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

[View] Add support for user timeout + keybinding action

Configuration looks like:

```css
configuration {
  timeout {
      delay:  15;
      action: "kb-cancel";
  }
}
```

Both delay and action need to be set.
Action can be any of the keybindings as shown in `rofi -show keys`.

(-timeout-delay 15 -timeout-action "kb-cancel"  on commandline.).

Fixes: #1066
This commit is contained in:
Dave Davenport 2021-06-30 13:29:54 +02:00
parent 42dde494c1
commit c9701b2a91
4 changed files with 70 additions and 1 deletions

View file

@ -186,5 +186,11 @@ gboolean parse_keys_abe ( NkBindings *bindings );
*/ */
void setup_abe ( void ); void setup_abe ( void );
/**
* @param name Don't have the name.
*
* @returns id, or UINT32_MAX if not found.
*/
guint key_binding_get_action_from_name ( const char *name );
/**@}*/ /**@}*/
#endif // ROFI_KEYB_H #endif // ROFI_KEYB_H

View file

@ -147,6 +147,18 @@ static gboolean binding_trigger_action ( guint64 scope, G_GNUC_UNUSED gpointer t
return rofi_view_trigger_action ( rofi_view_get_active (), scope, GPOINTER_TO_UINT ( user_data ) ); return rofi_view_trigger_action ( rofi_view_get_active (), scope, GPOINTER_TO_UINT ( user_data ) );
} }
guint key_binding_get_action_from_name ( const char *name )
{
for ( gsize i = 0; i < G_N_ELEMENTS ( rofi_bindings ); ++i ) {
ActionBindingEntry *b = &rofi_bindings[i];
if ( g_strcmp0(b->name, name) == 0 ){
return b->id;
}
}
return UINT32_MAX;
}
gboolean parse_keys_abe ( NkBindings *bindings ) gboolean parse_keys_abe ( NkBindings *bindings )
{ {
GError *error = NULL; GError *error = NULL;

View file

@ -157,7 +157,7 @@ const char *mode_get_display_name ( const Mode *mode )
ThemeWidget *wid = rofi_config_find_widget ( mode->name, NULL, TRUE ); ThemeWidget *wid = rofi_config_find_widget ( mode->name, NULL, TRUE );
if ( wid ) { if ( wid ) {
/** Check string property */ /** Check string property */
Property *p = rofi_theme_find_property ( wid, P_STRING, "display-name", FALSE ); Property *p = rofi_theme_find_property ( wid, P_STRING, "display-name", TRUE );
if ( p != NULL && p->type == P_STRING ) { if ( p != NULL && p->type == P_STRING ) {
return p->value.s; return p->value.s;
} }

View file

@ -112,6 +112,8 @@ struct
workarea mon; workarea mon;
/** timeout for reloading */ /** timeout for reloading */
guint idle_timeout; guint idle_timeout;
/** timeout handling */
guint user_timeout;
/** debug counter for redraws */ /** debug counter for redraws */
unsigned long long count; unsigned long long count;
/** redraw idle time. */ /** redraw idle time. */
@ -129,6 +131,7 @@ struct
.flags = MENU_NORMAL, .flags = MENU_NORMAL,
.views = G_QUEUE_INIT, .views = G_QUEUE_INIT,
.idle_timeout = 0, .idle_timeout = 0,
.user_timeout = 0,
.count = 0L, .count = 0L,
.repaint_source = 0, .repaint_source = 0,
.fullscreen = FALSE, .fullscreen = FALSE,
@ -475,6 +478,48 @@ static gboolean rofi_view_reload_idle ( G_GNUC_UNUSED gpointer data )
CacheState.idle_timeout = 0; CacheState.idle_timeout = 0;
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
static gboolean rofi_view_user_timeout ( G_GNUC_UNUSED gpointer data )
{
CacheState.user_timeout = 0;
ThemeWidget *wid = rofi_config_find_widget ( "timeout", NULL, TRUE );
if ( wid ) {
/** Check string property */
Property *p = rofi_theme_find_property ( wid, P_STRING, "action", TRUE);
if ( p != NULL && p->type == P_STRING ) {
const char *action = p->value.s;
guint id = key_binding_get_action_from_name(action);
if ( id != UINT32_MAX )
{
rofi_view_trigger_action ( rofi_view_get_active (), SCOPE_GLOBAL, id);
} else {
g_warning("Failed to parse keybinding: %s\r\n", action);
}
}
}
return G_SOURCE_REMOVE;
}
static void rofi_view_set_user_timeout ( G_GNUC_UNUSED gpointer data )
{
if ( CacheState.user_timeout > 0 ) {
g_source_remove ( CacheState.user_timeout );
CacheState.user_timeout = 0;
}
{
/** Find the widget */
ThemeWidget *wid = rofi_config_find_widget ( "timeout", NULL, TRUE );
if ( wid ) {
/** Check string property */
Property *p = rofi_theme_find_property ( wid, P_INTEGER, "delay", TRUE);
if ( p != NULL && p->type == P_INTEGER) {
int delay = p->value.i;
CacheState.user_timeout = g_timeout_add ( delay*1000 , rofi_view_user_timeout, NULL );
}
}
}
}
void rofi_view_reload ( void ) void rofi_view_reload ( void )
{ {
@ -1996,6 +2041,8 @@ RofiViewState *rofi_view_create ( Mode *sw,
rofi_view_ping_mouse ( state ); rofi_view_ping_mouse ( state );
xcb_flush ( xcb->connection ); xcb_flush ( xcb->connection );
rofi_view_set_user_timeout ( NULL );
/* When Override Redirect, the WM will not let us know we can take focus, so just steal it */ /* When Override Redirect, the WM will not let us know we can take focus, so just steal it */
if ( ( ( menu_flags & MENU_NORMAL_WINDOW ) == 0 ) ) { if ( ( ( menu_flags & MENU_NORMAL_WINDOW ) == 0 ) ) {
rofi_xcb_set_input_focus ( CacheState.main_window ); rofi_xcb_set_input_focus ( CacheState.main_window );
@ -2066,6 +2113,10 @@ void rofi_view_cleanup ()
g_source_remove ( CacheState.idle_timeout ); g_source_remove ( CacheState.idle_timeout );
CacheState.idle_timeout = 0; CacheState.idle_timeout = 0;
} }
if ( CacheState.user_timeout > 0 ) {
g_source_remove ( CacheState.user_timeout );
CacheState.user_timeout = 0;
}
if ( CacheState.repaint_source > 0 ) { if ( CacheState.repaint_source > 0 ) {
g_source_remove ( CacheState.repaint_source ); g_source_remove ( CacheState.repaint_source );
CacheState.repaint_source = 0; CacheState.repaint_source = 0;