From e5a258f19c0ae715c36c3d5646486578f4cdf94d Mon Sep 17 00:00:00 2001 From: Tony Zorman Date: Sat, 18 Jun 2022 17:40:25 +0200 Subject: [PATCH] Revert "Merge pull request #350 from Thiago4532/opaque-window-border" This reverts commit dbe9c4f799fd826c199169d012c2d2687b210a7f, reversing changes made to f6e4e278b54a8c37bfcd620debf4256cb59b875a. A discussion of why, as well as a new way forward, in being discussed in https://github.com/xmonad/xmonad/issues/395 However, since we would like to release a new minor version soon-ish, it's better to revert this for now. --- src/XMonad/Operations.hs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/XMonad/Operations.hs b/src/XMonad/Operations.hs index ce29def..dd0241d 100644 --- a/src/XMonad/Operations.hs +++ b/src/XMonad/Operations.hs @@ -258,7 +258,7 @@ setWindowBorderWithFallback :: Display -> Window -> String -> Pixel -> X () setWindowBorderWithFallback dpy w color basic = io $ C.handle fallback $ do wa <- getWindowAttributes dpy w - pixel <- setPixelSolid . color_pixel . fst <$> allocNamedColor dpy (wa_colormap wa) color + pixel <- color_pixel . fst <$> allocNamedColor dpy (wa_colormap wa) color setWindowBorder dpy w pixel where fallback :: C.SomeException -> IO () @@ -512,14 +512,10 @@ cleanMask km = do nlm <- gets numberlockMask return (complement (nlm .|. lockMask) .&. km) --- | Set the 'Pixel' alpha value to 255. -setPixelSolid :: Pixel -> Pixel -setPixelSolid p = (p .|. 0xff000000) - -- | Get the 'Pixel' value for a named color. initColor :: Display -> String -> IO (Maybe Pixel) initColor dpy c = C.handle (\(C.SomeException _) -> return Nothing) $ - (Just . setPixelSolid . color_pixel . fst) <$> allocNamedColor dpy colormap c + (Just . color_pixel . fst) <$> allocNamedColor dpy colormap c where colormap = defaultColormap dpy (defaultScreen dpy) ------------------------------------------------------------------------