Passthrough stuff, some minor improvements, more keybinds

1 files changed, 5 insertions, 1 deletions

diff --git a/main.c b/main.c
index 5f2ef12..f585465 100644
--- a/main.c
+++ b/main.c
@@ -46,6 +46,7 @@ static void parse_keybind(const char *key, guint *keyval, GdkModifierType *mods)
 	if (strstr(key, "A-")) *mods |= GDK_MOD1_MASK;
 
 	/* everything after the last '-' and before '>' */
+	/* this means we can't have things like <S-A-z> for example, but too bad so sad. cannot be bothered to implement that at the moment */
 	start = strrchr(key, '-') + 1;
 	end = strchr(key, '>');
 	snprintf(name, sizeof(name), "%.*s", (int)(end - start), start);
@@ -60,6 +61,7 @@ static void on_title_changed(WebKitWebView *webview, GParamSpec *pspec, GtkNoteb
 
 static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) {
 	Cinnamon* cinnamon = (Cinnamon*)data;
+	GdkModifierType relevant = GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK;
 	if (mode == 1 || mode == 2) {
 		if (mode == 1 && event->keyval == GDK_KEY_Escape) {
 			set_mode(cinnamon, 0);
@@ -68,6 +70,9 @@ static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer dat
 				cmdbar_focused = false;
 			}
 		}
+		if (mode == 2 && event->keyval == GDK_KEY_Escape && (event->state & relevant) == GDK_SHIFT_MASK) {
+			set_mode(cinnamon, 0);
+		}
 	}
 	else {
 		if (event->keyval == GDK_KEY_colon) {
@@ -82,7 +87,6 @@ static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer dat
 			guint keyval;
 			GdkModifierType mods;
 			parse_keybind(keybinds[i].key, &keyval, &mods);
-			GdkModifierType relevant = GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK;
 			if (gdk_keyval_to_lower(event->keyval) == keyval && (event->state & relevant) == mods) {
 				/* we dont know what to do yet, printf */
 				keybinds[i].fptr(cinnamon, keybinds[i].arg);