xserver: Branch 'xorg-server-1.2-apple' - 3 commits
Ben Byer
bbyer at kemper.freedesktop.org
Sun Nov 18 17:49:46 PST 2007
hw/darwin/darwinKeyboard.c | 2 -
hw/darwin/quartz/xpr/xprScreen.c | 68 +++++++++++++++++++--------------------
2 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 768d268e4f0d919b2993a4ef13e3df85a0a09dab
Merge: 3208298... 4375ddf...
Author: Ben Byer <bbyer at bbyer.local>
Date: Sun Nov 18 17:49:32 2007 -0800
Merge branch 'xorg-server-1.2-apple' of ssh://git.freedesktop.org/git/xorg/xserver into xorg-server-1.2-apple
commit 3208298149296228d3aebe2fb2fd8b05e931708a
Author: Ben Byer <bbyer at bbyer.local>
Date: Sun Nov 18 17:44:12 2007 -0800
Added some DEBUG_LOG sauce to the XP_EVENT handling code
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c
index 25f491a..739cefc 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/darwin/quartz/xpr/xprScreen.c
@@ -64,49 +64,49 @@ static void
eventHandler(unsigned int type, const void *arg,
unsigned int arg_size, void *data)
{
- switch (type)
- {
+ switch (type) {
case XP_EVENT_DISPLAY_CHANGED:
- // ErrorF("XP_EVENT_DISPLAY_MOVED\n");
- QuartzMessageServerThread(kXDarwinDisplayChanged, 0);
- break;
+ DEBUG_LOG("XP_EVENT_DISPLAY_CHANGED\n");
+ QuartzMessageServerThread(kXDarwinDisplayChanged, 0);
+ break;
case XP_EVENT_WINDOW_STATE_CHANGED:
- // ErrorF("XP_EVENT_WINDOW_STATE_CHANGED\n");
- if (arg_size >= sizeof(xp_window_state_event))
- {
- const xp_window_state_event *ws_arg = arg;
-
- QuartzMessageServerThread(kXDarwinWindowState, 2,
- ws_arg->id, ws_arg->state);
- }
- break;
+ DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED\n");
+ if (arg_size >= sizeof(xp_window_state_event)) {
+ const xp_window_state_event *ws_arg = arg;
+
+ QuartzMessageServerThread(kXDarwinWindowState, 2,
+ ws_arg->id, ws_arg->state);
+ }
+ break;
case XP_EVENT_WINDOW_MOVED:
- // ErrorF("XP_EVENT_WINDOW_MOVED\n");
- if (arg_size == sizeof(xp_window_id))
- {
- xp_window_id id = * (xp_window_id *) arg;
- WindowPtr pWin = xprGetXWindow(id);
- QuartzMessageServerThread(kXDarwinWindowMoved, 1, pWin);
- }
- break;
-
+ DEBUG_LOG("XP_EVENT_WINDOW_MOVED\n");
+ if (arg_size == sizeof(xp_window_id)) {
+ xp_window_id id = * (xp_window_id *) arg;
+ WindowPtr pWin = xprGetXWindow(id);
+ QuartzMessageServerThread(kXDarwinWindowMoved, 1, pWin);
+ }
+ break;
+
case XP_EVENT_SURFACE_DESTROYED:
+ DEBUG_LOG("XP_EVENT_SURFACE_DESTROYED\n");
case XP_EVENT_SURFACE_CHANGED:
- // ErrorF("XP_EVENT_SURFACE_MOVED\n");
- if (arg_size == sizeof(xp_surface_id))
- {
- int kind;
-
- if (type == XP_EVENT_SURFACE_DESTROYED)
- kind = AppleDRISurfaceNotifyDestroyed;
- else
- kind = AppleDRISurfaceNotifyChanged;
-
- DRISurfaceNotify(*(xp_surface_id *) arg, kind);
+ DEBUG_LOG("XP_EVENT_SURFACE_CHANGED\n");
+ if (arg_size == sizeof(xp_surface_id)) {
+ int kind;
+
+ if (type == XP_EVENT_SURFACE_DESTROYED)
+ kind = AppleDRISurfaceNotifyDestroyed;
+ else
+ kind = AppleDRISurfaceNotifyChanged;
+
+ DRISurfaceNotify(*(xp_surface_id *) arg, kind);
}
break;
+ default:
+ ErrorF("Unknown XP_EVENT type (%d) in xprScreen:eventHandler\n",
+ type);
}
}
commit 920265a927984dd508992f2ed050c4c8c7dd4805
Author: Ben Byer <bbyer at bbyer.local>
Date: Sun Nov 18 17:43:40 2007 -0800
Disabled ALT_IS_MODE_SWITCH
(just for joke, nothing more)
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index 111c98a..efa12b7 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -61,7 +61,7 @@
#undef DUMP_DARWIN_KEYMAP
/* Define this to use Alt for Mode_switch. */
-#define ALT_IS_MODE_SWITCH 1
+//#define ALT_IS_MODE_SWITCH 1
#include <stdio.h>
#include <stdlib.h>
More information about the xorg-commit
mailing list