Remove screen_infomsg(), nothing uses it.

ok okan.

5 files changed, 6 insertions, 69 deletions

diff --git a/calmwm.h b/calmwm.h
index c49de33..16706c4 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -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.
  *
- * $Id: calmwm.h,v 1.33 2008/04/16 13:33:26 oga Exp $
+ * $Id: calmwm.h,v 1.34 2008/04/16 13:35:37 oga Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -350,7 +350,6 @@ Pixmap			 client_bg_pixmap(struct client_ctx *);
 void			 client_map(struct client_ctx *cc);
 void			 client_mtf(struct client_ctx *cc);
 struct client_ctx	*client_cyclenext(int reverse);
-void			 client_altrelease();
 struct client_ctx	*client_mrunext(struct client_ctx *cc);
 struct client_ctx	*client_mruprev(struct client_ctx *cc);
 void			 client_gethints(struct client_ctx *cc);
@@ -420,7 +419,6 @@ void			 screen_init(void);
 struct screen_ctx	*screen_fromroot(Window);
 struct screen_ctx	*screen_current(void);
 void			 screen_updatestackingorder(void);
-void			 screen_infomsg(char *);
 
 void			 conf_setup(struct conf *, const char *);
 int			 conf_get_int(struct client_ctx *, enum conftype);
diff --git a/client.c b/client.c
index 484778d..95faaeb 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.
  *
- * $Id: client.c,v 1.17 2008/04/15 20:24:41 oga Exp $
+ * $Id: client.c,v 1.18 2008/04/16 13:35:37 oga Exp $
  */
 
 #include "headers.h"
@@ -610,7 +610,7 @@ client_cyclenext(int reverse)
 
 	/* TODO: maybe this should just be a CIRCLEQ. */
 
-	if (!(cc = _curcc)) {
+	if ((cc = client_current()) == NULL) {
 		if (TAILQ_EMPTY(&Clientq))
 			return(NULL);
 		cc = TAILQ_FIRST(&Clientq);
@@ -676,20 +676,6 @@ client__cycle(struct client_ctx *cc,
 }
 
 void
-client_altrelease()
-{
-	struct client_ctx *cc = _curcc;
-	struct screen_ctx *sc;
-
-	if (cc == NULL)
-		return;
-	sc = CCTOSC(cc);
-
-	XUnmapWindow(X_Dpy, sc->infowin);
-	XReparentWindow(X_Dpy, sc->infowin, sc->rootwin, 0, 0);
-}
-
-void
 client_placecalc(struct client_ctx *cc)
 {
 	struct screen_ctx *sc = CCTOSC(cc);
diff --git a/group.c b/group.c
index 2af3c1f..24cf337 100644
--- a/group.c
+++ b/group.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: group.c,v 1.9 2008/04/15 20:24:41 oga Exp $
+ * $Id: group.c,v 1.10 2008/04/16 13:35:37 oga Exp $
  */
 
 #include "headers.h"
@@ -182,9 +182,6 @@ void
 group_hidetoggle(int idx)
 {
 	struct group_ctx *gc;
-#ifdef notyet
-	char buf[128];
-#endif
 
 	if (idx < 0 || idx >= CALMWM_NGROUPS)
 		err(1, "group_hidetoggle: index out of range (%d)", idx);
@@ -200,11 +197,6 @@ group_hidetoggle(int idx)
 		if (TAILQ_EMPTY(&gc->clients))
 			Group_active = gc;
 	}
-
-#ifdef notyet
-	snprintf(buf, sizeof(buf), "Group %d", idx + 1);
-	screen_infomsg(buf);
-#endif
 }
 
 #define GROUP_NEXT(gc, fwd) (fwd) ?					\
diff --git a/screen.c b/screen.c
index ed9cd2c..6155e45 100644
--- a/screen.c
+++ b/screen.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.
  *
- * $Id: screen.c,v 1.4 2008/04/15 20:24:41 oga Exp $
+ * $Id: screen.c,v 1.5 2008/04/16 13:35:37 oga Exp $
  */
 
 #include "headers.h"
@@ -24,13 +24,6 @@
 extern struct screen_ctx_q	 Screenq;
 extern struct screen_ctx	*Curscreen;
 
-static void
-_clearwindow_cb(int sig)
-{
-	struct screen_ctx *sc = screen_current();
-	XUnmapWindow(X_Dpy, sc->infowin);
-}
-
 struct screen_ctx *
 screen_fromroot(Window rootwin)
 {
@@ -79,35 +72,4 @@ screen_init(void)
 	struct screen_ctx *sc = screen_current();
 
 	sc->cycle_client = NULL;
-
-	sc->infowin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0,
-	    1, 1, 1, sc->blackpixl, sc->whitepixl);
-
-	/* XXX - marius. */
-	if (signal(SIGALRM, _clearwindow_cb) == SIG_ERR)
-		err(1, "signal");
-}
-
-void
-screen_infomsg(char *msg)
-{
-	struct screen_ctx *sc = screen_current();
-	char buf[1024];
-	int dy, dx;
-	struct fontdesc *font = DefaultFont;
-
-	XUnmapWindow(X_Dpy, sc->infowin);
-	alarm(0);
-
-	snprintf(buf, sizeof(buf), ">%s", msg);
-	dy = font_ascent(font) + font_descent(font) + 1;
-	dx = font_width(font, buf, strlen(buf));
-
-	XMoveResizeWindow(X_Dpy, sc->infowin, 0, 0, dx, dy);
-	XMapRaised(X_Dpy, sc->infowin);
-
-	font_draw(font, buf, strlen(buf), sc->infowin,
-	    0, font_ascent(font) + 1);
-
-	alarm(1);
 }
diff --git a/xevents.c b/xevents.c
index bce9c49..c5f5d7f 100644
--- a/xevents.c
+++ b/xevents.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.
  *
- * $Id: xevents.c,v 1.11 2008/04/15 20:24:41 oga Exp $
+ * $Id: xevents.c,v 1.12 2008/04/16 13:35:37 oga Exp $
  */
 
 /*
@@ -421,7 +421,6 @@ xev_handle_keyrelease(struct xevent *xev, XEvent *ee)
 	 * how/when to mtf.
 	 */
 	client_mtf(NULL);
-	client_altrelease();
 
  out:
 	xev_register(xev);