From 75c4bd0d809c8e1feb73f445905bcfe849c837ad Mon Sep 17 00:00:00 2001
From: jasper
Date: Tue, 2 Oct 2007 18:01:45 +0000
Subject: When cycling, only the end of the window names will be printed if the
 name is too long. so show the beginning instead.

from Pierre Riteau <pierre.riteau at free.fr>

"looks correct" matthieu@
---
 client.c | 6 +++++-
 search.c | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/client.c b/client.c
index 8412fd8..e974242 100644
--- a/client.c
+++ b/client.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
  * All rights reserved.
  *
- * $Id: client.c,v 1.6 2007/06/08 16:29:19 jasper Exp $
+ * $Id: client.c,v 1.7 2007/10/02 18:01:45 jasper Exp $
  */
 
 #include "headers.h"
@@ -705,6 +705,10 @@ client_cycleinfo(struct client_ctx *cc)
 	if ((diff = cc->geom.height - (y + h)) < 0)
 		y += diff;
 
+	/* Don't hide the beginning of the window names */
+	if (x < 0)
+		x = 0;
+
 	XReparentWindow(X_Dpy, sc->infowin, cc->win, 0, 0);
 	XMoveResizeWindow(X_Dpy, sc->infowin, x, y, w, h);
 	XMapRaised(X_Dpy, sc->infowin);
diff --git a/search.c b/search.c
index 075c1d2..5a99a2e 100644
--- a/search.c
+++ b/search.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
  * All rights reserved.
  *
- * $Id: search.c,v 1.3 2007/06/26 19:34:26 niallo Exp $
+ * $Id: search.c,v 1.4 2007/10/02 18:01:45 jasper Exp $
  */
 
 #include "headers.h"
@@ -239,6 +239,11 @@ search_start(struct menu_q *menuq,
 			}
 			if (y + dy >= ymax) {
 				y = ymax - dy;
+				/* If the menu is too high, never hide the
+				 * top of the menu.
+				 */
+				if (y < 0)
+					y = 0;
 				warp = 1;
 			}
 
-- 
cgit v1.2.3-2-gb3c3