diff options
author | Daniel Carl <danielcarl@gmx.de> | 2013-08-06 21:24:28 +0200 |
---|---|---|
committer | Daniel Carl <danielcarl@gmx.de> | 2013-08-06 21:24:28 +0200 |
commit | c0d79d2e3410be1c792af85f225b76e0bd58e159 (patch) | |
tree | b9d05e10ebe2ae277f108a5b28761a8a6c23c80e /src | |
parent | 7094cb4d94cdbdd418b0f19f9556e70350642e5d (diff) |
Renamed the insert mode to input mode.
This reflects better what we are doing and we used both terms in the manual
page which was confusing. So now the mode is called 'Input Mode'.
Diffstat (limited to 'src')
-rw-r--r-- | src/command.c | 6 | ||||
-rw-r--r-- | src/dom.c | 7 | ||||
-rw-r--r-- | src/hints.c | 2 | ||||
-rw-r--r-- | src/main.c | 8 | ||||
-rw-r--r-- | src/main.h | 4 |
5 files changed, 13 insertions, 14 deletions
diff --git a/src/command.c b/src/command.c index d1cd64f..e42777e 100644 --- a/src/command.c +++ b/src/command.c @@ -78,10 +78,10 @@ static CommandInfo cmd_list[] = { {"scrollup", NULL, command_scroll, {VB_SCROLL_TYPE_SCROLL | VB_SCROLL_DIRECTION_TOP | VB_SCROLL_UNIT_LINE}}, {"scrolldown", NULL, command_scroll, {VB_SCROLL_TYPE_SCROLL | VB_SCROLL_DIRECTION_DOWN | VB_SCROLL_UNIT_LINE}}, {"nmap", NULL, command_map, {VB_MODE_NORMAL}}, - {"imap", NULL, command_map, {VB_MODE_INSERT}}, + {"imap", NULL, command_map, {VB_MODE_INPUT}}, {"cmap", NULL, command_map, {VB_MODE_COMMAND}}, {"nunmap", NULL, command_unmap, {VB_MODE_NORMAL}}, - {"iunmap", NULL, command_unmap, {VB_MODE_INSERT}}, + {"iunmap", NULL, command_unmap, {VB_MODE_INPUT}}, {"cunmap", NULL, command_unmap, {VB_MODE_COMMAND}}, {"set", NULL, command_set, {0}}, {"inspect", NULL, command_inspect, {0}}, @@ -961,7 +961,7 @@ gboolean command_mode(const Arg *arg) gboolean command_focusinput(const Arg *arg) { if (dom_focus_input(vb.gui.webview)) { - vb_set_mode(VB_MODE_INSERT, false); + vb_set_mode(VB_MODE_INPUT, false); return true; } @@ -79,8 +79,7 @@ gboolean dom_focus_input(WebKitWebView *view) return false; } - html = webkit_dom_node_list_item(list, 0); - + html = webkit_dom_node_list_item(list, 0); resolver = webkit_dom_document_create_ns_resolver(doc, html); if (!resolver) { return false; @@ -195,7 +194,7 @@ static gboolean element_is_visible(WebKitDOMDOMWindow* win, WebKitDOMElement* el static gboolean auto_insert(Element *element) { if (dom_is_editable(element)) { - vb_set_mode(VB_MODE_INSERT, false); + vb_set_mode(VB_MODE_INPUT, false); return true; } return false; @@ -206,7 +205,7 @@ static gboolean editable_focus_cb(Element *element, Event *event) webkit_dom_event_target_remove_event_listener( WEBKIT_DOM_EVENT_TARGET(element), "focus", G_CALLBACK(editable_focus_cb), false ); - if (CLEAN_MODE(vb.state.mode) != VB_MODE_INSERT) { + if (CLEAN_MODE(vb.state.mode) != VB_MODE_INPUT) { EventTarget *target = webkit_dom_event_get_target(event); auto_insert((void*)target); } diff --git a/src/hints.c b/src/hints.c index c9d61e2..52c9772 100644 --- a/src/hints.c +++ b/src/hints.c @@ -149,7 +149,7 @@ static void run_script(char *js) } else if (!strncmp(value, "DONE:", 5)) { vb_set_mode(VB_MODE_NORMAL, true); } else if (!strncmp(value, "INSERT:", 7)) { - vb_set_mode(VB_MODE_INSERT, false); + vb_set_mode(VB_MODE_INPUT, false); if (HINTS_GET_TYPE(mode) == HINTS_TYPE_EDITABLE) { command_editor(NULL); } @@ -207,7 +207,7 @@ gboolean vb_set_mode(Mode mode, gboolean clean) command_search(&((Arg){VB_SEARCH_OFF})); } else if ((vb.state.mode & VB_MODE_HINTING) && !(mode & VB_MODE_HINTING)) { hints_clear(); - } else if (CLEAN_MODE(vb.state.mode) == VB_MODE_INSERT && !(mode & VB_MODE_INSERT)) { + } else if (CLEAN_MODE(vb.state.mode) == VB_MODE_INPUT && !(mode & VB_MODE_INPUT)) { clean = true; dom_clear_focus(vb.gui.webview); } @@ -227,7 +227,7 @@ gboolean vb_set_mode(Mode mode, gboolean clean) gtk_widget_grab_focus(GTK_WIDGET(vb.gui.inputbox)); break; - case VB_MODE_INSERT: + case VB_MODE_INPUT: clean = false; gtk_widget_grab_focus(GTK_WIDGET(vb.gui.webview)); if (mode & VB_MODE_PASSTHROUGH) { @@ -456,7 +456,7 @@ static void webview_load_status_cb(WebKitWebView *view, GParamSpec *pspec) run_user_script(frame); } - if (vb.state.mode & VB_MODE_INSERT) { + if (vb.state.mode & VB_MODE_INPUT) { /* status bar is updated by vb_set_mode */ vb_set_mode(VB_MODE_NORMAL, false); } else { @@ -887,7 +887,7 @@ static gboolean button_relase_cb(WebKitWebView *webview, GdkEventButton *event) g_object_get(result, "context", &context, NULL); if (mode == VB_MODE_NORMAL && context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE) { - vb_set_mode(VB_MODE_INSERT, false); + vb_set_mode(VB_MODE_INPUT, false); propagate = true; } @@ -61,7 +61,7 @@ gtk_editable_set_position(GTK_EDITABLE(vb.gui.inputbox), -1); \ } #define GET_URI() (webkit_web_view_get_uri(vb.gui.webview)) -#define CLEAN_MODE(mode) ((mode) & (VB_MODE_NORMAL|VB_MODE_COMMAND|VB_MODE_INSERT)) +#define CLEAN_MODE(mode) ((mode) & (VB_MODE_NORMAL|VB_MODE_COMMAND|VB_MODE_INPUT)) #define CLEAR_INPUT() (vb_echo(VB_MSG_NORMAL, "")) #define PRIMARY_CLIPBOARD() gtk_clipboard_get(GDK_SELECTION_PRIMARY) #define SECONDARY_CLIPBOARD() gtk_clipboard_get(GDK_NONE) @@ -115,7 +115,7 @@ typedef enum _vb_mode { /* main modes */ VB_MODE_NORMAL = 1<<0, VB_MODE_COMMAND = 1<<1, - VB_MODE_INSERT = 1<<2, + VB_MODE_INPUT = 1<<2, /* sub modes */ VB_MODE_PASSTHROUGH = 1<<3, /* normal or insert mode */ VB_MODE_SEARCH = 1<<4, /* normal mode */ |