xserver: Branch 'xorg-server-1.4-apple' - 3 commits

[Jeremy Huddleston]

 hw/xquartz/X11Application.m           |    2 +-
 hw/xquartz/mach-startup/bundle-main.c |    1 +
 render/render.c                       |   10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit b5dea63fdbfcaf6cc288477fe1f1de2eb845abaf
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Oct 2 19:20:24 2009 -0700

    XQuartz: Fix a possible minor memory leak
    (cherry picked from commit 24e640e1fa6cfb3917ba90dcdabf1fadddff20aa)

diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 691b555..640a91f 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -300,6 +300,7 @@ kern_return_t do_request_fd_handoff_socket(mach_port_t port, string_t filename)
 
     handoff_data->fd = create_socket(handoff_data->filename);
     if(!handoff_data->fd) {
+        free(handoff_data);
         return KERN_FAILURE;
     }
 
commit 530e7afd4b1e71820856425a2600ae6b29ea3d29
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Oct 2 18:58:35 2009 -0700

    XQuartz: Send mouse location with scroll events.
    
    This fixes the problem where (0, 0) was sent as the mouse location with scroll
    button events causing the event to not reach the client.
    (cherry picked from commit c4886fbabc1d8b4054654b227fcad83f58e8e798)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 48a5885..1d61a50 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -987,7 +987,7 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
     isMouseOrTabletEvent =  [e type] == NSLeftMouseDown    ||  [e type] == NSOtherMouseDown    ||  [e type] == NSRightMouseDown    ||
                             [e type] == NSLeftMouseUp      ||  [e type] == NSOtherMouseUp      ||  [e type] == NSRightMouseUp      ||
                             [e type] == NSLeftMouseDragged ||  [e type] == NSOtherMouseDragged ||  [e type] == NSRightMouseDragged ||
-                            [e type] == NSMouseMoved       ||  [e type] == NSTabletPoint;
+                            [e type] == NSMouseMoved       ||  [e type] == NSTabletPoint       ||  [e type] == NSScrollWheel;
 
     isTabletEvent = ([e type] == NSTabletPoint) ||
                     (isMouseOrTabletEvent && ([e subtype] == NSTabletPointEventSubtype || [e subtype] == NSTabletProximityEventSubtype));
commit d88d16730ed0a55382890adb6494d1b8d9faf6cf
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Dec 10 12:31:59 2008 +0000

    render: rename SetBit to RenderSetBit.
    
    Avoiding namespace collision with the SetBit macro soon to be used in the
    input code.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 8460425740c72e58bcb897557f033e2836251160)

diff --git a/render/render.c b/render/render.c
index b53e878..a5bd9e8 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1451,7 +1451,7 @@ ProcRenderFillRectangles (ClientPtr client)
 }
 
 static void
-SetBit (unsigned char *line, int x, int bit)
+RenderSetBit (unsigned char *line, int x, int bit)
 {
     unsigned char   mask;
     
@@ -1623,8 +1623,8 @@ ProcRenderCreateCursor (ClientPtr client)
 	    {
 		CARD32	a = ((p >> 24));
 
-		SetBit (mskline, x, a != 0);
-		SetBit (srcline, x, a != 0 && p == twocolor[0]);
+		RenderSetBit (mskline, x, a != 0);
+		RenderSetBit (srcline, x, a != 0 && p == twocolor[0]);
 	    }
 	    else
 	    {
@@ -1632,9 +1632,9 @@ ProcRenderCreateCursor (ClientPtr client)
 		CARD32	i = ((CvtR8G8B8toY15(p) >> 7) * DITHER_SIZE + 127) / 255;
 		CARD32	d = orderedDither[y&(DITHER_DIM-1)][x&(DITHER_DIM-1)];
 		/* Set mask from dithered alpha value */
-		SetBit(mskline, x, a > d);
+		RenderSetBit(mskline, x, a > d);
 		/* Set src from dithered intensity value */
-		SetBit(srcline, x, a > d && i <= d);
+		RenderSetBit(srcline, x, a > d && i <= d);
 	    }
 	}
 	srcline += stride;