1 --- a/src/bin/enna.c Fri Aug 22 00:20:01 2008 +0200
2 +++ b/src/bin/enna.c Fri Aug 22 16:32:52 2008 +0200
3 @@ -170,26 +170,36 @@
4 {
5 dbg("Load GL engine\n");
6 enna->ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 64, 64);
7 + if (enna->ee)
8 + enna->ee_winid = ecore_evas_gl_x11_window_get (enna->ee);
9 }
10 else if (!strcmp(enna_config->engine, "xrender") && ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_XRENDER_X11))
11 {
12 dbg("Load XRENDER engine\n");
13 enna->ee = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, 64, 64);
14 + if (enna->ee)
15 + enna->ee_winid = ecore_evas_xrender_x11_window_get (enna->ee);
16 }
17 else if (!strcmp(enna_config->engine, "x11_16") && ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_16_X11))
18 {
19 dbg("Load X11_16 engine\n");
20 enna->ee = ecore_evas_software_x11_16_new(NULL, 0, 0, 0, 64, 64);
21 + if (enna->ee)
22 + enna->ee_winid = ecore_evas_software_x11_16_window_get (enna->ee);
23 }
24 else if (!strcmp(enna_config->engine, "x11") && ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_X11))
25 {
26 dbg("Load X11 engine\n");
27 enna->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 64, 64);
28 + if (enna->ee)
29 + enna->ee_winid = ecore_evas_software_x11_window_get (enna->ee);
30 }
31 else if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_X11))
32 {
33 dbg("Specified \'%s\' engine not found, use X11 software default engine\n", enna_config->engine);
34 enna->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 64, 64);
35 + if (enna->ee)
36 + enna->ee_winid = ecore_evas_software_x11_window_get (enna->ee);
37 }
38 else
39 {
1.1 --- a/src/bin/enna.h Fri Aug 22 00:20:01 2008 +0200
1.2 +++ b/src/bin/enna.h Fri Aug 22 16:32:52 2008 +0200
1.3 @@ -87,6 +87,7 @@
1.4 {
1.5 char *home; /**< Home directory ie $HOME/.enna. */
1.6 Ecore_Evas *ee; /**< Ecore_Evas. */
1.7 + Ecore_X_Window ee_winid; /**< Ecore_Evas WindowID */
1.8 Evas *evas; /**< Main enna evas. */
1.9 Evas_Object *o_background;/**< Background object, it handles key down. */
1.10 Evas_Object *o_edje; /**< Main edje. */
2.1 --- a/src/modules/backend/libplayer/enna_module_libplayer.c Fri Aug 22 00:20:01 2008 +0200
2.2 +++ b/src/modules/backend/libplayer/enna_module_libplayer.c Fri Aug 22 16:32:52 2008 +0200
2.3 @@ -187,7 +187,7 @@
2.4 mod->evas = em->evas;
2.5 mod->player =
2.6 player_init (PLAYER_TYPE_MPLAYER, PLAYER_AO_AUTO, PLAYER_VO_AUTO,
2.7 - PLAYER_MSG_WARNING, _event_cb);
2.8 + PLAYER_MSG_WARNING, enna->ee_winid, _event_cb);
2.9 enna_mediaplayer_backend_register(&class);
2.10 mod->uri = NULL;
2.11 }