Merge branch 'feature/pgtk' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

5 files changed, 57 insertions, 31 deletions

diff --git a/src/gtkutil.c b/src/gtkutil.c
index d872d393caf..225984af41a 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -684,8 +684,13 @@ xg_check_special_colors (struct frame *f,
   block_input ();
   {
 #ifdef HAVE_GTK3
+#ifndef HAVE_PGTK
     GtkStyleContext *gsty
       = gtk_widget_get_style_context (FRAME_GTK_OUTER_WIDGET (f));
+#else
+    GtkStyleContext *gsty
+      = gtk_widget_get_style_context (FRAME_WIDGET (f));
+#endif
     GdkRGBA col;
     char buf[sizeof "rgb://rrrr/gggg/bbbb"];
     int state = GTK_STATE_FLAG_SELECTED|GTK_STATE_FLAG_FOCUSED;
diff --git a/src/image.c b/src/image.c
index 3ba3d572b05..f8188292d46 100644
--- a/src/image.c
+++ b/src/image.c
@@ -9101,7 +9101,7 @@ webp_load (struct frame *f, struct image *img)
 {
   ptrdiff_t size = 0;
   uint8_t *contents;
-  Lisp_Object file;
+  Lisp_Object file = Qnil;
 
   /* Open the WebP file.  */
   Lisp_Object specified_file = image_spec_value (img->spec, QCfile, NULL);
@@ -9138,7 +9138,7 @@ webp_load (struct frame *f, struct image *img)
   /* Validate the WebP image header.  */
   if (!WebPGetInfo (contents, size, NULL, NULL))
     {
-      if (NILP (specified_data))
+      if (!NILP (file))
         image_error ("Not a WebP file: `%s'", file);
       else
         image_error ("Invalid header in WebP image data");
@@ -9161,7 +9161,7 @@ webp_load (struct frame *f, struct image *img)
     case VP8_STATUS_USER_ABORT:
     default:
       /* Error out in all other cases.  */
-      if (NILP (specified_data))
+      if (!NILP (file))
         image_error ("Error when interpreting WebP image data: `%s'", file);
       else
         image_error ("Error when interpreting WebP image data");
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index 74591452fb6..5fc5bb4bf22 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -3551,17 +3551,23 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute)
 
   /* Get these here because they can't be got in configure_event(). */
   int left_pos, top_pos;
-  if (FRAME_GTK_OUTER_WIDGET (f)) {
-    gtk_window_get_position (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                             &left_pos, &top_pos);
-  } else {
-    if (FRAME_GTK_WIDGET (f) == NULL)
-      return Qnil;    /* This can occur while creating a frame. */
-    GtkAllocation alloc;
-    gtk_widget_get_allocation (FRAME_GTK_WIDGET (f), &alloc);
-    left_pos = alloc.x;
-    top_pos = alloc.y;
-  }
+
+  if (FRAME_GTK_OUTER_WIDGET (f))
+    {
+      gtk_window_get_position (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
+                               &left_pos, &top_pos);
+    }
+  else
+    {
+      GtkAllocation alloc;
+
+      if (FRAME_GTK_WIDGET (f) == NULL)
+        return Qnil;    /* This can occur while creating a frame.  */
+
+      gtk_widget_get_allocation (FRAME_GTK_WIDGET (f), &alloc);
+      left_pos = alloc.x;
+      top_pos = alloc.y;
+    }
 
   int native_left = left_pos + border;
   int native_top = top_pos + border + title_height;
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 4bfe2efbdc5..1e8d49c1d1b 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -803,7 +803,8 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value,
       FRAME_X_OUTPUT (f)->border_color_css_provider = NULL;
       {
         GtkStyleContext *ctxt = gtk_widget_get_style_context (FRAME_WIDGET (f));
-        gtk_style_context_remove_provider (ctxt, GTK_STYLE_PROVIDER (provider));
+        if (provider != NULL)
+          gtk_style_context_remove_provider (ctxt, GTK_STYLE_PROVIDER (provider));
       }
 
       {
@@ -850,8 +851,11 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value,
       GtkStyleContext *ctxt = gtk_widget_get_style_context (FRAME_WIDGET (f));
       GtkCssProvider *old = FRAME_X_OUTPUT (f)->border_color_css_provider;
       FRAME_X_OUTPUT (f)->border_color_css_provider = provider;
-      gtk_style_context_add_provider (ctxt, GTK_STYLE_PROVIDER (provider),
-                                      GTK_STYLE_PROVIDER_PRIORITY_USER);
+      if (provider != NULL)
+        {
+          gtk_style_context_add_provider (ctxt, GTK_STYLE_PROVIDER (provider),
+                                          GTK_STYLE_PROVIDER_PRIORITY_USER);
+        }
       if (old != NULL)
         {
           gtk_style_context_remove_provider (ctxt, GTK_STYLE_PROVIDER (old));
@@ -3050,10 +3054,11 @@ pgtk_bitmap_icon (struct frame *f, Lisp_Object file)
 bool
 pgtk_text_icon (struct frame *f, const char *icon_name)
 {
-  if (FRAME_GTK_OUTER_WIDGET (f)) {
-    gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), NULL);
-    gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), icon_name);
-  }
+  if (FRAME_GTK_OUTER_WIDGET (f))
+    {
+      gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), NULL);
+      gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), icon_name);
+    }
 
   return false;
 }
@@ -5379,13 +5384,17 @@ done:
 }
 
 static gboolean
-key_release_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
+key_release_event (GtkWidget *widget,
+                   GdkEvent *event,
+                   gpointer *user_data)
 {
   return TRUE;
 }
 
 static gboolean
-configure_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
+configure_event (GtkWidget *widget,
+                 GdkEvent *event,
+                 gpointer *user_data)
 {
   struct frame *f = pgtk_any_window_to_frame (event->configure.window);
   if (f && widget == FRAME_GTK_OUTER_WIDGET (f))
@@ -5405,7 +5414,9 @@ configure_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
 }
 
 static gboolean
-map_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
+map_event (GtkWidget *widget,
+           GdkEvent *event,
+           gpointer *user_data)
 {
   struct frame *f = pgtk_any_window_to_frame (event->any.window);
   union buffered_input_event inev;
@@ -5452,8 +5463,9 @@ map_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
 }
 
 static gboolean
-window_state_event (GtkWidget * widget, GdkEvent * event,
-                    gpointer * user_data)
+window_state_event (GtkWidget *widget,
+                    GdkEvent *event,
+                    gpointer *user_data)
 {
   struct frame *f = pgtk_any_window_to_frame (event->window_state.window);
   union buffered_input_event inev;
@@ -5486,7 +5498,8 @@ window_state_event (GtkWidget * widget, GdkEvent * event,
 }
 
 static gboolean
-delete_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
+delete_event (GtkWidget *widget,
+              GdkEvent *event, gpointer *user_data)
 {
   struct frame *f = pgtk_any_window_to_frame (event->any.window);
   union buffered_input_event inev;
@@ -5561,8 +5574,8 @@ x_focus_changed (gboolean is_enter, int state,
 }
 
 static gboolean
-enter_notify_event (GtkWidget * widget, GdkEvent * event,
-                    gpointer * user_data)
+enter_notify_event (GtkWidget *widget, GdkEvent *event,
+                    gpointer *user_data)
 {
   union buffered_input_event inev;
   struct frame *frame =
diff --git a/src/xdisp.c b/src/xdisp.c
index 080c9063cd7..971015e0a35 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -30294,7 +30294,8 @@ produce_stretch_glyph (struct it *it)
          Compute the width of the characters having this `display'
          property.  */
       struct it it2;
-      Lisp_Object object = it->stack[it->sp - 1].string;
+      Lisp_Object object =
+        it->sp > 0 ? it->stack[it->sp - 1].string : it->string;
       unsigned char *p = (STRINGP (object)
                           ? SDATA (object) + IT_STRING_BYTEPOS (*it)
                           : BYTE_POS_ADDR (IT_BYTEPOS (*it)));
@@ -30396,7 +30397,8 @@ produce_stretch_glyph (struct it *it)
   if (width > 0 && height > 0 && it->glyph_row)
     {
       Lisp_Object o_object = it->object;
-      Lisp_Object object = it->stack[it->sp - 1].string;
+      Lisp_Object object =
+        it->sp > 0 ? it->stack[it->sp - 1].string : it->string;
       int n = width;
 
       if (!STRINGP (object))