diff options
| author | Alan Third <alan@idiocy.org> | 2021-08-15 10:46:43 +0100 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2021-12-22 20:48:19 +0000 |
| commit | 11c0b2550331df6b7f812c61cb4113c42ea99ad7 (patch) | |
| tree | 6ccb33d948238481030436901659aa7e6549a1de /src/dispextern.h | |
| parent | 0f427befe82f88237bdccbd528baf76f6d6485b0 (diff) | |
| download | emacs-11c0b2550331df6b7f812c61cb4113c42ea99ad7.tar.gz emacs-11c0b2550331df6b7f812c61cb4113c42ea99ad7.tar.bz2 emacs-11c0b2550331df6b7f812c61cb4113c42ea99ad7.zip | |
Further cleanup of NS color code
* src/dispextern.h (FACE_COLOR_TO_PIXEL): Remove define and fix all
callers.
* src/nsterm.h (struct nsfont_info): Remove color_table.
* src/nsterm.m ([NSColor colorWithUnsignedLong:]): Always assume the
input contains the correct alpha value.
(ns_lookup_indexed_color):
(ns_index_color):
(ns_color_index_to_rgba): Remove functions and fix all callers.
(ns_query_color): No longer set pixel to the lookup table index,
always just set it to the ARGB integer value.
(ns_defined_color): Ignore makeindex as we no longer set pixel to the
lookup table index.
(ns_initialize_display_info):
(ns_redisplay_interface): Remove lookup table.
(ns_term_init): Fix the alpha setting.
thing
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 0f316a2eaf9..f1d99abad32 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -123,15 +123,10 @@ typedef HDC Emacs_Pix_Context; #ifdef HAVE_NS #include "nsgui.h" -#define FACE_COLOR_TO_PIXEL(face_color, frame) (FRAME_NS_P (frame) \ - ? ns_color_index_to_rgba (face_color, frame) \ - : face_color) /* Following typedef needed to accommodate the MSDOS port, believe it or not. */ typedef struct ns_display_info Display_Info; typedef Emacs_Pixmap Emacs_Pix_Container; typedef Emacs_Pixmap Emacs_Pix_Context; -#else -#define FACE_COLOR_TO_PIXEL(face_color, frame) face_color #endif #ifdef HAVE_PGTK |