[hackers] [surf] Resolving some conflicts in the shortcuts. || Christoph Lohmann

From: <git_AT_suckless.org>
Date: Sun, 02 Dec 2012 22:50:44 +0100

commit 760f8f36debebd5a6fd16100e9876df3b9994647
Author: Christoph Lohmann <20h_AT_r-36.net>
Date: Sun Dec 2 22:48:41 2012 +0100

    Resolving some conflicts in the shortcuts.

diff --git a/config.def.h b/config.def.h
index 57bf31e..4fd1292 100644
--- a/config.def.h
+++ b/config.def.h
_AT_@ -46,26 +46,33 @@ static Key keys[] = {
     { MODKEY|GDK_SHIFT_MASK,GDK_r, reload, { .b = TRUE } },
     { MODKEY, GDK_r, reload, { .b = FALSE } },
     { MODKEY|GDK_SHIFT_MASK,GDK_p, print, { 0 } },
+
     { MODKEY, GDK_p, clipboard, { .b = TRUE } },
     { MODKEY, GDK_y, clipboard, { .b = FALSE } },
+
     { MODKEY|GDK_SHIFT_MASK,GDK_j, zoom, { .i = -1 } },
     { MODKEY|GDK_SHIFT_MASK,GDK_k, zoom, { .i = +1 } },
- { MODKEY|GDK_SHIFT_MASK,GDK_i, zoom, { .i = 0 } },
+ { MODKEY|GDK_SHIFT_MASK,GDK_q, zoom, { .i = 0 } },
     { MODKEY, GDK_minus, zoom, { .i = -1 } },
     { MODKEY, GDK_plus, zoom, { .i = +1 } },
+
     { MODKEY, GDK_l, navigate, { .i = +1 } },
     { MODKEY, GDK_h, navigate, { .i = -1 } },
+
     { MODKEY, GDK_j, scroll_v, { .i = +1 } },
     { MODKEY, GDK_k, scroll_v, { .i = -1 } },
     { MODKEY, GDK_b, scroll_v, { .i = -10000 } },
     { MODKEY, GDK_space, scroll_v, { .i = +10000 } },
     { MODKEY, GDK_i, scroll_h, { .i = +1 } },
     { MODKEY, GDK_u, scroll_h, { .i = -1 } },
+
     { 0, GDK_Escape, stop, { 0 } },
     { MODKEY, GDK_o, source, { 0 } },
+
     { MODKEY, GDK_g, spawn, SETPROP("_SURF_URI", "_SURF_GO") },
     { MODKEY, GDK_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") },
     { MODKEY, GDK_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") },
+
     { MODKEY, GDK_n, find, { .b = TRUE } },
     { MODKEY|GDK_SHIFT_MASK,GDK_n, find, { .b = FALSE } },
 
diff --git a/surf.1 b/surf.1
index bf78ceb..7e523f6 100644
--- a/surf.1
+++ b/surf.1
_AT_@ -85,7 +85,7 @@ Zooms page in.
 .B Ctrl\-Shift\-j or Ctrl\--
 Zooms page out
 .TP
-.B Ctrl\-Shift\-i
+.B Ctrl\-Shift\-q
 Resets Zoom
 .TP
 .B Ctrl\-h
Received on Sun Dec 02 2012 - 22:50:44 CET