Merge remote-tracking branch 'gitorious/master' into phoenix

This commit is contained in:
Tom Willemsen 2012-02-07 01:23:07 +01:00
commit db354a5b6d
3 changed files with 7 additions and 8 deletions

View file

@ -64,7 +64,9 @@ function print_tags() {
} }
function print_mailboxes() { function print_mailboxes() {
declare -A mailnames
mailboxes=(ninthfloor gmail arch aethon ryuslash.org) mailboxes=(ninthfloor gmail arch aethon ryuslash.org)
mailnames=([ninthfloor]="9f" [gmail]="gm" [arch]="arc" [aethon]="aet" [ryuslash.org]="ryu")
mailtxt="" mailtxt=""
for j in "${mailboxes[@]}"; do for j in "${mailboxes[@]}"; do
mailfile="$HOME/documents/mail/$j/INBOX/new/" mailfile="$HOME/documents/mail/$j/INBOX/new/"
@ -77,7 +79,7 @@ function print_mailboxes() {
mailcolor=$bgcolor mailcolor=$bgcolor
fi fi
mailtxt="$mailtxt${separator}^bg($mailcolor)^fg(#ffffff) $j ^fg()^bg()" mailtxt="$mailtxt${separator}^bg($mailcolor)^fg(#ffffff) ${mailnames[$j]} ^fg()^bg()"
# echo -n "^fg($mailcolor)^ro(${tag_width}x$height)^fg()$separator" # echo -n "^fg($mailcolor)^ro(${tag_width}x$height)^fg()$separator"
done done
mailtxt_only=$(echo -n "$mailtxt" | sed 's.\^[^(]*([^)]*)..g') mailtxt_only=$(echo -n "$mailtxt" | sed 's.\^[^(]*([^)]*)..g')

View file

@ -27,10 +27,8 @@
(close-port file) (close-port file)
tags)) tags))
(define (get-tag tags pipe)
(read-line pipe))
(define (choose-tag prompt tags) (define (choose-tag prompt tags)
"Ask to choose a tag"
(let* ((file (open-input-pipe (let* ((file (open-input-pipe
(string-append "echo '" (string-join tags "\n") (string-append "echo '" (string-join tags "\n")
"' | " dmenu-cmd " -p '" prompt ":'"))) "' | " dmenu-cmd " -p '" prompt ":'")))
@ -45,7 +43,7 @@
(if (string? tag) (if (string? tag)
(begin (begin
(if (not (member tag tags)) (if (not (member tag tags))
(run-command (string-append "herbstclient add " tag))) (system (string-append "herbstclient add " tag)))
(run-command (string-append "herbstclient use " tag)))) (run-command (string-append "herbstclient use " tag))))
(reset-main-binding))) (reset-main-binding)))
@ -66,7 +64,7 @@
(if (string? tag) (if (string? tag)
(begin (begin
(if (not (member tag tags)) (if (not (member tag tags))
(run-command (string-append "herbstclient add " tag))) (system (string-append "herbstclient add " tag)))
(run-command (string-append "herbstclient move " tag)))) (run-command (string-append "herbstclient move " tag))))
(reset-main-binding))) (reset-main-binding)))

View file

@ -1,4 +1,3 @@
case
# -*- mode: shell-script; eval: (git-auto-commit-mode 1) -*- # -*- mode: shell-script; eval: (git-auto-commit-mode 1) -*-
# -----[ Set background ]--------------------------------------------- # -----[ Set background ]---------------------------------------------