This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch evas-sdl3-rewrite
in repository efl.
View the commit online.
commit 0fa303923c2fe9dcf9caf9d93d2a2b3dc9dcfa3d
Author: Swagtoy <[email protected]>
AuthorDate: Thu May 14 01:17:13 2026 -0400
ecore_evas_sdl: simplify initialization
Can be better re-evaluated later, but I don't particularly see why
these should be explicitly used at the moment.
---
src/lib/ecore_evas/Ecore_Evas.h | 8 +-------
src/lib/ecore_evas/ecore_evas.c | 13 ++++---------
src/lib/elementary/efl_ui_win.c | 2 +-
src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c | 17 +++--------------
4 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index e66a5edd9c..1c1be7f6a1 100644
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -1962,15 +1962,9 @@ EAPI Ecore_Win32_Window *ecore_evas_win32_window_get(const Ecore_Evas *ee);
* @param name Device target name, defaults to "EFL SDL" if NULL.
* @param w Width of the canvas, in pixels.
* @param h Height of the canvas, in pixels.
- * @param fullscreen Set the fullscreen property for the window.
- * @param hwsurface Set the hardware surface property for the window.
- * @param noframe Set the noframe flag on the einfo.
- * @param alpha Set alpha for the Ecore_Evas window.
* @return A new @c Ecore_Evas instance, or @c NULL on failure.
*/
-EAPI Ecore_Evas *ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha);
-
-EAPI Ecore_Evas *ecore_evas_sdl16_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha);
+EAPI Ecore_Evas *ecore_evas_sdl_new(const char* name, int w, int h);
/**
* @brief Creates a new @c Ecore_Evas canvas bound to the Evas
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 4c92527d63..f2f40857eb 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -837,12 +837,8 @@ _ecore_evas_constructor_sdl(int x EINA_UNUSED, int y EINA_UNUSED, int w, int h,
char *name = NULL;
_ecore_evas_parse_extra_options_str(extra_options, "name=", &name);
- _ecore_evas_parse_extra_options_uint(extra_options, "fullscreen=", &fullscreen);
- _ecore_evas_parse_extra_options_uint(extra_options, "hwsurface=", &hwsurface);
- _ecore_evas_parse_extra_options_uint(extra_options, "noframe=", &noframe);
- _ecore_evas_parse_extra_options_uint(extra_options, "alpha=", &alpha);
- ee = ecore_evas_sdl_new(name, w, h, fullscreen, hwsurface, noframe, alpha);
+ ee = ecore_evas_sdl_new(name, w, h);
free(name);
return ee;
@@ -4364,18 +4360,17 @@ ecore_evas_extn_plug_connect(Evas_Object *obj, const char *svcname, int svcnum,
}
EAPI Ecore_Evas *
-ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen,
- int hwsurface, int noframe, int alpha)
+ecore_evas_sdl_new(const char* name, int w, int h)
{
Ecore_Evas *ee;
- Ecore_Evas *(*new)(const char *, int, int, int, int, int, int);
+ Ecore_Evas *(*new)(const char *, int, int);
Eina_Module *m = _ecore_evas_engine_load("sdl");
EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
new = eina_module_symbol_get(m, "ecore_evas_sdl_new_internal");
EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
- ee = new(name, w, h, fullscreen, hwsurface, noframe, alpha);
+ ee = new(name, w, h);
if (!_ecore_evas_cursors_init(ee))
{
ecore_evas_free(ee);
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index cf83c3d258..1dff3d92a0 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -5538,7 +5538,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
else if (!strcmp(enginelist[i], ELM_OPENGL_WIN32))
tmp_sd.ee = ecore_evas_gl_win32_new(NULL, 1, 1, 0, 0);
else if (!strcmp(enginelist[i], ELM_SOFTWARE_SDL))
- tmp_sd.ee = ecore_evas_sdl_new(NULL, 0, 0, 0, 0, 0, 1);
+ tmp_sd.ee = ecore_evas_sdl_new(NULL, 0, 0);
else if (!strcmp(enginelist[i], ELM_OPENGL_SDL))
tmp_sd.ee = ecore_evas_gl_sdl_new(NULL, 1, 1, 0, 0);
else if (!strcmp(enginelist[i], ELM_OPENGL_COCOA))
diff --git a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
index 852e124a4b..78f7520c58 100644
--- a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
+++ b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
@@ -373,7 +373,7 @@ static Ecore_Evas_Engine_Func _ecore_sdl_engine_func =
};
static Ecore_Evas*
-_ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fullscreen, int hwsurface, int noframe EINA_UNUSED, int alpha)
+_ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h)
{ printf("[ INITIALIZATION OF EVAS SDL3 ]\n");
Ecore_Evas_SDL_Switch_Data *swd;
Ecore_Evas *ee;
@@ -412,12 +412,9 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
ee->prop.borderless = EINA_FALSE;
ee->prop.override = EINA_TRUE;
ee->prop.maximized = EINA_FALSE;
- ee->prop.fullscreen = fullscreen;
ee->prop.withdrawn = EINA_TRUE;
ee->prop.sticky = EINA_FALSE;
ee->prop.window = 0;
- ee->alpha = alpha;
- ee->prop.hwsurface = hwsurface;
// TODO: probably make this only occur for the sw renderer, when GL
// is later implemented
ee->func.fn_post_render = _ecore_evas_sdl_post_render;
@@ -472,8 +469,7 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
}
EMODAPI Ecore_Evas *
-ecore_evas_sdl_new_internal(const char* name, int w, int h, int fullscreen,
- int hwsurface, int noframe, int alpha)
+ecore_evas_sdl_new_internal(const char* name, int w, int h)
{
Ecore_Evas *ee;
int rmethod;
@@ -481,17 +477,10 @@ ecore_evas_sdl_new_internal(const char* name, int w, int h, int fullscreen,
rmethod = evas_render_method_lookup("software_sdl");
if (!rmethod) return NULL;
- ee = _ecore_evas_internal_sdl_new(rmethod, name, w, h, fullscreen, hwsurface, noframe, alpha);
+ ee = _ecore_evas_internal_sdl_new(rmethod, name, w, h);
return ee;
}
-EMODAPI Ecore_Evas*
-ecore_evas_sdl16_new_internal(const char* name EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int fullscreen EINA_UNUSED, int hwsurface EINA_UNUSED, int noframe EINA_UNUSED, int alpha EINA_UNUSED)
-{
- ERR("OUCH !");
- return NULL;
-}
-
#ifdef BUILD_ECORE_EVAS_OPENGL_SDL
EMODAPI Ecore_Evas *
ecore_evas_gl_sdl_new_internal(const char* name, int w, int h, int fullscreen, int noframe)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
