PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-02-10 15:44:41 -05:00
Code Releases Activity

Made it so the presence of a field in drun-display-format is enough to parse the .desktop files for that field. Also fixed helper_string_replace_if_exists only allowing one guarded field in the display format by making the regex ungreedy (#911)

Browse source 
Co-authored-by: Dave Davenport <DaveDavenport@users.noreply.github.com>
This commit is contained in:
Zachary Freed 2021-06-15 13:32:46 +01:00 • committed by GitHub
parent 3307d62c55
commit 44140ac5b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
source/dialogs/drun.c
View file

@ -123,7 +123,8 @@ typedef struct
typedef struct typedef struct
{ {
const char *entry_field_name; const char *entry_field_name;
gboolean enabled; gboolean enabled_match;
gboolean enabled_display;
} DRunEntryField; } DRunEntryField;
typedef enum typedef enum
@ -138,12 +139,12 @@ typedef enum
} DRunMatchingFields; } DRunMatchingFields;
static DRunEntryField matching_entry_fields[DRUN_MATCH_NUM_FIELDS] = { static DRunEntryField matching_entry_fields[DRUN_MATCH_NUM_FIELDS] = {
{ .entry_field_name = "name", .enabled = TRUE, }, { .entry_field_name = "name", .enabled_match = TRUE, .enabled_display = TRUE, },
{ .entry_field_name = "generic", .enabled = TRUE, }, { .entry_field_name = "generic", .enabled_match = TRUE, .enabled_display = TRUE, },
{ .entry_field_name = "exec", .enabled = TRUE, }, { .entry_field_name = "exec", .enabled_match = TRUE, .enabled_display = TRUE, },
{ .entry_field_name = "categories", .enabled = TRUE, }, { .entry_field_name = "categories", .enabled_match = TRUE, .enabled_display = TRUE, },
{ .entry_field_name = "keywords", .enabled = TRUE, }, { .entry_field_name = "keywords", .enabled_match = TRUE, .enabled_display = TRUE, },
{ .entry_field_name = "comment", .enabled = FALSE, } { .entry_field_name = "comment", .enabled_match = FALSE,.enabled_display = FALSE,}
}; };
struct _DRunModePrivateData struct _DRunModePrivateData
@ -572,15 +573,16 @@ static void read_desktop_file ( DRunModePrivateData *pd, const char *root, const
pd->entry_list[pd->cmd_list_length].action = DRUN_GROUP_NAME; pd->entry_list[pd->cmd_list_length].action = DRUN_GROUP_NAME;
gchar *gn = g_key_file_get_locale_string ( kf, DRUN_GROUP_NAME, "GenericName", NULL, NULL ); gchar *gn = g_key_file_get_locale_string ( kf, DRUN_GROUP_NAME, "GenericName", NULL, NULL );
pd->entry_list[pd->cmd_list_length].generic_name = gn; pd->entry_list[pd->cmd_list_length].generic_name = gn;
if ( matching_entry_fields[DRUN_MATCH_FIELD_KEYWORDS].enabled_match
if ( matching_entry_fields[DRUN_MATCH_FIELD_KEYWORDS].enabled ) { || matching_entry_fields[DRUN_MATCH_FIELD_CATEGORIES].enabled_display) {
pd->entry_list[pd->cmd_list_length].keywords = g_key_file_get_locale_string_list ( kf, DRUN_GROUP_NAME, "Keywords", NULL, NULL, NULL ); pd->entry_list[pd->cmd_list_length].keywords = g_key_file_get_locale_string_list ( kf, DRUN_GROUP_NAME, "Keywords", NULL, NULL, NULL );
} }
else { else {
pd->entry_list[pd->cmd_list_length].keywords = NULL; pd->entry_list[pd->cmd_list_length].keywords = NULL;
} }
if ( matching_entry_fields[DRUN_MATCH_FIELD_CATEGORIES].enabled ) { if ( matching_entry_fields[DRUN_MATCH_FIELD_CATEGORIES].enabled_match
|| matching_entry_fields[DRUN_MATCH_FIELD_CATEGORIES].enabled_display ) {
if ( categories ) { if ( categories ) {
pd->entry_list[pd->cmd_list_length].categories = categories; pd->entry_list[pd->cmd_list_length].categories = categories;
categories = NULL; categories = NULL;
@ -603,7 +605,8 @@ static void read_desktop_file ( DRunModePrivateData *pd, const char *root, const
pd->entry_list[pd->cmd_list_length].exec = NULL; pd->entry_list[pd->cmd_list_length].exec = NULL;
} }
if ( matching_entry_fields[DRUN_MATCH_FIELD_COMMENT].enabled ) { if ( matching_entry_fields[DRUN_MATCH_FIELD_COMMENT].enabled_match
|| matching_entry_fields[DRUN_MATCH_FIELD_COMMENT].enabled_display ) {
pd->entry_list[pd->cmd_list_length].comment = g_key_file_get_locale_string ( kf, pd->entry_list[pd->cmd_list_length].comment = g_key_file_get_locale_string ( kf,
DRUN_GROUP_NAME, "Comment", NULL, NULL ); DRUN_GROUP_NAME, "Comment", NULL, NULL );
} }
@ -987,13 +990,15 @@ static void drun_mode_parse_entry_fields ()
const char * const sep = ",#"; const char * const sep = ",#";
// Split token on ','. This modifies switcher_str. // Split token on ','. This modifies switcher_str.
for ( unsigned int i = 0; i < DRUN_MATCH_NUM_FIELDS; i++ ) { for ( unsigned int i = 0; i < DRUN_MATCH_NUM_FIELDS; i++ ) {
matching_entry_fields[i].enabled = FALSE; matching_entry_fields[i].enabled_match = FALSE;
matching_entry_fields[i].enabled_display = FALSE;
} }
for ( char *token = strtok_r ( switcher_str, sep, &savept ); token != NULL; for ( char *token = strtok_r ( switcher_str, sep, &savept ); token != NULL;
token = strtok_r ( NULL, sep, &savept ) ) { token = strtok_r ( NULL, sep, &savept ) ) {
if ( strcmp ( token, "all" ) == 0 ) { if ( strcmp ( token, "all" ) == 0 ) {
for ( unsigned int i = 0; i < DRUN_MATCH_NUM_FIELDS; i++ ) { for ( unsigned int i = 0; i < DRUN_MATCH_NUM_FIELDS; i++ ) {
matching_entry_fields[i].enabled = TRUE; matching_entry_fields[i].enabled_match = TRUE;
matching_entry_fields[i].enabled_display = TRUE;
} }
break; break;
} }
@ -1002,7 +1007,8 @@ static void drun_mode_parse_entry_fields ()
for ( unsigned int i = 0; i < DRUN_MATCH_NUM_FIELDS; i++ ) { for ( unsigned int i = 0; i < DRUN_MATCH_NUM_FIELDS; i++ ) {
const char * entry_name = matching_entry_fields[i].entry_field_name; const char * entry_name = matching_entry_fields[i].entry_field_name;
if ( g_ascii_strcasecmp ( token, entry_name ) == 0 ) { if ( g_ascii_strcasecmp ( token, entry_name ) == 0 ) {
matching_entry_fields[i].enabled = TRUE; matching_entry_fields[i].enabled_match = TRUE;
matching_entry_fields[i].enabled_display = TRUE;
matched = TRUE; matched = TRUE;
} }
} }
@ -1015,6 +1021,18 @@ static void drun_mode_parse_entry_fields ()
g_free ( switcher_str ); g_free ( switcher_str );
} }
static void drun_mode_parse_display_format() {
for (int i = 0; i < DRUN_MATCH_NUM_FIELDS; i++) {
if ( matching_entry_fields[i].enabled_display ) continue;
gchar* search_term = g_strdup_printf("{%s}",matching_entry_fields[i].entry_field_name);
if ( strstr( config.drun_display_format, search_term) ) {
matching_entry_fields[i].enabled_match = TRUE;
}
g_free( search_term );
}
}
static int drun_mode_init ( Mode *sw ) static int drun_mode_init ( Mode *sw )
{ {
if ( mode_get_private_data ( sw ) != NULL ) { if ( mode_get_private_data ( sw ) != NULL ) {
@ -1032,6 +1050,7 @@ static int drun_mode_init ( Mode *sw )
} }
drun_mode_parse_entry_fields (); drun_mode_parse_entry_fields ();
drun_mode_parse_display_format();
get_apps ( pd ); get_apps ( pd );
pd->completer = create_new_file_browser (); pd->completer = create_new_file_browser ();
@ -1302,24 +1321,24 @@ static int drun_token_match ( const Mode *data, rofi_int_matcher **tokens, unsig
int test = 0; int test = 0;
rofi_int_matcher *ftokens[2] = { tokens[j], NULL }; rofi_int_matcher *ftokens[2] = { tokens[j], NULL };
// Match name // Match name
if ( matching_entry_fields[DRUN_MATCH_FIELD_NAME].enabled ) { if ( matching_entry_fields[DRUN_MATCH_FIELD_NAME].enabled_match ) {
if ( rmpd->entry_list[index].name ) { if ( rmpd->entry_list[index].name ) {
test = helper_token_match ( ftokens, rmpd->entry_list[index].name ); test = helper_token_match ( ftokens, rmpd->entry_list[index].name );
} }
} }
if ( matching_entry_fields[DRUN_MATCH_FIELD_GENERIC].enabled ) { if ( matching_entry_fields[DRUN_MATCH_FIELD_GENERIC].enabled_match ) {
// Match generic name // Match generic name
if ( test == tokens[j]->invert && rmpd->entry_list[index].generic_name ) { if ( test == tokens[j]->invert && rmpd->entry_list[index].generic_name ) {
test = helper_token_match ( ftokens, rmpd->entry_list[index].generic_name ); test = helper_token_match ( ftokens, rmpd->entry_list[index].generic_name );
} }
} }
if ( matching_entry_fields[DRUN_MATCH_FIELD_EXEC].enabled ) { if ( matching_entry_fields[DRUN_MATCH_FIELD_EXEC].enabled_match ) {
// Match executable name. // Match executable name.
if ( test == tokens[j]->invert && rmpd->entry_list[index].exec ) { if ( test == tokens[j]->invert && rmpd->entry_list[index].exec ) {
test = helper_token_match ( ftokens, rmpd->entry_list[index].exec ); test = helper_token_match ( ftokens, rmpd->entry_list[index].exec );
} }
} }
if ( matching_entry_fields[DRUN_MATCH_FIELD_CATEGORIES].enabled ) { if ( matching_entry_fields[DRUN_MATCH_FIELD_CATEGORIES].enabled_match ) {
// Match against category. // Match against category.
if ( test == tokens[j]->invert ) { if ( test == tokens[j]->invert ) {
gchar **list = rmpd->entry_list[index].categories; gchar **list = rmpd->entry_list[index].categories;
@ -1328,7 +1347,7 @@ static int drun_token_match ( const Mode *data, rofi_int_matcher **tokens, unsig
} }
} }
} }
if ( matching_entry_fields[DRUN_MATCH_FIELD_KEYWORDS].enabled ) { if ( matching_entry_fields[DRUN_MATCH_FIELD_KEYWORDS].enabled_match ) {
// Match against category. // Match against category.
if ( test == tokens[j]->invert ) { if ( test == tokens[j]->invert ) {
gchar **list = rmpd->entry_list[index].keywords; gchar **list = rmpd->entry_list[index].keywords;
@ -1337,7 +1356,8 @@ static int drun_token_match ( const Mode *data, rofi_int_matcher **tokens, unsig
} }
} }
} }
if ( matching_entry_fields[DRUN_MATCH_FIELD_COMMENT].enabled ) { if ( matching_entry_fields[DRUN_MATCH_FIELD_COMMENT].enabled_match ) {
// Match executable name. // Match executable name.
if ( test == tokens[j]->invert && rmpd->entry_list[index].comment ) { if ( test == tokens[j]->invert && rmpd->entry_list[index].comment ) {
test = helper_token_match ( ftokens, rmpd->entry_list[index].comment ); test = helper_token_match ( ftokens, rmpd->entry_list[index].comment );

2
source/helper.c
View file

@ -1299,7 +1299,7 @@ char *helper_string_replace_if_exists_v ( char * string, GHashTable *h )
char *res = NULL; char *res = NULL;
// Replace hits within {-\w+}. // Replace hits within {-\w+}.
GRegex *reg = g_regex_new ( "\\[(.*)({[-\\w]+})(.*)\\]|({[\\w-]+})", 0, 0, &error ); GRegex *reg = g_regex_new ( "\\[(.*)({[-\\w]+})(.*)\\]|({[\\w-]+})", G_REGEX_UNGREEDY, 0, &error );
if ( error == NULL ) { if ( error == NULL ) {
res = g_regex_replace_eval ( reg, string, -1, 0, 0, helper_eval_cb2, h, &error ); res = g_regex_replace_eval ( reg, string, -1, 0, 0, helper_eval_cb2, h, &error );
} }