mirror of
https://github.com/brl/mutter.git
synced 2024-11-21 15:40:41 -05:00
don't pass a null string to printf
2002-06-15 Havoc Pennington <hp@pobox.com> * src/keybindings.c (meta_display_process_key_event): don't pass a null string to printf * src/display.c (key_event_description): don't pass a null string to printf * src/keybindings.c (meta_set_keybindings_disabled): allow enable/disable keybindings regardless of debug mode.
This commit is contained in:
parent
c3b63c96d7
commit
82a43d88f5
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
||||
2002-06-15 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* src/keybindings.c (meta_display_process_key_event): don't pass a
|
||||
null string to printf
|
||||
|
||||
* src/display.c (key_event_description): don't pass a null string
|
||||
to printf
|
||||
|
||||
* src/keybindings.c (meta_set_keybindings_disabled): allow
|
||||
enable/disable keybindings regardless of debug mode.
|
||||
|
||||
2002-06-15 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
* src/draw-workspace.h, src/draw-workspace.c: workspace-drawing
|
||||
|
@ -1741,11 +1741,14 @@ key_event_description (Display *xdisplay,
|
||||
XEvent *event)
|
||||
{
|
||||
KeySym keysym;
|
||||
const char *str;
|
||||
|
||||
keysym = XKeycodeToKeysym (xdisplay, event->xkey.keycode, 0);
|
||||
|
||||
str = XKeysymToString (keysym);
|
||||
|
||||
return g_strdup_printf ("Key '%s' state 0x%x",
|
||||
XKeysymToString (keysym), event->xkey.state);
|
||||
str ? str : "(null)", event->xkey.state);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -286,6 +286,17 @@ reload_modmap (MetaDisplay *display)
|
||||
|
||||
while (j < display->keysyms_per_keycode)
|
||||
{
|
||||
if (syms[j] != 0)
|
||||
{
|
||||
const char *str;
|
||||
|
||||
str = XKeysymToString (syms[j]);
|
||||
meta_topic (META_DEBUG_KEYBINDINGS,
|
||||
"Keysym %s bound to modifier 0x%x\n",
|
||||
str ? str : "(null)",
|
||||
(1 << ( i / modmap->max_keypermod)));
|
||||
}
|
||||
|
||||
if (syms[j] == XK_Num_Lock)
|
||||
{
|
||||
/* Mod1Mask is 1 << 3 for example, i.e. the
|
||||
@ -637,6 +648,10 @@ meta_change_keygrab (MetaDisplay *display,
|
||||
{
|
||||
if (result == BadAccess)
|
||||
meta_warning (_("Some other program is already using the key %s with modifiers %x as a binding\n"), keysym_name (keysym), modmask | ignored_mask);
|
||||
else
|
||||
meta_topic (META_DEBUG_KEYBINDINGS,
|
||||
"Failed to grab key %s with modifiers %x\n",
|
||||
keysym_name (keysym), modmask | ignored_mask);
|
||||
}
|
||||
|
||||
++ignored_mask;
|
||||
@ -1001,6 +1016,10 @@ process_event (MetaKeyBinding *bindings,
|
||||
{
|
||||
int i;
|
||||
|
||||
/* we used to have release-based bindings but no longer. */
|
||||
if (event->type == KeyRelease)
|
||||
return;
|
||||
|
||||
i = 0;
|
||||
while (i < n_bindings)
|
||||
{
|
||||
@ -1021,14 +1040,21 @@ process_event (MetaKeyBinding *bindings,
|
||||
|
||||
if (handler == NULL)
|
||||
meta_bug ("Binding %s has no handler\n", bindings[i].name);
|
||||
else
|
||||
meta_topic (META_DEBUG_KEYBINDINGS,
|
||||
"Running handler for %s\n",
|
||||
bindings[i].name);
|
||||
|
||||
(* handler->func) (display, window, event,
|
||||
&bindings[i]);
|
||||
break;
|
||||
return;
|
||||
}
|
||||
|
||||
++i;
|
||||
}
|
||||
|
||||
meta_topic (META_DEBUG_KEYBINDINGS,
|
||||
"No handler found for this event in this binding table\n");
|
||||
}
|
||||
|
||||
void
|
||||
@ -1038,6 +1064,7 @@ meta_display_process_key_event (MetaDisplay *display,
|
||||
{
|
||||
KeySym keysym;
|
||||
gboolean handled;
|
||||
const char *str;
|
||||
|
||||
XAllowEvents (display->xdisplay,
|
||||
all_bindings_disabled ? ReplayKeyboard : AsyncKeyboard,
|
||||
@ -1048,11 +1075,13 @@ meta_display_process_key_event (MetaDisplay *display,
|
||||
/* window may be NULL */
|
||||
|
||||
keysym = XKeycodeToKeysym (display->xdisplay, event->xkey.keycode, 0);
|
||||
|
||||
str = XKeysymToString (keysym);
|
||||
|
||||
meta_topic (META_DEBUG_KEYBINDINGS,
|
||||
"Processing key %s event, keysym: %s state: 0x%x window: %s\n",
|
||||
event->type == KeyPress ? "press" : "release",
|
||||
XKeysymToString (keysym), event->xkey.state,
|
||||
str ? str : "(null)", event->xkey.state,
|
||||
window ? window->desc : "(no window)");
|
||||
|
||||
if (window == NULL || !window->all_keys_grabbed)
|
||||
@ -1970,15 +1999,7 @@ handle_spew_mark (MetaDisplay *display,
|
||||
void
|
||||
meta_set_keybindings_disabled (gboolean setting)
|
||||
{
|
||||
if (meta_is_debugging ())
|
||||
{
|
||||
all_bindings_disabled = setting;
|
||||
meta_topic (META_DEBUG_KEYBINDINGS,
|
||||
"Keybindings %s\n", all_bindings_disabled ? "disabled" : "enabled");
|
||||
}
|
||||
else
|
||||
{
|
||||
meta_topic (META_DEBUG_KEYBINDINGS,
|
||||
"Ignoring keybindings disable message, not in debug mode\n");
|
||||
}
|
||||
all_bindings_disabled = setting;
|
||||
meta_topic (META_DEBUG_KEYBINDINGS,
|
||||
"Keybindings %s\n", all_bindings_disabled ? "disabled" : "enabled");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user