Removed the saved_touchpad_off variable in syndaemon. It's

more robust to just not disable the touchpad if it already is
disabled.
This commit is contained in:
Peter Osterlund
2004-01-25 23:02:27 +01:00
parent 995df72ef0
commit f894659659

View File

@@ -12,7 +12,6 @@
static SynapticsSHM *synshm;
static int pad_disabled;
static Bool saved_touchpad_off;
static void usage()
@@ -26,7 +25,7 @@ static void usage()
static void signal_handler(int signum)
{
if (pad_disabled) {
synshm->touchpad_off = saved_touchpad_off;
synshm->touchpad_off = 0;
pad_disabled = 0;
}
kill(getpid(), signum);
@@ -121,15 +120,14 @@ static void main_loop(Display *display, double idle_time)
if (current_time > last_activity + idle_time) { /* Enable touchpad */
if (pad_disabled) {
printf("Enable\n");
synshm->touchpad_off = saved_touchpad_off;
synshm->touchpad_off = 0;
pad_disabled = 0;
}
} else { /* Disable touchpad */
if (!pad_disabled) {
if (!pad_disabled && !synshm->touchpad_off) {
printf("Disable\n");
saved_touchpad_off = synshm->touchpad_off;
synshm->touchpad_off = 1;
pad_disabled = 1;
synshm->touchpad_off = 1;
}
}