gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

- Added support for NET_WM_NAME/NET_WM_ICON_NAME

Browse Source 
- moved out font name conversion code from getstyle/setstyle/convertfonts and made it support fontsets
This commit is contained in:
kojima
2004-10-16 22:05:04 +00:00
parent 9402724e40
commit 7055530895
17 changed files with 305 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/wmspec.c
View File

@@ -74,10 +74,10 @@ static Atom net_moveresize_window; /* TODO */
static Atom net_wm_moveresize; /* TODO */
/* Application Window Properties */
static Atom net_wm_name; /* TODO */
static Atom net_wm_visible_name; /* TODO */
static Atom net_wm_icon_name; /* TODO */
static Atom net_wm_visible_icon_name; /* TODO */
static Atom net_wm_name;
static Atom net_wm_visible_name; /* TODO (unnecessary?) */
static Atom net_wm_icon_name;
static Atom net_wm_visible_icon_name; /* TODO (unnecessary?) */
static Atom net_wm_desktop;
static Atom net_wm_window_type;
static Atom net_wm_window_type_desktop;
@@ -295,6 +295,9 @@ setSupportedHints(WScreen *scr)
atom[i++] = net_wm_icon_geometry;
atom[i++] = net_wm_icon;
atom[i++] = net_wm_handled_icons;
atom[i++] = net_wm_name;
atom[i++] = net_wm_icon_name;
XChangeProperty(dpy, scr->root_win, net_supported, XA_ATOM, 32,
PropModeReplace, (unsigned char*)atom, i);
@@ -535,6 +538,16 @@ wNETWMInitStuff(WScreen *scr)
}
void
wNETWMCleanup(WScreen *scr)
{
int i;
for (i= 0; i < atomNr; i++)
XDeleteProperty(dpy, scr->root_win, *atomNames[i].atom);
}
void
wNETWMUpdateActions(WWindow *wwin, Bool del)
{
@@ -1018,6 +1031,7 @@ doStateAtom(WWindow *wwin, Atom state, int set, Bool init)
}
}
} else if (state == net_wm_state_fullscreen) {
puts("GoT FS ST");
if (set == _NET_WM_STATE_TOGGLE) {
set = !(wwin->flags.fullscreen);
}
@@ -1502,6 +1516,15 @@ wNETWMCheckClientHintChange(WWindow *wwin, XPropertyEvent *event)
updateNetIconInfo(wwin);
} else if (event->atom == net_wm_window_type) {
updateWindowType(wwin);
} else if (event->atom == net_wm_name) {
char *name= wNETWMGetWindowName(wwin->client_win);
wWindowUpdateName(wwin, name);
if (name) wfree(name);
} else if (event->atom == net_wm_icon_name) {
if (wwin->icon) {
char *name= wNETWMGetIconName(wwin->client_win);
wIconChangeTitle(wwin->icon, name);
}
} else {
ret = False;
}
@@ -1535,6 +1558,46 @@ wNETWMGetPidForWindow(Window window)
}
char*
wNETWMGetWindowName(Window window)
{
char *name;
char *ret;
int size;
name= (char*)PropGetCheckProperty(window,
net_wm_name, utf8_string, 0,
0, &size);
if (name) {
ret= wstrndup(name, size);
XFree(name);
}
else
ret= NULL;
return ret;
}
char*
wNETWMGetIconName(Window window)
{
char *name;
char *ret;
int size;
name= (char*)PropGetCheckProperty(window,
net_wm_icon_name, utf8_string, 0,
0, &size);
if (name) {
ret= wstrndup(name, size);
XFree(name);
}
else
ret= NULL;
return ret;
}
static void
observer(void *self, WMNotification *notif)
{