Enlightenment CVS committal
Author : metrics
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_config.h e_ipc_handlers.h e_ipc_handlers_list.h
e_popup.c
Log Message:
Add composite support for popups (shelves, menus and exebuf)
configurable via enlightenment_remote.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -3 -r1.214 -r1.215
--- e_config.c 7 Nov 2006 22:45:49 -0000 1.214
+++ e_config.c 13 Nov 2006 07:26:14 -0000 1.215
@@ -360,6 +360,7 @@
E_CONFIG_VAL(D, T, evas_engine_drag, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_win, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_zone, INT); /**/
+ E_CONFIG_VAL(D, T, use_composite, INT); /**/
E_CONFIG_VAL(D, T, language, STR); /**/
E_CONFIG_LIST(D, T, modules, _e_config_module_edd); /**/
E_CONFIG_LIST(D, T, font_fallbacks, _e_config_font_fallback_edd); /**/
@@ -579,6 +580,7 @@
e_config->evas_engine_drag = E_EVAS_ENGINE_DEFAULT;
e_config->evas_engine_win = E_EVAS_ENGINE_DEFAULT;
e_config->evas_engine_zone = E_EVAS_ENGINE_DEFAULT;
+ e_config->use_composite = 0;
e_config->language = NULL;
e_config->window_placement_policy = E_WINDOW_PLACEMENT_SMART;
e_config->focus_policy = E_FOCUS_SLOPPY;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- e_config.h 16 Oct 2006 08:42:22 -0000 1.128
+++ e_config.h 13 Nov 2006 07:26:14 -0000 1.129
@@ -109,6 +109,7 @@
int evas_engine_drag; // NO GUI - maybe remove?
int evas_engine_win; // NO GUI - maybe remove?
int evas_engine_zone; // NO GUI - maybe remove?
+ int use_composite; // NO GUI
const char *language; // GUI
Evas_List *modules; // GUI
Evas_List *font_fallbacks; // GUI
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- e_ipc_handlers.h 6 Sep 2006 08:06:19 -0000 1.135
+++ e_ipc_handlers.h 13 Nov 2006 07:26:14 -0000 1.136
@@ -7592,3 +7592,43 @@
END_INT;
#endif
#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_USE_COMPOSITE_SET
+#if (TYPE == E_REMOTE_OPTIONS)
+ OP("-use-composite-set", 1, "Set whether composite should be used", 0, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+ REQ_INT(atoi(params[0]), HDL);
+#elif (TYPE == E_WM_IN)
+ START_INT(val, HDL);
+ e_config->use_composite = val;
+ E_CONFIG_LIMIT(e_config->use_composite, 0, 1);
+ SAVE;
+ END_INT;
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_USE_COMPOSITE_GET
+#if (TYPE == E_REMOTE_OPTIONS)
+ OP("-use-composite-get", 0, "Get whether composite should be used", 1, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+ REQ_NULL(HDL);
+#elif (TYPE == E_WM_IN)
+ SEND_INT(e_config->use_composite, E_IPC_OP_USE_COMPOSITE_GET_REPLY, HDL);
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_USE_COMPOSITE_GET_REPLY
+#if (TYPE == E_REMOTE_OPTIONS)
+#elif (TYPE == E_REMOTE_OUT)
+#elif (TYPE == E_WM_IN)
+#elif (TYPE == E_REMOTE_IN)
+ START_INT(val, HDL);
+ printf("REPLY: %d\n", val);
+ END_INT;
+#endif
+#undef HDL
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers_list.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_ipc_handlers_list.h 6 Sep 2006 08:06:19 -0000 1.49
+++ e_ipc_handlers_list.h 13 Nov 2006 07:26:14 -0000 1.50
@@ -389,3 +389,7 @@
#define E_IPC_OP_EDGE_FLIP_DRAGGING_SET 360
#define E_IPC_OP_EDGE_FLIP_DRAGGING_GET 361
#define E_IPC_OP_EDGE_FLIP_DRAGGING_GET_REPLY 362
+
+#define E_IPC_OP_USE_COMPOSITE_SET 363
+#define E_IPC_OP_USE_COMPOSITE_GET 364
+#define E_IPC_OP_USE_COMPOSITE_GET_REPLY 365
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_popup.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_popup.c 18 Jun 2006 02:19:05 -0000 1.14
+++ e_popup.c 13 Nov 2006 07:26:14 -0000 1.15
@@ -169,7 +169,14 @@
pop->shaped = 1;
else
pop->shaped = 0;
- ecore_evas_shaped_set(pop->ecore_evas, pop->shaped);
+ if (e_config->use_composite)
+ {
+ ecore_evas_alpha_set(pop->ecore_evas, pop->shaped);
+ pop->evas_win =
ecore_evas_software_x11_window_get(pop->ecore_evas);
+ e_container_window_raise(pop->zone->container, pop->evas_win,
pop->layer);
+ }
+ else
+ ecore_evas_shaped_set(pop->ecore_evas, pop->shaped);
}
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
