Mercurial > emacs
comparison mac/inc/macgui.h @ 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 | |
children |
comparison
equal
deleted
inserted
replaced
32751:2a657a9fae69 | 32752:923b8d6d8277 |
---|---|
1 /* Definitions and headers for communication on the Mac OS. | |
2 Copyright (C) 2000 Free Software Foundation, Inc. | |
3 | |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
8 the Free Software Foundation; either version 2, or (at your option) | |
9 any later version. | |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 /* Contributed by Andrew Choi (akochoi@users.sourceforge.net). */ | |
22 | |
23 #ifndef EMACS_MACGUI_H | |
24 #define EMACS_MACGUI_H | |
25 | |
26 #include <MacTypes.h> | |
27 #include <Quickdraw.h> | |
28 | |
29 typedef int Pixmap; | |
30 typedef int Bitmap; | |
31 | |
32 typedef int Display; /* fix later */ | |
33 | |
34 typedef unsigned long Time; | |
35 typedef RGBColor Color; | |
36 typedef WindowPtr Window; | |
37 | |
38 #define FACE_DEFAULT (~0) | |
39 | |
40 | |
41 /* Emulate XCharStruct. */ | |
42 typedef struct _XCharStruct | |
43 { | |
44 int rbearing; | |
45 int lbearing; | |
46 int width; | |
47 int ascent; | |
48 int descent; | |
49 } XCharStruct; | |
50 | |
51 struct MacFontStruct { | |
52 char *fontname; | |
53 | |
54 SInt16 mac_fontnum; /* font number of font used in this window */ | |
55 int mac_fontsize; /* size of font */ | |
56 Style mac_fontface; /* plain, bold, italics, etc. */ | |
57 short mac_scriptcode; /* Mac OS script code for font used */ | |
58 | |
59 #if 0 | |
60 SInt16 mFontNum; /* font number of font used in this window */ | |
61 short mScriptCode; /* Mac OS script code for font used */ | |
62 int mFontSize; /* size of font */ | |
63 Style mFontFace; /* plain, bold, italics, etc. */ | |
64 int mHeight; /* height of one line of text in pixels */ | |
65 int mWidth; /* width of one character in pixels */ | |
66 int mAscent; | |
67 int mDescent; | |
68 int mLeading; | |
69 char mTwoByte; /* true for two-byte font */ | |
70 #endif | |
71 | |
72 /* from Xlib.h */ | |
73 #if 0 | |
74 XExtData *ext_data; /* hook for extension to hang data */ | |
75 Font fid; /* Font id for this font */ | |
76 unsigned direction; /* hint about the direction font is painted */ | |
77 #endif | |
78 unsigned min_char_or_byte2;/* first character */ | |
79 unsigned max_char_or_byte2;/* last character */ | |
80 unsigned min_byte1; /* first row that exists */ | |
81 unsigned max_byte1; /* last row that exists */ | |
82 #if 0 | |
83 Bool all_chars_exist; /* flag if all characters have nonzero size */ | |
84 unsigned default_char; /* char to print for undefined character */ | |
85 int n_properties; /* how many properties there are */ | |
86 XFontProp *properties; /* pointer to array of additional properties */ | |
87 #endif | |
88 XCharStruct min_bounds; /* minimum bounds over all existing char */ | |
89 XCharStruct max_bounds; /* maximum bounds over all existing char */ | |
90 XCharStruct *per_char; /* first_char to last_char information */ | |
91 int ascent; /* logical extent above baseline for spacing */ | |
92 int descent; /* logical decent below baseline for spacing */ | |
93 }; | |
94 | |
95 typedef struct MacFontStruct MacFontStruct; | |
96 typedef struct MacFontStruct XFontStruct; | |
97 | |
98 | |
99 /* Emulate X GC's by keeping color and font info in a structure. */ | |
100 typedef struct _XGCValues | |
101 { | |
102 unsigned long foreground; | |
103 unsigned long background; | |
104 XFontStruct *font; | |
105 } XGCValues; | |
106 | |
107 typedef XGCValues *GC; | |
108 | |
109 extern XGCValues * | |
110 XCreateGC (void *, Window, unsigned long, XGCValues *); | |
111 | |
112 #define GCForeground 0x01 | |
113 #define GCBackground 0x02 | |
114 #define GCFont 0x03 | |
115 #define GCGraphicsExposures 0 | |
116 | |
117 /* Bit Gravity */ | |
118 | |
119 #define ForgetGravity 0 | |
120 #define NorthWestGravity 1 | |
121 #define NorthGravity 2 | |
122 #define NorthEastGravity 3 | |
123 #define WestGravity 4 | |
124 #define CenterGravity 5 | |
125 #define EastGravity 6 | |
126 #define SouthWestGravity 7 | |
127 #define SouthGravity 8 | |
128 #define SouthEastGravity 9 | |
129 #define StaticGravity 10 | |
130 | |
131 #define NoValue 0x0000 | |
132 #define XValue 0x0001 | |
133 #define YValue 0x0002 | |
134 #define WidthValue 0x0004 | |
135 #define HeightValue 0x0008 | |
136 #define AllValues 0x000F | |
137 #define XNegative 0x0010 | |
138 #define YNegative 0x0020 | |
139 | |
140 #define USPosition (1L << 0) /* user specified x, y */ | |
141 #define USSize (1L << 1) /* user specified width, height */ | |
142 | |
143 #define PPosition (1L << 2) /* program specified position */ | |
144 #define PSize (1L << 3) /* program specified size */ | |
145 #define PMinSize (1L << 4) /* program specified minimum size */ | |
146 #define PMaxSize (1L << 5) /* program specified maximum size */ | |
147 #define PResizeInc (1L << 6) /* program specified resize increments */ | |
148 #define PAspect (1L << 7) /* program specified min and max aspect ratios */ | |
149 #define PBaseSize (1L << 8) /* program specified base for incrementing */ | |
150 #define PWinGravity (1L << 9) /* program specified window gravity */ | |
151 | |
152 extern int XParseGeometry (); | |
153 | |
154 #endif /* EMACS_MACGUI_H */ | |
155 |