diff options
| author | Keith Packard <keithp@keithp.com> | 2003-10-01 06:43:50 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2003-10-01 06:43:50 +0000 |
| commit | 5a21f4f4d0c03e0e34f1979fd7cec8f0d19b00d4 (patch) | |
| tree | 50c32f7b1aa1b9e1faaa79031161b8edd6cf6aac | |
| parent | a42e31b28c493dc3d6b32cde4e72ff17fc983183 (diff) | |
Add XDM cookies. Fix up support for pkgconfig X bits
| -rw-r--r-- | hw/kdrive/fbdev/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/kdrive/linux/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/kdrive/mach64/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/kdrive/src/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/kdrive/src/kinput.c | 8 | ||||
| -rw-r--r-- | hw/kdrive/vesa/Makefile.am | 1 |
6 files changed, 8 insertions, 5 deletions
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am index 31643e2f1..fc4ab67f6 100644 --- a/hw/kdrive/fbdev/Makefile.am +++ b/hw/kdrive/fbdev/Makefile.am @@ -1,7 +1,6 @@ INCLUDES = \ -I$(top_srcdir)/fb \ -I$(top_srcdir)/hw/kdrive/src \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/mi \ -I$(top_srcdir)/miext/layer \ -I$(top_srcdir)/miext/shadow \ diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am index 53df4e23b..cc64b7720 100644 --- a/hw/kdrive/linux/Makefile.am +++ b/hw/kdrive/linux/Makefile.am @@ -1,6 +1,5 @@ INCLUDES = \ -I$(top_srcdir)/hw/kdrive/src \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/mi \ -I$(top_srcdir)/fb \ -I$(top_srcdir)/miext/layer \ diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am index b437463dd..cfc377762 100644 --- a/hw/kdrive/mach64/Makefile.am +++ b/hw/kdrive/mach64/Makefile.am @@ -2,7 +2,6 @@ INCLUDES = \ -I$(top_srcdir)/fb \ -I$(top_srcdir)/hw/kdrive/src \ -I$(top_srcdir)/hw/kdrive/vesa \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/mi \ -I$(top_srcdir)/miext/layer \ -I$(top_srcdir)/miext/shadow \ diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am index 44f3701a0..c478dbdcb 100644 --- a/hw/kdrive/src/Makefile.am +++ b/hw/kdrive/src/Makefile.am @@ -1,6 +1,5 @@ INCLUDES = \ -I$(top_srcdir)/fb \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/mi \ -I$(top_srcdir)/miext/shadow \ -I$(top_srcdir)/randr \ diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index ef3bba3d2..641e6a33c 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -31,7 +31,9 @@ #define XK_PUBLISHING #include <X11/keysym.h> +#if HAVE_X11_XF86KEYSYM_H #include <X11/XF86keysym.h> +#endif #include "kkeymap.h" #include <signal.h> #include <stdio.h> @@ -513,12 +515,18 @@ const KdKeySymModsRec kdKeySymMods[] = { { XK_Mode_switch, Mod4Mask }, #ifdef TOUCHSCREEN /* PDA specific hacks */ +#ifdef XF86XK_Start { XF86XK_Start, ControlMask }, +#endif { XK_Menu, ShiftMask }, { XK_telephone, Mod1Mask }, +#ifdef XF86XK_AudioRecord { XF86XK_AudioRecord, Mod2Mask }, +#endif +#ifdef XF86XK_Calendar { XF86XK_Calendar, Mod3Mask } #endif +#endif }; #define NUM_SYM_MODS (sizeof(kdKeySymMods) / sizeof(kdKeySymMods[0])) diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am index 3bd6c039d..2338672a8 100644 --- a/hw/kdrive/vesa/Makefile.am +++ b/hw/kdrive/vesa/Makefile.am @@ -1,7 +1,6 @@ INCLUDES = \ -I$(top_srcdir)/fb \ -I$(top_srcdir)/hw/kdrive/src \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/mi \ -I$(top_srcdir)/miext/layer \ -I$(top_srcdir)/miext/shadow \ |