aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-19 16:10:18 (GMT)
committerfluxgen <fluxgen>2002-07-19 16:10:18 (GMT)
commita602e936b15ab28575532be16f0b964f0c13abff (patch)
treeb9118d70253233415254ad8ec18f8cde1adb1761
parentd8d2b3aa13ebe779b5d1cc24b1e15a7b2c29526d (diff)
downloadfluxbox-a602e936b15ab28575532be16f0b964f0c13abff.zip
fluxbox-a602e936b15ab28575532be16f0b964f0c13abff.tar.bz2
fixed slitlist loading bug, the list was just reading until space, but now it reads the entire line. And a typeo on XINERAMA
-rw-r--r--src/Slit.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index f6cc80c..a033bae 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.15 2002/05/29 19:10:04 fluxgen Exp $ 22// $Id: Slit.cc,v 1.16 2002/07/19 16:10:18 fluxgen Exp $
23 23
24//use GNU extensions 24//use GNU extensions
25#ifndef _GNU_SOURCE 25#ifndef _GNU_SOURCE
@@ -526,7 +526,7 @@ void Slit::reposition(void) {
526 head_y = 0, 526 head_y = 0,
527 head_w, 527 head_w,
528 head_h; 528 head_h;
529#ifdef XINERMA 529#ifdef XINERAMA
530 if (screen->hasXinerama()) { 530 if (screen->hasXinerama()) {
531 unsigned int head = screen->getSlitOnHead(); 531 unsigned int head = screen->getSlitOnHead();
532 532
@@ -785,7 +785,7 @@ void Slit::loadClientList(void) {
785 std::string name; 785 std::string name;
786 while (! file.eof()) { 786 while (! file.eof()) {
787 name = ""; 787 name = "";
788 file >> name; 788 std::getline(file, name); // get the entire line
789 if (name.size() > 0) { 789 if (name.size() > 0) {
790 SlitClient *client = new SlitClient(name.c_str()); 790 SlitClient *client = new SlitClient(name.c_str());
791 clientList.push_back(client); 791 clientList.push_back(client);
@@ -805,6 +805,7 @@ void Slit::saveClientList(void) {
805 name = (*it)->match_name; 805 name = (*it)->match_name;
806 if (name != prevName) 806 if (name != prevName)
807 file << name.c_str() << std::endl; 807 file << name.c_str() << std::endl;
808
808 prevName = name; 809 prevName = name;
809 } 810 }
810} 811}