Mercurial > emacs
diff src/frame.c @ 32752:923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
2000-10-23 Andrew Choi <akochoi@i-cable.com>
* dispextern.h [macintosh]: Include macgui.h instead of macterm.h.
* dispnew.c [macintosh]: Include macterm.h.
(init_display) [macintosh]: initialization for window system.
* emacs.c (main) [macintosh]: Call syms_of_textprop,
syms_of_macfns, syms_of_ccl, syms_of_fontset, syms_of_xterm,
syms_of_search, x_term_init, and init_keyboard before calling
init_window_once. Also, call syms_of_xmenu.
* fontset.c (syms_of_fontset) [macintosh]: Set ASCII font of
default fontset to Monaco.
* frame.c [macintosh]: Include macterm.h. Remove declarations of
NewMacWindow and DisposeMacWindow.
(make_terminal_frame) [macintosh]: Call make_mac_terminal_frame
instead of calling NewMacWindow and setting fields of
f->output_data.mac directly. Call init_frame_faces.
(Fdelete_frame) [macintosh]: Remove unused code.
(Fmodify_frame_parameters) [macintosh]: Call
x_set_frame_parameters instead of mac_set_frame_parameters.
* frame.h [macintosh]: Define menu_bar_lines field in struct
frame. Define FRAME_EXTERNAL_MENU_BAR macro.
* keyboard.c [macintosh]: Include macterm.h.
(kbd_buffer_get_event) [macintosh]: Generate delete_window_event
and menu_bar_activate_event type events as for X and NT.
(make_lispy_event) [macintosh]: Construct lisp events of type
MENU_BAR_EVENT as for X and NT.
* sysdep.c [macintosh]: Remove declaration for sys_signal.
Include stdlib.h. Remove definition of Vx_bitmap_file_path.
(sys_subshell) [macintosh]: Remove definition entirely.
(init_sys_modes) [macintosh]: Do not initialize Vwindow_system and
Vwindow_system_version here. Remove initialization of
Vx_bitmap_file_path.
(read_input_waiting): Correct the number of parameters passed to
read_socket_hook.
Move all Macintosh functions to mac/mac.c.
* term.c [macintosh]: Include macterm.h.
* window.c [macintosh]: Include macterm.h.
* xdisp.c [macintosh]: Include macterm.h. Declare
set_frame_menubar and pending_menu_activation.
(echo_area_display) [macintosh]: Do not return if terminal frame
is the selected frame.
(update_menu_bar) [macintosh]: Check FRAME_EXTERNAL_MENU_BAR (f).
Allow only the selected frame to set menu bar.
(redisplay_window) [macintosh]: Obtain menu bar to redisplay by
calling FRAME_EXTERNAL_MENU_BAR (f).
(display_menu_bar) [macintosh]: Check FRAME_MAC_P (f).
* xfaces.c [macintosh]: Include macterm.h. Define x_display_info
and check_x. Declare XCreateGC. Define x_create_gc and
x_free_gc. Initialize font_sort_order.
(x_face_list_fonts) [macintosh]: Use the same code as WINDOWSNT,
but call x_list_fonts instead of w32_list_fonts.
(Finternal_face_x_get_resource) [macintosh]: Do not call
display_x_get_resource.
(prepare_face_for_display) [macintosh]: Set xgcv.font.
(realize_x_face) [macintosh]: Load the font if it is specified in
ATTRS.
(syms_of_xfaces) [macintosh]: Initialize Vscalable_fonts_allowed
to Qt.
* cus-edit.el (custom-button-face): Use 3D look for mac.
(custom-button-pressed-face): Likewise.
* faces.el (set-face-attributes-from-resources): Handle mac frames
in the same way as x and w32 frames.
(face-valid-attribute-values): Likewise.
(read-face-attribute): Likewise.
(defined-colors): Likewise.
(color-defined-p): Likewise.
(color-values): Likewise.
(display-grayscale-p): Likewise.
(face-set-after-frame-default): Likewise.
(mode-line): Same default face as for x and w32.
(tool-bar): Likewise.
* frame.el: Remove call to frame-notice-user-settings at end of
the file.
* info.el (Info-fontify-node): make underlines invisible for mac
as for x, pc, and w32 frame types.
* term/mac-win.el: New file.
author | Andrew Choi <akochoi@shaw.ca> |
---|---|
date | Sun, 22 Oct 2000 16:50:16 +0000 |
parents | 288723d38c06 |
children | 9e6ba99c8d53 |
line wrap: on
line diff
--- a/src/frame.c Sun Oct 22 16:29:14 2000 +0000 +++ b/src/frame.c Sun Oct 22 16:50:16 2000 +0000 @@ -29,6 +29,9 @@ #ifdef WINDOWSNT #include "w32term.h" #endif +#ifdef macintosh +#include "macterm.h" +#endif #include "buffer.h" /* These help us bind and responding to switch-frame events. */ #include "commands.h" @@ -45,11 +48,6 @@ #include "dosfns.h" #endif -#ifdef macintosh -extern struct mac_output *NewMacWindow (); -extern void DisposeMacWindow (struct mac_output *); -#endif - /* Evaluate this expression to rebuild the section of syms_of_frame that initializes and staticpros the symbols declared below. Note that Emacs 18 has a bug that keeps C-x C-e from being able to @@ -582,25 +580,15 @@ f->output_method = output_termcap; #else #ifdef macintosh - f->output_data.mac = NewMacWindow(f); - f->output_data.mac->background_pixel = 0xffffff; - f->output_data.mac->foreground_pixel = 0; - f->output_data.mac->n_param_faces = 0; - f->output_data.mac->n_computed_faces = 0; - f->output_data.mac->size_computed_faces = 0; - f->output_method = output_mac; - f->auto_raise = 1; - f->auto_lower = 1; - init_frame_faces (f); -#else /* !macintosh */ + make_mac_terminal_frame (f); +#else f->output_data.x = &tty_display; -#endif /* !macintosh */ +#endif /* macintosh */ #endif /* MSDOS */ -#ifndef macintosh if (!noninteractive) init_frame_faces (f); -#endif + return f; } @@ -1288,14 +1276,6 @@ x_destroy_window (f); #endif -/* Done by x_destroy_window above already */ -#if 0 -#ifdef macintosh - if (FRAME_MAC_P (f)) - DisposeMacWindow (f->output_data.mac); -#endif -#endif - f->output_data.nothing = 0; /* If we've deleted the last_nonminibuf_frame, then try to find @@ -2229,11 +2209,6 @@ IT_set_frame_parameters (f, alist); else #endif -#ifdef macintosh - if (FRAME_MAC_P (f)) - mac_set_frame_parameters (f, alist); - else -#endif { int length = XINT (Flength (alist));