penwing/savoia-surf
1
0
Fork 0
Code Issues 4 Pull requests Actions Packages Projects Releases Wiki Activity

selectable tabs

Browse source
This commit is contained in:
WanderingPenwing 2024-08-04 18:32:15 +02:00
parent 64073d896c
commit b0e5f842be
1 changed files with 35 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
surf.c
View file

@ -420,10 +420,8 @@ void switch_tab(Client *c, const Arg *a) {
return; return;
} }
c->selected_tab = new_selected_tab; c->selected_tab = new_selected_tab;
Tab *selected_tab = g_list_nth_data(c->tabs, c->selected_tab);
selected_tab->suspended = true;
update_tab_bar(c); update_tab_bar(c);
reload_tab(c); suspend_tab(c);
} }
void move_tab(Client *c, const Arg *a) { void move_tab(Client *c, const Arg *a) {
@ -478,6 +476,12 @@ void unsuspend_tab(Client *c) {
reload_tab(c); reload_tab(c);
} }
void suspend_tab(Client *c) {
Tab *selected_tab = g_list_nth_data(c->tabs, c->selected_tab);
selected_tab->suspended = true;
reload_tab(c);
}
void close_tab(Client *c, const Arg *a) { void close_tab(Client *c, const Arg *a) {
if (g_list_length(c->tabs) == 1) { if (g_list_length(c->tabs) == 1) {
g_print("tried to close last tab\n"); g_print("tried to close last tab\n");
@ -485,10 +489,8 @@ void close_tab(Client *c, const Arg *a) {
} }
remove_tab(c, g_list_nth_data(c->tabs, c->selected_tab)); remove_tab(c, g_list_nth_data(c->tabs, c->selected_tab));
c->selected_tab -= 1; c->selected_tab -= 1;
Tab *selected_tab = g_list_nth_data(c->tabs, c->selected_tab);
selected_tab->suspended = true;
update_tab_bar(c); update_tab_bar(c);
reload_tab(c); suspend_tab(c);
} }
void new_tab(Client *c, const Arg *a) { void new_tab(Client *c, const Arg *a) {
@ -501,23 +503,38 @@ void new_tab(Client *c, const Arg *a) {
} }
void tab_bar_click(GtkWidget *w, GdkEvent *e, Client *c) { void tab_bar_click(GtkWidget *w, GdkEvent *e, Client *c) {
if (g_list_length(c->tabs) == 0) {
return;
}
if (e->type == GDK_BUTTON_PRESS) { if (e->type == GDK_BUTTON_PRESS) {
GdkEventButton *event_button = (GdkEventButton *)e; GdkEventButton *event_button = (GdkEventButton *)e;
g_print("Click at position: (%.0f, %.0f)\n", event_button->x, event_button->y);
} else { GtkAllocation allocation;
g_print("Event type %d received.\n", e->type); gtk_widget_get_allocation(GTK_WIDGET(c->win), &allocation);
} int width = allocation.width;
int n_tabs = g_list_length(c->tabs);
int tab_width = width / MAX(n_tabs + 1, 4);
int tab_index = (int)(event_button->x / tab_width);
if (tab_index < n_tabs) {
c->selected_tab = event_button->x/tab_width;
update_tab_bar(c);
suspend_tab(c);
} else {
Arg new_tab_arg = {0};
new_tab(c, &new_tab_arg);
}
}
} }
void fill_tab_bar(Client *c) { void fill_tab_bar(Client *c) {
GdkRGBA fg_color; GdkRGBA fg_color;
gdk_rgba_parse(&fg_color, tab_bar_color[1]); gdk_rgba_parse(&fg_color, tab_bar_color[1]);
//GtkAllocation allocation;
//gtk_widget_get_allocation(GTK_WIDGET(c->win), &allocation);
//int width = allocation.width;
int tab_index = 0; int tab_index = 0;
// Add tabs to the tab bar // Add tabs to the tab bar
for (GList *l = c->tabs; l != NULL; l = l->next) { for (GList *l = c->tabs; l != NULL; l = l->next) {
@ -861,7 +878,7 @@ loaduri(Client *c, const Arg *a)
setatom(c, AtomUri, url); setatom(c, AtomUri, url);
if (strcmp(url, geturi(c)) == 0) { if (strcmp(url, geturi(c)) == 0 && strcmp(url, "about:blank") != 0) {
reload(c, a); reload(c, a);
} else { } else {
webkit_web_view_load_uri(c->view, url); webkit_web_view_load_uri(c->view, url);
@ -1744,8 +1761,6 @@ createwindow(Client *c)
{ {
char *wmstr; char *wmstr;
GtkWidget *w; GtkWidget *w;
g_print("Creating window for client: %p\n", (void *)c);
if (embed) { if (embed) {
w = gtk_plug_new(embed); w = gtk_plug_new(embed);
@ -1774,7 +1789,7 @@ createwindow(Client *c)
g_signal_connect(G_OBJECT(w), "window-state-event", g_signal_connect(G_OBJECT(w), "window-state-event",
G_CALLBACK(winevent), c); G_CALLBACK(winevent), c);
g_signal_connect(G_OBJECT(w), "button-press-event", g_signal_connect(G_OBJECT(w), "button-press-event",
G_CALLBACK(tab_bar_click), c); G_CALLBACK(tab_bar_click), c);
return w; return w;
} }