Mercurial > emacs
comparison src/xfns.c @ 2328:82e4fed9cdd6
* xfns.c (Fx_parse_geometry): Renamed from Fx_geometry.
(Fx_color_defined_p): Renamed from Fx_defined_color.
(syms_of_xfns): Adjusted.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Tue, 23 Mar 1993 04:58:07 +0000 |
parents | 0d8ce1b8ceee |
children | 1982e2983822 |
comparison
equal
deleted
inserted
replaced
2327:61b35714d880 | 2328:82e4fed9cdd6 |
---|---|
168 Lisp_Object Qinternal_border_width; | 168 Lisp_Object Qinternal_border_width; |
169 Lisp_Object Qleft; | 169 Lisp_Object Qleft; |
170 Lisp_Object Qmouse_color; | 170 Lisp_Object Qmouse_color; |
171 Lisp_Object Qnone; | 171 Lisp_Object Qnone; |
172 Lisp_Object Qparent_id; | 172 Lisp_Object Qparent_id; |
173 Lisp_Object Qsuppress_icon; | |
173 Lisp_Object Qtop; | 174 Lisp_Object Qtop; |
174 Lisp_Object Qundefined_color; | 175 Lisp_Object Qundefined_color; |
175 Lisp_Object Qvertical_scroll_bars; | 176 Lisp_Object Qvertical_scroll_bars; |
176 Lisp_Object Qvisibility; | 177 Lisp_Object Qvisibility; |
177 Lisp_Object Qwindow_id; | 178 Lisp_Object Qwindow_id; |
1474 tem = deflt; | 1475 tem = deflt; |
1475 x_set_frame_parameters (f, Fcons (Fcons (prop, tem), Qnil)); | 1476 x_set_frame_parameters (f, Fcons (Fcons (prop, tem), Qnil)); |
1476 return tem; | 1477 return tem; |
1477 } | 1478 } |
1478 | 1479 |
1479 DEFUN ("x-geometry", Fx_geometry, Sx_geometry, 1, 1, 0, | 1480 DEFUN ("x-parse-geometry", Fx_parse_geometry, Sx_parse_geometry, 1, 1, 0, |
1480 "Parse an X-style geometry string STRING.\n\ | 1481 "Parse an X-style geometry string STRING.\n\ |
1481 Returns an alist of the form ((top . TOP), (left . LEFT) ... ).") | 1482 Returns an alist of the form ((top . TOP), (left . LEFT) ... ).") |
1482 (string) | 1483 (string) |
1483 Lisp_Object string; | 1484 Lisp_Object string; |
1484 { | 1485 { |
2132 /* Now override the defaults with all the rest of the specified | 2133 /* Now override the defaults with all the rest of the specified |
2133 parms. */ | 2134 parms. */ |
2134 tem = x_get_arg (parms, Qunsplittable, 0, 0, boolean); | 2135 tem = x_get_arg (parms, Qunsplittable, 0, 0, boolean); |
2135 f->no_split = minibuffer_only || EQ (tem, Qt); | 2136 f->no_split = minibuffer_only || EQ (tem, Qt); |
2136 | 2137 |
2137 /* Do not create an icon window if the caller says not to. | 2138 /* Do not create an icon window if the caller says not to */ |
2138 I'm not sure that this code is right; how does X10 handle icons? */ | 2139 if (!EQ (x_get_arg (parms, Qsuppress_icon, 0, 0, boolean), Qt) |
2139 x_text_icon (f, iconidentity); | 2140 || f->display.x->parent_desc != ROOT_WINDOW) |
2140 x_default_parameter (f, parms, Qicon_type, Qnil, | 2141 { |
2141 "BitmapIcon", 0, symbol); | 2142 x_text_icon (f, iconidentity); |
2143 x_default_parameter (f, parms, Qicon_type, Qnil, | |
2144 "BitmapIcon", 0, symbol); | |
2145 } | |
2142 | 2146 |
2143 /* Tell the X server the previously set values of the | 2147 /* Tell the X server the previously set values of the |
2144 background, border and mouse colors; also create the mouse cursor. */ | 2148 background, border and mouse colors; also create the mouse cursor. */ |
2145 BLOCK_INPUT; | 2149 BLOCK_INPUT; |
2146 temp = XMakeTile (f->display.x->background_pixel); | 2150 temp = XMakeTile (f->display.x->background_pixel); |
2281 UNBLOCK_INPUT; | 2285 UNBLOCK_INPUT; |
2282 return tempwindow != 0; | 2286 return tempwindow != 0; |
2283 } | 2287 } |
2284 #endif /* not HAVE_X11 */ | 2288 #endif /* not HAVE_X11 */ |
2285 | 2289 |
2286 DEFUN ("x-defined-color", Fx_defined_color, Sx_defined_color, 1, 1, 0, | 2290 DEFUN ("x-color-defined-p", Fx_color_defined_p, Sx_color_defined_p, 1, 1, 0, |
2287 "Return t if the current X display supports the color named COLOR.") | 2291 "Return t if the current X display supports the color named COLOR.") |
2288 (color) | 2292 (color) |
2289 Lisp_Object color; | 2293 Lisp_Object color; |
2290 { | 2294 { |
2291 Color foo; | 2295 Color foo; |
3894 staticpro (&Qmouse_color); | 3898 staticpro (&Qmouse_color); |
3895 Qnone = intern ("none"); | 3899 Qnone = intern ("none"); |
3896 staticpro (&Qnone); | 3900 staticpro (&Qnone); |
3897 Qparent_id = intern ("parent-id"); | 3901 Qparent_id = intern ("parent-id"); |
3898 staticpro (&Qparent_id); | 3902 staticpro (&Qparent_id); |
3903 Qsuppress_icon = intern ("suppress-icon"); | |
3904 staticpro (&Qsuppress_icon); | |
3899 Qtop = intern ("top"); | 3905 Qtop = intern ("top"); |
3900 staticpro (&Qtop); | 3906 staticpro (&Qtop); |
3901 Qundefined_color = intern ("undefined-color"); | 3907 Qundefined_color = intern ("undefined-color"); |
3902 staticpro (&Qundefined_color); | 3908 staticpro (&Qundefined_color); |
3903 Qvertical_scroll_bars = intern ("vertical-scroll-bars"); | 3909 Qvertical_scroll_bars = intern ("vertical-scroll-bars"); |
3951 defsubr (&Sx_erase_rectangle); | 3957 defsubr (&Sx_erase_rectangle); |
3952 defsubr (&Sx_contour_region); | 3958 defsubr (&Sx_contour_region); |
3953 defsubr (&Sx_uncontour_region); | 3959 defsubr (&Sx_uncontour_region); |
3954 #endif | 3960 #endif |
3955 defsubr (&Sx_display_color_p); | 3961 defsubr (&Sx_display_color_p); |
3956 defsubr (&Sx_defined_color); | 3962 defsubr (&Sx_color_defined_p); |
3957 defsubr (&Sx_server_vendor); | 3963 defsubr (&Sx_server_vendor); |
3958 defsubr (&Sx_server_version); | 3964 defsubr (&Sx_server_version); |
3959 defsubr (&Sx_display_pixel_width); | 3965 defsubr (&Sx_display_pixel_width); |
3960 defsubr (&Sx_display_pixel_height); | 3966 defsubr (&Sx_display_pixel_height); |
3961 defsubr (&Sx_display_mm_width); | 3967 defsubr (&Sx_display_mm_width); |
3975 defsubr (&Sx_get_default); | 3981 defsubr (&Sx_get_default); |
3976 defsubr (&Sx_store_cut_buffer); | 3982 defsubr (&Sx_store_cut_buffer); |
3977 defsubr (&Sx_get_cut_buffer); | 3983 defsubr (&Sx_get_cut_buffer); |
3978 defsubr (&Sx_set_face); | 3984 defsubr (&Sx_set_face); |
3979 #endif | 3985 #endif |
3980 defsubr (&Sx_geometry); | 3986 defsubr (&Sx_parse_geometry); |
3981 defsubr (&Sx_create_frame); | 3987 defsubr (&Sx_create_frame); |
3982 defsubr (&Sfocus_frame); | 3988 defsubr (&Sfocus_frame); |
3983 defsubr (&Sunfocus_frame); | 3989 defsubr (&Sunfocus_frame); |
3984 #if 0 | 3990 #if 0 |
3985 defsubr (&Sx_horizontal_line); | 3991 defsubr (&Sx_horizontal_line); |