From 680521778310ed3c0c4c1254cc7aca9133374ecd Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 17 May 2009 18:15:41 +0000 Subject: Move dist.mk to tools/. --- dist.mk | 32 -------------------------------- status.c | 9 ++++----- tools/dist.mk | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 37 deletions(-) delete mode 100644 dist.mk create mode 100644 tools/dist.mk diff --git a/dist.mk b/dist.mk deleted file mode 100644 index 0d808076..00000000 --- a/dist.mk +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: dist.mk,v 1.3 2009-05-16 21:56:38 nicm Exp $ - -VERSION= 0.8 - -DISTDIR= tmux-${VERSION} -DISTFILES= *.[ch] Makefile GNUmakefile configure tmux.1 \ - NOTES TODO CHANGES FAQ \ - `find examples compat -type f -and ! -path '*CVS*'` - -dist: - (./configure && make clean-all) - grep '^#FDEBUG=' Makefile - grep '^#FDEBUG=' GNUmakefile - [ "`(grep '^VERSION' Makefile; grep '^VERSION' GNUmakefile)| \ - uniq -u`" = "" ] - tar -zc \ - -s '/.*/${DISTDIR}\/\0/' \ - -f ${DISTDIR}.tar.gz ${DISTFILES} - -upload-index.html: update-index.html - scp index.html images/*.png \ - nicm,tmux@web.sf.net:/home/groups/t/tm/tmux/htdocs - rm -f images/small-* - -update-index.html: - (cd images && \ - rm -f small-* && \ - for i in *.png; do \ - convert "$$i" -resize 200x150 "small-$$i"; \ - done \ - ) - sed "s/%%VERSION%%/${VERSION}/g" index.html.in >index.html diff --git a/status.c b/status.c index 6d8a7838..c89c0f00 100644 --- a/status.c +++ b/status.c @@ -1,4 +1,4 @@ -/* $Id: status.c,v 1.80 2009-05-14 19:36:56 nicm Exp $ */ +/* $Id: status.c,v 1.81 2009-05-17 18:15:40 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -182,7 +182,7 @@ draw: if (larrow == 1 && offset < start) { if (session_alert_has(s, wl, WINDOW_ACTIVITY)) larrow = -1; - if (session_alert_has(s, wl, WINDOW_BELL)) + else if (session_alert_has(s, wl, WINDOW_BELL)) larrow = -1; } @@ -195,7 +195,7 @@ draw: if (rarrow == 1 && offset > start + width) { if (session_alert_has(s, wl, WINDOW_ACTIVITY)) rarrow = -1; - if (session_alert_has(s, wl, WINDOW_BELL)) + else if (session_alert_has(s, wl, WINDOW_BELL)) rarrow = -1; } @@ -467,8 +467,7 @@ status_print(struct session *s, struct winlink *wl, struct grid_cell *gc) if (session_alert_has(s, wl, WINDOW_ACTIVITY)) { flag = '#'; gc->attr ^= GRID_ATTR_REVERSE; - } - if (session_alert_has(s, wl, WINDOW_BELL)) { + } else if (session_alert_has(s, wl, WINDOW_BELL)) { flag = '!'; gc->attr ^= GRID_ATTR_REVERSE; } diff --git a/tools/dist.mk b/tools/dist.mk new file mode 100644 index 00000000..daaec1ee --- /dev/null +++ b/tools/dist.mk @@ -0,0 +1,32 @@ +# $Id: dist.mk,v 1.1 2009-05-17 18:15:41 nicm Exp $ + +VERSION= 0.8 + +DISTDIR= tmux-${VERSION} +DISTFILES= *.[ch] Makefile GNUmakefile configure tmux.1 \ + NOTES TODO CHANGES FAQ \ + `find examples compat -type f -and ! -path '*CVS*'` + +dist: + (./configure && make clean-all) + grep '^#FDEBUG=' Makefile + grep '^#FDEBUG=' GNUmakefile + [ "`(grep '^VERSION' Makefile; grep '^VERSION' GNUmakefile)| \ + uniq -u`" = "" ] + tar -zc \ + -s '/.*/${DISTDIR}\/\0/' \ + -f ${DISTDIR}.tar.gz ${DISTFILES} + +upload-index.html: update-index.html + scp index.html images/*.png \ + nicm,tmux@web.sf.net:/home/groups/t/tm/tmux/htdocs + rm -f images/small-* + +update-index.html: + (cd images && \ + rm -f small-* && \ + for i in *.png; do \ + convert "$$i" -resize 200x150 "small-$$i"; \ + done \ + ) + sed "s/%%VERSION%%/${VERSION}/g" index.html.in >index.html -- cgit