frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdrive/input: only run special key behaviours on non-XKB 

Only attempt to manually deal with special key behaviours (e.g. terminating
the server) when not using XKB, and leave locking behaviour up to GKVE.
This commit is contained in:
Daniel Stone 2006-08-15 15:25:16 +03:00 committed by Daniel Stone
parent 34228d8b28
commit 47c1c948e6
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/kdrive/src/kinput.c
View File

@ -1927,23 +1927,14 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo *ki,
else else
type = KeyPress; type = KeyPress;
/* HRNGH */ #ifdef XKB
switch (KEYCOL1(ki, key_code)) if (noXkbExtension)
{ #endif
case XK_Num_Lock: {
case XK_Scroll_Lock: KdCheckSpecialKeys(ki, type, key_code);
case XK_Shift_Lock: KdHandleKeyboardEvent(ki, type, key_code);
case XK_Caps_Lock:
if (type == KeyRelease)
return;
if (IsKeyDown (ki, key_code))
type = KeyRelease;
else
type = KeyPress;
} }
KdCheckSpecialKeys(ki, type, key_code);
KdHandleKeyboardEvent(ki, type, key_code);
nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code); nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code);
#ifdef DEBUG #ifdef DEBUG
ErrorF("KdEnqueueKeyboardEvent: got %d events from GKE\n", nEvents); ErrorF("KdEnqueueKeyboardEvent: got %d events from GKE\n", nEvents);