From 89e8d33c1c86c626fba57b1f24a503246d6718ce Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Tue, 4 Oct 2011 22:21:00 +0000 Subject: BREAKING CHANGE: remove toggle_zoom_type, toggle_status they've been replaced with the new toggle command --- README | 7 ------- examples/config/config | 4 ++-- extras/vim/syntax/uzbl.vim | 4 ++-- src/commands.c | 18 ------------------ src/commands.h | 2 -- 5 files changed, 4 insertions(+), 31 deletions(-) diff --git a/README b/README index 2dccafd..836260e 100644 --- a/README +++ b/README @@ -152,11 +152,6 @@ The following commands are recognized: - Increase the zoom level. * `zoom_out` - Decrease the zoom level. -* `toggle_zoom_type` - - Toggles the variable `zoom_type` between "full-content" and "text-only" - zoom. In "text-only" zoom, only the text of the page is zoomed, while in - "full-content" zoom, images and other page elements are zoomed along with - the text. * `uri

` - Attempt to load `

`. This is equivalent to `set uri =

`. * `js ` @@ -164,8 +159,6 @@ The following commands are recognized: - Remember that the commands must not contain line breaks. * `script ` - Execute the JavaScript in ``. -* `toggle_status` - - Toggle the display of the status bar. * `spawn ` TODO explain path-alike expansion - Runs a command; see EXTERNAL SCRIPTS for details. - `$PATH` is searched, so giving the full path to commands is not necessary. diff --git a/examples/config/config b/examples/config/config index 6819dde..d295347 100644 --- a/examples/config/config +++ b/examples/config/config @@ -251,12 +251,12 @@ set ebind = @mode_bind global,-insert # Zoom binds @cbind + = zoom_in @cbind - = zoom_out -@cbind T = toggle_zoom_type +@cbind T = toggle zoom_type @cbind 1 = set zoom_level = 1.0 @cbind 2 = set zoom_level = 2.0 # Appearance binds -@cbind t = toggle_status +@cbind t = toggle show_status # Page searching binds @cbind /* = search %s diff --git a/extras/vim/syntax/uzbl.vim b/extras/vim/syntax/uzbl.vim index 1a4172b..2cb4006 100644 --- a/extras/vim/syntax/uzbl.vim +++ b/extras/vim/syntax/uzbl.vim @@ -26,8 +26,8 @@ elseif exists("b:current_syntax") endif syn keyword uzblKeyword back forward scroll reload reload_ign_cache stop -syn keyword uzblKeyword zoom_in zoom_out toggle_zoom_type uri script -syn keyword uzblKeyword toggle_status spawn sync_spawn sync_sh sync_spawn_exec +syn keyword uzblKeyword zoom_in zoom_out toggle uri script +syn keyword uzblKeyword spawn sync_spawn sync_sh sync_spawn_exec syn keyword uzblKeyword exit search search_reverse search_clear dehilight set syn keyword uzblKeyword dump_config dump_config_as_events chain print event syn keyword uzblKeyword request menu_add menu_link_add menu_image_add diff --git a/src/commands.c b/src/commands.c index 708ed49..032bb4a 100644 --- a/src/commands.c +++ b/src/commands.c @@ -18,11 +18,9 @@ CommandInfo cmdlist[] = { "stop", view_stop_loading, 0 }, { "zoom_in", view_zoom_in, 0 }, //Can crash (when max zoom reached?). { "zoom_out", view_zoom_out, 0 }, - { "toggle_zoom_type", toggle_zoom_type, 0 }, { "uri", load_uri, TRUE }, { "js", run_js, TRUE }, { "script", run_external_js, 0 }, - { "toggle_status", toggle_status, 0 }, { "spawn", spawn_async, 0 }, { "sync_spawn", spawn_sync, 0 }, { "sync_spawn_exec", spawn_sync_exec, 0 }, // needed for load_cookies.sh :( @@ -97,22 +95,6 @@ VIEWFUNC(go_back) VIEWFUNC(go_forward) #undef VIEWFUNC -void -toggle_zoom_type (WebKitWebView* page, GArray *argv, GString *result) { - (void)page; (void)argv; (void)result; - - int current_type = get_zoom_type(); - set_zoom_type(!current_type); -} - -void -toggle_status (WebKitWebView* page, GArray *argv, GString *result) { - (void)page; (void)argv; (void)result; - - int current_status = get_show_status(); - set_show_status(!current_status); -} - /* * scroll vertical 20 * scroll vertical 20% diff --git a/src/commands.h b/src/commands.h index 38bd5f2..c39b541 100644 --- a/src/commands.h +++ b/src/commands.h @@ -61,8 +61,6 @@ void set_var(WebKitWebView *page, GArray *argv, GString *result); void toggle_var(WebKitWebView *page, GArray *argv, GString *result); void run_js (WebKitWebView * web_view, GArray *argv, GString *result); void run_external_js (WebKitWebView * web_view, GArray *argv, GString *result); -void toggle_zoom_type (WebKitWebView* page, GArray *argv, GString *result); -void toggle_status (WebKitWebView* page, GArray *argv, GString *result); void act_dump_config(WebKitWebView* page, GArray *argv, GString *result); void act_dump_config_as_events(WebKitWebView* page, GArray *argv, GString *result); -- cgit v1.2.3