diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-01-11 16:20:53 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-11 16:20:53 -0500 |
| commit | 567fd15eebdd44e50cef140419dbf7a336708109 (patch) | |
| tree | 3b3691719c704d6da4454bd78e17ec8b495ee76a /openbox/openbox.c | |
| parent | 3e9dbc01430193035e3d1f5832c019c3f9623db8 (diff) | |
| parent | e8200ae603f33b70824c125ba6b37bfaec7d89ea (diff) | |
Merge branch 'backport' into work
Conflicts:
configure.ac
data/rc.xml
openbox/client.c
openbox/event.c
openbox/focus_cycle.c
openbox/focus_cycle_popup.c
openbox/openbox.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
parser/parse.c
version.h.in
Diffstat (limited to 'openbox/openbox.c')
| -rw-r--r-- | openbox/openbox.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c index 792dae2e..69889081 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -224,6 +224,8 @@ gint main(gint argc, gchar **argv) keys[OB_KEY_DOWN] = obt_keyboard_keysym_to_keycode(XK_Down); keys[OB_KEY_TAB] = obt_keyboard_keysym_to_keycode(XK_Tab); keys[OB_KEY_SPACE] = obt_keyboard_keysym_to_keycode(XK_space); + keys[OB_KEY_HOME] = obt_keyboard_keysym_to_keycode(XK_Home); + keys[OB_KEY_END] = obt_keyboard_keysym_to_keycode(XK_End); { ObtXmlInst *i; @@ -411,6 +413,8 @@ gint main(gint argc, gchar **argv) g_free(keys[OB_KEY_DOWN]); g_free(keys[OB_KEY_TAB]); g_free(keys[OB_KEY_SPACE]); + g_free(keys[OB_KEY_HOME]); + g_free(keys[OB_KEY_END]); } while (reconfigure); } |