cleanup on key_press_cb, still non functional :)

1 files changed, 10 insertions, 36 deletions

diff --git a/sb.c b/sb.c
index ae34b25..26b198c 100644
--- a/sb.c
+++ b/sb.c
@@ -142,48 +142,22 @@ gpointer * new_window(void) {
 gboolean key_press_cb (GtkWidget *widget, GdkEventKey *event) {	
 if (event->state == GDK_CONTROL_MASK) {
 
-	if (gdk_keyval_to_lower(event->keyval) == GDK_f) {
-		gtk_widget_grab_focus(GTK_WIDGET(sb.bar));	
-		return TRUE;
-	}
-	if (gdk_keyval_to_lower(event->keyval) == GDK_l) {
-		gtk_widget_grab_focus(GTK_WIDGET(sb.bar));
-		return TRUE;
-	}	
-	if (gdk_keyval_to_lower(event->keyval) == GDK_j) {
-		go_back_cb(NULL, NULL);
-
-		return TRUE;
-	}	
-	if (gdk_keyval_to_lower(event->keyval) == GDK_k) {
-		go_forward_cb(NULL, NULL);
-		return TRUE;
-	}	
-	if (gdk_keyval_to_lower(event->keyval) == GDK_bracketright) {
-		
-		webkit_web_view_set_zoom_level(sb.view, (webkit_web_view_get_zoom_level(sb.view) + .05));
-		return TRUE;
-	}
-		if (gdk_keyval_to_lower(event->keyval) == GDK_bracketleft) {
-		
-		webkit_web_view_set_zoom_level(sb.view, (webkit_web_view_get_zoom_level(sb.view) - .05));
-		return TRUE;
-	}
-	else {
-		return FALSE;
-	}
+	if (gdk_keyval_to_lower(event->keyval) == GDK_f) {	gtk_widget_grab_focus(GTK_WIDGET(sb.bar)); return TRUE; }
+	if (gdk_keyval_to_lower(event->keyval) == GDK_l) {	gtk_widget_grab_focus(GTK_WIDGET(sb.bar)); return TRUE; }	
+	if (gdk_keyval_to_lower(event->keyval) == GDK_j) {  go_back_cb(NULL, NULL); return TRUE; }	
+	if (gdk_keyval_to_lower(event->keyval) == GDK_k) {	go_forward_cb(NULL, NULL); return TRUE;	}	
+	if (gdk_keyval_to_lower(event->keyval) == GDK_bracketright) { webkit_web_view_set_zoom_level(sb.view, (webkit_web_view_get_zoom_level(sb.view) + .05));	return TRUE; }
+	if (gdk_keyval_to_lower(event->keyval) == GDK_bracketleft) { webkit_web_view_set_zoom_level(sb.view, (webkit_web_view_get_zoom_level(sb.view) - .05)); return TRUE;	}
+	else { return FALSE; }
 }
-
-	if (gtk_widget_has_focus(sb.bar) && gdk_keyval_to_lower(event->keyval) == GDK_Escape) {
-		gtk_widget_grab_focus(GTK_WIDGET(sb.view));
-		return TRUE;
-	}
+	if (gtk_widget_has_focus(sb.bar) && gdk_keyval_to_lower(event->keyval) == GDK_Escape) {	gtk_widget_grab_focus(GTK_WIDGET(sb.view)); return TRUE; }
+	
 	return FALSE;
 }
 	
 
 int main (int argc, char* argv[]) {
-    gtk_init (&argc, &argv);\
+    gtk_init (&argc, &argv);
     struct window *w;
 	(window *) w = new_window();
 	//gchar* w->starting_uri = (gchar*) (argc > 1 ? argv[1] : "http://www.google.com/");