1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-25 13:55:34 -05:00

[Combi] Add hide prefix option.

This commit is contained in:
Dave Davenport 2017-11-07 20:03:42 +01:00
parent 23c04e34fe
commit 4ac428bace
5 changed files with 12 additions and 3 deletions

View file

@ -146,4 +146,5 @@ Settings config = {
.color_window = NULL, .color_window = NULL,
.plugin_path = PLUGIN_PATH, .plugin_path = PLUGIN_PATH,
.max_history_size = 25, .max_history_size = 25,
.combi_hide_mode_prefix = FALSE,
}; };

View file

@ -112,6 +112,8 @@ rofi.scroll-method: 0
! rofi.color-window: ! rofi.color-window:
! "Max history size (WARNING: can cause slowdowns when set to high)." Set from: Default ! "Max history size (WARNING: can cause slowdowns when set to high)." Set from: Default
! rofi.max-history-size: 25 ! rofi.max-history-size: 25
! "Hide the prefix mode prefix on the combi view." Set from: Default
! rofi.combi-hide-mode-prefix: false
! "Pidfile location" Set from: File ! "Pidfile location" Set from: File
rofi.pid: /tmp/rofi.pid rofi.pid: /tmp/rofi.pid
! "Paste primary selection" Set from: File ! "Paste primary selection" Set from: File

View file

@ -164,6 +164,7 @@ typedef struct
/** Maximum history length per mode. */ /** Maximum history length per mode. */
unsigned int max_history_size; unsigned int max_history_size;
gboolean combi_hide_mode_prefix;
} Settings; } Settings;
/** Global Settings structure. */ /** Global Settings structure. */
extern Settings config; extern Settings config;

View file

@ -214,10 +214,13 @@ static char * combi_mgrv ( const Mode *sw, unsigned int selected_line, int *stat
} }
for ( unsigned i = 0; i < pd->num_switchers; i++ ) { for ( unsigned i = 0; i < pd->num_switchers; i++ ) {
if ( selected_line >= pd->starts[i] && selected_line < ( pd->starts[i] + pd->lengths[i] ) ) { if ( selected_line >= pd->starts[i] && selected_line < ( pd->starts[i] + pd->lengths[i] ) ) {
char * str = mode_get_display_value ( pd->switchers[i].mode, selected_line - pd->starts[i], state, attr_list, TRUE ); char * retv;
char * str = retv = mode_get_display_value ( pd->switchers[i].mode, selected_line - pd->starts[i], state, attr_list, TRUE );
const char *dname = mode_get_display_name ( pd->switchers[i].mode ); const char *dname = mode_get_display_name ( pd->switchers[i].mode );
char * retv = g_strdup_printf ( "%s %s", dname, str ); if ( !config.combi_hide_mode_prefix ) {
g_free ( str ); retv = g_strdup_printf ( "%s %s", dname, str );
g_free ( str );
}
if ( attr_list != NULL ) { if ( attr_list != NULL ) {
ThemeWidget *wid = rofi_theme_find_widget ( sw->name, NULL, TRUE ); ThemeWidget *wid = rofi_theme_find_widget ( sw->name, NULL, TRUE );

View file

@ -208,6 +208,8 @@ static XrmOption xrmOptions[] = {
"Color scheme window", CONFIG_DEFAULT }, "Color scheme window", CONFIG_DEFAULT },
{ xrm_Number, "max-history-size", { .num = &config.max_history_size }, NULL, { xrm_Number, "max-history-size", { .num = &config.max_history_size }, NULL,
"Max history size (WARNING: can cause slowdowns when set to high).", CONFIG_DEFAULT }, "Max history size (WARNING: can cause slowdowns when set to high).", CONFIG_DEFAULT },
{ xrm_Boolean, "combi-hide-mode-prefix", { .snum = &config.combi_hide_mode_prefix }, NULL,
"Hide the prefix mode prefix on the combi view.", CONFIG_DEFAULT },
}; };
/** Dynamic array of extra options */ /** Dynamic array of extra options */