From b1a68bdb5f9eb5edb74be8797f585d9ad3381afb Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 28 Sep 2010 22:43:48 +0000 Subject: [PATCH] at least support software-x11-8 engine - in theory. SVN revision: 52868 --- legacy/elementary/src/lib/elm_config.c | 15 ++++++++++----- legacy/elementary/src/lib/elm_priv.h | 1 + legacy/elementary/src/lib/elm_win.c | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/legacy/elementary/src/lib/elm_config.c b/legacy/elementary/src/lib/elm_config.c index 6031028315..6a58a98ce6 100644 --- a/legacy/elementary/src/lib/elm_config.c +++ b/legacy/elementary/src/lib/elm_config.c @@ -468,6 +468,16 @@ _env_get(void) (!strcasecmp(s, "software-x11")) || (!strcasecmp(s, "software_x11"))) _elm_config->engine = ELM_SOFTWARE_X11; + else if ((!strcasecmp(s, "opengl")) || + (!strcasecmp(s, "gl")) || + (!strcasecmp(s, "opengl-x11")) || + (!strcasecmp(s, "opengl_x11"))) + _elm_config->engine = ELM_OPENGL_X11; + else if ((!strcasecmp(s, "x11-8")) || + (!strcasecmp(s, "x18")) || + (!strcasecmp(s, "software-8-x11")) || + (!strcasecmp(s, "software_8_x11"))) + _elm_config->engine = ELM_SOFTWARE_8_X11; else if ((!strcasecmp(s, "x11-16")) || (!strcasecmp(s, "x16")) || (!strcasecmp(s, "software-16-x11")) || @@ -493,11 +503,6 @@ _env_get(void) (!strcasecmp(s, "software-16-sdl")) || (!strcasecmp(s, "software_16_sdl"))) _elm_config->engine = ELM_SOFTWARE_16_SDL; - else if ((!strcasecmp(s, "opengl")) || - (!strcasecmp(s, "gl")) || - (!strcasecmp(s, "opengl-x11")) || - (!strcasecmp(s, "opengl_x11"))) - _elm_config->engine = ELM_OPENGL_X11; else if ((!strcasecmp(s, "opengl-sdl")) || (!strcasecmp(s, "opengl_sdl")) || (!strcasecmp(s, "gl-sdl")) || diff --git a/legacy/elementary/src/lib/elm_priv.h b/legacy/elementary/src/lib/elm_priv.h index d4857113cd..3e5ebdefec 100644 --- a/legacy/elementary/src/lib/elm_priv.h +++ b/legacy/elementary/src/lib/elm_priv.h @@ -45,6 +45,7 @@ typedef enum _Elm_Engine ELM_SOFTWARE_FB, ELM_SOFTWARE_DIRECTFB, ELM_SOFTWARE_16_X11, + ELM_SOFTWARE_8_X11, ELM_XRENDER_X11, ELM_OPENGL_X11, ELM_SOFTWARE_WIN32, diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index 4e1d9404b1..698a57c0ba 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -311,6 +311,9 @@ _elm_win_xwindow_get(Elm_Win *win) case ELM_SOFTWARE_16_X11: if (win->ee) win->xwin = ecore_evas_software_x11_16_window_get(win->ee); break; + case ELM_SOFTWARE_8_X11: + if (win->ee) win->xwin = ecore_evas_software_x11_8_window_get(win->ee); + break; case ELM_XRENDER_X11: if (win->ee) win->xwin = ecore_evas_xrender_x11_window_get(win->ee); break; @@ -864,6 +867,18 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) #ifdef HAVE_ELEMENTARY_X win->client_message_handler = ecore_event_handler_add (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win); +#endif + break; + case ELM_SOFTWARE_8_X11: + win->ee = ecore_evas_software_x11_8_new(NULL, 0, 0, 0, 1, 1); + if (!win->ee) + { + CRITICAL("Software-8 engine create failed. Try software."); + win->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 1, 1); + } +#ifdef HAVE_ELEMENTARY_X + win->client_message_handler = ecore_event_handler_add + (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win); #endif break; case ELM_XRENDER_X11: @@ -999,6 +1014,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) break; case ELM_SOFTWARE_X11: case ELM_SOFTWARE_16_X11: + case ELM_SOFTWARE_8_X11: case ELM_XRENDER_X11: case ELM_OPENGL_X11: case ELM_SOFTWARE_WIN32: