Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c
Log Message:
openoffice is happier
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_border.c 25 Nov 2004 14:09:49 -0000 1.2
+++ e_border.c 25 Nov 2004 14:57:48 -0000 1.3
@@ -391,7 +391,7 @@
e = ev;
bd = e_border_find_by_client_window(e->win);
if (!bd) return 1;
- return 0;
+ return 1;
}
static int _e_border_cb_window_destroy(void *data, int ev_type, void *ev)
@@ -403,7 +403,7 @@
bd = e_border_find_by_client_window(e->win);
if (!bd) return 1;
e_object_del(E_OBJECT(bd));
- return 0;
+ return 1;
}
static int
@@ -422,7 +422,7 @@
return 1;
}
e_object_del(E_OBJECT(bd));
- return 0;
+ return 1;
}
static int
@@ -437,7 +437,7 @@
if (!bd) return 1;
if (e->parent == bd->client.shell_win) return 1;
e_object_del(E_OBJECT(bd));
- return 0;
+ return 1;
}
static int
@@ -554,7 +554,7 @@
}
}
}
- return 0;
+ return 1;
}
static int
@@ -567,7 +567,7 @@
bd = e_border_find_by_client_window(e->win);
if (!bd) return 1;
printf("gravity for %0x\n", e->win);
- return 0;
+ return 1;
}
static int
@@ -580,7 +580,7 @@
bd = e_border_find_by_client_window(e->win);
printf("stack req for %0x bd %p\n", e->win, bd);
if (!bd) return 1;
- return 0;
+ return 1;
}
static int
@@ -612,7 +612,7 @@
bd->client.netwm.fetch.desktop = 1;
// bd->client.border.changed = 1;
bd->changed = 1;
- return 0;
+ return 1;
}
static int
@@ -624,7 +624,7 @@
e = ev;
bd = e_border_find_by_client_window(e->win);
if (!bd) return 1;
- return 0;
+ return 1;
}
static int
@@ -636,7 +636,7 @@
e = ev;
bd = e_border_find_by_client_window(e->win);
if (!bd) return 1;
- return 0;
+ return 1;
}
static int
@@ -651,10 +651,11 @@
printf("f IN %i | %i\n", e->mode, e->detail);
if (!bd->focused)
{
+ printf("FOCUS\n");
bd->focused = 1;
edje_object_signal_emit(bd->bg_object, "active", "");
}
- return 0;
+ return 1;
}
static int
@@ -669,10 +670,11 @@
printf("f OUT %i | %i\n", e->mode, e->detail);
if (bd->focused)
{
+ printf("UNFOCUS\n");
bd->focused = 0;
edje_object_signal_emit(bd->bg_object, "passive", "");
}
- return 0;
+ return 1;
}
static int
@@ -685,7 +687,7 @@
bd = e_border_find_by_client_window(e->win);
if (!bd) return 1;
printf("client message for %0x\n", e->win);
- return 0;
+ return 1;
}
static void
@@ -849,6 +851,9 @@
ev = event;
bd = data;
+// if (ev->mode == ECORE_X_EVENT_MODE_GRAB) return 1;
+ if (ev->mode == ECORE_X_EVENT_MODE_UNGRAB) return 1;
+// if (ev->mode == ECORE_X_EVENT_MODE_WHILE_GRABBED) return 1;
if (ev->event_win == bd->win)
{
/* FIXME: this would normally put focus on the client on pointer */
@@ -874,12 +879,45 @@
{
Ecore_X_Event_Mouse_Out *ev;
E_Border *bd;
-
+
ev = event;
bd = data;
/* FIXME: this would normally take focus away in pointer focus mode */
+// if (ev->mode == ECORE_X_EVENT_MODE_UNGRAB) return 1;
+// if (ev->mode == ECORE_X_EVENT_MODE_WHILE_GRABBED) return 1;
if (ev->event_win == bd->win)
- ecore_x_window_focus(bd->container->manager->win);
+ {
+ const char *modes[] = {
+ "ECORE_X_EVENT_MODE_NORMAL",
+ "ECORE_X_EVENT_MODE_WHILE_GRABBED",
+ "ECORE_X_EVENT_MODE_GRAB",
+ "ECORE_X_EVENT_MODE_UNGRAB"
+ };
+ const char *details[] = {
+ "ECORE_X_EVENT_DETAIL_ANCESTOR",
+ "ECORE_X_EVENT_DETAIL_VIRTUAL",
+ "ECORE_X_EVENT_DETAIL_INFERIOR",
+ "ECORE_X_EVENT_DETAIL_NON_LINEAR",
+ "ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL",
+ "ECORE_X_EVENT_DETAIL_POINTER",
+ "ECORE_X_EVENT_DETAIL_POINTER_ROOT",
+ "ECORE_X_EVENT_DETAIL_DETAIL_NONE"
+ };
+
+ printf("OUT 0x%x [%s] md=%s dt=%s\n",
+ ev->win,
+ bd->client.icccm.title,
+ modes[ev->mode],
+ details[ev->detail]);
+
+ if (ev->mode != ECORE_X_EVENT_MODE_GRAB)
+ ecore_x_window_focus(bd->container->manager->win);
+ else
+ {
+ printf("OUT GRAB!\n");
+ }
+
+ }
if (ev->win != bd->event_win) return 1;
bd->mouse.current.mx = ev->root.x;
bd->mouse.current.my = ev->root.y;
@@ -1131,9 +1169,7 @@
if ((!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_ALL)) &&
(!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_TITLE)) &&
(!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_BORDER)))
- {
- bd->client.mwm.borderless = 1;
- }
+ bd->client.mwm.borderless = 1;
}
if (bd->client.mwm.borderless != pb)
{
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
