Author: rjek Date: Mon Aug 28 21:24:45 2006 New Revision: 2897 URL: http://svn.semichrome.net?rev=2897&view=rev Log: Force nsgtk caret plotting to use GDK. Move plotting to stand-alone function. Modified: trunk/netsurf/gtk/gtk_window.c Modified: trunk/netsurf/gtk/gtk_window.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_window.c?rev=2897&r1=... ============================================================================== --- trunk/netsurf/gtk/gtk_window.c (original) +++ trunk/netsurf/gtk/gtk_window.c Mon Aug 28 21:24:45 2006 @@ -94,6 +94,7 @@ 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 *, @@ -259,6 +260,24 @@ 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) { @@ -287,8 +306,7 @@ g->scale, 0xFFFFFF); if (g->careth != 0) - plot.line(g->caretx, g->carety, - g->caretx, g->carety + g->careth, 1, 0, false, false); + nsgtk_plot_caret(g->caretx, g->carety, g->careth); g_object_unref(current_gc); #ifdef CAIRO_VERSION