diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2009-02-10 16:43:46 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-11 09:15:25 +1000 |
| commit | db59771946ac53f78fecf2d75eb165275a45f6aa (patch) | |
| tree | c96d5913a198f92cdce01e9b1095c8f06e788ec6 | |
| parent | ea428e52f599a6f575bc012b552e14535009d219 (diff) | |
No more special sun keyboards anymore.
Extracted into separate commits by Peter Hutterer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/kbd.c | 17 | ||||
| -rw-r--r-- | src/xf86OSKbd.h | 1 |
2 files changed, 0 insertions, 18 deletions
@@ -320,9 +320,6 @@ KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags) } } - if ((xkb_model && !strcmp(xkb_model, "sun")) || - (xkb_rules && !strcmp(xkb_rules, "sun"))) - pKbd->sunKbd = TRUE; #endif pKbd->CustomKeycodes = FALSE; @@ -592,19 +589,6 @@ PostKbdEvent(InputInfoPtr pInfo, unsigned int scanCode, Bool down) if (xf86inSuspend) return; - if (pKbd->sunKbd) { - /* - * XXX XXX XXX: - * - * I really don't know what's wrong here, but passing the real - * scanCode offsets by one from XKB's point of view. - * - * (ecd@skynet.be, 980405) - */ - scanCode--; - goto sunKeyboards; - } - /* * First do some special scancode remapping ... */ @@ -634,7 +618,6 @@ PostKbdEvent(InputInfoPtr pInfo, unsigned int scanCode, Bool down) } #endif -sunKeyboards: /* * Now map the scancodes to real X-keycodes ... */ diff --git a/src/xf86OSKbd.h b/src/xf86OSKbd.h index 5574e82..eb1a1aa 100644 --- a/src/xf86OSKbd.h +++ b/src/xf86OSKbd.h @@ -88,7 +88,6 @@ typedef struct { int kbdType; int consType; int wsKbdType; - Bool sunKbd; } KbdDevRec, *KbdDevPtr; |