November 2006 - netsurf-commits - listmaster.pepperfish.net

r3062 dsilvers - in /branches/dsilvers/gtk-frames/gtk: gtk_scaffolding.c gtk_scaffolding.h gtk_window.c

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Nov 19 18:11:58 2006 New Revision: 3062 URL: http://svn.semichrome.net?rev=3062&view=rev Log: Destruction of gui_window and gtk_scaffold stand a better chance of cleaning up some more Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h branches/dsilvers/gtk-frames/gtk/gtk_window.c Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Sun Nov 19 18:11:58 2006 @@ -62,6 +62,7 @@ int throb_frame; struct gui_window *top_level; + int being_destroyed; }; struct gtk_history_window { @@ -182,15 +183,28 @@ void nsgtk_window_destroy_event(GtkWidget *widget, gpointer data) { struct gtk_scaffolding *g = data; - + LOG(("Being Destroyed = %d", g->being_destroyed)); gtk_widget_destroy(GTK_WIDGET(g->history_window->window)); gtk_widget_destroy(GTK_WIDGET(g->window)); if (--open_windows == 0) netsurf_quit = true; - - gui_window_destroy(g->top_level); -} + + if (!g->being_destroyed) { + g->being_destroyed = 1; + gui_window_destroy(g->top_level); + } +} + +void nsgtk_scaffolding_destroy(nsgtk_scaffolding *scaffold) +{ + /* Our top_level has asked us to die */ + LOG(("Being Destroyed = %d", scaffold->being_destroyed)); + if (scaffold->being_destroyed) return; + scaffold->being_destroyed = 1; + nsgtk_window_destroy_event(0, scaffold); +} + void nsgtk_window_update_back_forward(struct gtk_scaffolding *g) { @@ -683,7 +697,9 @@ /* set up the menu signal handlers */ nsgtk_attach_menu_handlers(g->xml, g); - + + g->being_destroyed = 0; + /* finally, show the window. */ gtk_widget_show(GTK_WIDGET(g->window)); Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h Sun Nov 19 18:11:58 2006 @@ -20,4 +20,6 @@ void nsgtk_attach_toplevel_viewport(nsgtk_scaffolding *g, GtkViewport *vp); +void nsgtk_scaffolding_destroy(nsgtk_scaffolding *scaffold); + #endif /* NETSURF_GTK_SCAFFOLDING_H */ Modified: branches/dsilvers/gtk-frames/gtk/gtk_window.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_window.c?r... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_window.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_window.c Sun Nov 19 18:11:58 2006 @@ -332,6 +332,10 @@ LOG(("Destroy")); + /* If we're a top-level gui_window, destroy our scaffold */ + if (g->scrolledwindow == 0) + nsgtk_scaffolding_destroy(g->scaffold); + free(g); }

16 years, 2 months

1
0
0 / 0

r3061 dsilvers - /branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Nov 19 18:03:51 2006 New Revision: 3061 URL: http://svn.semichrome.net?rev=3061&view=rev Log: Do not attach history motion notify, rjek hasn't finished it yet Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Sun Nov 19 18:03:51 2006 @@ -510,6 +510,7 @@ winx, winy, (int)(event->x), (int)(event->y))); gtk_widget_show(GTK_WIDGET(wndTooltip)); + LOG(("Move")); gtk_window_move(wndTooltip, event->x + winx, event->y + winy); return TRUE; @@ -658,8 +659,8 @@ /* connect history window signals to their handlers */ CONNECT(g->history_window->drawing_area, "expose_event", nsgtk_history_expose_event, g->history_window); - CONNECT(g->history_window->drawing_area, "motion_notify_event", - nsgtk_history_motion_notify_event, g->history_window); +// CONNECT(g->history_window->drawing_area, "motion_notify_event", +// nsgtk_history_motion_notify_event, g->history_window); CONNECT(g->history_window->drawing_area, "button_press_event", nsgtk_history_button_press_event, g->history_window); CONNECT(g->history_window->window, "delete_event",

16 years, 2 months

1
0
0 / 0

r3060 dsilvers - /branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Nov 19 17:59:51 2006 New Revision: 3060 URL: http://svn.semichrome.net?rev=3060&view=rev Log: Yay, renders a simple page. Unfortunately local history is boogered Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Sun Nov 19 17:59:51 2006 @@ -520,7 +520,9 @@ { struct gtk_history_window *hw = (struct gtk_history_window *)g; struct browser_window *bw = nsgtk_get_browser_for_gui(hw->g->top_level); - + + LOG(("X=%d, Y=%d", event->x, event->y)); + history_click(bw, bw->history, event->x, event->y, false);

16 years, 2 months

1
0
0 / 0

r3059 dsilvers - in /branches/dsilvers/gtk-frames: gtk/gtk_scaffolding.c gtk/gtk_window.c makefile

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Nov 19 17:55:57 2006 New Revision: 3059 URL: http://svn.semichrome.net?rev=3059&view=rev Log: Yay, renders a simple page. Unfortunately local history is boogered Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c branches/dsilvers/gtk-frames/gtk/gtk_window.c branches/dsilvers/gtk-frames/makefile Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Sun Nov 19 17:55:57 2006 @@ -35,6 +35,7 @@ #include "netsurf/render/html.h" #include "netsurf/utils/messages.h" #include "netsurf/utils/utils.h" +#undef NDEBUG #include "netsurf/utils/log.h" struct gtk_history_window; @@ -533,7 +534,8 @@ { /* Insert the viewport into the right part of our table */ GtkTable *table = GTK_TABLE(GET_WIDGET("centreTable")); - gtk_table_attach_defaults(table, GTK_WIDGET(vp), 0, 0, 0, 0); + LOG(("Attaching viewport to scaffolding %p", g)); + gtk_table_attach_defaults(table, GTK_WIDGET(vp), 0, 1, 0, 1); /* connect our scrollbars to the viewport */ gtk_viewport_set_hadjustment(vp, @@ -549,6 +551,8 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel) { struct gtk_scaffolding *g = malloc(sizeof(*g)); + + LOG(("Constructing a scaffold of %p for gui_window %p", g, toplevel)); g->top_level = toplevel; Modified: branches/dsilvers/gtk-frames/gtk/gtk_window.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_window.c?r... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_window.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_window.c Sun Nov 19 17:55:57 2006 @@ -13,6 +13,8 @@ #include "netsurf/gtk/gtk_scaffolding.h" #include "netsurf/gtk/gtk_plotters.h" #include "netsurf/gtk/gtk_schedule.h" +#undef NDEBUG +#include "netsurf/utils/log.h" #include <gdk/gdkkeysyms.h> struct gui_window { @@ -83,9 +85,12 @@ struct browser_window *clone) { struct gui_window *g; /**< what we're creating to return */ - + g = malloc(sizeof(*g)); - + + LOG(("Creating gui window %p for browser window %p", g, bw)); + + g->bw = bw; g->current_pointer = GUI_POINTER_DEFAULT; if (clone != NULL) @@ -144,8 +149,11 @@ /* Now construct and attach a scaffold */ g->scaffold = nsgtk_new_scaffolding(g); nsgtk_attach_toplevel_viewport(g->scaffold, g->viewport); - /* And enable visibility from our viewport down */ - gtk_widget_show_all(GTK_WIDGET(g->viewport)); + + /* And enable visibility from our viewport down */ + gtk_widget_show(GTK_WIDGET(g->viewport)); + gtk_widget_show(GTK_WIDGET(g->fixed)); + gtk_widget_show(GTK_WIDGET(g->drawing_area)); return g; } @@ -154,7 +162,7 @@ { struct gui_window *g = data; struct content *c = g->bw->current_content; - + if (c == NULL) return FALSE; @@ -269,10 +277,10 @@ } gboolean nsgtk_window_size_allocate_event(GtkWidget *widget, - GtkAllocation *allocation, gpointer data) + GtkAllocation *allocation, gpointer data) { struct gui_window *g = data; - + g->target_width = widget->allocation.width - 2; g->target_height = widget->allocation.height; @@ -293,8 +301,8 @@ if (g->bw->current_content->status != CONTENT_STATUS_READY && g->bw->current_content->status != CONTENT_STATUS_DONE) return; - - content_reformat(g->bw->current_content, + + content_reformat(g->bw->current_content, g->target_width, g->target_height); if (nsgtk_scaffolding_is_busy(g->scaffold)) @@ -321,7 +329,9 @@ if (g->next) g->next->prev = g->prev; - + + LOG(("Destroy")); + free(g); } Modified: branches/dsilvers/gtk-frames/makefile URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/makefile?rev=3059&... ============================================================================== --- branches/dsilvers/gtk-frames/makefile (original) +++ branches/dsilvers/gtk-frames/makefile Sun Nov 19 17:55:57 2006 @@ -129,7 +129,7 @@ CFLAGS_DEBUG = -std=c9x -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I.. \ $(PLATFORM_CFLAGS_DEBUG) -g CFLAGS_GTK = -Dnsgtk -std=c9x -D_BSD_SOURCE -D_POSIX_C_SOURCE -Dgtk \ - $(WARNFLAGS) -I.. -g -O0 -Wformat=2 \ + $(WARNFLAGS) -I.. -g -O0 -Wformat=2 -DNDEBUG \ `pkg-config --cflags libglade-2.0 gtk+-2.0` `xml2-config --cflags` # Stop GCC under Cygwin throwing a fit

16 years, 2 months

1
0
0 / 0

r3058 dsilvers - in /branches/dsilvers/gtk-frames/gtk: gtk_scaffolding.c res/netsurf.glade

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Nov 19 17:30:07 2006 New Revision: 3058 URL: http://svn.semichrome.net?rev=3058&view=rev Log: More work toward getting to to display, doesn't yet Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c branches/dsilvers/gtk-frames/gtk/res/netsurf.glade Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Sun Nov 19 17:30:07 2006 @@ -531,11 +531,17 @@ void nsgtk_attach_toplevel_viewport(nsgtk_scaffolding *g, GtkViewport *vp) { - /* connect our scrollbars to the viewport */ + /* Insert the viewport into the right part of our table */ + GtkTable *table = GTK_TABLE(GET_WIDGET("centreTable")); + gtk_table_attach_defaults(table, GTK_WIDGET(vp), 0, 0, 0, 0); + + /* connect our scrollbars to the viewport */ gtk_viewport_set_hadjustment(vp, - gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("hscrollbar1")))); + gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("coreScrollHorizontal")))); gtk_viewport_set_vadjustment(vp, - gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("vscrollbar1")))); + gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("coreScrollVertical")))); + + /* And set the size-request to zero to cause it to get its act together */ gtk_widget_set_size_request(GTK_WIDGET(vp), 0, 0); } Modified: branches/dsilvers/gtk-frames/gtk/res/netsurf.glade URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/res/netsurf.gl... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/res/netsurf.glade (original) +++ branches/dsilvers/gtk-frames/gtk/res/netsurf.glade Sun Nov 19 17:30:07 2006 @@ -984,7 +984,7 @@ </child> <child> - <widget class="GtkTable" id="table6"> + <widget class="GtkTable" id="centreTable"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">2</property> @@ -993,7 +993,7 @@ <property name="column_spacing">0</property> <child> - <widget class="GtkVScrollbar" id="vscrollbar1"> + <widget class="GtkVScrollbar" id="coreScrollVertical"> <property name="visible">True</property> <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> <property name="inverted">False</property> @@ -1039,7 +1039,7 @@ </child> <child> - <widget class="GtkHScrollbar" id="hscrollbar1"> + <widget class="GtkHScrollbar" id="coreScrollHorizontal"> <property name="visible">True</property> <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> <property name="inverted">False</property>

16 years, 2 months

1
0
0 / 0

r3057 dsilvers - in /branches/dsilvers/gtk-frames/gtk: gtk_scaffolding.c gtk_scaffolding.h gtk_window.c

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Nov 19 17:23:34 2006 New Revision: 3057 URL: http://svn.semichrome.net?rev=3057&view=rev Log: Now it doesn't crash, but we still don't get to see it. Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h branches/dsilvers/gtk-frames/gtk/gtk_window.c Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Sun Nov 19 17:23:34 2006 @@ -540,7 +540,7 @@ } -nsgtk_scaffolding *new_scaffolding(struct gui_window *toplevel) +nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel) { struct gtk_scaffolding *g = malloc(sizeof(*g)); Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h Sun Nov 19 17:23:34 2006 @@ -14,7 +14,7 @@ typedef struct gtk_scaffolding nsgtk_scaffolding; -nsgtk_scaffolding *new_scaffolding(struct gui_window *toplevel); +nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel); gboolean nsgtk_scaffolding_is_busy(nsgtk_scaffolding *scaffold); Modified: branches/dsilvers/gtk-frames/gtk/gtk_window.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_window.c?r... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_window.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_window.c Sun Nov 19 17:23:34 2006 @@ -141,6 +141,11 @@ CONNECT(g->viewport, "size_allocate", nsgtk_window_size_allocate_event, g); + /* Now construct and attach a scaffold */ + g->scaffold = nsgtk_new_scaffolding(g); + nsgtk_attach_toplevel_viewport(g->scaffold, g->viewport); + /* And enable visibility from our viewport down */ + gtk_widget_show_all(GTK_WIDGET(g->viewport)); return g; }

16 years, 2 months

1
0
0 / 0

r3056 dsilvers - in /branches/dsilvers/gtk-frames: gtk/gtk_plotters.c gtk/gtk_plotters.h gtk/gtk_scaffolding.c gtk/gtk_scaffolding.h gtk/gtk_schedule.h gtk/gtk_window.c gtk/gtk_window.h gtk/res/netsurf.glade makefile

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Nov 19 17:19:41 2006 New Revision: 3056 URL: http://svn.semichrome.net?rev=3056&view=rev Log: Initial breakout into gtk_window and gtk_scaffold. Compiles, does not yet run. Added: branches/dsilvers/gtk-frames/gtk/gtk_schedule.h branches/dsilvers/gtk-frames/gtk/gtk_window.c branches/dsilvers/gtk-frames/gtk/gtk_window.h Modified: branches/dsilvers/gtk-frames/gtk/gtk_plotters.c branches/dsilvers/gtk-frames/gtk/gtk_plotters.h branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h branches/dsilvers/gtk-frames/gtk/res/netsurf.glade branches/dsilvers/gtk-frames/makefile Modified: branches/dsilvers/gtk-frames/gtk/gtk_plotters.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_plotters.c... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_plotters.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_plotters.c Sun Nov 19 17:19:41 2006 @@ -443,3 +443,21 @@ return nsgtk_plot_scale; } +/** Plot a caret. It is assumed that the plotters have been set up. */ +void nsgtk_plot_caret(int x, int y, int h) +{ + GdkColor colour; + + colour.red = 0; + colour.green = 0; + colour.blue = 0; + colour.pixel = 0; + gdk_color_alloc(gdk_colormap_get_system(), + &colour); + gdk_gc_set_foreground(current_gc, &colour); + + gdk_draw_line(current_drawable, current_gc, + x, y, + x, y + h - 1); +} + Modified: branches/dsilvers/gtk-frames/gtk/gtk_plotters.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_plotters.h... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_plotters.h (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_plotters.h Sun Nov 19 17:19:41 2006 @@ -28,5 +28,6 @@ void nsgtk_plot_set_scale(float s); float nsgtk_plot_get_scale(void); void nsgtk_set_colour(colour c); +void nsgtk_plot_caret(int x, int y, int h); #endif /* NETSURF_GTK_PLOTTERS_H */ Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Sun Nov 19 17:19:41 2006 @@ -9,7 +9,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> #include <glade/glade.h> #include "netsurf/content/content.h" @@ -28,6 +27,8 @@ #include "netsurf/gtk/gtk_completion.h" #include "netsurf/gtk/gtk_throbber.h" #include "netsurf/gtk/gtk_history.h" +#include "netsurf/gtk/gtk_window.h" +#include "netsurf/gtk/gtk_schedule.h" #include "netsurf/render/box.h" #include "netsurf/render/font.h" #include "netsurf/render/form.h" @@ -38,12 +39,10 @@ struct gtk_history_window; -struct gui_window { +struct gtk_scaffolding { GtkWindow *window; GtkEntry *url_bar; GtkEntryCompletion *url_bar_completion; - GtkDrawingArea *drawing_area; - GtkViewport *viewport; GtkLabel *status_bar; GtkToolButton *back_button; GtkToolButton *forward_button; @@ -58,22 +57,14 @@ GladeXML *xml; - struct browser_window *bw; - float scale; - int target_width, target_height; - int caretx, carety, careth; - gui_pointer_shape current_pointer; + struct gtk_history_window *history_window; + int throb_frame; - - struct gtk_history_window *history_window; - - int last_x, last_y; - - struct gui_window *next, *prev; + struct gui_window *top_level; }; struct gtk_history_window { - struct gui_window *g; + struct gtk_scaffolding *g; GtkWindow *window; GtkScrolledWindow *scrolled; GtkDrawingArea *drawing_area; @@ -85,27 +76,11 @@ }; static int open_windows = 0; /**< current number of open browsers */ -static struct gui_window *window_list = 0; /**< first entry in win list*/ - -static wchar_t gdkkey_to_nskey(GdkEventKey *); + static void nsgtk_window_destroy_event(GtkWidget *, gpointer); -static void nsgtk_plot_caret(int x, int y, int h); -static gboolean nsgtk_window_expose_event(GtkWidget *, GdkEventExpose *, - gpointer); -static gboolean nsgtk_window_motion_notify_event(GtkWidget *, GdkEventMotion *, - gpointer); -static gboolean nsgtk_window_button_press_event(GtkWidget *, GdkEventButton *, - gpointer); -static gboolean nsgtk_window_keypress_event(GtkWidget *, GdkEventKey *, - gpointer); -static gboolean nsgtk_window_size_allocate_event(GtkWidget *, GtkAllocation *, - gpointer); - -static void nsgtk_perform_deferred_resize(void *); -static void nsgtk_window_update_back_forward(struct gui_window *); + +static void nsgtk_window_update_back_forward(struct gtk_scaffolding *); static void nsgtk_throb(void *); -static void nsgtk_redraw_caret(struct gui_window *); - static gboolean nsgtk_window_back_button_clicked(GtkWidget *, gpointer); static gboolean nsgtk_window_forward_button_clicked(GtkWidget *, gpointer); static gboolean nsgtk_window_stop_button_clicked(GtkWidget *, gpointer); @@ -189,16 +164,6 @@ { NULL, NULL } }; -void nsgtk_reflow_all_windows(void) -{ - struct gui_window *g = window_list; - - while (g != NULL) { - nsgtk_perform_deferred_resize(g); - g = g->next; - } -} - void nsgtk_attach_menu_handlers(GladeXML *xml, gpointer g) { struct menu_events *event = menu_events; @@ -211,205 +176,40 @@ } } -wchar_t gdkkey_to_nskey(GdkEventKey *key) -{ - /* this function will need to become much more complex to support - * everything that the RISC OS version does. But this will do for - * now. I hope. - */ - - switch (key->keyval) - { - case GDK_BackSpace: return KEY_DELETE_LEFT; - case GDK_Delete: return KEY_DELETE_RIGHT; - case GDK_Linefeed: return 13; - case GDK_Return: return 10; - case GDK_Left: return KEY_LEFT; - case GDK_Right: return KEY_RIGHT; - case GDK_Up: return KEY_UP; - case GDK_Down: return KEY_DOWN; - - /* Modifiers - do nothing for now */ - case GDK_Shift_L: - case GDK_Shift_R: - case GDK_Control_L: - case GDK_Control_R: - case GDK_Caps_Lock: - case GDK_Shift_Lock: - case GDK_Meta_L: - case GDK_Meta_R: - case GDK_Alt_L: - case GDK_Alt_R: - case GDK_Super_L: - case GDK_Super_R: - case GDK_Hyper_L: - case GDK_Hyper_R: return 0; - - default: return key->keyval; - } -} - /* event handlers and support functions for them */ void nsgtk_window_destroy_event(GtkWidget *widget, gpointer data) { - struct gui_window *g = data; - - gui_window_destroy(g); -} - -/** Plot a caret. It is assumed that the plotters have been set up. */ -void nsgtk_plot_caret(int x, int y, int h) -{ - GdkColor colour; - - colour.red = 0; - colour.green = 0; - colour.blue = 0; - colour.pixel = 0; - gdk_color_alloc(gdk_colormap_get_system(), - &colour); - gdk_gc_set_foreground(current_gc, &colour); - - gdk_draw_line(current_drawable, current_gc, - x, y, - x, y + h - 1); -} - -gboolean nsgtk_window_expose_event(GtkWidget *widget, - GdkEventExpose *event, gpointer data) -{ - struct gui_window *g = data; - struct content *c = g->bw->current_content; - - if (c == NULL) - return FALSE; - - current_widget = widget; - current_drawable = widget->window; - current_gc = gdk_gc_new(current_drawable); -#ifdef CAIRO_VERSION - current_cr = gdk_cairo_create(current_drawable); -#endif - - plot = nsgtk_plotters; - nsgtk_plot_set_scale(g->scale); - content_redraw(c, 0, 0, - widget->allocation.width, - widget->allocation.height, - event->area.x, - event->area.y, - event->area.x + event->area.width, - event->area.y + event->area.height, - g->scale, 0xFFFFFF); - - if (g->careth != 0) - nsgtk_plot_caret(g->caretx, g->carety, g->careth); - - g_object_unref(current_gc); -#ifdef CAIRO_VERSION - cairo_destroy(current_cr); -#endif - - return FALSE; -} - -gboolean nsgtk_window_motion_notify_event(GtkWidget *widget, - GdkEventMotion *event, gpointer data) -{ - struct gui_window *g = data; - - browser_window_mouse_track(g->bw, 0, event->x / g->scale, - event->y / g->scale); - - g->last_x = event->x; - g->last_y = event->y; - - return TRUE; -} - -gboolean nsgtk_window_button_press_event(GtkWidget *widget, - GdkEventButton *event, gpointer data) -{ - struct gui_window *g = data; - int button = BROWSER_MOUSE_CLICK_1; - - if (event->button == 2) /* 2 == middle button on X */ - button = BROWSER_MOUSE_CLICK_2; - - if (event->button == 3) /* 3 == right button on X */ - return TRUE; /* Do nothing for right click for now */ - - browser_window_mouse_click(g->bw, button, - event->x / g->scale, event->y / g->scale); - - return TRUE; -} - -gboolean nsgtk_window_keypress_event(GtkWidget *widget, GdkEventKey *event, - gpointer data) -{ - struct gui_window *g = data; - wchar_t nskey = gdkkey_to_nskey(event); - - browser_window_key_press(g->bw, nskey); - - return TRUE; -} - -gboolean nsgtk_window_size_allocate_event(GtkWidget *widget, - GtkAllocation *allocation, gpointer data) -{ - struct gui_window *g = data; - - g->target_width = widget->allocation.width - 2; - g->target_height = widget->allocation.height; - - /* schedule a callback to perform the resize for 1/10s from now */ - schedule(5, nsgtk_perform_deferred_resize, g); - - return TRUE; -} - -void nsgtk_perform_deferred_resize(void *p) -{ - struct gui_window *g = p; - - if (gui_in_multitask) - return; - - if (g->bw->current_content == NULL) - return; - - if (g->bw->current_content->status != CONTENT_STATUS_READY && - g->bw->current_content->status != CONTENT_STATUS_DONE) - return; - - content_reformat(g->bw->current_content, - g->target_width, g->target_height); - - if (GTK_WIDGET_SENSITIVE((GTK_WIDGET(g->stop_button)))) - schedule(100, nsgtk_perform_deferred_resize, g); -} - -void nsgtk_window_update_back_forward(struct gui_window *g) + struct gtk_scaffolding *g = data; + + gtk_widget_destroy(GTK_WIDGET(g->history_window->window)); + gtk_widget_destroy(GTK_WIDGET(g->window)); + + if (--open_windows == 0) + netsurf_quit = true; + + gui_window_destroy(g->top_level); +} + +void nsgtk_window_update_back_forward(struct gtk_scaffolding *g) { int width, height; - + struct browser_window *bw = nsgtk_get_browser_for_gui(g->top_level); + gtk_widget_set_sensitive(GTK_WIDGET(g->back_button), - history_back_available(g->bw->history)); + history_back_available(bw->history)); gtk_widget_set_sensitive(GTK_WIDGET(g->forward_button), - history_forward_available(g->bw->history)); + history_forward_available(bw->history)); gtk_widget_set_sensitive(GTK_WIDGET(g->back_menu), - history_back_available(g->bw->history)); + history_back_available(bw->history)); gtk_widget_set_sensitive(GTK_WIDGET(g->forward_menu), - history_forward_available(g->bw->history)); + history_forward_available(bw->history)); /* update the local history window, as well as queuing a redraw * for it. */ - history_size(g->bw->history, &width, &height); + history_size(bw->history, &width, &height); gtk_widget_set_size_request(GTK_WIDGET(g->history_window->drawing_area), width, height); gtk_widget_queue_draw(GTK_WIDGET(g->history_window->drawing_area)); @@ -417,7 +217,7 @@ void nsgtk_throb(void *p) { - struct gui_window *g = p; + struct gtk_scaffolding *g = p; if (g->throb_frame >= (nsgtk_throbber->nframes - 1)) g->throb_frame = 1; @@ -430,24 +230,16 @@ schedule(10, nsgtk_throb, p); } -void nsgtk_redraw_caret(struct gui_window *g) -{ - if (g->careth == 0) - return; - - gui_window_redraw(g, g->caretx, g->carety, - g->caretx, g->carety + g->careth); -} - /* signal handling functions for the toolbar and URL bar */ gboolean nsgtk_window_back_button_clicked(GtkWidget *widget, gpointer data) { - struct gui_window *g = data; - - if (!history_back_available(g->bw->history)) + struct gtk_scaffolding *g = data; + struct browser_window *bw = nsgtk_get_browser_for_gui(g->top_level); + + if (!history_back_available(bw->history)) return TRUE; - history_back(g->bw, g->bw->history); + history_back(bw, bw->history); nsgtk_window_update_back_forward(g); return TRUE; @@ -455,12 +247,13 @@ gboolean nsgtk_window_forward_button_clicked(GtkWidget *widget, gpointer data) { - struct gui_window *g = data; - - if (!history_forward_available(g->bw->history)) + struct gtk_scaffolding *g = data; + struct browser_window *bw = nsgtk_get_browser_for_gui(g->top_level); + + if (!history_forward_available(bw->history)) return TRUE; - history_forward(g->bw, g->bw->history); + history_forward(bw, bw->history); nsgtk_window_update_back_forward(g); return TRUE; @@ -468,45 +261,49 @@ gboolean nsgtk_window_stop_button_clicked(GtkWidget *widget, gpointer data) { - struct gui_window *g = data; - - browser_window_stop(g->bw); + struct gtk_scaffolding *g = data; + struct browser_window *bw = nsgtk_get_browser_for_gui(g->top_level); + + browser_window_stop(bw); return TRUE; } gboolean nsgtk_window_reload_button_clicked(GtkWidget *widget, gpointer data) { - struct gui_window *g = data; - - browser_window_reload(g->bw, true); + struct gtk_scaffolding *g = data; + struct browser_window *bw = nsgtk_get_browser_for_gui(g->top_level); + + browser_window_reload(bw, true); return TRUE; } gboolean nsgtk_window_home_button_clicked(GtkWidget *widget, gpointer data) { - struct gui_window *g = data; + struct gtk_scaffolding *g = data; static const char *addr = "http://netsurf.sourceforge.net/"; + struct browser_window *bw = nsgtk_get_browser_for_gui(g->top_level); if (option_homepage_url != NULL) addr = option_homepage_url; - browser_window_go(g->bw, addr, 0, true); + browser_window_go(bw, addr, 0, true); return TRUE; } gboolean nsgtk_window_url_activate_event(GtkWidget *widget, gpointer data) { - struct gui_window *g = data; + struct gtk_scaffolding *g = data; char *referer = 0; - - if (g->bw->current_content && g->bw->current_content->url) - referer = g->bw->current_content->url; - - browser_window_go(g->bw, gtk_entry_get_text(GTK_ENTRY(g->url_bar)), - referer, true); + struct browser_window *bw = nsgtk_get_browser_for_gui(g->top_level); + + if (bw->current_content && bw->current_content->url) + referer = bw->current_content->url; + + browser_window_go(bw, gtk_entry_get_text(GTK_ENTRY(g->url_bar)), + referer, true); return TRUE; } @@ -535,7 +332,7 @@ MENUHANDLER(close_window) { - struct gui_window *gw = (struct gui_window *)g; + struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g; gtk_widget_destroy(GTK_WIDGET(gw->window)); @@ -557,34 +354,39 @@ MENUHANDLER(zoom_in) { - struct gui_window *gw = (struct gui_window *)g; - - browser_window_set_scale(gw->bw, gw->scale + 0.05, true); + struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g; + struct browser_window *bw = nsgtk_get_browser_for_gui(gw->top_level); + float old_scale = nsgtk_get_scale_for_gui(gw->top_level); + + browser_window_set_scale(bw, old_scale + 0.05, true); return TRUE; } MENUHANDLER(normal_size) { - struct gui_window *gw = (struct gui_window *)g; - - browser_window_set_scale(gw->bw, 1.0, true); + struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g; + struct browser_window *bw = nsgtk_get_browser_for_gui(gw->top_level); + + browser_window_set_scale(bw, 1.0, true); return TRUE; } MENUHANDLER(zoom_out) { - struct gui_window *gw = (struct gui_window *)g; - - browser_window_set_scale(gw->bw, gw->scale - 0.05, true); + struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g; + struct browser_window *bw = nsgtk_get_browser_for_gui(gw->top_level); + float old_scale = nsgtk_get_scale_for_gui(gw->top_level); + + browser_window_set_scale(bw, old_scale - 0.05, true); return TRUE; } MENUHANDLER(save_window_size) { - struct gui_window *gw = (struct gui_window *)g; + struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g; option_toolbar_status_width = gtk_paned_get_position(gw->status_pane); gtk_window_get_position(gw->window, &option_window_x, &option_window_y); @@ -632,7 +434,7 @@ MENUHANDLER(local_history) { - struct gui_window *gw = (struct gui_window *)g; + struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g; gtk_widget_show(GTK_WIDGET(gw->history_window->window)); gdk_window_raise(GDK_WINDOW(gw->history_window->window)); @@ -657,10 +459,11 @@ /* signal handler functions for the local history window */ gboolean nsgtk_history_expose_event(GtkWidget *widget, - GdkEventExpose *event, gpointer g) + GdkEventExpose *event, gpointer g) { struct gtk_history_window *hw = (struct gtk_history_window *)g; - + struct browser_window *bw = nsgtk_get_browser_for_gui(hw->g->top_level); + current_widget = widget; current_drawable = widget->window; current_gc = gdk_gc_new(current_drawable); @@ -670,7 +473,7 @@ plot = nsgtk_plotters; nsgtk_plot_set_scale(1.0); - history_redraw(hw->g->bw->history); + history_redraw(bw->history); g_object_unref(current_gc); #ifdef CAIRO_VERSION @@ -680,21 +483,22 @@ } gboolean nsgtk_history_motion_notify_event(GtkWidget *widget, - GdkEventMotion *event, gpointer g) + GdkEventMotion *event, gpointer g) { /* if we're hovering over a history item, popup our tooltip bodge * describing the page. */ struct gtk_history_window *gw = g; + struct browser_window *bw = nsgtk_get_browser_for_gui(gw->g->top_level); const char *url; int winx, winy; // if (!option_history_tooltip) // return TRUE; - url = history_position_url(gw->g->bw->history, event->x, event->y); + url = history_position_url(bw->history, event->x, event->y); if (url == NULL) { - gtk_widget_hide(wndTooltip); + gtk_widget_hide(GTK_WIDGET(wndTooltip)); return TRUE; } @@ -702,7 +506,7 @@ gtk_window_get_position(gw->g->window, &winx, &winy); LOG(("winx = %d, winy = %d, event->x = %d, event->y = %d", - winx, winy, event->x, event->y)); + winx, winy, (int)(event->x), (int)(event->y))); gtk_widget_show(GTK_WIDGET(wndTooltip)); gtk_window_move(wndTooltip, event->x + winx, event->y + winy); @@ -714,39 +518,34 @@ GdkEventButton *event, gpointer g) { struct gtk_history_window *hw = (struct gtk_history_window *)g; - - history_click(hw->g->bw, hw->g->bw->history, + struct browser_window *bw = nsgtk_get_browser_for_gui(hw->g->top_level); + + history_click(bw, bw->history, event->x, event->y, false); return TRUE; } -/* functions called by the core to manipulate the GUI */ #define GET_WIDGET(x) glade_xml_get_widget(g->xml, (x)) -struct gui_window *gui_create_browser_window(struct browser_window *bw, - struct browser_window *clone) -{ - struct gui_window *g; /**< what we're creating to return */ - - g = malloc(sizeof(*g)); - - g->bw = bw; - g->current_pointer = GUI_POINTER_DEFAULT; - if (clone != NULL) - g->scale = clone->window->scale; - else - g->scale = 1.0; - - g->careth = 0; - - /* add the window to the list of open windows. */ - g->prev = 0; - g->next = window_list; - - if (window_list) - window_list->prev = g; - window_list = g; - + +void nsgtk_attach_toplevel_viewport(nsgtk_scaffolding *g, + GtkViewport *vp) +{ + /* connect our scrollbars to the viewport */ + gtk_viewport_set_hadjustment(vp, + gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("hscrollbar1")))); + gtk_viewport_set_vadjustment(vp, + gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("vscrollbar1")))); + gtk_widget_set_size_request(GTK_WIDGET(vp), 0, 0); + +} + +nsgtk_scaffolding *new_scaffolding(struct gui_window *toplevel) +{ + struct gtk_scaffolding *g = malloc(sizeof(*g)); + + g->top_level = toplevel; + open_windows++; /* load the window template from the glade xml file, and extract @@ -756,7 +555,6 @@ glade_xml_signal_autoconnect(g->xml); g->window = GTK_WINDOW(GET_WIDGET("wndBrowser")); g->url_bar = GTK_ENTRY(GET_WIDGET("URLBar")); - g->drawing_area = GTK_DRAWING_AREA(GET_WIDGET("drawingArea")); g->status_bar = GTK_LABEL(GET_WIDGET("statusBar")); g->back_button = GTK_TOOL_BUTTON(GET_WIDGET("toolBack")); g->forward_button = GTK_TOOL_BUTTON(GET_WIDGET("toolForward")); @@ -767,7 +565,6 @@ g->stop_menu = GTK_MENU_ITEM(GET_WIDGET("stop")); g->reload_menu = GTK_MENU_ITEM(GET_WIDGET("reload")); g->throbber = GTK_IMAGE(GET_WIDGET("throbber")); - g->viewport = GTK_VIEWPORT(GET_WIDGET("viewport1")); g->status_pane = GTK_PANED(GET_WIDGET("hpaned1")); /* set this window's size and position to what's in the options, or @@ -784,33 +581,10 @@ /* set the size of the hpane with status bar and h scrollbar */ gtk_paned_set_position(g->status_pane, option_toolbar_status_width); - /* connect our scrollbars to the viewport */ - gtk_viewport_set_hadjustment(g->viewport, - gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("hscrollbar1")))); - gtk_viewport_set_vadjustment(g->viewport, - gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("vscrollbar1")))); - gtk_widget_set_size_request(GTK_WIDGET(g->viewport), 0, 0); - /* set the URL entry box to expand, as we can't do this from within * glade because of the way it emulates toolbars. */ gtk_tool_item_set_expand(GTK_TOOL_ITEM(GET_WIDGET("toolURLBar")), TRUE); - - /* set the events we're interested in receiving from the browser's - * drawing area. - */ - gtk_widget_set_events(GTK_WIDGET(g->drawing_area), - GDK_EXPOSURE_MASK | - GDK_LEAVE_NOTIFY_MASK | - GDK_BUTTON_PRESS_MASK | - GDK_POINTER_MOTION_MASK | - GDK_KEY_PRESS_MASK | - GDK_KEY_RELEASE_MASK); - GTK_WIDGET_SET_FLAGS(GTK_WIDGET(g->drawing_area), GTK_CAN_FOCUS); - - /* set the default background colour of the drawing area to white. */ - gtk_widget_modify_bg(GTK_WIDGET(g->drawing_area), GTK_STATE_NORMAL, - &((GdkColor) { 0, 0xffff, 0xffff, 0xffff } )); /* disable toolbar buttons that make no sense initially. */ gtk_widget_set_sensitive(GTK_WIDGET(g->back_button), FALSE); @@ -881,15 +655,6 @@ /* connect signals to handlers. */ CONNECT(g->window, "destroy", nsgtk_window_destroy_event, g); - CONNECT(g->drawing_area, "expose_event", nsgtk_window_expose_event, g); - CONNECT(g->drawing_area, "motion_notify_event", - nsgtk_window_motion_notify_event, g); - CONNECT(g->drawing_area, "button_press_event", - nsgtk_window_button_press_event, g); - CONNECT(g->drawing_area, "key_press_event", - nsgtk_window_keypress_event, g); - CONNECT(GET_WIDGET("viewport1"), "size_allocate", - nsgtk_window_size_allocate_event, g); /* toolbar and URL bar signal handlers */ CONNECT(g->back_button, "clicked", nsgtk_window_back_button_clicked, g); @@ -912,29 +677,11 @@ return g; } -void gui_window_destroy(struct gui_window *g) -{ - if (g->prev) - g->prev->next = g->next; - else - window_list = g->next; - - if (g->next) - g->next->prev = g->prev; - - gtk_widget_destroy(GTK_WIDGET(g->history_window->window)); - gtk_widget_destroy(GTK_WIDGET(g->window)); - - free(g); - - if (--open_windows == 0) - netsurf_quit = true; -} - -void gui_window_set_title(struct gui_window *g, const char *title) +void gui_window_set_title(struct gui_window *_g, const char *title) { static char suffix[] = " - NetSurf"; char nt[strlen(title) + strlen(suffix) + 1]; + struct gtk_scaffolding *g = nsgtk_get_scaffold(_g); if (title == NULL || title[0] == '\0') { @@ -949,171 +696,22 @@ } } -void gui_window_redraw(struct gui_window *g, int x0, int y0, int x1, int y1) -{ - gtk_widget_queue_draw_area(GTK_WIDGET(g->drawing_area), - x0, y0, x1-x0+1, y1-y0+1); -} - -void gui_window_redraw_window(struct gui_window *g) -{ - gtk_widget_queue_draw(GTK_WIDGET(g->drawing_area)); -} - -void gui_window_update_box(struct gui_window *g, - const union content_msg_data *data) -{ - struct content *c = g->bw->current_content; - - if (c == NULL) - return; - - gtk_widget_queue_draw_area(GTK_WIDGET(g->drawing_area), - data->redraw.x, data->redraw.y, - data->redraw.width, data->redraw.height); -} - -bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy) -{ - *sx = 0; - *sy = 0; - return true; -} - -void gui_window_set_scroll(struct gui_window *g, int sx, int sy) -{ - -} - -float gui_window_get_scale(struct gui_window *g) -{ - return g->scale; -} - -void gui_window_set_scale(struct gui_window *g, float scale) -{ - if (g->scale == scale) - return; - g->scale = scale; - - if (g->bw->current_content != NULL) - gui_window_update_extent(g); - - gtk_widget_queue_draw(GTK_WIDGET(g->drawing_area)); - -} - -void gui_window_update_extent(struct gui_window *g) -{ - if (!g->bw->current_content) - return; - - gtk_widget_set_size_request(GTK_WIDGET(g->drawing_area), - g->bw->current_content->width * g->scale, - g->bw->current_content->height * g->scale); - gtk_widget_set_size_request(GTK_WIDGET(g->viewport), 0, 0); -} - -void gui_window_set_status(struct gui_window *g, const char *text) -{ +void gui_window_set_status(struct gui_window *_g, const char *text) +{ + struct gtk_scaffolding *g = nsgtk_get_scaffold(_g); gtk_label_set_text(g->status_bar, text); } -void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) -{ - GdkCursor *cursor = NULL; - GdkCursorType cursortype; - bool nullcursor = false; - - if (g->current_pointer == shape) - return; - - g->current_pointer = shape; - - switch (shape) { - case GUI_POINTER_POINT: - cursortype = GDK_HAND1; - break; - case GUI_POINTER_CARET: - cursortype = GDK_XTERM; - break; - case GUI_POINTER_UP: - cursortype = GDK_TOP_SIDE; - break; - case GUI_POINTER_DOWN: - cursortype = GDK_BOTTOM_SIDE; - break; - case GUI_POINTER_LEFT: - cursortype = GDK_LEFT_SIDE; - break; - case GUI_POINTER_RIGHT: - cursortype = GDK_RIGHT_SIDE; - break; - case GUI_POINTER_LD: - cursortype = GDK_BOTTOM_LEFT_CORNER; - break; - case GUI_POINTER_RD: - cursortype = GDK_BOTTOM_RIGHT_CORNER; - break; - case GUI_POINTER_LU: - cursortype = GDK_TOP_LEFT_CORNER; - break; - case GUI_POINTER_RU: - cursortype = GDK_TOP_RIGHT_CORNER; - break; - case GUI_POINTER_CROSS: - cursortype = GDK_CROSS; - break; - case GUI_POINTER_MOVE: - cursortype = GDK_FLEUR; - break; - case GUI_POINTER_WAIT: - cursortype = GDK_WATCH; - break; - case GUI_POINTER_HELP: - cursortype = GDK_QUESTION_ARROW; - break; - case GUI_POINTER_MENU: - cursortype = GDK_RIGHTBUTTON; - break; - case GUI_POINTER_PROGRESS: - /* In reality, this needs to be the funky left_ptr_watch - * which we can't do easily yet. - */ - cursortype = GDK_WATCH; - break; - /* The following we're not sure about */ - case GUI_POINTER_NO_DROP: - case GUI_POINTER_NOT_ALLOWED: - case GUI_POINTER_DEFAULT: - default: - nullcursor = true; - } - - if (!nullcursor) - cursor = gdk_cursor_new_for_display( - gtk_widget_get_display( - GTK_WIDGET(g->drawing_area)), - cursortype); - gdk_window_set_cursor(GTK_WIDGET(g->drawing_area)->window, cursor); - - if (!nullcursor) - gdk_cursor_unref(cursor); -} - -void gui_window_hide_pointer(struct gui_window *g) -{ - -} - -void gui_window_set_url(struct gui_window *g, const char *url) -{ +void gui_window_set_url(struct gui_window *_g, const char *url) +{ + struct gtk_scaffolding *g = nsgtk_get_scaffold(_g); gtk_entry_set_text(g->url_bar, url); gtk_editable_set_position(GTK_EDITABLE(g->url_bar), -1); } -void gui_window_start_throbber(struct gui_window* g) -{ +void gui_window_start_throbber(struct gui_window* _g) +{ + struct gtk_scaffolding *g = nsgtk_get_scaffold(_g); gtk_widget_set_sensitive(GTK_WIDGET(g->stop_button), TRUE); gtk_widget_set_sensitive(GTK_WIDGET(g->reload_button), FALSE); gtk_widget_set_sensitive(GTK_WIDGET(g->stop_menu), TRUE); @@ -1124,8 +722,9 @@ schedule(10, nsgtk_throb, g); } -void gui_window_stop_throbber(struct gui_window* g) -{ +void gui_window_stop_throbber(struct gui_window* _g) +{ + struct gtk_scaffolding *g = nsgtk_get_scaffold(_g); gtk_widget_set_sensitive(GTK_WIDGET(g->stop_button), FALSE); gtk_widget_set_sensitive(GTK_WIDGET(g->reload_button), TRUE); gtk_widget_set_sensitive(GTK_WIDGET(g->stop_menu), FALSE); @@ -1137,111 +736,11 @@ gtk_image_set_from_pixbuf(g->throbber, nsgtk_throbber->framedata[0]); // Issue a final reflow so that the content object reports its size correctly - schedule(5, nsgtk_perform_deferred_resize, g); -} - -void gui_window_place_caret(struct gui_window *g, int x, int y, int height) -{ - nsgtk_redraw_caret(g); - - g->caretx = x; - g->carety = y + 1; - g->careth = height; - - nsgtk_redraw_caret(g); - - gtk_widget_grab_focus(GTK_WIDGET(g->drawing_area)); -} - -void gui_window_remove_caret(struct gui_window *g) -{ - int oh = g->careth; - - if (oh == 0) - return; - - g->careth = 0; - - gui_window_redraw(g, g->caretx, g->carety, - g->caretx, g->carety + oh); -} - -void gui_window_new_content(struct gui_window *g) -{ - -} - -bool gui_window_scroll_start(struct gui_window *g) -{ - return true; -} - -bool gui_window_box_scroll_start(struct gui_window *g, - int x0, int y0, int x1, int y1) -{ - return true; -} - -void gui_drag_save_object(gui_save_type type, struct content *c, - struct gui_window *g) -{ - -} - -void gui_drag_save_selection(struct selection *s, struct gui_window *g) -{ - -} - -void gui_start_selection(struct gui_window *g) -{ - -} - -void gui_paste_from_clipboard(struct gui_window *g, int x, int y) -{ - -} - -bool gui_empty_clipboard(void) -{ - return true; -} - -bool gui_add_to_clipboard(const char *text, size_t length, bool space) -{ - return true; -} - -bool gui_commit_clipboard(void) -{ - return true; -} - - -bool gui_copy_to_clipboard(struct selection *s) -{ - return true; -} - - -void gui_window_get_dimensions(struct gui_window *g, int *width, int *height, - bool scaled) -{ - *width = GTK_WIDGET(g->drawing_area)->allocation.width; - *height = GTK_WIDGET(g->drawing_area)->allocation.height; - - if (scaled) { - *width /= g->scale; - *height /= g->scale; - } -} - -void gui_window_position_frame(struct gui_window *g, int x0, int y0, int x1, int y1) -{ -} - -bool gui_window_frame_resize_start(struct gui_window *g) -{ - return true; -} + schedule(5, (gtk_callback)(nsgtk_window_reflow_content), _g); +} + +gboolean nsgtk_scaffolding_is_busy(nsgtk_scaffolding *scaffold) +{ + /* We are considered "busy" if the stop button is sensitive */ + return GTK_WIDGET_SENSITIVE((GTK_WIDGET(scaffold->stop_button))); +} Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h Sun Nov 19 17:19:41 2006 @@ -8,8 +8,16 @@ #ifndef NETSURF_GTK_SCAFFOLDING_H #define NETSURF_GTK_SCAFFOLDING_H 1 +#include <gtk/gtk.h> +#include "netsurf/desktop/gui.h" #include "netsurf/desktop/plotters.h" -void nsgtk_reflow_all_windows(void); +typedef struct gtk_scaffolding nsgtk_scaffolding; + +nsgtk_scaffolding *new_scaffolding(struct gui_window *toplevel); + +gboolean nsgtk_scaffolding_is_busy(nsgtk_scaffolding *scaffold); + +void nsgtk_attach_toplevel_viewport(nsgtk_scaffolding *g, GtkViewport *vp); #endif /* NETSURF_GTK_SCAFFOLDING_H */ Added: branches/dsilvers/gtk-frames/gtk/gtk_schedule.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_schedule.h... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_schedule.h (added) +++ branches/dsilvers/gtk-frames/gtk/gtk_schedule.h Sun Nov 19 17:19:41 2006 @@ -1,0 +1,13 @@ +/* + * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * Licensed under the GNU General Public License, + * http://www.opensource.org/licenses/gpl-license + * Copyright 2006 Daniel Silverstone <dsilvers(a)digital-scurf.org> + */ + +#ifndef NETSURF_GTK_CALLBACK_H +#define NETSURF_GTK_CALLBACK_H 1 + +typedef void (*gtk_callback)(void *p); + +#endif /* NETSURF_GTK_CALLBACK_H */ Added: branches/dsilvers/gtk-frames/gtk/gtk_window.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_window.c?r... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_window.c (added) +++ branches/dsilvers/gtk-frames/gtk/gtk_window.c Sun Nov 19 17:19:41 2006 @@ -1,0 +1,589 @@ +/* + * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * Licensed under the GNU General Public License, + * http://www.opensource.org/licenses/gpl-license + * Copyright 2006 Daniel Silverstone <dsilvers(a)digital-scurf.org> + * Copyright 2006 Rob Kendrick <rjek(a)rjek.com> + */ + +#include "netsurf/gtk/gtk_window.h" +#include "netsurf/desktop/browser.h" +#include "netsurf/desktop/textinput.h" +#include "netsurf/gtk/gtk_gui.h" +#include "netsurf/gtk/gtk_scaffolding.h" +#include "netsurf/gtk/gtk_plotters.h" +#include "netsurf/gtk/gtk_schedule.h" +#include <gdk/gdkkeysyms.h> + +struct gui_window { + /* All gui_window objects have an ultimate scaffold */ + nsgtk_scaffolding *scaffold; + /* A gui_window is the rendering of a browser_window */ + struct browser_window *bw; + + /* These are the storage for the rendering */ + float scale; + int target_width, target_height; + int caretx, carety, careth; + gui_pointer_shape current_pointer; + int last_x, last_y; + + /* Within GTK, a gui_window is a scrolled window + * with a viewport inside + * with a gtkfixed in that + * with a drawing area in that + * The scrolled window is optional and only chosen + * for frames which need it. Otherwise we just use + * a viewport. + */ + GtkScrolledWindow *scrolledwindow; + GtkViewport *viewport; + GtkFixed *fixed; + GtkDrawingArea *drawing_area; + + /* Keep gui_windows in a list for cleanup later */ + struct gui_window *next, *prev; +}; + +static struct gui_window *window_list = 0; /**< first entry in win list*/ + +static wchar_t gdkkey_to_nskey(GdkEventKey *); +/* Methods which apply only to a gui_window */ +static gboolean nsgtk_window_expose_event(GtkWidget *, GdkEventExpose *, + gpointer); +static gboolean nsgtk_window_motion_notify_event(GtkWidget *, GdkEventMotion *, + gpointer); +static gboolean nsgtk_window_button_press_event(GtkWidget *, GdkEventButton *, + gpointer); +static gboolean nsgtk_window_keypress_event(GtkWidget *, GdkEventKey *, + gpointer); +static gboolean nsgtk_window_size_allocate_event(GtkWidget *, GtkAllocation *, + gpointer); +/* Other useful bits */ +static void nsgtk_redraw_caret(struct gui_window *g); + + +nsgtk_scaffolding *nsgtk_get_scaffold(struct gui_window *g) +{ + return g->scaffold; +} + +struct browser_window *nsgtk_get_browser_for_gui(struct gui_window *g) +{ + return g->bw; +} + +float nsgtk_get_scale_for_gui(struct gui_window *g) +{ + return g->scale; +} + +/* Create a gui_window */ +struct gui_window *gui_create_browser_window(struct browser_window *bw, + struct browser_window *clone) +{ + struct gui_window *g; /**< what we're creating to return */ + + g = malloc(sizeof(*g)); + + g->bw = bw; + g->current_pointer = GUI_POINTER_DEFAULT; + if (clone != NULL) + g->scale = clone->window->scale; + else + g->scale = 1.0; + + g->careth = 0; + + /* Attach ourselves to the list (push_top) */ + if (window_list) + window_list->prev = g; + g->next = window_list; + g->prev = NULL; + window_list = g; + + /* For now, we're always a top level frame */ + g->scrolledwindow = 0; + /* Construct our primary elements */ + g->viewport = GTK_VIEWPORT(gtk_viewport_new(NULL, NULL)); /* Need to attach adjustments */ + g->fixed = GTK_FIXED(gtk_fixed_new()); + g->drawing_area = GTK_DRAWING_AREA(gtk_drawing_area_new()); + gtk_fixed_put(g->fixed, GTK_WIDGET(g->drawing_area), 0, 0); + gtk_container_add(GTK_CONTAINER(g->viewport), GTK_WIDGET(g->fixed)); + gtk_container_set_border_width(GTK_CONTAINER(g->viewport), 0); + gtk_container_set_border_width(GTK_CONTAINER(g->fixed), 0); + + /* set the events we're interested in receiving from the browser's + * drawing area. + */ + gtk_widget_set_events(GTK_WIDGET(g->drawing_area), + GDK_EXPOSURE_MASK | + GDK_LEAVE_NOTIFY_MASK | + GDK_BUTTON_PRESS_MASK | + GDK_POINTER_MOTION_MASK | + GDK_KEY_PRESS_MASK | + GDK_KEY_RELEASE_MASK); + GTK_WIDGET_SET_FLAGS(GTK_WIDGET(g->drawing_area), GTK_CAN_FOCUS); + + /* set the default background colour of the drawing area to white. */ + gtk_widget_modify_bg(GTK_WIDGET(g->drawing_area), GTK_STATE_NORMAL, + &((GdkColor) { 0, 0xffff, 0xffff, 0xffff } )); + +#define CONNECT(obj, sig, callback, ptr) \ + g_signal_connect(G_OBJECT(obj), (sig), G_CALLBACK(callback), (ptr)) + CONNECT(g->drawing_area, "expose_event", nsgtk_window_expose_event, g); + CONNECT(g->drawing_area, "motion_notify_event", + nsgtk_window_motion_notify_event, g); + CONNECT(g->drawing_area, "button_press_event", + nsgtk_window_button_press_event, g); + CONNECT(g->drawing_area, "key_press_event", + nsgtk_window_keypress_event, g); + CONNECT(g->viewport, "size_allocate", + nsgtk_window_size_allocate_event, g); + + return g; +} + +gboolean nsgtk_window_expose_event(GtkWidget *widget, + GdkEventExpose *event, gpointer data) +{ + struct gui_window *g = data; + struct content *c = g->bw->current_content; + + if (c == NULL) + return FALSE; + + current_widget = widget; + current_drawable = widget->window; + current_gc = gdk_gc_new(current_drawable); +#ifdef CAIRO_VERSION + current_cr = gdk_cairo_create(current_drawable); +#endif + + plot = nsgtk_plotters; + nsgtk_plot_set_scale(g->scale); + content_redraw(c, 0, 0, + widget->allocation.width, + widget->allocation.height, + event->area.x, + event->area.y, + event->area.x + event->area.width, + event->area.y + event->area.height, + g->scale, 0xFFFFFF); + + if (g->careth != 0) + nsgtk_plot_caret(g->caretx, g->carety, g->careth); + + g_object_unref(current_gc); +#ifdef CAIRO_VERSION + cairo_destroy(current_cr); +#endif + + return FALSE; +} + +gboolean nsgtk_window_motion_notify_event(GtkWidget *widget, + GdkEventMotion *event, gpointer data) +{ + struct gui_window *g = data; + + browser_window_mouse_track(g->bw, 0, event->x / g->scale, + event->y / g->scale); + + g->last_x = event->x; + g->last_y = event->y; + + return TRUE; +} + +gboolean nsgtk_window_button_press_event(GtkWidget *widget, + GdkEventButton *event, gpointer data) +{ + struct gui_window *g = data; + int button = BROWSER_MOUSE_CLICK_1; + + if (event->button == 2) /* 2 == middle button on X */ + button = BROWSER_MOUSE_CLICK_2; + + if (event->button == 3) /* 3 == right button on X */ + return TRUE; /* Do nothing for right click for now */ + + browser_window_mouse_click(g->bw, button, + event->x / g->scale, event->y / g->scale); + + return TRUE; +} + +wchar_t gdkkey_to_nskey(GdkEventKey *key) +{ + /* this function will need to become much more complex to support + * everything that the RISC OS version does. But this will do for + * now. I hope. + */ + + switch (key->keyval) + { + case GDK_BackSpace: return KEY_DELETE_LEFT; + case GDK_Delete: return KEY_DELETE_RIGHT; + case GDK_Linefeed: return 13; + case GDK_Return: return 10; + case GDK_Left: return KEY_LEFT; + case GDK_Right: return KEY_RIGHT; + case GDK_Up: return KEY_UP; + case GDK_Down: return KEY_DOWN; + + /* Modifiers - do nothing for now */ + case GDK_Shift_L: + case GDK_Shift_R: + case GDK_Control_L: + case GDK_Control_R: + case GDK_Caps_Lock: + case GDK_Shift_Lock: + case GDK_Meta_L: + case GDK_Meta_R: + case GDK_Alt_L: + case GDK_Alt_R: + case GDK_Super_L: + case GDK_Super_R: + case GDK_Hyper_L: + case GDK_Hyper_R: return 0; + + default: return key->keyval; + } +} + +gboolean nsgtk_window_keypress_event(GtkWidget *widget, GdkEventKey *event, + gpointer data) +{ + struct gui_window *g = data; + wchar_t nskey = gdkkey_to_nskey(event); + + browser_window_key_press(g->bw, nskey); + + return TRUE; +} + +gboolean nsgtk_window_size_allocate_event(GtkWidget *widget, + GtkAllocation *allocation, gpointer data) +{ + struct gui_window *g = data; + + g->target_width = widget->allocation.width - 2; + g->target_height = widget->allocation.height; + + /* schedule a callback to perform the resize for 1/10s from now */ + schedule(5, (gtk_callback)(nsgtk_window_reflow_content), g); + + return TRUE; +} + +void nsgtk_window_reflow_content(struct gui_window *g) +{ + if (gui_in_multitask) + return; + + if (g->bw->current_content == NULL) + return; + + if (g->bw->current_content->status != CONTENT_STATUS_READY && + g->bw->current_content->status != CONTENT_STATUS_DONE) + return; + + content_reformat(g->bw->current_content, + g->target_width, g->target_height); + + if (nsgtk_scaffolding_is_busy(g->scaffold)) + schedule(100, + (gtk_callback)(nsgtk_window_reflow_content), g); +} + +void nsgtk_reflow_all_windows(void) +{ + struct gui_window *g = window_list; + + while (g != NULL) { + nsgtk_window_reflow_content(g); + g = g->next; + } +} + +void gui_window_destroy(struct gui_window *g) +{ + if (g->prev) + g->prev->next = g->next; + else + window_list = g->next; + + if (g->next) + g->next->prev = g->prev; + + free(g); + +} + +void nsgtk_redraw_caret(struct gui_window *g) +{ + if (g->careth == 0) + return; + + gui_window_redraw(g, g->caretx, g->carety, + g->caretx, g->carety + g->careth); +} + +void gui_window_redraw(struct gui_window *g, int x0, int y0, int x1, int y1) +{ + gtk_widget_queue_draw_area(GTK_WIDGET(g->drawing_area), + x0, y0, x1-x0+1, y1-y0+1); +} + +void gui_window_redraw_window(struct gui_window *g) +{ + gtk_widget_queue_draw(GTK_WIDGET(g->drawing_area)); +} + +void gui_window_update_box(struct gui_window *g, + const union content_msg_data *data) +{ + struct content *c = g->bw->current_content; + + if (c == NULL) + return; + + gtk_widget_queue_draw_area(GTK_WIDGET(g->drawing_area), + data->redraw.x, data->redraw.y, + data->redraw.width, data->redraw.height); +} + +bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy) +{ + *sx = 0; + *sy = 0; + return true; +} + +void gui_window_set_scroll(struct gui_window *g, int sx, int sy) +{ + +} + +float gui_window_get_scale(struct gui_window *g) +{ + return g->scale; +} + +void gui_window_set_scale(struct gui_window *g, float scale) +{ + if (g->scale == scale) + return; + g->scale = scale; + + if (g->bw->current_content != NULL) + gui_window_update_extent(g); + + gtk_widget_queue_draw(GTK_WIDGET(g->drawing_area)); + +} + +void gui_window_update_extent(struct gui_window *g) +{ + if (!g->bw->current_content) + return; + + gtk_widget_set_size_request(GTK_WIDGET(g->drawing_area), + g->bw->current_content->width * g->scale, + g->bw->current_content->height * g->scale); + gtk_widget_set_size_request(GTK_WIDGET(g->viewport), 0, 0); +} + +void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) +{ + GdkCursor *cursor = NULL; + GdkCursorType cursortype; + bool nullcursor = false; + + if (g->current_pointer == shape) + return; + + g->current_pointer = shape; + + switch (shape) { + case GUI_POINTER_POINT: + cursortype = GDK_HAND1; + break; + case GUI_POINTER_CARET: + cursortype = GDK_XTERM; + break; + case GUI_POINTER_UP: + cursortype = GDK_TOP_SIDE; + break; + case GUI_POINTER_DOWN: + cursortype = GDK_BOTTOM_SIDE; + break; + case GUI_POINTER_LEFT: + cursortype = GDK_LEFT_SIDE; + break; + case GUI_POINTER_RIGHT: + cursortype = GDK_RIGHT_SIDE; + break; + case GUI_POINTER_LD: + cursortype = GDK_BOTTOM_LEFT_CORNER; + break; + case GUI_POINTER_RD: + cursortype = GDK_BOTTOM_RIGHT_CORNER; + break; + case GUI_POINTER_LU: + cursortype = GDK_TOP_LEFT_CORNER; + break; + case GUI_POINTER_RU: + cursortype = GDK_TOP_RIGHT_CORNER; + break; + case GUI_POINTER_CROSS: + cursortype = GDK_CROSS; + break; + case GUI_POINTER_MOVE: + cursortype = GDK_FLEUR; + break; + case GUI_POINTER_WAIT: + cursortype = GDK_WATCH; + break; + case GUI_POINTER_HELP: + cursortype = GDK_QUESTION_ARROW; + break; + case GUI_POINTER_MENU: + cursortype = GDK_RIGHTBUTTON; + break; + case GUI_POINTER_PROGRESS: + /* In reality, this needs to be the funky left_ptr_watch + * which we can't do easily yet. + */ + cursortype = GDK_WATCH; + break; + /* The following we're not sure about */ + case GUI_POINTER_NO_DROP: + case GUI_POINTER_NOT_ALLOWED: + case GUI_POINTER_DEFAULT: + default: + nullcursor = true; + } + + if (!nullcursor) + cursor = gdk_cursor_new_for_display( + gtk_widget_get_display( + GTK_WIDGET(g->drawing_area)), + cursortype); + gdk_window_set_cursor(GTK_WIDGET(g->drawing_area)->window, cursor); + + if (!nullcursor) + gdk_cursor_unref(cursor); +} + +void gui_window_hide_pointer(struct gui_window *g) +{ + +} + +void gui_window_place_caret(struct gui_window *g, int x, int y, int height) +{ + nsgtk_redraw_caret(g); + + g->caretx = x; + g->carety = y + 1; + g->careth = height; + + nsgtk_redraw_caret(g); + + gtk_widget_grab_focus(GTK_WIDGET(g->drawing_area)); +} + +void gui_window_remove_caret(struct gui_window *g) +{ + int oh = g->careth; + + if (oh == 0) + return; + + g->careth = 0; + + gui_window_redraw(g, g->caretx, g->carety, + g->caretx, g->carety + oh); +} + +void gui_window_new_content(struct gui_window *g) +{ + +} + +bool gui_window_scroll_start(struct gui_window *g) +{ + return true; +} + +bool gui_window_box_scroll_start(struct gui_window *g, + int x0, int y0, int x1, int y1) +{ + return true; +} + +void gui_drag_save_object(gui_save_type type, struct content *c, + struct gui_window *g) +{ + +} + +void gui_drag_save_selection(struct selection *s, struct gui_window *g) +{ + +} + +void gui_start_selection(struct gui_window *g) +{ + +} + +void gui_paste_from_clipboard(struct gui_window *g, int x, int y) +{ + +} + +bool gui_empty_clipboard(void) +{ + return true; +} + +bool gui_add_to_clipboard(const char *text, size_t length, bool space) +{ + return true; +} + +bool gui_commit_clipboard(void) +{ + return true; +} + + +bool gui_copy_to_clipboard(struct selection *s) +{ + return true; +} + + +void gui_window_get_dimensions(struct gui_window *g, int *width, int *height, + bool scaled) +{ + *width = GTK_WIDGET(g->drawing_area)->allocation.width; + *height = GTK_WIDGET(g->drawing_area)->allocation.height; + + if (scaled) { + *width /= g->scale; + *height /= g->scale; + } +} + +void gui_window_position_frame(struct gui_window *g, int x0, int y0, int x1, int y1) +{ +} + +bool gui_window_frame_resize_start(struct gui_window *g) +{ + return true; +} Added: branches/dsilvers/gtk-frames/gtk/gtk_window.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_window.h?r... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_window.h (added) +++ branches/dsilvers/gtk-frames/gtk/gtk_window.h Sun Nov 19 17:19:41 2006 @@ -1,0 +1,22 @@ +/* + * This file is part of NetSurf, http://netsurf.sourceforge.net/ + * Licensed under the GNU General Public License, + * http://www.opensource.org/licenses/gpl-license + * Copyright 2006 Daniel Silverstone <dsilvers(a)digital-scurf.org> + */ + +#ifndef NETSURF_GTK_WINDOW_H +#define NETSURF_GTK_WINDOW_H 1 + +#include "netsurf/desktop/gui.h" +#include "netsurf/gtk/gtk_scaffolding.h" + +void nsgtk_window_reflow_content(struct gui_window *g); +void nsgtk_reflow_all_windows(void); + +nsgtk_scaffolding *nsgtk_get_scaffold(struct gui_window *g); +struct browser_window *nsgtk_get_browser_for_gui(struct gui_window *g); + +float nsgtk_get_scale_for_gui(struct gui_window *g); + +#endif /* NETSURF_GTK_WINDOW_H */ Modified: branches/dsilvers/gtk-frames/gtk/res/netsurf.glade URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/res/netsurf.gl... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/res/netsurf.glade (original) +++ branches/dsilvers/gtk-frames/gtk/res/netsurf.glade Sun Nov 19 17:19:41 2006 @@ -1005,29 +1005,6 @@ <property name="top_attach">0</property> <property name="bottom_attach">1</property> <property name="x_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkViewport" id="viewport1"> - <property name="visible">True</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - - <child> - <widget class="GtkDrawingArea" id="drawingArea"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> </packing> </child> Modified: branches/dsilvers/gtk-frames/makefile URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/makefile?rev=3056&... ============================================================================== --- branches/dsilvers/gtk-frames/makefile (original) +++ branches/dsilvers/gtk-frames/makefile Sun Nov 19 17:19:41 2006 @@ -72,7 +72,7 @@ gtk_schedule.o gtk_thumbnail.o gtk_options.o \ gtk_plotters.o gtk_treeview.o gtk_scaffolding.o \ gtk_completion.o gtk_login.o gtk_throbber.o \ - gtk_history.o # gtk/ + gtk_history.o gtk_window.o # gtk/ OBJDIR_RISCOS = arm-riscos-aof

16 years, 2 months

1
0
0 / 0

r3055 dsilvers - in /branches/dsilvers/gtk-frames/gtk: gtk_plotters.h gtk_scaffolding.h

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Nov 19 15:57:09 2006 New Revision: 3055 URL: http://svn.semichrome.net?rev=3055&view=rev Log: Move plotter functions from scaffolding header to plotter header in GTK dir Modified: branches/dsilvers/gtk-frames/gtk/gtk_plotters.h branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h Modified: branches/dsilvers/gtk-frames/gtk/gtk_plotters.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_plotters.h... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_plotters.h (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_plotters.h Sun Nov 19 15:57:09 2006 @@ -25,4 +25,8 @@ extern cairo_t *current_cr; #endif +void nsgtk_plot_set_scale(float s); +float nsgtk_plot_get_scale(void); +void nsgtk_set_colour(colour c); + #endif /* NETSURF_GTK_PLOTTERS_H */ Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h Sun Nov 19 15:57:09 2006 @@ -10,9 +10,6 @@ #include "netsurf/desktop/plotters.h" -void nsgtk_plot_set_scale(float s); -float nsgtk_plot_get_scale(void); -void nsgtk_set_colour(colour c); void nsgtk_reflow_all_windows(void); #endif /* NETSURF_GTK_SCAFFOLDING_H */

16 years, 2 months

1
0
0 / 0

r3054 dsilvers - in /branches/dsilvers/gtk-frames/gtk: font_pango.c gtk_plotters.c gtk_plotters.h gtk_scaffolding.c gtk_scaffolding.h

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Nov 19 15:53:10 2006 New Revision: 3054 URL: http://svn.semichrome.net?rev=3054&view=rev Log: Move the drawable storage to gtk_plotters Modified: branches/dsilvers/gtk-frames/gtk/font_pango.c branches/dsilvers/gtk-frames/gtk/gtk_plotters.c branches/dsilvers/gtk-frames/gtk/gtk_plotters.h branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h Modified: branches/dsilvers/gtk-frames/gtk/font_pango.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/font_pango.c?r... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/font_pango.c (original) +++ branches/dsilvers/gtk-frames/gtk/font_pango.c Sun Nov 19 15:53:10 2006 @@ -17,7 +17,7 @@ #include <gtk/gtk.h> #include "netsurf/css/css.h" #include "netsurf/gtk/font_pango.h" -#include "netsurf/gtk/gtk_scaffolding.h" +#include "netsurf/gtk/gtk_plotters.h" #include "netsurf/render/font.h" #include "netsurf/utils/utils.h" #include "netsurf/utils/log.h" Modified: branches/dsilvers/gtk-frames/gtk/gtk_plotters.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_plotters.c... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_plotters.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_plotters.c Sun Nov 19 15:53:10 2006 @@ -27,6 +27,13 @@ #include "netsurf/desktop/options.h" #include "netsurf/gtk/options.h" #include "netsurf/gtk/gtk_bitmap.h" + +GtkWidget *current_widget; +GdkDrawable *current_drawable; +GdkGC *current_gc; +#ifdef CAIRO_VERSION +cairo_t *current_cr; +#endif static bool nsgtk_plot_clg(colour c); static bool nsgtk_plot_rectangle(int x0, int y0, int width, int height, Modified: branches/dsilvers/gtk-frames/gtk/gtk_plotters.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_plotters.h... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_plotters.h (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_plotters.h Sun Nov 19 15:53:10 2006 @@ -9,7 +9,20 @@ * Target independent plotting (GDK / GTK+ interface). */ +#ifndef NETSURF_GTK_PLOTTERS_H +#define NETSURF_GTK_PLOTTERS_H 1 + +#include <gtk/gtk.h> + struct plotter_table; extern const struct plotter_table nsgtk_plotters; +extern GtkWidget *current_widget; +extern GdkDrawable *current_drawable; +extern GdkGC *current_gc; +#ifdef CAIRO_VERSION +extern cairo_t *current_cr; +#endif + +#endif /* NETSURF_GTK_PLOTTERS_H */ Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Sun Nov 19 15:53:10 2006 @@ -79,13 +79,6 @@ GtkDrawingArea *drawing_area; }; -GtkWidget *current_widget; -GdkDrawable *current_drawable; -GdkGC *current_gc; -#ifdef CAIRO_VERSION -cairo_t *current_cr; -#endif - struct menu_events { const char *widget; GCallback handler; Modified: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h Sun Nov 19 15:53:10 2006 @@ -5,17 +5,14 @@ * Copyright 2005 James Bursa <bursa(a)users.sourceforge.net> */ -#include <gtk/gtk.h> +#ifndef NETSURF_GTK_SCAFFOLDING_H +#define NETSURF_GTK_SCAFFOLDING_H 1 + #include "netsurf/desktop/plotters.h" - -extern GtkWidget *current_widget; -extern GdkDrawable *current_drawable; -extern GdkGC *current_gc; -#ifdef CAIRO_VERSION -extern cairo_t *current_cr; -#endif void nsgtk_plot_set_scale(float s); float nsgtk_plot_get_scale(void); void nsgtk_set_colour(colour c); void nsgtk_reflow_all_windows(void); + +#endif /* NETSURF_GTK_SCAFFOLDING_H */

16 years, 2 months

1
0
0 / 0

r3053 dsilvers - in /branches/dsilvers/gtk-frames: gtk/font_pango.c gtk/gtk_bitmap.c gtk/gtk_options.c gtk/gtk_plotters.c gtk/gtk_scaffolding.c gtk/gtk_scaffolding.h gtk/gtk_thumbnail.c gtk/gtk_window.c gtk/gtk_window.h makefile

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Nov 19 15:49:05 2006 New Revision: 3053 URL: http://svn.semichrome.net?rev=3053&view=rev Log: Rename gtk_window.* to gtk_scaffolding.* Added: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c - copied, changed from r3052, branches/dsilvers/gtk-frames/gtk/gtk_window.c branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.h - copied unchanged from r3052, branches/dsilvers/gtk-frames/gtk/gtk_window.h Removed: branches/dsilvers/gtk-frames/gtk/gtk_window.c branches/dsilvers/gtk-frames/gtk/gtk_window.h Modified: branches/dsilvers/gtk-frames/gtk/font_pango.c branches/dsilvers/gtk-frames/gtk/gtk_bitmap.c branches/dsilvers/gtk-frames/gtk/gtk_options.c branches/dsilvers/gtk-frames/gtk/gtk_plotters.c branches/dsilvers/gtk-frames/gtk/gtk_thumbnail.c branches/dsilvers/gtk-frames/makefile Modified: branches/dsilvers/gtk-frames/gtk/font_pango.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/font_pango.c?r... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/font_pango.c (original) +++ branches/dsilvers/gtk-frames/gtk/font_pango.c Sun Nov 19 15:49:05 2006 @@ -17,7 +17,7 @@ #include <gtk/gtk.h> #include "netsurf/css/css.h" #include "netsurf/gtk/font_pango.h" -#include "netsurf/gtk/gtk_window.h" +#include "netsurf/gtk/gtk_scaffolding.h" #include "netsurf/render/font.h" #include "netsurf/utils/utils.h" #include "netsurf/utils/log.h" Modified: branches/dsilvers/gtk-frames/gtk/gtk_bitmap.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_bitmap.c?r... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_bitmap.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_bitmap.c Sun Nov 19 15:49:05 2006 @@ -17,7 +17,7 @@ #include <gdk/gdk.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include "netsurf/content/content.h" -#include "netsurf/gtk/gtk_window.h" +#include "netsurf/gtk/gtk_scaffolding.h" #include "netsurf/image/bitmap.h" #include "netsurf/utils/log.h" Modified: branches/dsilvers/gtk-frames/gtk/gtk_options.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_options.c?... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_options.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_options.c Sun Nov 19 15:49:05 2006 @@ -14,7 +14,7 @@ #include "netsurf/desktop/options.h" #include "netsurf/gtk/options.h" #include "netsurf/gtk/gtk_gui.h" -#include "netsurf/gtk/gtk_window.h" +#include "netsurf/gtk/gtk_scaffolding.h" #include "netsurf/gtk/gtk_options.h" GtkWindow *wndChoices; Modified: branches/dsilvers/gtk-frames/gtk/gtk_plotters.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_plotters.c... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_plotters.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_plotters.c Sun Nov 19 15:49:05 2006 @@ -21,7 +21,7 @@ #include "netsurf/desktop/plotters.h" #include "netsurf/gtk/font_pango.h" #include "netsurf/gtk/gtk_plotters.h" -#include "netsurf/gtk/gtk_window.h" +#include "netsurf/gtk/gtk_scaffolding.h" #include "netsurf/render/font.h" #include "netsurf/utils/log.h" #include "netsurf/desktop/options.h" Copied: branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c (from r3052, branches/dsilvers/gtk-frames/gtk/gtk_window.c) URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_scaffoldin... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_window.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_scaffolding.c Sun Nov 19 15:49:05 2006 @@ -23,7 +23,7 @@ #include "netsurf/desktop/gesture_core.h" #include "netsurf/gtk/gtk_gui.h" #include "netsurf/gtk/gtk_plotters.h" -#include "netsurf/gtk/gtk_window.h" +#include "netsurf/gtk/gtk_scaffolding.h" #include "netsurf/gtk/gtk_options.h" #include "netsurf/gtk/gtk_completion.h" #include "netsurf/gtk/gtk_throbber.h" Modified: branches/dsilvers/gtk-frames/gtk/gtk_thumbnail.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_thumbnail.... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_thumbnail.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_thumbnail.c Sun Nov 19 15:49:05 2006 @@ -22,7 +22,7 @@ #include "netsurf/image/bitmap.h" #include "netsurf/render/font.h" #include "netsurf/utils/log.h" -#include "netsurf/gtk/gtk_window.h" +#include "netsurf/gtk/gtk_scaffolding.h" #include "netsurf/gtk/gtk_plotters.h" #include "netsurf/gtk/gtk_bitmap.h" Removed: branches/dsilvers/gtk-frames/gtk/gtk_window.c URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_window.c?r... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_window.c (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_window.c (removed) @@ -1,1254 +1,0 @@ -/* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ - * Licensed under the GNU General Public License, - * http://www.opensource.org/licenses/gpl-license - * Copyright 2006 Rob Kendrick <rjek(a)rjek.com> - */ - -#include <stdbool.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <gdk/gdkkeysyms.h> -#include <gtk/gtk.h> -#include <glade/glade.h> -#include "netsurf/content/content.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/history_core.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/netsurf.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/desktop/options.h" -#include "netsurf/desktop/textinput.h" -#include "netsurf/desktop/gesture_core.h" -#include "netsurf/gtk/gtk_gui.h" -#include "netsurf/gtk/gtk_plotters.h" -#include "netsurf/gtk/gtk_window.h" -#include "netsurf/gtk/gtk_options.h" -#include "netsurf/gtk/gtk_completion.h" -#include "netsurf/gtk/gtk_throbber.h" -#include "netsurf/gtk/gtk_history.h" -#include "netsurf/render/box.h" -#include "netsurf/render/font.h" -#include "netsurf/render/form.h" -#include "netsurf/render/html.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" -#include "netsurf/utils/log.h" - -struct gtk_history_window; - -struct gui_window { - GtkWindow *window; - GtkEntry *url_bar; - GtkEntryCompletion *url_bar_completion; - GtkDrawingArea *drawing_area; - GtkViewport *viewport; - GtkLabel *status_bar; - GtkToolButton *back_button; - GtkToolButton *forward_button; - GtkToolButton *stop_button; - GtkToolButton *reload_button; - GtkMenuItem *back_menu; - GtkMenuItem *forward_menu; - GtkMenuItem *stop_menu; - GtkMenuItem *reload_menu; - GtkImage *throbber; - GtkPaned *status_pane; - - GladeXML *xml; - - struct browser_window *bw; - float scale; - int target_width, target_height; - int caretx, carety, careth; - gui_pointer_shape current_pointer; - int throb_frame; - - struct gtk_history_window *history_window; - - int last_x, last_y; - - struct gui_window *next, *prev; -}; - -struct gtk_history_window { - struct gui_window *g; - GtkWindow *window; - GtkScrolledWindow *scrolled; - GtkDrawingArea *drawing_area; -}; - -GtkWidget *current_widget; -GdkDrawable *current_drawable; -GdkGC *current_gc; -#ifdef CAIRO_VERSION -cairo_t *current_cr; -#endif - -struct menu_events { - const char *widget; - GCallback handler; -}; - -static int open_windows = 0; /**< current number of open browsers */ -static struct gui_window *window_list = 0; /**< first entry in win list*/ - -static wchar_t gdkkey_to_nskey(GdkEventKey *); -static void nsgtk_window_destroy_event(GtkWidget *, gpointer); -static void nsgtk_plot_caret(int x, int y, int h); -static gboolean nsgtk_window_expose_event(GtkWidget *, GdkEventExpose *, - gpointer); -static gboolean nsgtk_window_motion_notify_event(GtkWidget *, GdkEventMotion *, - gpointer); -static gboolean nsgtk_window_button_press_event(GtkWidget *, GdkEventButton *, - gpointer); -static gboolean nsgtk_window_keypress_event(GtkWidget *, GdkEventKey *, - gpointer); -static gboolean nsgtk_window_size_allocate_event(GtkWidget *, GtkAllocation *, - gpointer); - -static void nsgtk_perform_deferred_resize(void *); -static void nsgtk_window_update_back_forward(struct gui_window *); -static void nsgtk_throb(void *); -static void nsgtk_redraw_caret(struct gui_window *); - -static gboolean nsgtk_window_back_button_clicked(GtkWidget *, gpointer); -static gboolean nsgtk_window_forward_button_clicked(GtkWidget *, gpointer); -static gboolean nsgtk_window_stop_button_clicked(GtkWidget *, gpointer); -static gboolean nsgtk_window_reload_button_clicked(GtkWidget *, gpointer); -static gboolean nsgtk_window_home_button_clicked(GtkWidget *, gpointer); -static gboolean nsgtk_window_url_activate_event(GtkWidget *, gpointer); -static gboolean nsgtk_window_url_changed(GtkWidget *, GdkEventKey *, gpointer); - -static gboolean nsgtk_history_expose_event(GtkWidget *, GdkEventExpose *, - gpointer); -static gboolean nsgtk_history_motion_notify_event(GtkWidget *, GdkEventMotion *, - gpointer); -static gboolean nsgtk_history_button_press_event(GtkWidget *, GdkEventButton *, - gpointer); - -static void nsgtk_attach_menu_handlers(GladeXML *, gpointer); - -#define MENUEVENT(x) { #x, G_CALLBACK(nsgtk_on_##x##_activate) } -#define MENUPROTO(x) static gboolean nsgtk_on_##x##_activate( \ - GtkMenuItem *widget, gpointer g) -/* prototypes for menu handlers */ -/* file menu */ -MENUPROTO(new_window); -MENUPROTO(close_window); -MENUPROTO(quit); - -/* edit menu */ -MENUPROTO(choices); - -/* view menu */ -MENUPROTO(stop); -MENUPROTO(reload); -MENUPROTO(zoom_in); -MENUPROTO(normal_size); -MENUPROTO(zoom_out); -MENUPROTO(save_window_size); -MENUPROTO(toggle_debug_rendering); - -/* navigate menu */ -MENUPROTO(back); -MENUPROTO(forward); -MENUPROTO(home); -MENUPROTO(local_history); -MENUPROTO(global_history); - -/* help menu */ -MENUPROTO(about); - -/* structure used by nsgtk_attach_menu_handlers to connect menu items to - * their handling functions. - */ -static struct menu_events menu_events[] = { - /* file menu */ - MENUEVENT(new_window), - MENUEVENT(close_window), - MENUEVENT(quit), - - /* edit menu */ - MENUEVENT(choices), - - /* view menu */ - MENUEVENT(stop), - MENUEVENT(reload), - MENUEVENT(zoom_in), - MENUEVENT(normal_size), - MENUEVENT(zoom_out), - MENUEVENT(save_window_size), - MENUEVENT(toggle_debug_rendering), - - /* navigate menu */ - MENUEVENT(back), - MENUEVENT(forward), - MENUEVENT(home), - MENUEVENT(local_history), - MENUEVENT(global_history), - - /* help menu */ - MENUEVENT(about), - - /* sentinel */ - { NULL, NULL } -}; - -void nsgtk_reflow_all_windows(void) -{ - struct gui_window *g = window_list; - - while (g != NULL) { - nsgtk_perform_deferred_resize(g); - g = g->next; - } -} - -void nsgtk_attach_menu_handlers(GladeXML *xml, gpointer g) -{ - struct menu_events *event = menu_events; - - while (event->widget != NULL) - { - GtkWidget *w = glade_xml_get_widget(xml, event->widget); - g_signal_connect(G_OBJECT(w), "activate", event->handler, g); - event++; - } -} - -wchar_t gdkkey_to_nskey(GdkEventKey *key) -{ - /* this function will need to become much more complex to support - * everything that the RISC OS version does. But this will do for - * now. I hope. - */ - - switch (key->keyval) - { - case GDK_BackSpace: return KEY_DELETE_LEFT; - case GDK_Delete: return KEY_DELETE_RIGHT; - case GDK_Linefeed: return 13; - case GDK_Return: return 10; - case GDK_Left: return KEY_LEFT; - case GDK_Right: return KEY_RIGHT; - case GDK_Up: return KEY_UP; - case GDK_Down: return KEY_DOWN; - - /* Modifiers - do nothing for now */ - case GDK_Shift_L: - case GDK_Shift_R: - case GDK_Control_L: - case GDK_Control_R: - case GDK_Caps_Lock: - case GDK_Shift_Lock: - case GDK_Meta_L: - case GDK_Meta_R: - case GDK_Alt_L: - case GDK_Alt_R: - case GDK_Super_L: - case GDK_Super_R: - case GDK_Hyper_L: - case GDK_Hyper_R: return 0; - - default: return key->keyval; - } -} - -/* event handlers and support functions for them */ - -void nsgtk_window_destroy_event(GtkWidget *widget, gpointer data) -{ - struct gui_window *g = data; - - gui_window_destroy(g); -} - -/** Plot a caret. It is assumed that the plotters have been set up. */ -void nsgtk_plot_caret(int x, int y, int h) -{ - GdkColor colour; - - colour.red = 0; - colour.green = 0; - colour.blue = 0; - colour.pixel = 0; - gdk_color_alloc(gdk_colormap_get_system(), - &colour); - gdk_gc_set_foreground(current_gc, &colour); - - gdk_draw_line(current_drawable, current_gc, - x, y, - x, y + h - 1); -} - -gboolean nsgtk_window_expose_event(GtkWidget *widget, - GdkEventExpose *event, gpointer data) -{ - struct gui_window *g = data; - struct content *c = g->bw->current_content; - - if (c == NULL) - return FALSE; - - current_widget = widget; - current_drawable = widget->window; - current_gc = gdk_gc_new(current_drawable); -#ifdef CAIRO_VERSION - current_cr = gdk_cairo_create(current_drawable); -#endif - - plot = nsgtk_plotters; - nsgtk_plot_set_scale(g->scale); - content_redraw(c, 0, 0, - widget->allocation.width, - widget->allocation.height, - event->area.x, - event->area.y, - event->area.x + event->area.width, - event->area.y + event->area.height, - g->scale, 0xFFFFFF); - - if (g->careth != 0) - nsgtk_plot_caret(g->caretx, g->carety, g->careth); - - g_object_unref(current_gc); -#ifdef CAIRO_VERSION - cairo_destroy(current_cr); -#endif - - return FALSE; -} - -gboolean nsgtk_window_motion_notify_event(GtkWidget *widget, - GdkEventMotion *event, gpointer data) -{ - struct gui_window *g = data; - - browser_window_mouse_track(g->bw, 0, event->x / g->scale, - event->y / g->scale); - - g->last_x = event->x; - g->last_y = event->y; - - return TRUE; -} - -gboolean nsgtk_window_button_press_event(GtkWidget *widget, - GdkEventButton *event, gpointer data) -{ - struct gui_window *g = data; - int button = BROWSER_MOUSE_CLICK_1; - - if (event->button == 2) /* 2 == middle button on X */ - button = BROWSER_MOUSE_CLICK_2; - - if (event->button == 3) /* 3 == right button on X */ - return TRUE; /* Do nothing for right click for now */ - - browser_window_mouse_click(g->bw, button, - event->x / g->scale, event->y / g->scale); - - return TRUE; -} - -gboolean nsgtk_window_keypress_event(GtkWidget *widget, GdkEventKey *event, - gpointer data) -{ - struct gui_window *g = data; - wchar_t nskey = gdkkey_to_nskey(event); - - browser_window_key_press(g->bw, nskey); - - return TRUE; -} - -gboolean nsgtk_window_size_allocate_event(GtkWidget *widget, - GtkAllocation *allocation, gpointer data) -{ - struct gui_window *g = data; - - g->target_width = widget->allocation.width - 2; - g->target_height = widget->allocation.height; - - /* schedule a callback to perform the resize for 1/10s from now */ - schedule(5, nsgtk_perform_deferred_resize, g); - - return TRUE; -} - -void nsgtk_perform_deferred_resize(void *p) -{ - struct gui_window *g = p; - - if (gui_in_multitask) - return; - - if (g->bw->current_content == NULL) - return; - - if (g->bw->current_content->status != CONTENT_STATUS_READY && - g->bw->current_content->status != CONTENT_STATUS_DONE) - return; - - content_reformat(g->bw->current_content, - g->target_width, g->target_height); - - if (GTK_WIDGET_SENSITIVE((GTK_WIDGET(g->stop_button)))) - schedule(100, nsgtk_perform_deferred_resize, g); -} - -void nsgtk_window_update_back_forward(struct gui_window *g) -{ - int width, height; - - gtk_widget_set_sensitive(GTK_WIDGET(g->back_button), - history_back_available(g->bw->history)); - gtk_widget_set_sensitive(GTK_WIDGET(g->forward_button), - history_forward_available(g->bw->history)); - - gtk_widget_set_sensitive(GTK_WIDGET(g->back_menu), - history_back_available(g->bw->history)); - gtk_widget_set_sensitive(GTK_WIDGET(g->forward_menu), - history_forward_available(g->bw->history)); - - /* update the local history window, as well as queuing a redraw - * for it. - */ - history_size(g->bw->history, &width, &height); - gtk_widget_set_size_request(GTK_WIDGET(g->history_window->drawing_area), - width, height); - gtk_widget_queue_draw(GTK_WIDGET(g->history_window->drawing_area)); -} - -void nsgtk_throb(void *p) -{ - struct gui_window *g = p; - - if (g->throb_frame >= (nsgtk_throbber->nframes - 1)) - g->throb_frame = 1; - else - g->throb_frame++; - - gtk_image_set_from_pixbuf(g->throbber, nsgtk_throbber->framedata[ - g->throb_frame]); - - schedule(10, nsgtk_throb, p); -} - -void nsgtk_redraw_caret(struct gui_window *g) -{ - if (g->careth == 0) - return; - - gui_window_redraw(g, g->caretx, g->carety, - g->caretx, g->carety + g->careth); -} - -/* signal handling functions for the toolbar and URL bar */ -gboolean nsgtk_window_back_button_clicked(GtkWidget *widget, gpointer data) -{ - struct gui_window *g = data; - - if (!history_back_available(g->bw->history)) - return TRUE; - - history_back(g->bw, g->bw->history); - nsgtk_window_update_back_forward(g); - - return TRUE; -} - -gboolean nsgtk_window_forward_button_clicked(GtkWidget *widget, gpointer data) -{ - struct gui_window *g = data; - - if (!history_forward_available(g->bw->history)) - return TRUE; - - history_forward(g->bw, g->bw->history); - nsgtk_window_update_back_forward(g); - - return TRUE; -} - -gboolean nsgtk_window_stop_button_clicked(GtkWidget *widget, gpointer data) -{ - struct gui_window *g = data; - - browser_window_stop(g->bw); - - return TRUE; -} - -gboolean nsgtk_window_reload_button_clicked(GtkWidget *widget, gpointer data) -{ - struct gui_window *g = data; - - browser_window_reload(g->bw, true); - - return TRUE; -} - -gboolean nsgtk_window_home_button_clicked(GtkWidget *widget, gpointer data) -{ - struct gui_window *g = data; - static const char *addr = "http://netsurf.sourceforge.net/"; - - if (option_homepage_url != NULL) - addr = option_homepage_url; - - browser_window_go(g->bw, addr, 0, true); - - return TRUE; -} - -gboolean nsgtk_window_url_activate_event(GtkWidget *widget, gpointer data) -{ - struct gui_window *g = data; - char *referer = 0; - - if (g->bw->current_content && g->bw->current_content->url) - referer = g->bw->current_content->url; - - browser_window_go(g->bw, gtk_entry_get_text(GTK_ENTRY(g->url_bar)), - referer, true); - - return TRUE; -} - - -gboolean nsgtk_window_url_changed(GtkWidget *widget, GdkEventKey *event, - gpointer data) -{ - const char *prefix; - - prefix = gtk_entry_get_text(GTK_ENTRY(widget)); - nsgtk_completion_update(prefix); - - return TRUE; -} - - -/* signal handlers for menu entries */ -#define MENUHANDLER(x) gboolean nsgtk_on_##x##_activate(GtkMenuItem *widget, \ - gpointer g) - -MENUHANDLER(new_window) -{ - return TRUE; -} - -MENUHANDLER(close_window) -{ - struct gui_window *gw = (struct gui_window *)g; - - gtk_widget_destroy(GTK_WIDGET(gw->window)); - - return TRUE; -} - -MENUHANDLER(quit) -{ - netsurf_quit = true; - return TRUE; -} - -MENUHANDLER(choices) -{ - gtk_widget_show(GTK_WIDGET(wndChoices)); - - return TRUE; -} - -MENUHANDLER(zoom_in) -{ - struct gui_window *gw = (struct gui_window *)g; - - browser_window_set_scale(gw->bw, gw->scale + 0.05, true); - - return TRUE; -} - -MENUHANDLER(normal_size) -{ - struct gui_window *gw = (struct gui_window *)g; - - browser_window_set_scale(gw->bw, 1.0, true); - - return TRUE; -} - -MENUHANDLER(zoom_out) -{ - struct gui_window *gw = (struct gui_window *)g; - - browser_window_set_scale(gw->bw, gw->scale - 0.05, true); - - return TRUE; -} - -MENUHANDLER(save_window_size) -{ - struct gui_window *gw = (struct gui_window *)g; - - option_toolbar_status_width = gtk_paned_get_position(gw->status_pane); - gtk_window_get_position(gw->window, &option_window_x, &option_window_y); - gtk_window_get_size(gw->window, &option_window_width, - &option_window_height); - - - options_write(options_file_location); - - return TRUE; -} - -MENUHANDLER(toggle_debug_rendering) -{ - html_redraw_debug = !html_redraw_debug; - gui_window_redraw_window(g); - - return TRUE; -} - -MENUHANDLER(stop) -{ - return nsgtk_window_stop_button_clicked(GTK_WIDGET(widget), g); -} - -MENUHANDLER(reload) -{ - return nsgtk_window_reload_button_clicked(GTK_WIDGET(widget), g); -} - -MENUHANDLER(back) -{ - return nsgtk_window_back_button_clicked(GTK_WIDGET(widget), g); -} - -MENUHANDLER(forward) -{ - return nsgtk_window_forward_button_clicked(GTK_WIDGET(widget), g); -} - -MENUHANDLER(home) -{ - return nsgtk_window_home_button_clicked(GTK_WIDGET(widget), g); -} - -MENUHANDLER(local_history) -{ - struct gui_window *gw = (struct gui_window *)g; - - gtk_widget_show(GTK_WIDGET(gw->history_window->window)); - gdk_window_raise(GDK_WINDOW(gw->history_window->window)); - - return TRUE; -} - -MENUHANDLER(global_history) -{ - gtk_widget_show(GTK_WIDGET(wndHistory)); - gdk_window_raise(GDK_WINDOW(wndHistory)); - - return TRUE; -} - -MENUHANDLER(about) -{ - gtk_widget_show(GTK_WIDGET(wndAbout)); - gdk_window_raise(GDK_WINDOW(wndAbout)); - return TRUE; -} - -/* signal handler functions for the local history window */ -gboolean nsgtk_history_expose_event(GtkWidget *widget, - GdkEventExpose *event, gpointer g) -{ - struct gtk_history_window *hw = (struct gtk_history_window *)g; - - current_widget = widget; - current_drawable = widget->window; - current_gc = gdk_gc_new(current_drawable); -#ifdef CAIRO_VERSION - current_cr = gdk_cairo_create(current_drawable); -#endif - plot = nsgtk_plotters; - nsgtk_plot_set_scale(1.0); - - history_redraw(hw->g->bw->history); - - g_object_unref(current_gc); -#ifdef CAIRO_VERSION - cairo_destroy(current_cr); -#endif - return FALSE; -} - -gboolean nsgtk_history_motion_notify_event(GtkWidget *widget, - GdkEventMotion *event, gpointer g) -{ - /* if we're hovering over a history item, popup our tooltip bodge - * describing the page. - */ - struct gtk_history_window *gw = g; - const char *url; - int winx, winy; - -// if (!option_history_tooltip) -// return TRUE; - - url = history_position_url(gw->g->bw->history, event->x, event->y); - if (url == NULL) { - gtk_widget_hide(wndTooltip); - return TRUE; - } - - gtk_label_set_text(labelTooltip, url); - gtk_window_get_position(gw->g->window, &winx, &winy); - - LOG(("winx = %d, winy = %d, event->x = %d, event->y = %d", - winx, winy, event->x, event->y)); - - gtk_widget_show(GTK_WIDGET(wndTooltip)); - gtk_window_move(wndTooltip, event->x + winx, event->y + winy); - - return TRUE; -} - -gboolean nsgtk_history_button_press_event(GtkWidget *widget, - GdkEventButton *event, gpointer g) -{ - struct gtk_history_window *hw = (struct gtk_history_window *)g; - - history_click(hw->g->bw, hw->g->bw->history, - event->x, event->y, false); - - return TRUE; -} - -/* functions called by the core to manipulate the GUI */ -#define GET_WIDGET(x) glade_xml_get_widget(g->xml, (x)) -struct gui_window *gui_create_browser_window(struct browser_window *bw, - struct browser_window *clone) -{ - struct gui_window *g; /**< what we're creating to return */ - - g = malloc(sizeof(*g)); - - g->bw = bw; - g->current_pointer = GUI_POINTER_DEFAULT; - if (clone != NULL) - g->scale = clone->window->scale; - else - g->scale = 1.0; - - g->careth = 0; - - /* add the window to the list of open windows. */ - g->prev = 0; - g->next = window_list; - - if (window_list) - window_list->prev = g; - window_list = g; - - open_windows++; - - /* load the window template from the glade xml file, and extract - * widget references from it for later use. - */ - g->xml = glade_xml_new(glade_file_location, "wndBrowser", NULL); - glade_xml_signal_autoconnect(g->xml); - g->window = GTK_WINDOW(GET_WIDGET("wndBrowser")); - g->url_bar = GTK_ENTRY(GET_WIDGET("URLBar")); - g->drawing_area = GTK_DRAWING_AREA(GET_WIDGET("drawingArea")); - g->status_bar = GTK_LABEL(GET_WIDGET("statusBar")); - g->back_button = GTK_TOOL_BUTTON(GET_WIDGET("toolBack")); - g->forward_button = GTK_TOOL_BUTTON(GET_WIDGET("toolForward")); - g->stop_button = GTK_TOOL_BUTTON(GET_WIDGET("toolStop")); - g->reload_button = GTK_TOOL_BUTTON(GET_WIDGET("toolReload")); - g->back_menu = GTK_MENU_ITEM(GET_WIDGET("back")); - g->forward_menu = GTK_MENU_ITEM(GET_WIDGET("forward")); - g->stop_menu = GTK_MENU_ITEM(GET_WIDGET("stop")); - g->reload_menu = GTK_MENU_ITEM(GET_WIDGET("reload")); - g->throbber = GTK_IMAGE(GET_WIDGET("throbber")); - g->viewport = GTK_VIEWPORT(GET_WIDGET("viewport1")); - g->status_pane = GTK_PANED(GET_WIDGET("hpaned1")); - - /* set this window's size and position to what's in the options, or - * or some sensible default if they're not set yet. - */ - if (option_window_width > 0) { - gtk_window_move(g->window, option_window_x, option_window_y); - gtk_window_resize(g->window, option_window_width, - option_window_height); - } else { - gtk_window_set_default_size(g->window, 600, 600); - } - - /* set the size of the hpane with status bar and h scrollbar */ - gtk_paned_set_position(g->status_pane, option_toolbar_status_width); - - /* connect our scrollbars to the viewport */ - gtk_viewport_set_hadjustment(g->viewport, - gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("hscrollbar1")))); - gtk_viewport_set_vadjustment(g->viewport, - gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("vscrollbar1")))); - gtk_widget_set_size_request(GTK_WIDGET(g->viewport), 0, 0); - - /* set the URL entry box to expand, as we can't do this from within - * glade because of the way it emulates toolbars. - */ - gtk_tool_item_set_expand(GTK_TOOL_ITEM(GET_WIDGET("toolURLBar")), TRUE); - - /* set the events we're interested in receiving from the browser's - * drawing area. - */ - gtk_widget_set_events(GTK_WIDGET(g->drawing_area), - GDK_EXPOSURE_MASK | - GDK_LEAVE_NOTIFY_MASK | - GDK_BUTTON_PRESS_MASK | - GDK_POINTER_MOTION_MASK | - GDK_KEY_PRESS_MASK | - GDK_KEY_RELEASE_MASK); - GTK_WIDGET_SET_FLAGS(GTK_WIDGET(g->drawing_area), GTK_CAN_FOCUS); - - /* set the default background colour of the drawing area to white. */ - gtk_widget_modify_bg(GTK_WIDGET(g->drawing_area), GTK_STATE_NORMAL, - &((GdkColor) { 0, 0xffff, 0xffff, 0xffff } )); - - /* disable toolbar buttons that make no sense initially. */ - gtk_widget_set_sensitive(GTK_WIDGET(g->back_button), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(g->forward_button), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(g->stop_button), FALSE); - - /* create the local history window to be assoicated with this browser */ - g->history_window = malloc(sizeof(struct gtk_history_window)); - g->history_window->g = g; - g->history_window->window = GTK_WINDOW( - gtk_window_new(GTK_WINDOW_TOPLEVEL)); - gtk_window_set_transient_for(g->history_window->window, g->window); - gtk_window_set_default_size(g->history_window->window, 400, 400); - gtk_window_set_title(g->history_window->window, "NetSurf History"); - gtk_window_set_type_hint(g->history_window->window, - GDK_WINDOW_TYPE_HINT_UTILITY); - g->history_window->scrolled = GTK_SCROLLED_WINDOW( - gtk_scrolled_window_new(0, 0)); - gtk_container_add(GTK_CONTAINER(g->history_window->window), - GTK_WIDGET(g->history_window->scrolled)); - - gtk_widget_show(GTK_WIDGET(g->history_window->scrolled)); - g->history_window->drawing_area = GTK_DRAWING_AREA( - gtk_drawing_area_new()); - - gtk_widget_set_events(GTK_WIDGET(g->history_window->drawing_area), - GDK_EXPOSURE_MASK | - GDK_POINTER_MOTION_MASK | - GDK_BUTTON_PRESS_MASK); - gtk_widget_modify_bg(GTK_WIDGET(g->history_window->drawing_area), - GTK_STATE_NORMAL, - &((GdkColor) { 0, 0xffff, 0xffff, 0xffff } )); - gtk_scrolled_window_add_with_viewport(g->history_window->scrolled, - GTK_WIDGET(g->history_window->drawing_area)); - gtk_widget_show(GTK_WIDGET(g->history_window->drawing_area)); - - /* set up URL bar completion */ - g->url_bar_completion = gtk_entry_completion_new(); - gtk_entry_set_completion(g->url_bar, g->url_bar_completion); - gtk_entry_completion_set_match_func(g->url_bar_completion, - nsgtk_completion_match, NULL, NULL); - gtk_entry_completion_set_model(g->url_bar_completion, - GTK_TREE_MODEL(nsgtk_completion_list)); - gtk_entry_completion_set_text_column(g->url_bar_completion, 0); - gtk_entry_completion_set_minimum_key_length(g->url_bar_completion, 1); - gtk_entry_completion_set_popup_completion(g->url_bar_completion, TRUE); - g_object_set(G_OBJECT(g->url_bar_completion), - "popup-set-width", TRUE, - "popup-single-match", TRUE, - NULL); - - /* set up the throbber. */ - gtk_image_set_from_pixbuf(g->throbber, nsgtk_throbber->framedata[0]); - g->throb_frame = 0; - -#define CONNECT(obj, sig, callback, ptr) \ - g_signal_connect(G_OBJECT(obj), (sig), G_CALLBACK(callback), (ptr)) - - /* connect history window signals to their handlers */ - CONNECT(g->history_window->drawing_area, "expose_event", - nsgtk_history_expose_event, g->history_window); - CONNECT(g->history_window->drawing_area, "motion_notify_event", - nsgtk_history_motion_notify_event, g->history_window); - CONNECT(g->history_window->drawing_area, "button_press_event", - nsgtk_history_button_press_event, g->history_window); - CONNECT(g->history_window->window, "delete_event", - gtk_widget_hide_on_delete, NULL); - - /* connect signals to handlers. */ - CONNECT(g->window, "destroy", nsgtk_window_destroy_event, g); - CONNECT(g->drawing_area, "expose_event", nsgtk_window_expose_event, g); - CONNECT(g->drawing_area, "motion_notify_event", - nsgtk_window_motion_notify_event, g); - CONNECT(g->drawing_area, "button_press_event", - nsgtk_window_button_press_event, g); - CONNECT(g->drawing_area, "key_press_event", - nsgtk_window_keypress_event, g); - CONNECT(GET_WIDGET("viewport1"), "size_allocate", - nsgtk_window_size_allocate_event, g); - - /* toolbar and URL bar signal handlers */ - CONNECT(g->back_button, "clicked", nsgtk_window_back_button_clicked, g); - CONNECT(g->forward_button, "clicked", - nsgtk_window_forward_button_clicked, g); - CONNECT(g->stop_button, "clicked", nsgtk_window_stop_button_clicked, g); - CONNECT(g->reload_button, "clicked", - nsgtk_window_reload_button_clicked, g); - CONNECT(GET_WIDGET("toolHome"), "clicked", - nsgtk_window_home_button_clicked, g); - CONNECT(g->url_bar, "activate", nsgtk_window_url_activate_event, g); - CONNECT(g->url_bar, "changed", nsgtk_window_url_changed, g); - - /* set up the menu signal handlers */ - nsgtk_attach_menu_handlers(g->xml, g); - - /* finally, show the window. */ - gtk_widget_show(GTK_WIDGET(g->window)); - - return g; -} - -void gui_window_destroy(struct gui_window *g) -{ - if (g->prev) - g->prev->next = g->next; - else - window_list = g->next; - - if (g->next) - g->next->prev = g->prev; - - gtk_widget_destroy(GTK_WIDGET(g->history_window->window)); - gtk_widget_destroy(GTK_WIDGET(g->window)); - - free(g); - - if (--open_windows == 0) - netsurf_quit = true; -} - -void gui_window_set_title(struct gui_window *g, const char *title) -{ - static char suffix[] = " - NetSurf"; - char nt[strlen(title) + strlen(suffix) + 1]; - - if (title == NULL || title[0] == '\0') - { - gtk_window_set_title(g->window, "NetSurf"); - - } - else - { - strcpy(nt, title); - strcat(nt, suffix); - gtk_window_set_title(g->window, nt); - } -} - -void gui_window_redraw(struct gui_window *g, int x0, int y0, int x1, int y1) -{ - gtk_widget_queue_draw_area(GTK_WIDGET(g->drawing_area), - x0, y0, x1-x0+1, y1-y0+1); -} - -void gui_window_redraw_window(struct gui_window *g) -{ - gtk_widget_queue_draw(GTK_WIDGET(g->drawing_area)); -} - -void gui_window_update_box(struct gui_window *g, - const union content_msg_data *data) -{ - struct content *c = g->bw->current_content; - - if (c == NULL) - return; - - gtk_widget_queue_draw_area(GTK_WIDGET(g->drawing_area), - data->redraw.x, data->redraw.y, - data->redraw.width, data->redraw.height); -} - -bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy) -{ - *sx = 0; - *sy = 0; - return true; -} - -void gui_window_set_scroll(struct gui_window *g, int sx, int sy) -{ - -} - -float gui_window_get_scale(struct gui_window *g) -{ - return g->scale; -} - -void gui_window_set_scale(struct gui_window *g, float scale) -{ - if (g->scale == scale) - return; - g->scale = scale; - - if (g->bw->current_content != NULL) - gui_window_update_extent(g); - - gtk_widget_queue_draw(GTK_WIDGET(g->drawing_area)); - -} - -void gui_window_update_extent(struct gui_window *g) -{ - if (!g->bw->current_content) - return; - - gtk_widget_set_size_request(GTK_WIDGET(g->drawing_area), - g->bw->current_content->width * g->scale, - g->bw->current_content->height * g->scale); - gtk_widget_set_size_request(GTK_WIDGET(g->viewport), 0, 0); -} - -void gui_window_set_status(struct gui_window *g, const char *text) -{ - gtk_label_set_text(g->status_bar, text); -} - -void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) -{ - GdkCursor *cursor = NULL; - GdkCursorType cursortype; - bool nullcursor = false; - - if (g->current_pointer == shape) - return; - - g->current_pointer = shape; - - switch (shape) { - case GUI_POINTER_POINT: - cursortype = GDK_HAND1; - break; - case GUI_POINTER_CARET: - cursortype = GDK_XTERM; - break; - case GUI_POINTER_UP: - cursortype = GDK_TOP_SIDE; - break; - case GUI_POINTER_DOWN: - cursortype = GDK_BOTTOM_SIDE; - break; - case GUI_POINTER_LEFT: - cursortype = GDK_LEFT_SIDE; - break; - case GUI_POINTER_RIGHT: - cursortype = GDK_RIGHT_SIDE; - break; - case GUI_POINTER_LD: - cursortype = GDK_BOTTOM_LEFT_CORNER; - break; - case GUI_POINTER_RD: - cursortype = GDK_BOTTOM_RIGHT_CORNER; - break; - case GUI_POINTER_LU: - cursortype = GDK_TOP_LEFT_CORNER; - break; - case GUI_POINTER_RU: - cursortype = GDK_TOP_RIGHT_CORNER; - break; - case GUI_POINTER_CROSS: - cursortype = GDK_CROSS; - break; - case GUI_POINTER_MOVE: - cursortype = GDK_FLEUR; - break; - case GUI_POINTER_WAIT: - cursortype = GDK_WATCH; - break; - case GUI_POINTER_HELP: - cursortype = GDK_QUESTION_ARROW; - break; - case GUI_POINTER_MENU: - cursortype = GDK_RIGHTBUTTON; - break; - case GUI_POINTER_PROGRESS: - /* In reality, this needs to be the funky left_ptr_watch - * which we can't do easily yet. - */ - cursortype = GDK_WATCH; - break; - /* The following we're not sure about */ - case GUI_POINTER_NO_DROP: - case GUI_POINTER_NOT_ALLOWED: - case GUI_POINTER_DEFAULT: - default: - nullcursor = true; - } - - if (!nullcursor) - cursor = gdk_cursor_new_for_display( - gtk_widget_get_display( - GTK_WIDGET(g->drawing_area)), - cursortype); - gdk_window_set_cursor(GTK_WIDGET(g->drawing_area)->window, cursor); - - if (!nullcursor) - gdk_cursor_unref(cursor); -} - -void gui_window_hide_pointer(struct gui_window *g) -{ - -} - -void gui_window_set_url(struct gui_window *g, const char *url) -{ - gtk_entry_set_text(g->url_bar, url); - gtk_editable_set_position(GTK_EDITABLE(g->url_bar), -1); -} - -void gui_window_start_throbber(struct gui_window* g) -{ - gtk_widget_set_sensitive(GTK_WIDGET(g->stop_button), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(g->reload_button), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(g->stop_menu), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(g->reload_button), FALSE); - - nsgtk_window_update_back_forward(g); - - schedule(10, nsgtk_throb, g); -} - -void gui_window_stop_throbber(struct gui_window* g) -{ - gtk_widget_set_sensitive(GTK_WIDGET(g->stop_button), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(g->reload_button), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(g->stop_menu), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(g->reload_menu), TRUE); - - nsgtk_window_update_back_forward(g); - - schedule_remove(nsgtk_throb, g); - - gtk_image_set_from_pixbuf(g->throbber, nsgtk_throbber->framedata[0]); - // Issue a final reflow so that the content object reports its size correctly - schedule(5, nsgtk_perform_deferred_resize, g); -} - -void gui_window_place_caret(struct gui_window *g, int x, int y, int height) -{ - nsgtk_redraw_caret(g); - - g->caretx = x; - g->carety = y + 1; - g->careth = height; - - nsgtk_redraw_caret(g); - - gtk_widget_grab_focus(GTK_WIDGET(g->drawing_area)); -} - -void gui_window_remove_caret(struct gui_window *g) -{ - int oh = g->careth; - - if (oh == 0) - return; - - g->careth = 0; - - gui_window_redraw(g, g->caretx, g->carety, - g->caretx, g->carety + oh); -} - -void gui_window_new_content(struct gui_window *g) -{ - -} - -bool gui_window_scroll_start(struct gui_window *g) -{ - return true; -} - -bool gui_window_box_scroll_start(struct gui_window *g, - int x0, int y0, int x1, int y1) -{ - return true; -} - -void gui_drag_save_object(gui_save_type type, struct content *c, - struct gui_window *g) -{ - -} - -void gui_drag_save_selection(struct selection *s, struct gui_window *g) -{ - -} - -void gui_start_selection(struct gui_window *g) -{ - -} - -void gui_paste_from_clipboard(struct gui_window *g, int x, int y) -{ - -} - -bool gui_empty_clipboard(void) -{ - return true; -} - -bool gui_add_to_clipboard(const char *text, size_t length, bool space) -{ - return true; -} - -bool gui_commit_clipboard(void) -{ - return true; -} - - -bool gui_copy_to_clipboard(struct selection *s) -{ - return true; -} - - -void gui_window_get_dimensions(struct gui_window *g, int *width, int *height, - bool scaled) -{ - *width = GTK_WIDGET(g->drawing_area)->allocation.width; - *height = GTK_WIDGET(g->drawing_area)->allocation.height; - - if (scaled) { - *width /= g->scale; - *height /= g->scale; - } -} - -void gui_window_position_frame(struct gui_window *g, int x0, int y0, int x1, int y1) -{ -} - -bool gui_window_frame_resize_start(struct gui_window *g) -{ - return true; -} Removed: branches/dsilvers/gtk-frames/gtk/gtk_window.h URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/gtk/gtk_window.h?r... ============================================================================== --- branches/dsilvers/gtk-frames/gtk/gtk_window.h (original) +++ branches/dsilvers/gtk-frames/gtk/gtk_window.h (removed) @@ -1,21 +1,0 @@ -/* - * This file is part of NetSurf, http://netsurf.sourceforge.net/ - * Licensed under the GNU General Public License, - * http://www.opensource.org/licenses/gpl-license - * Copyright 2005 James Bursa <bursa(a)users.sourceforge.net> - */ - -#include <gtk/gtk.h> -#include "netsurf/desktop/plotters.h" - -extern GtkWidget *current_widget; -extern GdkDrawable *current_drawable; -extern GdkGC *current_gc; -#ifdef CAIRO_VERSION -extern cairo_t *current_cr; -#endif - -void nsgtk_plot_set_scale(float s); -float nsgtk_plot_get_scale(void); -void nsgtk_set_colour(colour c); -void nsgtk_reflow_all_windows(void); Modified: branches/dsilvers/gtk-frames/makefile URL: http://svn.semichrome.net/branches/dsilvers/gtk-frames/makefile?rev=3053&... ============================================================================== --- branches/dsilvers/gtk-frames/makefile (original) +++ branches/dsilvers/gtk-frames/makefile Sun Nov 19 15:49:05 2006 @@ -70,7 +70,7 @@ version.o gesture_core.o # desktop/ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \ gtk_schedule.o gtk_thumbnail.o gtk_options.o \ - gtk_plotters.o gtk_treeview.o gtk_window.o \ + gtk_plotters.o gtk_treeview.o gtk_scaffolding.o \ gtk_completion.o gtk_login.o gtk_throbber.o \ gtk_history.o # gtk/

16 years, 2 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits November 2006