Merge pull request emacs-mirror#15 from fejfighter/pgtk-childframe

Pgtk childframe support

Author: Yuuki Harano

src/ftcrfont.c

@@ -131,7 +131,9 @@ ftcrfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
   filename = XCAR (val);
   size = XFIXNUM (AREF (entity, FONT_SIZE_INDEX));
   if (size == 0)
+  {
     size = pixel_size;
+  }
 
   block_input ();
 

src/gtkutil.c

@@ -1326,6 +1326,7 @@ xg_create_frame_widgets (struct frame *f)
 #ifndef HAVE_GTK3
   GtkRcStyle *style;
 #endif
+  GtkWindowType type = GTK_WINDOW_TOPLEVEL;
   char *title = 0;
 
   PGTK_TRACE("xg_create_frame_widgets.");
@@ -1339,9 +1340,16 @@ xg_create_frame_widgets (struct frame *f)
     }
   else
 #endif
-    wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
 #ifdef HAVE_PGTK
-  gtk_widget_add_events(wtop, GDK_ALL_EVENTS_MASK);
+    if (!NILP(f->parent_frame)){
+      type = GTK_WINDOW_POPUP;
+    }
+#endif
+
+  wtop = gtk_window_new (type);
+#ifdef HAVE_PGTK
+	gtk_widget_add_events(wtop, GDK_ALL_EVENTS_MASK);
 #endif
 
   /* gtk_window_set_has_resize_grip is a Gtk+ 3.0 function but Ubuntu
@@ -1467,7 +1475,7 @@ xg_create_frame_widgets (struct frame *f)
 #ifndef HAVE_PGTK
   gtk_widget_realize (wfixed);
 #else
-  gtk_widget_show_all(wtop);
+  //  gtk_widget_show_all(wtop);
 #endif
 #ifndef HAVE_PGTK
   FRAME_X_WINDOW (f) = GTK_WIDGET_TO_X_WIN (wfixed);
@@ -1684,10 +1692,8 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position)
 		 sizeof (size_hints)) != 0)
     {
       block_input ();
-#ifndef HAVE_PGTK
       gtk_window_set_geometry_hints (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
 				     NULL, &size_hints, hint_flags);
-#endif
       f->output_data.xp->size_hints = size_hints;
       f->output_data.xp->hint_flags = hint_flags;
       unblock_input ();

src/pgtkfns.c

@@ -915,7 +915,7 @@ frame_parm_handler pgtk_frame_parm_handlers[] =
   pgtk_set_tool_bar_position,
   0, /* x_set_inhibit_double_buffering */
   x_set_undecorated,
-  0, /* x_set_parent_frame, */
+  x_set_parent_frame,
   x_set_skip_taskbar,
   x_set_no_focus_on_map,
   x_set_no_accept_focus,
@@ -1454,17 +1454,23 @@ This function is an internal primitive--use `make-frame' instead.  */)
   gui_default_parameter (f, parms, Qalpha, Qnil,
 		       "alpha", "Alpha", RES_TYPE_NUMBER);
 
-#if 0
   if (!NILP (parent_frame))
     {
       struct frame *p = XFRAME (parent_frame);
 
       block_input ();
-      XReparentWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
-		       FRAME_X_WINDOW (p), f->left_pos, f->top_pos);
+      PGTK_TRACE ("x_set_parent_frame x: %d, y: %d", f->left_pos, f->top_pos);
+      gtk_window_set_transient_for(GTK_WINDOW(FRAME_GTK_OUTER_WIDGET(f)),
+				   GTK_WINDOW(FRAME_GTK_OUTER_WIDGET(p)));
+      gtk_window_set_attached_to(GTK_WINDOW(FRAME_GTK_OUTER_WIDGET(f)),
+				 FRAME_GTK_WIDGET(p));
+      gtk_window_set_destroy_with_parent(GTK_WINDOW(FRAME_GTK_OUTER_WIDGET(f)),
+					 TRUE);
+      gtk_widget_show_all(FRAME_GTK_OUTER_WIDGET(f));
       unblock_input ();
     }
-#endif
+
+  gtk_widget_show_all(FRAME_GTK_OUTER_WIDGET(f));
 
   gui_default_parameter (f, parms, Qno_focus_on_map, Qnil,
 		       NULL, NULL, RES_TYPE_BOOLEAN);
@@ -3158,8 +3164,8 @@ When using Gtk+ tooltips, the tooltip face is not used.  */);
   DEFSYM (Qreverse_landscape, "reverse-landscape");
 }
 
-#ifdef PGTK_DEBUG
 
+#ifdef PGTK_DEBUG
 #include <stdarg.h>
 #include <time.h>
 void pgtk_log(const char *file, int lineno, const char *fmt, ...)

src/pgtkmenu.c

@@ -458,9 +458,8 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_
        doc: /* SKIP: real doc in xmenu.c.  */)
   (void)
 {
-  struct frame *f;
-  f = SELECTED_FRAME ();
-  //  return (f->output_data.pgtk->menubar_active > 0) ? Qt : Qnil;
+  /* struct frame *f = SELECTED_FRAME (); */
+  /* return (f->output_data.pgtk->menubar_active > 0) ? Qt : Qnil; */
   return Qnil;
 }
 

src/pgtkterm.c

@@ -38,6 +38,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "lisp.h"
 #include "blockinput.h"
+#include "frame.h"
 #include "sysselect.h"
 #include "gtkutil.h"
 #include "systime.h"
@@ -355,22 +356,35 @@ x_set_offset (struct frame *f, int xoff, int yoff, int change_gravity)
      External: Position the window
    -------------------------------------------------------------------------- */
 {
-  /* not working on wayland. */
-
   PGTK_TRACE("x_set_offset: %d,%d,%d.", xoff, yoff, change_gravity);
 
-  if (change_gravity > 0)
-    {
-      PGTK_TRACE("x_set_offset: change_gravity > 0");
-      f->top_pos = yoff;
+  struct frame *parent = FRAME_PARENT_FRAME(f);
+  GtkAllocation a = {0};
+  if (change_gravity > 0) {
+    if (parent) {
+      /* determing the "height" of the titlebar, by finding the
+	 location of the "emacsfixed" widget on the surface/window */
+      GtkWidget *w = FRAME_GTK_WIDGET(parent);
+      gtk_widget_get_allocation(w, &a);
+    }
+
+    f->size_hint_flags &= ~ (XNegative | YNegative);
+    /* if the value is negative, don't include the titlebar offset */
+    if (xoff < 0) {
+      f->size_hint_flags |= XNegative;
       f->left_pos = xoff;
-      f->size_hint_flags &= ~ (XNegative | YNegative);
-      if (xoff < 0)
-	f->size_hint_flags |= XNegative;
-      if (yoff < 0)
-	f->size_hint_flags |= YNegative;
-      f->win_gravity = NorthWestGravity;
+    } else {
+      f->left_pos = xoff + a.x; //~25
+    }
+
+    if (yoff < 0){
+      f->size_hint_flags |= YNegative;
+      f->top_pos = yoff;
+      } else {
+      f->top_pos = yoff + a.y; //~60
     }
+    f->win_gravity = NorthWestGravity;
+  }
 
   x_calc_absolute_position (f);
 
@@ -430,8 +444,6 @@ pgtk_set_window_size (struct frame *f,
   for (GtkWidget *w = FRAME_GTK_WIDGET(f); w != NULL; w = gtk_widget_get_parent(w)) {
     gint wd, hi;
     gtk_widget_get_size_request(w, &wd, &hi);
-    GtkAllocation alloc;
-    gtk_widget_get_allocation(w, &alloc);
   }
 
   f->output_data.pgtk->preferred_width = pixelwidth;
@@ -697,13 +709,7 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
    -------------------------------------------------------------------------- */
 {
   struct frame *p = NULL;
-  int width = 0, height = 0;
-
-  PGTK_TRACE ("x_set_parent_frame x: %d, y: %d, size: %d x %d", f->left_pos, f->top_pos, width, height );
-  gtk_window_get_size(FRAME_NATIVE_WINDOW(f), &width, &height);
-
-
-  PGTK_TRACE ("x_set_parent_frame x: %d, y: %d, size: %d x %d", f->left_pos, f->top_pos, width, height );
+  PGTK_TRACE ("x_set_parent_frame x: %d, y: %d", f->left_pos, f->top_pos);
 
   if (!NILP (new_value)
       && (!FRAMEP (new_value)
@@ -722,7 +728,6 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
       gtk_window_set_attached_to(FRAME_NATIVE_WINDOW(f), FRAME_GTK_WIDGET(p));
       gtk_window_move(FRAME_NATIVE_WINDOW(f), f->left_pos, f->top_pos);
       gtk_window_set_keep_above(FRAME_NATIVE_WINDOW(f), true);
-      //fill this in
       unblock_input ();
 
       fset_parent_frame (f, new_value);
@@ -815,8 +820,8 @@ pgtk_initialize_display_info (struct pgtk_display_info *dpyinfo)
       Initialize global info and storage for display.
    -------------------------------------------------------------------------- */
 {
-    dpyinfo->resx = 72.27; /* used 75.0, but this makes pt == pixel, expected */
-    dpyinfo->resy = 72.27;
+    dpyinfo->resx = 96;
+    dpyinfo->resy = 96;
     dpyinfo->color_p = 1;
     dpyinfo->n_planes = 32;
     dpyinfo->root_window = 42; /* a placeholder.. */
@@ -2683,7 +2688,6 @@ pgtk_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, int x,
 {
   PGTK_TRACE("draw_window_cursor: %d, %d, %d, %d, %d, %d.",
 	       x, y, cursor_type, cursor_width, on_p, active_p);
-
   if (on_p)
     {
       w->phys_cursor_type = cursor_type;
@@ -2732,6 +2736,7 @@ pgtk_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, int x,
 	  xic_set_preeditarea (w, x, y);
 #endif
     }
+
 }
 
 static void
@@ -5390,7 +5395,7 @@ static gboolean window_state_event(GtkWidget *widget, GdkEvent *event, gpointer
 
   if (inev.ie.kind != NO_EVENT)
     evq_enqueue(&inev);
-  return TRUE;
+  return FALSE;
 }
 
 static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer *user_data)
@@ -6285,7 +6290,13 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
 
   {
     GdkScreen *gscr = gdk_display_get_default_screen(dpyinfo->gdpy);
-    gdouble dpi = gdk_screen_get_resolution(gscr);
+
+    GSettings *set = g_settings_new("org.gnome.desktop.interface");
+    gdouble x = g_settings_get_double(set,"text-scaling-factor");
+    gdouble dpi = 0;
+
+    dpi =  96.0 * x;
+    gdk_screen_set_resolution(gscr, dpi);
     dpyinfo->resx = dpi;
     dpyinfo->resy = dpi;
   }