isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

select ColormapChangeMask on toplevel windows, maybe a partial fix for

Browse Source 
2002-12-18  Havoc Pennington  <hp@redhat.com>

	* src/window.c (meta_window_new): select ColormapChangeMask
	on toplevel windows, maybe a partial fix for #101478

2002-12-17  Havoc Pennington  <hp@pobox.com>

	* 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
This commit is contained in:
Havoc Pennington 2002-12-19 20:18:54 +00:00 committed by Havoc Pennington
parent 4045ee474d
commit 91641c2cf3
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -12,6 +12,19 @@ Tue Dec 17 17:50:19 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* src/themes/AgingGorilla/metacity-theme-1.xml: added support for * src/themes/AgingGorilla/metacity-theme-1.xml: added support for
border only windows. #100984. border only windows. #100984.
2002-12-17 Havoc Pennington <hp@pobox.com>
* 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 <hp@pobox.com> 2002-12-17 Havoc Pennington <hp@pobox.com>
* src/metacity.schemas.in: s/focussed/focused/ * src/metacity.schemas.in: s/focussed/focused/

8
src/display.c
View File

@ -2082,7 +2082,7 @@ key_event_description (Display *xdisplay,
str = XKeysymToString (keysym); str = XKeysymToString (keysym);
return g_strdup_printf ("Key '%s' state 0x%x", 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 */ #endif /* WITH_VERBOSE_MODE */
@ -2623,13 +2623,13 @@ meta_display_begin_grab_op (MetaDisplay *display,
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Doing grab op %d on window %s button %d pointer already grabbed: %d\n", "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) 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", 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, op, window ? window->desc : "none", display->grab_op,
display->grab_window ? display->grab_window->desc : "(null)"); display->grab_window ? display->grab_window->desc : "none");
return FALSE; return FALSE;
} }

4
src/keybindings.c
View File

@ -407,7 +407,7 @@ reload_modmap (MetaDisplay *display)
str = XKeysymToString (syms[j]); str = XKeysymToString (syms[j]);
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"Keysym %s bound to modifier 0x%x\n", "Keysym %s bound to modifier 0x%x\n",
str ? str : "(null)", str ? str : "none",
(1 << ( i / modmap->max_keypermod))); (1 << ( i / modmap->max_keypermod)));
} }
@ -1380,7 +1380,7 @@ meta_display_process_key_event (MetaDisplay *display,
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"Processing key %s event, keysym: %s state: 0x%x window: %s\n", "Processing key %s event, keysym: %s state: 0x%x window: %s\n",
event->type == KeyPress ? "press" : "release", event->type == KeyPress ? "press" : "release",
str ? str : "(null)", event->xkey.state, str ? str : "none", event->xkey.state,
window ? window->desc : "(no window)"); window ? window->desc : "(no window)");
all_keys_grabbed = window ? window->all_keys_grabbed : screen->all_keys_grabbed; all_keys_grabbed = window ? window->all_keys_grabbed : screen->all_keys_grabbed;

6
src/window.c
View File

@ -4780,8 +4780,8 @@ update_wm_class (MetaWindow *window)
meta_verbose ("Window %s class: '%s' name: '%s'\n", meta_verbose ("Window %s class: '%s' name: '%s'\n",
window->desc, window->desc,
window->res_class ? window->res_class : "(null)", window->res_class ? window->res_class : "none",
window->res_name ? window->res_name : "(null)"); window->res_name ? window->res_name : "none");
} }
static Window static Window
@ -4871,7 +4871,7 @@ update_sm_hints (MetaWindow *window)
meta_verbose ("Window %s client leader: 0x%lx SM_CLIENT_ID: '%s'\n", meta_verbose ("Window %s client leader: 0x%lx SM_CLIENT_ID: '%s'\n",
window->desc, window->xclient_leader, 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 static void