diff --git a/README.md b/README.md index bd6f68d..bd952da 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Rose is released under own license, which grants the following permissions: ### To do - [ ] String substitution on uri in order to redirect to better frontends. -- [ ] Present "standard" browser keybindings as an alternative. -- [ ] Fix zoom in new tab +- [x] Present "standard" browser keybindings as an alternative. +- [x] Fix zoom in new tab - [ ] Make tab bar slightly prettier. diff --git a/config.def.h b/config.def.h index 76103b8..30df77f 100644 --- a/config.def.h +++ b/config.def.h @@ -15,8 +15,8 @@ /* See more: * https://webkitgtk.org/reference/webkit2gtk/stable/class.Settings.html */ #define WEBKIT \ - "enable-back-forward-navigation-gestures", true, "enable-developer-extras", true, \ - "enable-smooth-scrolling", false + "enable-back-forward-navigation-gestures", true, "enable-developer-extras", true, \ + "enable-smooth-scrolling", false #define GTK "gtk-application-prefer-dark-theme", true, "gtk-enable-animations", false @@ -25,29 +25,29 @@ #define CACHE_DIR "/home/fenze/.cache/rose" #define KEY(x) GDK_KEY_##x -#define ZOOM 1 /* Starting zoom level */ +#define ZOOM 1 /* Starting zoom level */ #define ZOOM_VAL .1 /* Zooming value in zoomin/zoomout functions */ #define BG_COLOR "#1E1E2E" /* or "#FEFEFE" if you are not using the dark theme. */ #define WIDTH 500 #define HEIGHT 400 typedef enum { - goback, - goforward, - refresh, - refresh_force, - back_to_home, - toggle_fullscreen, - zoomin, - zoomout, - zoom_reset, - next_tab, - prev_tab, - close_tab, - show_searchbar, - show_finder, - finder_next, - finder_prev + goback, + goforward, + refresh, + refresh_force, + back_to_home, + toggle_fullscreen, + zoomin, + zoomout, + zoom_reset, + next_tab, + prev_tab, + close_tab, + show_searchbar, + show_finder, + finder_next, + finder_prev } func; #define SFT 1 << 0 @@ -55,33 +55,47 @@ typedef enum { #define ALT 1 << 3 static struct { - unsigned mod; - unsigned key; - func id; + unsigned mod; + unsigned key; + func id; } keys[] = { - { CTRL, KEY(h), goback }, - { CTRL, KEY(l), goforward }, - { CTRL, KEY(r), refresh }, + { CTRL, KEY(h), goback }, + { CTRL, KEY(l), goforward }, + { CTRL, KEY(r), refresh }, { CTRL | SFT, KEY(R), refresh_force }, { CTRL | SFT, KEY(H), back_to_home }, - { CTRL, KEY(equal), zoomin }, - { CTRL, KEY(minus), zoomout }, - { CTRL, KEY(0), zoom_reset }, - { ALT, KEY(h), prev_tab }, - { ALT, KEY(l), next_tab }, - { CTRL, KEY(w), close_tab }, - { 0x0, KEY(F11), toggle_fullscreen }, - { CTRL, KEY(e), show_searchbar }, - { CTRL, KEY(f), show_finder }, - { CTRL, KEY(n), finder_next }, - { CTRL | SFT, KEY(N), finder_prev } + { CTRL, KEY(equal), zoomin }, + { CTRL, KEY(minus), zoomout }, + { CTRL, KEY(0), zoom_reset }, + { ALT, KEY(h), prev_tab }, + { ALT, KEY(l), next_tab }, + { CTRL, KEY(w), close_tab }, + { 0x0, KEY(F11), toggle_fullscreen }, + { CTRL, KEY(e), show_searchbar }, + { CTRL, KEY(f), show_finder }, + { CTRL, KEY(n), finder_next }, + { CTRL | SFT, KEY(N), finder_prev } }; -/* -Default browser controls: -- Ctrl+L: Go to searchbar -- Ctrl+T: New Tab -- Ctrl+Page up: Go to next tab -- Ctrl+Page down: Go to previous tab - +/* For controls more akin to normal browsers, use: +{ + { 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(equal), zoomin }, + { CTRL, KEY(minus), zoomout }, + { CTRL, KEY(0), zoom_reset }, + { CTRL, KEY(Page_Down), prev_tab }, + { CTRL, KEY(Page_Up), next_tab }, + { CTRL, KEY(w), close_tab }, + { 0x0, KEY(F11), toggle_fullscreen }, + { CTRL, KEY(l), show_searchbar }, + { CTRL, KEY(f), show_finder }, + { CTRL, KEY(n), finder_next }, + { CTRL | SFT, KEY(N), finder_prev } +}; */ +/* Reference for the key shorthand: + * */