CVS: sml-dist/src/eXene/lib/user exene-base-sig.sml,1.2,1.3 exene-win-sig.sml,1.2,1.3 iccc-sig.sml,1.3,1.4
Matthias Blume <[email protected]>
| Newsgroups | gmane.comp.lang.sml.smlnj.commits |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/smlnj/sml-dist/src/eXene/lib/user
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32471/lib/user
Modified Files:
exene-base-sig.sml exene-win-sig.sml iccc-sig.sml
Log Message:
merge Kansas changes to eXene into repository
Index: exene-base-sig.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/eXene/lib/user/exene-base-sig.sml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** exene-base-sig.sml 1 Jun 2000 18:33:40 -0000 1.2
--- exene-base-sig.sml 3 Mar 2006 03:33:15 -0000 1.3
***************
*** 28,48 ****
(* server time *)
structure XTime : sig
! type time
! val toReal : time -> real
! val + : (time * time) -> time
! val - : (time * time) -> time
! val < : (time * time) -> bool
! val <= : (time * time) -> bool
! val > : (time * time) -> bool
! val >= : (time * time) -> bool
end
(* authentication information *)
datatype authentication = AUTH of {
! family : int,
! addr : string,
! dpy : string,
! name : string,
! data : Word8Vector.vector
}
--- 28,48 ----
(* server time *)
structure XTime : sig
! type time
! val toReal : time -> real
! val + : (time * time) -> time
! val - : (time * time) -> time
! val < : (time * time) -> bool
! val <= : (time * time) -> bool
! val > : (time * time) -> bool
! val >= : (time * time) -> bool
end
(* authentication information *)
datatype authentication = AUTH of {
! family : int,
! addr : string,
! dpy : string,
! name : string,
! data : Word8Vector.vector
}
***************
*** 73,77 ****
val sizeMMOfScr : screen -> G.size
val depthOfScr : screen -> int
!
datatype display_class
= StaticGray | GrayScale | StaticColor | PseudoColor | TrueColor | DirectColor
--- 73,78 ----
val sizeMMOfScr : screen -> G.size
val depthOfScr : screen -> int
!
!
datatype display_class
= StaticGray | GrayScale | StaticColor | PseudoColor | TrueColor | DirectColor
***************
*** 88,102 ****
val sizeOfTile : tile -> G.size
val geomOfWin : window
! -> {pos : G.point, sz : G.size, depth : int, border : int}
val geomOfPixmap : pixmap
! -> {pos : G.point, sz : G.size, depth : int, border : int}
val geomOfTile : tile
! -> {pos : G.point, sz : G.size, depth : int, border : int}
(** Images **)
datatype image = IMAGE of {
! sz : G.size,
! data : Word8Vector.vector list list
}
--- 89,103 ----
val sizeOfTile : tile -> G.size
val geomOfWin : window
! -> {pos : G.point, sz : G.size, depth : int, border : int}
val geomOfPixmap : pixmap
! -> {pos : G.point, sz : G.size, depth : int, border : int}
val geomOfTile : tile
! -> {pos : G.point, sz : G.size, depth : int, border : int}
(** Images **)
datatype image = IMAGE of {
! sz : G.size,
! data : Word8Vector.vector list list
}
***************
*** 165,170 ****
(* gravity (both window and bit) *)
datatype gravity
! = ForgetGravity (* bit gravity only *)
! | UnmapGravity (* window gravity only *)
| NorthWestGravity
| NorthGravity
--- 166,171 ----
(* gravity (both window and bit) *)
datatype gravity
! = ForgetGravity (* bit gravity only *)
! | UnmapGravity (* window gravity only *)
| NorthWestGravity
| NorthGravity
Index: exene-win-sig.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/eXene/lib/user/exene-win-sig.sml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** exene-win-sig.sml 1 Jun 2000 18:33:40 -0000 1.2
--- exene-win-sig.sml 3 Mar 2006 03:33:15 -0000 1.3
***************
*** 49,71 ****
val createSimpleTopWin : EXB.screen -> {
! geom : G.win_geom,
! border : EXB.color,
! backgrnd : EXB.color
! } -> (window * Interact.in_env)
val createSimpleSubwin : window -> {
! geom : G.win_geom,
! border : EXB.color option,
! backgrnd : EXB.color option
! } -> window
val createTransientWin : EXB.window -> {
! geom : G.win_geom,
! border : EXB.color,
! backgrnd : EXB.color
! } -> (window * Interact.in_env)
val createSimplePopupWin : EXB.screen -> {
! geom : G.win_geom,
! border : EXB.color,
! backgrnd : EXB.color
! } -> (window * Interact.in_env)
val createInputOnlyWin : window -> G.rect -> window
--- 49,73 ----
val createSimpleTopWin : EXB.screen -> {
! geom : G.win_geom,
! border : EXB.color,
! backgrnd : EXB.color
! (* modified ddeboer, Jul 2004; original:
! } -> (window * Interact.in_env) *)
! } -> (window * Interact.in_env * unit CML.chan)
val createSimpleSubwin : window -> {
! geom : G.win_geom,
! border : EXB.color option,
! backgrnd : EXB.color option
! } -> window
val createTransientWin : EXB.window -> {
! geom : G.win_geom,
! border : EXB.color,
! backgrnd : EXB.color
! } -> (window * Interact.in_env)
val createSimplePopupWin : EXB.screen -> {
! geom : G.win_geom,
! border : EXB.color,
! backgrnd : EXB.color
! } -> (window * Interact.in_env)
val createInputOnlyWin : window -> G.rect -> window
***************
*** 76,86 ****
(* set the properties of a top-level window *)
val setWMProperties : window -> {
! win_name : string option,
! icon_name : string option,
! argv : string list,
! size_hints : ICCC.size_hints list,
! wm_hints : ICCC.wm_hints list,
! class_hints : {res_class : string, res_name : string} option
! } -> unit
(* set the window-manager protocols for a window *)
--- 78,88 ----
(* set the properties of a top-level window *)
val setWMProperties : window -> {
! win_name : string option,
! icon_name : string option,
! argv : string list,
! size_hints : ICCC.size_hints list,
! wm_hints : ICCC.wm_hints list,
! class_hints : {res_class : string, res_name : string} option
! } -> unit
(* set the window-manager protocols for a window *)
***************
*** 100,110 ****
val setBackground : window -> EXB.color option -> unit
! (* set the background color attribute of the window. Note that this does
! * not have an immediate affect on the window's contents, but if it is done
! * before the window is mapped, the window will come up with the right color.
! *)
val changeWinAttrs : window -> window_attr list -> unit
! (* Set various window attributes *)
val mapWin : window -> unit
--- 102,112 ----
val setBackground : window -> EXB.color option -> unit
! (* set the background color attribute of the window. Note that this does
! * not have an immediate affect on the window's contents, but if it is done
! * before the window is mapped, the window will come up with the right color.
! *)
val changeWinAttrs : window -> window_attr list -> unit
! (* Set various window attributes *)
val mapWin : window -> unit
***************
*** 116,118 ****
--- 118,123 ----
val displayOfWin : window -> EXB.display
+ (* added ddeboer *)
+ val grabKeyboard : window -> int
+ val ungrabKeyboard : window -> int
end (* EXENE_WIN *)
Index: iccc-sig.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/eXene/lib/user/iccc-sig.sml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** iccc-sig.sml 8 Sep 2000 02:09:17 -0000 1.3
--- iccc-sig.sml 3 Mar 2006 03:33:15 -0000 1.4
***************
*** 91,96 ****
datatype raw_format = Raw8 | Raw16 | Raw32
datatype raw_data = RAW_DATA of {
! format : raw_format,
! data : Word8Vector.vector
}
--- 91,96 ----
datatype raw_format = Raw8 | Raw16 | Raw32
datatype raw_data = RAW_DATA of {
! format : raw_format,
! data : Word8Vector.vector
}
***************
*** 100,111 ****
*)
datatype prop_val = PROP_VAL of {
! typ : atom,
! value : raw_data
}
exception PropAlloc
! (* raised, if there is not enough space to store a property value
! * on the server.
! *)
(* an abstract interface to a property on a window *)
--- 100,111 ----
*)
datatype prop_val = PROP_VAL of {
! typ : atom,
! value : raw_data
}
exception PropAlloc
! (* raised, if there is not enough space to store a property value
! * on the server.
! *)
(* an abstract interface to a property on a window *)
***************
*** 113,169 ****
val property : (EXB.window * atom) -> property
! (* return the abstract representation of the named property on
! * the specified window.
! *)
val unusedProperty : EXB.window -> property
! (* generate a property on the specified window that is guaranteed
! * to be unused. Note that once this property has been "deleted"
! * its name may be reused.
! * NOTE: eventually, properties will be finalized, but for the
! * time being, programs should delete any allocated properties they
! * are not using.
! *)
val mkProperty : (EXB.window * prop_val) -> property
! (* create a new property initialized to the given value *)
val nameOfProp : property -> atom
! (* return the atom that names the given property *)
val setProperty : (property * prop_val) -> unit
! (* set the value of the property *)
val appendToProperty : (property * prop_val) -> unit
! (* append the property value to the property; the types
! * and formats must match.
! *)
val prependToProperty : (property * prop_val) -> unit
! (* prepend the property value to the property; the types
! * and formats must match.
! *)
val deleteProperty : property -> unit
! (* delete the named property *)
exception RotateProps
val rotateProperties : (property list * int) -> unit
! (* rotate the list of properties; raises RotateProps if the
! * properties do not belong to the same window.
! *)
val getProperty : property -> prop_val option
! (* get the value of the property; if the property has not been
! * set, then NONE is returned.
! *)
datatype prop_change = NewValue | Deleted
val watchProperty : property -> (prop_change * EXB.XTime.time) CML.event
! (* returns an event for monitoring changes to a property's
! * state. Note that once a property has been deleted, there
! * will be no more events, unless watchProperty is called again.
! *)
--- 113,184 ----
val property : (EXB.window * atom) -> property
! (* return the abstract representation of the named property on
! * the specified window.
! *)
val unusedProperty : EXB.window -> property
! (* generate a property on the specified window that is guaranteed
! * to be unused. Note that once this property has been "deleted"
! * its name may be reused.
! * NOTE: eventually, properties will be finalized, but for the
! * time being, programs should delete any allocated properties they
! * are not using.
! *)
val mkProperty : (EXB.window * prop_val) -> property
! (* create a new property initialized to the given value *)
val nameOfProp : property -> atom
! (* return the atom that names the given property *)
val setProperty : (property * prop_val) -> unit
! (* set the value of the property *)
val appendToProperty : (property * prop_val) -> unit
! (* append the property value to the property; the types
! * and formats must match.
! *)
val prependToProperty : (property * prop_val) -> unit
! (* prepend the property value to the property; the types
! * and formats must match.
! *)
val deleteProperty : property -> unit
! (* delete the named property *)
exception RotateProps
val rotateProperties : (property list * int) -> unit
! (* rotate the list of properties; raises RotateProps if the
! * properties do not belong to the same window.
! *)
val getProperty : property -> prop_val option
! (* get the value of the property; if the property has not been
! * set, then NONE is returned.
! *)
+ (* Additions by ddeboer, May 2004.
+ * Dusty deBoer, KSU CIS 705, Spring 2004. *)
+
+ (* xrdbOfScr: return the list of strings contained in the
+ * XA_RESOURCE_MANAGER property of the root screen of the
+ * specified screen.
+ * This should properly belong some other place than in ICCC,
+ * as it has nothing to do with ICCC, except that it accesses
+ * data in the screen type, and uses the GetProperty functions
+ * of ICCC.
+ *)
+ val xrdbOfScr : EXB.screen -> string list
+
+ (** end additions by ddeboer **)
+
datatype prop_change = NewValue | Deleted
val watchProperty : property -> (prop_change * EXB.XTime.time) CML.event
! (* returns an event for monitoring changes to a property's
! * state. Note that once a property has been deleted, there
! * will be no more events, unless watchProperty is called again.
! *)
***************
*** 183,196 ****
(* Window manager hints *)
datatype wm_hints
! = HINT_Input of bool (* does this application rely on the window *)
! (* manager to get keyboard input? *)
! (* Initial window state (choose one) *)
! | HINT_WithdrawnState (* for windows that are not mapped *)
! | HINT_NormalState (* most want to start this way *)
! | HINT_IconicState (* application wants to start as an icon *)
! | HINT_IconTile of EXB.tile (* tile to be used as icon *)
! | HINT_IconPixmap of EXB.pixmap (* pixmap to be used as icon *)
! | HINT_IconWindow of EXB.window (* window to be used as icon *)
! | HINT_IconMask of EXB.pixmap (* icon mask bitmap *)
| HINT_IconPosition of G.point (* initial position of icon *)
| HINT_WindowGroup of EXB.window (* the group leader *)
--- 198,211 ----
(* Window manager hints *)
datatype wm_hints
! = HINT_Input of bool (* does this application rely on the window *)
! (* manager to get keyboard input? *)
! (* Initial window state (choose one) *)
! | HINT_WithdrawnState (* for windows that are not mapped *)
! | HINT_NormalState (* most want to start this way *)
! | HINT_IconicState (* application wants to start as an icon *)
! | HINT_IconTile of EXB.tile (* tile to be used as icon *)
! | HINT_IconPixmap of EXB.pixmap (* pixmap to be used as icon *)
! | HINT_IconWindow of EXB.window (* window to be used as icon *)
! | HINT_IconMask of EXB.pixmap (* icon mask bitmap *)
| HINT_IconPosition of G.point (* initial position of icon *)
| HINT_WindowGroup of EXB.window (* the group leader *)
***************
*** 204,209 ****
val acquireSelection : (EXB.window * atom * EXB.XTime.time)
! -> selection_handle option
! (* acquire the named selection *)
val selectionOf : selection_handle -> atom
--- 219,224 ----
val acquireSelection : (EXB.window * atom * EXB.XTime.time)
! -> selection_handle option
! (* acquire the named selection *)
val selectionOf : selection_handle -> atom
***************
*** 211,234 ****
val selectionReqEvt : selection_handle -> {
! target : atom,
! time : EXB.XTime.time option,
! reply : prop_val option -> unit
! } CML.event
! (* this event is enabled once for each request for the selection. The
! * target field is the requested target type; the time field is the
! * server-time of the gesture that caused the request, and the reply
! * field is a function for sending the reply. If the time field is
! * NONE, this means a value of CurrentTime was used. Strictly speaking
! * this violates the ICCC specification, but applications may choose
! * to accept it.
! *)
val selectionRelEvt : selection_handle -> unit CML.event
! (* this event becomes enabled when the selection is lost; either by
! * the owner releasing it, or by some other client acquiring ownership.
! *)
val releaseSelection : selection_handle -> unit
! (* release ownership of the selection *)
--- 226,249 ----
val selectionReqEvt : selection_handle -> {
! target : atom,
! time : EXB.XTime.time option,
! reply : prop_val option -> unit
! } CML.event
! (* this event is enabled once for each request for the selection. The
! * target field is the requested target type; the time field is the
! * server-time of the gesture that caused the request, and the reply
! * field is a function for sending the reply. If the time field is
! * NONE, this means a value of CurrentTime was used. Strictly speaking
! * this violates the ICCC specification, but applications may choose
! * to accept it.
! *)
val selectionRelEvt : selection_handle -> unit CML.event
! (* this event becomes enabled when the selection is lost; either by
! * the owner releasing it, or by some other client acquiring ownership.
! *)
val releaseSelection : selection_handle -> unit
! (* release ownership of the selection *)
***************
*** 236,251 ****
val requestSelection : {
! win : EXB.window,
! selection : atom,
! target : atom,
! property : atom,
! time : EXB.XTime.time
! } -> prop_val option CML.event
! (* request the value of the selection. the win field is the requesting
! * window, the selection field is the requested selection, the target
! * field is the requested target type, and the time field is the server-
! * time of the gesture causing the request. This returns an event
! * that will become enabled when the reply is received.
! *)
end (* signature ICCC *)
--- 251,266 ----
val requestSelection : {
! win : EXB.window,
! selection : atom,
! target : atom,
! property : atom,
! time : EXB.XTime.time
! } -> prop_val option CML.event
! (* request the value of the selection. the win field is the requesting
! * window, the selection field is the requested selection, the target
! * field is the requested target type, and the time field is the server-
! * time of the gesture causing the request. This returns an event
! * that will become enabled when the reply is received.
! *)
end (* signature ICCC *)
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642