* 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

1 files changed, 4 insertions, 16 deletions

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 2d1a990483f..ef8daba720a 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -6436,7 +6436,9 @@ pgtk_defined_color (struct frame *f,
   int r;
 
   block_input ();
-  r = pgtk_parse_color (name, color_def);
+  r = xg_check_special_colors(f, name, color_def);
+  if (!r)
+    r = pgtk_parse_color (f, name, color_def);
   unblock_input ();
   return r;
 }
@@ -6449,7 +6451,7 @@ pgtk_defined_color (struct frame *f,
    and names we've actually looked up; list-colors-display is probably
    the most color-intensive case we're likely to hit.  */
 
-int pgtk_parse_color (const char *color_name, Emacs_Color *color)
+int pgtk_parse_color (struct frame *f, const char *color_name, Emacs_Color *color)
 {
   PGTK_TRACE("pgtk_parse_color: %s", color_name);
 
@@ -6468,20 +6470,6 @@ int pgtk_parse_color (const char *color_name, Emacs_Color *color)
   return 0;
 }
 
-int
-pgtk_lisp_to_color (Lisp_Object color, Emacs_Color *col)
-/* --------------------------------------------------------------------------
-     Convert a Lisp string object to a NS color
-   -------------------------------------------------------------------------- */
-{
-  PGTK_TRACE("pgtk_lisp_to_color");
-  if (STRINGP (color))
-    return !pgtk_parse_color (SSDATA (color), col);
-  else if (SYMBOLP (color))
-    return !pgtk_parse_color (SSDATA (SYMBOL_NAME (color)), col);
-  return 1;
-}
-
 /* On frame F, translate pixel colors to RGB values for the NCOLORS
    colors in COLORS.  On W32, we no longer try to map colors to
    a palette.  */