nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add updateIconTitle

Browse source
This commit is contained in:
Dana Jansens 2002-11-07 08:22:27 +00:00
parent ab88b1b9cd
commit 8b041e2f5c
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/client.cc
View file

@ -75,6 +75,7 @@ OBClient::OBClient(Window window)
updateWMHints(); updateWMHints();
// XXX: updateTransientFor(); // XXX: updateTransientFor();
updateTitle(); updateTitle();
updateIconTitle();
updateClass(); updateClass();
#ifdef DEBUG #ifdef DEBUG
@ -328,6 +329,8 @@ void OBClient::updateProtocols()
int num_return = 0; int num_return = 0;
_focus_notify = false; _focus_notify = false;
_decorations &= ~Decor_Close;
_functions &= ~Func_Close;
if (XGetWMProtocols(otk::OBDisplay::display, _window, &proto, &num_return)) { if (XGetWMProtocols(otk::OBDisplay::display, _window, &proto, &num_return)) {
for (int i = 0; i < num_return; ++i) { for (int i = 0; i < num_return; ++i) {
@ -438,6 +441,25 @@ void OBClient::updateTitle()
} }
void OBClient::updateIconTitle()
{
const otk::OBProperty *property = Openbox::instance->property();
_icon_title = "";
// try netwm
if (! property->get(_window, otk::OBProperty::net_wm_icon_name,
otk::OBProperty::utf8, &_icon_title)) {
// try old x stuff
property->get(_window, otk::OBProperty::wm_icon_name,
otk::OBProperty::ascii, &_icon_title);
}
if (_title.empty())
_icon_title = _("Unnamed Window");
}
void OBClient::updateClass() void OBClient::updateClass()
{ {
const otk::OBProperty *property = Openbox::instance->property(); const otk::OBProperty *property = Openbox::instance->property();
@ -466,10 +488,11 @@ void OBClient::update(const XPropertyEvent &e)
else if (e.atom == XA_WM_HINTS) else if (e.atom == XA_WM_HINTS)
updateWMHints(); updateWMHints();
else if (e.atom == property->atom(otk::OBProperty::net_wm_name) || else if (e.atom == property->atom(otk::OBProperty::net_wm_name) ||
e.atom == property->atom(otk::OBProperty::wm_name) || e.atom == property->atom(otk::OBProperty::wm_name))
e.atom == property->atom(otk::OBProperty::net_wm_icon_name) ||
e.atom == property->atom(otk::OBProperty::wm_icon_name))
updateTitle(); updateTitle();
else if (e.atom == property->atom(otk::OBProperty::net_wm_icon_name) ||
e.atom == property->atom(otk::OBProperty::wm_icon_name))
updateIconTitle();
else if (e.atom == property->atom(otk::OBProperty::wm_class)) else if (e.atom == property->atom(otk::OBProperty::wm_class))
updateClass(); updateClass();
else if (e.atom == property->atom(otk::OBProperty::wm_protocols)) else if (e.atom == property->atom(otk::OBProperty::wm_protocols))