htoolkit-cvs

[<kr_...@us...>]

Update of /cvsroot/htoolkit/gio/src/Graphics/UI/GIO
In directory sc8-pr-cvs1:/tmp/cvs-serv18912/gio/src/Graphics/UI/GIO

Modified Files:
	Events.hs Menu.hs Types.hs Window.hs 
Log Message:
Replace definition of Key with its own definition from HToolkit


Index: Events.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Events.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Events.hs	27 Jan 2003 22:14:39 -0000	1.2
--- Events.hs	31 Jan 2003 01:01:44 -0000	1.3
***************
*** 266,282 ****
  enterKey,tabKey,escKey,helpKey,delKey,homeKey,endKey :: Reactive w => Event w (IO ())
  pgupKey,pgdownKey,downKey,upKey,leftKey,rightKey :: Reactive w => Event w (IO ())
! enterKey  = key KeyEnter
! tabKey    = key KeyTab
! escKey    = key KeyEscape
! helpKey   = key KeyHelp
! delKey    = key KeyDelete
! homeKey   = key KeyBegin
! endKey    = key KeyEnd
! pgupKey   = key KeyPageUp
! pgdownKey = key KeyPageDown
! downKey   = key KeyArrowDown
! upKey     = key KeyArrowUp
! leftKey   = key KeyArrowLeft
! rightKey  = key KeyArrowRight
  
  charKey :: Reactive w => Char -> Event w (IO ())
--- 266,282 ----
  enterKey,tabKey,escKey,helpKey,delKey,homeKey,endKey :: Reactive w => Event w (IO ())
  pgupKey,pgdownKey,downKey,upKey,leftKey,rightKey :: Reactive w => Event w (IO ())
! enterKey  = key (KeyEnter      noModifiers)
! tabKey    = key (KeyTab        noModifiers)
! escKey    = key (KeyEscape     noModifiers)
! helpKey   = key (KeyHelp       noModifiers)
! delKey    = key (KeyDelete     noModifiers)
! homeKey   = key (KeyBegin      noModifiers)
! endKey    = key (KeyEnd        noModifiers)
! pgupKey   = key (KeyPageUp     noModifiers)
! pgdownKey = key (KeyPageDown   noModifiers)
! downKey   = key (KeyArrowDown  noModifiers)
! upKey     = key (KeyArrowUp    noModifiers)
! leftKey   = key (KeyArrowLeft  noModifiers)
! rightKey  = key (KeyArrowRight noModifiers)
  
  charKey :: Reactive w => Char -> Event w (IO ())
***************
*** 288,293 ****
    = keyboardFilter "key" filter
    where
!     filter (KeyDown x mod False)  = (k==x) && noneDown mod
!     filter other                  = False
  
  
--- 288,293 ----
    = keyboardFilter "key" filter
    where
!     filter (KeyDown x False)  = k==x
!     filter other              = False
  
  
***************
*** 296,301 ****
    = keyboardFilter1 "anyKey" filter
    where
!     filter (KeyDown x mod False)  = noneDown mod
!     filter other                  = False
  
  
--- 296,301 ----
    = keyboardFilter1 "anyKey" filter
    where
!     filter (KeyDown x False)  = True
!     filter other              = False
  
  

Index: Menu.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Menu.hs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Menu.hs	26 Jan 2003 12:41:49 -0000	1.1.1.1
--- Menu.hs	31 Jan 2003 01:01:44 -0000	1.2
***************
*** 16,20 ****
                -- * Menu items
                -- ** Menu item
!             , MenuItem, menuitem, menukey, menumod
                -- ** Menu separator
              , menuline
--- 16,20 ----
                -- * Menu items
                -- ** Menu item
!             , MenuItem, menuitem, menukey
                -- ** Menu separator
              , menuline
***************
*** 77,81 ****
                              , mtext    :: String
                              , vkey     :: Var Key
-                             , vmod     :: Var Modifiers
                              , venabled :: Var Bool
                              , vcommand :: EventHandler (IO ())
--- 77,80 ----
***************
*** 85,95 ****
  menuitem :: String -> [Prop MenuItem] -> Menu -> IO MenuItem
  menuitem title props menu
!   = do mitem <- do hitem    <- Lib.addMenuItem (hmenu menu) (KeyChar '\0') noModifiers title
                     Lib.registerWindowMenu (hwindow menu) hitem
                     venabled <- newVar True
                     vcommand <- newEventHandler
!                    vkey     <- newVar (KeyChar '\0')
!                    vmod     <- newVar noModifiers
!                    return (MenuItem hitem menu title vkey vmod venabled vcommand)
         set mitem props
         return mitem
--- 84,93 ----
  menuitem :: String -> [Prop MenuItem] -> Menu -> IO MenuItem
  menuitem title props menu
!   = do mitem <- do hitem    <- Lib.addMenuItem (hmenu menu) Lib.KeyNull title
                     Lib.registerWindowMenu (hwindow menu) hitem
                     venabled <- newVar True
                     vcommand <- newEventHandler
!                    vkey     <- newVar Lib.KeyNull
!                    return (MenuItem hitem menu title vkey venabled vcommand)
         set mitem props
         return mitem
***************
*** 112,131 ****
              (\w x -> do setVar (vkey w) x; menuItemUpdateLabel w)
  
- -- | The modifiers for the short-cut key.
- menumod :: Attr MenuItem Modifiers
- menumod 
-   = newAttr (\w   -> getVar (vmod w))
-             (\w x -> do setVar (vmod w) x; menuItemUpdateLabel w)
- 
  menuItemUpdateLabel m
    = do key <- getVar (vkey m)
!        mod <- getVar (vmod m)
!        let mod'     = case key of
!                         KeyChar c    | isLower c && noneDown mod  -> mod{ controlDown = True }
!                                      | isUpper c  -> mod{ shiftDown = False }
!                         other        -> mod
!        Lib.setMenuItemLabel (hmenu (parent m)) (hitem m) key mod' (mtext m)
!        setVar (vmod m) mod'
! 
  
  {--------------------------------------------------------------------
--- 110,116 ----
              (\w x -> do setVar (vkey w) x; menuItemUpdateLabel w)
  
  menuItemUpdateLabel m
    = do key <- getVar (vkey m)
!        Lib.setMenuItemLabel (hmenu (parent m)) (hitem m) key (mtext m)
  
  {--------------------------------------------------------------------

Index: Types.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Types.hs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Types.hs	30 Jan 2003 23:58:39 -0000	1.5
--- Types.hs	31 Jan 2003 01:01:44 -0000	1.6
***************
*** 56,60 ****
              -- ** Keyboard events
              , KeyboardEvent(..), Key(..)
!             , keyboardKey, keyboardModifiers, keyboardRepeat
  
              -- * Render
--- 56,60 ----
              -- ** Keyboard events
              , KeyboardEvent(..), Key(..)
!             , keyboardKey, keyboardRepeat, keyModifiers
  
              -- * Render

Index: Window.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Window.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Window.hs	30 Jan 2003 23:58:40 -0000	1.3
--- Window.hs	31 Jan 2003 01:01:45 -0000	1.4
***************
*** 119,123 ****
  
                      
! keyboardWindow w (KeyDown KeyF4 mod rep) | altDown mod
    = close w
  keyboardWindow w kbd
--- 119,123 ----
  
                      
! keyboardWindow w (KeyDown (KeyF4 mod) rep) | altDown mod
    = close w
  keyboardWindow w kbd