Mercurial > emacs
annotate lwlib/xlwmenuP.h @ 26729:f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
* xfaces.c (XColor) [!HAVE_X_WINDOWS]: Provide a typedef for non-X
frames.
(Vface_tty_color_alist): Remove.
(tty_defined_color): New function.
(defined_color): Rewrite to support any type of frame.
(tty_color_name): New function.
(face_color_supported_p, Fface_color_gray_p,
Fface_color_supported_p): Support non-X frames.
(load_color): Enclose the color name in quotes, in the log
messages. Remove DOS-specific version of load_color.
(realize_tty_face): Take the supported colors from
tty-color-alist. Support translation of X colors to the closest
tty color, for both MSDOS and tty frames.
[MSDOS]: Don't invert face colors if they were taken from the
frame colors.
(Fface_register_tty_color, Fface_clear_tty_colors): Remove.
* frame.h (struct x_output) [!MSDOS, !WINDOWSNT, !HAVE_X_WINDOWS]:
Define a mostly empty surrogate.
(tty_display): Declare.
* frame.c (make_terminal_frame) [!macintosh]: Don't use
tty_display.
(Fframe_parameters): Don't invert colors of non-FRAME_WINDOW_P
frames when the frame's param_alist includes 'reverse.
(tty_display): Define.
(make_terminal_frame) [!MSDOS]: Assign &tty_display to the
output_data.x member.
(Fframe_parameters): Return foreground and background color names
on tty frames as well, in addition to MSDOS frames.
* msdos.h (DisplayWidth, DisplayHeight): Changes for Lisp_Object
selected_frame.
(struct x_output): Remove unused members; document who uses each
member.
(FRAME_PARAM_FACES, FRAME_N_PARAM_FACES, FRAME_DEFAULT_PARAM_FACE,
FRAME_MODE_LINE_PARAM_FACE, FRAME_COMPUTED_FACES,
FRAME_N_COMPUTED_FACES, FRAME_SIZE_COMPUTED_FACES,
FRAME_DEFAULT_FACE, FRAME_MODE_LINE_FACE, unload_color): Remove
unused macro definintions.
* msdos.c (IT_set_frame_parameters): Don't call
recompute_basic_faces, the next redisplay will, anyway.
(x_current_display): Remove unused variable.
Many functions: changes for Lisp_object selected_frame.
(IT_set_face): If the tty_reverse_p flag is set for the face,
reverse the foreground and background colors.
(Fmsdos_remember_default_colors): New function.
(syms_of_msdos): Defsubr it.
(IT_set_frame_parameters): Use initial_screen_colors[] when
creating a new frame. If the frame parameters include 'reverse,
swap the foreground and background colors.
(internal_terminal_init): Initialize initial_screen_colors to -1.
(syms_of_msdos): Add DEFVAR_BOOL for x-stretch-cursor, to shut up
cus-start.el.
* Makefile.in (lisp, shortlisp): Add lisp/term/tty-colors.elc.
* xfns.c (x_defined_color): Rename from defined_color. All
callers changed.
(Fxw_color_defined_p): Renamed from Fx_color_defined_p;
all callers changed.
(Fxw_color_values): Renamed from Fx_color_values; all callers
changed.
(Fxw_display_color_p): Renamed from Fx_display_color_p; all
callers changed.
(x_window_to_frame, x_any_window_to_frame,
x_non_menubar_window_to_frame, x_menubar_window_to_frame,
x_top_window_to_frame): Use !FRAME_X_P instead of
f->output_data.nothing.
* xterm.h (x_defined_color): Rename from defined_color.
* w32fns.c (x_window_to_frame): Use FRAME_W32_P instead of
f->output_data.nothing.
(Fxw_color_defined_p): Renamed from Fx_color_defined_p;
all callers changed.
(Fxw_color_values): Renamed from Fx_color_values; all callers
changed.
(Fxw_display_color_p): Renamed from Fx_display_color_p; all
callers changed.
* dispextern.h (tty_color_name): Add prototype.
* xmenu.c (menubar_id_to_frame): Use FRAME_WINDOW_P instead of
f->output_data.nothing.
* w32menu.c (menubar_id_to_frame): Likewise.
* w32term.h (w32_output): Declare.
* dosfns.c (Qmsdos_color_translate): Remove.
(msdos_stdcolor_name): Now returns a Lisp_Object.
* dosfns.h (Qmsdos_color_translate): Remove.
* s/msdos.h (INTERNAL_TERMINAL): Add entries for color support.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Mon, 06 Dec 1999 16:54:09 +0000 |
parents | 584c34c7cf53 |
children | 1d84a7873d7c |
rev | line source |
---|---|
7359 | 1 #ifndef _XlwMenuP_h |
2 #define _XlwMenuP_h | |
3 | |
4 #include "xlwmenu.h" | |
5 #include <X11/CoreP.h> | |
6 | |
7 /* Elements in the stack arrays. */ | |
8 typedef struct _window_state | |
9 { | |
10 Window window; | |
11 Position x; | |
12 Position y; | |
13 Dimension width; | |
14 Dimension height; | |
15 Dimension label_width; | |
25033
584c34c7cf53
(_window_state): Add button_width.
Gerd Moellmann <gerd@gnu.org>
parents:
7360
diff
changeset
|
16 |
584c34c7cf53
(_window_state): Add button_width.
Gerd Moellmann <gerd@gnu.org>
parents:
7360
diff
changeset
|
17 /* Width of toggle buttons or radio buttons. */ |
584c34c7cf53
(_window_state): Add button_width.
Gerd Moellmann <gerd@gnu.org>
parents:
7360
diff
changeset
|
18 Dimension button_width; |
7359 | 19 } window_state; |
20 | |
21 | |
22 /* New fields for the XlwMenu widget instance record */ | |
23 typedef struct _XlwMenu_part | |
24 { | |
25 /* slots set by the resources */ | |
26 XFontStruct* font; | |
7360 | 27 Pixel foreground; |
7359 | 28 Pixel button_foreground; |
29 Dimension margin; | |
30 Dimension horizontal_spacing; | |
31 Dimension vertical_spacing; | |
32 Dimension arrow_spacing; | |
33 Dimension shadow_thickness; | |
34 Pixel top_shadow_color; | |
35 Pixel bottom_shadow_color; | |
36 Pixmap top_shadow_pixmap; | |
37 Pixmap bottom_shadow_pixmap; | |
7360 | 38 Cursor cursor_shape; |
7359 | 39 XtCallbackList open; |
40 XtCallbackList select; | |
41 widget_value* contents; | |
42 int horizontal; | |
43 | |
44 /* State of the XlwMenu */ | |
45 int old_depth; | |
46 widget_value** old_stack; | |
47 int old_stack_length; | |
48 | |
49 /* New state after the user moved */ | |
50 int new_depth; | |
51 widget_value** new_stack; | |
52 int new_stack_length; | |
53 | |
54 /* Window resources */ | |
55 window_state* windows; | |
56 int windows_length; | |
57 | |
58 /* Internal part, set by the XlwMenu */ | |
59 GC foreground_gc; | |
60 GC button_gc; | |
61 GC background_gc; | |
62 GC inactive_gc; | |
63 GC inactive_button_gc; | |
64 GC shadow_top_gc; | |
65 GC shadow_bottom_gc; | |
66 Cursor cursor; | |
67 Boolean popped_up; | |
68 Pixmap gray_pixmap; | |
69 } XlwMenuPart; | |
70 | |
71 /* Full instance record declaration */ | |
72 typedef struct _XlwMenuRec | |
73 { | |
74 CorePart core; | |
75 XlwMenuPart menu; | |
76 } XlwMenuRec; | |
77 | |
78 /* New fields for the XlwMenu widget class record */ | |
79 typedef struct | |
80 { | |
81 int dummy; | |
82 } XlwMenuClassPart; | |
83 | |
84 /* Full class record declaration. */ | |
85 typedef struct _XlwMenuClassRec | |
86 { | |
87 CoreClassPart core_class; | |
88 XlwMenuClassPart menu_class; | |
89 } XlwMenuClassRec; | |
90 | |
91 /* Class pointer. */ | |
92 extern XlwMenuClassRec xlwMenuClassRec; | |
93 | |
94 #endif /* _XlwMenuP_h */ |