Update of /cvsroot/scsh/scx/scheme/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv21834
Modified Files:
atom-type.scm color-type.scm color.scm colormap-type.scm
colormap.scm cursor-type.scm display-type.scm display.scm
drawable.scm event-type.scm event.scm font-type.scm
gcontext-type.scm gcontext.scm pixel.scm pixmap-type.scm
pixmap.scm property.scm text.scm window-type.scm window.scm
Log Message:
Added suffix "scx_" to all imported C functions.
Index: atom-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/atom-type.scm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** atom-type.scm 2001/07/11 14:19:30 1.1
--- atom-type.scm 2001/07/31 14:54:53 1.2
***************
*** 32,36 ****
(import-lambda-definition %intern-atom (Xdisplay name)
! "Intern_Atom")
;; finalize-atom is called, when the garbage collector removes the last
--- 32,36 ----
(import-lambda-definition %intern-atom (Xdisplay name)
! "scx_Intern_Atom")
;; finalize-atom is called, when the garbage collector removes the last
Index: color-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/color-type.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** color-type.scm 2001/07/30 14:27:35 1.3
--- color-type.scm 2001/07/31 14:54:53 1.4
***************
*** 24,28 ****
(import-lambda-definition %create-color (r g b)
! "Create_Color")
;; returns a list of r,g,b as integers
--- 24,28 ----
(import-lambda-definition %create-color (r g b)
! "scx_Create_Color")
;; returns a list of r,g,b as integers
***************
*** 31,35 ****
(import-lambda-definition %extract-rgb-values (XColor)
! "Extract_RGB_Values")
;; All color records need to be saved in a weak-list, to have only one record
--- 31,35 ----
(import-lambda-definition %extract-rgb-values (XColor)
! "scx_Extract_RGB_Values")
;; All color records need to be saved in a weak-list, to have only one record
Index: color.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/color.scm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** color.scm 2001/07/30 14:43:22 1.5
--- color.scm 2001/07/31 14:54:53 1.6
***************
*** 31,35 ****
(import-lambda-definition %query-color (Xcolormap Xpixel Xdisplay)
! "Query_Color")
;; query-colors does the same as query-color but on vectors of pixels and
--- 31,35 ----
(import-lambda-definition %query-color (Xcolormap Xpixel Xdisplay)
! "scx_Query_Color")
;; query-colors does the same as query-color but on vectors of pixels and
***************
*** 45,49 ****
(import-lambda-definition %query-colors (Xcolormap Xpixels Xdisplay)
! "Query_Colors")
;; lookup-color takes the name of a color (a string or symbol) looks it up in
--- 45,49 ----
(import-lambda-definition %query-colors (Xcolormap Xpixels Xdisplay)
! "scx_Query_Colors")
;; lookup-color takes the name of a color (a string or symbol) looks it up in
***************
*** 64,66 ****
(import-lambda-definition %lookup-color (Xcolormap Xdisplay name)
! "Lookup_Color")
--- 64,66 ----
(import-lambda-definition %lookup-color (Xcolormap Xdisplay name)
! "scx_Lookup_Color")
Index: colormap-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/colormap-type.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** colormap-type.scm 2001/07/30 14:43:22 1.3
--- colormap-type.scm 2001/07/31 14:54:53 1.4
***************
*** 35,39 ****
(import-lambda-definition %free-colormap (Xcolormap Xdisplay)
! "Free_Colormap")
;; All colormap records need to be saved in a weak-list, to have only one
record
--- 35,39 ----
(import-lambda-definition %free-colormap (Xcolormap Xdisplay)
! "scx_Free_Colormap")
;; All colormap records need to be saved in a weak-list, to have only one
record
Index: colormap.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/colormap.scm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** colormap.scm 2001/07/30 14:43:22 1.4
--- colormap.scm 2001/07/31 14:54:53 1.5
***************
*** 13,17 ****
(import-lambda-definition %alloc-color (Xcolormap Xcolor Xdisplay)
! "Alloc_Color")
;; alloc-named-color looks up the named color with respect to the screen that
--- 13,17 ----
(import-lambda-definition %alloc-color (Xcolormap Xcolor Xdisplay)
! "scx_Alloc_Color")
;; alloc-named-color looks up the named color with respect to the screen that
***************
*** 34,36 ****
(import-lambda-definition %alloc-named-color (Xcolormap name Xdisplay)
! "Alloc_Named_Color")
\ No newline at end of file
--- 34,36 ----
(import-lambda-definition %alloc-named-color (Xcolormap name Xdisplay)
! "scx_Alloc_Named_Color")
\ No newline at end of file
Index: cursor-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/cursor-type.scm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** cursor-type.scm 2001/07/30 14:45:24 1.1
--- cursor-type.scm 2001/07/31 14:54:53 1.2
***************
*** 35,39 ****
(import-lambda-definition %free-cursor (Xdisplay Xcursor)
! "Free_Cursor")
;; All cursor records need to be saved in a weak-list, to have only one record
--- 35,39 ----
(import-lambda-definition %free-cursor (Xdisplay Xcursor)
! "scx_Free_Cursor")
;; All cursor records need to be saved in a weak-list, to have only one record
Index: display-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/display-type.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** display-type.scm 2001/07/30 14:43:22 1.3
--- display-type.scm 2001/07/31 14:54:53 1.4
***************
*** 72,74 ****
(import-lambda-definition %display-message-fd (Xdisplay)
! "Display_Message_fd")
\ No newline at end of file
--- 72,74 ----
(import-lambda-definition %display-message-fd (Xdisplay)
! "scx_Display_Message_fd")
\ No newline at end of file
Index: display.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/display.scm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** display.scm 2001/07/30 14:43:22 1.6
--- display.scm 2001/07/31 14:54:53 1.7
***************
*** 18,22 ****
(make-display Xdisplay #t)))))
! (import-lambda-definition %open-display (name) "Open_Display")
;; for compatibility with elk: is that correct?? see error.c
--- 18,23 ----
(make-display Xdisplay #t)))))
! (import-lambda-definition %open-display (name)
! "scx_Open_Display")
;; for compatibility with elk: is that correct?? see error.c
***************
*** 36,40 ****
(import-lambda-definition %default-root-window (Xdisplay)
! "Display_Default_Root_Window")
;; display-default-colormap return the default colormap for allocation on the
--- 37,41 ----
(import-lambda-definition %default-root-window (Xdisplay)
! "scx_Display_Default_Root_Window")
;; display-default-colormap return the default colormap for allocation on the
***************
*** 50,54 ****
(import-lambda-definition %default-colormap (Xdisplay)
! "Display_Default_Colormap")
;; display-default-gcontext return the default graphics context for the root
--- 51,55 ----
(import-lambda-definition %default-colormap (Xdisplay)
! "scx_Display_Default_Colormap")
;; display-default-gcontext return the default graphics context for the root
***************
*** 61,65 ****
(import-lambda-definition %default-gcontext (Xdisplay)
! "Display_Default_Gcontext")
;; display-default-depth returns the depth (number of planes) of the default
--- 62,66 ----
(import-lambda-definition %default-gcontext (Xdisplay)
! "scx_Display_Default_Gcontext")
;; display-default-depth returns the depth (number of planes) of the default
***************
*** 71,75 ****
(import-lambda-definition %default-depth (Xdisplay)
! "Display_Default_Depth")
;; display-default-screen-number returns the default screen number of the
given
--- 72,76 ----
(import-lambda-definition %default-depth (Xdisplay)
! "scx_Display_Default_Depth")
;; display-default-screen-number returns the default screen number of the
given
***************
*** 81,85 ****
(import-lambda-definition %default-screen-number (Xdisplay)
! "Display_Default_Screen_Number")
;; internal function
--- 82,86 ----
(import-lambda-definition %default-screen-number (Xdisplay)
! "scx_Display_Default_Screen_Number")
;; internal function
***************
*** 97,101 ****
(import-lambda-definition %display-cells (Xdisplay screen-number)
! "Display_Cells")
;; display-planes returns the depth of the root window of the specified
screen.
--- 98,102 ----
(import-lambda-definition %display-cells (Xdisplay screen-number)
! "scx_Display_Cells")
;; display-planes returns the depth of the root window of the specified
screen.
***************
*** 107,111 ****
(import-lambda-definition %display-planes (Xdisplay screen-number)
! "Display_Planes")
;; display-string returns the name of the display as a string - the same that
--- 108,112 ----
(import-lambda-definition %display-planes (Xdisplay screen-number)
! "scx_Display_Planes")
;; display-string returns the name of the display as a string - the same that
***************
*** 116,120 ****
(import-lambda-definition %display-string (Xdisplay)
! "Display_String")
;; Display-Vendor returns a pair, whose car is the vendor identification and
--- 117,121 ----
(import-lambda-definition %display-string (Xdisplay)
! "scx_Display_String")
;; Display-Vendor returns a pair, whose car is the vendor identification and
***************
*** 125,129 ****
(import-lambda-definition %display-vendor (Xdisplay)
! "Display_Vendor")
;; Display-protocol-version return a pair of major and minor version numbers
of
--- 126,130 ----
(import-lambda-definition %display-vendor (Xdisplay)
! "scx_Display_Vendor")
;; Display-protocol-version return a pair of major and minor version numbers
of
***************
*** 134,138 ****
(import-lambda-definition %display-protocol-version (Xdisplay)
! "Display_Protocol_Version")
;; display-screen-count returns the number of available screen on this
display.
--- 135,139 ----
(import-lambda-definition %display-protocol-version (Xdisplay)
! "scx_Display_Protocol_Version")
;; display-screen-count returns the number of available screen on this
display.
***************
*** 143,147 ****
(import-lambda-definition %display-screen-count (Xdisplay)
! "Display_Screen_Count")
;; display-image-byte-order returns one of the symbols 'lsb-first and
--- 144,148 ----
(import-lambda-definition %display-screen-count (Xdisplay)
! "scx_Display_Screen_Count")
;; display-image-byte-order returns one of the symbols 'lsb-first and
***************
*** 152,156 ****
(import-lambda-definition %display-image-byte-order (Xdisplay)
! "Display_Image_Byte_Order")
;; display-bitmap-unit returns the size of a bitmap's scanline unit in bits.
--- 153,157 ----
(import-lambda-definition %display-image-byte-order (Xdisplay)
! "scx_Display_Image_Byte_Order")
;; display-bitmap-unit returns the size of a bitmap's scanline unit in bits.
***************
*** 161,165 ****
(import-lambda-definition %display-bitmap-unit (Xdisplay)
! "Display_Bitmap_Unit")
;; display-bitmap-bit-order return one the symbols 'lbs-first and 'msb-first.
--- 162,166 ----
(import-lambda-definition %display-bitmap-unit (Xdisplay)
! "scx_Display_Bitmap_Unit")
;; display-bitmap-bit-order return one the symbols 'lbs-first and 'msb-first.
***************
*** 170,174 ****
(import-lambda-definition %display-bitmap-bit-order (Xdisplay)
! "Display_Bitmap_Bit_Order")
;; display-bitmap-pad returns the number of bits that each scanline must be
--- 171,175 ----
(import-lambda-definition %display-bitmap-bit-order (Xdisplay)
! "scx_Display_Bitmap_Bit_Order")
;; display-bitmap-pad returns the number of bits that each scanline must be
***************
*** 179,183 ****
(import-lambda-definition %display-bitmap-pad (Xdisplay)
! "Display_Bitmap_Pad")
;; display-width (-height) returns the width (height) of the screen in
pixels.
--- 180,184 ----
(import-lambda-definition %display-bitmap-pad (Xdisplay)
! "scx_Display_Bitmap_Pad")
;; display-width (-height) returns the width (height) of the screen in
pixels.
***************
*** 188,192 ****
(import-lambda-definition %display-width (Xdisplay)
! "Display_Width")
(define (display-height display)
--- 189,193 ----
(import-lambda-definition %display-width (Xdisplay)
! "scx_Display_Width")
(define (display-height display)
***************
*** 194,198 ****
(import-lambda-definition %display-height (Xdisplay)
! "Display_Height")
;; display-width-mm (-height-mm) returns the width (height) of the screen in
--- 195,199 ----
(import-lambda-definition %display-height (Xdisplay)
! "scx_Display_Height")
;; display-width-mm (-height-mm) returns the width (height) of the screen in
***************
*** 203,207 ****
(import-lambda-definition %display-width-mm (Xdisplay)
! "Display_Width_Mm")
(define (display-height-mm display)
--- 204,208 ----
(import-lambda-definition %display-width-mm (Xdisplay)
! "scx_Display_Width_Mm")
(define (display-height-mm display)
***************
*** 209,213 ****
(import-lambda-definition %display-height-mm (Xdisplay)
! "Display_Height_Mm")
;; See XDisplayMotionBufferSize.
--- 210,214 ----
(import-lambda-definition %display-height-mm (Xdisplay)
! "scx_Display_Height_Mm")
;; See XDisplayMotionBufferSize.
***************
*** 217,221 ****
(import-lambda-definition %display-motion-buffer-size (Xdisplay)
! "Display_Motion_Buffer_Size")
;; The display-flush-output flushes the output buffer. See XFlush.
--- 218,222 ----
(import-lambda-definition %display-motion-buffer-size (Xdisplay)
! "scx_Display_Motion_Buffer_Size")
;; The display-flush-output flushes the output buffer. See XFlush.
***************
*** 225,229 ****
(import-lambda-definition %display-flush-output (Xdisplay)
! "Display_Flush_Output")
;; display-wait-output flushes the output buffer and then waits until all
--- 226,230 ----
(import-lambda-definition %display-flush-output (Xdisplay)
! "scx_Display_Flush_Output")
;; display-wait-output flushes the output buffer and then waits until all
***************
*** 236,240 ****
(import-lambda-definition %display-wait-output (Xdisplay discard)
! "Display_Wait_Output")
;; display-no-op sends a NoOperation protocol request to the X server, thereby
--- 237,241 ----
(import-lambda-definition %display-wait-output (Xdisplay discard)
! "scx_Display_Wait_Output")
;; display-no-op sends a NoOperation protocol request to the X server, thereby
***************
*** 245,249 ****
(import-lambda-definition %no-op (Xdisplay)
! "No_Op")
;; for compatibility with Elk.
--- 246,250 ----
(import-lambda-definition %no-op (Xdisplay)
! "scx_No_Op")
;; for compatibility with Elk.
***************
*** 258,262 ****
(import-lambda-definition %display-list-depths (Xdisplay scr)
! "List_Depths")
;; for compatibility with Elk.
--- 259,263 ----
(import-lambda-definition %display-list-depths (Xdisplay scr)
! "scx_List_Depths")
;; for compatibility with Elk.
***************
*** 272,276 ****
(import-lambda-definition %display-list-pixmap-formats (Xdisplay)
! "List_Pixmap_Formats")
;; synchronize just sets the after-function of the display to
--- 273,277 ----
(import-lambda-definition %display-list-pixmap-formats (Xdisplay)
! "scx_List_Pixmap_Formats")
;; synchronize just sets the after-function of the display to
Index: drawable.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/drawable.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** drawable.scm 2001/07/30 14:43:22 1.3
--- drawable.scm 2001/07/31 14:54:53 1.4
***************
*** 1,5 ****
;; defined in window.c
(import-lambda-definition %get-geometry (Xdisplay Xdrawable)
! "Get_Geometry")
(define (get-geometry drawable)
--- 1,5 ----
;; defined in window.c
(import-lambda-definition %get-geometry (Xdisplay Xdrawable)
! "scx_Get_Geometry")
(define (get-geometry drawable)
Index: event-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/event-type.scm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** event-type.scm 2001/07/09 13:45:36 1.1
--- event-type.scm 2001/07/31 14:54:53 1.2
***************
*** 4,8 ****
(type event-type event-set-type!) ;a symbol
(args event-args event-set-args!)) ;a vector
-
-
-
--- 4,5 ----
Index: event.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/event.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** event.scm 2001/07/19 15:15:31 1.3
--- event.scm 2001/07/31 14:54:53 1.4
***************
*** 71,75 ****
(import-lambda-definition %peek-event (Xdisplay)
! "Peek_Event")
(define (events-pending display)
--- 71,75 ----
(import-lambda-definition %peek-event (Xdisplay)
! "scx_Peek_Event")
(define (events-pending display)
***************
*** 80,84 ****
(import-lambda-definition %events-pending (Xdisplay)
! "Events_Pending")
(define (get-motion-events window from-time to-time)
--- 80,84 ----
(import-lambda-definition %events-pending (Xdisplay)
! "scx_Events_Pending")
(define (get-motion-events window from-time to-time)
***************
*** 88,90 ****
(import-lambda-definition %get-motion-events (Xdisplay Xwindow from to)
! "Get_Motion_Events")
\ No newline at end of file
--- 88,90 ----
(import-lambda-definition %get-motion-events (Xdisplay Xwindow from to)
! "scx_Get_Motion_Events")
\ No newline at end of file
Index: font-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/font-type.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** font-type.scm 2001/07/30 14:43:22 1.3
--- font-type.scm 2001/07/31 14:54:53 1.4
***************
*** 29,33 ****
(import-lambda-definition %Get_Xfont (Xfontstruct)
! "Get_Xfont")
;; load-font loads a font by its name. See XLoadQueryFont.
--- 29,33 ----
(import-lambda-definition %Get_Xfont (Xfontstruct)
! "scx_Get_Xfont")
;; load-font loads a font by its name. See XLoadQueryFont.
***************
*** 41,45 ****
(import-lambda-definition %load-font (Xdisplay font_name)
! "Load_Font")
;; for compatibility with Elk:
--- 41,45 ----
(import-lambda-definition %load-font (Xdisplay font_name)
! "scx_Load_Font")
;; for compatibility with Elk:
***************
*** 67,71 ****
(import-lambda-definition %free-font (Xdisplay Xfontstruct)
! "Free_Font")
;; All font records need to be saved in a weak-list, to have only one record
--- 67,71 ----
(import-lambda-definition %free-font (Xdisplay Xfontstruct)
! "scx_Free_Font")
;; All font records need to be saved in a weak-list, to have only one record
Index: gcontext-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/gcontext-type.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** gcontext-type.scm 2001/07/19 15:21:09 1.2
--- gcontext-type.scm 2001/07/31 14:54:53 1.3
***************
*** 36,40 ****
(import-lambda-definition %free-gcontext (Xgcontext Xdisplay)
! "Free_Gc")
;; All gcontext records need to be saved in a weak-list, to have only one
record
--- 36,40 ----
(import-lambda-definition %free-gcontext (Xgcontext Xdisplay)
! "scx_Free_Gc")
;; All gcontext records need to be saved in a weak-list, to have only one
record
Index: gcontext.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/gcontext.scm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** gcontext.scm 2001/07/30 14:43:22 1.5
--- gcontext.scm 2001/07/31 14:54:53 1.6
***************
*** 20,24 ****
(import-lambda-definition %create-gcontext (Xdisplay Xdrawable alist)
! "Create_Gc")
;; ...
--- 20,24 ----
(import-lambda-definition %create-gcontext (Xdisplay Xdrawable alist)
! "scx_Create_Gc")
;; ...
***************
*** 33,37 ****
(import-lambda-definition %copy-gcontext (Xdisplay Xsource Xdest)
! "Copy_Gc")
;; ...
--- 33,37 ----
(import-lambda-definition %copy-gcontext (Xdisplay Xsource Xdest)
! "scx_Copy_Gc")
;; ...
***************
*** 64,68 ****
(import-lambda-definition %get-gcontext-values (Xgcontext Xdisplay)
! "Get_Gc_Values")
;;...
--- 64,68 ----
(import-lambda-definition %get-gcontext-values (Xgcontext Xdisplay)
! "scx_Get_Gc_Values")
;;...
***************
*** 117,121 ****
(import-lambda-definition %change-gcontext (Xgcontext Xdisplay args)
! "Change_Gc")
(define (make-gcontext-setter name)
--- 117,121 ----
(import-lambda-definition %change-gcontext (Xgcontext Xdisplay args)
! "scx_Change_Gc")
(define (make-gcontext-setter name)
***************
*** 157,161 ****
(import-lambda-definition %set-dashlist (Xgcontext Xdisplay dashoffset
dashlist)
! "Set_Gcontext_Dashlist")
;; ...
--- 157,161 ----
(import-lambda-definition %set-dashlist (Xgcontext Xdisplay dashoffset
dashlist)
! "scx_Set_Gcontext_Dashlist")
;; ...
***************
*** 168,172 ****
(import-lambda-definition %set-gcontext-clip-rectangles! (Xgcontext Xdisplay
x
y v ord)
! "Set_Gcontext_Clip_Rectangles")
;; ...
--- 168,172 ----
(import-lambda-definition %set-gcontext-clip-rectangles! (Xgcontext Xdisplay
x
y v ord)
! "scx_Set_Gcontext_Clip_Rectangles")
;; ...
***************
*** 177,181 ****
(import-lambda-definition %query-best-size (Xdisplay width height shape)
! "Query_Best_Size")
(define (query-best-cursor display width height)
--- 177,181 ----
(import-lambda-definition %query-best-size (Xdisplay width height shape)
! "scx_Query_Best_Size")
(define (query-best-cursor display width height)
Index: pixel.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/pixel.scm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pixel.scm 2001/06/11 15:28:32 1.1
--- pixel.scm 2001/07/31 14:54:53 1.2
***************
*** 5,9 ****
(import-lambda-definition %black-pixel (Xdisplay)
! "Black_Pixel")
(define (white-pixel display)
--- 5,9 ----
(import-lambda-definition %black-pixel (Xdisplay)
! "scx_Black_Pixel")
(define (white-pixel display)
***************
*** 11,13 ****
(import-lambda-definition %white-pixel (Xdisplay)
! "White_Pixel")
\ No newline at end of file
--- 11,13 ----
(import-lambda-definition %white-pixel (Xdisplay)
! "scx_White_Pixel")
\ No newline at end of file
Index: pixmap-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/pixmap-type.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pixmap-type.scm 2001/07/30 14:43:22 1.3
--- pixmap-type.scm 2001/07/31 14:54:53 1.4
***************
*** 37,41 ****
(import-lambda-definition %free-pixmap (Xdisplay Xpixmap)
! "Free_Pixmap")
;; All pixmap records need to be saved in a weak-list, to have only one record
--- 37,41 ----
(import-lambda-definition %free-pixmap (Xdisplay Xpixmap)
! "scx_Free_Pixmap")
;; All pixmap records need to be saved in a weak-list, to have only one record
Index: pixmap.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/pixmap.scm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pixmap.scm 2001/07/30 14:43:22 1.4
--- pixmap.scm 2001/07/31 14:54:53 1.5
***************
*** 13,17 ****
(import-lambda-definition %create-pixmap (Xdisplay Xdrawable w h depth)
! "Create_Pixmap")
; ---
--- 13,17 ----
(import-lambda-definition %create-pixmap (Xdisplay Xdrawable w h depth)
! "scx_Create_Pixmap")
; ---
***************
*** 25,29 ****
(import-lambda-definition %create-bitmap-from-data (Xdisplay Xdrawable data w
h)
! "Create_Bitmap_From_Data")
; ---
--- 25,29 ----
(import-lambda-definition %create-bitmap-from-data (Xdisplay Xdrawable data w
h)
! "scx_Create_Bitmap_From_Data")
; ---
***************
*** 41,45 ****
(import-lambda-definition %create-pixmap-from-bitmap-data
(Xdisplay Xdrawabel data w h f b depth)
! "Create_Pixmap_From_Bitmap_Data")
; Returns a list of five elements: (pixmap widht heigth x y)
--- 41,45 ----
(import-lambda-definition %create-pixmap-from-bitmap-data
(Xdisplay Xdrawabel data w h f b depth)
! "scx_Create_Pixmap_From_Bitmap_Data")
; Returns a list of five elements: (pixmap widht heigth x y)
***************
*** 52,56 ****
(import-lambda-definition %read-bitmap-file (Xdisplay Xdrawable file)
! "Read_Bitmap_File")
--- 52,56 ----
(import-lambda-definition %read-bitmap-file (Xdisplay Xdrawable file)
! "scx_Read_Bitmap_File")
***************
*** 69,71 ****
(import-lambda-definition %write-bitmap-file (Xdisplay file Xpixmap w h x y)
! "Write_Bitmap_File")
\ No newline at end of file
--- 69,71 ----
(import-lambda-definition %write-bitmap-file (Xdisplay file Xpixmap w h x y)
! "scx_Write_Bitmap_File")
\ No newline at end of file
Index: property.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/property.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** property.scm 2001/07/30 14:43:22 1.3
--- property.scm 2001/07/31 14:54:53 1.4
***************
*** 12,17 ****
name))))
! (import-labmda-definition %intern-atom (Xdisplay name)
! "Intern_Atom")
--- 12,17 ----
name))))
! (import-lambda-definition %intern-atom (Xdisplay name)
! "scx_Intern_Atom")
***************
*** 25,29 ****
(import-lambda-definition %find-atom (Xdisplay name)
! "Find_Atom")
; --- RETURN: string
--- 25,29 ----
(import-lambda-definition %find-atom (Xdisplay name)
! "scx_Find_Atom")
; --- RETURN: string
***************
*** 34,38 ****
(import-lambda-definition %atom-name (Xdisplay atom)
! "Atom_Name")
; --- RETURN: vector of atoms
--- 34,38 ----
(import-lambda-definition %atom-name (Xdisplay atom)
! "scx_Atom_Name")
; --- RETURN: vector of atoms
***************
*** 45,49 ****
(import-lambda-definition %list-properties (Xdisplay Xwindow)
! "List_Properties")
--- 45,49 ----
(import-lambda-definition %list-properties (Xdisplay Xwindow)
! "scx_List_Properties")
***************
*** 59,63 ****
(import-lambda-definition %get-property (Xwindow Xdisplay Xatom_prop
Xatom_type
start len deletep)
! "Get_Property")
--- 59,63 ----
(import-lambda-definition %get-property (Xwindow Xdisplay Xatom_prop
Xatom_type
start len deletep)
! "scx_Get_Property")
***************
*** 73,77 ****
(import-lambda-definition %change-property (Xdisplay Xwindow Xatom_prop
Xatom_type format mode data)
! "Change_Property")
; --- RETURN -> "void"
--- 73,77 ----
(import-lambda-definition %change-property (Xdisplay Xwindow Xatom_prop
Xatom_type format mode data)
! "scx_Change_Property")
; --- RETURN -> "void"
***************
*** 83,87 ****
(import-lambda-definition %delete-property (Xdisplay Xwindow Xatom_prop)
! "Delete_Property")
--- 83,87 ----
(import-lambda-definition %delete-property (Xdisplay Xwindow Xatom_prop)
! "scx_Delete_Property")
***************
*** 96,100 ****
(import-lambda-definition %rotate-properties (Xdisplay Xwindow Xatom_vec
delta)
! "Rotate_Properties")
; --- RETURN -> "void"
--- 96,100 ----
(import-lambda-definition %rotate-properties (Xdisplay Xwindow Xatom_vec
delta)
! "scx_Rotate_Properties")
; --- RETURN -> "void"
***************
*** 108,112 ****
(import-lambda-definition %set-selection-owner! (Xdisplay Xatom_s
Xwindow_owner
time)
! "Set_Selection_Owner")
--- 108,112 ----
(import-lambda-definition %set-selection-owner! (Xdisplay Xatom_s
Xwindow_owner
time)
! "scx_Set_Selection_Owner")
***************
*** 121,125 ****
(import-lambda-definition %get-selection-owner (Xdisplay Xatom_s)
! "Get_Selection_Owner")
; --- RETURN -> "void"
--- 121,125 ----
(import-lambda-definition %get-selection-owner (Xdisplay Xatom_s)
! "scx_Get_Selection_Owner")
; --- RETURN -> "void"
***************
*** 137,141 ****
(import-lambda-definition %convert-selection (Xdisplay Xatom_s Xatom_t
Xwindow time)
! "Convert_Selection")
--- 137,141 ----
(import-lambda-definition %convert-selection (Xdisplay Xatom_s Xatom_t
Xwindow time)
! "scx_Convert_Selection")
Index: text.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/text.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** text.scm 2001/07/30 14:43:22 1.2
--- text.scm 2001/07/31 14:54:53 1.3
***************
*** 51,55 ****
(import-lambda-definition %text-width (Xfontstruct text format)
! "Text_Width")
; --- Each extents-...-functions returns an number.
--- 51,55 ----
(import-lambda-definition %text-width (Xfontstruct text format)
! "scx_Text_Width")
; --- Each extents-...-functions returns an number.
***************
*** 63,67 ****
! (define (extends-width font text format)
(extents-intern font text format 2))
--- 63,67 ----
! (define (extents-width font text format)
(extents-intern font text format 2))
***************
*** 83,87 ****
(import-lambda-definition %extents-text (Xfontstruct text format which)
! "Extents_Text")
; --- draw-image-text get's a mixed vector (text) with integer and
--- 83,87 ----
(import-lambda-definition %extents-text (Xfontstruct text format which)
! "scx_Extents_Text")
; --- draw-image-text get's a mixed vector (text) with integer and
***************
*** 100,104 ****
(import-lambda-definition %draw-image-text (Xdisplay Xdrawable Xgcontext
x y text format)
! "Draw_Image_Text")
; --- text is a Vector of font-object and chars.
--- 100,104 ----
(import-lambda-definition %draw-image-text (Xdisplay Xdrawable Xgcontext
x y text format)
! "scx_Draw_Image_Text")
; --- text is a Vector of font-object and chars.
***************
*** 107,122 ****
(let ((vec-text (transform-text text))
(int-format (change-format format)))
! (if (check-format? vec-text int-format)
(%draw-poly-text (display-Xdisplay (drawable-display drawable))
(drawable-Xobject drawable) (gcontext-Xgcontext
gcontext)
! x y vec-text (change-format! format)))))
(import-lambda-definition %draw-poly-text (Xdisplay Xdrawable Xgcontext
x y text format)
! "Draw_Poly_Text")
-
; --- Extracts the Xfont from the scheme48-font-record and makes vectors
; from formerly integer vector entries...
--- 107,130 ----
(let ((vec-text (transform-text text))
(int-format (change-format format)))
! (if (check-format vec-text int-format)
(%draw-poly-text (display-Xdisplay (drawable-display drawable))
(drawable-Xobject drawable) (gcontext-Xgcontext
gcontext)
! x y vec-text int-format))))
(import-lambda-definition %draw-poly-text (Xdisplay Xdrawable Xgcontext
x y text format)
! "scx_Draw_Poly_Text")
+ (define (check-format (trans-text int-format))
+ (call-with-current-continuation
+ (lambda (return)
+ (for-each (lambda (obj)
+ (if (and (vector? obj)
+ (not (vec-format? obj int-format)))
+ (return #f)))
+ (vector->list trans-text))
+ #t)))
; --- Extracts the Xfont from the scheme48-font-record and makes vectors
; from formerly integer vector entries...
***************
*** 153,169 ****
(define (translate-text string)
! (if (string? string)
! (let* ((len (string-length string))
! (res-vec (make-vector len)))
! (let loop ((i 0))
! (if (= i len)
! res-vec
! (begin
! (vector-set! res-vec i (char->integer (string-ref string i)))
! (loop (+ i 1))))))
! (error "the parameter istn't a string" translate-string)))
!
!
!
!
!
--- 161,170 ----
(define (translate-text string)
! (let* ((len (string-length string))
! (res-vec (make-vector len)))
! (let loop ((i 0))
! (if (= i len)
! res-vec
! (begin
! (vector-set! res-vec i (char->integer (string-ref string i)))
! (loop (+ i 1)))))))
Index: window-type.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/window-type.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** window-type.scm 2001/07/19 15:21:09 1.3
--- window-type.scm 2001/07/31 14:54:53 1.4
***************
*** 39,43 ****
(import-lambda-definition %destroy-window (Xdisplay Xwindow)
! "Destroy_Window")
;; All window records need to be saved in a weak-list, to have only one record
--- 39,43 ----
(import-lambda-definition %destroy-window (Xdisplay Xwindow)
! "scx_Destroy_Window")
;; All window records need to be saved in a weak-list, to have only one record
Index: window.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/window.scm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** window.scm 2001/07/30 14:39:14 1.6
--- window.scm 2001/07/31 14:54:53 1.7
***************
*** 34,38 ****
(import-lambda-definition %create-window (Xdisplay Xparent x y width height
border-width attrAlist)
! "Create_Window")
;; change-window-attributes takes an alist of names and values...
--- 34,38 ----
(import-lambda-definition %create-window (Xdisplay Xparent x y width height
border-width attrAlist)
! "scx_Create_Window")
;; change-window-attributes takes an alist of names and values...
***************
*** 61,65 ****
(import-lambda-definition %change-window-attributes (Xwindow Xdisplay alist)
! "Change_Window_Attributes")
;; simple functions that use change-window-attributes
--- 61,65 ----
(import-lambda-definition %change-window-attributes (Xwindow Xdisplay alist)
! "scx_Change_Window_Attributes")
;; simple functions that use change-window-attributes
***************
*** 122,126 ****
(import-lambda-definition %get-window-attributes (Xdisplay Xwindow)
! "Get_Window_Attributes")
(define (make-win-attr-getter name)
--- 122,126 ----
(import-lambda-definition %get-window-attributes (Xdisplay Xwindow)
! "scx_Get_Window_Attributes")
(define (make-win-attr-getter name)
***************
*** 167,171 ****
(import-lambda-definition %configure-window (Xwindow Xdisplay alist)
! "Configure_Window")
;; the following mutators are based on configure-window
--- 167,171 ----
(import-lambda-definition %configure-window (Xwindow Xdisplay alist)
! "scx_Configure_Window")
;; the following mutators are based on configure-window
***************
*** 191,195 ****
(import-lambda-definition %map-window (Xwindow Xdisplay)
! "Map_Window")
;; The unmap-window function unmaps the specified window and causes the
--- 191,195 ----
(import-lambda-definition %map-window (Xwindow Xdisplay)
! "scx_Map_Window")
;; The unmap-window function unmaps the specified window and causes the
***************
*** 201,205 ****
(import-lambda-definition %unmap-window (Xwindow Xdisplay)
! "Unmap_Window")
;; The destroy-subwindows function destroys all inferior windows of the
--- 201,205 ----
(import-lambda-definition %unmap-window (Xwindow Xdisplay)
! "scx_Unmap_Window")
;; The destroy-subwindows function destroys all inferior windows of the
***************
*** 211,215 ****
(import-lambda-definition %destroy-subwindows (Xwindow Xdisplay)
! "Destroy_Subwindows")
;; The map-subwindows function maps all subwindows for a specified window in
--- 211,215 ----
(import-lambda-definition %destroy-subwindows (Xwindow Xdisplay)
! "scx_Destroy_Subwindows")
;; The map-subwindows function maps all subwindows for a specified window in
***************
*** 221,225 ****
(import-lambda-definition %map-subwindows (Xwindow Xdisplay)
! "Map_Subwindows")
;; The unmap-subwindows function unmaps all subwindows for each subwindow
--- 221,225 ----
(import-lambda-definition %map-subwindows (Xwindow Xdisplay)
! "scx_Map_Subwindows")
;; The unmap-subwindows function unmaps all subwindows for each subwindow
***************
*** 231,235 ****
(import-lambda-definition %unmap-subwindows (Xwindow Xdisplay)
! "Unmap_Subwindows")
;; See XCirculateSubwindows.
--- 231,235 ----
(import-lambda-definition %unmap-subwindows (Xwindow Xdisplay)
! "scx_Unmap_Subwindows")
;; See XCirculateSubwindows.
***************
*** 242,246 ****
(import-lambda-definition %circulate-subwindows (Xwindow Xdisplay dir)
! "Circulate_Subwindows")
;; The clear-window function clears the entire area in the specified window.
--- 242,246 ----
(import-lambda-definition %circulate-subwindows (Xwindow Xdisplay dir)
! "scx_Circulate_Subwindows")
;; The clear-window function clears the entire area in the specified window.
***************
*** 289,293 ****
(import-lambda-definition %query-tree (Xwindow Xdisplay)
! "Query_Tree")
;; translate-coordinates takes the x and y coordinates relative to the source
--- 289,293 ----
(import-lambda-definition %query-tree (Xwindow Xdisplay)
! "scx_Query_Tree")
;; translate-coordinates takes the x and y coordinates relative to the source
***************
*** 312,316 ****
(import-lambda-definition %translate-coordinates (Xdisplay srcXwindow x y
srcXwindow)
! "Translate_Coordinates")
--- 312,316 ----
(import-lambda-definition %translate-coordinates (Xdisplay srcXwindow x y
srcXwindow)
! "scx_Translate_Coordinates")
***************
*** 329,331 ****
(import-lambda-definition %query-pointer (Xdisplay Xwindow)
! "Query_Pointer")
\ No newline at end of file
--- 329,331 ----
(import-lambda-definition %query-pointer (Xdisplay Xwindow)
! "scx_Query_Pointer")
\ No newline at end of file
|