summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--elementary.pc.in4
-rw-r--r--src/lib/elm_main.c6
-rw-r--r--src/lib/elm_priv.h2
-rw-r--r--src/lib/elm_win.c7
4 files changed, 15 insertions, 4 deletions
diff --git a/elementary.pc.in b/elementary.pc.in
index 3d2dfa4b9..0e299f025 100644
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
3libdir=@libdir@ 3libdir=@libdir@
4includedir=@includedir@ 4includedir=@includedir@
5 5
6Name: eet 6Name: elementary
7Description: Library for speedy data storage, retrieval, and compression 7Description: Mobile device touchscreen widget library
8Version: @VERSION@ 8Version: @VERSION@
9Libs: -L${libdir} -lelementary 9Libs: -L${libdir} -lelementary
10Libs.private: @my_libs@ @ELEMENTARY_LIBS@ 10Libs.private: @my_libs@ @ELEMENTARY_LIBS@
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 46d554872..44b97e864 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -36,6 +36,8 @@ elm_init(int argc, char **argv)
36 _elm_config->thumbscroll_momentum_threshhold = 100.0; 36 _elm_config->thumbscroll_momentum_threshhold = 100.0;
37 _elm_config->thumbscroll_friction = 1.0; 37 _elm_config->thumbscroll_friction = 1.0;
38 _elm_config->scale = 1.0; 38 _elm_config->scale = 1.0;
39 _elm_config->bgpixmap = 1;
40 _elm_config->compositing = 1;
39 41
40 if ((_elm_config->engine == ELM_SOFTWARE_X11) || 42 if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
41 (_elm_config->engine == ELM_SOFTWARE_16_X11) || 43 (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
@@ -51,8 +53,10 @@ elm_init(int argc, char **argv)
51 { 53 {
52 if (val > 0) _elm_config->scale = (double)val / 1000.0; 54 if (val > 0) _elm_config->scale = (double)val / 1000.0;
53 } 55 }
56 if (!ecore_x_screen_is_composited(0))
57 _elm_config->compositing = 0;
54 } 58 }
55 59
56} 60}
57 61
58EAPI void 62EAPI void
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 54dcc31a4..cc023ef2a 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -28,6 +28,8 @@ struct _Elm_Config
28 double thumbscroll_momentum_threshhold; 28 double thumbscroll_momentum_threshhold;
29 double thumbscroll_friction; 29 double thumbscroll_friction;
30 double scale; 30 double scale;
31 int bgpixmap;
32 int compositing;
31}; 33};
32 34
33#define ELM_NEW(t) calloc(1, sizeof(t)) 35#define ELM_NEW(t) calloc(1, sizeof(t))
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 6761dabb8..05c471d47 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -354,6 +354,11 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
354 free(win); 354 free(win);
355 return NULL; 355 return NULL;
356 } 356 }
357 printf("_elm_config->bgpixmap = %i\n"
358 "_elm_config->compositing = %i\n",
359 _elm_config->bgpixmap, _elm_config->compositing);
360 if (_elm_config->bgpixmap && !_elm_config->compositing)
361 ecore_evas_avoid_damage_set(win->ee, ECORE_EVAS_AVOID_DAMAGE_BUILT_IN);
357 362
358 win->type = type; 363 win->type = type;
359 win->parent = parent; 364 win->parent = parent;
@@ -476,7 +481,7 @@ elm_win_alpha_set(Evas_Object *obj, Evas_Bool alpha)
476 { 481 {
477 if (alpha) 482 if (alpha)
478 { 483 {
479 if (!ecore_x_screen_is_composited(0)) 484 if (!_elm_config->compositing)
480 elm_win_shaped_set(obj, alpha); 485 elm_win_shaped_set(obj, alpha);
481 else 486 else
482 ecore_evas_alpha_set(win->ee, alpha); 487 ecore_evas_alpha_set(win->ee, alpha);