summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2016-06-26 11:00:23 +0200
committerDave Davenport <qball@gmpclient.org>2016-06-26 11:00:23 +0200
commitc87e91b6d92da5264a047de4dfcc0a51586e713b (patch)
tree821256e6d94816136adbaaa92e96c1cace578812
parent40f95ae81ff49cce2d4217020712b6a90bc26c73 (diff)
Make select behave more Rasi-ish
-rw-r--r--source/dialogs/dmenu.c4
-rwxr-xr-xtest/run_dmenu_issue_292.sh4
-rwxr-xr-xtest/run_dmenu_test.sh1
3 files changed, 4 insertions, 5 deletions
diff --git a/source/dialogs/dmenu.c b/source/dialogs/dmenu.c
index 2c1720e1..a38a88cb 100644
--- a/source/dialogs/dmenu.c
+++ b/source/dialogs/dmenu.c
@@ -445,9 +445,7 @@ static void dmenu_finalize ( RofiViewState *state )
if ( pd->selected_list != NULL ) {
for ( unsigned int st = 0; st < pd->cmd_list_length; st++ ) {
if ( bitget ( pd->selected_list, st ) ) {
- if ( pd->selected_line == st ) {
- seen = TRUE;
- }
+ seen = TRUE;
dmenu_output_formatted_line ( pd->format, cmd_list[st], st, input );
}
}
diff --git a/test/run_dmenu_issue_292.sh b/test/run_dmenu_issue_292.sh
index 56030458..61c0da15 100755
--- a/test/run_dmenu_issue_292.sh
+++ b/test/run_dmenu_issue_292.sh
@@ -39,9 +39,9 @@ xdotool key Return
wait ${RPID}
RETV=$?
OUTPUT=$(cat output.txt | tr '\n' ' ')
-if [ "${OUTPUT}" != '2 12 20 21 22 23 24 25 26 27 28 29 32 ' ]
+if [ "${OUTPUT}" != '2 12 20 21 22 23 24 25 26 27 28 29 ' ]
then
- echo "Got: '${OUTPUT}' expected '2 12 20 21 22 23 24 25 26 27 28 29 32 '"
+ echo "Got: '${OUTPUT}' expected '2 12 20 21 22 23 24 25 26 27 28 29 '"
exit 1
fi
echo ${RETV}
diff --git a/test/run_dmenu_test.sh b/test/run_dmenu_test.sh
index eb3a5dcb..0d70d700 100755
--- a/test/run_dmenu_test.sh
+++ b/test/run_dmenu_test.sh
@@ -10,6 +10,7 @@ sleep 5;
xdotool key 'Down'
sleep 0.4
xdotool key Shift+Return
+xdotool key Shift+Return
xdotool key Return
# Get result, kill xvfb