mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-09 15:50:21 +00:00
1a578e9be2
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.
156 lines
4.7 KiB
C
156 lines
4.7 KiB
C
/* Definitions and headers for communication on the Mac OS.
|
|
Copyright (C) 2000 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Emacs; see the file COPYING. If not, write to
|
|
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
/* Contributed by Andrew Choi (akochoi@users.sourceforge.net). */
|
|
|
|
#ifndef EMACS_MACGUI_H
|
|
#define EMACS_MACGUI_H
|
|
|
|
#include <MacTypes.h>
|
|
#include <Quickdraw.h>
|
|
|
|
typedef int Pixmap;
|
|
typedef int Bitmap;
|
|
|
|
typedef int Display; /* fix later */
|
|
|
|
typedef unsigned long Time;
|
|
typedef RGBColor Color;
|
|
typedef WindowPtr Window;
|
|
|
|
#define FACE_DEFAULT (~0)
|
|
|
|
|
|
/* Emulate XCharStruct. */
|
|
typedef struct _XCharStruct
|
|
{
|
|
int rbearing;
|
|
int lbearing;
|
|
int width;
|
|
int ascent;
|
|
int descent;
|
|
} XCharStruct;
|
|
|
|
struct MacFontStruct {
|
|
char *fontname;
|
|
|
|
SInt16 mac_fontnum; /* font number of font used in this window */
|
|
int mac_fontsize; /* size of font */
|
|
Style mac_fontface; /* plain, bold, italics, etc. */
|
|
short mac_scriptcode; /* Mac OS script code for font used */
|
|
|
|
#if 0
|
|
SInt16 mFontNum; /* font number of font used in this window */
|
|
short mScriptCode; /* Mac OS script code for font used */
|
|
int mFontSize; /* size of font */
|
|
Style mFontFace; /* plain, bold, italics, etc. */
|
|
int mHeight; /* height of one line of text in pixels */
|
|
int mWidth; /* width of one character in pixels */
|
|
int mAscent;
|
|
int mDescent;
|
|
int mLeading;
|
|
char mTwoByte; /* true for two-byte font */
|
|
#endif
|
|
|
|
/* from Xlib.h */
|
|
#if 0
|
|
XExtData *ext_data; /* hook for extension to hang data */
|
|
Font fid; /* Font id for this font */
|
|
unsigned direction; /* hint about the direction font is painted */
|
|
#endif
|
|
unsigned min_char_or_byte2;/* first character */
|
|
unsigned max_char_or_byte2;/* last character */
|
|
unsigned min_byte1; /* first row that exists */
|
|
unsigned max_byte1; /* last row that exists */
|
|
#if 0
|
|
Bool all_chars_exist; /* flag if all characters have nonzero size */
|
|
unsigned default_char; /* char to print for undefined character */
|
|
int n_properties; /* how many properties there are */
|
|
XFontProp *properties; /* pointer to array of additional properties */
|
|
#endif
|
|
XCharStruct min_bounds; /* minimum bounds over all existing char */
|
|
XCharStruct max_bounds; /* maximum bounds over all existing char */
|
|
XCharStruct *per_char; /* first_char to last_char information */
|
|
int ascent; /* logical extent above baseline for spacing */
|
|
int descent; /* logical decent below baseline for spacing */
|
|
};
|
|
|
|
typedef struct MacFontStruct MacFontStruct;
|
|
typedef struct MacFontStruct XFontStruct;
|
|
|
|
|
|
/* Emulate X GC's by keeping color and font info in a structure. */
|
|
typedef struct _XGCValues
|
|
{
|
|
unsigned long foreground;
|
|
unsigned long background;
|
|
XFontStruct *font;
|
|
} XGCValues;
|
|
|
|
typedef XGCValues *GC;
|
|
|
|
extern XGCValues *
|
|
XCreateGC (void *, Window, unsigned long, XGCValues *);
|
|
|
|
#define GCForeground 0x01
|
|
#define GCBackground 0x02
|
|
#define GCFont 0x03
|
|
#define GCGraphicsExposures 0
|
|
|
|
/* Bit Gravity */
|
|
|
|
#define ForgetGravity 0
|
|
#define NorthWestGravity 1
|
|
#define NorthGravity 2
|
|
#define NorthEastGravity 3
|
|
#define WestGravity 4
|
|
#define CenterGravity 5
|
|
#define EastGravity 6
|
|
#define SouthWestGravity 7
|
|
#define SouthGravity 8
|
|
#define SouthEastGravity 9
|
|
#define StaticGravity 10
|
|
|
|
#define NoValue 0x0000
|
|
#define XValue 0x0001
|
|
#define YValue 0x0002
|
|
#define WidthValue 0x0004
|
|
#define HeightValue 0x0008
|
|
#define AllValues 0x000F
|
|
#define XNegative 0x0010
|
|
#define YNegative 0x0020
|
|
|
|
#define USPosition (1L << 0) /* user specified x, y */
|
|
#define USSize (1L << 1) /* user specified width, height */
|
|
|
|
#define PPosition (1L << 2) /* program specified position */
|
|
#define PSize (1L << 3) /* program specified size */
|
|
#define PMinSize (1L << 4) /* program specified minimum size */
|
|
#define PMaxSize (1L << 5) /* program specified maximum size */
|
|
#define PResizeInc (1L << 6) /* program specified resize increments */
|
|
#define PAspect (1L << 7) /* program specified min and max aspect ratios */
|
|
#define PBaseSize (1L << 8) /* program specified base for incrementing */
|
|
#define PWinGravity (1L << 9) /* program specified window gravity */
|
|
|
|
extern int XParseGeometry ();
|
|
|
|
#endif /* EMACS_MACGUI_H */
|
|
|