mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-12 22:40:46 -08:00
(struct glyph_string): Likewise. * emacs.c (main) [MAC_OS8]: Call mac_term_init instead of mac_initialize. * fileio.c (Fnext_read_file_uses_dialog_p, Fread_file_name): Change TARGET_API_MAC_CARBON to HAVE_CARBON. * fns.c (vector): Change MAC_OSX to MAC_OS. * frame.c (x_set_frame_parameters, x_report_frame_params) (x_set_fullscreen): Remove #ifndef HAVE_CARBON. (x_set_border_width, Vdefault_frame_scroll_bars): Change HAVE_CARBON to MAC_OS. * image.c [MAC_OS]: Include sys/stat.h. [MAC_OS && !MAC_OSX]: Include sys/param.h, ImageCompression.h, and QuickTimeComponents.h. * mac.c [!MAC_OSX] (mac_wait_next_event): Add extern. [!MAC_OSX] (select): Use mac_wait_next_event. [!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to Vexec_suffixes. [!MAC_OSX] (select, run_mac_command): Change `#ifdef TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'. (mac_clear_font_name_table): Add extern. (Fmac_clear_font_name_table): New defun. (syms_of_mac): Defsubr it. [MAC_OSX] (SELECT_POLLING_PERIOD_USEC): New define. [MAC_OSX] (select_and_poll_event): New function. [MAC_OSX] (sys_select): Use it. [MAC_OSX && SELECT_USE_CFSOCKET] (socket_callback): New function. [MAC_OSX && SELECT_USE_CFSOCKET] (SELECT_TIMEOUT_THRESHOLD_RUNLOOP, EVENT_CLASS_SOCK): New defines. [MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]: Use CFSocket and RunLoop for simultaneously monitoring two kinds of inputs, window events and process outputs, without periodically polling. * macfns.c (mac_initialized): Remove extern. (stricmp): Put in #if 0. All callers changed to use xstricmp in xfaces.c. (strnicmp): Decrement `n' at the end of each loop, not the beginning. (check_mac): Use the term "Mac native windows" instead of "Mac OS". (check_x_display_info, x_display_info_for_name): Sync with xfns.c. (mac_get_rdb_resource): New function (from w32reg.c). (x_get_string_resource): Use it. (install_window_handler): Add extern. (mac_window): New function. (Fx_create_frame): Use it instead of make_mac_frame. Set parameter for Qfullscreen. Call x_wm_set_size_hint. (Fx_open_connection, Fx_close_connection): New defuns. (syms_of_macfns): Defsubr them. (x_create_tip_frame) [TARGET_API_MAC_CARBON]: Add kWindowNoUpdatesAttribute to the window attribute. (x_create_tip_frame) [!TARGET_API_MAC_CARBON]: Use NewCWindow. (x_create_tip_frame): Don't call ShowWindow. (Fx_show_tip): Call ShowWindow. (Fx_file_dialog): Change `#ifdef TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'. (mac_frame_parm_handlers): Set handlers for Qfullscreen. (syms_of_macfns) [MAC_OSX]: Initialize mac_in_use to 0. * macgui.h [!MAC_OSX]: Don't include Controls.h. Include Windows.h. (Window): Typedef to WindowPtr and move outside `#if TARGET_API_MAC_CARBON'. (XSizeHints): New struct. * macterm.c (x_update_begin, x_update_end) [TARGET_API_MAC_CARBON]: Disable screen updates during update of a frame. (x_draw_glyph_string_background, x_draw_glyph_string_foreground) [MAC_OS8]: Use XDrawImageString/XDrawImageString16. (construct_mouse_click): Put in #if 0. (x_check_fullscreen, x_check_fullscreen_move): Remove decls. (x_scroll_bar_create, x_scroll_bar_handle_click): Change `#ifdef TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'. (activate_scroll_bars, deactivate_scroll_bars) [!TARGET_API_MAC_CARBON]: Use ActivateControl/DeactivateControl. (x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window if the position is neither user-specified nor program-specified. (x_free_frame_resources): Free size_hints. (x_wm_set_size_hint): Allocate size_hints if needed. Set size_hints. (mac_clear_font_name_table): New function. (mac_do_list_fonts): Initialize font_name_table if needed. (x_list_fonts): Don't initialize font_name_table. Add BLOCK_INPUT around mac_do_list_fonts. (mac_unload_font): New function. (x_load_font): Add BLOCK_INPUT around XLoadQueryFont. (init_mac_drag_n_drop, mac_do_receive_drag): Enclose declarations and definitions with #if TARGET_API_MAC_CARBON. [USE_CARBON_EVENTS] (mac_handle_window_event): Add decl. (install_window_handler): Add decl. (do_window_update): Add BeginUpdate/EndUpdate for the tooltip window. Use UpdateControls. Get the rectangle that should be updated and restrict the target of expose_frame to it. (do_grow_window): Set minimum height/width according to size_hints. (do_grow_window) [TARGET_API_MAC_CARBON]: Use ResizeWindow. (do_zoom_window): Don't use x_set_window_size. [USE_CARBON_EVENTS] (mac_handle_window_event): New function. (install_window_handler): New function. [!USE_CARBON_EVENTS] (mouse_region): New variable. [!USE_CARBON_EVENTS] (mac_wait_next_event): New function. (XTread_socket) [USE_CARBON_EVENTS]: Move call to GetEventDispatcherTarget inside BLOCK_INPUT. (XTread_socket) [!USE_CARBON_EVENTS]: Use mac_wait_next_event. Update mouse_region when mouse is moved. (make_mac_frame): Remove. (make_mac_terminal_frame): Put in #ifdef MAC_OS8. Initialize mouse pointer shapes. Change values of f->left_pos and f->top_pos. Don't use make_mac_frame. Use NewCWindow. Don't call ShowWindow. (mac_initialize_display_info) [MAC_OSX]: Create mac_id_name from Vinvocation_name and Vsystem_name. (mac_make_rdb): New function (from w32term.c). (mac_term_init): Use it. Add BLOCK_INPUT. Error if display has already been opened. Don't pass argument to mac_initialize_display_info. Don't set dpyinfo->height/width. Add entries to x_display_list and x_display_name_list. (x_delete_display): New function. (mac_initialize): Don't call mac_initialize_display_info. (syms_of_macterm) [!MAC_OSX]: Don't call Fprovide. * macterm.h (check_mac): Add extern. (struct mac_output): New member size_hints. (FRAME_SIZE_HINTS): New macro. (mac_unload_font): Add extern. * xdisp.c (expose_window, expose_frame): Remove kludges for Mac. * xfaces.c (clear_font_table) [MAC_OS]: call mac_unload_font.
265 lines
7.3 KiB
C
265 lines
7.3 KiB
C
/* Definitions and headers for communication on the Mac OS.
|
|
Copyright (C) 2000, 2001 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@mac.com). */
|
|
|
|
#ifndef EMACS_MACGUI_H
|
|
#define EMACS_MACGUI_H
|
|
|
|
typedef int Display; /* fix later */
|
|
|
|
typedef char * XrmDatabase; /* fix later */
|
|
|
|
typedef unsigned long Time;
|
|
|
|
#if MAC_OSX
|
|
#undef mktime
|
|
#undef DEBUG
|
|
#undef Z
|
|
#undef free
|
|
#undef malloc
|
|
#undef realloc
|
|
/* Macros max and min defined in lisp.h conflict with those in
|
|
precompiled header Carbon.h. */
|
|
#undef max
|
|
#undef min
|
|
#undef init_process
|
|
#include <Carbon/Carbon.h>
|
|
#undef mktime
|
|
#define mktime emacs_mktime
|
|
#undef Z
|
|
#define Z (current_buffer->text->z)
|
|
#undef free
|
|
#define free unexec_free
|
|
#undef malloc
|
|
#define malloc unexec_malloc
|
|
#undef realloc
|
|
#define realloc unexec_realloc
|
|
#undef min
|
|
#define min(a, b) ((a) < (b) ? (a) : (b))
|
|
#undef max
|
|
#define max(a, b) ((a) > (b) ? (a) : (b))
|
|
#undef init_process
|
|
#define init_process emacs_init_process
|
|
#undef INFINITY
|
|
#else
|
|
#include <QuickDraw.h> /* for WindowPtr */
|
|
#include <QDOffscreen.h> /* for GWorldPtr */
|
|
#include <Windows.h>
|
|
#include <Gestalt.h>
|
|
#endif
|
|
|
|
typedef WindowPtr Window;
|
|
typedef GWorldPtr Pixmap;
|
|
|
|
#if TARGET_API_MAC_CARBON
|
|
#define Cursor ThemeCursor
|
|
#define No_Cursor (-1)
|
|
#else
|
|
#define SetPortWindowPort(w) SetPort(w)
|
|
#define Cursor CursHandle
|
|
#define No_Cursor (0)
|
|
extern CursPtr arrow_cursor;
|
|
#endif
|
|
|
|
#define FACE_DEFAULT (~0)
|
|
|
|
|
|
/* Emulate XCharStruct. */
|
|
typedef struct _XCharStruct
|
|
{
|
|
int rbearing;
|
|
int lbearing;
|
|
int width;
|
|
int ascent;
|
|
int descent;
|
|
} XCharStruct;
|
|
|
|
struct MacFontStruct {
|
|
char *fontname;
|
|
|
|
short mac_fontnum; /* font number of font used in this window */
|
|
int mac_fontsize; /* size of font */
|
|
short 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 /* 0 */
|
|
|
|
/* 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 /* 0 */
|
|
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 /* 0 */
|
|
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;
|
|
|
|
/* Structure borrowed from Xlib.h to represent two-byte characters. */
|
|
|
|
typedef struct {
|
|
unsigned char byte1;
|
|
unsigned char byte2;
|
|
} XChar2b;
|
|
|
|
#define STORE_XCHAR2B(chp, b1, b2) \
|
|
((chp)->byte1 = (b1), (chp)->byte2 = (b2))
|
|
|
|
#define XCHAR2B_BYTE1(chp) \
|
|
((chp)->byte1)
|
|
|
|
#define XCHAR2B_BYTE2(chp) \
|
|
((chp)->byte2)
|
|
|
|
|
|
/* 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
|
|
|
|
typedef struct {
|
|
long flags; /* marks which fields in this structure are defined */
|
|
#if 0
|
|
int x, y; /* obsolete for new window mgrs, but clients */
|
|
int width, height; /* should set so old wm's don't mess up */
|
|
#endif
|
|
int min_width, min_height;
|
|
#if 0
|
|
int max_width, max_height;
|
|
#endif
|
|
int width_inc, height_inc;
|
|
#if 0
|
|
struct {
|
|
int x; /* numerator */
|
|
int y; /* denominator */
|
|
} min_aspect, max_aspect;
|
|
#endif
|
|
int base_width, base_height; /* added by ICCCM version 1 */
|
|
#if 0
|
|
int win_gravity; /* added by ICCCM version 1 */
|
|
#endif
|
|
} XSizeHints;
|
|
|
|
#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 ();
|
|
|
|
typedef struct {
|
|
int x, y;
|
|
unsigned width, height;
|
|
} XRectangle;
|
|
|
|
#define NativeRectangle Rect
|
|
|
|
#define CONVERT_TO_XRECT(xr,nr) \
|
|
((xr).x = (nr).left, \
|
|
(xr).y = (nr).top, \
|
|
(xr).width = ((nr).right - (nr).left), \
|
|
(xr).height = ((nr).bottom - (nr).top))
|
|
|
|
#define CONVERT_FROM_XRECT(xr,nr) \
|
|
((nr).left = (xr).x, \
|
|
(nr).top = (xr).y, \
|
|
(nr).right = ((xr).x + (xr).width), \
|
|
(nr).bottom = ((xr).y + (xr).height))
|
|
|
|
#define STORE_NATIVE_RECT(nr,x,y,width,height) \
|
|
((nr).left = (x), \
|
|
(nr).top = (y), \
|
|
(nr).right = ((nr).left + (width)), \
|
|
(nr).bottom = ((nr).top + (height)))
|
|
|
|
#endif /* EMACS_MACGUI_H */
|
|
|
|
/* arch-tag: 5a0da49a-35e2-418b-a58c-8a55778ae849
|
|
(do not change this comment) */
|