Xinerama

3 files changed, 14 insertions, 13 deletions

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index cb3ca28..d92c533 100644
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: BaseDisplay.cc,v 1.10 2002/03/19 21:19:55 fluxgen Exp $
+// $Id: BaseDisplay.cc,v 1.11 2002/03/23 02:02:00 pekdon Exp $
 
 // use GNU extensions
 #ifndef  _GNU_SOURCE
@@ -454,28 +454,29 @@ ScreenInfo::~ScreenInfo(void) {
 // x,y. If it fails or Xinerama isn't
 // activated it'll return head nr 0
 //-----------------------------------------
-unsigned int ScreenInfo::getHead(int x, int y) {
+unsigned int ScreenInfo::getHead(int x, int y) const {
 
         // is Xinerama extensions enabled?
         if (hasXinerama()) {
                 // check if last head is still active
-                if ((xineramaInfos[xineramaLastHead].x_org <= x) &&
+/*              if ((xineramaInfos[xineramaLastHead].x_org <= x) &&
                                 ((xineramaInfos[xineramaLastHead].x_org +
                                 xineramaInfos[xineramaLastHead].width) > x) &&
                                 (xineramaInfos[xineramaLastHead].y_org <= y) &&
                                 ((xineramaInfos[xineramaLastHead].y_org +
                                 xineramaInfos[xineramaLastHead].height) > y)) {
                         return xineramaLastHead;
-                } else {
+                } else { */
                         // go trough all the heads, and search
                         for (int i = 0; (signed) i < xineramaNumHeads; i++) {
                                 if (xineramaInfos[i].x_org <= x &&
-                                                xineramaInfos[i].x_org + xineramaInfos[i].width) > x &&
+                                                (xineramaInfos[i].x_org + xineramaInfos[i].width) > x &&
                                                 xineramaInfos[i].y_org <= y &&
-                                                xineramaInfos[i].y_org + xineramaInfos[i].height) > y)
-                                        return (xineramaLastHead = i);
+                                                (xineramaInfos[i].y_org + xineramaInfos[i].height) > y)
+                                        // return (xineramaLastHead = i);
+                                        return i;
                         }
-                }
+        //      }
         }
 
         return 0;
@@ -506,7 +507,7 @@ unsigned int ScreenInfo::getCurrHead(void) const {
 //----------- getHeadWidth ------------
 // Returns the width of head
 //-------------------------------------
-unsigned int ScreenInfo::getHeadWidth(unsigned int head) {
+unsigned int ScreenInfo::getHeadWidth(unsigned int head) const {
 
         if (hasXinerama()) {
                 if ((signed) head >= xineramaNumHeads) {
diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh
index d7075c1..30e90c0 100644
--- a/src/BaseDisplay.hh
+++ b/src/BaseDisplay.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: BaseDisplay.hh,v 1.17 2002/03/19 21:19:55 fluxgen Exp $
+// $Id: BaseDisplay.hh,v 1.18 2002/03/23 02:02:01 pekdon Exp $
 
 #ifndef  BASEDISPLAY_HH
 #define  BASEDISPLAY_HH
@@ -172,8 +172,8 @@ public:
         unsigned int getCurrHead(void) const;
         unsigned int getHeadWidth(unsigned int head) const;
         unsigned int getHeadHeight(unsigned int head) const;
-        int getHeadX(unsigned int head);
-        int getHeadY(unsigned int head);
+        int getHeadX(unsigned int head) const;
+        int getHeadY(unsigned int head) const;
 #endif // XINERAMA
 
 private:
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d71fa3..6d0d201 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ DEFAULT_KEYSFILE=$(pkgdatadir)/keys
 DEFAULT_INITFILE=
 
 CPPFLAGS= -Wall @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ \
-@DEBUG@ @NEWWMSPEC@ @NLS@ @TIMEDCACHE@ @KDE@ @GNOME@ \
+@DEBUG@ @NEWWMSPEC@ @NLS@ @TIMEDCACHE@ @KDE@ @GNOME@ @XINERAMA@ \
 -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \