Changeset 5349 for trunk/Ohana/src/kapa/graph/cursor.c

Timestamp:

Oct 15, 2005, 2:41:53 PM (21 years ago)

Author:

eugene

Message:

cursor now returns a string for key

File:

• trunk/Ohana/src/kapa/graph/cursor.c (modified) (4 diffs)

trunk/Ohana/src/kapa/graph/cursor.c

@@ -1 +1 @@
 # include "Ximage.h"
-# define EventMask (long) (KeyPressMask | ExposureMask | StructureNotifyMask)
+# define EventMask (long) (KeyPressMask | ExposureMask | StructureNotifyMask | ButtonPressMask)
 
 int cursor () {
@@ -8 +8 @@
   int             status, value;
   XComposeStatus  composestatus;
-  char            string[10], line[35];
+  char            string[10], line[40], *name;
   double          x, y;
   char            buffer[10];
   Layout         *layout;
-  
+  XButtonEvent   *mouse_event;
+
   layout = &section[TheSection];
 
@@ -22 +23 @@
     
     switch (status) {
-    case -1:
-      /* no input from pipe: continue */
-      break;
+      case -1:
+        /* no input from pipe: continue */
+        break;
       
-    case 0:
-      fprintf (stderr, "pipe has died!\n");
-      return (FALSE);
-      break;
+      case 0:
+        fprintf (stderr, "pipe has died!\n");
+        return (FALSE);
+        break;
 
-    case 4:
-      if (!strcmp (buffer, "NCUR")) {  /* stop reading cursor */
+      case 4:
+        if (!strcmp (buffer, "NCUR")) {  /* stop reading cursor */
+          return (TRUE);
+        }
+        break;
+
+      default:
+        fprintf (stderr, "weird signal: too many or few bytes!  %d\n", status);
         return (TRUE);
-      }
-      break;
-
-    default:
-      fprintf (stderr, "weird signal: too many or few bytes!  %d\n", status);
-      return (TRUE);
-      break;
+        break;
     }
 
@@ -53 +54 @@
       switch (event.type)  {
 
-      case MotionNotify:
-        break;
+        case MotionNotify:
+          break;
 
-      case Expose:
-        if (HAVE_BACKING) {
-          continue;
-        }
-        if (XEventsQueued (graphic.display, QueuedAlready) < 2) {
-          Refresh (1);
-        }
-        break;
+        case Expose:
+          if (HAVE_BACKING) {
+            continue;
+          }
+          if (XEventsQueued (graphic.display, QueuedAlready) < 2) {
+            Refresh (1);
+          }
+          break;
         
-      case ConfigureNotify:
-        status = Reconfig (&event);
-        break;
+        case ConfigureNotify:
+          status = Reconfig (&event);
+          break;
         
-      case MappingNotify:
-        XRefreshKeyboardMapping ((XMappingEvent *) &event);
-        break;
+        case MappingNotify:
+          XRefreshKeyboardMapping ((XMappingEvent *) &event);
+          break;
         
-      case KeyPress:
-        string[0] = 0;
-        value = XLookupString ((XKeyEvent *) &event, string, 9, &keysym, &composestatus);
-        x = (event.xkey.x - layout[0].axis[0].fx)*(layout[0].axis[0].max - layout[0].axis[0].min)/layout[0].axis[0].dfx + layout[0].axis[0].min;
-        y = (event.xkey.y - layout[0].axis[1].fy)*(layout[0].axis[1].max - layout[0].axis[1].min)/layout[0].axis[1].dfy + layout[0].axis[1].min;
-        if ((value > 0) && (isdigit(string[0]) || isalpha(string[0]))) {
-          sprintf (line, "%c %12.6f %12.6f ", string[0], x, y);
-          write (sock, line, 32);
-        }
-        break;
+        case ButtonPress:
+          mouse_event = (XButtonEvent *) &event;
+          sprintf (string, "Button%d", mouse_event[0].button);
+          x = (mouse_event[0].x - layout[0].axis[0].fx)*(layout[0].axis[0].max - layout[0].axis[0].min)/layout[0].axis[0].dfx + layout[0].axis[0].min;
+          y = (mouse_event[0].y - layout[0].axis[1].fy)*(layout[0].axis[1].max - layout[0].axis[1].min)/layout[0].axis[1].dfy + layout[0].axis[1].min;
+          snprintf (line, 40, "%12s %12.6f %12.6f ", string, x, y);
+          write (sock, line, 40);
+          break;
+
+        case KeyPress:
+          value = XLookupString ((XKeyEvent *) &event, string, 9, &keysym, &composestatus);
+          name = XKeysymToString (keysym);
+
+          x = (event.xkey.x - layout[0].axis[0].fx)*(layout[0].axis[0].max - layout[0].axis[0].min)/layout[0].axis[0].dfx + layout[0].axis[0].min;
+          y = (event.xkey.y - layout[0].axis[1].fy)*(layout[0].axis[1].max - layout[0].axis[1].min)/layout[0].axis[1].dfy + layout[0].axis[1].min;
+
+          // skip the following keys: 
+          if (!strcmp (name, "Shift_L")) break;
+          if (!strcmp (name, "Shift_R")) break;
+          if (!strcmp (name, "Control_L")) break;
+          if (!strcmp (name, "Control_R")) break;
+          if (!strcmp (name, "Alt_L")) break;
+          if (!strcmp (name, "Alt_R")) break;
+          if (!strcmp (name, "Super_L")) break;
+          if (!strcmp (name, "Super_R")) break;
+          if (!strcmp (name, "Caps_Lock")) break;
+          if (!strcmp (name, "Pause")) break;
+          if (!strcmp (name, "Break")) break;
+          if (!strcmp (name, "Num_Lock")) break;
+          if (!strcmp (name, "Scroll_Lock")) break;
+          if (!strcmp (name, "Print")) break;
+          if (!strcmp (name, "(null)")) break;
+
+          snprintf (line, 40, "%12s %12.6f %12.6f ", name, x, y);
+          write (sock, line, 40);
+          break;
       }
     }