Mercurial > emacs
view src/dispextern.h @ 1776:20c6f4aa5843
Make scrollbar structures into lisp objects, so that they can be
GC'd; this allows windows and scrollbars can refer to each other
without worrying about dangling pointers.
* xterm.h (struct x_display): vertical_scrollbars and
judge_timestamp members deleted.
(struct scrollbar): Redesigned to be a template for a Lisp_Vector.
(SCROLLBAR_VEC_SIZE, XSCROLLBAR, SCROLLBAR_PACK, SCROLLBAR_UNPACK,
SCROLLBAR_X_WINDOW, SET_SCROLLBAR_X_WINDOW,
VERTICAL_SCROLLBAR_INSIDE_WIDTH, VERTICAL_SCROLLBAR_TOP_RANGE,
VERTICAL_SCROLLBAR_INSIDE_HEIGHT, VERTICAL_SCROLLBAR_MIN_HANDLE):
New macros, to help deal with the lispy structures, and deal with
the graphics.
* frame.h (WINDOW_VERTICAL_SCROLLBAR): Macro deleted.
(struct frame): New fields `scrollbars' and
`condemned_scrollbars', for use by the scrollbar implementation.
[MULTI_FRAME and not MULTI_FRAME] (FRAME_SCROLLBARS,
FRAME_CONDEMNED_SCROLLBARS): Accessors for the new field.
* window.h (struct window): Doc fix for vertical_scrollbar field.
* frame.c (make_frame): Initialize the `scrollbars' and
`condemned_scrollbars' fields of the new frame.
* alloc.c (mark_object): Mark the `scrollbars' and
`condemned_scrollbars' slots of frames.
* xterm.c (x_window_to_scrollbar): Scrollbars are chained on
frames' scrollbar field, not their x.display->vertical_scrollbars
field.
(x_scrollbar_create, x_scrollbar_set_handle, x_scrollbar_move,
x_scrollbar_remove, XTset_vertical_scrollbar,
XTcondemn_scrollbars, XTredeem_scrollbar, XTjudge_scrollbars,
x_scrollbar_expose, x_scrollbar_handle_click,
x_scrollbar_handle_motion): Substantially rewritten to correct
typos and brainos, and to accomodate the lispy structures.
* frame.h (FRAME_SAMPLE_VISIBILITY): Make sure frame is marked as
garbaged whenever it goes from invisible to visible.
* dispextern.h (frame_garbaged): Move extern declaration from here...
* frame.h (frame_garbaged): ... to here. The FRAME_SAMPLE_VISIBILITY
macro uses it now, and this seems to be just as modular. Make a
new page, just for this and message_buf_print.
(struct frame): Doc fix for the `visible' field.
* process.c: #include "frame.h" instead of "dispextern.h"; the
only thing we care about from it is the frame_garbaged
declaration.
* ymakefile: Note dependency change.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Thu, 14 Jan 1993 15:09:51 +0000 |
parents | c3225b867171 |
children | d01c59bac5c1 |
line wrap: on
line source
/* Interface definitions for display code. Copyright (C) 1985, 1992 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, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Nonzero means don't assume anything about current contents of actual terminal frame */ extern int frame_garbaged; /* Nonzero means last display completed and cursor is really at cursX, cursY. Zero means it was preempted. */ extern int display_completed; #ifdef HAVE_X_WINDOWS #include <X11/Xlib.h> struct face { /* If this is non-zero, it is a GC we can use without modification to represent this face. */ GC gc; /* Pixel value for foreground color. */ int foreground; /* Pixel value for background color. */ int background; /* Font used for this face */ XFontStruct font; /* Background stipple or bitmap used for this face. */ Pixmap stipple; /* Whether or not to underline text in this face. */ char underline; }; typedef struct face *FACE; #define NORMAL_FACE ((FACE *) 0) #define FACE_HAS_GC(f) ((f)->gc) #define FACE_GC(f) ((f)->gc) #define FACE_FOREGROUND(f) ((f)->foreground) #define FACE_BACKGROUND(f) ((f)->background) #define FACE_FONT(f) ((f)->font) #define FACE_STIPPLE(f) ((f)->stipple) #define FACE_UNDERLINE_P(f) ((f)->underline) #else /* Not X */ typedef int FACE; #define NORMAL_FACE 0x0 #define HIGHLIGHT_FACE 0x1 #define UNDERLINE_FACE 0x2 #define HIGHLIGHT_UNDERLINE_FACE 0x3 #define FACE_HIGHLIGHT(f) ((f) & 0x1) #define FACE_UNDERLINE(f) ((f) & 0x2) #endif /* Not X */ /* This structure is used for the actual display of text on a frame. There are two instantiations of it: the glyphs currently displayed, and the glyphs we desire to display. The latter object is generated from buffers being displayed. */ struct frame_glyphs { #ifdef MULTI_FRAME struct frame *frame; /* Frame these glyphs belong to. */ #endif /* MULTI_FRAME */ int height; int width; /* Contents of the frame. glyphs[V][H] is the glyph at position V, H. Note that glyphs[V][-1], glyphs[V][used[V]], and glyphs[V][frame_width] are always '\0'. */ GLYPH **glyphs; /* long vector from which the strings in `glyphs' are taken. */ GLYPH *total_contents; /* When representing a desired frame, enable[n] == 0 means that line n is same as current frame. Between updates, all lines should be disabled. When representing current frame contents, enable[n] == 0 means that line n is blank. */ char *enable; /* Everything on line n after column used[n] is considered blank. */ int *used; /* highlight[n] != 0 iff line n is highlighted. */ char *highlight; /* Buffer offset of this line's first char. */ int *bufp; #ifdef HAVE_X_WINDOWS /* Pixel position of top left corner of line. */ short *top_left_x; short *top_left_y; /* Pixel width of line. */ short *pix_width; /* Pixel height of line. */ short *pix_height; /* Largest font ascent on this line. */ short *max_ascent; #endif /* HAVE_X_WINDOWS */ }; extern void get_display_line (); extern Lisp_Object sit_for ();