X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2ab1394150d6f2f0a41cddd93a978b96dcdf5b7b..9a5114ac7e384d28a13c99725380b6024abde5cf:/src/xterm.h diff --git a/src/xterm.h b/src/xterm.h index 607cf02cac..f28e170e0d 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -15,7 +15,8 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include #include @@ -70,14 +71,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #endif #endif -#ifdef XlibSpecificationRelease -#if XlibSpecificationRelease >= 5 -#define HAVE_X11R5 +#ifdef HAVE_X11R5 /* In case someone has X11R5 on AIX 3.1, make sure HAVE_X11R4 is defined as well as HAVE_X11R5. */ #define HAVE_X11R4 #endif -#endif #ifdef HAVE_X11R5 #define HAVE_X_I18N @@ -93,25 +91,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define FONT_HEIGHT(f) ((f)->ascent + (f)->descent) #define FONT_BASE(f) ((f)->ascent) -#define CHECK_X_FRAME(f, frame) \ - if (NILP (frame)) \ - f = selected_frame; \ - else \ - { \ - CHECK_LIVE_FRAME (frame, 0); \ - f = XFRAME (frame); \ - } \ - if (! FRAME_X_P (f)) - - - /* The mask of events that text windows always want to receive. This - does not include mouse movement events. It is used when the window - is created (in x_window) and and in selection processing. - - We do include ButtonReleases in this set because Emacs isn't always - fast enough to catch them when it wants them, and they're rare - enough that they don't use much processor time. */ + includes mouse movement events, since handling the mouse-font text property + means that we must track mouse motion all the time. */ #define STANDARD_EVENT_SET \ (KeyPressMask \ @@ -119,7 +101,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | ButtonPressMask \ | ButtonReleaseMask \ | PointerMotionMask \ - | PointerMotionHintMask \ | StructureNotifyMask \ | FocusChangeMask \ | LeaveWindowMask \ @@ -143,16 +124,6 @@ enum text_cursor_kinds { filled_box_cursor, hollow_box_cursor, bar_cursor }; -/* This data type is used for the font_table field - of struct x_display_info. */ - -struct font_info -{ - XFontStruct *font; - char *name; - char *full_name; -}; - /* Structure recording X pixmap and reference count. If REFCOUNT is 0 then this record is free to be reused. */ @@ -288,8 +259,16 @@ struct x_display_info /* More atoms, which are selection types. */ Atom Xatom_CLIPBOARD, Xatom_TIMESTAMP, Xatom_TEXT, Xatom_DELETE, + Xatom_COMPOUND_TEXT, Xatom_MULTIPLE, Xatom_INCR, Xatom_EMACS_TMP, Xatom_TARGETS, Xatom_NULL, Xatom_ATOM_PAIR; + + /* More atoms for font properties. The last three are private + properties, see the comments in src/fontset.h. */ + Atom Xatom_PIXEL_SIZE, + Xatom_MULE_BASELINE_OFFSET, Xatom_MULE_RELATIVE_COMPOSE, + Xatom_MULE_DEFAULT_ASCENT; + #ifdef MULTI_KBOARD struct kboard *kboard; #endif @@ -314,6 +293,10 @@ struct x_display_info frame. It differs from x_focus_frame when we're using a global minibuffer. */ struct frame *x_highlight_frame; + + /* The null pixel used for filling a character background with + background color of a gc. */ + Pixmap null_pixel; }; /* This is a chain of structures for all the X displays currently in use. */ @@ -325,10 +308,16 @@ extern struct x_display_info *x_display_list; FONT-LIST-CACHE records previous values returned by x-list-fonts. */ extern Lisp_Object x_display_name_list; +/* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */ +extern Lisp_Object Vx_pixel_size_width_font_regexp; + extern struct x_display_info *x_display_info_for_display (); extern struct x_display_info *x_display_info_for_name (); extern struct x_display_info *x_term_init (); + +extern Lisp_Object x_list_fonts (); +extern struct font_info *x_get_font_info(), *x_load_font (), *x_query_font (); /* Each X frame object points to its own struct x_output object in the output_data.x field. The x_output structure contains @@ -399,8 +388,16 @@ struct x_output icon. */ int icon_bitmap; + /* Default ASCII font of this frame. */ XFontStruct *font; + /* The baseline position of the default ASCII font. */ + int font_baseline; + + /* If a fontset is specified for this frame instead of font, this + value contains an ID of the fontset, else -1. */ + int fontset; + /* Pixel values used for various purposes. border_pixel may be -1 meaning use a gray tile. */ unsigned long background_pixel; @@ -472,8 +469,8 @@ struct x_output struct x_display_info *display_info; /* This is a button event that wants to activate the menubar. - We save it here until the command loop gets to think about it. */ - XButtonEvent *saved_button_event; + We save it here until the command loop gets to think about it. */ + XEvent *saved_menu_event; /* This is the widget id used for this frame's menubar in lwlib. */ #ifdef USE_X_TOOLKIT @@ -488,6 +485,8 @@ struct x_output char asked_for_visible; #ifdef HAVE_X_I18N + /* Input method. */ + XIM xim; /* Input context (currently, this means Compose key handler setup). */ XIC xic; #endif @@ -511,6 +510,7 @@ struct x_output #define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel) #define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel) #define FRAME_FONT(f) ((f)->output_data.x->font) +#define FRAME_FONTSET(f) ((f)->output_data.x->fontset) #define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.x->internal_border_width) #define FRAME_LINE_HEIGHT(f) ((f)->output_data.x->line_height) @@ -523,12 +523,16 @@ struct x_output /* This is the `Screen *' which frame F is on. */ #define FRAME_X_SCREEN(f) (FRAME_X_DISPLAY_INFO (f)->screen) +/* This is the 'font_info *' which frame F has. */ +#define FRAME_X_FONT_TABLE(f) (FRAME_X_DISPLAY_INFO (f)->font_table) + /* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}. */ #define PIXEL_WIDTH(f) ((f)->output_data.x->pixel_width) #define PIXEL_HEIGHT(f) ((f)->output_data.x->pixel_height) #define FRAME_DESIRED_CURSOR(f) ((f)->output_data.x->desired_cursor) +#define FRAME_XIM(f) ((f)->output_data.x->xim) #define FRAME_XIC(f) ((f)->output_data.x->xic) /* X-specific scroll bar stuff. */ @@ -616,8 +620,11 @@ struct scroll_bar { /* Return the inside width of a vertical scroll bar, given the outside width. */ -#define VERTICAL_SCROLL_BAR_INSIDE_WIDTH(width) \ - ((width) - VERTICAL_SCROLL_BAR_LEFT_BORDER - VERTICAL_SCROLL_BAR_RIGHT_BORDER) +#define VERTICAL_SCROLL_BAR_INSIDE_WIDTH(f, width) \ + ((width) \ + - VERTICAL_SCROLL_BAR_LEFT_BORDER \ + - VERTICAL_SCROLL_BAR_RIGHT_BORDER \ + - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2) /* Return the length of the rectangle within which the top of the handle must stay. This isn't equivalent to the inside height, @@ -626,12 +633,12 @@ struct scroll_bar { This is the real range of motion for the scroll bar, so when we're scaling buffer positions to scroll bar positions, we use this, not VERTICAL_SCROLL_BAR_INSIDE_HEIGHT. */ -#define VERTICAL_SCROLL_BAR_TOP_RANGE(height) \ - (VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (height) - VERTICAL_SCROLL_BAR_MIN_HANDLE) +#define VERTICAL_SCROLL_BAR_TOP_RANGE(f, height) \ + (VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (f, height) - VERTICAL_SCROLL_BAR_MIN_HANDLE) /* Return the inside height of vertical scroll bar, given the outside height. See VERTICAL_SCROLL_BAR_TOP_RANGE too. */ -#define VERTICAL_SCROLL_BAR_INSIDE_HEIGHT(height) \ +#define VERTICAL_SCROLL_BAR_INSIDE_HEIGHT(f, height) \ ((height) - VERTICAL_SCROLL_BAR_TOP_BORDER - VERTICAL_SCROLL_BAR_BOTTOM_BORDER) @@ -654,6 +661,10 @@ struct scroll_bar { /* Minimum lengths for scroll bar handles, in pixels. */ #define VERTICAL_SCROLL_BAR_MIN_HANDLE (5) +/* Trimming off a few pixels from each side prevents + text from glomming up against the scroll bar */ +#define VERTICAL_SCROLL_BAR_WIDTH_TRIM (2) + /* Manipulating pixel sizes and character sizes. Knowledge of which factors affect the overall size of the window should @@ -703,11 +714,15 @@ struct scroll_bar { by this structure. */ /* For an event of kind selection_request_event, - this structure really describes the contents. */ + this structure really describes the contents. + **Don't make this struct longer!** + If it overlaps the frame_or_window field of struct input_event, + that will cause GC to crash. */ struct selection_input_event { int kind; Display *display; + /* We spell it with an "o" here because X does. */ Window requestor; Atom selection, target, property; Time time; @@ -715,6 +730,7 @@ struct selection_input_event #define SELECTION_EVENT_DISPLAY(eventp) \ (((struct selection_input_event *) (eventp))->display) +/* We spell it with an "o" here because X does. */ #define SELECTION_EVENT_REQUESTOR(eventp) \ (((struct selection_input_event *) (eventp))->requestor) #define SELECTION_EVENT_SELECTION(eventp) \