From 0df1c7293ee5a4715879ec8bf92585fa050085ea Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Tue, 22 Jul 2014 17:55:04 +0400 Subject: [PATCH] * xterm.h (struct x_output) [USE_LUCID && USE_TOOLKIT_SCROLL_BARS]: Define scroll_bar_top_shadow_pixel and scroll_bar_bottom_shadow_pixel as such. All related users changed. --- src/ChangeLog | 3 +++ src/xfns.c | 12 ++++++------ src/xterm.c | 4 ++-- src/xterm.h | 6 ++++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 84fe1f02560..babfb66bacc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,9 @@ * xterm.h (struct x_output) [USE_X_TOOLKIT || USE_GTK]: Define menubar_height as such. Tweak comment. + [USE_LUCID && USE_TOOLKIT_SCROLL_BARS]: Likewise for + scroll_bar_top_shadow_pixel and scroll_bar_bottom_shadow_pixel. + All related users changed. (FRAME_MENUBAR_HEIGHT) [!USE_X_TOOLKIT && !USE_GTK]: No-op. * xterm.c (handle_one_xevent): * gtkutil.c (xg_event_is_for_menubar): diff --git a/src/xfns.c b/src/xfns.c index 1bdb676af04..6574beddc8b 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1221,7 +1221,7 @@ x_set_scroll_bar_background (struct frame *f, Lisp_Object value, Lisp_Object old if (f->output_data.x->scroll_bar_background_pixel != -1) unload_color (f, f->output_data.x->scroll_bar_background_pixel); -#ifdef USE_TOOLKIT_SCROLL_BARS +#if defined (USE_LUCID) && defined (USE_TOOLKIT_SCROLL_BARS) /* Scrollbar shadow colors. */ if (f->output_data.x->scroll_bar_top_shadow_pixel != -1) { @@ -1233,7 +1233,7 @@ x_set_scroll_bar_background (struct frame *f, Lisp_Object value, Lisp_Object old unload_color (f, f->output_data.x->scroll_bar_bottom_shadow_pixel); f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; } -#endif /* USE_TOOLKIT_SCROLL_BARS */ +#endif /* USE_LUCID && USE_TOOLKIT_SCROLL_BARS */ f->output_data.x->scroll_bar_background_pixel = pixel; if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f)) @@ -2950,10 +2950,10 @@ This function is an internal primitive--use `make-frame' instead. */) FRAME_FONTSET (f) = -1; f->output_data.x->scroll_bar_foreground_pixel = -1; f->output_data.x->scroll_bar_background_pixel = -1; -#ifdef USE_TOOLKIT_SCROLL_BARS +#if defined (USE_LUCID) && defined (USE_TOOLKIT_SCROLL_BARS) f->output_data.x->scroll_bar_top_shadow_pixel = -1; f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; -#endif /* USE_TOOLKIT_SCROLL_BARS */ +#endif /* USE_LUCID && USE_TOOLKIT_SCROLL_BARS */ f->output_data.x->white_relief.pixel = -1; f->output_data.x->black_relief.pixel = -1; @@ -4952,10 +4952,10 @@ x_create_tip_frame (struct x_display_info *dpyinfo, FRAME_FONTSET (f) = -1; f->output_data.x->scroll_bar_foreground_pixel = -1; f->output_data.x->scroll_bar_background_pixel = -1; -#ifdef USE_TOOLKIT_SCROLL_BARS +#if defined (USE_LUCID) && defined (USE_TOOLKIT_SCROLL_BARS) f->output_data.x->scroll_bar_top_shadow_pixel = -1; f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; -#endif /* USE_TOOLKIT_SCROLL_BARS */ +#endif /* USE_LUCID && USE_TOOLKIT_SCROLL_BARS */ f->output_data.x->white_relief.pixel = -1; f->output_data.x->black_relief.pixel = -1; diff --git a/src/xterm.c b/src/xterm.c index 98737951022..8513427972a 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -9269,13 +9269,13 @@ x_free_frame_resources (struct frame *f) unload_color (f, f->output_data.x->scroll_bar_background_pixel); if (f->output_data.x->scroll_bar_foreground_pixel != -1) unload_color (f, f->output_data.x->scroll_bar_foreground_pixel); -#ifdef USE_TOOLKIT_SCROLL_BARS +#if defined (USE_LUCID) && defined (USE_TOOLKIT_SCROLL_BARS) /* Scrollbar shadow colors. */ if (f->output_data.x->scroll_bar_top_shadow_pixel != -1) unload_color (f, f->output_data.x->scroll_bar_top_shadow_pixel); if (f->output_data.x->scroll_bar_bottom_shadow_pixel != -1) unload_color (f, f->output_data.x->scroll_bar_bottom_shadow_pixel); -#endif /* USE_TOOLKIT_SCROLL_BARS */ +#endif /* USE_LUCID && USE_TOOLKIT_SCROLL_BARS */ if (f->output_data.x->white_relief.pixel != -1) unload_color (f, f->output_data.x->white_relief.pixel); if (f->output_data.x->black_relief.pixel != -1) diff --git a/src/xterm.h b/src/xterm.h index 398d70fc8fc..569433e4242 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -541,10 +541,12 @@ struct x_output bars). */ unsigned long scroll_bar_background_pixel; - /* Top and bottom shadow colors for 3d toolkit scrollbars. -1 means - let the scroll compute them itself. */ +#if defined (USE_LUCID) && defined (USE_TOOLKIT_SCROLL_BARS) + /* Top and bottom shadow colors for 3D Lucid scrollbars. + -1 means let the scroll compute them itself. */ unsigned long scroll_bar_top_shadow_pixel; unsigned long scroll_bar_bottom_shadow_pixel; +#endif /* Descriptor for the cursor in use for this window. */ Cursor text_cursor; -- 2.39.2