Mercurial > emacs
changeset 112026:b3df357e51ff
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.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Tue, 28 Dec 2010 17:34:04 +0100 |
| parents | 41f10e4816d0 |
| children | a23f5102654d |
| files | src/ChangeLog src/xterm.c src/xterm.h |
| diffstat | 3 files changed, 24 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Dec 28 17:39:25 2010 +0800 +++ b/src/ChangeLog Tue Dec 28 17:34:04 2010 +0100 @@ -1,3 +1,8 @@ +2010-12-28 Andreas Schwab <schwab@linux-m68k.org> + + * xterm.h (x_alloc_lighter_color_for_widget): Restore declaration. + * xterm.c (x_alloc_lighter_color_for_widget): Restore. + 2010-12-27 Andreas Schwab <schwab@linux-m68k.org> * buffer.c: Remove unused declarations.
--- a/src/xterm.c Tue Dec 28 17:39:25 2010 +0800 +++ b/src/xterm.c Tue Dec 28 17:34:04 2010 +0100 @@ -1483,6 +1483,22 @@ } +/* 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. */
--- a/src/xterm.h Tue Dec 28 17:39:25 2010 +0800 +++ b/src/xterm.h Tue Dec 28 17:34:04 2010 +0100 @@ -974,6 +974,9 @@ 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 *);