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_cursor.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 'libraries/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c')
-rw-r--r-- | libraries/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c index 434505c..a968c56 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c | |||
@@ -10,15 +10,15 @@ EAPI Eina_Bool | |||
10 | ecore_x_cursor_color_supported_get(void) | 10 | ecore_x_cursor_color_supported_get(void) |
11 | { | 11 | { |
12 | return _ecore_x_xcursor; | 12 | return _ecore_x_xcursor; |
13 | } /* ecore_x_cursor_color_supported_get */ | 13 | } |
14 | 14 | ||
15 | EAPI Ecore_X_Cursor | 15 | EAPI Ecore_X_Cursor |
16 | ecore_x_cursor_new(Ecore_X_Window win, | 16 | ecore_x_cursor_new(Ecore_X_Window win, |
17 | int *pixels, | 17 | int *pixels, |
18 | int w, | 18 | int w, |
19 | int h, | 19 | int h, |
20 | int hot_x, | 20 | int hot_x, |
21 | int hot_y) | 21 | int hot_y) |
22 | { | 22 | { |
23 | #ifdef ECORE_XCURSOR | 23 | #ifdef ECORE_XCURSOR |
24 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 24 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
@@ -43,7 +43,7 @@ ecore_x_cursor_new(Ecore_X_Window win, | |||
43 | // r = (((pixels[i] >> 16) & 0xff) * a) / 0xff; | 43 | // r = (((pixels[i] >> 16) & 0xff) * a) / 0xff; |
44 | // g = (((pixels[i] >> 8 ) & 0xff) * a) / 0xff; | 44 | // g = (((pixels[i] >> 8 ) & 0xff) * a) / 0xff; |
45 | // b = (((pixels[i] ) & 0xff) * a) / 0xff; | 45 | // b = (((pixels[i] ) & 0xff) * a) / 0xff; |
46 | xci->pixels[i] = pixels[i]; | 46 | xci->pixels[i] = pixels[i]; |
47 | // (a << 24) | (r << 16) | (g << 8) | (b); | 47 | // (a << 24) | (r << 16) | (g << 8) | (b); |
48 | } | 48 | } |
49 | c = XcursorImageLoadCursor(_ecore_x_disp, xci); | 49 | c = XcursorImageLoadCursor(_ecore_x_disp, xci); |
@@ -200,14 +200,14 @@ ecore_x_cursor_new(Ecore_X_Window win, | |||
200 | } | 200 | } |
201 | 201 | ||
202 | return 0; | 202 | return 0; |
203 | } /* ecore_x_cursor_new */ | 203 | } |
204 | 204 | ||
205 | EAPI void | 205 | EAPI void |
206 | ecore_x_cursor_free(Ecore_X_Cursor c) | 206 | ecore_x_cursor_free(Ecore_X_Cursor c) |
207 | { | 207 | { |
208 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 208 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
209 | XFreeCursor(_ecore_x_disp, c); | 209 | XFreeCursor(_ecore_x_disp, c); |
210 | } /* ecore_x_cursor_free */ | 210 | } |
211 | 211 | ||
212 | /* | 212 | /* |
213 | * Returns the cursor for the given shape. | 213 | * Returns the cursor for the given shape. |
@@ -220,7 +220,7 @@ ecore_x_cursor_shape_get(int shape) | |||
220 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 220 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
221 | /* Shapes are defined in Ecore_X_Cursor.h */ | 221 | /* Shapes are defined in Ecore_X_Cursor.h */ |
222 | return XCreateFontCursor(_ecore_x_disp, shape); | 222 | return XCreateFontCursor(_ecore_x_disp, shape); |
223 | } /* ecore_x_cursor_shape_get */ | 223 | } |
224 | 224 | ||
225 | EAPI void | 225 | EAPI void |
226 | ecore_x_cursor_size_set(int size) | 226 | ecore_x_cursor_size_set(int size) |
@@ -231,7 +231,7 @@ ecore_x_cursor_size_set(int size) | |||
231 | #else /* ifdef ECORE_XCURSOR */ | 231 | #else /* ifdef ECORE_XCURSOR */ |
232 | size = 0; | 232 | size = 0; |
233 | #endif /* ifdef ECORE_XCURSOR */ | 233 | #endif /* ifdef ECORE_XCURSOR */ |
234 | } /* ecore_x_cursor_size_set */ | 234 | } |
235 | 235 | ||
236 | EAPI int | 236 | EAPI int |
237 | ecore_x_cursor_size_get(void) | 237 | ecore_x_cursor_size_get(void) |
@@ -242,5 +242,5 @@ ecore_x_cursor_size_get(void) | |||
242 | #else /* ifdef ECORE_XCURSOR */ | 242 | #else /* ifdef ECORE_XCURSOR */ |
243 | return 0; | 243 | return 0; |
244 | #endif /* ifdef ECORE_XCURSOR */ | 244 | #endif /* ifdef ECORE_XCURSOR */ |
245 | } /* ecore_x_cursor_size_get */ | 245 | } |
246 | 246 | ||