aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2010-12-28 17:34:04 +0100
committerAndreas Schwab2010-12-28 17:34:04 +0100
commit365525b370a3faa4d2403b4d312c10f760082a66 (patch)
treee67d9167b1ef1885d7447cb406d8477ef85e799e /src
parentc940c05468b5ab2a203bd8043f0d4f4f3bf56958 (diff)
downloademacs-365525b370a3faa4d2403b4d312c10f760082a66.tar.gz
emacs-365525b370a3faa4d2403b4d312c10f760082a66.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c16
-rw-r--r--src/xterm.h3
3 files changed, 24 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7985f575cd6..9b4a709710d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-12-28 Andreas Schwab <schwab@linux-m68k.org>
2
3 * xterm.h (x_alloc_lighter_color_for_widget): Restore declaration.
4 * xterm.c (x_alloc_lighter_color_for_widget): Restore.
5
12010-12-27 Andreas Schwab <schwab@linux-m68k.org> 62010-12-27 Andreas Schwab <schwab@linux-m68k.org>
2 7
3 * buffer.c: Remove unused declarations. 8 * 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)
1483} 1483}
1484 1484
1485 1485
1486/* Allocate a color which is lighter or darker than *PIXEL by FACTOR
1487 or DELTA. Try a color with RGB values multiplied by FACTOR first.
1488 If this produces the same color as PIXEL, try a color where all RGB
1489 values have DELTA added. Return the allocated color in *PIXEL.
1490 DISPLAY is the X display, CMAP is the colormap to operate on.
1491 Value is non-zero if successful. */
1492
1493int
1494x_alloc_lighter_color_for_widget (Widget widget, Display *display, Colormap cmap,
1495 unsigned long *pixel, double factor, int delta)
1496{
1497 struct frame *f = x_frame_of_widget (widget);
1498 return x_alloc_lighter_color (f, display, cmap, pixel, factor, delta);
1499}
1500
1501
1486/* Structure specifying which arguments should be passed by Xt to 1502/* Structure specifying which arguments should be passed by Xt to
1487 cvt_string_to_pixel. We want the widget's screen and colormap. */ 1503 cvt_string_to_pixel. We want the widget's screen and colormap. */
1488 1504
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);
974extern unsigned long x_copy_color (struct frame *, unsigned long); 974extern unsigned long x_copy_color (struct frame *, unsigned long);
975#ifdef USE_X_TOOLKIT 975#ifdef USE_X_TOOLKIT
976extern XtAppContext Xt_app_con; 976extern XtAppContext Xt_app_con;
977extern int x_alloc_lighter_color_for_widget (Widget, Display *, Colormap,
978 unsigned long *,
979 double, int);
977extern void x_activate_timeout_atimer (void); 980extern void x_activate_timeout_atimer (void);
978#endif 981#endif
979extern int x_alloc_nearest_color (struct frame *, Colormap, XColor *); 982extern int x_alloc_nearest_color (struct frame *, Colormap, XColor *);