jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

screenlock - Implement StateSuspendPending so exiting CRUST requires 3 clicks

Browse source 
If you don't triple click after exiting deep sleep after 10s, use select() with
timeout to kick back into deep sleep.
This commit is contained in:
Miles Alan 2020-07-09 20:09:46 -05:00
parent 0013ea3d73
commit b51644baca
1 changed files with 52 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

83
programs/sxmo_screenlock.c
View file

@ -8,10 +8,11 @@
#include <X11/Xlib.h>
enum State {
StateNoInput,
StateNoInputNoScreen,
StateSuspend,
StateDead
StateNoInput, // Screen on / input lock
StateNoInputNoScreen, // Screen off / input lock
StateSuspend, // Deep sleep
StateSuspendPending, // Suspend 'woken up', must leave state in <10s, or kicks to StateSuspend
StateDead // Exit the appliation
};
enum Color {
@ -67,12 +68,12 @@ syncstate()
setpineled(Red);
configuresuspendsettingsandwakeupsources();
writefile(powerstatefile, "mem");
state = StateNoInput;
state = StateSuspendPending;
syncstate();
} else if (state == StateNoInput) {
setpineled(Blue);
writefile(brightnessfile, oldbrightness);
} else if (state == StateNoInputNoScreen) {
} else if (state == StateNoInputNoScreen || state == StateSuspendPending) {
setpineled(Purple);
writefile(brightnessfile, "0");
} else if (state == StateDead) {
@ -123,35 +124,55 @@ readinputloop(Display *dpy, int screen) {
KeySym keysym;
XEvent ev;
char buf[32];
fd_set fdset;
int xfd;
int selectresult;
struct timeval xeventtimeout = {10, 0};
xfd = ConnectionNumber(dpy);
while (state != StateDead && !XNextEvent(dpy, &ev)) {
if (ev.type == KeyPress) {
XLookupString(&ev.xkey, buf, sizeof(buf), &keysym, 0);
if (lastkeysym == keysym) {
lastkeyn++;
} else {
lastkeysym = keysym;
lastkeyn = 1;
}
if (lastkeyn < 3)
continue;
lastkeyn = 0;
lastkeysym = NULL;
switch (keysym) {
case XF86XK_AudioRaiseVolume:
state = StateSuspend;
break;
case XF86XK_AudioLowerVolume:
state = (state == StateNoInput ? StateNoInputNoScreen : StateNoInput);
break;
case XF86XK_PowerOff:
state = StateDead;
break;
for (;;) {
FD_ZERO(&fdset);
FD_SET(xfd, &fdset);
if (state == StateSuspendPending)
selectresult = select(FD_SETSIZE, &fdset, NULL, NULL, &xeventtimeout);
else
selectresult = select(FD_SETSIZE, &fdset, NULL, NULL, NULL);
if (FD_ISSET(xfd, &fdset) && XPending(dpy)) {
XNextEvent(dpy, &ev);
if (ev.type == KeyPress) {
XLookupString(&ev.xkey, buf, sizeof(buf), &keysym, 0);
if (lastkeysym == keysym) {
lastkeyn++;
} else {
lastkeysym = keysym;
lastkeyn = 1;
}
if (lastkeyn < 3)
continue;
lastkeyn = 0;
lastkeysym = NULL;
switch (keysym) {
case XF86XK_AudioRaiseVolume:
state = StateSuspend;
break;
case XF86XK_AudioLowerVolume:
state = (state == StateNoInput ? StateNoInputNoScreen : StateNoInput);
break;
case XF86XK_PowerOff:
state = StateDead;
break;
}
syncstate();
}
} else if (state == StateSuspendPending) {
state = StateSuspend;
syncstate();
}
if (state == StateDead) break;
}
}