Add new frame parameters and associated functions

Add new frame parameters `undecorated', `override-redirect',
`parent-frame', `skip-taskbar', `no-focus-on-map',
`no-accept-focus', `z-group', `delete-before', `no-other-frame',
`mouse-wheel-frame', `min-width', `min-height'.  Add new
functions `frame-restack' and `frame-list-z-order'.

* lisp/cus-start.el (focus-follows-mouse): Adapt customization
type.
* lisp/frame.el (handle-delete-frame): Handle child and
`delete-before' frames.
(other-frame): Stop looking for other frame after one round.
(frame-list-z-order, frame-restack): New functions.
(delete-other-frames): Handle child frames.
* lisp/frameset.el (frameset-persistent-filter-alist)
(frameset--record-relationships): Handle `delete-before',
`parent-frame' and `mouse-wheel-frame' parameters.  Rename
latter from `frameset--record-minibuffer-relationships'.
(frameset--restore-frame): Handle ‘parent-frame’ parameter
specially.
(frameset-restore): Handle `delete-before', `parent-frame' and
`mouse-wheel-frame' parameters.
* lisp/mwheel.el (mwheel-scroll): Handle `mouse-wheel-frame'
parameter.
* lisp/window.el (window--min-size-ignore-p): Fix doc-string.
(mouse-autoselect-window-select, handle-select-window): Major
rewrite.  Try to not ignore errors.  Handle auto-selection of
child frames and different values of `focus-follows-mouse'.
* src/frame.c (frame_windows_min_size): Handle new `min-width'
and `min-height' frame parameters.
(make_frame): Initialize new frame structure members.
(do_switch_frame): Don't reset internal_last_event_frame for
descendant frames.
(Fframe_parent, frame_ancestor_p, Fframe_ancestor_p): New
functions.
(candidate_frame): Don't return `no-other-frame' frame.
(other_frames): New function replacing other_visible_frames.
(delete_frame): Rewrite.  Handle child and `delete-before' frames.
(Fmake_frame_invisible): Call other_frames.
(store_frame_param): Check `delete-before' and `parent-frame'
parameters for circular dependencies.
(frame_parms, syms_of_frame): Add entries for and define new
frame parameters.
(focus_follows_mouse): New meaningful value `auto-raise'.
* src/frame.h (z_group): New enumeration type.
(frame): New slots parent_frame, undecorated, override_redirect,
skip_taskbar, no_focus_on_map, no_accept_focus, z_group.
(fset_parent_frame): New inlined function.
(FRAME_UNDECORATED, FRAME_OVERRIDE_REDIRECT)
(FRAME_PARENT_FRAME, FRAME_SKIP_TASKBAR, FRAME_NO_FOCUS_ON_MAP)
(FRAME_NO_ACCEPT_FOCUS, FRAME_Z_GROUP, FRAME_Z_GROUP_NONE)
(FRAME_Z_GROUP_ABOVE, FRAME_Z_GROUP_ABOVE_SUSPENDED)
(FRAME_Z_GROUP_BELOW): New macros.
(frame_ancestor_p): Add declaration.
* src/gtkutil.c (xg_create_frame_widgets): Handle
`undecorated' and `override-redirect' frame parameters.
(x_wm_set_size_hint): None for child frames.
(xg_set_undecorated, xg_frame_restack, xg_set_skip_taskbar)
(xg_set_no_focus_on_map, xg_set_no_accept_focus)
(xg_set_override_redirect): New functions.
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos):
Don't let scrollbars obscure child frames.
* src/gtkutil.h: (xg_set_undecorated, xg_frame_restack)
(xg_set_skip_taskbar, xg_set_no_focus_on_map)
(xg_set_no_accept_focus, xg_set_override_redirect): Add extern
declarations.
* src/nsfns.m (ns_frame_parm_handlers): Add entries for new
frame parameters.
(Fx_create_frame): Install `min-width' and `min-height' frame
parameters.
* src/nsterm.m (mouseMoved:): Handle focus_follows_mouse change.
* src/w32fns.c (WS_EX_NOACTIVATE): Define if necessary.
(x_real_positions): Handle child frames.
(x_set_menu_bar_lines): Don't for child frames.
(x_set_undecorated, x_set_parent_frame, x_set_skip_taskbar)
(x_set_no_focus_on_map, x_set_no_accept_focus)
(x_set_z_group): New functions.
(w32_createvscrollbar, w32_createhscrollbar): Don't draw
scroll bars over child frames.
(w32_createwindow): Handle new frame parameters and child frames.
(w32_wnd_proc): Let mouse clicks into a child frame activate
the frame.  Try to handle the `no-accept-focus' parameter.  Do
SetFocus when our window is brought to top or becomes the
foreground window.
(w32_window): Don't initialize menu bar for child frames.
(Fx_create_frame): Handle new frame parameters.
(x_create_tip_frame): Set explicit_parent slot.
(w32_dialog_in_progress): New function.
(Fx_file_dialog): Handle `z-group-above' frames.
(w32_frame_list_z_order, Fw32_frame_list_z_order)
(w32_frame_restack, Fw32_frame_restack): New functions.
(w32_frame_parm_handlers): Add entries for new frame
parameters.
* src/w32font.c (Fx_select_font): Handle `z-group-above'
frames during font selection dialogue.
* src/w32term.c (construct_mouse_wheel): Construct mouse wheel
event from F's w32 window.
(w32_mouse_position): Handle child frames.
(w32_set_vertical_scroll_bar, w32_set_horizontal_scroll_bar):
Don't draw scroll bars over child frames.
(w32_read_socket): Always erase background of child frames.
When generating SELECT_WINDOW_EVENTs handle new value of
`focus-follows-mouse' and handle `no-accept-focus' parameter.
Handle `mouse-wheel-frame' parameter.
(x_calc_absolute_position, x_set_offset, x_set_window_size):
Handle child frames.
(x_make_frame_visible): Handle child frames specially.  Handle
`no-focus-on-map' parameter.
* src/w32term.h (w32_dialog_in_progress): Add external
declaration.
* src/xdisp.c (x_consider_frame_title, prepare_menu_bars): Not
for child frames.
* src/xfns.c (Xm/MwmUtil.h): Include for WM hints.
(PropMotifWmHints, PROP_MOTIF_WM_HINTS_ELEMENTS): Define for
non-Motif, non-GTK case.
(x_real_pos_and_offsets): Handle child frames.
(x_set_undecorated, x_set_parent_frame)
(x_set_no_focus_on_map, x_set_no_accept_focus)
(x_set_override_redirect): New functions.
(x_set_menu_bar_lines): Not for child frames.
(x_window): Handle `undecorated' and `override_redirect' cases.
(Fx_create_frame): Handle new frame parameters.
(frame_geometry): Handle child frames and outer border.
(x_frame_list_z_order, Fx_frame_list_z_order)
(x_frame_restack, Fx_frame_restack): New functions.
(Fx_file_dialog, Fx_select_font): Set x_menu_set_in_use.
(x_frame_parm_handlers): Add entries for new frame parameters.
* src/xmenu.c (x_menu_set_in_use): Handle `z-group-above'
frames.
* src/xterm.c (x_set_frame_alpha): Don't set alpha of parent
for child frames.
(XTmouse_position): Handle child frames.
(x_scroll_bar_create, x_scroll_bar_expose): Don't let scroll
bars obscure child frames.
(handle_one_xevent): Handle child frame positions.  If necessary
set `skip-taskbar' and reassign proper `z-group' when we are
mapped.  When generating SELECT_WINDOW_EVENTs handle new value
of `focus-follows-mouse'.  Handle `mouse-wheel-frame' parameter.
Let mouse clicks into a child frame activate the frame.
(x_calc_absolute_position, x_set_offset): Handle child frames
specially.
(x_set_skip_taskbar, x_set_z_group): New functions.
(x_make_frame_visible): Handle child frames.
(ATOM_REFS_INIT): Add entries for
Xatom_net_wm_state_skip_taskbar, Xatom_net_wm_state_above,
Xatom_net_wm_state_below.
* src/xterm.h (top-level): Declare Xatom_net_wm_state_above,
Xatom_net_wm_state_below and Xatom_net_wm_state_skip_taskbar.
(x_set_skip_taskbar, x_set_z_group): Add extern declarations.

1 files changed, 325 insertions, 64 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 1d14407aa43..4444a5c187a 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -945,11 +945,14 @@ x_set_frame_alpha (struct frame *f)
      Do this unconditionally as this function is called on reparent when
      alpha has not changed on the frame.  */
 
-  parent = x_find_topmost_parent (f);
-  if (parent != None)
-    XChangeProperty (dpy, parent, dpyinfo->Xatom_net_wm_window_opacity,
-                     XA_CARDINAL, 32, PropModeReplace,
-                     (unsigned char *) &opac, 1);
+  if (!FRAME_PARENT_FRAME (f))
+    {
+      parent = x_find_topmost_parent (f);
+      if (parent != None)
+        XChangeProperty (dpy, parent, dpyinfo->Xatom_net_wm_window_opacity,
+                         XA_CARDINAL, 32, PropModeReplace,
+                         (unsigned char *) &opac, 1);
+    }
 
   /* return unless necessary */
   {
@@ -4964,6 +4967,9 @@ XTmouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
          containing the pointer.  */
       {
         Window win, child;
+#ifdef USE_GTK
+        Window first_win = 0;
+#endif
         int win_x, win_y;
         int parent_x = 0, parent_y = 0;
 
@@ -5010,20 +5016,37 @@ XTmouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
                                        &child);
 
                 if (child == None || child == win)
-                  break;
+                  {
+#ifdef USE_GTK
+                    /* On GTK we have not inspected WIN yet.  If it has
+                       a frame and that frame has a parent, use it.  */
+                    struct frame *f = x_window_to_frame (dpyinfo, win);
+
+                    if (f && FRAME_PARENT_FRAME (f))
+                      first_win = win;
+#endif
+                    break;
+                  }
 #ifdef USE_GTK
                 /* We don't wan't to know the innermost window.  We
                    want the edit window.  For non-Gtk+ the innermost
                    window is the edit window.  For Gtk+ it might not
                    be.  It might be the tool bar for example.  */
                 if (x_window_to_frame (dpyinfo, win))
-                  break;
+                  /* But don't hurry.  We might find a child frame
+                     beneath.  */
+                  first_win = win;
 #endif
                 win = child;
                 parent_x = win_x;
                 parent_y = win_y;
               }
 
+#ifdef USE_GTK
+            if (first_win)
+              win = first_win;
+#endif
+
             /* Now we know that:
                win is the innermost window containing the pointer
                (XTC says it has no child containing the pointer),
@@ -6496,10 +6519,14 @@ x_scroll_bar_create (struct window *w, int top, int left,
     Widget scroll_bar = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar);
     XtConfigureWidget (scroll_bar, left, top, width, max (height, 1), 0);
     XtMapWidget (scroll_bar);
+    /* Don't obscure any child frames.  */
+    XLowerWindow (FRAME_X_DISPLAY (f), bar->x_window);
 #endif /* not USE_GTK */
     }
 #else /* not USE_TOOLKIT_SCROLL_BARS */
-  XMapRaised (FRAME_X_DISPLAY (f), bar->x_window);
+  XMapWindow (FRAME_X_DISPLAY (f), bar->x_window);
+  /* Don't obscure any child frames.  */
+  XLowerWindow (FRAME_X_DISPLAY (f), bar->x_window);
 #endif /* not USE_TOOLKIT_SCROLL_BARS */
 
   unblock_input ();
@@ -7067,10 +7094,10 @@ x_scroll_bar_expose (struct scroll_bar *bar, const XEvent *event)
                   /* x, y, width, height */
                   0, 0, bar->width - 1, bar->height - 1);
 
-   /* Restore the foreground color of the GC if we changed it above.  */
-   if (f->output_data.x->scroll_bar_foreground_pixel != -1)
-     XSetForeground (FRAME_X_DISPLAY (f), gc,
-                     FRAME_FOREGROUND_PIXEL (f));
+  /* Restore the foreground color of the GC if we changed it above.  */
+  if (f->output_data.x->scroll_bar_foreground_pixel != -1)
+    XSetForeground (FRAME_X_DISPLAY (f), gc,
+                    FRAME_FOREGROUND_PIXEL (f));
 
    unblock_input ();
 
@@ -7839,8 +7866,21 @@ handle_one_xevent (struct x_display_info *dpyinfo,
       f = x_top_window_to_frame (dpyinfo, event->xreparent.window);
       if (f)
         {
-          f->output_data.x->parent_desc = event->xreparent.parent;
-          x_real_positions (f, &f->left_pos, &f->top_pos);
+          /* Maybe we shouldn't set this for child frames ??  */
+          f->output_data.x->parent_desc = event->xreparent.parent;
+          if (!FRAME_PARENT_FRAME (f))
+            x_real_positions (f, &f->left_pos, &f->top_pos);
+          else
+            {
+              Window root;
+              unsigned int dummy_uint;
+
+              block_input ();
+              XGetGeometry (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
+                            &root, &f->left_pos, &f->top_pos,
+                            &dummy_uint, &dummy_uint, &dummy_uint, &dummy_uint);
+              unblock_input ();
+            }
 
           /* Perhaps reparented due to a WM restart.  Reset this.  */
           FRAME_DISPLAY_INFO (f)->wm_type = X_WMTYPE_UNKNOWN;
@@ -8000,7 +8040,26 @@ handle_one_xevent (struct x_display_info *dpyinfo,
           /* Check if fullscreen was specified before we where mapped the
              first time, i.e. from the command line.  */
           if (!f->output_data.x->has_been_visible)
-            x_check_fullscreen (f);
+            {
+
+              x_check_fullscreen (f);
+#ifndef USE_GTK
+              /* For systems that cannot synthesize `skip_taskbar' for
+                 unmapped windows do the following.  */
+              if (FRAME_SKIP_TASKBAR (f))
+                x_set_skip_taskbar (f, Qt, Qnil);
+#endif /* Not USE_GTK */
+            }
+
+          if (!iconified)
+            {
+              /* The `z-group' is reset every time a frame becomes
+                 invisible.  Handle this here.  */
+              if (FRAME_Z_GROUP (f) == z_group_above)
+                x_set_z_group (f, Qabove, Qnil);
+              else if (FRAME_Z_GROUP (f) == z_group_below)
+                x_set_z_group (f, Qbelow, Qnil);
+            }
 
           SET_FRAME_VISIBLE (f, 1);
           SET_FRAME_ICONIFIED (f, false);
@@ -8444,34 +8503,46 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #endif
         if (f)
           {
-
-            /* Generate SELECT_WINDOW_EVENTs when needed.
-               Don't let popup menus influence things (bug#1261).  */
-            if (!NILP (Vmouse_autoselect_window) && !popup_activated ())
+            /* Maybe generate a SELECT_WINDOW_EVENT for
+               `mouse-autoselect-window' but don't let popup menus
+               interfere with this (Bug#1261).  */
+            if (!NILP (Vmouse_autoselect_window)
+                && !popup_activated ()
+                /* Don't switch if we're currently in the minibuffer.
+                   This tries to work around problems where the
+                   minibuffer gets unselected unexpectedly, and where
+                   you then have to move your mouse all the way down to
+                   the minibuffer to select it.  */
+                && !MINI_WINDOW_P (XWINDOW (selected_window))
+                /* With `focus-follows-mouse' non-nil create an event
+                   also when the target window is on another frame.  */
+                && (f == XFRAME (selected_frame)
+                    || !NILP (focus_follows_mouse)))
               {
                 static Lisp_Object last_mouse_window;
                 Lisp_Object window = window_from_coordinates
                   (f, event->xmotion.x, event->xmotion.y, 0, false);
 
-                /* Window will be selected only when it is not selected now and
-                   last mouse movement event was not in it.  Minibuffer window
-                   will be selected only when it is active.  */
+                /* A window will be autoselected only when it is not
+                   selected now and the last mouse movement event was
+                   not in it.  The remainder of the code is a bit vague
+                   wrt what a "window" is.  For immediate autoselection,
+                   the window is usually the entire window but for GTK
+                   where the scroll bars don't count.  For delayed
+                   autoselection the window is usually the window's text
+                   area including the margins.  */
                 if (WINDOWP (window)
                     && !EQ (window, last_mouse_window)
-                    && !EQ (window, selected_window)
-                    /* For click-to-focus window managers
-                       create event iff we don't leave the
-                       selected frame.  */
-                    && (focus_follows_mouse
-                        || (EQ (XWINDOW (window)->frame,
-                                XWINDOW (selected_window)->frame))))
+                    && !EQ (window, selected_window))
                   {
                     inev.ie.kind = SELECT_WINDOW_EVENT;
                     inev.ie.frame_or_window = window;
                   }
+
                 /* Remember the last window where we saw the mouse.  */
                 last_mouse_window = window;
               }
+
             if (!note_mouse_movement (f, &event->xmotion))
               help_echo_string = previous_help_echo_string;
           }
@@ -8621,7 +8692,19 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
               XSETFRAME (frame, f);
 
-              x_real_positions (f, &f->left_pos, &f->top_pos);
+              if (!FRAME_PARENT_FRAME (f))
+                x_real_positions (f, &f->left_pos, &f->top_pos);
+              else
+                {
+                  Window root;
+                  unsigned int dummy_uint;
+
+                  block_input ();
+                  XGetGeometry (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
+                                &root, &f->left_pos, &f->top_pos,
+                                &dummy_uint, &dummy_uint, &dummy_uint, &dummy_uint);
+                  unblock_input ();
+                }
 
               if (old_left != f->left_pos || old_top != f->top_pos)
                 {
@@ -8650,8 +8733,35 @@ handle_one_xevent (struct x_display_info *dpyinfo,
         dpyinfo->last_mouse_glyph_frame = NULL;
         x_display_set_last_user_time (dpyinfo, event->xbutton.time);
 
-        f = (x_mouse_grabbed (dpyinfo) ? dpyinfo->last_mouse_frame
-             : x_window_to_frame (dpyinfo, event->xbutton.window));
+        if (x_mouse_grabbed (dpyinfo))
+          f = dpyinfo->last_mouse_frame;
+        else
+          {
+            f = x_window_to_frame (dpyinfo, event->xbutton.window);
+
+            if (f && event->xbutton.type == ButtonPress
+                && !popup_activated ()
+                && !x_window_to_scroll_bar (event->xbutton.display,
+                                            event->xbutton.window, 2)
+                && !FRAME_NO_ACCEPT_FOCUS (f))
+              {
+                /* When clicking into a child frame or when clicking
+                   into a parent frame with the child frame selected and
+                   `no-accept-focus' is not set, select the clicked
+                   frame.  */
+                struct frame *hf = dpyinfo->x_highlight_frame;
+
+                if (FRAME_PARENT_FRAME (f) || frame_ancestor_p (f, hf))
+                  {
+                    block_input ();
+                    XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
+                                    RevertToParent, CurrentTime);
+                    if (FRAME_PARENT_FRAME (f))
+                      XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
+                    unblock_input ();
+                  }
+              }
+          }
 
 #ifdef USE_GTK
         if (f && xg_event_is_for_scrollbar (f, event))
@@ -10007,6 +10117,7 @@ static void
 x_calc_absolute_position (struct frame *f)
 {
   int flags = f->size_hint_flags;
+  struct frame *p = FRAME_PARENT_FRAME (f);
 
   /* We have nothing to do if the current position
      is already for the top-left corner.  */
@@ -10015,32 +10126,72 @@ x_calc_absolute_position (struct frame *f)
 
   /* Treat negative positions as relative to the leftmost bottommost
      position that fits on the screen.  */
-  if (flags & XNegative)
-    f->left_pos = x_display_pixel_width (FRAME_DISPLAY_INFO (f))
-      - FRAME_PIXEL_WIDTH (f) + f->left_pos;
+  if ((flags & XNegative) && (f->left_pos <= 0))
+    {
+      int width = FRAME_PIXEL_WIDTH (f);
 
-  {
-    int height = FRAME_PIXEL_HEIGHT (f);
+      /* A frame that has been visible at least once should have outer
+         edges.  */
+      if (f->output_data.x->has_been_visible && !p)
+        {
+          Lisp_Object frame;
+          Lisp_Object edges = Qnil;
+
+          XSETFRAME (frame, f);
+          edges = Fx_frame_edges (frame, Qouter_edges);
+          if (!NILP (edges))
+            width = (XINT (Fnth (make_number (2), edges))
+                     - XINT (Fnth (make_number (0), edges)));
+        }
+
+      if (p)
+        f->left_pos = (FRAME_PIXEL_WIDTH (p) - width - 2 * f->border_width
+                       + f->left_pos);
+      else
+        f->left_pos = (x_display_pixel_width (FRAME_DISPLAY_INFO (f))
+                       - width + f->left_pos);
+
+    }
+
+  if ((flags & YNegative) && (f->top_pos <= 0))
+    {
+      int height = FRAME_PIXEL_HEIGHT (f);
 
 #if defined USE_X_TOOLKIT && defined USE_MOTIF
-    /* Something is fishy here.  When using Motif, starting Emacs with
-       `-g -0-0', the frame appears too low by a few pixels.
+      /* Something is fishy here.  When using Motif, starting Emacs with
+         `-g -0-0', the frame appears too low by a few pixels.
 
-       This seems to be so because initially, while Emacs is starting,
-       the column widget's height and the frame's pixel height are
-       different.  The column widget's height is the right one.  In
-       later invocations, when Emacs is up, the frame's pixel height
-       is right, though.
+         This seems to be so because initially, while Emacs is starting,
+         the column widget's height and the frame's pixel height are
+         different.  The column widget's height is the right one.  In
+         later invocations, when Emacs is up, the frame's pixel height
+         is right, though.
 
-       It's not obvious where the initial small difference comes from.
-       2000-12-01, gerd.  */
+         It's not obvious where the initial small difference comes from.
+         2000-12-01, gerd.  */
 
-    XtVaGetValues (f->output_data.x->column_widget, XtNheight, &height, NULL);
+      XtVaGetValues (f->output_data.x->column_widget, XtNheight, &height, NULL);
 #endif
 
-    if (flags & YNegative)
-      f->top_pos = x_display_pixel_height (FRAME_DISPLAY_INFO (f))
-        - height + f->top_pos;
+      if (f->output_data.x->has_been_visible && !p)
+        {
+          Lisp_Object frame;
+          Lisp_Object edges = Qnil;
+
+          XSETFRAME (frame, f);
+          if (NILP (edges))
+            edges = Fx_frame_edges (frame, Qouter_edges);
+          if (!NILP (edges))
+            height = (XINT (Fnth (make_number (3), edges))
+                      - XINT (Fnth (make_number (1), edges)));
+        }
+
+      if (p)
+        f->top_pos = (FRAME_PIXEL_HEIGHT (p) - height - 2 * f->border_width
+                       + f->top_pos);
+      else
+        f->top_pos = (x_display_pixel_height (FRAME_DISPLAY_INFO (f))
+                      - height + f->top_pos);
   }
 
   /* The left_pos and top_pos
@@ -10125,6 +10276,7 @@ x_set_offset (struct frame *f, register int xoff, register int yoff, int change_
      need to compute the top/left offset adjustment for this frame.  */
 
   if (change_gravity != 0
+      && !FRAME_PARENT_FRAME (f)
       && (FRAME_DISPLAY_INFO (f)->wm_type == X_WMTYPE_UNKNOWN
           || (FRAME_DISPLAY_INFO (f)->wm_type == X_WMTYPE_A
               && (FRAME_X_OUTPUT (f)->move_offset_left == 0
@@ -10255,6 +10407,92 @@ x_set_sticky (struct frame *f, Lisp_Object new_value, Lisp_Object old_value)
                 dpyinfo->Xatom_net_wm_state_sticky, None);
 }
 
+/**
+ * x_set_skip_taskbar:
+ *
+ * Set frame F's `skip-taskbar' parameter.  If non-nil, this should
+ * remove F's icon from the taskbar associated with the display of F's
+ * window-system window and inhibit switching to F's window via
+ * <Alt>-<TAB>.  If nil, lift these restrictions.
+ *
+ * Some window managers may not honor this parameter.
+ */
+void
+x_set_skip_taskbar (struct frame *f, Lisp_Object new_value, Lisp_Object old_value)
+{
+  if (!EQ (new_value, old_value))
+    {
+#ifdef USE_GTK
+      xg_set_skip_taskbar (f, new_value);
+#else
+      Lisp_Object frame;
+      struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
+
+      XSETFRAME (frame, f);
+      set_wm_state (frame, !NILP (new_value),
+                    dpyinfo->Xatom_net_wm_state_skip_taskbar, None);
+#endif /* USE_GTK */
+      FRAME_SKIP_TASKBAR (f) = !NILP (new_value);
+    }
+}
+
+/**
+ * x_set_z_group:
+ *
+ * Set frame F's `z-group' parameter.  If `above', F's window-system
+ * window is displayed above all windows that do not have the `above'
+ * property set.  If nil, F's window is shown below all windows that
+ * have the `above' property set and above all windows that have the
+ * `below' property set.  If `below', F's window is displayed below all
+ * windows that do not have the `below' property set.
+ *
+ * Some window managers may not honor this parameter.
+ */
+void
+x_set_z_group (struct frame *f, Lisp_Object new_value, Lisp_Object old_value)
+{
+  /* We don't care about old_value.  The window manager might have
+     reset the value without telling us.  */
+  Lisp_Object frame;
+  struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
+
+  XSETFRAME (frame, f);
+
+  if (NILP (new_value))
+    {
+      set_wm_state (frame, false,
+                    dpyinfo->Xatom_net_wm_state_above, None);
+      set_wm_state (frame, false,
+                    dpyinfo->Xatom_net_wm_state_below, None);
+      FRAME_Z_GROUP (f) = z_group_none;
+    }
+  else if (EQ (new_value, Qabove))
+    {
+      set_wm_state (frame, true,
+                    dpyinfo->Xatom_net_wm_state_above, None);
+      set_wm_state (frame, false,
+                    dpyinfo->Xatom_net_wm_state_below, None);
+      FRAME_Z_GROUP (f) = z_group_above;
+    }
+  else if (EQ (new_value, Qbelow))
+    {
+      set_wm_state (frame, false,
+                    dpyinfo->Xatom_net_wm_state_above, None);
+      set_wm_state (frame, true,
+                    dpyinfo->Xatom_net_wm_state_below, None);
+      FRAME_Z_GROUP (f) = z_group_below;
+    }
+  else if (EQ (new_value, Qabove_suspended))
+    {
+      set_wm_state (frame, false,
+                    dpyinfo->Xatom_net_wm_state_above, None);
+      FRAME_Z_GROUP (f) = z_group_above_suspended;
+    }
+  else
+    error ("Invalid z-group specification");
+}
+
+
 /* Return the current _NET_WM_STATE.
    SIZE_STATE is set to one of the FULLSCREEN_* values.
    Set *STICKY to the sticky state.
@@ -10758,7 +10996,8 @@ x_set_window_size_1 (struct frame *f, bool change_gravity,
   int old_height = FRAME_PIXEL_HEIGHT (f);
   Lisp_Object fullscreen = get_frame_param (f, Qfullscreen);
 
-  if (change_gravity) f->win_gravity = NorthWestGravity;
+  if (change_gravity)
+    f->win_gravity = NorthWestGravity;
   x_wm_set_size_hint (f, 0, false);
 
   /* When the frame is fullheight and we only want to change the width
@@ -11047,6 +11286,26 @@ xembed_send_message (struct frame *f, Time t, enum xembed_message msg,
 void
 x_make_frame_visible (struct frame *f)
 {
+  if (FRAME_PARENT_FRAME (f))
+    {
+      if (!FRAME_VISIBLE_P (f))
+        {
+          block_input ();
+#ifdef USE_GTK
+          gtk_widget_show_all (FRAME_GTK_OUTER_WIDGET (f));
+          XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
+                       f->left_pos, f->top_pos);
+#else
+          XMapRaised (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
+#endif
+          unblock_input ();
+
+          SET_FRAME_VISIBLE (f, true);
+          SET_FRAME_ICONIFIED (f, false);
+        }
+      return;
+    }
+
   block_input ();
 
   x_set_bitmap_icon (f);
@@ -11115,9 +11374,10 @@ x_make_frame_visible (struct frame *f)
        because the window manager may choose the position
        and we don't want to override it.  */
 
-    if (! FRAME_VISIBLE_P (f)
-        && ! FRAME_ICONIFIED_P (f)
-        && ! FRAME_X_EMBEDDED_P (f)
+    if (!FRAME_VISIBLE_P (f)
+        && !FRAME_ICONIFIED_P (f)
+        && !FRAME_X_EMBEDDED_P (f)
+        && !FRAME_PARENT_FRAME (f)
         && f->win_gravity == NorthWestGravity
         && previously_visible)
       {
@@ -11180,15 +11440,15 @@ x_make_frame_invisible (struct frame *f)
     xembed_set_info (f, 0);
   else
 #endif
-  {
 
-  if (! XWithdrawWindow (FRAME_X_DISPLAY (f), window,
-                         DefaultScreen (FRAME_X_DISPLAY (f))))
-    {
-      unblock_input ();
-      error ("Can't notify window manager of window withdrawal");
-    }
-  }
+    if (! XWithdrawWindow (FRAME_X_DISPLAY (f), window,
+                           DefaultScreen (FRAME_X_DISPLAY (f))))
+      {
+        unblock_input ();
+        error ("Can't notify window manager of window withdrawal");
+      }
+
+  x_sync (f);
 
   /* We can't distinguish this from iconification
      just by the event that we get from the server.
@@ -11198,8 +11458,6 @@ x_make_frame_invisible (struct frame *f)
   SET_FRAME_VISIBLE (f, 0);
   SET_FRAME_ICONIFIED (f, false);
 
-  x_sync (f);
-
   unblock_input ();
 }
 
@@ -12355,6 +12613,9 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
       ATOM_REFS_INIT ("SM_CLIENT_ID", Xatom_SM_CLIENT_ID)
       ATOM_REFS_INIT ("_XSETTINGS_SETTINGS", Xatom_xsettings_prop)
       ATOM_REFS_INIT ("MANAGER", Xatom_xsettings_mgr)
+      ATOM_REFS_INIT ("_NET_WM_STATE_SKIP_TASKBAR", Xatom_net_wm_state_skip_taskbar)
+      ATOM_REFS_INIT ("_NET_WM_STATE_ABOVE", Xatom_net_wm_state_above)
+      ATOM_REFS_INIT ("_NET_WM_STATE_BELOW", Xatom_net_wm_state_below)
     };
 
     int i;