? kwin/plugins.loT Index: kwin/kwinbindings.cpp =================================================================== RCS file: /home/kde/kdebase/kwin/kwinbindings.cpp,v retrieving revision 1.14 diff -u -5 -r1.14 kwinbindings.cpp --- kwin/kwinbindings.cpp 2001/04/02 16:17:06 1.14 +++ kwin/kwinbindings.cpp 2001/04/29 17:44:56 @@ -31,10 +31,12 @@ keys->insertItem(i18n("Window move"),"Window move", ""); keys->insertItem(i18n("Window resize"),"Window resize", ""); keys->insertItem(i18n("Window raise"),"Window raise", ""); keys->insertItem(i18n("Window lower"),"Window lower", ""); keys->insertItem(i18n("Window raise-or-lower"), "Toggle raise and lower", ""); + keys->insertItem(i18n("Window to next desktop"),"Window to next desktop", ""); + keys->insertItem(i18n("Window to previous desktop"),"Window to previous desktop", ""); keys->insertItem(i18n("Walk through desktops"),"Walk through desktops", "CTRL+Tab"); keys->insertItem(i18n("Walk back through desktops"),"Walk back through desktops", "SHIFT+CTRL+Tab"); keys->insertItem(i18n("Walk through windows"),"Walk through windows", "ALT+Tab"); keys->insertItem(i18n("Walk back through windows"),"Walk back through windows", "SHIFT+ALT+Tab"); Index: kwin/workspace.cpp =================================================================== RCS file: /home/kde/kdebase/kwin/workspace.cpp,v retrieving revision 1.237 diff -u -5 -r1.237 workspace.cpp --- kwin/workspace.cpp 2001/04/25 16:15:54 1.237 +++ kwin/workspace.cpp 2001/04/29 17:45:03 @@ -2386,10 +2386,12 @@ keys->connectItem( "Window move", this, SLOT( slotWindowMove() ) ); keys->connectItem( "Window resize", this, SLOT( slotWindowResize() ) ); keys->connectItem( "Window raise", this, SLOT( slotWindowRaise() ) ); keys->connectItem( "Window lower", this, SLOT( slotWindowLower() ) ); keys->connectItem( "Toggle raise and lower", this, SLOT( slotWindowRaiseOrLower() ) ); + keys->connectItem( "Window to next desktop", this, SLOT( slotWindowNextDesktop() ) ); + keys->connectItem( "Window to previous desktop", this, SLOT( slotWindowPreviousDesktop() ) ); keys->connectItem( "Walk through desktops", this, SLOT( slotWalkThroughDesktops())); keys->connectItem( "Walk back through desktops", this, SLOT( slotWalkBackThroughDesktops())); keys->connectItem( "Walk through windows",this, SLOT( slotWalkThroughWindows())); keys->connectItem( "Walk back through windows",this, SLOT( slotWalkBackThroughWindows())); @@ -2566,10 +2568,33 @@ { if ( popup_client ) raiseOrLowerClient( popup_client ); } +/*! + Move window to next desktop + */ +void Workspace::slotWindowNextDesktop(){ + int d = currentDesktop() + 1; + if ( d > numberOfDesktops() ) + d = 1; + if (popup_client) + sendClientToDesktop(popup_client,d); + setCurrentDesktop(d); +} + +/*! + Move window to previous desktop + */ +void Workspace::slotWindowPreviousDesktop(){ + int d = currentDesktop() - 1; + if ( d <= 0 ) + d = numberOfDesktops(); + if (popup_client) + sendClientToDesktop(popup_client,d); + setCurrentDesktop(d); +} /*! Invokes keyboard mouse emulation */ void Workspace::slotMouseEmulation() Index: kwin/workspace.h =================================================================== RCS file: /home/kde/kdebase/kwin/workspace.h,v retrieving revision 1.80 diff -u -5 -r1.80 workspace.h --- kwin/workspace.h 2001/04/22 06:51:07 1.80 +++ kwin/workspace.h 2001/04/29 17:45:05 @@ -247,10 +247,13 @@ void slotWindowOperations(); void slotWindowClose(); void slotWindowMove(); void slotWindowResize(); + void slotWindowNextDesktop(); + void slotWindowPreviousDesktop(); + void slotMouseEmulation(); void slotResetAllClientsDelayed(); void slotResetAllClients();