X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-seat.h;h=d7096a5e32d6426b8223d020710861b8b1fa2736;hp=0547dec0723d6c4d2978976b01ce82018326fae1;hb=d422cfe2a7a8253eb28e9b2c7e6192307f96383e;hpb=cc3773810855956bad92337cee8fa193584ab62e diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h index 0547dec07..d7096a5e3 100644 --- a/src/login/logind-seat.h +++ b/src/login/logind-seat.h @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - #pragma once /*** @@ -24,9 +22,6 @@ typedef struct Seat Seat; #include "list.h" -#include "util.h" -#include "logind.h" -#include "logind-device.h" #include "logind-session.h" struct Seat { @@ -41,6 +36,9 @@ struct Seat { Session *pending_switch; LIST_HEAD(Session, sessions); + Session **positions; + size_t position_count; + bool in_gc_queue:1; bool started:1; @@ -55,12 +53,19 @@ int seat_load(Seat *s); int seat_apply_acls(Seat *s, Session *old_active); int seat_set_active(Seat *s, Session *session); -int seat_active_vt_changed(Seat *s, int vtnr); +int seat_switch_to(Seat *s, unsigned int num); +int seat_switch_to_next(Seat *s); +int seat_switch_to_previous(Seat *s); +int seat_active_vt_changed(Seat *s, unsigned int vtnr); int seat_read_active_vt(Seat *s); +#if 0 /// UNNEEDED by elogind int seat_preallocate_vts(Seat *s); +#endif // 0 int seat_attach_session(Seat *s, Session *session); void seat_complete_switch(Seat *s); +void seat_evict_position(Seat *s, Session *session); +void seat_claim_position(Seat *s, Session *session, unsigned int pos); bool seat_has_vts(Seat *s); bool seat_is_seat0(Seat *s); @@ -72,8 +77,8 @@ bool seat_can_graphical(Seat *s); int seat_get_idle_hint(Seat *s, dual_timestamp *t); int seat_start(Seat *s); -int seat_stop(Seat *s); -int seat_stop_sessions(Seat *s); +int seat_stop(Seat *s, bool force); +int seat_stop_sessions(Seat *s, bool force); bool seat_check_gc(Seat *s, bool drop_not_started); void seat_add_to_gc_queue(Seat *s); @@ -82,9 +87,11 @@ bool seat_name_is_valid(const char *name); extern const sd_bus_vtable seat_vtable[]; -int seat_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata); -int seat_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *seatdata); +int seat_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error); +int seat_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error); char *seat_bus_path(Seat *s); int seat_send_signal(Seat *s, bool new_seat); int seat_send_changed(Seat *s, const char *properties, ...) _sentinel_; + +int bus_seat_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error);