callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API: Add gtk_cairo_draw_insertion_cursor()

Browse Source 
For now just add it instead of replacing the current function. In the
end, this one should probably be renamed to
gtk_draw_insertion_cursor() and the current
gtk_draw_insertion_cursor() should die.
This commit is contained in:
Benjamin Otte 2010-08-15 19:38:32 +02:00
parent 3d340d7449
commit ac48f2330d
3 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/gtk.symbols
View File

@ -1043,6 +1043,7 @@ gtk_style_new
gtk_style_render_icon gtk_style_render_icon
gtk_style_set_background gtk_style_set_background
gtk_draw_insertion_cursor gtk_draw_insertion_cursor
gtk_cairo_draw_insertion_cursor
gtk_style_get_style_property gtk_style_get_style_property
gtk_style_get_valist gtk_style_get_valist
gtk_style_get gtk_style_get

39
gtk/gtkstyle.c
View File

@ -6494,12 +6494,29 @@ _gtk_widget_get_cursor_color (GtkWidget *widget,
*color = gtk_widget_get_style (widget)->text[GTK_STATE_NORMAL]; *color = gtk_widget_get_style (widget)->text[GTK_STATE_NORMAL];
} }
static void /**
draw_insertion_cursor (GtkWidget *widget, * gtk_cairo_draw_insertion_cursor:
cairo_t *cr, * @widget: a #GtkWidget
const GdkRectangle *location, * @cr: cairo context to draw to
GtkTextDirection direction, * @location: location where to draw the cursor (@location->width is ignored)
gboolean draw_arrow) * @is_primary: if the cursor should be the primary cursor color.
* @direction: whether the cursor is left-to-right or
* right-to-left. Should never be #GTK_TEXT_DIR_NONE
* @draw_arrow: %TRUE to draw a directional arrow on the
* cursor. Should be %FALSE unless the cursor is split.
*
* Draws a text caret on @cr at @location. This is not a style function
* but merely a convenience function for drawing the standard cursor shape.
*
* Since: 3.0
**/
void
gtk_cairo_draw_insertion_cursor (GtkWidget *widget,
cairo_t *cr,
const GdkRectangle *location,
gboolean is_primary,
GtkTextDirection direction,
gboolean draw_arrow)
{ {
gint stem_width; gint stem_width;
gint arrow_width; gint arrow_width;
@ -6507,6 +6524,13 @@ draw_insertion_cursor (GtkWidget *widget,
gfloat cursor_aspect_ratio; gfloat cursor_aspect_ratio;
gint offset; gint offset;
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (cr != NULL);
g_return_if_fail (location != NULL);
g_return_if_fail (direction != GTK_TEXT_DIR_NONE);
gdk_cairo_set_source_color (cr, get_insertion_cursor_color (widget, is_primary));
/* When changing the shape or size of the cursor here, /* When changing the shape or size of the cursor here,
* propagate the changes to gtktextview.c:text_window_invalidate_cursors(). * propagate the changes to gtktextview.c:text_window_invalidate_cursors().
*/ */
@ -6593,8 +6617,7 @@ gtk_draw_insertion_cursor (GtkWidget *widget,
cairo_clip (cr); cairo_clip (cr);
} }
gdk_cairo_set_source_color (cr, get_insertion_cursor_color (widget, is_primary)); gtk_cairo_draw_insertion_cursor (widget, cr, location, is_primary, direction, draw_arrow);
draw_insertion_cursor (widget, cr, location, direction, draw_arrow);
cairo_destroy (cr); cairo_destroy (cr);
} }

6
gtk/gtkstyle.h
View File

@ -900,6 +900,12 @@ void gtk_draw_insertion_cursor (GtkWidget *widget,
gboolean is_primary, gboolean is_primary,
GtkTextDirection direction, GtkTextDirection direction,
gboolean draw_arrow); gboolean draw_arrow);
void gtk_cairo_draw_insertion_cursor (GtkWidget *widget,
cairo_t *cr,
const GdkRectangle *location,
gboolean is_primary,
GtkTextDirection direction,
gboolean draw_arrow);
void _gtk_widget_get_cursor_color (GtkWidget *widget, void _gtk_widget_get_cursor_color (GtkWidget *widget,
GdkColor *color); GdkColor *color);