mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-15 07:41:09 -08:00
Code Issues Projects Releases Wiki Activity

* xterm.h (struct x_output) [USE_LUCID && USE_TOOLKIT_SCROLL_BARS]:

Browse source 
Define scroll_bar_top_shadow_pixel and scroll_bar_bottom_shadow_pixel
as such.  All related users changed.
This commit is contained in:
Dmitry Antipov 2014-07-22 17:55:04 +04:00
parent 1d3710228b
commit 0df1c7293e
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -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):

12
src/xfns.c
View file

@ -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;

4
src/xterm.c
View file

@ -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)

6
src/xterm.h
View file

@ -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;