Mercurial > emacs
diff src/frame.c @ 91073:4bc33ffdda1a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 09:12:07 +0000 |
parents | 1251cabc40b7 b210bba3f477 |
children | 880960b70474 |
line wrap: on
line diff
--- a/src/frame.c Sat Oct 27 00:30:50 2007 +0000 +++ b/src/frame.c Sat Oct 27 09:12:07 2007 +0000 @@ -114,7 +114,6 @@ Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; Lisp_Object Qtty_color_mode; Lisp_Object Qtty, Qtty_type; -Lisp_Object Qwindow_system; Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth; #ifdef USE_FONT_BACKEND @@ -268,7 +267,7 @@ return Qnil; else return type; -} +} struct frame * make_frame (mini_p) @@ -530,6 +529,7 @@ { initial_kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); init_kboard (initial_kboard); + /* Leave Vwindow_system at its `t' default for now. */ initial_kboard->next_kboard = all_kboards; all_kboards = initial_kboard; } @@ -556,10 +556,10 @@ f->terminal = terminal; f->terminal->reference_count++; f->output_data.nothing = 0; - + FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; - + FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; @@ -621,10 +621,10 @@ f->terminal = terminal; f->terminal->reference_count++; create_tty_output (f); - + FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; - + FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; @@ -632,10 +632,10 @@ if (FRAMEP (FRAME_TTY (f)->top_frame) && FRAME_LIVE_P (XFRAME (FRAME_TTY (f)->top_frame))) XFRAME (FRAME_TTY (f)->top_frame)->async_visible = 2; /* obscured */ - + FRAME_TTY (f)->top_frame = frame; } - + #ifdef CANNOT_DUMP FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR; FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR; @@ -719,7 +719,7 @@ #endif #endif #endif /* not MSDOS */ - + { Lisp_Object terminal; @@ -730,9 +730,9 @@ t = get_terminal (terminal, 1); } } - + if (!t) - { + { char *name = 0, *type = 0; Lisp_Object tty, tty_type; @@ -746,7 +746,7 @@ strncpy (name, SDATA (tty), SBYTES (tty)); name[SBYTES (tty)] = 0; } - + tty_type = get_future_frame_param (Qtty_type, parms, (FRAME_TERMCAP_P (XFRAME (selected_frame)) ? FRAME_TTY (XFRAME (selected_frame))->type @@ -768,13 +768,12 @@ get_tty_size (fileno (FRAME_TTY (f)->input), &width, &height); change_frame_size (f, height, width, 0, 0, 0); } - + adjust_glyphs (f); calculate_costs (f); XSETFRAME (frame, f); Fmodify_frame_parameters (frame, Vdefault_frame_alist); Fmodify_frame_parameters (frame, parms); - Fmodify_frame_parameters (frame, Fcons (Fcons (Qwindow_system, Qnil), Qnil)); Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty_type, build_string (t->display_info.tty->type)), Qnil)); @@ -784,7 +783,7 @@ Qnil)); else Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty, Qnil), Qnil)); - + /* Make the frame face alist be frame-specific, so that each frame could change its face definitions independently. */ f->face_alist = Fcopy_alist (sf->face_alist); @@ -1530,7 +1529,7 @@ { struct terminal *terminal = FRAME_TERMINAL (f); - f->output_data.nothing = 0; + f->output_data.nothing = 0; f->terminal = 0; /* Now the frame is dead. */ /* If needed, delete the terminal that this frame was on. @@ -2037,7 +2036,7 @@ CHECK_LIVE_FRAME (frame); f = XFRAME (frame); - + /* Do like the documentation says. */ Fmake_frame_visible (frame); @@ -2057,14 +2056,14 @@ Lisp_Object frame; { struct frame *f; - + if (NILP (frame)) frame = selected_frame; CHECK_LIVE_FRAME (frame); f = XFRAME (frame); - + if (FRAME_TERMINAL (f)->frame_raise_lower_hook) (*FRAME_TERMINAL (f)->frame_raise_lower_hook) (f, 0); @@ -2101,7 +2100,7 @@ Lisp_Object frame, focus_frame; { struct frame *f; - + /* Note that we don't check for a live frame here. It's reasonable to redirect the focus of a frame you're about to delete, if you know what other frame should receive those keystrokes. */ @@ -2111,7 +2110,7 @@ CHECK_LIVE_FRAME (focus_frame); f = XFRAME (frame); - + f->focus_frame = focus_frame; if (FRAME_TERMINAL (f)->frame_rehighlight_hook) @@ -3303,7 +3302,7 @@ else if (EQ (new_value, Qfullheight)) f->want_fullscreen = FULLSCREEN_HEIGHT; - if (FRAME_TERMINAL (f)->fullscreen_hook != NULL) + if (FRAME_TERMINAL (f)->fullscreen_hook != NULL) FRAME_TERMINAL (f)->fullscreen_hook (f); } @@ -4291,7 +4290,7 @@ int width, height; /* It takes both for some WM:s to place it where we want */ - window_prompting = USPosition | PPosition; + window_prompting |= USPosition | PPosition; x_fullscreen_adjust (f, &width, &height, &top, &left); FRAME_COLS (f) = width; FRAME_LINES (f) = height; @@ -4400,8 +4399,6 @@ staticpro (&Qtty); Qtty_type = intern ("tty-type"); staticpro (&Qtty_type); - Qwindow_system = intern ("window-system"); - staticpro (&Qwindow_system); Qface_set_after_frame_default = intern ("face-set-after-frame-default"); staticpro (&Qface_set_after_frame_default); @@ -4426,7 +4423,7 @@ staticpro (&Qterminal); Qterminal_live_p = intern ("terminal-live-p"); staticpro (&Qterminal_live_p); - + { int i; @@ -4528,7 +4525,7 @@ frame. In the second invocation, the frame is already deleted, and the function should do nothing. (You can use `frame-live-p' to check for this.) This wrinkle happens when an earlier function in -`delete-frame-functions' (indirectly) calls delete-frame +`delete-frame-functions' (indirectly) calls `delete-frame' recursively. */); Vdelete_frame_functions = Qnil; @@ -4561,7 +4558,7 @@ #else focus_follows_mouse = 0; #endif - + staticpro (&Vframe_list); defsubr (&Sactive_minibuffer_window);