[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c [emacs-unicode-2] |
Date: |
Wed, 28 Jul 2004 03:09:59 -0400 |
Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.590.2.4 emacs/src/xfns.c:1.590.2.5
*** emacs/src/xfns.c:1.590.2.4 Mon Jun 28 07:29:25 2004
--- emacs/src/xfns.c Wed Jul 28 07:05:52 2004
***************
*** 2613,2618 ****
--- 2613,2640 ----
#endif /* not USE_GTK */
#endif /* not USE_X_TOOLKIT */
+ /* Verify that the icon position args for this window are valid. */
+
+ static void
+ x_icon_verify (f, parms)
+ struct frame *f;
+ Lisp_Object parms;
+ {
+ Lisp_Object icon_x, icon_y;
+
+ /* Set the position of the icon. Note that twm groups all
+ icons in an icon window. */
+ icon_x = x_frame_get_and_record_arg (f, parms, Qicon_left, 0, 0,
RES_TYPE_NUMBER);
+ icon_y = x_frame_get_and_record_arg (f, parms, Qicon_top, 0, 0,
RES_TYPE_NUMBER);
+ if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
+ {
+ CHECK_NUMBER (icon_x);
+ CHECK_NUMBER (icon_y);
+ }
+ else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
+ error ("Both left and top icon corners of icon must be specified");
+ }
+
/* Handle the icon stuff for this window. Perhaps later we might
want an x_set_icon_position which can be called interactively as
well. */
***************
*** 3101,3106 ****
--- 3123,3130 ----
tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
f->no_split = minibuffer_only || EQ (tem, Qt);
+ x_icon_verify (f, parms);
+
/* Create the X widget or window. */
#ifdef USE_X_TOOLKIT
x_window (f, window_prompting, minibuffer_only);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/xfns.c [emacs-unicode-2],
Miles Bader <=