norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

seat: rename WAKE_UP/SLEEP to ACTIVATE/DEACTIVATE

Browse Source 
We use this naming-scheme for all the session-helpers so we should also
use it for the callback notifications.
Also rename all the callback-helpers to *_call_* so we have no
name-clashes.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-10-12 15:46:30 +02:00
parent a737fcd92d
commit b86f5d215d
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/kmscon_seat.c
View File

@ -86,24 +86,24 @@ static void session_call(struct kmscon_session *sess, unsigned int event,
sess->cb(sess, event, disp, sess->data);
}
static void session_wake_up(struct kmscon_session *sess)
static void session_call_activate(struct kmscon_session *sess)
{
session_call(sess, KMSCON_SESSION_WAKE_UP, NULL);
session_call(sess, KMSCON_SESSION_ACTIVATE, NULL);
}
static void session_sleep(struct kmscon_session *sess)
static void session_call_deactivate(struct kmscon_session *sess)
{
session_call(sess, KMSCON_SESSION_SLEEP, NULL);
session_call(sess, KMSCON_SESSION_DEACTIVATE, NULL);
}
static void session_display_new(struct kmscon_session *sess,
struct uterm_display *disp)
static void session_call_display_new(struct kmscon_session *sess,
struct uterm_display *disp)
{
session_call(sess, KMSCON_SESSION_DISPLAY_NEW, disp);
}
static void session_display_gone(struct kmscon_session *sess,
struct uterm_display *disp)
static void session_call_display_gone(struct kmscon_session *sess,
struct uterm_display *disp)
{
session_call(sess, KMSCON_SESSION_DISPLAY_GONE, disp);
}
@ -117,13 +117,13 @@ static void session_activate(struct kmscon_session *sess)
if (seat->cur_sess) {
if (seat->awake)
session_sleep(seat->cur_sess);
session_call_deactivate(seat->cur_sess);
seat->cur_sess = NULL;
}
seat->cur_sess = sess;
if (seat->awake)
session_wake_up(sess);
session_call_activate(sess);
}
static void session_deactivate(struct kmscon_session *sess)
@ -134,7 +134,7 @@ static void session_deactivate(struct kmscon_session *sess)
return;
if (seat->awake)
session_sleep(sess);
session_call_deactivate(sess);
if (shl_dlist_empty(&seat->sessions)) {
seat->cur_sess = NULL;
@ -143,7 +143,7 @@ static void session_deactivate(struct kmscon_session *sess)
struct kmscon_session,
list);
if (seat->awake)
session_wake_up(seat->cur_sess);
session_call_activate(seat->cur_sess);
}
}
@ -166,7 +166,7 @@ static void activate_display(struct kmscon_display *d)
shl_dlist_for_each_safe(iter, tmp, &seat->sessions) {
s = shl_dlist_entry(iter, struct kmscon_session, list);
session_display_new(s, d->disp);
session_call_display_new(s, d->disp);
}
ret = uterm_display_set_dpms(d->disp, UTERM_DPMS_ON);
@ -209,7 +209,7 @@ static void seat_remove_display(struct kmscon_seat *seat,
if (d->activated) {
shl_dlist_for_each_safe(iter, tmp, &seat->sessions) {
s = shl_dlist_entry(iter, struct kmscon_session, list);
session_display_gone(s, d->disp);
session_call_display_gone(s, d->disp);
}
}
@ -237,11 +237,11 @@ static int seat_vt_event(struct uterm_vt *vt, unsigned int event, void *data)
}
if (seat->cur_sess)
session_wake_up(seat->cur_sess);
session_call_activate(seat->cur_sess);
break;
case UTERM_VT_DEACTIVATE:
if (seat->cur_sess)
session_sleep(seat->cur_sess);
session_call_deactivate(seat->cur_sess);
uterm_input_sleep(seat->input);

4
src/kmscon_seat.h
View File

@ -52,8 +52,8 @@ typedef void (*kmscon_seat_cb_t) (struct kmscon_seat *seat,
enum kmscon_session_event {
KMSCON_SESSION_DISPLAY_NEW,
KMSCON_SESSION_DISPLAY_GONE,
KMSCON_SESSION_WAKE_UP,
KMSCON_SESSION_SLEEP,
KMSCON_SESSION_ACTIVATE,
KMSCON_SESSION_DEACTIVATE,
KMSCON_SESSION_UNREGISTER,
};

4
src/kmscon_terminal.c
View File

@ -435,13 +435,13 @@ static void session_event(struct kmscon_session *session, unsigned int event,
case KMSCON_SESSION_DISPLAY_GONE:
rm_display(term, disp);
break;
case KMSCON_SESSION_WAKE_UP:
case KMSCON_SESSION_ACTIVATE:
term->awake = true;
if (!term->opened)
terminal_open(term);
schedule_redraw(term);
break;
case KMSCON_SESSION_SLEEP:
case KMSCON_SESSION_DEACTIVATE:
term->awake = false;
break;
case KMSCON_SESSION_UNREGISTER: