xserver: Branch 'xorg-server-1.2-apple'
Ben Byer
bbyer at kemper.freedesktop.org
Fri Nov 16 05:36:55 PST 2007
hw/darwin/quartz/quartz.c | 2 +-
hw/darwin/quartz/quartzCocoa.m | 10 +++++-----
hw/darwin/quartz/quartzCommon.h | 5 +++--
hw/darwin/quartz/xpr/xprScreen.c | 8 +-------
4 files changed, 10 insertions(+), 15 deletions(-)
New commits:
commit 0560544a9a7b6f102a6d47b11b979479efba787c
Author: Ben Byer <bbyer at bbyer.local>
Date: Fri Nov 16 05:36:51 2007 -0800
More correctness fixes to fix compiler warnings.
diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c
index 615ea8d..d1eb724 100644
--- a/hw/darwin/quartz/quartz.c
+++ b/hw/darwin/quartz/quartz.c
@@ -464,7 +464,7 @@ void DarwinModeProcessEvent(
case kXDarwinWindowMoved:
DEBUG_LOG("kXDarwinWindowMoved\n");
- RootlessNativeWindowMoved (xe->u.clientMessage.u.l.longs0);
+ RootlessNativeWindowMoved ((WindowPtr)xe->u.clientMessage.u.l.longs0);
break;
case kXDarwinToggleFullscreen:
diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m
index c5e6e5c..46c61dc 100644
--- a/hw/darwin/quartz/quartzCocoa.m
+++ b/hw/darwin/quartz/quartzCocoa.m
@@ -123,9 +123,9 @@ int QuartzFSUseQDCursor(
* Clean out any autoreleased objects.
*/
void QuartzBlockHandler(
- void *blockData,
- void *pTimeout,
- void *pReadmask)
+ pointer blockData,
+ OSTimePtr pTimeout,
+ pointer pReadmask)
{
static NSAutoreleasePool *aPool = nil;
@@ -138,9 +138,9 @@ void QuartzBlockHandler(
* QuartzWakeupHandler
*/
void QuartzWakeupHandler(
- void *blockData,
+ pointer blockData,
int result,
- void *pReadmask)
+ pointer pReadmask)
{
// nothing here
}
diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h
index f5dff66..f0d5a7a 100644
--- a/hw/darwin/quartz/quartzCommon.h
+++ b/hw/darwin/quartz/quartzCommon.h
@@ -46,6 +46,7 @@
#undef Cursor
#undef WindowPtr
#undef Picture
+#include <X11/Xdefs.h>
// Quartz specific per screen storage structure
typedef struct {
@@ -87,8 +88,8 @@ void QuartzSetWindowMenu(int nitems, const char **items,
void QuartzFSCapture(void);
void QuartzFSRelease(void);
int QuartzFSUseQDCursor(int depth);
-void QuartzBlockHandler(void *blockData, void *pTimeout, void *pReadmask);
-void QuartzWakeupHandler(void *blockData, int result, void *pReadmask);
+void QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask);
+void QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask);
// Messages that can be sent to the main thread.
enum {
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c
index 49cd1c1..25f491a 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/darwin/quartz/xpr/xprScreen.c
@@ -88,13 +88,7 @@ eventHandler(unsigned int type, const void *arg,
{
xp_window_id id = * (xp_window_id *) arg;
WindowPtr pWin = xprGetXWindow(id);
- BoxRec box;
- xp_error retval = xp_get_window_bounds(id, &box);
- if (retval != Success) {
- ErrorF("Unable to find new bounds for window\n");
- break;
- }
- QuartzMessageServerThread(kXDarwinWindowMoved, 3, pWin, box.x1, box.y1);
+ QuartzMessageServerThread(kXDarwinWindowMoved, 1, pWin);
}
break;
More information about the xorg-commit
mailing list