REF remove extra theadstate
This commit is contained in:
parent
609048f6b6
commit
f875b7c71d
|
@ -101,7 +101,7 @@ run = do
|
|||
dws <- startDynWorkspaces fs
|
||||
runIO <- askRunInIO
|
||||
let cleanup = runCleanup runIO ts db
|
||||
kbs <- filterExternal <$> evalExternal (fsKeys fs cleanup ts db)
|
||||
kbs <- filterExternal <$> evalExternal (fsKeys fs cleanup db)
|
||||
sk <- evalAlways $ fsShowKeys fs
|
||||
ha <- evalAlways $ fsACPIHandler fs
|
||||
tt <- evalAlways $ fsTabbedTheme fs
|
||||
|
@ -154,7 +154,7 @@ getCreateDirectories = do
|
|||
_ -> return ()
|
||||
|
||||
data FeatureSet = FeatureSet
|
||||
{ fsKeys :: X () -> ThreadState -> DBusState -> [KeyGroup FeatureX]
|
||||
{ fsKeys :: X () -> DBusState -> [KeyGroup FeatureX]
|
||||
, fsDBusExporters :: [Maybe SesClient -> SometimesIO]
|
||||
, fsPowerMon :: SometimesIO
|
||||
, fsRemovableMon :: Maybe SysClient -> SometimesIO
|
||||
|
@ -229,7 +229,7 @@ allFeatures db = withRunInIO $ \runIO -> do
|
|||
let cleanup = runCleanup runIO ts db
|
||||
let bfs =
|
||||
concatMap (fmap kbMaybeAction . kgBindings) $
|
||||
externalBindings cleanup ts db
|
||||
externalBindings cleanup db
|
||||
let dbus = fmap (\f -> f $ dbSesClient db) dbusExporters
|
||||
let others = [runRemovableMon $ dbSysClient db, runPowermon]
|
||||
return (dbus ++ others, Left runScreenLock : bfs, allDWs')
|
||||
|
@ -748,8 +748,8 @@ filterExternal = fmap go
|
|||
]
|
||||
}
|
||||
|
||||
externalBindings :: X () -> ThreadState -> DBusState -> [KeyGroup FeatureX]
|
||||
externalBindings cleanup _ db =
|
||||
externalBindings :: X () -> DBusState -> [KeyGroup FeatureX]
|
||||
externalBindings cleanup db =
|
||||
[ KeyGroup
|
||||
"Launchers"
|
||||
[ KeyBinding "<XF86Search>" "select/launch app" $ Left runAppMenu
|
||||
|
|
Loading…
Reference in New Issue