From 365525b370a3faa4d2403b4d312c10f760082a66 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 28 Dec 2010 17:34:04 +0100 Subject: [PATCH] Restore x_alloc_lighter_color_for_widget, needed for lwlib * src/xterm.h (x_alloc_lighter_color_for_widget): Restore declaration. * src/xterm.c (x_alloc_lighter_color_for_widget): Restore. --- src/ChangeLog | 5 +++++ src/xterm.c | 16 ++++++++++++++++ src/xterm.h | 3 +++ 3 files changed, 24 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 7985f575cd6..9b4a709710d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-12-28 Andreas Schwab + + * xterm.h (x_alloc_lighter_color_for_widget): Restore declaration. + * xterm.c (x_alloc_lighter_color_for_widget): Restore. + 2010-12-27 Andreas Schwab * buffer.c: Remove unused declarations. diff --git a/src/xterm.c b/src/xterm.c index 32ab6950184..e91782395df 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1483,6 +1483,22 @@ x_alloc_nearest_color_for_widget (Widget widget, Colormap cmap, XColor *color) } +/* Allocate a color which is lighter or darker than *PIXEL by FACTOR + or DELTA. Try a color with RGB values multiplied by FACTOR first. + If this produces the same color as PIXEL, try a color where all RGB + values have DELTA added. Return the allocated color in *PIXEL. + DISPLAY is the X display, CMAP is the colormap to operate on. + Value is non-zero if successful. */ + +int +x_alloc_lighter_color_for_widget (Widget widget, Display *display, Colormap cmap, + unsigned long *pixel, double factor, int delta) +{ + struct frame *f = x_frame_of_widget (widget); + return x_alloc_lighter_color (f, display, cmap, pixel, factor, delta); +} + + /* Structure specifying which arguments should be passed by Xt to cvt_string_to_pixel. We want the widget's screen and colormap. */ diff --git a/src/xterm.h b/src/xterm.h index 5e4a37a5ddb..6a15b675c55 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -974,6 +974,9 @@ extern void x_initialize (void); extern unsigned long x_copy_color (struct frame *, unsigned long); #ifdef USE_X_TOOLKIT extern XtAppContext Xt_app_con; +extern int x_alloc_lighter_color_for_widget (Widget, Display *, Colormap, + unsigned long *, + double, int); extern void x_activate_timeout_atimer (void); #endif extern int x_alloc_nearest_color (struct frame *, Colormap, XColor *); -- 2.11.4.GIT