summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnno Boland (tox) <tox@s01.de>2009-09-09 23:15:39 +0200
committerEnno Boland (tox) <tox@s01.de>2009-09-09 23:15:39 +0200
commit03afc9d985bed1dd77576b28a74c45b0abb4804e (patch)
tree5c27a79893d819d376cd47afc2c8ddda1a18c881
parentb35dd763449dcfce376844565133f2149b9f4084 (diff)
downloadsurf-03afc9d985bed1dd77576b28a74c45b0abb4804e.tar.gz
surf-03afc9d985bed1dd77576b28a74c45b0abb4804e.tar.bz2
surf-03afc9d985bed1dd77576b28a74c45b0abb4804e.zip
making all keys lowercase using shiftmask to determinate.
-rw-r--r--config.def.h6
-rw-r--r--surf.c5
2 files changed, 6 insertions, 5 deletions
diff --git a/config.def.h b/config.def.h
index d628b76..e1d2f50 100644
--- a/config.def.h
+++ b/config.def.h
@@ -4,13 +4,13 @@ static gchar *progress_trust = "#00FF00";
#define MODKEY GDK_CONTROL_MASK
static Key keys[] = {
/* modifier keyval function arg Focus */
- { MODKEY, GDK_R, reload, { .b = TRUE }, ALWAYS },
+ { MODKEY|GDK_SHIFT_MASK,GDK_r, reload, { .b = TRUE }, ALWAYS },
{ MODKEY, GDK_r, reload, { .b = FALSE }, ALWAYS },
{ MODKEY, GDK_g, showurl, { 0 }, ALWAYS },
{ MODKEY, GDK_slash, showsearch, { 0 }, ALWAYS },
{ 0, GDK_Escape, hidesearch, { 0 }, ALWAYS },
{ 0, GDK_Escape, hideurl, { 0 }, ALWAYS },
- { MODKEY, GDK_P, print, { 0 }, ALWAYS },
+ { MODKEY|GDK_SHIFT_MASK,GDK_p, print, { 0 }, ALWAYS },
{ MODKEY, GDK_p, clipboard, { .b = TRUE }, BROWSER },
{ MODKEY, GDK_y, clipboard, { .b = FALSE }, BROWSER },
{ MODKEY|GDK_SHIFT_MASK,GDK_j, zoom, { .i = -1 }, BROWSER },
@@ -23,7 +23,7 @@ static Key keys[] = {
{ 0, GDK_Escape, stop, { 0 }, BROWSER },
{ MODKEY, GDK_o, source, { 0 }, BROWSER },
{ MODKEY, GDK_n, searchtext, { .b = TRUE }, BROWSER|SEARCHBAR },
- { MODKEY, GDK_N, searchtext, { .b = FALSE }, BROWSER|SEARCHBAR },
+ { MODKEY|GDK_SHIFT_MASK,GDK_n, searchtext, { .b = FALSE }, BROWSER|SEARCHBAR },
{ 0, GDK_Return, searchtext, { .b = TRUE }, SEARCHBAR },
{ GDK_SHIFT_MASK, GDK_Return, searchtext, { .b = FALSE }, SEARCHBAR },
{ 0, GDK_Return, loaduri, { .v = NULL }, URLBAR },
diff --git a/surf.c b/surf.c
index 5e3fc12..ab16c98 100644
--- a/surf.c
+++ b/surf.c
@@ -263,8 +263,9 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
else
focus = BROWSER;
for(i = 0; i < LENGTH(keys); i++) {
- if(focus & keys[i].focus && ev->keyval == keys[i].keyval &&
- CLEANMASK(ev->state) == keys[i].mod
+ if(focus & keys[i].focus
+ && gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
+ && CLEANMASK(ev->state) == keys[i].mod
&& keys[i].func) {
keys[i].func(c, &(keys[i].arg));
processed = TRUE;