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

[EntryHistory] Disable entry history when dmenu password is set.

Browse source
This commit is contained in:
Dave Davenport 2023-01-23 16:17:36 +01:00
parent c84f7f3bad
commit 48e5478ceb
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
source/view.c
View file

@ -155,6 +155,7 @@ struct {
/** Cursor type */ /** Cursor type */
X11CursorType cursor_type; X11CursorType cursor_type;
/** Entry box */ /** Entry box */
gboolean entry_history_enable;
EntryHistoryIndex *entry_history; EntryHistoryIndex *entry_history;
gssize entry_history_length; gssize entry_history_length;
gssize entry_history_index; gssize entry_history_index;
@ -175,6 +176,7 @@ struct {
.count = 0L, .count = 0L,
.repaint_source = 0, .repaint_source = 0,
.fullscreen = FALSE, .fullscreen = FALSE,
.entry_history_enable = TRUE,
.entry_history = NULL, .entry_history = NULL,
.entry_history_length = 0, .entry_history_length = 0,
.entry_history_index = 0 .entry_history_index = 0
@ -900,6 +902,9 @@ static void open_xim_callback(xcb_xim_t *im, G_GNUC_UNUSED void *user_data) {
static void input_history_initialize ( void ) static void input_history_initialize ( void )
{ {
if ( CacheState.entry_history_enable == FALSE ) {
return;
}
CacheState.entry_history = NULL; CacheState.entry_history = NULL;
CacheState.entry_history_index = 0; CacheState.entry_history_index = 0;
CacheState.entry_history_length = 0; CacheState.entry_history_length = 0;
@ -937,6 +942,9 @@ static void input_history_initialize ( void )
} }
static void input_history_save ( void ) static void input_history_save ( void )
{ {
if ( CacheState.entry_history_enable == FALSE ) {
return;
}
if ( CacheState.entry_history_length > 0 ){ if ( CacheState.entry_history_length > 0 ){
// History max. // History max.
int max_history = 20; int max_history = 20;
@ -961,9 +969,20 @@ static void input_history_save ( void )
} }
g_free(path); g_free(path);
} }
// Cleanups.
if ( CacheState.entry_history != NULL ) {
g_free(CacheState.entry_history);
CacheState.entry_history = NULL;
CacheState.entry_history_length = 0;
CacheState.entry_history_index = 0;
}
} }
void __create_window(MenuFlags menu_flags) { void __create_window(MenuFlags menu_flags) {
// In password mode, disable the entry history.
if ( (menu_flags|MENU_PASSWORD) == MENU_PASSWORD ) {
CacheState.entry_history_enable = FALSE;
}
input_history_initialize(); input_history_initialize();
uint32_t selmask = XCB_CW_BACK_PIXMAP | XCB_CW_BORDER_PIXEL | uint32_t selmask = XCB_CW_BACK_PIXMAP | XCB_CW_BORDER_PIXEL |
@ -1560,7 +1579,7 @@ static void rofi_view_input_changed() {
rofi_view_take_action("inputchange"); rofi_view_take_action("inputchange");
RofiViewState * state = current_active_menu; RofiViewState * state = current_active_menu;
if ( state ) { if ( CacheState.entry_history_enable && state ) {
if ( CacheState.entry_history[CacheState.entry_history_index].string != NULL) { if ( CacheState.entry_history[CacheState.entry_history_index].string != NULL) {
g_free(CacheState.entry_history[CacheState.entry_history_index].string); g_free(CacheState.entry_history[CacheState.entry_history_index].string);
} }
@ -1823,7 +1842,7 @@ static void rofi_view_trigger_global_action(KeyBindingAction action) {
break; break;
} }
case ENTRY_HISTORY_DOWN: { case ENTRY_HISTORY_DOWN: {
if ( state->text ) { if ( CacheState.entry_history_enable && state->text ) {
CacheState.entry_history[CacheState.entry_history_index].index = textbox_get_cursor(state->text); CacheState.entry_history[CacheState.entry_history_index].index = textbox_get_cursor(state->text);
if ( CacheState.entry_history_index > 0 ) { if ( CacheState.entry_history_index > 0 ) {
CacheState.entry_history_index--; CacheState.entry_history_index--;
@ -1837,7 +1856,7 @@ static void rofi_view_trigger_global_action(KeyBindingAction action) {
break; break;
} }
case ENTRY_HISTORY_UP: { case ENTRY_HISTORY_UP: {
if ( state->text ) { if ( CacheState.entry_history_enable && state->text ) {
if ( CacheState.entry_history[CacheState.entry_history_index].string != NULL) { if ( CacheState.entry_history[CacheState.entry_history_index].string != NULL) {
g_free(CacheState.entry_history[CacheState.entry_history_index].string); g_free(CacheState.entry_history[CacheState.entry_history_index].string);
} }