Mercurial > dwindows

changeset 2358:314d417e55c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GTK3: Cache the cairo_t from the draw callback and use it for drawing. This fixes issues with GtkDrawingArea within a GtkScrolledWindow when contents of the scrolled window clip.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 08 Mar 2021 23:50:57 +0000
parents c9b776655725
children 707836e00e5e
files gtk3/dw.c
diffstat 1 files changed, 45 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/gtk3/dw.c	Mon Mar 08 20:15:20 2021 +0000
+++ b/gtk3/dw.c	Mon Mar 08 23:50:57 2021 +0000
@@ -1513,9 +1513,9 @@
       exp.x = exp.y = 0;
       exp.width = gtk_widget_get_allocated_width(widget);
       exp.height = gtk_widget_get_allocated_height(widget);
-      g_object_set_data(G_OBJECT(work.window), "_dw_expose", GINT_TO_POINTER(TRUE));
+      g_object_set_data(G_OBJECT(work.window), "_dw_cr", (gpointer)cr);
       retval = exposefunc(work.window, &exp, work.data);
-      g_object_set_data(G_OBJECT(work.window), "_dw_expose", NULL);
+      g_object_set_data(G_OBJECT(work.window), "_dw_cr", NULL);
    }
    return retval;
 }
@@ -7324,6 +7324,7 @@
 {
    int _locked_by_me = FALSE;
    cairo_t *cr = NULL;
+   int cached = FALSE;
 #if GTK_CHECK_VERSION(3,22,0)
    GdkDrawingContext *dc = NULL;
    cairo_region_t *clip = NULL;
@@ -7333,8 +7334,10 @@
    if(handle)
    {
       GdkDisplay *display = gdk_display_get_default();
-      
-      if((display && GDK_IS_X11_DISPLAY(display)) || g_object_get_data(G_OBJECT(handle), "_dw_expose"))
+
+      if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
+         cached = TRUE;
+      else if((display && GDK_IS_X11_DISPLAY(display)))
       {
          GdkWindow *window = gtk_widget_get_window(handle);
          /* Safety check for non-existant windows */
@@ -7378,7 +7381,8 @@
          gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
       else
 #endif
-      cairo_destroy(cr);
+      if(!cached)
+         cairo_destroy(cr);
    }
    DW_MUTEX_UNLOCK;
 }
@@ -7396,6 +7400,7 @@
 {
    int _locked_by_me = FALSE;
    cairo_t *cr = NULL;
+   int cached = FALSE;
 #if GTK_CHECK_VERSION(3,22,0)
    GdkDrawingContext *dc = NULL;
    cairo_region_t *clip = NULL;
@@ -7406,7 +7411,9 @@
    {
       GdkDisplay *display = gdk_display_get_default();
       
-      if((display && GDK_IS_X11_DISPLAY(display)) || g_object_get_data(G_OBJECT(handle), "_dw_expose"))
+      if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
+         cached = TRUE;
+      else if((display && GDK_IS_X11_DISPLAY(display)))
       {
          GdkWindow *window = gtk_widget_get_window(handle);
          /* Safety check for non-existant windows */
@@ -7451,7 +7458,8 @@
          gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
       else
 #endif
-      cairo_destroy(cr);
+      if(!cached)
+         cairo_destroy(cr);
    }
    DW_MUTEX_UNLOCK;
 }
@@ -7469,6 +7477,7 @@
 {
    int _locked_by_me = FALSE;
    cairo_t *cr = NULL;
+   int cached = FALSE;
    int z;
 #if GTK_CHECK_VERSION(3,22,0)
    GdkDrawingContext *dc = NULL;
@@ -7480,7 +7489,9 @@
    {
       GdkDisplay *display = gdk_display_get_default();
       
-      if((display && GDK_IS_X11_DISPLAY(display)) || g_object_get_data(G_OBJECT(handle), "_dw_expose"))
+      if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
+         cached = TRUE;
+      else if((display && GDK_IS_X11_DISPLAY(display)))
       {
          GdkWindow *window = gtk_widget_get_window(handle);
          /* Safety check for non-existant windows */
@@ -7533,7 +7544,8 @@
          gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
       else
 #endif
-      cairo_destroy(cr);
+      if(!cached)
+         cairo_destroy(cr);
    }
    DW_MUTEX_UNLOCK;
 }
@@ -7552,6 +7564,7 @@
 {
    int _locked_by_me = FALSE;
    cairo_t *cr = NULL;
+   int cached = FALSE;
 #if GTK_CHECK_VERSION(3,22,0)
    GdkDrawingContext *dc = NULL;
    cairo_region_t *clip = NULL;
@@ -7562,7 +7575,9 @@
    {
       GdkDisplay *display = gdk_display_get_default();
       
-      if((display && GDK_IS_X11_DISPLAY(display)) || g_object_get_data(G_OBJECT(handle), "_dw_expose"))
+      if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
+         cached = TRUE;
+      else if((display && GDK_IS_X11_DISPLAY(display)))
       {
          GdkWindow *window = gtk_widget_get_window(handle);
          /* Safety check for non-existant windows */
@@ -7614,7 +7629,8 @@
          gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
       else
 #endif
-      cairo_destroy(cr);
+      if(!cached)
+         cairo_destroy(cr);
    }
    DW_MUTEX_UNLOCK;
 }
@@ -7636,6 +7652,7 @@
 {
    int _locked_by_me = FALSE;
    cairo_t *cr = NULL;
+   int cached = FALSE;
 #if GTK_CHECK_VERSION(3,22,0)
    GdkDrawingContext *dc = NULL;
    cairo_region_t *clip = NULL;
@@ -7646,7 +7663,9 @@
    {
       GdkDisplay *display = gdk_display_get_default();
       
-      if((display && GDK_IS_X11_DISPLAY(display)) || g_object_get_data(G_OBJECT(handle), "_dw_expose"))
+      if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
+         cached = TRUE;
+      else if((display && GDK_IS_X11_DISPLAY(display)))
       {
          GdkWindow *window = gtk_widget_get_window(handle);
          /* Safety check for non-existant windows */
@@ -7710,7 +7729,8 @@
          gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
       else
 #endif
-      cairo_destroy(cr);
+      if(!cached)
+         cairo_destroy(cr);
    }
    DW_MUTEX_UNLOCK;
 }
@@ -7727,6 +7747,7 @@
 {
    int _locked_by_me = FALSE;
    cairo_t *cr = NULL;
+   int cached = FALSE;
    PangoFontDescription *font;
    char *tmpname, *fontname = "monospace 10";
 #if GTK_CHECK_VERSION(3,22,0)
@@ -7742,7 +7763,9 @@
    {
       GdkDisplay *display = gdk_display_get_default();
       
-      if((display && GDK_IS_X11_DISPLAY(display)) || g_object_get_data(G_OBJECT(handle), "_dw_expose"))
+      if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
+         cached = TRUE;
+      else if((display && GDK_IS_X11_DISPLAY(display)))
       {
          GdkWindow *window = gtk_widget_get_window(handle);
          /* Safety check for non-existant windows */
@@ -7830,7 +7853,8 @@
          gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
       else
 #endif
-      cairo_destroy(cr);
+      if(!cached)
+         cairo_destroy(cr);
    }
    DW_MUTEX_UNLOCK;
 }
@@ -8183,6 +8207,7 @@
 {
    int _locked_by_me = FALSE;
    cairo_t *cr = NULL;
+   int cached = FALSE;
    int retval = DW_ERROR_GENERAL;
 #if GTK_CHECK_VERSION(3,22,0)
    GdkDrawingContext *dc = NULL;
@@ -8197,7 +8222,9 @@
    {
       GdkDisplay *display = gdk_display_get_default();
       
-      if((display && GDK_IS_X11_DISPLAY(display)) || g_object_get_data(G_OBJECT(dest), "_dw_expose"))
+      if((cr = g_object_get_data(G_OBJECT(dest), "_dw_cr")))
+         cached = TRUE;
+      else if((display && GDK_IS_X11_DISPLAY(display)))
       {
          GdkWindow *window = gtk_widget_get_window(dest);
          /* Safety check for non-existant windows */
@@ -8252,7 +8279,8 @@
          gdk_window_end_draw_frame(gtk_widget_get_window(dest), dc);
       else
 #endif
-      cairo_destroy(cr);
+      if(!cached)
+         cairo_destroy(cr);
       retval = DW_ERROR_NONE;
    }
    DW_MUTEX_UNLOCK;