xserver: Branch 'master' - 4 commits
Tiago Vignatti
vignatti at kemper.freedesktop.org
Tue Oct 7 23:42:10 PDT 2008
dix/getevents.c | 2 +-
hw/dmx/dmxcursor.c | 5 -----
hw/xfree86/common/xf86Init.c | 1 -
hw/xfree86/common/xf86Xinput.h | 1 -
include/os.h | 2 --
mi/mipointer.c | 37 ++++++++-----------------------------
mi/mipointer.h | 19 +------------------
7 files changed, 10 insertions(+), 57 deletions(-)
New commits:
commit d1bb5e3b47ab71aa2f18f69daaf2a4c5ce06d800
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Wed Oct 8 03:19:45 2008 -0300
mi: functions here are carrying 'time' without need.
diff --git a/dix/getevents.c b/dix/getevents.c
index ed7bf7f..4770a69 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -916,7 +916,7 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
/* This takes care of crossing screens for us, as well as clipping
* to the current screen. Right now, we only have one history buffer,
* so we don't set this for both the device and core.*/
- miPointerSetPosition(pDev, &pDev->last.valuators[0], &pDev->last.valuators[1], ms);
+ miPointerSetPosition(pDev, &pDev->last.valuators[0], &pDev->last.valuators[1]);
if (master) {
master->last.valuators[0] = pDev->last.valuators[0];
diff --git a/mi/mipointer.c b/mi/mipointer.c
index c131882..b998cd4 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -74,8 +74,7 @@ static Bool miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
Bool generateEvent);
static Bool miPointerCloseScreen(int index, ScreenPtr pScreen);
static void miPointerMove(DeviceIntPtr pDev, ScreenPtr pScreen,
- int x, int y,
- unsigned long time);
+ int x, int y);
static Bool miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);
static void miPointerDeviceCleanup(DeviceIntPtr pDev,
ScreenPtr pScreen);
@@ -315,7 +314,7 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
if (GenerateEvent)
{
- miPointerMove (pDev, pScreen, x, y, GetTimeInMillis());
+ miPointerMove (pDev, pScreen, x, y);
}
else
{
@@ -457,13 +456,13 @@ miPointerGetScreen(DeviceIntPtr pDev)
_X_EXPORT void
miPointerAbsoluteCursor (int x, int y, unsigned long time)
{
- miPointerSetPosition(inputInfo.pointer, &x, &y, time);
+ miPointerSetPosition(inputInfo.pointer, &x, &y);
}
/* Move the pointer on the current screen, and update the sprite. */
static void
miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen,
- int x, int y, unsigned long time)
+ int x, int y)
{
miPointerPtr pPointer;
SetupScreen(pScreen);
@@ -489,7 +488,7 @@ miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen,
}
_X_EXPORT void
-miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y, unsigned long time)
+miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
{
miPointerScreenPtr pScreenPriv;
ScreenPtr pScreen;
@@ -538,7 +537,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y, unsigned long time)
pPointer->pScreen == pScreen)
return;
- miPointerMoved(pDev, pScreen, *x, *y, time);
+ miPointerMoved(pDev, pScreen, *x, *y);
}
_X_EXPORT void
@@ -549,12 +548,12 @@ miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y)
}
void
-miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y, unsigned long time)
+miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{
int i, nevents;
int valuators[2];
- miPointerMoved(pDev, pScreen, x, y, time);
+ miPointerMoved(pDev, pScreen, x, y);
/* generate motion notify */
valuators[0] = x;
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 6119c25..d1eac98 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -149,8 +149,7 @@ extern void miPointerGetPosition(
extern void miPointerSetPosition(
DeviceIntPtr pDev,
int *x,
- int *y,
- unsigned long time);
+ int *y);
extern void miPointerUpdateSprite(
DeviceIntPtr pDev);
commit 4964a9ca6c3f26376469b6d8217815a47231f0a9
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Wed Oct 8 03:06:32 2008 -0300
mi: remove deprecated and unused functions.
miPointerDeltaCursor, miPointerGetMotionBufferSize and
miPointerSetNewScreen.
diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c
index 6218dc3..32934bb 100644
--- a/hw/dmx/dmxcursor.c
+++ b/hw/dmx/dmxcursor.c
@@ -943,13 +943,8 @@ void dmxCheckCursor(void)
pScreen = screenInfo.screens[dmxScreen->index];
if (!dmxOnScreen(x, y, dmxScreen)) {
-#if 00
- if (firstScreen && i == miPointerCurrentScreen()->myNum)
- miPointerSetNewScreen(firstScreen->index, x, y);
-#else
if (firstScreen && i == miPointerGetScreen(inputInfo.pointer)->myNum)
miPointerSetScreen(inputInfo.pointer, firstScreen->index, x, y);
-#endif
_dmxSetCursor(pScreen, NULL,
x - dmxScreen->rootXOrigin,
y - dmxScreen->rootYOrigin);
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 8293e9b..c131882 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -420,26 +420,6 @@ miPointerUpdateSprite (DeviceIntPtr pDev)
}
}
-/*
- * miPointerDeltaCursor. The pointer has moved dx,dy from it's previous
- * position.
- */
-
-void
-miPointerDeltaCursor (int dx, int dy, unsigned long time)
-{
- int x = MIPOINTER(inputInfo.pointer)->x = dx;
- int y = MIPOINTER(inputInfo.pointer)->y = dy;
-
- miPointerSetPosition(inputInfo.pointer, &x, &y, time);
-}
-
-void
-miPointerSetNewScreen(int screen_no, int x, int y)
-{
- miPointerSetScreen(inputInfo.pointer, screen_no, x, y);
-}
-
void
miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
{
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 179e4f3..6119c25 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -110,10 +110,6 @@ extern void miPointerWarpCursor(
int /*y*/
) _X_DEPRECATED;
-extern int miPointerGetMotionBufferSize(
- void
-) _X_DEPRECATED;
-
extern int miPointerGetMotionEvents(
DeviceIntPtr /*pPtr*/,
xTimecoord * /*coords*/,
@@ -123,24 +119,12 @@ extern int miPointerGetMotionEvents(
);
/* Deprecated in favour of miPointerSetPosition. */
-extern void miPointerDeltaCursor(
- int /*dx*/,
- int /*dy*/,
- unsigned long /*time*/
-) _X_DEPRECATED;
extern void miPointerAbsoluteCursor(
int /*x*/,
int /*y*/,
unsigned long /*time*/
) _X_DEPRECATED;
-/* Deprecated in favour of miPointerSetScreen. */
-extern void miPointerSetNewScreen(
- int, /*screen_no*/
- int, /*x*/
- int /*y*/
-) _X_DEPRECATED;
-
/* Deprecated in favour of miPointerGetScreen. */
extern ScreenPtr miPointerCurrentScreen(
void
commit adf3e296e2b00164fb22e89ad4f44acbd2e3deae
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Wed Oct 8 02:12:49 2008 -0300
Remove unused declarations.
AvailableClientInput (LBX debris) and xf86XinputFinalizeInit.
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index 02f657d..7617a3e 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -170,7 +170,6 @@ void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down,
...);
void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code,
int is_down);
-void xf86XinputFinalizeInit(DeviceIntPtr dev);
void xf86ActivateDevice(LocalDevicePtr local);
Bool xf86CheckButton(int button, int down);
void xf86SwitchCoreDevice(LocalDevicePtr device, DeviceIntPtr core);
diff --git a/include/os.h b/include/os.h
index c2bcd09..e63daad 100644
--- a/include/os.h
+++ b/include/os.h
@@ -169,8 +169,6 @@ extern void MakeClientGrabPervious(ClientPtr /*client*/);
extern void ListenOnOpenFD(int /* fd */, int /* noxauth */);
#endif
-extern void AvailableClientInput(ClientPtr /* client */);
-
extern CARD32 GetTimeInMillis(void);
extern void AdjustWaitForDelay(
commit bca9fa2efe97d2816a2e9412cdff08a0145c8f96
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Wed Oct 8 01:38:27 2008 -0300
Everyone knows that the loader is present. Silence it.
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 01f2395..06a7f93 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -236,7 +236,6 @@ xf86PrintBanner()
#endif
ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
"\tto make sure that you have the latest version.\n");
- ErrorF("Module Loader present\n");
}
static void
More information about the xorg-commit
mailing list