diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-15 14:35:22 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-18 07:59:55 +1000 |
| commit | 424b856e8e19f35c24bfc0a9fced9464d2f17c90 (patch) | |
| tree | 08906ec2bd7c7f7177e66b8f1269651103cf7f66 | |
| parent | 3c28a29e132d6f73c36d4b64818d112b1c6e9a40 (diff) | |
dix: update comments for GetPointerEvents and friends
All these now generate InternalEvents, point this out. Remove XKB/XI
references, that's just confusing. This comment referred to the old-style
event generation code from server 1.4 to including 1.6 but is now just
confusing to newcomers.
Remove comment about SwitchCoreKeyboard() for the same reason.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
| -rw-r--r-- | dix/getevents.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index e5134d34b..ecbf416b1 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -894,20 +894,12 @@ GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code) /** - * Returns a set of keyboard events for KeyPress/KeyRelease, optionally - * also with valuator events. Handles Xi and XKB. - * - * DOES NOT GENERATE CORE EVENTS! Core events are created when processing the - * event (ProcessOtherEvent). + * Returns a set of InternalEvents for KeyPress/KeyRelease, optionally + * also with valuator events. * * events is not NULL-terminated; the return value is the number of events. * The DDX is responsible for allocating the event structure in the first * place via GetMaximumEventsNum(), and for freeing it. - * - * This function does not change the core keymap to that of the device; - * that is done by SwitchCoreKeyboard, which is called from - * mieqProcessInputEvents. If replacing that function, take care to call - * SetCoreKeyboard before processInputProc, so keymaps are altered to suit. */ int GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type, @@ -1050,11 +1042,8 @@ transformAbsolute(DeviceIntPtr dev, int v[MAX_VALUATORS]) } /** - * Generate a series of xEvents (filled into the EventList) representing - * pointer motion, or button presses. Xi and XKB-aware. - * - * DOES NOT GENERATE CORE EVENTS! Core events are created when processing the - * event (ProcessOtherEvent). + * Generate a series of InternalEvents (filled into the EventList) + * representing pointer motion, or button presses. * * events is not NULL-terminated; the return value is the number of events. * The DDX is responsible for allocating the event structure in the first @@ -1183,7 +1172,8 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons, /** - * Post ProximityIn/ProximityOut events, accompanied by valuators. + * Generate ProximityIn/ProximityOut InternalEvents, accompanied by + * valuators. * * events is not NULL-terminated; the return value is the number of events. * The DDX is responsible for allocating the event structure in the first |