PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00
Code Releases Activity

Speedup drun by 10% by reducing number of reallocs.

Browse source
This commit is contained in:
Dave Davenport 2017-02-02 08:35:33 +01:00
parent cc0ab10833
commit 601a20aba5
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/dialogs/drun.c
View file

@ -98,14 +98,13 @@ typedef struct
char *generic_name; char *generic_name;
GKeyFile *key_file; GKeyFile *key_file;
/* Application needs to be launched in terminal. */
unsigned int terminal;
} DRunModeEntry; } DRunModeEntry;
typedef struct typedef struct
{ {
DRunModeEntry *entry_list; DRunModeEntry *entry_list;
unsigned int cmd_list_length; unsigned int cmd_list_length;
unsigned int cmd_list_length_actual;
unsigned int history_length; unsigned int history_length;
// List of disabled entries. // List of disabled entries.
GHashTable *disabled_entries; GHashTable *disabled_entries;
@ -200,7 +199,9 @@ static void exec_cmd_entry ( DRunModeEntry *e )
exec_path = NULL; exec_path = NULL;
} }
if ( execsh ( exec_path, fp, e->terminal ) ) { // Returns false if not found, if key not found, we don't want run in terminal.
gboolean terminal = g_key_file_get_boolean ( e->key_file, "Desktop Entry", "Terminal", NULL );
if ( execsh ( exec_path, fp, terminal ) ) {
char *path = g_build_filename ( cache_dir, DRUN_CACHE_FILE, NULL ); char *path = g_build_filename ( cache_dir, DRUN_CACHE_FILE, NULL );
char *key = g_strdup_printf ( "%s:::%s", e->root, e->path ); char *key = g_strdup_printf ( "%s:::%s", e->root, e->path );
history_set ( path, key ); history_set ( path, key );
@ -286,7 +287,10 @@ static void read_desktop_file ( DRunModePrivateData *pd, const char *root, const
return; return;
} }
size_t nl = ( ( pd->cmd_list_length ) + 1 ); size_t nl = ( ( pd->cmd_list_length ) + 1 );
pd->entry_list = g_realloc ( pd->entry_list, nl * sizeof ( *( pd->entry_list ) ) ); if ( nl >= pd->cmd_list_length_actual ) {
pd->cmd_list_length_actual+=256;
pd->entry_list = g_realloc ( pd->entry_list, pd->cmd_list_length_actual * sizeof ( *( pd->entry_list ) ) );
}
pd->entry_list[pd->cmd_list_length].root = g_strdup ( root ); pd->entry_list[pd->cmd_list_length].root = g_strdup ( root );
pd->entry_list[pd->cmd_list_length].path = g_strdup ( path ); pd->entry_list[pd->cmd_list_length].path = g_strdup ( path );
gchar *n = g_key_file_get_locale_string ( kf, "Desktop Entry", "Name", NULL, NULL ); gchar *n = g_key_file_get_locale_string ( kf, "Desktop Entry", "Name", NULL, NULL );
@ -294,8 +298,6 @@ static void read_desktop_file ( DRunModePrivateData *pd, const char *root, const
gchar *gn = g_key_file_get_locale_string ( kf, "Desktop Entry", "GenericName", NULL, NULL ); gchar *gn = g_key_file_get_locale_string ( kf, "Desktop Entry", "GenericName", NULL, NULL );
pd->entry_list[pd->cmd_list_length].generic_name = gn; pd->entry_list[pd->cmd_list_length].generic_name = gn;
pd->entry_list[pd->cmd_list_length].exec = g_key_file_get_string ( kf, "Desktop Entry", "Exec", NULL ); pd->entry_list[pd->cmd_list_length].exec = g_key_file_get_string ( kf, "Desktop Entry", "Exec", NULL );
// Returns false if not found, if key not found, we don't want run in terminal.
pd->entry_list[pd->cmd_list_length].terminal = g_key_file_get_boolean ( kf, "Desktop Entry", "Terminal", NULL );
// Keep keyfile around. // Keep keyfile around.
pd->entry_list[pd->cmd_list_length].key_file = kf; pd->entry_list[pd->cmd_list_length].key_file = kf;