diff options
Diffstat (limited to 'xorg-server/hw/xwin/InitInput.c')
| -rw-r--r-- | xorg-server/hw/xwin/InitInput.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c index bc48a9360..6e7db760d 100644 --- a/xorg-server/hw/xwin/InitInput.c +++ b/xorg-server/hw/xwin/InitInput.c @@ -32,7 +32,7 @@ #include "win.h" #include "dixstruct.h" #include "inputstr.h" - +#include <unistd.h> /* * Local function prototypes @@ -40,7 +40,6 @@ #ifdef XWIN_CLIPBOARD int winProcEstablishConnection(ClientPtr /* client */); -int winProcQueryTree(ClientPtr /* client */); int winProcSetSelectionOwner(ClientPtr /* client */); #endif @@ -76,15 +75,7 @@ LegalModifier (unsigned int uiKey, DeviceIntPtr pDevice) void ProcessInputEvents (void) { -#if 0 - ErrorF ("ProcessInputEvents\n"); -#endif - mieqProcessInputEvents (); - -#if 0 - ErrorF ("ProcessInputEvents - returning\n"); -#endif } @@ -99,9 +90,7 @@ void DDXRingBell(int volume, int pitch, int duration) void InitInput (int argc, char *argv[]) { -#if CYGDEBUG winDebug ("InitInput\n"); -#endif #ifdef XWIN_CLIPBOARD /* @@ -112,12 +101,6 @@ InitInput (int argc, char *argv[]) winProcEstablishConnectionOrig = InitialVector[2]; InitialVector[2] = winProcEstablishConnection; } - if (g_fXdmcpEnabled - && ProcVector[X_QueryTree] != winProcQueryTree) - { - winProcQueryTreeOrig = ProcVector[X_QueryTree]; - ProcVector[X_QueryTree] = winProcQueryTree; - } #endif g_pwinPointer = AddInputDevice (serverClient, winMouseProc, TRUE); @@ -127,8 +110,8 @@ InitInput (int argc, char *argv[]) mieqInit (); - /* Initialize the mode key states */ - winInitializeModeKeyStates (); + /* Do not nitialize the mode key states here yet since the keyboard device is not started yet + winInitializeModeKeyStates (); */ #ifdef HAS_DEVWINDOWS /* Only open the windows message queue device once */ @@ -148,13 +131,13 @@ InitInput (int argc, char *argv[]) } #endif -#if CYGDEBUG winDebug ("InitInput - returning\n"); -#endif } void CloseInput (void) { mieqFini (); + g_pwinPointer=NULL; + g_pwinKeyboard=NULL; } |