From 350e6022dfe8bf112b4c29ca793f4513adb1b95d Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Fri, 16 Dec 2022 01:27:04 +0100 Subject: [PATCH] tweak: Add hide searchbar option Also bring config.def.h up to date --- config.def.h | 39 ++++++++++++++++++++++----------------- config.h | 8 ++++++-- rose.c | 4 ++++ 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/config.def.h b/config.def.h index c2daff4..d5fda39 100644 --- a/config.def.h +++ b/config.def.h @@ -45,9 +45,11 @@ typedef enum { prev_tab, close_tab, show_searchbar, + hide_searchbar, show_finder, finder_next, finder_prev + prettify } func; #define SFT 1 << 0 @@ -59,22 +61,24 @@ static struct { unsigned key; func id; } keys[] = { - { 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(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(k), hide_searchbar }, + { CTRL, KEY(f), show_finder }, + { CTRL, KEY(n), finder_next }, + { CTRL | SFT, KEY(N), finder_prev }, + { CTRL, KEY(p), prettify } }; /* For controls more akin to normal browsers, use: @@ -94,7 +98,8 @@ static struct { { CTRL, KEY(l), show_searchbar }, { CTRL, KEY(f), show_finder }, { CTRL, KEY(n), finder_next }, - { CTRL | SFT, KEY(N), finder_prev } + { CTRL | SFT, KEY(N), finder_prev }, + { CTRL, KEY(p), prettify } }; */ /* Reference for the key shorthand: diff --git a/config.h b/config.h index b9b75b7..d0fd938 100644 --- a/config.h +++ b/config.h @@ -46,6 +46,7 @@ typedef enum { prev_tab, close_tab, show_searchbar, + hide_searchbar, show_finder, finder_next, finder_prev, @@ -75,10 +76,11 @@ static struct { { CTRL, KEY(w), close_tab }, { 0x0, KEY(F11), toggle_fullscreen }, { CTRL, KEY(l), show_searchbar }, + { CTRL, KEY(k), hide_searchbar }, { CTRL, KEY(f), show_finder }, { CTRL, KEY(n), finder_next }, { CTRL | SFT, KEY(N), finder_prev }, - { CTRL, KEY(p), prettify }, + { CTRL, KEY(p), prettify } }; /* ^ For controls more akin to normal browsers */ /* Reference for the key shorthand: @@ -94,12 +96,14 @@ static struct { { CTRL, KEY(minus), zoomout }, { CTRL, KEY(0), zoom_reset }, { ALT, KEY(h), prev_tab }, + { CTRL, KEY(k), hide_searchbar }, { 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 | SFT, KEY(N), finder_prev }, + { CTRL, KEY(p), prettify } }; */ diff --git a/rose.c b/rose.c index 8e85be0..7e5dad5 100644 --- a/rose.c +++ b/rose.c @@ -259,6 +259,10 @@ int handle_key(func id, GtkNotebook *notebook) entry_mode = _SEARCH; show_bar(notebook); break; + + case hide_searchbar: + gtk_widget_hide(GTK_WIDGET(bar)); + break; case show_finder: entry_mode = _FIND;