X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=powermate.hs;h=ad177897d224764c236c768d23a5c65c72f347a9;hb=HEAD;hp=dc8790e1ddbd132d9212237f671d35278305bbf4;hpb=70d9fdb8d5790b9af3577b64bd7bc0cc77281ab3;p=powermate.git

diff --git a/powermate.hs b/powermate.hs
old mode 100755
new mode 100644
index dc8790e..ad17789
--- a/powermate.hs
+++ b/powermate.hs
@@ -3,42 +3,61 @@ module Main where
 import PowerMate
 import System.IO
 import System.Process
-import Control.Monad
 import Text.Regex.Posix
+import Data.Time
 
 data State = State {
-  stPowerMate   :: Handle,
-  stVolume      :: Int,
-  stPrevDir     :: Int,
-  stPrevAction  :: Int
+  stPowerMate     :: Handle,
+  stVolume        :: Int,
+  stPrevDir       :: Int,
+  stPrevAction    :: Int,
+  stPressed       :: Bool,
+  stIndeterminate :: Bool,
+  stLastPress     :: UTCTime
 }
 
 processEvent :: State -> Event -> IO State
 processEvent state (Button True) = do
-  createProcess (proc "music-toggle" [])
+  time <- getCurrentTime
+  state <- updateLastPress state (time)
+  state <- updateButton state True
+  state <- updateIndeterminate state True
   return state
 processEvent state (Button False) = do
+  time <- getCurrentTime
+  if (stIndeterminate state)
+    then do
+    if (diffUTCTime (time) (stLastPress state) > 0.8)
+      then do createProcess(proc "volume-toggle" []); return ()
+      else do runCommand "music-toggle"; return ()
+  else return ()
+  state <- updateButton state False
   return state
 
 processEvent state (Rotate dir) = do
-  state <- (if dir < 2
+  state <- updateIndeterminate state False
+  state <- (if (stPressed state) == False
+              && dir < 2
               && (stPrevDir state) == 1
               && (stPrevAction state) == 1
                 then volumeUp
               else return) state
-  state <- (if dir > 2
+  state <- (if (stPressed state) == False
+              && dir > 2
               && (stPrevDir state) == 0
               && (stPrevAction state) == 0
                 then volumeDown
               else return) state
+  if stPressed state
+    then do
+    if dir < 2 then do runCommand "next"; return ()
+    else do runCommand "back"; return ()
+  else return ()
   state <- updatePrevState state (if dir < 2 then 1 else 0)
   updateBrightness state
   state <- updatePrevAction state (if (stPrevAction state) == 1 then 0 else 1)
   return state
 
-processEvent state (StatusChange status) = do
-  return state
-
 readState :: State -> IO State
 readState state = do
   return state
@@ -55,6 +74,18 @@ updateBrightness state = do
   writeStatus (stPowerMate state) $
     statusInit { brightness=brightness }
 
+updateIndeterminate :: State -> Bool -> IO State
+updateIndeterminate state value = do
+  state <- readState $ State {
+    stPowerMate=(stPowerMate state),
+    stVolume=(stVolume state),
+    stPrevAction=(stPrevAction state),
+    stPrevDir=(stPrevDir state),
+    stPressed=(stPressed state),
+    stLastPress=(stLastPress state),
+    stIndeterminate=value }
+  return state
+
 volumeUp :: State -> IO State
 volumeUp state = do
   createProcess (proc "volume-up" [])
@@ -62,7 +93,10 @@ volumeUp state = do
     stPowerMate=(stPowerMate state),
     stVolume=(max 0 $ 1+(stVolume state)),
     stPrevAction=(stPrevAction state),
-    stPrevDir=(stPrevDir state) }
+    stPrevDir=(stPrevDir state),
+    stPressed=(stPressed state),
+    stLastPress=(stLastPress state),
+    stIndeterminate=(stIndeterminate state) }
   state <- updatePrevAction state 1
   return state
 
@@ -73,7 +107,10 @@ volumeDown state = do
     stPowerMate=(stPowerMate state),
     stVolume=(max 0 $ (stVolume state)-1),
     stPrevAction=(stPrevAction state),
-    stPrevDir=(stPrevDir state) }
+    stPrevDir=(stPrevDir state),
+    stPressed=(stPressed state),
+    stLastPress=(stLastPress state),
+    stIndeterminate=(stIndeterminate state) }
   state <- updatePrevAction state 0
   return state
 
@@ -83,7 +120,10 @@ updatePrevState state dir = do
     stPowerMate=(stPowerMate state),
     stVolume=(stVolume state),
     stPrevAction=(stPrevAction state),
-    stPrevDir=dir }
+    stPrevDir=dir,
+    stPressed=(stPressed state),
+    stLastPress=(stLastPress state),
+    stIndeterminate=(stIndeterminate state) }
   return state
 
 updatePrevAction :: State -> Int -> IO State
@@ -92,7 +132,34 @@ updatePrevAction state action = do
     stPowerMate=(stPowerMate state),
     stVolume=(stVolume state),
     stPrevAction=action,
-    stPrevDir=(stPrevDir state) }
+    stPrevDir=(stPrevDir state),
+    stPressed=(stPressed state),
+    stLastPress=(stLastPress state),
+    stIndeterminate=(stIndeterminate state) }
+  return state
+
+updateButton :: State -> Bool -> IO State
+updateButton state button = do
+  state <- readState $ State {
+    stPowerMate=(stPowerMate state),
+    stVolume=(stVolume state),
+    stPrevAction=(stPrevAction state),
+    stPrevDir=(stPrevDir state),
+    stPressed=button,
+    stLastPress=(stLastPress state),
+    stIndeterminate=(stIndeterminate state) }
+  return state
+
+updateLastPress :: State -> UTCTime -> IO State
+updateLastPress state lastPress = do
+  state <- readState $ State {
+    stPowerMate=(stPowerMate state),
+    stVolume=(stVolume state),
+    stPrevAction=(stPrevAction state),
+    stPrevDir=(stPrevDir state),
+    stPressed=(stPressed state),
+    stLastPress=lastPress,
+    stIndeterminate=(stIndeterminate state) }
   return state
 
 loop :: FilePath -> IO ()
@@ -105,11 +172,15 @@ loop devname = do
                       (take
                         (subtract 2
                           (length alsaMaster)) alsaMaster)) :: Int
+  time <- getCurrentTime
   state <- readState $ State {
     stPowerMate=powermate,
     stVolume=volume,
     stPrevAction=0,
-    stPrevDir=0 }
+    stPrevDir=0,
+    stPressed=False,
+    stLastPress=time,
+    stIndeterminate=False }
   updateBrightness state
 
   next state $ \call -> do