Changeset 25454 in vbox for trunk/src/VBox/Additions/x11/vboxmouse

Timestamp:

Dec 17, 2009 11:34:52 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56114

Message:

Additions/x11/vboxmouse: build the XFree86 vboxmouse driver against the XFree86 4.3 headers which support amd64

Location:

trunk/src/VBox/Additions/x11/vboxmouse

Files:

• Makefile.kmk (modified) (1 diff)
• mouse.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk

@@ -41 +41 @@
         IN_MODULE XFree86Module PNP_MOUSE
  vboxmouse_drv_INCS := \
-        $(VBOX_PATH_X11_XFREE_4_2)/exports/include \
-        $(VBOX_PATH_X11_XFREE_4_2)/exports/include/X11 \
-        $(VBOX_PATH_X11_XFREE_4_2)/include \
-        $(VBOX_PATH_X11_XFREE_4_2)/include/extensions \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/include \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86 \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/common \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/os-support \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/os-support/bus \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/mi \
+        $(VBOX_PATH_X11_XFREE_4_3)/include \
+        $(VBOX_PATH_X11_XFREE_4_3)/include/extensions \
+        $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \
+        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86 \
+        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common \
+        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
+        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support/bus \
+        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mi \
+        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
         $(PATH_SUB_CURRENT)
  vboxmouse_drv_SOURCES = \

trunk/src/VBox/Additions/x11/vboxmouse/mouse.c

@@ -605 +605 @@
     InputInfoPtr pInfo;
     MouseDevPtr pMse;
+    Bool clearDTR, clearRTS;
     MessageType from = X_DEFAULT;
     const char *protocol;
@@ -748 +749 @@
     }
 
-    pMse->clearDTR = xf86SetBoolOption(pInfo->options, "ClearDTR", FALSE);
-    pMse->clearRTS = xf86SetBoolOption(pInfo->options, "ClearRTS", FALSE);
-    if (pMse->clearDTR || pMse->clearRTS) {
+    if ((clearDTR = xf86SetBoolOption(pInfo->options, "ClearDTR", FALSE)))
+                pMse->mouseFlags |= MF_CLEAR_DTR;
+
+    if ((clearRTS = xf86SetBoolOption(pInfo->options, "ClearRTS", FALSE)))
+                pMse->mouseFlags |= MF_CLEAR_RTS;
+
+    if (clearDTR || clearRTS) {
         xf86Msg(X_CONFIG, "%s: ", pInfo->name);
-        if (pMse->clearDTR) {
+        if (clearDTR) {
             xf86ErrorF("ClearDTR");
-            if (pMse->clearRTS)
+            if (clearRTS)
                 xf86ErrorF(", ");
         }
-        if (pMse->clearRTS) {
+        if (clearRTS) {
             xf86ErrorF("ClearRTS");
         }