From 52b8a085f779789a9774b2890390df3758c8c302 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Thu, 1 Aug 2013 10:38:49 +0400 Subject: [PATCH] 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. --- src/ChangeLog | 10 ++++++++++ src/frame.c | 3 ++- src/frame.h | 6 ++++-- src/nsterm.m | 9 --------- src/w32fns.c | 3 --- src/w32term.c | 16 ---------------- 6 files changed, 16 insertions(+), 31 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 566cd2b5961..4fb6a657939 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2013-08-01 Dmitry Antipov + + 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 * xterm.c (last_mouse_press_frame): Remove the diff --git a/src/frame.c b/src/frame.c index 6e56a20f850..f5d1971a2bf 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2867,10 +2867,11 @@ x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist) /* 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; diff --git a/src/frame.h b/src/frame.h index 98cf54c13a4..c4c5ec23efc 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1207,7 +1207,6 @@ extern Lisp_Object Qrun_hook_with_args; 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 x_set_menu_bar_lines (struct frame *, 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 *); diff --git a/src/nsterm.m b/src/nsterm.m index 14706f6b91d..7126ef56c5e 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3863,15 +3863,6 @@ ns_judge_scroll_bars (struct frame *f) [eview updateFrameSize: NO]; } - -void -x_wm_set_icon_position (struct frame *f, int icon_x, int icon_y) -{ - /* XXX irrelevant under NS */ -} - - - /* ========================================================================== Initialization diff --git a/src/w32fns.c b/src/w32fns.c index e46608f9d72..458013da093 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -4182,9 +4182,6 @@ x_icon (struct frame *f, Lisp_Object parms) 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 diff --git a/src/w32term.c b/src/w32term.c index b97632dabca..f91bfc2dc7f 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6225,22 +6225,6 @@ x_wm_set_size_hint (struct frame *f, long flags, bool user_position) 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 ***********************************************************************/ -- 2.39.2