PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into glib-loop

This commit is contained in:
Dave Davenport 2016-02-04 16:25:04 +01:00
parent c173d9d707 69b88caac5
commit 531f3f884a
6 changed files with 124 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -224,6 +224,8 @@ test-x: ${bin_PROGRAMS}
$(top_srcdir)/test/run_test.sh 217 $(top_srcdir)/test/run_fuzzy_test.sh $(top_builddir)
echo "Test config dump"
$(top_srcdir)/test/run_test.sh 218 $(top_srcdir)/test/xr_config_test.sh $(top_builddir) $(top_srcdir)
echo "Test issue 333"
$(top_srcdir)/test/run_test.sh 221 $(top_srcdir)/test/run_ssue_333.sh $(top_builddir)
test-x1: ${bin_PROGRAMS}
echo "Test dmenu-normal-window"

2
script/rofi-sensible-terminal
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
#
# This code is released in public domain by Han Boetes <han@mijncomputer.nl>
# Updated by Dave Davenport <qball@gmpclient.org>

13
source/dialogs/dmenu.c
View File

@ -427,6 +427,12 @@ int dmenu_switcher_dialog ( void )
* Select item mode.
*/
restart = 1;
// Skip if no valid item is selected.
if ( ( mretv & MENU_CANCEL ) == MENU_CANCEL ) {
// In no custom mode we allow canceling.
restart = ( find_arg ( "-only-match" ) >= 0 );
}
else if ( pd->selected_line != UINT32_MAX ) {
if ( ( mretv & ( MENU_OK | MENU_QUICK_SWITCH ) ) && cmd_list[pd->selected_line] != NULL ) {
dmenu_output_formatted_line ( pd->format, cmd_list[pd->selected_line], pd->selected_line, input );
retv = TRUE;
@ -435,17 +441,14 @@ int dmenu_switcher_dialog ( void )
}
return retv;
}
else if ( ( mretv & MENU_CANCEL ) == MENU_CANCEL ) {
// In no custom mode we allow canceling.
restart = ( find_arg ( "-only-match" ) >= 0 );
}
pd->selected_line = next_pos - 1;
}
continue;
}
// We normally do not want to restart the loop.
restart = FALSE;
// Normal mode
if ( ( mretv & MENU_OK ) && cmd_list[pd->selected_line] != NULL ) {
if ( ( mretv & MENU_OK ) && pd->selected_line != UINT32_MAX && cmd_list[pd->selected_line] != NULL ) {
dmenu_output_formatted_line ( pd->format, cmd_list[pd->selected_line], pd->selected_line, input );
if ( ( mretv & MENU_SHIFT ) ) {
restart = TRUE;

5
source/i3-support.c
View File

@ -50,7 +50,7 @@ char *i3_socket_path = NULL;
void i3_support_focus_window ( Window id )
{
i3_ipc_header_t head;
int s, len;
int s;
ssize_t t;
struct sockaddr_un remote;
size_t upm = sizeof ( remote.sun_path );
@ -68,9 +68,8 @@ void i3_support_focus_window ( Window id )
remote.sun_family = AF_UNIX;
g_strlcpy ( remote.sun_path, i3_socket_path, upm );
len = strlen ( remote.sun_path ) + sizeof ( remote.sun_family );
if ( connect ( s, ( struct sockaddr * ) &remote, len ) == -1 ) {
if ( connect ( s, ( struct sockaddr * ) &remote, sizeof ( struct sockaddr_un ) ) == -1 ) {
fprintf ( stderr, "Failed to connect to I3 (%s): %s\n", i3_socket_path, strerror ( errno ) );
close ( s );
return;

38
source/rofi.c
View File

@ -1422,6 +1422,7 @@ static void menu_mainloop_iter ( MenuState *state, XEvent *ev )
}
for ( unsigned int a = CUSTOM_1; a <= CUSTOM_19; a++ ) {
if ( abe_test_action ( a, ev->xkey.state, key ) ) {
state->selected_line = UINT32_MAX;
if ( state->selected < state->filtered_lines ) {
( state->selected_line ) = state->line_map[state->selected];
}
@ -1446,6 +1447,7 @@ static void menu_mainloop_iter ( MenuState *state, XEvent *ev )
int shift = ( ( ev->xkey.state & ShiftMask ) == ShiftMask );
// If a valid item is selected, return that..
state->selected_line = UINT32_MAX;
if ( state->selected < state->filtered_lines ) {
( state->selected_line ) = state->line_map[state->selected];
if ( strlen ( state->text->text ) > 0 && rc == -2 ) {
@ -1613,8 +1615,7 @@ MenuState *menu ( Mode *sw,
state->top_offset = state->border * 1 + state->line_height + 2 + config.line_margin * 2;
// Move indicator to end.
widget_move ( WIDGET ( state->case_indicator ), state->border + textbox_get_width ( state->prompt_tb ) + entrybox_width,
state->border );
widget_move ( WIDGET ( state->case_indicator ), state->border + textbox_get_width ( state->prompt_tb ) + entrybox_width, state->border );
textbox_text ( state->case_indicator, get_matching_state () );
state->message_tb = NULL;
@ -1779,6 +1780,7 @@ void error_dialog ( const char *msg, int markup )
}
menu_state_set_active ( NULL );
menu_state_free ( state );
release_keyboard ( display );
}
/**
@ -2075,13 +2077,9 @@ static void cleanup ()
* First the three build-in modi are checked: window, run, ssh
* if that fails, a script-switcher is created.
*/
static void setup_modi ( void )
static int add_mode ( const char * token )
{
char *savept = NULL;
// Make a copy, as strtok will modify it.
char *switcher_str = g_strdup ( config.modi );
// Split token on ','. This modifies switcher_str.
for ( char *token = strtok_r ( switcher_str, ",", &savept ); token != NULL; token = strtok_r ( NULL, ",", &savept ) ) {
unsigned int index = num_modi;
// Resize and add entry.
modi = (ModeHolder *) g_realloc ( modi, sizeof ( ModeHolder ) * ( num_modi + 1 ) );
modi[num_modi].tb = NULL;
@ -2131,7 +2129,16 @@ static void setup_modi ( void )
token = NULL;
}
}
// Keybinding.
return ( index == num_modi ) ? -1 : (int) index;
}
static void setup_modi ( void )
{
char *savept = NULL;
// Make a copy, as strtok will modify it.
char *switcher_str = g_strdup ( config.modi );
// Split token on ','. This modifies switcher_str.
for ( char *token = strtok_r ( switcher_str, ",", &savept ); token != NULL; token = strtok_r ( NULL, ",", &savept ) ) {
add_mode ( token );
}
// Free string that was modified by strtok_r
g_free ( switcher_str );
@ -2207,6 +2214,8 @@ static void reload_configuration ()
}
}
/**
* Process X11 events in the main-loop (gui-thread) of the application.
*/
@ -2495,6 +2504,17 @@ int main ( int argc, char *argv[] )
char *sname = NULL;
if ( find_arg_str ( "-show", &sname ) == TRUE ) {
int index = switcher_get ( sname );
if ( index < 0 ) {
// Add it to the list
index = add_mode ( sname );
// Complain
if ( index >= 0 ) {
fprintf ( stdout, "Mode %s not enabled. Please add it to the list of enabled modi: %s\n",
sname, config.modi );
fprintf ( stdout, "Adding mode: %s\n", sname );
}
// Run it anyway if found.
}
if ( index >= 0 ) {
run_switcher ( index );
g_idle_add ( delayed_start, GINT_TO_POINTER ( index ) );

33
test/run_issue333_test.sh Executable file
View File

@ -0,0 +1,33 @@
#!/usr/bin/env bash
# wait till it is up, run rofi with error message
rm -f output.txt
sleep 1;
echo -e -n "aap\nnoot\nmies" | rofi -dmenu -no-custom -kb-custom-1 F5 -kb-custom-2 "Control+a" > output.txt &
RPID=$!
# send enter.
sleep 5;
xdotool key 'q'
sleep 0.4
xdotool key Return
sleep 0.4
xdotool key F5
sleep 0.4
xdotool key "Control+a"
sleep 0.4
xdotool key Escape
# Get result, kill xvfb
wait ${RPID}
RETV=$?
OUTPUT=$(cat output.txt | tr '\n' ' ')
if [ "${OUTPUT}" != '' ]
then
echo "Got: '${OUTPUT}' expected nothing"
exit 1
fi
if [ ${RETV} != 1 ]
then
exit 1
fi