aw/surf
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

making all keys lowercase using shiftmask to determinate.

Browse Source
This commit is contained in:
Enno Boland (tox) 2009-09-09 23:15:39 +02:00
parent b35dd76344
commit 03afc9d985
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.def.h
View File

@ -4,13 +4,13 @@ static gchar *progress_trust = "#00FF00";
#define MODKEY GDK_CONTROL_MASK #define MODKEY GDK_CONTROL_MASK
static Key keys[] = { static Key keys[] = {
/* modifier keyval function arg Focus */ /* 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_r, reload, { .b = FALSE }, ALWAYS },
{ MODKEY, GDK_g, showurl, { 0 }, ALWAYS }, { MODKEY, GDK_g, showurl, { 0 }, ALWAYS },
{ MODKEY, GDK_slash, showsearch, { 0 }, ALWAYS }, { MODKEY, GDK_slash, showsearch, { 0 }, ALWAYS },
{ 0, GDK_Escape, hidesearch, { 0 }, ALWAYS }, { 0, GDK_Escape, hidesearch, { 0 }, ALWAYS },
{ 0, GDK_Escape, hideurl, { 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_p, clipboard, { .b = TRUE }, BROWSER },
{ MODKEY, GDK_y, clipboard, { .b = FALSE }, BROWSER }, { MODKEY, GDK_y, clipboard, { .b = FALSE }, BROWSER },
{ MODKEY|GDK_SHIFT_MASK,GDK_j, zoom, { .i = -1 }, BROWSER }, { MODKEY|GDK_SHIFT_MASK,GDK_j, zoom, { .i = -1 }, BROWSER },
@ -23,7 +23,7 @@ static Key keys[] = {
{ 0, GDK_Escape, stop, { 0 }, BROWSER }, { 0, GDK_Escape, stop, { 0 }, BROWSER },
{ MODKEY, GDK_o, source, { 0 }, BROWSER }, { MODKEY, GDK_o, source, { 0 }, BROWSER },
{ MODKEY, GDK_n, searchtext, { .b = TRUE }, BROWSER|SEARCHBAR }, { 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 }, { 0, GDK_Return, searchtext, { .b = TRUE }, SEARCHBAR },
{ GDK_SHIFT_MASK, GDK_Return, searchtext, { .b = FALSE }, SEARCHBAR }, { GDK_SHIFT_MASK, GDK_Return, searchtext, { .b = FALSE }, SEARCHBAR },
{ 0, GDK_Return, loaduri, { .v = NULL }, URLBAR }, { 0, GDK_Return, loaduri, { .v = NULL }, URLBAR },

5
surf.c
View File

@ -263,8 +263,9 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
else else
focus = BROWSER; focus = BROWSER;
for(i = 0; i < LENGTH(keys); i++) { for(i = 0; i < LENGTH(keys); i++) {
if(focus & keys[i].focus && ev->keyval == keys[i].keyval && if(focus & keys[i].focus
CLEANMASK(ev->state) == keys[i].mod && gdk_keyval_to_lower(ev->keyval) == keys[i].keyval
&& CLEANMASK(ev->state) == keys[i].mod
&& keys[i].func) { && keys[i].func) {
keys[i].func(c, &(keys[i].arg)); keys[i].func(c, &(keys[i].arg));
processed = TRUE; processed = TRUE;