From a1b70380dbfc83b2044cad3ce46f68e2878dd976 Mon Sep 17 00:00:00 2001 From: "Enno Boland (tox)" Date: Mon, 7 Sep 2009 11:43:31 +0200 Subject: moving config.h to config.def.h. --- Makefile | 6 +++++- config.def.h | 30 ++++++++++++++++++++++++++++++ config.h | 30 ------------------------------ 3 files changed, 35 insertions(+), 31 deletions(-) create mode 100644 config.def.h delete mode 100644 config.h 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.def.h b/config.def.h new file mode 100644 index 0000000..b0dcf54 --- /dev/null +++ b/config.def.h @@ -0,0 +1,30 @@ +/* modifier 0 means no modifier */ +static GdkColor progress = { 65535,65535,0,0 }; +static GdkColor progress_trust = { 65535,0,65535,0 }; +static Key keys[] = { + /* modifier keyval function arg Focus */ + { 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_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 }, + { GDK_CONTROL_MASK, GDK_plus, zoom, {.i = +1 }, BROWSER }, + { GDK_CONTROL_MASK, GDK_minus, zoom, {.i = -1 }, BROWSER }, + { GDK_CONTROL_MASK, GDK_0, zoom, {.i = 0 }, BROWSER }, + { 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 }, +}; + diff --git a/config.h b/config.h deleted file mode 100644 index fde3592..0000000 --- a/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* modifier 0 means no modifier */ -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 }, - { 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 }, - { GDK_CONTROL_MASK, GDK_plus, zoom, {.i = +1 }, BROWSER }, - { GDK_CONTROL_MASK, GDK_minus, zoom, {.i = -1 }, BROWSER }, - { GDK_CONTROL_MASK, GDK_0, zoom, {.i = 0 }, BROWSER }, - { GDK_CONTROL_MASK, GDK_l, navigate, {.i = +1}, BROWSER }, - { GDK_CONTROL_MASK, GDK_h, navigate, {.i = -1}, BROWSER }, - { 0, GDK_Escape, stop, {0}, BROWSER }, -}; - -- cgit v1.2.3