[gentoo-commits] proj/ufed:master commit in: /

["Sven Eden" <sven.eden@gmx.de>]

commit:     bba5611120141abef8896f3e1c123db5ab317477
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Mon Jan 14 18:08:59 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Mon Jan 14 18:08:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=bba56111

Send list of (known) masked use flags to the interface. But do not allow to toggle masked flags using mouse or keyboard.

---
 ufed-curses-checklist.c |   16 +++++++++++++++-
 ufed.pl.in              |   43 ++++++++++++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c
index 9123388..50dc1b4 100644
--- a/ufed-curses-checklist.c
+++ b/ufed-curses-checklist.c
@@ -96,6 +96,8 @@ static void read_flags(void) {
 			flag->on = '-';
 		else if(!strcmp(&line[on.start], "def"))
 			flag->on = ' ';
+		else if(!strcmp(&line[on.start], "msk"))
+			flag->on = 'm';
 		else
 			exit(-1);
 
@@ -173,12 +175,16 @@ static void drawflag(struct item *item, bool highlight) {
 	}
 	wmove(win(List), y, 0);
 	sprintf(buf, " %c%c%c %-*s %-4.4s ",
+		/* State of selection */
 		flag->on == ' ' ? '(' : '[',
 		flag->on == ' '
-			? flags->on == ' ' ? flag->state[1] : ' '
+			? flags->on == ' '
+				? flag->state[1] : ' '
 			: flag->on,
 		flag->on == ' ' ? ')' : ']',
+		/* distance and name being masked or not */
 		minwidth-11, flag->name,
+		/* current selection state */
 		flag->state);
 	if(d != &flag->descr[flag->item.height]) {
 		for(;;) {
@@ -292,6 +298,10 @@ static int callback(struct item **currentitem, int key) {
 			return 1;
 		break;
 	case ' ': {
+		// do not toggle masked flags using the keyboard
+		if ('m' == ((struct flag *) *currentitem)->on)
+			break;
+		// Not masked? Then cycle through the states.
 		switch (((struct flag *) *currentitem)->on) {
 		case '+':
 			((struct flag *) *currentitem)->on = '-';
@@ -327,6 +337,10 @@ static int callback(struct item **currentitem, int key) {
 		break;
 #ifdef NCURSES_MOUSE_VERSION
 	case KEY_MOUSE:
+		// do not toggle masked flags using the double click
+		if ('m' == ((struct flag *) *currentitem)->on)
+			break;
+		// Not masked? Then cycle through the states.
 		switch (((struct flag *) *currentitem)->on) {
 		case '+':
 			((struct flag *) *currentitem)->on = '-';

diff --git a/ufed.pl.in b/ufed.pl.in
index e7f9673..341cb55 100644
--- a/ufed.pl.in
+++ b/ufed.pl.in
@@ -12,7 +12,6 @@ use Portage;
 my $version = 'XX_PACKAGE_VERSION@';
 
 my %use_descriptions;
-my %masked_flags;
 my %masked_descriptions;
 
 sub finalise(@);
@@ -32,7 +31,7 @@ $Portage::make_conf_flags{'-*'} = 1
 
 for(keys %Portage::all_flags) {
 	@{$use_descriptions{$_}} = "(Unknown)"
-	if not exists $use_descriptions{$_};
+		if not exists $use_descriptions{$_};
 }
 @{$use_descriptions{'-*'}} = 'Never enable any flags other than those specified in make.conf';
 
@@ -47,8 +46,8 @@ for(keys %Portage::use_masked_flags) {
 		last if not($masked &&= $_);
 	}
 	if($masked) {
-		$masked_flags{$_}        = $Portage::all_flags{$_};
-		$masked_descriptions{$_} = $use_descriptions{$_};
+		@{$masked_descriptions{$_}} = @{$use_descriptions{$_}}
+			if (defined($use_descriptions{$_}));
 		delete $Portage::default_flags{$_};
 		delete $Portage::all_flags{$_};
 		delete $use_descriptions{$_};
@@ -89,15 +88,33 @@ sub flags_dialog() {
 	POSIX::close $iread;
 	POSIX::close $owrite;
 	if(open my $fh, '>&=', $iwrite) {
-		my @flags = sort { uc $a cmp uc $b } keys %use_descriptions;
-		my %descriptions;
-		for(my $flag=0; $flag<@flags; $flag++) {
-			my $flag = $flags[$flag];
-			print $fh $flag;
-			print $fh defined $Portage::make_conf_flags{$flag} ? $Portage::make_conf_flags{$flag} ? ' on ' : ' off ' : ' def ';
-			print $fh exists $Portage::make_defaults_flags{$flag} ? $Portage::make_defaults_flags{$flag} ? '(+' :'(-' :'( ' ;
-			print $fh exists     $Portage::make_conf_flags{$flag} ?     $Portage::make_conf_flags{$flag} ?  '+)': '-)': ' )';
-			print $fh ' ', scalar(@{$use_descriptions{$flag}}), "\n";
+		
+		# Write masked flags first so they sort at the beginning of the list
+		for my $flag (sort { uc $a cmp uc $b } keys %masked_descriptions) {
+			print $fh "(" . $flag . ") msk "
+			. (exists($Portage::make_defaults_flags{$flag})
+				? $Portage::make_defaults_flags{$flag} ? '(+' :'(-'
+				: '( ')
+			. (exists($Portage::make_conf_flags{$flag})
+				? $Portage::make_conf_flags{$flag}     ? '+)': '-)'
+				: ' )')
+			. ' ' . scalar(@{$masked_descriptions{$flag}}) . "\n";
+			print $fh $_, "\n" for(@{$masked_descriptions{$flag}});
+		}
+
+		# Then write regular flags
+		for my $flag (sort { uc $a cmp uc $b } keys %use_descriptions) {
+			print $fh $flag
+			. (defined($Portage::make_conf_flags{$flag})
+				? $Portage::make_conf_flags{$flag} ? ' on ' : ' off '
+				: ' def ' )
+			. (exists($Portage::make_defaults_flags{$flag})
+				? $Portage::make_defaults_flags{$flag} ? '(+' :'(-'
+				: '( ')
+			. (exists($Portage::make_conf_flags{$flag})
+				? $Portage::make_conf_flags{$flag}     ? '+)': '-)'
+				: ' )')
+			. ' ' . scalar(@{$use_descriptions{$flag}}) . "\n";
 			print $fh $_, "\n" for(@{$use_descriptions{$flag}});
 		}
 		close $fh;