xserver: Branch 'master' - 3 commits
Tiago Vignatti
vignatti at kemper.freedesktop.org
Tue Oct 7 21:29:17 PDT 2008
hw/xfree86/common/xf86.h | 4 -
hw/xfree86/common/xf86Events.c | 107 ++++++++++-------------------------------
hw/xfree86/common/xf86Xinput.c | 20 +++----
hw/xfree86/loader/xf86sym.c | 2
4 files changed, 38 insertions(+), 95 deletions(-)
New commits:
commit 278c11f01fbc6d6bd91c5a7127928c9ef5d29fca
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Wed Oct 8 01:18:49 2008 -0300
xfree86: xf86{Enable, Disable}InputHandler can be static.
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 84ea633..0956f9c 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -191,8 +191,6 @@ xf86SetDGAModeProc xf86SetDGAMode;
void SetTimeSinceLastInputEvent(void);
pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data);
int xf86RemoveInputHandler(pointer handler);
-void xf86DisableInputHandler(pointer handler);
-void xf86EnableInputHandler(pointer handler);
pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data);
int xf86RemoveGeneralHandler(pointer handler);
void xf86InterceptSignals(int *signo);
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 520e7f1..6ca0ae7 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -635,6 +635,34 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
}
}
+static void
+xf86EnableInputHandler(pointer handler)
+{
+ IHPtr ih;
+
+ if (!handler)
+ return;
+
+ ih = handler;
+ ih->enabled = TRUE;
+ if (ih->fd >= 0)
+ AddEnabledDevice(ih->fd);
+}
+
+static void
+xf86DisableInputHandler(pointer handler)
+{
+ IHPtr ih;
+
+ if (!handler)
+ return;
+
+ ih = handler;
+ ih->enabled = FALSE;
+ if (ih->fd >= 0)
+ RemoveEnabledDevice(ih->fd);
+}
+
/*
* xf86VTSwitch --
* Handle requests for switching the vt.
@@ -901,34 +929,6 @@ xf86RemoveGeneralHandler(pointer handler)
return fd;
}
-_X_EXPORT void
-xf86DisableInputHandler(pointer handler)
-{
- IHPtr ih;
-
- if (!handler)
- return;
-
- ih = handler;
- ih->enabled = FALSE;
- if (ih->fd >= 0)
- RemoveEnabledDevice(ih->fd);
-}
-
-_X_EXPORT void
-xf86EnableInputHandler(pointer handler)
-{
- IHPtr ih;
-
- if (!handler)
- return;
-
- ih = handler;
- ih->enabled = TRUE;
- if (ih->fd >= 0)
- AddEnabledDevice(ih->fd);
-}
-
/*
* As used currently by the DRI, the return value is ignored.
*/
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index 494d2db..1677a49 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -375,8 +375,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(SetTimeSinceLastInputEvent)
SYMFUNC(xf86AddInputHandler)
SYMFUNC(xf86RemoveInputHandler)
- SYMFUNC(xf86DisableInputHandler)
- SYMFUNC(xf86EnableInputHandler)
SYMFUNC(xf86AddEnabledDevice)
SYMFUNC(xf86RemoveEnabledDevice)
SYMFUNC(xf86InterceptSignals)
commit 50081d2dfb79878cb931a15c265f0d60698dfd39
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Wed Oct 8 01:11:38 2008 -0300
xfree86: remove xf86{Enable, Disable}GeneralHandler and others unused.
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index fbbfc73..84ea633 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -195,8 +195,6 @@ void xf86DisableInputHandler(pointer handler);
void xf86EnableInputHandler(pointer handler);
pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data);
int xf86RemoveGeneralHandler(pointer handler);
-void xf86DisableGeneralHandler(pointer handler);
-void xf86EnableGeneralHandler(pointer handler);
void xf86InterceptSignals(int *signo);
void xf86InterceptSigIll(void (*sigillhandler)(void));
Bool xf86EnableVTSwitch(Bool new);
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 15dce9f..520e7f1 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -57,16 +57,13 @@
#include <X11/Xpoll.h>
#include <X11/Xproto.h>
#include "misc.h"
-
#include "compiler.h"
-
#include "xf86.h"
#include "xf86Priv.h"
#define XF86_OS_PRIVS
#include "xf86_OSlib.h"
#include <X11/keysym.h>
-
#ifdef XFreeXDGA
#include "dgaproc.h"
#endif
@@ -87,25 +84,12 @@
#include <X11/extensions/xf86bigfont.h>
#endif
-#ifdef XKB
-extern Bool noXkbExtension;
-#endif
-
#ifdef DPMSExtension
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include "dpmsproc.h"
#endif
-#define XE_POINTER 1
-#define XE_KEYBOARD 2
-
-#define EqEnqueue(pDev, ev) { \
- int __sigstate = xf86BlockSIGIO (); \
- mieqEnqueue (pDev, ev); \
- xf86UnblockSIGIO(__sigstate); \
-}
-
/*
* The first of many hacks to get VT switching to work under
* Solaris 2.1 for x86. The basic problem is that Solaris is supposed
@@ -160,7 +144,6 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
* Function used for screensaver purposes by the os module. Returns the
* time in milliseconds since there last was any input.
*/
-
int
TimeSinceLastInputEvent()
{
@@ -170,28 +153,22 @@ TimeSinceLastInputEvent()
return GetTimeInMillis() - xf86Info.lastEventTime;
}
-
-
/*
* SetTimeSinceLastInputEvent --
* Set the lastEventTime to now.
*/
-
_X_EXPORT void
SetTimeSinceLastInputEvent()
{
xf86Info.lastEventTime = GetTimeInMillis();
}
-
-
/*
* ProcessInputEvents --
* Retrieve all waiting input events and pass them to DIX in their
* correct chronological order. Only reads from the system pointer
* and keyboard.
*/
-
void
ProcessInputEvents ()
{
@@ -939,20 +916,6 @@ xf86DisableInputHandler(pointer handler)
}
_X_EXPORT void
-xf86DisableGeneralHandler(pointer handler)
-{
- IHPtr ih;
-
- if (!handler)
- return;
-
- ih = handler;
- ih->enabled = FALSE;
- if (ih->fd >= 0)
- RemoveGeneralSocket(ih->fd);
-}
-
-_X_EXPORT void
xf86EnableInputHandler(pointer handler)
{
IHPtr ih;
@@ -966,20 +929,6 @@ xf86EnableInputHandler(pointer handler)
AddEnabledDevice(ih->fd);
}
-_X_EXPORT void
-xf86EnableGeneralHandler(pointer handler)
-{
- IHPtr ih;
-
- if (!handler)
- return;
-
- ih = handler;
- ih->enabled = TRUE;
- if (ih->fd >= 0)
- AddGeneralSocket(ih->fd);
-}
-
/*
* As used currently by the DRI, the return value is ignored.
*/
commit 54294e15ecf4a8ec0fd9fa8b6ed1a1b2d912ec7e
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Wed Oct 8 00:43:22 2008 -0300
xfree86: fix wrong function name message errors.
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 530fa86..f8f3577 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -660,8 +660,8 @@ xf86PostMotionEvent(DeviceIntPtr device,
static int valuators[MAX_VALUATORS];
if (num_valuators > MAX_VALUATORS) {
- xf86Msg(X_ERROR, "xf86PostMotionEvent: num_valuator %d"
- " is greater than MAX_VALUATORS\n", num_valuators);
+ xf86Msg(X_ERROR, "%s: num_valuator %d is greater than"
+ " MAX_VALUATORS\n", __FUNCTION__, num_valuators);
return;
}
@@ -688,8 +688,8 @@ xf86PostMotionEventP(DeviceIntPtr device,
int flags = 0;
if (num_valuators > MAX_VALUATORS) {
- xf86Msg(X_ERROR, "xf86PostMotionEvent: num_valuator %d"
- " is greater than MAX_VALUATORS\n", num_valuators);
+ xf86Msg(X_ERROR, "%s: num_valuator %d is greater than"
+ " MAX_VALUATORS\n", __FUNCTION__, num_valuators);
return;
}
@@ -751,8 +751,8 @@ xf86PostProximityEvent(DeviceIntPtr device,
if (num_valuators > MAX_VALUATORS) {
- xf86Msg(X_ERROR, "xf86PostMotionEvent: num_valuator %d"
- " is greater than MAX_VALUATORS\n", num_valuators);
+ xf86Msg(X_ERROR, "%s: num_valuator %d is greater than"
+ " MAX_VALUATORS\n", __FUNCTION__, num_valuators);
return;
}
@@ -792,8 +792,8 @@ xf86PostButtonEvent(DeviceIntPtr device,
}
#endif
if (num_valuators > MAX_VALUATORS) {
- xf86Msg(X_ERROR, "xf86PostMotionEvent: num_valuator %d"
- " is greater than MAX_VALUATORS\n", num_valuators);
+ xf86Msg(X_ERROR, "%s: num_valuator %d is greater than"
+ " MAX_VALUATORS\n", __FUNCTION__, num_valuators);
return;
}
@@ -832,8 +832,8 @@ xf86PostKeyEvent(DeviceIntPtr device,
"broken.\n");
if (num_valuators > MAX_VALUATORS) {
- xf86Msg(X_ERROR, "xf86PostMotionEvent: num_valuator %d"
- " is greater than MAX_VALUATORS\n", num_valuators);
+ xf86Msg(X_ERROR, "%s: num_valuator %d is greater than"
+ " MAX_VALUATORS\n", __FUNCTION__, num_valuators);
return;
}
More information about the xorg-commit
mailing list