diff options
| author | Gerd Moellmann | 2001-06-25 15:37:16 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-06-25 15:37:16 +0000 |
| commit | ea0a1f53c78b7d997dab4f58f5d752186787b604 (patch) | |
| tree | b94bc2f2dda10a390d6f12361c35f2a949d94725 /src | |
| parent | cbec8c518d92c2d9296f177f695407508b038eae (diff) | |
| download | emacs-ea0a1f53c78b7d997dab4f58f5d752186787b604.tar.gz emacs-ea0a1f53c78b7d997dab4f58f5d752186787b604.zip | |
(Qwait_for_wm): New variable.
(x_frame_parms): Add entry for `wait-for-wm".
(x_set_wait_for_wm): New function.
(Fx_create_frame): Call x_default_parameter for wait-for-wm.
(syms_of_xfns): Initialize and staticpro Qwait_for_wm.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/xfns.c b/src/xfns.c index 53e7f090ef6..1f4fb43dda8 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -217,6 +217,7 @@ extern Lisp_Object Qdisplay; | |||
| 217 | Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background; | 217 | Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background; |
| 218 | Lisp_Object Qscreen_gamma, Qline_spacing, Qcenter; | 218 | Lisp_Object Qscreen_gamma, Qline_spacing, Qcenter; |
| 219 | Lisp_Object Qcompound_text, Qcancel_timer; | 219 | Lisp_Object Qcompound_text, Qcancel_timer; |
| 220 | Lisp_Object Qwait_for_wm; | ||
| 220 | 221 | ||
| 221 | /* The below are defined in frame.c. */ | 222 | /* The below are defined in frame.c. */ |
| 222 | 223 | ||
| @@ -731,6 +732,7 @@ static void x_disable_image P_ ((struct frame *, struct image *)); | |||
| 731 | static void x_create_im P_ ((struct frame *)); | 732 | static void x_create_im P_ ((struct frame *)); |
| 732 | void x_set_foreground_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); | 733 | void x_set_foreground_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
| 733 | static void x_set_line_spacing P_ ((struct frame *, Lisp_Object, Lisp_Object)); | 734 | static void x_set_line_spacing P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
| 735 | static void x_set_wait_for_wm P_ ((struct frame *, Lisp_Object, Lisp_Object)); | ||
| 734 | void x_set_background_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); | 736 | void x_set_background_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
| 735 | void x_set_mouse_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); | 737 | void x_set_mouse_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
| 736 | void x_set_cursor_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); | 738 | void x_set_cursor_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
| @@ -799,7 +801,8 @@ static struct x_frame_parm_table x_frame_parms[] = | |||
| 799 | "scroll-bar-foreground", x_set_scroll_bar_foreground, | 801 | "scroll-bar-foreground", x_set_scroll_bar_foreground, |
| 800 | "scroll-bar-background", x_set_scroll_bar_background, | 802 | "scroll-bar-background", x_set_scroll_bar_background, |
| 801 | "screen-gamma", x_set_screen_gamma, | 803 | "screen-gamma", x_set_screen_gamma, |
| 802 | "line-spacing", x_set_line_spacing | 804 | "line-spacing", x_set_line_spacing, |
| 805 | "wait-for-wm", x_set_wait_for_wm | ||
| 803 | }; | 806 | }; |
| 804 | 807 | ||
| 805 | /* Attach the `x-frame-parameter' properties to | 808 | /* Attach the `x-frame-parameter' properties to |
| @@ -1312,8 +1315,22 @@ x_set_line_spacing (f, new_value, old_value) | |||
| 1312 | } | 1315 | } |
| 1313 | 1316 | ||
| 1314 | 1317 | ||
| 1318 | /* Change the `wait-for-wm' frame parameter of frame F. OLD_VALUE is | ||
| 1319 | the previous value of that parameter, NEW_VALUE is the new value. | ||
| 1320 | See also the comment of wait_for_wm in struct x_output. */ | ||
| 1321 | |||
| 1322 | static void | ||
| 1323 | x_set_wait_for_wm (f, new_value, old_value) | ||
| 1324 | struct frame *f; | ||
| 1325 | Lisp_Object new_value, old_value; | ||
| 1326 | { | ||
| 1327 | f->output_data.x->wait_for_wm = !NILP (new_value); | ||
| 1328 | } | ||
| 1329 | |||
| 1330 | |||
| 1315 | /* Change the `screen-gamma' frame parameter of frame F. OLD_VALUE is | 1331 | /* Change the `screen-gamma' frame parameter of frame F. OLD_VALUE is |
| 1316 | the previous value of that parameter, NEW_VALUE is the new value. */ | 1332 | the previous value of that parameter, NEW_VALUE is the new |
| 1333 | value. */ | ||
| 1317 | 1334 | ||
| 1318 | static void | 1335 | static void |
| 1319 | x_set_screen_gamma (f, new_value, old_value) | 1336 | x_set_screen_gamma (f, new_value, old_value) |
| @@ -4320,6 +4337,8 @@ This function is an internal primitive--use `make-frame' instead.") | |||
| 4320 | RES_TYPE_SYMBOL); | 4337 | RES_TYPE_SYMBOL); |
| 4321 | x_default_parameter (f, parms, Qtitle, Qnil, | 4338 | x_default_parameter (f, parms, Qtitle, Qnil, |
| 4322 | "title", "Title", RES_TYPE_STRING); | 4339 | "title", "Title", RES_TYPE_STRING); |
| 4340 | x_default_parameter (f, parms, Qwait_for_wm, Qt, | ||
| 4341 | "waitForWM", "WaitForWM", RES_TYPE_BOOLEAN); | ||
| 4323 | 4342 | ||
| 4324 | f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window; | 4343 | f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window; |
| 4325 | 4344 | ||
| @@ -11426,6 +11445,8 @@ syms_of_xfns () | |||
| 11426 | staticpro (&Qcompound_text); | 11445 | staticpro (&Qcompound_text); |
| 11427 | Qcancel_timer = intern ("cancel-timer"); | 11446 | Qcancel_timer = intern ("cancel-timer"); |
| 11428 | staticpro (&Qcancel_timer); | 11447 | staticpro (&Qcancel_timer); |
| 11448 | Qwait_for_wm = intern ("wait-for-wm"); | ||
| 11449 | staticpro (&Qwait_for_wm); | ||
| 11429 | /* This is the end of symbol initialization. */ | 11450 | /* This is the end of symbol initialization. */ |
| 11430 | 11451 | ||
| 11431 | /* Text property `display' should be nonsticky by default. */ | 11452 | /* Text property `display' should be nonsticky by default. */ |