From e98f5e9b2914e50e4dac374a62abb4d60c015dc1 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Fri, 22 Mar 2024 09:38:13 -0300 Subject: [PATCH] fix pageup/pagedown shortcuts --- TODO.md | 6 ++---- config.h | 45 ++++++++++++++++++++++++++------------------- rosenrot | Bin 40120 -> 40120 bytes rosenrot.c | 5 ++--- 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/TODO.md b/TODO.md index 79f4283..5c270b5 100644 --- a/TODO.md +++ b/TODO.md @@ -1,12 +1,9 @@ # To do -## Quality of life: - - [ ] Document creating new applications, e.g., as in [Asana for Linux](https://git.nunosempere.com/NunoSempere/asana-for-linux) -- [ ] Use something other than Whatsapp as an example syslink. + - [ ] This time, use something other than Whatsapp as an example syslink. - [ ] Fix bug about distorted audio. Maybe related to [this pipewire issue]()? - See whether it even exists at all -- [ ] Fix PageUp/PageDown shortcuts. - [ ] Upgrade to GTK-4 / Webkitgtk 6.0? Will take a fair amount of time, since GTK4 redesigns the application model somewhat. - Instructions for webkit-6.0 [here](https://github.com/WebKit/WebKit/blob/ed1422596dce5ff012e64a38faf402ac1674fc7e/Source/WebKit/gtk/migrating-to-webkitgtk-6.0.md) - Instructions for GTK-4 [here](https://docs.gtk.org/gtk4/migrating-3to4.html) @@ -17,6 +14,7 @@ # Previously done +- [x] Fix PageUp/PageDown shortcuts. - ~~[ ] Set [`webkit_web_context_set_sandbox_enabled`](), as recommended [here]()~~. Irrelevant with upgrade to libsoup3. - [x] Update to webkit2gtk-4.1 - [x] Change README and point to last Ubuntu 20.04 commit diff --git a/config.h b/config.h index 1409d18..e2a13ed 100644 --- a/config.h +++ b/config.h @@ -53,6 +53,13 @@ To remove plugins completely; // GTK #define GTK_SETTINGS_CONFIG_H "gtk-application-prefer-dark-theme", false, "gtk-enable-animations", false #define KEY(x) GDK_KEY_##x +/* +There are two different constants for Page_Up/Page_Down: +This could possibly have something to so with having Page_Down/Page_Up +as part of a keypad with/without NumLock +See: https://docs.gtk.org/gdk3/?q=Page_Up +See: https://docs.gtk.org/gdk3/?q=GDK_KEY_KP +*/ // Shortcuts typedef enum { @@ -87,25 +94,25 @@ static struct { unsigned key; func id; } shortcut[] = { - { CTRL, KEY(h), goback }, - { CTRL, KEY(j), goforward }, - { CTRL, KEY(r), refresh }, - { CTRL, KEY(R), refresh_force }, - { CTRL, KEY(H), back_to_home }, - { CTRL, KEY(equal), zoomin }, - { CTRL, KEY(minus), zoomout }, - { CTRL, KEY(0), zoom_reset }, - { CTRL, KEY(Page_Up), prev_tab }, - { CTRL, KEY(Page_Down), next_tab }, - { CTRL, KEY(t), new_tab }, - { CTRL, KEY(w), close_tab }, - { 0x0, KEY(F11), toggle_fullscreen }, - { CTRL, KEY(l), show_searchbar }, - { CTRL, KEY(semicolon), hide_bar }, - { CTRL, KEY(f), show_finder }, - { CTRL, KEY(n), finder_next }, - { CTRL, KEY(N), finder_prev }, - { CTRL, KEY(p), prettify } + { CTRL, KEY(h), goback }, + { CTRL, KEY(j), goforward }, + { CTRL, KEY(r), refresh }, + { CTRL, KEY(R), refresh_force }, + { CTRL, KEY(H), back_to_home }, + { CTRL, KEY(equal), zoomin }, + { CTRL, KEY(minus), zoomout }, + { CTRL, KEY(0), zoom_reset }, + { CTRL, KEY(KP_Page_Up), prev_tab }, /* also try KEY(Page_Up) if this doesn't work on your machine */ + { CTRL, KEY(KP_Page_Down), next_tab }, /* ditto for KEY(Page_Down) */ + { CTRL, KEY(t), new_tab }, + { CTRL, KEY(w), close_tab }, + { 0x0, KEY(F11), toggle_fullscreen }, + { CTRL, KEY(l), show_searchbar }, + { CTRL, KEY(semicolon), hide_bar }, + { CTRL, KEY(f), show_finder }, + { CTRL, KEY(n), finder_next }, + { CTRL, KEY(N), finder_prev }, + { CTRL, KEY(p), prettify } }; /* ^ For controls more akin to normal browsers */ /* Reference for the key shorthand: diff --git a/rosenrot b/rosenrot index a72527c2bad73be1e7bd0ab8643c9aa40f7fdc0b..20fac11fcebc9536623f8219d601593818301c85 100755 GIT binary patch delta 2613 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 p%Ge(5v~MTz!Y9gXY);GT>RrjU@oQ%amep