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

List:       kde-core-devel
Subject:    Re: KWin patch
From:       Henrik Johnson <hpj () globecom ! net>
Date:       2001-05-10 10:02:37
[Download RAW message or body]

Sorry, don't know what happened, lets see if this works better.

/Henrik Johnson
GlobeCom AB

>>>>>>>>>>>>>>>>>> Original Message <<<<<<<<<<<<<<<<<<

On 5/10/01, 11:47:24 AM, Matthias Ettrich <ettrich@trolltech.com> wrote 
regarding Re: KWin patch:


> On Thursday 10 May 2001 09:59, Henrik Johnson wrote:
> > I've tried to submit this patch again and got no response, so I'm giving
> > it a new try.
> >
> > The patch basically adds two keybindings to bring the current window with
> > you to the next/previous desktop.
> >
> > /Henrik Johnson
> > GlobeCom AB


> Looks ok, but the attachement has weird characters (=3D) so I couldn't 
apply
> it.

> Matthias

> ----------------------------------------
> Content-Type: text/plain; charset="iso-8859-1"; 
name="kwin-movewindow.patch"
> Content-Transfer-Encoding: quoted-printable
> Content-Description: filename="kwin-movewindow.patch"
> ----------------------------------------
["kwin-movewindow2.patch" (kwin-movewindow2.patch)]

Index: kwin/kwinbindings.cpp
===================================================================
RCS file: /home/kde/kdebase/kwin/kwinbindings.cpp,v
retrieving revision 1.14
diff -U5 -r1.14 kwinbindings.cpp
--- kwin/kwinbindings.cpp	2001/04/02 16:17:06	1.14
+++ kwin/kwinbindings.cpp	2001/05/10 09:21:55
@@ -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.240
diff -U5 -r1.240 workspace.cpp
--- kwin/workspace.cpp	2001/05/09 20:06:46	1.240
+++ kwin/workspace.cpp	2001/05/10 09:22:01
@@ -2388,10 +2388,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()));
@@ -2568,10 +2570,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.81
diff -U5 -r1.81 workspace.h
--- kwin/workspace.h	2001/05/02 20:32:28	1.81
+++ kwin/workspace.h	2001/05/10 09:22:02
@@ -248,10 +248,13 @@
     void slotWindowOperations();
     void slotWindowClose();
     void slotWindowMove();
     void slotWindowResize();
 
+    void slotWindowNextDesktop();
+    void slotWindowPreviousDesktop();
+
     void slotMouseEmulation();
 
     void slotResetAllClientsDelayed();
     void slotResetAllClients();
 

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