From 8a181af3cf06a32c08d57176484e27894f96459a Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Tue, 26 May 2009 23:19:12 +0200 Subject: more precise gtk dep --- docs/INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/INSTALL b/docs/INSTALL index 440157a..3453e03 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -29,7 +29,7 @@ Dependencies * pkgconfig (for Make/gcc) * libwebkit 1.1.4 or higher * libsoup 2.24 or higher (dep for webkit/gtk+) -* gtk 2 something something +* gtk 2.14 or higher Optional/Recommended -------------------- -- cgit v1.2.3 From 881b7daf9da79abe80046f43008574b87d6e29e5 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Tue, 26 May 2009 23:20:52 +0200 Subject: disable cookies in master --- examples/configs/sampleconfig | 2 +- examples/configs/sampleconfig-dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig index 06f3f13..a541854 100644 --- a/examples/configs/sampleconfig +++ b/examples/configs/sampleconfig @@ -11,7 +11,7 @@ # You can use any action in place of spawn set history_handler = spawn /usr/share/uzbl/examples/scripts/history.sh set download_handler = spawn /usr/share/uzbl/examples/scripts/download.sh -set cookie_handler = spawn /usr/share/uzbl/examples/scripts/cookies.sh +#set cookie_handler = spawn /usr/share/uzbl/examples/scripts/cookies.sh set minimum_font_size = 6 set font_size = 11 diff --git a/examples/configs/sampleconfig-dev b/examples/configs/sampleconfig-dev index 3deeac1..3b1c069 100644 --- a/examples/configs/sampleconfig-dev +++ b/examples/configs/sampleconfig-dev @@ -11,7 +11,7 @@ # Usually you want to spawn a script to handle things, but any action (such as sh) can be used set history_handler = spawn ./examples/scripts/history.sh set download_handler = spawn ./examples/scripts/download.sh -set cookie_handler = spawn ./examples/scripts/cookies.sh +#set cookie_handler = spawn ./examples/scripts/cookies.sh set minimum_font_size = 6 set font_size = 11 -- cgit v1.2.3 From efed998a1aca58fc79f2cf82ce78c9dda7911201 Mon Sep 17 00:00:00 2001 From: uranther Date: Fri, 29 May 2009 15:11:23 -0400 Subject: Some cleaning of code, and stricter compiling options (with warnings I don't know how to fix) --- Makefile | 2 +- uzbl.c | 17 ++++++++--------- uzbl.h | 8 ++++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index d158a9b..f8277fb 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" +CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) -ggdb -Wall -pedantic -std=gnu99 -W -DARCH="\"$(shell uname -m)\"" -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" LDFLAGS=$(shell pkg-config --libs gtk+-2.0 webkit-1.0) all: uzbl uzblctrl diff --git a/uzbl.c b/uzbl.c index 60c9eaa..1758638 100644 --- a/uzbl.c +++ b/uzbl.c @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 4; -*- */ -// Original code taken from the example webkit-gtk+ application. see notice below. -// Modified code is licensed under the GPL 3. See LICENSE file. +/* Original code taken from the example webkit-gtk+ application. see notice below. */ +/* Modified code is licensed under the GPL 3. See LICENSE file. */ /* @@ -36,23 +36,23 @@ #include #include #include + +#include #include #include -#include -#include #include #include +#include + #include +#include + #include #include #include #include #include -#include #include -#include -#include -#include #include #include "uzbl.h" #include "config.h" @@ -531,7 +531,6 @@ VIEWFUNC(go_forward) #undef VIEWFUNC /* -- command to callback/function map for things we cannot attach to any signals */ -// TODO: reload static struct {char *name; Command command[2];} cmdlist[] = { /* key function no_split */ { "back", {view_go_back, 0} }, diff --git a/uzbl.h b/uzbl.h index cd5e3ef..4c4c4ea 100644 --- a/uzbl.h +++ b/uzbl.h @@ -71,10 +71,10 @@ typedef struct { GtkWidget* vbox; GtkWidget* mainbar; GtkWidget* mainbar_label; - GtkScrollbar* scbar_v; // Horizontal and Vertical Scrollbar - GtkScrollbar* scbar_h; // (These are still hidden) - GtkAdjustment* bar_v; // Information about document length - GtkAdjustment* bar_h; // and scrolling position + GtkScrollbar* scbar_v; /* Horizontal and Vertical Scrollbar */ + GtkScrollbar* scbar_h; /* (These are still hidden) */ + GtkAdjustment* bar_v; /* Information about document length */ + GtkAdjustment* bar_h; /* and scrolling position */ WebKitWebView* web_view; gchar* main_title; -- cgit v1.2.3 From 89916092aef4b603c3fb5a711f0475d49aa7868e Mon Sep 17 00:00:00 2001 From: uranther Date: Fri, 29 May 2009 15:47:55 -0400 Subject: Added reset_zoom_level() to reset zoom to 100%, and added keybinding in sampleconfig --- examples/configs/sampleconfig | 1 + uzbl.c | 7 +++++++ uzbl.h | 3 +++ 3 files changed, 11 insertions(+) diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig index a541854..881173c 100644 --- a/examples/configs/sampleconfig +++ b/examples/configs/sampleconfig @@ -69,6 +69,7 @@ bind r = reload bind R = reload_ign_cache bind + = zoom_in bind - = zoom_out +bind = = reset_zoom bind t = toggle_status # Hilight matches. Notice the * after the slash - it makes the command incremental, i.e. gets called # on every character you type. You can do `bind /_ = search %s' if you want it less interactive. diff --git a/uzbl.c b/uzbl.c index 1758638..acae3cf 100644 --- a/uzbl.c +++ b/uzbl.c @@ -544,6 +544,7 @@ static struct {char *name; Command command[2];} cmdlist[] = { "stop", {view_stop_loading, 0}, }, { "zoom_in", {view_zoom_in, 0}, }, //Can crash (when max zoom reached?). { "zoom_out", {view_zoom_out, 0}, }, + { "reset_zoom", {reset_zoom_level, 0}, }, { "uri", {load_uri, NOSPLIT} }, { "js", {run_js, NOSPLIT} }, { "script", {run_external_js, 0} }, @@ -706,6 +707,12 @@ search_reverse_text (WebKitWebView *page, GArray *argv) { search_text(page, argv, FALSE); } +static void +reset_zoom_level (WebKitWebView *page, GArray *argv) { + (void) argv; + webkit_web_view_set_zoom_level (page, 1.0); +} + static void dehilight (WebKitWebView *page, GArray *argv) { (void) argv; diff --git a/uzbl.h b/uzbl.h index 4c4c4ea..51a788c 100644 --- a/uzbl.h +++ b/uzbl.h @@ -397,6 +397,9 @@ search_forward_text (WebKitWebView *page, GArray *argv); static void search_reverse_text (WebKitWebView *page, GArray *argv); +static void +reset_zoom_level (WebKitWebView *page, GArray *argv); + static void dehilight (WebKitWebView *page, GArray *argv); -- cgit v1.2.3 From 113ace97e4185c885b677e1b486e94e7ba6a5d12 Mon Sep 17 00:00:00 2001 From: uranther Date: Fri, 29 May 2009 15:53:59 -0400 Subject: Added zoom to README --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 71cdcfa..4d537a4 100644 --- a/README +++ b/README @@ -153,6 +153,7 @@ actions follows: * `stop` * `zoom_in` * `zoom_out` +* `reset_zoom` * `uri
` * `js ` - execute the javascript in `` -- cgit v1.2.3 From 79bc5894756cf9ea267ec80938e7c9fe4881d1b4 Mon Sep 17 00:00:00 2001 From: uranther Date: Fri, 29 May 2009 16:51:05 -0400 Subject: Replaced reset_zoom with zoom_level; added floats to commands --- README | 1 - examples/configs/sampleconfig | 2 +- uzbl.c | 22 ++++++++++++---------- uzbl.h | 9 ++++++--- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/README b/README index 4d537a4..71cdcfa 100644 --- a/README +++ b/README @@ -153,7 +153,6 @@ actions follows: * `stop` * `zoom_in` * `zoom_out` -* `reset_zoom` * `uri
` * `js ` - execute the javascript in `` diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig index 881173c..603ee0f 100644 --- a/examples/configs/sampleconfig +++ b/examples/configs/sampleconfig @@ -69,7 +69,7 @@ bind r = reload bind R = reload_ign_cache bind + = zoom_in bind - = zoom_out -bind = = reset_zoom +bind = = sh "echo set zoom_level = 1.0 > $4" bind t = toggle_status # Hilight matches. Notice the * after the slash - it makes the command incremental, i.e. gets called # on every character you type. You can do `bind /_ = search %s' if you want it less interactive. diff --git a/uzbl.c b/uzbl.c index acae3cf..4f12637 100644 --- a/uzbl.c +++ b/uzbl.c @@ -84,7 +84,7 @@ typedef const struct { void (*func)(void); } uzbl_cmdprop; -enum {TYPE_INT, TYPE_STR}; +enum {TYPE_INT, TYPE_STR, TYPE_FLOAT}; /* an abbreviation to help keep the table's width humane */ #define PTR(var, t, fun) { .ptr = (void*)&(var), .type = TYPE_##t, .func = fun } @@ -129,10 +129,11 @@ const struct { { "max_conns", PTR(uzbl.net.max_conns, INT, cmd_max_conns)}, { "max_conns_host", PTR(uzbl.net.max_conns_host, INT, cmd_max_conns_host)}, { "useragent", PTR(uzbl.net.useragent, STR, cmd_useragent)}, - /* exported WebKitWebSettings properties*/ + /* exported WebKitWebSettings properties */ { "font_size", PTR(uzbl.behave.font_size, INT, cmd_font_size)}, { "monospace_size", PTR(uzbl.behave.monospace_size, INT, cmd_font_size)}, { "minimum_font_size", PTR(uzbl.behave.minimum_font_size, INT, cmd_minimum_font_size)}, + { "zoom_level", PTR(uzbl.behave.zoom_level, FLOAT, cmd_zoom_level)}, { "disable_plugins", PTR(uzbl.behave.disable_plugins, INT, cmd_disable_plugins)}, { "disable_scripts", PTR(uzbl.behave.disable_scripts, INT, cmd_disable_scripts)}, { "autoload_images", PTR(uzbl.behave.autoload_img, INT, cmd_autoload_img)}, @@ -544,7 +545,6 @@ static struct {char *name; Command command[2];} cmdlist[] = { "stop", {view_stop_loading, 0}, }, { "zoom_in", {view_zoom_in, 0}, }, //Can crash (when max zoom reached?). { "zoom_out", {view_zoom_out, 0}, }, - { "reset_zoom", {reset_zoom_level, 0}, }, { "uri", {load_uri, NOSPLIT} }, { "js", {run_js, NOSPLIT} }, { "script", {run_external_js, 0} }, @@ -707,12 +707,6 @@ search_reverse_text (WebKitWebView *page, GArray *argv) { search_text(page, argv, FALSE); } -static void -reset_zoom_level (WebKitWebView *page, GArray *argv) { - (void) argv; - webkit_web_view_set_zoom_level (page, 1.0); -} - static void dehilight (WebKitWebView *page, GArray *argv) { (void) argv; @@ -1257,6 +1251,11 @@ cmd_font_size() { } } +static void +cmd_zoom_level() { + webkit_web_view_set_zoom_level (uzbl.gui.web_view, uzbl.behave.zoom_level); +} + static void cmd_disable_plugins() { g_object_set (G_OBJECT(view_settings()), "enable-plugins", @@ -1429,9 +1428,12 @@ set_var_value(gchar *name, gchar *val) { if (c->type == TYPE_STR) { g_free(*c->ptr); *c->ptr = g_strdup(val); - } else if(c->type == TYPE_INT) { + } else if (c->type == TYPE_INT) { int *ip = (int *)c->ptr; *ip = (int)strtoul(val, &endp, 10); + } else if (c->type == TYPE_FLOAT) { + float *fp = (float *)c->ptr; + *fp = (float)strtof(val, &endp); } /* invoke a command specific function */ diff --git a/uzbl.h b/uzbl.h index 51a788c..91421bd 100644 --- a/uzbl.h +++ b/uzbl.h @@ -155,6 +155,7 @@ typedef struct { guint font_size; guint monospace_size; guint minimum_font_size; + gfloat zoom_level; guint disable_plugins; guint disable_scripts; guint autoload_img; @@ -397,9 +398,6 @@ search_forward_text (WebKitWebView *page, GArray *argv); static void search_reverse_text (WebKitWebView *page, GArray *argv); -static void -reset_zoom_level (WebKitWebView *page, GArray *argv); - static void dehilight (WebKitWebView *page, GArray *argv); @@ -454,9 +452,14 @@ cmd_max_conns(); static void cmd_max_conns_host(); +/* exported WebKitWebSettings properties */ + static void cmd_font_size(); +static void +cmd_zoom_level(); + static void cmd_disable_plugins(); -- cgit v1.2.3 From 0683d83a8058b36a4f351022afa8faddbae506ad Mon Sep 17 00:00:00 2001 From: uranther Date: Fri, 29 May 2009 16:54:36 -0400 Subject: oops - removed unnecessary float cast --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uzbl.c b/uzbl.c index 4f12637..084c354 100644 --- a/uzbl.c +++ b/uzbl.c @@ -1433,7 +1433,7 @@ set_var_value(gchar *name, gchar *val) { *ip = (int)strtoul(val, &endp, 10); } else if (c->type == TYPE_FLOAT) { float *fp = (float *)c->ptr; - *fp = (float)strtof(val, &endp); + *fp = strtof(val, &endp); } /* invoke a command specific function */ -- cgit v1.2.3 From 217b80ed2839c67b8fba4760aba559a6c7306c88 Mon Sep 17 00:00:00 2001 From: uranther Date: Mon, 1 Jun 2009 14:50:03 -0400 Subject: fixed incorrect merge --- uzbl.c | 107 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 55 insertions(+), 52 deletions(-) diff --git a/uzbl.c b/uzbl.c index 94369b0..8e6b51b 100644 --- a/uzbl.c +++ b/uzbl.c @@ -96,59 +96,62 @@ const struct { } var_name_to_ptr[] = { /* variable name pointer to variable in code type dump callback function */ /* --------------------------------------------------------------------------------------- */ - { "uri", PTR(uzbl.state.uri, STR, cmd_load_uri)}, - { "mode", PTR(uzbl.behave.mode, INT, NULL)}, - { "inject_html", PTR(uzbl.behave.inject_html, STR, cmd_inject_html)}, - { "base_url", PTR(uzbl.behave.base_url, STR, NULL)}, - { "html_endmarker", PTR(uzbl.behave.html_endmarker, STR, NULL)}, - { "html_mode_timeout", PTR(uzbl.behave.html_timeout, INT, NULL)}, - { "status_message", PTR(uzbl.gui.sbar.msg, STR, update_title)}, - { "show_status", PTR(uzbl.behave.show_status, INT, cmd_set_status)}, - { "status_top", PTR(uzbl.behave.status_top, INT, move_statusbar)}, - { "status_format", PTR(uzbl.behave.status_format, STR, update_title)}, - { "status_pbar_done", PTR(uzbl.gui.sbar.progress_s, STR, update_title)}, - { "status_pbar_pending", PTR(uzbl.gui.sbar.progress_u, STR, update_title)}, - { "status_pbar_width", PTR(uzbl.gui.sbar.progress_w, INT, update_title)}, - { "status_background", PTR(uzbl.behave.status_background, STR, update_title)}, - { "title_format_long", PTR(uzbl.behave.title_format_long, STR, update_title)}, - { "title_format_short", PTR(uzbl.behave.title_format_short, STR, update_title)}, - { "insert_mode", PTR(uzbl.behave.insert_mode, INT, NULL)}, - { "always_insert_mode", PTR(uzbl.behave.always_insert_mode, INT, cmd_always_insert_mode)}, - { "reset_command_mode", PTR(uzbl.behave.reset_command_mode, INT, NULL)}, - { "modkey", PTR(uzbl.behave.modkey, STR, cmd_modkey)}, - { "load_finish_handler", PTR(uzbl.behave.load_finish_handler, STR, NULL)}, - { "load_start_handler", PTR(uzbl.behave.load_start_handler, STR, NULL)}, - { "load_commit_handler", PTR(uzbl.behave.load_commit_handler, STR, NULL)}, - { "history_handler", PTR(uzbl.behave.history_handler, STR, NULL)}, - { "download_handler", PTR(uzbl.behave.download_handler, STR, NULL)}, - { "cookie_handler", PTR(uzbl.behave.cookie_handler, STR, cmd_cookie_handler)}, - { "fifo_dir", PTR(uzbl.behave.fifo_dir, STR, cmd_fifo_dir)}, - { "socket_dir", PTR(uzbl.behave.socket_dir, STR, cmd_socket_dir)}, - { "http_debug", PTR(uzbl.behave.http_debug, INT, cmd_http_debug)}, - { "shell_cmd", PTR(uzbl.behave.shell_cmd, STR, NULL)}, - { "proxy_url", PTR(uzbl.net.proxy_url, STR, set_proxy_url)}, - { "max_conns", PTR(uzbl.net.max_conns, INT, cmd_max_conns)}, - { "max_conns_host", PTR(uzbl.net.max_conns_host, INT, cmd_max_conns_host)}, - { "useragent", PTR(uzbl.net.useragent, STR, cmd_useragent)}, + { "uri", PTR(uzbl.state.uri, STR, 1, cmd_load_uri)}, + { "verbose", PTR(uzbl.state.verbose, INT, 1, NULL)}, + { "mode", PTR(uzbl.behave.mode, INT, 0, NULL)}, + { "inject_html", PTR(uzbl.behave.inject_html, STR, 0, cmd_inject_html)}, + { "base_url", PTR(uzbl.behave.base_url, STR, 1, NULL)}, + { "html_endmarker", PTR(uzbl.behave.html_endmarker, STR, 1, NULL)}, + { "html_mode_timeout", PTR(uzbl.behave.html_timeout, INT, 1, NULL)}, + { "status_message", PTR(uzbl.gui.sbar.msg, STR, 1, update_title)}, + { "show_status", PTR(uzbl.behave.show_status, INT, 1, cmd_set_status)}, + { "status_top", PTR(uzbl.behave.status_top, INT, 1, move_statusbar)}, + { "status_format", PTR(uzbl.behave.status_format, STR, 1, update_title)}, + { "status_pbar_done", PTR(uzbl.gui.sbar.progress_s, STR, 1, update_title)}, + { "status_pbar_pending", PTR(uzbl.gui.sbar.progress_u, STR, 1, update_title)}, + { "status_pbar_width", PTR(uzbl.gui.sbar.progress_w, INT, 1, update_title)}, + { "status_background", PTR(uzbl.behave.status_background, STR, 1, update_title)}, + { "insert_indicator", PTR(uzbl.behave.insert_indicator, STR, 1, update_title)}, + { "command_indicator", PTR(uzbl.behave.cmd_indicator, STR, 1, update_title)}, + { "title_format_long", PTR(uzbl.behave.title_format_long, STR, 1, update_title)}, + { "title_format_short", PTR(uzbl.behave.title_format_short, STR, 1, update_title)}, + { "insert_mode", PTR(uzbl.behave.insert_mode, INT, 1, NULL)}, + { "always_insert_mode", PTR(uzbl.behave.always_insert_mode, INT, 1, cmd_always_insert_mode)}, + { "reset_command_mode", PTR(uzbl.behave.reset_command_mode, INT, 1, NULL)}, + { "modkey", PTR(uzbl.behave.modkey, STR, 1, cmd_modkey)}, + { "load_finish_handler", PTR(uzbl.behave.load_finish_handler, STR, 1, NULL)}, + { "load_start_handler", PTR(uzbl.behave.load_start_handler, STR, 1, NULL)}, + { "load_commit_handler", PTR(uzbl.behave.load_commit_handler, STR, 1, NULL)}, + { "history_handler", PTR(uzbl.behave.history_handler, STR, 1, NULL)}, + { "download_handler", PTR(uzbl.behave.download_handler, STR, 1, NULL)}, + { "cookie_handler", PTR(uzbl.behave.cookie_handler, STR, 1, cmd_cookie_handler)}, + { "fifo_dir", PTR(uzbl.behave.fifo_dir, STR, 1, cmd_fifo_dir)}, + { "socket_dir", PTR(uzbl.behave.socket_dir, STR, 1, cmd_socket_dir)}, + { "http_debug", PTR(uzbl.behave.http_debug, INT, 1, cmd_http_debug)}, + { "shell_cmd", PTR(uzbl.behave.shell_cmd, STR, 1, NULL)}, + { "proxy_url", PTR(uzbl.net.proxy_url, STR, 1, set_proxy_url)}, + { "max_conns", PTR(uzbl.net.max_conns, INT, 1, cmd_max_conns)}, + { "max_conns_host", PTR(uzbl.net.max_conns_host, INT, 1, cmd_max_conns_host)}, + { "useragent", PTR(uzbl.net.useragent, STR, 1, cmd_useragent)}, /* exported WebKitWebSettings properties */ - { "font_size", PTR(uzbl.behave.font_size, INT, cmd_font_size)}, - { "monospace_size", PTR(uzbl.behave.monospace_size, INT, cmd_font_size)}, - { "minimum_font_size", PTR(uzbl.behave.minimum_font_size, INT, cmd_minimum_font_size)}, - { "zoom_level", PTR(uzbl.behave.zoom_level, FLOAT, cmd_zoom_level)}, - { "disable_plugins", PTR(uzbl.behave.disable_plugins, INT, cmd_disable_plugins)}, - { "disable_scripts", PTR(uzbl.behave.disable_scripts, INT, cmd_disable_scripts)}, - { "autoload_images", PTR(uzbl.behave.autoload_img, INT, cmd_autoload_img)}, - { "autoshrink_images", PTR(uzbl.behave.autoshrink_img, INT, cmd_autoshrink_img)}, - { "enable_spellcheck", PTR(uzbl.behave.enable_spellcheck, INT, cmd_enable_spellcheck)}, - { "enable_private", PTR(uzbl.behave.enable_private, INT, cmd_enable_private)}, - { "print_backgrounds", PTR(uzbl.behave.print_bg, INT, cmd_print_bg)}, - { "stylesheet_uri", PTR(uzbl.behave.style_uri, STR, cmd_style_uri)}, - { "resizable_text_areas",PTR(uzbl.behave.resizable_txt, INT, cmd_resizable_txt)}, - { "default_encoding", PTR(uzbl.behave.default_encoding, STR, cmd_default_encoding)}, - { "enforce_96_dpi", PTR(uzbl.behave.enforce_96dpi, INT, cmd_enforce_96dpi)}, - { "caret_browsing", PTR(uzbl.behave.caret_browsing, INT, cmd_caret_browsing)}, - - { NULL, {.ptr = NULL, .type = TYPE_INT, .func = NULL}} + { "zoom_level", PTR(uzbl.behave.zoom_level, FLOAT,1, cmd_zoom_level)}, + { "font_size", PTR(uzbl.behave.font_size, INT, 1, cmd_font_size)}, + { "monospace_size", PTR(uzbl.behave.monospace_size, INT, 1, cmd_font_size)}, + { "minimum_font_size", PTR(uzbl.behave.minimum_font_size, INT, 1, cmd_minimum_font_size)}, + { "disable_plugins", PTR(uzbl.behave.disable_plugins, INT, 1, cmd_disable_plugins)}, + { "disable_scripts", PTR(uzbl.behave.disable_scripts, INT, 1, cmd_disable_scripts)}, + { "autoload_images", PTR(uzbl.behave.autoload_img, INT, 1, cmd_autoload_img)}, + { "autoshrink_images", PTR(uzbl.behave.autoshrink_img, INT, 1, cmd_autoshrink_img)}, + { "enable_spellcheck", PTR(uzbl.behave.enable_spellcheck, INT, 1, cmd_enable_spellcheck)}, + { "enable_private", PTR(uzbl.behave.enable_private, INT, 1, cmd_enable_private)}, + { "print_backgrounds", PTR(uzbl.behave.print_bg, INT, 1, cmd_print_bg)}, + { "stylesheet_uri", PTR(uzbl.behave.style_uri, STR, 1, cmd_style_uri)}, + { "resizable_text_areas",PTR(uzbl.behave.resizable_txt, INT, 1, cmd_resizable_txt)}, + { "default_encoding", PTR(uzbl.behave.default_encoding, STR, 1, cmd_default_encoding)}, + { "enforce_96_dpi", PTR(uzbl.behave.enforce_96dpi, INT, 1, cmd_enforce_96dpi)}, + { "caret_browsing", PTR(uzbl.behave.caret_browsing, INT, 1, cmd_caret_browsing)}, + + { NULL, {.ptr = NULL, .type = TYPE_INT, .dump = 0, .func = NULL}} }, *n2v_p = var_name_to_ptr; const struct { -- cgit v1.2.3 From f3ee2bb1790e96041bfc920e14d32518bf096e59 Mon Sep 17 00:00:00 2001 From: uranther Date: Mon, 1 Jun 2009 14:58:14 -0400 Subject: fixed sampleconfig so zoom level works again (changed = to 0) --- examples/configs/sampleconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig index ce36fa6..6121ac4 100644 --- a/examples/configs/sampleconfig +++ b/examples/configs/sampleconfig @@ -69,7 +69,7 @@ bind r = reload bind R = reload_ign_cache bind + = zoom_in bind - = zoom_out -bind = = sh "echo set zoom_level = 1.0 > $4" +bind 0 = sh "echo set zoom_level = 1.0 > $4" bind t = toggle_status # Hilight matches. Notice the * after the slash - it makes the command incremental, i.e. gets called # on every character you type. You can do `bind /_ = search %s' if you want it less interactive. -- cgit v1.2.3