*fix* ignore SIGCHLD in way that BSD and linux support

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 8052aecc3bce02837e9ad74e0c330521284f67fa..4f5c67372f18132a3f27b4f7c51e33001176888b 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -91,11 +91,12 @@ void init (int argc, char *argv[])
        // Set signal handler
        signal_pending = 0;
        struct sigaction sa = { .sa_handler = signal_handler };
+       struct sigaction sa_chld = { .sa_handler = SIG_DFL, .sa_flags = SA_NOCLDWAIT };
        sigaction(SIGUSR1, &sa, 0);
        sigaction(SIGINT, &sa, 0);
        sigaction(SIGTERM, &sa, 0);
        sigaction(SIGHUP, &sa, 0);
-//     signal(SIGCHLD, SIG_IGN);               // don't have to wait() after fork()
+       sigaction(SIGCHLD, &sa_chld, 0);
 
        // BSD does not support pselect(), therefore we have to use select and hope that we do not
        // end up in a race condition there (see 'man select()' on a linux machine for more information)
@@ -708,6 +709,7 @@ int main (int argc, char *argv[])
        Panel *panel;
        GSList *it;
        struct timeval* timeout;
+       int hidden_dnd = 0;
 
 start:
        init (argc, argv);
@@ -791,11 +793,17 @@ start:
                                        else if (e.type == LeaveNotify)
                                                autohide_trigger_hide(panel);
                                        if (panel->is_hidden) {
-                                               if (e.type == ClientMessage && e.xclient.message_type == server.atom.XdndPosition)
+                                               if (e.type == ClientMessage && e.xclient.message_type == server.atom.XdndPosition) {
+                                                       hidden_dnd = 1;
                                                        autohide_show(panel);
+                                               }
                                                else
                                                        continue;   // discard further processing of this event because the panel is not visible yet
                                        }
+                                       else if (hidden_dnd && e.type == ClientMessage && e.xclient.message_type == server.atom.XdndLeave) {
+                                               hidden_dnd = 0;
+                                               autohide_hide(panel);
+                                       }
                                }
 
                                switch (e.type) {