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

diff --git a/src/dispextern.h b/src/dispextern.h
index 0f316a2eaf9d84429970d8f53a32330bc2b29a19..f1d99abad3243abdcfacc0c0072666c94f8b83b8 100644 (file)
--- 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

diff --git a/src/image.c b/src/image.c
index dc9aae27c92b4e58945f996f412e509824f0fb25..3904ab75a6034e6dcf4789cdbc3193748360ac09 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -2626,8 +2626,8 @@ lookup_image (struct frame *f, Lisp_Object spec, int face_id)
     face_id = DEFAULT_FACE_ID;
 
   struct face *face = FACE_FROM_ID (f, face_id);
-  unsigned long foreground = FACE_COLOR_TO_PIXEL (face->foreground, f);
-  unsigned long background = FACE_COLOR_TO_PIXEL (face->background, f);
+  unsigned long foreground = face->foreground;
+  unsigned long background = face->background;
   int font_size = face->font->pixel_size;
   char *font_family = SSDATA (face->lface[LFACE_FAMILY_INDEX]);
 

diff --git a/src/nsfns.m b/src/nsfns.m
index 365df7fc1e8994d3aa1a6b6b721e754f8c8e7226..7cb2cf72581f3b7ede8b3116725384caa5970d55 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -300,9 +300,9 @@ ns_set_background_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
       face = FRAME_DEFAULT_FACE (f);
       if (face)
         {
-          col = ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), f);
-          face->background = ns_index_color
-            ([col colorWithAlphaComponent: alpha], f);
+          col = [NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND (face)];
+          face->background = [[col colorWithAlphaComponent: alpha]
+                               unsignedLong];
 
           update_face_from_frame_parameter (f, Qbackground_color, arg);
         }

diff --git a/src/nsfont.m b/src/nsfont.m
index b3224629f0533ad215e64c816de2cb791df7e6de..7ff852b843f8f72cc1a8926f2b1157db146eeb52 100644 (file)
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1196,7 +1196,7 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
        {
          if (s->hl != DRAW_CURSOR)
            [(NS_FACE_BACKGROUND (face) != 0
-             ? ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f)
+             ? [NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND (face)]
              : FRAME_BACKGROUND_COLOR (s->f)) set];
          else
            [FRAME_CURSOR_COLOR (s->f) set];
@@ -1216,7 +1216,7 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
     col = FRAME_BACKGROUND_COLOR (s->f);
   else
     col = (NS_FACE_FOREGROUND (face) != 0
-          ? ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f)
+          ? [NSColor colorWithUnsignedLong:NS_FACE_FOREGROUND (face)]
           : FRAME_FOREGROUND_COLOR (s->f));
 
   /* render under GNUstep using DPS */

diff --git a/src/nsgui.h b/src/nsgui.h
index e4038d32267523a0958e1d0608591a8579a680b1..e79fcab336409724e21b03e08e8a8a7285f522e9 100644 (file)
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -58,9 +58,6 @@ typedef struct _XCharStruct
   int descent;
 } XCharStruct;
 
-/* Used in xdisp.c when comparing faces and frame colors.  */
-extern unsigned long ns_color_index_to_rgba(int idx, struct frame *f);
-
 #ifdef __OBJC__
 typedef id Emacs_Pixmap;
 #else

diff --git a/src/nsterm.h b/src/nsterm.h
index 8bd7611441f9621103d2340407fe080391fe3a20..3413bb1f78019464c51bded8990a750080950ab8 100644 (file)
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -357,6 +357,7 @@ typedef id instancetype;
 @interface NSColor (EmacsColor)
 + (NSColor *)colorForEmacsRed:(CGFloat)red green:(CGFloat)green
                          blue:(CGFloat)blue alpha:(CGFloat)alpha;
++ (NSColor *)colorWithUnsignedLong:(unsigned long)c;
 - (NSColor *)colorUsingDefaultColorSpace;
 - (unsigned long)unsignedLong;
 @end
@@ -821,12 +822,6 @@ struct ns_display_info
   ptrdiff_t bitmaps_size;
   ptrdiff_t bitmaps_last;
 
-#ifdef __OBJC__
-  NSMutableArray *color_table;
-#else
-  void *color_table;
-#endif
-
   /* DPI resolution of this screen */
   double resx, resy;
 
@@ -1102,13 +1097,9 @@ ns_defined_color (struct frame *f,
                   const char *name,
                   Emacs_Color *color_def, bool alloc,
                   bool makeIndex);
-extern void
-ns_query_color (void *col, Emacs_Color *color_def, bool setPixel);
 
 #ifdef __OBJC__
 extern int ns_lisp_to_color (Lisp_Object color, NSColor **col);
-extern NSColor *ns_lookup_indexed_color (unsigned long idx, struct frame *f);
-extern unsigned long ns_index_color (NSColor *color, struct frame *f);
 extern const char *ns_get_pending_menu_title (void);
 #endif
 

diff --git a/src/nsterm.m b/src/nsterm.m
index 12f24fbfd535599dad77ba68c85b66fba7847c1a..8fdbacf12feebb787a17b93df6962be5043caa93 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -167,15 +167,13 @@ char const * nstrace_fullscreen_type_name (int fs_type)
 }
 
 + (NSColor *)colorWithUnsignedLong:(unsigned long)c
-                          hasAlpha:(BOOL)alpha
 {
   EmacsCGFloat a = (double)((c >> 24) & 0xff) / 255.0;
   EmacsCGFloat r = (double)((c >> 16) & 0xff) / 255.0;
   EmacsCGFloat g = (double)((c >> 8) & 0xff) / 255.0;
   EmacsCGFloat b = (double)(c & 0xff) / 255.0;
 
-  return [NSColor colorForEmacsRed:r green:g blue:b
-                             alpha:(alpha ? a : (EmacsCGFloat)1.0)];
+  return [NSColor colorForEmacsRed:r green:g blue:b alpha:a];
 }
 
 - (unsigned long)unsignedLong
@@ -1972,35 +1970,6 @@ ns_fullscreen_hook (struct frame *f)
    ========================================================================== */
 
 
-NSColor *
-ns_lookup_indexed_color (unsigned long idx, struct frame *f)
-{
-  NSMutableArray *color_table = FRAME_DISPLAY_INFO (f)->color_table;
-  if (idx < 1 || idx >= [color_table count])
-    return nil;
-  return [color_table objectAtIndex:idx];
-}
-
-
-unsigned long
-ns_index_color (NSColor *color, struct frame *f)
-{
-  NSMutableArray *color_table = FRAME_DISPLAY_INFO (f)->color_table;
-
-  /* An index of 0 appears to be special in some way, so insert a
-     dummy object.  */
-  if ([color_table count] == 0)
-    [color_table addObject:[NSNull null]];
-
-  /* Do we already have this color?  */
-  if ([color_table containsObject:color])
-    return [color_table indexOfObject:color];
-
-  [color_table addObject:color];
-  return [color_table count] - 1;
-}
-
-
 static int
 ns_get_color (const char *name, NSColor **col)
 /* --------------------------------------------------------------------------
@@ -2125,25 +2094,11 @@ ns_lisp_to_color (Lisp_Object color, NSColor **col)
   return 1;
 }
 
-/* Convert an index into the color table into an RGBA value.  Used in
-   xdisp.c:extend_face_to_end_of_line when comparing faces and frame
-   color values.  */
-
-unsigned long
-ns_color_index_to_rgba(int idx, struct frame *f)
-{
-  NSColor *col;
-  col = ns_lookup_indexed_color (idx, f);
-
-  return [col unsignedLong];
-}
-
 void
-ns_query_color(void *col, Emacs_Color *color_def, bool setPixel)
+ns_query_color(void *col, Emacs_Color *color_def)
 /* --------------------------------------------------------------------------
-         Get ARGB values out of NSColor col and put them into color_def.
-         If setPixel, set the pixel to a concatenated version.
-         and set color_def pixel to the resulting index.
+         Get ARGB values out of NSColor col and put them into color_def
+         and set color_def pixel to the ARGB color.
    -------------------------------------------------------------------------- */
 {
   EmacsCGFloat r, g, b, a;
@@ -2153,8 +2108,7 @@ ns_query_color(void *col, Emacs_Color *color_def, bool setPixel)
   color_def->green = g * 65535;
   color_def->blue  = b * 65535;
 
-  if (setPixel == YES)
-    color_def->pixel = [(NSColor *)col unsignedLong];
+  color_def->pixel = [(NSColor *)col unsignedLong];
 }
 
 bool
@@ -2162,12 +2116,9 @@ ns_defined_color (struct frame *f,
                   const char *name,
                   Emacs_Color *color_def,
                   bool alloc,
-                  bool makeIndex)
+                  bool _makeIndex)
 /* --------------------------------------------------------------------------
          Return true if named color found, and set color_def rgb accordingly.
-         If makeIndex and alloc are nonzero put the color in the color_table,
-         and set color_def pixel to the resulting index.
-         If makeIndex is zero, set color_def pixel to ARGB.
          Return false if not found.
    -------------------------------------------------------------------------- */
 {
@@ -2180,9 +2131,7 @@ ns_defined_color (struct frame *f,
       unblock_input ();
       return 0;
     }
-  if (makeIndex && alloc)
-    color_def->pixel = ns_index_color (col, f);
-  ns_query_color (col, color_def, !makeIndex);
+  ns_query_color (col, color_def);
   unblock_input ();
   return 1;
 }
@@ -2193,7 +2142,7 @@ ns_query_frame_background_color (struct frame *f, Emacs_Color *bgcolor)
      External (hook): Store F's background color into *BGCOLOR
    -------------------------------------------------------------------------- */
 {
-  ns_query_color (FRAME_BACKGROUND_COLOR (f), bgcolor, true);
+  ns_query_color (FRAME_BACKGROUND_COLOR (f), bgcolor);
 }
 
 static void
@@ -2612,8 +2561,8 @@ ns_clear_frame (struct frame *f)
 
   block_input ();
   ns_focus (f, &r, 1);
-  [ns_lookup_indexed_color (NS_FACE_BACKGROUND
-                           (FACE_FROM_ID (f, DEFAULT_FACE_ID)), f) set];
+  [[NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND
+                           (FACE_FROM_ID (f, DEFAULT_FACE_ID))] set];
   NSRectFill (r);
   ns_unfocus (f);
 
@@ -2641,7 +2590,7 @@ ns_clear_frame_area (struct frame *f, int x, int y, int width, int height)
 
   r = NSIntersectionRect (r, [view frame]);
   ns_focus (f, &r, 1);
-  [ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), f) set];
+  [[NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND (face)] set];
 
   NSRectFill (r);
 
@@ -2744,8 +2693,7 @@ ns_clear_under_internal_border (struct frame *f)
         return;
 
       ns_focus (f, NULL, 1);
-      [ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), f) set];
-
+      [[NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND (face)] set];
       NSRectFill (NSMakeRect (0, margin, width, border));
       NSRectFill (NSMakeRect (0, 0, border, height));
       NSRectFill (NSMakeRect (0, margin, width, border));
@@ -2796,7 +2744,7 @@ ns_after_update_window_line (struct window *w, struct glyph_row *desired_row)
           NSRect r = NSMakeRect (0, y, FRAME_PIXEL_WIDTH (f), height);
           ns_focus (f, &r, 1);
 
-          [ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), f) set];
+          [[NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND (face)] set];
           NSRectFill (NSMakeRect (0, y, width, height));
           NSRectFill (NSMakeRect (FRAME_PIXEL_WIDTH (f) - width,
                                   y, width, height));
@@ -2964,7 +2912,7 @@ ns_draw_fringe_bitmap (struct window *w, struct glyph_row *row,
     {
       NSTRACE_RECT ("clearRect", clearRect);
 
-      [ns_lookup_indexed_color(face->background, f) set];
+      [[NSColor colorWithUnsignedLong:face->background] set];
       NSRectFill (clearRect);
     }
 
@@ -2981,9 +2929,9 @@ ns_draw_fringe_bitmap (struct window *w, struct glyph_row *row,
       [bmp transformUsingAffineTransform:transform];
 
       if (!p->cursor_p)
-        bm_color = ns_lookup_indexed_color(face->foreground, f);
+        bm_color = [NSColor colorWithUnsignedLong:face->foreground];
       else if (p->overlay_p)
-        bm_color = ns_lookup_indexed_color(face->background, f);
+        bm_color = [NSColor colorWithUnsignedLong:face->background];
       else
         bm_color = f->output_data.ns->cursor_color;
 
@@ -3134,7 +3082,7 @@ ns_draw_vertical_window_border (struct window *w, int x, int y0, int y1)
 
   ns_focus (f, &r, 1);
   if (face)
-    [ns_lookup_indexed_color(face->foreground, f) set];
+    [[NSColor colorWithUnsignedLong:face->foreground] set];
 
   NSRectFill(r);
   ns_unfocus (f);
@@ -3170,29 +3118,29 @@ ns_draw_window_divider (struct window *w, int x0, int x1, int y0, int y1)
     /* A vertical divider, at least three pixels wide: Draw first and
        last pixels differently.  */
     {
-      [ns_lookup_indexed_color(color_first, f) set];
+      [[NSColor colorWithUnsignedLong:color_first] set];
       NSRectFill(NSMakeRect (x0, y0, 1, y1 - y0));
-      [ns_lookup_indexed_color(color, f) set];
+      [[NSColor colorWithUnsignedLong:color] set];
       NSRectFill(NSMakeRect (x0 + 1, y0, x1 - x0 - 2, y1 - y0));
-      [ns_lookup_indexed_color(color_last, f) set];
+      [[NSColor colorWithUnsignedLong:color_last] set];
       NSRectFill(NSMakeRect (x1 - 1, y0, 1, y1 - y0));
     }
   else if ((x1 - x0 > y1 - y0) && (y1 - y0 >= 3))
     /* A horizontal divider, at least three pixels high: Draw first and
        last pixels differently.  */
     {
-      [ns_lookup_indexed_color(color_first, f) set];
+      [[NSColor colorWithUnsignedLong:color_first] set];
       NSRectFill(NSMakeRect (x0, y0, x1 - x0, 1));
-      [ns_lookup_indexed_color(color, f) set];
+      [[NSColor colorWithUnsignedLong:color] set];
       NSRectFill(NSMakeRect (x0, y0 + 1, x1 - x0, y1 - y0 - 2));
-      [ns_lookup_indexed_color(color_last, f) set];
+      [[NSColor colorWithUnsignedLong:color_last] set];
       NSRectFill(NSMakeRect (x0, y1 - 1, x1 - x0, 1));
     }
   else
     {
       /* In any other case do not draw the first and last pixels
          differently.  */
-      [ns_lookup_indexed_color(color, f) set];
+      [[NSColor colorWithUnsignedLong:color] set];
       NSRectFill(divider);
     }
 
@@ -3305,7 +3253,7 @@ ns_draw_text_decoration (struct glyph_string *s, struct face *face,
       if (s->face->underline == FACE_UNDER_WAVE)
         {
           if (!face->underline_defaulted_p)
-            [ns_lookup_indexed_color (face->underline_color, s->f) set];
+            [[NSColor colorWithUnsignedLong:face->underline_color] set];
 
           ns_draw_underwave (s, width, x);
         }
@@ -3379,7 +3327,8 @@ ns_draw_text_decoration (struct glyph_string *s, struct face *face,
           r = NSMakeRect (x, s->ybase + position, width, thickness);
 
           if (!face->underline_defaulted_p)
-            [ns_lookup_indexed_color (face->underline_color, s->f) set];
+            [[NSColor colorWithUnsignedLong:face->underline_color] set];
+
           NSRectFill (r);
         }
     }
@@ -3391,7 +3340,7 @@ ns_draw_text_decoration (struct glyph_string *s, struct face *face,
       r = NSMakeRect (x, s->y, width, 1);
 
       if (!face->overline_color_defaulted_p)
-        [ns_lookup_indexed_color (face->overline_color, s->f) set];
+        [[NSColor colorWithUnsignedLong:face->overline_color] set];
 
       NSRectFill (r);
     }
@@ -3416,7 +3365,7 @@ ns_draw_text_decoration (struct glyph_string *s, struct face *face,
       r = NSMakeRect (x, glyph_y + dy, width, 1);
 
       if (!face->strike_through_color_defaulted_p)
-        [ns_lookup_indexed_color (face->strike_through_color, s->f) set];
+        [[NSColor colorWithUnsignedLong:face->strike_through_color] set];
 
       NSRectFill (r);
     }
@@ -3475,7 +3424,7 @@ ns_draw_relief (NSRect outer, int hthickness, int vthickness, char raised_p,
 
   if (s->face->use_box_color_for_shadows_p)
     {
-      newBaseCol = ns_lookup_indexed_color (s->face->box_color, s->f);
+      newBaseCol = [NSColor colorWithUnsignedLong:s->face->box_color];
     }
 /*     else if (s->first_glyph->type == IMAGE_GLYPH
           && s->img->pixmap
@@ -3485,7 +3434,7 @@ ns_draw_relief (NSRect outer, int hthickness, int vthickness, char raised_p,
        } */
   else
     {
-      newBaseCol = ns_lookup_indexed_color (s->face->background, s->f);
+      newBaseCol = [NSColor colorWithUnsignedLong:s->face->background];
     }
 
   if (newBaseCol == nil)
@@ -3607,7 +3556,7 @@ ns_dumpglyphs_box_or_relief (struct glyph_string *s)
   if (s->face->box == FACE_SIMPLE_BOX && s->face->box_color)
     {
       ns_draw_box (r, abs (hthickness), abs (vthickness),
-                   ns_lookup_indexed_color (face->box_color, s->f),
+                   [NSColor colorWithUnsignedLong:face->box_color],
                    left_p, right_p);
     }
   else
@@ -3644,7 +3593,7 @@ ns_maybe_dumpglyphs_background (struct glyph_string *s, char force_p)
            {
              if (s->hl != DRAW_CURSOR)
                [(NS_FACE_BACKGROUND (face) != 0
-                 ? ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f)
+                 ? [NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND (face)]
                  : FRAME_BACKGROUND_COLOR (s->f)) set];
              else
                [FRAME_CURSOR_COLOR (s->f) set];
@@ -3701,7 +3650,7 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r)
      otherwise, since we composite the image under NS (instead of mucking
      with its background color), we must clear just the image area.  */
 
-  [ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f) set];
+  [[NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND (face)] set];
 
   if (bg_height > s->slice.height || s->img->hmargin || s->img->vmargin
       || s->img->mask || s->img->pixmap == 0 || s->width != s->background_width)
@@ -3771,11 +3720,11 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r)
   if (s->hl == DRAW_CURSOR)
     {
       [FRAME_CURSOR_COLOR (s->f) set];
-      tdCol = ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f);
+      tdCol = [NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND (face)];
     }
   else
     {
-      tdCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f);
+      tdCol = [NSColor colorWithUnsignedLong:NS_FACE_FOREGROUND (face)];
     }
 
   /* Draw underline, overline, strike-through.  */
@@ -3832,8 +3781,8 @@ ns_dumpglyphs_stretch (struct glyph_string *s)
 
       face = s->face;
 
-      bgCol = ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f);
-      fgCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f);
+      bgCol = [NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND (face)];
+      fgCol = [NSColor colorWithUnsignedLong:NS_FACE_FOREGROUND (face)];
 
       if (s->hl == DRAW_CURSOR)
        {
@@ -4067,8 +4016,7 @@ ns_draw_glyph_string (struct glyph_string *s)
 
        {
          NSColor *col = (NS_FACE_FOREGROUND (s->face) != 0
-                         ? ns_lookup_indexed_color (NS_FACE_FOREGROUND (s->face),
-                                                    s->f)
+                         ? [NSColor colorWithUnsignedLong:NS_FACE_FOREGROUND (s->face)]
                          : FRAME_FOREGROUND_COLOR (s->f));
 
          /* Draw underline, overline, strike-through. */
@@ -4103,7 +4051,7 @@ ns_draw_glyph_string (struct glyph_string *s)
     {
       NSColor *fg_color;
 
-      fg_color = ns_lookup_indexed_color (NS_FACE_FOREGROUND (s->face), s->f);
+      fg_color = [NSColor colorWithUnsignedLong:NS_FACE_FOREGROUND (s->face)];
       ns_draw_text_decoration (s, s->face, fg_color,
                               s->background_width, s->x);
     }
@@ -4922,7 +4870,6 @@ ns_initialize_display_info (struct ns_display_info *dpyinfo)
                 && ![NSCalibratedWhiteColorSpace isEqualToString:
                                                  NSColorSpaceFromDepth (depth)];
     dpyinfo->n_planes = NSBitsPerPixelFromDepth (depth);
-    dpyinfo->color_table = [[NSMutableArray array] retain];
     dpyinfo->root_window = 42; /* A placeholder.  */
     dpyinfo->highlight_frame = dpyinfo->ns_focus_frame = NULL;
     dpyinfo->n_fonts = 0;
@@ -4998,7 +4945,6 @@ static void
 ns_delete_display (struct ns_display_info *dpyinfo)
 {
   /* TODO...  */
-  [dpyinfo->color_table release];
 }
 
 
@@ -5211,8 +5157,9 @@ ns_term_init (Lisp_Object display_name)
             color = XCAR (color_map);
             name = XCAR (color);
             c = XFIXNUM (XCDR (color));
+            c |= 0xFF000000;
             [cl setColor:
-                  [NSColor colorWithUnsignedLong:c hasAlpha:NO]
+                  [NSColor colorWithUnsignedLong:c]
                   forKey: [NSString stringWithLispString: name]];
           }
 
@@ -7610,9 +7557,8 @@ not_in_argv (NSString *arg)
   onFirstScreen = [[w screen] isEqual:[[NSScreen screens] objectAtIndex:0]];
   f = emacsframe;
   wr = [w frame];
-  col = ns_lookup_indexed_color (NS_FACE_BACKGROUND
-                                (FACE_FROM_ID (f, DEFAULT_FACE_ID)),
-                                 f);
+  col = [NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND
+                                (FACE_FROM_ID (f, DEFAULT_FACE_ID))];
 
   if (fs_state != FULLSCREEN_BOTH)
     {
@@ -8360,9 +8306,8 @@ not_in_argv (NSString *arg)
 
       f->border_width = [self borderWidth];
 
-      col = ns_lookup_indexed_color (NS_FACE_BACKGROUND
-                                     (FACE_FROM_ID (f, DEFAULT_FACE_ID)),
-                                     f);
+      col = [NSColor colorWithUnsignedLong:NS_FACE_BACKGROUND
+                                     (FACE_FROM_ID (f, DEFAULT_FACE_ID))];
       [self setBackgroundColor:col];
       if ([col alphaComponent] != (EmacsCGFloat) 1.0)
         [self setOpaque:NO];

diff --git a/src/xdisp.c b/src/xdisp.c
index f4dcb1838d5a680ac60b73c42b8961ce51fa6d97..1f896c256eecf81da3054b9c2a6a3e6c6279f482 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22478,7 +22478,7 @@ extend_face_to_end_of_line (struct it *it)
       && face->underline == FACE_NO_UNDERLINE
       && !face->overline_p
       && !face->strike_through_p
-      && FACE_COLOR_TO_PIXEL (face->background, f) == FRAME_BACKGROUND_PIXEL (f)
+      && face->background == FRAME_BACKGROUND_PIXEL (f)
 #ifdef HAVE_WINDOW_SYSTEM
       && !face->stipple
 #endif
@@ -22712,7 +22712,7 @@ extend_face_to_end_of_line (struct it *it)
          && (it->glyph_row->used[LEFT_MARGIN_AREA]
              < WINDOW_LEFT_MARGIN_WIDTH (it->w))
          && !it->glyph_row->mode_line_p
-         && FACE_COLOR_TO_PIXEL (face->background, f) != FRAME_BACKGROUND_PIXEL (f))
+         && face->background != FRAME_BACKGROUND_PIXEL (f))
        {
          struct glyph *g = it->glyph_row->glyphs[LEFT_MARGIN_AREA];
          struct glyph *e = g + it->glyph_row->used[LEFT_MARGIN_AREA];
@@ -22783,7 +22783,7 @@ extend_face_to_end_of_line (struct it *it)
          && (it->glyph_row->used[RIGHT_MARGIN_AREA]
              < WINDOW_RIGHT_MARGIN_WIDTH (it->w))
          && !it->glyph_row->mode_line_p
-         && FACE_COLOR_TO_PIXEL (face->background, f) != FRAME_BACKGROUND_PIXEL (f))
+         && face->background != FRAME_BACKGROUND_PIXEL (f))
        {
          struct glyph *g = it->glyph_row->glyphs[RIGHT_MARGIN_AREA];
          struct glyph *e = g + it->glyph_row->used[RIGHT_MARGIN_AREA];