diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/ecore/src/lib/ecore_evas/ecore_evas_extn.c | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to 'libraries/ecore/src/lib/ecore_evas/ecore_evas_extn.c')
-rw-r--r-- | libraries/ecore/src/lib/ecore_evas/ecore_evas_extn.c | 69 |
1 files changed, 43 insertions, 26 deletions
diff --git a/libraries/ecore/src/lib/ecore_evas/ecore_evas_extn.c b/libraries/ecore/src/lib/ecore_evas/ecore_evas_extn.c index e46ab4a..a7ea4c3 100644 --- a/libraries/ecore/src/lib/ecore_evas/ecore_evas_extn.c +++ b/libraries/ecore/src/lib/ecore_evas/ecore_evas_extn.c | |||
@@ -2,35 +2,37 @@ | |||
2 | # include <config.h> | 2 | # include <config.h> |
3 | #endif | 3 | #endif |
4 | 4 | ||
5 | #include <stdio.h> | ||
5 | #include <stdlib.h> | 6 | #include <stdlib.h> |
7 | #include <sys/types.h> | ||
8 | #include <unistd.h> | ||
9 | #include <math.h> | ||
10 | #include <time.h> | ||
11 | #ifdef HAVE_SYS_MMAN_H | ||
12 | # include <sys/mman.h> | ||
13 | #endif | ||
14 | #include <sys/stat.h> | ||
15 | #include <fcntl.h> | ||
16 | #include <string.h> | ||
17 | #include <sys/file.h> | ||
6 | #include <unistd.h> | 18 | #include <unistd.h> |
7 | 19 | ||
8 | #include <Ecore.h> | 20 | #include <Ecore.h> |
9 | #include "ecore_private.h" | 21 | #include "ecore_private.h" |
10 | #include <Ecore_Input.h> | 22 | #include <Ecore_Input.h> |
11 | 23 | ||
12 | #ifdef BUILD_ECORE_IPC | 24 | #ifdef BUILD_ECORE_EVAS_EXTN |
13 | # ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER | 25 | |
14 | # define EXTN_ENABLED 1 | 26 | #include <Ecore_Ipc.h> |
15 | # endif | 27 | |
16 | #endif | 28 | #endif |
17 | 29 | ||
18 | #include "ecore_evas_private.h" | 30 | #include "ecore_evas_private.h" |
19 | #include "Ecore_Evas.h" | 31 | #include "Ecore_Evas.h" |
20 | #ifdef EXTN_ENABLED | ||
21 | #include "Ecore_Ipc.h" | ||
22 | 32 | ||
23 | #include <stdio.h> | 33 | |
24 | #include <stdlib.h> | 34 | #ifdef BUILD_ECORE_EVAS_EXTN |
25 | #include <sys/types.h> | 35 | |
26 | #include <unistd.h> | ||
27 | #include <math.h> | ||
28 | #include <time.h> | ||
29 | #include <sys/mman.h> | ||
30 | #include <sys/stat.h> | ||
31 | #include <fcntl.h> | ||
32 | #include <string.h> | ||
33 | #include <sys/file.h> | ||
34 | 36 | ||
35 | typedef struct _Shmfile Shmfile; | 37 | typedef struct _Shmfile Shmfile; |
36 | 38 | ||
@@ -1102,6 +1104,13 @@ static const Ecore_Evas_Engine_Func _ecore_extn_plug_engine_func = | |||
1102 | NULL, | 1104 | NULL, |
1103 | NULL, //transparent | 1105 | NULL, //transparent |
1104 | 1106 | ||
1107 | NULL, | ||
1108 | NULL, | ||
1109 | NULL, | ||
1110 | NULL, | ||
1111 | NULL, | ||
1112 | NULL, | ||
1113 | |||
1105 | NULL, // render | 1114 | NULL, // render |
1106 | NULL // screen_geometry_get | 1115 | NULL // screen_geometry_get |
1107 | }; | 1116 | }; |
@@ -1286,12 +1295,13 @@ void | |||
1286 | _ecore_evas_extn_shutdown(void) | 1295 | _ecore_evas_extn_shutdown(void) |
1287 | { | 1296 | { |
1288 | } | 1297 | } |
1289 | #endif | 1298 | |
1299 | #endif /* BUILD_ECORE_EVAS_EXTN */ | ||
1290 | 1300 | ||
1291 | EAPI Evas_Object * | 1301 | EAPI Evas_Object * |
1292 | ecore_evas_extn_plug_new(Ecore_Evas *ee_target) | 1302 | ecore_evas_extn_plug_new(Ecore_Evas *ee_target) |
1293 | { | 1303 | { |
1294 | #ifdef EXTN_ENABLED | 1304 | #ifdef BUILD_ECORE_EVAS_EXTN |
1295 | Evas_Object *o; | 1305 | Evas_Object *o; |
1296 | Ecore_Evas *ee; | 1306 | Ecore_Evas *ee; |
1297 | int w = 1, h = 1; | 1307 | int w = 1, h = 1; |
@@ -1408,7 +1418,7 @@ ecore_evas_extn_plug_new(Ecore_Evas *ee_target) | |||
1408 | EAPI Eina_Bool | 1418 | EAPI Eina_Bool |
1409 | ecore_evas_extn_plug_connect(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys) | 1419 | ecore_evas_extn_plug_connect(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys) |
1410 | { | 1420 | { |
1411 | #ifdef EXTN_ENABLED | 1421 | #ifdef BUILD_ECORE_EVAS_EXTN |
1412 | Extn *extn; | 1422 | Extn *extn; |
1413 | Ecore_Evas *ee = NULL; | 1423 | Ecore_Evas *ee = NULL; |
1414 | 1424 | ||
@@ -1459,7 +1469,7 @@ ecore_evas_extn_plug_connect(Evas_Object *obj, const char *svcname, int svcnum, | |||
1459 | EAPI void | 1469 | EAPI void |
1460 | ecore_evas_extn_plug_object_data_lock(Evas_Object *obj) | 1470 | ecore_evas_extn_plug_object_data_lock(Evas_Object *obj) |
1461 | { | 1471 | { |
1462 | #ifdef EXTN_ENABLED | 1472 | #ifdef BUILD_ECORE_EVAS_EXTN |
1463 | Ecore_Evas *ee; | 1473 | Ecore_Evas *ee; |
1464 | 1474 | ||
1465 | ee = ecore_evas_object_ecore_evas_get(obj); | 1475 | ee = ecore_evas_object_ecore_evas_get(obj); |
@@ -1471,7 +1481,7 @@ ecore_evas_extn_plug_object_data_lock(Evas_Object *obj) | |||
1471 | EAPI void | 1481 | EAPI void |
1472 | ecore_evas_extn_plug_object_data_unlock(Evas_Object *obj) | 1482 | ecore_evas_extn_plug_object_data_unlock(Evas_Object *obj) |
1473 | { | 1483 | { |
1474 | #ifdef EXTN_ENABLED | 1484 | #ifdef BUILD_ECORE_EVAS_EXTN |
1475 | Ecore_Evas *ee; | 1485 | Ecore_Evas *ee; |
1476 | 1486 | ||
1477 | ee = ecore_evas_object_ecore_evas_get(obj); | 1487 | ee = ecore_evas_object_ecore_evas_get(obj); |
@@ -1480,7 +1490,7 @@ ecore_evas_extn_plug_object_data_unlock(Evas_Object *obj) | |||
1480 | #endif | 1490 | #endif |
1481 | } | 1491 | } |
1482 | 1492 | ||
1483 | #ifdef EXTN_ENABLED | 1493 | #ifdef BUILD_ECORE_EVAS_EXTN |
1484 | static void | 1494 | static void |
1485 | _ecore_evas_socket_resize(Ecore_Evas *ee, int w, int h) | 1495 | _ecore_evas_socket_resize(Ecore_Evas *ee, int w, int h) |
1486 | { | 1496 | { |
@@ -1830,7 +1840,7 @@ _ipc_client_data(void *data, int type __UNUSED__, void *event) | |||
1830 | 1840 | ||
1831 | #define STRGET(val) \ | 1841 | #define STRGET(val) \ |
1832 | do { \ | 1842 | do { \ |
1833 | if ((ipc->val) && (ipc->val < (char *)(e->size - 1))) \ | 1843 | if ((ipc->val) && (ipc->val < (char *)(long)(e->size - 1))) \ |
1834 | ipc->val = ((char *)ipc) + (long)ipc->val; \ | 1844 | ipc->val = ((char *)ipc) + (long)ipc->val; \ |
1835 | else \ | 1845 | else \ |
1836 | ipc->val = NULL; \ | 1846 | ipc->val = NULL; \ |
@@ -1978,6 +1988,13 @@ static const Ecore_Evas_Engine_Func _ecore_extn_socket_engine_func = | |||
1978 | _ecore_evas_extn_socket_alpha_set, | 1988 | _ecore_evas_extn_socket_alpha_set, |
1979 | NULL, //transparent | 1989 | NULL, //transparent |
1980 | 1990 | ||
1991 | NULL, | ||
1992 | NULL, | ||
1993 | NULL, | ||
1994 | NULL, | ||
1995 | NULL, | ||
1996 | NULL, | ||
1997 | |||
1981 | _ecore_evas_extn_socket_render, // render | 1998 | _ecore_evas_extn_socket_render, // render |
1982 | NULL // screen_geometry_get | 1999 | NULL // screen_geometry_get |
1983 | }; | 2000 | }; |
@@ -1987,7 +2004,7 @@ static const Ecore_Evas_Engine_Func _ecore_extn_socket_engine_func = | |||
1987 | EAPI Ecore_Evas * | 2004 | EAPI Ecore_Evas * |
1988 | ecore_evas_extn_socket_new(int w, int h) | 2005 | ecore_evas_extn_socket_new(int w, int h) |
1989 | { | 2006 | { |
1990 | #ifdef EXTN_ENABLED | 2007 | #ifdef BUILD_ECORE_EVAS_EXTN |
1991 | Evas_Engine_Info_Buffer *einfo; | 2008 | Evas_Engine_Info_Buffer *einfo; |
1992 | Ecore_Evas *ee; | 2009 | Ecore_Evas *ee; |
1993 | int rmethod; | 2010 | int rmethod; |
@@ -2077,7 +2094,7 @@ ecore_evas_extn_socket_new(int w, int h) | |||
2077 | EAPI Eina_Bool | 2094 | EAPI Eina_Bool |
2078 | ecore_evas_extn_socket_listen(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys) | 2095 | ecore_evas_extn_socket_listen(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys) |
2079 | { | 2096 | { |
2080 | #ifdef EXTN_ENABLED | 2097 | #ifdef BUILD_ECORE_EVAS_EXTN |
2081 | Extn *extn; | 2098 | Extn *extn; |
2082 | 2099 | ||
2083 | extn = calloc(1, sizeof(Extn)); | 2100 | extn = calloc(1, sizeof(Extn)); |