diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2020-10-26 22:05:55 +0900 |
|---|---|---|
| committer | Jeff Walsh <jeff.walsh@drtusers-MacBook-Pro.local> | 2020-11-24 12:24:40 +1100 |
| commit | e405404d10ef5b24e06d02f626c4bf27a3ae525d (patch) | |
| tree | 4d0e23b75fdab263a9f159e96806ea7705d3d245 /src/pgtkterm.h | |
| parent | 948e2fa582ff33b58d25186ea35f41adaa9d6cbe (diff) | |
| download | emacs-e405404d10ef5b24e06d02f626c4bf27a3ae525d.tar.gz emacs-e405404d10ef5b24e06d02f626c4bf27a3ae525d.tar.bz2 emacs-e405404d10ef5b24e06d02f626c4bf27a3ae525d.zip | |
Fix startup failure on svg-unsupported environments
* src/pgtkterm.c (pgtk_bitmap_icon): Re-port X-code.
(pgtk_term_init): Add member initialization.
* src/pgtkterm.h (struct pgtk_display_info): Add member.
(struct pgtk_output): Add member.
Diffstat (limited to 'src/pgtkterm.h')
| -rw-r--r-- | src/pgtkterm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/pgtkterm.h b/src/pgtkterm.h index ad66039648b..a2714a3afe0 100644 --- a/src/pgtkterm.h +++ b/src/pgtkterm.h @@ -172,6 +172,10 @@ struct pgtk_display_info int color_p; + /* Emacs bitmap-id of the default icon bitmap for this frame. + Or -1 if none has been allocated yet. */ + ptrdiff_t icon_bitmap_id; + Window root_window; /* Xism */ @@ -296,6 +300,10 @@ struct pgtk_output Window window_desc, parent_desc; char explicit_parent; + /* If >=0, a bitmap index. The indicated bitmap is used for the + icon. */ + ptrdiff_t icon_bitmap; + struct font *font; int baseline_offset; |