Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h e_manager.c e_win.c e_win.h
Log Message:
and dialogs work again
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -3 -r1.481 -r1.482
--- e_border.c 2 Mar 2006 12:03:48 -0000 1.481
+++ e_border.c 8 Mar 2006 08:54:43 -0000 1.482
@@ -199,7 +199,7 @@
}
EAPI E_Border *
-e_border_new(E_Container *con, Ecore_X_Window win, int first_map)
+e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
{
E_Border *bd;
Ecore_X_Window_Attributes *att;
@@ -228,7 +228,7 @@
ecore_evas_title_set(bd->bg_ecore_evas, "Enlightenment Frame");
bd->client.shell_win = ecore_x_window_override_new(bd->win, 0, 0, 1, 1);
ecore_x_window_container_manage(bd->client.shell_win);
- ecore_x_window_client_manage(win);
+ if (!internal) ecore_x_window_client_manage(win);
/* FIXME: Round trip. XCB */
/* fetch needed to avoid grabbing the server as window may vanish */
att = &bd->client.initial_attributes;
@@ -1195,9 +1195,7 @@
if (bd->focused)
{
if (bd->internal)
- {
- e_grabinput_focus(bd->win, E_FOCUS_METHOD_PASSIVE);
- }
+ e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
else
{
if ((!bd->client.icccm.accepts_focus) &&
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- e_border.h 2 Mar 2006 12:03:48 -0000 1.130
+++ e_border.h 8 Mar 2006 08:54:43 -0000 1.131
@@ -487,7 +487,7 @@
EAPI int e_border_init(void);
EAPI int e_border_shutdown(void);
-EAPI E_Border *e_border_new(E_Container *con, Ecore_X_Window win, int
first_map);
+EAPI E_Border *e_border_new(E_Container *con, Ecore_X_Window win, int
first_map, int internal);
EAPI void e_border_free(E_Border *bd);
EAPI void e_border_ref(E_Border *bd);
EAPI void e_border_unref(E_Border *bd);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- e_manager.c 3 Mar 2006 09:10:14 -0000 1.51
+++ e_manager.c 8 Mar 2006 08:54:43 -0000 1.52
@@ -244,7 +244,7 @@
deskxy[1]);
{
- bd = e_border_new(con, windows[i], 1);
+ bd = e_border_new(con, windows[i], 1, 0);
if (bd)
{
/* FIXME:
@@ -263,7 +263,7 @@
E_Container *con;
E_Border *bd;
con = e_container_current_get(man);
- bd = e_border_new(con, windows[i], 1);
+ bd = e_border_new(con, windows[i], 1, 0);
if (bd)
e_border_show(bd);
}
@@ -535,7 +535,7 @@
con = e_container_current_get(man);
if (!e_border_find_by_client_window(e->win))
{
- bd = e_border_new(con, e->win, 0);
+ bd = e_border_new(con, e->win, 0, 0);
if (!bd)
ecore_x_window_show(e->win);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_win.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_win.c 2 Mar 2006 12:03:48 -0000 1.17
+++ e_win.c 8 Mar 2006 08:54:43 -0000 1.18
@@ -46,7 +46,7 @@
win->engine = e_canvas_engine_decide(e_config->evas_engine_win);
win->ecore_evas = e_canvas_new(e_config->evas_engine_win,
con->manager->root,
0, 0, 1, 1, 1, 0,
- &(win->evas_win), &(win->evas_sub_win));
+ &(win->evas_win), NULL);
e_canvas_add(win->ecore_evas);
ecore_evas_data_set(win->ecore_evas, "E_Win", win);
ecore_evas_callback_move_set(win->ecore_evas, _e_win_cb_move);
@@ -83,11 +83,12 @@
{
_e_win_prop_update(win);
ecore_evas_lower(win->ecore_evas);
- win->border = e_border_new(win->container, win->evas_win, 1);
+ win->border = e_border_new(win->container, win->evas_win, 1, 1);
if (!win->placed)
win->border->re_manage = 0;
win->border->internal = 1;
win->border->internal_ecore_evas = win->ecore_evas;
+/*
if (win->engine == E_EVAS_ENGINE_GL_X11)
{
ecore_evas_gl_x11_extra_event_window_add(win->ecore_evas,
win->border->win);
@@ -103,6 +104,7 @@
ecore_evas_software_x11_extra_event_window_add(win->ecore_evas,
win->border->win);
ecore_evas_software_x11_extra_event_window_add(win->ecore_evas,
win->border->event_win);
}
+ */
}
_e_win_prop_update(win);
e_border_show(win->border);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_win.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_win.h 2 Mar 2006 12:03:48 -0000 1.6
+++ e_win.h 8 Mar 2006 08:54:43 -0000 1.7
@@ -22,7 +22,6 @@
Ecore_Evas *ecore_evas;
Evas *evas;
Ecore_X_Window evas_win;
- Ecore_X_Window evas_sub_win;
unsigned char placed : 1;
int min_w, min_h, max_w, max_h, base_w, base_h;
int step_x, step_y;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
