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

Don't user NET WM icon on Window Maker.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@22043 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
FredKiefer 2005-11-18 17:53:53 +00:00
parent 97aecfddb2
commit 97b4f13265
2 changed files with 43 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-11-18 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XGServerWindow.m (-window::::): Don't use the NET WM
window icon for Window Maker.
* Source/x11/XGServerWindow.m (_createNetIcon:::, _setNetWMIconFor:):
Rewrote this methods to be prepared to use the mini window icon,
when that gets available in back.
2005-11-16 Richard Frith-Macdonald <rfm@gnu.org>
* Source/art/composite.m:

59
Source/x11/XGServerWindow.m
View file

@ -953,35 +953,25 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
}
/*
Code to build up a NET WM icon from our application icon
* Code to build up a NET WM icon from our application icon
*/
static long *iconPropertyData;
static int iconSize;
static BOOL didCreateNetIcon;
-(int) _createNetIcon
-(BOOL) _createNetIcon: (NSImage*)image
result: (long**)pixeldata
size: (int*)size
{
NSImage *image;
NSBitmapImageRep *rep;
int i, j, w, h, samples;
unsigned char *data;
int index;
long *iconPropertyData;
int iconSize;
NSAssert(!didCreateNetIcon, @"called _createNetIcon twice");
image = [NSApp applicationIconImage];
if (image == nil)
{
return 0;
}
didCreateNetIcon = YES;
rep = (NSBitmapImageRep *)[image bestRepresentationForDevice:nil];
if (![rep isKindOfClass: [NSBitmapImageRep class]])
{
NSLog(@"Wrong bitmap class for WM icon %@ %@", rep, image);
return 0;
return NO;
}
if ([rep bitsPerSample] != 8
@ -990,7 +980,7 @@ static BOOL didCreateNetIcon;
|| [rep isPlanar])
{
NSLog(@"Wrong image type for WM icon");
return 0;
return NO;
}
h = [rep pixelsHigh];
@ -1003,7 +993,7 @@ static BOOL didCreateNetIcon;
if (iconPropertyData == NULL)
{
NSLog(@"No memory for WM icon");
return 0;
return NO;
}
memset(iconPropertyData, 0, sizeof(long)*iconSize);
@ -1055,14 +1045,22 @@ static BOOL didCreateNetIcon;
data += [rep bytesPerRow];
}
return 1;
*pixeldata = iconPropertyData;
*size = iconSize;
return YES;
}
- (void) _setNetWMIconFor: (Window) window
{
// We store the GNUStepMenuImage in the window
// and use that as our title bar icon
// We store the GNUstep application icon image in the window
// and use that as our title bar icon.
// FIXME: This code should rather use the window mini icon,
// but currently this image is not available in the backend.
static Atom icon_atom = None;
static BOOL didCreateNetIcon = NO;
static long *iconPropertyData = NULL;
static int iconSize;
NSImage *image;
/* Initialize the atom if needed */
if (icon_atom == None)
@ -1070,7 +1068,17 @@ static BOOL didCreateNetIcon;
if (!didCreateNetIcon)
{
[self _createNetIcon];
if (iconPropertyData != NULL)
{
objc_free(iconPropertyData);
}
image = [NSApp applicationIconImage];
if (image != nil)
{
didCreateNetIcon = YES;
[self _createNetIcon: image result: &iconPropertyData size: &iconSize];
}
}
if (iconPropertyData)
@ -1197,7 +1205,10 @@ static BOOL didCreateNetIcon;
setWindowHintsForStyle (dpy, window->ident, style);
}
if ((generic.wm & XGWM_EWMH) != 0)
// For window managers supporting EWMH, but not Window Maker,
// where we use a different solution, set the window icon.
if (((generic.wm & XGWM_EWMH) != 0) &&
((generic.wm & XGWM_WINDOWMAKER) == 0))
{
[self _setNetWMIconFor: window->ident];
}