scsh-checkins
[Top] [All Lists]

[Scsh-checkins] CVS: scx/scheme/xlib client.scm,1.2,1.3 cursor.scm,1.2,1

To: scsh-checkins@lists.sourceforge.net
Subject: [Scsh-checkins] CVS: scx/scheme/xlib client.scm,1.2,1.3 cursor.scm,1.2,1.3 display-type.scm,1.6,1.7 drawable.scm,1.4,1.5 grab.scm,1.2,1.3 pixmap.scm,1.6,1.7 utility.scm,1.2,1.3 wm.scm,1.1,1.2
From: David Frese <frese@users.sourceforge.net>
Date: Tue Oct 9 08:33:12 2001
List-id: <scsh-checkins.lists.sourceforge.net>
Sender: scsh-checkins-admin@lists.sourceforge.net
Update of /cvsroot/scsh/scx/scheme/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv4307/scheme/xlib

Modified Files:
        client.scm cursor.scm display-type.scm drawable.scm grab.scm 
        pixmap.scm utility.scm wm.scm 
Log Message:
- added comments and newlines.


Index: client.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/client.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** client.scm  2001/08/29 14:43:49     1.2
--- client.scm  2001/10/09 15:32:54     1.3
***************
*** 1,2 ****
--- 1,6 ----
+ ;; iconfiy-window send a WM_CHANGE_STATE message (in an appropiate
+ ;; format), to the root window of the specified screen. See
+ ;; XIconifyWindow.
+ 
  (define (iconify-window window screen-number)
    (check-screen-number (window-display window) screen-number)
***************
*** 10,13 ****
--- 14,21 ----
    "scx_Iconify_Window")
  
+ ;; withdraw-window unmaps the specified window and sends a synthetic
+ ;; UnmapNotify event to the root window of the specified screen. See
+ ;; XWithdrawWindow.
+ 
  (define (withdraw-window window screen-number)
    (check-screen-number screen-number)
***************
*** 21,24 ****
--- 29,37 ----
    "scx_Withdraw_Window")
  
+ ;; reconfigure-wm-window change attributes of the specified window
+ ;; similar to configure-window, or sends a ConfigureRequestEvent to
+ ;; the root window if that fails. See XReconfigureWMWindow. See
+ ;; configure-window.
+ 
  (define (reconfigure-wm-window window screen-number . args)
    (check-screen-number screen-number)
***************
*** 33,36 ****
--- 46,52 ----
    "scx_Reconfigure_Wm_Window")
  
+ ;; wm-command reads the WM_COMMAND property from the specified window
+ ;; and returns is as a list of strings. See XGetCommand.
+ 
  (define (wm-command window)
    (vector->list (%wm-command (display-Xdisplay (window-display window))
***************
*** 40,43 ****
--- 56,78 ----
    "scx_Wm_Command")
  
+ ;; set-wm-command! sets the WM_COMMAND property (the command and
+ ;; arguments used to invoke the application). The command has to be
+ ;; specified as a list of string or symbols. See XSetCommand.
+ 
+ (define (set-wm-command! window command)
+   (%set-wm-command! (display-Xdisplay (window-display window))
+                   (window-Xwindow window)
+                   (list->vector (map (lambda (x)
+                                        (if (symbol? x)
+                                            (symbol->string x)
+                                            x))
+                                      command))))
+ 
+ (import-lambda-definition %set-wm-command (Xdisplay Xwindow command)
+   "scx_Set_Wm_Command")
+ 
+ ;; get-text-property returns the property specified by atom of the
+ ;; specified window as a list of strings. See XGetTextProperty.
+ 
  (define (get-text-property window atom)
    (let ((res (%get-text-property (display-Xdisplay (window-display window))
***************
*** 52,55 ****
--- 87,93 ----
    "scx_Get_Text_Property")
  
+ ;; set-text-property! sets the property specified by atom of the
+ ;; specified window to value - a list of strings or symbols.
+ 
  (define (set-text-property! window value atom)
    (let ((res (%set-text-property! (display-Xdisplay (window-display window))
***************
*** 64,67 ****
--- 102,110 ----
    "scx_Set_Text_Property")
  
+ ;; wm-protocols function returns the list of atoms stored in the
+ ;; WM_PROTOCOLS property on the specified window. These atoms describe
+ ;; window manager protocols in which the owner of this window is
+ ;; willing to participate. See XGetWMProtocols.
+ 
  (define (wm-protocols window)
    (let ((res (%wm-protocols (display-Xdisplay (window-display window))
***************
*** 75,78 ****
--- 118,124 ----
    "scx_Wm_Protocols")
  
+ ;; set-wm-protocols! sets the WM_PROTOCOLS property of the specified
+ ;; window. protocols has to be a list of atoms. See XSetWMProtocols.
+ 
  (define (set-wm-protocols! window protocols)
    (let ((res (%set-wm-protocols! (display-Xdisplay (window-display window))
***************
*** 86,89 ****
--- 132,138 ----
    "scx_Set_Wm_Protocols")
  
+ ;; wm-class returns the class hint for the specified window. See
+ ;; XGetClassHint.
+ 
  (define (wm-class window)
    (let ((res (%wm-class (display-Xdisplay (window-display window))
***************
*** 96,99 ****
--- 145,151 ----
    "scx_Wm_Class")
  
+ ;; set-wm-class! sets the class hint for the specified window. See
+ ;; XSetClassHint.
+ 
  (define (set-wm-class! window name class)
    (%set-wm-class! (display-Xdisplay (window-display window))
***************
*** 108,123 ****
  (import-lambda-definition %set-wm-class! (Xdisplay Xwindow name class)
    "scx_Set_Wm_Class")
- 
- (define (set-wm-command! window command)
-   (%set-wm-command! (display-Xdisplay (window-display window))
-                   (window-Xwindow window)
-                   (list->vector (map (lambda (x)
-                                        (if (symbol? x)
-                                            (symbol->string x)
-                                            x))
-                                      command))))
  
! (import-lambda-definition %set-wm-command (Xdisplay Xwindow command)
!   "scx_Set_Wm_Command")
  
  (define (wm-hints window)
--- 160,168 ----
  (import-lambda-definition %set-wm-class! (Xdisplay Xwindow name class)
    "scx_Set_Wm_Class")
  
! ;; wm-hints reads the window manager hints and returns them as an
! ;; alist mapping symbols to specific values. The hints are: 'input?
! ;; 'initial-state 'icon-pixmap 'icon-window 'icon-x 'icon-y 'icon-mask
! ;; 'window-group 'urgency. See XGetWMHints for a description.
  
  (define (wm-hints window)
***************
*** 146,149 ****
--- 191,199 ----
    "scx_Wm_Hints")
  
+ ;; set-wm-hints! sets the specified window manager hints. The hints
+ ;; must be specified together with their names. Either by giving two
+ ;; parameter 'name value, or the last argument may be an alist, as
+ ;; returned by wm-hints. See XSetWMHints.
+ 
  (define (set-wm-hints! window . args)
    (%set-wm-hints! (display-Xdisplay (window-display window))
***************
*** 161,164 ****
--- 211,218 ----
    "scx_Set_Wm_Hints")
  
+ ;; transient-for returns the WM_TRANSIENT_FOR property for the
+ ;; specified window. The value of that property is a window. See
+ ;; XGetTransientForHint.
+ 
  (define (transient-for window)
    (make-window (%transient-for (display-Xdisplay (display-window window))
***************
*** 170,173 ****
--- 224,231 ----
    "scx_Transient_For")
  
+ ;; set-transient-for! sets the WM_TRANSIENT_FOR property of the
+ ;; specified window to the specified property-window. See
+ ;; XSetTransientForHint.
+ 
  (define (set-transient-for! window property-window)
    (%set-transient-for (display-Xdisplay (window-display window))
***************
*** 179,182 ****
--- 237,243 ----
    "scx_Set_Transient_For")
  
+ ;; The following function a wrappers for the get/set-text-property
+ ;; function.
+ 
  (define xa-wm-name (make-atom 39))
  (define xa-wm-icon-name (make-atom 37))
***************
*** 201,204 ****
--- 262,272 ----
    (set-text-property! w s xa-wm-client-machine))
  
+ ;; wm-normal-hints/set-wm-normal-hints! get or set the size hints
+ ;; stored in the WM_NORMAL_HINTS property on the specified window. The
+ ;; hints are '(x y width height us-position us-size min-width
+ ;; min-height max-width max-height width-inc height-inc min-aspect-x
+ ;; min-aspect-y max-aspect-x max-aspect-y base-width base-height
+ ;; gravity). See XGetWMNormalHints, XSetWMNormalHints.
+ 
  (define (wm-normal-hints window)
    (let* ((v (%wm-normal-hints (display-Xdisplay (window-display window))
***************
*** 225,228 ****
--- 293,302 ----
    "scx_Set_Wm_Normal_Hints")
  
+ ;; icon-sizes returns the icon sizes specified by a window manager as
+ ;; a list. If no icon sizes are specified the list is empty. An icon
+ ;; size itself is a list consisting of integers meaning '(min-width
+ ;; min-height max-width max-height width-inc height-inc). See
+ ;; XGetIconSizes.
+ 
  (define (icon-sizes window)
    (let ((r (%icon-sizes (display-Xdisplay (window-display window))
***************
*** 233,236 ****
--- 307,313 ----
  (import-lambda-definition %icon-sizes (Xdisplay Xwindow)
    "scx_Icon_Sizes")
+ 
+ ;; set-icon-sizes! is used only by window managers to set the
+ ;; supported icon sizes. See icon-sizes, XSetIconSizes.
  
  (define (set-icon-sizes! window icon-sizes)

Index: cursor.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/cursor.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cursor.scm  2001/08/21 14:57:08     1.2
--- cursor.scm  2001/10/09 15:32:54     1.3
***************
*** 1,2 ****
--- 1,6 ----
+ ;; create-pixmap-cursor returns a cursor, that was build using the
+ ;; pixmaps src and mask, and the colors foreground and background. x
+ ;; and y specify the hotspot of the cursor. See XCreatePixmapCursor.
+ 
  (define (create-pixmap-cursor src mask x y foreground background)
    (let ((display (pixmap-display src)))
***************
*** 15,18 ****
--- 19,26 ----
    "scx_Create_Pixmap_Cursor")
  
+ ;; create-glyph-cursor returns a cursor, that was build using the font
+ ;; src, an integer src-char, a font mask, an integer mask-char, and
+ ;; the colors foreground and background. See XCreateGlyphCursor.
+ 
  (define (create-glyph-cursor src src-char mask mask-char foreground 
background)
    (let ((display (font-display src)))
***************
*** 31,34 ****
--- 39,47 ----
    "scx_Create_Glyph_Cursor")
  
+ ;; create-font-cursor returns a cursor, that was build with
+ ;; create-glyph-cursor using a font named "cursor", src-char, the
+ ;; character following src-char as mask-char, and black and as
+ ;; foreground and background.
+ 
  (define (create-font-cursor display src-char)
    (let ((font (load-font display "cursor")))
***************
*** 41,44 ****
--- 54,59 ----
      ;;(unload-font font)
      ))
+ 
+ ;; recolor-cursor resets the colors of an existing cursor. See XRecolorCursor.
  
  (define (recolor-cursor cursor foreground background)

Index: display-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/display-type.scm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** display-type.scm    2001/08/29 14:48:40     1.6
--- display-type.scm    2001/10/09 15:32:54     1.7
***************
*** 91,93 ****
  
  (import-lambda-definition %display-message-fd (Xdisplay)
!   "scx_Display_Message_fd")
\ No newline at end of file
--- 91,93 ----
  
  (import-lambda-definition %display-message-fd (Xdisplay)
!   "scx_Display_Message_fd")

Index: drawable.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/drawable.scm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** drawable.scm        2001/07/31 14:54:53     1.4
--- drawable.scm        2001/10/09 15:32:54     1.5
***************
*** 15,18 ****
--- 15,22 ----
      (vector-ref (get-geometry drawable) num)))
  
+ ;; the drawable-* functions return common information of a window or a
+ ;; pixmap. drawable-root returns a window, all other functions return
+ ;; an integer. See XGetGeometry.
+ 
  (define drawable-root (make-geometry-getter 0))
  (define drawable-x (make-geometry-getter 1))
***************
*** 22,25 ****
  (define drawable-border-width (make-geometry-getter 5))
  (define drawable-depth (make-geometry-getter 6))
- 
- 
--- 26,27 ----

Index: grab.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/grab.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** grab.scm    2001/08/29 14:43:49     1.2
--- grab.scm    2001/10/09 15:32:54     1.3
***************
*** 1,7 ****
  ; Norbert Freudemann
  
! ; grab-pointer grabs control of a pointer for your client only.
! ; It returns on of the symbols: 
! ;     (success not-viewable already-grabbed frozen invlalide-time)
  
  (define (grab-pointer window owner? events ptr-sync? kbd-sync?
--- 1,8 ----
  ; Norbert Freudemann
  
! ;; grab-pointer grabs control of a pointer for your client only.
! ;; It returns on of the symbols: 
! ;;     (success not-viewable already-grabbed frozen invalide-time)
! ;; See XGrabPointer.
  
  (define (grab-pointer window owner? events ptr-sync? kbd-sync?
***************
*** 15,26 ****
                 time))
  
- 
  (import-lambda-definition %grab-pointer (Xdisplay Xwindow owner? events
                                         ptr-sync? kbd-sync?
                                         Xconfine-to Xcursor time)
    "scx_Grab_Pointer")
- 
  
! ; ungrab-pointer releases the pointer.
  
  (define (ungrab-pointer display time)
--- 16,25 ----
                 time))
  
  (import-lambda-definition %grab-pointer (Xdisplay Xwindow owner? events
                                         ptr-sync? kbd-sync?
                                         Xconfine-to Xcursor time)
    "scx_Grab_Pointer")
  
! ;; ungrab-pointer releases the pointer. See XUngrabPointer.
  
  (define (ungrab-pointer display time)
***************
*** 32,36 ****
  
  
! ; ---
  
  (define (grab-button window button mod owner? events ptr-sync? kbd-sync?
--- 31,36 ----
  
  
! ;; grab-button performs a grab-pointer depending on a corresponding
! ;; button press event. See XGrabButton.
  
  (define (grab-button window button mod owner? events ptr-sync? kbd-sync?
***************
*** 47,54 ****
                                                 Xconfine-to Xcursor)
    "scx_Grab_Button")                     
- 
- 
- ; ---
  
  
  (define (ungrab-button window button modifiers)
--- 47,53 ----
                                                 Xconfine-to Xcursor)
    "scx_Grab_Button")                     
  
+ ;; ungrab-button releases the passive grab, performed by
+ ;; grab-button. See XUngrabButton.
  
  (define (ungrab-button window button modifiers)
***************
*** 61,67 ****
    "scx_Ungrab_Button")
  
  
- ; ---
- 
  (define (change-active-pointer-grab display events cursor time)
    (%change-active-p-g (display-Xdisplay display)
--- 60,67 ----
    "scx_Ungrab_Button")
  
+ ;; change-active-pointer-grab changes the specified dynamic parameters
+ ;; if the pointer is actively grabbed by the client (by grab-pointer,
+ ;; not by grab-button). See XChangeActivePointerGrab.
  
  (define (change-active-pointer-grab display events cursor time)
    (%change-active-p-g (display-Xdisplay display)
***************
*** 71,77 ****
                                              cursor time)
    "scx_Change_Active_Pointer_Grab")         
- 
  
! ; ---
                  
  (define (grab-keyboard window owner? ptr-sync? kbd-sync? time)
--- 71,81 ----
                                              cursor time)
    "scx_Change_Active_Pointer_Grab")         
  
! ;; grab-keyboard actively grabs control of the keyboard and generates
! ;; FocusIn and FocusOut events. Further key events are reported only
! ;; to the grabbing client. 
! ;; ungrab-keyboard releases the keyboard and any queued events if this
! ;; client has it actively grabbed from either grab-keyboard or
! ;; grab-Key. See XGrabKeyboard and XUngrabKeyboard.
                  
  (define (grab-keyboard window owner? ptr-sync? kbd-sync? time)
***************
*** 85,92 ****
    "scx_Grab_Keyboard")
  
- 
- ; ---
- 
- 
  (define (ungrab-keyboard display time)
    (%ungrab-keyboard (display-Xdisplay display)
--- 89,92 ----
***************
*** 96,102 ****
  (import-lambda-definition %ungrab-keyboard (Xdisplay time)
    "scx_Ungrab_Keyboard")
- 
  
! ; ---
                          
  (define (grab-key window key mod owner? ptr-sync? kbd-sync?)
--- 96,104 ----
  (import-lambda-definition %ungrab-keyboard (Xdisplay time)
    "scx_Ungrab_Keyboard")
  
! ;; The grab-key function establishes a passive grab on the
! ;; keyboard. In the future, the keyboard is actively
! ;; grabbed. 
! ;; ungrab-key releases this passive grab. See XGrabKey and XUngrabKey.
                          
  (define (grab-key window key mod owner? ptr-sync? kbd-sync?)
***************
*** 109,115 ****
    "scx_Grab_Key")           
  
- ; ---
- 
- 
  (define (ungrab-key window key mod)
    (%ungrab-key (display-Xdisplay (window-display window))
--- 111,114 ----
***************
*** 120,126 ****
                                       flag)
    "scx_Ungrab_Key")   
- 
- ; ---
  
  
  (define (allow-events display mode time)
--- 119,125 ----
                                       flag)
    "scx_Ungrab_Key")   
  
+ ;; allow-events function releases some queued events if the client has
+ ;; caused a device to freeze. See XAllowEvents.
  
  (define (allow-events display mode time)
***************
*** 131,135 ****
    "scx_Allow_Events")
  
! ; ---
  
  (define (grab-server display)
--- 130,137 ----
    "scx_Allow_Events")
  
! ;; grab-server disables processing of requests and close downs on all
! ;; other connections than the one this request arrived on. You should
! ;; not grab the X server any more than is absolutely necessary. See
! ;; XGrabServer.
  
  (define (grab-server display)
***************
*** 139,143 ****
    "scx_Grab_Server")
  
! ; ---
  
  (define (ungrab-server display)
--- 141,147 ----
    "scx_Grab_Server")
  
! ;; ungrab-server restarts processing of requests and close downs on
! ;; other connections.  You should avoid grabbing the X server as much
! ;; as possible. See XUngrabServer.
  
  (define (ungrab-server display)
***************
*** 148,153 ****
                
  
! ; Implementation of with-server-grabbed follows...
  
! ;(define (with-server-grabbed display . body-forms)
! ;)
\ No newline at end of file
--- 152,156 ----
                
  
! ;; with-server-grabbed not implemented (yet).
  
! ;;(define-syntax (with-server-grabbed display . body-forms))

Index: pixmap.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/pixmap.scm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pixmap.scm  2001/08/21 14:57:08     1.6
--- pixmap.scm  2001/10/09 15:32:54     1.7
***************
*** 3,7 ****
  ;; last change   : 16/07/2001
  
! ; ---
  
  (define (create-pixmap drawable width height depth)
--- 3,7 ----
  ;; last change   : 16/07/2001
  
! ;; create a new pixmap.
  
  (define (create-pixmap drawable width height depth)
***************
*** 15,19 ****
    "scx_Create_Pixmap")
  
! ; ---
  
  (define (create-bitmap-from-data window data width height)
--- 15,21 ----
    "scx_Create_Pixmap")
  
! ;; create-bitmap-from-data creates a new pixmap, consisting of the
! ;; image found in data, which has to be a string. Such an image can be
! ;; generated with write-bitmap-file. See XCreateBitmapFromData.
  
  (define (create-bitmap-from-data window data width height)
***************
*** 27,31 ****
    "scx_Create_Bitmap_From_Data")
  
! ; ---
  
  (define (create-pixmap-from-bitmap-data win data widht height 
--- 29,35 ----
    "scx_Create_Bitmap_From_Data")
  
! ;; create-pixmap-from-bitmap-data creates a pixmap of the given depth
! ;; and then does a bitmap-format XPutImage of the data into it. See
! ;; XCreatePixmapFromBitmapData.
  
  (define (create-pixmap-from-bitmap-data win data widht height 
***************
*** 43,47 ****
    "scx_Create_Pixmap_From_Bitmap_Data")
  
! ; Returns a list of five elements: (pixmap widht heigth x y)
  
  (define (read-bitmap-file drawable filename)
--- 47,54 ----
    "scx_Create_Pixmap_From_Bitmap_Data")
  
! ;; read-bitmap-file reads the bitmap data from the file, creates a new
! ;; pixmap and returns a list of five elements (pixmap widht heigth
! ;; x-hot y-hot). if x-hot and y-hot are not defined in the file then
! ;; they are set to -1,-1. See XReadBitmapFile;
  
  (define (read-bitmap-file drawable filename)
***************
*** 56,73 ****
    "scx_Read_Bitmap_File")
  
  
! ; --- coord is optional. It should be the empty list or (x-hot y-hot)
! 
! (define (write-bitmap-file filename pixmap width height . coord)
    (let ((dpy (display-Xdisplay (pixmap-display pixmap)))
        (xy-hot (cond
!                ((null? coord) (list -1 -1))
!                ((null? (cdr coord)) 
!                 (error "zero or both coordinates must be defined"))
!                (else coord))))
      (%write-bitmap-file dpy filename pixmap widht height 
!                       (car xy-hot) (cadr xy-hot))))
! 
  
  (import-lambda-definition %write-bitmap-file (Xdisplay file Xpixmap w h x y)
!   "scx_Write_Bitmap_File")
\ No newline at end of file
--- 63,79 ----
    "scx_Read_Bitmap_File")
  
+ ;; write-bitmap-file writes a bitmap out to a file in the X Version 11
+ ;; format. The optional argument hotspot specifies the hotspot as a
+ ;; pair (x-hot . y-hot) which defaults to (-1 . -1). See
+ ;; XWriteBitmapFile.
  
! (define (write-bitmap-file filename pixmap width height . hotspot)
    (let ((dpy (display-Xdisplay (pixmap-display pixmap)))
        (xy-hot (cond
!                ((null? hotspot) (cons -1 -1))
!                (else (car hotspot)))))
      (%write-bitmap-file dpy filename pixmap widht height 
!                       (car xy-hot) (cdr xy-hot))))
  
  (import-lambda-definition %write-bitmap-file (Xdisplay file Xpixmap w h x y)
!   "scx_Write_Bitmap_File")

Index: utility.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/utility.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** utility.scm 2001/08/29 14:43:49     1.2
--- utility.scm 2001/10/09 15:32:54     1.3
***************
*** 19,23 ****
    "scx_Xlib_Release_6_Or_Later")
  
! ; Get the user-default values of a specified program
  
  (define (get-default dpy program option)
--- 19,26 ----
    "scx_Xlib_Release_6_Or_Later")
  
! ;; get-default returns the user default values of a specified program
! ;; from the X-resource database. program and option should be
! ;; strings. On success a string is returned, otherwise #f. See
! ;; XGetDefault.
  
  (define (get-default dpy program option)
***************
*** 29,35 ****
    "scx_Get_Default")
  
  
- ; ---
- 
  (define (resource-manager-string dpy)
    (%resource-manager-string (display-Xdisplay dpy)))
--- 32,39 ----
    "scx_Get_Default")
  
+ ;; resource-manager-string returns the RESOURCE_MANAGER property from
+ ;; the server's root window of screen 0, or #f if no such property
+ ;; exists. See XResourceManagerString.
  
  (define (resource-manager-string dpy)
    (%resource-manager-string (display-Xdisplay dpy)))
***************
*** 38,42 ****
    "scx_Resource_Manager_String")
  
! ; ---
  
  (define (parse-geometry string)
--- 42,51 ----
    "scx_Resource_Manager_String")
  
! ;; parse-geometry parses a string for the standard X format for x, y,
! ;; width and height arguments. Definition:
! ;; [=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]. The return
! ;; value is a list (x-negative? y-negative? x y width height), where
! ;; x, y, width, height can be #f if they were not specified in the
! ;; string. See XParseGeometry.
  
  (define (parse-geometry string)
***************
*** 46,56 ****
    "scx_Parse_Geometry")
  
! ; ---
  
! (define (store-buffer) #f)
! (define (store-bytes) #f)
! (define (fetch-buffer) #f)
! (define (fetch-bytes) #f)
! (define (rotate-buffers) #f)
  
  (let ((xa-string (make-atom 31))    ; (31 is XA_STRING)
--- 55,65 ----
    "scx_Parse_Geometry")
  
! ;; these are some functions for clipboard handling.
  
! (define store-buffer #f)
! (define store-bytes #f)
! (define fetch-buffer #f)
! (define fetch-bytes #f)
! (define rotate-buffers #f)
  
  (let ((xa-string (make-atom 31))    ; (31 is XA_STRING)

Index: wm.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/wm.scm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** wm.scm      2001/07/31 14:53:49     1.1
--- wm.scm      2001/10/09 15:32:54     1.2
***************
*** 1,2 ****
--- 1,7 ----
+ ;; If the specified window is mapped, reparent-window automatically
+ ;; performs an UnmapWindow request on it, removes it from its current
+ ;; position in the hierarchy, and inserts it as the child of the
+ ;; specified parent. See XReparentWindow.
+ 
  (define (reparent-window window parent-window x y)
    (%reparent-window (display-Xdisplay (window-display window))
***************
*** 8,11 ****
--- 13,19 ----
    "scx_Reparent_Window")
  
+ ;; install-colormap function installs the specified colormap for
+ ;; its associated screen. See XInstallColormap.
+ 
  (define (install-colormap colormap)
    (%install-colormap (display-Xdisplay (colormap-display colormap))
***************
*** 15,18 ****
--- 23,29 ----
    "scx_Install_Colormap")
  
+ ;; uninstall-colormap removes the specified colormap from the required
+ ;; list for its screen. See XUninstallColormap.
+ 
  (define (uninstall-colormap colormap)
    (%uninstall-colormap (display-Xdisplay (colormap-display colormap))
***************
*** 22,25 ****
--- 33,40 ----
    "scx_Uninstall_Colormap")
  
+ ;; list-installed-colormaps function returns a list of the currently
+ ;; installed colormaps for the screen of the specified window. See
+ ;; XListInstalledColormaps.
+ 
  (define (list-installed-colormaps window)
    (let* ((dpy (window-display window))
***************
*** 34,37 ****
--- 49,55 ----
    "scx_List_Installed_Colormaps")
  
+ ;; set-input-focus function changes the input focus and the
+ ;; last-focus-change time. See XSetInputFocus.
+ 
  (define (set-input-focus display window revert-to time)
    (%set-input-focus (display-Xdisplay display)
***************
*** 47,50 ****
--- 65,71 ----
    "scx_Set_Input_Focus")
  
+ ;; input-focus returns the current focus window and the current focus
+ ;; state as a pair. See XGetInputFocus.
+ 
  (define (input-focus display)
    (let ((ret (%input-focus (display-Xdisplay display))))
***************
*** 52,55 ****
--- 73,82 ----
          (cdr ret))))
  
+ (import-lambda-definition %input-focus (Xdisplay)
+   "scx_Input_Focus")
+ 
+ ;; general-warp-pointer moves the pointer in the specified way. See
+ ;; XWarpPointer for a detailed description.
+ 
  (define (general-warp-pointer display 
                              dst-win dst-x dst-y
***************
*** 65,68 ****
--- 92,99 ----
    "scx_General_Warp_Pointer")
  
+ ;; warp-pointer calls general-warp-pointer with using 'none as the
+ ;; src-win and 0 for the src-* coordinates. The display is taken from
+ ;; dst-window.
+ 
  (define (warp-pointer dst-window dst-x dst-y)
    (general-warp-pointer (window-display dst-window)
***************
*** 70,73 ****
--- 101,107 ----
                        'none 0 0 0 0))
  
+ ;; warp-pointer-relative uses general-warp-pointer to move the pointer
+ ;; by x-offset and y-offset away from it's current position.
+ 
  (define (warp-pointer-relative display x-offset y-offset)
    (general-warp-pointer display
***************
*** 75,78 ****
--- 109,116 ----
                        'none 0 0 0 0))
  
+ ;; bell rings the bell on the keyboard on the specified display, if
+ ;; possible. The optional percent argument specifies the volume in a
+ ;; range from -100 to 100. 0 is the default value. See XBell.
+ 
  (define (bell display . percent)
    (%bell (display-Xdisplay display)
***************
*** 84,87 ****
--- 122,128 ----
    "scx_Bell")
  
+ ;; set-access-control either enables or disables the use of the access
+ ;; control list at each connection setup. See XSetAccessControl.
+ 
  (define (set-access-control display enable?)
    (%set-access-control (display-Xdisplay display)
***************
*** 91,94 ****
--- 132,141 ----
    "scx_Set_Access_Control")
  
+ ;; Depending on the specified mode, change-save-set either inserts or
+ ;; deletes the specified window from the client's save-set. The
+ ;; specified window must have been created by some other client, or a
+ ;; BadMatch error results. mode is one of 'insert or 'delete. See
+ ;; XChangeSaveSet.
+ 
  (define (change-save-set window mode)
    (%change-save-set (display-Xdisplay (window-display window))
***************
*** 99,102 ****
--- 146,153 ----
    "scx_Change_Save_Set")
  
+ ;; set-close-down-mode defines what will happen to the client's
+ ;; resources at connection close. mode is one of 'destroy-all,
+ ;; 'retain-permanent or 'retain-temporary. See XSetCloseDownMode.
+ 
  (define (set-close-down-mode display mode)
    (%set-close-down-mode (display-Xdisplay display)
***************
*** 106,109 ****
--- 157,164 ----
    "scx_Set_Close_Down_Mode")
  
+ ;; get-pointer-mapping returns a vector, that specifies in the i-th
+ ;; element the logical button number for the physical button i+1. See
+ ;; XGetPointerMapping.
+ 
  (define (get-pointer-mapping display)
    (%get-pointer-mapping (display-Xdisplay display)))
***************
*** 111,114 ****
--- 166,175 ----
  (import-lambda-definition %get-pointer-mapping (Xdisplay)
    "scx_Get_Pointer_Mapping")
+ 
+ ;; set-pointer-mapping sets the mapping of the pointer. mapping must
+ ;; be a vector of the same length that get-pointer-mapping would
+ ;; return. If any of the buttons to be altered are logically in the
+ ;; down state, then #f is returned. #t otherwise. See
+ ;; XSetPointerMapping.
  
  (define (set-pointer-mapping display mapping)



<Prev in Thread] Current Thread [Next in Thread>
  • [Scsh-checkins] CVS: scx/scheme/xlib client.scm,1.2,1.3 cursor.scm,1.2,1.3 display-type.scm,1.6,1.7 drawable.scm,1.4,1.5 grab.scm,1.2,1.3 pixmap.scm,1.6,1.7 utility.scm,1.2,1.3 wm.scm,1.1,1.2, David Frese <=