diff options
| author | Yuuki Harano | 2020-05-12 22:39:15 +0900 |
|---|---|---|
| committer | Jeff Walsh | 2020-11-24 12:24:40 +1100 |
| commit | d68633bfa1124e32f6aa6a288a9c7b2098a39bd8 (patch) | |
| tree | cff14bac6d7ece318d90b72e2e1919a195798c72 /src/pgtkterm.h | |
| parent | fe2297ce7aa0e400f4a80484e2872dcee0de1391 (diff) | |
| download | emacs-d68633bfa1124e32f6aa6a288a9c7b2098a39bd8.tar.gz emacs-d68633bfa1124e32f6aa6a288a9c7b2098a39bd8.zip | |
* src/pgtkterm.c (pgtk_defined_color): support gtk special colors
Color functions take the frame
* src/gtkutil.c (xg_check_special_colors): pass frame as argument.
* src/pgtkfns.c (x_set_foreground_color, x_set_background_color,
x_set_cursor_color, pgtk_set_scroll_bar_foreground,
pgtk_set_scroll_bar_background, Fxw_color_defined_p,
Fxw_color_values): pass frame as argument.
* src/pgtkterm.c (pgtk_parse_color): take frame as argument.
(pgtk_lisp_to_color): take frame as argument, and pass it.
Remove pgtk_lisp_to_color
* src/pgtkfns.c (x_set_foreground_color, x_set_background_color,
x_set_cursor_color): use x_decode_color instead of pgtk_lisp_to_color.
(Fxw_color_defined_p, Fxw_color_values):
use pgtk_defined_color instead of pgtk_lisp_to_color.
* src/pgtkterm.c (pgtk_lisp_to_color): remove.
* src/gtkutil.c (xg_check_special_colors): change color format
* src/pgtkterm.h: remove pgtk_lisp_to_color declaration
Diffstat (limited to 'src/pgtkterm.h')
| -rw-r--r-- | src/pgtkterm.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pgtkterm.h b/src/pgtkterm.h index 706198aa8a4..b92a2cd1d19 100644 --- a/src/pgtkterm.h +++ b/src/pgtkterm.h | |||
| @@ -534,8 +534,7 @@ extern bool pgtk_defined_color (struct frame *f, | |||
| 534 | bool makeIndex); | 534 | bool makeIndex); |
| 535 | extern void pgtk_query_color (struct frame *f, Emacs_Color *color); | 535 | extern void pgtk_query_color (struct frame *f, Emacs_Color *color); |
| 536 | extern void pgtk_query_colors (struct frame *f, Emacs_Color *colors, int ncolors); | 536 | extern void pgtk_query_colors (struct frame *f, Emacs_Color *colors, int ncolors); |
| 537 | extern int pgtk_parse_color (const char *color_name, Emacs_Color *color); | 537 | extern int pgtk_parse_color (struct frame *f, const char *color_name, Emacs_Color *color); |
| 538 | extern int pgtk_lisp_to_color (Lisp_Object color, Emacs_Color *col); | ||
| 539 | 538 | ||
| 540 | /* Implemented in pgtkterm.c */ | 539 | /* Implemented in pgtkterm.c */ |
| 541 | extern void pgtk_clear_area (struct frame *f, int x, int y, int width, int height); | 540 | extern void pgtk_clear_area (struct frame *f, int x, int y, int width, int height); |