static void set_curpos(KeyBindingTree *newpos)
{
- if (curpos != newpos) {
- grab_keys(FALSE);
- curpos = newpos;
- grab_keys(TRUE);
- }
+ if (curpos == newpos) return;
+
+ grab_keys(FALSE);
+ curpos = newpos;
+ grab_keys(TRUE);
if (curpos != NULL) {
gchar *text = NULL;
/* ungrab first so they won't be NotifyWhileGrabbed */
if (ungrab)
- grab_keyboard(FALSE);
+ ungrab_keyboard();
/* set this before running the actions so they know the keyboard is not
grabbed */
g_assert(action->data.any.interactive);
if (!istate.active) {
- if (!grab_keyboard(TRUE))
+ if (!grab_keyboard())
return FALSE;
} else if (action->func != istate.action->func) {
keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE);