aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpekdon <pekdon>2002-02-02 19:51:15 (GMT)
committerpekdon <pekdon>2002-02-02 19:51:15 (GMT)
commit0c2fc0568b5b8a90fdfec4949c0d4df81bcaacbf (patch)
tree38942ea791db4ceec863a119ca43700f1f76e768
parent39d4112a5e7300a8de70d09af777f8060082837a (diff)
downloadfluxbox-0c2fc0568b5b8a90fdfec4949c0d4df81bcaacbf.zip
fluxbox-0c2fc0568b5b8a90fdfec4949c0d4df81bcaacbf.tar.bz2
leftWorkspace/rightWorkspace added
-rw-r--r--ChangeLog5
-rw-r--r--src/Screen.cc16
-rw-r--r--src/Screen.hh4
-rw-r--r--src/fluxbox.cc13
4 files changed, 29 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 25b61fb..9aa8b16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
1Changes for 0.1.7: 1Changes for 0.1.7:
2*02/02/02:
3 * Added leftWorkspace and rightWorkspace, now those keybindings
4 actually work. (Claes Nästén)
5 * Fixed small glitch in Tab.cc. (Claes Nästén)
6
2*02/01/27: 7*02/01/27:
3 * Clean up in menu loading 8 * Clean up in menu loading
4 * Moved from old C style file reading to c++ istream 9 * Moved from old C style file reading to c++ istream
diff --git a/src/Screen.cc b/src/Screen.cc
index e0358fc..5d20aff 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1643,3 +1643,19 @@ void BScreen::prevWorkspace(void) {
1643 else 1643 else
1644 changeWorkspaceID(getCurrentWorkspaceID()-1); 1644 changeWorkspaceID(getCurrentWorkspaceID()-1);
1645} 1645}
1646
1647//-------------- rightWorkspace ---------------
1648// Goes to the workspace "right" of the current
1649//--------------------------------------------
1650void BScreen::rightWorkspace(void) {
1651 if (getCurrentWorkspaceID()+1 < getCount())
1652 changeWorkspaceID(getCurrentWorkspaceID()+1);
1653}
1654
1655//------------- leftWorkspace ----------------
1656// Goes to the workspace "left" of the current
1657//--------------------------------------------
1658void BScreen::leftWorkspace(void) {
1659 if (getCurrentWorkspaceID() > 0)
1660 changeWorkspaceID(getCurrentWorkspaceID()-1);
1661}
diff --git a/src/Screen.hh b/src/Screen.hh
index c91a45c..6e020b4 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.hh,v 1.13 2002/01/27 12:45:32 fluxgen Exp $ 25// $Id: Screen.hh,v 1.14 2002/02/02 19:51:15 pekdon Exp $
26 26
27#ifndef _SCREEN_HH_ 27#ifndef _SCREEN_HH_
28#define _SCREEN_HH_ 28#define _SCREEN_HH_
@@ -205,6 +205,8 @@ public:
205 //scroll workspaces 205 //scroll workspaces
206 void nextWorkspace(); 206 void nextWorkspace();
207 void prevWorkspace(); 207 void prevWorkspace();
208 void rightWorkspace();
209 void leftWorkspace();
208 210
209 void removeWorkspaceNames(void); 211 void removeWorkspaceNames(void);
210 void updateWorkspaceNamesAtom(void); 212 void updateWorkspaceNamesAtom(void);
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index e859921..a45f4e4 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.24 2002/01/21 02:04:23 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.25 2002/02/02 19:51:15 pekdon Exp $
26 26
27//Use some GNU extensions 27//Use some GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -958,15 +958,12 @@ void Fluxbox::process_event(XEvent *e) {
958 case Keys::PREVWORKSPACE: 958 case Keys::PREVWORKSPACE:
959 screen->prevWorkspace(); 959 screen->prevWorkspace();
960 break; 960 break;
961 /*case Keys::grabUpWorkspace: 961 case Keys::LEFTWORKSPACE:
962 screen->leftWorkspace();
962 break; 963 break;
963 case Keys::grabDownWorkspace: 964 case Keys::RIGHTWORKSPACE:
965 screen->rightWorkspace();
964 break; 966 break;
965 case Keys::grabLeftWorkspace:
966 break;
967 case Keys::grabRightWorkspace:
968 break;
969 */
970 case Keys::KILLWINDOW: //kill the current window 967 case Keys::KILLWINDOW: //kill the current window
971 XKillClient(screen->getBaseDisplay()->getXDisplay(), 968 XKillClient(screen->getBaseDisplay()->getXDisplay(),
972 focused_window->getClientWindow()); 969 focused_window->getClientWindow());