projects
/
dana
/
openbox-history.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cf640af
)
put back default hardcoded mouse bindings. remove default key bindigns
author
Dana Jansens
<danakj@orodu.net>
Sat, 23 Jun 2007 15:46:27 +0000
(15:46 +0000)
committer
Dana Jansens
<danakj@orodu.net>
Sat, 23 Jun 2007 15:46:27 +0000
(15:46 +0000)
openbox/config.c
patch
|
blob
|
history
diff --git
a/openbox/config.c
b/openbox/config.c
index
7f51e7c
..
51e169e
100644
(file)
--- a/
openbox/config.c
+++ b/
openbox/config.c
@@
-760,24
+760,6
@@
typedef struct
const gchar *actname;
} ObDefKeyBind;
const gchar *actname;
} ObDefKeyBind;
-static void bind_default_keyboard()
-{
- ObDefKeyBind *it;
- ObDefKeyBind binds[] = {
- { NULL, NULL },
- { "A-Tab", "NextWindow" },
- { "S-A-Tab", "PreviousWindow" },
- { "A-F4", "Close" },
- { NULL, NULL }
- };
-
- for (it = binds; it->key; ++it) {
- GList *l = g_list_append(NULL, g_strdup(it->key));
- keyboard_bind(l, actions_parse_string(it->actname));
- g_list_free(l);
- }
-}
-
typedef struct
{
const gchar *button;
typedef struct
{
const gchar *button;
@@
-790,7
+772,6
@@
static void bind_default_mouse()
{
ObDefMouseBind *it;
ObDefMouseBind binds[] = {
{
ObDefMouseBind *it;
ObDefMouseBind binds[] = {
- { NULL, NULL, 0, NULL },
{ "Left", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Middle", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Right", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Left", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Middle", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Right", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
@@
-823,10
+804,10
@@
static void bind_default_mouse()
{ "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Left", "Close", OB_MOUSE_ACTION_CLICK, "Close" },
{ "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Left", "Close", OB_MOUSE_ACTION_CLICK, "Close" },
- { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "
ToggleMaximizeFull
" },
+ { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "
Maximize
" },
{ "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Iconify" },
{ "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Iconify" },
- { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "
Toggle
Omnipresent" },
- { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "
Toggle
Shade" },
+ { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Omnipresent" },
+ { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Shade" },
{ "Left", "TLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
{ "Left", "TRCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
{ "Left", "BLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
{ "Left", "TLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
{ "Left", "TRCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
{ "Left", "BLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
@@
-902,8
+883,6
@@
void config_startup(ObParseInst *i)
translate_key("C-g", &config_keyboard_reset_state,
&config_keyboard_reset_keycode);
translate_key("C-g", &config_keyboard_reset_state,
&config_keyboard_reset_keycode);
- bind_default_keyboard();
-
parse_register(i, "keyboard", parse_keyboard, NULL);
config_mouse_threshold = 8;
parse_register(i, "keyboard", parse_keyboard, NULL);
config_mouse_threshold = 8;