[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/~seli/randr
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2008-11-28 16:07:23
Message-ID: 1227888443.479410.1564.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 890222 by lunakl:

Merge r865184 from trunk.
Send event to the right screen, without this, krandrtray crashes with dual-head \
setup, beacuse if it sends the event with a non-existing ID on a screen, m_crtcs \
doesn't have the ID, and handleEvent() asserts.



 M  +4 -1      BRANCH  
 M  +3 -3      randrdisplay.cpp  


--- branches/work/~seli/randr/BRANCH #890221:890222
@@ -1 +1,4 @@
-last sync: r878939
+last sync:
+r878939 (4.1)
+r865184 (4.2)
+
--- branches/work/~seli/randr/randrdisplay.cpp #890221:890222
@@ -223,9 +223,9 @@
 		XRRNotifyEvent *event = (XRRNotifyEvent*)e;
 		for (int i=0; i < m_screens.count(); ++i) {
 			RandRScreen *screen = m_screens.at(i);
-			// FIXME: check which screen should receive the event
-			//        this needs a dual-head setup
-			screen->handleRandREvent(event);
+			if ( screen->rootWindow() == event->window ) {
+				screen->handleRandREvent(event);
+			}
 		}
 	}
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]