summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnno Boland (tox) <tox@s01.de>2009-09-07 11:43:31 +0200
committerEnno Boland (tox) <tox@s01.de>2009-09-07 11:43:31 +0200
commita1b70380dbfc83b2044cad3ce46f68e2878dd976 (patch)
treeca53d38988ca8935f1a9a512ad490bc2bbc25949
parent03f0a3baf5a844dc44aa5c145f1dd5d12c56ad07 (diff)
downloadsurf-a1b70380dbfc83b2044cad3ce46f68e2878dd976.tar.gz
surf-a1b70380dbfc83b2044cad3ce46f68e2878dd976.tar.bz2
surf-a1b70380dbfc83b2044cad3ce46f68e2878dd976.zip
moving config.h to config.def.h.
-rw-r--r--Makefile6
-rw-r--r--config.def.h (renamed from config.h)20
2 files changed, 15 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 6dc19fa..5a98461 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,11 @@ options:
@echo CC $<
@${CC} -c ${CFLAGS} $<
-${OBJ}: config.mk
+${OBJ}: config.h config.mk
+
+config.h:
+ @echo creating $@ from config.def.h
+ @cp config.def.h $@
surf: ${OBJ}
@echo CC -o $@
diff --git a/config.h b/config.def.h
index fde3592..b0dcf54 100644
--- a/config.h
+++ b/config.def.h
@@ -3,20 +3,13 @@ static GdkColor progress = { 65535,65535,0,0 };
static GdkColor progress_trust = { 65535,0,65535,0 };
static Key keys[] = {
/* modifier keyval function arg Focus */
- { 0, GDK_Escape, hidesearch, {0}, ALWAYS },
- { 0, GDK_Escape, hideurl, {0}, ALWAYS },
- { GDK_CONTROL_MASK, GDK_P, print, {0}, ALWAYS },
- { 0, GDK_Return, searchtext, {.b = TRUE}, SEARCHBAR },
- { GDK_SHIFT_MASK, GDK_Return, searchtext, {.b = FALSE}, SEARCHBAR },
- { GDK_CONTROL_MASK, GDK_n, searchtext, {.b = TRUE}, BROWSER|SEARCHBAR },
- { GDK_CONTROL_MASK, GDK_N, searchtext, {.b = FALSE}, BROWSER|SEARCHBAR },
- { 0 },
{ GDK_CONTROL_MASK, GDK_R, reload, {.b = TRUE}, ALWAYS },
{ GDK_CONTROL_MASK, GDK_r, reload, {.b = FALSE}, ALWAYS },
{ GDK_CONTROL_MASK, GDK_g, showurl, {0}, ALWAYS },
{ GDK_CONTROL_MASK, GDK_slash, showsearch, {0}, ALWAYS },
- { 0, GDK_Return, loaduri, {.v = NULL}, URLBAR },
- { 0, GDK_Return, hideurl, {0}, URLBAR },
+ { 0, GDK_Escape, hidesearch, {0}, ALWAYS },
+ { 0, GDK_Escape, hideurl, {0}, ALWAYS },
+ { GDK_CONTROL_MASK, GDK_P, print, {0}, ALWAYS },
{ GDK_CONTROL_MASK, GDK_p, clipboard, {.b = TRUE }, BROWSER },
{ GDK_CONTROL_MASK, GDK_y, clipboard, {.b = FALSE}, BROWSER },
{ GDK_CONTROL_MASK, GDK_equal, zoom, {.i = +1 }, BROWSER },
@@ -26,5 +19,12 @@ static Key keys[] = {
{ GDK_CONTROL_MASK, GDK_l, navigate, {.i = +1}, BROWSER },
{ GDK_CONTROL_MASK, GDK_h, navigate, {.i = -1}, BROWSER },
{ 0, GDK_Escape, stop, {0}, BROWSER },
+ { GDK_CONTROL_MASK, GDK_n, searchtext, {.b = TRUE}, BROWSER|SEARCHBAR },
+ { GDK_CONTROL_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 },
+ { 0, GDK_Return, loaduri, {.v = NULL}, URLBAR },
+ { 0, GDK_Return, hideurl, {0}, URLBAR },
};