diff options
| author | Egbert Eich <eich@freedesktop.org> | 2004-09-15 09:05:22 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2004-09-15 09:05:22 +0000 |
| commit | 2e02a95dcc43dd3ec7bbaf4675ffb94f5074f543 (patch) | |
| tree | 3d0c6b0c66c965dacbe5690ecb9b63769a353068 | |
| parent | 2d3afb68a104a80a21ee622b9abb9c95e83505d3 (diff) | |
| download | xorg-lib-libX11-2e02a95dcc43dd3ec7bbaf4675ffb94f5074f543.tar.gz | |
Unregistering events in XSelectInput() when unregistering IM filter callbacks may be a bad idea as others may be interested in this event. Removed the call to XSelectInput() altogether as we are in root window anyway (Lubos Lunak).
Fix size of a variable that gets assigned the value of SmartScheduleTime (long) to long. This should help to prevent smart scheduler lockup on 64 bit systems due to overruns (Andreas Schwab).
| -rw-r--r-- | modules/im/ximcp/imInsClbk.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c index 3d647953..0aaba735 100644 --- a/modules/im/ximcp/imInsClbk.c +++ b/modules/im/ximcp/imInsClbk.c @@ -254,8 +254,18 @@ _XimUnRegisterIMInstantiateCallback( _XUnregisterFilter( display, RootWindow(display, 0), _XimFilterPropertyNotify, (XPointer)NULL ); +#if 0 + /* + * don't unregister the event mask + * (not even the PropertyNotify mask) + * as others may be interested. + * It shouldn't matter if we don't unregister + * as we are in the root window anyway so the + * event won't be propagated any further. + */ XSelectInput( display, RootWindow(display, 0), NoEventMask ); +#endif } else picb->next = icb->next; |