[Emacs-diffs] /srv/bzr/emacs/trunk r100966: * xterm.c (x_create_toolkit_scroll_bar): Only set XtNbeNiceToColormap

[Jan D.]

------------------------------------------------------------
revno: 100966
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-02 16:23:06 +0200
message:
  * xterm.c (x_create_toolkit_scroll_bar): Only set XtNbeNiceToColormap
  to TRUE if depth of screen is < 16.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-02 12:50:03 +0000
+++ b/src/ChangeLog     2010-08-02 14:23:06 +0000
@@ -1,11 +1,14 @@
 2010-08-02  Jan Djärv  <address@hidden>
 
+       * xterm.c (x_create_toolkit_scroll_bar): Only set XtNbeNiceToColormap
+       to TRUE if depth of screen is < 16.
+
        * gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless
        USE_GTK_TOOLTIP.
        (xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP
        (xg_show_tooltip, xg_hide_tooltip): Do nothing unless
        USE_GTK_TOOLTIP.
-       (xg_create_frame_widgets): Surrond tooltip-related code with ifdef
+       (xg_create_frame_widgets): Surround tooltip-related code with ifdef
        USE_GTK_TOOLTIP.
        (xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP.
 

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2010-08-01 13:57:07 +0000
+++ b/src/xterm.c       2010-08-02 14:23:06 +0000
@@ -4532,8 +4532,11 @@
       || f->output_data.x->scroll_bar_bottom_shadow_pixel == -1)
     /* We tried to allocate a color for the top/bottom shadow, and
        failed, so tell Xaw3d to use dithering instead.   */
+    /* But only if we have a small colormap.  Xaw3d can allocate nice
+       colors itself.  */
     {
-      XtSetArg (av[ac], XtNbeNiceToColormap, True);
+      XtSetArg (av[ac], XtNbeNiceToColormap,
+                DefaultDepthOfScreen (FRAME_X_SCREEN (f)) < 16);
       ++ac;
     }
   else