xserver: Branch 'master' - 4 commits

[Tiago Vignatti]

 os/utils.c          |    5 -----
 render/animcur.c    |   11 -----------
 render/picturestr.h |    4 ++--
 xfixes/cursor.c     |   11 ++++-------
 4 files changed, 6 insertions(+), 25 deletions(-)

New commits:
commit 2a806d7fa372e28d039761c9b4087cf812e8e46b
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Fri Aug 28 16:05:04 2009 +0300

    os: remove unused -cursor option
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>

diff --git a/os/utils.c b/os/utils.c
index 00abd63..3718b17 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -482,7 +482,6 @@ void UseMsg(void)
     ErrorF("-c                     turns off key-click\n");
     ErrorF("c #                    key-click volume (0-100)\n");
     ErrorF("-cc int                default color visual class\n");
-    ErrorF("-cursor                enable the cursor (default)\n");
     ErrorF("-nocursor              disable the cursor\n");
     ErrorF("-core                  generate core dump on fatal error\n");
     ErrorF("-dpi int               screen resolution in dots per inch\n");
@@ -666,10 +665,6 @@ ProcessCommandLine(int argc, char *argv[])
         {
             EnableCursor = FALSE;
         }
-        else if ( strcmp( argv[i], "-cursor") == 0)
-        {
-            EnableCursor = TRUE;
-        }
         else if ( strcmp( argv[i], "-dpi") == 0)
 	{
 	    if(++i < argc)
commit 9040dab76182d1a019ca7fef7b29733d2c199e61
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Fri Aug 28 15:50:50 2009 +0300

    xfixes: minor clean ups on createInvisibleCursor()
    
    - unused return value
    - no reason to declare static variable given the function is just called
      once
    - no reason to declare different type and cast it after.
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>

diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index acc703a..0c70660 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -1046,12 +1046,11 @@ static CursorPtr
 createInvisibleCursor (void)
 {
     CursorPtr pCursor;
-    static unsigned int *psrcbits, *pmaskbits;
+    unsigned char *psrcbits, *pmaskbits;
     CursorMetricRec cm;
-    int rc;
 
-    psrcbits = (unsigned int *) xalloc(4);
-    pmaskbits = (unsigned int *) xalloc(4);
+    psrcbits = (unsigned char *) xalloc(4);
+    pmaskbits = (unsigned char *) xalloc(4);
     if (psrcbits == NULL || pmaskbits == NULL) {
 	return NULL;
     }
@@ -1063,9 +1062,7 @@ createInvisibleCursor (void)
     cm.xhot = 0;
     cm.yhot = 0;
 
-    rc = AllocARGBCursor(
-	        (unsigned char *)psrcbits,
-		(unsigned char *)pmaskbits,
+    AllocARGBCursor(psrcbits, pmaskbits,
 		NULL, &cm,
 		0, 0, 0,
 		0, 0, 0,
commit 80ed8096f9b8e974b556a6c9f3b600fb71b994c3
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Fri Aug 28 15:33:19 2009 +0300

    render: delete unused headers declaration
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>

diff --git a/render/animcur.c b/render/animcur.c
index e7bc4e5..276e5e4 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -104,17 +104,6 @@ static DevPrivateKey AnimCurScreenPrivateKey = &AnimCurScreenPrivateKeyIndex;
 #define Wrap(as,s,elt,func) (((as)->elt = (s)->elt), (s)->elt = func)
 #define Unwrap(as,s,elt)    ((s)->elt = (as)->elt)
 
-static Bool
-AnimCurDisplayCursor (DeviceIntPtr pDev, 
-                      ScreenPtr pScreen,
-		      CursorPtr pCursor);
-
-static Bool
-AnimCurSetCursorPosition (DeviceIntPtr pDev,
-                          ScreenPtr pScreen,
-			  int x,
-			  int y,
-			  Bool generateEvent);
 
 static Bool
 AnimCurCloseScreen (int index, ScreenPtr pScreen)
commit f959b1e5485b93700c7da449a98182f5ce067ca2
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Fri Aug 28 15:30:21 2009 +0300

    render: AnimCurInit and AnimCursorCreate shouldn't be _X_EXPORT
    
    Pointed by Peter Hutterer on xorg-devel ml.
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>

diff --git a/render/picturestr.h b/render/picturestr.h
index 6a1cc06..6a8d76d 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -620,10 +620,10 @@ PictureGradientColor (PictGradientStopPtr stop1,
 
 extern _X_EXPORT void RenderExtensionInit (void);
 
-extern _X_EXPORT Bool
+Bool
 AnimCurInit (ScreenPtr pScreen);
 
-extern _X_EXPORT int
+int
 AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor, ClientPtr client, XID cid);
 
 extern _X_EXPORT void