summaryrefslogtreecommitdiffstats
path: root/source/run-dialog.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/run-dialog.c')
-rw-r--r--source/run-dialog.c361
1 files changed, 213 insertions, 148 deletions
diff --git a/source/run-dialog.c b/source/run-dialog.c
index 1a728739..08887257 100644
--- a/source/run-dialog.c
+++ b/source/run-dialog.c
@@ -45,151 +45,176 @@
#include <time.h>
#endif
-#define RUN_CACHE_FILE "rofi-2.runcache"
+#define RUN_CACHE_FILE "rofi-2.runcache"
-static inline int execsh( const char *cmd ,int run_in_term )
+static inline int execsh ( const char *cmd, int run_in_term )
{
// use sh for args parsing
if ( run_in_term )
- return execlp( config.terminal_emulator, config.terminal_emulator, "-e", "sh", "-c", cmd, NULL );
+ {
+ return execlp ( config.terminal_emulator, config.terminal_emulator, "-e", "sh", "-c", cmd, NULL );
+ }
- return execlp( "/bin/sh", "sh", "-c", cmd, NULL );
+ return execlp ( "/bin/sh", "sh", "-c", cmd, NULL );
}
-typedef struct _element{
+typedef struct _element
+{
long int index;
- char name[1024];
+ char name[1024];
}element;
-static int element_sort_func(const void *ea,const void *eb)
+static int element_sort_func ( const void *ea, const void *eb )
{
- element *a = *(element **)ea;
- element *b = *(element **)eb;
+ element *a = *(element * *) ea;
+ element *b = *(element * *) eb;
return b->index - a->index;
}
// execute sub-process
-static pid_t exec_cmd( const char *cmd, int run_in_term )
+static pid_t exec_cmd ( const char *cmd, int run_in_term )
{
- if ( !cmd || !cmd[0] ) return -1;
+ if ( !cmd || !cmd[0] )
+ {
+ return -1;
+ }
- signal( SIGCHLD, catch_exit );
- pid_t pid = fork();
+ signal ( SIGCHLD, catch_exit );
+ pid_t pid = fork ();
- if ( !pid ) {
- setsid();
- execsh( cmd, run_in_term );
- exit( EXIT_FAILURE );
+ if ( !pid )
+ {
+ setsid ();
+ execsh ( cmd, run_in_term );
+ exit ( EXIT_FAILURE );
}
- int curr = -1;
- unsigned int index = 0;
- element **retv = NULL;
+ int curr = -1;
+ unsigned int index = 0;
+ element **retv = NULL;
/**
* This happens in non-critical time (After launching app)
* It is allowed to be a bit slower.
*/
- size_t path_length = strlen( cache_dir ) + strlen( RUN_CACHE_FILE )+3;
- char *path = allocate( path_length );
- snprintf( path, path_length, "%s/%s", cache_dir, RUN_CACHE_FILE );
- FILE *fd = fopen ( path, "r" );
+ size_t path_length = strlen ( cache_dir ) + strlen ( RUN_CACHE_FILE ) + 3;
+ char *path = allocate ( path_length );
+ snprintf ( path, path_length, "%s/%s", cache_dir, RUN_CACHE_FILE );
+ FILE *fd = fopen ( path, "r" );
- if ( fd != NULL ) {
+ if ( fd != NULL )
+ {
char buffer[1024];
- while ( fgets( buffer,1024,fd ) != NULL ) {
- if(strlen(buffer) == 0) continue;
- retv = reallocate( retv, ( index+2 )*sizeof( element* ) );
- retv[index] = allocate(sizeof(element));
- buffer[strlen( buffer )-1] = '\0';
+ while ( fgets ( buffer, 1024, fd ) != NULL )
+ {
+ if ( strlen ( buffer ) == 0 )
+ {
+ continue;
+ }
+ retv = reallocate ( retv, ( index + 2 ) * sizeof ( element* ) );
+ retv[index] = allocate ( sizeof ( element ) );
+ buffer[strlen ( buffer ) - 1] = '\0';
char * start = NULL;
- retv[index]->index = strtol(buffer, &start, 10);
- snprintf(retv[index]->name, 1024, "%s", start+1);
- retv[index+1] = NULL;
+ retv[index]->index = strtol ( buffer, &start, 10 );
+ snprintf ( retv[index]->name, 1024, "%s", start + 1 );
+ retv[index + 1] = NULL;
- if ( strcasecmp( retv[index]->name, cmd ) == 0 ) {
+ if ( strcasecmp ( retv[index]->name, cmd ) == 0 )
+ {
curr = index;
}
index++;
}
- fclose( fd );
+ fclose ( fd );
}
- if(curr < 0) {
- retv = reallocate( retv, ( index+2 )*sizeof( element* ) );
- retv[index] = allocate(sizeof(element));
- retv[index]->index = 1;
- snprintf(retv[index]->name, 1024, "%s", cmd);
- index++;
- }else {
- retv[curr]->index++;
+ if ( curr < 0 )
+ {
+ retv = reallocate ( retv, ( index + 2 ) * sizeof ( element* ) );
+ retv[index] = allocate ( sizeof ( element ) );
+ retv[index]->index = 1;
+ snprintf ( retv[index]->name, 1024, "%s", cmd );
+ index++;
+ }
+ else
+ {
+ retv[curr]->index++;
}
// Sort the list.
- qsort(retv, index, sizeof(element*), element_sort_func);
+ qsort ( retv, index, sizeof ( element* ), element_sort_func );
/**
* Write out the last 25 results again.
*/
fd = fopen ( path, "w" );
- if ( fd ) {
-
- for ( int i = 0; i < ( int )index && i < 20; i++ ) {
- if(retv[i]->name && retv[i]->name[0] != '\0') {
- fprintf(fd, "%ld %s\n",
- retv[i]->index,
- retv[i]->name
- );
+ if ( fd )
+ {
+ for ( int i = 0; i < ( int ) index && i < 20; i++ )
+ {
+ if ( retv[i]->name && retv[i]->name[0] != '\0' )
+ {
+ fprintf ( fd, "%ld %s\n",
+ retv[i]->index,
+ retv[i]->name
+ );
}
}
- fclose( fd );
+ fclose ( fd );
}
- for ( int i=0; retv != NULL && retv[i] != NULL; i++ ) {
- free( retv[i] );
+ for ( int i = 0; retv != NULL && retv[i] != NULL; i++ )
+ {
+ free ( retv[i] );
}
- free( retv );
+ free ( retv );
- free( path );
+ free ( path );
return pid;
}
// execute sub-process
-static void delete_entry( const char *cmd )
+static void delete_entry ( const char *cmd )
{
- int curr = -1;
- unsigned int index = 0;
- element **retv = NULL;
+ int curr = -1;
+ unsigned int index = 0;
+ element **retv = NULL;
/**
* This happens in non-critical time (After launching app)
* It is allowed to be a bit slower.
*/
- char *path = allocate( strlen( cache_dir ) + strlen( RUN_CACHE_FILE )+3 );
- sprintf( path, "%s/%s", cache_dir, RUN_CACHE_FILE );
+ char *path = allocate ( strlen ( cache_dir ) + strlen ( RUN_CACHE_FILE ) + 3 );
+ sprintf ( path, "%s/%s", cache_dir, RUN_CACHE_FILE );
FILE *fd = fopen ( path, "r" );
- if ( fd != NULL ) {
+ if ( fd != NULL )
+ {
char buffer[1024];
- while ( fgets( buffer,1024,fd ) != NULL ) {
- if(strlen(buffer) == 0) continue;
- retv = reallocate( retv, ( index+2 )*sizeof( element* ) );
- retv[index] = allocate(sizeof(element));
- buffer[strlen( buffer )-1] = '\0';
+ while ( fgets ( buffer, 1024, fd ) != NULL )
+ {
+ if ( strlen ( buffer ) == 0 )
+ {
+ continue;
+ }
+ retv = reallocate ( retv, ( index + 2 ) * sizeof ( element* ) );
+ retv[index] = allocate ( sizeof ( element ) );
+ buffer[strlen ( buffer ) - 1] = '\0';
char * start = NULL;
- retv[index]->index = strtol(buffer, &start, 10);
- snprintf(retv[index]->name, 1024, "%s", start+1);
- retv[index+1] = NULL;
+ retv[index]->index = strtol ( buffer, &start, 10 );
+ snprintf ( retv[index]->name, 1024, "%s", start + 1 );
+ retv[index + 1] = NULL;
- if ( strcasecmp( retv[index]->name, cmd ) == 0 ) {
+ if ( strcasecmp ( retv[index]->name, cmd ) == 0 )
+ {
curr = index;
}
index++;
}
- fclose( fd );
+ fclose ( fd );
}
/**
@@ -197,88 +222,107 @@ static void delete_entry( const char *cmd )
*/
fd = fopen ( path, "w" );
- if ( fd ) {
- for ( int i = 0; i < ( int )index && i < 20; i++ ) {
- if ( i != curr ) {
- if(retv[i]->name && retv[i]->name[0] != '\0') {
- fprintf(fd, "%ld %s\n",
- retv[i]->index,
- retv[i]->name
- );
+ if ( fd )
+ {
+ for ( int i = 0; i < ( int ) index && i < 20; i++ )
+ {
+ if ( i != curr )
+ {
+ if ( retv[i]->name && retv[i]->name[0] != '\0' )
+ {
+ fprintf ( fd, "%ld %s\n",
+ retv[i]->index,
+ retv[i]->name
+ );
}
}
}
- fclose( fd );
+ fclose ( fd );
}
- for ( int i=0; retv != NULL && retv[i] != NULL; i++ ) {
- free( retv[i] );
+ for ( int i = 0; retv != NULL && retv[i] != NULL; i++ )
+ {
+ free ( retv[i] );
}
- free( retv );
-
- free( path );
+ free ( retv );
+ free ( path );
}
static int sort_func ( const void *a, const void *b )
{
- const char *astr = *( const char * const * )a;
- const char *bstr = *( const char * const * )b;
- return strcasecmp( astr,bstr );
+ const char *astr = *( const char * const * ) a;
+ const char *bstr = *( const char * const * ) b;
+ return strcasecmp ( astr, bstr );
}
static char ** get_apps ( )
{
- unsigned int num_favorites = 0;
- unsigned int index = 0;
- char *path;
- char **retv = NULL;
+ unsigned int num_favorites = 0;
+ unsigned int index = 0;
+ char *path;
+ char **retv = NULL;
#ifdef TIMING
struct timespec start, stop;
- clock_gettime( CLOCK_REALTIME, &start );
+ clock_gettime ( CLOCK_REALTIME, &start );
#endif
- if ( getenv( "PATH" ) == NULL ) return NULL;
+ if ( getenv ( "PATH" ) == NULL )
+ {
+ return NULL;
+ }
- path = allocate( strlen( cache_dir ) + strlen( RUN_CACHE_FILE )+3 );
- sprintf( path, "%s/%s", cache_dir, RUN_CACHE_FILE );
+ path = allocate ( strlen ( cache_dir ) + strlen ( RUN_CACHE_FILE ) + 3 );
+ sprintf ( path, "%s/%s", cache_dir, RUN_CACHE_FILE );
FILE *fd = fopen ( path, "r" );
- if ( fd != NULL ) {
+ if ( fd != NULL )
+ {
char buffer[1024];
- while ( fgets( buffer,1024,fd ) != NULL ) {
- if(strlen(buffer) == 0) continue;
- buffer[strlen( buffer )-1] = '\0';
+ while ( fgets ( buffer, 1024, fd ) != NULL )
+ {
+ if ( strlen ( buffer ) == 0 )
+ {
+ continue;
+ }
+ buffer[strlen ( buffer ) - 1] = '\0';
char *start = NULL;
// Don't use result.
- strtol(buffer, &start, 10);
- if(start == NULL) continue;
- retv = reallocate( retv, ( index+2 )*sizeof( char* ) );
- retv[index] = strdup( start+1 );
- retv[index+1] = NULL;
+ strtol ( buffer, &start, 10 );
+ if ( start == NULL )
+ {
+ continue;
+ }
+ retv = reallocate ( retv, ( index + 2 ) * sizeof ( char* ) );
+ retv[index] = strdup ( start + 1 );
+ retv[index + 1] = NULL;
index++;
num_favorites++;
}
- fclose( fd );
+ fclose ( fd );
}
- free( path );
+ free ( path );
- path = strdup( getenv( "PATH" ) );
+ path = strdup ( getenv ( "PATH" ) );
- for ( const char *dirname = strtok( path, ":" ); dirname != NULL; dirname = strtok( NULL, ":" ) ) {
- DIR *dir = opendir( dirname );
+ for ( const char *dirname = strtok ( path, ":" ); dirname != NULL; dirname = strtok ( NULL, ":" ) )
+ {
+ DIR *dir = opendir ( dirname );
- if ( dir != NULL ) {
+ if ( dir != NULL )
+ {
struct dirent *dent;
- while ( ( dent=readdir( dir ) )!=NULL ) {
+ while ( ( dent = readdir ( dir ) ) != NULL )
+ {
if ( dent->d_type != DT_REG &&
dent->d_type != DT_LNK &&
- dent->d_type != DT_UNKNOWN ) {
+ dent->d_type != DT_UNKNOWN )
+ {
continue;
}
@@ -286,72 +330,93 @@ static char ** get_apps ( )
// This is a nice little penalty, but doable? time will tell.
// given num_favorites is max 25.
- for ( unsigned int j = 0; found == 0 && j < num_favorites; j++ ) {
- if ( strcasecmp( dent->d_name, retv[j] ) == 0 ) found = 1;
+ for ( unsigned int j = 0; found == 0 && j < num_favorites; j++ )
+ {
+ if ( strcasecmp ( dent->d_name, retv[j] ) == 0 )
+ {
+ found = 1;
+ }
}
- if ( found == 1 ) continue;
+ if ( found == 1 )
+ {
+ continue;
+ }
- retv = reallocate( retv, ( index+2 )*sizeof( char* ) );
- retv[index] = strdup( dent->d_name );
- retv[index+1] = NULL;
+ retv = reallocate ( retv, ( index + 2 ) * sizeof ( char* ) );
+ retv[index] = strdup ( dent->d_name );
+ retv[index + 1] = NULL;
index++;
}
- closedir( dir );
+ closedir ( dir );
}
}
// TODO: check this is still fast enough. (takes 1ms on laptop.)
- if(index > num_favorites) {
- qsort( &retv[num_favorites],index-num_favorites, sizeof( char* ), sort_func );
+ if ( index > num_favorites )
+ {
+ qsort ( &retv[num_favorites], index - num_favorites, sizeof ( char* ), sort_func );
}
- free( path );
+ free ( path );
#ifdef TIMING
- clock_gettime( CLOCK_REALTIME, &stop );
+ clock_gettime ( CLOCK_REALTIME, &stop );
- if ( stop.tv_sec != start.tv_sec ) {
- stop.tv_nsec += ( stop.tv_sec-start.tv_sec )*1e9;
+ if ( stop.tv_sec != start.tv_sec )
+ {
+ stop.tv_nsec += ( stop.tv_sec - start.tv_sec ) * 1e9;
}
- long diff = stop.tv_nsec-start.tv_nsec;
- printf( "Time elapsed: %ld us\n", diff/1000 );
+ long diff = stop.tv_nsec - start.tv_nsec;
+ printf ( "Time elapsed: %ld us\n", diff / 1000 );
#endif
return retv;
}
SwitcherMode run_switcher_dialog ( char **input )
{
- int shift=0;
- int selected_line = 0;
- SwitcherMode retv = MODE_EXIT;
+ int shift = 0;
+ int selected_line = 0;
+ SwitcherMode retv = MODE_EXIT;
// act as a launcher
- char **cmd_list = get_apps( );
+ char **cmd_list = get_apps ( );
- if ( cmd_list == NULL ) {
- cmd_list = allocate( 2*sizeof( char * ) );
- cmd_list[0] = strdup( "No applications found" );
+ if ( cmd_list == NULL )
+ {
+ cmd_list = allocate ( 2 * sizeof ( char * ) );
+ cmd_list[0] = strdup ( "No applications found" );
cmd_list[1] = NULL;
}
- int mretv = menu( cmd_list, input, "$", NULL, &shift,token_match, NULL, &selected_line );
+ int mretv = menu ( cmd_list, input, "$", NULL, &shift, token_match, NULL, &selected_line );
- if ( mretv == MENU_NEXT ) {
+ if ( mretv == MENU_NEXT )
+ {
retv = NEXT_DIALOG;
- } else if ( mretv == MENU_OK && cmd_list[selected_line] != NULL ) {
- exec_cmd( cmd_list[selected_line], shift );
- } else if ( mretv == MENU_CUSTOM_INPUT && *input != NULL && *input[0] != '\0' ) {
- exec_cmd( *input, shift );
- } else if ( mretv == MENU_ENTRY_DELETE && cmd_list[selected_line] ) {
+ }
+ else if ( mretv == MENU_OK && cmd_list[selected_line] != NULL )
+ {
+ exec_cmd ( cmd_list[selected_line], shift );
+ }
+ else if ( mretv == MENU_CUSTOM_INPUT && *input != NULL && *input[0] != '\0' )
+ {
+ exec_cmd ( *input, shift );
+ }
+ else if ( mretv == MENU_ENTRY_DELETE && cmd_list[selected_line] )
+ {
delete_entry ( cmd_list[selected_line] );
retv = RUN_DIALOG;
}
- for ( int i=0; cmd_list != NULL && cmd_list[i] != NULL; i++ ) {
- free( cmd_list[i] );
+ for ( int i = 0; cmd_list != NULL && cmd_list[i] != NULL; i++ )
+ {
+ free ( cmd_list[i] );
}
- if ( cmd_list != NULL ) free( cmd_list );
+ if ( cmd_list != NULL )
+ {
+ free ( cmd_list );
+ }
return retv;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 13:39:40 +0000