mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-25 15:59:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

clean up gtk scaffolding interface, remove lots of cruft and globals

Browse Source
This commit is contained in:
Vincent Sanders 2014-07-27 18:06:07 +01:00
parent 06a1d75d52
commit 55669387ff
14 changed files with 482 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/dialogs/preferences.c
View File

@ -611,7 +611,7 @@ nsgtk_preferences_comboboxLanguage_realize(GtkWidget *widget,
G_MODULE_EXPORT void
nsgtk_preferences_comboTheme_changed(GtkComboBox *combo, struct ppref *priv)
{
nsgtk_scaffolding *current = scaf_list;
struct nsgtk_scaffolding *current;
int theme = 0;
gchar *name;
GtkTreeIter iter;
@ -643,7 +643,8 @@ nsgtk_preferences_comboTheme_changed(GtkComboBox *combo, struct ppref *priv)
g_free(name);
}
while (current) {
current = nsgtk_scaffolding_iterate(NULL);
while (current != NULL) {
nsgtk_theme_implement(current);
current = nsgtk_scaffolding_iterate(current);
}
@ -797,12 +798,13 @@ G_MODULE_EXPORT void
nsgtk_preferences_comboTabPosition_changed(GtkComboBox *widget,
struct ppref *priv)
{
nsgtk_scaffolding *current = scaf_list;
struct nsgtk_scaffolding *current;
/* set the option */
nsoption_set_int(position_tab, gtk_combo_box_get_active(widget));
/* update all notebooks in all scaffolds */
current = nsgtk_scaffolding_iterate(NULL);
while (current) {
nsgtk_scaffolding_reset_offset(current);
@ -854,13 +856,15 @@ G_MODULE_EXPORT void
nsgtk_preferences_comboButtonType_changed(GtkComboBox *widget,
struct ppref *priv)
{
nsgtk_scaffolding *current = scaf_list;
struct nsgtk_scaffolding *current;
nsoption_set_int(button_type, gtk_combo_box_get_active(widget) + 1);
/* value of 0 is reserved for 'unset' */
while (current) {
current = nsgtk_scaffolding_iterate(NULL);
while (current != NULL) {
nsgtk_scaffolding_reset_offset(current);
switch(nsoption_int(button_type)) {
/* value of 0 is reserved for 'unset' */
case 1:
gtk_toolbar_set_style(
GTK_TOOLBAR(nsgtk_scaffolding_toolbar(current)),

5
gtk/gui.c
View File

@ -533,10 +533,7 @@ static void gui_quit(void)
LOG(("Quitting GUI"));
/* Ensure all scaffoldings are destroyed before we go into exit */
while (scaf_list != NULL) {
nsgtk_scaffolding_destroy(scaf_list);
}
nsgtk_scaffolding_destroy();
nsgtk_download_destroy();
urldb_save_cookies(nsoption_charp(cookie_jar));
urldb_save(nsoption_charp(url_file));

585
gtk/scaffolding.c
View File

@ -75,18 +75,18 @@
/** Macro to define a handler for menu, button and activate events. */
#define MULTIHANDLER(q)\
static gboolean nsgtk_on_##q##_activate(struct gtk_scaffolding *g);\
static gboolean nsgtk_on_##q##_activate(struct nsgtk_scaffolding *g);\
static gboolean nsgtk_on_##q##_activate_menu(GtkMenuItem *widget, gpointer data)\
{\
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;\
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;\
return nsgtk_on_##q##_activate(g);\
}\
static gboolean nsgtk_on_##q##_activate_button(GtkButton *widget, gpointer data)\
{\
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;\
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;\
return nsgtk_on_##q##_activate(g);\
}\
static gboolean nsgtk_on_##q##_activate(struct gtk_scaffolding *g)
static gboolean nsgtk_on_##q##_activate(struct nsgtk_scaffolding *g)
/** Macro to define a handler for menu events. */
#define MENUHANDLER(q)\
@ -97,7 +97,7 @@ static gboolean nsgtk_on_##q##_activate_menu(GtkMenuItem *widget, gpointer data)
static gboolean nsgtk_on_##q##_activate(GtkButton *widget, gpointer data)
/** Core scaffolding structure. */
struct gtk_scaffolding {
struct nsgtk_scaffolding {
GtkWindow *window;
GtkNotebook *notebook;
GtkWidget *url_bar;
@ -133,14 +133,14 @@ struct gtk_scaffolding {
bool fullscreen;
/* keep global linked list for gui interface adjustments */
struct gtk_scaffolding *next, *prev;
struct nsgtk_scaffolding *next, *prev;
};
/** current scaffold for model dialogue use */
static struct gtk_scaffolding *scaf_current;
static struct nsgtk_scaffolding *scaf_current;
/** global list for interface changes */
nsgtk_scaffolding *scaf_list = NULL;
static struct nsgtk_scaffolding *scaf_list = NULL;
/** holds the context data for what's under the pointer, when the contextual
* menu is opened. */
@ -225,7 +225,7 @@ static void popup_menu_show(struct nsgtk_popup_menu *menu, bool submenu,
*/
static void scaffolding_window_destroy(GtkWidget *widget, gpointer data)
{
struct gtk_scaffolding *gs = data;
struct nsgtk_scaffolding *gs = data;
LOG(("scaffold:%p", gs));
@ -256,7 +256,7 @@ static void scaffolding_window_destroy(GtkWidget *widget, gpointer data)
static gboolean scaffolding_window_delete_event(GtkWidget *widget,
GdkEvent *event, gpointer data)
{
struct gtk_scaffolding *g = data;
struct nsgtk_scaffolding *g = data;
if (nsgtk_check_for_downloads(GTK_WINDOW(widget)) == false) {
gtk_widget_destroy(GTK_WIDGET(g->window));
@ -265,19 +265,23 @@ static gboolean scaffolding_window_delete_event(GtkWidget *widget,
}
/* exported interface documented in gtk_scaffold.h */
void nsgtk_scaffolding_destroy(nsgtk_scaffolding *gs)
void nsgtk_scaffolding_destroy(void)
{
LOG(("scaffold: %p", gs));
struct nsgtk_scaffolding *gs;
if (gtk_widget_in_destruction(GTK_WIDGET(gs->window)) != TRUE) {
gtk_widget_destroy(GTK_WIDGET(gs->window));
gs = scaf_list;
while (gs != NULL) {
LOG(("destroying scaffold: %p", gs));
if (gtk_widget_in_destruction(GTK_WIDGET(gs->window)) != TRUE) {
gtk_widget_destroy(GTK_WIDGET(gs->window));
}
}
}
/**
* Update the back and forward button sensitivity.
*/
static void nsgtk_window_update_back_forward(struct gtk_scaffolding *g)
static void nsgtk_window_update_back_forward(struct nsgtk_scaffolding *g)
{
int width, height;
struct browser_window *bw = nsgtk_get_browser_window(g->top_level);
@ -306,7 +310,7 @@ static void nsgtk_window_update_back_forward(struct gtk_scaffolding *g)
*/
static void nsgtk_throb(void *p)
{
struct gtk_scaffolding *g = p;
struct nsgtk_scaffolding *g = p;
if (g->throb_frame >= (nsgtk_throbber->nframes - 1))
g->throb_frame = 1;
@ -320,7 +324,7 @@ static void nsgtk_throb(void *p)
}
static guint nsgtk_scaffolding_update_edit_actions_sensitivity(
struct gtk_scaffolding *g)
struct nsgtk_scaffolding *g)
{
GtkWidget *widget = gtk_window_get_focus(g->window);
gboolean has_selection;
@ -354,7 +358,7 @@ static guint nsgtk_scaffolding_update_edit_actions_sensitivity(
static void nsgtk_scaffolding_enable_edit_actions_sensitivity(
struct gtk_scaffolding *g)
struct nsgtk_scaffolding *g)
{
g->buttons[PASTE_BUTTON]->sensitivity = true;
@ -367,7 +371,7 @@ static void nsgtk_scaffolding_enable_edit_actions_sensitivity(
/* signal handling functions for the toolbar, URL bar, and menu bar */
static gboolean nsgtk_window_edit_menu_clicked(GtkWidget *widget,
struct gtk_scaffolding *g)
struct nsgtk_scaffolding *g)
{
nsgtk_scaffolding_update_edit_actions_sensitivity(g);
@ -375,7 +379,7 @@ static gboolean nsgtk_window_edit_menu_clicked(GtkWidget *widget,
}
static gboolean nsgtk_window_edit_menu_hidden(GtkWidget *widget,
struct gtk_scaffolding *g)
struct nsgtk_scaffolding *g)
{
nsgtk_scaffolding_enable_edit_actions_sensitivity(g);
@ -383,7 +387,7 @@ static gboolean nsgtk_window_edit_menu_hidden(GtkWidget *widget,
}
static gboolean nsgtk_window_popup_menu_hidden(GtkWidget *widget,
struct gtk_scaffolding *g)
struct nsgtk_scaffolding *g)
{
nsgtk_scaffolding_enable_edit_actions_sensitivity(g);
return TRUE;
@ -391,7 +395,7 @@ static gboolean nsgtk_window_popup_menu_hidden(GtkWidget *widget,
gboolean nsgtk_window_url_activate_event(GtkWidget *widget, gpointer data)
{
struct gtk_scaffolding *g = data;
struct nsgtk_scaffolding *g = data;
nserror ret;
nsurl *url;
@ -429,7 +433,7 @@ gboolean nsgtk_window_url_changed(GtkWidget *widget, GdkEventKey *event,
static gboolean nsgtk_window_tool_bar_clicked(GtkToolbar *toolbar,
gint x, gint y, gint button, gpointer data)
{
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
/* set visibility for right-click popup menu */
popup_menu_hide(g->menu_popup, true, false, true, false);
@ -445,7 +449,7 @@ static gboolean nsgtk_window_tool_bar_clicked(GtkToolbar *toolbar,
* Update the menus when the number of tabs changes.
*/
static void nsgtk_window_tabs_add(GtkNotebook *notebook,
GtkWidget *page, guint page_num, struct gtk_scaffolding *g)
GtkWidget *page, guint page_num, struct nsgtk_scaffolding *g)
{
gboolean visible = gtk_notebook_get_show_tabs(g->notebook);
g_object_set(g->menu_bar->view_submenu->tabs_menuitem, "visible", visible, NULL);
@ -463,7 +467,7 @@ static void
nsgtk_window_tabs_remove(GtkNotebook *notebook,
GtkWidget *page,
guint page_num,
struct gtk_scaffolding *gs)
struct nsgtk_scaffolding *gs)
{
/* if the scaffold is being destroyed it is not useful to
* update the state, futher many of the widgets may have
@ -473,8 +477,9 @@ nsgtk_window_tabs_remove(GtkNotebook *notebook,
return;
}
/* if this is the last tab destroy the scaffold in addition */
if (gtk_notebook_get_n_pages(notebook) == 1) {
nsgtk_scaffolding_destroy(gs);
gtk_widget_destroy(GTK_WIDGET(gs->window));
return;
}
@ -917,7 +922,7 @@ MULTIHANDLER(quit)
MENUHANDLER(savelink)
{
nsurl *url;
struct gtk_scaffolding *g = (struct gtk_scaffolding *) data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *) data;
struct gui_window *gui = g->top_level;
struct browser_window *bw = nsgtk_get_browser_window(gui);
@ -943,7 +948,7 @@ MENUHANDLER(savelink)
*/
MENUHANDLER(link_openwin)
{
struct gtk_scaffolding *g = (struct gtk_scaffolding *) data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *) data;
struct gui_window *gui = g->top_level;
struct browser_window *bw = nsgtk_get_browser_window(gui);
nsurl *url;
@ -971,7 +976,7 @@ MENUHANDLER(link_openwin)
*/
MENUHANDLER(link_opentab)
{
struct gtk_scaffolding *g = (struct gtk_scaffolding *) data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *) data;
struct gui_window *gui = g->top_level;
struct browser_window *bw = nsgtk_get_browser_window(gui);
nsurl *url;
@ -1086,7 +1091,7 @@ MULTIHANDLER(delete)
MENUHANDLER(customize)
{
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
nsgtk_toolbar_customization_init(g);
return TRUE;
}
@ -1177,7 +1182,7 @@ MULTIHANDLER(viewsource)
MENUHANDLER(menubar)
{
GtkWidget *w;
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
/* if the menubar is not being shown the popup menu shows the
* menubar entries instead.
@ -1223,7 +1228,7 @@ MENUHANDLER(menubar)
MENUHANDLER(toolbar)
{
GtkWidget *w;
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
w = GTK_WIDGET(g->menu_popup->view_submenu->toolbars_submenu->toolbar_menuitem);
@ -1637,7 +1642,7 @@ MULTIHANDLER(about)
BUTTONHANDLER(history)
{
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
return nsgtk_on_localhistory_activate(g);
}
@ -1737,7 +1742,7 @@ static gboolean nsgtk_history_button_press_event(GtkWidget *widget,
static void nsgtk_attach_menu_handlers(struct gtk_scaffolding *g)
static void nsgtk_attach_menu_handlers(struct nsgtk_scaffolding *g)
{
for (int i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++) {
if (g->buttons[i]->main != NULL) {
@ -1769,7 +1774,7 @@ static void nsgtk_attach_menu_handlers(struct gtk_scaffolding *g)
* \return menu structure on sucess or NULL on error.
*/
static struct nsgtk_popup_menu *
nsgtk_new_scaffolding_popup(struct gtk_scaffolding *g, GtkAccelGroup *group)
nsgtk_new_scaffolding_popup(struct nsgtk_scaffolding *g, GtkAccelGroup *group)
{
struct nsgtk_popup_menu *nmenu;
@ -1807,7 +1812,7 @@ nsgtk_new_scaffolding_popup(struct gtk_scaffolding *g, GtkAccelGroup *group)
* \return true on success or false on error.
*/
static struct nsgtk_link_menu *
nsgtk_new_scaffolding_link_popup(struct gtk_scaffolding *g, GtkAccelGroup *group)
nsgtk_new_scaffolding_link_popup(struct nsgtk_scaffolding *g, GtkAccelGroup *group)
{
struct nsgtk_link_menu *nmenu;
@ -1836,7 +1841,7 @@ nsgtk_new_scaffolding_link_popup(struct gtk_scaffolding *g, GtkAccelGroup *group
}
/* exported interface documented in gtk/scaffolding.h */
nsgtk_scaffolding *nsgtk_current_scaffolding(void)
struct nsgtk_scaffolding *nsgtk_current_scaffolding(void)
{
if (scaf_current == NULL) {
scaf_current = scaf_list;
@ -1844,10 +1849,164 @@ nsgtk_scaffolding *nsgtk_current_scaffolding(void)
return scaf_current;
}
/* exported interface documented in gtk/scaffolding.h */
nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
/**
* init the array g->buttons[]
*/
static void nsgtk_scaffolding_toolbar_init(struct nsgtk_scaffolding *g)
{
struct gtk_scaffolding *g;
#define ITEM_MAIN(p, q, r)\
g->buttons[p##_BUTTON]->main = g->menu_bar->q->r##_menuitem;\
g->buttons[p##_BUTTON]->rclick = g->menu_popup->q->r##_menuitem;\
g->buttons[p##_BUTTON]->mhandler = nsgtk_on_##r##_activate_menu;\
g->buttons[p##_BUTTON]->bhandler = nsgtk_on_##r##_activate_button;\
g->buttons[p##_BUTTON]->dataplus = nsgtk_toolbar_##r##_button_data;\
g->buttons[p##_BUTTON]->dataminus = nsgtk_toolbar_##r##_toolbar_button_data
#define ITEM_SUB(p, q, r, s)\
g->buttons[p##_BUTTON]->main =\
g->menu_bar->q->r##_submenu->s##_menuitem;\
g->buttons[p##_BUTTON]->rclick =\
g->menu_popup->q->r##_submenu->s##_menuitem;\
g->buttons[p##_BUTTON]->mhandler =\
nsgtk_on_##s##_activate_menu;\
g->buttons[p##_BUTTON]->bhandler =\
nsgtk_on_##s##_activate_button;\
g->buttons[p##_BUTTON]->dataplus =\
nsgtk_toolbar_##s##_button_data;\
g->buttons[p##_BUTTON]->dataminus =\
nsgtk_toolbar_##s##_toolbar_button_data
#define ITEM_BUTTON(p, q)\
g->buttons[p##_BUTTON]->bhandler =\
nsgtk_on_##q##_activate;\
g->buttons[p##_BUTTON]->dataplus =\
nsgtk_toolbar_##q##_button_data;\
g->buttons[p##_BUTTON]->dataminus =\
nsgtk_toolbar_##q##_toolbar_button_data
#define ITEM_POP(p, q) \
g->buttons[p##_BUTTON]->popup = GTK_IMAGE_MENU_ITEM(\
g->menu_popup->q##_menuitem)
#define SENSITIVITY(q) \
g->buttons[q##_BUTTON]->sensitivity = false
#define ITEM_ITEM(p, q)\
g->buttons[p##_ITEM]->dataplus =\
nsgtk_toolbar_##q##_button_data;\
g->buttons[p##_ITEM]->dataminus =\
nsgtk_toolbar_##q##_toolbar_button_data
ITEM_ITEM(WEBSEARCH, websearch);
ITEM_ITEM(THROBBER, throbber);
ITEM_MAIN(NEWWINDOW, file_submenu, newwindow);
ITEM_MAIN(NEWTAB, file_submenu, newtab);
ITEM_MAIN(OPENFILE, file_submenu, openfile);
ITEM_MAIN(PRINT, file_submenu, print);
ITEM_MAIN(CLOSEWINDOW, file_submenu, closewindow);
ITEM_MAIN(SAVEPAGE, file_submenu, savepage);
ITEM_MAIN(PRINTPREVIEW, file_submenu, printpreview);
ITEM_MAIN(PRINT, file_submenu, print);
ITEM_MAIN(QUIT, file_submenu, quit);
ITEM_MAIN(CUT, edit_submenu, cut);
ITEM_MAIN(COPY, edit_submenu, copy);
ITEM_MAIN(PASTE, edit_submenu, paste);
ITEM_MAIN(DELETE, edit_submenu, delete);
ITEM_MAIN(SELECTALL, edit_submenu, selectall);
ITEM_MAIN(FIND, edit_submenu, find);
ITEM_MAIN(PREFERENCES, edit_submenu, preferences);
ITEM_MAIN(STOP, view_submenu, stop);
ITEM_POP(STOP, stop);
ITEM_MAIN(RELOAD, view_submenu, reload);
ITEM_POP(RELOAD, reload);
ITEM_MAIN(FULLSCREEN, view_submenu, fullscreen);
ITEM_MAIN(DOWNLOADS, tools_submenu, downloads);
ITEM_MAIN(SAVEWINDOWSIZE, view_submenu, savewindowsize);
ITEM_MAIN(BACK, nav_submenu, back);
ITEM_POP(BACK, back);
ITEM_MAIN(FORWARD, nav_submenu, forward);
ITEM_POP(FORWARD, forward);
ITEM_MAIN(HOME, nav_submenu, home);
ITEM_MAIN(LOCALHISTORY, nav_submenu, localhistory);
ITEM_MAIN(GLOBALHISTORY, nav_submenu, globalhistory);
ITEM_MAIN(ADDBOOKMARKS, nav_submenu, addbookmarks);
ITEM_MAIN(SHOWBOOKMARKS, nav_submenu, showbookmarks);
ITEM_MAIN(SHOWCOOKIES, tools_submenu, showcookies);
ITEM_MAIN(OPENLOCATION, nav_submenu, openlocation);
ITEM_MAIN(CONTENTS, help_submenu, contents);
ITEM_MAIN(INFO, help_submenu, info);
ITEM_MAIN(GUIDE, help_submenu, guide);
ITEM_MAIN(ABOUT, help_submenu, about);
ITEM_SUB(PLAINTEXT, file_submenu, export, plaintext);
ITEM_SUB(PDF, file_submenu, export, pdf);
ITEM_SUB(DRAWFILE, file_submenu, export, drawfile);
ITEM_SUB(POSTSCRIPT, file_submenu, export, postscript);
ITEM_SUB(ZOOMPLUS, view_submenu, scaleview, zoomplus);
ITEM_SUB(ZOOMMINUS, view_submenu, scaleview, zoomminus);
ITEM_SUB(ZOOMNORMAL, view_submenu, scaleview, zoomnormal);
ITEM_SUB(NEXTTAB, view_submenu, tabs, nexttab);
ITEM_SUB(PREVTAB, view_submenu, tabs, prevtab);
ITEM_SUB(CLOSETAB, view_submenu, tabs, closetab);
/* development submenu */
ITEM_SUB(VIEWSOURCE, tools_submenu, developer, viewsource);
ITEM_SUB(TOGGLEDEBUGGING, tools_submenu, developer, toggledebugging);
ITEM_SUB(SAVEBOXTREE, tools_submenu, developer, debugboxtree);
ITEM_SUB(SAVEDOMTREE, tools_submenu, developer, debugdomtree);
ITEM_BUTTON(HISTORY, history);
/* disable items that make no sense initially, as well as
* as-yet-unimplemented items */
SENSITIVITY(BACK);
SENSITIVITY(FORWARD);
SENSITIVITY(STOP);
SENSITIVITY(PRINTPREVIEW);
SENSITIVITY(DELETE);
SENSITIVITY(DRAWFILE);
SENSITIVITY(POSTSCRIPT);
SENSITIVITY(NEXTTAB);
SENSITIVITY(PREVTAB);
SENSITIVITY(CLOSETAB);
#ifndef WITH_PDF_EXPORT
SENSITIVITY(PDF);
#endif
#undef ITEM_MAIN
#undef ITEM_SUB
#undef ITEM_BUTTON
#undef ITEM_POP
#undef SENSITIVITY
}
static void nsgtk_scaffolding_initial_sensitivity(struct nsgtk_scaffolding *g)
{
for (int i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++) {
if (g->buttons[i]->main != NULL)
gtk_widget_set_sensitive(GTK_WIDGET(
g->buttons[i]->main),
g->buttons[i]->sensitivity);
if (g->buttons[i]->rclick != NULL)
gtk_widget_set_sensitive(GTK_WIDGET(
g->buttons[i]->rclick),
g->buttons[i]->sensitivity);
if ((g->buttons[i]->location != -1) &&
(g->buttons[i]->button != NULL))
gtk_widget_set_sensitive(GTK_WIDGET(
g->buttons[i]->button),
g->buttons[i]->sensitivity);
if (g->buttons[i]->popup != NULL)
gtk_widget_set_sensitive(GTK_WIDGET(
g->buttons[i]->popup),
g->buttons[i]->sensitivity);
}
gtk_widget_set_sensitive(GTK_WIDGET(g->menu_bar->view_submenu->images_menuitem), FALSE);
}
/* exported interface documented in gtk/scaffolding.h */
struct nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
{
struct nsgtk_scaffolding *g;
int i;
GtkAccelGroup *group;
GError* error = NULL;
@ -2146,7 +2305,7 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
*/
void gui_window_set_title(struct gui_window *gw, const char *title)
{
struct gtk_scaffolding *gs = nsgtk_get_scaffold(gw);
struct nsgtk_scaffolding *gs = nsgtk_get_scaffold(gw);
int title_len;
char *newtitle;
@ -2180,7 +2339,7 @@ void gui_window_set_title(struct gui_window *gw, const char *title)
void gui_window_set_url(struct gui_window *_g, const char *url)
{
struct gtk_scaffolding *g = nsgtk_get_scaffold(_g);
struct nsgtk_scaffolding *g = nsgtk_get_scaffold(_g);
if (g->top_level != _g) return;
gtk_entry_set_text(GTK_ENTRY(g->url_bar), url);
gtk_editable_set_position(GTK_EDITABLE(g->url_bar), -1);
@ -2188,7 +2347,7 @@ void gui_window_set_url(struct gui_window *_g, const char *url)
void gui_window_start_throbber(struct gui_window* _g)
{
struct gtk_scaffolding *g = nsgtk_get_scaffold(_g);
struct nsgtk_scaffolding *g = nsgtk_get_scaffold(_g);
g->buttons[STOP_BUTTON]->sensitivity = true;
g->buttons[RELOAD_BUTTON]->sensitivity = false;
nsgtk_scaffolding_set_sensitivity(g);
@ -2200,7 +2359,7 @@ void gui_window_start_throbber(struct gui_window* _g)
void gui_window_stop_throbber(struct gui_window* _g)
{
struct gtk_scaffolding *g = nsgtk_get_scaffold(_g);
struct nsgtk_scaffolding *g = nsgtk_get_scaffold(_g);
if (g == NULL)
return;
nsgtk_window_update_back_forward(g);
@ -2226,7 +2385,7 @@ void gui_window_stop_throbber(struct gui_window* _g)
void
nsgtk_scaffolding_set_icon(struct gui_window *gw)
{
struct gtk_scaffolding *sc = nsgtk_get_scaffold(gw);
struct nsgtk_scaffolding *sc = nsgtk_get_scaffold(gw);
GdkPixbuf *icon_pixbuf = nsgtk_get_icon(gw);
/* check icon needs to be shown */
@ -2242,8 +2401,62 @@ nsgtk_scaffolding_set_icon(struct gui_window *gw)
gtk_widget_show_all(GTK_WIDGET(sc->buttons[URL_BAR_ITEM]->button));
}
static void
nsgtk_scaffolding_set_websearch(struct nsgtk_scaffolding *g, const char *content)
{
/** \todo this code appears technically correct, though
* currently has no effect at all.
*/
PangoLayout *lo = gtk_entry_get_layout(GTK_ENTRY(g->webSearchEntry));
if (lo != NULL) {
pango_layout_set_font_description(lo, NULL);
PangoFontDescription *desc = pango_font_description_new();
if (desc != NULL) {
pango_font_description_set_style(desc,
PANGO_STYLE_ITALIC);
pango_font_description_set_family(desc, "Arial");
pango_font_description_set_weight(desc,
PANGO_WEIGHT_ULTRALIGHT);
pango_font_description_set_size(desc,
10 * PANGO_SCALE);
pango_layout_set_font_description(lo, desc);
}
PangoAttrList *list = pango_attr_list_new();
if (list != NULL) {
PangoAttribute *italic = pango_attr_style_new(
PANGO_STYLE_ITALIC);
if (italic != NULL) {
italic->start_index = 0;
italic->end_index = strlen(content);
}
PangoAttribute *grey = pango_attr_foreground_new(
0x7777, 0x7777, 0x7777);
if (grey != NULL) {
grey->start_index = 0;
grey->end_index = strlen(content);
}
pango_attr_list_insert(list, italic);
pango_attr_list_insert(list, grey);
pango_layout_set_attributes(lo, list);
pango_attr_list_unref(list);
}
pango_layout_set_text(lo, content, -1);
}
/* an alternative method */
/* char *parse = malloc(strlen(content) + 1);
PangoAttrList *list = pango_layout_get_attributes(lo);
char *markup = g_strconcat("<span foreground='#777777'><i>", content,
"</i></span>", NULL);
pango_parse_markup(markup, -1, 0, &list, &parse, NULL, NULL);
gtk_widget_show_all(g->webSearchEntry);
*/
gtk_entry_set_visibility(GTK_ENTRY(g->webSearchEntry), TRUE);
gtk_entry_set_text(GTK_ENTRY(g->webSearchEntry), content);
}
/**
* Gui callback when search provider details are updated.
* GTK UI callback when search provider details are updated.
*
* \param provider_name The providers name.
* \param ico_bitmap The icon bitmap representing the provider.
@ -2253,7 +2466,7 @@ static nserror
gui_search_web_provider_update(const char *provider_name,
struct bitmap *provider_bitmap)
{
nsgtk_scaffolding *current;
struct nsgtk_scaffolding *current;
GdkPixbuf *srch_pixbuf = NULL;
char *searchcontent;
@ -2309,71 +2522,79 @@ static struct gui_search_web_table search_web_table = {
struct gui_search_web_table *nsgtk_search_web_table = &search_web_table;
bool nsgtk_scaffolding_is_busy(nsgtk_scaffolding *g)
{
/* We are considered "busy" if the stop button is sensitive */
return g->buttons[STOP_BUTTON]->sensitivity;
}
GtkWindow* nsgtk_scaffolding_window(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
GtkWindow* nsgtk_scaffolding_window(struct nsgtk_scaffolding *g)
{
return g->window;
}
GtkNotebook* nsgtk_scaffolding_notebook(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
GtkNotebook* nsgtk_scaffolding_notebook(struct nsgtk_scaffolding *g)
{
return g->notebook;
}
GtkWidget *nsgtk_scaffolding_urlbar(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
GtkWidget *nsgtk_scaffolding_urlbar(struct nsgtk_scaffolding *g)
{
return g->url_bar;
}
GtkWidget *nsgtk_scaffolding_websearch(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
GtkWidget *nsgtk_scaffolding_websearch(struct nsgtk_scaffolding *g)
{
return g->webSearchEntry;
}
GtkToolbar *nsgtk_scaffolding_toolbar(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
GtkToolbar *nsgtk_scaffolding_toolbar(struct nsgtk_scaffolding *g)
{
return g->tool_bar;
}
struct nsgtk_button_connect *nsgtk_scaffolding_button(nsgtk_scaffolding *g,
int i)
/* exported interface documented in gtk/scaffolding.h */
struct nsgtk_button_connect *
nsgtk_scaffolding_button(struct nsgtk_scaffolding *g, int i)
{
return g->buttons[i];
}
struct gtk_search *nsgtk_scaffolding_search(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
struct gtk_search *nsgtk_scaffolding_search(struct nsgtk_scaffolding *g)
{
return g->search;
}
GtkMenuBar *nsgtk_scaffolding_menu_bar(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
GtkMenuBar *nsgtk_scaffolding_menu_bar(struct nsgtk_scaffolding *g)
{
return g->menu_bar->bar_menu;
}
struct gtk_history_window *nsgtk_scaffolding_history_window(nsgtk_scaffolding
*g)
/* exported interface documented in gtk/scaffolding.h */
struct gtk_history_window *
nsgtk_scaffolding_history_window(struct nsgtk_scaffolding *g)
{
return g->history_window;
}
nsgtk_scaffolding *nsgtk_scaffolding_iterate(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
struct nsgtk_scaffolding *nsgtk_scaffolding_iterate(struct nsgtk_scaffolding *g)
{
if (g == NULL) {
return scaf_list;
}
return g->next;
}
void nsgtk_scaffolding_reset_offset(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
void nsgtk_scaffolding_reset_offset(struct nsgtk_scaffolding *g)
{
g->offset = 0;
}
void nsgtk_scaffolding_update_url_bar_ref(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
void nsgtk_scaffolding_update_url_bar_ref(struct nsgtk_scaffolding *g)
{
g->url_bar = GTK_WIDGET(gtk_bin_get_child(GTK_BIN(
nsgtk_scaffolding_button(g, URL_BAR_ITEM)->button)));
@ -2381,71 +2602,23 @@ void nsgtk_scaffolding_update_url_bar_ref(nsgtk_scaffolding *g)
gtk_entry_set_completion(GTK_ENTRY(g->url_bar),
g->url_bar_completion);
}
void nsgtk_scaffolding_update_throbber_ref(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
void nsgtk_scaffolding_update_throbber_ref(struct nsgtk_scaffolding *g)
{
g->throbber = GTK_IMAGE(gtk_bin_get_child(GTK_BIN(gtk_bin_get_child(
GTK_BIN(g->buttons[THROBBER_ITEM]->button)))));
}
void nsgtk_scaffolding_update_websearch_ref(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
void nsgtk_scaffolding_update_websearch_ref(struct nsgtk_scaffolding *g)
{
g->webSearchEntry = gtk_bin_get_child(GTK_BIN(
g->buttons[WEBSEARCH_ITEM]->button));
}
void nsgtk_scaffolding_set_websearch(nsgtk_scaffolding *g, const char *content)
{
/* this code appears technically correct, though currently has no
* effect at all - tinkering encouraged */
PangoLayout *lo = gtk_entry_get_layout(GTK_ENTRY(g->webSearchEntry));
if (lo != NULL) {
pango_layout_set_font_description(lo, NULL);
PangoFontDescription *desc = pango_font_description_new();
if (desc != NULL) {
pango_font_description_set_style(desc,
PANGO_STYLE_ITALIC);
pango_font_description_set_family(desc, "Arial");
pango_font_description_set_weight(desc,
PANGO_WEIGHT_ULTRALIGHT);
pango_font_description_set_size(desc,
10 * PANGO_SCALE);
pango_layout_set_font_description(lo, desc);
}
PangoAttrList *list = pango_attr_list_new();
if (list != NULL) {
PangoAttribute *italic = pango_attr_style_new(
PANGO_STYLE_ITALIC);
if (italic != NULL) {
italic->start_index = 0;
italic->end_index = strlen(content);
}
PangoAttribute *grey = pango_attr_foreground_new(
0x7777, 0x7777, 0x7777);
if (grey != NULL) {
grey->start_index = 0;
grey->end_index = strlen(content);
}
pango_attr_list_insert(list, italic);
pango_attr_list_insert(list, grey);
pango_layout_set_attributes(lo, list);
pango_attr_list_unref(list);
}
pango_layout_set_text(lo, content, -1);
}
/* an alternative method */
/* char *parse = malloc(strlen(content) + 1);
PangoAttrList *list = pango_layout_get_attributes(lo);
char *markup = g_strconcat("<span foreground='#777777'><i>", content,
"</i></span>", NULL);
pango_parse_markup(markup, -1, 0, &list, &parse, NULL, NULL);
gtk_widget_show_all(g->webSearchEntry);
*/
gtk_entry_set_visibility(GTK_ENTRY(g->webSearchEntry), TRUE);
gtk_entry_set_text(GTK_ENTRY(g->webSearchEntry), content);
}
void nsgtk_scaffolding_toggle_search_bar_visibility(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
void nsgtk_scaffolding_toggle_search_bar_visibility(struct nsgtk_scaffolding *g)
{
gboolean vis;
struct browser_window *bw = nsgtk_get_browser_window(g->top_level);
@ -2463,17 +2636,17 @@ void nsgtk_scaffolding_toggle_search_bar_visibility(nsgtk_scaffolding *g)
}
}
struct gui_window *nsgtk_scaffolding_top_level(nsgtk_scaffolding *g)
/* exported interface documented in gtk/scaffolding.h */
struct gui_window *nsgtk_scaffolding_top_level(struct nsgtk_scaffolding *g)
{
return g->top_level;
}
/* set the current active top level gui window */
/* exported interface documented in gtk/scaffolding.h */
void nsgtk_scaffolding_set_top_level(struct gui_window *gw)
{
struct browser_window *bw;
nsgtk_scaffolding *sc;
struct nsgtk_scaffolding *sc;
assert(gw != NULL);
@ -2500,7 +2673,7 @@ void nsgtk_scaffolding_set_top_level(struct gui_window *gw)
}
/* exported interface documented in scaffolding.h */
void nsgtk_scaffolding_set_sensitivity(struct gtk_scaffolding *g)
void nsgtk_scaffolding_set_sensitivity(struct nsgtk_scaffolding *g)
{
int i;
#define SENSITIVITY(q)\
@ -2536,32 +2709,9 @@ void nsgtk_scaffolding_set_sensitivity(struct gtk_scaffolding *g)
#undef SENSITIVITY
}
void nsgtk_scaffolding_initial_sensitivity(struct gtk_scaffolding *g)
{
for (int i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++) {
if (g->buttons[i]->main != NULL)
gtk_widget_set_sensitive(GTK_WIDGET(
g->buttons[i]->main),
g->buttons[i]->sensitivity);
if (g->buttons[i]->rclick != NULL)
gtk_widget_set_sensitive(GTK_WIDGET(
g->buttons[i]->rclick),
g->buttons[i]->sensitivity);
if ((g->buttons[i]->location != -1) &&
(g->buttons[i]->button != NULL))
gtk_widget_set_sensitive(GTK_WIDGET(
g->buttons[i]->button),
g->buttons[i]->sensitivity);
if (g->buttons[i]->popup != NULL)
gtk_widget_set_sensitive(GTK_WIDGET(
g->buttons[i]->popup),
g->buttons[i]->sensitivity);
}
gtk_widget_set_sensitive(GTK_WIDGET(g->menu_bar->view_submenu->images_menuitem), FALSE);
}
/* exported interface documented in gtk/scaffolding.h */
void nsgtk_scaffolding_context_menu(struct gtk_scaffolding *g,
void nsgtk_scaffolding_context_menu(struct nsgtk_scaffolding *g,
gdouble x,
gdouble y)
{
@ -2614,7 +2764,7 @@ void nsgtk_scaffolding_context_menu(struct gtk_scaffolding *g,
void nsgtk_scaffolding_toolbar_size_allocate(GtkWidget *widget,
GtkAllocation *alloc, gpointer data)
{
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
int i = nsgtk_toolbar_get_id_from_widget(widget, g);
if (i == -1)
return;
@ -2646,132 +2796,3 @@ void nsgtk_scaffolding_toolbar_size_allocate(GtkWidget *widget,
/**
* init the array g->buttons[]
*/
void nsgtk_scaffolding_toolbar_init(struct gtk_scaffolding *g)
{
#define ITEM_MAIN(p, q, r)\
g->buttons[p##_BUTTON]->main = g->menu_bar->q->r##_menuitem;\
g->buttons[p##_BUTTON]->rclick = g->menu_popup->q->r##_menuitem;\
g->buttons[p##_BUTTON]->mhandler = nsgtk_on_##r##_activate_menu;\
g->buttons[p##_BUTTON]->bhandler = nsgtk_on_##r##_activate_button;\
g->buttons[p##_BUTTON]->dataplus = nsgtk_toolbar_##r##_button_data;\
g->buttons[p##_BUTTON]->dataminus = nsgtk_toolbar_##r##_toolbar_button_data
#define ITEM_SUB(p, q, r, s)\
g->buttons[p##_BUTTON]->main =\
g->menu_bar->q->r##_submenu->s##_menuitem;\
g->buttons[p##_BUTTON]->rclick =\
g->menu_popup->q->r##_submenu->s##_menuitem;\
g->buttons[p##_BUTTON]->mhandler =\
nsgtk_on_##s##_activate_menu;\
g->buttons[p##_BUTTON]->bhandler =\
nsgtk_on_##s##_activate_button;\
g->buttons[p##_BUTTON]->dataplus =\
nsgtk_toolbar_##s##_button_data;\
g->buttons[p##_BUTTON]->dataminus =\
nsgtk_toolbar_##s##_toolbar_button_data
#define ITEM_BUTTON(p, q)\
g->buttons[p##_BUTTON]->bhandler =\
nsgtk_on_##q##_activate;\
g->buttons[p##_BUTTON]->dataplus =\
nsgtk_toolbar_##q##_button_data;\
g->buttons[p##_BUTTON]->dataminus =\
nsgtk_toolbar_##q##_toolbar_button_data
#define ITEM_POP(p, q) \
g->buttons[p##_BUTTON]->popup = GTK_IMAGE_MENU_ITEM(\
g->menu_popup->q##_menuitem)
#define SENSITIVITY(q) \
g->buttons[q##_BUTTON]->sensitivity = false
#define ITEM_ITEM(p, q)\
g->buttons[p##_ITEM]->dataplus =\
nsgtk_toolbar_##q##_button_data;\
g->buttons[p##_ITEM]->dataminus =\
nsgtk_toolbar_##q##_toolbar_button_data
ITEM_ITEM(WEBSEARCH, websearch);
ITEM_ITEM(THROBBER, throbber);
ITEM_MAIN(NEWWINDOW, file_submenu, newwindow);
ITEM_MAIN(NEWTAB, file_submenu, newtab);
ITEM_MAIN(OPENFILE, file_submenu, openfile);
ITEM_MAIN(PRINT, file_submenu, print);
ITEM_MAIN(CLOSEWINDOW, file_submenu, closewindow);
ITEM_MAIN(SAVEPAGE, file_submenu, savepage);
ITEM_MAIN(PRINTPREVIEW, file_submenu, printpreview);
ITEM_MAIN(PRINT, file_submenu, print);
ITEM_MAIN(QUIT, file_submenu, quit);
ITEM_MAIN(CUT, edit_submenu, cut);
ITEM_MAIN(COPY, edit_submenu, copy);
ITEM_MAIN(PASTE, edit_submenu, paste);
ITEM_MAIN(DELETE, edit_submenu, delete);
ITEM_MAIN(SELECTALL, edit_submenu, selectall);
ITEM_MAIN(FIND, edit_submenu, find);
ITEM_MAIN(PREFERENCES, edit_submenu, preferences);
ITEM_MAIN(STOP, view_submenu, stop);
ITEM_POP(STOP, stop);
ITEM_MAIN(RELOAD, view_submenu, reload);
ITEM_POP(RELOAD, reload);
ITEM_MAIN(FULLSCREEN, view_submenu, fullscreen);
ITEM_MAIN(DOWNLOADS, tools_submenu, downloads);
ITEM_MAIN(SAVEWINDOWSIZE, view_submenu, savewindowsize);
ITEM_MAIN(BACK, nav_submenu, back);
ITEM_POP(BACK, back);
ITEM_MAIN(FORWARD, nav_submenu, forward);
ITEM_POP(FORWARD, forward);
ITEM_MAIN(HOME, nav_submenu, home);
ITEM_MAIN(LOCALHISTORY, nav_submenu, localhistory);
ITEM_MAIN(GLOBALHISTORY, nav_submenu, globalhistory);
ITEM_MAIN(ADDBOOKMARKS, nav_submenu, addbookmarks);
ITEM_MAIN(SHOWBOOKMARKS, nav_submenu, showbookmarks);
ITEM_MAIN(SHOWCOOKIES, tools_submenu, showcookies);
ITEM_MAIN(OPENLOCATION, nav_submenu, openlocation);
ITEM_MAIN(CONTENTS, help_submenu, contents);
ITEM_MAIN(INFO, help_submenu, info);
ITEM_MAIN(GUIDE, help_submenu, guide);
ITEM_MAIN(ABOUT, help_submenu, about);
ITEM_SUB(PLAINTEXT, file_submenu, export, plaintext);
ITEM_SUB(PDF, file_submenu, export, pdf);
ITEM_SUB(DRAWFILE, file_submenu, export, drawfile);
ITEM_SUB(POSTSCRIPT, file_submenu, export, postscript);
ITEM_SUB(ZOOMPLUS, view_submenu, scaleview, zoomplus);
ITEM_SUB(ZOOMMINUS, view_submenu, scaleview, zoomminus);
ITEM_SUB(ZOOMNORMAL, view_submenu, scaleview, zoomnormal);
ITEM_SUB(NEXTTAB, view_submenu, tabs, nexttab);
ITEM_SUB(PREVTAB, view_submenu, tabs, prevtab);
ITEM_SUB(CLOSETAB, view_submenu, tabs, closetab);
/* development submenu */
ITEM_SUB(VIEWSOURCE, tools_submenu, developer, viewsource);
ITEM_SUB(TOGGLEDEBUGGING, tools_submenu, developer, toggledebugging);
ITEM_SUB(SAVEBOXTREE, tools_submenu, developer, debugboxtree);
ITEM_SUB(SAVEDOMTREE, tools_submenu, developer, debugdomtree);
ITEM_BUTTON(HISTORY, history);
/* disable items that make no sense initially, as well as
* as-yet-unimplemented items */
SENSITIVITY(BACK);
SENSITIVITY(FORWARD);
SENSITIVITY(STOP);
SENSITIVITY(PRINTPREVIEW);
SENSITIVITY(DELETE);
SENSITIVITY(DRAWFILE);
SENSITIVITY(POSTSCRIPT);
SENSITIVITY(NEXTTAB);
SENSITIVITY(PREVTAB);
SENSITIVITY(CLOSETAB);
#ifndef WITH_PDF_EXPORT
SENSITIVITY(PDF);
#endif
#undef ITEM_MAIN
#undef ITEM_SUB
#undef ITEM_BUTTON
#undef ITEM_POP
#undef SENSITIVITY
}

116
gtk/scaffolding.h
View File

@ -26,7 +26,6 @@ struct bitmap;
struct hlcache_handle;
struct gui_window;
struct gui_search_web_table;
typedef struct gtk_scaffolding nsgtk_scaffolding;
extern struct gui_search_web_table *nsgtk_search_web_table;
@ -86,7 +85,7 @@ typedef enum {
} nsgtk_toolbar_button; /* PLACEHOLDER_BUTTON - 1 */
struct gtk_history_window {
struct gtk_scaffolding *g;
struct nsgtk_scaffolding *g;
GtkWindow *window;
GtkScrolledWindow *scrolled;
GtkDrawingArea *drawing_area;
@ -113,48 +112,93 @@ struct nsgtk_button_connect {
void *dataminus; /* customization -> store */
};
extern nsgtk_scaffolding *scaf_list;
/**
* create a new scaffolding for a window.
*
* \param gw The gui window to create the new scaffold around.
* \return The newly constructed scaffold or NULL on error.
*/
nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel);
struct nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *gw);
/**
* Obtain the most recently used scaffolding element.
*
* This allows tabs to be opened in the most recently used window
*/
nsgtk_scaffolding *nsgtk_current_scaffolding(void);
struct nsgtk_scaffolding *nsgtk_current_scaffolding(void);
bool nsgtk_scaffolding_is_busy(nsgtk_scaffolding *g);
/* acessors for gtk elements withing a scaffold */
GtkWindow *nsgtk_scaffolding_window(nsgtk_scaffolding *g);
GtkNotebook *nsgtk_scaffolding_notebook(nsgtk_scaffolding *g);
GtkWidget *nsgtk_scaffolding_urlbar(nsgtk_scaffolding *g);
GtkWidget *nsgtk_scaffolding_websearch(nsgtk_scaffolding *g);
GtkToolbar *nsgtk_scaffolding_toolbar(nsgtk_scaffolding *g);
struct nsgtk_button_connect *nsgtk_scaffolding_button(nsgtk_scaffolding *g,
int i);
struct gtk_search *nsgtk_scaffolding_search(nsgtk_scaffolding *g);
GtkMenuBar *nsgtk_scaffolding_menu_bar(nsgtk_scaffolding *g);
struct gtk_history_window *nsgtk_scaffolding_history_window(nsgtk_scaffolding
*g);
struct gui_window *nsgtk_scaffolding_top_level(nsgtk_scaffolding *g);
void nsgtk_scaffolding_reset_offset(nsgtk_scaffolding *g);
nsgtk_scaffolding *nsgtk_scaffolding_iterate(nsgtk_scaffolding *g);
void nsgtk_scaffolding_toolbar_init(struct gtk_scaffolding *g);
void nsgtk_scaffolding_update_url_bar_ref(nsgtk_scaffolding *g);
void nsgtk_scaffolding_update_throbber_ref(nsgtk_scaffolding *g);
void nsgtk_scaffolding_update_websearch_ref(nsgtk_scaffolding *g);
void nsgtk_scaffolding_set_websearch(nsgtk_scaffolding *g, const char
*content);
void nsgtk_scaffolding_toggle_search_bar_visibility(nsgtk_scaffolding *g);
/**
* Get the gtk window for a scaffolding.
*/
GtkWindow *nsgtk_scaffolding_window(struct nsgtk_scaffolding *g);
/**
* Get the gtk notebook from a scaffold.
*/
GtkNotebook *nsgtk_scaffolding_notebook(struct nsgtk_scaffolding *g);
/**
* Get the gtk url bar from a scaffold.
*/
GtkWidget *nsgtk_scaffolding_urlbar(struct nsgtk_scaffolding *g);
/**
* Get the gtk web search entry from a scaffold.
*/
GtkWidget *nsgtk_scaffolding_websearch(struct nsgtk_scaffolding *g);
/**
* Get the gtk toolbar from a scaffold.
*/
GtkToolbar *nsgtk_scaffolding_toolbar(struct nsgtk_scaffolding *g);
struct nsgtk_button_connect *nsgtk_scaffolding_button(struct nsgtk_scaffolding *g, int i);
struct gtk_search *nsgtk_scaffolding_search(struct nsgtk_scaffolding *g);
GtkMenuBar *nsgtk_scaffolding_menu_bar(struct nsgtk_scaffolding *g);
struct gtk_history_window *nsgtk_scaffolding_history_window(struct nsgtk_scaffolding *g);
struct gui_window *nsgtk_scaffolding_top_level(struct nsgtk_scaffolding *g);
/**
* reset the scaffold offset value to 0.
*
* \todo The value is only ever altered in
* nsgtk_scaffolding_toolbar_size_allocate and is something to do with
* the history button either clarify or remove!
*/
void nsgtk_scaffolding_reset_offset(struct nsgtk_scaffolding *g);
/**
* Iterate through available scaffolding.
*/
struct nsgtk_scaffolding *nsgtk_scaffolding_iterate(struct nsgtk_scaffolding *g);
void nsgtk_scaffolding_update_url_bar_ref(struct nsgtk_scaffolding *g);
void nsgtk_scaffolding_update_throbber_ref(struct nsgtk_scaffolding *g);
void nsgtk_scaffolding_update_websearch_ref(struct nsgtk_scaffolding *g);
void nsgtk_scaffolding_toggle_search_bar_visibility(struct nsgtk_scaffolding *g);
/**
* Set the current active top level gui window.
*/
void nsgtk_scaffolding_set_top_level(struct gui_window *g);
void nsgtk_scaffolding_destroy(nsgtk_scaffolding *g);
/**
* Destroy all scaffolds.
*/
void nsgtk_scaffolding_destroy(void);
/** update the sensitivity of context sensitive UI elements
/**
* update the sensitivity of context sensitive UI elements
*
* widgets altered in arrays:
* main
@ -173,9 +217,7 @@ void nsgtk_scaffolding_destroy(nsgtk_scaffolding *g);
* prevtab
* closetab
*/
void nsgtk_scaffolding_set_sensitivity(struct gtk_scaffolding *g);
void nsgtk_scaffolding_initial_sensitivity(struct gtk_scaffolding *g);
void nsgtk_scaffolding_set_sensitivity(struct nsgtk_scaffolding *g);
/**
* Open a context sensitive menu.
@ -184,12 +226,14 @@ void nsgtk_scaffolding_initial_sensitivity(struct gtk_scaffolding *g);
* \param x The x co-ordinate.
* \param y The y co-ordinate.
*/
void nsgtk_scaffolding_context_menu(struct gtk_scaffolding *g, gdouble x, gdouble y);
void nsgtk_scaffolding_toolbar_size_allocate(GtkWidget *widget,
GtkAllocation *alloc, gpointer data);
void nsgtk_scaffolding_context_menu(struct nsgtk_scaffolding *g, gdouble x, gdouble y);
void nsgtk_scaffolding_toolbar_size_allocate(GtkWidget *widget, GtkAllocation *alloc, gpointer data);
void nsgtk_scaffolding_set_icon(struct gui_window *gw);
gboolean nsgtk_window_url_activate_event(GtkWidget *, gpointer);
gboolean nsgtk_window_url_changed(GtkWidget *, GdkEventKey *, gpointer);
nserror nsgtk_scaffolding_new_tab(struct gui_window *gw);

38
gtk/search.c
View File

@ -50,7 +50,7 @@
static void nsgtk_search_set_forward_state(bool active, struct gui_window *gw)
{
if (gw != NULL && nsgtk_get_browser_window(gw) != NULL) {
struct gtk_scaffolding *g = nsgtk_get_scaffold(gw);
struct nsgtk_scaffolding *g = nsgtk_get_scaffold(gw);
gtk_widget_set_sensitive(
GTK_WIDGET(nsgtk_scaffolding_search(g)->buttons[1]),
active);
@ -66,7 +66,7 @@ static void nsgtk_search_set_forward_state(bool active, struct gui_window *gw)
static void nsgtk_search_set_back_state(bool active, struct gui_window *gw)
{
if (gw != NULL && nsgtk_get_browser_window(gw) != NULL) {
struct gtk_scaffolding *g = nsgtk_get_scaffold(gw);
struct nsgtk_scaffolding *g = nsgtk_get_scaffold(gw);
gtk_widget_set_sensitive(GTK_WIDGET(nsgtk_scaffolding_search(
g)->buttons[0]), active);
}
@ -76,7 +76,7 @@ static void nsgtk_search_set_back_state(bool active, struct gui_window *gw)
gboolean nsgtk_search_forward_button_clicked(GtkWidget *widget, gpointer data)
{
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
struct gui_window *gw = nsgtk_scaffolding_top_level(g);
struct browser_window *bw = nsgtk_get_browser_window(gw);
@ -99,7 +99,7 @@ gboolean nsgtk_search_forward_button_clicked(GtkWidget *widget, gpointer data)
gboolean nsgtk_search_back_button_clicked(GtkWidget *widget, gpointer data)
{
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
struct gui_window *gw = nsgtk_scaffolding_top_level(g);
struct browser_window *bw = nsgtk_get_browser_window(gw);
@ -122,7 +122,7 @@ gboolean nsgtk_search_back_button_clicked(GtkWidget *widget, gpointer data)
gboolean nsgtk_search_close_button_clicked(GtkWidget *widget, gpointer data)
{
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
nsgtk_scaffolding_toggle_search_bar_visibility(g);
return TRUE;
}
@ -131,20 +131,21 @@ gboolean nsgtk_search_close_button_clicked(GtkWidget *widget, gpointer data)
gboolean nsgtk_search_entry_changed(GtkWidget *widget, gpointer data)
{
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
struct gui_window *gw = nsgtk_scaffolding_top_level(g);
struct browser_window *bw = nsgtk_get_browser_window(gw);
search_flags_t flags;
assert(bw != NULL);
nsgtk_search_set_forward_state(true, gw);
nsgtk_search_set_back_state(true, gw);
search_flags_t flags = SEARCH_FLAG_FORWARDS |
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
flags = SEARCH_FLAG_FORWARDS |
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->caseSens)) ?
SEARCH_FLAG_CASE_SENSITIVE : 0) |
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->checkAll)) ?
SEARCH_FLAG_SHOWALL : 0);
@ -157,17 +158,18 @@ gboolean nsgtk_search_entry_changed(GtkWidget *widget, gpointer data)
gboolean nsgtk_search_entry_activate(GtkWidget *widget, gpointer data)
{
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
struct gui_window *gw = nsgtk_scaffolding_top_level(g);
struct browser_window *bw = nsgtk_get_browser_window(gw);
search_flags_t flags;
assert(bw);
search_flags_t flags = SEARCH_FLAG_FORWARDS |
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
flags = SEARCH_FLAG_FORWARDS |
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->caseSens)) ?
SEARCH_FLAG_CASE_SENSITIVE : 0) |
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
nsgtk_scaffolding_search(g)->checkAll)) ?
SEARCH_FLAG_SHOWALL : 0);
@ -178,11 +180,11 @@ gboolean nsgtk_search_entry_activate(GtkWidget *widget, gpointer data)
/** allows escape key to close search bar too */
gboolean nsgtk_search_entry_key(GtkWidget *widget, GdkEventKey *event,
gpointer data)
gboolean
nsgtk_search_entry_key(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
if (event->keyval == GDK_KEY(Escape)) {
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
nsgtk_scaffolding_toggle_search_bar_visibility(g);
}
return FALSE;
@ -192,7 +194,7 @@ gboolean nsgtk_search_entry_key(GtkWidget *widget, GdkEventKey *event,
gboolean nsgtk_websearch_activate(GtkWidget *widget, gpointer data)
{
struct gtk_scaffolding *g = data;
struct nsgtk_scaffolding *g = data;
nserror ret;
nsurl *url;
@ -226,7 +228,7 @@ gboolean nsgtk_websearch_activate(GtkWidget *widget, gpointer data)
gboolean nsgtk_websearch_clear(GtkWidget *widget, GdkEventFocus *f,
gpointer data)
{
struct gtk_scaffolding *g = (struct gtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
gtk_editable_select_region(GTK_EDITABLE(
nsgtk_scaffolding_websearch(g)), 0, -1);
gtk_widget_grab_focus(GTK_WIDGET(nsgtk_scaffolding_websearch(g)));

4
gtk/search.h
View File

@ -21,9 +21,9 @@
struct gui_search_table *nsgtk_search_table;
struct gtk_scaffolding;
struct nsgtk_scaffolding;
void nsgtk_search_bar_toggle_visibility(struct gtk_scaffolding * g);
void nsgtk_search_bar_toggle_visibility(struct nsgtk_scaffolding * g);
gboolean nsgtk_search_entry_changed(GtkWidget *widget, gpointer data);
gboolean nsgtk_search_entry_activate(GtkWidget *widget, gpointer data);
gboolean nsgtk_search_entry_key(GtkWidget *widget, GdkEventKey *event, gpointer data);

2
gtk/tabs.c
View File

@ -266,7 +266,7 @@ void nsgtk_tab_options_changed(GtkNotebook *notebook)
/* exported interface documented in gtk/tabs.h */
void nsgtk_tab_init(struct gtk_scaffolding *gs)
void nsgtk_tab_init(struct nsgtk_scaffolding *gs)
{
GtkNotebook *notebook;

2
gtk/tabs.h
View File

@ -21,7 +21,7 @@
struct gui_window;
void nsgtk_tab_init(struct gtk_scaffolding *gs);
void nsgtk_tab_init(struct nsgtk_scaffolding *gs);
void nsgtk_tab_add(struct gui_window *window, GtkWidget *tab_contents, bool background);
/** set the tab title

5
gtk/theme.c
View File

@ -161,7 +161,7 @@ static bool nsgtk_theme_verify(const char *themename)
void nsgtk_theme_init(void)
{
int theme;
nsgtk_scaffolding *list = scaf_list;
struct nsgtk_scaffolding *list;
FILE *fp;
char buf[50];
int row_count = 0;
@ -194,6 +194,7 @@ void nsgtk_theme_init(void)
}
fclose(fp);
list = nsgtk_scaffolding_iterate(NULL);
while (list != NULL) {
nsgtk_theme_implement(list);
list = nsgtk_scaffolding_iterate(list);
@ -287,7 +288,7 @@ void nsgtk_theme_add(const char *themename)
* sets the images for a particular scaffolding according to the current theme
*/
void nsgtk_theme_implement(struct gtk_scaffolding *g)
void nsgtk_theme_implement(struct nsgtk_scaffolding *g)
{
struct nsgtk_theme *theme[IMAGE_SET_COUNT];
int i;

2
gtk/theme.h
View File

@ -39,7 +39,7 @@ struct nsgtk_theme *nsgtk_theme_load(GtkIconSize s);
void nsgtk_theme_add(const char *themename);
void nsgtk_theme_init(void);
void nsgtk_theme_prepare(void);
void nsgtk_theme_implement(struct gtk_scaffolding *g);
void nsgtk_theme_implement(struct nsgtk_scaffolding *g);
char *nsgtk_theme_name(void);
void nsgtk_theme_set_name(const char *name);

93
gtk/toolbar.c
View File

@ -67,11 +67,10 @@ possible into the store */
static struct nsgtk_toolbar_custom_store store;
static struct nsgtk_toolbar_custom_store *window = &store;
static void nsgtk_toolbar_close(nsgtk_scaffolding *g);
static void nsgtk_toolbar_window_open(nsgtk_scaffolding *g);
static void nsgtk_toolbar_customization_save(nsgtk_scaffolding *g);
static void nsgtk_toolbar_add_item_to_toolbar(nsgtk_scaffolding *g, int i,
struct nsgtk_theme *theme);
static void nsgtk_toolbar_close(struct nsgtk_scaffolding *g);
static void nsgtk_toolbar_window_open(struct nsgtk_scaffolding *g);
static void nsgtk_toolbar_customization_save(struct nsgtk_scaffolding *g);
static void nsgtk_toolbar_add_item_to_toolbar(struct nsgtk_scaffolding *g, int i, struct nsgtk_theme *theme);
static bool nsgtk_toolbar_add_store_widget(GtkWidget *widget);
static gboolean nsgtk_toolbar_data(GtkWidget *widget, GdkDragContext *context,
gint x, gint y, guint time, gpointer data);
@ -90,28 +89,30 @@ static gboolean nsgtk_toolbar_delete(GtkWidget *widget, GdkEvent *event,
static gboolean nsgtk_toolbar_cancel_clicked(GtkWidget *widget, gpointer data);
static gboolean nsgtk_toolbar_reset(GtkWidget *widget, gpointer data);
static gboolean nsgtk_toolbar_persist(GtkWidget *widget, gpointer data);
static void nsgtk_toolbar_cast(nsgtk_scaffolding *g);
static GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g,
static void nsgtk_toolbar_cast(struct nsgtk_scaffolding *g);
static GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
nsgtk_toolbar_button i, struct nsgtk_theme *theme);
static void nsgtk_toolbar_set_handler(nsgtk_scaffolding *g,
static void nsgtk_toolbar_set_handler(struct nsgtk_scaffolding *g,
nsgtk_toolbar_button i);
static void nsgtk_toolbar_temp_connect(nsgtk_scaffolding *g,
static void nsgtk_toolbar_temp_connect(struct nsgtk_scaffolding *g,
nsgtk_toolbar_button i);
static void nsgtk_toolbar_clear_toolbar(GtkWidget *widget, gpointer data);
static nsgtk_toolbar_button nsgtk_toolbar_get_id_at_location(
nsgtk_scaffolding *g, int i);
struct nsgtk_scaffolding *g, int i);
/**
* change behaviour of scaffoldings while editing toolbar; all buttons as
* well as window clicks are desensitized; then buttons in the front window
* are changed to movable buttons
* change behaviour of scaffoldings while editing toolbar
*
* All buttons as well as window clicks are desensitized; then buttons
* in the front window are changed to movable buttons
*/
void nsgtk_toolbar_customization_init(nsgtk_scaffolding *g)
void nsgtk_toolbar_customization_init(struct nsgtk_scaffolding *g)
{
int i;
nsgtk_scaffolding *list = scaf_list;
struct nsgtk_scaffolding *list;
edit_mode = true;
list = nsgtk_scaffolding_iterate(NULL);
while (list) {
g_signal_handler_block(GTK_WIDGET(
nsgtk_window_get_layout(
@ -187,7 +188,7 @@ void nsgtk_toolbar_customization_init(nsgtk_scaffolding *g)
/**
* create store window
*/
void nsgtk_toolbar_window_open(nsgtk_scaffolding *g)
void nsgtk_toolbar_window_open(struct nsgtk_scaffolding *g)
{
int x = 0, y = 0;
GError* error = NULL;
@ -286,7 +287,7 @@ gboolean nsgtk_toolbar_delete(GtkWidget *widget, GdkEvent *event,
gpointer data)
{
edit_mode = false;
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
/* reset g->buttons->location */
for (int i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++) {
nsgtk_scaffolding_button(g, i)->location =
@ -306,7 +307,7 @@ gboolean nsgtk_toolbar_delete(GtkWidget *widget, GdkEvent *event,
gboolean nsgtk_toolbar_cancel_clicked(GtkWidget *widget, gpointer data)
{
edit_mode = false;
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
/* reset g->buttons->location */
for (int i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++) {
nsgtk_scaffolding_button(g, i)->location =
@ -326,7 +327,7 @@ gboolean nsgtk_toolbar_cancel_clicked(GtkWidget *widget, gpointer data)
gboolean nsgtk_toolbar_persist(GtkWidget *widget, gpointer data)
{
edit_mode = false;
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
/* save state to file, update toolbars for all windows */
nsgtk_toolbar_customization_save(g);
nsgtk_toolbar_cast(g);
@ -341,7 +342,7 @@ gboolean nsgtk_toolbar_persist(GtkWidget *widget, gpointer data)
*/
gboolean nsgtk_toolbar_reset(GtkWidget *widget, gpointer data)
{
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
int i;
for (i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++)
nsgtk_scaffolding_button(g, i)->location =
@ -365,7 +366,7 @@ gboolean nsgtk_toolbar_reset(GtkWidget *widget, gpointer data)
* to correspond to the logically stored schema in terms of location
* visibility etc
*/
void nsgtk_toolbar_set_physical(nsgtk_scaffolding *g)
void nsgtk_toolbar_set_physical(struct nsgtk_scaffolding *g)
{
int i;
struct nsgtk_theme *theme =
@ -387,13 +388,16 @@ void nsgtk_toolbar_set_physical(nsgtk_scaffolding *g)
* cleanup code physical update of all toolbars; resensitize
* \param g the 'front' scaffolding that called customize
*/
void nsgtk_toolbar_close(nsgtk_scaffolding *g)
void nsgtk_toolbar_close(struct nsgtk_scaffolding *g)
{
int i;
nsgtk_scaffolding *list = scaf_list;
struct nsgtk_scaffolding *list;
struct nsgtk_theme *theme;
list = nsgtk_scaffolding_iterate(NULL);
while (list) {
struct nsgtk_theme *theme =
nsgtk_theme_load(GTK_ICON_SIZE_LARGE_TOOLBAR);
theme = nsgtk_theme_load(GTK_ICON_SIZE_LARGE_TOOLBAR);
if (theme == NULL) {
warn_user(messages_get("NoMemory"), 0);
continue;
@ -447,7 +451,7 @@ void nsgtk_toolbar_close(nsgtk_scaffolding *g)
*/
void nsgtk_toolbar_clear_toolbar(GtkWidget *widget, gpointer data)
{
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
gtk_container_remove(GTK_CONTAINER(nsgtk_scaffolding_toolbar(g)), widget);
}
@ -458,7 +462,7 @@ void nsgtk_toolbar_clear_toolbar(GtkWidget *widget, gpointer data)
* the function should be called, when multiple items are being added,
* in ascending order
*/
void nsgtk_toolbar_add_item_to_toolbar(nsgtk_scaffolding *g, int i,
void nsgtk_toolbar_add_item_to_toolbar(struct nsgtk_scaffolding *g, int i,
struct nsgtk_theme *theme)
{
int q;
@ -510,7 +514,7 @@ bool nsgtk_toolbar_add_store_widget(GtkWidget *widget)
gboolean nsgtk_toolbar_data(GtkWidget *widget, GdkDragContext *gdc, gint x,
gint y, guint time, gpointer data)
{
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
int ind = gtk_toolbar_get_drop_index(nsgtk_scaffolding_toolbar(g),
x, y);
int q, i;
@ -602,7 +606,7 @@ gboolean nsgtk_toolbar_move_complete(GtkWidget *widget, GdkDragContext *gdc,
gboolean nsgtk_toolbar_store_return(GtkWidget *widget, GdkDragContext *gdc,
gint x, gint y, guint time, gpointer data)
{
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
int q, i;
if ((window->fromstore) || (window->currentbutton == -1)) {
@ -637,7 +641,7 @@ gboolean nsgtk_toolbar_store_return(GtkWidget *widget, GdkDragContext *gdc,
gboolean nsgtk_toolbar_action(GtkWidget *widget, GdkDragContext *gdc, gint x,
gint y, guint time, gpointer data)
{
nsgtk_scaffolding *g = (nsgtk_scaffolding *)data;
struct nsgtk_scaffolding *g = (struct nsgtk_scaffolding *)data;
GtkToolItem *item = gtk_tool_button_new(NULL, NULL);
if (item != NULL)
gtk_toolbar_set_drop_highlight_item(
@ -671,7 +675,7 @@ void nsgtk_toolbar_clear(GtkWidget *widget, GdkDragContext *gdc, guint time,
* \param i the id of the widget
* \param theme the theme to make the widgets from
*/
GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g,
GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
nsgtk_toolbar_button i, struct nsgtk_theme *theme)
{
switch(i) {
@ -829,7 +833,7 @@ GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g,
* \return toolbar item id when a widget is an element of the scaffolding
* else -1
*/
int nsgtk_toolbar_get_id_from_widget(GtkWidget *widget, nsgtk_scaffolding *g)
int nsgtk_toolbar_get_id_from_widget(GtkWidget *widget, struct nsgtk_scaffolding *g)
{
int i;
for (i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++) {
@ -846,8 +850,8 @@ int nsgtk_toolbar_get_id_from_widget(GtkWidget *widget, nsgtk_scaffolding *g)
* \return toolbar item id from location when there is an item at that logical
* location; else -1
*/
nsgtk_toolbar_button nsgtk_toolbar_get_id_at_location(nsgtk_scaffolding *g,
int i)
nsgtk_toolbar_button
nsgtk_toolbar_get_id_at_location(struct nsgtk_scaffolding *g, int i)
{
int q;
for (q = BACK_BUTTON; q < PLACEHOLDER_BUTTON; q++)
@ -860,7 +864,7 @@ nsgtk_toolbar_button nsgtk_toolbar_get_id_at_location(nsgtk_scaffolding *g,
* connect 'normal' handlers to toolbar buttons
*/
void nsgtk_toolbar_connect_all(nsgtk_scaffolding *g)
void nsgtk_toolbar_connect_all(struct nsgtk_scaffolding *g)
{
int q, i;
for (i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++) {
@ -882,7 +886,8 @@ void nsgtk_toolbar_connect_all(nsgtk_scaffolding *g)
* \param g the scaffolding to attach handlers to
* \param i the toolbar item id
*/
void nsgtk_toolbar_set_handler(nsgtk_scaffolding *g, nsgtk_toolbar_button i)
void
nsgtk_toolbar_set_handler(struct nsgtk_scaffolding *g, nsgtk_toolbar_button i)
{
switch(i){
case URL_BAR_ITEM:
@ -1010,7 +1015,7 @@ DATAHANDLER(websearch, WEBSEARCH, window)
/**
* connect temporary handler for toolbar edit events
*/
void nsgtk_toolbar_temp_connect(nsgtk_scaffolding *g, nsgtk_toolbar_button i)
void nsgtk_toolbar_temp_connect(struct nsgtk_scaffolding *g, nsgtk_toolbar_button i)
{
if ((i == URL_BAR_ITEM) ||
(nsgtk_scaffolding_button(g, i)->button == NULL) ||
@ -1025,7 +1030,7 @@ void nsgtk_toolbar_temp_connect(nsgtk_scaffolding *g, nsgtk_toolbar_button i)
* load toolbar settings from file; file is a set of fields arranged as
* [itemreference];[itemlocation]|[itemreference];[itemlocation]| etc
*/
void nsgtk_toolbar_customization_load(nsgtk_scaffolding *g)
void nsgtk_toolbar_customization_load(struct nsgtk_scaffolding *g)
{
int i, ii;
char *val;
@ -1066,17 +1071,21 @@ void nsgtk_toolbar_customization_load(nsgtk_scaffolding *g)
* cast toolbar settings to all scaffoldings referenced from the global linked
* list of gui_windows
*/
void nsgtk_toolbar_cast(nsgtk_scaffolding *g)
void nsgtk_toolbar_cast(struct nsgtk_scaffolding *g)
{
int i;
nsgtk_scaffolding *list = scaf_list;
for (i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++)
struct nsgtk_scaffolding *list;
for (i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++) {
window->buttonlocations[i] =
((nsgtk_scaffolding_button(g, i)->location
>= -1) &&
(nsgtk_scaffolding_button(g, i)->location
< PLACEHOLDER_BUTTON)) ?
nsgtk_scaffolding_button(g, i)->location : -1;
}
list = nsgtk_scaffolding_iterate(NULL);
while (list) {
if (list != g)
for (i = BACK_BUTTON; i < PLACEHOLDER_BUTTON; i++)
@ -1089,7 +1098,7 @@ void nsgtk_toolbar_cast(nsgtk_scaffolding *g)
/**
* save toolbar settings to file
*/
void nsgtk_toolbar_customization_save(nsgtk_scaffolding *g)
void nsgtk_toolbar_customization_save(struct nsgtk_scaffolding *g)
{
int i;
FILE *f = fopen(toolbar_indices_file_location, "w");

13
gtk/toolbar.h
View File

@ -23,13 +23,12 @@
#include "gtk/scaffolding.h"
void nsgtk_toolbar_customization_init(nsgtk_scaffolding *g);
void nsgtk_toolbar_init(nsgtk_scaffolding *g);
void nsgtk_toolbar_customization_load(nsgtk_scaffolding *g);
void nsgtk_toolbar_set_physical(nsgtk_scaffolding *g);
void nsgtk_toolbar_connect_all(nsgtk_scaffolding *g);
int nsgtk_toolbar_get_id_from_widget(GtkWidget *widget, nsgtk_scaffolding
*g);
void nsgtk_toolbar_customization_init(struct nsgtk_scaffolding *g);
void nsgtk_toolbar_init(struct nsgtk_scaffolding *g);
void nsgtk_toolbar_customization_load(struct nsgtk_scaffolding *g);
void nsgtk_toolbar_set_physical(struct nsgtk_scaffolding *g);
void nsgtk_toolbar_connect_all(struct nsgtk_scaffolding *g);
int nsgtk_toolbar_get_id_from_widget(GtkWidget *widget, struct nsgtk_scaffolding *g);
#define TOOLPROTO(q) gboolean nsgtk_toolbar_##q##_button_data(\
GtkWidget *widget, GdkDragContext *cont, GtkSelectionData\

4
gtk/window.c
View File

@ -58,7 +58,7 @@ struct gui_window {
/** The gtk scaffold object containing menu, buttons, url bar, [tabs],
* drawing area, etc that may contain one or more gui_windows.
*/
nsgtk_scaffolding *scaffold;
struct nsgtk_scaffolding *scaffold;
/** The 'content' window that is rendered in the gui_window */
struct browser_window *bw;
@ -116,7 +116,7 @@ struct gui_window {
struct gui_window *window_list = NULL; /**< first entry in win list*/
int temp_open_background = -1;
nsgtk_scaffolding *nsgtk_get_scaffold(struct gui_window *g)
struct nsgtk_scaffolding *nsgtk_get_scaffold(struct gui_window *g)
{
return g->scaffold;
}

2
gtk/window.h
View File

@ -33,7 +33,7 @@ extern struct gui_window *window_list;
extern int temp_open_background;
struct browser_window *nsgtk_get_browser_window(struct gui_window *g);
nsgtk_scaffolding *nsgtk_get_scaffold(struct gui_window *g);
struct nsgtk_scaffolding *nsgtk_get_scaffold(struct gui_window *g);
GdkPixbuf *nsgtk_get_icon(struct gui_window *gw);
void nsgtk_reflow_all_windows(void);
float nsgtk_get_scale_for_gui(struct gui_window *g);