xserver: Branch 'master' - 3 commits

[Tiago Vignatti]

 hw/xfree86/common/xf86Events.c  |    4 ----
 hw/xfree86/common/xf86Globals.c |    1 -
 hw/xfree86/common/xf86Init.c    |    1 -
 hw/xfree86/common/xf86Privstr.h |    1 -
 include/input.h                 |    5 -----
 mi/mieq.c                       |    2 +-
 mi/misprite.c                   |    1 -
 7 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 6e018f6a30dab1259b8fdc1ae4c84056b2acf362
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date:   Wed Jun 11 18:10:55 2008 -0300

    No need for inputPending field in xf86Info.

diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index f408fc9..a7f9578 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -236,8 +236,6 @@ ProcessInputEvents ()
     }
 #endif
 
-  xf86Info.inputPending = FALSE;
-
   mieqProcessInputEvents();
 
   /* FIXME: This is a problem if we have multiple pointers */
@@ -499,8 +497,6 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
     }
 
     if (xf86VTSwitchPending()) xf86VTSwitch();
-
-    if (xf86Info.inputPending) ProcessInputEvents();
 }
 
 
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 14bef39..19ed4e7 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -103,7 +103,6 @@ xf86InfoRec xf86Info = {
 	NULL,		/* mouseLocal */
 	-1,		/* lastEventTime */
 	FALSE,		/* vtRequestsPending */
-	FALSE,		/* inputPending */
 	FALSE,		/* dontVTSwitch */
 	FALSE,		/* dontZap */
 	FALSE,		/* dontZoom */
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index a2607e3..46c4a96 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1117,7 +1117,6 @@ InitInput(argc, argv)
     InputInfoPtr pInfo;
 
     xf86Info.vtRequestsPending = FALSE;
-    xf86Info.inputPending = FALSE;
 
     /* Call the PreInit function for each input device instance. */
     for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) {
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 318a59f..0601c0d 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -85,7 +85,6 @@ typedef struct {
     /* event handler part */
     int			lastEventTime;
     Bool		vtRequestsPending;
-    Bool		inputPending;
     Bool		dontVTSwitch;
     Bool		dontZap;
     Bool		dontZoom;
commit 881e551de92e5664f92ef1961092e35cd7a77b15
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date:   Wed Jun 11 18:03:33 2008 -0300

    CopyGetMasterEvent() can be static.

diff --git a/include/input.h b/include/input.h
index a816385..59f4e7f 100644
--- a/include/input.h
+++ b/include/input.h
@@ -506,11 +506,6 @@ extern Bool RegisterPairingClient(ClientPtr client);
 extern DeviceIntPtr GuessFreePointerDevice(void);
 extern DeviceIntPtr NextFreePointerDevice(void);
 
-extern void CopyGetMasterEvent(DeviceIntPtr mdev,
-			       xEvent* original,
-			       xEvent** master,
-			       int count);
-
 extern int AllocMasterDevice(ClientPtr client,
                              char* name,
                              DeviceIntPtr* ptr,
diff --git a/mi/mieq.c b/mi/mieq.c
index 91b7a51..e7e16ab 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -268,7 +268,7 @@ ChangeDeviceID(DeviceIntPtr dev, xEvent* event)
  * @param master The event after being copied
  * @param count Number of events in original.
  */
-void
+static void
 CopyGetMasterEvent(DeviceIntPtr mdev, xEvent* original,
                    xEvent** master, int count)
 {
commit 656949cbe24648a5b58f7df6ed49b25af0b47601
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date:   Wed Jun 11 17:57:19 2008 -0300

    Remove more unused things.
    
        In function ‘miSpriteCloseScreen’:
        warning: unused variable ‘pDev’

diff --git a/mi/misprite.c b/mi/misprite.c
index b8df5eb..c1f64ce 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -268,7 +268,6 @@ static Bool
 miSpriteCloseScreen (int i, ScreenPtr pScreen)
 {
     miSpriteScreenPtr   pScreenPriv;
-    DeviceIntPtr        pDev;
 
     pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
 						      miSpriteScreenKey);