twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-03 13:41:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Give a name to the initial state in X.A.GridSelect

Browse Source
This commit is contained in:
Dmitri Iouchtchenko
2013-01-21 06:13:24 +00:00
parent 45e4bd4ff6
commit e98f0657bb
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
XMonad/Actions/GridSelect.hs
View File

@@ -628,16 +628,16 @@ gridselect _ [] = return Nothing
gridselect gsconfig elements = gridselect gsconfig elements =
withDisplay $ \dpy -> do withDisplay $ \dpy -> do
rootw <- asks theRoot rootw <- asks theRoot
s <- gets $ screenRect . W.screenDetail . W.current . windowset scr <- gets $ screenRect . W.screenDetail . W.current . windowset
win <- liftIO $ mkUnmanagedWindow dpy (defaultScreenOfDisplay dpy) rootw win <- liftIO $ mkUnmanagedWindow dpy (defaultScreenOfDisplay dpy) rootw
(rect_x s) (rect_y s) (rect_width s) (rect_height s) (rect_x scr) (rect_y scr) (rect_width scr) (rect_height scr)
liftIO $ mapWindow dpy win liftIO $ mapWindow dpy win
liftIO $ selectInput dpy win (exposureMask .|. keyPressMask .|. buttonReleaseMask) liftIO $ selectInput dpy win (exposureMask .|. keyPressMask .|. buttonReleaseMask)
status <- io $ grabKeyboard dpy win True grabModeAsync grabModeAsync currentTime status <- io $ grabKeyboard dpy win True grabModeAsync grabModeAsync currentTime
io $ grabButton dpy button1 anyModifier win True buttonReleaseMask grabModeAsync grabModeAsync none none io $ grabButton dpy button1 anyModifier win True buttonReleaseMask grabModeAsync grabModeAsync none none
font <- initXMF (gs_font gsconfig) font <- initXMF (gs_font gsconfig)
let screenWidth = toInteger $ rect_width s; let screenWidth = toInteger $ rect_width scr
screenHeight = toInteger $ rect_height s; screenHeight = toInteger $ rect_height scr
selectedElement <- if (status == grabSuccess) then do selectedElement <- if (status == grabSuccess) then do
let restriction ss cs = (fromInteger ss/fromInteger (cs gsconfig)-1)/2 :: Double let restriction ss cs = (fromInteger ss/fromInteger (cs gsconfig)-1)/2 :: Double
restrictX = floor $ restriction screenWidth gs_cellwidth restrictX = floor $ restriction screenWidth gs_cellwidth
@@ -645,16 +645,16 @@ gridselect gsconfig elements =
originPosX = floor $ ((gs_originFractX gsconfig) - (1/2)) * 2 * fromIntegral restrictX originPosX = floor $ ((gs_originFractX gsconfig) - (1/2)) * 2 * fromIntegral restrictX
originPosY = floor $ ((gs_originFractY gsconfig) - (1/2)) * 2 * fromIntegral restrictY originPosY = floor $ ((gs_originFractY gsconfig) - (1/2)) * 2 * fromIntegral restrictY
coords = diamondRestrict restrictX restrictY originPosX originPosY coords = diamondRestrict restrictX restrictY originPosX originPosY
s = TwoDState { td_curpos = (head coords),
evalTwoD (updateAllElements >> (gs_navigate gsconfig)) TwoDState { td_curpos = (head coords), td_availSlots = coords,
td_availSlots = coords, td_elements = elements,
td_elements = elements, td_gsconfig = gsconfig,
td_gsconfig = gsconfig, td_font = font,
td_font = font, td_paneX = screenWidth,
td_paneX = screenWidth, td_paneY = screenHeight,
td_paneY = screenHeight, td_drawingWin = win,
td_drawingWin = win, td_searchString = "" }
td_searchString = "" } evalTwoD (updateAllElements >> (gs_navigate gsconfig)) s
else else
return Nothing return Nothing
liftIO $ do liftIO $ do