scsh-conservatory
/
scx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed Iso-C problems 

- minor bugs fixed.
This commit is contained in:
frese 2003-10-23 12:38:33 +00:00
parent 3fd2ba17b6
commit ada7af2ab3
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
c/xlib/region.c
View File

@ -1,7 +1,7 @@
#include "xlib.h" #include "xlib.h"
#define scx_extract_region(x) (Region)s48_extract_pointer(x) #define scx_extract_region(x) (Region)S48_EXTRACT_POINTER(x)
#define scx_enter_region(r) s48_enter_pointer(r) #define scx_enter_region(r) S48_ENTER_POINTER(r)
/*** create or destroy regions *************************************/ /*** create or destroy regions *************************************/
@ -27,22 +27,24 @@ s48_value scx_Empty_Region(s48_value r) {
} }
s48_value scx_Equal_Region(s48_value r1, s48_value r2) { s48_value scx_Equal_Region(s48_value r1, s48_value r2) {
Bool res;
S48_DECLARE_GC_PROTECT_2(r1, r2); S48_DECLARE_GC_PROTECT_2(r1, r2);
Bool res = XEqualRegion(scx_extract_region(r1), res = XEqualRegion(scx_extract_region(r1),
scx_extract_region(r2)); scx_extract_region(r2));
S48_GC_RETURN(S48_ENTER_BOOLEAN(res)); S48_GC_RETURN(S48_ENTER_BOOLEAN(res));
} }
s48_value scx_Point_In_Region(s48_value r, s48_value x, s48_value y) { s48_value scx_Point_In_Region(s48_value r, s48_value x, s48_value y) {
Bool res;
S48_DECLARE_GC_PROTECT_3(r, x, y); S48_DECLARE_GC_PROTECT_3(r, x, y);
Bool res = XPointInRegion(scx_extract_region(r), res = XPointInRegion(scx_extract_region(r),
s48_extract_integer(x), s48_extract_integer(x),
s48_extract_integer(y)); s48_extract_integer(y));
S48_GC_RETURN(S48_ENTER_BOOLEAN(res)); S48_GC_RETURN(S48_ENTER_BOOLEAN(res));
} }
extern s48_value scx_rect_in_region_type_binding; s48_value scx_rect_in_region_type_binding = S48_FALSE;
extern s48_value scx_rect_in_region_types_binding; s48_value scx_rect_in_region_types_binding = S48_FALSE;
#define scx_extract_rect_in_region_type(x) \ #define scx_extract_rect_in_region_type(x) \
S48_EXTRACT_ENUM(x, scx_rect_in_region_type_binding) S48_EXTRACT_ENUM(x, scx_rect_in_region_type_binding)
#define scx_enter_rect_in_region_type(x) \ #define scx_enter_rect_in_region_type(x) \
@ -134,7 +136,7 @@ s48_value scx_Polygon_Region(s48_value points, s48_value fill_rule) {
points = S48_CDR(points); points = S48_CDR(points);
} }
r = XPolygonRegion(ps, n, scx_extract_fill_rule(fill_rule)); r = XPolygonRegion(ps, n, scx_extract_fill_rule(fill_rule));
S48_RETURN(scx_enter_region(r)); S48_GC_RETURN(scx_enter_region(r));
} }
s48_value scx_Clip_Box(s48_value r) { s48_value scx_Clip_Box(s48_value r) {

2
scheme/xlib/region.scm
View File

@ -18,7 +18,7 @@
(define-enumerated-type rect-in-region-type :rect-in-region-type (define-enumerated-type rect-in-region-type :rect-in-region-type
rect-in-region-type? rect-in-region-types rect-in-region-type-name rect-in-region-type? rect-in-region-types rect-in-region-type-name
rect-in-region-type-index rect-in-region-type-index
(rectangle-in rectangle-out rectangle-part)) (out in part))
(define-exported-binding "scx-rect-in-region-type" :rect-in-region-type) (define-exported-binding "scx-rect-in-region-type" :rect-in-region-type)
(define-exported-binding "scx-rect-in-region-types" rect-in-region-types) (define-exported-binding "scx-rect-in-region-types" rect-in-region-types)

4
scheme/xlib/xlib-interfaces.scm
View File

@ -799,11 +799,11 @@
;; region.scm ***************************************************** ;; region.scm *****************************************************
create-region set-region destroy-region create-region set-region destroy-region
empty-region? equal-region? point-in-region? empty-region? equal-region? point-in-region?
((rectangle-in rectangle-out rectangle-part) :enumeration) (rect-in-region-type :enumeration)
rect-in-region? intersect-region! intersect-region rect-in-region? intersect-region! intersect-region
union-region! union-region union-rect-with-region! union-rect-with-region union-region! union-region union-rect-with-region! union-rect-with-region
subtract-region! subtract-region xor-region! xor-region subtract-region! subtract-region xor-region! xor-region
offset-region! shrink-region offset-region! shrink-region!
polygon-region clip-box polygon-region clip-box
;; atom.scm ******************************************************* ;; atom.scm *******************************************************