about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarco Peereboom <marco@conformal.com>2011-01-11 02:37:53 +0000
committerMarco Peereboom <marco@conformal.com>2011-01-11 02:37:53 +0000
commitce4b1f4a64ec7767261a45a651ea40097101579b (patch)
tree246f48faa77b01676236a76545e3662dacac2f46
parentf326fa2219717c874982bb6a9a0fe4d0aee6a77c (diff)
downloadxombrero-ce4b1f4a64ec7767261a45a651ea40097101579b.tar.gz
delete a bunch of hide_oops now that we do it much earlier
-rw-r--r--xxxterm.c29
1 files changed, 1 insertions, 28 deletions
diff --git a/xxxterm.c b/xxxterm.c
index d89b237..3dd2464 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -4654,11 +4654,6 @@ wv_keypress_after_cb(GtkWidget *w, GdkEventKey *e, struct tab *t)
 	DNPRINTF(XT_D_KEY, "wv_keypress_after_cb: keyval 0x%x mask 0x%x t %p\n",
 	    e->keyval, e->state, t);
 
-	if (w == GTK_WIDGET(t->cmd)) {
-		goto done;
-	}
-	hide_oops(t);
-
 	if (t->hints_on) {
 		/* ESC */
 		if (CLEAN(e->state) == 0 && e->keyval == GDK_Escape) {
@@ -4775,7 +4770,7 @@ anum:
 			return (XT_CB_HANDLED);
 		}
 
-done:
+
 	return (XT_CB_PASSTHROUGH);
 }
 
@@ -4803,11 +4798,6 @@ cmd_keyrelease_cb(GtkEntry *w, GdkEventKey *e, struct tab *t)
 	DNPRINTF(XT_D_CMD, "cmd_keyrelease_cb: keyval 0x%x mask 0x%x t %p\n",
 	    e->keyval, e->state, t);
 
-	if (w == GTK_ENTRY(t->oops)) {
-		hide_oops(t);
-		goto done;
-	}
-
 	if (c[0] == ':')
 		goto done;
 	if (strlen(c) == 1) {
@@ -4906,12 +4896,6 @@ cmd_keypress_cb(GtkEntry *w, GdkEventKey *e, struct tab *t)
 	DNPRINTF(XT_D_CMD, "cmd_keypress_cb: keyval 0x%x mask 0x%x t %p\n",
 	    e->keyval, e->state, t);
 
-	if (w == GTK_ENTRY(t->oops)) {
-		hide_oops(t);
-		rv = XT_CB_PASSTHROUGH;
-		goto done;
-	}
-
 	/* sanity */
 	if (c == NULL)
 		e->keyval = GDK_Escape;
@@ -4962,12 +4946,6 @@ cmd_focusout_cb(GtkWidget *w, GdkEventFocus *e, struct tab *t)
 	DNPRINTF(XT_D_CMD, "cmd_focusout_cb: tab %d focus_wv %d\n",
 	    t->tab_id, t->focus_wv);
 
-	/* abort command when losing focus */
-	if (w == GTK_WIDGET(t->cmd))
-		hide_cmd(t);
-	else
-		hide_oops(t);
-
 	if (t->focus_wv)
 		gtk_widget_grab_focus(GTK_WIDGET(t->wv));
 	else
@@ -4988,11 +4966,6 @@ cmd_activate_cb(GtkEntry *entry, struct tab *t)
 
 	DNPRINTF(XT_D_CMD, "cmd_activate_cb: tab %d %s\n", t->tab_id, c);
 
-	if (entry == GTK_ENTRY(t->oops)) {
-		hide_oops(t);
-		return;
-	}
-
 	/* sanity */
 	if (c == NULL)
 		goto done;