From 91641c2cf324b03da9e15cfbf13ebf90a318ddb3 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 19 Dec 2002 20:18:54 +0000 Subject: [PATCH] select ColormapChangeMask on toplevel windows, maybe a partial fix for 2002-12-18 Havoc Pennington * src/window.c (meta_window_new): select ColormapChangeMask on toplevel windows, maybe a partial fix for #101478 2002-12-17 Havoc Pennington * src/display.c (meta_display_begin_grab_op): don't use "(null)" for null pointers, use "none", so I can distinguish glibc-generated (null) which is a bug. (key_event_description): ditto (meta_display_begin_grab_op): ditto * src/window.c (update_sm_hints): ditto * src/keybindings.c (reload_modmap): ditto (meta_display_process_key_event): ditto --- ChangeLog | 13 +++++++++++++ src/display.c | 8 ++++---- src/keybindings.c | 4 ++-- src/window.c | 6 +++--- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0daf3792..65f1e8cdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,19 @@ Tue Dec 17 17:50:19 2002 HideToshi Tajima * src/themes/AgingGorilla/metacity-theme-1.xml: added support for border only windows. #100984. +2002-12-17 Havoc Pennington + + * src/display.c (meta_display_begin_grab_op): don't use "(null)" + for null pointers, use "none", so I can distinguish + glibc-generated (null) which is a bug. + (key_event_description): ditto + (meta_display_begin_grab_op): ditto + + * src/window.c (update_sm_hints): ditto + + * src/keybindings.c (reload_modmap): ditto + (meta_display_process_key_event): ditto + 2002-12-17 Havoc Pennington * src/metacity.schemas.in: s/focussed/focused/ diff --git a/src/display.c b/src/display.c index 2b20411d8..4b8ac0530 100644 --- a/src/display.c +++ b/src/display.c @@ -2082,7 +2082,7 @@ key_event_description (Display *xdisplay, str = XKeysymToString (keysym); return g_strdup_printf ("Key '%s' state 0x%x", - str ? str : "(null)", event->xkey.state); + str ? str : "none", event->xkey.state); } #endif /* WITH_VERBOSE_MODE */ @@ -2623,13 +2623,13 @@ meta_display_begin_grab_op (MetaDisplay *display, meta_topic (META_DEBUG_WINDOW_OPS, "Doing grab op %d on window %s button %d pointer already grabbed: %d\n", - op, window ? window->desc : "(null)", button, pointer_already_grabbed); + op, window ? window->desc : "none", button, pointer_already_grabbed); if (display->grab_op != META_GRAB_OP_NONE) { meta_warning ("Attempt to perform window operation %d on window %s when operation %d on %s already in effect\n", - op, window ? window->desc : "(null)", display->grab_op, - display->grab_window ? display->grab_window->desc : "(null)"); + op, window ? window->desc : "none", display->grab_op, + display->grab_window ? display->grab_window->desc : "none"); return FALSE; } diff --git a/src/keybindings.c b/src/keybindings.c index 2afe556b0..921a909f4 100644 --- a/src/keybindings.c +++ b/src/keybindings.c @@ -407,7 +407,7 @@ reload_modmap (MetaDisplay *display) str = XKeysymToString (syms[j]); meta_topic (META_DEBUG_KEYBINDINGS, "Keysym %s bound to modifier 0x%x\n", - str ? str : "(null)", + str ? str : "none", (1 << ( i / modmap->max_keypermod))); } @@ -1380,7 +1380,7 @@ meta_display_process_key_event (MetaDisplay *display, meta_topic (META_DEBUG_KEYBINDINGS, "Processing key %s event, keysym: %s state: 0x%x window: %s\n", event->type == KeyPress ? "press" : "release", - str ? str : "(null)", event->xkey.state, + str ? str : "none", event->xkey.state, window ? window->desc : "(no window)"); all_keys_grabbed = window ? window->all_keys_grabbed : screen->all_keys_grabbed; diff --git a/src/window.c b/src/window.c index 2c3e4e3b6..594af4b37 100644 --- a/src/window.c +++ b/src/window.c @@ -4780,8 +4780,8 @@ update_wm_class (MetaWindow *window) meta_verbose ("Window %s class: '%s' name: '%s'\n", window->desc, - window->res_class ? window->res_class : "(null)", - window->res_name ? window->res_name : "(null)"); + window->res_class ? window->res_class : "none", + window->res_name ? window->res_name : "none"); } static Window @@ -4871,7 +4871,7 @@ update_sm_hints (MetaWindow *window) meta_verbose ("Window %s client leader: 0x%lx SM_CLIENT_ID: '%s'\n", window->desc, window->xclient_leader, - window->sm_client_id ? window->sm_client_id : "(null)"); + window->sm_client_id ? window->sm_client_id : "none"); } static void