Mercurial > emacs
changeset 109617:7fa7e34c0f18
* xterm.c (x_create_toolkit_scroll_bar): Only set XtNbeNiceToColormap
to TRUE if depth of screen is < 16.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 02 Aug 2010 16:23:06 +0200 |
| parents | 9760620de530 |
| children | 87a4d6ee5443 |
| files | src/ChangeLog src/xterm.c |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Aug 02 14:50:03 2010 +0200 +++ b/src/ChangeLog Mon Aug 02 16:23:06 2010 +0200 @@ -1,11 +1,14 @@ 2010-08-02 Jan Djärv <jan.h.d@swipnet.se> + * 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.
--- a/src/xterm.c Mon Aug 02 14:50:03 2010 +0200 +++ b/src/xterm.c Mon Aug 02 16:23:06 2010 +0200 @@ -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. */ - { - XtSetArg (av[ac], XtNbeNiceToColormap, True); + /* But only if we have a small colormap. Xaw3d can allocate nice + colors itself. */ + { + XtSetArg (av[ac], XtNbeNiceToColormap, + DefaultDepthOfScreen (FRAME_X_SCREEN (f)) < 16); ++ac; } else