about summary refs log tree commit diff
path: root/config.def.h
diff options
context:
space:
mode:
authorQuentin Rameau <quinq@fifth.space>2015-11-21 19:14:08 +0100
committerQuentin Rameau <quinq@fifth.space>2015-11-21 19:14:08 +0100
commit432f3c6b53cf47db3141a3e9b8b5aec2152f9aae (patch)
tree60abca8392759e389508ecc8c1b194de9ed42500 /config.def.h
parentCleanup remaining unused variables and copystr() (diff)
downloadsurf-432f3c6b53cf47db3141a3e9b8b5aec2152f9aae.tar.gz
surf-432f3c6b53cf47db3141a3e9b8b5aec2152f9aae.tar.bz2
surf-432f3c6b53cf47db3141a3e9b8b5aec2152f9aae.zip
Style change in functions ordering
Try to group and order functions in a logical manner.
Same thing for config keybindings.
Diffstat (limited to 'config.def.h')
-rw-r--r--config.def.h40
1 files changed, 21 insertions, 19 deletions
diff --git a/config.def.h b/config.def.h
index 50ce75d..6d62c98 100644
--- a/config.def.h
+++ b/config.def.h
@@ -84,18 +84,15 @@ static SiteStyle styles[] = {
  */
 static Key keys[] = {
 	/* modifier	         keyval          function    arg */
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_r,      reload,     { .b = TRUE } },
-	{ MODKEY,                GDK_KEY_r,      reload,     { .b = FALSE } },
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_p,      print,      { 0 } },
+	{ MODKEY,                GDK_KEY_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
+	{ MODKEY,                GDK_KEY_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+	{ MODKEY,                GDK_KEY_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
 
-	{ MODKEY,                GDK_KEY_p,      clipboard,  { .b = TRUE } },
-	{ MODKEY,                GDK_KEY_y,      clipboard,  { .b = FALSE } },
+	{ 0,                     GDK_KEY_Escape, stop,       { 0 } },
+	{ MODKEY,                GDK_KEY_c,      stop,       { 0 } },
 
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_j,      zoom,       { .i = -1 } },
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_k,      zoom,       { .i = +1 } },
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_q,      zoom,       { .i = 0  } },
-	{ MODKEY,                GDK_KEY_minus,  zoom,       { .i = -1 } },
-	{ MODKEY,                GDK_KEY_plus,   zoom,       { .i = +1 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_r,      reload,     { .b = TRUE } },
+	{ MODKEY,                GDK_KEY_r,      reload,     { .b = FALSE } },
 
 	{ MODKEY,                GDK_KEY_l,      navigate,   { .i = +1 } },
 	{ MODKEY,                GDK_KEY_h,      navigate,   { .i = -1 } },
@@ -108,17 +105,25 @@ static Key keys[] = {
 	{ MODKEY,                GDK_KEY_i,      scroll_h,   { .i = +10 } },
 	{ MODKEY,                GDK_KEY_u,      scroll_h,   { .i = -10 } },
 
-	{ 0,                     GDK_KEY_F11,    togglefullscreen, { 0 } },
-	{ 0,                     GDK_KEY_Escape, stop,       { 0 } },
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_o,      toggleinspector, { 0 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_j,      zoom,       { .i = -1 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_k,      zoom,       { .i = +1 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_q,      zoom,       { .i = 0  } },
+	{ MODKEY,                GDK_KEY_minus,  zoom,       { .i = -1 } },
+	{ MODKEY,                GDK_KEY_plus,   zoom,       { .i = +1 } },
 
-	{ MODKEY,                GDK_KEY_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
-	{ MODKEY,                GDK_KEY_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
-	{ MODKEY,                GDK_KEY_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+	{ MODKEY,                GDK_KEY_p,      clipboard,  { .b = TRUE } },
+	{ MODKEY,                GDK_KEY_y,      clipboard,  { .b = FALSE } },
 
 	{ MODKEY,                GDK_KEY_n,      find,       { .i = +1 } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_n,      find,       { .i = -1 } },
 
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_p,      print,      { 0 } },
+
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_a,      togglecookiepolicy, { 0 } },
+	{ 0,                     GDK_KEY_F11,    togglefullscreen, { 0 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_o,      toggleinspector, { 0 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m,      togglestyle, { 0 } },
+
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_c,      toggle,     { .i = CaretBrowsing } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_f,      toggle,     { .i = FrameFlattening } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_g,      toggle,     { .i = Geolocation } },
@@ -126,9 +131,6 @@ static Key keys[] = {
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_i,      toggle,     { .i = LoadImages } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_v,      toggle,     { .i = Plugins } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_b,      toggle,     { .i = ScrollBars } },
-
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_a,      togglecookiepolicy, { 0 } },
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m,      togglestyle, { 0 } },
 };
 
 /* button definitions */