Add support for xwidgets to the PGTK port

* src/emacsgtkfixed.c (EMACS_FIXED_GET_CLASS): New function.
(struct GtkFixedPrivateL): New struct.
(emacs_fixed_gtk_widget_size_allocate):
(emacs_fixed_class_init): New functions.

* src/keyboard.h: Declare lispy_function_keys also when
HAVE_PGTK.

* src/pgtkterm.c (x_free_frame_resources): Destroy all xwidget
views.
(pgtk_scroll_run): Move xwidget views that overlap with the
scrolled area.
(pgtk_emacs_to_gtk_modifiers): Expose function.

* src/pgtkterm.h: Wrap in include guard.
(pgtk_emacs_to_gtk_modifiers): New prototype.

* src/xwidget.c (xw_forward_event_translate):
(xw_forward_event_from_view): New functions.
(Fmake_xwidget): Remove obsolete PGTK specific code.
(Fxwidget_perform_lispy_event): Convert modifiers correctly on
PGTK.
(define_cursors): Use GDK functions to define cursors on PGTK.
(xwidget_view_from_window): Disable on non-PGTK builds.
(xwidget_show_view):
(xwidget_hide_view): Implement on PGTK.
(xv_do_draw): Disable on non-PGTK builds.
(offscreen_damage_event): Queue xwidget views for draw.
(xwidget_expose): Disable on non-PGTK builds.
(xwidget_init_view):
(x_draw_xwidget_glyph_string):
(Fdelete_xwidget_view): Implement for PGTK.
(syms_of_xwidget): Don't initialize XID to widget table on PGTK.
(lower_frame_xwidget_views): Disable on PGTK.
* src/xwidget.h (struct xwidget_view): New fields for PGTK
builds.
(kill_frame_xwidget_views): Enable on PGTK.

1 files changed, 89 insertions, 1 deletions

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index c75dab5130a..0814fb0df88 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -245,6 +245,9 @@ x_free_frame_resources (struct frame *f)
 
   block_input ();
 
+#ifdef HAVE_XWIDGETS
+  kill_frame_xwidget_views (f);
+#endif
   free_frame_faces (f);
 
   if (FRAME_X_OUTPUT (f)->scale_factor_atimer != NULL)
@@ -2999,6 +3002,91 @@ pgtk_scroll_run (struct window *w, struct run *run)
 
   block_input ();
 
+#ifdef HAVE_XWIDGETS
+  /* "Copy" xwidget views in the area that will be scrolled.  */
+  GtkWidget *tem, *parent = FRAME_GTK_WIDGET (f);
+  GList *children = gtk_container_get_children (GTK_CONTAINER (parent));
+  GList *iter;
+  struct xwidget_view *view;
+
+  for (iter = children; iter; iter = iter->next)
+    {
+      tem = iter->data;
+      view = g_object_get_data (G_OBJECT (tem), XG_XWIDGET_VIEW);
+
+      if (view && !view->hidden)
+        {
+          int window_y = view->y + view->clip_top;
+          int window_height = view->clip_bottom - view->clip_top;
+
+          Emacs_Rectangle r1, r2, result;
+          r1.x = w->pixel_left;
+          r1.y = from_y;
+          r1.width = w->pixel_width;
+          r1.height = height;
+          r2 = r1;
+          r2.y = window_y;
+          r2.height = window_height;
+
+          /* The window is offscreen, just unmap it.  */
+          if (window_height == 0)
+            {
+              view->hidden = true;
+              gtk_widget_hide (tem);
+              continue;
+            }
+
+          bool intersects_p =
+            gui_intersect_rectangles (&r1, &r2, &result);
+
+          if (XWINDOW (view->w) == w && intersects_p)
+            {
+              int y = view->y + (to_y - from_y);
+              int text_area_x, text_area_y, text_area_width, text_area_height;
+              int clip_top, clip_bottom;
+
+              window_box (w, view->area, &text_area_x, &text_area_y,
+                          &text_area_width, &text_area_height);
+
+              view->y = y;
+
+              clip_top = 0;
+              clip_bottom = XXWIDGET (view->model)->height;
+
+              if (y < text_area_y)
+                clip_top = text_area_y - y;
+
+              if ((y + clip_bottom) > (text_area_y + text_area_height))
+                {
+                  clip_bottom -= (y + clip_bottom) - (text_area_y + text_area_height);
+                }
+
+              view->clip_top = clip_top;
+              view->clip_bottom = clip_bottom;
+
+              /* This means the view has moved offscreen.  Unmap
+                 it and hide it here.  */
+              if ((view->clip_bottom - view->clip_top) <= 0)
+                {
+                  view->hidden = true;
+                  gtk_widget_hide (tem);
+                }
+              else
+                {
+                  gtk_fixed_move (GTK_FIXED (FRAME_GTK_WIDGET (f)),
+                                  tem, view->x + view->clip_left,
+                                  view->y + view->clip_top);
+                  gtk_widget_set_size_request (tem, view->clip_right - view->clip_left,
+                                               view->clip_bottom - view->clip_top);
+                  gtk_widget_queue_allocate (tem);
+                }
+            }
+        }
+    }
+
+  g_list_free (children);
+#endif
+
   /* Cursor off.  Will be switched on again in x_update_window_end.  */
   gui_clear_cursor (w);
 
@@ -5099,7 +5187,7 @@ pgtk_gtk_to_emacs_modifiers (struct pgtk_display_info *dpyinfo, int state)
   return mod;
 }
 
-static int
+int
 pgtk_emacs_to_gtk_modifiers (struct pgtk_display_info *dpyinfo, int state)
 {
   int mod_ctrl;