Mercurial > emacs
comparison src/xterm.h @ 47144:aef410a9a629
(enum text_cursor_kinds): Removed.
(struct output_x) <current_cursor, desired_cursor, cursor_width>
<blink_off_cursor, blink_off_cursor_width>: Members removed.
(FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR)
(FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed.
(x_specified_cursor_type): Remove prototype.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Fri, 30 Aug 2002 12:05:31 +0000 |
parents | 1afff47013bb |
children | f8288cd7d1cd |
comparison
equal
deleted
inserted
replaced
47143:264271f9ab24 | 47144:aef410a9a629 |
---|---|
104 | StructureNotifyMask \ | 104 | StructureNotifyMask \ |
105 | FocusChangeMask \ | 105 | FocusChangeMask \ |
106 | LeaveWindowMask \ | 106 | LeaveWindowMask \ |
107 | EnterWindowMask \ | 107 | EnterWindowMask \ |
108 | VisibilityChangeMask) | 108 | VisibilityChangeMask) |
109 | |
110 enum text_cursor_kinds | |
111 { | |
112 NO_CURSOR = -1, | |
113 FILLED_BOX_CURSOR, | |
114 HOLLOW_BOX_CURSOR, | |
115 BAR_CURSOR, | |
116 HBAR_CURSOR | |
117 }; | |
118 | 109 |
119 /* Structure recording X pixmap and reference count. | 110 /* Structure recording X pixmap and reference count. |
120 If REFCOUNT is 0 then this record is free to be reused. */ | 111 If REFCOUNT is 0 then this record is free to be reused. */ |
121 | 112 |
122 struct x_bitmap_record | 113 struct x_bitmap_record |
508 unsigned hourglass_p : 1; | 499 unsigned hourglass_p : 1; |
509 | 500 |
510 /* Flag to set when the X window needs to be completely repainted. */ | 501 /* Flag to set when the X window needs to be completely repainted. */ |
511 int needs_exposure; | 502 int needs_exposure; |
512 | 503 |
513 /* What kind of text cursor is drawn in this window right now? | |
514 (If there is no cursor (phys_cursor_x < 0), then this means nothing.) */ | |
515 enum text_cursor_kinds current_cursor; | |
516 | |
517 /* What kind of text cursor should we draw in the future? | |
518 This should always be filled_box_cursor or bar_cursor. */ | |
519 enum text_cursor_kinds desired_cursor; | |
520 | |
521 /* Width of bar cursor (if we are using that). */ | |
522 int cursor_width; | |
523 | |
524 /* What kind of text cursor should we draw when the cursor blinks off? | |
525 This can be filled_box_cursor or bar_cursor or no_cursor. */ | |
526 enum text_cursor_kinds blink_off_cursor; | |
527 | |
528 /* Width of bar cursor (if we are using that) for blink-off state. */ | |
529 int blink_off_cursor_width; | |
530 | |
531 /* These are the current window manager hints. It seems that | 504 /* These are the current window manager hints. It seems that |
532 XSetWMHints, when presented with an unset bit in the `flags' | 505 XSetWMHints, when presented with an unset bit in the `flags' |
533 member of the hints structure, does not leave the corresponding | 506 member of the hints structure, does not leave the corresponding |
534 attribute unchanged; rather, it resets that attribute to its | 507 attribute unchanged; rather, it resets that attribute to its |
535 default value. For example, unless you set the `icon_pixmap' | 508 default value. For example, unless you set the `icon_pixmap' |
698 #define FRAME_X_FONT_TABLE(f) (FRAME_X_DISPLAY_INFO (f)->font_table) | 671 #define FRAME_X_FONT_TABLE(f) (FRAME_X_DISPLAY_INFO (f)->font_table) |
699 | 672 |
700 /* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}. */ | 673 /* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}. */ |
701 #define PIXEL_WIDTH(f) ((f)->output_data.x->pixel_width) | 674 #define PIXEL_WIDTH(f) ((f)->output_data.x->pixel_width) |
702 #define PIXEL_HEIGHT(f) ((f)->output_data.x->pixel_height) | 675 #define PIXEL_HEIGHT(f) ((f)->output_data.x->pixel_height) |
703 | |
704 #define FRAME_DESIRED_CURSOR(f) ((f)->output_data.x->desired_cursor) | |
705 #define FRAME_BLINK_OFF_CURSOR(f) ((f)->output_data.x->blink_off_cursor) | |
706 #define FRAME_CURSOR_WIDTH(f) ((f)->output_data.x->cursor_width) | |
707 #define FRAME_BLINK_OFF_CURSOR_WIDTH(f) ((f)->output_data.x->blink_off_cursor_width) | |
708 | 676 |
709 #define FRAME_XIC(f) ((f)->output_data.x->xic) | 677 #define FRAME_XIC(f) ((f)->output_data.x->xic) |
710 #define FRAME_X_XIM(f) (FRAME_X_DISPLAY_INFO (f)->xim) | 678 #define FRAME_X_XIM(f) (FRAME_X_DISPLAY_INFO (f)->xim) |
711 #define FRAME_X_XIM_STYLES(f) (FRAME_X_DISPLAY_INFO (f)->xim_styles) | 679 #define FRAME_X_XIM_STYLES(f) (FRAME_X_DISPLAY_INFO (f)->xim_styles) |
712 #define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style) | 680 #define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style) |
1099 extern int x_pixel_height P_ ((struct frame *)); | 1067 extern int x_pixel_height P_ ((struct frame *)); |
1100 extern int x_char_width P_ ((struct frame *)); | 1068 extern int x_char_width P_ ((struct frame *)); |
1101 extern int x_char_height P_ ((struct frame *)); | 1069 extern int x_char_height P_ ((struct frame *)); |
1102 extern int x_screen_planes P_ ((struct frame *)); | 1070 extern int x_screen_planes P_ ((struct frame *)); |
1103 extern void x_sync P_ ((struct frame *)); | 1071 extern void x_sync P_ ((struct frame *)); |
1104 extern enum text_cursor_kinds x_specified_cursor_type P_ ((Lisp_Object, int *)); | |
1105 extern int x_defined_color P_ ((struct frame *, char *, XColor *, int)); | 1072 extern int x_defined_color P_ ((struct frame *, char *, XColor *, int)); |
1106 #ifdef HAVE_X_I18N | 1073 #ifdef HAVE_X_I18N |
1107 extern void free_frame_xic P_ ((struct frame *)); | 1074 extern void free_frame_xic P_ ((struct frame *)); |
1108 #endif | 1075 #endif |
1109 extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); | 1076 extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); |