nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

initialize all vars.

Browse source 
change warnings to messages
This commit is contained in:
Dana Jansens 2003-04-05 00:10:47 +00:00
parent d77ac21a62
commit 98c0c676dd
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/keyboard/keyboard.c
View file

@ -16,7 +16,7 @@ void plugin_setup_config()
parse_reg_section("keyboard", keyparse); parse_reg_section("keyboard", keyparse);
} }
KeyBindingTree *firstnode; KeyBindingTree *firstnode = NULL;
static KeyBindingTree *curpos; static KeyBindingTree *curpos;
static guint reset_key, reset_state; static guint reset_key, reset_state;
@ -58,12 +58,12 @@ gboolean kbind(GList *keylist, Action *action)
return FALSE; return FALSE;
if ((t = tree_find(tree, &conflict)) != NULL) { if ((t = tree_find(tree, &conflict)) != NULL) {
/* already bound to something */ /* already bound to something */
g_warning("keychain is already bound"); g_message("keychain is already bound");
tree_destroy(tree); tree_destroy(tree);
return FALSE; return FALSE;
} }
if (conflict) { if (conflict) {
g_warning("conflict with binding"); g_message("conflict with binding");
tree_destroy(tree); tree_destroy(tree);
return FALSE; return FALSE;
} }
@ -130,6 +130,9 @@ static void press(ObEvent *e, void *foo)
void plugin_startup() void plugin_startup()
{ {
curpos = NULL;
grabbed = FALSE;
dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL); dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
translate_key("C-g", &reset_state, &reset_key); translate_key("C-g", &reset_state, &reset_key);

6
plugins/keyboard/translate.c
View file

@ -15,7 +15,7 @@ static guint translate_modifier(char *str)
!g_ascii_strcasecmp("C", str)) return ControlMask; !g_ascii_strcasecmp("C", str)) return ControlMask;
else if (!g_ascii_strcasecmp("Shift", str) || else if (!g_ascii_strcasecmp("Shift", str) ||
!g_ascii_strcasecmp("S", str)) return ShiftMask; !g_ascii_strcasecmp("S", str)) return ShiftMask;
g_warning("Invalid modifier '%s' in binding.", str); g_message("Invalid modifier '%s' in binding.", str);
return 0; return 0;
} }
@ -47,12 +47,12 @@ gboolean translate_key(char *str, guint *state, guint *keycode)
/* figure out the keycode */ /* figure out the keycode */
sym = XStringToKeysym(l); sym = XStringToKeysym(l);
if (sym == NoSymbol) { if (sym == NoSymbol) {
g_warning("Invalid key name '%s' in key binding.", l); g_message("Invalid key name '%s' in key binding.", l);
goto translation_fail; goto translation_fail;
} }
*keycode = XKeysymToKeycode(ob_display, sym); *keycode = XKeysymToKeycode(ob_display, sym);
if (!*keycode) { if (!*keycode) {
g_warning("Key '%s' does not exist on the display.", l); g_message("Key '%s' does not exist on the display.", l);
goto translation_fail; goto translation_fail;
} }