diff options
| author | YAMAMOTO Mitsuharu | 2019-05-30 17:16:41 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-05-30 17:16:41 +0900 |
| commit | cc71a82fc705a73fa3ef6cda3ec6bee1cb654d7e (patch) | |
| tree | 7ce649f9d1bcf8fe087e38b3488c9c0a6e14a7ba /src/xterm.h | |
| parent | ceca1740ea2c9bc98da8c11765b78c696b27c79e (diff) | |
| download | emacs-cc71a82fc705a73fa3ef6cda3ec6bee1cb654d7e.tar.gz emacs-cc71a82fc705a73fa3ef6cda3ec6bee1cb654d7e.zip | |
Add stipple support on cairo
* src/xterm.h (struct x_bitmap_record) [USE_CAIRO]: Remove unused member img.
Add member stipple.
(x_bitmap_stipple) [USE_CAIRO]: Add extern.
* src/image.c (x_bitmap_stipple) [HAVE_X_WINDOWS && USE_CAIRO]: New function.
(image_create_bitmap_from_data, image_create_bitmap_from_file)
(x_create_bitmap_from_xpm_data) [HAVE_X_WINDOWS && USE_CAIRO]: Initialize
stipple member of struct x_bitmap_record.
(free_bitmap_record) [HAVE_X_WINDOWS && USE_CAIRO]: Destroy stipple member.
* src/xterm.c (x_fill_rectangle) [USE_CAIRO]: Inspect gc and draw stipple if
necessary. Use x_bitmap_stipple.
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xterm.h b/src/xterm.h index ce1443c381c..2bd2c0105f6 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -130,7 +130,7 @@ struct xim_inst_t | |||
| 130 | struct x_bitmap_record | 130 | struct x_bitmap_record |
| 131 | { | 131 | { |
| 132 | #ifdef USE_CAIRO | 132 | #ifdef USE_CAIRO |
| 133 | void *img; | 133 | cairo_pattern_t *stipple; |
| 134 | #endif | 134 | #endif |
| 135 | Pixmap pixmap; | 135 | Pixmap pixmap; |
| 136 | bool have_mask; | 136 | bool have_mask; |
| @@ -151,6 +151,8 @@ struct x_gc_ext_data | |||
| 151 | /* Clipping rectangles. */ | 151 | /* Clipping rectangles. */ |
| 152 | XRectangle clip_rects[MAX_CLIP_RECTS]; | 152 | XRectangle clip_rects[MAX_CLIP_RECTS]; |
| 153 | }; | 153 | }; |
| 154 | |||
| 155 | extern cairo_pattern_t *x_bitmap_stipple (struct frame *, Pixmap); | ||
| 154 | #endif | 156 | #endif |
| 155 | 157 | ||
| 156 | 158 | ||