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

r2853 rjek - in /trunk/netsurf: gtk/gtk_gui.c gtk/gtk_throbber.c gtk/gtk_throbber.h gtk/gtk_window.c gtk/netsurf.glade gtk/throbber.gif makefile

by netsurf＠semichrome.net

Author: rjek Date: Tue Aug 15 22:29:20 2006 New Revision: 2853 URL: http://svn.semichrome.net?rev=2853&view=rev Log: Merge new glade nsgtk window code into trunk. Added: trunk/netsurf/gtk/gtk_throbber.c - copied, changed from r2852, branches/rjek/glade/gtk/gtk_throbber.c trunk/netsurf/gtk/gtk_throbber.h - copied unchanged from r2852, branches/rjek/glade/gtk/gtk_throbber.h trunk/netsurf/gtk/throbber.gif - copied unchanged from r2852, branches/rjek/glade/gtk/throbber.gif Modified: trunk/netsurf/gtk/gtk_gui.c trunk/netsurf/gtk/gtk_window.c trunk/netsurf/gtk/netsurf.glade trunk/netsurf/makefile [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/netsurf/gtk/gtk_gui.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_gui.c?rev=2853&r1=2852&r2... Copied: trunk/netsurf/gtk/gtk_throbber.c (from r2852, branches/rjek/glade/gtk/gtk_throbber.c) URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_throbber.c?p2=trunk/netsu... Modified: trunk/netsurf/gtk/gtk_window.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_window.c?rev=2853&r1=2852... Modified: trunk/netsurf/gtk/netsurf.glade URL: http://svn.semichrome.net/trunk/netsurf/gtk/netsurf.glade?rev=2853&r1=285... Modified: trunk/netsurf/makefile URL: http://svn.semichrome.net/trunk/netsurf/makefile?rev=2853&r1=2852&r2=2853...

17 years, 1 month

1
0
0 / 0

r2852 rjw - /trunk/netsurf/css/ruleset.c

by netsurf＠semichrome.net

Author: rjw Date: Tue Aug 15 20:33:42 2006 New Revision: 2852 URL: http://svn.semichrome.net?rev=2852&view=rev Log: Fix accidental press of delete :-s Modified: trunk/netsurf/css/ruleset.c Modified: trunk/netsurf/css/ruleset.c URL: http://svn.semichrome.net/trunk/netsurf/css/ruleset.c?rev=2852&r1=2851&r2... ============================================================================== --- trunk/netsurf/css/ruleset.c (original) +++ trunk/netsurf/css/ruleset.c Tue Aug 15 20:33:42 2006 @@ -625,7 +625,7 @@ if ((v->type != CSS_NODE_DIMENSION) && (v->type != CSS_NODE_NUMBER)) return 1; num_length = strspn(v->data, "0123456789+-."); - if (v->type == CSS_NODE_DIMENSION) + if (v->type == CSS_NODE_DIMENSION) { u = css_unit_parse(v->data + num_length, v->data_length - num_length); if (u == CSS_UNIT_UNKNOWN) { return 1;

17 years, 1 month

1
0
0 / 0

r2851 rjw - /trunk/netsurf/css/ruleset.c

by netsurf＠semichrome.net

Author: rjw Date: Tue Aug 15 20:20:36 2006 New Revision: 2851 URL: http://svn.semichrome.net?rev=2851&view=rev Log: Treat unitless CSS values as pixels (fix 1527056) Modified: trunk/netsurf/css/ruleset.c Modified: trunk/netsurf/css/ruleset.c URL: http://svn.semichrome.net/trunk/netsurf/css/ruleset.c?rev=2851&r1=2850&r2... ============================================================================== --- trunk/netsurf/css/ruleset.c (original) +++ trunk/netsurf/css/ruleset.c Tue Aug 15 20:20:36 2006 @@ -622,12 +622,17 @@ length->value = 0; return 0; } - if (v->type != CSS_NODE_DIMENSION) + if ((v->type != CSS_NODE_DIMENSION) && (v->type != CSS_NODE_NUMBER)) return 1; num_length = strspn(v->data, "0123456789+-."); - u = css_unit_parse(v->data + num_length, v->data_length - num_length); - if (u == CSS_UNIT_UNKNOWN) - return 1; + if (v->type == CSS_NODE_DIMENSION) + u = css_unit_parse(v->data + num_length, v->data_length - num_length); + if (u == CSS_UNIT_UNKNOWN) { + return 1; + } + } else { + u = CSS_UNIT_PX; + } value = atof(v->data); if (non_negative && value < 0) return 1;

17 years, 1 month

1
0
0 / 0

r2850 bursa - /trunk/netsurf/riscos/gui.c

by netsurf＠semichrome.net

Author: bursa Date: Tue Aug 15 05:05:30 2006 New Revision: 2850 URL: http://svn.semichrome.net?rev=2850&view=rev Log: Call rufl_dump_state() when a crash occurs. Modified: trunk/netsurf/riscos/gui.c Modified: trunk/netsurf/riscos/gui.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/gui.c?rev=2850&r1=2849&r2=... ============================================================================== --- trunk/netsurf/riscos/gui.c (original) +++ trunk/netsurf/riscos/gui.c Tue Aug 15 05:05:30 2006 @@ -779,6 +779,7 @@ box_dump(c->data.html.layout, 0); } options_dump(); + rufl_dump_state(); xhourglass_colours(old_sand, old_glass, 0, 0); xhourglass_off(); }

17 years, 1 month

1
0
0 / 0

r2849 bursa - /trunk/netsurf/render/layout.c

by netsurf＠semichrome.net

Author: bursa Date: Tue Aug 15 00:05:08 2006 New Revision: 2849 URL: http://svn.semichrome.net?rev=2849&view=rev Log: Fix layout of standalone <br>. Modified: trunk/netsurf/render/layout.c Modified: trunk/netsurf/render/layout.c URL: http://svn.semichrome.net/trunk/netsurf/render/layout.c?rev=2849&r1=2848&... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Tue Aug 15 00:05:08 2006 @@ -817,7 +817,7 @@ has_text_children = false; for (c = inline_container->children; c; c = c->next) - if (!c->object && c->text && c->length) + if ((!c->object && c->text && c->length) || c->type == BOX_BR) has_text_children = true; for (c = inline_container->children; c; ) {

17 years, 1 month

1
0
0 / 0

r2848 rjek - /branches/rjek/glade/makefile

by netsurf＠semichrome.net

Author: rjek Date: Tue Aug 15 00:00:34 2006 New Revision: 2848 URL: http://svn.semichrome.net?rev=2848&view=rev Log: Back out sillyness left in makefile CFLAGS for nsgtk target. Modified: branches/rjek/glade/makefile Modified: branches/rjek/glade/makefile URL: http://svn.semichrome.net/branches/rjek/glade/makefile?rev=2848&r1=2847&r... ============================================================================== --- branches/rjek/glade/makefile (original) +++ branches/rjek/glade/makefile Tue Aug 15 00:00:34 2006 @@ -121,8 +121,8 @@ CFLAGS_NCOS = $(CFLAGS_RISCOS) -Dncos CFLAGS_DEBUG = -std=c9x -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I.. \ $(PLATFORM_CFLAGS_DEBUG) -g -CFLAGS_GTK = -std=c9x -DNDEBUG -D_BSD_SOURCE -D_POSIX_C_SOURCE -Dgtk \ - $(WARNFLAGS) -I.. -g -O2 -Wformat=2 \ +CFLAGS_GTK = -std=c9x -D_BSD_SOURCE -D_POSIX_C_SOURCE -Dgtk \ + $(WARNFLAGS) -I.. -g -O0 -Wformat=2 \ `pkg-config --cflags libglade-2.0 gtk+-2.0` `xml2-config --cflags` # Stop GCC under Cygwin throwing a fit

17 years, 1 month

1
0
0 / 0

r2847 dsilvers - /branches/rjek/glade/gtk/gtk_window.c

by netsurf＠semichrome.net

Author: dsilvers Date: Mon Aug 14 23:49:07 2006 New Revision: 2847 URL: http://svn.semichrome.net?rev=2847&view=rev Log: Cleanups, also fix scrollbar mis-sizing on URL change and ensure zooms work properly Modified: branches/rjek/glade/gtk/gtk_window.c Modified: branches/rjek/glade/gtk/gtk_window.c URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_window.c?rev=2847&r... ============================================================================== --- branches/rjek/glade/gtk/gtk_window.c (original) +++ branches/rjek/glade/gtk/gtk_window.c Mon Aug 14 23:49:07 2006 @@ -38,6 +38,7 @@ GtkWindow *window; GtkEntry *url_bar; GtkDrawingArea *drawing_area; + GtkViewport *viewport; GtkLabel *status_bar; GtkToolButton *back_button; GtkToolButton *forward_button; @@ -88,8 +89,6 @@ static void nsgtk_window_destroy_event(GtkWidget *, gpointer); static gboolean nsgtk_window_expose_event(GtkWidget *, GdkEventExpose *, gpointer); -static gboolean nsgtk_window_configure_event(GtkWidget *, GdkEventConfigure *, - gpointer); static gboolean nsgtk_window_motion_notify_event(GtkWidget *, GdkEventMotion *, gpointer); static gboolean nsgtk_window_button_press_event(GtkWidget *, GdkEventButton *, @@ -177,7 +176,7 @@ /* help menu */ MENUEVENT(about), - /* sentinal */ + /* sentinel */ { NULL, NULL } }; @@ -282,26 +281,6 @@ return FALSE; } -gboolean nsgtk_window_configure_event(GtkWidget *widget, - GdkEventConfigure *event, gpointer data) -{ - struct gui_window *g = data; - - if (gui_in_multitask) - return FALSE; - - if (!g->bw->current_content) - return FALSE; - - if (g->bw->current_content->status != CONTENT_STATUS_READY && - g->bw->current_content->status != CONTENT_STATUS_DONE) - return FALSE; - - content_reformat(g->bw->current_content, event->width, event->height); - - return FALSE; -} - gboolean nsgtk_window_motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) { @@ -321,7 +300,7 @@ { 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; @@ -374,7 +353,7 @@ return; content_reformat(g->bw->current_content, - g->target_width, g->target_height); + g->target_width, g->target_height); if (GTK_WIDGET_SENSITIVE((GTK_WIDGET(g->stop_button)))) schedule(100, nsgtk_perform_deferred_resize, g); @@ -475,7 +454,7 @@ gboolean nsgtk_window_home_button_clicked(GtkWidget *widget, gpointer data) { struct gui_window *g = data; - const char *addr = "http://netsurf.sourceforge.net/"; + static const char *addr = "http://netsurf.sourceforge.net/"; if (option_homepage_url != NULL) addr = option_homepage_url; @@ -687,13 +666,14 @@ 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")); /* connect our scrollbars to the viewport */ - gtk_viewport_set_hadjustment(GTK_VIEWPORT(GET_WIDGET("viewport1")), + + gtk_viewport_set_hadjustment(g->viewport, gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("hscrollbar1")))); - gtk_viewport_set_vadjustment(GTK_VIEWPORT(GET_WIDGET("viewport1")), + gtk_viewport_set_vadjustment(g->viewport, gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("vscrollbar1")))); - gtk_widget_set_size_request(GTK_WIDGET(GET_WIDGET("viewport1")), 0, 0); + gtk_widget_set_size_request(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. @@ -774,8 +754,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, "configure_event", - nsgtk_window_configure_event, g); CONNECT(g->drawing_area, "motion_notify_event", nsgtk_window_motion_notify_event, g); CONNECT(g->drawing_area, "button_press_event", @@ -815,7 +793,7 @@ void gui_window_set_title(struct gui_window *g, const char *title) { - char suffix[] = " - NetSurf"; + static char suffix[] = " - NetSurf"; char nt[strlen(title) + strlen(suffix) + 1]; if (title == NULL || title[0] == '\0') @@ -834,7 +812,7 @@ 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); + x0, y0, x1-x0+1, y1-y0+1); } void gui_window_redraw_window(struct gui_window *g) @@ -843,7 +821,7 @@ } void gui_window_update_box(struct gui_window *g, - const union content_msg_data *data) + const union content_msg_data *data) { struct content *c = g->bw->current_content; @@ -880,7 +858,8 @@ void gui_window_set_extent(struct gui_window *g, int width, int height) { gtk_widget_set_size_request(GTK_WIDGET(g->drawing_area), - width * g->scale, height * g->scale); + width * g->scale, height * g->scale); + gtk_widget_set_size_request(g->viewport, 0, 0); } void gui_window_set_status(struct gui_window *g, const char *text) @@ -1004,6 +983,8 @@ 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)

17 years, 1 month

1
0
0 / 0

r2846 rjek - in /branches/rjek/glade/gtk: gtk_window.c netsurf.glade

by netsurf＠semichrome.net

Author: rjek Date: Mon Aug 14 23:41:38 2006 New Revision: 2846 URL: http://svn.semichrome.net?rev=2846&view=rev Log: Fix setting focus on drawing area and caret plotting in new nsgtk Modified: branches/rjek/glade/gtk/gtk_window.c branches/rjek/glade/gtk/netsurf.glade Modified: branches/rjek/glade/gtk/gtk_window.c URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_window.c?rev=2846&r... ============================================================================== --- branches/rjek/glade/gtk/gtk_window.c (original) +++ branches/rjek/glade/gtk/gtk_window.c Mon Aug 14 23:41:38 2006 @@ -102,6 +102,7 @@ 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); @@ -417,6 +418,15 @@ 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) { @@ -656,6 +666,8 @@ g->scale = clone->window->scale; else g->scale = 1.0; + + g->careth = 0; /* load the window template from the glade xml file, and extract * widget references from it for later use. @@ -996,12 +1008,24 @@ 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(g->drawing_area); } void gui_window_remove_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_new_content(struct gui_window *g) Modified: branches/rjek/glade/gtk/netsurf.glade URL: http://svn.semichrome.net/branches/rjek/glade/gtk/netsurf.glade?rev=2846&... ============================================================================== --- branches/rjek/glade/gtk/netsurf.glade (original) +++ branches/rjek/glade/gtk/netsurf.glade Mon Aug 14 23:41:38 2006 @@ -4228,6 +4228,8 @@ <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>

17 years, 1 month

1
0
0 / 0

r2845 rjek - /branches/rjek/glade/makefile

by netsurf＠semichrome.net

Author: rjek Date: Mon Aug 14 23:26:00 2006 New Revision: 2845 URL: http://svn.semichrome.net?rev=2845&view=rev Log: Oops - missed makefile changes for throbber work Modified: branches/rjek/glade/makefile Modified: branches/rjek/glade/makefile URL: http://svn.semichrome.net/branches/rjek/glade/makefile?rev=2845&r1=2844&r... ============================================================================== --- branches/rjek/glade/makefile (original) +++ branches/rjek/glade/makefile Mon Aug 14 23:26:00 2006 @@ -68,7 +68,8 @@ version.o gesture_core.o # desktop/ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \ gtk_schedule.o gtk_thumbnail.o \ - gtk_plotters.o gtk_treeview.o gtk_window.o # gtk/ + gtk_plotters.o gtk_treeview.o gtk_window.o \ + gtk_throbber.o # gtk/ OBJDIR_RISCOS = arm-riscos-aof @@ -120,8 +121,8 @@ CFLAGS_NCOS = $(CFLAGS_RISCOS) -Dncos CFLAGS_DEBUG = -std=c9x -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I.. \ $(PLATFORM_CFLAGS_DEBUG) -g -CFLAGS_GTK = -std=c9x -D_BSD_SOURCE -D_POSIX_C_SOURCE -Dgtk \ - $(WARNFLAGS) -I.. -g -O0 -Wformat=2 \ +CFLAGS_GTK = -std=c9x -DNDEBUG -D_BSD_SOURCE -D_POSIX_C_SOURCE -Dgtk \ + $(WARNFLAGS) -I.. -g -O2 -Wformat=2 \ `pkg-config --cflags libglade-2.0 gtk+-2.0` `xml2-config --cflags` # Stop GCC under Cygwin throwing a fit

17 years, 1 month

1
0
0 / 0

r2844 rjek - in /branches/rjek/glade/gtk: gtk_gui.c gtk_throbber.c gtk_throbber.h gtk_window.c netsurf.glade throbber.gif

by netsurf＠semichrome.net

Author: rjek Date: Mon Aug 14 23:13:02 2006 New Revision: 2844 URL: http://svn.semichrome.net?rev=2844&view=rev Log: Working throbber in glade branch of nsgtk Added: branches/rjek/glade/gtk/throbber.gif (with props) Modified: branches/rjek/glade/gtk/gtk_gui.c branches/rjek/glade/gtk/gtk_throbber.c branches/rjek/glade/gtk/gtk_throbber.h branches/rjek/glade/gtk/gtk_window.c branches/rjek/glade/gtk/netsurf.glade Modified: branches/rjek/glade/gtk/gtk_gui.c URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_gui.c?rev=2844&r1=2... ============================================================================== --- branches/rjek/glade/gtk/gtk_gui.c (original) +++ branches/rjek/glade/gtk/gtk_gui.c Mon Aug 14 23:13:02 2006 @@ -27,6 +27,7 @@ #include "netsurf/desktop/netsurf.h" #include "netsurf/desktop/options.h" #include "netsurf/gtk/gtk_gui.h" +#include "netsurf/gtk/gtk_throbber.h" #include "netsurf/render/box.h" #include "netsurf/render/form.h" #include "netsurf/render/html.h" @@ -98,6 +99,8 @@ char buf[PATH_MAX]; gtk_init(&argc, &argv); + + nsgtk_throbber_initialise("./gtk/throbber.gif"); gladeWindows = glade_xml_new("./gtk/netsurf.glade", NULL, NULL); wndChoices = glade_xml_get_widget(gladeWindows, "wndChoices"); Modified: branches/rjek/glade/gtk/gtk_throbber.c URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_throbber.c?rev=2844... ============================================================================== --- branches/rjek/glade/gtk/gtk_throbber.c (original) +++ branches/rjek/glade/gtk/gtk_throbber.c Mon Aug 14 23:13:02 2006 @@ -11,7 +11,7 @@ #include "netsurf/image/gifread.h" #include "netsurf/gtk/gtk_throbber.h" -struct nsgtk_throbber *nsgtk_throbber; +struct nsgtk_throbber *nsgtk_throbber = NULL; bool nsgtk_throbber_initialise(const char *fn) { @@ -31,7 +31,6 @@ gif = (struct gif_animation *)malloc(sizeof(struct gif_animation)); throb = (struct nsgtk_throbber *)malloc(sizeof(struct nsgtk_throbber)); - nsgtk_throbber = throb; /* discover the size of the data file. */ fseek(fh, 0, SEEK_END); @@ -113,5 +112,19 @@ } */ + nsgtk_throbber = throb; + return true; } + +void nsgtk_throbber_finalise(void) +{ + int i; + + for (i = 0; i < nsgtk_throbber->nframes; i++) + gdk_pixbuf_unref(nsgtk_throbber->framedata[i]); + + free(nsgtk_throbber); + + nsgtk_throbber = NULL; +} Modified: branches/rjek/glade/gtk/gtk_throbber.h URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_throbber.h?rev=2844... ============================================================================== --- branches/rjek/glade/gtk/gtk_throbber.h (original) +++ branches/rjek/glade/gtk/gtk_throbber.h Mon Aug 14 23:13:02 2006 @@ -19,5 +19,6 @@ extern struct nsgtk_throbber *nsgtk_throbber; bool nsgtk_throbber_initialise(const char *fn); +void nsgtk_throbber_finalise(void); #endif /* __GTK_THROBBER_H__ */ Modified: branches/rjek/glade/gtk/gtk_window.c URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_window.c?rev=2844&r... ============================================================================== --- branches/rjek/glade/gtk/gtk_window.c (original) +++ branches/rjek/glade/gtk/gtk_window.c Mon Aug 14 23:13:02 2006 @@ -24,6 +24,7 @@ #include "netsurf/gtk/gtk_gui.h" #include "netsurf/gtk/gtk_plotters.h" #include "netsurf/gtk/gtk_window.h" +#include "netsurf/gtk/gtk_throbber.h" #include "netsurf/render/box.h" #include "netsurf/render/font.h" #include "netsurf/render/form.h" @@ -46,6 +47,7 @@ GtkMenuItem *forward_menu; GtkMenuItem *stop_menu; GtkMenuItem *reload_menu; + GtkImage *throbber; GladeXML *xml; @@ -54,6 +56,7 @@ int target_width, target_height; int caretx, carety, careth; gui_pointer_shape current_pointer; + int throb_frame; struct gtk_history_window *history_window; @@ -96,8 +99,9 @@ static gboolean nsgtk_window_size_allocate_event(GtkWidget *, GtkAllocation *, gpointer); -static void nsgtk_perform_deferred_resize(void *p); +static void nsgtk_perform_deferred_resize(void *); static void nsgtk_window_update_back_forward(struct gui_window *); +static void nsgtk_throb(void *); static gboolean nsgtk_window_back_button_clicked(GtkWidget *, gpointer); static gboolean nsgtk_window_forward_button_clicked(GtkWidget *, gpointer); @@ -398,6 +402,20 @@ 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); +} /* signal handling functions for the toolbar and URL bar */ gboolean nsgtk_window_back_button_clicked(GtkWidget *widget, gpointer data) @@ -656,6 +674,7 @@ 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")); /* connect our scrollbars to the viewport */ gtk_viewport_set_hadjustment(GTK_VIEWPORT(GET_WIDGET("viewport1")), @@ -722,6 +741,10 @@ 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 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)) @@ -953,6 +976,8 @@ 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) @@ -963,6 +988,10 @@ 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]); } void gui_window_place_caret(struct gui_window *g, int x, int y, int height) Modified: branches/rjek/glade/gtk/netsurf.glade URL: http://svn.semichrome.net/branches/rjek/glade/gtk/netsurf.glade?rev=2844&... ============================================================================== --- branches/rjek/glade/gtk/netsurf.glade (original) +++ branches/rjek/glade/gtk/netsurf.glade Mon Aug 14 23:13:02 2006 @@ -4171,13 +4171,13 @@ <property name="is_important">False</property> <child> - <widget class="GtkImage" id="throbble"> + <widget class="GtkImage" id="throbber"> <property name="visible">True</property> <property name="icon_size">4</property> <property name="icon_name">gtk-yes</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> - <property name="xpad">0</property> + <property name="xpad">2</property> <property name="ypad">0</property> </widget> </child> Added: branches/rjek/glade/gtk/throbber.gif URL: http://svn.semichrome.net/branches/rjek/glade/gtk/throbber.gif?rev=2844&v... ============================================================================== Binary file - no diff available. Propchange: branches/rjek/glade/gtk/throbber.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

17 years, 1 month

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits August 2006