* xfns.c (Fx_display_color_cells): Use number of planes to calculate

how many colors can be displayed.

diff --git a/src/ChangeLog b/src/ChangeLog
index 742e2c3dabc9c74042dfb958b741bb534d7a0212..bd641e8f6fb570ecf9a8c87edeeffc51c4751be9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-01  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xfns.c (Fx_display_color_cells): Use number of planes to calculate
+       how many colors can be displayed.
+
 2004-03-01  Kenichi Handa  <handa@m17n.org>
 
        * editfns.c (Ftranslate_region): Handle multibyte chars in TABLE

diff --git a/src/xfns.c b/src/xfns.c
index a3e885bac7421c66c553ad17d1a9d7669475e4e3..3028a61018c51c71da8335648a45cdc73b10b847 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3758,8 +3758,17 @@ If omitted or nil, that stands for the selected frame's display.  */)
 {
   struct x_display_info *dpyinfo = check_x_display_info (display);
 
-  return make_number (DisplayCells (dpyinfo->display,
-                                   XScreenNumberOfScreen (dpyinfo->screen)));
+  int nr_planes = DisplayPlanes (dpyinfo->display,
+                                 XScreenNumberOfScreen (dpyinfo->screen));
+
+  /* Truncate nr_planes to 24 to avoid integer overflow.
+     Some displays says 32, but only 24 bits are actually significant.
+     There are only very few and rare video cards that have more than
+     24 significant bits.  Also 24 bits is more than 16 million colors,
+     it "should be enough for everyone".  */
+  if (nr_planes > 24) nr_planes = 24;
+
+  return make_number (1 << nr_planes);
 }
 
 DEFUN ("x-server-max-request-size", Fx_server_max_request_size,