diff options
| author | Jim Blandy <jimb@redhat.com> | 1993-01-26 01:58:16 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1993-01-26 01:58:16 +0000 |
| commit | dbc4e1c12940079cad7b24e1654a0badcda8d6fc (patch) | |
| tree | e0fbea5b15bd13d2839c8b59b624cec80f31bfd8 /src/xterm.h | |
| parent | 72766144811cd7258b2a59e56f6e3657537ea508 (diff) | |
| download | emacs-dbc4e1c12940079cad7b24e1654a0badcda8d6fc.tar.gz | |
JimB's changes since January 18th
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/xterm.h b/src/xterm.h index 9bf083fa788..025e277a22f 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -239,9 +239,6 @@ enum text_cursor_kinds { filled_box_cursor, hollow_box_cursor, bar_cursor }; -#define PIXEL_WIDTH(f) ((f)->display.x->pixel_width) -#define PIXEL_HEIGHT(f) ((f)->display.x->pixel_height) - /* Each X frame object points to its own struct x_display object in the display.x field. The x_display structure contains all the information that is specific to X windows. */ @@ -316,9 +313,13 @@ struct x_display /* Flag to set when the X window needs to be completely repainted. */ int needs_exposure; - /* What kind of text cursor is drawn in this window right now? (If - there is no cursor (phys_cursor_x < 0), then this means nothing. */ - enum text_cursor_kinds text_cursor_kind; + /* What kind of text cursor is drawn in this window right now? + (If there is no cursor (phys_cursor_x < 0), then this means nothing.) */ + enum text_cursor_kinds current_cursor; + + /* What kind of text cursor should we draw in the future? + This should always be filled_box_cursor or bar_cursor. */ + enum text_cursor_kinds desired_cursor; /* These are the current window manager hints. It seems that XSetWMHints, when presented with an unset bit in the `flags' @@ -341,6 +342,12 @@ struct x_display /* Return the window associated with the frame F. */ #define FRAME_X_WINDOW(f) ((f)->display.x->window_desc) +/* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}. */ +#define PIXEL_WIDTH(f) ((f)->display.x->pixel_width) +#define PIXEL_HEIGHT(f) ((f)->display.x->pixel_height) + +#define FRAME_DESIRED_CURSOR(f) ((f)->display.x->desired_cursor) + /* When X windows are used, a glyf may be a 16 bit unsigned datum. The high order byte is the face number and is used as an index |