use focus model stuff properly

SVN revision: 16262

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index a82cde4..29a65bc 100644 (file)
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -6050,7 +6050,7 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_X_T
                                  "widgets/border/default/fullscreen");
      }
 
-   if ((bd->client.icccm.accepts_focus) &&
+   if ((bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) &&
        (!bd->client.netwm.state.skip_taskbar))
      {
        mi = e_menu_item_new(m);
@@ -6331,7 +6331,7 @@ _e_border_menu_cb_skip_winlist(void *data, E_Menu *m, E_Menu_Item *mi)
    bd = data;
    if (!bd) return;
    
-   if ((bd->client.icccm.accepts_focus) &&
+   if ((bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) &&
        (!bd->client.netwm.state.skip_taskbar))
      bd->user_skip_winlist = e_menu_item_toggle_get(mi);
    else

diff --git a/src/bin/e_winlist.c b/src/bin/e_winlist.c
index 4c252ee..8ff58e1 100644 (file)
--- a/src/bin/e_winlist.c
+++ b/src/bin/e_winlist.c
@@ -371,7 +371,8 @@ _e_winlist_border_add(E_Border *bd, E_Zone *zone, E_Desk *desk)
    int ok;
 
    ok = 1;
-   if ((!bd->client.icccm.accepts_focus)) ok = 0;
+   if ((!bd->client.icccm.accepts_focus) &&
+       (!bd->client.icccm.take_focus)) ok = 0;
    if (bd->client.netwm.state.skip_taskbar) ok = 0;
    if (bd->user_skip_winlist) ok = 0;
    if (bd->iconic)