Elementary: Add support for the PSL1GHT engine

git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@64784 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 9ecb665..58f7237 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -326,6 +326,29 @@ if test "x$want_elementary_fb" = "xyes" -a "x$have_elementary_fb" = "xno"; then
     AC_MSG_ERROR([ecore-fb support requested, but not found by pkg-config.])
 fi
 
+have_elementary_psl1ght="no"
+want_elementary_psl1ght="auto"
+AC_ARG_ENABLE([ecore-psl1ght],
+   [AC_HELP_STRING([--disable-ecore-psl1ght], [disable ecore-psl1ght support. @<:@default=detect@:>@])],
+   [want_elementary_psl1ght=$enableval], [])
+
+if test "x$want_elementary_psl1ght" != "xno"; then
+   PKG_CHECK_MODULES([ELEMENTARY_PSL1GHT],
+      [ecore-psl1ght >= 1.0.0],
+      [
+       AC_DEFINE(HAVE_ELEMENTARY_PSL1GHT, 1, [PSL1GHT support for Elementary])
+       have_elementary_psl1ght="yes"
+       requirement_elm="ecore-psl1ght >= 1.0.0 ${requirement_elm}"
+      ],
+      [have_elementary_psl1ght="no"]
+   )
+else
+    have_elementary_psl1ght="no"
+fi
+if test "x$want_elementary_psl1ght" = "xyes" -a "x$have_elementary_psl1ght" = "xno"; then
+    AC_MSG_ERROR([ecore-psl1ght support requested, but not found by pkg-config.])
+fi
+
 have_elementary_sdl="no"
 want_elementary_sdl="auto"
 AC_ARG_ENABLE([ecore-sdl],
@@ -705,6 +728,7 @@ echo
 echo "  Engines:"
 echo "    X11....................: ${have_elementary_x}"
 echo "    Framebuffer............: ${have_elementary_fb}"
+echo "    PSL1GHT................: ${have_elementary_psl1ght}"
 echo "    SDL....................: ${have_elementary_sdl}"
 echo "    Cocoa..................: ${have_elementary_cocoa}"
 echo "    Windows XP.............: ${have_elementary_win32}"

diff --git a/src/bin/config.c b/src/bin/config.c
index 02f8e01..92e06d8 100644 (file)
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -2657,6 +2657,9 @@ _elm_engine_supported(const char *engine)
       "sdl",
       "software_16_sdl",
       "opengl_sdl",
+      "ews",
+      "opengl_cocoa",
+      "psl1ght",
       NULL
    };
 

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 1dcc17e..5d71ed9 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -33,6 +33,7 @@ const char *_elm_engines[] = {
    "buffer",
    "ews",
    "opengl_cocoa",
+   "psl1ght",
    NULL
 };
 
@@ -1464,6 +1465,8 @@ _env_get(void)
         else if ((!strcasecmp(s, "directfb")) ||
                  (!strcasecmp(s, "dfb")))
           eina_stringshare_replace(&_elm_config->engine, ELM_SOFTWARE_DIRECTFB);
+        else if ((!strcasecmp(s, "psl1ght")))
+          eina_stringshare_replace(&_elm_config->engine, ELM_SOFTWARE_PSL1GHT);
         else if ((!strcasecmp(s, "sdl")) ||
                  (!strcasecmp(s, "software-sdl")) ||
                  (!strcasecmp(s, "software_sdl")))

diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 06c28e7..c1da756 100644 (file)
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -76,6 +76,7 @@ extern const char *_elm_engines[];
 #define ELM_BUFFER            (_elm_engines[12])
 #define ELM_EWS               (_elm_engines[13])
 #define ELM_OPENGL_COCOA      (_elm_engines[14])
+#define ELM_SOFTWARE_PSL1GHT  (_elm_engines[15])
 
 #define ELM_FONT_TOKEN_STYLE ":style="
 

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 556ec87..9cc8b10 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -1458,6 +1458,11 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
              win->ee = ecore_evas_software_wince_gdi_new(NULL, 0, 0, 1, 1);
              FALLBACK_TRY("Sofware-16-WinCE");
           }
+        else if (ENGINE_COMPARE(ELM_SOFTWARE_PSL1GHT))
+          {
+             win->ee = ecore_evas_psl1ght_new(NULL, 1, 1);
+             FALLBACK_TRY("PSL1GHT");
+          }
         else if (ENGINE_COMPARE(ELM_SOFTWARE_SDL))
           {
              win->ee = ecore_evas_sdl_new(NULL, 0, 0, 0, 0, 0, 1);