Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Thu Feb 3 20:06:27 CST 2011 Aren Olson <reacocard@gmail.com>
- * expose withRegion
- Mon Jan 24 14:46:42 CST 2011 Aren Olson <reacocard@gmail.com>
- * Expose constructor for Visual
- Mon Jan 24 01:10:44 CST 2011 Aren Olson <reacocard@gmail.com>
- * Export makeRegion for use in extension libraries
- Mon Jan 24 01:10:16 CST 2011 Aren Olson <reacocard@gmail.com>
- * Add support for CreateEevent
- Mon Jan 24 01:09:29 CST 2011 Aren Olson <reacocard@gmail.com>
- * Add class to WindowAttributes
- diff -rN -u old-X11/Graphics/X11/Xlib/Extras.hsc new-X11/Graphics/X11/Xlib/Extras.hsc
- --- old-X11/Graphics/X11/Xlib/Extras.hsc 2011-02-03 20:08:04.711497969 -0600
- +++ new-X11/Graphics/X11/Xlib/Extras.hsc 2011-02-03 20:08:04.714831302 -0600
- @@ -212,7 +212,20 @@
- , ev_message_type :: !Atom
- , ev_data :: ![CInt]
- }
- -
- + | CreateEvent
- + { ev_event_type :: !EventType
- + , ev_serial :: !CULong
- + , ev_send_event :: !Bool
- + , ev_event_display :: Display
- + , ev_window :: !Window
- + , ev_parent :: !Window
- + , ev_x :: !CInt
- + , ev_y :: !CInt
- + , ev_width :: !CInt
- + , ev_height :: !CInt
- + , ev_border_width :: !CInt
- + , ev_override_redirect :: !Bool
- + }
- deriving ( Show, Typeable )
- eventTable :: [(EventType, String)]
- @@ -613,6 +626,34 @@
- , ev_data = dat
- }
- + -------------------------
- + -- CreateEvent
- + -------------------------
- + | type_ == createNotify -> do
- + window <- #{peek XCreateWindowEvent, window } p
- + parent <- #{peek XCreateWindowEvent, parent } p
- + x <- #{peek XCreateWindowEvent, x } p
- + y <- #{peek XCreateWindowEvent, y } p
- + width <- #{peek XCreateWindowEvent, width } p
- + height <- #{peek XCreateWindowEvent, height } p
- + border <- #{peek XCreateWindowEvent, border_width } p
- + override <- #{peek XCreateWindowEvent, override_redirect } p
- + return $ CreateEvent
- + { ev_event_type = type_
- + , ev_serial = serial
- + , ev_send_event = send_event
- + , ev_event_display = display
- + , ev_window = window
- + , ev_parent = parent
- + , ev_x = x
- + , ev_y = y
- + , ev_width = width
- + , ev_height = height
- + , ev_border_width = border
- + , ev_override_redirect = override
- + }
- +
- +
- -- We don't handle this event specifically, so return the generic
- -- AnyEvent.
- | otherwise -> do
- @@ -714,6 +755,7 @@
- { wa_x, wa_y, wa_width, wa_height, wa_border_width :: CInt
- , wa_map_state :: CInt
- , wa_override_redirect :: Bool
- + , wa_class :: WindowClass
- }
- --
- @@ -736,6 +778,7 @@
- `ap` (#{peek XWindowAttributes, border_width } p)
- `ap` (#{peek XWindowAttributes, map_state } p)
- `ap` (#{peek XWindowAttributes, override_redirect} p)
- + `ap` (#{peek XWindowAttributes, class } p)
- poke p wa = do
- #{poke XWindowAttributes, x } p $ wa_x wa
- #{poke XWindowAttributes, y } p $ wa_y wa
- @@ -744,6 +787,7 @@
- #{poke XWindowAttributes, border_width } p $ wa_border_width wa
- #{poke XWindowAttributes, map_state } p $ wa_map_state wa
- #{poke XWindowAttributes, override_redirect} p $ wa_override_redirect wa
- + #{poke XWindowAttributes, class } p $ wa_class wa
- foreign import ccall unsafe "XlibExtras.h XGetWindowAttributes"
- xGetWindowAttributes :: Display -> Window -> Ptr (WindowAttributes) -> IO Status
- diff -rN -u old-X11/Graphics/X11/Xlib/Region.hs new-X11/Graphics/X11/Xlib/Region.hs
- --- old-X11/Graphics/X11/Xlib/Region.hs 2011-02-03 20:08:04.708164636 -0600
- +++ new-X11/Graphics/X11/Xlib/Region.hs 2011-02-03 20:08:04.714831302 -0600
- @@ -15,6 +15,8 @@
- module Graphics.X11.Xlib.Region(
- Region,
- + makeRegion,
- + withRegion,
- RectInRegionResult,
- rectangleOut,
- diff -rN -u old-X11/Graphics/X11/Xlib/Types.hsc new-X11/Graphics/X11/Xlib/Types.hsc
- --- old-X11/Graphics/X11/Xlib/Types.hsc 2011-02-03 20:08:04.708164636 -0600
- +++ new-X11/Graphics/X11/Xlib/Types.hsc 2011-02-03 20:08:04.714831302 -0600
- @@ -15,7 +15,7 @@
- -- #hide
- module Graphics.X11.Xlib.Types(
- - Display(..), Screen(..), Visual, GC, GCValues, SetWindowAttributes,
- + Display(..), Screen(..), Visual(..), GC, GCValues, SetWindowAttributes,
- Image(..), Point(..), Rectangle(..), Arc(..), Segment(..), Color(..),
- Pixel, Position, Dimension, Angle, ScreenNumber, Buffer
- ) where
Add Comment
Please, Sign In to add comment
