aboutsummaryrefslogtreecommitdiff
path: root/src/Ewmh.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-08-27 22:29:33 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-08-27 22:29:33 (GMT)
commit82047e6a391a12be9583168f28ac72c1154108d6 (patch)
tree68cc4865da7bdf95052907c6d8ce9cf0fb19c90b /src/Ewmh.cc
parenta2ec0c9bdd9ebcc713426a79209b9ca90b4db301 (diff)
downloadfluxbox_pavel-82047e6a391a12be9583168f28ac72c1154108d6.zip
fluxbox_pavel-82047e6a391a12be9583168f28ac72c1154108d6.tar.bz2
move some things from FluxboxWindow to WindowState
Diffstat (limited to 'src/Ewmh.cc')
-rw-r--r--src/Ewmh.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 2617491..aacb2ed 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -586,22 +586,22 @@ void Ewmh::setupClient(WinClient &winclient) {
586 winclient.property(m_net->wm_window_type, 0, 0x7fffffff, False, XA_ATOM, 586 winclient.property(m_net->wm_window_type, 0, 0x7fffffff, False, XA_ATOM,
587 &ret_type, &fmt, &nitems, &bytes_after, 587 &ret_type, &fmt, &nitems, &bytes_after,
588 &data); 588 &data);
589 Focusable::WindowType type = Focusable::TYPE_NORMAL; 589 WindowState::WindowType type = WindowState::TYPE_NORMAL;
590 if (data) { 590 if (data) {
591 Atom *atoms = (unsigned long *)data; 591 Atom *atoms = (unsigned long *)data;
592 for (unsigned long l = 0; l < nitems; ++l) { 592 for (unsigned long l = 0; l < nitems; ++l) {
593 if (atoms[l] == m_net->wm_window_type_dock) 593 if (atoms[l] == m_net->wm_window_type_dock)
594 type = Focusable::TYPE_DOCK; 594 type = WindowState::TYPE_DOCK;
595 else if (atoms[l] == m_net->wm_window_type_desktop) 595 else if (atoms[l] == m_net->wm_window_type_desktop)
596 type = Focusable::TYPE_DESKTOP; 596 type = WindowState::TYPE_DESKTOP;
597 else if (atoms[l] == m_net->wm_window_type_splash) 597 else if (atoms[l] == m_net->wm_window_type_splash)
598 type = Focusable::TYPE_SPLASH; 598 type = WindowState::TYPE_SPLASH;
599 else if (atoms[l] == m_net->wm_window_type_dialog) 599 else if (atoms[l] == m_net->wm_window_type_dialog)
600 type = Focusable::TYPE_DIALOG; 600 type = WindowState::TYPE_DIALOG;
601 else if (atoms[l] == m_net->wm_window_type_menu) 601 else if (atoms[l] == m_net->wm_window_type_menu)
602 type = Focusable::TYPE_MENU; 602 type = WindowState::TYPE_MENU;
603 else if (atoms[l] == m_net->wm_window_type_toolbar) 603 else if (atoms[l] == m_net->wm_window_type_toolbar)
604 type = Focusable::TYPE_TOOLBAR; 604 type = WindowState::TYPE_TOOLBAR;
605 else if (atoms[l] != m_net->wm_window_type_normal) 605 else if (atoms[l] != m_net->wm_window_type_normal)
606 continue; 606 continue;
607 /* 607 /*
@@ -615,7 +615,7 @@ void Ewmh::setupClient(WinClient &winclient) {
615 // if _NET_WM_WINDOW_TYPE not set and this window 615 // if _NET_WM_WINDOW_TYPE not set and this window
616 // has transient_for the type must be set to _NET_WM_WINDOW_TYPE_DIALOG 616 // has transient_for the type must be set to _NET_WM_WINDOW_TYPE_DIALOG
617 if (winclient.isTransient()) { 617 if (winclient.isTransient()) {
618 type = Focusable::TYPE_DIALOG; 618 type = WindowState::TYPE_DIALOG;
619 winclient. 619 winclient.
620 changeProperty(m_net->wm_window_type, 620 changeProperty(m_net->wm_window_type,
621 XA_ATOM, 32, PropModeReplace, 621 XA_ATOM, 32, PropModeReplace,