diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-05-09 13:07:35 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-05-19 19:50:32 -0600 |
| commit | c0e146e4ec266edf348473c3db7ca8d16745f4f7 (patch) | |
| tree | 3f2070ccbf941ba14f43836f7cfa1b4c78979043 /src/termhooks.h | |
| parent | 05b79539f4d22bfe5160777aa5a963aeb74b000c (diff) | |
| download | emacs-c0e146e4ec266edf348473c3db7ca8d16745f4f7.tar.gz | |
Introduce Emacs_Color struct and typedef
This avoids clashing with the XColor struct from X.
* src/dispextern [HAVE_X_WINDOWS]: Define Emacs_Color alias.
[!HAVE_X_WINDOWS]: Rename XColor compatibility struct to
Emacs_Color. Remove unused fields.
* src/gtkutil.c:
* src/gtkutil.h:
* src/image.c:
* src/nsterm.h:
* src/nsterm.m:
* src/termhooks.h:
* src/w32fns.c:
* src/w32term.c:
* src/w32term.h:
* src/xfaces.c:
* src/xfns.c:
* src/xterm.h: Use Emacs_Color over XColor outside of X-specific
sections.
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index 0962add0817..410273875a6 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -496,7 +496,7 @@ struct terminal If MAKEINDEX (on NS), set COLOR_DEF pixel to ARGB. */ bool (*defined_color_hook) (struct frame *f, const char *color_name, - XColor *color_def, + Emacs_Color *color_def, bool alloc, bool makeIndex); @@ -515,13 +515,13 @@ struct terminal /* This hook is called to store the frame's background color into BGCOLOR. */ - void (*query_frame_background_color) (struct frame *f, XColor *bgcolor); + void (*query_frame_background_color) (struct frame *f, Emacs_Color *bgcolor); #if defined (HAVE_X_WINDOWS) || defined (HAVE_NTGUI) /* On frame F, translate pixel colors to RGB values for the NCOLORS colors in COLORS. Use cached information, if available. */ - void (*query_colors) (struct frame *f, XColor *colors, int ncolors); + void (*query_colors) (struct frame *f, Emacs_Color *colors, int ncolors); #endif /* Return the current position of the mouse. |