Changeset 1977Tweet

Timestamp:

Oct 4, 2012, 6:28:42 PM (5 years ago)

Author:

sam

Message:

neercs: support arrow keys, pgup etc. and don't send keystrokes to the
terminal if the setup window is active.

Location:

trunk/tools/neercs

Files:

• neercs.cpp (modified) (1 diff)
• term/term.cpp (modified) (2 diffs)
• video/render.cpp (modified) (15 diffs)
• video/render.h (modified) (1 diff)

trunk/tools/neercs/neercs.cpp

@@ -59 +59 @@
 }
 
-
 void Neercs::TickDraw(float seconds)
 {

trunk/tools/neercs/term/term.cpp

@@ -24 +24 @@
 #include "term.h"
 
+extern bool g_setup;
+
 Term::Term(ivec2 size)
   : m_pty(0),
@@ -45 +47 @@
 
 #if defined HAVE_PTY_H || defined HAVE_UTIL_H || defined HAVE_LIBUTIL_H
-    bool have_ctrl = Input::GetStatus(Key::LeftCtrl)
-                      || Input::GetStatus(Key::RightCtrl);
-    bool have_shift = Input::GetStatus(Key::LeftShift)
-                       || Input::GetStatus(Key::RightShift);
-
-    for (int i = 0x0; i < 0x7f; ++i)
-    {
-        if (Input::WasPressed((Key::Value)i))
+    if (!g_setup)
+    {
+        bool have_ctrl = Input::GetStatus(Key::LeftCtrl)
+                          || Input::GetStatus(Key::RightCtrl);
+        bool have_shift = Input::GetStatus(Key::LeftShift)
+                           || Input::GetStatus(Key::RightShift);
+
+        /* Check for standard ASCII keys */
+        for (int i = 0x0; i < 0x7f; ++i)
         {
-            if (have_ctrl && i >= 'a' && i <= 'z')
+            if (Input::WasPressed((Key::Value)i))
             {
-                char c = i + 1 - 'a';
-                m_pty->WriteData(&c, 1);
+                if (have_ctrl && i >= 'a' && i <= 'z')
+                {
+                    char c = i + 1 - 'a';
+                    m_pty->WriteData(&c, 1);
+                }
+                else if (have_shift && i >= 'a' && i <= 'z')
+                {
+                    char c = i + 'A' - 'a';
+                    m_pty->WriteData(&c, 1);
+                }
+                else
+                {
+                    char c = i;
+                    m_pty->WriteData(&c, 1);
+                }
             }
-            else if (have_shift && i >= 'a' && i <= 'z')
-            {
-                char c = i + 'A' - 'a';
-                m_pty->WriteData(&c, 1);
-            }
-            else
-            {
-                char c = i;
-                m_pty->WriteData(&c, 1);
-            }
+        }
+
+        /* Check for special keys */
+        static struct { Key::Value k; char const *str; int len; } const lut[] =
+        {
+            { Key::Up, "\033OA", 3 },
+            { Key::Down, "\033OB", 3 },
+            { Key::Right, "\033OC", 3 },
+            { Key::Left, "\033OD", 3 },
+            { Key::PageUp, "\033[5~", 4 },
+            { Key::PageDown, "\033[6~", 4 },
+            { Key::Home, "\033[1~", 4 },
+            { Key::Insert, "\033[2~", 4 },
+            { Key::Delete, "\033[3~", 4 },
+            { Key::End, "\033[4~", 4 },
+#if 0 /* FIXME: disabled for now (used by the theme system */
+            { Key::F1, "\033[11~", 5 },
+            { Key::F2, "\033[12~", 5 },
+            { Key::F3, "\033[13~", 5 },
+            { Key::F4, "\033[14~", 5 },
+            { Key::F5, "\033[15~", 5 },
+            { Key::F6, "\033[17~", 5 },
+            { Key::F7, "\033[18~", 5 },
+            { Key::F8, "\033[19~", 5 },
+            { Key::F9, "\033[20~", 5 },
+            { Key::F10, "\033[21~", 5 },
+            { Key::F11, "\033[23~", 5 },
+            { Key::F12, "\033[24~", 5 },
+#endif
+        };
+
+        for (size_t i = 0; i < sizeof(lut) / sizeof(*lut); i++)
+        {
+            if (!have_ctrl && !have_shift)
+                if (Input::WasPressed(lut[i].k))
+                    m_pty->WriteData(lut[i].str, lut[i].len);
         }
     }

trunk/tools/neercs/video/render.cpp

@@ -44 +44 @@
 
 #define PID M_PI/180.0f    // pi ratio
+
+/*
+ * Global variable -- ugly
+ */
+bool g_setup = true;
 
 /*
@@ -580 +585 @@
     m_pause(false),
     m_polygon(true),
-    m_setup(true),
     m_shader(true),
     m_shader_glow(true),
@@ -611 +615 @@
 
     /* draw setup */
-    if (m_setup)
+    if (g_setup)
     {
         /* background */
@@ -708 +712 @@
     if (Input::WasPressed(Key::F1))
     {
-        m_setup = !m_setup;
-        if (m_setup) setup_n = calc_item_length();
+        g_setup = !g_setup;
+        if (g_setup) setup_n = calc_item_length();
         sync_flag = true;
         sync_angle = main_angle;
@@ -729 +733 @@
    if (Input::WasPressed(Key::Tab))
     {
-        if (m_setup)
+        if (g_setup)
         {
             setup_switch = !setup_switch;
@@ -738 +742 @@
     if (Input::WasPressed(Key::Up))
     {
-        if (m_setup)
+        if (g_setup)
         {
             if (!setup_switch)
@@ -788 +792 @@
     if (Input::WasPressed(Key::Down))
     {
-        if (m_setup)
+        if (g_setup)
         {
             if (!setup_switch)
@@ -838 +842 @@
     if (Input::WasPressed(Key::PageUp))
     {
-        if (m_setup)
+        if (g_setup)
         {
             if (!setup_switch)
@@ -887 +891 @@
     if (Input::WasPressed(Key::PageDown))
     {
-        if (m_setup)
+        if (g_setup)
         {
             if (!setup_switch)
@@ -936 +940 @@
     if (Input::WasPressed(Key::Left))
     {
-        if (m_setup && setup_switch)
+        if (g_setup && setup_switch)
         {
             setup_var[setup_item_key].w -= setup_var[setup_item_key].z;
@@ -945 +949 @@
     if (Input::WasPressed(Key::Right))
     {
-        if (m_setup && setup_switch)
+        if (g_setup && setup_switch)
         {
             setup_var[setup_item_key].w += setup_var[setup_item_key].z;
@@ -954 +958 @@
     if (Input::WasPressed(Key::Home))
     {
-        if (m_setup && setup_switch)
+        if (g_setup && setup_switch)
         {
             setup_var[setup_item_key].w = setup_var[setup_item_key].x;
@@ -962 +966 @@
     if (Input::WasPressed(Key::End))
     {
-        if (m_setup && setup_switch)
+        if (g_setup && setup_switch)
         {
             setup_var[setup_item_key].w = setup_var[setup_item_key].y;
@@ -1042 +1046 @@
     m_txt_screen->Render();
 
-    if (m_setup)
+    if (g_setup)
         m_txt_setup->Render();
 
@@ -1059 +1063 @@
 
     m_txt_screen->Blit(border, canvas_size);
-    if (m_setup)
+    if (g_setup)
         m_txt_setup->Blit((screen_size - setup_canvas_size) / 2, setup_canvas_size);
 

trunk/tools/neercs/video/render.h

@@ -37 +37 @@
     bool m_pause;
     bool m_polygon;
-    bool m_setup;
     bool m_shader;
     bool m_shader_glow;