Mercurial > emacs
comparison src/xfns.c @ 83181:159920fd1024
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-464
Update from CVS: lisp/progmodes/make-mode.el: Fix comments.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-465
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-466
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-467
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-221
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 24 Jul 2004 22:08:12 +0000 |
parents | 91cf385601e5 5044b3527ce8 |
children | 22658e29bd48 |
comparison
equal
deleted
inserted
replaced
83180:e657dca8261e | 83181:159920fd1024 |
---|---|
2641 } | 2641 } |
2642 | 2642 |
2643 #endif /* not USE_GTK */ | 2643 #endif /* not USE_GTK */ |
2644 #endif /* not USE_X_TOOLKIT */ | 2644 #endif /* not USE_X_TOOLKIT */ |
2645 | 2645 |
2646 /* Verify that the icon position args for this window are valid. */ | |
2647 | |
2648 static void | |
2649 x_icon_verify (f, parms) | |
2650 struct frame *f; | |
2651 Lisp_Object parms; | |
2652 { | |
2653 Lisp_Object icon_x, icon_y; | |
2654 | |
2655 /* Set the position of the icon. Note that twm groups all | |
2656 icons in an icon window. */ | |
2657 icon_x = x_frame_get_and_record_arg (f, parms, Qicon_left, 0, 0, RES_TYPE_NUMBER); | |
2658 icon_y = x_frame_get_and_record_arg (f, parms, Qicon_top, 0, 0, RES_TYPE_NUMBER); | |
2659 if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound)) | |
2660 { | |
2661 CHECK_NUMBER (icon_x); | |
2662 CHECK_NUMBER (icon_y); | |
2663 } | |
2664 else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound)) | |
2665 error ("Both left and top icon corners of icon must be specified"); | |
2666 } | |
2667 | |
2646 /* Handle the icon stuff for this window. Perhaps later we might | 2668 /* Handle the icon stuff for this window. Perhaps later we might |
2647 want an x_set_icon_position which can be called interactively as | 2669 want an x_set_icon_position which can be called interactively as |
2648 well. */ | 2670 well. */ |
2649 | 2671 |
2650 static void | 2672 static void |
3129 /* Compute the size of the X window. */ | 3151 /* Compute the size of the X window. */ |
3130 window_prompting = x_figure_window_size (f, parms, 1); | 3152 window_prompting = x_figure_window_size (f, parms, 1); |
3131 | 3153 |
3132 tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); | 3154 tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); |
3133 f->no_split = minibuffer_only || EQ (tem, Qt); | 3155 f->no_split = minibuffer_only || EQ (tem, Qt); |
3156 | |
3157 x_icon_verify (f, parms); | |
3134 | 3158 |
3135 /* Create the X widget or window. */ | 3159 /* Create the X widget or window. */ |
3136 #ifdef USE_X_TOOLKIT | 3160 #ifdef USE_X_TOOLKIT |
3137 x_window (f, window_prompting, minibuffer_only); | 3161 x_window (f, window_prompting, minibuffer_only); |
3138 #else | 3162 #else |