From: Daniel Carl <danielcarl@gmx.de>
Date: Sun, 25 Nov 2012 13:40:07 +0000 (+0100)
Subject: Added macro to get the cleaned current browser mode.
X-Git-Url: https://git.owens.tech/assets/favicon.png/assets/favicon.png/git?a=commitdiff_plain;h=94eaa94925de60522c2200caf97088e32a1b8579;p=vimb.git

Added macro to get the cleaned current browser mode.
---

diff --git a/src/dom.c b/src/dom.c
index 2769238..ef04e42 100644
--- a/src/dom.c
+++ b/src/dom.c
@@ -55,7 +55,7 @@ static gboolean dom_editable_focus_cb(WebKitDOMElement* element, WebKitDOMEvent*
     webkit_dom_event_target_remove_event_listener(
         WEBKIT_DOM_EVENT_TARGET(element), "focus", G_CALLBACK(dom_editable_focus_cb), true
     );
-    if (CLEAN_MODE(vp.state.mode) != VP_MODE_INSERT) {
+    if (GET_CLEAN_MODE() != VP_MODE_INSERT) {
         WebKitDOMEventTarget* target = webkit_dom_event_get_target(event);
         dom_auto_insert((void*)target);
     }
diff --git a/src/keybind.c b/src/keybind.c
index 7f7b9dc..390481e 100644
--- a/src/keybind.c
+++ b/src/keybind.c
@@ -230,7 +230,7 @@ static gboolean keybind_keypress_callback(WebKitWebView* webview, GdkEventKey* e
     }
 
     /* check for keybinding */
-    GSList* link = keybind_find(CLEAN_MODE(vp.state.mode), vp.state.modkey, state, keyval);
+    GSList* link = keybind_find(GET_CLEAN_MODE(), vp.state.modkey, state, keyval);
 
     if (link) {
         Keybind* keybind = (Keybind*)link->data;
diff --git a/src/main.c b/src/main.c
index e160e38..31002ab 100644
--- a/src/main.c
+++ b/src/main.c
@@ -547,7 +547,7 @@ static gboolean vp_notify_event_cb(GtkWidget* widget, GdkEvent* event, gpointer
 {
     WebKitHitTestResult *result = NULL;
     WebKitHitTestResultContext context;
-    if (CLEAN_MODE(vp.state.mode) == VP_MODE_NORMAL
+    if (GET_CLEAN_MODE() == VP_MODE_NORMAL
         && event->type == GDK_BUTTON_RELEASE
     ) {
         result = webkit_web_view_get_hit_test_result(vp.gui.webview, (GdkEventButton*)event);
diff --git a/src/main.h b/src/main.h
index bac04d6..2d96f05 100644
--- a/src/main.h
+++ b/src/main.h
@@ -45,6 +45,7 @@
 
 #define GET_TEXT() (gtk_entry_get_text(GTK_ENTRY(vp.gui.inputbox)))
 #define CLEAN_MODE(mode) ((mode) & ~(VP_MODE_COMPLETE))
+#define GET_CLEAN_MODE() (CLEAN_MODE(vp.state.mode))
 #define CLEAR_INPUT() (vp_echo(VP_MSG_NORMAL, ""))
 
 #ifdef HAS_GTK3