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

[Script] Add option to set deliminter and example script. 

Issue: #1041
This commit is contained in:
Dave Davenport 2020-04-01 13:58:01 +02:00
parent 5b8aebad3e
commit aa07b8ef94
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Examples/test_script_mode_delim.sh Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env bash
if [ x"$@" = x"quit" ]
then
exit 0
fi
# Override the previously set prompt.
echo -en "\x00delim\x1f\\x1\n"
echo -en "\x00prompt\x1fChange prompt\x1"
for a in {1..10}
do
echo -en "$a\x1"
done
echo -en "newline\ntest\x1"
echo -en "quit"

7
doc/rofi.1
View File

@ -657,6 +657,13 @@ rofi \-show run \-sidebar\-mode \-lines 0
.fi
.RE
.PP
\fB\fC\-eh\fR \fInumber\fP
.PP
Set row height (in chars)
Default: \fI1\fP
.PP
\fB\fC\-auto\-select\fR

10
source/dialogs/script.c
View File

@ -68,6 +68,7 @@ typedef struct
char *message;
char *prompt;
gboolean do_markup;
char delim;
} ScriptModePrivateData;
/**
@ -127,11 +128,15 @@ static void parse_header_entry ( Mode *sw, char *line, ssize_t length )
else if ( strcasecmp ( line, "active" ) == 0 ) {
parse_ranges ( value, &( pd->active_list ), &( pd->num_active_list ) );
}
else if ( strcasecmp ( line, "delim" ) == 0 ) {
pd->delim = helper_parse_char ( value );
}
}
}
static DmenuScriptEntry *get_script_output ( Mode *sw, char *command, char *arg, unsigned int *length )
{
ScriptModePrivateData *pd = (ScriptModePrivateData *) sw->private_data;
int fd = -1;
GError *error = NULL;
DmenuScriptEntry *retv = NULL;
@ -159,9 +164,9 @@ static DmenuScriptEntry *get_script_output ( Mode *sw, char *command, char *arg,
size_t buffer_length = 0;
ssize_t read_length = 0;
size_t actual_size = 0;
while ( ( read_length = getline ( &buffer, &buffer_length, inp ) ) > 0 ) {
while ( ( read_length = getdelim ( &buffer, &buffer_length, pd->delim, inp ) ) > 0 ) {
// Filter out line-end.
if ( buffer[read_length - 1] == '\n' ) {
if ( buffer[read_length - 1] == pd->delim ) {
buffer[read_length - 1] = '\0';
}
if ( buffer[0] == '\0' ) {
@ -217,6 +222,7 @@ static int script_mode_init ( Mode *sw )
{
if ( sw->private_data == NULL ) {
ScriptModePrivateData *pd = g_malloc0 ( sizeof ( *pd ) );
pd->delim = '\n';
sw->private_data = (void *) pd;
pd->cmd_list = get_script_output ( sw, (char *) sw->ed, NULL, &( pd->cmd_list_length ) );
}