aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/Window.cc b/src/Window.cc
index d942482..53222a7 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -772,14 +772,14 @@ void FluxboxWindow::nextClient() {
772 if (numClients() <= 1) 772 if (numClients() <= 1)
773 return; 773 return;
774 774
775 screen().focusControl().cycleFocus(&m_clientlist, 0); 775 screen().focusControl().cycleFocus(m_clientlist, 0);
776} 776}
777 777
778void FluxboxWindow::prevClient() { 778void FluxboxWindow::prevClient() {
779 if (numClients() <= 1) 779 if (numClients() <= 1)
780 return; 780 return;
781 781
782 screen().focusControl().cycleFocus(&m_clientlist, 0, true); 782 screen().focusControl().cycleFocus(m_clientlist, 0, true);
783} 783}
784 784
785 785
@@ -1903,6 +1903,9 @@ void FluxboxWindow::lower() {
1903} 1903}
1904 1904
1905void FluxboxWindow::tempRaise() { 1905void FluxboxWindow::tempRaise() {
1906 // Note: currently, this causes a problem with cycling through minimized
1907 // clients if this window has more than one tab, since the window will not
1908 // match isIconic() when the rest of the tabs get checked
1906 if (isIconic()) 1909 if (isIconic())
1907 deiconify(); 1910 deiconify();
1908 1911
@@ -3684,10 +3687,19 @@ Window FluxboxWindow::clientWindow() const {
3684 3687
3685 3688
3686const string &FluxboxWindow::title() const { 3689const string &FluxboxWindow::title() const {
3687 static string empty_string; 3690 return (m_client ? m_client->title() : m_title);
3688 if (m_client == 0) 3691}
3689 return empty_string; 3692
3690 return m_client->title(); 3693const std::string &FluxboxWindow::getWMClassName() const {
3694 return (m_client ? m_client->getWMClassName() : m_instance_name);
3695}
3696
3697const std::string &FluxboxWindow::getWMClassClass() const {
3698 return (m_client ? m_client->getWMClassClass() : m_class_name);
3699}
3700
3701std::string FluxboxWindow::getWMRole() const {
3702 return (m_client ? m_client->getWMRole() : "FluxboxWindow");
3691} 3703}
3692 3704
3693int FluxboxWindow::initialState() const { return m_client->initial_state; } 3705int FluxboxWindow::initialState() const { return m_client->initial_state; }