Mercurial > emacs

comparison src/frame.h @ 96675:d45acf0c8d23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merging Emacs.app (NeXTstep port)
author Adrian Robert <Adrian.B.Robert@gmail.com>
date Tue, 15 Jul 2008 18:15:18 +0000
parents 69278a81390d
children 1e2f7aab70ba
comparison
equal deleted inserted replaced
96674:ff312a846b25 96675:d45acf0c8d23
48 output_initial, 48 output_initial,
49 output_termcap, 49 output_termcap,
50 output_x_window, 50 output_x_window,
51 output_msdos_raw, 51 output_msdos_raw,
52 output_w32, 52 output_w32,
53 output_mac 53 output_mac,
54 output_ns
54 }; 55 };
55 56
56 enum vertical_scroll_bar_type 57 enum vertical_scroll_bar_type
57 { 58 {
58 vertical_scroll_bar_none, 59 vertical_scroll_bar_none,
240 241
241 /* Set to non-zero to minimize tool-bar height even when 242 /* Set to non-zero to minimize tool-bar height even when
242 auto-resize-tool-bar is set to grow-only. */ 243 auto-resize-tool-bar is set to grow-only. */
243 unsigned minimize_tool_bar_window_p : 1; 244 unsigned minimize_tool_bar_window_p : 1;
244 245
245 #if defined (USE_GTK) || defined (MAC_OS) 246 #if defined (USE_GTK) || defined (HAVE_NS) || defined (MAC_OS)
246 /* Nonzero means using a tool bar that comes from the toolkit. */ 247 /* Nonzero means using a tool bar that comes from the toolkit. */
247 int external_tool_bar; 248 int external_tool_bar;
248 #endif 249 #endif
249 250
250 /* Margin at the top of the frame. Used to display the tool-bar. */ 251 /* Margin at the top of the frame. Used to display the tool-bar. */
330 { 331 {
331 struct tty_output *tty; /* termchar.h */ 332 struct tty_output *tty; /* termchar.h */
332 struct x_output *x; /* xterm.h */ 333 struct x_output *x; /* xterm.h */
333 struct w32_output *w32; /* w32term.h */ 334 struct w32_output *w32; /* w32term.h */
334 struct mac_output *mac; /* macterm.h */ 335 struct mac_output *mac; /* macterm.h */
336 struct ns_output *ns; /* nsterm.h */
335 EMACS_INT nothing; 337 EMACS_INT nothing;
336 } 338 }
337 output_data; 339 output_data;
338 340
339 /* List of font-drivers available on the frame. */ 341 /* List of font-drivers available on the frame. */
357 359
358 /* Number of lines of menu bar. */ 360 /* Number of lines of menu bar. */
359 int menu_bar_lines; 361 int menu_bar_lines;
360 362
361 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \ 363 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \
362 || defined (USE_GTK) 364 || defined (HAVE_NS) || defined (USE_GTK)
363 /* Nonzero means using a menu bar that comes from the X toolkit. */ 365 /* Nonzero means using a menu bar that comes from the X toolkit. */
364 unsigned int external_menu_bar : 1; 366 unsigned int external_menu_bar : 1;
365 #endif 367 #endif
366 368
367 /* Nonzero if last attempt at redisplay on this frame was preempted. */ 369 /* Nonzero if last attempt at redisplay on this frame was preempted. */
517 #define FRAME_TERMCAP_P(f) ((f)->output_method == output_termcap) 519 #define FRAME_TERMCAP_P(f) ((f)->output_method == output_termcap)
518 #define FRAME_X_P(f) ((f)->output_method == output_x_window) 520 #define FRAME_X_P(f) ((f)->output_method == output_x_window)
519 #define FRAME_W32_P(f) ((f)->output_method == output_w32) 521 #define FRAME_W32_P(f) ((f)->output_method == output_w32)
520 #define FRAME_MSDOS_P(f) ((f)->output_method == output_msdos_raw) 522 #define FRAME_MSDOS_P(f) ((f)->output_method == output_msdos_raw)
521 #define FRAME_MAC_P(f) ((f)->output_method == output_mac) 523 #define FRAME_MAC_P(f) ((f)->output_method == output_mac)
524 #define FRAME_NS_P(f) ((f)->output_method == output_ns)
522 525
523 /* FRAME_WINDOW_P tests whether the frame is a window, and is 526 /* FRAME_WINDOW_P tests whether the frame is a window, and is
524 defined to be the predicate for the window system being used. */ 527 defined to be the predicate for the window system being used. */
525 528
526 #ifdef HAVE_X_WINDOWS 529 #ifdef HAVE_X_WINDOWS
530 #define FRAME_WINDOW_P(f) FRAME_W32_P (f) 533 #define FRAME_WINDOW_P(f) FRAME_W32_P (f)
531 #endif 534 #endif
532 #ifdef MAC_OS 535 #ifdef MAC_OS
533 #define FRAME_WINDOW_P(f) FRAME_MAC_P (f) 536 #define FRAME_WINDOW_P(f) FRAME_MAC_P (f)
534 #endif 537 #endif
538 #ifdef HAVE_NS
539 #define FRAME_WINDOW_P(f) FRAME_NS_P(f)
540 #endif
535 #ifndef FRAME_WINDOW_P 541 #ifndef FRAME_WINDOW_P
536 #define FRAME_WINDOW_P(f) (0) 542 #define FRAME_WINDOW_P(f) (0)
537 #endif 543 #endif
538 544
539 /* Nonzero if frame F is still alive (not deleted). */ 545 /* Nonzero if frame F is still alive (not deleted). */
568 These lines are counted in FRAME_LINES. */ 574 These lines are counted in FRAME_LINES. */
569 #define FRAME_MENU_BAR_LINES(f) (f)->menu_bar_lines 575 #define FRAME_MENU_BAR_LINES(f) (f)->menu_bar_lines
570 576
571 /* Nonzero if this frame should display a tool bar 577 /* Nonzero if this frame should display a tool bar
572 in a way that does not use any text lines. */ 578 in a way that does not use any text lines. */
573 #if defined (USE_GTK) || defined (MAC_OS) 579 #if defined (USE_GTK) || defined (HAVE_NS) || defined (MAC_OS)
574 #define FRAME_EXTERNAL_TOOL_BAR(f) (f)->external_tool_bar 580 #define FRAME_EXTERNAL_TOOL_BAR(f) (f)->external_tool_bar
575 #else 581 #else
576 #define FRAME_EXTERNAL_TOOL_BAR(f) 0 582 #define FRAME_EXTERNAL_TOOL_BAR(f) 0
577 #endif 583 #endif
578 584
587 (FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F)) 593 (FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F))
588 594
589 /* Nonzero if this frame should display a menu bar 595 /* Nonzero if this frame should display a menu bar
590 in a way that does not use any text lines. */ 596 in a way that does not use any text lines. */
591 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \ 597 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \
592 || defined (USE_GTK) 598 || defined (HAVE_NS) || defined (USE_GTK)
593 #define FRAME_EXTERNAL_MENU_BAR(f) (f)->external_menu_bar 599 #define FRAME_EXTERNAL_MENU_BAR(f) (f)->external_menu_bar
594 #else 600 #else
595 #define FRAME_EXTERNAL_MENU_BAR(f) 0 601 #define FRAME_EXTERNAL_MENU_BAR(f) 0
596 #endif 602 #endif
597 #define FRAME_VISIBLE_P(f) ((f)->visible != 0) 603 #define FRAME_VISIBLE_P(f) ((f)->visible != 0)
1042 1048
1043 extern Lisp_Object Qleft_fringe, Qright_fringe; 1049 extern Lisp_Object Qleft_fringe, Qright_fringe;
1044 extern Lisp_Object Qheight, Qwidth; 1050 extern Lisp_Object Qheight, Qwidth;
1045 extern Lisp_Object Qminibuffer, Qmodeline; 1051 extern Lisp_Object Qminibuffer, Qmodeline;
1046 extern Lisp_Object Qonly; 1052 extern Lisp_Object Qonly;
1047 extern Lisp_Object Qx, Qw32, Qmac, Qpc; 1053 extern Lisp_Object Qx, Qw32, Qmac, Qpc, Qns;
1048 extern Lisp_Object Qvisible; 1054 extern Lisp_Object Qvisible;
1049 extern Lisp_Object Qdisplay_type; 1055 extern Lisp_Object Qdisplay_type;
1050 extern Lisp_Object Qbackground_mode; 1056 extern Lisp_Object Qbackground_mode;
1051 1057
1052 extern Lisp_Object Qx_resource_name; 1058 extern Lisp_Object Qx_resource_name;