chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: minor clean-ups
[elogind.git]
/
src
/
login
/
logind-inhibit.h
diff --git
a/src/login/logind-inhibit.h
b/src/login/logind-inhibit.h
index 0670a7f8cd5c2f1d16fb4e27d51fff9fa60b751a..1b77fc1e9ef9f8d02756d43643199ba8c240b1be 100644
(file)
--- a/
src/login/logind-inhibit.h
+++ b/
src/login/logind-inhibit.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foologindinhibithfoo
-#define foologindinhibithfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-24,22
+23,33
@@
typedef struct Inhibitor Inhibitor;
typedef struct Inhibitor Inhibitor;
-#include "list.h"
-#include "util.h"
-#include "logind.h"
-#include "logind-seat.h"
typedef enum InhibitWhat {
INHIBIT_SHUTDOWN = 1,
typedef enum InhibitWhat {
INHIBIT_SHUTDOWN = 1,
- INHIBIT_S
USPEND
= 2,
+ INHIBIT_S
LEEP
= 2,
INHIBIT_IDLE = 4,
INHIBIT_IDLE = 4,
- _INHIBIT_WHAT_MAX = 8,
+ INHIBIT_HANDLE_POWER_KEY = 8,
+ INHIBIT_HANDLE_SUSPEND_KEY = 16,
+ INHIBIT_HANDLE_HIBERNATE_KEY = 32,
+ INHIBIT_HANDLE_LID_SWITCH = 64,
+ _INHIBIT_WHAT_MAX = 128,
_INHIBIT_WHAT_INVALID = -1
} InhibitWhat;
_INHIBIT_WHAT_INVALID = -1
} InhibitWhat;
+typedef enum InhibitMode {
+ INHIBIT_BLOCK,
+ INHIBIT_DELAY,
+ _INHIBIT_MODE_MAX,
+ _INHIBIT_MODE_INVALID = -1
+} InhibitMode;
+
+#include "logind.h"
+
struct Inhibitor {
Manager *manager;
struct Inhibitor {
Manager *manager;
+ sd_event_source *event_source;
+
char *id;
char *state_file;
char *id;
char *state_file;
@@
-48,10
+58,13
@@
struct Inhibitor {
InhibitWhat what;
char *who;
char *why;
InhibitWhat what;
char *who;
char *why;
+ InhibitMode mode;
pid_t pid;
uid_t uid;
pid_t pid;
uid_t uid;
+ dual_timestamp since;
+
char *fifo_path;
int fifo_fd;
};
char *fifo_path;
int fifo_fd;
};
@@
-68,9
+81,11
@@
int inhibitor_stop(Inhibitor *i);
int inhibitor_create_fifo(Inhibitor *i);
void inhibitor_remove_fifo(Inhibitor *i);
int inhibitor_create_fifo(Inhibitor *i);
void inhibitor_remove_fifo(Inhibitor *i);
-InhibitWhat manager_inhibit_what(Manager *m);
+InhibitWhat manager_inhibit_what(Manager *m, InhibitMode mm);
+bool manager_is_inhibited(Manager *m, InhibitWhat w, InhibitMode mm, dual_timestamp *since, bool ignore_inactive, bool ignore_uid, uid_t uid, Inhibitor **offending);
const char *inhibit_what_to_string(InhibitWhat k);
InhibitWhat inhibit_what_from_string(const char *s);
const char *inhibit_what_to_string(InhibitWhat k);
InhibitWhat inhibit_what_from_string(const char *s);
-#endif
+const char *inhibit_mode_to_string(InhibitMode k);
+InhibitMode inhibit_mode_from_string(const char *s);