diff options
| -rw-r--r-- | config.def.h | 49 | ||||
| -rw-r--r-- | rose.c | 22 |
2 files changed, 38 insertions, 33 deletions
diff --git a/config.def.h b/config.def.h index 8a10f74..5612d2b 100644 --- a/config.def.h +++ b/config.def.h @@ -14,11 +14,14 @@ /* 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 +#define WEBKIT \ + "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 +#define GTK \ + "gtk-application-prefer-dark-theme", true, \ + "gtk-enable-animations", false #define HOME "https://lite.duckduckgo.com/html/" #define SEARCH "https://lite.duckduckgo.com/html/?q=%s" @@ -48,7 +51,8 @@ typedef enum { show_finder, finder_next, finder_prev, - newtab + newtab, + hidebar } func; #define SFT 1 << 0 @@ -60,23 +64,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(t), newtab } + { 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(t), newtab }, + { 0x0, KEY(Escape), hidebar } }; /* For controls more akin to normal browsers, use: { @@ -6,8 +6,6 @@ * files to modify, copy, merge, publish, distribute and/or * sublicense copies of this sotware for their own use. * This code does not come with any warranty. - * - * @author: fenze <contact@fenze.dev> */ #include <string.h> #include <stdbool.h> @@ -28,7 +26,7 @@ "offline-application-cache-directory", CACHE_DIR, \ "service-worker-registrations-directory", CACHE_DIR -enum { _SEARCH, _FIND }; +enum { _SEARCH, _FIND, _HIDDEN }; static int entry_mode; static GtkWindow *window; @@ -86,7 +84,8 @@ void redirect_if_annoying(WebKitWebView *view, const char *uri){ str_init(uri_filtered, l); int check = libre_redirect(uri, uri_filtered); - if(check == 2){ + + if (check == 2){ webkit_web_view_load_uri(view, uri_filtered); } @@ -153,12 +152,15 @@ void show_bar(GtkNotebook *notebook) gtk_entry_buffer_set_text(search_buf, url, strlen(url)); gtk_widget_show(GTK_WIDGET(bar)); gtk_window_set_focus(window, GTK_WIDGET(search)); + } else if (entry_mode == _HIDDEN) { + gtk_widget_hide(GTK_WIDGET(bar)); } else { const char *search_text = webkit_find_controller_get_search_text( webkit_web_view_get_find_controller(notebook_get_webview(notebook))); if (search_text != NULL) gtk_entry_buffer_set_text(search_buf, search_text, strlen(search_text)); + gtk_entry_set_placeholder_text(search, "Find"); gtk_widget_show(GTK_WIDGET(bar)); gtk_window_set_focus(window, GTK_WIDGET(search)); @@ -267,9 +269,11 @@ int handle_key(func id, GtkNotebook *notebook) case newtab: notebook_append(notebook, NULL); gtk_notebook_set_show_tabs(notebook, true); - } - + case hidebar: + entry_mode = _HIDDEN; + show_bar(notebook); + } return 1; } @@ -301,17 +305,14 @@ void search_activate(GtkEntry *self, GtkNotebook *notebook) void window_init(GtkNotebook *notebook) { GtkCssProvider *css = gtk_css_provider_new(); - gtk_css_provider_load_from_path(css, "/usr/share/themes/rose/style.css", NULL); gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css), 800); - gtk_entry_buffer_new("", 0); gtk_entry_set_alignment(search, 0.48); gtk_widget_set_size_request(GTK_WIDGET(search), 300, -1); gtk_header_bar_set_custom_title(bar, GTK_WIDGET(search)); gtk_window_set_titlebar(window, GTK_WIDGET(bar)); - g_signal_connect(search, "activate", G_CALLBACK(search_activate), notebook); g_signal_connect(window, "key-press-event", G_CALLBACK(keypress), notebook); g_signal_connect(window, "destroy", G_CALLBACK(exit), notebook); @@ -340,8 +341,7 @@ void setup(GtkNotebook *notebook, const char *uri) gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(notebook)); gtk_widget_show_all(GTK_WIDGET(window)); gtk_widget_hide(GTK_WIDGET(bar)); - webkit_web_view_set_zoom_level(notebook_get_webview(notebook), ZOOM); - + webkit_web_view_set_zoom_level(notebook_get_webview(notebook), ZOOM); } int main(int argc, char **argv) |