summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2012-11-05 21:59:49 +0000
committerSebastian Dransfeld <sd@tango.flipp.net>2012-11-05 21:59:49 +0000
commit5fabee3c944e09d652d856b08d68dd6c4f13caed (patch)
tree8035ee3e6c5507cb10f2617f9f85d9ff16854a3a
parentfe3b4244240aab7bd7d6ad4971ffa81ca9e8846d (diff)
python-ecore: remove support for *_16
SVN revision: 78934
-rw-r--r--Makefile.am1
-rw-r--r--ecore/evas/__init__.py2
-rw-r--r--ecore/evas/ecore.evas.c_ecore_evas.pyx10
-rw-r--r--ecore/evas/ecore.evas.c_ecore_evas_software_x11_16.pxi62
-rw-r--r--include/ecore/evas/c_ecore_evas.pxd13
5 files changed, 1 insertions, 87 deletions
diff --git a/Makefile.am b/Makefile.am
index 2584720..a562127 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,7 +109,6 @@ c_ecore_evas_deps = \
109 ecore/evas/ecore.evas.c_ecore_evas_directfb.pxi \ 109 ecore/evas/ecore.evas.c_ecore_evas_directfb.pxi \
110 ecore/evas/ecore.evas.c_ecore_evas_fb.pxi \ 110 ecore/evas/ecore.evas.c_ecore_evas_fb.pxi \
111 ecore/evas/ecore.evas.c_ecore_evas_gl_x11.pxi \ 111 ecore/evas/ecore.evas.c_ecore_evas_gl_x11.pxi \
112 ecore/evas/ecore.evas.c_ecore_evas_software_x11_16.pxi \
113 ecore/evas/ecore.evas.c_ecore_evas_software_x11.pxi \ 112 ecore/evas/ecore.evas.c_ecore_evas_software_x11.pxi \
114 ecore/evas/ecore.evas.c_ecore_evas_xrender_x11.pxi 113 ecore/evas/ecore.evas.c_ecore_evas_xrender_x11.pxi
115 114
diff --git a/ecore/evas/__init__.py b/ecore/evas/__init__.py
index bf95cdc..1c3cf2a 100644
--- a/ecore/evas/__init__.py
+++ b/ecore/evas/__init__.py
@@ -21,7 +21,7 @@ import c_ecore_evas
21 21
22from c_ecore_evas import shutdown, engine_type_supported_get, \ 22from c_ecore_evas import shutdown, engine_type_supported_get, \
23 engine_type_from_name, engine_name_from_type, engines_get, new, \ 23 engine_type_from_name, engine_name_from_type, engines_get, new, \
24 SoftwareX11, GLX11, XRenderX11, FB, Buffer, SoftwareX11_16 24 SoftwareX11, GLX11, XRenderX11, FB, Buffer
25 25
26ECORE_EVAS_OBJECT_ASSOCIATE_BASE = 0 26ECORE_EVAS_OBJECT_ASSOCIATE_BASE = 0
27ECORE_EVAS_OBJECT_ASSOCIATE_STACK = 1 27ECORE_EVAS_OBJECT_ASSOCIATE_STACK = 1
diff --git a/ecore/evas/ecore.evas.c_ecore_evas.pyx b/ecore/evas/ecore.evas.c_ecore_evas.pyx
index 93bccba..977e906 100644
--- a/ecore/evas/ecore.evas.c_ecore_evas.pyx
+++ b/ecore/evas/ecore.evas.c_ecore_evas.pyx
@@ -54,9 +54,6 @@ engine_id_mapping = {
54 "sdl": ECORE_EVAS_ENGINE_SOFTWARE_SDL, 54 "sdl": ECORE_EVAS_ENGINE_SOFTWARE_SDL,
55 "directfb": ECORE_EVAS_ENGINE_DIRECTFB, 55 "directfb": ECORE_EVAS_ENGINE_DIRECTFB,
56 "fb": ECORE_EVAS_ENGINE_SOFTWARE_FB, 56 "fb": ECORE_EVAS_ENGINE_SOFTWARE_FB,
57 "software_16_x11": ECORE_EVAS_ENGINE_SOFTWARE_16_X11,
58 "software_16_ddraw": ECORE_EVAS_ENGINE_SOFTWARE_16_DDRAW,
59 "software_16_wince": ECORE_EVAS_ENGINE_SOFTWARE_16_WINCE,
60 } 57 }
61 58
62cdef object engine_mapping 59cdef object engine_mapping
@@ -66,19 +63,13 @@ engine_mapping = {
66 "opengl_x11": GLX11, 63 "opengl_x11": GLX11,
67 "software_xcb": SoftwareX11, 64 "software_xcb": SoftwareX11,
68 "xrender_xcb": XRenderX11, 65 "xrender_xcb": XRenderX11,
69 "software_16_x11": SoftwareX11_16,
70# "directfb": DirectFB, 66# "directfb": DirectFB,
71 "fb": FB, 67 "fb": FB,
72# "software_gdi": , 68# "software_gdi": ,
73# "software_ddraw": , 69# "software_ddraw": ,
74# "direct3d": , 70# "direct3d": ,
75# "opengl_glew": , 71# "opengl_glew": ,
76# "software_16_ddraw": ,
77# "software_16_wince": ,
78# "software_16_wince_fb": ,
79# "software_16_wince_gapi": ,
80# "sdl": , 72# "sdl": ,
81# "software_16_sdl": ,
82# "cocoa": , 73# "cocoa": ,
83 "buffer": Buffer, 74 "buffer": Buffer,
84 } 75 }
@@ -196,4 +187,3 @@ include "ecore.evas.c_ecore_evas_gl_x11.pxi"
196include "ecore.evas.c_ecore_evas_xrender_x11.pxi" 187include "ecore.evas.c_ecore_evas_xrender_x11.pxi"
197include "ecore.evas.c_ecore_evas_fb.pxi" 188include "ecore.evas.c_ecore_evas_fb.pxi"
198include "ecore.evas.c_ecore_evas_buffer.pxi" 189include "ecore.evas.c_ecore_evas_buffer.pxi"
199include "ecore.evas.c_ecore_evas_software_x11_16.pxi"
diff --git a/ecore/evas/ecore.evas.c_ecore_evas_software_x11_16.pxi b/ecore/evas/ecore.evas.c_ecore_evas_software_x11_16.pxi
deleted file mode 100644
index 512acaa..0000000
--- a/ecore/evas/ecore.evas.c_ecore_evas_software_x11_16.pxi
+++ /dev/null
@@ -1,62 +0,0 @@
1# Copyright (C) 2007-2008 Gustavo Sverzut Barbieri
2#
3# This file is part of Python-Ecore.
4#
5# Python-Ecore is free software; you can redistribute it and/or
6# modify it under the terms of the GNU Lesser General Public
7# License as published by the Free Software Foundation; either
8# version 2.1 of the License, or (at your option) any later version.
9#
10# Python-Ecore is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY; without even the implied warranty of
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13# Lesser General Public License for more details.
14#
15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-Ecore. If not, see <http://www.gnu.org/licenses/>.
17
18# This file is included verbatim by c_ecore_evas.pyx
19
20cdef class SoftwareX11_16(BaseX11):
21 """X11 window using software render optimized for 16 bits-per-pixel.
22
23 @ivar window: X11 window id.
24 @ivar direct_resize: if direct resize is enabled or not.
25 """
26 def __init__(self, char *display=NULL, long parent_xid=0, int x=0, int y=0,
27 int w=320, int h=240):
28 cdef Ecore_Evas *obj
29
30 if self.obj == NULL:
31 obj = ecore_evas_software_x11_16_new(display, parent_xid,
32 x, y, w, h)
33 self._set_obj(obj)
34
35 def window_get(self):
36 """Get X11 window id.
37
38 @rtype: int
39 """
40 return ecore_evas_software_x11_16_window_get(self.obj)
41
42 property window:
43 def __get__(self):
44 return self.window_get()
45
46 def direct_resize_set(self, int on):
47 ecore_evas_software_x11_16_direct_resize_set(self.obj, on)
48
49 def direct_resize_get(self):
50 "@rtype: bool"
51 return bool(ecore_evas_software_x11_16_direct_resize_get(self.obj))
52
53 property direct_resize:
54 def __get__(self):
55 return self.direct_resize_get()
56
57 def __set__(self, int on):
58 self.direct_resize_set(on)
59
60 def extra_event_window_add(self, long win_xid):
61 ecore_evas_software_x11_16_extra_event_window_add(self.obj, win_xid)
62
diff --git a/include/ecore/evas/c_ecore_evas.pxd b/include/ecore/evas/c_ecore_evas.pxd
index c82ea68..6056642 100644
--- a/include/ecore/evas/c_ecore_evas.pxd
+++ b/include/ecore/evas/c_ecore_evas.pxd
@@ -46,9 +46,6 @@ cdef extern from "Ecore_Evas.h":
46 ECORE_EVAS_ENGINE_SOFTWARE_SDL 46 ECORE_EVAS_ENGINE_SOFTWARE_SDL
47 ECORE_EVAS_ENGINE_DIRECTFB 47 ECORE_EVAS_ENGINE_DIRECTFB
48 ECORE_EVAS_ENGINE_SOFTWARE_FB 48 ECORE_EVAS_ENGINE_SOFTWARE_FB
49 ECORE_EVAS_ENGINE_SOFTWARE_16_X11
50 ECORE_EVAS_ENGINE_SOFTWARE_16_DDRAW
51 ECORE_EVAS_ENGINE_SOFTWARE_16_WINCE
52 49
53 ctypedef enum Ecore_Evas_Avoid_Damage_Type: 50 ctypedef enum Ecore_Evas_Avoid_Damage_Type:
54 ECORE_EVAS_AVOID_DAMAGE_NONE 51 ECORE_EVAS_AVOID_DAMAGE_NONE
@@ -116,12 +113,6 @@ cdef extern from "Ecore_Evas.h":
116 int ecore_evas_xrender_x11_direct_resize_get(Ecore_Evas *ee) 113 int ecore_evas_xrender_x11_direct_resize_get(Ecore_Evas *ee)
117 void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) 114 void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win)
118 115
119 Ecore_Evas *ecore_evas_software_x11_16_new(char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h)
120 Ecore_X_Window ecore_evas_software_x11_16_window_get(Ecore_Evas *ee)
121 void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, int on)
122 int ecore_evas_software_x11_16_direct_resize_get(Ecore_Evas *ee)
123 void ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win)
124
125 Ecore_Evas *ecore_evas_fb_new(char *disp_name, int rotation, int w, int h) 116 Ecore_Evas *ecore_evas_fb_new(char *disp_name, int rotation, int w, int h)
126 117
127 Ecore_Evas *ecore_evas_directfb_new(char *disp_name, int windowed, int x, int y, int w, int h) 118 Ecore_Evas *ecore_evas_directfb_new(char *disp_name, int windowed, int x, int y, int w, int h)
@@ -258,10 +249,6 @@ cdef class XRenderX11(BaseX11):
258 pass 249 pass
259 250
260 251
261cdef class SoftwareX11_16(BaseX11):
262 pass
263
264
265cdef class FB(EcoreEvas): 252cdef class FB(EcoreEvas):
266 pass 253 pass
267 254