summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-05 14:09:49 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-05 14:09:49 +0000
commitbb0e4d65eda434c531b671a94e41c48916adaed4 (patch)
tree092c0fbc8fbd792b28166f5d8b4d14a4ee1d1a89 /src/lib/ecore_evas
parent1227340c122bb7c2d9de6314a81d10edbf35cb7c (diff)
efl/ecore_evas: move more removed/deprecated stuff to own file and mark.
x11-16, x11-8, xrender were also removed but not marked as EINA_DEPRECATED. move those to ecore_evas_deprecated.c file. SVN revision: 80255
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r--src/lib/ecore_evas/Ecore_Evas.h36
-rw-r--r--src/lib/ecore_evas/ecore_evas.c26
-rw-r--r--src/lib/ecore_evas/ecore_evas_deprecated.c102
-rw-r--r--src/lib/ecore_evas/ecore_evas_x.c94
4 files changed, 121 insertions, 137 deletions
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 20e7ba37f6..5c57025747 100644
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -914,24 +914,24 @@ EAPI Eina_Bool ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee);
914EAPI void ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win); 914EAPI void ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
915EAPI void ecore_evas_gl_x11_pre_post_swap_callback_set(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e)); 915EAPI void ecore_evas_gl_x11_pre_post_swap_callback_set(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
916 916
917EAPI Ecore_Evas *ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h); 917EAPI Ecore_Evas *ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) EINA_DEPRECATED;
918EAPI Ecore_X_Window ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee); 918EAPI Ecore_X_Window ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee) EINA_DEPRECATED;
919EAPI void ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on); 919EAPI void ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) EINA_DEPRECATED;
920EAPI Eina_Bool ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee); 920EAPI Eina_Bool ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee) EINA_DEPRECATED;
921EAPI void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win); 921EAPI void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) EINA_DEPRECATED;
922 922
923EAPI Ecore_Evas *ecore_evas_software_x11_8_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h); 923EAPI Ecore_Evas *ecore_evas_software_x11_8_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) EINA_DEPRECATED;
924EAPI Ecore_X_Window ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee); 924EAPI Ecore_X_Window ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee) EINA_DEPRECATED;
925EAPI Ecore_X_Window ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee); 925EAPI Ecore_X_Window ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee) EINA_DEPRECATED;
926EAPI void ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, Eina_Bool on); 926EAPI void ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) EINA_DEPRECATED;
927EAPI Eina_Bool ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee); 927EAPI Eina_Bool ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee) EINA_DEPRECATED;
928EAPI void ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win); 928EAPI void ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) EINA_DEPRECATED;
929 929
930EAPI Ecore_Evas *ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h); 930EAPI Ecore_Evas *ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) EINA_DEPRECATED;
931EAPI Ecore_X_Window ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee); 931EAPI Ecore_X_Window ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee) EINA_DEPRECATED;
932EAPI void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, Eina_Bool on); 932EAPI void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) EINA_DEPRECATED;
933EAPI Eina_Bool ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee); 933EAPI Eina_Bool ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee) EINA_DEPRECATED;
934EAPI void ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win); 934EAPI void ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) EINA_DEPRECATED;
935 935
936EAPI Ecore_Evas *ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h); 936EAPI Ecore_Evas *ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h);
937 937
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 49d90fb607..db35a7837e 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -154,13 +154,8 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
154 return EINA_FALSE; 154 return EINA_FALSE;
155#endif 155#endif
156 156
157 case ECORE_EVAS_ENGINE_SOFTWARE_8_X11: 157 case ECORE_EVAS_ENGINE_SOFTWARE_8_X11:
158#ifdef BUILD_ECORE_EVAS_SOFTWARE_8_X11
159 return EINA_TRUE;
160#else
161 return EINA_FALSE; 158 return EINA_FALSE;
162#endif
163
164 case ECORE_EVAS_ENGINE_SOFTWARE_16_X11: 159 case ECORE_EVAS_ENGINE_SOFTWARE_16_X11:
165 return EINA_FALSE; 160 return EINA_FALSE;
166 case ECORE_EVAS_ENGINE_SOFTWARE_16_DDRAW: 161 case ECORE_EVAS_ENGINE_SOFTWARE_16_DDRAW:
@@ -455,22 +450,6 @@ _ecore_evas_constructor_opengl_x11(int x, int y, int w, int h, const char *extra
455} 450}
456#endif 451#endif
457 452
458#ifdef BUILD_ECORE_EVAS_SOFTWARE_8_X11
459static Ecore_Evas *
460_ecore_evas_constructor_software_8_x11(int x, int y, int w, int h, const char *extra_options)
461{
462 Ecore_X_Window parent = 0;
463 char *disp_name = NULL;
464 Ecore_Evas *ee;
465
466 _ecore_evas_parse_extra_options_x(extra_options, &disp_name, &parent);
467 ee = ecore_evas_software_x11_8_new(disp_name, parent, x, y, w, h);
468 free(disp_name);
469
470 return ee;
471}
472#endif
473
474#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL 453#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
475static Ecore_Evas * 454static Ecore_Evas *
476_ecore_evas_constructor_sdl(int x EINA_UNUSED, int y EINA_UNUSED, int w, int h, const char *extra_options) 455_ecore_evas_constructor_sdl(int x EINA_UNUSED, int y EINA_UNUSED, int w, int h, const char *extra_options)
@@ -639,9 +618,6 @@ static const struct ecore_evas_engine _engines[] = {
639#ifdef BUILD_ECORE_EVAS_OPENGL_X11 618#ifdef BUILD_ECORE_EVAS_OPENGL_X11
640 {"opengl_x11", _ecore_evas_constructor_opengl_x11}, 619 {"opengl_x11", _ecore_evas_constructor_opengl_x11},
641#endif 620#endif
642#ifdef BUILD_ECORE_EVAS_SOFTWARE_8_X11
643 {"software_8_x11", _ecore_evas_constructor_software_8_x11},
644#endif
645#ifdef BUILD_ECORE_EVAS_FB 621#ifdef BUILD_ECORE_EVAS_FB
646 {"fb", _ecore_evas_constructor_fb}, 622 {"fb", _ecore_evas_constructor_fb},
647#endif 623#endif
diff --git a/src/lib/ecore_evas/ecore_evas_deprecated.c b/src/lib/ecore_evas/ecore_evas_deprecated.c
index 6e0621fa11..20a57ebf80 100644
--- a/src/lib/ecore_evas/ecore_evas_deprecated.c
+++ b/src/lib/ecore_evas/ecore_evas_deprecated.c
@@ -86,3 +86,105 @@ ecore_evas_directfb_window_get(const Ecore_Evas *ee EINA_UNUSED)
86{ 86{
87 return NULL; 87 return NULL;
88} 88}
89
90/* Ecore_Evas X11 16 bits support was removed. However we keep the functions
91 * to not break ABI.
92 */
93EAPI Ecore_Evas *
94ecore_evas_software_x11_16_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED,
95 int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
96{
97 return NULL;
98}
99
100EAPI Ecore_X_Window
101ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee EINA_UNUSED)
102{
103 return 0;
104}
105
106EAPI void
107ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
108{
109}
110
111EAPI Eina_Bool
112ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
113{
114 return EINA_FALSE;
115}
116
117EAPI void
118ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
119{
120}
121
122/* Ecore_Evas X11 8 bits support was removed. However we keep the functions
123 * to not break ABI.
124 */
125EAPI Ecore_Evas *
126ecore_evas_software_x11_8_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
127{
128 return NULL;
129}
130
131EAPI Ecore_X_Window
132ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee EINA_UNUSED)
133{
134 return 0;
135}
136
137EAPI Ecore_X_Window
138ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee EINA_UNUSED)
139{
140 return 0;
141}
142
143EAPI void
144ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
145{
146}
147
148EAPI Eina_Bool
149ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
150{
151 return EINA_FALSE;
152}
153
154EAPI void
155ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
156{
157 return;
158}
159
160/* Ecore_Evas XRender support was removed. However we keep the functions
161 * to not break ABI.
162 */
163EAPI Ecore_Evas *
164ecore_evas_xrender_x11_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED,
165 int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
166{
167 return NULL;
168}
169
170EAPI Ecore_X_Window
171ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee EINA_UNUSED)
172{
173 return 0;
174}
175
176EAPI void
177ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
178{
179}
180
181EAPI Eina_Bool
182ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
183{
184 return 0;
185}
186
187EAPI void
188ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
189{
190}
diff --git a/src/lib/ecore_evas/ecore_evas_x.c b/src/lib/ecore_evas/ecore_evas_x.c
index 4608d56860..ec8e923aec 100644
--- a/src/lib/ecore_evas/ecore_evas_x.c
+++ b/src/lib/ecore_evas/ecore_evas_x.c
@@ -1732,7 +1732,6 @@ static void
1732_ecore_evas_x_rotation_set(Ecore_Evas *ee, int rotation, int resize) 1732_ecore_evas_x_rotation_set(Ecore_Evas *ee, int rotation, int resize)
1733{ 1733{
1734 if (ee->rotation == rotation) return; 1734 if (ee->rotation == rotation) return;
1735 if (!strcmp(ee->driver, "xrender_x11")) return;
1736 1735
1737#if _USE_WIN_ROT_EFFECT 1736#if _USE_WIN_ROT_EFFECT
1738 int angles[2]; 1737 int angles[2];
@@ -3382,99 +3381,6 @@ ecore_evas_gl_x11_pre_post_swap_callback_set(const Ecore_Evas *ee EINA_UNUSED, v
3382} 3381}
3383#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ 3382#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */
3384 3383
3385EAPI Ecore_Evas *
3386ecore_evas_xrender_x11_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED,
3387 int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
3388{
3389 return NULL;
3390}
3391
3392EAPI Ecore_X_Window
3393ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee EINA_UNUSED)
3394{
3395 return 0;
3396}
3397
3398EAPI void
3399ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
3400{
3401}
3402
3403EAPI Eina_Bool
3404ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
3405{
3406 return 0;
3407}
3408
3409EAPI void
3410ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
3411{
3412}
3413
3414EAPI Ecore_Evas *
3415ecore_evas_software_x11_16_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED,
3416 int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
3417{
3418 return NULL;
3419}
3420
3421EAPI Ecore_X_Window
3422ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee EINA_UNUSED)
3423{
3424 return 0;
3425}
3426
3427EAPI void
3428ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
3429{
3430}
3431
3432EAPI Eina_Bool
3433ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
3434{
3435 return 0;
3436}
3437
3438EAPI void
3439ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
3440{
3441}
3442
3443EAPI Ecore_Evas *
3444ecore_evas_software_x11_8_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
3445{
3446 return NULL;
3447}
3448
3449EAPI Ecore_X_Window
3450ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee EINA_UNUSED)
3451{
3452 return 0;
3453}
3454
3455EAPI Ecore_X_Window
3456ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee EINA_UNUSED)
3457{
3458 return 0;
3459}
3460
3461EAPI void
3462ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
3463{
3464}
3465
3466EAPI Eina_Bool
3467ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
3468{
3469 return 0;
3470}
3471
3472EAPI void
3473ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
3474{
3475 return;
3476}
3477
3478EAPI void 3384EAPI void
3479ecore_evas_x11_leader_set(Ecore_Evas *ee, Ecore_X_Window win) 3385ecore_evas_x11_leader_set(Ecore_Evas *ee, Ecore_X_Window win)
3480{ 3386{