seat: remove "manual input" logic

This really doesn't make sense. We no longer want the applications to be
in charge of VT switches so always force the VT-master to be in control of
the VT-switching logic.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-11-19 16:07:34 +01:00
parent 890e34556b
commit 7b83d77463
2 changed files with 2 additions and 14 deletions

View File

@ -53,7 +53,6 @@ struct kmscon_session {
bool enabled;
bool foreground;
bool manual_input;
bool deactivating;
struct ev_timer *timer;
@ -542,15 +541,13 @@ static void seat_input_event(struct uterm_input *input,
if (conf_grab_matches(seat->conf->grab_session_next,
ev->mods, ev->num_syms, ev->keysyms)) {
ev->handled = true;
if (!seat->current_sess || !seat->current_sess->manual_input)
seat_next(seat);
seat_next(seat);
return;
}
if (conf_grab_matches(seat->conf->grab_session_prev,
ev->mods, ev->num_syms, ev->keysyms)) {
ev->handled = true;
if (!seat->current_sess || !seat->current_sess->manual_input)
seat_prev(seat);
seat_prev(seat);
return;
}
if (conf_grab_matches(seat->conf->grab_session_close,
@ -997,14 +994,6 @@ int kmscon_session_set_background(struct kmscon_session *sess)
return 0;
}
void kmscon_session_set_manual_input(struct kmscon_session *sess, bool set)
{
if (!sess)
return;
sess->manual_input = set;
}
void kmscon_session_enable(struct kmscon_session *sess)
{
if (!sess || sess->enabled)

View File

@ -103,7 +103,6 @@ bool kmscon_session_is_registered(struct kmscon_session *sess);
bool kmscon_session_is_active(struct kmscon_session *sess);
int kmscon_session_set_foreground(struct kmscon_session *sess);
int kmscon_session_set_background(struct kmscon_session *sess);
void kmscon_session_set_manual_input(struct kmscon_session *sess, bool set);
void kmscon_session_enable(struct kmscon_session *sess);
void kmscon_session_disable(struct kmscon_session *sess);