open.source/rosenrot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GTK4: try diagnosing again

Browse Source
This commit is contained in:
NunoSempere 2024-07-21 00:02:25 -04:00
parent 61a1d4f0f3
commit 6f3f56c604
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -3,7 +3,7 @@ CC=gcc # alternatives: tcc, clang, zig cc
WARNINGS=-Wall WARNINGS=-Wall
OPTIMIZED_SOME=-O3 OPTIMIZED_SOME=-O3
OPTIMIZED_MORE=-Ofast -march=native -funit-at-a-time -flto # binary will not be compatible with other computers, but may be much faster OPTIMIZED_MORE=-Ofast -march=native -funit-at-a-time -flto # binary will not be compatible with other computers, but may be much faster
DEBUG=# DEBUG=
STD=-std=c99 # maybe consider moving to c11 and using safer string handling STD=-std=c99 # maybe consider moving to c11 and using safer string handling
# Dependencies for WebkitGTK4/GTK3 # Dependencies for WebkitGTK4/GTK3
@ -81,7 +81,7 @@ user_cache:
runtime_files: runtime_files:
@echo @echo
sudo mkdir -p /opt/rosenrot/ sudo mkdir -p /opt/rosenrot/
sudo cp style.css /opt/rosenrot/ sudo cp style-gtk4.css /opt/rosenrot/style.css
sudo cp -r images/flower-imgs /opt/rosenrot/ sudo cp -r images/flower-imgs /opt/rosenrot/
sudo cp plugins/style/style.js /opt/rosenrot/ sudo cp plugins/style/style.js /opt/rosenrot/
sudo cp plugins/readability/readability.js /opt/rosenrot/ sudo cp plugins/readability/readability.js /opt/rosenrot/

45
rosenrot4_greenfield.c
View File

@ -20,6 +20,9 @@ static struct {
static int num_tabs = 0; static int num_tabs = 0;
static int custom_style_enabled = 1; static int custom_style_enabled = 1;
/* Event controllers */
GtkEventController* event_controller_keypress;
/* Forward declarations */ /* Forward declarations */
void toggle_bar(GtkNotebook* notebook, Bar_entry_mode mode); void toggle_bar(GtkNotebook* notebook, Bar_entry_mode mode);
void notebook_create_new_tab(GtkNotebook* notebook, const char* uri); void notebook_create_new_tab(GtkNotebook* notebook, const char* uri);
@ -175,8 +178,24 @@ void notebook_create_new_tab(GtkNotebook* notebook, const char* uri)
if (num_tabs < MAX_NUM_TABS || MAX_NUM_TABS == 0) { if (num_tabs < MAX_NUM_TABS || MAX_NUM_TABS == 0) {
WebKitWebView* view = create_new_webview(); WebKitWebView* view = create_new_webview();
g_signal_connect(view, "load_changed", G_CALLBACK(handle_signal_load_changed), notebook); // g_signal_connect(view, "load_changed", G_CALLBACK(handle_signal_load_changed), notebook);
// I suspect there is something wonky going on here
// YEP, there is a problem here
// todo: fix
/* GtkEventController* event_controller_load_changed;
event_controller_load_changed = gtk_event_controller_key_new();
g_signal_connect_object(event_controller_load_changed, "load_changed", G_CALLBACK(handle_signal_load_changed), notebook, G_CONNECT_DEFAULT);
gtk_widget_add_controller(GTK_WIDGET(view), event_controller_load_changed);
*/
g_signal_connect(view, "create", G_CALLBACK(handle_signal_create_new_tab), notebook); g_signal_connect(view, "create", G_CALLBACK(handle_signal_create_new_tab), notebook);
// I suspect there is something wonky going on here
/*
GtkEventController* event_controller_create_new_tab;
event_controller_create_new_tab = gtk_event_controller_key_new();
g_signal_connect_object(event_controller_create_new_tab, "create", G_CALLBACK(handle_signal_create_new_tab), notebook, G_CONNECT_DEFAULT);
gtk_widget_add_controller(GTK_WIDGET(view), event_controller_create_new_tab);
*/
int n = gtk_notebook_append_page(notebook, GTK_WIDGET(view), NULL); int n = gtk_notebook_append_page(notebook, GTK_WIDGET(view), NULL);
gtk_notebook_set_tab_reorderable(notebook, GTK_WIDGET(view), true); gtk_notebook_set_tab_reorderable(notebook, GTK_WIDGET(view), true);
@ -364,7 +383,7 @@ static gboolean handle_signal_keypress(GtkWidget* drawing_area,
guint keyval, guint keyval,
guint keycode, guint keycode,
GdkModifierType state, GdkModifierType state,
GtkEventControllerKey* event_controller) GtkEventControllerKey* event_controller_keypress)
{ {
fprintf(stdout, "New keypress!\n"); fprintf(stdout, "New keypress!\n");
@ -386,9 +405,9 @@ int main(int argc, char** argv)
/* Initialize GTK in general */ /* Initialize GTK in general */
gtk_init(); gtk_init();
g_object_set(gtk_settings_get_default(), GTK_SETTINGS_CONFIG_H, NULL); // https://docs.gtk.org/gobject/method.Object.set.html g_object_set(gtk_settings_get_default(), GTK_SETTINGS_CONFIG_H, NULL); // https://docs.gtk.org/gobject/method.Object.set.html
// GtkCssProvider* css = gtk_css_provider_new(); GtkCssProvider* css = gtk_css_provider_new();
// gtk_css_provider_load_from_path(css, "/opt/rosenrot/style.css"); gtk_css_provider_load_from_path(css, "/opt/rosenrot/style.css");
// gtk_style_context_add_provider_for_display(gdk_display_get_default(), GTK_STYLE_PROVIDER(css), 0); /* might change with GTK4/webkitgtk6.0 */ gtk_style_context_add_provider_for_display(gdk_display_get_default(), GTK_STYLE_PROVIDER(css), 0); /* might change with GTK4/webkitgtk6.0 */
printf("%d", GTK_STYLE_PROVIDER_PRIORITY_USER); printf("%d", GTK_STYLE_PROVIDER_PRIORITY_USER);
printf("%d", GTK_STYLE_PROVIDER_PRIORITY_FALLBACK); printf("%d", GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
@ -407,7 +426,6 @@ int main(int argc, char** argv)
bar.line = GTK_ENTRY(gtk_entry_new_with_buffer(bar.line_text)); bar.line = GTK_ENTRY(gtk_entry_new_with_buffer(bar.line_text));
gtk_entry_set_alignment(bar.line, 0.48); gtk_entry_set_alignment(bar.line, 0.48);
gtk_widget_set_size_request(GTK_WIDGET(bar.line), BAR_SIZE, -1); gtk_widget_set_size_request(GTK_WIDGET(bar.line), BAR_SIZE, -1);
g_signal_connect(bar.line, "activate", G_CALLBACK(handle_signal_bar_press_enter), notebook);
bar.widget = GTK_HEADER_BAR(gtk_header_bar_new()); bar.widget = GTK_HEADER_BAR(gtk_header_bar_new());
gtk_header_bar_set_title_widget(bar.widget, GTK_WIDGET(bar.line)); gtk_header_bar_set_title_widget(bar.widget, GTK_WIDGET(bar.line));
@ -415,12 +433,17 @@ int main(int argc, char** argv)
// Listen to signals // Listen to signals
GtkEventController* event_controller; // g_signal_connect(window, "destroy", G_CALLBACK(exit), notebook);
event_controller = gtk_event_controller_key_new(); event_controller_keypress = gtk_event_controller_key_new();
g_signal_connect_object(event_controller_keypress, "key-pressed", G_CALLBACK(handle_signal_keypress), window, G_CONNECT_DEFAULT);
gtk_widget_add_controller(GTK_WIDGET(window), event_controller_keypress);
g_signal_connect_object(event_controller, "key-pressed", G_CALLBACK(handle_signal_keypress), window, G_CONNECT_DEFAULT); g_signal_connect(bar.line, "activate", G_CALLBACK(handle_signal_bar_press_enter), notebook);
gtk_widget_add_controller(GTK_WIDGET(window), event_controller); // I suspect there is something wonky going on here
g_signal_connect(window, "destroy", G_CALLBACK(exit), notebook); // GtkEventController* event_controller_bar_press_enter;
// event_controller_bar_press_enter = gtk_event_controller_key_new();
// g_signal_connect_object(event_controller_bar_press_enter, "key-pressed", G_CALLBACK(handle_signal_bar_press_enter), notebook, G_CONNECT_DEFAULT);
// gtk_widget_add_controller(GTK_WIDGET(bar.line), event_controller_bar_press_enter);
// Show the application window // Show the application window
gtk_window_present(window); gtk_window_present(window);