diff options
Diffstat (limited to 'lib/Phi/Widgets/Systray.hs')
| -rw-r--r-- | lib/Phi/Widgets/Systray.hs | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/lib/Phi/Widgets/Systray.hs b/lib/Phi/Widgets/Systray.hs index 2aef713..c419426 100644 --- a/lib/Phi/Widgets/Systray.hs +++ b/lib/Phi/Widgets/Systray.hs @@ -49,11 +49,11 @@ data SystrayMessage = AddIcon !Window !Window | RemoveIcon !Window | RenderIcon instance Widget Systray SystrayState (RenderCache Systray SystrayState) where - initWidget (Systray) phi dispvar = do + initWidget (Systray) phi dispvar screens = do phi' <- dupPhi phi - forkIO $ systrayRunner phi' dispvar + forkIO $ systrayRunner phi' dispvar $ snd . head $ screens - return $ SystrayState phi (head . getScreens $ dispvar) 0 [] + return $ SystrayState phi (fst . head $ screens) 0 [] initCache _ = createRenderCache $ \Systray (SystrayState phi systrayScreen reset icons) x y w h screen -> do when (screen == systrayScreen) $ do @@ -77,12 +77,14 @@ instance Widget Systray SystrayState (RenderCache Systray SystrayState) where Just (AddIcon midParent window) -> SystrayState phi screen reset ((SystrayIconState midParent window):icons) Just (RemoveIcon window) -> SystrayState phi screen reset $ filter (\(SystrayIconState _ stateWindow) -> stateWindow /= window) icons _ -> case (fromMessage m) of - Just ResetBackground -> SystrayState phi screen (reset+1) icons - _ -> priv + Just (UpdateScreens screens) -> SystrayState phi (fst . head $ screens) reset icons + _ -> case (fromMessage m) of + Just ResetBackground -> SystrayState phi screen (reset+1) icons + _ -> priv -systrayRunner :: Phi -> Display -> IO () -systrayRunner phi dispvar = do +systrayRunner :: Phi -> Display -> Window -> IO () +systrayRunner phi dispvar panelWindow = do let atoms = getAtoms dispvar initSuccess <- withDisplay dispvar $ flip initSystray atoms @@ -94,7 +96,7 @@ systrayRunner phi dispvar = do m <- receiveMessage phi case (fromMessage m) of Just event -> - handleEvent event phi dispvar xembedWindow + handleEvent event phi dispvar panelWindow xembedWindow _ -> case (fromMessage m) of Just (RenderIcon midParent window x y w h) -> do @@ -188,16 +190,15 @@ sYSTEM_TRAY_CANCEL_MESSAGE = 2 xEMBED_EMBEDDED_NOTIFY :: CInt xEMBED_EMBEDDED_NOTIFY = 0 -handleEvent :: Event -> Phi -> Display -> Window -> StateT (M.Map Window Window) IO () -handleEvent message@ClientMessageEvent { ev_message_type = message_type, ev_data = messageData, ev_window = window } phi dispvar xembedWindow = do +handleEvent :: Event -> Phi -> Display -> Window -> Window -> StateT (M.Map Window Window) IO () +handleEvent message@ClientMessageEvent { ev_message_type = message_type, ev_data = messageData, ev_window = window } phi dispvar panelWindow xembedWindow = do let atoms = getAtoms dispvar - screenWindows = getScreenWindows dispvar when (window == xembedWindow && message_type == atom_NET_SYSTEM_TRAY_OPCODE atoms) $ do case messageData of _:opcode:iconID:_ -> do case True of _ | opcode == sYSTEM_TRAY_REQUEST_DOCK -> do - when (iconID /= 0) $ withDisplay dispvar $ \disp -> addIcon phi disp (getAtoms dispvar) (snd . head $ screenWindows) $ fromIntegral iconID + when (iconID /= 0) $ withDisplay dispvar $ \disp -> addIcon phi disp (getAtoms dispvar) panelWindow $ fromIntegral iconID | opcode == sYSTEM_TRAY_BEGIN_MESSAGE || opcode == sYSTEM_TRAY_CANCEL_MESSAGE -> return () @@ -210,13 +211,13 @@ handleEvent message@ClientMessageEvent { ev_message_type = message_type, ev_data _ -> return () -handleEvent message@UnmapEvent { ev_window = window } phi dispvar xembedWindow = +handleEvent message@UnmapEvent { ev_window = window } phi dispvar panelWindow xembedWindow = withDisplay dispvar $ \disp -> removeIcon phi disp True window -handleEvent message@DestroyWindowEvent { ev_window = window } phi dispvar xembedWindow = +handleEvent message@DestroyWindowEvent { ev_window = window } phi dispvar panelWindow xembedWindow = withDisplay dispvar $ \disp -> removeIcon phi disp False window -handleEvent message@AnyEvent { ev_window = window } phi dispvar xembedWindow | ev_event_type message == reparentNotify = do +handleEvent message@AnyEvent { ev_window = window } phi dispvar panelWindow xembedWindow | ev_event_type message == reparentNotify = do parent <- liftIO $ alloca $ \rootPtr -> alloca $ \parentPtr -> alloca $ \childrenPtrPtr -> alloca $ \nChildrenPtr -> do status <- withDisplay dispvar $ \disp -> xQueryTree disp window rootPtr parentPtr childrenPtrPtr nChildrenPtr case status of @@ -232,7 +233,7 @@ handleEvent message@AnyEvent { ev_window = window } phi dispvar xembedWindow | e withDisplay dispvar $ \disp -> removeIcon phi disp False window return () -handleEvent _ _ _ _ = return () +handleEvent _ _ _ _ _ = return () addIcon :: Phi -> Xlib.Display -> Atoms -> Window -> Window -> StateT (M.Map Window Window) IO () |