update news, bump version

fixes selectively disabling desk flip effects

NEWS

@@ -0,0 +1,23 @@
+Release 1.0.3
+--------------------
+
+Mike Blumenkrantz (1):
+      use correct int size for ds effect iterating
+
+Release 1.0.2
+--------------------
+
+Mike Blumenkrantz (1):
+      reorder ds client iterator filter to catch override clients before ec->desk deref
+
+
+Release 1.0.1
+--------------------
+
+Mike Blumenkrantz (3):
+      raise client zoom obj on mouse in
+      fix input regions on shaded clients after desk flip
+      fix multiscreen zoom and current desks zoom
+
+
+

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(desksanity, 1.0, zmike@enlightenment.org)
+AC_INIT(desksanity, 1.0.3, zmike@enlightenment.org)
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(configure.ac)
@@ -6,7 +6,7 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
 
-AM_INIT_AUTOMAKE([1.8 dist-bzip2])
+AM_INIT_AUTOMAKE([1.8 dist-xz])
 AM_CONFIG_HEADER(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -30,7 +30,7 @@ AC_PROG_LIBTOOL
 #])
 #AC_SUBST(LTLIBINTL)
 
-PKG_CHECK_MODULES([E], [efx enlightenment > 0.18.99])
+PKG_CHECK_MODULES([E], [efx enlightenment > 0.19])
 release=$(pkg-config --variable=release enlightenment)
 MODULE_ARCH="$host_os-$host_cpu-$release"
 AC_SUBST(MODULE_ARCH)

src/desksanity.c

@@ -63,7 +63,7 @@ _ds_show(E_Desk *desk, int dx, int dy)
 {
    E_Client *ec;
    DS_Type use_type;
-   DS_Type *disabled_types = (DS_Type*)&ds_config->types;
+   Eina_Bool *disabled_types = (Eina_Bool*)&ds_config->types;
 
    /* free existing mirror */
    E_FREE_FUNC(dm_show, evas_object_del);
@@ -72,7 +72,7 @@ _ds_show(E_Desk *desk, int dx, int dy)
    E_CLIENT_FOREACH(desk->zone->comp, ec)
      {
         /* skip clients from other screens, iconic clients, and ignorable clients */
-        if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue;
+        if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue;
         /* always keep user-moving clients visible */
         if (ec->moving)
           {
@@ -85,7 +85,7 @@ _ds_show(E_Desk *desk, int dx, int dy)
         e_comp_object_effect_unclip(ec->frame);
         e_comp_object_effect_set(ec->frame, NULL);
         /* comp unignore the client */
-        e_client_comp_hidden_set(ec, EINA_FALSE);
+        e_client_comp_hidden_set(ec, ec->shaded);
         ec->hidden = 0;
         evas_object_show(ec->frame);
      }
@@ -397,7 +397,7 @@ _ds_hide(E_Desk *desk)
    E_CLIENT_FOREACH(desk->zone->comp, ec)
      {
         /* same as above */
-        if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue;
+        if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue;
         if (ec->moving) continue;
         if ((ec->desk != desk) || (ec->sticky)) continue;
         /* comp hide clients */

src/zoom.c

@@ -99,6 +99,12 @@ _client_mouse_down(E_Client *ec EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o
    dm = edje_object_part_swallow_get(obj, "e.swallow.client");
 }
 
+static void
+_client_mouse_in(E_Client *ec, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Event_Mouse_Up *ev)
+{
+   evas_object_raise(obj);
+}
+
 static void
 _client_mouse_up(E_Client *ec, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Event_Mouse_Up *ev)
 {
@@ -218,6 +224,7 @@ _zoomobj_add_client(Evas_Object *zoom_obj, Eina_List *l, Evas_Object *m)
    e_theme_edje_object_set(e, NULL, "e/modules/desksanity/zoom/client");
    evas_object_event_callback_add(e, EVAS_CALLBACK_MOUSE_DOWN, (Evas_Object_Event_Cb)_client_mouse_down, ec);
    evas_object_event_callback_add(e, EVAS_CALLBACK_MOUSE_UP, (Evas_Object_Event_Cb)_client_mouse_up, ec);
+   evas_object_event_callback_add(e, EVAS_CALLBACK_MOUSE_IN, (Evas_Object_Event_Cb)_client_mouse_in, ec);
    if ((!zmw) && (!zmh))
      edje_object_size_min_calc(e, &zmw, &zmh);
    edje_object_signal_callback_add(e, "e,action,activate", "e", _client_activate, ec);
@@ -480,7 +487,7 @@ zoom(Eina_List *clients, E_Zone *zone)
    edje_object_signal_callback_add(zoom_obj, "e,state,hiding", "e", _hiding, NULL);
    edje_object_signal_callback_add(zoom_obj, "e,action,dismiss", "e", _dismiss, NULL);
    edje_object_signal_callback_add(zoom_obj, "e,action,done", "e", _hid, NULL);
-   evas_object_resize(zoom_obj, zone->w, zone->h);
+   evas_object_geometry_set(zoom_obj, zone->x, zone->y, zone->w, zone->h);
    evas_object_layer_set(zoom_obj, E_LAYER_POPUP);
    e_theme_edje_object_set(zoom_obj, NULL, "e/modules/desksanity/zoom/base");
 
@@ -552,13 +559,6 @@ _zoom_begin(Zoom_Filter_Cb cb, E_Zone *zone)
    Evas_Object *m;
    E_Client *ec;
 
-
-   if (zoom_objs)
-     {
-        _zoom_hide();
-        return;
-     }
-
    EINA_LIST_FOREACH(e_client_focus_stack_get(), l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
@@ -572,9 +572,17 @@ _zoom_begin(Zoom_Filter_Cb cb, E_Zone *zone)
    zoom(clients, zone);
 }
 
+#define ZOOM_CHECK \
+   if (zoom_objs) \
+     { \
+        _zoom_hide(); \
+        return; \
+     }
+
 static void
 _zoom_desk_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
 {
+   ZOOM_CHECK;
    cur_act = act_zoom_desk;
    _zoom_begin(_filter_desk, e_zone_current_get(e_comp_get(NULL)));
 }
@@ -586,6 +594,7 @@ _zoom_desk_all_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
    E_Zone *zone;
    Eina_List *l;
 
+   ZOOM_CHECK;
    cur_act = act_zoom_desk_all;
    EINA_LIST_FOREACH(comp->zones, l, zone)
      _zoom_begin(_filter_desk_all, zone);
@@ -594,6 +603,7 @@ _zoom_desk_all_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
 static void
 _zoom_zone_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
 {
+   ZOOM_CHECK;
    cur_act = act_zoom_zone;
    _zoom_begin(_filter_zone, e_zone_current_get(e_comp_get(NULL)));
 }
@@ -605,6 +615,7 @@ _zoom_zone_all_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
    E_Zone *zone;
    Eina_List *l;
 
+   ZOOM_CHECK;
    cur_act = act_zoom_zone_all;
    EINA_LIST_FOREACH(comp->zones, l, zone)
      _zoom_begin(_filter_zone, zone);
@@ -623,7 +634,7 @@ zoom_init(void)
    act_zoom_desk_all = e_action_add("zoom_desk_all");
    if (act_zoom_desk_all)
      {
-        act_zoom_desk->func.go = _zoom_desk_all_cb;
+        act_zoom_desk_all->func.go = _zoom_desk_all_cb;
         e_action_predef_name_set(D_("Compositor"), D_("Toggle zoom current desks"),
                                  "zoom_desk_all", NULL, NULL, 0);
      }