xserver: Branch 'glucose-2' - 3 commits
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Sep 12 11:36:25 PDT 2007
hw/xgl/Makefile.am | 6 ++++--
hw/xgl/glx/module/Makefile.am | 5 ++++-
hw/xgl/glx/xglx.c | 23 +++++++++++------------
hw/xgl/glxext/Makefile.am | 4 +++-
hw/xgl/xglinput.c | 7 +++----
randr/randrstr.h | 2 ++
6 files changed, 27 insertions(+), 20 deletions(-)
New commits:
diff-tree a2f96d3135d71828bf1dfc8407b456decb444892 (from be9fa811821c77874d83637dc96310015f394b2d)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date: Wed Sep 12 19:24:07 2007 +0100
Update for input interface changes.
diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index 92974f0..1cf2098 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -50,7 +50,7 @@
#ifdef XKB
#include <X11/extensions/XKB.h>
-#include <xkbsrv.h>
+#include <X11/extensions/XKBsrv.h>
#include <X11/extensions/XKBconfig.h>
extern Bool
@@ -975,6 +975,8 @@ xglxBlockHandler (pointer blockData,
XFlush (xdisplay);
}
+static DeviceIntPtr pKeyboard, pPointer;
+
static void
xglxWakeupHandler (pointer blockData,
int result,
@@ -991,25 +993,25 @@ xglxWakeupHandler (pointer blockData,
x.u.u.type = KeyPress;
x.u.u.detail = X.xkey.keycode;
x.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis ();
- mieqEnqueue (&x);
+ mieqEnqueue (pKeyboard, &x);
break;
case KeyRelease:
x.u.u.type = KeyRelease;
x.u.u.detail = X.xkey.keycode;
x.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis ();
- mieqEnqueue (&x);
+ mieqEnqueue (pKeyboard, &x);
break;
case ButtonPress:
x.u.u.type = ButtonPress;
x.u.u.detail = X.xbutton.button;
x.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis ();
- mieqEnqueue (&x);
+ mieqEnqueue (pPointer, &x);
break;
case ButtonRelease:
x.u.u.type = ButtonRelease;
x.u.u.detail = X.xbutton.button;
x.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis ();
- mieqEnqueue (&x);
+ mieqEnqueue (pPointer, &x);
break;
case MotionNotify:
x.u.u.type = MotionNotify;
@@ -1018,7 +1020,7 @@ xglxWakeupHandler (pointer blockData,
x.u.keyButtonPointer.rootY = X.xmotion.y;
x.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis ();
miPointerAbsoluteCursor (X.xmotion.x, X.xmotion.y, lastEventTime);
- mieqEnqueue (&x);
+ mieqEnqueue (pPointer, &x);
break;
case EnterNotify:
if (X.xcrossing.detail != NotifyInferior) {
@@ -1030,7 +1032,7 @@ xglxWakeupHandler (pointer blockData,
x.u.keyButtonPointer.rootY = X.xcrossing.y;
x.u.keyButtonPointer.time = lastEventTime =
GetTimeInMillis ();
- mieqEnqueue (&x);
+ mieqEnqueue (pPointer, &x);
}
}
break;
@@ -1046,7 +1048,7 @@ xglxBell (int volume,
pointer ctrl,
int cls)
{
- XBell (xdisplay, volume);
+ XBell (xdisplay, volume);
}
static void
@@ -1259,16 +1261,13 @@ void
xglxInitInput (int argc,
char **argv)
{
- DeviceIntPtr pKeyboard, pPointer;
-
pPointer = AddInputDevice (xglMouseProc, TRUE);
pKeyboard = AddInputDevice (xglxKeybdProc, TRUE);
RegisterPointerDevice (pPointer);
RegisterKeyboardDevice (pKeyboard);
- miRegisterPointerDevice (screenInfo.screens[0], pPointer);
- mieqInit (&pKeyboard->public, &pPointer->public);
+ mieqInit ();
AddEnabledDevice (XConnectionNumber (xdisplay));
diff --git a/hw/xgl/xglinput.c b/hw/xgl/xglinput.c
index cda21ad..f745f8b 100644
--- a/hw/xgl/xglinput.c
+++ b/hw/xgl/xglinput.c
@@ -51,9 +51,9 @@ xglMouseProc (DeviceIntPtr pDevice,
InitPointerDeviceStruct (pDev,
map,
NUM_BUTTONS,
- miPointerGetMotionEvents,
+ GetMotionHistory,
(PtrCtrlProcPtr) NoopDDA,
- miPointerGetMotionBufferSize ());
+ GetMotionHistorySize (), 2);
break;
case DEVICE_ON:
pDev->on = TRUE;
@@ -258,6 +258,5 @@ xglInitInput (int argc, char **argv)
RegisterPointerDevice (pPointer);
RegisterKeyboardDevice (pKeyboard);
- miRegisterPointerDevice (screenInfo.screens[0], pPointer);
- mieqInit (&pKeyboard->public, &pPointer->public);
+ mieqInit ();
}
diff-tree be9fa811821c77874d83637dc96310015f394b2d (from ff22e3d2a943978ef68728446596fa37801a8e3b)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date: Wed Sep 12 19:01:44 2007 +0100
Avoid typedef redefinitions.
diff --git a/randr/randrstr.h b/randr/randrstr.h
index bd19fe9..a852c3a 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -55,9 +55,11 @@
#define RANDR_10_INTERFACE 1
#define RANDR_12_INTERFACE 1
+#ifndef _XRANDR_H_
typedef XID RRMode;
typedef XID RROutput;
typedef XID RRCrtc;
+#endif
extern int RREventBase, RRErrorBase;
diff-tree ff22e3d2a943978ef68728446596fa37801a8e3b (from c13e2a941d77520e27233577845e77620b17e0ea)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date: Wed Sep 12 19:01:04 2007 +0100
Use LIBDRM_CFLAGS.
diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am
index ef9fc0e..6c72ea6 100644
--- a/hw/xgl/Makefile.am
+++ b/hw/xgl/Makefile.am
@@ -19,7 +19,9 @@ SUBDIRS = \
$(XEGL_SUBDIRS)
AM_CFLAGS = \
- $(DIX_CFLAGS) \
+ @DIX_CFLAGS@ \
+ @LIBDRM_CFLAGS@ \
+ @DRIPROTO_CFLAGS@ \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
-I$(top_srcdir)/GL/glx \
@@ -55,7 +57,7 @@ libxgl_a_SOURCES = \
xglpict.c \
xglglyph.c \
xgltrap.c \
- xglloader.c \
+ xglloader.c \
xglhash.c \
xglglx.c \
xglxv.c
diff --git a/hw/xgl/glx/module/Makefile.am b/hw/xgl/glx/module/Makefile.am
index bd1c4b0..103b041 100644
--- a/hw/xgl/glx/module/Makefile.am
+++ b/hw/xgl/glx/module/Makefile.am
@@ -2,7 +2,10 @@ if GLX
GLX_LIB = $(top_builddir)/hw/xgl/glxext/libxglglxext.la
endif
-AM_CFLAGS = $(DIX_CFLAGS) \
+AM_CFLAGS = \
+ @DIX_CFLAGS@ \
+ @LIBDRM_CFLAGS@ \
+ @DRIPROTO_CFLAGS@ \
-I$(srcdir)/.. \
-I$(srcdir)/../.. \
$(XGLXMODULES_CFLAGS)
diff --git a/hw/xgl/glxext/Makefile.am b/hw/xgl/glxext/Makefile.am
index 98a9b13..4fa84a6 100644
--- a/hw/xgl/glxext/Makefile.am
+++ b/hw/xgl/glxext/Makefile.am
@@ -1,7 +1,9 @@
SUBDIRS = module
AM_CFLAGS = \
- $(DIX_CFLAGS) \
+ @DIX_CFLAGS@ \
+ @LIBDRM_CFLAGS@ \
+ @DRIPROTO_CFLAGS@ \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
$(XGLMODULES_CFLAGS) \
More information about the xorg-commit
mailing list