diff options
Diffstat (limited to 'xorg-server/xkb')
| -rw-r--r-- | xorg-server/xkb/makefile | 47 | ||||
| -rw-r--r-- | xorg-server/xkb/xkb.c | 2 | ||||
| -rw-r--r-- | xorg-server/xkb/xkbActions.c | 6 | ||||
| -rw-r--r-- | xorg-server/xkb/xkbInit.c | 6 |
4 files changed, 56 insertions, 5 deletions
diff --git a/xorg-server/xkb/makefile b/xorg-server/xkb/makefile new file mode 100644 index 000000000..dc1b559e0 --- /dev/null +++ b/xorg-server/xkb/makefile @@ -0,0 +1,47 @@ +DEFINES += HAVE_XKB_CONFIG_H + +DDX_SRCS = \ + ddxBeep.c \ + ddxCtrls.c \ + ddxFakeBtn.c \ + ddxFakeMtn.c \ + ddxInit.c \ + ddxKeyClick.c \ + ddxLEDs.c \ + ddxLoad.c \ + ddxList.c \ + ddxDevBtn.c + +DIX_SRCS = \ + xkb.c \ + xkbUtils.c \ + xkbEvents.c \ + xkbAccessX.c \ + xkbSwap.c \ + xkbLEDs.c \ + xkbInit.c \ + xkbActions.c \ + xkbPrKeyEv.c + +# this should be replaced by a common library or something, ideally -d +XKBFILE_SRCS = \ + maprules.c \ + xkmread.c \ + xkbtext.c \ + xkbfmisc.c \ + xkbout.c + +X11_SRCS = \ + XKBMisc.c \ + XKBAlloc.c \ + XKBGAlloc.c \ + XKBMAlloc.c + +# ends up unused... +# XI_SRCS = xkbPrOtherEv.c + +CSRCS = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \ + $(X11_SRCS) ddxVT.c ddxPrivate.c ddxKillSrv.c + +LIBRARY=libxkb + diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c index 7c569d483..4850a50de 100644 --- a/xorg-server/xkb/xkb.c +++ b/xorg-server/xkb/xkb.c @@ -5579,6 +5579,8 @@ ProcXkbGetKbdByName(ClientPtr client) if (!(client->xkbClientFlags&_XkbClientInitialized)) return BadAccess; + memset(&mrep,0,sizeof(mrep)); //MH + CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, access_mode); xkb = dev->key->xkbInfo->desc; diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c index 8c72874df..0b7e03032 100644 --- a/xorg-server/xkb/xkbActions.c +++ b/xorg-server/xkb/xkbActions.c @@ -1031,15 +1031,15 @@ _XkbFilterDeviceBtn( XkbSrvInfoPtr xkbi, DeviceIntPtr dev; int button; - if (dev == inputInfo.keyboard) - return 0; - if (filter->keycode==0) { /* initial press */ _XkbLookupButtonDevice(&dev, pAction->devbtn.device, serverClient, DixUnknownAccess, &button); if (!dev || !dev->public.on || dev == inputInfo.pointer) return 1; + if (dev == inputInfo.keyboard) + return 0; + button= pAction->devbtn.button; if ((button<1)||(button>dev->button->numButtons)) return 1; diff --git a/xorg-server/xkb/xkbInit.c b/xorg-server/xkb/xkbInit.c index 3b47396e5..c1be14c8e 100644 --- a/xorg-server/xkb/xkbInit.c +++ b/xorg-server/xkb/xkbInit.c @@ -35,7 +35,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #include <stdlib.h> #include <ctype.h> +#ifndef _MSC_VER #include <unistd.h> +#endif #include <math.h> #define NEED_EVENTS 1 #include <X11/X.h> @@ -95,10 +97,10 @@ typedef struct _SrvXkmInfo { /***====================================================================***/ #ifndef XKB_BASE_DIRECTORY -#define XKB_BASE_DIRECTORY "/usr/lib/X11/xkb" +#define XKB_BASE_DIRECTORY "xkbdata" #endif #ifndef XKB_BIN_DIRECTORY -#define XKB_BIN_DIRECTORY XKB_BASE_DIRECTORY +#define XKB_BIN_DIRECTORY "." #endif #ifndef XKB_DFLT_RULES_FILE #define XKB_DFLT_RULES_FILE "rules" |