[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] cairo 022d7cd: * xterm.c (x_draw_window_divider): Use x_fi
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] cairo 022d7cd: * xterm.c (x_draw_window_divider): Use x_fill_rectangle instead of XFillRectangle. |
Date: |
Mon, 16 Feb 2015 01:15:22 +0000 |
branch: cairo
commit 022d7cda41e8c0db381b22bef0d48671b5725e9c
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: YAMAMOTO Mitsuharu <address@hidden>
* xterm.c (x_draw_window_divider): Use x_fill_rectangle instead of
XFillRectangle.
---
src/ChangeLog | 5 +++++
src/xterm.c | 29 ++++++++++++++---------------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 6485449..d9b2476 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-16 YAMAMOTO Mitsuharu <address@hidden>
+
+ * xterm.c (x_draw_window_divider): Use x_fill_rectangle instead of
+ XFillRectangle.
+
2015-02-14 YAMAMOTO Mitsuharu <address@hidden>
* fringe.c (init_fringe_bitmap) [USE_CAIRO]: Adjust bitmap data for
diff --git a/src/xterm.c b/src/xterm.c
index 49d9c32..04d6c06 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1101,39 +1101,38 @@ x_draw_window_divider (struct window *w, int x0, int
x1, int y0, int y1)
? face_last->foreground
: FRAME_FOREGROUND_PIXEL (f));
Display *display = FRAME_X_DISPLAY (f);
- Window window = FRAME_X_WINDOW (f);
if (y1 - y0 > x1 - x0 && x1 - x0 > 2)
/* Vertical. */
{
XSetForeground (display, f->output_data.x->normal_gc, color_first);
- XFillRectangle (display, window, f->output_data.x->normal_gc,
- x0, y0, 1, y1 - y0);
+ x_fill_rectangle (f, f->output_data.x->normal_gc,
+ x0, y0, 1, y1 - y0);
XSetForeground (display, f->output_data.x->normal_gc, color);
- XFillRectangle (display, window, f->output_data.x->normal_gc,
- x0 + 1, y0, x1 - x0 - 2, y1 - y0);
+ x_fill_rectangle (f, f->output_data.x->normal_gc,
+ x0 + 1, y0, x1 - x0 - 2, y1 - y0);
XSetForeground (display, f->output_data.x->normal_gc, color_last);
- XFillRectangle (display, window, f->output_data.x->normal_gc,
- x1 - 1, y0, 1, y1 - y0);
+ x_fill_rectangle (f, f->output_data.x->normal_gc,
+ x1 - 1, y0, 1, y1 - y0);
}
else if (x1 - x0 > y1 - y0 && y1 - y0 > 3)
/* Horizontal. */
{
XSetForeground (display, f->output_data.x->normal_gc, color_first);
- XFillRectangle (display, window, f->output_data.x->normal_gc,
- x0, y0, x1 - x0, 1);
+ x_fill_rectangle (f, f->output_data.x->normal_gc,
+ x0, y0, x1 - x0, 1);
XSetForeground (display, f->output_data.x->normal_gc, color);
- XFillRectangle (display, window, f->output_data.x->normal_gc,
- x0, y0 + 1, x1 - x0, y1 - y0 - 2);
+ x_fill_rectangle (f, f->output_data.x->normal_gc,
+ x0, y0 + 1, x1 - x0, y1 - y0 - 2);
XSetForeground (display, f->output_data.x->normal_gc, color_last);
- XFillRectangle (display, window, f->output_data.x->normal_gc,
- x0, y1 - 1, x1 - x0, 1);
+ x_fill_rectangle (f, f->output_data.x->normal_gc,
+ x0, y1 - 1, x1 - x0, 1);
}
else
{
XSetForeground (display, f->output_data.x->normal_gc, color);
- XFillRectangle (display, window, f->output_data.x->normal_gc,
- x0, y0, x1 - x0, y1 - y0);
+ x_fill_rectangle (f, f->output_data.x->normal_gc,
+ x0, y0, x1 - x0, y1 - y0);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] cairo 022d7cd: * xterm.c (x_draw_window_divider): Use x_fill_rectangle instead of XFillRectangle.,
YAMAMOTO Mitsuharu <=