diff options
author | Jory Pratt <anarchy@gentoo.org> | 2007-12-03 01:20:10 +0000 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2007-12-03 01:20:10 +0000 |
commit | bac7edb284d2a5ab3003768e240f95946e0f1ced (patch) | |
tree | d2a1855cc1dd64c179deba644a4beef2071abe08 /x11-base/xorg-server/files | |
parent | latest madwifi svn (diff) | |
download | je_fro-bac7edb284d2a5ab3003768e240f95946e0f1ced.tar.gz je_fro-bac7edb284d2a5ab3003768e240f95946e0f1ced.tar.bz2 je_fro-bac7edb284d2a5ab3003768e240f95946e0f1ced.zip |
add keyboard led support along with fix for xmodmap in xinitrc loading
svn path=/; revision=137
Diffstat (limited to 'x11-base/xorg-server/files')
-rw-r--r-- | x11-base/xorg-server/files/1.4-fix-kbdleds.patch | 26 | ||||
-rw-r--r-- | x11-base/xorg-server/files/1.4-mapping-changes-for-all.diff | 155 |
2 files changed, 181 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/1.4-fix-kbdleds.patch b/x11-base/xorg-server/files/1.4-fix-kbdleds.patch new file mode 100644 index 0000000..3580a1a --- /dev/null +++ b/x11-base/xorg-server/files/1.4-fix-kbdleds.patch @@ -0,0 +1,26 @@ +From bug http://bugs.freedesktop.org/show_bug.cgi?id=12434 + +"It's a perfectly fine patch to put in distributions for the time being" + -- Daniel Stone, Comment #18 + +--- xorg-server-1.4/dix/devices.c.orig 2007-10-19 17:04:51.000000000 -0200 ++++ xorg-server-1.4/dix/devices.c 2007-10-23 17:50:38.000000000 -0200 +@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt + static void + CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl) + { ++#ifdef XKB ++ if (!noXkbExtension) { ++ DeviceIntPtr dev = (DeviceIntPtr) ++ pDev->devPrivates[CoreDevicePrivatesIndex].ptr; ++ ++ if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc) ++ (*dev->key->xkbInfo->kbdProc)(dev, ctrl); ++ } ++#else + return; ++#endif + } + + /** + diff --git a/x11-base/xorg-server/files/1.4-mapping-changes-for-all.diff b/x11-base/xorg-server/files/1.4-mapping-changes-for-all.diff new file mode 100644 index 0000000..19506cf --- /dev/null +++ b/x11-base/xorg-server/files/1.4-mapping-changes-for-all.diff @@ -0,0 +1,155 @@ +commit 27ad5d74c20f01516a1bff73be283f8982fcf0fe +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sun Sep 23 17:17:03 2007 +0300 + + Input: Generate XKB mapping changes for all core-sending devices (bug #12523) + + When we change the mapping on a core device, make sure we propagate this + through to XKB for all extended devices as well. + +diff --git a/Xi/exevents.c b/Xi/exevents.c +index fe297ab..377311e 100644 +--- a/Xi/exevents.c ++++ b/Xi/exevents.c +@@ -73,6 +73,10 @@ SOFTWARE. + #include "dixgrabs.h" /* CreateGrab() */ + #include "scrnintstr.h" + ++#ifdef XKB ++#include "xkbsrv.h" ++#endif ++ + #define WID(w) ((w) ? ((w)->drawable.id) : 0) + #define AllModifiersMask ( \ + ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \ +@@ -942,7 +946,7 @@ SetModifierMapping(ClientPtr client, DeviceIntPtr dev, int len, int rlen, + } + + void +-SendDeviceMappingNotify(CARD8 request, ++SendDeviceMappingNotify(ClientPtr client, CARD8 request, + KeyCode firstKeyCode, CARD8 count, DeviceIntPtr dev) + { + xEvent event; +@@ -957,6 +961,11 @@ SendDeviceMappingNotify(CARD8 request, + ev->count = count; + } + ++#ifdef XKB ++ if (request == MappingKeyboard || request == MappingModifier) ++ XkbApplyMappingChange(dev, request, firstKeyCode, count, client); ++#endif ++ + SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) ev, 1); + } + +@@ -992,7 +1001,7 @@ ChangeKeyMapping(ClientPtr client, + keysyms.map = map; + if (!SetKeySymsMap(&k->curKeySyms, &keysyms)) + return BadAlloc; +- SendDeviceMappingNotify(MappingKeyboard, firstKeyCode, keyCodes, dev); ++ SendDeviceMappingNotify(client, MappingKeyboard, firstKeyCode, keyCodes, dev); + return client->noClientException; + } + +diff --git a/Xi/setbmap.c b/Xi/setbmap.c +index bdfa513..1f5970d 100644 +--- a/Xi/setbmap.c ++++ b/Xi/setbmap.c +@@ -134,7 +134,7 @@ ProcXSetDeviceButtonMapping(ClientPtr client) + } + + if (ret != MappingBusy) +- SendDeviceMappingNotify(MappingPointer, 0, 0, dev); ++ SendDeviceMappingNotify(client, MappingPointer, 0, 0, dev); + return Success; + } + +diff --git a/Xi/setmmap.c b/Xi/setmmap.c +index 0078499..e30213e 100644 +--- a/Xi/setmmap.c ++++ b/Xi/setmmap.c +@@ -122,7 +122,7 @@ ProcXSetDeviceModifierMapping(ClientPtr client) + if (ret == MappingSuccess || ret == MappingBusy || ret == MappingFailed) { + rep.success = ret; + if (ret == MappingSuccess) +- SendDeviceMappingNotify(MappingModifier, 0, 0, dev); ++ SendDeviceMappingNotify(client, MappingModifier, 0, 0, dev); + WriteReplyToClient(client, sizeof(xSetDeviceModifierMappingReply), + &rep); + } else { +diff --git a/dix/devices.c b/dix/devices.c +index 9f3c576..e05444e 100644 +--- a/dix/devices.c ++++ b/dix/devices.c +@@ -1208,10 +1208,9 @@ SendMappingNotify(unsigned request, unsigned firstKeyCode, unsigned count, + } + #ifdef XKB + if (!noXkbExtension && +- ((request == MappingKeyboard) || (request == MappingModifier))) { +- XkbApplyMappingChange(inputInfo.keyboard,request,firstKeyCode,count, +- client); +- } ++ ((request == MappingKeyboard) || (request == MappingModifier))) ++ XkbApplyMappingChange(inputInfo.keyboard, request, firstKeyCode, count, ++ client); + #endif + + /* 0 is the server client */ +@@ -1359,6 +1358,7 @@ int + ProcSetModifierMapping(ClientPtr client) + { + xSetModifierMappingReply rep; ++ DeviceIntPtr dev; + REQUEST(xSetModifierMappingReq); + + REQUEST_AT_LEAST_SIZE(xSetModifierMappingReq); +@@ -1374,8 +1374,10 @@ ProcSetModifierMapping(ClientPtr client) + rep.success = DoSetModifierMapping(client, (KeyCode *)&stuff[1], + stuff->numKeyPerModifier); + +- /* FIXME: Send mapping notifies for all the extended devices as well. */ + SendMappingNotify(MappingModifier, 0, 0, client); ++ for (dev = inputInfo.devices; dev; dev = dev->next) ++ if (dev->key && dev->coreEvents) ++ SendDeviceMappingNotify(client, MappingModifier, 0, 0, dev); + WriteReplyToClient(client, sizeof(xSetModifierMappingReply), &rep); + return client->noClientException; + } +@@ -1438,16 +1440,19 @@ ProcChangeKeyboardMapping(ClientPtr client) + keysyms.maxKeyCode = stuff->firstKeyCode + stuff->keyCodes - 1; + keysyms.mapWidth = stuff->keySymsPerKeyCode; + keysyms.map = (KeySym *)&stuff[1]; +- for (pDev = inputInfo.devices; pDev; pDev = pDev->next) { +- if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) { ++ for (pDev = inputInfo.devices; pDev; pDev = pDev->next) ++ if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) + if (!SetKeySymsMap(&pDev->key->curKeySyms, &keysyms)) + return BadAlloc; +- } +- } + +- /* FIXME: Send mapping notifies for all the extended devices as well. */ + SendMappingNotify(MappingKeyboard, stuff->firstKeyCode, stuff->keyCodes, + client); ++ for (pDev = inputInfo.devices; pDev; pDev = pDev->next) ++ if (pDev->key && pDev->coreEvents) ++ SendDeviceMappingNotify(client, MappingKeyboard, ++ stuff->firstKeyCode, stuff->keyCodes, ++ pDev); ++ + return client->noClientException; + } + +diff --git a/include/exevents.h b/include/exevents.h +index 69d4abc..cf7d71a 100644 +--- a/include/exevents.h ++++ b/include/exevents.h +@@ -129,6 +129,7 @@ extern int SetModifierMapping( + KeyClassPtr * /* k */); + + extern void SendDeviceMappingNotify( ++ ClientPtr /* client, */, + CARD8 /* request, */, + KeyCode /* firstKeyCode */, + CARD8 /* count */, |