From e1cc81164a1589ac7f42984a934aadec719b4b0c Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Wed, 20 Nov 2002 11:13:37 +0000
Subject: [PATCH] mall cleanup.
(Old svn revision: 10729)
---
src/client.c | 19 +++++++------------
src/workspaces.c | 8 ++++----
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/client.c b/src/client.c
index 44984bfa9..61326ab50 100644
--- a/src/client.c
+++ b/src/client.c
@@ -2705,23 +2705,18 @@ static GtkToXEventFilterStatus clientMove_event_filter(XEvent * xevent, gpointer
msx = xevent->xmotion.x_root;
msy = xevent->xmotion.y_root;
- if(msx == 0 && !((workspace == 0) && !wrap_workspaces))
+
+ if(msx == 0 && wrap_workspaces)
{
- XEvent e;
- workspaceSwitch(workspace - 1, c);
XWarpPointer(dpy, None, root, 0, 0, 0, 0, XDisplayWidth(dpy, screen) - 11, msy);
- xevent->xmotion.x_root = XDisplayWidth(dpy, screen) - 11;
- while(XCheckTypedEvent(dpy, MotionNotify, &e));
- XRaiseWindow(dpy, passdata->tmp_event_window);
+ msx = xevent->xmotion.x_root = XDisplayWidth(dpy, screen) - 11;
+ workspaceSwitch(workspace - 1, c);
}
- else if((msx == XDisplayWidth(dpy, screen) - 1) && !((workspace == workspace_count - 1) && !wrap_workspaces))
+ else if((msx == XDisplayWidth(dpy, screen) - 1) && wrap_workspaces)
{
- XEvent e;
- workspaceSwitch(workspace + 1, c);
XWarpPointer(dpy, None, root, 0, 0, 0, 0, 10, msy);
- xevent->xmotion.x_root = 10;
- while(XCheckTypedEvent(dpy, MotionNotify, &e));
- XRaiseWindow(dpy, passdata->tmp_event_window);
+ msx = xevent->xmotion.x_root = 10;
+ workspaceSwitch(workspace + 1, c);
}
}
diff --git a/src/workspaces.c b/src/workspaces.c
index aab48ffc4..5c15e065e 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -53,7 +53,7 @@ void workspaceSwitch(int new_ws, Client * c2)
{
new_ws = 0;
}
- if((new_ws < 0) || (new_ws > workspace_count - 1) || (new_ws == workspace))
+ if(new_ws == workspace)
{
return;
}
@@ -69,9 +69,6 @@ void workspaceSwitch(int new_ws, Client * c2)
clientSetWorkspace(c2, new_ws, FALSE);
}
- setGnomeHint(dpy, root, win_workspace, new_ws);
- data[0] = new_ws;
- XChangeProperty(dpy, root, net_current_desktop, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
workspace = new_ws;
/*
@@ -116,6 +113,9 @@ void workspaceSwitch(int new_ws, Client * c2)
f = c2;
clientRaise(c2);
}
+ setGnomeHint(dpy, root, win_workspace, new_ws);
+ data[0] = new_ws;
+ XChangeProperty(dpy, root, net_current_desktop, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
workspaceUpdateArea(margins, gnome_margins);
clientSetFocus(f, True);
}
--
GitLab