BUG #6473: Event-related problems with the XIElib code and structures

2 files changed, 18 insertions, 2 deletions

diff --git a/xc/lib/XIE/XIElib.h b/xc/lib/XIE/XIElib.h
index d9320d195..d5cd4b634 100644
--- a/xc/lib/XIE/XIElib.h
+++ b/xc/lib/XIE/XIElib.h
@@ -1,4 +1,4 @@
-/* $XConsortium: XIElib.h,v 1.4 93/10/30 14:57:34 rws Exp $ */
+/* $XConsortium: XIElib.h,v 1.5 94/01/12 19:44:01 rws Exp $ */
 /******************************************************************************
 Copyright 1993 by the Massachusetts Institute of Technology,
 
@@ -716,6 +716,7 @@ typedef struct {
     Bool			send_event;
     Display			*display;
     unsigned long		name_space;
+    Time			time;
     unsigned long		flo_id;
     XiePhototag			src;
     unsigned int		elem_type;
@@ -730,10 +731,13 @@ typedef struct {
     Bool			send_event;
     Display			*display;
     unsigned long		name_space;
+    Time			time;
     unsigned long		flo_id;
     XiePhototag			src;
     unsigned int		elem_type;
     XieDecodeTechnique		decode_technique;
+    Bool			aborted;
+    unsigned int		band_number;
     unsigned long		width;
     unsigned long		height;
 } XieDecodeNotifyEvent;
@@ -744,9 +748,11 @@ typedef struct {
     Bool			send_event;
     Display			*display;
     unsigned long		name_space;
+    Time			time;
     unsigned long		flo_id;
     XiePhototag			src;
     unsigned int		elem_type;
+    unsigned int		band_number;
     unsigned long		data[3];
 } XieExportAvailableEvent;
 
@@ -756,6 +762,7 @@ typedef struct {
     Bool			send_event;
     Display			*display;
     unsigned long		name_space;
+    Time			time;
     unsigned long		flo_id;
     XiePhototag			src;
     unsigned int		elem_type;
@@ -772,6 +779,7 @@ typedef struct {
     Bool			send_event;
     Display			*display;
     unsigned long		name_space;
+    Time			time;
     unsigned long		flo_id;
 } XiePhotofloDoneEvent;
 
diff --git a/xc/lib/XIE/events.c b/xc/lib/XIE/events.c
index 0d8b8aecd..f285627fc 100644
--- a/xc/lib/XIE/events.c
+++ b/xc/lib/XIE/events.c
@@ -1,4 +1,4 @@
-/* $XConsortium: events.c,v 1.1 93/07/19 11:39:20 mor Exp $ */
+/* $XConsortium: events.c,v 1.2 94/01/12 19:44:28 rws Exp $ */
 
 /******************************************************************************
 Copyright 1993 by the Massachusetts Institute of Technology
@@ -37,6 +37,7 @@ xEvent		*wire;
     host_event->send_event            = (wire_event->event & 0x80) != 0;
     host_event->display               = display;
     host_event->name_space            = wire_event->instanceNameSpace;
+    host_event->time                  = wire_event->time;
     host_event->flo_id                = wire_event->instanceFloID;
     host_event->src                   = wire_event->src;
     host_event->elem_type             = wire_event->type;
@@ -64,10 +65,13 @@ xEvent		*wire;
     host_event->send_event       = (wire_event->event & 0x80) != 0;
     host_event->display          = display;
     host_event->name_space       = wire_event->instanceNameSpace;
+    host_event->time             = wire_event->time;
     host_event->flo_id           = wire_event->instanceFloID;
     host_event->src              = wire_event->src;
     host_event->elem_type        = wire_event->type;
     host_event->decode_technique = wire_event->decodeTechnique;
+    host_event->aborted          = wire_event->aborted;
+    host_event->band_number      = wire_event->bandNumber;
     host_event->width		 = wire_event->width;
     host_event->height		 = wire_event->height;
 
@@ -91,9 +95,11 @@ xEvent		*wire;
     host_event->send_event = (wire_event->event & 0x80) != 0;
     host_event->display    = display;
     host_event->name_space = wire_event->instanceNameSpace;
+    host_event->time       = wire_event->time;
     host_event->flo_id     = wire_event->instanceFloID;
     host_event->src        = wire_event->src;
     host_event->elem_type  = wire_event->type;
+    host_event->band_number = wire_event->bandNumber;
     host_event->data[0]    = wire_event->data0;
     host_event->data[1]    = wire_event->data1;
     host_event->data[2]    = wire_event->data2;
@@ -118,6 +124,7 @@ xEvent		*wire;
     host_event->send_event = (wire_event->event & 0x80) != 0;
     host_event->display    = display;
     host_event->name_space = wire_event->instanceNameSpace;
+    host_event->time       = wire_event->time;
     host_event->flo_id     = wire_event->instanceFloID;
     host_event->src        = wire_event->src;
     host_event->elem_type  = wire_event->type;
@@ -147,6 +154,7 @@ xEvent		*wire;
     host_event->send_event = (wire_event->event & 0x80) != 0;
     host_event->display    = display;
     host_event->name_space = wire_event->instanceNameSpace;
+    host_event->time       = wire_event->time;
     host_event->flo_id     = wire_event->instanceFloID;
 
     return (True);