Merge branch 'matthiasc/for-main' into 'main'

node-editor: Make crash handling more robust

See merge request GNOME/gtk!6845

NEWS

@@ -1,6 +1,35 @@
 Overview of Changes in 4.13.7, xx-xx-xxxx
 =========================================
 
+* Accessibility:
+ - Add socket support for webkit accessibility
+
+* GSK:
+ - Make the ngl renderer work on macOS
+ - Fix a crash in the vulkan renderer
+ - Make nodeparser allow aliases for fonts again
+ - Implement cache eviction for the glyph and
+   texture caches
+
+* media:
+ - Support dmabufs in the gstreamer backend. This allows
+   zero-copy video playback on Wayland when paired with
+   hardware video decoding
+
+* Wayland:
+ - Commit empty frames if and double-buffered state
+   is pending
+ - Fix monitor size information when using mutter without
+   the scale-monitor-framebuffer setting
+
+* Tools:
+ - Make the crash handling in gtk4-node-editor more robust
+
+* Translation updates
+ Galician
+ Georgian
+
+
 Overview of Changes in 4.13.6, 25-01-2024
 =========================================
 

demos/node-editor/node-editor-window.c

@@ -68,8 +68,9 @@ struct _NodeEditorWindow
 
   GArray *errors;
 
-  guint update_timeout;
   gboolean auto_reload;
+  gboolean mark_as_safe_pending;
+  gulong after_paint_handler;
 };
 
 struct _NodeEditorWindowClass
@@ -245,6 +246,41 @@ highlight_text (NodeEditorWindow *self)
   gtk_text_buffer_apply_tag_by_name (self->text_buffer, "no-hyphens", &start, &end);
 }
 
+static void
+mark_autosave_as_unsafe (void)
+{
+  char *path1 = NULL;
+  char *path2 = NULL;
+
+  path1 = get_autosave_path ("-unsafe");
+  path2 = get_autosave_path (NULL);
+
+  g_rename (path2, path1);
+}
+
+static void
+mark_autosave_as_safe (void)
+{
+  char *path1 = NULL;
+  char *path2 = NULL;
+
+  path1 = get_autosave_path ("-unsafe");
+  path2 = get_autosave_path (NULL);
+
+  g_rename (path1, path2);
+}
+
+static void
+after_paint (GdkFrameClock    *clock,
+             NodeEditorWindow *self)
+{
+  if (self->mark_as_safe_pending)
+    {
+      self->mark_as_safe_pending = FALSE;
+      mark_autosave_as_safe ();
+    }
+}
+
 static void
 reload (NodeEditorWindow *self)
 {
@@ -253,6 +289,8 @@ reload (NodeEditorWindow *self)
   float scale;
   GskRenderNode *big_node;
 
+  mark_autosave_as_unsafe ();
+
   text = get_current_text (self->text_buffer);
   bytes = g_bytes_new_take (text, strlen (text));
 
@@ -314,6 +352,8 @@ reload (NodeEditorWindow *self)
     }
 
   g_clear_pointer (&big_node, gsk_render_node_unref);
+
+  self->mark_as_safe_pending = TRUE;
 }
 
 static void
@@ -1125,9 +1165,6 @@ node_editor_window_finalize (GObject *object)
 {
   NodeEditorWindow *self = (NodeEditorWindow *)object;
 
-  if (self->update_timeout)
-    g_source_remove (self->update_timeout);
-
   g_array_free (self->errors, TRUE);
 
   g_clear_pointer (&self->node, gsk_render_node_unref);
@@ -1172,6 +1209,7 @@ static void
 node_editor_window_realize (GtkWidget *widget)
 {
   NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
+  GdkFrameClock *frameclock;
 
   GTK_WIDGET_CLASS (node_editor_window_parent_class)->realize (widget);
 
@@ -1199,14 +1237,24 @@ node_editor_window_realize (GtkWidget *widget)
   node_editor_window_add_renderer (self,
                                    gsk_cairo_renderer_new (),
                                    "Cairo");
+
+  frameclock = gtk_widget_get_frame_clock (widget);
+  self->after_paint_handler = g_signal_connect (frameclock, "after-paint",
+                                                G_CALLBACK (after_paint), self);
+
 }
 
 static void
 node_editor_window_unrealize (GtkWidget *widget)
 {
   NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
+  GdkFrameClock *frameclock;
   guint i;
 
+  frameclock = gtk_widget_get_frame_clock (widget);
+  g_signal_handler_disconnect (frameclock, self->after_paint_handler);
+  self->after_paint_handler = 0;
+
   for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i ++)
     {
       gpointer item = g_list_model_get_item (G_LIST_MODEL (self->renderers), i);
@@ -1806,41 +1854,6 @@ autosave_contents (NodeEditorWindow *self)
   g_free (contents);
 }
 
-static void
-mark_autosave_as_safe (void)
-{
-  char *path1 = NULL;
-  char *path2 = NULL;
-
-  path1 = get_autosave_path ("-unsafe");
-  path2 = get_autosave_path (NULL);
-
-  g_rename (path1, path2);
-}
-
-static gboolean
-update_timeout_cb (gpointer data)
-{
-  NodeEditorWindow *self = data;
-
-  self->update_timeout = 0;
-
-  mark_autosave_as_safe ();
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-initiate_autosave (NodeEditorWindow *self)
-{
-  autosave_contents (self);
-
-  if (self->update_timeout != 0)
-    g_source_remove (self->update_timeout);
-
-  self->update_timeout = g_timeout_add (100, update_timeout_cb, self);
-}
-
 static void
 node_editor_window_init (NodeEditorWindow *self)
 {
@@ -1905,7 +1918,7 @@ node_editor_window_init (NodeEditorWindow *self)
 
   set_initial_text (self);
 
-  g_signal_connect_swapped (self->text_buffer, "changed", G_CALLBACK (initiate_autosave), self);
+  g_signal_connect_swapped (self->text_buffer, "changed", G_CALLBACK (autosave_contents), self);
 
   if (g_getenv ("GSK_RENDERER"))
     {

demos/node-editor/node-editor-window.ui

@@ -213,6 +213,7 @@
                         <property name="halign">1</property>
                         <property name="label" translatable="1">The application may have crashed.
 As a precaution, auto-loading has been turned off.
+You can turn it back on in the menu.
 </property>
                       </object>
                     </child>