client_ptrwarp should not deal with unhiding or raising clients (non ptr

requests); most callers do this already - deal with the few that do not.
client_ptrwarp becomes a simple wrapper (setpos) but it will be expanded.

1 files changed, 2 insertions, 6 deletions

diff --git a/client.c b/client.c
index 5797135..6e9fa6e 100644
--- a/client.c
+++ b/client.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: client.c,v 1.225 2016/09/30 20:55:54 okan Exp $
+ * $OpenBSD: client.c,v 1.226 2016/10/03 13:41:30 okan Exp $
  */
 
 #include <sys/types.h>
@@ -469,11 +469,6 @@ client_config(struct client_ctx *cc)
 void
 client_ptrwarp(struct client_ctx *cc)
 {
-	if (cc->flags & CLIENT_HIDDEN)
-		client_unhide(cc);
-	else
-		client_raise(cc);
-
 	xu_ptr_setpos(cc->win, cc->ptr.x, cc->ptr.y);
 }
 
@@ -686,6 +681,7 @@ client_cycle(struct screen_ctx *sc, int flags)
 	/* reset when cycling mod is released. XXX I hate this hack */
 	sc->cycling = 1;
 	client_ptrsave(oldcc);
+	client_raise(newcc);
 	client_ptrwarp(newcc);
 }