Permalink
Browse files

BREAKING CHANGE: remove toggle_zoom_type, toggle_status

they've been replaced with the new toggle command
  • Loading branch information...
1 parent 5cb7ce2 commit 89e8d33c1c86c626fba57b1f24a503246d6718ce @bct bct committed Oct 4, 2011
Showing with 4 additions and 31 deletions.
  1. +0 −7 README
  2. +2 −2 examples/config/config
  3. +2 −2 extras/vim/syntax/uzbl.vim
  4. +0 −18 src/commands.c
  5. +0 −2 src/commands.h
View
7 README
@@ -152,20 +152,13 @@ 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 <address>`
- Attempt to load `<address>`. This is equivalent to `set uri = <address>`.
* `js <body>`
- Execute the JavaScript in `<body>`.
- Remember that the commands must not contain line breaks.
* `script <file>`
- Execute the JavaScript in `<file>`.
-* `toggle_status`
- - Toggle the display of the status bar.
* `spawn <executable> <additional args>` 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.
View
4 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
View
4 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
View
18 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%
View
2 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);

0 comments on commit 89e8d33

Please sign in to comment.