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

List:       kde-commits
Subject:    branches/work/kwin_composite
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2007-04-21 12:50:04
Message-ID: 1177159804.208928.6122.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 656455 by lunakl:

Trigger TrackMouseEffect using Ctrl+Meta rather than mouse buttons.



 M  +3 -2      effects.cpp  
 M  +2 -1      effects.h  
 M  +1 -1      effects/demo_taskbarthumbnail.cpp  
 M  +2 -1      effects/demo_taskbarthumbnail.h  
 M  +2 -2      effects/magnifier.cpp  
 M  +2 -1      effects/magnifier.h  
 M  +3 -2      effects/trackmouse.cpp  
 M  +2 -1      effects/trackmouse.h  
 M  +2 -2      effects/zoom.cpp  
 M  +2 -1      effects/zoom.h  
 M  +1 -1      lib/kwineffects.cpp  
 M  +2 -1      lib/kwineffects.h  
 M  +2 -1      workspace.cpp  


--- branches/work/kwin_composite/effects.cpp #656454:656455
@@ -233,10 +233,11 @@
     return ret;
     }
 
-void EffectsHandlerImpl::cursorMoved( const QPoint& pos, Qt::MouseButtons buttons )
+void EffectsHandlerImpl::mouseChanged( const QPoint& pos, const QPoint& old,
+    Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers )
     {
     foreach( EffectPair ep, loaded_effects )
-        ep.second->cursorMoved( pos, buttons );
+        ep.second->mouseChanged( pos, old, buttons, modifiers );
     }
 
 bool EffectsHandlerImpl::grabKeyboard( Effect* effect )
--- branches/work/kwin_composite/effects.h #656454:656455
@@ -101,7 +101,8 @@
         void tabBoxClosed();
         void tabBoxUpdated();
         bool borderActivated( ElectricBorder border );
-        void cursorMoved( const QPoint& pos, Qt::MouseButtons buttons );
+        void mouseChanged( const QPoint& pos, const QPoint& old,
+            Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers );
         void grabbedKeyboardEvent( QKeyEvent* e );
         bool hasKeyboardGrab() const;
 
--- branches/work/kwin_composite/effects/demo_taskbarthumbnail.cpp #656454:656455
@@ -101,7 +101,7 @@
     return thumb;
     }
 
-void TaskbarThumbnailEffect::cursorMoved( const QPoint& pos, Qt::MouseButtons )
+void TaskbarThumbnailEffect::mouseChanged( const QPoint& pos, const QPoint&, \
Qt::MouseButtons, Qt::KeyboardModifiers )  {
     // this should check if the mouse position change actually means something
     // (just like it should be done in prePaintScreen()), but since this effect
--- branches/work/kwin_composite/effects/demo_taskbarthumbnail.h #656454:656455
@@ -34,7 +34,8 @@
         virtual void prePaintScreen( int* mask, QRegion* region, int time );
         virtual void prePaintWindow( EffectWindow* w, int* mask, QRegion* paint, \
QRegion* clip, int time );  virtual void postPaintScreen();
-        virtual void cursorMoved( const QPoint& pos, Qt::MouseButtons buttons );
+        virtual void mouseChanged( const QPoint& pos, const QPoint& old,
+            Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers );
 
     protected:
         QRect getThumbnailPosition( EffectWindow* c, int* space ) const;
--- branches/work/kwin_composite/effects/magnifier.cpp #656454:656455
@@ -138,9 +138,9 @@
     effects->addRepaint( magnifierArea());
     }
 
-void MagnifierEffect::cursorMoved( const QPoint&, Qt::MouseButtons )
+void MagnifierEffect::mouseChanged( const QPoint& pos, const QPoint& old, \
Qt::MouseButtons, Qt::KeyboardModifiers )  {
-    if( zoom != 1 )
+    if( pos != old && zoom != 1 )
         effects->addRepaint( magnifierArea());
     }
 
--- branches/work/kwin_composite/effects/magnifier.h #656454:656455
@@ -25,7 +25,8 @@
         virtual void prePaintScreen( int* mask, QRegion* region, int time );
         virtual void paintScreen( int mask, QRegion region, ScreenPaintData& data );
         virtual void postPaintScreen();
-        void cursorMoved( const QPoint& pos, Qt::MouseButtons buttons );
+        virtual void mouseChanged( const QPoint& pos, const QPoint& old,
+            Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers );
     private slots:
         void zoomIn();
         void zoomOut();
--- branches/work/kwin_composite/effects/trackmouse.cpp #656454:656455
@@ -107,9 +107,10 @@
     effects->postPaintScreen();
     }
 
-void TrackMouseEffect::cursorMoved( const QPoint&, Qt::MouseButtons buttons )
+void TrackMouseEffect::mouseChanged( const QPoint&, const QPoint&, Qt::MouseButtons,
+    Qt::KeyboardModifiers modifiers )
     {
-    if( buttons == ( Qt::LeftButton | Qt::RightButton ))
+    if( modifiers == ( Qt::CTRL | Qt::META ))
         {
         if( !active )
             {
--- branches/work/kwin_composite/effects/trackmouse.h #656454:656455
@@ -26,7 +26,8 @@
         virtual void prePaintScreen( int* mask, QRegion* region, int time );
         virtual void paintScreen( int mask, QRegion region, ScreenPaintData& data );
         virtual void postPaintScreen();
-        virtual void cursorMoved( const QPoint& pos, Qt::MouseButtons buttons );
+        virtual void mouseChanged( const QPoint& pos, const QPoint& old,
+            Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers );
     private:
         QRect starRect( int num ) const;
         void loadTexture();
--- branches/work/kwin_composite/effects/zoom.cpp #656454:656455
@@ -89,9 +89,9 @@
     effects->addRepaintFull();
     }
 
-void ZoomEffect::cursorMoved( const QPoint&, Qt::MouseButtons )
+void ZoomEffect::mouseChanged( const QPoint& pos, const QPoint& old, \
Qt::MouseButtons, Qt::KeyboardModifiers )  {
-    if( zoom != 1 )
+    if( pos != old && zoom != 1 )
         effects->addRepaintFull();
     }
 
--- branches/work/kwin_composite/effects/zoom.h #656454:656455
@@ -25,7 +25,8 @@
         virtual void prePaintScreen( int* mask, QRegion* region, int time );
         virtual void paintScreen( int mask, QRegion region, ScreenPaintData& data );
         virtual void postPaintScreen();
-        void cursorMoved( const QPoint& pos, Qt::MouseButtons buttons );
+        virtual void mouseChanged( const QPoint& pos, const QPoint& old,
+            Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers );
     private slots:
         void zoomIn();
         void zoomOut();
--- branches/work/kwin_composite/lib/kwineffects.cpp #656454:656455
@@ -118,7 +118,7 @@
     return false;
     }
 
-void Effect::cursorMoved( const QPoint&, Qt::MouseButtons )
+void Effect::mouseChanged( const QPoint&, const QPoint&, Qt::MouseButtons, \
Qt::KeyboardModifiers )  {
     }
 
--- branches/work/kwin_composite/lib/kwineffects.h #656454:656455
@@ -100,7 +100,8 @@
         virtual void desktopChanged( int old );
         virtual void windowDamaged( EffectWindow* w, const QRect& r );
         virtual void windowGeometryShapeChanged( EffectWindow* w, const QRect& old \
                );
-        virtual void cursorMoved( const QPoint& pos, Qt::MouseButtons buttons );
+        virtual void mouseChanged( const QPoint& pos, const QPoint& old,
+            Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers );
         virtual void grabbedKeyboardEvent( QKeyEvent* e );
 
         virtual void tabBoxAdded( int mode );
--- branches/work/kwin_composite/workspace.cpp #656454:656455
@@ -2613,7 +2613,8 @@
     int lastb = last_buttons;
     cursorPos(); // update if needed
     if( last != last_cursor_pos || lastb != last_buttons )
-        static_cast< EffectsHandlerImpl* >( effects )->cursorMoved( cursorPos(), \
x11ToQtMouseButtons( last_buttons )); +        static_cast< EffectsHandlerImpl* >( \
effects )->mouseChanged( cursorPos(), last_cursor_pos, +            \
x11ToQtMouseButtons( last_buttons ), x11ToQtKeyboardModifiers( last_buttons ));  }
 
 } // namespace


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