frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Flush the debug log for easier debugging 

Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d4239c7f3918332ef07752f1e211afb23)
This commit is contained in:
Jeremy Huddleston 2008-01-04 12:23:09 -08:00
parent 57468a696e
commit aca75f389e
2 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xquartz/darwin.h
View File

@ -124,7 +124,7 @@ enum {
#ifdef ENABLE_DEBUG_LOG #ifdef ENABLE_DEBUG_LOG
extern FILE *debug_log_fp; extern FILE *debug_log_fp;
#define DEBUG_LOG_NAME "x11-debug.txt" #define DEBUG_LOG_NAME "x11-debug.txt"
#define DEBUG_LOG(msg, args...) if (debug_log_fp) fprintf(debug_log_fp, "%s:%d: " msg, __FUNCTION__, __LINE__, ##args ) #define DEBUG_LOG(msg, args...) if (debug_log_fp) fprintf(debug_log_fp, "%s:%s:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args ); fflush(debug_log_fp);
#else #else
#define DEBUG_LOG(msg, args...) #define DEBUG_LOG(msg, args...)
#endif #endif

13
hw/xquartz/xpr/xprScreen.c
View File

@ -62,10 +62,8 @@ static const char *xprOpenGLBundle = "glxCGL.bundle";
* eventHandler * eventHandler
* Callback handler for Xplugin events. * Callback handler for Xplugin events.
*/ */
static void static void eventHandler(unsigned int type, const void *arg,
eventHandler(unsigned int type, const void *arg, unsigned int arg_size, void *data) {
unsigned int arg_size, void *data)
{
switch (type) { switch (type) {
case XP_EVENT_DISPLAY_CHANGED: case XP_EVENT_DISPLAY_CHANGED:
DEBUG_LOG("XP_EVENT_DISPLAY_CHANGED\n"); DEBUG_LOG("XP_EVENT_DISPLAY_CHANGED\n");
@ -73,12 +71,14 @@ eventHandler(unsigned int type, const void *arg,
break; break;
case XP_EVENT_WINDOW_STATE_CHANGED: case XP_EVENT_WINDOW_STATE_CHANGED:
DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED\n");
if (arg_size >= sizeof(xp_window_state_event)) { if (arg_size >= sizeof(xp_window_state_event)) {
const xp_window_state_event *ws_arg = arg; const xp_window_state_event *ws_arg = arg;
DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: id=%d, state=%d\n", ws_arg->id, ws_arg->state);
QuartzMessageServerThread(kXDarwinWindowState, 2, QuartzMessageServerThread(kXDarwinWindowState, 2,
ws_arg->id, ws_arg->state); ws_arg->id, ws_arg->state);
} else {
DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: ignored\n");
} }
break; break;
@ -107,8 +107,7 @@ eventHandler(unsigned int type, const void *arg,
} }
break; break;
default: default:
ErrorF("Unknown XP_EVENT type (%d) in xprScreen:eventHandler\n", ErrorF("Unknown XP_EVENT type (%d) in xprScreen:eventHandler\n", type);
type);
} }
} }