get shortcuts working again

4 files changed, 15 insertions, 6 deletions

diff --git a/config.h b/config.h
index b6f3005..7fff23a 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,7 @@
-#include <gdk/gdkkeysyms.h>
 #include <stdbool.h>
+#include <gdk/gdk.h>
+// Previously: #include <gdk/gdkkeysyms.h>
+// But GTK now discourages including the individual headers
 
 // Key user config
 #define WIDTH 1920 // 960 for half-width, 1920 for full width
@@ -82,8 +84,8 @@ static struct {
     { CTRL,        KEY(h),          goback             },
     { CTRL,        KEY(j),          goforward          },
     { CTRL,        KEY(r),          refresh            },
-    { CTRL | SFT,  KEY(R),          refresh_force      },
-    { CTRL | SFT,  KEY(H),          back_to_home       },
+    { CTRL,        KEY(R),          refresh_force      },
+    { CTRL,        KEY(H),          back_to_home       },
     { CTRL,        KEY(equal),      zoomin             },
     { CTRL,        KEY(minus),      zoomout            },
     { CTRL,        KEY(0),          zoom_reset         },
@@ -96,7 +98,7 @@ static struct {
     { CTRL,        KEY(semicolon),  hide_bar           },
     { CTRL,        KEY(f),          show_finder        },
     { CTRL,        KEY(n),          finder_next        },
-    { CTRL | SFT,  KEY(N),          finder_prev        },
+    { CTRL,        KEY(N),          finder_prev        },
     { CTRL,        KEY(p),          prettify           }
 };
 /* ^ For controls more akin to normal browsers */
diff --git a/makefile b/makefile
index 25aa387..44723ae 100644
--- a/makefile
+++ b/makefile
@@ -64,7 +64,7 @@ fast: $(SRC) $(PLUGINS) $(CONFIG)
 	rm -f *.gcda
 
 lint: 
-	clang-tidy $(SRC) $(PLUGINS) -- -Wall -O3    `pkg-config --cflags 'webkit2gtk-4.0'` -o rose `pkg-config --libs 'webkit2gtk-4.0'`
+	clang-tidy $(SRC) $(PLUGINS) -- -Wall -O3    `pkg-config --cflags 'webkit2gtk-4.1'` -o rose `pkg-config --libs 'webkit2gtk-4.1'`
 
 inspect: build
 	GTK_DEBUG=interactive ./rose
diff --git a/rose b/rose
index 623f8b9..d6a6f8d 100755
--- a/rose
+++ b/rose
diff --git a/rose.c b/rose.c
index 775b338..f7d9ccc 100644
--- a/rose.c
+++ b/rose.c
@@ -381,8 +381,15 @@ int handle_signal_keypress(void* self, GdkEvent* event, GtkNotebook* notebook)
 {
     (void)self;
 
+    /*
+        printf("Keypress state: %d\n", event->key.state);
+        if(event->key.state & GDK_CONTROL_MASK){
+            printf("Keypress state is: CONTROL\n");
+        }
+        printf("Keypress value: %d\n", event->key.keyval);
+    */
     for (int i = 0; i < sizeof(shortcut) / sizeof(shortcut[0]); i++)
-        if ((event->key.state == shortcut[i].mod || shortcut[i].mod == 0x0) && event->key.keyval == shortcut[i].key)
+        if ((event->key.state & shortcut[i].mod || shortcut[i].mod == 0x0) && event->key.keyval == shortcut[i].key)
             return handle_shortcut(shortcut[i].id, notebook);
     /*
     If I wanted to bind button presses, like the extra button in the mouse,