[Emacs-diffs] trunk r113629: Do not use pure Xism x_wm_set_icon_position in non-X ports.

[Dmitry Antipov]

------------------------------------------------------------
revno: 113629
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-01 10:38:49 +0400
message:
  Do not use pure Xism x_wm_set_icon_position in non-X ports.
  * frame.c (x_set_frame_parameters): Call to x_wm_set_icon_position
  only if HAVE_X_WINDOWS is in use.
  * frame.h (x_set_frame_parameters): Move under HAVE_X_WINDOWS.
  * nsterm.m (x_wm_set_icon_position): Remove no-op.
  * w32term.c (x_wm_set_icon_position): Likewise.
  * w32fns.c (x_icon): Adjust user.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
  src/w32fns.c                   w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-01 05:56:20 +0000
+++ b/src/ChangeLog     2013-08-01 06:38:49 +0000
@@ -1,5 +1,15 @@
 2013-08-01  Dmitry Antipov  <address@hidden>
 
+       Do not use pure Xism x_wm_set_icon_position in non-X ports.
+       * frame.c (x_set_frame_parameters): Call to x_wm_set_icon_position
+       only if HAVE_X_WINDOWS is in use.
+       * frame.h (x_set_frame_parameters): Move under HAVE_X_WINDOWS.
+       * nsterm.m (x_wm_set_icon_position): Remove no-op.
+       * w32term.c (x_wm_set_icon_position): Likewise.
+       * w32fns.c (x_icon): Adjust user.
+
+2013-08-01  Dmitry Antipov  <address@hidden>
+
        * xterm.c (last_mouse_press_frame): Remove the
        leftover which is not really used any more.
        (handle_one_xevent, syms_of_xterm): Adjust users.

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-07-31 12:50:59 +0000
+++ b/src/frame.c       2013-08-01 06:38:49 +0000
@@ -2867,10 +2867,11 @@
        /* Actually set that position, and convert to absolute.  */
        x_set_offset (f, leftpos, toppos, -1);
       }
-
+#ifdef HAVE_X_WINDOWS
     if ((!NILP (icon_left) || !NILP (icon_top))
        && ! (icon_left_no_change && icon_top_no_change))
       x_wm_set_icon_position (f, XINT (icon_left), XINT (icon_top));
+#endif /* HAVE_X_WINDOWS */
   }
 
   UNGCPRO;

=== modified file 'src/frame.h'
--- a/src/frame.h       2013-07-31 12:50:59 +0000
+++ b/src/frame.h       2013-08-01 06:38:49 +0000
@@ -1207,7 +1207,6 @@
 
 extern void x_set_scroll_bar_default_width (struct frame *);
 extern void x_set_offset (struct frame *, int, int, int);
-extern void x_wm_set_icon_position (struct frame *, int, int);
 extern void x_wm_set_size_hint (FRAME_PTR f, long flags, bool user_position);
 
 extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int);
@@ -1278,9 +1277,12 @@
 extern void free_frame_menubar (struct frame *);
 extern void x_free_frame_resources (struct frame *);
 
-#if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT
+#if defined HAVE_X_WINDOWS
+extern void x_wm_set_icon_position (struct frame *, int, int);
+#if !defined USE_X_TOOLKIT
 extern char *x_get_resource_string (const char *, const char *);
 #endif
+#endif
 
 extern void x_query_colors (struct frame *f, XColor *, int);
 extern void x_query_color (struct frame *f, XColor *);

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-07-27 22:14:07 +0000
+++ b/src/nsterm.m      2013-08-01 06:38:49 +0000
@@ -3863,15 +3863,6 @@
     [eview updateFrameSize: NO];
 }
 
-
-void
-x_wm_set_icon_position (struct frame *f, int icon_x, int icon_y)
-{
-  /* XXX irrelevant under NS */
-}
-
-
-
 /* ==========================================================================
 
     Initialization

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2013-07-31 12:50:59 +0000
+++ b/src/w32fns.c      2013-08-01 06:38:49 +0000
@@ -4182,9 +4182,6 @@
 
   block_input ();
 
-  if (! EQ (icon_x, Qunbound))
-    x_wm_set_icon_position (f, XINT (icon_x), XINT (icon_y));
-
 #if 0 /* TODO */
   /* Start up iconic or window? */
   x_wm_set_window_state

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2013-07-30 05:56:18 +0000
+++ b/src/w32term.c     2013-08-01 06:38:49 +0000
@@ -6225,22 +6225,6 @@
   leave_crit ();
 }
 
-/* Window manager things */
-void
-x_wm_set_icon_position (struct frame *f, int icon_x, int icon_y)
-{
-#if 0
-  Window window = FRAME_W32_WINDOW (f);
-
-  f->display.x->wm_hints.flags |= IconPositionHint;
-  f->display.x->wm_hints.icon_x = icon_x;
-  f->display.x->wm_hints.icon_y = icon_y;
-
-  XSetWMHints (FRAME_X_DISPLAY (f), window, &f->display.x->wm_hints);
-#endif
-}
-
-
 /***********************************************************************
                                Fonts
  ***********************************************************************/