diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/ecore/src/lib/ecore_x/xlib/ecore_x_region.c | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to '')
-rw-r--r-- | libraries/ecore/src/lib/ecore_x/xlib/ecore_x_region.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_region.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_region.c index 7cc66e3..81d7eea 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_region.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_region.c | |||
@@ -32,7 +32,7 @@ ecore_x_xregion_new() | |||
32 | { | 32 | { |
33 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 33 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
34 | return (Ecore_X_XRegion *)XCreateRegion(); | 34 | return (Ecore_X_XRegion *)XCreateRegion(); |
35 | } /* ecore_x_xregion_new */ | 35 | } |
36 | 36 | ||
37 | EAPI void | 37 | EAPI void |
38 | ecore_x_xregion_free(Ecore_X_XRegion *region) | 38 | ecore_x_xregion_free(Ecore_X_XRegion *region) |
@@ -42,20 +42,20 @@ ecore_x_xregion_free(Ecore_X_XRegion *region) | |||
42 | return; | 42 | return; |
43 | 43 | ||
44 | XDestroyRegion((Region)region); | 44 | XDestroyRegion((Region)region); |
45 | } /* ecore_x_xregion_free */ | 45 | } |
46 | 46 | ||
47 | EAPI Eina_Bool | 47 | EAPI Eina_Bool |
48 | ecore_x_xregion_set(Ecore_X_XRegion *region, | 48 | ecore_x_xregion_set(Ecore_X_XRegion *region, |
49 | Ecore_X_GC gc) | 49 | Ecore_X_GC gc) |
50 | { | 50 | { |
51 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 51 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
52 | return XSetRegion(_ecore_x_disp, gc, (Region)region) ? EINA_TRUE : EINA_FALSE; | 52 | return XSetRegion(_ecore_x_disp, gc, (Region)region) ? EINA_TRUE : EINA_FALSE; |
53 | } /* ecore_x_xregion_set */ | 53 | } |
54 | 54 | ||
55 | EAPI void | 55 | EAPI void |
56 | ecore_x_xregion_translate(Ecore_X_XRegion *region, | 56 | ecore_x_xregion_translate(Ecore_X_XRegion *region, |
57 | int x, | 57 | int x, |
58 | int y) | 58 | int y) |
59 | { | 59 | { |
60 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 60 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
61 | if (!region) | 61 | if (!region) |
@@ -63,7 +63,7 @@ ecore_x_xregion_translate(Ecore_X_XRegion *region, | |||
63 | 63 | ||
64 | /* return value not used */ | 64 | /* return value not used */ |
65 | XOffsetRegion((Region)region, x, y); | 65 | XOffsetRegion((Region)region, x, y); |
66 | } /* ecore_x_xregion_translate */ | 66 | } |
67 | 67 | ||
68 | EAPI Eina_Bool | 68 | EAPI Eina_Bool |
69 | ecore_x_xregion_intersect(Ecore_X_XRegion *dst, | 69 | ecore_x_xregion_intersect(Ecore_X_XRegion *dst, |
@@ -72,7 +72,7 @@ ecore_x_xregion_intersect(Ecore_X_XRegion *dst, | |||
72 | { | 72 | { |
73 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 73 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
74 | return XIntersectRegion((Region)r1, (Region)r2, (Region)dst) ? EINA_TRUE : EINA_FALSE; | 74 | return XIntersectRegion((Region)r1, (Region)r2, (Region)dst) ? EINA_TRUE : EINA_FALSE; |
75 | } /* ecore_x_xregion_intersect */ | 75 | } |
76 | 76 | ||
77 | EAPI Eina_Bool | 77 | EAPI Eina_Bool |
78 | ecore_x_xregion_union(Ecore_X_XRegion *dst, | 78 | ecore_x_xregion_union(Ecore_X_XRegion *dst, |
@@ -81,11 +81,11 @@ ecore_x_xregion_union(Ecore_X_XRegion *dst, | |||
81 | { | 81 | { |
82 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 82 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
83 | return XUnionRegion((Region)r1, (Region)r2, (Region)dst) ? EINA_TRUE : EINA_FALSE; | 83 | return XUnionRegion((Region)r1, (Region)r2, (Region)dst) ? EINA_TRUE : EINA_FALSE; |
84 | } /* ecore_x_xregion_union */ | 84 | } |
85 | 85 | ||
86 | EAPI Eina_Bool | 86 | EAPI Eina_Bool |
87 | ecore_x_xregion_union_rect(Ecore_X_XRegion *dst, | 87 | ecore_x_xregion_union_rect(Ecore_X_XRegion *dst, |
88 | Ecore_X_XRegion *src, | 88 | Ecore_X_XRegion *src, |
89 | Ecore_X_Rectangle *rect) | 89 | Ecore_X_Rectangle *rect) |
90 | { | 90 | { |
91 | XRectangle xr; | 91 | XRectangle xr; |
@@ -97,7 +97,7 @@ ecore_x_xregion_union_rect(Ecore_X_XRegion *dst, | |||
97 | xr.height = rect->height; | 97 | xr.height = rect->height; |
98 | 98 | ||
99 | return XUnionRectWithRegion(&xr, (Region)src, (Region)dst) ? EINA_TRUE : EINA_FALSE; | 99 | return XUnionRectWithRegion(&xr, (Region)src, (Region)dst) ? EINA_TRUE : EINA_FALSE; |
100 | } /* ecore_x_xregion_union_rect */ | 100 | } |
101 | 101 | ||
102 | EAPI Eina_Bool | 102 | EAPI Eina_Bool |
103 | ecore_x_xregion_subtract(Ecore_X_XRegion *dst, | 103 | ecore_x_xregion_subtract(Ecore_X_XRegion *dst, |
@@ -106,7 +106,7 @@ ecore_x_xregion_subtract(Ecore_X_XRegion *dst, | |||
106 | { | 106 | { |
107 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 107 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
108 | return XSubtractRegion((Region)rm, (Region)rs, (Region)dst) ? EINA_TRUE : EINA_FALSE; | 108 | return XSubtractRegion((Region)rm, (Region)rs, (Region)dst) ? EINA_TRUE : EINA_FALSE; |
109 | } /* ecore_x_xregion_subtract */ | 109 | } |
110 | 110 | ||
111 | EAPI Eina_Bool | 111 | EAPI Eina_Bool |
112 | ecore_x_xregion_is_empty(Ecore_X_XRegion *region) | 112 | ecore_x_xregion_is_empty(Ecore_X_XRegion *region) |
@@ -116,7 +116,7 @@ ecore_x_xregion_is_empty(Ecore_X_XRegion *region) | |||
116 | 116 | ||
117 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 117 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
118 | return XEmptyRegion((Region)region) ? EINA_TRUE : EINA_FALSE; | 118 | return XEmptyRegion((Region)region) ? EINA_TRUE : EINA_FALSE; |
119 | } /* ecore_x_xregion_is_empty */ | 119 | } |
120 | 120 | ||
121 | EAPI Eina_Bool | 121 | EAPI Eina_Bool |
122 | ecore_x_xregion_is_equal(Ecore_X_XRegion *r1, | 122 | ecore_x_xregion_is_equal(Ecore_X_XRegion *r1, |
@@ -127,22 +127,22 @@ ecore_x_xregion_is_equal(Ecore_X_XRegion *r1, | |||
127 | 127 | ||
128 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 128 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
129 | return XEqualRegion((Region)r1, (Region)r1) ? EINA_TRUE : EINA_FALSE; | 129 | return XEqualRegion((Region)r1, (Region)r1) ? EINA_TRUE : EINA_FALSE; |
130 | } /* ecore_x_xregion_is_equal */ | 130 | } |
131 | 131 | ||
132 | EAPI Eina_Bool | 132 | EAPI Eina_Bool |
133 | ecore_x_xregion_point_contain(Ecore_X_XRegion *region, | 133 | ecore_x_xregion_point_contain(Ecore_X_XRegion *region, |
134 | int x, | 134 | int x, |
135 | int y) | 135 | int y) |
136 | { | 136 | { |
137 | if (!region) | 137 | if (!region) |
138 | return EINA_FALSE; | 138 | return EINA_FALSE; |
139 | 139 | ||
140 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 140 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
141 | return XPointInRegion((Region)region, x, y) ? EINA_TRUE : EINA_FALSE; | 141 | return XPointInRegion((Region)region, x, y) ? EINA_TRUE : EINA_FALSE; |
142 | } /* ecore_x_xregion_point_contain */ | 142 | } |
143 | 143 | ||
144 | EAPI Eina_Bool | 144 | EAPI Eina_Bool |
145 | ecore_x_xregion_rect_contain(Ecore_X_XRegion *region, | 145 | ecore_x_xregion_rect_contain(Ecore_X_XRegion *region, |
146 | Ecore_X_Rectangle *rect) | 146 | Ecore_X_Rectangle *rect) |
147 | { | 147 | { |
148 | if (!region || !rect) | 148 | if (!region || !rect) |
@@ -154,5 +154,5 @@ ecore_x_xregion_rect_contain(Ecore_X_XRegion *region, | |||
154 | rect->y, | 154 | rect->y, |
155 | rect->width, | 155 | rect->width, |
156 | rect->height) ? EINA_TRUE : EINA_FALSE; | 156 | rect->height) ? EINA_TRUE : EINA_FALSE; |
157 | } /* ecore_x_xregion_rect_contain */ | 157 | } |
158 | 158 | ||