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

Add XDM cookies. Fix up support for pkgconfig X bits

This commit is contained in:
Keith Packard 2003-10-01 06:43:50 +00:00
parent a42e31b28c
commit 5a21f4f4d0
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/kdrive/fbdev/Makefile.am
View File

@ -1,7 +1,6 @@
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/fb \ -I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \ -I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mi \ -I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/layer \ -I$(top_srcdir)/miext/layer \
-I$(top_srcdir)/miext/shadow \ -I$(top_srcdir)/miext/shadow \

1
hw/kdrive/linux/Makefile.am
View File

@ -1,6 +1,5 @@
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/hw/kdrive/src \ -I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mi \ -I$(top_srcdir)/mi \
-I$(top_srcdir)/fb \ -I$(top_srcdir)/fb \
-I$(top_srcdir)/miext/layer \ -I$(top_srcdir)/miext/layer \

1
hw/kdrive/mach64/Makefile.am
View File

@ -2,7 +2,6 @@ INCLUDES = \
-I$(top_srcdir)/fb \ -I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \ -I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/hw/kdrive/vesa \ -I$(top_srcdir)/hw/kdrive/vesa \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mi \ -I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/layer \ -I$(top_srcdir)/miext/layer \
-I$(top_srcdir)/miext/shadow \ -I$(top_srcdir)/miext/shadow \

1
hw/kdrive/src/Makefile.am
View File

@ -1,6 +1,5 @@
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/fb \ -I$(top_srcdir)/fb \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mi \ -I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/shadow \ -I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \ -I$(top_srcdir)/randr \

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

@ -31,7 +31,9 @@
#define XK_PUBLISHING #define XK_PUBLISHING
#include <X11/keysym.h> #include <X11/keysym.h>
#if HAVE_X11_XF86KEYSYM_H
#include <X11/XF86keysym.h> #include <X11/XF86keysym.h>
#endif
#include "kkeymap.h" #include "kkeymap.h"
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@ -513,12 +515,18 @@ const KdKeySymModsRec kdKeySymMods[] = {
{ XK_Mode_switch, Mod4Mask }, { XK_Mode_switch, Mod4Mask },
#ifdef TOUCHSCREEN #ifdef TOUCHSCREEN
/* PDA specific hacks */ /* PDA specific hacks */
#ifdef XF86XK_Start
{ XF86XK_Start, ControlMask }, { XF86XK_Start, ControlMask },
#endif
{ XK_Menu, ShiftMask }, { XK_Menu, ShiftMask },
{ XK_telephone, Mod1Mask }, { XK_telephone, Mod1Mask },
#ifdef XF86XK_AudioRecord
{ XF86XK_AudioRecord, Mod2Mask }, { XF86XK_AudioRecord, Mod2Mask },
#endif
#ifdef XF86XK_Calendar
{ XF86XK_Calendar, Mod3Mask } { XF86XK_Calendar, Mod3Mask }
#endif #endif
#endif
}; };
#define NUM_SYM_MODS (sizeof(kdKeySymMods) / sizeof(kdKeySymMods[0])) #define NUM_SYM_MODS (sizeof(kdKeySymMods) / sizeof(kdKeySymMods[0]))

1
hw/kdrive/vesa/Makefile.am
View File

@ -1,7 +1,6 @@
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/fb \ -I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \ -I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mi \ -I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/layer \ -I$(top_srcdir)/miext/layer \
-I$(top_srcdir)/miext/shadow \ -I$(top_srcdir)/miext/shadow \