hlfw.ca

Info  •  Files  •  Log  •  Branches

Keep modmap in scope of draw.c

--- a/draw.c

+++ b/draw.c

@@ -480,3 +480,9 @@

     return TRUE;

 }

+

+Bool

+x9checkmod(unsigned int k, DeviceIntPtr pDev)

+{

+    return modmap[k] != 0;

+}

\ No newline at end of file

--- a/x9dev.c

+++ b/x9dev.c

@@ -105,7 +105,7 @@

 Bool

 LegalModifier(unsigned int k, DeviceIntPtr pDev)

 {

-    return modmap[k] != 0;

+    return x9checkmod(k, pDev);

 }

 void

--- a/x9dev.h

+++ b/x9dev.h

@@ -72,6 +72,7 @@

 DeviceIntPtr x9devMouse;

 DeviceIntPtr x9devKeybd;

+Bool x9checkmod(unsigned int, DeviceIntPtr);

 Bool x9devScreenInit(ScreenPtr, int, char **);

 int  x9devMouseProc(DeviceIntPtr, int);