From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3441E1381F3 for ; Wed, 11 Sep 2013 06:04:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AEA2E0C8E; Wed, 11 Sep 2013 06:04:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D32F7E0C8B for ; Wed, 11 Sep 2013 06:04:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7C6E33EC22 for ; Wed, 11 Sep 2013 06:04:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D89E5E5471 for ; Wed, 11 Sep 2013 06:04:08 +0000 (UTC) From: "Sven Eden" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Eden" Message-ID: <1378877534.e40b5a85d8ad6e97828b989164db3fcb5264c31b.yamakuzure@gentoo> Subject: [gentoo-commits] proj/ufed:master commit in: / X-VCS-Repository: proj/ufed X-VCS-Files: ufed-curses.c X-VCS-Directories: / X-VCS-Committer: yamakuzure X-VCS-Committer-Name: Sven Eden X-VCS-Revision: e40b5a85d8ad6e97828b989164db3fcb5264c31b X-VCS-Branch: master Date: Wed, 11 Sep 2013 06:04:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a64c22ab-20a9-436b-997b-962a7930d4c9 X-Archives-Hash: 1df4173e413b1bfcbd745184a477c7a2 commit: e40b5a85d8ad6e97828b989164db3fcb5264c31b Author: Sven Eden gmx net> AuthorDate: Wed Sep 11 05:32:14 2013 +0000 Commit: Sven Eden gmx de> CommitDate: Wed Sep 11 05:32:14 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=e40b5a85 Changed the indicator to show F9/F10 state as well, now in a condensed 4-char-limited line that needs less space. --- ufed-curses.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/ufed-curses.c b/ufed-curses.c index 8441c56..2428cfd 100644 --- a/ufed-curses.c +++ b/ufed-curses.c @@ -331,15 +331,24 @@ void drawStatus(bool withSep) mvwaddstr(w, 0, minwidth + 5, "Si"); // Scope, installed mvwaddch (w, 0, minwidth + 7, ACS_VLINE); // After scope - // Use the unused right side to show the filter status - sprintf(buf, "%*s%-6s / %-13s / %-6s] ", - max(2, iWidth - 40 - minwidth), " [", - eScope_global == e_scope ? "global" : - eScope_local == e_scope ? "local" : "all", - eState_installed == e_state ? "installed" : - eState_notinstalled == e_state ? "not installed" : "all", - eMask_masked == e_mask ? "masked" : - eMask_unmasked == e_mask ? "normal" : "all"); + /* Use the unused right side to show the filter status + * The Order and layout is: + * [Scope|State|Mask|Order|Desc] with + * all items limited to four characters. + * 5 * 4 = 20 + * + 2 brackets = 22 + * + 4 pipes = 26 + */ + sprintf(buf, "%*s%-4s|%-4s|%-4s|%-4s|%-4s] ", + max(2, iWidth - 33 - minwidth), " [", + eScope_global == e_scope ? "glob" + : eScope_local == e_scope ? "loca" : "all", + eState_installed == e_state ? "inst" + : eState_notinstalled == e_state ? "noti" : "all", + eMask_masked == e_mask ? "mask" + : eMask_unmasked == e_mask ? "norm" : "all", + eOrder_left == e_order ? "left" : "righ", + eDesc_ori == e_desc ? "orig" : "stri"); waddstr(w, buf); }