Skip to content

Commit 39ef43f

Browse files
committed
- gfxlib2: X11 driver - set the window title for both the frame window and the client window
(cherry picked from commit 505f7cd)
1 parent c2f291f commit 39ef43f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Version 1.07.2
66
- suffixes in '-lang fb' reverted to fbc-1.05.0 behaviours
77
- rtlib: internal fb_MemCopyClear() argument types changed to expect unsigned lengths (UINTEGER => size_t)
88
- github #256: gfxlib2: enable frame buffer on linux-arm targets
9+
- gfxlib2: X11 driver - set the window title for both the frame window and the client window
910

1011
[added]
1112
- gas64 emitter for x86_64 (SARG), added '-gen gas64' command line option to select

src/gfxlib2/unix/gfx_x11.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ int fb_hX11Init(char *title, int w, int h, int depth, int refresh_rate, int flag
482482

483483
if (!fb_x11.window)
484484
return -1;
485-
XStoreName(fb_x11.display, fb_x11.window, title);
485+
fb_hX11SetWindowTitle( title );
486486
if (fb_program_icon) {
487487
hints.flags = IconPixmapHint | IconMaskHint;
488488
xpm_attribs.valuemask = XpmReturnAllocPixels | XpmReturnExtensions;
@@ -758,7 +758,11 @@ void fb_hX11SetMouse(int x, int y, int show, int clip)
758758

759759
void fb_hX11SetWindowTitle(char *title)
760760
{
761-
XStoreName(fb_x11.display, fb_x11.wmwindow, title);
761+
if (fb_x11.flags & DRIVER_NO_FRAME) {
762+
XStoreName(fb_x11.display, fb_x11.window, title);
763+
} else {
764+
XStoreName(fb_x11.display, fb_x11.wmwindow, title);
765+
}
762766
}
763767

764768
int fb_hX11SetWindowPos(int x, int y)

0 commit comments

Comments
 (0)