summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Slit.cc27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index 6eea94b..2684ca2 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Slit.cc,v 1.19 2002/07/23 18:38:31 fluxgen Exp $ 22// $Id: Slit.cc,v 1.20 2002/08/14 21:51:07 fluxgen Exp $
23 23
24//use GNU extensions 24//use GNU extensions
25#ifndef _GNU_SOURCE 25#ifndef _GNU_SOURCE
@@ -521,7 +521,7 @@ void Slit::reconfigure(void) {
521} 521}
522 522
523 523
524void Slit::reposition(void) { 524void Slit::reposition() {
525 int head_x = 0, 525 int head_x = 0,
526 head_y = 0, 526 head_y = 0,
527 head_w, 527 head_w,
@@ -667,7 +667,7 @@ void Slit::reposition(void) {
667} 667}
668 668
669 669
670void Slit::shutdown(void) { 670void Slit::shutdown() {
671 saveClientList(); 671 saveClientList();
672 while (clientList.size() != 0) 672 while (clientList.size() != 0)
673 removeClient(clientList.front(), true, true); 673 removeClient(clientList.front(), true, true);
@@ -710,9 +710,11 @@ void Slit::enterNotifyEvent(XCrossingEvent *) {
710 return; 710 return;
711 711
712 if (hidden) { 712 if (hidden) {
713 if (! timer.isTiming()) timer.start(); 713 if (! timer.isTiming())
714 timer.start();
714 } else { 715 } else {
715 if (timer.isTiming()) timer.stop(); 716 if (timer.isTiming())
717 timer.stop();
716 } 718 }
717} 719}
718 720
@@ -722,9 +724,11 @@ void Slit::leaveNotifyEvent(XCrossingEvent *) {
722 return; 724 return;
723 725
724 if (hidden) { 726 if (hidden) {
725 if (timer.isTiming()) timer.stop(); 727 if (timer.isTiming())
728 timer.stop();
726 } else if (! slitmenu.isVisible()) { 729 } else if (! slitmenu.isVisible()) {
727 if (! timer.isTiming()) timer.start(); 730 if (! timer.isTiming())
731 timer.start();
728 } 732 }
729} 733}
730 734
@@ -768,7 +772,7 @@ void Slit::configureRequestEvent(XConfigureRequestEvent *e) {
768} 772}
769 773
770 774
771void Slit::timeout(void) { 775void Slit::timeout() {
772 hidden = ! hidden; 776 hidden = ! hidden;
773 if (hidden) 777 if (hidden)
774 XMoveWindow(display, frame.window, frame.x_hidden, frame.y_hidden); 778 XMoveWindow(display, frame.window, frame.x_hidden, frame.y_hidden);
@@ -776,11 +780,10 @@ void Slit::timeout(void) {
776 XMoveWindow(display, frame.window, frame.x, frame.y); 780 XMoveWindow(display, frame.window, frame.x, frame.y);
777} 781}
778 782
779void Slit::loadClientList(void) { 783void Slit::loadClientList() {
780 const std::string &filename = fluxbox->getSlitlistFilename(); 784 const std::string &filename = fluxbox->getSlitlistFilename();
781 struct stat buf; 785 struct stat buf;
782 if (!stat(filename.c_str(), &buf)) 786 if (!stat(filename.c_str(), &buf)) {
783 {
784 std::ifstream file(fluxbox->getSlitlistFilename().c_str()); 787 std::ifstream file(fluxbox->getSlitlistFilename().c_str());
785 std::string name; 788 std::string name;
786 while (! file.eof()) { 789 while (! file.eof()) {
@@ -860,7 +863,7 @@ slit(sl) {
860} 863}
861 864
862 865
863Slitmenu::~Slitmenu(void) { 866Slitmenu::~Slitmenu() {
864 delete directionmenu; 867 delete directionmenu;
865 delete placementmenu; 868 delete placementmenu;
866#ifdef XINERAMA 869#ifdef XINERAMA