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

GTK4: formatting pass

Browse Source
This commit is contained in:
NunoSempere 2024-07-21 10:13:27 -04:00
parent db4f980af9
commit d7781d308d
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
rosenrot4_beta.c
View File

@ -6,13 +6,13 @@
#include "plugins/plugins.h" #include "plugins/plugins.h"
#include <webkit/webkit.h> #include <webkit/webkit.h>
#define NULLCHECK(x) \ #define NULLCHECK(x) \
do { \ do { \
if (x == NULL) { \ if (x == NULL) { \
printf("\nNull found"); \ printf("\nNull found"); \
printf("@ %s (%d): ", __FILE__, __LINE__); \ printf("@ %s (%d): ", __FILE__, __LINE__); \
exit(0); \ exit(0); \
} \ } \
} while (0) } while (0)
static GtkNotebook* notebook; static GtkNotebook* notebook;
@ -32,8 +32,8 @@ static int custom_style_enabled = 1;
/* 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);
static int handle_signal_keypress(void *self, int keyval, int keycode, static int handle_signal_keypress(void* self, int keyval, int keycode,
GdkModifierType state, void *controller); GdkModifierType state, void* controller);
/* Utils */ /* Utils */
WebKitWebView* notebook_get_webview(GtkNotebook* notebook) WebKitWebView* notebook_get_webview(GtkNotebook* notebook)
@ -130,8 +130,6 @@ void handle_signal_load_changed(WebKitWebView* self, WebKitLoadEvent load_event,
} }
} }
/* New tabs */ /* New tabs */
WebKitWebView* create_new_webview() WebKitWebView* create_new_webview()
{ {
@ -152,9 +150,9 @@ WebKitWebView* create_new_webview()
WebKitWebView* view = g_object_new(WEBKIT_TYPE_WEB_VIEW, "settings", settings, "network-session", network_session, "user-content-manager", contentmanager, NULL); WebKitWebView* view = g_object_new(WEBKIT_TYPE_WEB_VIEW, "settings", settings, "network-session", network_session, "user-content-manager", contentmanager, NULL);
GtkEventController *event_controller = gtk_event_controller_key_new(); GtkEventController* event_controller = gtk_event_controller_key_new();
g_signal_connect(event_controller, "key-pressed", G_CALLBACK(handle_signal_keypress), NULL); g_signal_connect(event_controller, "key-pressed", G_CALLBACK(handle_signal_keypress), NULL);
gtk_widget_add_controller(GTK_WIDGET(view), event_controller); gtk_widget_add_controller(GTK_WIDGET(view), event_controller);
NULLCHECK(view); NULLCHECK(view);
return view; return view;
@ -178,7 +176,6 @@ GtkWidget* handle_signal_create_new_tab(WebKitWebView* self,
return GTK_WIDGET(self); // NULL; return GTK_WIDGET(self); // NULL;
} }
void notebook_create_new_tab_mini(GtkNotebook* notebook, const char* uri) void notebook_create_new_tab_mini(GtkNotebook* notebook, const char* uri)
{ {
WebKitWebView* view = create_new_webview(); WebKitWebView* view = create_new_webview();
@ -288,8 +285,6 @@ void handle_signal_bar_press_enter(void* data)
gtk_widget_hide(GTK_WIDGET(bar.widget)); gtk_widget_hide(GTK_WIDGET(bar.widget));
} }
/* Handle shortcuts */ /* Handle shortcuts */
int handle_shortcut_mini(func id) int handle_shortcut_mini(func id)
{ {
@ -430,30 +425,28 @@ int handle_shortcut(func id)
return 1; return 1;
} }
/* Listen to keypresses */ /* Listen to keypresses */
static int handle_signal_keypress(void *self, int keyval, int keycode, static int handle_signal_keypress(void* self, int keyval, int keycode,
GdkModifierType state, void *controller) GdkModifierType state, void* controller)
{ {
// (void) self, (void) keycode, (void) controller; // (void) self, (void) keycode, (void) controller;
// fprintf(stdout, "New keypress!\n"); // fprintf(stdout, "New keypress!\n");
printf("New keypress\n"); printf("New keypress\n");
if (1) { if (1) {
printf("Keypress state: %d\n", state); printf("Keypress state: %d\n", state);
printf("Keypress value: %d\n", keyval); printf("Keypress value: %d\n", keyval);
} }
for (int i = 0; i < sizeof(shortcut) / sizeof(shortcut[0]); i++){ for (int i = 0; i < sizeof(shortcut) / sizeof(shortcut[0]); i++) {
if ((state & shortcut[i].mod || shortcut[i].mod == 0x0) && keyval == shortcut[i].key) { if ((state & shortcut[i].mod || shortcut[i].mod == 0x0) && keyval == shortcut[i].key) {
printf("New shortcut, with id: %d\n", shortcut[i].id); printf("New shortcut, with id: %d\n", shortcut[i].id);
return handle_shortcut(shortcut[i].id); return handle_shortcut(shortcut[i].id);
} }
} }
return 0;
return 0;
} }
int main(int argc, char** argv) int main(int argc, char** argv)
@ -486,9 +479,9 @@ int main(int argc, char** argv)
gtk_window_set_titlebar(window, GTK_WIDGET(bar.widget)); gtk_window_set_titlebar(window, GTK_WIDGET(bar.widget));
// Signals // Signals
GtkEventController *event_controller = gtk_event_controller_key_new(); GtkEventController* event_controller = gtk_event_controller_key_new();
g_signal_connect(event_controller, "key-pressed", G_CALLBACK(handle_signal_keypress), NULL); g_signal_connect(event_controller, "key-pressed", G_CALLBACK(handle_signal_keypress), NULL);
gtk_widget_add_controller(GTK_WIDGET(window), event_controller); gtk_widget_add_controller(GTK_WIDGET(window), event_controller);
g_signal_connect(bar.line, "activate", G_CALLBACK(handle_signal_bar_press_enter), NULL); g_signal_connect(bar.line, "activate", G_CALLBACK(handle_signal_bar_press_enter), NULL);
g_signal_connect(GTK_WIDGET(window), "destroy", G_CALLBACK(exit), notebook); g_signal_connect(GTK_WIDGET(window), "destroy", G_CALLBACK(exit), notebook);
@ -512,7 +505,7 @@ int main(int argc, char** argv)
} }
// Enter the main event loop, and wait for user interaction // Enter the main event loop, and wait for user interaction
printf("\nEntering main loop"); printf("Entering main loop\n");
while (g_list_model_get_n_items(gtk_window_get_toplevels()) > 0 && num_tabs > 0) while (g_list_model_get_n_items(gtk_window_get_toplevels()) > 0 && num_tabs > 0)
g_main_context_iteration(NULL, TRUE); g_main_context_iteration(NULL, TRUE);