diff options
| author | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
| commit | 813ac136e48f60d4c2b13e808107870dafcc4d52 (patch) | |
| tree | 396a6c98276f6e9a04216933daebdf3af7b81d46 /driver/xscreensaver.h | |
| parent | Flush X events before locking if we have an external ungrab command (diff) | |
| parent | Update to 5.43 (diff) | |
| download | xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.gz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.xz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.zip | |
Merge branch 'master' into openslx (5.43)
Diffstat (limited to 'driver/xscreensaver.h')
| -rw-r--r-- | driver/xscreensaver.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h index 2a3ae02..fe84d20 100644 --- a/driver/xscreensaver.h +++ b/driver/xscreensaver.h @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1993-2017 Jamie Zawinski <jwz@jwz.org> +/* xscreensaver, Copyright (c) 1993-2019 Jamie Zawinski <jwz@jwz.org> * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -158,8 +158,11 @@ extern void hack_subproc_environment (Screen *, Window saver_window); extern void init_sigchld (void); extern void spawn_screenhack (saver_screen_info *ssi); extern pid_t fork_and_exec (saver_screen_info *ssi, const char *command); +extern pid_t fork_and_exec_1 (saver_info *si, saver_screen_info *ssi, + const char *command); extern int exec_and_wait (saver_info *si, const char *command); extern void kill_screenhack (saver_screen_info *ssi); +int kill_job (saver_info *si, pid_t pid, int signal); extern void suspend_screenhack (saver_screen_info *ssi, Bool suspend_p); extern Bool screenhack_running_p (saver_info *si); extern void emergency_kill_subproc (saver_info *si); |