*** empty log message ***

Rev: lib/modules/Protocols.pmod/X.pmod/Xlib.pmod:1.4
Rev: lib/modules/Protocols.pmod/X.pmod/_Xlib.pmod:1.3
Rev: lib/modules/Protocols.pmod/X.pmod/my_struct.pmod:1.2

lib/modules/Protocols.pmod/X.pmod/Xlib.pmod

@@ -2,7 +2,7 @@
  *
  */
 
-#define error(x) throw( ({ (x), backtrace() }) )
+#include "error.h"
 
 constant XPORT = 6000;
 
@@ -353,10 +353,8 @@ class Display
 	case STATE_WAIT_HEADER:
 	  {
 	    received->expect(32); /* Correct for most of the cases */
-	    string type = _Xlib.event_types[msg[0]];
-	    switch(type)
-	      {
-	      case "Error":
+	    string type = _Xlib.event_types[msg[0] & 0x3f];
+	    if (type == "Error")
 	      {
 		mapping m = ([]);
 		sscanf(msg, "%*c%c%2c%4c%2c%c",
@@ -364,7 +362,7 @@ class Display
 		       m->minorCode, m->majorCode);
 		return ({ ACTION_ERROR, m });
 	      }
-	      case "Reply":
+	    else if (type == "Reply")
 	      {
 		reply = ([]);
 		int length;
@@ -377,80 +375,111 @@ class Display
 
 		state = STATE_WAIT_REPLY;
 		received->expect(length*4);
-	      
-		  break;
 	      }
-#if 0 
+	    else
+	      {
+		mapping event = ([ "type" : type ]);
+		switch(type)
+		  {
 		  case "KeyPress":
 		  case "KeyRelease":
 		  case "ButtonPress":
 		  case "ButtonRelease":
-	      case "MotionNotify":
-		...
+		  case "MotionNotify": {
+		    int root, child;
+		    sscanf(msg, "%*c%c%2c%4c" "%4c%4c%4c" "%2c%2c%2c%2c" "%2c%c",
+			   event->detail, event->sequenceNumber, event->time,
+			   root, event->wid, child,
+			   event->rootX, event->rootY, event->eventx, event->eventY,
+			   event->state, event->sameScreen);
+		    event->root = lookup_id(root);
+		    event->event = lookup_id(event->wid);
+		    event->child = child && lookup_id(child);
+		    break;
+		  }
+#if 0 
+		
 		  case "EnterNotify":
 		  case "LeaveNotify":
-		...
+		    ...;
 		  case "FocusIn":
 		  case "FocusOut":
-		...
+		    ...;
 #endif
 		  case "KeymapNotify":
-		return ({ ACTION_EVENT,
-			    ([ "type" : "KeymapNotify",
-			     "map" : msg[1..] ]) });
+		    event->map = msg[1..];
+		    break;
+		  case "Expose": {
+		    sscanf(msg, "%*4c%4c" "%2c%2c%2c%2c" "%2c",
+			   event->wid,
+			   event->x, event->y, event->width, event->height,
+			   event->count);
+		    event->window = lookup_id(event->wid);
+		    break;
+		  }
 #if 0		
-	      case "Expose":
-		...
 		  case "GraphicsExpose":
-		...
+		    ...;
 		  case "NoExpose":
-		...
+		    ...;
 		  case "VisibilityNotify":
-		...
-	      case "CreateNotify":
-		...
+		    ...;
+#endif
+		  case "CreateNotify": {
+		    int window;
+		    sscanf(msg, "%*4c%4c%4c" "%2c%2c" "%2c%2c%2c" "%c",
+			   event->wid, window,
+			   event->x, event->y,
+			   event->width, event->height, event->borderWidth,
+			   event->override);
+		    event->parent = lookup_id(event->wid);
+		    event->window = lookup_id(window) || window;
+		    break;
+		  }
+#if 0
 		  case "DestroyNotify":
-		...
+		    ...;
 		  case "UnmapNotify":
-		...
+		    ...;
 		  case "MapNotify":
-		...
+		    ...;
 		  case "MapRequest":
-		...
+		    ...;
 		  case "ReparentNotify":
-		...
+		    ...;
 		  case "ConfigureNotify":
-		...
+		    ...;
 		  case "ConfigureRequest":
-		...
+		    ...;
 		  case "GravityNotify":
-		...
+		    ...;
 		  case "ResizeRequest":
-		...
+		    ...;
 		  case "CirculateNotify":
-		...
+		    ...;
 		  case "CirculateRequest":
-		...
+		    ...;
 		  case "PropertyNotify":
-		...
+		    ...;
 		  case "SelectionClear":
-		...
+		    ...;
 		  case "SelectionRequest":
-		...
+		    ...;
 		  case "SelectionNotify":
-		...
+		    ...;
 		  case "ColormapNotify":
-		...
+		    ...;
 		  case "ClientMessage":
-		...
+		    ...;
 		  case "MappingNotify":
 #endif		
 		  default:  /* Any other event */
-		return ({ ACTION_EVENT,
-			    ([ "type" : "Unimplemented",
+		    event = ([ "type" : "Unimplemented",
 			     "name" : type,
-			     "raw" : msg ]) });
-	      
+			     "raw" : msg ]);
+		    break;
+		  }
+		return ({ ACTION_EVENT, event });
 	      }
 	    break; 
 	  }

lib/modules/Protocols.pmod/X.pmod/_Xlib.pmod

@@ -6,21 +6,48 @@
 object display_re = Regexp("([^:]*):([0-9]+).([0-9]+)");
 
 array(string) window_attributes =
-({ "background_pixmap",
-   "background_pixel",
-   "border_pixmap",
-   "border_pixel",
-   "bit_gravity",
-   "win_gravity",
-   "backing_store",
-   "backing_bit_planes",
-   "backing_pixel",
-   "override_redirect",
-   "save_under",
-   "event_mask",
-   "do_not_propagate_mask",
-   "colormap",
-   "cursor" });
+({ "BackPixmap",
+   "BackPixel",
+   "BorderPixmap",
+   "BorderPixel",
+   "BitGravity",
+   "WinGravity",
+   "BackingStore",
+   "BackingPlanes",
+   "BackingPixel",
+   "OverrideRedirect",
+   "SaveUnder",
+   "EventMask",
+   "DontPropagate",
+   "Colormap",
+   "Cursor" });
+
+array(string) gc_attributes =
+({
+  "Function",
+  "PlaneMask",
+  "Foreground",
+  "Background",
+  "LineWidth",
+  "LineStyle",
+  "CapStyle",
+  "JoinStyle",
+  "FillStyle",
+  "FillRule",
+  "Tile",
+  "Stipple",
+  "TileStipXOrigin",
+  "TileStipYOrigin",
+  "Font",
+  "SubwindowMode",
+  "GraphicsExposures",
+  "ClipXOrigin",
+  "ClipYOrigin",
+  "ClipMask",
+  "DashOffset",
+  "DashList",
+  "ArcMode"
+});
 
 mapping(string:int) event_masks =
 ([

lib/modules/Protocols.pmod/X.pmod/my_struct.pmod

@@ -3,8 +3,7 @@
  * This should replace ADT.struct at some time.
  */
 
-#define error(x) throw( ({ (x), backtrace() }) )
-// #include "error.h"
+#include "error.h"
 
 class struct {     
   string buffer;