Indentation in callback.c

1 files changed, 165 insertions, 153 deletions

diff --git a/src/callback.c b/src/callback.c
index 3afa7c31..29a3f46e 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -27,193 +27,205 @@
 
 /* dwb_entry_keyrelease_cb {{{*/
 gboolean 
-callback_entry_insert_text(GtkWidget* entry, char *new_text, int length, gpointer position) { 
-  const char *text = GET_TEXT();
-  int newlen = strlen(text) + length + 1;
-  char buffer[newlen];
-  snprintf(buffer, sizeof(buffer), "%s%s", text, new_text);
-  if (dwb.state.mode == QUICK_MARK_OPEN) {
-    return dwb_update_find_quickmark(buffer);
-  }
-  return false;
+callback_entry_insert_text(GtkWidget* entry, char *new_text, int length, gpointer position) {
+
+    const char *text = GET_TEXT();
+    int newlen = strlen(text) + length + 1;
+    char buffer[newlen];
+    snprintf(buffer, sizeof(buffer), "%s%s", text, new_text);
+    if (dwb.state.mode == QUICK_MARK_OPEN) 
+        return dwb_update_find_quickmark(buffer);
+    
+    return false;
 }
 gboolean
-callback_find_timeout(char *text) {
-  if (!g_strcmp0(text, GET_TEXT())) 
-    dwb_update_search();
-  g_free(text);
-  return false;
+callback_find_timeout(char *text) 
+{
+    if (!g_strcmp0(text, GET_TEXT())) 
+        dwb_update_search();
+    g_free(text);
+    return false;
 }
 gboolean 
-callback_entry_key_release(GtkWidget* entry, GdkEventKey *e) { 
-  if (dwb.state.mode == HINT_MODE) {
-    if (e->keyval == GDK_KEY_BackSpace) {
-      return dwb_update_hints(e);
+callback_entry_key_release(GtkWidget* entry, GdkEventKey *e) {
+
+    if (dwb.state.mode == HINT_MODE) {
+        if (e->keyval == GDK_KEY_BackSpace) 
+            return dwb_update_hints(e);
+        
     }
-  }
-  if (dwb.state.mode == FIND_MODE) {
-    if (dwb.misc.find_delay > 0)
-      g_timeout_add(dwb.misc.find_delay, (GSourceFunc)callback_find_timeout, g_strdup(GET_TEXT()));
-    else 
-      dwb_update_search();
-  }
-  return false;
+    if (dwb.state.mode == FIND_MODE) 
+    {
+        if (dwb.misc.find_delay > 0)
+            g_timeout_add(dwb.misc.find_delay, (GSourceFunc)callback_find_timeout, g_strdup(GET_TEXT()));
+        else 
+            dwb_update_search();
+    }
+    return false;
 }/*}}}*/
 
 /* dwb_entry_keypress_cb(GtkWidget* entry, GdkEventKey *e) {{{*/
 gboolean 
-callback_entry_key_press(GtkWidget* entry, GdkEventKey *e) {
-  Mode mode = dwb.state.mode;
-  gboolean ret = false;
-  gboolean complete = (mode == DOWNLOAD_GET_PATH || (mode & COMPLETE_PATH));
-  gboolean set_text = false;
+callback_entry_key_press(GtkWidget* entry, GdkEventKey *e) 
+{
+    Mode mode = dwb.state.mode;
+    gboolean ret = false;
+    gboolean complete = (mode == DOWNLOAD_GET_PATH || (mode & COMPLETE_PATH));
+    gboolean set_text = false;
 
-  if (dwb.state.mode & QUICK_MARK_OPEN) 
-    set_text = true;
-  /*  Handled by activate-callback */
-  if (e->keyval == GDK_KEY_Return)
-    return dwb_entry_activate(e);
-  /* Insert primary selection on shift-insert */
-  if (mode == QUICK_MARK_SAVE) 
-    return false;
-  else if (mode & COMPLETE_BUFFER) {
-    completion_buffer_key_press(e);
-    return true;
-  }
-  else if (mode & COMPLETE_SCRIPTS && !DWB_COMPLETE_KEY(e)) {
-    return dwb.state.script_comp_readonly;
-  }
-  else if (e->keyval == GDK_KEY_BackSpace && !complete) {
-    return false;
-  }
-  else if (mode == HINT_MODE) {
-    return dwb_update_hints(e);
-  }
-  else if (mode == SEARCH_FIELD_MODE) {
-    if (DWB_TAB_KEY(e)) {
-      dwb_update_hints(e);
-      return true;
+    if (dwb.state.mode & QUICK_MARK_OPEN) 
+        set_text = true;
+    /*  Handled by activate-callback */
+    if (e->keyval == GDK_KEY_Return)
+        return dwb_entry_activate(e);
+    /* Insert primary selection on shift-insert */
+    if (mode == QUICK_MARK_SAVE) 
+        return false;
+    else if (mode & COMPLETE_BUFFER) 
+    {
+        completion_buffer_key_press(e);
+        return true;
     }
-    else if (e->keyval == GDK_KEY_Return) {
-      return false;
+    else if (mode & COMPLETE_SCRIPTS && !DWB_COMPLETE_KEY(e)) 
+        return dwb.state.script_comp_readonly;
+    else if (e->keyval == GDK_KEY_BackSpace && !complete) 
+        return false;
+    else if (mode == HINT_MODE) 
+        return dwb_update_hints(e);
+    else if (mode == SEARCH_FIELD_MODE) 
+    {
+        if (DWB_TAB_KEY(e)) 
+        {
+            dwb_update_hints(e);
+            return true;
+        }
+        else if (e->keyval == GDK_KEY_Return) 
+            return false;
+        
     }
-  }
-  else if (!e->is_modifier && complete) {
-    if (DWB_TAB_KEY(e)) {
-      completion_complete_path(e->state & GDK_SHIFT_MASK);
-      return true;
+    else if (!e->is_modifier && complete) 
+    {
+        if (DWB_TAB_KEY(e)) 
+        {
+            completion_complete_path(e->state & GDK_SHIFT_MASK);
+            return true;
+        }
+        else 
+            completion_clean_path_completion();
     }
-    else {
-      completion_clean_path_completion();
+    else if (mode & COMPLETION_MODE && !DWB_COMPLETE_KEY(e) && !e->is_modifier && !CLEAN_STATE(e)) 
+        completion_clean_completion(set_text);
+    else if (mode == FIND_MODE) 
+        return false;
+    else if (DWB_COMPLETE_KEY(e)) 
+    {
+        completion_complete(dwb_eval_completion_type(), e->state & GDK_SHIFT_MASK || e->keyval == GDK_KEY_Up);
+        return true;
     }
-  }
-  else if (mode & COMPLETION_MODE && !DWB_COMPLETE_KEY(e) && !e->is_modifier && !CLEAN_STATE(e)) {
-    completion_clean_completion(set_text);
-  }
-  else if (mode == FIND_MODE) {
-    return false;
-  }
-  else if (DWB_COMPLETE_KEY(e)) {
-    completion_complete(dwb_eval_completion_type(), e->state & GDK_SHIFT_MASK || e->keyval == GDK_KEY_Up);
-    return true;
-  }
-  if (dwb_eval_override_key(e, CP_OVERRIDE_ENTRY)) {
-    ret = true;
-  }
-  return ret;
+    if (dwb_eval_override_key(e, CP_OVERRIDE_ENTRY)) 
+        ret = true;
+    return ret;
 }/*}}}*/
 
 /* dwb_delete_event_cb {{{*/
 gboolean
-callback_delete_event(GtkWidget *w) {
-  dwb_end();
-  return true;
+callback_delete_event(GtkWidget *w) 
+{
+    dwb_end();
+    return true;
 }/*}}}*/
 
 /* dwb_key_press_cb(GtkWidget *w, GdkEventKey *e, View *v) {{{*/
 gboolean 
-callback_key_press(GtkWidget *w, GdkEventKey *e) {
-  gboolean ret = false;
-  Mode mode = CLEAN_MODE(dwb.state.mode);
+callback_key_press(GtkWidget *w, GdkEventKey *e) 
+{
+    gboolean ret = false;
+    Mode mode = CLEAN_MODE(dwb.state.mode);
 
-  if (EMIT_SCRIPT(KEY_PRESS)) {
-    char *json = util_create_json(5, UINTEGER, "state", e->state, 
-        UINTEGER, "keyVal", e->keyval, UINTEGER, "keyCode", e->hardware_keycode,
-        BOOLEAN, "isModifier", e->is_modifier, CHAR, "name", gdk_keyval_name(e->keyval));
-    ScriptSignal signal = { SCRIPTS_WV(dwb.state.fview), SCRIPTS_SIG_META(json, KEY_PRESS, 0) };
-    SCRIPTS_EMIT_RETURN(signal, json, true);
-  }
+    if (EMIT_SCRIPT(KEY_PRESS)) 
+    {
+        char *json = util_create_json(5, UINTEGER, "state", e->state, 
+                UINTEGER, "keyVal", e->keyval, UINTEGER, "keyCode", e->hardware_keycode,
+                BOOLEAN, "isModifier", e->is_modifier, CHAR, "name", gdk_keyval_name(e->keyval));
+        ScriptSignal signal = { SCRIPTS_WV(dwb.state.fview), SCRIPTS_SIG_META(json, KEY_PRESS, 0) };
+        SCRIPTS_EMIT_RETURN(signal, json, true);
+    }
 
-  if (e->keyval == GDK_KEY_Escape) {
-    if (dwb.state.mode & COMPLETION_MODE) {
-      completion_clean_completion(true);
+    if (e->keyval == GDK_KEY_Escape) 
+    {
+        if (dwb.state.mode & COMPLETION_MODE) 
+            completion_clean_completion(true);
+        else 
+            dwb_change_mode(NORMAL_MODE, true);
+        ret = false;
     }
-    else 
-      dwb_change_mode(NORMAL_MODE, true);
-    ret = false;
-  }
-  else if(e->state == GDK_SHIFT_MASK && e->keyval == GDK_KEY_Insert) {
-    dwb_paste_primary();
-    return true;
-  }
-  else if (dwb_eval_override_key(e, CP_OVERRIDE_ALL)) 
-    ret = true;
-  else if (mode & INSERT_MODE) {
-    ret = dwb_eval_override_key(e, CP_OVERRIDE_INSERT);
-  }
-  else if (gtk_widget_has_focus(dwb.gui.entry) || mode & COMPLETION_MODE) {
-    ret = false;
-  }
-  else if (webkit_web_view_has_selection(CURRENT_WEBVIEW()) && e->keyval == GDK_KEY_Return) {
-    dwb_follow_selection();
-  }
-  else if (dwb.state.mode & AUTO_COMPLETE && DWB_TAB_KEY(e)) {
-    completion_autocomplete(dwb.keymap, e);
-    ret = true;
-  }
-  else {
-    if (mode & AUTO_COMPLETE) {
-      if (DWB_TAB_KEY(e)) {
-        completion_autocomplete(NULL, e);
-      }
-      else if (e->keyval == GDK_KEY_Return) {
-        completion_eval_autocompletion();
+    else if(e->state == GDK_SHIFT_MASK && e->keyval == GDK_KEY_Insert) 
+    {
+        dwb_paste_primary();
         return true;
-      }
     }
-    ret = dwb_eval_key(e);
-  }
-  return ret;
+    else if (dwb_eval_override_key(e, CP_OVERRIDE_ALL)) 
+        ret = true;
+    else if (mode & INSERT_MODE) 
+        ret = dwb_eval_override_key(e, CP_OVERRIDE_INSERT);
+    else if (gtk_widget_has_focus(dwb.gui.entry) || mode & COMPLETION_MODE) 
+        ret = false;
+    else if (webkit_web_view_has_selection(CURRENT_WEBVIEW()) && e->keyval == GDK_KEY_Return) 
+        dwb_follow_selection();
+    else if (dwb.state.mode & AUTO_COMPLETE && DWB_TAB_KEY(e)) 
+    {
+        completion_autocomplete(dwb.keymap, e);
+        ret = true;
+    }
+    else 
+    {
+        if (mode & AUTO_COMPLETE) 
+        {
+            if (DWB_TAB_KEY(e)) 
+                completion_autocomplete(NULL, e);
+            else if (e->keyval == GDK_KEY_Return) 
+            {
+                completion_eval_autocompletion();
+                return true;
+            }
+        }
+        ret = dwb_eval_key(e);
+    }
+    return ret;
 }/*}}}*/
 
 /* dwb_key_release_cb {{{*/
 gboolean 
-callback_key_release(GtkWidget *w, GdkEventKey *e) {
-  if (EMIT_SCRIPT(KEY_RELEASE)) {
-    char *json = util_create_json(5, UINTEGER, "state", e->state, 
-        UINTEGER, "keyVal", e->keyval, UINTEGER, "keyCode", e->hardware_keycode,
-        BOOLEAN, "isModifier", e->is_modifier, CHAR, "name", gdk_keyval_name(e->keyval));
-    ScriptSignal signal = { SCRIPTS_WV(dwb.state.fview), SCRIPTS_SIG_META(json, KEY_RELEASE, 0) };
-    SCRIPTS_EMIT_RETURN(signal, json, true);
-  }
-  if (DWB_TAB_KEY(e)) {
-    return true;
-  }
-  return false;
+callback_key_release(GtkWidget *w, GdkEventKey *e) 
+{
+    if (EMIT_SCRIPT(KEY_RELEASE)) 
+    {
+        char *json = util_create_json(5, UINTEGER, "state", e->state, 
+                UINTEGER, "keyVal", e->keyval, UINTEGER, "keyCode", e->hardware_keycode,
+                BOOLEAN, "isModifier", e->is_modifier, CHAR, "name", gdk_keyval_name(e->keyval));
+        ScriptSignal signal = { SCRIPTS_WV(dwb.state.fview), SCRIPTS_SIG_META(json, KEY_RELEASE, 0) };
+        SCRIPTS_EMIT_RETURN(signal, json, true);
+    }
+    if (DWB_TAB_KEY(e)) 
+        return true;
+
+    return false;
 }/*}}}*/
 
 #ifdef WITH_LIBSOUP_2_38
 void 
-callback_dns_resolve(SoupAddress *address, guint status, GList *gl) {
-  char *uri = NULL;
-  View *v = VIEW(gl);
-  if (status == SOUP_STATUS_OK) 
-    uri = g_strconcat("http://", v->status->request_uri, NULL);
-  else 
-    uri = dwb_get_searchengine(v->status->request_uri);
-  webkit_web_view_load_uri(WEBKIT_WEB_VIEW(v->web), uri);
-  g_free(uri);
-  g_free(v->status->request_uri);
-  v->status->request_uri = NULL;
+callback_dns_resolve(SoupAddress *address, guint status, GList *gl) 
+{
+    char *uri = NULL;
+    View *v = VIEW(gl);
+    if (status == SOUP_STATUS_OK) 
+        uri = g_strconcat("http://", v->status->request_uri, NULL);
+    else 
+        uri = dwb_get_searchengine(v->status->request_uri);
+
+    webkit_web_view_load_uri(WEBKIT_WEB_VIEW(v->web), uri);
+    g_free(uri);
+    g_free(v->status->request_uri);
+    v->status->request_uri = NULL;
 }
 #endif