2 files changed, 65 insertions, 1 deletions

diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index fcb7e584b..1fc62968c 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -54,6 +54,8 @@ SOFTWARE.
 

 #ifdef HAVE_DIX_CONFIG_H

 #include <dix-config.h>

+#else

+#define XINPUT

 #endif

 

 #include "inputstr.h"

@@ -925,6 +927,7 @@ ProcessRawEvent(RawDeviceEvent *ev, DeviceIntPtr device)
         }

 

         for (i = 0; i < screenInfo.numScreens; i++)

+          if (screenInfo.screens[i] && screenInfo.screens[i]->root)

             DeliverEventsToWindow(device, screenInfo.screens[i]->root, xi, 1,

                                   GetEventFilter(device, xi), NULL);

         free(xi);

@@ -966,7 +969,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
     {

         kbd = GetPairedDevice(device);

         mouse = device;

-        if (!kbd->key) /* can happen with floating SDs */

+        if (kbd && !kbd->key) /* can happen with floating SDs */

             kbd = NULL;

     } else

     {

@@ -1024,6 +1027,8 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
         case ET_KeyRelease:

         case ET_ProximityIn:

         case ET_ProximityOut:

+            if (!device->spriteInfo->sprite)

+              return;

             GetSpritePosition(device, &rootX, &rootY);

             event->root_x = rootX;

             event->root_y = rootY;

@@ -1695,6 +1700,10 @@ RecalculateDeviceDeliverableEvents(WindowPtr pWin)
     }

 }

 

+#ifdef _MSC_VER

+#pragma warning(disable:4715) /* Not all control paths return a value */

+#endif

+

 int

 InputClientGone(WindowPtr pWin, XID id)

 {

diff --git a/xorg-server/Xi/makefile b/xorg-server/Xi/makefile
new file mode 100644
index 000000000..a466c84f0
--- /dev/null
+++ b/xorg-server/Xi/makefile
@@ -0,0 +1,55 @@
+CSRCS=allowev.c \
+	chgdctl.c \
+	chgfctl.c \
+	chgkbd.c \
+	chgkmap.c \
+	chgprop.c \
+	chgptr.c \
+	closedev.c \
+	devbell.c \
+	exevents.c \
+	extinit.c \
+	getbmap.c \
+	getdctl.c \
+	getfctl.c \
+	getfocus.c \
+	getkmap.c \
+	getmmap.c \
+	getprop.c \
+	getselev.c \
+	getvers.c \
+	grabdev.c \
+	grabdevb.c \
+	grabdevk.c \
+	gtmotion.c \
+	listdev.c \
+	opendev.c \
+	queryst.c \
+	selectev.c \
+	sendexev.c \
+	setbmap.c \
+	setdval.c \
+	setfocus.c \
+	setmmap.c \
+	setmode.c \
+	ungrdev.c \
+	ungrdevb.c \
+	ungrdevk.c \
+	xiallowev.c \
+	xichangecursor.c \
+	xichangehierarchy.c \
+	xigetclientpointer.c \
+	xigrabdev.c \
+	xipassivegrab.c \
+	xiproperty.c \
+	xiquerydevice.c \
+	xiquerypointer.c \
+	xiqueryversion.c \
+	xiselectev.c \
+	xisetclientpointer.c \
+	xisetdevfocus.c \
+	xiwarppointer.c \
+	stubs.c
+
+LIBRARY=libXi
+