[EGIT] [e16/e16] master 02/02: Obsolete event handling tweak.

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/e16/e16.git/commit/?id=f6ff19cef193ab9973fc0506c2da73ed3043dad7

commit f6ff19cef193ab9973fc0506c2da73ed3043dad7
Author: Kim Woelders <k...@woelders.dk>
Date:   Sun Oct 6 21:30:27 2013 +0200

    Obsolete event handling tweak.
    
    Avoid trouble around obsolete events and click grabs.
---
 src/ewins.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/ewins.c b/src/ewins.c
index 6ce7bbb..a518aa3 100644
--- a/src/ewins.c
+++ b/src/ewins.c
@@ -2457,15 +2457,17 @@ EwinHandleEventsContainer(Win win __UNUSED__, XEvent * 
ev, void *prm)
 {
    EWin               *ewin = (EWin *) prm;
 
+   if (ev->type == ButtonPress)
+     {
+       FocusHandleClick(ewin, EwinGetClientConWin(ewin));
+       return;
+     }
+
    if (!_EwinEventEwinCheck("cont", ev, ewin))
       return;
 
    switch (ev->type)
      {
-     case ButtonPress:
-       FocusHandleClick(ewin, EwinGetContainerWin(ewin));
-       break;
-
      default:
        if (EwinHandleContainerEvents(ewin, ev))
           break;
@@ -2483,17 +2485,19 @@ EwinHandleEventsClient(Win win __UNUSED__, XEvent * ev, 
void *prm)
 {
    EWin               *ewin = (EWin *) prm;
 
+#if !USE_CONTAINER_WIN
+   if (ev->type == ButtonPress)
+     {
+       FocusHandleClick(ewin, EwinGetClientConWin(ewin));
+       return;
+     }
+#endif
+
    if (!_EwinEventEwinCheck("cli", ev, ewin))
       return;
 
    switch (ev->type)
      {
-#if !USE_CONTAINER_WIN
-     case ButtonPress:
-       FocusHandleClick(ewin, EwinGetClientConWin(ewin));
-       break;
-#endif
-
      case FocusIn:
      case FocusOut:
        if (ev->xfocus.detail == NotifyInferior)

--