Mercurial > emacs
view src/macgui.h @ 51207:7e176ef34c10
Make (many) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
(make_window): Initialize new members
left_margin_cols, right_margin_cols, left_fringe_width,
right_fringe_width, fringes_outside_margins, scroll_bar_width,
and vertical_scroll_bar_type.
(coordinates_in_window): Adapted to new fringe/margin positions
and per-window fringes and scroll-bars.
Fix bug related to incorrectly adjusting coordinates by
frame's internal_border_width (the effect normally negible since
the internal_border_width is typically 0 or 1 pixel, but very
noticeable for an internal_border_width of e.g. 25 pixels).
Upon successful return (other than ON_NOTHING), the coordinates
are now always properly converted to window relative for the
given display element.
(window_from_coordinates): Add new parameters wx and wy to
return the window relative x and y position in the returned
window and part. A null arg means, don't return the position.
All callers changed.
(adjust_window_margins): New function which may reduce the width
of the display margins if a window's text area is too small after
resizing or splitting windows.
(size_window): Fix bug that did not account for display margin
widths when checking the minimum width of a window; use
adjust_window_margins.
(set_window_buffer): Call Fset_window_fringes and
Fset_window_scroll_bars to setup per-window elements.
Add new arg KEEP_MARGINS_P. Non-nil means to keep window's
existing display margin, fringe widths, and scroll bar settings
(e.g. after splitting a window or resizing the frame). All
callers changed.
(Fset_window_buffer): New arg KEEP_MARGINS. All callers changed.
(Fsplit_window): Duplicate original window's display margin,
fringe, and scroll-bar settings; then call Fset_window_buffer with
KEEP_MARGINS non-nil. This fixes a bug which caused a split
window to only preserve the display margins in one of the windows.
When splitting horisontally, call adjust_window_margins on both
windows to ensure that the text area of the new windows is non too
narrow. This fixes a bug which could cause emacs to trap if the
width of the split window was less than the width of the display
margins.
(window_box_text_cols): Renamed from window_internal_width. All
uses changed. Adapt to per-window fringes and scroll bars.
Fix bug that caused vertical separator to be subtracted also on
window frames. Fix another bug that did not reduce the returned
value by the columns used for display margins.
(window_scroll_line_based): Fix bug related to scrolling too much
when display margins are present (implicitly fixed by the fix to
window_box_text_cols).
(scroll_left, scroll_right): Fix bug related to scrolling too far
by default when display margins are present (implicitly fixed by
the fix to window_box_text_cols).
(struct saved_window): Rename members left to left_col, top to
top_line, width to total_cols, height to total_lines, orig_top to
orig_top_line, orig_height to orig_total_lines. All uses changed.
New members left_margin_cols, right_margin_cols,
left_fringe_width, right_fringe_width, fringes_outside_margins,
scroll_bar_width, and vertical_scroll_bar_type for saving
per-window display elements.
(Fset_window_configuration): Restore display margins, fringes,
and scroll bar settings. This fixes a bug which caused display
margins to be discarded when saving and restoring a window
configuration.
(save_window_save): Save display margins, fringes, and scroll bar
settings. This fixes a bug which caused display margins to be
discarded when saving and restoring a window configuration.
(Fset_window_margins): Do nothing if display margins are not
really changed. Otherwise, call adjust_window_margins to ensure
the text area doesn't get too narrow. This fixes a bug which
could cause emacs to trap if setting display margins wider than
the width of the window.
(Fset_window_fringes): New defun to allow user to specifically set
this window's fringe widths and position vs. display margins.
(Fwindow_fringes): New defun to return window's actual fringe
settings.
(Fset_window_scroll_bars): New defun to allow user to specifically
set this window's scroll bar width and position.
(Fwindow_scroll_bars): New defun to return window's actual scroll
bar settings.
(compare_window_configurations): Also compare display margins,
fringes, and scroll bar settings.
(syms_of_window): Defsubr new defuns for fringe and scroll bars.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 22:07:51 +0000 |
parents | 6bc35dcf692b |
children | 695cf19ef79e |
line wrap: on
line source
/* 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 Pixmap; typedef int Bitmap; typedef int Display; /* fix later */ typedef char * XrmDatabase; /* fix later */ typedef unsigned long Time; #if MAC_OSX typedef struct OpaqueWindowPtr* Window; #else #include <QuickDraw.h> typedef WindowPtr Window; #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 #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 */