diff options
author | Jamey Sharp <jamey@minilop.net> | 2002-05-26 07:31:49 +0000 |
---|---|---|
committer | Jamey Sharp <jamey@minilop.net> | 2002-05-26 07:31:49 +0000 |
commit | 78af94f8e1db5ad6cf6a58fd5436e697bee33ed5 (patch) | |
tree | 22152a048f7adf8d8882ae97f6c1c0b3ddb36fac /xcl | |
parent | d166af1c33c1afd593e002b86efbcac31ccf8c18 (diff) |
Removed _XSetLastRequestRead.
Diffstat (limited to 'xcl')
-rw-r--r-- | xcl/src/ErrHndlr.c | 2 | ||||
-rw-r--r-- | xcl/src/EvToWire.c | 39 |
2 files changed, 2 insertions, 39 deletions
diff --git a/xcl/src/ErrHndlr.c b/xcl/src/ErrHndlr.c index 9afa150..78419df 100644 --- a/xcl/src/ErrHndlr.c +++ b/xcl/src/ErrHndlr.c @@ -202,7 +202,7 @@ int _XError(Display *dpy, register xError *rep) register _XAsyncHandler *async, *next; int rtn_val; - event.xerror.serial = _XSetLastRequestRead(dpy, (xGenericReply *)rep); + event.xerror.serial = 0; for (async = dpy->async_handlers; async; async = next) { next = async->next; diff --git a/xcl/src/EvToWire.c b/xcl/src/EvToWire.c index 6b26218..95a7bac 100644 --- a/xcl/src/EvToWire.c +++ b/xcl/src/EvToWire.c @@ -394,7 +394,7 @@ Bool _XUnknownWireEvent(register Display *dpy, register XEvent *re, register xEv Bool _XWireToEvent(register Display *dpy, register XEvent *re, register xEvent *event) { re->type = event->u.u.type & 0x7f; - ((XAnyEvent *)re)->serial = _XSetLastRequestRead(dpy, (xGenericReply *)event); + ((XAnyEvent *)re)->serial = 0; ((XAnyEvent *)re)->send_event = ((event->u.u.type & 0x80) != 0); ((XAnyEvent *)re)->display = dpy; @@ -754,40 +754,3 @@ Bool _XWireToEvent(register Display *dpy, register XEvent *re, register xEvent * } return(True); } - -/* The hard part about this is that we only get 16 bits from a reply. - * We have three values that will march along, with the following invariant: - * dpy->last_request_read <= rep->sequenceNumber <= dpy->request - * We have to keep - * dpy->request - dpy->last_request_read < 2^16 - * or else we won't know for sure what value to use in events. We do this - * by forcing syncs when we get close. */ -unsigned long _XSetLastRequestRead(register Display *dpy, register xGenericReply *rep) -{ - register unsigned long newseq, lastseq; - - lastseq = dpy->last_request_read; - /* - * KeymapNotify has no sequence number, but is always guaranteed - * to immediately follow another event, except when generated via - * SendEvent (hmmm). - */ - if ((rep->type & 0x7f) == KeymapNotify) - return(lastseq); - - newseq = (lastseq & ~((unsigned long)0xffff)) | rep->sequenceNumber; - - if (newseq < lastseq) { - newseq += 0x10000; - if (newseq > dpy->request) { - (void) fprintf (stderr, - "XCL: sequence lost (0x%lx > 0x%lx) in reply type 0x%x!\n", - newseq, dpy->request, - (unsigned int) rep->type); - newseq -= 0x10000; - } - } - - dpy->last_request_read = newseq; - return(newseq); -} |