Author: jmb Date: Wed Sep 6 12:29:14 2006 New Revision: 2921 URL: http://svn.semichrome.net?rev=2921&view=rev Log: Make GTK build compile again (don't expect frames to work, however) Squash warnings in GTK plotters. Modified: trunk/netsurf/gtk/gtk_plotters.c trunk/netsurf/gtk/gtk_plotters.h trunk/netsurf/gtk/gtk_window.c Modified: trunk/netsurf/gtk/gtk_plotters.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_plotters.c?rev=2921&r... ============================================================================== --- trunk/netsurf/gtk/gtk_plotters.c (original) +++ trunk/netsurf/gtk/gtk_plotters.c Wed Sep 6 12:29:14 2006 @@ -69,6 +69,7 @@ nsgtk_plot_bitmap, nsgtk_plot_bitmap_tile, NULL, + NULL, NULL }; @@ -82,7 +83,7 @@ int line_width, colour c, bool dotted, bool dashed) { nsgtk_set_colour(c); - if (dotted) + if (dotted) nsgtk_set_dotted(); else if (dashed) nsgtk_set_dashed(); @@ -187,7 +188,7 @@ #ifdef CAIRO_VERSION if (option_render_cairo) { cairo_reset_clip(current_cr); - cairo_rectangle(current_cr, clip_x0 - 1, clip_y0 - 1, + cairo_rectangle(current_cr, clip_x0 - 1, clip_y0 - 1, clip_x1 - clip_x0 + 1, clip_y1 - clip_y0 + 1); cairo_clip(current_cr); } @@ -220,19 +221,19 @@ cairo_set_line_width(current_cr, 1); cairo_arc(current_cr, x, y, radius, 0, M_PI * 2); - + if (filled) cairo_fill(current_cr); - + cairo_stroke(current_cr); } else #endif gdk_draw_arc(current_drawable, current_gc, - filled ? TRUE : FALSE, x - (radius), y - radius, + filled ? TRUE : FALSE, x - (radius), y - radius, radius * 2, radius * 2, 0, 360 * 64); - + return true; } @@ -243,8 +244,8 @@ #ifdef CAIRO_VERSION if (option_render_cairo) { cairo_set_line_width(current_cr, 1); - cairo_arc(current_cr, x, y, radius, - (angle1 + 90) * (M_PI / 180), + cairo_arc(current_cr, x, y, radius, + (angle1 + 90) * (M_PI / 180), (angle2 + 90) * (M_PI / 180)); cairo_stroke(current_cr); } else @@ -253,7 +254,7 @@ FALSE, x - (radius), y - radius, radius * 2, radius * 2, angle1 * 64, angle2 * 64); - + return true; } @@ -266,7 +267,7 @@ if (width == 0 || height == 0) return true; - + if (gdk_pixbuf_get_width(pixbuf) == width && gdk_pixbuf_get_height(pixbuf) == height) { gdk_draw_pixbuf(current_drawable, current_gc, @@ -302,7 +303,7 @@ struct bitmap *bitmap, colour bg) { GdkPixbuf *pixbuf = gtk_bitmap_get_primary(bitmap); - nsgtk_plot_pixbuf(x, y, width, height, pixbuf, bg); + return nsgtk_plot_pixbuf(x, y, width, height, pixbuf, bg); } bool nsgtk_plot_bitmap_tile(int x, int y, int width, int height, @@ -312,12 +313,12 @@ int doneheight = 0, donewidth = 0; GdkPixbuf *primary; GdkPixbuf *pretiled; - + if (!(repeat_x || repeat_y)) { /* Not repeating at all, so just pass it on */ return nsgtk_plot_bitmap(x,y,width,height,bitmap,bg); } - + if (repeat_x && !repeat_y) pretiled = gtk_bitmap_get_pretile_x(bitmap); if (repeat_x && repeat_y) @@ -330,12 +331,12 @@ width /= gdk_pixbuf_get_width(primary); height *= gdk_pixbuf_get_height(pretiled); height /= gdk_pixbuf_get_height(primary); - - if (y > cliprect.y) + + if (y > cliprect.y) doneheight = (cliprect.y - height) + ((y - cliprect.y) % height); else doneheight = y; - + while (doneheight < (cliprect.y + cliprect.height)) { if (x > cliprect.x) donewidth = (cliprect.x - width) + ((x - cliprect.x) % width); @@ -351,7 +352,7 @@ if (!repeat_y) break; } - + return true; } Modified: trunk/netsurf/gtk/gtk_plotters.h URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_plotters.h?rev=2921&r... ============================================================================== --- trunk/netsurf/gtk/gtk_plotters.h (original) +++ trunk/netsurf/gtk/gtk_plotters.h Wed Sep 6 12:29:14 2006 @@ -11,5 +11,5 @@ struct plotter_table; -const struct plotter_table nsgtk_plotters; +extern const struct plotter_table nsgtk_plotters; Modified: trunk/netsurf/gtk/gtk_window.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_window.c?rev=2921&r1=... ============================================================================== --- trunk/netsurf/gtk/gtk_window.c (original) +++ trunk/netsurf/gtk/gtk_window.c Wed Sep 6 12:29:14 2006 @@ -67,7 +67,7 @@ struct gtk_history_window *history_window; int last_x, last_y; - + struct gui_window *next, *prev; }; @@ -168,10 +168,10 @@ MENUEVENT(new_window), MENUEVENT(close_window), MENUEVENT(quit), - + /* edit menu */ MENUEVENT(choices), - + /* view menu */ MENUEVENT(stop), MENUEVENT(reload), @@ -179,17 +179,17 @@ MENUEVENT(normal_size), MENUEVENT(zoom_out), MENUEVENT(save_window_size), - + /* navigate menu */ MENUEVENT(back), MENUEVENT(forward), MENUEVENT(home), MENUEVENT(local_history), MENUEVENT(global_history), - + /* help menu */ MENUEVENT(about), - + /* sentinel */ { NULL, NULL } }; @@ -197,7 +197,7 @@ void nsgtk_reflow_all_windows(void) { struct gui_window *g = window_list; - + while (g != NULL) { nsgtk_perform_deferred_resize(g); g = g->next; @@ -207,7 +207,7 @@ 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); @@ -259,7 +259,7 @@ void nsgtk_window_destroy_event(GtkWidget *widget, gpointer data) { struct gui_window *g = data; - + gui_window_destroy(g); } @@ -267,7 +267,7 @@ void nsgtk_plot_caret(int x, int y, int h) { GdkColor colour; - + colour.red = 0; colour.green = 0; colour.blue = 0; @@ -275,7 +275,7 @@ 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); @@ -338,7 +338,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; @@ -400,17 +400,17 @@ 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. */ @@ -428,7 +428,7 @@ g->throb_frame = 1; else g->throb_frame++; - + gtk_image_set_from_pixbuf(g->throbber, nsgtk_throbber->framedata[ g->throb_frame]); @@ -449,43 +449,43 @@ { struct gui_window *g = data; - if (!history_back_available(g->bw->history)) + 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; } @@ -498,7 +498,7 @@ addr = option_homepage_url; browser_window_go(g->bw, addr, 0, true); - + return TRUE; } @@ -521,7 +521,7 @@ gpointer data) { const char *prefix; - + prefix = gtk_entry_get_text(GTK_ENTRY(widget)); nsgtk_completion_update(prefix); @@ -543,7 +543,7 @@ struct gui_window *gw = (struct gui_window *)g; gtk_widget_destroy(GTK_WIDGET(gw->window)); - + return TRUE; } @@ -556,17 +556,16 @@ MENUHANDLER(choices) { gtk_widget_show(GTK_WIDGET(wndChoices)); - + return TRUE; } void nsgtk_window_change_scale(struct gui_window *g, float scale) { g->scale = scale; - + if (g->bw->current_content != NULL) - gui_window_set_extent(g, g->bw->current_content->width, - g->bw->current_content->height); + gui_window_update_extent(g); gtk_widget_queue_draw(GTK_WIDGET(g->drawing_area)); } @@ -576,40 +575,40 @@ struct gui_window *gw = g; nsgtk_window_change_scale(gw, gw->scale + 0.05); - + return TRUE; } MENUHANDLER(normal_size) { struct gui_window *gw = g; - + nsgtk_window_change_scale(gw, 1.00); - + return TRUE; } MENUHANDLER(zoom_out) { struct gui_window *gw = g; - + nsgtk_window_change_scale(gw, gw->scale - 0.05); - + return TRUE; } MENUHANDLER(save_window_size) { struct gui_window *gw = 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; } @@ -641,10 +640,10 @@ 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; } @@ -652,7 +651,7 @@ { gtk_widget_show(GTK_WIDGET(wndHistory)); gdk_window_raise(GDK_WINDOW(wndHistory)); - + return TRUE; } @@ -666,7 +665,7 @@ GdkEventExpose *event, gpointer g) { struct gtk_history_window *hw = g; - + current_widget = widget; current_drawable = widget->window; current_gc = gdk_gc_new(current_drawable); @@ -708,7 +707,7 @@ struct browser_window *clone) { struct gui_window *g; /**< what we're creating to return */ - + g = malloc(sizeof(*g)); g->bw = bw; @@ -717,17 +716,17 @@ g->scale = clone->window->scale; else g->scale = 1.0; - + g->careth = 0; - /* add the window to the list of open windows. */ + /* 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 @@ -750,7 +749,7 @@ 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. */ @@ -761,10 +760,10 @@ } 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")))); @@ -792,7 +791,7 @@ /* 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); @@ -816,7 +815,7 @@ 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 | @@ -827,7 +826,7 @@ 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); @@ -842,13 +841,13 @@ "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)) + 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", @@ -871,7 +870,7 @@ 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", @@ -905,7 +904,7 @@ gtk_widget_destroy(GTK_WIDGET(g->history_window->window)); gtk_widget_destroy(GTK_WIDGET(g->window)); - + free(g); if (--open_windows == 0) @@ -916,11 +915,11 @@ { 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 { @@ -976,10 +975,14 @@ return GTK_WIDGET(g->drawing_area)->allocation.height; } -void gui_window_set_extent(struct gui_window *g, int width, int height) -{ +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), - width * g->scale, height * g->scale); + 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); } @@ -993,12 +996,12 @@ 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; @@ -1062,10 +1065,10 @@ if (!nullcursor) cursor = gdk_cursor_new_for_display( gtk_widget_get_display( - GTK_WIDGET(g->drawing_area)), + GTK_WIDGET(g->drawing_area)), cursortype); gdk_window_set_cursor(GTK_WIDGET(g->drawing_area)->window, cursor); - + if (!nullcursor) gdk_cursor_unref(cursor); } @@ -1087,9 +1090,9 @@ 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); } @@ -1099,11 +1102,11 @@ 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); @@ -1125,7 +1128,7 @@ void gui_window_remove_caret(struct gui_window *g) { int oh = g->careth; - + if (oh == 0) return; @@ -1194,3 +1197,17 @@ } +void gui_window_get_dimensions(struct gui_window *g, int *width, int *height) +{ + *width = 1; + *height = 1; +} + +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; +}