gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 23:42:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

2021-01-24 Sergii Stoian <stoyan255@gmail.com>

Browse source 
* Source/x11/XGServerWindow.m: WindowMaker doesn't support
  _NET_REQUEST_FRAME_EXTENTS message andthe only way to determine offsets
  is creating and mapping window. In this case first mapped window of
  application is not appicon window.
  Early appicon creating inserted back as _createWMAppiconHack method and
  called only if no other way to determine window's offsets (before call to
  _checkStyle);appicon window size is set to size icon;
This commit is contained in:
Sergii Stoian 2021-01-24 02:45:29 +02:00
parent aa9ae34916
commit 3f3c1305a9
2 changed files with 54 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2021-01-24 Sergii Stoian <stoyan255@gmail.com>
* Source/x11/XGServerWindow.m: WindowMaker doesn't support
_NET_REQUEST_FRAME_EXTENTS message andthe only way to determine offsets
is creating and mapping window. In this case first mapped window of
application is not appicon window.
Early appicon creating inserted back as _createWMAppiconHack method and
called only if no other way to determine window's offsets (before call to
_checkStyle);appicon window size is set to size icon;
2021-01-16 Fred Kiefer <FredKiefer@gmx.de>
* Documentation/news.texi: Fill in some details for pending release.

47
Source/x11/XGServerWindow.m
View file

@ -77,6 +77,7 @@
static BOOL handlesWindowDecorations = YES;
static int _wmAppIcon = -1;
#define WINDOW_WITH_TAG(windowNumber) (gswindow_device_t *)NSMapGet(windowtags, (void *)(uintptr_t)windowNumber)
@ -761,6 +762,20 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
return NO;
}
- (void) _createWMAppiconHack
{
NSSize iconSize = [self iconSize];
NSDebugLLog(@"XGTrace", @"WindowMaker hack: Preparing app icon window");
_wmAppIcon = [self window
: NSMakeRect(0, 0, iconSize.width, iconSize.height)
: NSBackingStoreBuffered : NSIconWindowMask : defScreen];
[self orderwindow: NSWindowAbove : -1 : _wmAppIcon];
NSDebugLLog(@"XGTrace", @"WindowMaker hack: icon window = %d", _wmAppIcon);
}
- (unsigned long*) _getExtents: (Window)win
{
int count;
@ -1627,14 +1642,27 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
}
else
{
offsets = (uint16_t *)PropGetCheckProperty(dpy,
DefaultRootWindow(dpy), generic._GNUSTEP_FRAME_OFFSETS_ATOM, XA_CARDINAL, 16, 60, &count);
offsets = (uint16_t *)PropGetCheckProperty(dpy, DefaultRootWindow(dpy),
generic._GNUSTEP_FRAME_OFFSETS_ATOM,
XA_CARDINAL, 16, 60, &count);
}
if (offsets == 0)
{
BOOL ok = YES;
/* WindowMaker hack: We want to display our own app icon window in the
* icon window provided by WindowMaker. However, this only works when
* the icon window is the first window being mapped. For that reason,
* we create an empty icon window here before the code below eventually
* generate temporary window to determine the window frame offsets
* and reuse the icon window once the real app icon window is allocated.
*/
if ((generic.wm & XGWM_WINDOWMAKER) && generic.flags.useWindowMakerIcons == 1)
{
[self _createWMAppiconHack];
}
/* No offsets available on the root window ... so we test each
* style of window to determine its offsets.
*/
@ -1663,7 +1691,8 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
off[count++] = (uint16_t)generic.offsets[i].b;
}
XChangeProperty(dpy, DefaultRootWindow(dpy),
generic._GNUSTEP_FRAME_OFFSETS_ATOM, XA_CARDINAL, 16, PropModeReplace,
generic._GNUSTEP_FRAME_OFFSETS_ATOM,
XA_CARDINAL, 16, PropModeReplace,
(unsigned char *)off, 60);
}
}
@ -1861,6 +1890,18 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
RContext *context;
NSDebugLLog(@"XGTrace", @"DPSwindow: %@ %d", NSStringFromRect(frame), (int)type);
/* WindowMaker hack: Reuse the empty app icon allocated in _createWMAppiconHack
* for the real app icon. */
if ((style & NSIconWindowMask) == NSIconWindowMask && _wmAppIcon != -1)
{
int win = _wmAppIcon;
NSDebugLLog(@"XGTrace",
@"WindowMaker hack: Returning window %d as app icon window", win);
_wmAppIcon = -1;
return win;
}
root = [self _rootWindow];
context = [self screenRContext];