Mercurial > emacs
comparison src/xfns.c @ 6519:22c56514eeb3
(x_set_frame_parameters, x_get_arg, x_window, Fx_create_frame,
Fx_create_frame): Use assignment, not initialization.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Fri, 25 Mar 1994 00:41:56 +0000 |
parents | 0d4be1fbfb4d |
children | eecaa7b19b6c |
comparison
equal
deleted
inserted
replaced
6518:07ecb7a5c916 | 6519:22c56514eeb3 |
---|---|
458 top = val; | 458 top = val; |
459 else if (EQ (prop, Qleft)) | 459 else if (EQ (prop, Qleft)) |
460 left = val; | 460 left = val; |
461 else | 461 else |
462 { | 462 { |
463 register Lisp_Object param_index = Fget (prop, Qx_frame_parameter); | 463 register Lisp_Object param_index, old_value; |
464 register Lisp_Object old_value = get_frame_param (f, prop); | 464 |
465 | 465 param_index = Fget (prop, Qx_frame_parameter); |
466 old_value = get_frame_param (f, prop); | |
466 store_frame_param (f, prop, val); | 467 store_frame_param (f, prop, val); |
467 if (XTYPE (param_index) == Lisp_Int | 468 if (XTYPE (param_index) == Lisp_Int |
468 && XINT (param_index) >= 0 | 469 && XINT (param_index) >= 0 |
469 && (XINT (param_index) | 470 && (XINT (param_index) |
470 < sizeof (x_frame_parms)/sizeof (x_frame_parms[0]))) | 471 < sizeof (x_frame_parms)/sizeof (x_frame_parms[0]))) |
1430 | 1431 |
1431 case symbol: | 1432 case symbol: |
1432 /* As a special case, we map the values `true' and `on' | 1433 /* As a special case, we map the values `true' and `on' |
1433 to Qt, and `false' and `off' to Qnil. */ | 1434 to Qt, and `false' and `off' to Qnil. */ |
1434 { | 1435 { |
1435 Lisp_Object lower = Fdowncase (tem); | 1436 Lisp_Object lower; |
1437 lower = Fdowncase (tem); | |
1436 if (!strcmp (XSTRING (tem)->data, "on") | 1438 if (!strcmp (XSTRING (tem)->data, "on") |
1437 || !strcmp (XSTRING (tem)->data, "true")) | 1439 || !strcmp (XSTRING (tem)->data, "true")) |
1438 return Qt; | 1440 return Qt; |
1439 else if (!strcmp (XSTRING (tem)->data, "off") | 1441 else if (!strcmp (XSTRING (tem)->data, "off") |
1440 || !strcmp (XSTRING (tem)->data, "false")) | 1442 || !strcmp (XSTRING (tem)->data, "false")) |
1831 /* x_set_name normally ignores requests to set the name if the | 1833 /* x_set_name normally ignores requests to set the name if the |
1832 requested name is the same as the current name. This is the one | 1834 requested name is the same as the current name. This is the one |
1833 place where that assumption isn't correct; f->name is set, but | 1835 place where that assumption isn't correct; f->name is set, but |
1834 the X server hasn't been told. */ | 1836 the X server hasn't been told. */ |
1835 { | 1837 { |
1836 Lisp_Object name = f->name; | 1838 Lisp_Object name; |
1837 int explicit = f->explicit_name; | 1839 int explicit = f->explicit_name; |
1838 | 1840 |
1841 f->explicit_name = 0; | |
1842 name = f->name; | |
1839 f->name = Qnil; | 1843 f->name = Qnil; |
1840 f->explicit_name = 0; | |
1841 x_set_name (f, name, explicit); | 1844 x_set_name (f, name, explicit); |
1842 } | 1845 } |
1843 | 1846 |
1844 XDefineCursor (XDISPLAY FRAME_X_WINDOW (f), | 1847 XDefineCursor (XDISPLAY FRAME_X_WINDOW (f), |
1845 f->display.x->text_cursor); | 1848 f->display.x->text_cursor); |
2142 #endif /* USE_X_TOOLKIT */ | 2145 #endif /* USE_X_TOOLKIT */ |
2143 | 2146 |
2144 /* Make the window appear on the frame and enable display, | 2147 /* Make the window appear on the frame and enable display, |
2145 unless the caller says not to. */ | 2148 unless the caller says not to. */ |
2146 { | 2149 { |
2147 Lisp_Object visibility = x_get_arg (parms, Qvisibility, 0, 0, symbol); | 2150 Lisp_Object visibility; |
2148 | 2151 |
2152 visibility = x_get_arg (parms, Qvisibility, 0, 0, symbol); | |
2149 if (EQ (visibility, Qunbound)) | 2153 if (EQ (visibility, Qunbound)) |
2150 visibility = Qt; | 2154 visibility = Qt; |
2151 | 2155 |
2152 if (EQ (visibility, Qicon)) | 2156 if (EQ (visibility, Qicon)) |
2153 x_iconify_frame (f); | 2157 x_iconify_frame (f); |
2382 | 2386 |
2383 Fmodify_frame_parameters (frame, parms); | 2387 Fmodify_frame_parameters (frame, parms); |
2384 | 2388 |
2385 /* Make the window appear on the frame and enable display. */ | 2389 /* Make the window appear on the frame and enable display. */ |
2386 { | 2390 { |
2387 Lisp_Object visibility = x_get_arg (parms, Qvisibility, 0, 0, symbol); | 2391 Lisp_Object visibility; |
2388 | 2392 |
2393 visibility = x_get_arg (parms, Qvisibility, 0, 0, symbol); | |
2389 if (EQ (visibility, Qunbound)) | 2394 if (EQ (visibility, Qunbound)) |
2390 visibility = Qt; | 2395 visibility = Qt; |
2391 | 2396 |
2392 if (! EQ (visibility, Qicon) | 2397 if (! EQ (visibility, Qicon) |
2393 && ! NILP (visibility)) | 2398 && ! NILP (visibility)) |