Enlightenment

Log:
  refactored shelf autohide animation code
  
Author:       jeffdameth
Date:         2009-03-05 15:49:01 -0800 (Thu, 05 Mar 2009)
New Revision: 39384

Modified:
  trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2009-03-05 21:51:16 UTC (rev 39383)
+++ trunk/e/src/bin/e_shelf.c	2009-03-05 23:49:01 UTC (rev 39384)
@@ -199,12 +199,12 @@
    es->hide_step = 0;
    es->locked = 0;
 
-   option =  edje_object_data_get(es->o_base, "hidden_state_size");
+   option = edje_object_data_get(es->o_base, "hidden_state_size");
    if (option)
      es->hidden_state_size = atoi(option);
    else
      es->hidden_state_size = 4;
-   option =  edje_object_data_get(es->o_base, "instant_delay");
+   option = edje_object_data_get(es->o_base, "instant_delay");
    if (option)
      es->instant_delay = atof(option);
    else
@@ -1396,192 +1396,95 @@
 _e_shelf_cb_hide_animator(void *data)
 {
    E_Shelf *es;
-   int step = 2, move = 0;
-
+   int step, height;
+   
    es = data;
+   switch (es->gadcon->orient)
+     {
+      case E_GADCON_ORIENT_TOP:
+      case E_GADCON_ORIENT_CORNER_TL:
+      case E_GADCON_ORIENT_CORNER_TR:
+      case E_GADCON_ORIENT_BOTTOM:
+      case E_GADCON_ORIENT_CORNER_BL:
+      case E_GADCON_ORIENT_CORNER_BR:
+	 height = es->h;
+	 if (es->hide_origin == -1)
+	   es->hide_origin = es->y;	 
+	 break;
+      case E_GADCON_ORIENT_LEFT:
+      case E_GADCON_ORIENT_CORNER_LB:
+      case E_GADCON_ORIENT_CORNER_LT:
+      case E_GADCON_ORIENT_RIGHT:
+      case E_GADCON_ORIENT_CORNER_RB:
+      case E_GADCON_ORIENT_CORNER_RT:
+	 height = es->w;
+	 if (es->hide_origin == -1)
+	   es->hide_origin = es->x;
+	 break;
+     }
 
+   step = ((height - es->hidden_state_size) / e_config->framerate) / es->cfg->hide_duration;
+
+   if (!step) step = 1;
+
+   if (es->hidden)
+     {
+	if (es->hide_step < height - es->hidden_state_size)
+	  {
+	     if (es->hide_step + step > height - es->hidden_state_size)
+	       {
+		  es->hide_step = height - es->hidden_state_size;
+	       }
+	     else
+	       {
+		  es->hide_step += step;
+	       }
+	  }
+	else goto end;
+     }
+   else
+     {
+	if (es->hide_step > 0)
+	  {
+	     if (es->hide_step < step)
+	       {
+		  es->hide_step = 0;
+	       }
+	     else
+	       {
+		  es->hide_step -= step;	       
+	       }
+	  }
+	else goto end;
+     }
+
    switch (es->gadcon->orient)
      {
       case E_GADCON_ORIENT_TOP:
       case E_GADCON_ORIENT_CORNER_TL:
       case E_GADCON_ORIENT_CORNER_TR:
-	 step = ((es->h - es->hidden_state_size) / e_config->framerate) / es->cfg->hide_duration;
-	 if (!step) step = 1;
-	 if (es->hidden)
-	   {
-	      if (es->hide_origin == -1) es->hide_origin = es->y;
-	      if (es->hide_step < es->h - es->hidden_state_size)
-		{
-		   if (es->hide_step + step > es->h - es->hidden_state_size)
-		     {
-			move = es->hide_origin - es->h + es->hidden_state_size;
-			es->hide_step = es->h - es->hidden_state_size;
-		     }
-		   else
-		     {
-			move = es->y - step;
-			es->hide_step += step;
-		     }
-		   e_shelf_move(es, es->x, move);
-		}
-	      else goto end;
-	   }
-	 else
-	   {
-	      if (es->hide_step > 0)
-		{
-		   if (es->hide_step < step)
-		     {
-			move = es->hide_origin;
-			es->hide_step = 0;
-		     }
-		   else
-		     {
-			move = es->y + step;
-			es->hide_step -= step;	       
-		     }
-		   e_shelf_move(es, es->x, move);
-		}
-	      else goto end;
-	   }
+	 e_shelf_move(es, es->x, es->hide_origin - es->hide_step);
 	 break;
       case E_GADCON_ORIENT_BOTTOM:
       case E_GADCON_ORIENT_CORNER_BL:
       case E_GADCON_ORIENT_CORNER_BR:
-	 step = ((es->h - es->hidden_state_size) / e_config->framerate) / es->cfg->hide_duration;
-	 if (!step) step = 1;
-	 if (es->hidden)
-	   {
-	      if (es->hide_origin == -1) es->hide_origin = es->y;
-	      if (es->hide_step < es->h - es->hidden_state_size)
-		{
-		   if (es->hide_step + step > es->h - es->hidden_state_size)
-		     {
-			move = es->hide_origin + es->h - es->hidden_state_size;
-			es->hide_step = es->h - es->hidden_state_size;
-		     }
-		   else
-		     {
-			move = es->y + step;
-			es->hide_step += step;
-		     }
-		   e_shelf_move(es, es->x, move);
-		}
-	      else goto end;
-	   }
-	 else
-	   {
-	      if (es->hide_step > 0)
-		{
-		   if (es->hide_step < step)
-		     {
-			move = es->hide_origin;
-			es->hide_step = 0;
-		     }
-		   else
-		     {
-			move = es->y - step;
-			es->hide_step -= step;	       
-		     }
-		   e_shelf_move(es, es->x, move);
-		}
-	      else goto end;
-	   }
-
+	 e_shelf_move(es, es->x, es->hide_origin + es->hide_step);
 	 break;
       case E_GADCON_ORIENT_LEFT:
       case E_GADCON_ORIENT_CORNER_LB:
       case E_GADCON_ORIENT_CORNER_LT:
-	 step = ((es->w - es->hidden_state_size) / e_config->framerate) / es->cfg->hide_duration;
-	 if (!step) step = 1;
-	 if (es->hidden)
-	   {
-	      if (es->hide_origin == -1) es->hide_origin = es->x;
-	      if (es->hide_step < es->w - es->hidden_state_size)
-		{
-		   if (es->hide_step + step > es->w - es->hidden_state_size)
-		     {
-			move = es->hide_origin - es->w + es->hidden_state_size;
-			es->hide_step = es->w - es->hidden_state_size;
-		     }
-		   else
-		     {
-			move = es->x - step;
-			es->hide_step += step;
-		     }
-		   e_shelf_move(es, move, es->y);
-		}
-	      else goto end;
-	   }
-	 else
-	   {
-	      if (es->hide_step > 0)
-		{
-		   if (es->hide_step < step)
-		     {
-			move = es->hide_origin;
-			es->hide_step = 0;
-		     }
-		   else
-		     {
-			move = es->x + step;
-			es->hide_step -= step;	       
-		     }
-		   e_shelf_move(es, move, es->y);
-		}
-	      else goto end;
-	   }
-
-	 break; 
+	 e_shelf_move(es, es->hide_origin - es->hide_step, es->y);
+	 break;
       case E_GADCON_ORIENT_RIGHT:
       case E_GADCON_ORIENT_CORNER_RB:
       case E_GADCON_ORIENT_CORNER_RT:
-	 step = ((es->w - es->hidden_state_size) / e_config->framerate) / es->cfg->hide_duration;
-	 if (!step) step = 1;
-	 if (es->hidden)
-	   {
-	      if (es->hide_origin == -1) es->hide_origin = es->x;
-	      if (es->hide_step < es->w - es->hidden_state_size)
-		{
-		   if (es->hide_step + step > es->w - es->hidden_state_size)
-		     {
-			move = es->hide_origin + es->w - es->hidden_state_size;
-			es->hide_step = es->w - es->hidden_state_size;
-		     }
-		   else
-		     {
-			move = es->x + step;
-			es->hide_step += step;
-		     }
-		   e_shelf_move(es, move, es->y);
-		}
-	      else goto end;
-	   }
-	 else
-	   {
-	      if (es->hide_step > 0)
-		{
-		   if (es->hide_step < step)
-		     {
-			move = es->hide_origin;
-			es->hide_step = 0;
-		     }
-		   else
-		     {
-			move = es->x - step;
-			es->hide_step -= step;	       
-		     }
-		   e_shelf_move(es, move, es->y);
-		}
-	      else goto end;
-	   }
-	 break; 
-      default:
+	 e_shelf_move(es, es->hide_origin + es->hide_step, es->y);
 	 break;
      }
+   
    return 1;
 
-end:
+ end:
    es->hide_animator = NULL;
    if (es->interrupted > -1)
      e_shelf_toggle(es, es->interrupted);

Log:
  shelf: small update to last commit
  
Author:       jeffdameth
Date:         2009-03-05 16:33:49 -0800 (Thu, 05 Mar 2009)
New Revision: 39385

Modified:
  trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2009-03-05 23:49:01 UTC (rev 39384)
+++ trunk/e/src/bin/e_shelf.c	2009-03-06 00:33:49 UTC (rev 39385)
@@ -1396,7 +1396,7 @@
 _e_shelf_cb_hide_animator(void *data)
 {
    E_Shelf *es;
-   int step, height;
+   int step, hidden_size;
    
    es = data;
    switch (es->gadcon->orient)
@@ -1407,7 +1407,7 @@
       case E_GADCON_ORIENT_BOTTOM:
       case E_GADCON_ORIENT_CORNER_BL:
       case E_GADCON_ORIENT_CORNER_BR:
-	 height = es->h;
+	 hidden_size = es->h - es->hidden_state_size;
 	 if (es->hide_origin == -1)
 	   es->hide_origin = es->y;	 
 	 break;
@@ -1417,23 +1417,23 @@
       case E_GADCON_ORIENT_RIGHT:
       case E_GADCON_ORIENT_CORNER_RB:
       case E_GADCON_ORIENT_CORNER_RT:
-	 height = es->w;
+	 hidden_size = es->w - es->hidden_state_size;
 	 if (es->hide_origin == -1)
 	   es->hide_origin = es->x;
 	 break;
      }
 
-   step = ((height - es->hidden_state_size) / e_config->framerate) / es->cfg->hide_duration;
+   step = (hidden_size / e_config->framerate) / es->cfg->hide_duration;
 
    if (!step) step = 1;
 
    if (es->hidden)
      {
-	if (es->hide_step < height - es->hidden_state_size)
+	if (es->hide_step < hidden_size)
 	  {
-	     if (es->hide_step + step > height - es->hidden_state_size)
+	     if (es->hide_step + step > hidden_size)
 	       {
-		  es->hide_step = height - es->hidden_state_size;
+		  es->hide_step = hidden_size;
 	       }
 	     else
 	       {

Log:
  shelf: fixed size of style selector, better fitting var name
  
Author:       jeffdameth
Date:         2009-03-05 17:56:09 -0800 (Thu, 05 Mar 2009)
New Revision: 39386

Modified:
  trunk/e/src/bin/e_int_shelf_config.c trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_int_shelf_config.c
===================================================================
--- trunk/e/src/bin/e_int_shelf_config.c	2009-03-06 00:33:49 UTC (rev 39385)
+++ trunk/e/src/bin/e_int_shelf_config.c	2009-03-06 01:56:09 UTC (rev 39386)
@@ -624,14 +624,14 @@
 	  sel = n;
      }
    e_widget_min_size_get(oi, &wmw, &wmh);
-   e_widget_min_size_set(oi, wmw, 120);
+   e_widget_min_size_set(oi, wmw, 160);
    
    e_widget_ilist_go(oi);
    e_widget_ilist_selected_set(oi, sel);
    
    e_widget_framelist_object_append(of, oi);
    
-   e_widget_list_object_append(o2, of, 0, 0, 0.5);
+   e_widget_list_object_append(o2, of, 1, 1, 0.5);
    
    ob = e_widget_button_add(evas, _("Configure Contents..."), "widget/config", _cb_configure, cfdata, NULL);
    e_widget_list_object_append(o2, ob, 0, 0, 0.5);

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2009-03-06 00:33:49 UTC (rev 39385)
+++ trunk/e/src/bin/e_shelf.c	2009-03-06 01:56:09 UTC (rev 39386)
@@ -1396,9 +1396,10 @@
 _e_shelf_cb_hide_animator(void *data)
 {
    E_Shelf *es;
-   int step, hidden_size;
+   int step, hide_max;
    
    es = data;
+
    switch (es->gadcon->orient)
      {
       case E_GADCON_ORIENT_TOP:
@@ -1407,7 +1408,7 @@
       case E_GADCON_ORIENT_BOTTOM:
       case E_GADCON_ORIENT_CORNER_BL:
       case E_GADCON_ORIENT_CORNER_BR:
-	 hidden_size = es->h - es->hidden_state_size;
+	 hide_max = es->h - es->hidden_state_size;
 	 if (es->hide_origin == -1)
 	   es->hide_origin = es->y;	 
 	 break;
@@ -1417,23 +1418,22 @@
       case E_GADCON_ORIENT_RIGHT:
       case E_GADCON_ORIENT_CORNER_RB:
       case E_GADCON_ORIENT_CORNER_RT:
-	 hidden_size = es->w - es->hidden_state_size;
+	 hide_max = es->w - es->hidden_state_size;
 	 if (es->hide_origin == -1)
 	   es->hide_origin = es->x;
 	 break;
      }
 
-   step = (hidden_size / e_config->framerate) / es->cfg->hide_duration;
-
+   step = (hide_max / e_config->framerate) / es->cfg->hide_duration;
    if (!step) step = 1;
 
    if (es->hidden)
      {
-	if (es->hide_step < hidden_size)
+	if (es->hide_step < hide_max)
 	  {
-	     if (es->hide_step + step > hidden_size)
+	     if (es->hide_step + step > hide_max)
 	       {
-		  es->hide_step = hidden_size;
+		  es->hide_step = hide_max;
 	       }
 	     else
 	       {

Log:
  shrink the shelf dialog a little
  
Author:       jeffdameth
Date:         2009-03-05 18:07:51 -0800 (Thu, 05 Mar 2009)
New Revision: 39387

Modified:
  trunk/e/src/bin/e_int_shelf_config.c 

Modified: trunk/e/src/bin/e_int_shelf_config.c
===================================================================
--- trunk/e/src/bin/e_int_shelf_config.c	2009-03-06 01:56:09 UTC (rev 39386)
+++ trunk/e/src/bin/e_int_shelf_config.c	2009-03-06 02:07:51 UTC (rev 39387)
@@ -566,27 +566,27 @@
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left", 24, 24, E_GADCON_ORIENT_LEFT, rg);
    e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right", 24, 24, E_GADCON_ORIENT_RIGHT, rg);
-   e_widget_frametable_object_append(of, ob, 4, 2, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 2, 2, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top", 24, 24, E_GADCON_ORIENT_TOP, rg);
-   e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom", 24, 24, E_GADCON_ORIENT_BOTTOM, rg);
-   e_widget_frametable_object_append(of, ob, 2, 4, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top_left", 24, 24, E_GADCON_ORIENT_CORNER_TL, rg);
-   e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top_right", 24, 24, E_GADCON_ORIENT_CORNER_TR, rg);
-   e_widget_frametable_object_append(of, ob, 3, 0, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom_left", 24, 24, E_GADCON_ORIENT_CORNER_BL, rg);
-   e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom_right", 24, 24, E_GADCON_ORIENT_CORNER_BR, rg);
-   e_widget_frametable_object_append(of, ob, 3, 4, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 2, 4, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left_top", 24, 24, E_GADCON_ORIENT_CORNER_LT, rg);
    e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right_top", 24, 24, E_GADCON_ORIENT_CORNER_RT, rg);
-   e_widget_frametable_object_append(of, ob, 4, 1, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 2, 1, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left_bottom", 24, 24, E_GADCON_ORIENT_CORNER_LB, rg);
    e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right_bottom", 24, 24, E_GADCON_ORIENT_CORNER_RB, rg);
-   e_widget_frametable_object_append(of, ob, 4, 3, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 2, 3, 1, 1, 1, 1, 1, 1);
    e_widget_list_object_append(o2, of, 1, 1, 0.5);
    
    e_widget_list_object_append(o, o2, 1, 1, 0.5);

Log:
  hide shelf also on mouse out triggered by deskflip
  
Author:       jeffdameth
Date:         2009-03-05 23:48:27 -0800 (Thu, 05 Mar 2009)
New Revision: 39388

Modified:
  trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2009-03-06 02:07:51 UTC (rev 39387)
+++ trunk/e/src/bin/e_shelf.c	2009-03-06 07:48:27 UTC (rev 39388)
@@ -128,6 +128,8 @@
    es->handlers = eina_list_append(es->handlers,
 	 ecore_event_handler_add(E_EVENT_ZONE_EDGE_IN, _e_shelf_cb_mouse_in, es));
    es->handlers = eina_list_append(es->handlers,
+	 ecore_event_handler_add(E_EVENT_ZONE_EDGE_OUT, _e_shelf_cb_mouse_out, es));
+   es->handlers = eina_list_append(es->handlers,
 	 ecore_event_handler_add(E_EVENT_ZONE_EDGE_MOVE, _e_shelf_cb_mouse_in, es));
    es->handlers = eina_list_append(es->handlers,
 	 ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_shelf_cb_mouse_in, es));
@@ -1367,16 +1369,63 @@
 static int
 _e_shelf_cb_mouse_out(void *data, int type, void *event)
 {
-   Ecore_X_Event_Mouse_Out *ev;
    E_Shelf                 *es;
    Ecore_X_Window           win;
 
-   ev = event;
    es = data;
-   if (es->popup) win = es->popup->evas_win;
-   else win = es->zone->container->event_win;
-   if (ev->win != win) return 1;
-   e_shelf_toggle(es, 0);
+   
+   if (type == E_EVENT_ZONE_EDGE_OUT)
+     {
+	E_Event_Zone_Edge *ev;
+	int                show = 1;
+
+	ev = event;
+	if (es->zone != ev->zone) return 1;
+	switch (es->gadcon->orient)
+	  {
+	   case E_GADCON_ORIENT_LEFT:
+	   case E_GADCON_ORIENT_CORNER_LT:
+	   case E_GADCON_ORIENT_CORNER_LB:
+	      if ((ev->edge == E_ZONE_EDGE_LEFT) && (ev->x >= es->x + es->w))
+		show = 0;
+	      break;
+	   case E_GADCON_ORIENT_RIGHT:
+	   case E_GADCON_ORIENT_CORNER_RT:
+	   case E_GADCON_ORIENT_CORNER_RB:
+	      if ((ev->edge == E_ZONE_EDGE_RIGHT) && (ev->x < es->x))
+		show = 0;
+	      break;
+	   case E_GADCON_ORIENT_TOP:
+	   case E_GADCON_ORIENT_CORNER_TL:
+	   case E_GADCON_ORIENT_CORNER_TR:
+	      if ((ev->edge == E_ZONE_EDGE_TOP) && (ev->y > es->y + es->h))
+		show = 0;
+	      break;
+	   case E_GADCON_ORIENT_BOTTOM:
+	   case E_GADCON_ORIENT_CORNER_BL:
+	   case E_GADCON_ORIENT_CORNER_BR:
+	      if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (ev->y < es->y))
+		show = 0;
+	      break;
+	   default:
+	      break;
+	      
+	  }
+	
+	if (!show) e_shelf_toggle(es, 0);
+     }
+   else if (type == ECORE_X_EVENT_MOUSE_OUT)
+     {
+	Ecore_X_Event_Mouse_Out *ev;
+
+	ev = event;
+
+	if (es->popup) win = es->popup->evas_win;
+	else win = es->zone->container->event_win;
+	if (ev->win != win) return 1;
+   
+	e_shelf_toggle(es, 0);
+     }
    return 1;
 }

Log:
  shelf: fix autohide bug in last commit
  
Author:       jeffdameth
Date:         2009-03-06 00:25:33 -0800 (Fri, 06 Mar 2009)
New Revision: 39389

Modified:
  trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2009-03-06 07:48:27 UTC (rev 39388)
+++ trunk/e/src/bin/e_shelf.c	2009-03-06 08:25:33 UTC (rev 39389)
@@ -1386,26 +1386,30 @@
 	   case E_GADCON_ORIENT_LEFT:
 	   case E_GADCON_ORIENT_CORNER_LT:
 	   case E_GADCON_ORIENT_CORNER_LB:
-	      if ((ev->edge == E_ZONE_EDGE_LEFT) && (ev->x >= es->x + es->w))
+	      if ((ev->edge == E_ZONE_EDGE_LEFT) &&
+		  (ev->x >= es->x + es->w))
 		show = 0;
 	      break;
 	   case E_GADCON_ORIENT_RIGHT:
 	   case E_GADCON_ORIENT_CORNER_RT:
 	   case E_GADCON_ORIENT_CORNER_RB:
-	      if ((ev->edge == E_ZONE_EDGE_RIGHT) && (ev->x < es->x))
-		show = 0;
+	      if ((ev->edge == E_ZONE_EDGE_RIGHT) &&
+		  (ev->x > es->w) || (-ev->x > es->w))
+	      	show = 0;
 	      break;
 	   case E_GADCON_ORIENT_TOP:
 	   case E_GADCON_ORIENT_CORNER_TL:
 	   case E_GADCON_ORIENT_CORNER_TR:
-	      if ((ev->edge == E_ZONE_EDGE_TOP) && (ev->y > es->y + es->h))
-		show = 0;
+	      if ((ev->edge == E_ZONE_EDGE_TOP) &&
+		  (ev->y > es->y + es->h))
+	      	show = 0;
 	      break;
 	   case E_GADCON_ORIENT_BOTTOM:
 	   case E_GADCON_ORIENT_CORNER_BL:
 	   case E_GADCON_ORIENT_CORNER_BR:
-	      if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (ev->y < es->y))
-		show = 0;
+	      if ((ev->edge == E_ZONE_EDGE_BOTTOM) &&
+		  (ev->y > es->h) || (-ev->y > es->h))
+	      	show = 0;
 	      break;
 	   default:
 	      break;

Log:
  remove redundant case from last commit
  
Author:       jeffdameth
Date:         2009-03-06 00:32:57 -0800 (Fri, 06 Mar 2009)
New Revision: 39390

Modified:
  trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2009-03-06 08:25:33 UTC (rev 39389)
+++ trunk/e/src/bin/e_shelf.c	2009-03-06 08:32:57 UTC (rev 39390)
@@ -1386,29 +1386,25 @@
 	   case E_GADCON_ORIENT_LEFT:
 	   case E_GADCON_ORIENT_CORNER_LT:
 	   case E_GADCON_ORIENT_CORNER_LB:
-	      if ((ev->edge == E_ZONE_EDGE_LEFT) &&
-		  (ev->x >= es->x + es->w))
+	      if ((ev->edge == E_ZONE_EDGE_LEFT) && (ev->x >= es->x + es->w))
 		show = 0;
 	      break;
 	   case E_GADCON_ORIENT_RIGHT:
 	   case E_GADCON_ORIENT_CORNER_RT:
 	   case E_GADCON_ORIENT_CORNER_RB:
-	      if ((ev->edge == E_ZONE_EDGE_RIGHT) &&
-		  (ev->x > es->w) || (-ev->x > es->w))
+	      if ((ev->edge == E_ZONE_EDGE_RIGHT) && (-ev->x > es->w))
 	      	show = 0;
 	      break;
 	   case E_GADCON_ORIENT_TOP:
 	   case E_GADCON_ORIENT_CORNER_TL:
 	   case E_GADCON_ORIENT_CORNER_TR:
-	      if ((ev->edge == E_ZONE_EDGE_TOP) &&
-		  (ev->y > es->y + es->h))
+	      if ((ev->edge == E_ZONE_EDGE_TOP) && (ev->y > es->y + es->h))
 	      	show = 0;
 	      break;
 	   case E_GADCON_ORIENT_BOTTOM:
 	   case E_GADCON_ORIENT_CORNER_BL:
 	   case E_GADCON_ORIENT_CORNER_BR:
-	      if ((ev->edge == E_ZONE_EDGE_BOTTOM) &&
-		  (ev->y > es->h) || (-ev->y > es->h))
+	      if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (-ev->y > es->h))
 	      	show = 0;
 	      break;
 	   default:

Log:
  delete submenus of main menu afterwards. this fixes the issue with borders 
  not getting unreffed
  
Author:       jeffdameth
Date:         2009-03-15 10:06:18 -0700 (Sun, 15 Mar 2009)
New Revision: 39494

Modified:
  trunk/e/src/bin/e_int_menus.c 

Modified: trunk/e/src/bin/e_int_menus.c
===================================================================
--- trunk/e/src/bin/e_int_menus.c	2009-03-15 12:35:56 UTC (rev 39493)
+++ trunk/e/src/bin/e_int_menus.c	2009-03-15 17:06:18 UTC (rev 39494)
@@ -128,7 +128,6 @@
    e_menu_item_submenu_set(mi, subm);
 
    subm = e_int_menus_clients_new();
-   e_object_data_set(E_OBJECT(subm), dat);   
    dat->clients = subm;
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Windows"));
@@ -398,9 +397,16 @@
 {
    Main_Data *dat;
    E_Menu *m;
-
+   
    m = obj;
    dat = e_object_data_get(E_OBJECT(obj));
+   e_object_del(E_OBJECT(dat->apps));
+   e_object_del(E_OBJECT(dat->all_apps));
+   e_object_del(E_OBJECT(dat->desktops));
+   e_object_del(E_OBJECT(dat->clients));
+   e_object_del(E_OBJECT(dat->enlightenment));
+   e_object_del(E_OBJECT(dat->config));
+   
    free(dat);
    _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/0"));
    _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/1"));
@@ -414,6 +420,7 @@
    _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/9"));
    _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/10"));
    _e_int_menus_augmentation_del(m, eina_hash_find(_e_int_menus_augmentation, "main/11"));
+
 }
 
 static void
@@ -1088,7 +1095,7 @@
 	e_util_menu_item_theme_icon_set(mi, "enlightenment/lost_windows");
 	e_menu_item_submenu_set(mi, subm);
      }
-
+   
    e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_clients_free_hook);
    e_object_data_set(E_OBJECT(m), borders);
 }
@@ -1149,7 +1156,7 @@
    m = obj;
    borders = e_object_data_get(E_OBJECT(m));
    EINA_LIST_FREE(borders, bd)
-	e_object_unref(E_OBJECT(bd));
+     e_object_unref(E_OBJECT(bd));
 }
 
 static void 
@@ -1188,7 +1195,6 @@
 
    bd = data;
    E_OBJECT_CHECK(bd);
-
    o = e_icon_add(m->evas);
    e_icon_object_set(o, e_border_icon_add(bd, m->evas));
    mi->icon_object = o;
@@ -1257,7 +1263,7 @@
    m = obj;
    borders = e_object_data_get(E_OBJECT(m));
    EINA_LIST_FREE(borders, bd)
-	e_object_unref(E_OBJECT(bd));
+     e_object_unref(E_OBJECT(bd));
 }
 
 static void 
@@ -1278,21 +1284,21 @@
 static void
 _e_int_menus_augmentation_add(E_Menu *m, Eina_List *augmentation)
 {
-	E_Int_Menu_Augmentation *aug;
+   E_Int_Menu_Augmentation *aug;
    Eina_List *l;
 
    EINA_LIST_FOREACH(augmentation, l, aug)
-	if (aug->add.func) aug->add.func(aug->add.data, m);
+     if (aug->add.func) aug->add.func(aug->add.data, m);
 }
 
 static void
 _e_int_menus_augmentation_del(E_Menu *m, Eina_List *augmentation)
 {
-	E_Int_Menu_Augmentation *aug;
+   E_Int_Menu_Augmentation *aug;
    Eina_List *l;
 
    EINA_LIST_FOREACH(augmentation, l, aug)
-	if (aug->del.func) aug->del.func(aug->del.data, m);
+     if (aug->del.func) aug->del.func(aug->del.data, m);
 }
 
 static void

Log:
  some efm work: 
  - up/down key navigation for grid mode
  - fixed next/prev functions for custom grid
  - use 'key' instead of keyname
  
Author:       jeffdameth
Date:         2009-03-16 18:40:50 -0700 (Mon, 16 Mar 2009)
New Revision: 39514

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2009-03-17 00:37:02 UTC (rev 39513)
+++ trunk/e/src/bin/e_fm.c	2009-03-17 01:40:50 UTC (rev 39514)
@@ -252,6 +252,9 @@
 static void _e_fm2_icon_sel_last(Evas_Object *obj);
 static void _e_fm2_icon_sel_prev(Evas_Object *obj);
 static void _e_fm2_icon_sel_next(Evas_Object *obj);
+static void _e_fm2_icon_sel_down(Evas_Object *obj);
+static void _e_fm2_icon_sel_up(Evas_Object *obj);
+
 static void _e_fm2_typebuf_show(Evas_Object *obj);
 static void _e_fm2_typebuf_hide(Evas_Object *obj);
 static void _e_fm2_typebuf_history_prev(Evas_Object *obj);
@@ -4785,23 +4788,75 @@
    E_Fm2_Smart_Data *sd;
    Eina_List *l;
    E_Fm2_Icon *ic, *ic_prev;
-
+   char view_mode;
+   int x, y, custom = 0, found = 0;
+   int dist, min = 65535; /* FIXME big enough? */
+   
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
    if (!sd->icons) return;
 
+   view_mode = _e_fm2_view_mode_get(sd);
+   if ((view_mode == E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS) ||
+       (view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) ||
+       (view_mode == E_FM2_VIEW_MODE_CUSTOM_ICONS))
+     custom = 1;
+
    ic_prev = NULL;
    EINA_LIST_FOREACH(sd->icons, l, ic)
      {
 	if (ic->selected)
 	  {
-	     if (!l->prev) return;
-	     ic_prev = l->prev->data;
+	     if (!custom)
+	       {
+		  if (!l->prev) return;
+		  ic_prev = l->prev->data;
+	       }
+	     else
+	       {
+		  found = 1;
+		  x = ic->x;
+		  y = ic->y;
+	       }
 	     break;
 	  }
      }
+
+   if (custom && found)
+     {
+	EINA_LIST_FOREACH(sd->icons, l, ic)
+	  {
+	     if (ic->x < x)
+	       {
+		  dist = 2 * (abs(ic->y - y)) + (x - ic->x);
+		  if (dist < min)
+		    {
+		       min = dist;
+		       ic_prev = ic;
+		    }
+	       }
+	  }
+	/* no prev item was found in row go to end and up */
+	if (!ic_prev)
+	  {
+	     EINA_LIST_FOREACH(sd->icons, l, ic)
+	       {
+		  if (ic->y < y)
+		    {
+		       dist = 2 * (abs(ic->y - y)) - ic->x;
+		       if (dist < min)
+			 {
+			    min = dist;
+			    ic_prev = ic;
+			 }
+		    }
+	       }
+	  }
+     }
+
    if (!ic_prev)
      {
+	/* FIXME this is not the bottomright item for custom grid */
 	_e_fm2_icon_sel_last(obj);
 	return;
      }
@@ -4817,23 +4872,74 @@
    E_Fm2_Smart_Data *sd;
    Eina_List *l;
    E_Fm2_Icon *ic, *ic_next;
-
+   char view_mode;
+   int x, y, custom = 0, found = 0;
+   int dist, min = 65535;
+   
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
    if (!sd->icons) return;
 
+   view_mode = _e_fm2_view_mode_get(sd);
+   if ((view_mode == E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS) ||
+       (view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) ||
+       (view_mode == E_FM2_VIEW_MODE_CUSTOM_ICONS))
+     custom = 1;
+
    ic_next = NULL;
    EINA_LIST_FOREACH(sd->icons, l, ic)
      {
 	if (ic->selected)
 	  {
-	     if (!l->next) return;
-	     ic_next = l->next->data;
+	     if (!custom)
+	       {
+		  if (!l->next) return; 
+		  ic_next = l->next->data;
+	       }
+	     else
+	       {
+		  found = 1;
+		  x = ic->x;
+		  y = ic->y;
+	       }
 	     break;
 	  }
      }
+
+   if (custom && found)
+     {
+	EINA_LIST_FOREACH(sd->icons, l, ic)
+	  {
+	     if (ic->x > x)
+	       {
+		  dist = 2 * (abs(ic->y - y))  + (ic->x - x);
+		  if (dist < min)
+		    {
+		       min = dist;
+		       ic_next = ic;
+		    }
+	       }
+	  }
+	/* no next item was found in row go down and begin */
+	if (!ic_next)
+	  {
+	     EINA_LIST_FOREACH(sd->icons, l, ic)
+	       {
+		  if (ic->y > y)
+		    {
+		       dist = 2 * (abs(ic->y - y)) + ic->x;
+		       if (dist < min)
+			 {
+			    min = dist;
+			    ic_next = ic;
+			 }
+		    }
+	       }
+	  }
+     }
    if (!ic_next)
      {
+	/* FIXME this is not the topleft item for custom grid */
 	_e_fm2_icon_sel_first(obj);
 	return;
      }
@@ -4843,6 +4949,160 @@
    _e_fm2_icon_make_visible(ic_next);
 }
 
+static void
+_e_fm2_icon_sel_down(Evas_Object *obj)
+{
+   E_Fm2_Smart_Data *sd;
+   Eina_List *l;
+   E_Fm2_Icon *ic, *ic_down;
+   int found, x, y, custom = 0;
+   int dist, min = 65535;
+   char view_mode;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   if (!sd->icons) return;
+
+   view_mode = _e_fm2_view_mode_get(sd);
+
+   view_mode = _e_fm2_view_mode_get(sd);
+   if ((view_mode == E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS) ||
+       (view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) ||
+       (view_mode == E_FM2_VIEW_MODE_CUSTOM_ICONS))
+     custom = 1;
+
+   ic_down = NULL;
+   found = 0;
+   
+   EINA_LIST_FOREACH(sd->icons, l, ic)
+     {
+	if (!found)
+	  {
+	     if (ic->selected)
+	       {
+		  found = 1;
+		  x = ic->x;
+		  y = ic->y;
+		  if (custom) break;
+	       }
+	  }
+	else if (ic->y > y)
+	  {
+	     dist = (abs(ic->x - x));
+	     if (dist < min)
+	       {
+		  min = dist;
+		  ic_down = ic;
+	       }
+	     else break;
+	  }
+     }
+   
+   if (custom && found)
+     {
+	EINA_LIST_FOREACH(sd->icons, l, ic)
+	  {
+	     if (ic->y > y)
+	       {
+		  dist = (abs(ic->x - x)) + (ic->y - y) * 2;
+		  if (dist < min)
+		    {
+		       min = dist;
+		       ic_down = ic;
+		    }
+	       }
+	  }
+     }
+   
+   if (!ic_down)
+     {
+	if (!custom) _e_fm2_icon_sel_next(obj);
+	return;
+     }
+   _e_fm2_icon_desel_any(obj);
+   _e_fm2_icon_select(ic_down);
+   evas_object_smart_callback_call(sd->obj, "selection_change", NULL);
+   _e_fm2_icon_make_visible(ic_down);
+}
+
+
+static void
+_e_fm2_icon_sel_up(Evas_Object *obj)
+{
+   E_Fm2_Smart_Data *sd;
+   Eina_List *l;
+   E_Fm2_Icon *ic, *ic_up;
+   int found, x, y, custom = 0;
+   int dist, min = 65535;
+   char view_mode;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   if (!sd->icons) return;
+
+   view_mode = _e_fm2_view_mode_get(sd);
+   
+   if ((view_mode == E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS) ||
+       (view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) ||
+       (view_mode == E_FM2_VIEW_MODE_CUSTOM_ICONS))
+     custom = 1;
+
+   ic_up = NULL;
+   found = 0;
+   
+   EINA_LIST_REVERSE_FOREACH(sd->icons, l, ic)
+     {
+	if (!found)
+	  {
+	     if (ic->selected)
+	       {
+		  found = 1;
+		  x = ic->x;
+		  y = ic->y;
+		  if (custom) break;
+	       }
+	  }
+	else if (ic->y < y)
+	  {
+	     dist = (abs(ic->x - x));
+	     if (dist < min)
+	       {
+		  min = dist;
+		  ic_up = ic;
+	       }
+	     else break;
+	  }
+
+     }
+   
+   if (custom && found)
+     {
+	EINA_LIST_FOREACH(sd->icons, l, ic)
+	  {
+	     if (!ic->selected && ic->y < y)
+	       {
+		  dist = (abs(ic->x - x)) + (y - ic->y) * 2;
+		  if (dist < min)
+		    {
+		       min = dist;
+		       ic_up = ic;
+		    }
+	       }
+	  }
+     }
+
+   if (!ic_up)
+     {
+	if (!custom) _e_fm2_icon_sel_prev(obj);
+	return;
+     }
+   _e_fm2_icon_desel_any(obj);
+   _e_fm2_icon_select(ic_up);
+   evas_object_smart_callback_call(sd->obj, "selection_change", NULL);
+   _e_fm2_icon_make_visible(ic_up);
+}
+
+
 /* FIXME: prototype */
 static void
 _e_fm2_typebuf_show(Evas_Object *obj)
@@ -6174,24 +6434,24 @@
 
    if (evas_key_modifier_is_set(ev->modifiers, "Control"))
      {
-	if (!strcmp(ev->keyname, "x"))
+	if (!strcmp(ev->key, "x"))
 	  {
 	     _e_fm2_file_cut(obj);
 	     return;
 	  }
-	else if (!strcmp(ev->keyname, "c"))
+	else if (!strcmp(ev->key, "c"))
 	  {
 	     _e_fm2_file_copy(obj);
 	     return;
 	  }
-	else if (!strcmp(ev->keyname, "v"))
+	else if (!strcmp(ev->key, "v"))
 	  {
 	     _e_fm2_file_paste(obj);
 	     return;
 	  }
      }
 
-   if (!strcmp(ev->keyname, "Left"))
+   if (!strcmp(ev->key, "Left"))
      { 
 	/* FIXME: icon mode, typebuf extras */
 	/* list mode: scroll left n pix
@@ -6200,7 +6460,7 @@
 	 */
 	_e_fm2_icon_sel_prev(obj);
     }
-   else if (!strcmp(ev->keyname, "Right"))
+   else if (!strcmp(ev->key, "Right"))
      {
 	/* FIXME: icon mode, typebuf extras */
 	/* list mode: scroll right n pix
@@ -6209,27 +6469,33 @@
 	 */
 	_e_fm2_icon_sel_next(obj);
      }
-   else if (!strcmp(ev->keyname, "Up"))
+   else if (!strcmp(ev->key, "Up"))
      {
-	/* FIXME: icon mode */
-	/* list mode: prev icon
-	 * icon mode: up an icon
-	 * typebuf mode: previous history
-	 */
 	if (sd->typebuf_visible)
 	  _e_fm2_typebuf_history_prev(obj);
+	else if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_LIST)
+	  _e_fm2_icon_sel_prev(obj);
 	else
-	  _e_fm2_icon_sel_prev(obj);
+	  _e_fm2_icon_sel_up(obj);
      }
-   else if (!strcmp(ev->keyname, "Home"))
+   else if (!strcmp(ev->key, "Down"))
      {
+	if (sd->typebuf_visible)
+	  _e_fm2_typebuf_history_next(obj);
+	else if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_LIST)
+	  _e_fm2_icon_sel_next(obj);
+	else
+	  _e_fm2_icon_sel_down(obj);
+     }
+   else if (!strcmp(ev->key, "Home"))
+     {
 	/* FIXME: typebuf extras */
 	/* go to first icon
 	 * typebuf mode: cursor to start
 	 */
 	_e_fm2_icon_sel_first(obj);
      }
-   else if (!strcmp(ev->keyname, "End"))
+   else if (!strcmp(ev->key, "End"))
      {
 	/* FIXME: typebuf extras */
 	/* go to last icon
@@ -6237,20 +6503,8 @@
 	 */
 	_e_fm2_icon_sel_last(obj);
      }
-   else if (!strcmp(ev->keyname, "Down"))
+   else if (!strcmp(ev->key, "Prior"))
      {
-	/* FIXME: icon mode */
-	/* list mode: next icon
-	 * icon mode: down an icon
-	 * typebuf mode: next history
-	 */
-	if (sd->typebuf_visible)
-	  _e_fm2_typebuf_history_next(obj);
-	else
-	  _e_fm2_icon_sel_next(obj);
-     }
-   else if (!strcmp(ev->keyname, "Prior"))
-     {
 	/* up h * n pixels */
 	e_fm2_pan_set(obj, sd->pos.x, sd->pos.y - sd->h);
 	evas_object_smart_callback_call(sd->obj, "pan_changed", NULL);
@@ -6261,7 +6515,7 @@
 	e_fm2_pan_set(obj, sd->pos.x, sd->pos.y + sd->h);
 	evas_object_smart_callback_call(sd->obj, "pan_changed", NULL);
      }
-   else if (!strcmp(ev->keyname, "Escape"))
+   else if (!strcmp(ev->key, "Escape"))
      {
 	/* typebuf mode: end typebuf mode */
 	if (sd->typebuf_visible)
@@ -6278,7 +6532,7 @@
 	       }
 	  }
      }
-   else if (!strcmp(ev->keyname, "Return"))
+   else if (!strcmp(ev->key, "Return"))
      {
 	/* if selected - select callback.
 	 * typebuf mode: if nothing selected - run cmd
@@ -6295,23 +6549,28 @@
 	       }
 	  }
      }
-   else if (!strcmp(ev->keyname, "Insert"))
+   else if (!strcmp(ev->key, "Insert"))
      {
 	/* dunno what to do with this yet */
      }
-   else if (!strcmp(ev->keyname, "Tab"))
+   else if (!strcmp(ev->key, "Tab"))
      {
 	/* typebuf mode: tab complete */
 	if (sd->typebuf_visible)
 	  _e_fm2_typebuf_complete(obj);
      }
-   else if (!strcmp(ev->keyname, "BackSpace"))
+   else if (!strcmp(ev->key, "BackSpace"))
      {
 	/* typebuf mode: backspace */
 	if (sd->typebuf_visible)
 	  _e_fm2_typebuf_char_backspace(obj);
+	else
+	  {
+	     if (e_fm2_has_parent_get(obj))
+	       e_fm2_parent_go(obj);
+	  } 
      }
-   else if (!strcmp(ev->keyname, "Delete"))
+   else if (!strcmp(ev->key, "Delete"))
      {
 	/* FIXME: typebuf extras */
 	if (sd->typebuf_visible)

Log:
  added: _e_fm2_icon_next_find function used in _e_fm2_icon_sel_prev/next and _e_fm2_typebuf_match
  - _e_fm2_typebuf_match has the new argument 'next'; one can now go to the prev/next match with up/down keys while typebuffer is active 
  
Author:       jeffdameth
Date:         2009-03-17 12:49:12 -0700 (Tue, 17 Mar 2009)
New Revision: 39534

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2009-03-17 19:39:14 UTC (rev 39533)
+++ trunk/e/src/bin/e_fm.c	2009-03-17 19:49:12 UTC (rev 39534)
@@ -248,6 +248,8 @@
 static void _e_fm2_icon_make_visible(E_Fm2_Icon *ic);
 static void _e_fm2_icon_desel_any(Evas_Object *obj);
 static E_Fm2_Icon *_e_fm2_icon_first_selected_find(Evas_Object *obj);
+static E_Fm2_Icon *_e_fm2_icon_next_find(Evas_Object *obj, int next, int match_func(E_Fm2_Icon *ic, void *data), void *data);
+
 static void _e_fm2_icon_sel_first(Evas_Object *obj);
 static void _e_fm2_icon_sel_last(Evas_Object *obj);
 static void _e_fm2_icon_sel_prev(Evas_Object *obj);
@@ -260,7 +262,7 @@
 static void _e_fm2_typebuf_history_prev(Evas_Object *obj);
 static void _e_fm2_typebuf_history_next(Evas_Object *obj);
 static void _e_fm2_typebuf_run(Evas_Object *obj);
-static void _e_fm2_typebuf_match(Evas_Object *obj);
+static void _e_fm2_typebuf_match(Evas_Object *obj, int next);
 static void _e_fm2_typebuf_complete(Evas_Object *obj);
 static void _e_fm2_typebuf_char_append(Evas_Object *obj, const char *ch);
 static void _e_fm2_typebuf_char_backspace(Evas_Object *obj);
@@ -4782,19 +4784,19 @@
    _e_fm2_icon_make_visible(ic);
 }
 
-static void
-_e_fm2_icon_sel_prev(Evas_Object *obj)
+static E_Fm2_Icon *
+_e_fm2_icon_next_find(Evas_Object *obj, int next, int match_func(E_Fm2_Icon *ic, void *data), void *data)
 {
    E_Fm2_Smart_Data *sd;
    Eina_List *l;
-   E_Fm2_Icon *ic, *ic_prev;
+   E_Fm2_Icon *ic, *ic_next;
    char view_mode;
-   int x, y, custom = 0, found = 0;
-   int dist, min = 65535; /* FIXME big enough? */
+   int x = 0, y = 0, custom = 0;
+   int dist, min = 65535;
    
    sd = evas_object_smart_data_get(obj);
-   if (!sd) return;
-   if (!sd->icons) return;
+   if (!sd) return NULL;
+   if (!sd->icons) return NULL;
 
    view_mode = _e_fm2_view_mode_get(sd);
    if ((view_mode == E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS) ||
@@ -4802,58 +4804,121 @@
        (view_mode == E_FM2_VIEW_MODE_CUSTOM_ICONS))
      custom = 1;
 
-   ic_prev = NULL;
+   ic_next = NULL;
+   /* find selected item / current position */
    EINA_LIST_FOREACH(sd->icons, l, ic)
      {
 	if (ic->selected)
 	  {
-	     if (!custom)
+	     if (!custom && !match_func)
 	       {
-		  if (!l->prev) return;
-		  ic_prev = l->prev->data;
+		  ic_next = ic;
 	       }
 	     else
 	       {
-		  found = 1;
 		  x = ic->x;
 		  y = ic->y;
 	       }
 	     break;
 	  }
      }
-
-   if (custom && found)
+   if (next && (custom || match_func))
      {
-	EINA_LIST_FOREACH(sd->icons, l, ic)
+	/* find next item in custom grid, or list/grid when match
+	   func is given */
+	if (next == 1)
 	  {
-	     if (ic->x < x)
+	     EINA_LIST_FOREACH(sd->icons, l, ic)
 	       {
-		  dist = 2 * (abs(ic->y - y)) + (x - ic->x);
-		  if (dist < min)
+		  if ((ic->x > x) &&
+		      (custom ? (ic->y >= y) : (ic->y == y)) &&
+		      (!match_func || match_func(ic, data)))
 		    {
-		       min = dist;
-		       ic_prev = ic;
+		       dist = 2 * (ic->y - y)  + (ic->x - x);
+		       if (dist < min)
+			 {
+			    min = dist;
+			    ic_next = ic;
+			 }
 		    }
 	       }
+	     /* no next item was found in row go down and begin */
+	     if (!ic_next)
+	       {
+		  EINA_LIST_FOREACH(sd->icons, l, ic)
+		    {
+		       if ((ic->y > y) && (!match_func || match_func(ic, data)))
+			 {
+			    dist = 2 * (abs(ic->y - y)) + ic->x;
+			    if (dist < min)
+			      {
+				 min = dist;
+				 ic_next = ic;
+			      }
+			 }
+		    }
+	       }
 	  }
-	/* no prev item was found in row go to end and up */
-	if (!ic_prev)
+	/* find previous item */
+	else if (next == -1)
 	  {
 	     EINA_LIST_FOREACH(sd->icons, l, ic)
 	       {
-		  if (ic->y < y)
+		  if ((ic->x < x) &&
+		      (custom ? (ic->y <= y) : (ic->y == y)) &&
+		      (!match_func || match_func(ic, data)))
 		    {
-		       dist = 2 * (abs(ic->y - y)) - ic->x;
+		       dist = 2 * (y - ic->y) + (x - ic->x);
 		       if (dist < min)
 			 {
 			    min = dist;
-			    ic_prev = ic;
+			    ic_next = ic;
 			 }
 		    }
 	       }
+	     /* no prev item was found in row go to end and up */
+	     if (!ic_next)
+	       {
+		  EINA_LIST_FOREACH(sd->icons, l, ic)
+		    {
+		       if ((ic->y < y) && (!match_func || match_func(ic, data)))
+			 {
+			    dist = 2 * (abs(ic->y - y)) - ic->x;
+			    if (dist < min)
+			      {
+				 min = dist;
+				 ic_next = ic;
+			      }
+			 }
+		    }
+	       }
 	  }
      }
+   /* not custom, items are arranged in list order */
+   else if (ic_next) 
+     {
+	if (next == 1)
+	  {
+	     if (!l->next) return NULL; 
+	     ic_next = l->next->data;
+	  }
+	if (next == -1)
+	  {
+	     if (!l->prev) return NULL; 
+	     ic_next = l->prev->data;
+	  }
+     }
+      
+   return ic_next;
+}
 
+static void
+_e_fm2_icon_sel_prev(Evas_Object *obj)
+{
+   E_Fm2_Icon *ic_prev;
+   
+   ic_prev = _e_fm2_icon_next_find(obj, -1, NULL, NULL);
+   
    if (!ic_prev)
      {
 	/* FIXME this is not the bottomright item for custom grid */
@@ -4862,81 +4927,16 @@
      }
    _e_fm2_icon_desel_any(obj);
    _e_fm2_icon_select(ic_prev);
-   evas_object_smart_callback_call(sd->obj, "selection_change", NULL);
+   evas_object_smart_callback_call(obj, "selection_change", NULL); /*XXX sd->obj*/
    _e_fm2_icon_make_visible(ic_prev);
 }
 
 static void
 _e_fm2_icon_sel_next(Evas_Object *obj)
 {
-   E_Fm2_Smart_Data *sd;
-   Eina_List *l;
-   E_Fm2_Icon *ic, *ic_next;
-   char view_mode;
-   int x, y, custom = 0, found = 0;
-   int dist, min = 65535;
-   
-   sd = evas_object_smart_data_get(obj);
-   if (!sd) return;
-   if (!sd->icons) return;
+   E_Fm2_Icon *ic_next;
 
-   view_mode = _e_fm2_view_mode_get(sd);
-   if ((view_mode == E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS) ||
-       (view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) ||
-       (view_mode == E_FM2_VIEW_MODE_CUSTOM_ICONS))
-     custom = 1;
-
-   ic_next = NULL;
-   EINA_LIST_FOREACH(sd->icons, l, ic)
-     {
-	if (ic->selected)
-	  {
-	     if (!custom)
-	       {
-		  if (!l->next) return; 
-		  ic_next = l->next->data;
-	       }
-	     else
-	       {
-		  found = 1;
-		  x = ic->x;
-		  y = ic->y;
-	       }
-	     break;
-	  }
-     }
-
-   if (custom && found)
-     {
-	EINA_LIST_FOREACH(sd->icons, l, ic)
-	  {
-	     if (ic->x > x)
-	       {
-		  dist = 2 * (abs(ic->y - y))  + (ic->x - x);
-		  if (dist < min)
-		    {
-		       min = dist;
-		       ic_next = ic;
-		    }
-	       }
-	  }
-	/* no next item was found in row go down and begin */
-	if (!ic_next)
-	  {
-	     EINA_LIST_FOREACH(sd->icons, l, ic)
-	       {
-		  if (ic->y > y)
-		    {
-		       dist = 2 * (abs(ic->y - y)) + ic->x;
-		       if (dist < min)
-			 {
-			    min = dist;
-			    ic_next = ic;
-			 }
-		    }
-	       }
-	  }
-     }
+   ic_next = _e_fm2_icon_next_find(obj, 1, NULL, NULL); 
    if (!ic_next)
      {
 	/* FIXME this is not the topleft item for custom grid */
@@ -4945,7 +4945,7 @@
      }
    _e_fm2_icon_desel_any(obj);
    _e_fm2_icon_select(ic_next);
-   evas_object_smart_callback_call(sd->obj, "selection_change", NULL);
+   evas_object_smart_callback_call(obj, "selection_change", NULL);
    _e_fm2_icon_make_visible(ic_next);
 }
 
@@ -4955,7 +4955,7 @@
    E_Fm2_Smart_Data *sd;
    Eina_List *l;
    E_Fm2_Icon *ic, *ic_down;
-   int found, x, y, custom = 0;
+   int found, x = -1, y = -1, custom = 0;
    int dist, min = 65535;
    char view_mode;
    
@@ -4998,7 +4998,7 @@
 	  }
      }
    
-   if (custom && found)
+   if (custom)
      {
 	EINA_LIST_FOREACH(sd->icons, l, ic)
 	  {
@@ -5032,7 +5032,7 @@
    E_Fm2_Smart_Data *sd;
    Eina_List *l;
    E_Fm2_Icon *ic, *ic_up;
-   int found, x, y, custom = 0;
+   int found = 0, x = 0, y = 0, custom = 0;
    int dist, min = 65535;
    char view_mode;
    
@@ -5048,7 +5048,6 @@
      custom = 1;
 
    ic_up = NULL;
-   found = 0;
    
    EINA_LIST_REVERSE_FOREACH(sd->icons, l, ic)
      {
@@ -5072,7 +5071,6 @@
 	       }
 	     else break;
 	  }
-
      }
    
    if (custom && found)
@@ -5182,12 +5180,40 @@
      }
 }
 
+static int
+_e_fm2_typebuf_match_func(E_Fm2_Icon *ic, void* data)
+{
+   char *tb = data;
+   return (((ic->info.label) &&
+	    (e_util_glob_case_match(ic->info.label, tb))) ||
+	   ((ic->info.file) &&
+	    (e_util_glob_case_match(ic->info.file, tb))));
+}
+
+static int
+_e_fm_typebuf_timer_cb(void *data)
+{
+   Evas_Object *obj = data;
+   E_Fm2_Smart_Data *sd;
+
+   if (!data) return 0;
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return 0;
+
+   if (!sd->typebuf_visible) return 0;
+
+   _e_fm2_typebuf_hide(obj);
+   sd->typebuf.timer = NULL;
+
+   return 0;
+}
+
 static void
-_e_fm2_typebuf_match(Evas_Object *obj)
+_e_fm2_typebuf_match(Evas_Object *obj, int next)
 {
    E_Fm2_Smart_Data *sd;
+   E_Fm2_Icon *ic, *ic_match = NULL;
    Eina_List *l;
-   E_Fm2_Icon *ic;
    char *tb;
    int tblen;
 
@@ -5195,7 +5221,7 @@
    if (!sd) return;
    if (!sd->typebuf.buf) return;
    if (!sd->icons) return;
-   _e_fm2_icon_desel_any(obj);
+
    tblen = strlen(sd->typebuf.buf);
    tb = malloc(tblen + 2);
    if (!tb) return;
@@ -5203,22 +5229,38 @@
    tb[tblen] = '*';
    tb[tblen + 1] = '\0';
 
-   EINA_LIST_FOREACH(sd->icons, l, ic)
+   if (!next)
      {
-	if (
-	    ((ic->info.label) &&
-	     (e_util_glob_case_match(ic->info.label, tb))) ||
-	    ((ic->info.file) &&
-	     (e_util_glob_case_match(ic->info.file, tb)))
-	    )
-	  {
-	     _e_fm2_icon_select(ic);
-	     evas_object_smart_callback_call(sd->obj, "selection_change", NULL);
-	     _e_fm2_icon_make_visible(ic);
-	     break;
-	  }
+       EINA_LIST_FOREACH(sd->icons, l, ic)
+	 {
+	   if (_e_fm2_typebuf_match_func(ic, tb))
+	     {
+	       ic_match = ic;
+	       break;
+	     }
+	 }
      }
-   free(tb);
+   else
+     {
+       ic_match = _e_fm2_icon_next_find(obj, next, &_e_fm2_typebuf_match_func, tb);
+     }
+   
+   if (ic_match)
+     {
+	_e_fm2_icon_desel_any(obj);
+	_e_fm2_icon_select(ic_match);
+	evas_object_smart_callback_call(obj, "selection_change", NULL);
+	_e_fm2_icon_make_visible(ic_match);
+     }
+   
+   free(tb);   
+
+   if (sd->typebuf.timer) 
+     {
+	ecore_timer_del(sd->typebuf.timer);
+     }
+
+   sd->typebuf.timer = ecore_timer_add(5.0, _e_fm_typebuf_timer_cb, obj);
 }
 
 static void
@@ -5229,27 +5271,9 @@
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
    /* FIXME: do */
-   _e_fm2_typebuf_match(obj);
+   _e_fm2_typebuf_match(obj, 0);
 }
 
-static int
-_e_fm_typebuf_timer_cb(void *data)
-{
-   Evas_Object *obj = data;
-   E_Fm2_Smart_Data *sd;
-
-   if (!data) return 0;
-   sd = evas_object_smart_data_get(obj);
-   if (!sd) return 0;
-
-   if (!sd->typebuf_visible) return 0;
-
-   _e_fm2_typebuf_hide(obj);
-   sd->typebuf.timer = NULL;
-
-   return 0;
-}
-
 static void
 _e_fm2_typebuf_char_append(Evas_Object *obj, const char *ch)
 {
@@ -5265,15 +5289,8 @@
    strcat(ts, ch);
    free(sd->typebuf.buf);
    sd->typebuf.buf = ts;
-   _e_fm2_typebuf_match(obj);
+   _e_fm2_typebuf_match(obj, 0);
    edje_object_part_text_set(sd->overlay, "e.text.typebuf_label", sd->typebuf.buf);
-
-   if (sd->typebuf.timer) 
-     {
-	ecore_timer_del(sd->typebuf.timer);
-     }
-
-   sd->typebuf.timer = ecore_timer_add(5.0, _e_fm_typebuf_timer_cb, obj);
 }
 
 static void
@@ -5298,7 +5315,7 @@
    if (!ts) return;
    free(sd->typebuf.buf);
    sd->typebuf.buf = ts;
-   _e_fm2_typebuf_match(obj);
+   _e_fm2_typebuf_match(obj, 0);
    edje_object_part_text_set(sd->overlay, "e.text.typebuf_label", sd->typebuf.buf);
 }
 
@@ -6472,7 +6489,10 @@
    else if (!strcmp(ev->key, "Up"))
      {
 	if (sd->typebuf_visible)
-	  _e_fm2_typebuf_history_prev(obj);
+	  /* FIXME: icon mode, typebuf extras */
+	  /* is there a way to use this atm? */
+	  // _e_fm2_typebuf_history_prev(obj);
+	  _e_fm2_typebuf_match(obj, -1);
 	else if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_LIST)
 	  _e_fm2_icon_sel_prev(obj);
 	else
@@ -6481,7 +6501,10 @@
    else if (!strcmp(ev->key, "Down"))
      {
 	if (sd->typebuf_visible)
-	  _e_fm2_typebuf_history_next(obj);
+	  /* FIXME: icon mode, typebuf extras */
+	  /* is there a way to use this? */
+	  //_e_fm2_typebuf_history_next(obj);
+	  _e_fm2_typebuf_match(obj, 1);
 	else if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_LIST)
 	  _e_fm2_icon_sel_next(obj);
 	else

Log:
  e17 exehist: do not add file params to exhist
  
Author:       jeffdameth
Date:         2009-07-07 10:38:42 -0700 (Tue, 07 Jul 2009)
New Revision: 41268

Modified:
  trunk/e/src/bin/e_exec.c 

Modified: trunk/e/src/bin/e_exec.c
===================================================================
--- trunk/e/src/bin/e_exec.c	2009-07-07 17:37:31 UTC (rev 41267)
+++ trunk/e/src/bin/e_exec.c	2009-07-07 17:38:42 UTC (rev 41268)
@@ -225,7 +225,7 @@
 	return NULL;
      }
    /* reset env vars */
-   if (launch->launch_method) e_exehist_add(launch->launch_method, exec);
+   if (launch->launch_method && !desktop) e_exehist_add(launch->launch_method, exec);
    free(exec);
    /* 20 lines at start and end, 20x100 limit on bytes at each end. */
 //// FIXME: seem to be some issues with the pipe and filling up ram - need to
@@ -256,6 +256,8 @@
 	     eina_hash_add(e_exec_instances, desktop->orig_path, l);
 	  }
 	e_exec_start_pending = eina_list_append(e_exec_start_pending, desktop);
+
+	e_exehist_add(launch->launch_method, desktop->exec);
      }
    else if (exe)
      {

Log:
  e17: do not show shape of argb popups
  
Author:       jeffdameth
Date:         2009-08-18 18:41:37 -0700 (Tue, 18 Aug 2009)
New Revision: 41867

Modified:
  trunk/e/src/bin/e_popup.c 

Modified: trunk/e/src/bin/e_popup.c
===================================================================
--- trunk/e/src/bin/e_popup.c	2009-08-19 00:45:10 UTC (rev 41866)
+++ trunk/e/src/bin/e_popup.c	2009-08-19 01:41:37 UTC (rev 41867)
@@ -285,7 +285,8 @@
 	       }
 	     pop->need_shape_export = 0;
 	  }
-	if ((pop->visible) && (!pop->idle_enterer))
+	if ((pop->visible) && (!pop->idle_enterer) &&
+	    (!pop->shaped && e_config->use_composite))
 	  e_container_shape_show(pop->shape);
      }
 }
@@ -318,7 +319,10 @@
    ecore_evas_move(pop->ecore_evas,
 		   pop->zone->x + pop->x, 
 		   pop->zone->y + pop->y);
-   e_container_shape_show(pop->shape);
+
+   if (!(pop->shaped && e_config->use_composite))
+     e_container_shape_show(pop->shape);
+   
    pop->idle_enterer = NULL;
    return 0;
 }

Log:
  e_exec: wait for openoffice to come an grab its icon
  
Author:       jeffdameth
Date:         2009-08-28 01:37:07 -0700 (Fri, 28 Aug 2009)
New Revision: 42066

Modified:
  trunk/e/src/bin/e_exec.c 

Modified: trunk/e/src/bin/e_exec.c
===================================================================
--- trunk/e/src/bin/e_exec.c	2009-08-28 08:34:45 UTC (rev 42065)
+++ trunk/e/src/bin/e_exec.c	2009-08-28 08:37:07 UTC (rev 42066)
@@ -55,6 +55,7 @@
 static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *lines);
 static void _dialog_save_cb(void *data, void *data2);
+static void _e_exec_instance_free(E_Exec_Instance *inst);
 
 /* local subsystem globals */
 static Eina_List *e_exec_start_pending = NULL;
@@ -288,10 +289,43 @@
    return 0;
 }
 
+static void
+_e_exec_instance_free(E_Exec_Instance *inst)
+{
+   Eina_List *instances;
+   
+   if (inst->desktop)
+     {
+	instances = eina_hash_find(e_exec_instances, inst->desktop->orig_path);
+	if (instances)
+	  {
+	     instances = eina_list_remove(instances, inst);
+	     if (instances)
+	       eina_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
+	     else
+	       eina_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
+	  }
+     }
+   e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop);
+   if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
+   if (inst->desktop) efreet_desktop_free(inst->desktop);
+   free(inst); 
+}
+
+
+
 static int
+_e_exec_cb_instance_finish(void *data)
+{
+   _e_exec_instance_free(data);
+   
+   return 0;
+}
+
+
+static int
 _e_exec_cb_exit(void *data, int type, void *event)
 {
-   Eina_List *instances;
    Ecore_Exe_Event_Del *ev;
    E_Exec_Instance *inst;
 
@@ -347,22 +381,16 @@
 				  ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_READ));
 	  }
      }
-   if (inst->desktop)
+
+   /* maybe better 1 minute? it might be openoffice */
+   if (ecore_time_get() - inst->launch_time < 5.0)
      {
-	instances = eina_hash_find(e_exec_instances, inst->desktop->orig_path);
-	if (instances)
-	  {
-	     instances = eina_list_remove(instances, inst);
-	     if (instances)
-	       eina_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
-	     else
-	       eina_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
-	  }
+	if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
+	inst->expire_timer = ecore_timer_add(30.0, _e_exec_cb_instance_finish, inst); 
      }
-   e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop);
-   if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
-   if (inst->desktop) efreet_desktop_free(inst->desktop);
-   free(inst);
+   else
+     _e_exec_instance_free(inst);
+
    return 1;
 }

Log:
  remember the borders' .desktop file after restart
  
Author:       jeffdameth
Date:         2009-08-28 02:25:36 -0700 (Fri, 28 Aug 2009)
New Revision: 42067

Modified:
  trunk/e/src/bin/e_atoms.c trunk/e/src/bin/e_atoms.h trunk/e/src/bin/e_border.c trunk/e/src/bin/e_manager.c 

Modified: trunk/e/src/bin/e_atoms.c
===================================================================
--- trunk/e/src/bin/e_atoms.c	2009-08-28 08:37:07 UTC (rev 42066)
+++ trunk/e/src/bin/e_atoms.c	2009-08-28 09:25:36 UTC (rev 42067)
@@ -14,6 +14,7 @@
 EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE = 0;
 EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE = 0;
 EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED = 0;
+EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE = 0;
 
 /* externally accessible functions */
 EAPI int
@@ -29,11 +30,12 @@
 	"__E_WINDOW_HIDDEN",
 	"__E_WINDOW_BORDER_SIZE",
 	"__E_ATOM_WINDOW_STATE",
-	"__E_ATOM_WINDOW_STATE_CENTERED"
+        "__E_ATOM_WINDOW_STATE_CENTERED",
+        "__E_ATOM_DESKTOP_FILE"
    };
-   Ecore_X_Atom atoms[10];
+   Ecore_X_Atom atoms[11];
    
-   ecore_x_atoms_get(atom_names, 10, atoms);
+   ecore_x_atoms_get(atom_names, 11, atoms);
    E_ATOM_MANAGED = atoms[0];
    E_ATOM_CONTAINER = atoms[1];
    E_ATOM_ZONE = atoms[2];
@@ -44,6 +46,7 @@
    E_ATOM_BORDER_SIZE = atoms[7];
    E_ATOM_WINDOW_STATE = atoms[8];
    E_ATOM_WINDOW_STATE_CENTERED = atoms[9];
+   E_ATOM_DESKTOP_FILE = atoms[10];
    return 1;
 }
 

Modified: trunk/e/src/bin/e_atoms.h
===================================================================
--- trunk/e/src/bin/e_atoms.h	2009-08-28 08:37:07 UTC (rev 42066)
+++ trunk/e/src/bin/e_atoms.h	2009-08-28 09:25:36 UTC (rev 42067)
@@ -17,6 +17,7 @@
 extern EAPI Ecore_X_Atom E_ATOM_SHADE_DIRECTION;
 extern EAPI Ecore_X_Atom E_ATOM_HIDDEN;
 extern EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE;
+extern EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE;
 
 /* extra e window states */
 /* if we add more states, we need to fix

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-08-28 08:37:07 UTC (rev 42066)
+++ trunk/e/src/bin/e_border.c	2009-08-28 09:25:36 UTC (rev 42067)
@@ -7368,7 +7368,8 @@
 	     if ((bd->client.icccm.name) && (bd->client.icccm.class))
 	       bd->desktop = efreet_util_desktop_wm_class_find(bd->client.icccm.name,
 							       bd->client.icccm.class);
-	     if (bd->desktop) efreet_desktop_ref(bd->desktop);
+	     /* already refd by desktop_wm_class_find */
+	     /* if (bd->desktop) efreet_desktop_ref(bd->desktop); */
 	  }
 	if (!bd->desktop)
 	  {
@@ -7376,6 +7377,19 @@
 						      bd->client.netwm.pid);
 	     if (bd->desktop) efreet_desktop_ref(bd->desktop);
 	  }
+	if (!bd->desktop && bd->client.icccm.name)
+	  {
+	     /* this works for most cases as fallback. useful when app is
+		run from a shell  */
+	     bd->desktop = efreet_util_desktop_exec_find(bd->client.icccm.name);
+	  }
+
+	if (bd->desktop)
+	  {
+	     ecore_x_window_prop_string_set(bd->client.win, E_ATOM_DESKTOP_FILE,
+					    bd->desktop->orig_path);
+	  }
+
 	bd->icon_object = e_border_icon_add(bd, bd->bg_evas);
 	if ((bd->focused) && (bd->icon_object))
 	  edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");

Modified: trunk/e/src/bin/e_manager.c
===================================================================
--- trunk/e/src/bin/e_manager.c	2009-08-28 08:37:07 UTC (rev 42066)
+++ trunk/e/src/bin/e_manager.c	2009-08-28 09:25:36 UTC (rev 42067)
@@ -256,6 +256,8 @@
 		  E_Desk       *desk = NULL;
 		  E_Border     *bd = NULL;
 		  unsigned int  id;
+		  char *path;
+		  Efreet_Desktop *desktop = NULL;
 
 		  /* get all information from window before it is 
 		   * reset by e_border_new */
@@ -282,7 +284,15 @@
 					    deskxy[0],
 					    deskxy[1]);
 
+		  path = ecore_x_window_prop_string_get(windows[i],
+							E_ATOM_DESKTOP_FILE);
+		  if (path)
 		    {
+		       desktop = efreet_desktop_get(path);
+		       free(path);
+		    }
+
+		    {
 		       bd = e_border_new(con, windows[i], 1, 0);
 		       if (bd)
 			 {
@@ -292,6 +302,7 @@
 			     * be set according to the desk */
 //			    if (zone) e_border_zone_set(bd, zone);
 			    if (desk) e_border_desk_set(bd, desk);
+			    bd->desktop = desktop;
 			 }
 		    }
 	       }

Log:
  whoops, this shouldnt have went in the patch
  
Author:       jeffdameth
Date:         2009-09-03 07:23:14 -0700 (Thu, 03 Sep 2009)
New Revision: 42206

Modified:
  trunk/e/src/bin/e_border.h 

Modified: trunk/e/src/bin/e_border.h
===================================================================
--- trunk/e/src/bin/e_border.h	2009-09-03 14:21:27 UTC (rev 42205)
+++ trunk/e/src/bin/e_border.h	2009-09-03 14:23:14 UTC (rev 42206)
@@ -674,7 +674,5 @@
 extern EAPI int E_EVENT_BORDER_FOCUS_OUT;
 extern EAPI int E_EVENT_BORDER_PROPERTY;
 
-extern EAPI Ecore_X_Atom ECOMORPH_ATOM_MANAGED;
-
 #endif
 #endif

Log:
  e17:shutdown all modules
  
Author:       jeffdameth
Date:         2009-09-04 12:43:10 -0700 (Fri, 04 Sep 2009)
New Revision: 42262

Modified:
  trunk/e/src/bin/e_module.c 

Modified: trunk/e/src/bin/e_module.c
===================================================================
--- trunk/e/src/bin/e_module.c	2009-09-04 19:27:12 UTC (rev 42261)
+++ trunk/e/src/bin/e_module.c	2009-09-04 19:43:10 UTC (rev 42262)
@@ -37,7 +37,8 @@
 e_module_shutdown(void)
 {
    E_Module *m;
-
+   Eina_List *l;
+   
 #ifdef HAVE_VALGRIND
    /* do a leak check now before we dlclose() all those plugins, cause
     * that means we won't get a decent backtrace to leaks in there
@@ -45,10 +46,15 @@
    VALGRIND_DO_LEAK_CHECK
 #endif
 
-   _e_modules = eina_list_reverse(_e_modules);
-
-   EINA_LIST_FREE(_e_modules, m)
+   // whats was this for? modules should not depend on each others load order
+   // _e_modules = eina_list_reverse(_e_modules); 
+   
+   /* FIXME there seems to be a module that modifies _e_modules here
+    * dont use EINA_LIST_FREE until solved! */
+   EINA_LIST_FOREACH(_e_modules, l, m)
      {
+	printf("shutdown module: %s\n", m->name);
+	
 	if (m && m->enabled && !m->error)
 	  {
 	     m->func.save(m);
@@ -58,6 +64,10 @@
 	e_object_del(E_OBJECT(m));
      }
 
+   if (_e_modules)
+     eina_list_free(_e_modules);
+   _e_modules = NULL;
+     
    return 1;
 }

Log:
  --printf
  
Author:       jeffdameth
Date:         2009-09-04 12:43:41 -0700 (Fri, 04 Sep 2009)
New Revision: 42263

Modified:
  trunk/e/src/bin/e_module.c 

Modified: trunk/e/src/bin/e_module.c
===================================================================
--- trunk/e/src/bin/e_module.c	2009-09-04 19:43:10 UTC (rev 42262)
+++ trunk/e/src/bin/e_module.c	2009-09-04 19:43:41 UTC (rev 42263)
@@ -53,8 +53,6 @@
     * dont use EINA_LIST_FREE until solved! */
    EINA_LIST_FOREACH(_e_modules, l, m)
      {
-	printf("shutdown module: %s\n", m->name);
-	
 	if (m && m->enabled && !m->error)
 	  {
 	     m->func.save(m);

Log:
  fix module unload issue: maybe there are some more places where EINA_LIST_FREE interferes with e_object_del
  
Author:       jeffdameth
Date:         2009-09-04 13:26:25 -0700 (Fri, 04 Sep 2009)
New Revision: 42267

Modified:
  trunk/e/src/bin/e_module.c 

Modified: trunk/e/src/bin/e_module.c
===================================================================
--- trunk/e/src/bin/e_module.c	2009-09-04 20:00:04 UTC (rev 42266)
+++ trunk/e/src/bin/e_module.c	2009-09-04 20:26:25 UTC (rev 42267)
@@ -37,7 +37,6 @@
 e_module_shutdown(void)
 {
    E_Module *m;
-   Eina_List *l;
    
 #ifdef HAVE_VALGRIND
    /* do a leak check now before we dlclose() all those plugins, cause
@@ -46,13 +45,13 @@
    VALGRIND_DO_LEAK_CHECK
 #endif
 
-   // whats was this for? modules should not depend on each others load order
-   // _e_modules = eina_list_reverse(_e_modules); 
-   
-   /* FIXME there seems to be a module that modifies _e_modules here
-    * dont use EINA_LIST_FREE until solved! */
-   EINA_LIST_FOREACH(_e_modules, l, m)
+   /* do not use EINA_LIST_FREE! e_object_del modifies list */
+   while (_e_modules)
      {
+	m = _e_modules->data;
+	
+	printf("module shutdown %s\n", m->name);
+	
 	if (m && m->enabled && !m->error)
 	  {
 	     m->func.save(m);
@@ -62,10 +61,6 @@
 	e_object_del(E_OBJECT(m));
      }
 
-   if (_e_modules)
-     eina_list_free(_e_modules);
-   _e_modules = NULL;
-     
    return 1;
 }

Log:
  --printf, once again.. 
  
Author:       jeffdameth
Date:         2009-09-04 13:41:00 -0700 (Fri, 04 Sep 2009)
New Revision: 42268

Modified:
  trunk/e/src/bin/e_module.c 

Modified: trunk/e/src/bin/e_module.c
===================================================================
--- trunk/e/src/bin/e_module.c	2009-09-04 20:26:25 UTC (rev 42267)
+++ trunk/e/src/bin/e_module.c	2009-09-04 20:41:00 UTC (rev 42268)
@@ -50,8 +50,6 @@
      {
 	m = _e_modules->data;
 	
-	printf("module shutdown %s\n", m->name);
-	
 	if (m && m->enabled && !m->error)
 	  {
 	     m->func.save(m);

Log:
  fix naming and warnings
  
Author:       jeffdameth
Date:         2009-09-05 05:43:44 -0700 (Sat, 05 Sep 2009)
New Revision: 42278

Modified:
  trunk/e/src/bin/e_desk.c trunk/e/src/bin/e_zone.c 

Modified: trunk/e/src/bin/e_desk.c
===================================================================
--- trunk/e/src/bin/e_desk.c	2009-09-05 12:17:00 UTC (rev 42277)
+++ trunk/e/src/bin/e_desk.c	2009-09-05 12:43:44 UTC (rev 42278)
@@ -9,11 +9,11 @@
  */
 
 static void _e_desk_free(E_Desk *desk);
-static void _e_border_event_desk_show_free(void *data, void *ev);
-static void _e_border_event_desk_before_show_free(void *data, void *ev);
-static void _e_border_event_desk_after_show_free(void *data, void *ev);
-static void _e_border_event_desk_deskshow_free(void *data, void *ev);
-static void _e_border_event_desk_name_change_free(void *data, void *ev);
+static void _e_desk_event_desk_show_free(void *data, void *ev);
+static void _e_desk_event_desk_before_show_free(void *data, void *ev);
+static void _e_desk_event_desk_after_show_free(void *data, void *ev);
+static void _e_desk_event_desk_deskshow_free(void *data, void *ev);
+static void _e_desk_event_desk_name_change_free(void *data, void *ev);
 static void _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy);
 static void _e_desk_show_end(E_Desk *desk);
 static int _e_desk_show_animator(void *data);
@@ -101,7 +101,7 @@
    ev->desk = desk;
    e_object_ref(E_OBJECT(desk));
    ecore_event_add(E_EVENT_DESK_NAME_CHANGE, ev, 
-		   _e_border_event_desk_name_change_free, NULL);
+		   _e_desk_event_desk_name_change_free, NULL);
 }
 
 EAPI void
@@ -211,7 +211,7 @@
    eev->desk = e_desk_current_get(desk->zone);
    e_object_ref(E_OBJECT(eev->desk));
    ecore_event_add(E_EVENT_DESK_BEFORE_SHOW, eev, 
-                   _e_border_event_desk_before_show_free, NULL);
+                   _e_desk_event_desk_before_show_free, NULL);
 
    ecore_x_window_shadow_tree_flush();
    for (x = 0; x < desk->zone->desk_x_count; x++)
@@ -278,7 +278,7 @@
    ev = E_NEW(E_Event_Desk_Show, 1);
    ev->desk = desk;
    e_object_ref(E_OBJECT(desk));
-   ecore_event_add(E_EVENT_DESK_SHOW, ev, _e_border_event_desk_show_free, NULL);
+   ecore_event_add(E_EVENT_DESK_SHOW, ev, _e_desk_event_desk_show_free, NULL);
 
    EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
@@ -317,7 +317,7 @@
 	eeev->desk = e_desk_current_get(desk->zone);
 	e_object_ref(E_OBJECT(eeev->desk));
 	ecore_event_add(E_EVENT_DESK_AFTER_SHOW, eeev, 
-			_e_border_event_desk_after_show_free, NULL);
+			_e_desk_event_desk_after_show_free, NULL);
      }
 
 }
@@ -361,7 +361,7 @@
    ev->desk = desk;
    e_object_ref(E_OBJECT(desk));
    ecore_event_add(E_EVENT_DESK_DESKSHOW, ev, 
-		   _e_border_event_desk_deskshow_free, NULL);
+		   _e_desk_event_desk_deskshow_free, NULL);
 }
 
 EAPI void
@@ -521,7 +521,7 @@
 }
 
 static void
-_e_border_event_desk_show_free(void *data, void *event)
+_e_desk_event_desk_show_free(void *data, void *event)
 {
    E_Event_Desk_Show *ev;
 
@@ -531,7 +531,7 @@
 }
 
 static void
-_e_border_event_desk_before_show_free(void *data, void *event)
+_e_desk_event_desk_before_show_free(void *data, void *event)
 {
    E_Event_Desk_Before_Show *ev;
 
@@ -541,7 +541,7 @@
 }
 
 static void
-_e_border_event_desk_after_show_free(void *data, void *event)
+_e_desk_event_desk_after_show_free(void *data, void *event)
 {
    E_Event_Desk_After_Show *ev;
 
@@ -551,7 +551,7 @@
 }
 
 static void
-_e_border_event_desk_deskshow_free(void *data, void *event)
+_e_desk_event_desk_deskshow_free(void *data, void *event)
 {
    E_Event_Desk_Show *ev;
 
@@ -561,7 +561,7 @@
 }
 
 static void
-_e_border_event_desk_name_change_free(void *data, void *event)
+_e_desk_event_desk_name_change_free(void *data, void *event)
 {
    E_Event_Desk_Name_Change *ev;
 
@@ -667,7 +667,7 @@
    ev->desk = e_desk_current_get(desk->zone);
    e_object_ref(E_OBJECT(ev->desk));
    ecore_event_add(E_EVENT_DESK_AFTER_SHOW, ev, 
-		   _e_border_event_desk_after_show_free, NULL);
+		   _e_desk_event_desk_after_show_free, NULL);
 }
 
 static int

Modified: trunk/e/src/bin/e_zone.c
===================================================================
--- trunk/e/src/bin/e_zone.c	2009-09-05 12:17:00 UTC (rev 42277)
+++ trunk/e/src/bin/e_zone.c	2009-09-05 12:43:44 UTC (rev 42278)
@@ -504,8 +504,6 @@
      }
    EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
-	ok = 0;
-
 	if (es->zone != zone) continue;
 	switch(es->gadcon->orient)
 	  {
@@ -529,6 +527,9 @@
 	   case E_GADCON_ORIENT_CORNER_RB:
 	      if (edge == E_ZONE_EDGE_RIGHT) ok = 1;
 	      break;
+	   default:
+	      ok = 0;
+	      break;
 	  }
 
 	if (!ok) continue;
@@ -541,7 +542,6 @@
 	zone->flip.es = es;
 	e_shelf_toggle(es, 1);
      }
-   ok = 0;
    switch(edge)
      {
       case E_ZONE_EDGE_LEFT:
@@ -556,6 +556,9 @@
       case E_ZONE_EDGE_BOTTOM:
 	 if (E_ZONE_FLIP_DOWN(zone)) ok = 1;
 	 break;
+      default:
+	 ok = 0;
+	 break;
      }
    if (!ok) return;
    bind = e_bindings_edge_get("desk_flip_in_direction", edge);

Log:
  populate custom gadcons on when added
  - now gadman shows gadgets when it is unloaded and loaded again 
  
Author:       jeffdameth
Date:         2009-09-05 10:02:09 -0700 (Sat, 05 Sep 2009)
New Revision: 42284

Modified:
  trunk/e/src/bin/e_gadcon.c 

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2009-09-05 15:05:48 UTC (rev 42283)
+++ trunk/e/src/bin/e_gadcon.c	2009-09-05 17:02:09 UTC (rev 42284)
@@ -16,7 +16,7 @@
 static void _e_gadcon_cb_client_frame_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_gadcon_cb_client_frame_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_gadcon_client_save(E_Gadcon_Client *gcc);
-static void _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y);
+//static void _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y);
 static void _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y);
 
 static void _e_gadcon_cb_min_size_request(void *data, Evas_Object *obj, void *event_info);
@@ -42,7 +42,7 @@
 static void _e_gadcon_cb_signal_resize_right_start(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_gadcon_cb_signal_resize_right_stop(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *emission, const char *source);
-static void _e_gadcon_cb_drag_finished(E_Drag *drag, int dropped);
+//static void _e_gadcon_cb_drag_finished(E_Drag *drag, int dropped);
 static void _e_gadcon_cb_dnd_enter(void *data, const char *type, void *event);
 static void _e_gadcon_cb_dnd_move(void *data, const char *type, void *event);
 static void _e_gadcon_cb_dnd_leave(void *data, const char *type, void *event);
@@ -79,6 +79,8 @@
 static void e_gadcon_layout_unpack(Evas_Object *obj);
 static void _e_gadcon_provider_populate_request(const E_Gadcon_Client_Class *cc);
 static void _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc);
+static int  _e_gadcon_provider_populate_idler(void *data);
+static int  _e_gadcon_custom_populate_idler(void *data);
 
 static int _e_gadcon_location_change(E_Gadcon_Client * gcc, E_Gadcon_Location *src, E_Gadcon_Location *dst);
 /********************/
@@ -191,6 +193,8 @@
 static Eina_List *gadcons = NULL;
 static Eina_List *populate_requests = NULL;
 static Ecore_Idler *populate_idler = NULL;
+static Eina_List *custom_populate_requests = NULL;
+static Ecore_Idler *custom_populate_idler = NULL;
 static Eina_List *gadcon_locations = NULL;
 
 /* This is the gadcon client which is currently dragged */
@@ -214,6 +218,12 @@
 	ecore_idler_del(populate_idler);
 	populate_idler = NULL;
      }
+   eina_list_free(custom_populate_requests);
+   if (custom_populate_idler)
+     {
+	ecore_idler_del(custom_populate_idler);
+	custom_populate_idler = NULL;
+     }
 
    return 1;
 }
@@ -263,6 +273,11 @@
 {
    if (!gc) return;
    gadcons = eina_list_append(gadcons, gc);
+
+   if (!custom_populate_idler)
+     custom_populate_idler = ecore_idler_add(_e_gadcon_custom_populate_idler, NULL);
+   if (!eina_list_data_find(custom_populate_requests, gc))
+     custom_populate_requests = eina_list_append(custom_populate_requests, gc);
 }
 
 EAPI void
@@ -1303,7 +1318,6 @@
 _e_gadcon_gadget_move_to_pre_cb(void *data, E_Menu *m) 
 {
    E_Gadcon_Client *gcc;
-   const char *name;
    int n = 0;
 
    e_menu_pre_activate_callback_set(m, NULL, NULL);
@@ -1521,6 +1535,8 @@
       case E_GADCON_SITE_TOOLBAR:
       case E_GADCON_SITE_EFM_TOOLBAR:
         return EINA_TRUE;
+      default:
+	 return EINA_FALSE;
      }
    return EINA_FALSE;
 }
@@ -1534,6 +1550,8 @@
       case E_GADCON_SITE_TOOLBAR:
       case E_GADCON_SITE_EFM_TOOLBAR:
         return EINA_FALSE;
+      default:
+	 return EINA_TRUE;
      }
    return EINA_TRUE;
 }
@@ -1699,6 +1717,8 @@
    e_config_save_queue();
 }
 
+#if 0
+/* FIXME unused */
 static void
 _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
 {
@@ -1741,6 +1761,7 @@
 	  }
      }
 }
+#endif
 
 static void
 _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y)
@@ -2233,6 +2254,8 @@
    gcc->dy += y;
 }
 
+#if 0
+/* FIXME unused */
 static void
 _e_gadcon_cb_drag_finished(E_Drag *drag, int dropped)
 {
@@ -2256,6 +2279,7 @@
    new_gcc = NULL;
    drag_gcc = NULL;
 }
+#endif
 
 static void
 _e_gadcon_cb_dnd_enter(void *data, const char *type, void *event)
@@ -5179,6 +5203,30 @@
 }
 
 static int
+_e_gadcon_custom_populate_idler(void *data)
+{
+   const E_Gadcon_Client_Class *cc;
+   const Eina_List *l;
+   E_Gadcon *gc;
+
+   EINA_LIST_FREE(custom_populate_requests, gc)
+     {
+	e_gadcon_layout_freeze(gc->o_container);
+	EINA_LIST_FOREACH(providers_list, l, cc)
+	  {
+	     if (gc->populate_class.func)
+	       gc->populate_class.func(gc->populate_class.data, gc, cc);
+	     else
+	       e_gadcon_populate_class(gc, cc);
+	  }
+	e_gadcon_layout_thaw(gc->o_container);
+     }
+
+   custom_populate_idler = NULL;
+   return 0;
+}
+
+static int
 _e_gadcon_provider_populate_idler(void *data __UNUSED__)
 {
    const E_Gadcon_Client_Class *cc;

Log:
  identify shelf and menu windows as such for compositing managers
  
Author:       jeffdameth
Date:         2009-09-06 13:04:20 -0700 (Sun, 06 Sep 2009)
New Revision: 42299

Modified:
  trunk/e/src/bin/e_menu.c trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_menu.c
===================================================================
--- trunk/e/src/bin/e_menu.c	2009-09-06 19:41:49 UTC (rev 42298)
+++ trunk/e/src/bin/e_menu.c	2009-09-06 20:04:20 UTC (rev 42299)
@@ -1420,7 +1420,7 @@
    ecore_x_window_shape_events_select(m->evas_win, 1);
    ecore_evas_name_class_set(m->ecore_evas, "E", "_e_menu_window");
    ecore_evas_title_set(m->ecore_evas, "E Menu");
-   
+
    o = edje_object_add(m->evas);
    m->bg_object = o;
    evas_object_name_set(o, "menu/background");
@@ -1457,6 +1457,8 @@
 	else
 	  ecore_evas_shaped_set(m->ecore_evas, m->shaped);
      }
+
+   ecore_x_netwm_window_type_set(m->evas_win, ECORE_X_WINDOW_TYPE_MENU);
    
    o = e_box_add(m->evas);
    m->container_object = o;

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2009-09-06 19:41:49 UTC (rev 42298)
+++ trunk/e/src/bin/e_shelf.c	2009-09-06 20:04:20 UTC (rev 42299)
@@ -153,6 +153,7 @@
 	evas_object_show(es->o_event);
 	evas_object_show(es->o_base);
 	e_popup_edje_bg_object_set(es->popup, es->o_base);
+	ecore_x_netwm_window_type_set(es->popup->evas_win, ECORE_X_WINDOW_TYPE_DOCK);
      }
    else
      {
@@ -691,7 +692,8 @@
 	evas_object_show(es->o_event);
 	evas_object_show(es->o_base);
 	e_popup_edje_bg_object_set(es->popup, es->o_base);
-
+	ecore_x_netwm_window_type_set(es->popup->evas_win, ECORE_X_WINDOW_TYPE_DOCK);
+	
 	e_drop_xdnd_register_set(es->popup->evas_win, 1);
 	e_gadcon_xdnd_window_set(es->gadcon, es->popup->evas_win);
 	e_gadcon_dnd_window_set(es->gadcon, es->popup->evas_win);

Log:
  prefer 24px icons for menus. downscaling looks less worse then upscaling. if ok
  for everyone, bug http://trac.enlightenment.org/e/ticket/355 can be closed.
  
Author:       jeffdameth
Date:         2009-09-10 13:03:17 -0700 (Thu, 10 Sep 2009)
New Revision: 42388

Modified:
  trunk/e/src/bin/e_utils.c 

Modified: trunk/e/src/bin/e_utils.c
===================================================================
--- trunk/e/src/bin/e_utils.c	2009-09-10 19:05:47 UTC (rev 42387)
+++ trunk/e/src/bin/e_utils.c	2009-09-10 20:03:17 UTC (rev 42388)
@@ -477,7 +477,7 @@
    unsigned int size;
 
    if ((!icon) || (!icon[0])) return 0;
-   size = e_util_icon_size_normalize(16 * e_scale);
+   size = e_util_icon_size_normalize(24 * e_scale);
    path = efreet_icon_path_find(e_config->icon_theme, icon, size);
    if (!path) return 0;
    e_menu_item_icon_file_set(mi, path);

Log:
  - show edje thumbnails in wallpaper and themes dialog again. 
  - use 48px for fdo icons in flist
  - #if 0 unused code
  
Author:       jeffdameth
Date:         2009-09-10 13:48:52 -0700 (Thu, 10 Sep 2009)
New Revision: 42389

Modified:
  trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_widget_flist.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2009-09-10 20:03:17 UTC (rev 42388)
+++ trunk/e/src/bin/e_fm.c	2009-09-10 20:48:52 UTC (rev 42389)
@@ -264,8 +264,8 @@
 
 static void _e_fm2_typebuf_show(Evas_Object *obj);
 static void _e_fm2_typebuf_hide(Evas_Object *obj);
-static void _e_fm2_typebuf_history_prev(Evas_Object *obj);
-static void _e_fm2_typebuf_history_next(Evas_Object *obj);
+//static void _e_fm2_typebuf_history_prev(Evas_Object *obj);
+//static void _e_fm2_typebuf_history_next(Evas_Object *obj);
 static void _e_fm2_typebuf_run(Evas_Object *obj);
 static void _e_fm2_typebuf_match(Evas_Object *obj, int next);
 static void _e_fm2_typebuf_complete(Evas_Object *obj);
@@ -396,7 +396,7 @@
 static int _e_fm2_client_monitor_add(const char *path);
 static void _e_fm2_client_monitor_del(int id, const char *path);
 static int _e_fm_client_file_del(const char *args, Evas_Object *e_fm);
-static int _e_fm2_client_file_trash(const char *path, Evas_Object *e_fm);
+//static int _e_fm2_client_file_trash(const char *path, Evas_Object *e_fm);
 static int _e_fm2_client_file_mkdir(const char *path, const char *rel, int rel_to, int x, int y, int res_w, int res_h, Evas_Object *e_fm);
 static int _e_fm_client_file_move(const char *args, Evas_Object *e_fm);
 static int _e_fm2_client_file_symlink(const char *path, const char *dest, const char *rel, int rel_to, int x, int y, int res_w, int res_h, Evas_Object *e_fm);
@@ -726,7 +726,7 @@
    _e_fm2_icon_thumb_str = eina_stringshare_add("THUMB");
    _e_fm2_mime_inode_directory = eina_stringshare_add("inode/directory");
    _e_fm2_mime_app_desktop = eina_stringshare_add("application/x-desktop");
-   _e_fm2_mime_app_edje = eina_stringshare_add("application/x-edje");
+   _e_fm2_mime_app_edje = eina_stringshare_add("application/x-extension-edj");
    _e_fm2_mime_text_uri_list = eina_stringshare_add("text/uri-list");
 
    /// DBG
@@ -2091,6 +2091,10 @@
    Evas_Object *o;
    const char *icon;
 
+   if (ic->info.mime == _e_fm2_mime_app_edje)
+     return _e_fm2_icon_thumb_edje_get
+       (evas, ic, gen_func, data, force_gen, type_ret);
+
    icon = _e_fm2_icon_mime_type_special_match(ic);
    if (icon)
      {
@@ -2098,12 +2102,8 @@
 	  return _e_fm2_icon_desktop_get(evas, ic, type_ret);
 	else if (icon == _e_fm2_icon_thumb_str)
 	  {
-	     if (ic->info.mime == _e_fm2_mime_app_edje)
-	       return _e_fm2_icon_thumb_edje_get
-		 (evas, ic, gen_func, data, force_gen, type_ret);
-	     else
-	       return _e_fm2_icon_thumb_get
-		 (evas, ic, NULL, gen_func, data, force_gen, type_ret);
+	     return _e_fm2_icon_thumb_get
+	       (evas, ic, NULL, gen_func, data, force_gen, type_ret);
 	  }
 	else if (strncmp(icon, "e/icons/fileman/mime/", 21) == 0)
 	  return _e_fm2_icon_explicit_theme_get(evas, ic, icon + 21 - 5, type_ret);
@@ -2124,7 +2124,7 @@
      o = _e_fm2_icon_mime_theme_get(evas, ic, type_ret);
 
    if (o) return o;
-
+   
    /* XXX REMOVE/DEPRECATED below here */
    icon = e_fm_mime_icon_get(ic->info.mime);
    if (!icon) return NULL;
@@ -2474,6 +2474,7 @@
    return id;
 }
 
+#if 0
 static int
 _e_fm2_client_file_trash(const char *path, Evas_Object *e_fm)
 {
@@ -2481,6 +2482,7 @@
    e_fm2_op_registry_entry_add(id, e_fm, E_FM_OP_TRASH, _e_fm2_operation_abort_internal);
    return id;
 }
+#endif
 
 static int
 _e_fm2_client_file_mkdir(const char *path, const char *rel, int rel_to, int x, int y, int res_w, int res_h, Evas_Object *e_fm)
@@ -5497,6 +5499,7 @@
    sd->typebuf_visible = 0;
 }
 
+#if 0
 static void
 _e_fm2_typebuf_history_prev(Evas_Object *obj)
 {
@@ -5516,6 +5519,7 @@
    if (!sd) return;
    /* FIXME: do */
 }
+#endif
 
 static int
 _e_fm2_inplace_open(const E_Fm2_Icon *ic)

Modified: trunk/e/src/bin/e_widget_flist.c
===================================================================
--- trunk/e/src/bin/e_widget_flist.c	2009-09-10 20:03:17 UTC (rev 42388)
+++ trunk/e/src/bin/e_widget_flist.c	2009-09-10 20:48:52 UTC (rev 42389)
@@ -48,6 +48,8 @@
    wd->fmc.view.no_subdir_jump = 0;
    wd->fmc.icon.list.w = 48;
    wd->fmc.icon.list.h = 48;
+   wd->fmc.icon.icon.w = 48;
+   wd->fmc.icon.icon.h = 48;
    wd->fmc.icon.fixed.w = 1;
    wd->fmc.icon.fixed.h = 1;
    wd->fmc.icon.extension.show = 0;

Log:
  return icon.list size if icon.icon size is not set
  
Author:       jeffdameth
Date:         2009-09-10 14:02:09 -0700 (Thu, 10 Sep 2009)
New Revision: 42392

Modified:
  trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_widget_flist.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2009-09-10 20:57:22 UTC (rev 42391)
+++ trunk/e/src/bin/e_fm.c	2009-09-10 21:02:09 UTC (rev 42392)
@@ -550,7 +550,9 @@
 {
    if (sd->icon_size > -1)
      return sd->icon_size * e_scale;
-   return sd->config->icon.icon.w;
+   if (sd->config->icon.icon.w)
+     return sd->config->icon.icon.w;
+   return sd->config->icon.list.w;
 }
 
 static inline Evas_Coord
@@ -558,7 +560,9 @@
 {
    if (sd->icon_size > -1)
      return sd->icon_size * e_scale;
-   return sd->config->icon.icon.h;
+   if (sd->config->icon.icon.h)
+     return sd->config->icon.icon.h;
+   return sd->config->icon.list.h;
 }
 
 static int

Modified: trunk/e/src/bin/e_widget_flist.c
===================================================================
--- trunk/e/src/bin/e_widget_flist.c	2009-09-10 20:57:22 UTC (rev 42391)
+++ trunk/e/src/bin/e_widget_flist.c	2009-09-10 21:02:09 UTC (rev 42392)
@@ -48,8 +48,6 @@
    wd->fmc.view.no_subdir_jump = 0;
    wd->fmc.icon.list.w = 48;
    wd->fmc.icon.list.h = 48;
-   wd->fmc.icon.icon.w = 48;
-   wd->fmc.icon.icon.h = 48;
    wd->fmc.icon.fixed.w = 1;
    wd->fmc.icon.fixed.h = 1;
    wd->fmc.icon.extension.show = 0;

Log:
  set border remember match entrys only on creation
  added text entries for advanced border remember dialog(not editable for now)
  
Author:       jeffdameth
Date:         2009-09-11 19:44:41 -0700 (Fri, 11 Sep 2009)
New Revision: 42428

Modified:
  trunk/e/src/bin/e_int_border_remember.c trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_int_border_remember.c
===================================================================
--- trunk/e/src/bin/e_int_border_remember.c	2009-09-11 23:51:47 UTC (rev 42427)
+++ trunk/e/src/bin/e_int_border_remember.c	2009-09-12 02:44:41 UTC (rev 42428)
@@ -24,6 +24,11 @@
    int mode;
    int warned;
    /*- ADVANCED -*/
+   char *name;
+   char *class;
+   char *title;
+   char *role;
+   char *command;
    struct {
       int match_name;
       int match_class;
@@ -57,7 +62,7 @@
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
-   
+
    v = E_NEW(E_Config_Dialog_View, 1);
    if (v)
       {
@@ -69,7 +74,7 @@
          v->advanced.apply_cfdata   = _advanced_apply_data;
          v->advanced.create_widgets = _advanced_create_widgets;
 	 v->override_auto_apply = 1;
-	 
+
          /* create config dialog for bd object/data */
          cfd = e_config_dialog_new(bd->zone->container,
 				   _("Window Remember"),
@@ -83,35 +88,13 @@
 static void
 _fill_data(E_Config_Dialog_Data *cfdata)
 {
-   if (cfdata->border->remember)
-     {
-	if (cfdata->border->remember->apply_first_only) cfdata->remember.apply_first_only = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_NAME) cfdata->remember.match_name = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_CLASS) cfdata->remember.match_class = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_TITLE) cfdata->remember.match_title = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_ROLE) cfdata->remember.match_role = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_TYPE) cfdata->remember.match_type = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_TRANSIENT) cfdata->remember.match_transient = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_POS) cfdata->remember.apply_pos = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SIZE) cfdata->remember.apply_size = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_LAYER) cfdata->remember.apply_layer = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_LOCKS) cfdata->remember.apply_locks = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_BORDER) cfdata->remember.apply_border = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_STICKY) cfdata->remember.apply_sticky = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_DESKTOP) cfdata->remember.apply_desktop = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SHADE) cfdata->remember.apply_shade = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_FULLSCREEN) cfdata->remember.apply_fullscreen = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_ZONE) cfdata->remember.apply_zone = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SKIP_WINLIST) cfdata->remember.apply_skip_winlist = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SKIP_PAGER) cfdata->remember.apply_skip_pager = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SKIP_TASKBAR) cfdata->remember.apply_skip_taskbar = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_RUN) cfdata->remember.apply_run = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_ICON_PREF) cfdata->remember.apply_icon_pref = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_SET_FOCUS_ON_START) cfdata->remember.set_focus_on_start = 1;
+   E_Border *bd;
+   E_Remember *rem;
 
-     }
-   if (!cfdata->border->remember) cfdata->mode = MODE_NOTHING;
-   else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size) && 
+   bd = cfdata->border;
+
+   if (!bd->remember) cfdata->mode = MODE_NOTHING;
+   else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size) &&
 	    (cfdata->remember.apply_locks) && (cfdata->remember.apply_layer) &&
 	    (cfdata->remember.apply_border) && (cfdata->remember.apply_sticky) &&
 	    (cfdata->remember.apply_desktop) && (cfdata->remember.apply_shade) &&
@@ -119,16 +102,99 @@
 	    (cfdata->remember.apply_skip_pager) && (cfdata->remember.apply_fullscreen) &&
 	    (cfdata->remember.apply_skip_taskbar))
      cfdata->mode = MODE_ALL;
-   else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size) && 
+   else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size) &&
 	    (cfdata->remember.apply_locks))
      cfdata->mode = MODE_GEOMETRY_LOCKS;
-   else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size)) 
+   else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size))
      cfdata->mode = MODE_GEOMETRY;
    else if ((cfdata->remember.apply_locks))
      cfdata->mode = MODE_LOCKS;
    else cfdata->mode = MODE_NOTHING;
+
+   if (bd->client.icccm.name && bd->client.icccm.name[0])
+     cfdata->name = strdup(bd->client.icccm.name);
+   if (bd->client.icccm.class && bd->client.icccm.class[0])
+     cfdata->class = strdup(bd->client.icccm.class);
+   if (bd->client.netwm.name && bd->client.netwm.name[0])
+     cfdata->title = strdup(bd->client.netwm.name);
+   else if (bd->client.icccm.title && bd->client.icccm.title[0])
+     cfdata->title = strdup(bd->client.icccm.title);
+   if (bd->client.icccm.window_role && bd->client.icccm.window_role[0])
+     cfdata->role = strdup(bd->client.icccm.window_role);
+
+   if ((bd->client.icccm.command.argc > 0) &&
+       (bd->client.icccm.command.argv))
+     {
+	char buf[4096];
+	int i, j, k;
+
+	buf[0] = 0;
+	k = 0;
+	for (i = 0; i < bd->client.icccm.command.argc; i++)
+	  {
+	     if (i > 0)
+	       {
+		  buf[k] = ' ';
+		  k++;
+	       }
+	     for (j = 0; bd->client.icccm.command.argv[i][j]; j++)
+	       {
+		  if (k >= (sizeof(buf) - 10))
+		    {
+		       buf[k] = 0;
+		       goto done;
+		    }
+		  if ((bd->client.icccm.command.argv[i][j] == ' ') ||
+		      (bd->client.icccm.command.argv[i][j] == '\t') ||
+		      (bd->client.icccm.command.argv[i][j] == '\\') ||
+		      (bd->client.icccm.command.argv[i][j] == '\"') ||
+		      (bd->client.icccm.command.argv[i][j] == '\'') ||
+		      (bd->client.icccm.command.argv[i][j] == '$') ||
+		      (bd->client.icccm.command.argv[i][j] == '%'))
+		    {
+		       buf[k] = '\\';
+		       k++;
+		    }
+		  buf[k] = bd->client.icccm.command.argv[i][j];
+		  k++;
+	       }
+	  }
+	buf[k] = 0;
+     done:
+	cfdata->command = strdup(buf);
+     }
+
+   rem = bd->remember;
+
+   if (rem)
+     {
+	if (rem->apply_first_only) cfdata->remember.apply_first_only = 1;
+	if (rem->match & E_REMEMBER_MATCH_NAME)         cfdata->remember.match_name = 1;
+	if (rem->match & E_REMEMBER_MATCH_CLASS)        cfdata->remember.match_class = 1;
+	if (rem->match & E_REMEMBER_MATCH_TITLE)        cfdata->remember.match_title = 1;
+	if (rem->match & E_REMEMBER_MATCH_ROLE)         cfdata->remember.match_role = 1;
+	if (rem->match & E_REMEMBER_MATCH_TYPE)         cfdata->remember.match_type = 1;
+	if (rem->match & E_REMEMBER_MATCH_TRANSIENT)    cfdata->remember.match_transient = 1;
+	if (rem->apply & E_REMEMBER_APPLY_POS)          cfdata->remember.apply_pos = 1;
+	if (rem->apply & E_REMEMBER_APPLY_SIZE)         cfdata->remember.apply_size = 1;
+	if (rem->apply & E_REMEMBER_APPLY_LAYER)        cfdata->remember.apply_layer = 1;
+	if (rem->apply & E_REMEMBER_APPLY_LOCKS)        cfdata->remember.apply_locks = 1;
+	if (rem->apply & E_REMEMBER_APPLY_BORDER)       cfdata->remember.apply_border = 1;
+	if (rem->apply & E_REMEMBER_APPLY_STICKY)       cfdata->remember.apply_sticky = 1;
+	if (rem->apply & E_REMEMBER_APPLY_DESKTOP)      cfdata->remember.apply_desktop = 1;
+	if (rem->apply & E_REMEMBER_APPLY_SHADE)        cfdata->remember.apply_shade = 1;
+	if (rem->apply & E_REMEMBER_APPLY_FULLSCREEN)   cfdata->remember.apply_fullscreen = 1;
+	if (rem->apply & E_REMEMBER_APPLY_ZONE)         cfdata->remember.apply_zone = 1;
+	if (rem->apply & E_REMEMBER_APPLY_SKIP_WINLIST) cfdata->remember.apply_skip_winlist = 1;
+	if (rem->apply & E_REMEMBER_APPLY_SKIP_PAGER)   cfdata->remember.apply_skip_pager = 1;
+	if (rem->apply & E_REMEMBER_APPLY_SKIP_TASKBAR) cfdata->remember.apply_skip_taskbar = 1;
+	if (rem->apply & E_REMEMBER_APPLY_RUN)          cfdata->remember.apply_run = 1;
+	if (rem->apply & E_REMEMBER_APPLY_ICON_PREF)    cfdata->remember.apply_icon_pref = 1;
+	if (rem->apply & E_REMEMBER_SET_FOCUS_ON_START) cfdata->remember.set_focus_on_start = 1;
+     }
 }
 
+
 static void *
 _create_data(E_Config_Dialog *cfd)
 {
@@ -137,7 +203,7 @@
     * the running systems/config in the apply methods
     */
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->border = cfd->data;
    _fill_data(cfdata);
@@ -148,7 +214,13 @@
 _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
-   cfdata->border->border_remember_dialog = NULL;
+   if (cfdata->name) free(cfdata->name);
+   if (cfdata->class) free(cfdata->class);
+   if (cfdata->title) free(cfdata->title);
+   if (cfdata->role) free(cfdata->role);
+   if (cfdata->command) free(cfdata->command);
+   if (cfdata->border)
+     cfdata->border->border_remember_dialog = NULL;
    free(cfdata);
 }
 
@@ -160,14 +232,14 @@
    E_Border *bd2;
    int n = 0;
    const char *title;
-   
+
    title = e_border_name_get(bd);
    EINA_LIST_FOREACH(e_border_client_list(), l, bd2)
      {
 	int required_matches;
 	int matches;
 	const char *title2;
-	
+
         matches = 0;
 	required_matches = 0;
 	if (matchflags & E_REMEMBER_MATCH_NAME) required_matches++;
@@ -205,17 +277,41 @@
    return n;
 }
 
+static void
+_remember_update(E_Remember *rem, E_Config_Dialog_Data *cfdata)
+{
+   if (rem->name) eina_stringshare_del(rem->name);
+   if (rem->class) eina_stringshare_del(rem->class);
+   if (rem->title) eina_stringshare_del(rem->title);
+   if (rem->role) eina_stringshare_del(rem->role);
+   if (rem->prop.command) eina_stringshare_del(rem->prop.command);
+   rem->name = NULL;
+   rem->class = NULL;
+   rem->title = NULL;
+   rem->role = NULL;
+   rem->prop.command = NULL;
+   if (cfdata->name  && cfdata->name[0])
+     rem->name = eina_stringshare_add(cfdata->name);
+   if (cfdata->class && cfdata->class[0])
+     rem->class = eina_stringshare_add(cfdata->class);
+   if (cfdata->title && cfdata->title[0])
+     rem->title = eina_stringshare_add(cfdata->title);
+   if (cfdata->role  && cfdata->role[0])
+     rem->role = eina_stringshare_add(cfdata->role);
+   if (cfdata->command && cfdata->command[0])
+     rem->prop.command = eina_stringshare_add(cfdata->command);
+}
+
 static int
 _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
-   
+   E_Remember *rem;
+
    if (cfdata->mode == MODE_NOTHING)
      {
 	if (cfdata->border->remember)
 	  {
-	     E_Remember *rem;
-	     
 	     rem = cfdata->border->remember;
 	     cfdata->border->remember = NULL;
 	     e_remember_unuse(rem);
@@ -227,7 +323,7 @@
    if (!cfdata->warned)
      {
 	int matches = 0;
-	
+
 	if ((cfdata->border->client.icccm.name) &&
 	    (cfdata->border->client.icccm.class) &&
 	    (cfdata->border->client.icccm.name[0] != 0) &&
@@ -238,7 +334,7 @@
 	if (matches > 1)
 	  {
 	     E_Dialog *dia;
-	     
+
 	     dia = e_dialog_new(cfd->con, "E", "_border_remember_error_multi_dialog");
 	     e_dialog_title_set(dia, _("Window properties are not a unique match"));
 	     e_dialog_text_set
@@ -264,33 +360,41 @@
 	     return 0;
 	  }
      }
-   if (!cfdata->border->remember)
+
+   rem = cfdata->border->remember;
+
+   if (!rem)
      {
-	cfdata->border->remember = e_remember_new();
-	if (cfdata->border->remember)
-          e_remember_use(cfdata->border->remember);
+	rem = e_remember_new();
+	if (rem)
+	  e_remember_use(rem);
      }
 
-   if (cfdata->border->remember)
+   if (rem)
      {
-	cfdata->border->remember->match = e_remember_default_match(cfdata->border);
+	rem->match = e_remember_default_match(cfdata->border);
 
 	if (cfdata->mode == MODE_GEOMETRY)
-	  cfdata->border->remember->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE;
+	  rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE;
 	else if (cfdata->mode == MODE_LOCKS)
-	  cfdata->border->remember->apply = E_REMEMBER_APPLY_LOCKS;
+	  rem->apply = E_REMEMBER_APPLY_LOCKS;
 	else if (cfdata->mode == MODE_GEOMETRY_LOCKS)
-	  cfdata->border->remember->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_LOCKS;
+	  rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_LOCKS;
 	else if (cfdata->mode == MODE_ALL)
-	  cfdata->border->remember->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_LAYER | 
-					    E_REMEMBER_APPLY_LOCKS | E_REMEMBER_APPLY_BORDER | E_REMEMBER_APPLY_STICKY | 
-					    E_REMEMBER_APPLY_DESKTOP | E_REMEMBER_APPLY_SHADE | E_REMEMBER_APPLY_ZONE | 
+	  rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_LAYER |
+					    E_REMEMBER_APPLY_LOCKS | E_REMEMBER_APPLY_BORDER | E_REMEMBER_APPLY_STICKY |
+					    E_REMEMBER_APPLY_DESKTOP | E_REMEMBER_APPLY_SHADE | E_REMEMBER_APPLY_ZONE |
 					    E_REMEMBER_APPLY_SKIP_WINLIST | E_REMEMBER_APPLY_SKIP_PAGER | E_REMEMBER_APPLY_SKIP_TASKBAR |
 	                                    E_REMEMBER_APPLY_FULLSCREEN | E_REMEMBER_APPLY_ICON_PREF;
-	cfdata->border->remember->apply_first_only = 0;
-       e_remember_update(cfdata->border->remember, cfdata->border);
+	rem->apply_first_only = 0;
+
+	_remember_update(rem, cfdata);
+
+	e_remember_update(rem, cfdata->border);
      }
-  
+
+   cfdata->border->remember = rem;
+
    e_config_save_queue();
    return 1; /* Apply was OK */
 }
@@ -299,8 +403,9 @@
 _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
-   
-   if (!((cfdata->remember.apply_pos) || (cfdata->remember.apply_size) || 
+   E_Remember *rem;
+
+   if (!((cfdata->remember.apply_pos) || (cfdata->remember.apply_size) ||
 	 (cfdata->remember.apply_locks) || (cfdata->remember.apply_layer) ||
 	 (cfdata->remember.apply_border) || (cfdata->remember.apply_sticky) ||
 	 (cfdata->remember.apply_desktop) || (cfdata->remember.apply_shade) ||
@@ -318,7 +423,7 @@
 	e_config_save_queue();
 	return 1;
      }
-   
+
    if (cfdata->remember.match_name) cfdata->remember.match_class = 1;
    else cfdata->remember.match_class = 0;
 
@@ -327,7 +432,7 @@
 	 (cfdata->remember.match_type) || (cfdata->remember.match_transient)))
      {
 	E_Dialog *dia;
-	
+
 	dia = e_dialog_new(cfd->con, "E", "_border_remember_error_noprop_dialog");
 	e_dialog_title_set(dia, _("No match properties set"));
 	e_dialog_text_set
@@ -346,7 +451,7 @@
    if (!cfdata->warned)
      {
 	int matchflags = 0;
-	  
+
 	if (cfdata->remember.match_name) matchflags |= E_REMEMBER_MATCH_NAME;
 	if (cfdata->remember.match_class) matchflags |= E_REMEMBER_MATCH_CLASS;
 	if (cfdata->remember.match_title) matchflags |= E_REMEMBER_MATCH_TITLE;
@@ -357,7 +462,7 @@
 	    (_check_matches(cfdata->border, matchflags) > 1))
 	  {
 	     E_Dialog *dia;
-	     
+
 	     dia = e_dialog_new(cfd->con, "E", "_border_remember_error_no_remember_dialog");
 	     e_dialog_title_set(dia, _("No match properties set"));
 	     e_dialog_text_set
@@ -387,44 +492,54 @@
 	     return 0;
 	  }
      }
+   rem = cfdata->border->remember;
 
-   if (!cfdata->border->remember)
+   if (!rem)
      {
-	cfdata->border->remember = e_remember_new();
-	if (cfdata->border->remember)
-	   e_remember_use(cfdata->border->remember);
+	rem = e_remember_new();
+	if (rem)
+	   e_remember_use(rem);
      }
-   if (cfdata->border->remember)
+   if (rem)
      {
-	cfdata->border->remember->apply = 0;
-	cfdata->border->remember->match = 0;
-	if (cfdata->remember.match_name) cfdata->border->remember->match |= E_REMEMBER_MATCH_NAME;
-	if (cfdata->remember.match_class) cfdata->border->remember->match |= E_REMEMBER_MATCH_CLASS;
-	if (cfdata->remember.match_title) cfdata->border->remember->match |= E_REMEMBER_MATCH_TITLE;
-	if (cfdata->remember.match_role) cfdata->border->remember->match |= E_REMEMBER_MATCH_ROLE;
-	if (cfdata->remember.match_type) cfdata->border->remember->match |= E_REMEMBER_MATCH_TYPE;
-	if (cfdata->remember.match_transient) cfdata->border->remember->match |= E_REMEMBER_MATCH_TRANSIENT;
-	if (cfdata->remember.apply_pos) cfdata->border->remember->apply |= E_REMEMBER_APPLY_POS;
-	if (cfdata->remember.apply_size) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SIZE;
-	if (cfdata->remember.apply_layer) cfdata->border->remember->apply |= E_REMEMBER_APPLY_LAYER;
-	if (cfdata->remember.apply_locks) cfdata->border->remember->apply |= E_REMEMBER_APPLY_LOCKS;
-	if (cfdata->remember.apply_border) cfdata->border->remember->apply |= E_REMEMBER_APPLY_BORDER;
-	if (cfdata->remember.apply_sticky) cfdata->border->remember->apply |= E_REMEMBER_APPLY_STICKY;
-	if (cfdata->remember.apply_desktop) cfdata->border->remember->apply |= E_REMEMBER_APPLY_DESKTOP;
-	if (cfdata->remember.apply_shade) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SHADE;
-	if (cfdata->remember.apply_fullscreen) cfdata->border->remember->apply |= E_REMEMBER_APPLY_FULLSCREEN;
-	if (cfdata->remember.apply_zone) cfdata->border->remember->apply |= E_REMEMBER_APPLY_ZONE;
-	if (cfdata->remember.apply_skip_winlist) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SKIP_WINLIST;
-	if (cfdata->remember.apply_skip_pager) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SKIP_PAGER;
-	if (cfdata->remember.apply_skip_taskbar) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SKIP_TASKBAR;
-	if (cfdata->remember.apply_run) cfdata->border->remember->apply |= E_REMEMBER_APPLY_RUN;
-	if (cfdata->remember.apply_icon_pref) cfdata->border->remember->apply |= E_REMEMBER_APPLY_ICON_PREF;
-	if (cfdata->remember.set_focus_on_start) cfdata->border->remember->apply |= E_REMEMBER_SET_FOCUS_ON_START;
+	rem->apply = 0;
+	rem->match = 0;
+	if (cfdata->remember.match_name) rem->match |= E_REMEMBER_MATCH_NAME;
+	if (cfdata->remember.match_class) rem->match |= E_REMEMBER_MATCH_CLASS;
+	if (cfdata->remember.match_title) rem->match |= E_REMEMBER_MATCH_TITLE;
+	if (cfdata->remember.match_role) rem->match |= E_REMEMBER_MATCH_ROLE;
+	if (cfdata->remember.match_type) rem->match |= E_REMEMBER_MATCH_TYPE;
+	if (cfdata->remember.match_transient) rem->match |= E_REMEMBER_MATCH_TRANSIENT;
+	if (cfdata->remember.apply_pos) rem->apply |= E_REMEMBER_APPLY_POS;
+	if (cfdata->remember.apply_size) rem->apply |= E_REMEMBER_APPLY_SIZE;
+	if (cfdata->remember.apply_layer) rem->apply |= E_REMEMBER_APPLY_LAYER;
+	if (cfdata->remember.apply_locks) rem->apply |= E_REMEMBER_APPLY_LOCKS;
+	if (cfdata->remember.apply_border) rem->apply |= E_REMEMBER_APPLY_BORDER;
+	if (cfdata->remember.apply_sticky) rem->apply |= E_REMEMBER_APPLY_STICKY;
+	if (cfdata->remember.apply_desktop) rem->apply |= E_REMEMBER_APPLY_DESKTOP;
+	if (cfdata->remember.apply_shade) rem->apply |= E_REMEMBER_APPLY_SHADE;
+	if (cfdata->remember.apply_fullscreen) rem->apply |= E_REMEMBER_APPLY_FULLSCREEN;
+	if (cfdata->remember.apply_zone) rem->apply |= E_REMEMBER_APPLY_ZONE;
+	if (cfdata->remember.apply_skip_winlist) rem->apply |= E_REMEMBER_APPLY_SKIP_WINLIST;
+	if (cfdata->remember.apply_skip_pager) rem->apply |= E_REMEMBER_APPLY_SKIP_PAGER;
+	if (cfdata->remember.apply_skip_taskbar) rem->apply |= E_REMEMBER_APPLY_SKIP_TASKBAR;
+	if (cfdata->remember.apply_run) rem->apply |= E_REMEMBER_APPLY_RUN;
+	if (cfdata->remember.apply_icon_pref) rem->apply |= E_REMEMBER_APPLY_ICON_PREF;
+	if (cfdata->remember.set_focus_on_start) rem->apply |= E_REMEMBER_SET_FOCUS_ON_START;
 
-	cfdata->border->remember->apply_first_only = cfdata->remember.apply_first_only;
-	e_remember_update(cfdata->border->remember, cfdata->border);
+	rem->apply_first_only = cfdata->remember.apply_first_only;
+
+	_remember_update(rem, cfdata);
      }
-   
+
+   if (rem && cfdata->border)
+     {
+	e_remember_update(rem, cfdata->border);
+	cfdata->border->remember = rem;
+     }
+   else if (rem)
+     e_remember_match_update(rem);
+
    e_config_save_queue();
    return 1; /* Apply was OK */
 }
@@ -436,7 +551,7 @@
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *ob;
    E_Radio_Group *rg;
-   
+
    o = e_widget_list_add(evas, 0, 0);
    rg = e_widget_radio_group_new(&(cfdata->mode));
    ob = e_widget_radio_add(evas, _("Nothing"), MODE_NOTHING, rg);
@@ -458,36 +573,52 @@
    /* generate the core widget layout for an advanced dialog */
    Evas_Object *o, *ob, *of;
 
-   o = e_widget_list_add(evas, 0, 0);
-   
+   o = e_widget_table_add(evas, 0);
+
    of = e_widget_framelist_add(evas, _("Remember using"), 0);
-   if ((cfdata->border->client.icccm.name) &&
-       (cfdata->border->client.icccm.class) &&
-       (cfdata->border->client.icccm.name[0] != 0) &&
-       (cfdata->border->client.icccm.class[0] != 0))
+   if (cfdata->name)
      {
-	ob = e_widget_check_add(evas, _("Window name and class"), &(cfdata->remember.match_name));
+	ob = e_widget_check_add(evas, _("Window name"), &(cfdata->remember.match_name));
 	e_widget_framelist_object_append(of, ob);
+	ob = e_widget_entry_add(evas, &cfdata->name, NULL, NULL, NULL);
+	e_widget_entry_readonly_set(ob, 1);
+	e_widget_framelist_object_append(of, ob);
      }
    else
      {
 	cfdata->remember.match_name = 0;
+     }
+   if (cfdata->class)
+     {
+	ob = e_widget_check_add(evas, _("Window class"), &(cfdata->remember.match_class));
+	e_widget_framelist_object_append(of, ob);
+	ob = e_widget_entry_add(evas, &cfdata->class, NULL, NULL, NULL);
+	e_widget_entry_readonly_set(ob, 1);
+	e_widget_framelist_object_append(of, ob);
+     }
+   else
+     {
 	cfdata->remember.match_class = 0;
      }
-   if ((e_border_name_get(cfdata->border))[0] != 0)
+   if (cfdata->title)
      {
 	ob = e_widget_check_add(evas, _("Title"), &(cfdata->remember.match_title));
 	e_widget_framelist_object_append(of, ob);
+	ob = e_widget_entry_add(evas, &cfdata->title, NULL, NULL, NULL);
+	e_widget_entry_readonly_set(ob, 1);
+	e_widget_framelist_object_append(of, ob);
      }
    else
      {
 	cfdata->remember.match_title = 0;
      }
-   if ((cfdata->border->client.icccm.window_role) && 
-       (cfdata->border->client.icccm.window_role[0] != 0))
+   if (cfdata->role)
      {
 	ob = e_widget_check_add(evas, _("Window Role"), &(cfdata->remember.match_role));
 	e_widget_framelist_object_append(of, ob);
+	ob = e_widget_entry_add(evas, &cfdata->role, NULL, NULL, NULL);
+	e_widget_entry_readonly_set(ob, 1);
+	e_widget_framelist_object_append(of, ob);
      }
    else
      {
@@ -504,7 +635,7 @@
      }
    ob = e_widget_check_add(evas, _("Transience"), &(cfdata->remember.match_transient));
    e_widget_framelist_object_append(of, ob);
-   e_widget_list_object_append(o, of, 1, 1, 0.5);
+   e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);
 
    of = e_widget_frametable_add(evas, _("Properties to remember"), 0);
    ob = e_widget_check_add(evas, _("Position"), &(cfdata->remember.apply_pos));
@@ -535,19 +666,19 @@
    e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Skip Taskbar"), &(cfdata->remember.apply_skip_taskbar));
    e_widget_frametable_object_append(of, ob, 1, 6, 1, 1, 1, 1, 1, 1);
-   e_widget_list_object_append(o, of, 1, 1, 0.5);
-   
+   e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1);
+
    ob = e_widget_check_add(evas, _("Match only one window"), &(cfdata->remember.apply_first_only));
-   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   e_widget_table_object_append(o, ob, 0, 1, 1, 1, 1, 1, 1, 1);
 
-   if (cfdata->border->client.icccm.command.argv)
+   if (cfdata->command)
      {
 	ob = e_widget_check_add(evas, _("Start this program on login"), &(cfdata->remember.apply_run));
-	e_widget_list_object_append(o, ob, 1, 1, 0.5);
+	e_widget_table_object_append(o, ob, 1, 2, 1, 1, 1, 1, 1, 1);
      }
 
    ob = e_widget_check_add(evas, _("Always focus on start"), &(cfdata->remember.set_focus_on_start));
-   e_widget_list_object_append(o, ob, 1, 1, 0.5);
-  
+   e_widget_table_object_append(o, ob, 1, 1, 1, 1, 1, 1, 1, 1);
+
    return o;
 }

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-11 23:51:47 UTC (rev 42427)
+++ trunk/e/src/bin/e_remember.c	2009-09-12 02:44:41 UTC (rev 42428)
@@ -203,30 +203,10 @@
 {
    if (!rem) return;
    if (bd->new_client) return;
-   if (rem->name) eina_stringshare_del(rem->name);
-   if (rem->class) eina_stringshare_del(rem->class);
-   if (rem->title) eina_stringshare_del(rem->title);
-   if (rem->role) eina_stringshare_del(rem->role);
+
    if (rem->prop.border) eina_stringshare_del(rem->prop.border);
-   if (rem->prop.command) eina_stringshare_del(rem->prop.command);
-   rem->name = NULL;
-   rem->class = NULL;
-   rem->title = NULL;
-   rem->role = NULL;
    rem->prop.border = NULL;
-   rem->prop.command = NULL;
-
-   if (bd->client.icccm.name)
-     rem->name = eina_stringshare_add(bd->client.icccm.name);
-   if (bd->client.icccm.class)
-     rem->class = eina_stringshare_add(bd->client.icccm.class);
-   if (bd->client.netwm.name)
-     rem->title = eina_stringshare_add(bd->client.netwm.name);
-   else if (bd->client.icccm.title)
-     rem->title = eina_stringshare_add(bd->client.icccm.title);
-   if (bd->client.icccm.window_role)
-     rem->role = eina_stringshare_add(bd->client.icccm.window_role);
-
+   
    e_remember_match_update(rem);
 
    rem->type = bd->client.netwm.type;
@@ -306,48 +286,6 @@
    rem->prop.zone = bd->zone->num;
    rem->prop.head = bd->zone->container->manager->num;
 
-   if ((bd->client.icccm.command.argc > 0) &&
-       (bd->client.icccm.command.argv))
-     {
-	char buf[4096];
-	int i, j, k;
-
-	buf[0] = 0;
-	k = 0;
-	for (i = 0; i < bd->client.icccm.command.argc; i++)
-	  {
-	     if (i > 0)
-	       {
-		  buf[k] = ' ';
-		  k++;
-	       }
-	     for (j = 0; bd->client.icccm.command.argv[i][j]; j++)
-	       {
-		  if (k >= (sizeof(buf) - 10))
-		    {
-		       buf[k] = 0;
-		       goto done;
-		    }
-		  if ((bd->client.icccm.command.argv[i][j] == ' ') ||
-		      (bd->client.icccm.command.argv[i][j] == '\t') ||
-		      (bd->client.icccm.command.argv[i][j] == '\\') ||
-		      (bd->client.icccm.command.argv[i][j] == '\"') ||
-		      (bd->client.icccm.command.argv[i][j] == '\'') ||
-		      (bd->client.icccm.command.argv[i][j] == '$') ||
-		      (bd->client.icccm.command.argv[i][j] == '%'))
-		    {
-		       buf[k] = '\\';
-		       k++;
-		    }
-		  buf[k] = bd->client.icccm.command.argv[i][j];
-		  k++;
-	       }
-	  }
-	buf[k] = 0;
-	done:
-	rem->prop.command = eina_stringshare_add(buf);
-     }
-
    e_config_save_queue();
 }
 
@@ -425,16 +363,16 @@
          * required, and if it is, check whether there's a match. If
          * it fails, then go to the next remember */
         if (rem->match & E_REMEMBER_MATCH_NAME &&
-            e_util_strcmp(rem->name, bd->client.icccm.name) &&
-            !e_util_both_str_empty(rem->name, bd->client.icccm.name))
+	    e_util_strcmp(rem->name, bd->client.icccm.name) &&
+	    !e_util_both_str_empty(rem->name, bd->client.icccm.name))
           continue;
         if (rem->match & E_REMEMBER_MATCH_CLASS &&
-            e_util_strcmp(rem->class, bd->client.icccm.class) &&
-            !e_util_both_str_empty(rem->class, bd->client.icccm.class))
+	    e_util_strcmp(rem->class, bd->client.icccm.class) &&
+	    !e_util_both_str_empty(rem->class, bd->client.icccm.class))
           continue;
         if (rem->match & E_REMEMBER_MATCH_TITLE &&
-            e_util_strcmp(rem->title, title) &&
-            !e_util_both_str_empty(rem->title, title))
+	    e_util_strcmp(rem->title, title) &&
+	    !e_util_both_str_empty(rem->title, title))
           continue;
         if (rem->match & E_REMEMBER_MATCH_ROLE &&
             e_util_strcmp(rem->role, bd->client.icccm.window_role) &&

Log:
  cleanups
  
Author:       jeffdameth
Date:         2009-09-11 20:03:53 -0700 (Fri, 11 Sep 2009)
New Revision: 42429

Modified:
  trunk/e/src/bin/e_int_border_remember.c 

Modified: trunk/e/src/bin/e_int_border_remember.c
===================================================================
--- trunk/e/src/bin/e_int_border_remember.c	2009-09-12 02:44:41 UTC (rev 42428)
+++ trunk/e/src/bin/e_int_border_remember.c	2009-09-12 03:03:53 UTC (rev 42429)
@@ -92,6 +92,7 @@
    E_Remember *rem;
 
    bd = cfdata->border;
+   rem = bd->remember;
 
    if (!bd->remember) cfdata->mode = MODE_NOTHING;
    else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size) &&
@@ -164,8 +165,6 @@
 	cfdata->command = strdup(buf);
      }
 
-   rem = bd->remember;
-
    if (rem)
      {
 	if (rem->apply_first_only) cfdata->remember.apply_first_only = 1;
@@ -403,7 +402,8 @@
 _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
-   E_Remember *rem;
+   E_Border *bd = cfdata->border;
+   E_Remember *rem = bd->remember;
 
    if (!((cfdata->remember.apply_pos) || (cfdata->remember.apply_size) ||
 	 (cfdata->remember.apply_locks) || (cfdata->remember.apply_layer) ||
@@ -414,10 +414,10 @@
 	 (cfdata->remember.apply_run) || (cfdata->remember.apply_icon_pref) ||
 	 (cfdata->remember.set_focus_on_start) || (cfdata->remember.apply_fullscreen)))
      {
-	if (cfdata->border->remember)
+	if (rem)
 	  {
-	     e_remember_unuse(cfdata->border->remember);
-	     e_remember_del(cfdata->border->remember);
+	     e_remember_unuse(rem);
+	     e_remember_del(rem);
 	     cfdata->border->remember = NULL;
 	  }
 	e_config_save_queue();
@@ -427,9 +427,9 @@
    if (cfdata->remember.match_name) cfdata->remember.match_class = 1;
    else cfdata->remember.match_class = 0;
 
-   if (!((cfdata->remember.match_name) || (cfdata->remember.match_class) ||
+   if (!((cfdata->remember.match_name)  || (cfdata->remember.match_class) ||
 	 (cfdata->remember.match_title) || (cfdata->remember.match_role) ||
-	 (cfdata->remember.match_type) || (cfdata->remember.match_transient)))
+	 (cfdata->remember.match_type)  || (cfdata->remember.match_transient)))
      {
 	E_Dialog *dia;
 
@@ -452,11 +452,11 @@
      {
 	int matchflags = 0;
 
-	if (cfdata->remember.match_name) matchflags |= E_REMEMBER_MATCH_NAME;
+	if (cfdata->remember.match_name)  matchflags |= E_REMEMBER_MATCH_NAME;
 	if (cfdata->remember.match_class) matchflags |= E_REMEMBER_MATCH_CLASS;
 	if (cfdata->remember.match_title) matchflags |= E_REMEMBER_MATCH_TITLE;
-	if (cfdata->remember.match_role) matchflags |= E_REMEMBER_MATCH_ROLE;
-	if (cfdata->remember.match_type) matchflags |= E_REMEMBER_MATCH_TYPE;
+	if (cfdata->remember.match_role)  matchflags |= E_REMEMBER_MATCH_ROLE;
+	if (cfdata->remember.match_type)  matchflags |= E_REMEMBER_MATCH_TYPE;
 	if (cfdata->remember.match_transient) matchflags |= E_REMEMBER_MATCH_TRANSIENT;
 	if ((!cfdata->remember.apply_first_only) &&
 	    (_check_matches(cfdata->border, matchflags) > 1))
@@ -492,7 +492,6 @@
 	     return 0;
 	  }
      }
-   rem = cfdata->border->remember;
 
    if (!rem)
      {
@@ -500,45 +499,42 @@
 	if (rem)
 	   e_remember_use(rem);
      }
+
    if (rem)
      {
 	rem->apply = 0;
 	rem->match = 0;
-	if (cfdata->remember.match_name) rem->match |= E_REMEMBER_MATCH_NAME;
-	if (cfdata->remember.match_class) rem->match |= E_REMEMBER_MATCH_CLASS;
-	if (cfdata->remember.match_title) rem->match |= E_REMEMBER_MATCH_TITLE;
-	if (cfdata->remember.match_role) rem->match |= E_REMEMBER_MATCH_ROLE;
-	if (cfdata->remember.match_type) rem->match |= E_REMEMBER_MATCH_TYPE;
-	if (cfdata->remember.match_transient) rem->match |= E_REMEMBER_MATCH_TRANSIENT;
-	if (cfdata->remember.apply_pos) rem->apply |= E_REMEMBER_APPLY_POS;
-	if (cfdata->remember.apply_size) rem->apply |= E_REMEMBER_APPLY_SIZE;
-	if (cfdata->remember.apply_layer) rem->apply |= E_REMEMBER_APPLY_LAYER;
-	if (cfdata->remember.apply_locks) rem->apply |= E_REMEMBER_APPLY_LOCKS;
-	if (cfdata->remember.apply_border) rem->apply |= E_REMEMBER_APPLY_BORDER;
-	if (cfdata->remember.apply_sticky) rem->apply |= E_REMEMBER_APPLY_STICKY;
-	if (cfdata->remember.apply_desktop) rem->apply |= E_REMEMBER_APPLY_DESKTOP;
-	if (cfdata->remember.apply_shade) rem->apply |= E_REMEMBER_APPLY_SHADE;
-	if (cfdata->remember.apply_fullscreen) rem->apply |= E_REMEMBER_APPLY_FULLSCREEN;
-	if (cfdata->remember.apply_zone) rem->apply |= E_REMEMBER_APPLY_ZONE;
+	if (cfdata->remember.match_name)         rem->match |= E_REMEMBER_MATCH_NAME;
+	if (cfdata->remember.match_class)        rem->match |= E_REMEMBER_MATCH_CLASS;
+	if (cfdata->remember.match_title)        rem->match |= E_REMEMBER_MATCH_TITLE;
+	if (cfdata->remember.match_role)         rem->match |= E_REMEMBER_MATCH_ROLE;
+	if (cfdata->remember.match_type)         rem->match |= E_REMEMBER_MATCH_TYPE;
+	if (cfdata->remember.match_transient)    rem->match |= E_REMEMBER_MATCH_TRANSIENT;
+	if (cfdata->remember.apply_pos)          rem->apply |= E_REMEMBER_APPLY_POS;
+	if (cfdata->remember.apply_size)         rem->apply |= E_REMEMBER_APPLY_SIZE;
+	if (cfdata->remember.apply_layer)        rem->apply |= E_REMEMBER_APPLY_LAYER;
+	if (cfdata->remember.apply_locks)        rem->apply |= E_REMEMBER_APPLY_LOCKS;
+	if (cfdata->remember.apply_border)       rem->apply |= E_REMEMBER_APPLY_BORDER;
+	if (cfdata->remember.apply_sticky)       rem->apply |= E_REMEMBER_APPLY_STICKY;
+	if (cfdata->remember.apply_desktop)      rem->apply |= E_REMEMBER_APPLY_DESKTOP;
+	if (cfdata->remember.apply_shade)        rem->apply |= E_REMEMBER_APPLY_SHADE;
+	if (cfdata->remember.apply_fullscreen)   rem->apply |= E_REMEMBER_APPLY_FULLSCREEN;
+	if (cfdata->remember.apply_zone)         rem->apply |= E_REMEMBER_APPLY_ZONE;
 	if (cfdata->remember.apply_skip_winlist) rem->apply |= E_REMEMBER_APPLY_SKIP_WINLIST;
-	if (cfdata->remember.apply_skip_pager) rem->apply |= E_REMEMBER_APPLY_SKIP_PAGER;
+	if (cfdata->remember.apply_skip_pager)   rem->apply |= E_REMEMBER_APPLY_SKIP_PAGER;
 	if (cfdata->remember.apply_skip_taskbar) rem->apply |= E_REMEMBER_APPLY_SKIP_TASKBAR;
-	if (cfdata->remember.apply_run) rem->apply |= E_REMEMBER_APPLY_RUN;
-	if (cfdata->remember.apply_icon_pref) rem->apply |= E_REMEMBER_APPLY_ICON_PREF;
+	if (cfdata->remember.apply_run)          rem->apply |= E_REMEMBER_APPLY_RUN;
+	if (cfdata->remember.apply_icon_pref)    rem->apply |= E_REMEMBER_APPLY_ICON_PREF;
 	if (cfdata->remember.set_focus_on_start) rem->apply |= E_REMEMBER_SET_FOCUS_ON_START;
 
 	rem->apply_first_only = cfdata->remember.apply_first_only;
 
 	_remember_update(rem, cfdata);
-     }
 
-   if (rem && cfdata->border)
-     {
-	e_remember_update(rem, cfdata->border);
 	cfdata->border->remember = rem;
+
+	e_remember_update(rem, cfdata->border);
      }
-   else if (rem)
-     e_remember_match_update(rem);
 
    e_config_save_queue();
    return 1; /* Apply was OK */

Log:
  add option to keep border settings as they are when remember is set 
  
Author:       jeffdameth
Date:         2009-09-11 20:43:51 -0700 (Fri, 11 Sep 2009)
New Revision: 42430

Modified:
  trunk/e/src/bin/e_config.c trunk/e/src/bin/e_int_border_remember.c trunk/e/src/bin/e_remember.c trunk/e/src/bin/e_remember.h 

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2009-09-12 03:03:53 UTC (rev 42429)
+++ trunk/e/src/bin/e_config.c	2009-09-12 03:43:51 UTC (rev 42430)
@@ -328,6 +328,7 @@
 #define D _e_config_remember_edd
    E_CONFIG_VAL(D, T, match, INT);
    E_CONFIG_VAL(D, T, apply_first_only, UCHAR);
+   E_CONFIG_VAL(D, T, keep_settings, UCHAR);
    E_CONFIG_VAL(D, T, name, STR);
    E_CONFIG_VAL(D, T, class, STR);
    E_CONFIG_VAL(D, T, title, STR);
@@ -381,7 +382,8 @@
    E_CONFIG_VAL(D, T, prop.head, INT);
    E_CONFIG_VAL(D, T, prop.command, STR);
    E_CONFIG_VAL(D, T, prop.icon_preference, UCHAR);
-   
+   E_CONFIG_VAL(D, T, prop.desktop_file, STR);
+
    _e_config_color_class_edd = E_CONFIG_DD_NEW("E_Color_Class", E_Color_Class);
 #undef T
 #undef D

Modified: trunk/e/src/bin/e_int_border_remember.c
===================================================================
--- trunk/e/src/bin/e_int_border_remember.c	2009-09-12 03:03:53 UTC (rev 42429)
+++ trunk/e/src/bin/e_int_border_remember.c	2009-09-12 03:43:51 UTC (rev 42430)
@@ -53,6 +53,7 @@
       int apply_run;
       int apply_icon_pref;
       int set_focus_on_start;
+      int keep_settings;
    } remember;
 };
 
@@ -168,6 +169,7 @@
    if (rem)
      {
 	if (rem->apply_first_only) cfdata->remember.apply_first_only = 1;
+	if (rem->keep_settings) cfdata->remember.keep_settings = 1;
 	if (rem->match & E_REMEMBER_MATCH_NAME)         cfdata->remember.match_name = 1;
 	if (rem->match & E_REMEMBER_MATCH_CLASS)        cfdata->remember.match_class = 1;
 	if (rem->match & E_REMEMBER_MATCH_TITLE)        cfdata->remember.match_title = 1;
@@ -501,9 +503,10 @@
      }
 
    if (rem)
-     {
+     {	
 	rem->apply = 0;
 	rem->match = 0;
+	rem->apply_first_only = cfdata->remember.apply_first_only;
 	if (cfdata->remember.match_name)         rem->match |= E_REMEMBER_MATCH_NAME;
 	if (cfdata->remember.match_class)        rem->match |= E_REMEMBER_MATCH_CLASS;
 	if (cfdata->remember.match_title)        rem->match |= E_REMEMBER_MATCH_TITLE;
@@ -527,13 +530,12 @@
 	if (cfdata->remember.apply_icon_pref)    rem->apply |= E_REMEMBER_APPLY_ICON_PREF;
 	if (cfdata->remember.set_focus_on_start) rem->apply |= E_REMEMBER_SET_FOCUS_ON_START;
 
-	rem->apply_first_only = cfdata->remember.apply_first_only;
-
 	_remember_update(rem, cfdata);
-
 	cfdata->border->remember = rem;
-
+	
+	rem->keep_settings = 0;
 	e_remember_update(rem, cfdata->border);
+	rem->keep_settings = cfdata->remember.keep_settings;
      }
 
    e_config_save_queue();
@@ -667,14 +669,17 @@
    ob = e_widget_check_add(evas, _("Match only one window"), &(cfdata->remember.apply_first_only));
    e_widget_table_object_append(o, ob, 0, 1, 1, 1, 1, 1, 1, 1);
 
+   ob = e_widget_check_add(evas, _("Always focus on start"), &(cfdata->remember.set_focus_on_start));
+   e_widget_table_object_append(o, ob, 1, 1, 1, 1, 1, 1, 1, 1);
+
+   ob = e_widget_check_add(evas, _("Keep current properties"), &(cfdata->remember.keep_settings));
+   e_widget_table_object_append(o, ob, 1, 2, 1, 1, 1, 1, 1, 1);
+   
    if (cfdata->command)
      {
 	ob = e_widget_check_add(evas, _("Start this program on login"), &(cfdata->remember.apply_run));
-	e_widget_table_object_append(o, ob, 1, 2, 1, 1, 1, 1, 1, 1);
+	e_widget_table_object_append(o, ob, 1, 3, 1, 1, 1, 1, 1, 1);
      }
 
-   ob = e_widget_check_add(evas, _("Always focus on start"), &(cfdata->remember.set_focus_on_start));
-   e_widget_table_object_append(o, ob, 1, 1, 1, 1, 1, 1, 1, 1);
-
    return o;
 }

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-12 03:03:53 UTC (rev 42429)
+++ trunk/e/src/bin/e_remember.c	2009-09-12 03:43:51 UTC (rev 42430)
@@ -204,6 +204,9 @@
    if (!rem) return;
    if (bd->new_client) return;
 
+   if (bd->remember && bd->remember->keep_settings)
+     return;
+   
    if (rem->prop.border) eina_stringshare_del(rem->prop.border);
    rem->prop.border = NULL;
    

Modified: trunk/e/src/bin/e_remember.h
===================================================================
--- trunk/e/src/bin/e_remember.h	2009-09-12 03:03:53 UTC (rev 42429)
+++ trunk/e/src/bin/e_remember.h	2009-09-12 03:43:51 UTC (rev 42430)
@@ -38,6 +38,7 @@
    unsigned char  delete_me;
    int            match;
    unsigned char  apply_first_only;
+   unsigned char  keep_settings;
    int            used_count;
    const char    *name;
    const char    *class;
@@ -54,7 +55,7 @@
 	int           pos_w, pos_h;
 	int           w, h;      
 	int           layer;
-      
+
 	unsigned char lock_user_location; 
 	unsigned char lock_client_location; 
 	unsigned char lock_user_size; 
@@ -78,9 +79,9 @@
 	unsigned char lock_focus_in; 
 	unsigned char lock_focus_out; 
 	unsigned char lock_life;
-      
+
 	const char   *border;
-      
+
 	unsigned char sticky;
 	unsigned char shaded;
 	unsigned char fullscreen;
@@ -93,6 +94,7 @@
 	int           zone;
 	int           head;
 	const char   *command;
+	const char   *desktop_file;
      } prop;
 };

Log:
  - allow glob matching in window remember -> advanced dialog has now editable entries
  - option added to remember desktop file for e window match. 
      means no more ugly openoffice provided icons (= even if i dont use it ..
  - e_border: added fallback for transient windows to use .desktop from main window   
  - fixed bug in e_remember to not delete all remembers when last item of the conf_remember list is deleted 
  
Author:       jeffdameth
Date:         2009-09-12 00:04:32 -0700 (Sat, 12 Sep 2009)
New Revision: 42432

Modified:
  trunk/e/src/bin/e_border.c trunk/e/src/bin/e_int_border_remember.c trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-12 03:49:50 UTC (rev 42431)
+++ trunk/e/src/bin/e_border.c	2009-09-12 07:04:32 UTC (rev 42432)
@@ -7369,13 +7369,19 @@
 	     evas_object_del(bd->icon_object);
 	     bd->icon_object = NULL;
 	  }
+	if (bd->remember && bd->remember->prop.desktop_file)
+	  {
+	     const char *desktop = bd->remember->prop.desktop_file;
+
+	     bd->desktop = efreet_desktop_new(desktop); 
+	     if (!bd->desktop)
+	       bd->desktop = efreet_util_desktop_name_find(desktop);
+	  }
 	if (!bd->desktop)
 	  {
 	     if ((bd->client.icccm.name) && (bd->client.icccm.class))
 	       bd->desktop = efreet_util_desktop_wm_class_find(bd->client.icccm.name,
 							       bd->client.icccm.class);
-	     /* already refd by desktop_wm_class_find */
-	     /* if (bd->desktop) efreet_desktop_ref(bd->desktop); */
 	  }
 	if (!bd->desktop)
 	  {
@@ -7389,7 +7395,15 @@
 		run from a shell  */
 	     bd->desktop = efreet_util_desktop_exec_find(bd->client.icccm.name);
 	  }
-
+	if (!bd->desktop && bd->client.icccm.transient_for)
+	  {
+	     E_Border *bd2 = e_border_find_by_client_window(bd->client.icccm.transient_for); 
+	     if (bd2 && bd2->desktop)
+	       {
+		  efreet_desktop_ref(bd2->desktop);
+		  bd->desktop = bd2->desktop;
+	       }
+	  }
 	if (bd->desktop)
 	  {
 	     ecore_x_window_prop_string_set(bd->client.win, E_ATOM_DESKTOP_FILE,

Modified: trunk/e/src/bin/e_int_border_remember.c
===================================================================
--- trunk/e/src/bin/e_int_border_remember.c	2009-09-12 03:49:50 UTC (rev 42431)
+++ trunk/e/src/bin/e_int_border_remember.c	2009-09-12 07:04:32 UTC (rev 42432)
@@ -29,6 +29,7 @@
    char *title;
    char *role;
    char *command;
+   char *desktop;
    struct {
       int match_name;
       int match_class;
@@ -52,6 +53,7 @@
       int apply_skip_taskbar;
       int apply_run;
       int apply_icon_pref;
+      int apply_desktop_file;
       int set_focus_on_start;
       int keep_settings;
    } remember;
@@ -113,16 +115,35 @@
      cfdata->mode = MODE_LOCKS;
    else cfdata->mode = MODE_NOTHING;
 
-   if (bd->client.icccm.name && bd->client.icccm.name[0])
+   if (bd->remember)
+     {
+	if (bd->remember->name)
+	  cfdata->name = strdup(bd->remember->name);
+	if (bd->remember->class)
+	  cfdata->class = strdup(bd->remember->class);
+	if (bd->remember->title)
+	  cfdata->title = strdup(bd->remember->title);
+	if (bd->remember->prop.desktop_file)
+	  cfdata->desktop = strdup(bd->remember->prop.desktop_file);
+	if (cfdata->desktop)
+	  cfdata->remember.apply_desktop_file = 1;
+     }
+
+   if (!cfdata->name && bd->client.icccm.name && bd->client.icccm.name[0])
      cfdata->name = strdup(bd->client.icccm.name);
-   if (bd->client.icccm.class && bd->client.icccm.class[0])
+   if (!cfdata->class && bd->client.icccm.class && bd->client.icccm.class[0])
      cfdata->class = strdup(bd->client.icccm.class);
-   if (bd->client.netwm.name && bd->client.netwm.name[0])
-     cfdata->title = strdup(bd->client.netwm.name);
-   else if (bd->client.icccm.title && bd->client.icccm.title[0])
-     cfdata->title = strdup(bd->client.icccm.title);
    if (bd->client.icccm.window_role && bd->client.icccm.window_role[0])
      cfdata->role = strdup(bd->client.icccm.window_role);
+   if (!cfdata->title)
+     {
+	if(bd->client.netwm.name && bd->client.netwm.name[0])
+	  cfdata->title = strdup(bd->client.netwm.name);
+	else if (bd->client.icccm.title && bd->client.icccm.title[0])
+	  cfdata->title = strdup(bd->client.icccm.title);
+     }
+   if (!cfdata->desktop && bd->desktop)
+     cfdata->desktop = strdup(bd->desktop->name);
 
    if ((bd->client.icccm.command.argc > 0) &&
        (bd->client.icccm.command.argv))
@@ -220,60 +241,89 @@
    if (cfdata->title) free(cfdata->title);
    if (cfdata->role) free(cfdata->role);
    if (cfdata->command) free(cfdata->command);
-   if (cfdata->border)
-     cfdata->border->border_remember_dialog = NULL;
+   if (cfdata->desktop) free(cfdata->desktop);
+
+   cfdata->border->border_remember_dialog = NULL;
    free(cfdata);
 }
 
 /**--APPLY--**/
 static int
-_check_matches(E_Border *bd, int matchflags)
+_check_matches(E_Config_Dialog_Data *cfdata, int update)
 {
    Eina_List *l;
-   E_Border *bd2;
+   E_Border *bd;
+   const char *title;
+   int matchflags = 0;
+   int required_matches = 0;
    int n = 0;
-   const char *title;
 
-   title = e_border_name_get(bd);
-   EINA_LIST_FOREACH(e_border_client_list(), l, bd2)
+   if (cfdata->remember.match_name)
      {
-	int required_matches;
-	int matches;
-	const char *title2;
+	matchflags |= E_REMEMBER_MATCH_NAME;
+	required_matches++;
+     }
+   if (cfdata->remember.match_class)
+     {
+	matchflags |= E_REMEMBER_MATCH_CLASS;
+	required_matches++;
+     }
+   if (cfdata->remember.match_title)
+     {
+	matchflags |= E_REMEMBER_MATCH_TITLE;
+	required_matches++;
+     }
+   if (cfdata->remember.match_role)
+     {
+	matchflags |= E_REMEMBER_MATCH_ROLE;
+	required_matches++;
+     }
+   if (cfdata->remember.match_type)
+     {
+	matchflags |= E_REMEMBER_MATCH_TYPE;
+	required_matches++;
+     }
 
-        matches = 0;
-	required_matches = 0;
-	if (matchflags & E_REMEMBER_MATCH_NAME) required_matches++;
-	if (matchflags & E_REMEMBER_MATCH_CLASS) required_matches++;
-	if (matchflags & E_REMEMBER_MATCH_TITLE) required_matches++;
-	if (matchflags & E_REMEMBER_MATCH_ROLE) required_matches++;
-	if (matchflags & E_REMEMBER_MATCH_TYPE) required_matches++;
-	if (matchflags & E_REMEMBER_MATCH_TRANSIENT) required_matches++;
-	title2 = e_border_name_get(bd2);
+   if (cfdata->remember.match_transient)
+     {
+	matchflags |= E_REMEMBER_MATCH_TRANSIENT;
+	required_matches++;
+     }
+
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+     {
+	int matches = 0;
+
+	title = e_border_name_get(bd);
         if ((matchflags & E_REMEMBER_MATCH_NAME) &&
-	    ((!e_util_strcmp(bd->client.icccm.name, bd2->client.icccm.name)) ||
-	     (e_util_both_str_empty(bd->client.icccm.name, bd2->client.icccm.name))))
+	    (e_util_glob_match(bd->client.icccm.name, cfdata->name)))
 	  matches++;
 	if ((matchflags & E_REMEMBER_MATCH_CLASS) &&
-	    ((!e_util_strcmp(bd->client.icccm.class, bd2->client.icccm.class)) ||
-	     (e_util_both_str_empty(bd->client.icccm.class, bd2->client.icccm.class))))
+	    (e_util_glob_match(bd->client.icccm.class, cfdata->class)))
 	  matches++;
 	if ((matchflags & E_REMEMBER_MATCH_TITLE) &&
-	    ((!e_util_strcmp(title, title2)) ||
-	     (e_util_both_str_empty(title, title2))))
-	  matches++;
+	    (e_util_glob_match(title, cfdata->title)))
+	    matches++;
 	if ((matchflags & E_REMEMBER_MATCH_ROLE) &&
-	    ((!e_util_strcmp(bd->client.icccm.window_role, bd2->client.icccm.window_role)) ||
-	     (e_util_both_str_empty(bd->client.icccm.window_role, bd2->client.icccm.window_role))))
+	    ((!e_util_strcmp(cfdata->role, bd->client.icccm.window_role)) ||
+	     (e_util_both_str_empty(cfdata->role, bd->client.icccm.window_role))))
 	  matches++;
 	if ((matchflags & E_REMEMBER_MATCH_TYPE) &&
-	    (bd->client.netwm.type == bd2->client.netwm.type))
+	    (cfdata->border->client.netwm.type == bd->client.netwm.type))
 	  matches++;
 	if ((matchflags & E_REMEMBER_MATCH_TRANSIENT) &&
-	    (((bd->client.icccm.transient_for) && (bd2->client.icccm.transient_for != 0)) ||
-	     ((!bd->client.icccm.transient_for) && (bd2->client.icccm.transient_for == 0))))
+	    ((cfdata->remember.match_transient && bd->client.icccm.transient_for != 0) ||
+	     (!cfdata->remember.match_transient && (bd->client.icccm.transient_for == 0))))
 	  matches++;
+
 	if (matches >= required_matches) n++;
+
+	if (update)
+	  {
+	     bd->changed = 1;
+	     bd->changes.icon = 1;
+	  }
+	else if (n > 1) break;
      }
    return n;
 }
@@ -286,11 +336,13 @@
    if (rem->title) eina_stringshare_del(rem->title);
    if (rem->role) eina_stringshare_del(rem->role);
    if (rem->prop.command) eina_stringshare_del(rem->prop.command);
+   if (rem->prop.desktop_file) eina_stringshare_del(rem->prop.desktop_file);
    rem->name = NULL;
    rem->class = NULL;
    rem->title = NULL;
    rem->role = NULL;
    rem->prop.command = NULL;
+   rem->prop.desktop_file = NULL;
    if (cfdata->name  && cfdata->name[0])
      rem->name = eina_stringshare_add(cfdata->name);
    if (cfdata->class && cfdata->class[0])
@@ -301,6 +353,10 @@
      rem->role = eina_stringshare_add(cfdata->role);
    if (cfdata->command && cfdata->command[0])
      rem->prop.command = eina_stringshare_add(cfdata->command);
+
+   if (cfdata->remember.apply_desktop_file && cfdata->desktop)
+     rem->prop.desktop_file = eina_stringshare_add(cfdata->desktop);
+
 }
 
 static int
@@ -324,14 +380,20 @@
    if (!cfdata->warned)
      {
 	int matches = 0;
+	cfdata->remember.match_role = 1;
+	cfdata->remember.match_type = 1;
+	cfdata->remember.match_transient = 1;
 
-	if ((cfdata->border->client.icccm.name) &&
-	    (cfdata->border->client.icccm.class) &&
-	    (cfdata->border->client.icccm.name[0] != 0) &&
-	    (cfdata->border->client.icccm.class[0] != 0))
-	  matches = _check_matches(cfdata->border, E_REMEMBER_MATCH_NAME | E_REMEMBER_MATCH_CLASS | E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT);
+	if ((cfdata->name) && (cfdata->class))
+	  {
+	     cfdata->remember.match_name = 1;
+	     cfdata->remember.match_class = 1;
+	  }
 	else
-	  matches = _check_matches(cfdata->border, E_REMEMBER_MATCH_TITLE | E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT);
+	  cfdata->remember.match_title = 1;
+
+	matches = _check_matches(cfdata, 0);
+
 	if (matches > 1)
 	  {
 	     E_Dialog *dia;
@@ -388,9 +450,9 @@
 					    E_REMEMBER_APPLY_SKIP_WINLIST | E_REMEMBER_APPLY_SKIP_PAGER | E_REMEMBER_APPLY_SKIP_TASKBAR |
 	                                    E_REMEMBER_APPLY_FULLSCREEN | E_REMEMBER_APPLY_ICON_PREF;
 	rem->apply_first_only = 0;
-
+	cfdata->remember.apply_desktop_file = 0;
 	_remember_update(rem, cfdata);
-
+	_check_matches(cfdata, 1);
 	e_remember_update(rem, cfdata->border);
      }
 
@@ -414,7 +476,8 @@
 	 (cfdata->remember.apply_zone) || (cfdata->remember.apply_skip_winlist) ||
 	 (cfdata->remember.apply_skip_pager) || (cfdata->remember.apply_skip_taskbar) ||
 	 (cfdata->remember.apply_run) || (cfdata->remember.apply_icon_pref) ||
-	 (cfdata->remember.set_focus_on_start) || (cfdata->remember.apply_fullscreen)))
+	 (cfdata->remember.set_focus_on_start) || (cfdata->remember.apply_fullscreen) ||
+	 (cfdata->remember.apply_desktop_file)))
      {
 	if (rem)
 	  {
@@ -426,9 +489,6 @@
 	return 1;
      }
 
-   if (cfdata->remember.match_name) cfdata->remember.match_class = 1;
-   else cfdata->remember.match_class = 0;
-
    if (!((cfdata->remember.match_name)  || (cfdata->remember.match_class) ||
 	 (cfdata->remember.match_title) || (cfdata->remember.match_role) ||
 	 (cfdata->remember.match_type)  || (cfdata->remember.match_transient)))
@@ -452,16 +512,8 @@
      }
    if (!cfdata->warned)
      {
-	int matchflags = 0;
-
-	if (cfdata->remember.match_name)  matchflags |= E_REMEMBER_MATCH_NAME;
-	if (cfdata->remember.match_class) matchflags |= E_REMEMBER_MATCH_CLASS;
-	if (cfdata->remember.match_title) matchflags |= E_REMEMBER_MATCH_TITLE;
-	if (cfdata->remember.match_role)  matchflags |= E_REMEMBER_MATCH_ROLE;
-	if (cfdata->remember.match_type)  matchflags |= E_REMEMBER_MATCH_TYPE;
-	if (cfdata->remember.match_transient) matchflags |= E_REMEMBER_MATCH_TRANSIENT;
 	if ((!cfdata->remember.apply_first_only) &&
-	    (_check_matches(cfdata->border, matchflags) > 1))
+	    (_check_matches(cfdata, 0) > 1))
 	  {
 	     E_Dialog *dia;
 
@@ -503,7 +555,7 @@
      }
 
    if (rem)
-     {	
+     {
 	rem->apply = 0;
 	rem->match = 0;
 	rem->apply_first_only = cfdata->remember.apply_first_only;
@@ -532,7 +584,7 @@
 
 	_remember_update(rem, cfdata);
 	cfdata->border->remember = rem;
-	
+	_check_matches(cfdata, 1);
 	rem->keep_settings = 0;
 	e_remember_update(rem, cfdata->border);
 	rem->keep_settings = cfdata->remember.keep_settings;
@@ -579,7 +631,6 @@
 	ob = e_widget_check_add(evas, _("Window name"), &(cfdata->remember.match_name));
 	e_widget_framelist_object_append(of, ob);
 	ob = e_widget_entry_add(evas, &cfdata->name, NULL, NULL, NULL);
-	e_widget_entry_readonly_set(ob, 1);
 	e_widget_framelist_object_append(of, ob);
      }
    else
@@ -591,7 +642,6 @@
 	ob = e_widget_check_add(evas, _("Window class"), &(cfdata->remember.match_class));
 	e_widget_framelist_object_append(of, ob);
 	ob = e_widget_entry_add(evas, &cfdata->class, NULL, NULL, NULL);
-	e_widget_entry_readonly_set(ob, 1);
 	e_widget_framelist_object_append(of, ob);
      }
    else
@@ -603,7 +653,6 @@
 	ob = e_widget_check_add(evas, _("Title"), &(cfdata->remember.match_title));
 	e_widget_framelist_object_append(of, ob);
 	ob = e_widget_entry_add(evas, &cfdata->title, NULL, NULL, NULL);
-	e_widget_entry_readonly_set(ob, 1);
 	e_widget_framelist_object_append(of, ob);
      }
    else
@@ -615,7 +664,6 @@
 	ob = e_widget_check_add(evas, _("Window Role"), &(cfdata->remember.match_role));
 	e_widget_framelist_object_append(of, ob);
 	ob = e_widget_entry_add(evas, &cfdata->role, NULL, NULL, NULL);
-	e_widget_entry_readonly_set(ob, 1);
 	e_widget_framelist_object_append(of, ob);
      }
    else
@@ -664,22 +712,28 @@
    e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Skip Taskbar"), &(cfdata->remember.apply_skip_taskbar));
    e_widget_frametable_object_append(of, ob, 1, 6, 1, 1, 1, 1, 1, 1);
-   e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1);
+   ob = e_widget_check_add(evas, _("Application file or name (.desktop)"), &(cfdata->remember.apply_desktop_file));
+   e_widget_frametable_object_append(of, ob, 0, 7, 2, 1, 1, 1, 1, 1);
+   ob = e_widget_entry_add(evas, &cfdata->desktop, NULL, NULL, NULL);
+   e_widget_frametable_object_append(of, ob, 0, 8, 2, 1, 1, 1, 1, 1);
+   e_widget_table_object_append(o, of, 1, 0, 1, 2, 1, 1, 1, 1);
 
+   of = e_widget_frametable_add(evas, _("Options"), 0);
    ob = e_widget_check_add(evas, _("Match only one window"), &(cfdata->remember.apply_first_only));
-   e_widget_table_object_append(o, ob, 0, 1, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
 
    ob = e_widget_check_add(evas, _("Always focus on start"), &(cfdata->remember.set_focus_on_start));
-   e_widget_table_object_append(o, ob, 1, 1, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
 
    ob = e_widget_check_add(evas, _("Keep current properties"), &(cfdata->remember.keep_settings));
-   e_widget_table_object_append(o, ob, 1, 2, 1, 1, 1, 1, 1, 1);
-   
+   e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
+
    if (cfdata->command)
      {
 	ob = e_widget_check_add(evas, _("Start this program on login"), &(cfdata->remember.apply_run));
-	e_widget_table_object_append(o, ob, 1, 3, 1, 1, 1, 1, 1, 1);
+	e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
      }
+   e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 1, 1, 1);
 
    return o;
 }

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-12 03:49:50 UTC (rev 42431)
+++ trunk/e/src/bin/e_remember.c	2009-09-12 07:04:32 UTC (rev 42432)
@@ -93,7 +93,8 @@
 EAPI void
 e_remember_unuse(E_Remember *rem)
 {
-   rem->used_count--;
+   if (rem->used_count > 0)
+     rem->used_count--;
    if ((rem->used_count == 0) && (rem->delete_me))
      _e_remember_free(rem);
 }
@@ -118,7 +119,6 @@
 	  }
 	return;
      }
-   _e_remember_free(rem);
 }
 
 EAPI E_Remember *
@@ -366,16 +366,13 @@
          * required, and if it is, check whether there's a match. If
          * it fails, then go to the next remember */
         if (rem->match & E_REMEMBER_MATCH_NAME &&
-	    e_util_strcmp(rem->name, bd->client.icccm.name) &&
-	    !e_util_both_str_empty(rem->name, bd->client.icccm.name))
+	    !e_util_glob_match(bd->client.icccm.name, rem->name))
           continue;
         if (rem->match & E_REMEMBER_MATCH_CLASS &&
-	    e_util_strcmp(rem->class, bd->client.icccm.class) &&
-	    !e_util_both_str_empty(rem->class, bd->client.icccm.class))
+	    !e_util_glob_match(bd->client.icccm.class, rem->class))
           continue;
         if (rem->match & E_REMEMBER_MATCH_TITLE &&
-	    e_util_strcmp(rem->title, title) &&
-	    !e_util_both_str_empty(rem->title, title))
+	    !e_util_glob_match(title, rem->title))
           continue;
         if (rem->match & E_REMEMBER_MATCH_ROLE &&
             e_util_strcmp(rem->role, bd->client.icccm.window_role) &&

Log:
  move applying of remember properties for new windows from e_border to e_remember 
  
Author:       jeffdameth
Date:         2009-09-12 02:18:41 -0700 (Sat, 12 Sep 2009)
New Revision: 42433

Modified:
  trunk/e/src/bin/e_border.c trunk/e/src/bin/e_int_border_remember.c trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-12 07:04:32 UTC (rev 42432)
+++ trunk/e/src/bin/e_border.c	2009-09-12 09:18:41 UTC (rev 42433)
@@ -5615,7 +5615,6 @@
 {
    int change_urgent = 0;
    int rem_change = 0;
-   int zx, zy, zw, zh;
    
    if (e_object_is_del(E_OBJECT(bd)))
      {
@@ -5624,8 +5623,7 @@
      }
    
    _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_FETCH, bd);
-   if (bd->zone)
-     e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
+
    /* fetch any info queued to be fetched */
    if (bd->client.icccm.fetch.client_leader)
      {
@@ -6154,7 +6152,6 @@
 
    if (bd->new_client)
      {
-	E_Remember *rem = NULL;
 	E_Event_Border_Add *ev;
 
 	ev = calloc(1, sizeof(E_Event_Border_Add));
@@ -6165,244 +6162,9 @@
 
 	if ((!bd->lock_border) || (!bd->client.border.name))
 	  bd->client.border.changed = 1;
-	if (!bd->remember)
-	  {
-	     rem = e_remember_find_usable(bd);
-	     if (rem)
-	       {
-		  bd->remember = rem;
-		  e_remember_use(rem);
-	       }
-	  }
-	if (bd->remember)
-	  {
-	     rem  = bd->remember;
-
-	     if (rem->apply & E_REMEMBER_APPLY_ZONE)
-	       {
-		  E_Zone *zone;
-		  
-		  zone = e_container_zone_number_get(bd->zone->container, rem->prop.zone);
-		  if (zone)
-		    e_border_zone_set(bd, zone);
-		  e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh);
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_DESKTOP)
-	       {
-		  E_Desk *desk;
-		  
-		  desk = e_desk_at_xy_get(bd->zone, rem->prop.desk_x, rem->prop.desk_y);
-		  if (desk) 
-		    {
-		       e_border_desk_set(bd, desk);
-		       if (e_config->desk_auto_switch)
-			 e_desk_show(desk);
-		    }
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_SIZE)
-	       {
-		  bd->client.w = rem->prop.w;
-		  bd->client.h = rem->prop.h;
-		  /* we can trust internal windows */
-		  if (bd->internal)
-		    {
-		       if (bd->zone->w != rem->prop.res_x)
-			 {	 
-			    if (bd->client.w > (bd->zone->w - 64))
-			      bd->client.w = bd->zone->w - 64;
-			 }
-		       if (bd->zone->h != rem->prop.res_y)
-			 {	 
-			    if (bd->client.h > (bd->zone->h - 64))
-			      bd->client.h = bd->zone->h - 64;
-			 }
-		       if (bd->client.icccm.min_w > bd->client.w)
-			 bd->client.w = bd->client.icccm.min_w;
-		       if (bd->client.icccm.max_w < bd->client.w)
-			 bd->client.w = bd->client.icccm.max_w;
-		       if (bd->client.icccm.min_h > bd->client.h)
-			 bd->client.h = bd->client.icccm.min_h;
-		       if (bd->client.icccm.max_h < bd->client.h)
-			 bd->client.h = bd->client.icccm.max_h;
-		    }
-		  bd->w = bd->client.w + bd->client_inset.l + bd->client_inset.r;
-		  bd->h = bd->client.h + bd->client_inset.t + bd->client_inset.b;
-		  bd->changes.size = 1;
-		  bd->changes.shape = 1;
-	       }
-	     if ((rem->apply & E_REMEMBER_APPLY_POS) && (!bd->re_manage))
-	       {
-		  bd->x = rem->prop.pos_x;
-		  bd->y = rem->prop.pos_y;
-		  if (bd->zone->w != rem->prop.res_x)
-		    {
-		       int px;
-		       
-		       px = bd->x + (bd->w / 2);
-		       if (px < ((rem->prop.res_x * 1) / 3))
-			 {
-			    if (bd->zone->w >= (rem->prop.res_x / 3))
-			      bd->x = rem->prop.pos_x;
-			    else
-			      bd->x = ((rem->prop.pos_x - 0) * bd->zone->w) / 
-			      (rem->prop.res_x / 3);
-			 }
-		       else if (px < ((rem->prop.res_x * 2) / 3))
-			 {
-			    if (bd->zone->w >= (rem->prop.res_x / 3))
-			      bd->x = (bd->zone->w / 2) + 
-			      (px - (rem->prop.res_x / 2)) -
-			      (bd->w / 2);
-			    else
-			      bd->x = (bd->zone->w / 2) + 
-			      (((px - (rem->prop.res_x / 2)) * bd->zone->w) / 
-			       (rem->prop.res_x / 3)) -
-			      (bd->w / 2);
-			 }
-		       else
-			 {
-			    if (bd->zone->w >= (rem->prop.res_x / 3))
-			      bd->x = bd->zone->w + 
-			      rem->prop.pos_x - rem->prop.res_x +
-			      (rem->prop.w - bd->client.w);
-			    else
-			      bd->x = bd->zone->w + 
-			      (((rem->prop.pos_x - rem->prop.res_x) * bd->zone->w) /
-			       (rem->prop.res_x / 3)) +
-			      (rem->prop.w - bd->client.w);
-			 }
-		       if ((rem->prop.pos_x >= 0) && (bd->x < 0))
-			 bd->x = 0;
-		       else if (((rem->prop.pos_x + rem->prop.w) < rem->prop.res_x) &&
-				((bd->x + bd->w) > bd->zone->w))
-			 bd->x = bd->zone->w - bd->w;
-		    }
-		  if (bd->zone->h != rem->prop.res_y)
-		    {
-		       int py;
-		       
-		       py = bd->y + (bd->h / 2);
-		       if (py < ((rem->prop.res_y * 1) / 3))
-			 {
-			    if (bd->zone->h >= (rem->prop.res_y / 3))
-			      bd->y = rem->prop.pos_y;
-			    else
-			      bd->y = ((rem->prop.pos_y - 0) * bd->zone->h) / 
-			      (rem->prop.res_y / 3);
-			 }
-		       else if (py < ((rem->prop.res_y * 2) / 3))
-			 {
-			    if (bd->zone->h >= (rem->prop.res_y / 3))
-			      bd->y = (bd->zone->h / 2) + 
-			      (py - (rem->prop.res_y / 2)) -
-			      (bd->h / 2);
-			    else
-			      bd->y = (bd->zone->h / 2) + 
-			      (((py - (rem->prop.res_y / 2)) * bd->zone->h) / 
-			       (rem->prop.res_y / 3)) -
-			      (bd->h / 2);
-			 }
-		       else
-			 {
-			    if (bd->zone->h >= (rem->prop.res_y / 3))
-			      bd->y = bd->zone->h + 
-			      rem->prop.pos_y - rem->prop.res_y +
-			      (rem->prop.h - bd->client.h);
-			    else
-			      bd->y = bd->zone->h + 
-			      (((rem->prop.pos_y - rem->prop.res_y) * bd->zone->h) /
-			       (rem->prop.res_y / 3)) +
-			      (rem->prop.h - bd->client.h);
-			 }
-		       if ((rem->prop.pos_y >= 0) && (bd->y < 0))
-			 bd->y = 0;
-		       else if (((rem->prop.pos_y + rem->prop.h) < rem->prop.res_y) &&
-				((bd->y + bd->h) > bd->zone->h))
-			 bd->y = bd->zone->h - bd->h;
-		    }
-//		  if (bd->zone->w != rem->prop.res_x)
-//		    bd->x = (rem->prop.pos_x * bd->zone->w) / rem->prop.res_x;
-//		  if (bd->zone->h != rem->prop.res_y)
-//		    bd->y = (rem->prop.pos_y * bd->zone->h) / rem->prop.res_y;
-		  bd->x += bd->zone->x;
-		  bd->y += bd->zone->y;
-		  bd->placed = 1;
-		  bd->changes.pos = 1;
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_LAYER)
-	       {
-		  bd->layer = rem->prop.layer;
-		  if (bd->layer == 100)
-		    e_hints_window_stacking_set(bd, E_STACKING_NONE);
-		  else if (bd->layer == 150)
-		    e_hints_window_stacking_set(bd, E_STACKING_ABOVE);
-		  e_container_border_raise(bd);
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_BORDER)
-	       {
-		  if (rem->prop.border)
-		    {
-		       if (bd->bordername) eina_stringshare_del(bd->bordername);
-		       if (rem->prop.border) bd->bordername = eina_stringshare_add(rem->prop.border);
-		       else bd->bordername = NULL;
-		       bd->client.border.changed = 1;
-		    }
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_FULLSCREEN)
-	       {
-		  if (rem->prop.fullscreen)
-		    e_border_fullscreen(bd, e_config->fullscreen_policy);
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_STICKY)
-	       {
-		  if (rem->prop.sticky) e_border_stick(bd);
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_SHADE)
-	       {
-		  if (rem->prop.shaded >= 100)
-		    e_border_shade(bd, rem->prop.shaded - 100);
-		  else if (rem->prop.shaded >= 50)
-		    e_border_unshade(bd, rem->prop.shaded - 50);
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_LOCKS)
-	       {
-		  bd->lock_user_location = rem->prop.lock_user_location;
-		  bd->lock_client_location = rem->prop.lock_client_location;
-		  bd->lock_user_size = rem->prop.lock_user_size;
-		  bd->lock_client_size = rem->prop.lock_client_size;
-		  bd->lock_user_stacking = rem->prop.lock_user_stacking;
-		  bd->lock_client_stacking = rem->prop.lock_client_stacking;
-		  bd->lock_user_iconify = rem->prop.lock_user_iconify;
-		  bd->lock_client_iconify = rem->prop.lock_client_iconify;
-		  bd->lock_user_desk = rem->prop.lock_user_desk;
-		  bd->lock_client_desk = rem->prop.lock_client_desk;
-		  bd->lock_user_sticky = rem->prop.lock_user_sticky;
-		  bd->lock_client_sticky = rem->prop.lock_client_sticky;
-		  bd->lock_user_shade = rem->prop.lock_user_shade;
-		  bd->lock_client_shade = rem->prop.lock_client_shade;
-		  bd->lock_user_maximize = rem->prop.lock_user_maximize;
-		  bd->lock_client_maximize = rem->prop.lock_client_maximize;
-		  bd->lock_user_fullscreen = rem->prop.lock_user_fullscreen;
-		  bd->lock_client_fullscreen = rem->prop.lock_client_fullscreen;
-		  bd->lock_border = rem->prop.lock_border;
-		  bd->lock_close = rem->prop.lock_close;
-		  bd->lock_focus_in = rem->prop.lock_focus_in;
-		  bd->lock_focus_out = rem->prop.lock_focus_out;
-		  bd->lock_life = rem->prop.lock_life;
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_SKIP_WINLIST)
-	       bd->user_skip_winlist = rem->prop.skip_winlist;
-	     if (rem->apply & E_REMEMBER_APPLY_SKIP_PAGER)
-	       bd->client.netwm.state.skip_pager = rem->prop.skip_pager;
-	     if (rem->apply & E_REMEMBER_APPLY_SKIP_TASKBAR)
-	       bd->client.netwm.state.skip_taskbar = rem->prop.skip_taskbar;
-	     if (rem->apply & E_REMEMBER_APPLY_ICON_PREF)
-	       bd->icon_preference = rem->prop.icon_preference;
-	     if (rem->apply & E_REMEMBER_SET_FOCUS_ON_START)
-	       bd->want_focus = 1;
-	  }
      }
 
+   /* PRE_POST_FETCH calls e_remember apply for new client */
    _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_POST_FETCH, bd);
    _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_FETCH, bd);
    _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN, bd);
@@ -6771,13 +6533,11 @@
 	     free(pnd);
 	  }
 
-     	/* Recreate state */
+	/* Recreate state */
 	e_hints_window_init(bd);
-	
-        if ((bd->client.e.state.centered) && 
+	if ((bd->client.e.state.centered) && 
 	    ((!bd->remember) ||
-	     ((bd->remember) && 
-	      (!(bd->remember->apply & E_REMEMBER_APPLY_POS)))))
+	     ((bd->remember) && (!(bd->remember->apply & E_REMEMBER_APPLY_POS)))))
 	  {
 	     bd->x = zx + (zw - bd->w) / 2;
 	     bd->y = zy + (zh - bd->h) / 2;
@@ -6785,23 +6545,6 @@
 	     bd->placed = 1;
 	  }
 
-	if ((bd->internal) && (!bd->remember) && 
-	    (e_config->remember_internal_windows) &&
-	    (!bd->internal_no_remember))
-	  {
-	     E_Remember *rem;
-	     
-	     rem = e_remember_new();
-	     if (rem)
-	       {
-		  rem->match = E_REMEMBER_MATCH_NAME | E_REMEMBER_MATCH_CLASS | E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT;
-		  rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_BORDER;
-		  bd->remember = rem;
-		  e_remember_use(rem);
-		  e_remember_update(rem, bd);
-	       }
-	  }
-	
 	if (bd->internal_ecore_evas)
 	  ecore_evas_managed_move(bd->internal_ecore_evas,
 				  bd->x + bd->fx.x + bd->client_inset.l,
@@ -6838,7 +6581,7 @@
 	     if ((zone) && (zone != bd->zone))
 	       {
 		  e_border_zone_set(bd, zone);
-		  e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh);
+		  /* e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh); */
 	       }
 	  }
      }

Modified: trunk/e/src/bin/e_int_border_remember.c
===================================================================
--- trunk/e/src/bin/e_int_border_remember.c	2009-09-12 07:04:32 UTC (rev 42432)
+++ trunk/e/src/bin/e_int_border_remember.c	2009-09-12 09:18:41 UTC (rev 42433)
@@ -679,6 +679,8 @@
      {
 	cfdata->remember.match_type = 0;
      }
+   ob = e_widget_label_add(evas, _("wildcard matches are allowed"));
+   e_widget_framelist_object_append(of, ob);
    ob = e_widget_check_add(evas, _("Transience"), &(cfdata->remember.match_transient));
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-12 07:04:32 UTC (rev 42432)
+++ trunk/e/src/bin/e_remember.c	2009-09-12 09:18:41 UTC (rev 42433)
@@ -10,6 +10,9 @@
 static void _e_remember_free(E_Remember *rem);
 static int _e_remember_sort_list(const void * d1, const void * d2);
 static E_Remember  *_e_remember_find(E_Border *bd, int check_usable);
+static void _e_remember_cb_hook_pre_post_fetch(void *data, E_Border *bd);
+static void _e_remember_cb_hook_eval_post_new_border(void *data, E_Border *bd);
+static Eina_List *hooks = NULL;
 
 /* FIXME: match netwm window type */
 
@@ -22,6 +25,7 @@
    Eina_List *l = NULL;
    E_Remember *rem;
    int not_updated = 0;
+   E_Border_Hook *h;
 
    if (mode == E_STARTUP_START)
      {
@@ -32,6 +36,13 @@
 	  }
      }
 
+   h = e_border_hook_add(E_BORDER_HOOK_EVAL_PRE_POST_FETCH,
+			 _e_remember_cb_hook_pre_post_fetch, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_EVAL_POST_NEW_BORDER,
+			 _e_remember_cb_hook_eval_post_new_border, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+
 #if 1
    EINA_LIST_FOREACH(e_config->remembers, l, rem)
      {
@@ -54,7 +65,7 @@
      }
 
    if (not_updated)
-     e_config->remembers = eina_list_sort(e_config->remembers, -1, 
+     e_config->remembers = eina_list_sort(e_config->remembers, -1,
                                           _e_remember_sort_list);
 #endif
    return 1;
@@ -63,6 +74,11 @@
 EAPI int
 e_remember_shutdown(void)
 {
+   E_Border_Hook *h;
+
+   EINA_LIST_FREE(hooks, h)
+     e_border_hook_del(h);
+
    return 1;
 }
 
@@ -158,7 +174,7 @@
 	 * need to remove from list and insert back into the appropriate
 	 * loction. */
 	Eina_List *l = NULL;
-	E_Remember *r; 
+	E_Remember *r;
 
 	rem->max_score = max_count;
 	e_config->remembers = eina_list_remove(e_config->remembers, rem);
@@ -188,7 +204,7 @@
      if ((e_border_name_get(bd))[0] != 0)
        match |= E_REMEMBER_MATCH_TITLE;
 
-   if ((bd->client.icccm.window_role) && 
+   if ((bd->client.icccm.window_role) &&
 	 (bd->client.icccm.window_role[0] != 0))
      match |= E_REMEMBER_MATCH_ROLE;
 
@@ -206,10 +222,10 @@
 
    if (bd->remember && bd->remember->keep_settings)
      return;
-   
+
    if (rem->prop.border) eina_stringshare_del(rem->prop.border);
    rem->prop.border = NULL;
-   
+
    e_remember_match_update(rem);
 
    rem->type = bd->client.netwm.type;
@@ -406,7 +422,7 @@
    free(rem);
 }
 
-static int 
+static int
 _e_remember_sort_list(const void * d1, const void * d2)
 {
    const E_Remember *r1, *r2;
@@ -418,3 +434,293 @@
    else
      return 1;
 }
+
+static void
+_e_remember_cb_hook_pre_post_fetch(void *data, E_Border *bd)
+{
+   E_Remember *rem = NULL;
+
+   if (!bd->new_client) return;
+
+   if (!bd->remember)
+     {
+	rem = e_remember_find_usable(bd);
+	if (rem)
+	  {
+	     bd->remember = rem;
+	     e_remember_use(rem);
+	  }
+     }
+   if (bd->remember)
+     {
+	rem = bd->remember;
+
+	if (rem->apply & E_REMEMBER_APPLY_ZONE)
+	  {
+	     E_Zone *zone;
+
+	     zone = e_container_zone_number_get(bd->zone->container, rem->prop.zone);
+	     if (zone)
+	       e_border_zone_set(bd, zone);
+	  }
+	if (rem->apply & E_REMEMBER_APPLY_DESKTOP)
+	  {
+	     E_Desk *desk;
+
+	     desk = e_desk_at_xy_get(bd->zone, rem->prop.desk_x, rem->prop.desk_y);
+	     if (desk)
+	       {
+		  e_border_desk_set(bd, desk);
+		  if (e_config->desk_auto_switch)
+		    e_desk_show(desk);
+	       }
+	  }
+	if (rem->apply & E_REMEMBER_APPLY_SIZE)
+	  {
+	     bd->client.w = rem->prop.w;
+	     bd->client.h = rem->prop.h;
+	     /* we can trust internal windows */
+	     if (bd->internal)
+	       {
+		  if (bd->zone->w != rem->prop.res_x)
+		    {
+		       if (bd->client.w > (bd->zone->w - 64))
+			 bd->client.w = bd->zone->w - 64;
+		    }
+		  if (bd->zone->h != rem->prop.res_y)
+		    {
+		       if (bd->client.h > (bd->zone->h - 64))
+			 bd->client.h = bd->zone->h - 64;
+		    }
+		  if (bd->client.icccm.min_w > bd->client.w)
+		    bd->client.w = bd->client.icccm.min_w;
+		  if (bd->client.icccm.max_w < bd->client.w)
+		    bd->client.w = bd->client.icccm.max_w;
+		  if (bd->client.icccm.min_h > bd->client.h)
+		    bd->client.h = bd->client.icccm.min_h;
+		  if (bd->client.icccm.max_h < bd->client.h)
+		    bd->client.h = bd->client.icccm.max_h;
+	       }
+	     bd->w = bd->client.w + bd->client_inset.l + bd->client_inset.r;
+	     bd->h = bd->client.h + bd->client_inset.t + bd->client_inset.b;
+	     bd->changes.size = 1;
+	     bd->changes.shape = 1;
+	  }
+	if ((rem->apply & E_REMEMBER_APPLY_POS) && (!bd->re_manage))
+	  {
+	     bd->x = rem->prop.pos_x;
+	     bd->y = rem->prop.pos_y;
+	     if (bd->zone->w != rem->prop.res_x)
+	       {
+		  int px;
+
+		  px = bd->x + (bd->w / 2);
+		  if (px < ((rem->prop.res_x * 1) / 3))
+		    {
+		       if (bd->zone->w >= (rem->prop.res_x / 3))
+			 bd->x = rem->prop.pos_x;
+		       else
+			 bd->x = ((rem->prop.pos_x - 0) * bd->zone->w) /
+			   (rem->prop.res_x / 3);
+		    }
+		  else if (px < ((rem->prop.res_x * 2) / 3))
+		    {
+		       if (bd->zone->w >= (rem->prop.res_x / 3))
+			 bd->x = (bd->zone->w / 2) +
+			   (px - (rem->prop.res_x / 2)) -
+			   (bd->w / 2);
+		       else
+			 bd->x = (bd->zone->w / 2) +
+			   (((px - (rem->prop.res_x / 2)) * bd->zone->w) /
+			    (rem->prop.res_x / 3)) -
+			   (bd->w / 2);
+		    }
+		  else
+		    {
+		       if (bd->zone->w >= (rem->prop.res_x / 3))
+			 bd->x = bd->zone->w +
+			   rem->prop.pos_x - rem->prop.res_x +
+			   (rem->prop.w - bd->client.w);
+		       else
+			 bd->x = bd->zone->w +
+			   (((rem->prop.pos_x - rem->prop.res_x) * bd->zone->w) /
+			    (rem->prop.res_x / 3)) +
+			   (rem->prop.w - bd->client.w);
+		    }
+		  if ((rem->prop.pos_x >= 0) && (bd->x < 0))
+		    bd->x = 0;
+		  else if (((rem->prop.pos_x + rem->prop.w) < rem->prop.res_x) &&
+			   ((bd->x + bd->w) > bd->zone->w))
+		    bd->x = bd->zone->w - bd->w;
+	       }
+	     if (bd->zone->h != rem->prop.res_y)
+	       {
+		  int py;
+
+		  py = bd->y + (bd->h / 2);
+		  if (py < ((rem->prop.res_y * 1) / 3))
+		    {
+		       if (bd->zone->h >= (rem->prop.res_y / 3))
+			 bd->y = rem->prop.pos_y;
+		       else
+			 bd->y = ((rem->prop.pos_y - 0) * bd->zone->h) /
+			   (rem->prop.res_y / 3);
+		    }
+		  else if (py < ((rem->prop.res_y * 2) / 3))
+		    {
+		       if (bd->zone->h >= (rem->prop.res_y / 3))
+			 bd->y = (bd->zone->h / 2) +
+			   (py - (rem->prop.res_y / 2)) -
+			   (bd->h / 2);
+		       else
+			 bd->y = (bd->zone->h / 2) +
+			   (((py - (rem->prop.res_y / 2)) * bd->zone->h) /
+			    (rem->prop.res_y / 3)) -
+			   (bd->h / 2);
+		    }
+		  else
+		    {
+		       if (bd->zone->h >= (rem->prop.res_y / 3))
+			 bd->y = bd->zone->h +
+			   rem->prop.pos_y - rem->prop.res_y +
+			   (rem->prop.h - bd->client.h);
+		       else
+			 bd->y = bd->zone->h +
+			   (((rem->prop.pos_y - rem->prop.res_y) * bd->zone->h) /
+			    (rem->prop.res_y / 3)) +
+			   (rem->prop.h - bd->client.h);
+		    }
+		  if ((rem->prop.pos_y >= 0) && (bd->y < 0))
+		    bd->y = 0;
+		  else if (((rem->prop.pos_y + rem->prop.h) < rem->prop.res_y) &&
+			   ((bd->y + bd->h) > bd->zone->h))
+		    bd->y = bd->zone->h - bd->h;
+	       }
+	     //		  if (bd->zone->w != rem->prop.res_x)
+	     //		    bd->x = (rem->prop.pos_x * bd->zone->w) / rem->prop.res_x;
+	     //		  if (bd->zone->h != rem->prop.res_y)
+	     //		    bd->y = (rem->prop.pos_y * bd->zone->h) / rem->prop.res_y;
+	     bd->x += bd->zone->x;
+	     bd->y += bd->zone->y;
+	     bd->placed = 1;
+	     bd->changes.pos = 1;
+	  }
+	if (rem->apply & E_REMEMBER_APPLY_LAYER)
+	  {
+	     bd->layer = rem->prop.layer;
+	     if (bd->layer == 100)
+	       e_hints_window_stacking_set(bd, E_STACKING_NONE);
+	     else if (bd->layer == 150)
+	       e_hints_window_stacking_set(bd, E_STACKING_ABOVE);
+	     e_container_border_raise(bd);
+	  }
+	if (rem->apply & E_REMEMBER_APPLY_BORDER)
+	  {
+	     if (rem->prop.border)
+	       {
+		  if (bd->bordername) eina_stringshare_del(bd->bordername);
+		  if (rem->prop.border) bd->bordername = eina_stringshare_add(rem->prop.border);
+		  else bd->bordername = NULL;
+		  bd->client.border.changed = 1;
+	       }
+	  }
+	if (rem->apply & E_REMEMBER_APPLY_FULLSCREEN)
+	  {
+	     if (rem->prop.fullscreen)
+	       e_border_fullscreen(bd, e_config->fullscreen_policy);
+	  }
+	if (rem->apply & E_REMEMBER_APPLY_STICKY)
+	  {
+	     if (rem->prop.sticky) e_border_stick(bd);
+	  }
+	if (rem->apply & E_REMEMBER_APPLY_SHADE)
+	  {
+	     if (rem->prop.shaded >= 100)
+	       e_border_shade(bd, rem->prop.shaded - 100);
+	     else if (rem->prop.shaded >= 50)
+	       e_border_unshade(bd, rem->prop.shaded - 50);
+	  }
+	if (rem->apply & E_REMEMBER_APPLY_LOCKS)
+	  {
+	     bd->lock_user_location = rem->prop.lock_user_location;
+	     bd->lock_client_location = rem->prop.lock_client_location;
+	     bd->lock_user_size = rem->prop.lock_user_size;
+	     bd->lock_client_size = rem->prop.lock_client_size;
+	     bd->lock_user_stacking = rem->prop.lock_user_stacking;
+	     bd->lock_client_stacking = rem->prop.lock_client_stacking;
+	     bd->lock_user_iconify = rem->prop.lock_user_iconify;
+	     bd->lock_client_iconify = rem->prop.lock_client_iconify;
+	     bd->lock_user_desk = rem->prop.lock_user_desk;
+	     bd->lock_client_desk = rem->prop.lock_client_desk;
+	     bd->lock_user_sticky = rem->prop.lock_user_sticky;
+	     bd->lock_client_sticky = rem->prop.lock_client_sticky;
+	     bd->lock_user_shade = rem->prop.lock_user_shade;
+	     bd->lock_client_shade = rem->prop.lock_client_shade;
+	     bd->lock_user_maximize = rem->prop.lock_user_maximize;
+	     bd->lock_client_maximize = rem->prop.lock_client_maximize;
+	     bd->lock_user_fullscreen = rem->prop.lock_user_fullscreen;
+	     bd->lock_client_fullscreen = rem->prop.lock_client_fullscreen;
+	     bd->lock_border = rem->prop.lock_border;
+	     bd->lock_close = rem->prop.lock_close;
+	     bd->lock_focus_in = rem->prop.lock_focus_in;
+	     bd->lock_focus_out = rem->prop.lock_focus_out;
+	     bd->lock_life = rem->prop.lock_life;
+	  }
+	if (rem->apply & E_REMEMBER_APPLY_SKIP_WINLIST)
+	  bd->user_skip_winlist = rem->prop.skip_winlist;
+	if (rem->apply & E_REMEMBER_APPLY_SKIP_PAGER)
+	  bd->client.netwm.state.skip_pager = rem->prop.skip_pager;
+	if (rem->apply & E_REMEMBER_APPLY_SKIP_TASKBAR)
+	  bd->client.netwm.state.skip_taskbar = rem->prop.skip_taskbar;
+	if (rem->apply & E_REMEMBER_APPLY_ICON_PREF)
+	  bd->icon_preference = rem->prop.icon_preference;
+	if (rem->apply & E_REMEMBER_SET_FOCUS_ON_START)
+	  bd->want_focus = 1;
+     }
+}
+
+
+static void
+_e_remember_cb_hook_eval_post_new_border(void *data, E_Border *bd)
+{
+   if (!bd->new_client) return;
+
+   if ((bd->internal) && (!bd->remember) &&
+       (e_config->remember_internal_windows) &&
+       (!bd->internal_no_remember))
+     {
+	E_Remember *rem;
+
+	rem = e_remember_new();
+	if (rem)
+	  {
+	     bd->remember = rem;
+	     rem->match = 0;
+	     
+	     if (bd->client.icccm.name)
+	       {
+		  rem->name = eina_stringshare_add(bd->client.icccm.name);
+		  rem->match |= E_REMEMBER_MATCH_NAME;
+	       }
+	     if (bd->client.icccm.class)
+	       {
+		  rem->class = eina_stringshare_add(bd->client.icccm.class);
+		  rem->match |= E_REMEMBER_MATCH_CLASS;
+	       }
+	     if (bd->client.icccm.window_role)
+	       {
+		  rem->role = eina_stringshare_add(bd->client.icccm.window_role);
+		  rem->match |= E_REMEMBER_MATCH_ROLE;
+	       }
+	     if (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_UNKNOWN)
+	       {
+		  rem->match |= E_REMEMBER_MATCH_TYPE;
+	       }
+
+	     rem->match |= E_REMEMBER_MATCH_TRANSIENT;
+	     rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_BORDER;
+	     e_remember_use(rem);
+	     e_remember_update(rem, bd);
+	  }
+     }
+}

Log:
  e_fm: find theme defined mime icons
  
Author:       jeffdameth
Date:         2009-09-12 04:22:58 -0700 (Sat, 12 Sep 2009)
New Revision: 42436

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2009-09-12 11:08:07 UTC (rev 42435)
+++ trunk/e/src/bin/e_fm.c	2009-09-12 11:22:58 UTC (rev 42436)
@@ -2067,7 +2067,7 @@
    char buf[1024];
    const char *file;
 
-   if (snprintf(buf, sizeof(buf), "e/icons/mimetypes/%s", ic->info.mime) >= sizeof(buf))
+   if (snprintf(buf, sizeof(buf), "e/icons/fileman/mime/%s", ic->info.mime) >= sizeof(buf))
      return NULL;
 
    file = e_theme_edje_file_get("base/theme/icons", buf);

Log:
  remember transient state - do not update 
  
Author:       jeffdameth
Date:         2009-09-12 05:42:13 -0700 (Sat, 12 Sep 2009)
New Revision: 42439

Modified:
  trunk/e/src/bin/e_int_border_remember.c trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_int_border_remember.c
===================================================================
--- trunk/e/src/bin/e_int_border_remember.c	2009-09-12 12:28:11 UTC (rev 42438)
+++ trunk/e/src/bin/e_int_border_remember.c	2009-09-12 12:42:13 UTC (rev 42439)
@@ -584,6 +584,11 @@
 	if (cfdata->remember.apply_icon_pref)    rem->apply |= E_REMEMBER_APPLY_ICON_PREF;
 	if (cfdata->remember.set_focus_on_start) rem->apply |= E_REMEMBER_SET_FOCUS_ON_START;
 
+	if (bd->client.icccm.transient_for != 0)
+	  rem->transient = 1;
+	else
+	  rem->transient = 0;
+
 	_remember_update(rem, cfdata);
 	_check_matches(cfdata, 1);
 	rem->keep_settings = 0;

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-12 12:28:11 UTC (rev 42438)
+++ trunk/e/src/bin/e_remember.c	2009-09-12 12:42:13 UTC (rev 42439)
@@ -232,6 +232,11 @@
 	rem->role = eina_stringshare_add(role);
      }
 
+   if (bd->client.icccm.transient_for != 0)
+     rem->transient = 1;
+   else
+     rem->transient = 0;
+
    rem->match = match;
    
    return match;
@@ -259,11 +264,6 @@
 
    rem->type = bd->client.netwm.type;
 
-   if (bd->client.icccm.transient_for != 0)
-     rem->transient = 1;
-   else
-     rem->transient = 0;
-
    if (bd->fullscreen)
      {
 	rem->prop.fullscreen = bd->fullscreen;

Log:
  simplify code. only refactoring
  
Author:       jeffdameth
Date:         2009-09-12 06:18:02 -0700 (Sat, 12 Sep 2009)
New Revision: 42440

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-12 12:42:13 UTC (rev 42439)
+++ trunk/e/src/bin/e_border.c	2009-09-12 13:18:02 UTC (rev 42440)
@@ -6654,6 +6654,8 @@
 	  }
 	else
 	  {
+	     int x = 0, y = 0;
+	     
 	     evas_obscured_clear(bd->bg_evas);
 	     evas_obscured_rectangle_add(bd->bg_evas,
 					 bd->client_inset.l, bd->client_inset.t,
@@ -6682,50 +6684,17 @@
 	     if (bd->shading)
 	       {
 		  if (bd->shade.dir == E_DIRECTION_UP)
-		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas, 0,
-						bd->h - (bd->client_inset.t + bd->client_inset.b) -
-						bd->client.h,
-						bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win, 0,
-						    bd->h - (bd->client_inset.t + bd->client_inset.b) -
-						    bd->client.h,
-						    bd->client.w, bd->client.h);
-		    }
+		    y = bd->h - (bd->client_inset.t + bd->client_inset.b) - bd->client.h;
 		  else if (bd->shade.dir == E_DIRECTION_LEFT)
-		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas,
-						bd->w - (bd->client_inset.l + bd->client_inset.r) -
-						bd->client.h,
-						0, bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win,
-						    bd->w - (bd->client_inset.l + bd->client_inset.r) -
-						    bd->client.h,
-						    0, bd->client.w, bd->client.h);
-		    }
-		  else
-		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, 
-						bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win, 0, 0,
-						    bd->client.w, bd->client.h);
-		    }
+		    x = bd->w - (bd->client_inset.l + bd->client_inset.r) - bd->client.h;
 	       }
+	     if (bd->internal_ecore_evas)
+	       ecore_evas_move_resize(bd->internal_ecore_evas,
+				      x, y, bd->client.w, bd->client.h);
 	     else
-	       {
-		  if (bd->internal_ecore_evas)
-		    ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, 
-					   bd->client.w, bd->client.h);
-		  else
-		    ecore_x_window_move_resize(bd->client.win, 0, 0,
-					       bd->client.w, bd->client.h);
-	       }
+	       ecore_x_window_move_resize(bd->client.win,
+					  x, y, bd->client.w, bd->client.h);
+
 	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
 	     evas_object_resize(bd->bg_object, bd->w, bd->h);
 	     e_container_shape_resize(bd->shape, bd->w, bd->h);
@@ -6799,6 +6768,8 @@
 	  }
 	else
 	  {
+	     int x = 0, y = 0;
+	     
 	     evas_obscured_clear(bd->bg_evas);
 	     evas_obscured_rectangle_add(bd->bg_evas,
 					 bd->client_inset.l, bd->client_inset.t,
@@ -6823,50 +6794,17 @@
 	     if (bd->shading)
 	       {
 		  if (bd->shade.dir == E_DIRECTION_UP)
-		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas, 0,
-						bd->h - (bd->client_inset.t + bd->client_inset.b) -
-						bd->client.h,
-						bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win, 0,
-						    bd->h - (bd->client_inset.t + bd->client_inset.b) -
-						    bd->client.h,
-						    bd->client.w, bd->client.h);
-		    }
+		    y = bd->h - (bd->client_inset.t + bd->client_inset.b) - bd->client.h;
 		  else if (bd->shade.dir == E_DIRECTION_LEFT)
-		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas,
-						bd->w - (bd->client_inset.l + bd->client_inset.r) -
-						bd->client.h,
-						0, bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win,
-						    bd->w - (bd->client_inset.l + bd->client_inset.r) -
-						    bd->client.h,
-						    0, bd->client.w, bd->client.h);
-		    }
-		  else
-		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, 
-						bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win, 0, 0,
-						    bd->client.w, bd->client.h);
-		    }
+		    x = bd->w - (bd->client_inset.l + bd->client_inset.r) - bd->client.h;
 	       }
+	     if (bd->internal_ecore_evas)
+	       ecore_evas_move_resize(bd->internal_ecore_evas,
+				      x, y, bd->client.w, bd->client.h);
 	     else
-	       {
-		  if (bd->internal_ecore_evas)
-		    ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, 
-					   bd->client.w, bd->client.h);
-		  else
-		    ecore_x_window_move_resize(bd->client.win, 0, 0,
-					       bd->client.w, bd->client.h);
-	       }
+	       ecore_x_window_move_resize(bd->client.win,
+					  x, y, bd->client.w, bd->client.h);
+
 	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
 	     evas_object_resize(bd->bg_object, bd->w, bd->h);
 	     e_container_shape_resize(bd->shape, bd->w, bd->h);

Log:
  factor duplicated ecore_evas_managed_move and ecore_x_icccm_move_resize_send
  out to _e_border_client_move_resize_send(E_Border)
  
Author:       jeffdameth
Date:         2009-09-12 06:53:43 -0700 (Sat, 12 Sep 2009)
New Revision: 42441

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-12 13:18:02 UTC (rev 42440)
+++ trunk/e/src/bin/e_border.c	2009-09-12 13:53:43 UTC (rev 42441)
@@ -107,6 +107,8 @@
 
 static void _e_border_hook_call(E_Border_Hook_Point hookpoint, void *bd);
 
+static void _e_border_client_move_resize_send(E_Border *bd);
+
 /* local subsystem globals */
 static Eina_List *handlers = NULL;
 static Eina_List *borders = NULL;
@@ -807,6 +809,22 @@
 }
 
 static void
+_e_border_client_move_resize_send(E_Border *bd)
+{
+   if (bd->internal_ecore_evas)
+     ecore_evas_managed_move(bd->internal_ecore_evas,
+			     bd->x + bd->fx.x + bd->client_inset.l,
+			     bd->y + bd->fx.y + bd->client_inset.t);
+   
+   ecore_x_icccm_move_resize_send(bd->client.win,
+				  bd->x + bd->fx.x + bd->client_inset.l,
+				  bd->y + bd->fx.y + bd->client_inset.t,
+				  bd->client.w,
+				  bd->client.h);
+}
+
+
+static void
 _e_border_move_internal(E_Border *bd, int x, int y, Eina_Bool without_border)
 {
    E_Event_Border_Move *ev;
@@ -851,15 +869,7 @@
 	ecore_x_netwm_sync_request_send(bd->client.win, bd->client.netwm.sync.serial++);
      }
 #endif
-   if (bd->internal_ecore_evas)
-     ecore_evas_managed_move(bd->internal_ecore_evas,
-			     bd->x + bd->fx.x + bd->client_inset.l,
-			     bd->y + bd->fx.y + bd->client_inset.t);
-   ecore_x_icccm_move_resize_send(bd->client.win,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t,
-				  bd->client.w,
-				  bd->client.h);
+   _e_border_client_move_resize_send(bd);
    _e_border_move_update(bd);
    ev = calloc(1, sizeof(E_Event_Border_Move));
    ev->border = bd;
@@ -944,15 +954,8 @@
    bd->fx.y = y;
    bd->changed = 1;
    bd->changes.pos = 1;
-   if (bd->internal_ecore_evas)
-     ecore_evas_managed_move(bd->internal_ecore_evas,
-			     bd->x + bd->fx.x + bd->client_inset.l,
-			     bd->y + bd->fx.y + bd->client_inset.t);
-   ecore_x_icccm_move_resize_send(bd->client.win,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t,
-				  bd->client.w,
-				  bd->client.h);
+
+   _e_border_client_move_resize_send(bd);
    if (bd->moving) _e_border_move_update(bd);
 }
 
@@ -1007,15 +1010,8 @@
 	bd->client.netwm.sync.wait++;
 	ecore_x_netwm_sync_request_send(bd->client.win, bd->client.netwm.sync.serial++);
      }
-   if (bd->internal_ecore_evas)
-     ecore_evas_managed_move(bd->internal_ecore_evas,
-			     bd->x + bd->fx.x + bd->client_inset.l,
-			     bd->y + bd->fx.y + bd->client_inset.t);
-   ecore_x_icccm_move_resize_send(bd->client.win,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t,
-				  bd->client.w,
-				  bd->client.h);
+
+   _e_border_client_move_resize_send(bd);
    _e_border_resize_update(bd);
    ev = calloc(1, sizeof(E_Event_Border_Resize));
    ev->border = bd;
@@ -1126,15 +1122,8 @@
 	bd->client.netwm.sync.wait++;
 	ecore_x_netwm_sync_request_send(bd->client.win, bd->client.netwm.sync.serial++);
      }
-   if (bd->internal_ecore_evas)
-     ecore_evas_managed_move(bd->internal_ecore_evas,
-			     bd->x + bd->fx.x + bd->client_inset.l,
-			     bd->y + bd->fx.y + bd->client_inset.t);
-   ecore_x_icccm_move_resize_send(bd->client.win,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t,
-				  bd->client.w,
-				  bd->client.h);
+
+   _e_border_client_move_resize_send(bd);
    _e_border_resize_update(bd);
    mev = calloc(1, sizeof(E_Event_Border_Move));
    mev->border = bd;
@@ -3477,15 +3466,7 @@
 	bd->need_shape_merge = 1;
 	bd->need_shape_export = 1;
      }
-   if (bd->internal_ecore_evas)
-     ecore_evas_managed_move(bd->internal_ecore_evas,
-			     bd->x + bd->fx.x + bd->client_inset.l,
-			     bd->y + bd->fx.y + bd->client_inset.t);
-   ecore_x_icccm_move_resize_send(bd->client.win,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t,
-				  bd->client.w,
-				  bd->client.h);
+   _e_border_client_move_resize_send(bd);
 }
 
 EAPI Eina_List *
@@ -4307,11 +4288,8 @@
 	       }
 	  }
      }
-   ecore_x_icccm_move_resize_send(bd->client.win,
-                                  bd->x + bd->fx.x + bd->client_inset.l,
-                                  bd->y + bd->fx.y + bd->client_inset.t,
-                                  bd->client.w,
-                                  bd->client.h);
+
+   _e_border_client_move_resize_send(bd);
    return 1;
 }
 
@@ -4358,11 +4336,8 @@
 	else
 	  e_border_resize(bd, w, h);
      }
-   ecore_x_icccm_move_resize_send(bd->client.win,
-                                  bd->x + bd->fx.x + bd->client_inset.l,
-                                  bd->y + bd->fx.y + bd->client_inset.t,
-                                  bd->client.w,
-                                  bd->client.h);
+
+     _e_border_client_move_resize_send(bd);
    return 1;
 }
 
@@ -6529,15 +6504,8 @@
 	     bd->placed = 1;
 	  }
 
-	if (bd->internal_ecore_evas)
-	  ecore_evas_managed_move(bd->internal_ecore_evas,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t);
-	ecore_x_icccm_move_resize_send(bd->client.win,
-				       bd->x + bd->fx.x + bd->client_inset.l,
-				       bd->y + bd->fx.y + bd->client_inset.t,
-				       bd->client.w,
-				       bd->client.h);
+	_e_border_client_move_resize_send(bd);
+
 	/* if the explicit geometry request asks for the app to be
 	 * in another zone - well move it there */
 	  {
@@ -6702,15 +6670,9 @@
 				    bd->x + bd->fx.x,
 				    bd->y + bd->fx.y);
 	  }
-	if (bd->internal_ecore_evas)
-	  ecore_evas_managed_move(bd->internal_ecore_evas,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t);
-        ecore_x_icccm_move_resize_send(bd->client.win,
-                                       bd->x + bd->fx.x + bd->client_inset.l,
-                                       bd->y + bd->fx.y + bd->client_inset.t,
-                                       bd->client.w,
-                                       bd->client.h);
+
+	_e_border_client_move_resize_send(bd);
+
 	bd->changes.pos = 0;
 	bd->changes.size = 0;
 	rem_change = 1;
@@ -6729,15 +6691,9 @@
 	     ecore_x_window_move(bd->win, bd->x + bd->fx.x, bd->y + bd->fx.y);
 	  }
 	e_container_shape_move(bd->shape, bd->x + bd->fx.x, bd->y + bd->fx.y);
-	if (bd->internal_ecore_evas)
-	  ecore_evas_managed_move(bd->internal_ecore_evas,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t);
-	ecore_x_icccm_move_resize_send(bd->client.win,
-				       bd->x + bd->fx.x + bd->client_inset.l,
-				       bd->y + bd->fx.y + bd->client_inset.t,
-				       bd->client.w,
-				       bd->client.h);
+
+	_e_border_client_move_resize_send(bd);
+
 	bd->changes.pos = 0;
 	rem_change = 1;
      }
@@ -6809,15 +6765,9 @@
 	     evas_object_resize(bd->bg_object, bd->w, bd->h);
 	     e_container_shape_resize(bd->shape, bd->w, bd->h);
 	  }
-	if (bd->internal_ecore_evas)
-	  ecore_evas_managed_move(bd->internal_ecore_evas,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t);
-	ecore_x_icccm_move_resize_send(bd->client.win,
-				       bd->x + bd->fx.x + bd->client_inset.l,
-				       bd->y + bd->fx.y + bd->client_inset.t,
-				       bd->client.w,
-				       bd->client.h);
+
+	_e_border_client_move_resize_send(bd);
+
 	bd->changes.size = 0;
 	rem_change = 1;
      }
@@ -6984,14 +6934,8 @@
 		       bd->y = y - (bd->client_inset.t >> 1);
 		       bd->changed = 1;
 		       bd->changes.pos = 1;
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_managed_move(bd->internal_ecore_evas,
-						 bd->x + bd->fx.x + bd->client_inset.l,
-						 bd->y + bd->fx.y + bd->client_inset.t);
-		       ecore_x_icccm_move_resize_send(bd->client.win,
-						      bd->x + bd->fx.x + bd->client_inset.l,
-						      bd->y + bd->fx.y + bd->client_inset.t,
-						      bd->client.w, bd->client.h);
+
+		       _e_border_client_move_resize_send(bd);
 		    }
 	       }
 	  }

Log:
  refactor bd->changes.size evaluation
  
Author:       jeffdameth
Date:         2009-09-12 08:24:28 -0700 (Sat, 12 Sep 2009)
New Revision: 42442

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-12 13:53:43 UTC (rev 42441)
+++ trunk/e/src/bin/e_border.c	2009-09-12 15:24:28 UTC (rev 42442)
@@ -6588,89 +6588,67 @@
 	rem_change = 1;
      }
 
-   if ((bd->changes.pos) && (bd->changes.size))
+   if (bd->changes.size)
      {
+	int x = 0, y = 0, xx = 0, yy = 0;
+
 	if ((bd->shaded) && (!bd->shading))
 	  {
 	     evas_obscured_clear(bd->bg_evas);
-//	     if (0)
-//	       {
-//		  if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-//		  bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job,
-//							bd);
-//		  bd->post_move = 1;
-//		  bd->post_resize = 1;
-//	       }
-//	     else
-	       {
-		  ecore_x_window_move_resize(bd->win, 
-					     bd->x + bd->fx.x, 
-					     bd->y + bd->fx.y,
-					     bd->w, bd->h);
-	       }
-	     ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
-	     if (bd->internal_ecore_evas)
-	       ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, bd->client.w, bd->client.h);
-	     else
-	       ecore_x_window_move_resize(bd->client.win, 0, 0, bd->client.w, bd->client.h);
-	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
-	     evas_object_resize(bd->bg_object, bd->w, bd->h);
-	     e_container_shape_resize(bd->shape, bd->w, bd->h);
-	     e_container_shape_move(bd->shape,
-				    bd->x + bd->fx.x,
-				    bd->y + bd->fx.y);
 	  }
 	else
 	  {
-	     int x = 0, y = 0;
+	     xx = bd->w - (bd->client_inset.l + bd->client_inset.r);
+	     yy = bd->h - (bd->client_inset.t + bd->client_inset.b);
 	     
 	     evas_obscured_clear(bd->bg_evas);
 	     evas_obscured_rectangle_add(bd->bg_evas,
-					 bd->client_inset.l, bd->client_inset.t,
-					 bd->w - (bd->client_inset.l + bd->client_inset.r),
-					 bd->h - (bd->client_inset.t + bd->client_inset.b));
-//	     if (0)
-//	       {
-//		  if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-//		  bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job,
-//							bd);
-//		  bd->post_move = 1;
-//		  bd->post_resize = 1;
-//	       }
-//	     else
-	       {
-		  ecore_x_window_move_resize(bd->win,
-					     bd->x + bd->fx.x,
-					     bd->y + bd->fx.y,
-					     bd->w, bd->h);
-	       }
-	     ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
-	     ecore_x_window_move_resize(bd->client.shell_win,
-					bd->client_inset.l, bd->client_inset.t,
-					bd->w - (bd->client_inset.l + bd->client_inset.r),
-					bd->h - (bd->client_inset.t + bd->client_inset.b));
+					 bd->client_inset.l, bd->client_inset.t, xx, yy);
+
 	     if (bd->shading)
 	       {
 		  if (bd->shade.dir == E_DIRECTION_UP)
-		    y = bd->h - (bd->client_inset.t + bd->client_inset.b) - bd->client.h;
+		    {
+		       y = yy - bd->client.h;
+		    }
 		  else if (bd->shade.dir == E_DIRECTION_LEFT)
-		    x = bd->w - (bd->client_inset.l + bd->client_inset.r) - bd->client.h;
+		    {
+		       x = xx - bd->client.w;
+		    }		  
 	       }
-	     if (bd->internal_ecore_evas)
-	       ecore_evas_move_resize(bd->internal_ecore_evas,
-				      x, y, bd->client.w, bd->client.h);
-	     else
-	       ecore_x_window_move_resize(bd->client.win,
-					  x, y, bd->client.w, bd->client.h);
+	  }
 
-	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
-	     evas_object_resize(bd->bg_object, bd->w, bd->h);
-	     e_container_shape_resize(bd->shape, bd->w, bd->h);
-	     e_container_shape_move(bd->shape, 
-				    bd->x + bd->fx.x,
-				    bd->y + bd->fx.y);
+	if (!bd->changes.pos)
+	  {
+	     if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
+	     bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job, bd);
+	     bd->post_resize = 1;
 	  }
+	else
+	  {
+	     ecore_x_window_move_resize(bd->win,
+					bd->x + bd->fx.x,
+					bd->y + bd->fx.y,
+					bd->w, bd->h);
+	  }
 
+	ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
+
+	if ((!bd->shaded) || (bd->shading))
+	  ecore_x_window_move_resize(bd->client.shell_win,
+				     bd->client_inset.l, bd->client_inset.t, xx, yy);
+	
+	if (bd->internal_ecore_evas)
+	  ecore_evas_move_resize(bd->internal_ecore_evas, x, y, bd->client.w, bd->client.h);
+	else
+	  ecore_x_window_move_resize(bd->client.win, x, y, bd->client.w, bd->client.h);
+	
+	ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
+	evas_object_resize(bd->bg_object, bd->w, bd->h);
+	e_container_shape_resize(bd->shape, bd->w, bd->h);
+	if (bd->changes.pos)
+	  e_container_shape_move(bd->shape, bd->x + bd->fx.x, bd->y + bd->fx.y);
+
 	_e_border_client_move_resize_send(bd);
 
 	bd->changes.pos = 0;
@@ -6697,81 +6675,7 @@
 	bd->changes.pos = 0;
 	rem_change = 1;
      }
-   else if (bd->changes.size)
-     {
-	if (bd->shaded && !bd->shading)
-	  {
-	     evas_obscured_clear(bd->bg_evas);
-	     ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
-	     if (1)
-	       {
-		  if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-		  bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job,
-							bd);
-		  bd->post_resize = 1;
-	       }
-	     else
-	       {
-		  ecore_x_window_resize(bd->win, bd->w, bd->h);
-	       }
-	     if (bd->internal_ecore_evas)
-	       ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, bd->client.w, bd->client.h);
-	     else
-	       ecore_x_window_move_resize(bd->client.win, 0, 0, bd->client.w, bd->client.h);
-	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
-	     evas_object_resize(bd->bg_object, bd->w, bd->h);
-	     e_container_shape_resize(bd->shape, bd->w, bd->h);
-	  }
-	else
-	  {
-	     int x = 0, y = 0;
-	     
-	     evas_obscured_clear(bd->bg_evas);
-	     evas_obscured_rectangle_add(bd->bg_evas,
-					 bd->client_inset.l, bd->client_inset.t,
-					 bd->w - (bd->client_inset.l + bd->client_inset.r),
-					 bd->h - (bd->client_inset.t + bd->client_inset.b));
-	     ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
-	     if (1)
-	       {
-		  if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-		  bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job,
-							bd);
-		  bd->post_resize = 1;
-	       }
-	     else
-	       {
-		  ecore_x_window_resize(bd->win, bd->w, bd->h);
-	       }
-	     ecore_x_window_move_resize(bd->client.shell_win,
-					bd->client_inset.l, bd->client_inset.t,
-					bd->w - (bd->client_inset.l + bd->client_inset.r),
-					bd->h - (bd->client_inset.t + bd->client_inset.b));
-	     if (bd->shading)
-	       {
-		  if (bd->shade.dir == E_DIRECTION_UP)
-		    y = bd->h - (bd->client_inset.t + bd->client_inset.b) - bd->client.h;
-		  else if (bd->shade.dir == E_DIRECTION_LEFT)
-		    x = bd->w - (bd->client_inset.l + bd->client_inset.r) - bd->client.h;
-	       }
-	     if (bd->internal_ecore_evas)
-	       ecore_evas_move_resize(bd->internal_ecore_evas,
-				      x, y, bd->client.w, bd->client.h);
-	     else
-	       ecore_x_window_move_resize(bd->client.win,
-					  x, y, bd->client.w, bd->client.h);
 
-	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
-	     evas_object_resize(bd->bg_object, bd->w, bd->h);
-	     e_container_shape_resize(bd->shape, bd->w, bd->h);
-	  }
-
-	_e_border_client_move_resize_send(bd);
-
-	bd->changes.size = 0;
-	rem_change = 1;
-     }
-
    if (bd->changes.reset_gravity)
      {
 	GRAV_SET(bd, ECORE_X_GRAVITY_NW);

Log:
  refactor _e_border_cb_window_move_resize_reques. this screamed for a switch.
  
Author:       jeffdameth
Date:         2009-09-12 08:51:44 -0700 (Sat, 12 Sep 2009)
New Revision: 42443

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-12 15:24:28 UTC (rev 42442)
+++ trunk/e/src/bin/e_border.c	2009-09-12 15:51:44 UTC (rev 42443)
@@ -4757,157 +4757,74 @@
 
    if (!bd->lock_user_stacking)
      e_border_raise(bd);
-   if (e->direction == RESIZE_TL)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_TL;
 
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_SE);
-     }
-   else if (e->direction == RESIZE_T)
+   if (e->direction == MOVE)
      {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_T;
-
-	bd->cur_mouse_action = e_action_find("window_resize");
+	bd->cur_mouse_action = e_action_find("window_move");
 	if (bd->cur_mouse_action)
 	  {
 	     if ((!bd->cur_mouse_action->func.end_mouse) &&
 		 (!bd->cur_mouse_action->func.end))
 	       bd->cur_mouse_action = NULL;
 	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
+	       {
+		  e_object_ref(E_OBJECT(bd->cur_mouse_action));
+		  bd->cur_mouse_action->func.go(E_OBJECT(bd), NULL); 
+	       }
 	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_S);
+	return 1;
      }
-   else if (e->direction == RESIZE_TR)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_TR;
 
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_SW);
-     }
-   else if (e->direction == RESIZE_R)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_R;
+   if (!_e_border_resize_begin(bd))
+     return 1;
 
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_W);
-     }
-   else if (e->direction == RESIZE_BR)
+   switch(e->direction)
      {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_BR;
-
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_NW);
+      case RESIZE_TL:
+	 bd->resize_mode = RESIZE_TL;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_SE);
+	 break;
+      case RESIZE_T:
+	 bd->resize_mode = RESIZE_T;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_S);
+	break;
+      case RESIZE_TR:
+	 bd->resize_mode = RESIZE_TR;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_SW);
+	break;
+      case RESIZE_R:
+	 bd->resize_mode = RESIZE_R;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_W);
+	 break;
+      case RESIZE_BR:
+	 bd->resize_mode = RESIZE_BR;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_NW);
+      case RESIZE_B:
+	 bd->resize_mode = RESIZE_B;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_N);
+	 break;
+      case RESIZE_BL:
+	 bd->resize_mode = RESIZE_BL;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_NE);
+	 break;
+      case RESIZE_L:
+	 bd->resize_mode = RESIZE_L;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_E);
+	 break;
+      default:
+	 return 1;
      }
-   else if (e->direction == RESIZE_B)
+   
+   bd->cur_mouse_action = e_action_find("window_resize");
+   if (bd->cur_mouse_action)
      {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_B;
-
-	bd->cur_mouse_action = e_action_find("window_resize");
+	if ((!bd->cur_mouse_action->func.end_mouse) &&
+	    (!bd->cur_mouse_action->func.end))
+	  bd->cur_mouse_action = NULL;
 	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_N);
+	  e_object_ref(E_OBJECT(bd->cur_mouse_action));
      }
-   else if (e->direction == RESIZE_BL)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_BL;
 
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_NE);
-     }
-   else if (e->direction == RESIZE_L)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_L;
-
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_E);
-     }
-   else if (e->direction == MOVE)
-     {
-	bd->cur_mouse_action = e_action_find("window_move");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       {
-		  e_object_ref(E_OBJECT(bd->cur_mouse_action));
-		  bd->cur_mouse_action->func.go(E_OBJECT(bd), NULL); 
-	       }
-	  }
-     }
    return 1;
 }

Log:
  delete border remembers.. finally
  
Author:       jeffdameth
Date:         2009-09-12 10:26:16 -0700 (Sat, 12 Sep 2009)
New Revision: 42444

Modified:
  trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-12 15:51:44 UTC (rev 42443)
+++ trunk/e/src/bin/e_remember.c	2009-09-12 17:26:16 UTC (rev 42444)
@@ -10,8 +10,8 @@
 static void _e_remember_free(E_Remember *rem);
 static int _e_remember_sort_list(const void * d1, const void * d2);
 static E_Remember  *_e_remember_find(E_Border *bd, int check_usable);
-static void _e_remember_cb_hook_pre_post_fetch(void *data, E_Border *bd);
-static void _e_remember_cb_hook_eval_post_new_border(void *data, E_Border *bd);
+static void _e_remember_cb_hook_pre_post_fetch(void *data, void *bd);
+static void _e_remember_cb_hook_eval_post_new_border(void *data, void *bd);
 static Eina_List *hooks = NULL;
 
 /* FIXME: match netwm window type */
@@ -109,22 +109,17 @@
 EAPI void
 e_remember_unuse(E_Remember *rem)
 {
-   if (rem->used_count > 0)
-     rem->used_count--;
-   if ((rem->used_count == 0) && (rem->delete_me))
-     _e_remember_free(rem);
+   rem->used_count--;
 }
 
 EAPI void
 e_remember_del(E_Remember *rem)
 {
-   if (rem->delete_me) return;
    if (rem->used_count != 0)
      {
 	Eina_List *l = NULL;
 	E_Border *bd;
 
-	rem->delete_me = 1;
 	EINA_LIST_FOREACH(e_border_client_list(), l, bd)
 	  {
 	     if (bd->remember == rem)
@@ -133,10 +128,8 @@
 		  e_remember_unuse(rem);
 	       }
 	  }
-	return;
      }
-   else
-     _e_remember_free(rem); 
+   _e_remember_free(rem); 
 }
 
 EAPI E_Remember *
@@ -380,7 +373,7 @@
 	    (((rem->transient) && (bd->client.icccm.transient_for != 0)) ||
 	     ((!rem->transient) && (bd->client.icccm.transient_for == 0))))
 	  matches++;
-	 if ((matches >= required_matches) && (!rem->delete_me))
+	 if (matches >= required_matches)
 	  return rem;
      }
    return NULL;
@@ -459,8 +452,9 @@
 }
 
 static void
-_e_remember_cb_hook_pre_post_fetch(void *data, E_Border *bd)
+_e_remember_cb_hook_pre_post_fetch(void *data, void *border)
 {
+   E_Border *bd = border;
    E_Remember *rem = NULL;
 
    if (!bd->new_client) return;
@@ -704,8 +698,10 @@
 
 
 static void
-_e_remember_cb_hook_eval_post_new_border(void *data, E_Border *bd)
+_e_remember_cb_hook_eval_post_new_border(void *data, void *border)
 {
+   E_Border *bd = border;
+
    if (!bd->new_client) return;
 
    if ((bd->internal) && (!bd->remember) &&

Log:
  fix warnings
  
Author:       jeffdameth
Date:         2009-09-13 17:31:07 -0700 (Sun, 13 Sep 2009)
New Revision: 42475

Modified:
  trunk/e/src/bin/e_moveresize.c 

Modified: trunk/e/src/bin/e_moveresize.c
===================================================================
--- trunk/e/src/bin/e_moveresize.c	2009-09-14 00:28:51 UTC (rev 42474)
+++ trunk/e/src/bin/e_moveresize.c	2009-09-14 00:31:07 UTC (rev 42475)
@@ -3,13 +3,13 @@
  */
 #include "e.h"
 
-static void _e_resize_begin(void *data, E_Border *bd);
-static void _e_resize_update(void *data, E_Border *bd);
-static void _e_resize_end(void *data, E_Border *bd);
+static void _e_resize_begin(void *data, void *bd);
+static void _e_resize_update(void *data, void *bd);
+static void _e_resize_end(void *data, void *bd);
 static void _e_resize_border_extents(E_Border *bd, int *w, int *h);
-static void _e_move_begin(void *data, E_Border *bd);
-static void _e_move_update(void *data, E_Border *bd);
-static void _e_move_end(void *data, E_Border *bd);
+static void _e_move_begin(void *data, void *bd);
+static void _e_move_update(void *data, void *bd);
+static void _e_move_end(void *data, void *bd);
 static void _e_move_resize_object_coords_set(int x, int y, int w, int h);
 
 static E_Popup *_disp_pop = NULL;
@@ -49,11 +49,14 @@
 
    EINA_LIST_FREE(hooks, h)
      e_border_hook_del(h);
+
+   return 1;
 }
 
 static void
-_e_resize_begin(void *data, E_Border *bd)
+_e_resize_begin(void *data, void *border)
 {
+   E_Border *bd = border;
    Evas_Coord ew, eh;
    char buf[40];
    int w, h;
@@ -109,7 +112,7 @@
 }
 
 static void
-_e_resize_end(void *data, E_Border *bd)
+_e_resize_end(void *data, void *border)
 {
    if (e_config->resize_info_visible)
      {
@@ -129,8 +132,9 @@
 }
 
 static void
-_e_resize_update(void *data, E_Border *bd)
+_e_resize_update(void *data, void *border)
 {
+   E_Border *bd = border;
    char buf[40];
    int w, h;
 
@@ -182,8 +186,9 @@
 }
 
 static void
-_e_move_begin(void *data, E_Border *bd)
+_e_move_begin(void *data, void *border)
 {
+   E_Border *bd = border;
    Evas_Coord ew, eh;
    char buf[40];
 
@@ -221,7 +226,7 @@
 }
 
 static void
-_e_move_end(void *data, E_Border *bd)
+_e_move_end(void *data, void *border)
 {
    if (e_config->move_info_visible)
      {
@@ -241,8 +246,10 @@
 }
 
 static void
-_e_move_update(void *data, E_Border *bd)
+_e_move_update(void *data, void *border)
 {
+   E_Border *bd = border;
+   
    char buf[40];
 
    if (!_disp_pop) return;

Log:
  fix warnings
  
Author:       jeffdameth
Date:         2009-09-13 17:32:44 -0700 (Sun, 13 Sep 2009)
New Revision: 42476

Modified:
  trunk/e/src/bin/e_actions.c trunk/e/src/bin/e_entry.c trunk/e/src/bin/e_popup.c 

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2009-09-14 00:31:07 UTC (rev 42475)
+++ trunk/e/src/bin/e_actions.c	2009-09-14 00:32:44 UTC (rev 42476)
@@ -1233,6 +1233,8 @@
 	     wev->curr.x = offset;
 	  }
 	 break;
+      default:
+	 break;
      }
 
    current = e_desk_current_get(zone);

Modified: trunk/e/src/bin/e_entry.c
===================================================================
--- trunk/e/src/bin/e_entry.c	2009-09-14 00:31:07 UTC (rev 42475)
+++ trunk/e/src/bin/e_entry.c	2009-09-14 00:32:44 UTC (rev 42476)
@@ -1061,7 +1061,7 @@
    if (sd->imf_context)
      {
         ecore_imf_context_client_window_set(sd->imf_context,
-					    ecore_evas_window_get(ecore_evas_ecore_evas_get(evas)));
+					    (long *)ecore_evas_window_get(ecore_evas_ecore_evas_get(evas)));
         ecore_imf_context_client_canvas_set(sd->imf_context, evas);
         ecore_imf_context_retrieve_surrounding_callback_set(sd->imf_context,
                                                             _e_entry_cb_imf_retrieve_surrounding,

Modified: trunk/e/src/bin/e_popup.c
===================================================================
--- trunk/e/src/bin/e_popup.c	2009-09-14 00:31:07 UTC (rev 42475)
+++ trunk/e/src/bin/e_popup.c	2009-09-14 00:32:44 UTC (rev 42476)
@@ -7,8 +7,7 @@
 static void _e_popup_free(E_Popup *pop);
 static int  _e_popup_idle_enterer(void *data);
 static int  _e_popup_cb_window_shape(void *data, int ev_type, void *ev);
-static E_Popup *_e_popup_find_by_window(Ecore_X_Window win);
-/*
+/*static E_Popup *_e_popup_find_by_window(Ecore_X_Window win);
 static int _e_popup_cb_mouse_down(void *data, int type, void *event);
 static int _e_popup_cb_mouse_up(void *data, int type, void *event);
 static int _e_popup_cb_mouse_wheel(void *data, int type, void *event);
@@ -341,7 +340,7 @@
    return 1;
 }
 
-static E_Popup *
+/*static E_Popup *
 _e_popup_find_by_window(Ecore_X_Window win)
 {
    E_Popup *pop;
@@ -353,6 +352,7 @@
      }
    return NULL;
 }
+*/
 /*
 static int
 _e_popup_cb_mouse_down(void *data, int type, void *event)

Log:
  gadcon:
  - fix dnd of gadcon clients between gadcons
  - apply fix from victor for gadcon client movements
  - make layout algorithm orientation agnostic
  
Author:       jeffdameth
Date:         2009-09-16 22:18:28 -0700 (Wed, 16 Sep 2009)
New Revision: 42539

Modified:
  trunk/e/src/bin/e_gadcon.c 

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2009-09-17 05:17:12 UTC (rev 42538)
+++ trunk/e/src/bin/e_gadcon.c	2009-09-17 05:18:28 UTC (rev 42539)
@@ -16,7 +16,7 @@
 static void _e_gadcon_cb_client_frame_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_gadcon_cb_client_frame_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_gadcon_client_save(E_Gadcon_Client *gcc);
-//static void _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y);
+static void _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y);
 static void _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y);
 
 static void _e_gadcon_cb_min_size_request(void *data, Evas_Object *obj, void *event_info);
@@ -42,7 +42,7 @@
 static void _e_gadcon_cb_signal_resize_right_start(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_gadcon_cb_signal_resize_right_stop(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *emission, const char *source);
-//static void _e_gadcon_cb_drag_finished(E_Drag *drag, int dropped);
+static void _e_gadcon_cb_drag_finished(E_Drag *drag, int dropped);
 static void _e_gadcon_cb_dnd_enter(void *data, const char *type, void *event);
 static void _e_gadcon_cb_dnd_move(void *data, const char *type, void *event);
 static void _e_gadcon_cb_dnd_leave(void *data, const char *type, void *event);
@@ -172,20 +172,13 @@
     (((__lc)->pos >= (__lc2)->pos) && ((__lc)->pos < ((__lc2)->pos + (__lc2)->size))))
 
 #define E_LAYOUT_ITEM_CONTAINER_SIZE_CHANGE_BY(__lc, __bi, __increase) \
-   if (__lc->sd->horizontal) \
      { \
 	if (__increase) \
 	  __lc->size += __bi->w; \
 	else \
 	  __lc->size -= __bi->w; \
-     } \
-   else \
-     { \
-	if (__increase) \
-	  __lc->size += __bi->h; \
-	else \
-	  __lc->size -= __bi->h; \
      }
+
 /********************/
 
 static Eina_Hash *providers = NULL;
@@ -1717,15 +1710,16 @@
    e_config_save_queue();
 }
 
-#if 0
-/* FIXME unused */
 static void
 _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
 {
    E_Drag *drag;
    Evas_Object *o = NULL;
-   Evas_Coord w, h;
+   Evas_Coord w = 0, h = 0;
    const char *drag_types[] = { "enlightenment/gadcon_client" };
+   
+   if (drag_gcc || !gcc->gadcon->zone || !gcc->gadcon->zone->container)
+     return;
 
    drag_gcc = gcc;
 
@@ -1739,29 +1733,28 @@
    if (!e_drop_inside(gcc->gadcon->drop_handler, x, y))
      e_gadcon_client_hide(gcc);
 
-   if ((gcc->gadcon->zone) && (gcc->gadcon->zone->container))
+   ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &x, &y);
+   
+   drag = e_drag_new(gcc->gadcon->zone->container, x, y,
+		     drag_types, 1, gcc, -1, NULL, 
+		     _e_gadcon_cb_drag_finished);
+   if (drag) 
      {
-	drag = e_drag_new(gcc->gadcon->zone->container, gcc->drag.x, gcc->drag.y,
-			  drag_types, 1, gcc, -1, NULL, 
-			  _e_gadcon_cb_drag_finished);
-	if (drag) 
+	o = gcc->client_class->func.icon(gcc->client_class, e_drag_evas_get(drag));
+	evas_object_geometry_get(o, NULL, NULL, &w, &h);
+	if (!o)
 	  {
-	     o = gcc->client_class->func.icon(gcc->client_class, drag->evas);
-	     evas_object_geometry_get(o, NULL, NULL, &w, &h);
-	     if (!o)
-	       {
-		  /* FIXME: fallback icon for drag */
-		  o = evas_object_rectangle_add(drag->evas);
-		  evas_object_color_set(o, 255, 255, 255, 255);
-	       }
-	     e_drag_object_set(drag, o);
-	     e_drag_move(drag, gcc->drag.x - w/2, gcc->drag.y - h/2);
-	     e_drag_resize(drag, w, h);
-	     e_drag_start(drag, gcc->drag.x, gcc->drag.y);
+	     /* FIXME: fallback icon for drag */
+	     o = evas_object_rectangle_add(e_drag_evas_get(drag));
+	     evas_object_color_set(o, 255, 255, 255, 100);
 	  }
+	if (w < 10)
+	  w = h = 50;
+	e_drag_object_set(drag, o);
+	e_drag_resize(drag, w, h);
+	e_drag_start(drag, x + w/2, y + h/2);
      }
 }
-#endif
 
 static void
 _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y)
@@ -1970,12 +1963,26 @@
 static void
 _e_gadcon_client_move_start(E_Gadcon_Client *gcc)
 {
+   int x, y, gcx, gcy, gy ,gx;
+   
    evas_object_raise(gcc->o_event);
    evas_object_stack_below(gcc->o_control, gcc->o_event);
    gcc->moving = 1;
-   evas_pointer_canvas_xy_get(gcc->gadcon->evas, &gcc->dx, &gcc->dy);
-   gcc->drag.x = gcc->dx;
-   gcc->drag.y = gcc->dy;
+   ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &gcc->dx, &gcc->dy);
+   e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gcx, &gcy, NULL, NULL);
+   evas_object_geometry_get(gcc->gadcon->o_container, &gx, &gy, NULL, NULL);
+   gcc->dx -= (gcx + gx);
+   gcc->dy -= (gcy + gy);
+   
+   if (gcc->o_frame)
+     evas_object_geometry_get(gcc->o_frame, &x, &y, NULL, NULL);
+   else if (gcc->o_base)
+     evas_object_geometry_get(gcc->o_base, &x, &y, NULL, NULL);
+
+   /* using drag pos to calc offset between pointer and gcc pos */
+   gcc->drag.x = (x - gcc->dx);
+   gcc->drag.y = (y - gcc->dy);
+
    gcc->state_info.resist = 0;
 }
 
@@ -1993,22 +2000,37 @@
 {
    Evas_Coord x, y, w, h;
    int cx, cy;
+   int gx, gy, gw, gh;
+   int gcx = 0, gcy = 0, gcw, gch;
 
+
+   
    if (!gcc->moving) return;
-   evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
+   /* we need to get output not canvas because things like systray
+      can reparent another window so we get no position here */
+   /* maybe we should better grab mouse while move resize is active...*/
+   //evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
+   ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &cx, &cy);
+   e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gcx, &gcy, &gcw, &gch);
+   evas_object_geometry_get(gcc->gadcon->o_container, &gx, &gy, &gw, &gh);
+   
+   cx -= (gx + gcx);
+   cy -= (gy + gcy);
+   
    x = cx - gcc->dx;
    y = cy - gcc->dy; 
-
+   
    gcc->state_info.flags = E_GADCON_LAYOUT_ITEM_LOCK_POSITION | E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
    _e_gadcon_client_current_position_sync(gcc);
    if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
-     {
-/*	if (abs(cy - gcc->drag.y) > e_config->drag_resist)
+     { 
+	if (cy + e_config->drag_resist < 0 || cy - e_config->drag_resist > gh)
 	  {
 	     _e_gadcon_client_drag_begin(gcc, cx, cy);
 	     return;
 	  }
-	else*/ if (x > 0)
+
+	if (x > 0)
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
 	       gcc->state_info.resist = 0;
@@ -2023,12 +2045,13 @@
      }
    else
      {
-/*	if (abs(cx - gcc->drag.x) > e_config->drag_resist)
+	if (cx + e_config->drag_resist < 0 || cx - e_config->drag_resist > gw)
 	  {
 	     _e_gadcon_client_drag_begin(gcc, cx, cy);
 	     return;
 	  }
-	else*/ if (y > 0)
+
+	if (y > 0)
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
 	       gcc->state_info.resist = 0;
@@ -2047,13 +2070,13 @@
    else if (gcc->o_base)
      evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
    else return; /* make clang happy */
-
+     
    if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
      {
 	if (gcc->o_frame)
-	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + x, w);
+	  e_gadcon_layout_pack_request_set(gcc->o_frame, cx + gcc->drag.x, w);
 	else if (gcc->o_base)
-	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + x, w);
+	  e_gadcon_layout_pack_request_set(gcc->o_base, cx + gcc->drag.x, w);
 
 	gcc->config.size = w;
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
@@ -2062,14 +2085,15 @@
    else
      {
 	if (gcc->o_frame)
-	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + y, h);
+	  e_gadcon_layout_pack_request_set(gcc->o_frame, cy + gcc->drag.y, h);
 	else if (gcc->o_base)
-	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + y, h);
+	  e_gadcon_layout_pack_request_set(gcc->o_base, cy + gcc->drag.y, h);
 
 	gcc->config.size = h;
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = h;
      }
+   
    gcc->dx += x;
    gcc->dy += y;
 }
@@ -2254,8 +2278,6 @@
    gcc->dy += y;
 }
 
-#if 0
-/* FIXME unused */
 static void
 _e_gadcon_cb_drag_finished(E_Drag *drag, int dropped)
 {
@@ -2279,7 +2301,6 @@
    new_gcc = NULL;
    drag_gcc = NULL;
 }
-#endif
 
 static void
 _e_gadcon_cb_dnd_enter(void *data, const char *type, void *event)
@@ -2728,7 +2749,7 @@
 /* externally accessible functions */
 static Evas_Object *
 e_gadcon_layout_add(Evas *evas)
-{
+{   
    _e_gadcon_layout_smart_init();
    return evas_object_smart_add(evas, _e_smart);
 }
@@ -2793,9 +2814,17 @@
    if (!obj) return;
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
-   if (w) *w = sd->minw;
-   if (h) *h = sd->minh;
-
+   if (sd->horizontal)
+     {
+	if (w) *w = sd->minw;
+	if (h) *h = sd->minh;
+     }
+   else
+     {
+	if (w) *w = sd->minh;
+	if (h) *h = sd->minw;
+     }
+   
 /*   
    EINA_LIST_FOREACH(sd->items, l, obj)
      {
@@ -2875,18 +2904,18 @@
     * _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd)
     */
    E_Gadcon_Layout_Item *bi;
-   int xx;
+   int pos;
 
    if (!obj) return;
    bi = evas_object_data_get(obj, "e_gadcon_layout_data");
    if (!bi) return;
-   xx = bi->ask.pos + (bi->ask.size / 2);
-   if (xx < (bi->ask.res / 3))
+   pos = bi->ask.pos + (bi->ask.size / 2);
+   if (pos < (bi->ask.res / 3))
      { 
         /* hooked to start */
 	bi->ask.size = size;
      }
-   else if (xx > ((2 * bi->ask.res) / 3))
+   else if (pos > ((2 * bi->ask.res) / 3))
      { 
         /* hooked to end */
 	bi->ask.pos = (bi->ask.pos + bi->ask.size) - size;
@@ -2911,7 +2940,7 @@
 	  }
 	else
 	  { 
-	     if (xx < (bi->ask.res / 2))
+	     if (pos < (bi->ask.res / 2))
 	       {
 		  bi->ask.pos = (bi->ask.pos + bi->ask.size) - size;
 		  bi->ask.size = size;
@@ -2933,10 +2962,8 @@
    if (!obj) return;
    bi = evas_object_data_get(obj, "e_gadcon_layout_data");
    if (!bi) return;
-   if (bi->sd->horizontal)
-     bi->ask.res = bi->sd->w;
-   else
-     bi->ask.res = bi->sd->h;
+
+   bi->ask.res = bi->sd->w;
    if (pos < 0) pos = 0;
    if ((bi->ask.res - pos) < size) pos = bi->ask.res - size;
    bi->ask.size = size;
@@ -2993,8 +3020,17 @@
    if (!obj) return;
    bi = evas_object_data_get(obj, "e_gadcon_layout_data");
    if (!bi) return;
-   bi->min.w = w;
-   bi->min.h = h;
+   if (bi->sd->horizontal)
+     {
+	bi->min.w = w;
+	bi->min.h = h;
+     }
+   else
+     {
+	bi->min.w = h;
+	bi->min.h = w;
+     }
+   
    _e_gadcon_layout_smart_reconfigure(bi->sd);
 }
 
@@ -3006,8 +3042,17 @@
    if (!obj) return;
    bi = evas_object_data_get(obj, "e_gadcon_layout_data");
    if (!bi) return;
-   bi->aspect.w = w;
-   bi->aspect.h = h;
+   if (bi->sd->horizontal)
+     {
+	bi->aspect.w = w;
+	bi->aspect.h = h;
+     }
+   else
+     {
+	bi->aspect.w = h;
+	bi->aspect.h = w;
+     }
+     
    _e_gadcon_layout_smart_reconfigure(bi->sd);
 }
 
@@ -3019,8 +3064,16 @@
    if (!obj) return;
    bi = evas_object_data_get(obj, "e_gadcon_layout_data");
    if (!bi) return;
-   bi->aspect_pad.w = w;
-   bi->aspect_pad.h = h;
+   if (bi->sd->horizontal)
+     {
+	bi->aspect_pad.w = w;
+	bi->aspect_pad.h = h;
+     }
+   else
+     {
+	bi->aspect_pad.w = h;
+	bi->aspect_pad.h = w;
+     }   
 }
 
 static void
@@ -3046,7 +3099,7 @@
    E_Gadcon_Layout_Item *bi;
 
    if (!obj) return NULL;
-   bi = calloc(1, sizeof(E_Gadcon_Layout_Item));
+   bi = E_NEW(E_Gadcon_Layout_Item, 1);
    if (!bi) return NULL;
    bi->sd = sd;
    bi->obj = obj;
@@ -3080,7 +3133,7 @@
    evas_object_smart_member_del(obj);
    evas_object_clip_unset(obj);
    evas_object_data_del(obj, "e_gadcon_layout_data");
-   free(bi);
+   E_FREE(bi);
 }
 
 static void
@@ -3113,45 +3166,28 @@
 
    _e_gadcon_layout_smart_min_cur_size_calc(sd, &min, &mino, &cur); 
 
-   if (sd->horizontal)
+   if ((sd->minw != min) || (sd->minh != mino))
      {
-	if ((sd->minw != min) || (sd->minh != mino))
-	  {
-	     sd->minw = min;
-	     sd->minh = mino;
-	     evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
-	  }
+	sd->minw = min;
+	sd->minh = mino;
+	evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
      }
-   else
-     {
-	if ((sd->minh != min) || (sd->minw != mino))
-	  {
-	     sd->minh = min;
-	     sd->minw = mino;
-	     evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
-	  }
-     }
 
    if (sd->req != cur)
      {
-	if (((sd->horizontal) && (cur >= sd->minw)) ||
-	    ((!sd->horizontal) && (cur >= sd->minh)))
+	if (cur >= sd->minw)
 	  {
 	     sd->req = cur;
 	     evas_object_smart_callback_call(sd->obj, "size_request", NULL);
 	  }
 	else
 	  {
-	     if (sd->horizontal)
-	       sd->req = sd->minw;
-	     else
-	       sd->req = sd->minh;
+	     sd->req = sd->minw;     
 	  }
      }
    _e_gadcon_layout_smart_gadcons_width_adjust(sd, min, cur);
 
-   if (((sd->horizontal) && (sd->w <= sd->req)) || 
-       ((!sd->horizontal) && (sd->h <= sd->req)))
+   if (sd->w <= sd->req)
      { 
 	_e_gadcon_layout_smart_gadcon_position_shrinked_mode(sd);
 	set_prev_pos = 0;
@@ -3164,11 +3200,9 @@
 
 	_e_gadcon_layout_smart_gadcons_position(sd, &list);
 
-	EINA_LIST_FOREACH(list, l, lc)
-	  {
-	     LC_FREE(lc);
-	  }
-	list = eina_list_free(list);
+	EINA_LIST_FREE(list, lc)
+	  LC_FREE(lc);
+
 	set_prev_pos = 1;
      }
 
@@ -3182,36 +3216,19 @@
 
 	if (set_prev_pos)
 	  {
-	     if (sd->horizontal)
-	       { 
-		  bi->ask.prev_pos = bi->x; 
-		  bi->ask.prev_size = bi->w;
-	       }
-	     else
-	       {
-		  bi->ask.prev_pos = bi->y;
-		  bi->ask.prev_size = bi->h;
-	       }
+	    bi->ask.prev_pos = bi->x; 
+	    bi->ask.prev_size = bi->w;
 	  }
-	if (sd->horizontal)
-	  {
-	     if ((bi->x == bi->ask.pos) &&
-		 (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION))
-	       bi->gcc->state_info.flags |= E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
-	  }
-	else
-	  {
-	     if ((bi->y == bi->ask.pos) &&
-		 (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION))
-	       bi->gcc->state_info.flags |= E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
-	  }
 
+	if ((bi->x == bi->ask.pos) &&
+	    (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION))
+	  bi->gcc->state_info.flags |= E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
+
 	if ((bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION) &&
 	    (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE))
 	  {
-	     if (((sd->horizontal) && (bi->x != bi->ask.pos)) ||
-	         ((!sd->horizontal) && (bi->y != bi->ask.pos)))
-	       bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
+	    if (bi->x != bi->ask.pos)
+	      bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
 	  }
 	i++;
      } 
@@ -3222,20 +3239,21 @@
 
 	bi = evas_object_data_get(obj, "e_gadcon_layout_data");
 	if (!bi) continue;
+
+	bi->h = sd->h;
+	xx = sd->x + bi->x;
+	yy = sd->y + ((sd->h - bi->h) / 2);
+
 	if (sd->horizontal)
 	  {
-	     bi->h = sd->h;
-	     xx = sd->x + bi->x;
-	     yy = sd->y + ((sd->h - bi->h) / 2);
+	     evas_object_move(obj, xx, yy);
+	     evas_object_resize(obj, bi->w, bi->h);
 	  }
 	else
 	  {
-	     bi->w = sd->w;
-	     xx = sd->x + ((sd->w - bi->w) / 2);
-	     yy = sd->y + bi->y;
+	     evas_object_move(obj, yy, xx);
+	     evas_object_resize(obj, bi->h, bi->w);
 	  }
-	evas_object_move(obj, xx, yy);
-	evas_object_resize(obj, bi->w, bi->h);
      }
    sd->doing_config = 0;
    if (sd->redo_config)
@@ -3243,28 +3261,17 @@
 	_e_gadcon_layout_smart_reconfigure(sd);
 	sd->redo_config = 0;
      }
-   if (sd->horizontal)
+
+   if ((sd->minw != min) || (sd->minh != mino))
      {
-	if ((sd->minw != min) || (sd->minh != mino))
-	  {
-	     sd->minw = min;
-	     sd->minh = mino;
-	     evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
-	  }
+	sd->minw = min;
+	sd->minh = mino;
+	evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
      }
-   else
-     {
-	if ((sd->minh != min) || (sd->minw != mino))
-	  {
-	     sd->minw = mino;
-	     sd->minh = min;
-	     evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
-	  }
-     }
+
    if (sd->req != cur)
      {
-	if (((sd->horizontal) && (cur >= sd->minw)) ||
-	    ((!sd->horizontal) && (cur >= sd->minh)))
+	  if (cur >= sd->minw)
 	  {
 	     sd->req = cur;
 	     evas_object_smart_callback_call(sd->obj, "size_request", NULL);
@@ -3351,8 +3358,17 @@
 	Evas_Object *item;
 	Evas_Coord dx, dy;
 
-	dx = x - sd->x;
-	dy = y - sd->y;
+	if (sd->horizontal)
+	  {
+	     dx = x - sd->x;
+	     dy = y - sd->y;
+	  }
+	else
+	  {
+	     dx = x - sd->y;
+	     dy = y - sd->x;
+	  }
+	
 	EINA_LIST_FOREACH(sd->items, l, item)
 	  {
 	     Evas_Coord ox, oy;
@@ -3361,8 +3377,17 @@
 	     evas_object_move(item, ox + dx, oy + dy);
 	  }
      }
-   sd->x = x;
-   sd->y = y;
+
+     if (sd->horizontal)
+       {
+	  sd->x = x;
+	  sd->y = y;
+       }
+     else
+       {
+	  sd->x = y;
+	  sd->y = x;
+       }
 }
 
 static void
@@ -3374,8 +3399,18 @@
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
    if ((w == sd->w) && (h == sd->h)) return;
-   sd->w = w;
-   sd->h = h;
+   if (sd->horizontal)
+     {	
+	sd->w = w;
+	sd->h = h;
+     }
+   else
+     {
+	sd->w = h;
+	sd->h = w;
+
+     }
+   
    _e_gadcon_layout_smart_reconfigure(sd);
 }
 
@@ -3453,57 +3488,28 @@
 
 	if ((bi->aspect.w > 0) && (bi->aspect.h > 0))
 	  {
-	     if (sd->horizontal)
+	     bi->ask.size2 =
+	       (((sd->h - bi->aspect_pad.h) * bi->aspect.w) / bi->aspect.h) + bi->aspect_pad.w;
+	     
+	     if (bi->ask.size2 > bi->min.w)
 	       {
-		  bi->ask.size2 = (((sd->h - bi->aspect_pad.h) * bi->aspect.w) / bi->aspect.h)
-				   + bi->aspect_pad.w;
-		  if (bi->ask.size2 > bi->min.w)
-		    {
-		       *min += bi->ask.size2;
-		       *cur += bi->ask.size2;
-		    }
-		  else
-		    {
-		       *min += bi->min.w;
-		       *cur += bi->min.w;
-		    }
+		  *min += bi->ask.size2;
+		  *cur += bi->ask.size2;
 	       }
 	     else
 	       {
-		  bi->ask.size2 = (((sd->w - bi->aspect_pad.w) * bi->aspect.h) / bi->aspect.w)
-				   + bi->aspect_pad.h;
-		  if (bi->ask.size2 > bi->min.h)
-		    {
-		       *min += bi->ask.size2;
-		       *cur += bi->ask.size2;
-		    }
-		  else
-		    {
-		       *cur += bi->min.h;
-		       *min += bi->min.h;
-		    }
+		  *min += bi->min.w;
+		  *cur += bi->min.w;
 	       }
 	  }
 	else
 	  {
-	     if (sd->horizontal)
-	       {
-		  *min += bi->min.w;
-		  if (bi->min.h > *mino) *mino = bi->min.h;
-		  if (bi->ask.size < bi->min.w)
-		    *cur += bi->min.w;
-		  else
-		    *cur += bi->ask.size;
-	       }
+	     *min += bi->min.w;
+	     if (bi->min.h > *mino) *mino = bi->min.h;
+	     if (bi->ask.size < bi->min.w)
+	       *cur += bi->min.w;
 	     else
-	       {
-		  *min += bi->min.h;
-		  if (bi->min.w > *mino) *mino = bi->min.w;
-		  if (bi->ask.size < bi->min.h)
-		    *cur += bi->min.h;
-		  else
-		    *cur += bi->ask.size;
-	       }
+	       *cur += bi->ask.size;
 	  }
      }
 }
@@ -3515,100 +3521,52 @@
 
    bi = evas_object_data_get(d1, "e_gadcon_layout_data");
    bi2 = evas_object_data_get(d2, "e_gadcon_layout_data"); 
-   if (bi->sd->horizontal)
-     { 
-	if (bi->ask.size2 > bi->min.w)
-	  {
-	     if (bi2->ask.size2 > bi2->min.w) 
-	       { 
-		  if (bi->ask.size2 < bi2->ask.size2)
-		    return 1;
-		  else
-		    return -1;
-	       }
+
+   if (bi->ask.size2 > bi->min.w)
+     {
+	if (bi2->ask.size2 > bi2->min.w) 
+	  { 
+	     if (bi->ask.size2 < bi2->ask.size2)
+	       return 1;
 	     else
-	       {
-		  if (bi->ask.size2 == bi2->ask.size2)
-		    return -1;
-		  else
-		    { 
-		       if (bi->ask.size2 < bi2->ask.size2)
-			 return 1;
-		       else
-			 return -1;
-		    }
-	       }
+	       return -1;
 	  }
 	else
 	  {
-	     if (bi2->ask.size2 > bi2->min.w)
-	       {
-		  if (bi->ask.size2 == bi2->ask.size2)
-		    return 1;
-		  else
-		    { 
-		       if (bi->ask.size2 < bi2->ask.size2)
-			 return 1;
-		       else
-			 return -1;
-		    }
-	       }
+	     if (bi->ask.size2 == bi2->ask.size2)
+	       return -1;
 	     else
 	       { 
 		  if (bi->ask.size2 < bi2->ask.size2)
 		    return 1;
-		  else if (bi->ask.size2 > bi2->ask.size2)
+		  else
 		    return -1;
 	       }
 	  }
      }
    else
      {
-	if (bi->ask.size2 > bi->min.h)
+	if (bi2->ask.size2 > bi2->min.w)
 	  {
-	     if (bi2->ask.size2 > bi2->min.h) 
+	     if (bi->ask.size2 == bi2->ask.size2)
+	       return 1;
+	     else
 	       { 
 		  if (bi->ask.size2 < bi2->ask.size2)
 		    return 1;
 		  else
 		    return -1;
 	       }
-	     else
-	       {
-		  if (bi->ask.size2 == bi2->ask.size2)
-		    return -1;
-		  else
-		    { 
-		       if (bi->ask.size2 < bi2->ask.size2)
-			 return 1;
-		       else
-			 return -1;
-		    }
-	       }
 	  }
 	else
-	  {
-	     if (bi2->ask.size2 > bi2->min.h)
-	       {
-		  if (bi->ask.size2 == bi2->ask.size2)
-		    return 1;
-		  else
-		    { 
-		       if (bi->ask.size2 < bi2->ask.size2)
-			 return 1;
-		       else
-			 return -1;
-		    }
-	       }
-	     else
-	       { 
-		  if (bi->ask.size2 < bi2->ask.size2)
-		    return 1;
-		  else if (bi->ask.size2 > bi2->ask.size2)
-		    return -1;
-	       }
+	  { 
+	     if (bi->ask.size2 < bi2->ask.size2)
+	       return 1;
+	     else if (bi->ask.size2 > bi2->ask.size2)
+	       return -1;
 	  }
      }
+
    return 0;
 }
 
@@ -3622,33 +3580,17 @@
    int need, limit, reduce_total, reduce;
    int max_size, c;
 
-   if (sd->horizontal)
+   if (sd->w < cur)
      {
-	if (sd->w < cur)
-	  {
-	     if (sd->w < min)
-	       max_size = min;
-	     else
-	       max_size = cur;
-
-	     need = max_size - sd->w;
-	  }
+	if (sd->w < min)
+	  max_size = min;
 	else
-	  return;
+	  max_size = cur;
+
+	need = max_size - sd->w;
      }
    else
-     {
-	if (sd->h < cur)
-	  {
-	     if (sd->h < min)
-	       max_size = min;
-	     else
-	       max_size = cur; 
-	     need = max_size - sd->h;
-	  }
-	else
-	  return;
-     } 
+     return;
 
    sd->items = eina_list_sort(sd->items, eina_list_count(sd->items), 
 			      _e_gadcon_layout_smart_width_smart_sort_reverse_cb);
@@ -3765,8 +3707,8 @@
 
    bi = evas_object_data_get(d1, "e_gadcon_layout_data");
    bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
-   if (bi->sd->horizontal) return (bi->x - bi2->x);
-   return (bi->y - bi2->y);
+
+   return (bi->x - bi2->x);
 }
 
 static int
@@ -3819,10 +3761,7 @@
 
    gcc->state_info.prev_pos = gcc->config.pos;
    gcc->state_info.prev_size = gcc->config.size;
-   if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container)) 
-     gcc->config.pos = bi->x;
-   else
-     gcc->config.pos = bi->y;
+   gcc->config.pos = bi->x;
 }
 
 static void
@@ -3900,45 +3839,26 @@
 		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MIN_END_DEC) ||
 	         (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC))
 	  { 
-	     if (sd->horizontal)
-	       { 
-		  if (bi->w < bi->min.w) 
-		    bi->gcc->config.size = bi->w = bi->min.w;
-		  else
-		    bi->gcc->config.size = bi->w;
-	       }
+	     if (bi->w < bi->min.w) 
+	       bi->gcc->config.size = bi->w = bi->min.w;
 	     else
-	       {
-		  if (bi->h < bi->min.h)
-		    bi->gcc->config.size = bi->h = bi->min.h;
-		  else
-		    bi->gcc->config.size = bi->h;
-	       }
+	       bi->gcc->config.size = bi->w;
+
 	     bi->gcc->config.pos = bi->gcc->state_info.prev_pos;
-	  } 
+	  }	
      } 
 
    EINA_LIST_FOREACH(sd->items, l, item)
      { 
 	bi = evas_object_data_get(item, "e_gadcon_layout_data");
-	if (sd->horizontal) 
-	  { 
-	     bi->x = pos; 
-	     bi->gcc->config.size = bi->w = bi->ask.size2; 
-	     pos = bi->x + bi->w;
-	  }
-	else
-	  {
-	     bi->y = pos; 
-	     bi->gcc->config.size = bi->h = bi->ask.size2; 
-	     pos = bi->y + bi->h;
-	  }
+
+	bi->x = pos;
+	bi->w = bi->ask.size2; 
+	bi->gcc->config.size = bi->w;
+	pos = bi->x + bi->w;
      }
 }
 
-/* 
- * The function returns a list of E_Gadcon_Layout_Item_Container
- */
 static void
 _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd)
 {
@@ -3946,118 +3866,69 @@
    Eina_List *l;
    Evas_Object *item;
 
+#if 1
    EINA_LIST_FOREACH(sd->items, l, item)
      {
 	bi = evas_object_data_get(item, "e_gadcon_layout_data");
 	if (!bi) continue;
-
-	if (sd->horizontal)
-	  {
-	     bi->x = bi->ask.pos;
-	     bi->w = bi->ask.size2;
-	  }
-	else
-	  {
-	     bi->y = bi->ask.pos;
-	     bi->h = bi->ask.size2;
-	  }
+	
+	bi->x = bi->ask.pos;
+	bi->w = bi->ask.size2;
      }
-
-#if 0
+#else
+   int pos;
    EINA_LIST_FOREACH(sd->items, l, item)
      {
 	bi = evas_object_data_get(item, "e_gadcon_layout_data");
 	if (!bi) continue;
-	if (sd->horizontal)
-	  {
-	     xx = bi->ask.pos + (bi->ask.size / 2);
-	     if (xx < (bi->ask.res / 3))
-	       { 
-                  /* hooked to start */
-		  bi->x = bi->ask.pos;
-		  bi->w = bi->ask.size2;
-		  bi->hookp = 0;
-	       }
-	     else if (xx > ((2 * bi->ask.res) / 3))
-	       { 
-                  /* hooked to end */
-		  bi->x = (bi->ask.pos - bi->ask.res) + sd->w;
-		  bi->w = bi->ask.size2;
-		  bi->hookp = bi->ask.res;
-	       }
-	     else
-	       { 
-                  /* hooked to middle */
-		  if ((bi->ask.pos <= (bi->ask.res / 2)) &&
-		      ((bi->ask.pos + bi->ask.size2) > (bi->ask.res / 2)))
-		    { 
-                       /* straddles middle */
-		       if (bi->ask.res > 2)
-			 bi->x = (sd->w / 2) + 
-			 (((bi->ask.pos + (bi->ask.size2 / 2) - 
-			    (bi->ask.res / 2)) * 
-			   (bi->ask.res / 2)) /
-			  (bi->ask.res / 2)) - (bi->ask.size2 / 2);
-		       else
-			 bi->x = sd->w / 2;
-		       bi->w = bi->ask.size2;
-		    }
-		  else
-		    { 
-                       /* either side of middle */
-		       bi->x = (bi->ask.pos - (bi->ask.res / 2)) + (sd->w / 2);
-		       bi->w = bi->ask.size2;
-		    }
-		  bi->hookp = bi->ask.res / 2;
-	       }
+
+	pos = bi->ask.pos + (bi->ask.size / 2);
+	if (pos < (bi->ask.res / 3))
+	  { 
+	     /* hooked to start */
+	     bi->x = bi->ask.pos;
+	     bi->w = bi->ask.size2;
+	     bi->hookp = 0;
 	  }
+	else if (pos > ((2 * bi->ask.res) / 3))
+	  { 
+	     /* hooked to end */
+	     bi->x = (bi->ask.pos - bi->ask.res) + sd->w;
+	     bi->w = bi->ask.size2;
+	     bi->hookp = bi->ask.res;
+	  }
 	else
-	  {
-	     yy = bi->ask.pos + (bi->ask.size2 / 2);
-	     if (yy < (bi->ask.res / 3))
+	  { 
+	     /* hooked to middle */
+	     if ((bi->ask.pos <= (bi->ask.res / 2)) &&
+		 ((bi->ask.pos + bi->ask.size2) > (bi->ask.res / 2)))
 	       { 
-                  /* hooked to start */
-		  bi->y = bi->ask.pos;
-		  bi->h = bi->ask.size2;
-		  bi->hookp = 0;
+		  /* straddles middle */
+		  if (bi->ask.res > 2)
+		    bi->x = (sd->w / 2) + 
+		      (((bi->ask.pos + (bi->ask.size2 / 2) - 
+			 (bi->ask.res / 2)) * 
+			(bi->ask.res / 2)) /
+		       (bi->ask.res / 2)) - (bi->ask.size2 / 2);
+		  else
+		    bi->x = sd->w / 2;
+		  bi->w = bi->ask.size2;
 	       }
-	     else if (yy > ((2 * bi->ask.res) / 3))
-	       { 
-                  /* hooked to end */
-		  bi->y = (bi->ask.pos - bi->ask.res) + sd->h;
-		  bi->h = bi->ask.size2;
-		  bi->hookp = bi->ask.res;
-	       }
 	     else
 	       { 
-                  /* hooked to middle */
-		  if ((bi->ask.pos <= (bi->ask.res / 2)) &&
-		      ((bi->ask.pos + bi->ask.size2) > (bi->ask.res / 2)))
-		    { 
-                       /* straddles middle */
-		       if (bi->ask.res > 2)
-			 bi->y = (sd->h / 2) + 
-			 (((bi->ask.pos + (bi->ask.size2 / 2) - 
-			    (bi->ask.res / 2)) * 
-			   (bi->ask.res / 2)) /
-			  (bi->ask.res / 2)) - (bi->ask.size2 / 2);
-		       else
-			 bi->y = sd->h / 2;
-		       bi->h = bi->ask.size2;
-		    }
-		  else
-		    { 
-                       /* either side of middle */
-		       bi->y = (bi->ask.pos - (bi->ask.res / 2)) + (sd->h / 2);
-		       bi->h = bi->ask.size2;
-		    }
-		  bi->hookp = bi->ask.res / 2;
+		  /* either side of middle */
+		  bi->x = (bi->ask.pos - (bi->ask.res / 2)) + (sd->w / 2);
+		  bi->w = bi->ask.size2;
 	       }
+	     bi->hookp = bi->ask.res / 2;
 	  }
      }
 #endif
 }
 
+/* 
+ * The function returns a list of E_Gadcon_Layout_Item_Container
+ */
 static Eina_List *
 _e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd)
 {
@@ -4066,22 +3937,17 @@
    E_Layout_Item_Container *lc;
    E_Gadcon_Layout_Item *bi;
 
+   
    EINA_LIST_FOREACH(sd->items, l, item)
      {
 	bi = evas_object_data_get(item, "e_gadcon_layout_data");
 	lc = E_NEW(E_Layout_Item_Container, 1);
 	lc->state_info.min_seq = lc->state_info.max_seq = bi->gcc->state_info.seq;
 	lc->sd = sd;
-	if (sd->horizontal)
-	  {
-	     lc->pos = bi->x;
-	     lc->size = bi->w;
-	  }
-	else
-	  {
-	     lc->pos = bi->y;
-	     lc->size = bi->h;
-	  }
+
+	lc->pos = bi->x;
+	lc->size = bi->w;
+
 	lc->prev_pos = bi->ask.prev_pos;
 	lc->prev_size = bi->ask.prev_size;
 
@@ -4109,12 +3975,8 @@
 
    EINA_LIST_FOREACH(*list, l, lc_moving)
      {
-	if ((lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_POS_INC) ||
-	    (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC) ||
-	    (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MIN_END_INC) ||
-	    (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MIN_END_DEC) ||
-	    (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MAX_END_INC) ||
-	    (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MAX_END_DEC))
+	if ((lc_moving->state != E_LAYOUT_ITEM_CONTAINER_STATE_NONE) &&
+	    (lc_moving->state != E_LAYOUT_ITEM_CONTAINER_STATE_POS_LOCKED))
 	  {
 	     lc_back = E_NEW(E_Layout_Item_Container, 1);
 	     lc_back->pos = lc_moving->pos;
@@ -4128,6 +3990,7 @@
 	       lc_back->items = eina_list_append(lc_back->items, lc);
 	     lc_back->state = lc_moving->state;
 	     bi_moving = eina_list_data_get(lc_back->items);
+	     
 	     break;
 	  }
 	lc_moving = NULL;
@@ -4207,33 +4070,15 @@
 			 {
 			    if (bi->ask.pos <= pos)
 			      {
-				 if (sd->horizontal) 
-				   { 
-				      bi->x = pos;
-				      pos = bi->x + bi->w;
-				   }
-				 else
-				   { 
-				      bi->y = pos;
-				      pos = bi->y + bi->h;
-				   }
+				bi->x = pos;
+				pos = (bi->x) + (bi->w);
 			      }
-			    else if (((sd->horizontal) && (bi->ask.pos < bi->x)) ||
-				     ((!sd->horizontal) && (bi->ask.pos < bi->y)))
+			    else if (bi->ask.pos < bi->x)
 			      {
-				 if (sd->horizontal)
-				   {
-				      bi->x = bi->ask.pos;
-				      pos = bi->x + bi->w;
-				   }
-				 else
-				   {
-				      bi->y = bi->ask.pos;
-				      pos = bi->y + bi->h;
-				   }
+				bi->x = bi->ask.pos;
+				pos = (bi->x) + (bi->w);				
 			      }
-			    else if (((sd->horizontal) && (bi->ask.pos == bi->x)) ||
-				     ((!sd->horizontal) && (bi->ask.pos == bi->y)))
+			    else if (bi->ask.pos == bi->x)
 			      {
 				 stop = 1;
 				 break;
@@ -4244,7 +4089,7 @@
 	  }
      }
    else if (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_POS_INC)
-     { 
+     {
 	_e_gadcon_layout_smart_restore_gadcons_position_before_move(sd, &lc_moving, lc_back, list); 
 	EINA_LIST_FOREACH(*list, l, lc)
 	   if (lc == lc_moving) break;
@@ -4302,7 +4147,11 @@
 	     if ((l) && eina_list_prev(l))
 	       {
 		  stop = 0;
-		  EINA_LIST_REVERSE_FOREACH(eina_list_prev(l), l2, lc)
+		  /* FIXME: patch from <victor.scorpion@...>
+		     just a workaround. something above is probably
+		     wrong (hannes) */
+		  /* EINA_LIST_REVERSE_FOREACH(eina_list_prev(l), l2, lc) */
+		  EINA_LIST_REVERSE_FOREACH_SAFE(eina_list_prev(l), l2, l2, lc)
 		    {
 		       if (stop) break;
 		       if ((lc->pos + lc->size) == prev_pos) break;
@@ -4310,36 +4159,17 @@
 
 		       EINA_LIST_REVERSE_FOREACH(eina_list_last(lc->items), l3, bi)
 			 {
-			    if (((sd->horizontal) && ((bi->ask.pos + bi->w) >= pos)) ||
-			        ((!sd->horizontal) && ((bi->ask.pos + bi->h) >= pos)))
+			    if ((bi->ask.pos + bi->w) >= pos)
 			      {
-				 if (sd->horizontal)
-				   {
-				      bi->x = pos - bi->w;
-				      pos = bi->x;
-				   }
-				 else
-				   {
-				      bi->y = pos - bi->h;
-				      pos = bi->y;
-				   }
+				 bi->x = pos - bi->w;
+				 pos = bi->x;
 			      }
-			    else if (((sd->horizontal) && (bi->ask.pos > bi->x)) ||
-				     ((!sd->horizontal) && (bi->ask.pos > bi->w)))
+			    else if (bi->ask.pos > bi->x)
 			      {
-				 if (sd->horizontal)
-				   {
-				      bi->x = bi->ask.pos;
-				      pos = bi->x;
-				   }
-				 else
-				   {
-				      bi->y = bi->ask.pos;
-				      pos = bi->y;
-				   }
+				 bi->x = bi->ask.pos;
+				 pos = bi->x;
 			      }
-			    else if (((sd->horizontal) && (bi->ask.pos == bi->x)) ||
-				     ((!sd->horizontal) && (bi->ask.pos == bi->y)))
+			    else if (bi->ask.pos == bi->x)
 			      {
 				 stop = 1;
 				 break;
@@ -4375,10 +4205,7 @@
 		  lc_moving->pos -= new_pos;
 
 		  bi = eina_list_data_get(lc_moving->items);
-		  if (sd->horizontal)
-		    bi->w = lc_moving->size;
-		  else
-		    bi->h = lc_moving->size;
+		  bi->w = lc_moving->size;
 		  _e_gadcon_layout_smart_position_items_inside_container(sd, lc_moving);
 
 		  new_pos = 0;
@@ -4410,10 +4237,8 @@
 		  lc_moving->pos = 0;
 
 		  bi = eina_list_data_get(lc_moving->items);
-		  if (sd->horizontal)
-		    bi->w = lc_moving->size;
-		  else
-		    bi->h = lc_moving->size;
+		  bi->w = lc_moving->size;
+
 		  _e_gadcon_layout_smart_position_items_inside_container(sd, lc_moving);
 	       }
 	  }
@@ -4449,29 +4274,15 @@
 		  new_pos += lc->size;
 	       }
 
-	     if (sd->horizontal)
+	     if (new_pos > sd->w)
 	       {
-		  if (new_pos > sd->w)
-		    {
-		       lc_moving->size -= (new_pos - sd->w);
-		       bi = eina_list_data_get(lc_moving->items);
-		       bi->w = lc_moving->size;
+		  lc_moving->size -= (new_pos - sd->w);
+		  bi = eina_list_data_get(lc_moving->items);
+		  bi->w = lc_moving->size;
 
-		       new_pos = lc_moving->pos + lc_moving->size;
-		    }
+		  new_pos = lc_moving->pos + lc_moving->size;
 	       }
-	     else
-	       {
-		  if (new_pos > sd->h)
-		    {
-		       lc_moving->size -= (new_pos - sd->h);
-		       bi = eina_list_data_get(lc_moving->items);
-		       bi->h = lc_moving->size;
 
-		       new_pos = lc_moving->pos + lc_moving->size;
-		    }
-	       }
-
 	     if (ok)
 	       {
 		  EINA_LIST_FOREACH(eina_list_next(l), l2, lc)
@@ -4489,24 +4300,12 @@
 	  }
 	else if ((l) && (!eina_list_next(l)))
 	  {
-	     if (sd->horizontal) 
+	     if ((lc_moving->pos + lc_moving->size) >= sd->w)
 	       {
-		  if ((lc_moving->pos + lc_moving->size) >= sd->w)
-		    {
-		       lc_moving->size = lc_moving->prev_size;
-		       bi = eina_list_data_get(lc_moving->items);
-		       bi->w = lc_moving->size;
-		    }
+		  lc_moving->size = lc_moving->prev_size;
+		  bi = eina_list_data_get(lc_moving->items);
+		  bi->w = lc_moving->size;
 	       }
-	     else
-	       {
-		  if ((lc_moving->pos + lc_moving->size) > sd->h)
-		    {
-		       lc_moving->size = lc_moving->prev_size;
-		       bi = eina_list_data_get(lc_moving->items);
-		       bi->h = lc_moving->size;
-		    }
-	       }
 	  }
      }
    else if (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MAX_END_DEC)
@@ -4516,16 +4315,8 @@
 	LC_FREE(lc_back);
      }
 
-   if (sd->horizontal) 
-     { 
-	bi_moving->gcc->config.pos = bi_moving->ask.pos = bi_moving->x; 
-	bi_moving->gcc->config.size = bi_moving->w;
-     }
-   else
-     {
-	bi_moving->gcc->config.pos = bi_moving->ask.pos = bi_moving->y;
-	bi_moving->gcc->config.size = bi_moving->h;
-     }
+   bi_moving->gcc->config.pos = bi_moving->ask.pos = bi_moving->x; 
+   bi_moving->gcc->config.size = bi_moving->w;
 }
 
 static void
@@ -4569,24 +4360,12 @@
 	     continue;
 	  }
 
-	if (sd->horizontal)
+	if (((lc->pos + lc->size) > sd->w) && (lc->size <= sd->w))
 	  {
-	     if (((lc->pos + lc->size) > sd->w) && (lc->size <= sd->w))
-	       {
-		  ok = 0;
-		  lc->pos = sd->w - lc->size;
-		  _e_gadcon_layout_smart_position_items_inside_container(sd, lc);
-	       }
+	     ok = 0;
+	     lc->pos = sd->w - lc->size;
+	     _e_gadcon_layout_smart_position_items_inside_container(sd, lc);
 	  }
-	else
-	  {
-	     if (((lc->pos + lc->size) > sd->h) && (lc->size <= sd->h))
-	       {
-		  ok = 0;
-		  lc->pos = sd->h - lc->size;
-		  _e_gadcon_layout_smart_position_items_inside_container(sd, lc);
-	       }
-	  }
      }
    if (!ok)
      _e_gadcon_layout_smart_gadcons_position_static(sd, list);
@@ -4634,18 +4413,11 @@
 	     bi = eina_list_data_get(lc->items);
 	     bi2 = eina_list_data_get(lc2->items);
 
-	     if (sd->horizontal)
-	       {
-		  bi->gcc->config.pos = bi->ask.pos = bi->x = (bi2->x + bi2->w) - bi->w;
-		  bi->gcc->config.size = bi->w;
-		  bi2->x = bi->x - bi2->w;
-	       }
-	     else
-	       {
-		  bi->gcc->config.pos = bi->ask.pos = bi->y = (bi2->y + bi2->h) - bi->h;
-		  bi->gcc->config.size = bi->h;
-		  bi2->y = bi->y - bi2->h;
-	       }
+	     bi->x = ((bi2->x) + (bi2->w)) - (bi->w);
+	     bi->gcc->config.pos = bi->ask.pos = bi->x;
+	     bi->gcc->config.size = bi->w;
+	     bi2->x = (bi->x) - (bi2->w);
+
 	     bi2->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
 
 	     t = bi->gcc->state_info.seq;
@@ -4679,8 +4451,7 @@
 		    {
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION)
 			 {
-			    if (sd->horizontal) shift = bi->ask.pos - bi->x;
-			    else shift = bi->ask.pos - bi->y;
+			    shift = bi->ask.pos - bi->x;
 			 }
 
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE)
@@ -4691,14 +4462,10 @@
 		    {
      		       EINA_LIST_FOREACH(lc->items, l, bi)
      			 {
-     			    if (sd->horizontal) bi->x += shift;
-     			    else bi->y += shift;
+			    bi->x += shift;
 			    
      			    if (l == lc->items)
-     			      {
-     				 if (sd->horizontal) lc->pos = bi->x;
-     				 else lc->pos = bi->y;
-     			      }
+			      lc->pos = bi->x;
      			 }
      		    } 
      	       } 
@@ -4732,8 +4499,7 @@
 		    {
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION)
 			 {
-			    if (sd->horizontal) shift = bi->ask.pos - bi->x;
-			    else shift = bi->ask.pos - bi->y;
+			    shift = bi->ask.pos - bi->x;
 			 }
 
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE)
@@ -4744,14 +4510,10 @@
 		    {
   		       EINA_LIST_FOREACH(lc->items, l, bi)
   			 {
-  			    if (sd->horizontal) bi->x += shift;
-  			    else bi->y += shift;
-			    
-  			    if (l == lc->items)
-  			      {
-  				 if (sd->horizontal) lc->pos = bi->x;
-  				 else lc->pos = bi->y;
-  			      }
+			    bi->x += shift;
+
+     			    if (l == lc->items)
+			      lc->pos = bi->x;
      			 }
      		    }
 	       }
@@ -4763,18 +4525,9 @@
 	     bi = eina_list_data_get(eina_list_last(lc->items));
 	     bi2 = eina_list_data_get(lc2->items);
 
-	     if (sd->horizontal)
-	       {
-		  bi2->gcc->config.pos = bi2->ask.pos = bi2->x = bi->x;
-		  bi2->gcc->config.size = bi2->w;
-		  bi->x = bi2->x + bi2->w;
-	       }
-	     else
-	       {
-		  bi2->gcc->config.pos = bi2->ask.pos = bi2->y = bi->y;
-		  bi2->gcc->config.size = bi2->h;
-		  bi->y = bi2->y + bi2->h;
-	       }
+	     bi2->gcc->config.pos = bi2->ask.pos = (bi2->x) = (bi->x);
+	     bi2->gcc->config.size = bi2->w;
+	     bi->x = (bi2->x) + (bi2->w);
 
 	     t = bi->gcc->state_info.seq;
 	     bi->gcc->state_info.seq = bi2->gcc->state_info.seq;
@@ -4877,10 +4630,7 @@
 		       if ((bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION) &&
 			   (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE))
 			 {
-			    if (sd->horizontal)
-			      shift = bi->ask.pos - bi->x;
-			    else
-			      shift = bi->ask.pos - bi->y;
+			    shift = bi->ask.pos - bi->x;
 			    break;
 			 }
 		    }
@@ -4889,18 +4639,10 @@
 		    {
 		       EINA_LIST_FOREACH(lc->items, l, bi)
      			 {
-     			    if (sd->horizontal)
-     			      bi->x += shift;
-     			    else
-     			      bi->y += shift;
+			    bi->x += shift;
 			    
      			    if (l == lc->items)
-     			      {
-     				 if (sd->horizontal)
-     				   lc->pos = bi->x;
-     				 else
-     				   lc->pos = bi->y;
-     			      }
+			      lc->pos = bi->x;
      			 }
 		    }
 	       } 
@@ -4958,26 +4700,18 @@
    if (!lc->items) return;
 
    bi = eina_list_data_get(lc->items);
-   if (sd->horizontal)
-     shift = lc->pos - bi->x;
-   else
-     shift = lc->pos - bi->y;
+   shift = lc->pos - bi->x;
+   
    if (!shift) return;
 
    EINA_LIST_FOREACH(lc->items, l, bi)
      {
-	if (sd->horizontal)
-	  bi->x += shift;
-	else
-	  bi->y += shift;
-
+	bi->x += shift;
+	
 	if ((bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_DEC) ||
 	    (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_INC))
 	  {
-	     if (sd->horizontal)
-	       bi->gcc->config.pos = bi->ask.pos = bi->x;
-	     else
-	       bi->gcc->config.pos = bi->ask.pos = bi->y;
+	     bi->gcc->config.pos = bi->ask.pos = bi->x;
 	  }
      }
 } 
@@ -5001,34 +4735,18 @@
 	if (l == nl)
 	  {
 	     min_seq = max_seq = bi->gcc->state_info.seq;
-	     if (sd->horizontal)
-	       {
-		  start = bi->x;
-		  size = bi->w;
-		  next = bi->x + bi->w;
-	       }
-	     else
-	       {
-		  start = bi->y;
-		  size = bi->h;
-		  next = bi->y + bi->h;
-	       }
+	     start = bi->x;
+	     size = bi->w;
+	     next = bi->x + bi->w;
+
 	     continue;
 	  }
 
 	max_seq = bi->gcc->state_info.seq;
-	if (sd->horizontal)
-	  {
-	     bi->x = next;
-	     size += bi->w;
-	     next = bi->x + bi->w;
-	  }
-	else
-	  {
-	     bi->y = next;
-	     size += bi->h;
-	     next = bi->y + bi->h;
-	  }
+
+	bi->x = next;
+	size += bi->w;
+	next = bi->x + bi->w;
      }
 
    lc->items = eina_list_free(lc->items);
@@ -5058,10 +4776,8 @@
      {
 	(*lc_moving)->size = (*lc_moving)->prev_size;
 	bi = eina_list_data_get((*lc_moving)->items);
-	if (sd->horizontal)
-	  bi->w = (*lc_moving)->prev_size;
-	else
-	  bi->h = (*lc_moving)->prev_size;
+
+	bi->w = (*lc_moving)->prev_size;
      }
    _e_gadcon_layout_smart_position_items_inside_container(sd, (*lc_moving));
    (*lc_moving)->state = E_LAYOUT_ITEM_CONTAINER_STATE_POS_LOCKED;
@@ -5077,12 +4793,7 @@
 	if (eina_list_count(lc->items) == 1)
 	  {
 	     bi = eina_list_data_get(lc->items);
-	     if ((bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_INC) || 
-		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_DEC) || 
-		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MIN_END_INC) || 
-		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MIN_END_DEC) || 
-		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC) || 
-		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MAX_END_DEC))
+	     if (bi->gcc->state_info.state != E_LAYOUT_ITEM_STATE_NONE)
 	       {
 		  LC_FREE(lc);
 		  l->data = *lc_moving = lc_back;
@@ -5092,10 +4803,7 @@
 		      ((*lc_moving)->state != E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC))
 		    {
 		       bi = eina_list_data_get((*lc_moving)->items);
-		       if (sd->horizontal)
-			 bi->w = (*lc_moving)->size;
-		       else
-			 bi->h = (*lc_moving)->size;
+		       bi->w = (*lc_moving)->size;
 		    }
 	       }
 	  }
@@ -5103,12 +4811,7 @@
 	  {
 	     EINA_LIST_FOREACH(lc->items, l2, bi)
 	       {
-		  if ((bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_INC) || 
-		      (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_DEC) || 
-		      (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MIN_END_INC) || 
-		      (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MIN_END_DEC) || 
-		      (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC) || 
-		      (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MAX_END_DEC))
+		  if (bi->gcc->state_info.state != E_LAYOUT_ITEM_STATE_NONE)
 		    {
 		       ok = 1;
 		       if (l2 != lc->items)
@@ -5123,10 +4826,7 @@
 				 if (l3 == lc->items)
 				   {
 				      lc2->state_info.min_seq = bi2->gcc->state_info.seq;
-				      if (sd->horizontal)
-					lc2->pos = lc2->prev_pos = bi2->x;
-				      else
-					lc2->pos = lc2->prev_pos = bi2->y;
+				      lc2->pos = lc2->prev_pos = bi2->x;
 				   }
 				 lc2->state_info.max_seq = bi2->gcc->state_info.seq;
 				 E_LAYOUT_ITEM_CONTAINER_SIZE_CHANGE_BY(lc2, bi2, 1);
@@ -5144,10 +4844,7 @@
 				 if (l3 == eina_list_next(l2))
 				   {
 				      lc3->state_info.min_seq = bi2->gcc->state_info.seq;
-				      if (sd->horizontal)
-					lc3->pos = lc3->prev_pos = bi2->x;
-				      else
-					lc3->pos = lc3->prev_pos = bi2->y;
+				      lc3->pos = lc3->prev_pos = bi2->x;
 				   }
 				 lc3->state_info.max_seq = bi2->gcc->state_info.seq;
 				 E_LAYOUT_ITEM_CONTAINER_SIZE_CHANGE_BY(lc3, bi2, 1);
@@ -5160,10 +4857,7 @@
 			   ((*lc_moving)->state != E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC)) 
 			 { 
 			    bi = eina_list_data_get((*lc_moving)->items); 
-			    if (sd->horizontal) 
-			      bi->w = (*lc_moving)->size; 
-			    else 
-			      bi->h = (*lc_moving)->size; 
+			    bi->w = (*lc_moving)->size; 
 			 }
 		       break;
 		    }

Log:
  gadcon: get right mouse position for efm gadcon..
  
Author:       jeffdameth
Date:         2009-09-16 22:41:23 -0700 (Wed, 16 Sep 2009)
New Revision: 42540

Modified:
  trunk/e/src/bin/e_gadcon.c 

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2009-09-17 05:18:28 UTC (rev 42539)
+++ trunk/e/src/bin/e_gadcon.c	2009-09-17 05:41:23 UTC (rev 42540)
@@ -1968,7 +1968,10 @@
    evas_object_raise(gcc->o_event);
    evas_object_stack_below(gcc->o_control, gcc->o_event);
    gcc->moving = 1;
-   ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &gcc->dx, &gcc->dy);
+   if (gcc->gadcon->toolbar)
+     evas_pointer_canvas_xy_get(gcc->gadcon->evas, &gcc->dx, &gcc->dy);
+   else
+     ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &gcc->dx, &gcc->dy);
    e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gcx, &gcy, NULL, NULL);
    evas_object_geometry_get(gcc->gadcon->o_container, &gx, &gy, NULL, NULL);
    gcc->dx -= (gcx + gx);
@@ -2001,7 +2004,7 @@
    Evas_Coord x, y, w, h;
    int cx, cy;
    int gx, gy, gw, gh;
-   int gcx = 0, gcy = 0, gcw, gch;
+   int gcx = 0, gcy = 0;
 
 
    
@@ -2010,8 +2013,14 @@
       can reparent another window so we get no position here */
    /* maybe we should better grab mouse while move resize is active...*/
    //evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
-   ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &cx, &cy);
-   e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gcx, &gcy, &gcw, &gch);
+   if (gcc->gadcon->toolbar)
+     evas_pointer_canvas_xy_get(gcc->gadcon->evas, &gcc->dx, &gcc->dy);
+   else
+     {
+	ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &cx, &cy);
+	e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gcx, &gcy, NULL, NULL);
+     }
+   
    evas_object_geometry_get(gcc->gadcon->o_container, &gx, &gy, &gw, &gh);
    
    cx -= (gx + gcx);

Log:
  gadcon: gadcon clients move now _with_ the mouse in shrinked mode
  
Author:       jeffdameth
Date:         2009-09-17 02:03:13 -0700 (Thu, 17 Sep 2009)
New Revision: 42543

Modified:
  trunk/e/src/bin/e_gadcon.c 

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2009-09-17 06:19:01 UTC (rev 42542)
+++ trunk/e/src/bin/e_gadcon.c	2009-09-17 09:03:13 UTC (rev 42543)
@@ -3251,7 +3251,7 @@
 
 	bi->h = sd->h;
 	xx = sd->x + bi->x;
-	yy = sd->y + ((sd->h - bi->h) / 2);
+	yy = sd->y; // + ((sd->h - bi->h) / 2);
 
 	if (sd->horizontal)
 	  {
@@ -3791,10 +3791,10 @@
 	  { 
 	     if (bi->gcc->state_info.resist <= E_LAYOUT_ITEM_DRAG_RESIST_LEVEL) 
 	       { 
-		  bi->gcc->state_info.resist++; 
-		  bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos;
+	     	  bi->gcc->state_info.resist++; 
+	     	  bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos;
 	       } 
-	     else 
+	     else
 	       { 
 		  bi->gcc->state_info.resist = 0; 
 		  if (eina_list_next(l)) 
@@ -3804,6 +3804,13 @@
 		       l->data = tp; 
 
 		       bi2 = evas_object_data_get(tp, "e_gadcon_layout_data");
+		       
+		       if (bi2->x + bi2->w/2 > bi->ask.pos + bi->w)
+			 {
+			    bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos;
+			    return;
+			 }
+		       
 		       bi->gcc->config.pos = bi->ask.pos = bi2->ask.pos;
 		       bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
 		       bi->gcc->state_info.want_save = 1;
@@ -3831,8 +3838,16 @@
 
 		       tp = eina_list_data_get(eina_list_prev(l));
 		       l->prev->data = eina_list_data_get(l);
+
 		       l->data = tp; 
 		       bi2 = evas_object_data_get(tp, "e_gadcon_layout_data");
+
+		       if (bi->ask.pos > bi2->x + bi2->w/2)
+			 {
+			    bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos;
+			    return;
+			 }
+
 		       bi->gcc->config.pos = bi->ask.pos = bi2->ask.pos;
 		       bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
 		       bi->gcc->state_info.want_save = 1;
@@ -4536,7 +4551,7 @@
 
 	     bi2->gcc->config.pos = bi2->ask.pos = (bi2->x) = (bi->x);
 	     bi2->gcc->config.size = bi2->w;
-	     bi->x = (bi2->x) + (bi2->w);
+	     bi->x = bi2->x + bi2->w;
 
 	     t = bi->gcc->state_info.seq;
 	     bi->gcc->state_info.seq = bi2->gcc->state_info.seq;

Log:
  e_border: remove maximized state when maximized window is moved or resized
  - merge _e_border_resize_internal with _e_border_move_resize_internal
  
Author:       jeffdameth
Date:         2009-09-19 09:26:16 -0700 (Sat, 19 Sep 2009)
New Revision: 42566

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-19 10:07:41 UTC (rev 42565)
+++ trunk/e/src/bin/e_border.c	2009-09-19 16:26:16 UTC (rev 42566)
@@ -835,6 +835,7 @@
    if ((bd->fullscreen) || 
        (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip))) 
      return;
+
    ecore_x_window_shadow_tree_flush();
    if (bd->new_client)
      {
@@ -857,6 +858,7 @@
      }
 
    if ((x == bd->x) && (y == bd->y)) return;
+   bd->maximized = 0;
    bd->pre_res_change.valid = 0;
    bd->x = x;
    bd->y = y;
@@ -960,111 +962,8 @@
 }
 
 static void
-_e_border_resize_internal(E_Border *bd, int w, int h, Eina_Bool without_border)
+_e_border_move_resize_internal(E_Border *bd, int x, int y, int w, int h, Eina_Bool without_border, Eina_Bool move)
 {
-   E_Event_Border_Resize *ev;
-
-   E_OBJECT_CHECK(bd);
-   E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
-
-   if ((bd->shaded) || (bd->shading) || (bd->fullscreen) ||
-       (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)))
-     return;
-   ecore_x_window_shadow_tree_flush();
-
-   if (bd->new_client)
-     {
-	E_Border_Pending_Move_Resize  *pnd;
-
-	pnd = E_NEW(E_Border_Pending_Move_Resize, 1);
-	if (!pnd) return;
-	pnd->resize = 1;
-	pnd->without_border = without_border;
-	pnd->w = w;
-	pnd->h = h;
-	bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
-	return;
-     }
-
-   if (without_border)
-     {
-	w += (bd->client_inset.l + bd->client_inset.r);
-	h += (bd->client_inset.t + bd->client_inset.b);
-     }
-
-   if ((w == bd->w) && (h == bd->h)) return;
-   bd->pre_res_change.valid = 0;
-   bd->w = w;
-   bd->h = h;
-   bd->client.w = bd->w - (bd->client_inset.l + bd->client_inset.r);
-   bd->client.h = bd->h - (bd->client_inset.t + bd->client_inset.b);
-   bd->changed = 1;
-   bd->changes.size = 1;
-   if ((bd->shaped) || (bd->client.shaped))
-     {
-	bd->need_shape_merge = 1;
-	bd->need_shape_export = 1;
-     }
-   if (bd->client.netwm.sync.request)
-     {
-	bd->client.netwm.sync.wait++;
-	ecore_x_netwm_sync_request_send(bd->client.win, bd->client.netwm.sync.serial++);
-     }
-
-   _e_border_client_move_resize_send(bd);
-   _e_border_resize_update(bd);
-   ev = calloc(1, sizeof(E_Event_Border_Resize));
-   ev->border = bd;
-   e_object_ref(E_OBJECT(bd));
-//   e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
-   ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
-   _e_border_zone_update(bd);
-}
-
-/**
- * Resize window to values that already account border decorations.
- *
- * This call will consider given size already accounts border
- * decorations, so it will not be considered later. This will just
- * work properly with borders that have being evaluated and border
- * decorations are known (border->client_inset).
- *
- * @parm w horizontal window size.
- * @parm h vertical window size.
- *
- * @see e_border_resize_without_border()
- */
-EAPI void
-e_border_resize(E_Border *bd, int w, int h)
-{
-   _e_border_resize_internal(bd, w, h, 0);
-}
-
-/**
- * Resize window to values that do not account border decorations yet.
- *
- * This call will consider given size does not account border
- * decoration, so these values (border->client_inset) will be
- * accounted automatically. This is specially useful when it is a new
- * client and has not be evaluated yet, in this case
- * border->client_inset will be zeroed and no information is known. It
- * will mark pending requests so border will be accounted on
- * evalutation phase.
- *
- * @parm w horizontal window size.
- * @parm h vertical window size.
- *
- * @see e_border_resize()
- */
-EAPI void
-e_border_resize_without_border(E_Border *bd, int w, int h)
-{
-   _e_border_resize_internal(bd, w, h, 1);
-}
-
-static void
-_e_border_move_resize_internal(E_Border *bd, int x, int y, int w, int h, Eina_Bool without_border)
-{
    E_Event_Border_Move		*mev;
    E_Event_Border_Resize	*rev;
 
@@ -1074,6 +973,7 @@
    if ((bd->fullscreen) || 
        (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip))) 
      return;
+
    ecore_x_window_shadow_tree_flush();
 
    if (bd->new_client)
@@ -1085,8 +985,11 @@
 	pnd->move = 1;
 	pnd->resize = 1;
 	pnd->without_border = without_border;
-	pnd->x = x;
-	pnd->y = y;
+	if (move)
+	  {
+	     pnd->x = x;
+	     pnd->y = y;
+	  }
 	pnd->w = w;
 	pnd->h = h;
 	bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
@@ -1101,16 +1004,24 @@
 	h += (bd->client_inset.t + bd->client_inset.b);
      }
 
-   if ((x == bd->x) && (y == bd->y) && (w == bd->w) && (h == bd->h)) return;
+   if ((!move || ((x == bd->x) && (y == bd->y))) &&
+	(w == bd->w) && (h == bd->h))
+     return;
+
+   bd->maximized = 0;
    bd->pre_res_change.valid = 0;
-   bd->x = x;
-   bd->y = y;
+   if (move)
+     {
+	bd->x = x;
+	bd->y = y;
+	bd->changes.pos = 1;
+     }
    bd->w = w;
    bd->h = h;
    bd->client.w = bd->w - (bd->client_inset.l + bd->client_inset.r);
    bd->client.h = bd->h - (bd->client_inset.t + bd->client_inset.b);
    bd->changed = 1;
-   bd->changes.pos = 1;
+
    bd->changes.size = 1;
    if ((bd->shaped) || (bd->client.shaped))
      {
@@ -1125,12 +1036,15 @@
 
    _e_border_client_move_resize_send(bd);
    _e_border_resize_update(bd);
-   mev = calloc(1, sizeof(E_Event_Border_Move));
-   mev->border = bd;
-   e_object_ref(E_OBJECT(bd));
-//   e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event");
-   ecore_event_add(E_EVENT_BORDER_MOVE, mev, _e_border_event_border_move_free, NULL);
-
+   if (move)
+     {
+	mev = calloc(1, sizeof(E_Event_Border_Move));
+	mev->border = bd;
+	e_object_ref(E_OBJECT(bd));
+	//   e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event");
+	ecore_event_add(E_EVENT_BORDER_MOVE, mev, _e_border_event_border_move_free, NULL);
+     }
+   
    rev = calloc(1, sizeof(E_Event_Border_Resize));
    rev->border = bd;
    e_object_ref(E_OBJECT(bd));
@@ -1157,7 +1071,7 @@
 EAPI void
 e_border_move_resize(E_Border *bd, int x, int y, int w, int h)
 {
-   _e_border_move_resize_internal(bd, x, y, w, h, 0);
+   _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
 }
 
 /**
@@ -1178,10 +1092,51 @@
 EAPI void
 e_border_move_resize_without_border(E_Border *bd, int x, int y, int w, int h)
 {
-   _e_border_move_resize_internal(bd, x, y, w, h, 1);
+   _e_border_move_resize_internal(bd, x, y, w, h, 1, 1);
 }
 
+/**
+ * Resize window to values that already account border decorations.
+ *
+ * This call will consider given size already accounts border
+ * decorations, so it will not be considered later. This will just
+ * work properly with borders that have being evaluated and border
+ * decorations are known (border->client_inset).
+ *
+ * @parm w horizontal window size.
+ * @parm h vertical window size.
+ *
+ * @see e_border_resize_without_border()
+ */
 EAPI void
+e_border_resize(E_Border *bd, int w, int h)
+{
+   _e_border_move_resize_internal(bd, 0, 0, w, h, 0, 0);
+}
+
+/**
+ * Resize window to values that do not account border decorations yet.
+ *
+ * This call will consider given size does not account border
+ * decoration, so these values (border->client_inset) will be
+ * accounted automatically. This is specially useful when it is a new
+ * client and has not be evaluated yet, in this case
+ * border->client_inset will be zeroed and no information is known. It
+ * will mark pending requests so border will be accounted on
+ * evalutation phase.
+ *
+ * @parm w horizontal window size.
+ * @parm h vertical window size.
+ *
+ * @see e_border_resize()
+ */
+EAPI void
+e_border_resize_without_border(E_Border *bd, int w, int h)
+{
+   _e_border_move_resize_internal(bd, 0, 0, w, h, 1, 0);
+}
+
+EAPI void
 e_border_layer_set(E_Border *bd, int layer)
 {
    int raise;
@@ -1822,85 +1777,85 @@
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
-   if ((bd->fullscreen) || ((bd->maximized) && (!e_config->allow_manip)) ||
-       (bd->shading)) return;
+   if ((bd->shaded) || (bd->shading) || 
+       ((bd->maximized) && (!e_config->allow_manip)) ||
+       (bd->fullscreen)) return;
    if ((bd->client.border.name) && 
        (!strcmp("borderless", bd->client.border.name))) return;
+
    ecore_x_window_shadow_tree_flush();
-   if (!bd->shaded)
-     {
-	bd->shade.x = bd->x;
-	bd->shade.y = bd->y;
-	bd->shade.dir = dir;
 
-	e_hints_window_shaded_set(bd, 1);
-	e_hints_window_shade_direction_set(bd, dir);
+   bd->shade.x = bd->x;
+   bd->shade.y = bd->y;
+   bd->shade.dir = dir;
 
-	if (e_config->border_shade_animate)
-	  {
-	     bd->shade.start = ecore_loop_time_get();
-	     bd->shading = 1;
-	     bd->changes.shading = 1;
-	     bd->changed = 1;
+   e_hints_window_shaded_set(bd, 1);
+   e_hints_window_shade_direction_set(bd, dir);
 
-	     if (bd->shade.dir == E_DIRECTION_UP ||
-		 bd->shade.dir == E_DIRECTION_LEFT)
-	       ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
-	     else
-	       ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE);
+   if (e_config->border_shade_animate)
+     {
+	bd->shade.start = ecore_loop_time_get();
+	bd->shading = 1;
+	bd->changes.shading = 1;
+	bd->changed = 1;
 
-	     bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
-	     edje_object_signal_emit(bd->bg_object, "e,state,shading", "e");
-	  }
+	if (bd->shade.dir == E_DIRECTION_UP ||
+	    bd->shade.dir == E_DIRECTION_LEFT)
+	  ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
 	else
-	  {
-	     if (bd->shade.dir == E_DIRECTION_UP)
-	       {
-		  bd->h = bd->client_inset.t + bd->client_inset.b;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_DOWN)
-	       {
-		  bd->h = bd->client_inset.t + bd->client_inset.b;
-		  bd->y = bd->y + bd->client.h;
-		  bd->changes.pos = 1;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_LEFT)
-	       {
-		  bd->w = bd->client_inset.l + bd->client_inset.r;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_RIGHT)
-	       {
-		  bd->w = bd->client_inset.l + bd->client_inset.r;
-		  bd->x = bd->x + bd->client.w;
-		  bd->changes.pos = 1;
-	       }
+	  ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE);
 
-	     if ((bd->shaped) || (bd->client.shaped))
-	       {
-		  bd->need_shape_merge = 1;
-		  bd->need_shape_export = 1;
-	       }
-	     bd->changes.size = 1;
-	     bd->shaded = 1;
-	     bd->changes.shaded = 1;
-	     bd->changed = 1;
-	     if ((bd->shaped) || (bd->client.shaped))
-	       {
-		  bd->need_shape_merge = 1;
-		  bd->need_shape_export = 1;
-	       }
-	     edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
-	     e_border_frame_recalc(bd);
-	     ev = calloc(1, sizeof(E_Event_Border_Resize));
-	     ev->border = bd;
-	     /* The resize is added in the animator when animation complete */
-	     /* For non-animated, we add it immediately with the new size */
-	     e_object_ref(E_OBJECT(bd));
-//	     e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
-	     ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
+	bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
+	edje_object_signal_emit(bd->bg_object, "e,state,shading", "e");
+     }
+   else
+     {
+	if (bd->shade.dir == E_DIRECTION_UP)
+	  {
+	     bd->h = bd->client_inset.t + bd->client_inset.b;
 	  }
+	else if (bd->shade.dir == E_DIRECTION_DOWN)
+	  {
+	     bd->h = bd->client_inset.t + bd->client_inset.b;
+	     bd->y = bd->y + bd->client.h;
+	     bd->changes.pos = 1;
+	  }
+	else if (bd->shade.dir == E_DIRECTION_LEFT)
+	  {
+	     bd->w = bd->client_inset.l + bd->client_inset.r;
+	  }
+	else if (bd->shade.dir == E_DIRECTION_RIGHT)
+	  {
+	     bd->w = bd->client_inset.l + bd->client_inset.r;
+	     bd->x = bd->x + bd->client.w;
+	     bd->changes.pos = 1;
+	  }
 
+	if ((bd->shaped) || (bd->client.shaped))
+	  {
+	     bd->need_shape_merge = 1;
+	     bd->need_shape_export = 1;
+	  }
+	bd->changes.size = 1;
+	bd->shaded = 1;
+	bd->changes.shaded = 1;
+	bd->changed = 1;
+	if ((bd->shaped) || (bd->client.shaped))
+	  {
+	     bd->need_shape_merge = 1;
+	     bd->need_shape_export = 1;
+	  }
+	edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
+	e_border_frame_recalc(bd);
+	ev = calloc(1, sizeof(E_Event_Border_Resize));
+	ev->border = bd;
+	/* The resize is added in the animator when animation complete */
+	/* For non-animated, we add it immediately with the new size */
+	e_object_ref(E_OBJECT(bd));
+	//	     e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
+	ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
      }
+
    e_remember_update(bd);
 }
 
@@ -1911,104 +1866,104 @@
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
-   if ((bd->fullscreen) || ((bd->maximized) && (!e_config->allow_manip)) ||
-       (bd->shading)) return;
+   if ((!bd->shaded) || (bd->shading) ||
+       ((bd->maximized) && (!e_config->allow_manip)) ||
+       (bd->fullscreen)) return;
+
    ecore_x_window_shadow_tree_flush();
-   if (bd->shaded)
-     {
-	bd->shade.dir = dir;
 
-	e_hints_window_shaded_set(bd, 0);
-	e_hints_window_shade_direction_set(bd, dir);
+   bd->shade.dir = dir;
 
-	if (bd->shade.dir == E_DIRECTION_UP ||
-	    bd->shade.dir == E_DIRECTION_LEFT)
+   e_hints_window_shaded_set(bd, 0);
+   e_hints_window_shade_direction_set(bd, dir);
+
+   if (bd->shade.dir == E_DIRECTION_UP ||
+       bd->shade.dir == E_DIRECTION_LEFT)
+     {
+	bd->shade.x = bd->x;
+	bd->shade.y = bd->y;
+     }
+   else
+     {
+	bd->shade.x = bd->x - bd->client.w;
+	bd->shade.y = bd->y - bd->client.h;
+     }
+   if (e_config->border_shade_animate)
+     {
+	bd->shade.start = ecore_loop_time_get();
+	bd->shading = 1;
+	bd->changes.shading = 1;
+	bd->changed = 1;
+
+	if (bd->shade.dir == E_DIRECTION_UP)
 	  {
-	     bd->shade.x = bd->x;
-	     bd->shade.y = bd->y;
+	     ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
+	     ecore_x_window_move_resize(bd->client.win, 0,
+					bd->h - (bd->client_inset.t + bd->client_inset.b) -
+					bd->client.h,
+					bd->client.w, bd->client.h);
 	  }
+	else if (bd->shade.dir == E_DIRECTION_LEFT)
+	  {
+	     ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
+	     ecore_x_window_move_resize(bd->client.win,
+					bd->w - (bd->client_inset.l + bd->client_inset.r) -
+					bd->client.h,
+					0, bd->client.w, bd->client.h);
+	  }
 	else
+	  ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE);
+
+	bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
+	edje_object_signal_emit(bd->bg_object, "e,state,unshading", "e");
+     }
+   else
+     {
+	if (bd->shade.dir == E_DIRECTION_UP)
 	  {
-	     bd->shade.x = bd->x - bd->client.w;
-	     bd->shade.y = bd->y - bd->client.h;
+	     bd->h = bd->client_inset.t + bd->client.h + bd->client_inset.b;
 	  }
-	if (e_config->border_shade_animate)
+	else if (bd->shade.dir == E_DIRECTION_DOWN)
 	  {
-	     bd->shade.start = ecore_loop_time_get();
-	     bd->shading = 1;
-	     bd->changes.shading = 1;
-	     bd->changed = 1;
-
-	     if (bd->shade.dir == E_DIRECTION_UP)
-	       {
-		  ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
-		  ecore_x_window_move_resize(bd->client.win, 0,
-					     bd->h - (bd->client_inset.t + bd->client_inset.b) -
-					     bd->client.h,
-					     bd->client.w, bd->client.h);
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_LEFT)
-	       {
-		  ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
-		  ecore_x_window_move_resize(bd->client.win,
-					     bd->w - (bd->client_inset.l + bd->client_inset.r) -
-					     bd->client.h,
-					     0, bd->client.w, bd->client.h);
-	       }
-	     else
-	       ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE);
-
-	     bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
-	     edje_object_signal_emit(bd->bg_object, "e,state,unshading", "e");
+	     bd->h = bd->client_inset.t + bd->client.h + bd->client_inset.b;
+	     bd->y = bd->y - bd->client.h;
+	     bd->changes.pos = 1;
 	  }
-	else
+	else if (bd->shade.dir == E_DIRECTION_LEFT)
 	  {
-	     if (bd->shade.dir == E_DIRECTION_UP)
-	       {
-		  bd->h = bd->client_inset.t + bd->client.h + bd->client_inset.b;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_DOWN)
-	       {
-		  bd->h = bd->client_inset.t + bd->client.h + bd->client_inset.b;
-		  bd->y = bd->y - bd->client.h;
-		  bd->changes.pos = 1;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_LEFT)
-	       {
-		  bd->w = bd->client_inset.l + bd->client.w + bd->client_inset.r;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_RIGHT)
-	       {
-		  bd->w = bd->client_inset.l + bd->client.w + bd->client_inset.r;
-		  bd->x = bd->x - bd->client.w;
-		  bd->changes.pos = 1;
-	       }
-	     if ((bd->shaped) || (bd->client.shaped))
-	       {
-		  bd->need_shape_merge = 1;
-		  bd->need_shape_export = 1;
-	       }
-	     bd->changes.size = 1;
-	     bd->shaded = 0;
-	     bd->changes.shaded = 1;
-	     bd->changed = 1;
-	     if ((bd->shaped) || (bd->client.shaped))
-	       {
-		  bd->need_shape_merge = 1;
-		  bd->need_shape_export = 1;
-	       }
-	     edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
-	     e_border_frame_recalc(bd);
-	     ev = calloc(1, sizeof(E_Event_Border_Resize));
-	     ev->border = bd;
-	     /* The resize is added in the animator when animation complete */
-	     /* For non-animated, we add it immediately with the new size */
-	     e_object_ref(E_OBJECT(bd));
-//	     e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
-	     ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
+	     bd->w = bd->client_inset.l + bd->client.w + bd->client_inset.r;
 	  }
-
+	else if (bd->shade.dir == E_DIRECTION_RIGHT)
+	  {
+	     bd->w = bd->client_inset.l + bd->client.w + bd->client_inset.r;
+	     bd->x = bd->x - bd->client.w;
+	     bd->changes.pos = 1;
+	  }
+	if ((bd->shaped) || (bd->client.shaped))
+	  {
+	     bd->need_shape_merge = 1;
+	     bd->need_shape_export = 1;
+	  }
+	bd->changes.size = 1;
+	bd->shaded = 0;
+	bd->changes.shaded = 1;
+	bd->changed = 1;
+	if ((bd->shaped) || (bd->client.shaped))
+	  {
+	     bd->need_shape_merge = 1;
+	     bd->need_shape_export = 1;
+	  }
+	edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
+	e_border_frame_recalc(bd);
+	ev = calloc(1, sizeof(E_Event_Border_Resize));
+	ev->border = bd;
+	/* The resize is added in the animator when animation complete */
+	/* For non-animated, we add it immediately with the new size */
+	e_object_ref(E_OBJECT(bd));
+	//	     e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
+	ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
      }
+
    e_remember_update(bd);
 }
 
@@ -7376,12 +7331,15 @@
 	  e_border_raise(bd);
      }
    if ((bd->shaded) || (bd->shading) ||
-       (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)) ||
        (bd->fullscreen) || (bd->lock_user_size))
      return 0;
 
+   if (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) &&
+       (!e_config->allow_manip))
+ 
    if (grabbed)
      e_grabinput_get(bd->win, 0, bd->win);
+
    if (bd->client.netwm.sync.request)
      {
 	bd->client.netwm.sync.alarm = ecore_x_sync_alarm_new(bd->client.netwm.sync.counter);
@@ -7433,10 +7391,13 @@
 	if (e_config->border_raise_on_mouse_action)
 	  e_border_raise(bd);
      }
-   if ((((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)) ||
-       (bd->fullscreen) || (bd->lock_user_location))
+   if ((bd->fullscreen) || (bd->lock_user_location))
      return 0;
 
+   if (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) &&
+       (!e_config->allow_manip))
+     return 0;
+
    if (grabbed)
      e_grabinput_get(bd->win, 0, bd->win);
 #if 0

Log:
  fix last commit: do not add pending move when doing only  resize
  
Author:       jeffdameth
Date:         2009-09-19 09:51:37 -0700 (Sat, 19 Sep 2009)
New Revision: 42567

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-19 16:26:16 UTC (rev 42566)
+++ trunk/e/src/bin/e_border.c	2009-09-19 16:51:37 UTC (rev 42567)
@@ -982,11 +982,11 @@
 
 	pnd = E_NEW(E_Border_Pending_Move_Resize, 1);
 	if (!pnd) return;
-	pnd->move = 1;
 	pnd->resize = 1;
 	pnd->without_border = without_border;
 	if (move)
 	  {
+	     pnd->move = 1;
 	     pnd->x = x;
 	     pnd->y = y;
 	  }
@@ -1012,17 +1012,17 @@
    bd->pre_res_change.valid = 0;
    if (move)
      {
+	bd->changes.pos = 1;
 	bd->x = x;
 	bd->y = y;
-	bd->changes.pos = 1;
      }
    bd->w = w;
    bd->h = h;
    bd->client.w = bd->w - (bd->client_inset.l + bd->client_inset.r);
    bd->client.h = bd->h - (bd->client_inset.t + bd->client_inset.b);
+   bd->changes.size = 1;
    bd->changed = 1;
 
-   bd->changes.size = 1;
    if ((bd->shaped) || (bd->client.shaped))
      {
 	bd->need_shape_merge = 1;

Log:
  e_border use e's macros for calloc/free
  
Author:       jeffdameth
Date:         2009-09-19 10:08:34 -0700 (Sat, 19 Sep 2009)
New Revision: 42568

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-19 16:51:37 UTC (rev 42567)
+++ trunk/e/src/bin/e_border.c	2009-09-19 17:08:34 UTC (rev 42568)
@@ -662,7 +662,7 @@
    if (bd->desk->zone != bd->zone)
      e_border_desk_set(bd, e_desk_current_get(bd->zone));
 
-   ev = calloc(1, sizeof(E_Event_Border_Zone_Set));
+   ev = E_NEW(E_Event_Border_Zone_Set, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 //   e_object_breadcrumb_add(E_OBJECT(bd), "border_zone_set_event");
@@ -692,7 +692,7 @@
    _e_border_hook_call(E_BORDER_HOOK_SET_DESK, bd);
    e_hints_window_desktop_set(bd);
 
-   ev = calloc(1, sizeof(E_Event_Border_Desk_Set));
+   ev = E_NEW(E_Event_Border_Desk_Set, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 //   e_object_breadcrumb_add(E_OBJECT(bd), "border_desk_set_event");
@@ -738,7 +738,7 @@
    ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MAPPED, &visible, 1);
    ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MANAGED, &visible, 1);
 
-   ev = calloc(1, sizeof(E_Event_Border_Show));
+   ev = E_NEW(E_Event_Border_Show, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 //   e_object_breadcrumb_add(E_OBJECT(bd), "border_show_event");
@@ -799,7 +799,7 @@
      {
 	E_Event_Border_Hide *ev;
 	
-	ev = calloc(1, sizeof(E_Event_Border_Hide));
+	ev = E_NEW(E_Event_Border_Hide, 1);
 	ev->border = bd;
 	e_object_ref(E_OBJECT(bd));
 //	e_object_breadcrumb_add(E_OBJECT(bd), "border_hide_event");
@@ -873,7 +873,7 @@
 #endif
    _e_border_client_move_resize_send(bd);
    _e_border_move_update(bd);
-   ev = calloc(1, sizeof(E_Event_Border_Move));
+   ev = E_NEW(E_Event_Border_Move, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 //  e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event");
@@ -1038,14 +1038,14 @@
    _e_border_resize_update(bd);
    if (move)
      {
-	mev = calloc(1, sizeof(E_Event_Border_Move));
+	mev = E_NEW(E_Event_Border_Move, 1);
 	mev->border = bd;
 	e_object_ref(E_OBJECT(bd));
 	//   e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event");
 	ecore_event_add(E_EVENT_BORDER_MOVE, mev, _e_border_event_border_move_free, NULL);
      }
    
-   rev = calloc(1, sizeof(E_Event_Border_Resize));
+   rev = E_NEW(E_Event_Border_Resize, 1);
    rev->border = bd;
    e_object_ref(E_OBJECT(bd));
 //   e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
@@ -1219,7 +1219,7 @@
 	  }
      }
 
-   ev = calloc(1, sizeof(E_Event_Border_Stack));
+   ev = E_NEW(E_Event_Border_Stack, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 
@@ -1305,7 +1305,7 @@
 	  }
      }
 
-   ev = calloc(1, sizeof(E_Event_Border_Stack));
+   ev = E_NEW(E_Event_Border_Stack, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 
@@ -1372,7 +1372,7 @@
 	  }
      }
 
-   ev = calloc(1, sizeof(E_Event_Border_Stack));
+   ev = E_NEW(E_Event_Border_Stack, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 
@@ -1426,7 +1426,7 @@
 	  }
      }
 
-   ev = calloc(1, sizeof(E_Event_Border_Stack));
+   ev = E_NEW(E_Event_Border_Stack, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 
@@ -1688,7 +1688,7 @@
 		    edje_object_signal_emit(focused->icon_object, "e,state,unfocused", "e");
 		  e_focus_event_focus_out(focused);
 		  
-		  ev = calloc(1, sizeof(E_Event_Border_Focus_Out)); 
+		  ev = E_NEW(E_Event_Border_Focus_Out, 1); 
 		  ev->border = focused; 
 		  e_object_ref(E_OBJECT(focused));
 		  
@@ -1746,7 +1746,7 @@
 	     focused = bd;
 	     // Let send the focus event iff the focus is set explicitly,
 	     // not via callback
-	     ev = calloc(1, sizeof(E_Event_Border_Focus_In)); 
+	     ev = E_NEW(E_Event_Border_Focus_In, 1); 
 	     ev->border = bd; 
 	     e_object_ref(E_OBJECT(bd)); 
 	     
@@ -1760,7 +1760,7 @@
 	     focused = NULL;
 	     // Let send the focus event iff the focus is set explicitly,
 	     // not via callback
-	     ev = calloc(1, sizeof(E_Event_Border_Focus_Out)); 
+	     ev = E_NEW(E_Event_Border_Focus_Out, 1); 
 	     ev->border = bd; 
 	     e_object_ref(E_OBJECT(bd));
 
@@ -1847,7 +1847,7 @@
 	  }
 	edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
 	e_border_frame_recalc(bd);
-	ev = calloc(1, sizeof(E_Event_Border_Resize));
+	ev = E_NEW(E_Event_Border_Resize, 1);
 	ev->border = bd;
 	/* The resize is added in the animator when animation complete */
 	/* For non-animated, we add it immediately with the new size */
@@ -1955,7 +1955,7 @@
 	  }
 	edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
 	e_border_frame_recalc(bd);
-	ev = calloc(1, sizeof(E_Event_Border_Resize));
+	ev = E_NEW(E_Event_Border_Resize, 1);
 	ev->border = bd;
 	/* The resize is added in the animator when animation complete */
 	/* For non-animated, we add it immediately with the new size */
@@ -3867,7 +3867,7 @@
 
    if ((!bd->new_client) && (!stopping))
      {
-	ev = calloc(1, sizeof(E_Event_Border_Remove));
+	ev = E_NEW(E_Event_Border_Remove, 1);
 	ev->border = bd;
 	e_object_ref(E_OBJECT(bd));
 	// e_object_breadcrumb_add(E_OBJECT(bd), "border_remove_event");
@@ -5985,7 +5985,7 @@
      {
 	E_Event_Border_Add *ev;
 
-	ev = calloc(1, sizeof(E_Event_Border_Add));
+	ev = E_NEW(E_Event_Border_Add, 1);
 	ev->border = bd;
 	e_object_ref(E_OBJECT(bd));
 //	e_object_breadcrumb_add(E_OBJECT(bd), "border_add_event");
@@ -6188,7 +6188,7 @@
 	  edje_object_signal_emit(bd->bg_object, "e,state,not_urgent", "e");
 	E_Event_Border_Urgent_Change *ev;
 
-	ev = calloc(1, sizeof(E_Event_Border_Urgent_Change));
+	ev = E_NEW(E_Event_Border_Urgent_Change, 1);
 	ev->border = bd;
 	e_object_ref(E_OBJECT(bd));
 	ecore_event_add(E_EVENT_BORDER_URGENT_CHANGE, ev,
@@ -6809,7 +6809,7 @@
 	  {
 	     E_Event_Border_Icon_Change *ev;
 
-	     ev = calloc(1, sizeof(E_Event_Border_Icon_Change));
+	     ev = E_NEW(E_Event_Border_Icon_Change, 1);
 	     ev->border = bd;
 	     e_object_ref(E_OBJECT(bd));
 //	     e_object_breadcrumb_add(E_OBJECT(bd), "border_icon_change_event");
@@ -6874,7 +6874,7 @@
    if (send_event) // FIXME: send only if a property changed - above need to
      // check on that. for now - always send.
      {
-	event = calloc(1, sizeof(E_Event_Border_Property));
+	event = E_NEW(E_Event_Border_Property, 1);
 	event->border = bd;
 	e_object_ref(E_OBJECT(bd));
 	ecore_event_add(E_EVENT_BORDER_PROPERTY, event, _e_border_event_border_property_free, NULL);
@@ -7087,7 +7087,7 @@
 	e_border_frame_recalc(bd);
 
 	ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NW);
-	ev = calloc(1, sizeof(E_Event_Border_Resize));
+	ev = E_NEW(E_Event_Border_Resize, 1);
 	ev->border = bd;
 	e_object_ref(E_OBJECT(bd));
 //	e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
@@ -7105,7 +7105,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_resize_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7116,7 +7116,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_move_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7127,7 +7127,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_add_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7138,7 +7138,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_remove_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7149,7 +7149,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_show_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7160,7 +7160,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_hide_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7171,7 +7171,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_iconify_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7182,7 +7182,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_uniconify_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7193,7 +7193,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_stick_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7204,7 +7204,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_unstick_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7216,7 +7216,7 @@
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_zone_set_event");
    e_object_unref(E_OBJECT(e->border));
    e_object_unref(E_OBJECT(e->zone));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7228,7 +7228,7 @@
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_desk_set_event");
    e_object_unref(E_OBJECT(e->border));
    e_object_unref(E_OBJECT(e->desk));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7244,7 +7244,7 @@
 //	e_object_breadcrumb_del(E_OBJECT(e->above), "border_raise_event.above");
 	e_object_unref(E_OBJECT(e->stack));
      }
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7255,7 +7255,7 @@
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_icon_change_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7265,7 +7265,7 @@
 
    e = ev;
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7275,7 +7275,7 @@
 
    e = ev;
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7285,7 +7285,7 @@
 
    e = ev;
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7295,7 +7295,7 @@
 
    e = ev;
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void

Log:
  remember internal windows again
  
Author:       jeffdameth
Date:         2009-09-19 10:35:18 -0700 (Sat, 19 Sep 2009)
New Revision: 42569

Modified:
  trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-19 17:08:34 UTC (rev 42568)
+++ trunk/e/src/bin/e_remember.c	2009-09-19 17:35:18 UTC (rev 42569)
@@ -683,35 +683,13 @@
 	E_Remember *rem;
 
 	rem = e_remember_new();
-	if (rem)
-	  {
-	     bd->remember = rem;
-	     rem->match = 0;
-	     
-	     if (bd->client.icccm.name)
-	       {
-		  rem->name = eina_stringshare_add(bd->client.icccm.name);
-		  rem->match |= E_REMEMBER_MATCH_NAME;
-	       }
-	     if (bd->client.icccm.class)
-	       {
-		  rem->class = eina_stringshare_add(bd->client.icccm.class);
-		  rem->match |= E_REMEMBER_MATCH_CLASS;
-	       }
-	     if (bd->client.icccm.window_role)
-	       {
-		  rem->role = eina_stringshare_add(bd->client.icccm.window_role);
-		  rem->match |= E_REMEMBER_MATCH_ROLE;
-	       }
-	     if (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_UNKNOWN)
-	       {
-		  rem->match |= E_REMEMBER_MATCH_TYPE;
-	       }
+	if (!rem) return;
 
-	     rem->match |= E_REMEMBER_MATCH_TRANSIENT;
-	     rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_BORDER;
-	     e_remember_use(rem);
-	     e_remember_update(bd);
-	  }
+	e_remember_default_match_set(rem, bd);
+	
+	rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_BORDER;
+	e_remember_use(rem);
+	e_remember_update(bd);
+	bd->remember = rem;
      }
 }

Log:
  fix warnings
  
Author:       jeffdameth
Date:         2009-09-19 15:55:35 -0700 (Sat, 19 Sep 2009)
New Revision: 42570

Modified:
  trunk/e/src/bin/e_hints.c 

Modified: trunk/e/src/bin/e_hints.c
===================================================================
--- trunk/e/src/bin/e_hints.c	2009-09-19 17:35:18 UTC (rev 42569)
+++ trunk/e/src/bin/e_hints.c	2009-09-19 22:55:35 UTC (rev 42570)
@@ -1037,6 +1037,10 @@
 	 break;
       case ECORE_X_ACTION_CLOSE:
 	 break;
+      case ECORE_X_ACTION_ABOVE:
+	 break;
+      case ECORE_X_ACTION_BELOW:
+	 break;
      }
 }
 
@@ -1095,6 +1099,10 @@
 		case ECORE_X_ACTION_CLOSE:
 		  bd->client.netwm.action.close = 1;
 		  break;
+		case ECORE_X_ACTION_ABOVE:
+		   break;
+		case ECORE_X_ACTION_BELOW:
+		   break;
 	       }
 	  }
 	free(action);

Log:
  fix warnings
  
Author:       jeffdameth
Date:         2009-09-21 13:07:28 -0700 (Mon, 21 Sep 2009)
New Revision: 42605

Modified:
  trunk/e/src/bin/e_int_gadcon_config.c 

Modified: trunk/e/src/bin/e_int_gadcon_config.c
===================================================================
--- trunk/e/src/bin/e_int_gadcon_config.c	2009-09-21 19:00:43 UTC (rev 42604)
+++ trunk/e/src/bin/e_int_gadcon_config.c	2009-09-21 20:07:28 UTC (rev 42605)
@@ -15,7 +15,7 @@
 static void _cb_add(void *data, void *data2);
 static void _cb_del(void *data, void *data2);
 static void _set_description(void *data, const char *name);
-static int _gad_list_sort(void *data1, void *data2);
+//static int _gad_list_sort(void *data1, void *data2);
 
 struct _E_Config_Dialog_Data 
 {
@@ -393,6 +393,8 @@
    efreet_desktop_free(desk);
 }
 
+/* FIXME unused */
+#if 0
 static int 
 _gad_list_sort(void *data1, void *data2) 
 {
@@ -410,3 +412,4 @@
 
    return (strcmp(lbl1, lbl2));
 }
+#endif

Log:
  fix warnings
  
Author:       jeffdameth
Date:         2009-09-21 13:19:14 -0700 (Mon, 21 Sep 2009)
New Revision: 42606

Modified:
  trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2009-09-21 20:07:28 UTC (rev 42605)
+++ trunk/e/src/bin/e_shelf.c	2009-09-21 20:19:14 UTC (rev 42606)
@@ -1564,6 +1564,10 @@
         hide_max = es->w - es->hidden_state_size;
         if (es->hide_origin == -1) es->hide_origin = es->x;
         break;
+      case E_GADCON_ORIENT_FLOAT:
+      case E_GADCON_ORIENT_HORIZ:
+      case E_GADCON_ORIENT_VERT:
+	break;
      }
 
    step = (hide_max / e_config->framerate) / es->cfg->hide_duration;
@@ -1614,6 +1618,10 @@
       case E_GADCON_ORIENT_CORNER_RT:
         e_shelf_move(es, es->hide_origin + es->hide_step, es->y);
         break;
+      case E_GADCON_ORIENT_FLOAT:
+      case E_GADCON_ORIENT_HORIZ:
+      case E_GADCON_ORIENT_VERT:
+	 break;
      }
 
    return 1;

Log:
  append params for dialog to configpath with '::' so the config path MUST not include '::'. e.g. use 'extenstions/shelves::$ID' to start the config dialog for a shelf with id $ID
  
Author:       jeffdameth
Date:         2009-09-21 16:02:37 -0700 (Mon, 21 Sep 2009)
New Revision: 42610

Modified:
  trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-21 22:52:44 UTC (rev 42609)
+++ trunk/e/src/bin/e_remember.c	2009-09-21 23:02:37 UTC (rev 42610)
@@ -133,7 +133,6 @@
    E_Remember *rem;
    Eina_List *l;
    E_Action *act_fm, *act;
-   const char *path;
    E_Container *con;
 
    act_fm = e_action_find("fileman"); 
@@ -143,28 +142,37 @@
    EINA_LIST_FOREACH(remembers->list, l, rem)
      {
 	if (!rem->class) continue;
-	//printf("internal restore %s\n", rem->class);
 
 	if (!strncmp(rem->class, "e_fwin::", 8))
 	  {
-	     //printf("internal restore fm %p\n", (void *) act_fm);
 	     if (!act_fm)
 	       continue;
-	     if (!strlen(rem->class) > 8)
+	     /* at least '/' */
+	     if (!rem->class + 9)
 	       continue;
 
-	     path = rem->class + 8;
-
-	     act_fm->func.go(NULL, path);
+	     act_fm->func.go(NULL, rem->class + 8);
 	  }
 	else if (!strncmp(rem->class, "_config::", 9))
 	  {
-	     /* TODO parse _config::params::path */
-	     path = rem->class + 9;
-	     //printf("internal restore config %s\n", path);
+	     char *param = NULL;
+	     char path[1024];
+	     const char *p;
+	     
+	     p = rem->class + 9;
+
+	     if ((param = strstr(p, "::")))
+	       {
+		  snprintf(path, (param - p) + sizeof(char), "%s", p);
+		  param = param + 2;
+	       }
+	     else
+	       snprintf(path, sizeof(path), "%s", p);
+	     
+	     printf("internal restore config %s - %s\n", path, param);
 	     if (e_configure_registry_exists(path))
 	       {
-		  e_configure_registry_call(path, con, NULL);
+		  e_configure_registry_call(path, con, param);
 	       }
 	  }
 	else if (!strcmp(rem->class, "_configure"))

Log:
  --printf
  
Author:       jeffdameth
Date:         2009-09-21 16:03:33 -0700 (Mon, 21 Sep 2009)
New Revision: 42611

Modified:
  trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-21 23:02:37 UTC (rev 42610)
+++ trunk/e/src/bin/e_remember.c	2009-09-21 23:03:33 UTC (rev 42611)
@@ -169,7 +169,6 @@
 	     else
 	       snprintf(path, sizeof(path), "%s", p);
 	     
-	     printf("internal restore config %s - %s\n", path, param);
 	     if (e_configure_registry_exists(path))
 	       {
 		  e_configure_registry_call(path, con, param);

Log:
  forgotten parentheses
  
Author:       jeffdameth
Date:         2009-09-21 17:08:54 -0700 (Mon, 21 Sep 2009)
New Revision: 42613

Modified:
  trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-21 23:04:23 UTC (rev 42612)
+++ trunk/e/src/bin/e_remember.c	2009-09-22 00:08:54 UTC (rev 42613)
@@ -148,7 +148,7 @@
 	     if (!act_fm)
 	       continue;
 	     /* at least '/' */
-	     if (!rem->class + 9)
+	     if (!(rem->class + 9))
 	       continue;
 
 	     act_fm->func.go(NULL, rem->class + 8);

Log:
  EINA_FUCK_REVERSE_FOREACH != for (l = some_pointer_in_list_from_where_want_to_start; l; l = l->prev)
  
  anyway nice that i didnt had to rewrite gadcon layout to fix this issue,
  but at least starting the rewrite made me realize the above mentioned 
  difference. moving and resizing of gcc in non-shrinked mode works 
  now nicely again.
  
Author:       jeffdameth
Date:         2009-09-22 23:06:13 -0700 (Tue, 22 Sep 2009)
New Revision: 42637

Modified:
  trunk/e/src/bin/e_gadcon.c 

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2009-09-23 05:48:59 UTC (rev 42636)
+++ trunk/e/src/bin/e_gadcon.c	2009-09-23 06:06:13 UTC (rev 42637)
@@ -1971,11 +1971,13 @@
    if (gcc->gadcon->toolbar)
      evas_pointer_canvas_xy_get(gcc->gadcon->evas, &gcc->dx, &gcc->dy);
    else
-     ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &gcc->dx, &gcc->dy);
-   e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gcx, &gcy, NULL, NULL);
-   evas_object_geometry_get(gcc->gadcon->o_container, &gx, &gy, NULL, NULL);
-   gcc->dx -= (gcx + gx);
-   gcc->dy -= (gcy + gy);
+     {
+	ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &gcc->dx, &gcc->dy);
+	e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gcx, &gcy, NULL, NULL);
+	evas_object_geometry_get(gcc->gadcon->o_container, &gx, &gy, NULL, NULL);
+	gcc->dx -= (gcx + gx);
+	gcc->dy -= (gcy + gy);
+     }
    
    if (gcc->o_frame)
      evas_object_geometry_get(gcc->o_frame, &x, &y, NULL, NULL);
@@ -2005,8 +2007,7 @@
    int cx, cy;
    int gx, gy, gw, gh;
    int gcx = 0, gcy = 0;
-
-
+   int changes = 0;
    
    if (!gcc->moving) return;
    /* we need to get output not canvas because things like systray
@@ -2014,7 +2015,7 @@
    /* maybe we should better grab mouse while move resize is active...*/
    //evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
    if (gcc->gadcon->toolbar)
-     evas_pointer_canvas_xy_get(gcc->gadcon->evas, &gcc->dx, &gcc->dy);
+     evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
    else
      {
 	ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &cx, &cy);
@@ -2022,7 +2023,7 @@
      }
    
    evas_object_geometry_get(gcc->gadcon->o_container, &gx, &gy, &gw, &gh);
-   
+
    cx -= (gx + gcx);
    cy -= (gy + gcy);
    
@@ -2031,6 +2032,13 @@
    
    gcc->state_info.flags = E_GADCON_LAYOUT_ITEM_LOCK_POSITION | E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
    _e_gadcon_client_current_position_sync(gcc);
+
+   if (gcc->o_frame)
+     evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h);
+   else if (gcc->o_base)
+     evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
+   else return; /* make clang happy */
+
    if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
      { 
 	if (cy + e_config->drag_resist < 0 || cy - e_config->drag_resist > gh)
@@ -2039,18 +2047,32 @@
 	     return;
 	  }
 
-	if (x > 0)
+	if (x > 0 && (cx + gcc->drag.x > gcc->config.pos))
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
 	       gcc->state_info.resist = 0;
 	     gcc->state_info.state = E_LAYOUT_ITEM_STATE_POS_INC;
+	     changes = 1;
 	  }
-	else if (x < 0)
+	else if (x < 0 && (cx + gcc->drag.x < gcc->config.pos))
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_DEC)
 	       gcc->state_info.resist = 0; 
 	     gcc->state_info.state = E_LAYOUT_ITEM_STATE_POS_DEC;
+	     changes = 1;
 	  }
+
+	if (changes)
+	  {
+	     if (gcc->o_frame)
+	       e_gadcon_layout_pack_request_set(gcc->o_frame, cx + gcc->drag.x, w);
+	     else if (gcc->o_base)
+	       e_gadcon_layout_pack_request_set(gcc->o_base, cx + gcc->drag.x, w);
+
+	     gcc->config.size = w;
+	     evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
+	     gcc->config.res = w;
+	  }
      }
    else
      {
@@ -2060,47 +2082,33 @@
 	     return;
 	  }
 
-	if (y > 0)
+	if (y > 0 && (cy + gcc->drag.y > gcc->config.pos))
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
 	       gcc->state_info.resist = 0;
 	     gcc->state_info.state = E_LAYOUT_ITEM_STATE_POS_INC;
+	     changes = 1;
 	  }
-	else if (y < 0)
+	else if (y < 0 && (cy + gcc->drag.y < gcc->config.pos))
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_DEC)
 	       gcc->state_info.resist = 0;
 	     gcc->state_info.state = E_LAYOUT_ITEM_STATE_POS_DEC;
+	     changes = 1;
 	  }
-     }
 
-   if (gcc->o_frame)
-     evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h);
-   else if (gcc->o_base)
-     evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
-   else return; /* make clang happy */
-     
-   if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
-     {
-	if (gcc->o_frame)
-	  e_gadcon_layout_pack_request_set(gcc->o_frame, cx + gcc->drag.x, w);
-	else if (gcc->o_base)
-	  e_gadcon_layout_pack_request_set(gcc->o_base, cx + gcc->drag.x, w);
+	if (changes)
+	  {
+	     if (gcc->o_frame)
+	       e_gadcon_layout_pack_request_set(gcc->o_frame, cy + gcc->drag.y, h);
+	     else if (gcc->o_base)
+	       e_gadcon_layout_pack_request_set(gcc->o_base, cy + gcc->drag.y, h);
 
-	gcc->config.size = w;
-	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
-	gcc->config.res = w;
-     }
-   else
-     {
-	if (gcc->o_frame)
-	  e_gadcon_layout_pack_request_set(gcc->o_frame, cy + gcc->drag.y, h);
-	else if (gcc->o_base)
-	  e_gadcon_layout_pack_request_set(gcc->o_base, cy + gcc->drag.y, h);
+	     gcc->config.size = h;
+	     evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
+	     gcc->config.res = h;
+	  }
 
-	gcc->config.size = h;
-	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
-	gcc->config.res = h;
      }
    
    gcc->dx += x;
@@ -3633,8 +3641,10 @@
 
 	if (reduce_total <= need) 
 	  {
-	     EINA_LIST_REVERSE_FOREACH(l, l2, item)
-	       { 
+	     /* EINA_FUCK_REVERSE_FOREACH(l, l2, item) */
+	     for (l2 = l; l2;  l2 = l2->prev)
+	       {
+		  item = l2->data;
 		  bi2 = evas_object_data_get(item, "e_gadcon_layout_data"); 
 		  bi2->ask.size2 -= reduce; 
 	       } 
@@ -3890,7 +3900,7 @@
    Eina_List *l;
    Evas_Object *item;
 
-#if 1
+#if 0
    EINA_LIST_FOREACH(sd->items, l, item)
      {
 	bi = evas_object_data_get(item, "e_gadcon_layout_data");
@@ -4171,17 +4181,16 @@
 	     if ((l) && eina_list_prev(l))
 	       {
 		  stop = 0;
-		  /* FIXME: patch from <victor.scorpion@...>
-		     just a workaround. something above is probably
-		     wrong (hannes) */
-		  /* EINA_LIST_REVERSE_FOREACH(eina_list_prev(l), l2, lc) */
-		  EINA_LIST_REVERSE_FOREACH_SAFE(eina_list_prev(l), l2, l2, lc)
+		  /* EINA_FUCK_REVERSE_FOREACH(eina_list_prev(l), l2, lc) */
+		  for (l2 = l->prev; l2; l2 = l2->prev)
 		    {
+		       lc = l2->data;
+		       
 		       if (stop) break;
 		       if ((lc->pos + lc->size) == prev_pos) break;
 		       prev_pos = lc->pos;
 
-		       EINA_LIST_REVERSE_FOREACH(eina_list_last(lc->items), l3, bi)
+		       EINA_LIST_REVERSE_FOREACH(lc->items, l3, bi)
 			 {
 			    if ((bi->ask.pos + bi->w) >= pos)
 			      {
@@ -4215,8 +4224,10 @@
 
 	     ok = 0;
 	     new_pos = lc_moving->pos;
-	     EINA_LIST_REVERSE_FOREACH(eina_list_prev(l), l2, lc)
+	     /* EINA_FUCK_REVERSE_FOREACH(eina_list_prev(l), l2, lc) */
+	     for (l2 = l->prev; l2; l2 = l2->prev)
 	       {
+		  lc = l2->data;		  
 		  if (new_pos >= (lc->pos + lc->size)) break;
 
 		  ok = 1;
@@ -4295,7 +4306,7 @@
 		    }
 
 		  ok = 1;
-		  new_pos += lc->size;
+		  /* new_pos += lc->size; */
 	       }
 
 	     if (new_pos > sd->w)

Log:
  dont use EINA_LIST_REVERSE_FOREACH here
  
Author:       jeffdameth
Date:         2009-09-22 23:12:53 -0700 (Tue, 22 Sep 2009)
New Revision: 42638

Modified:
  trunk/e/src/bin/e_utils.c 

Modified: trunk/e/src/bin/e_utils.c
===================================================================
--- trunk/e/src/bin/e_utils.c	2009-09-23 06:06:13 UTC (rev 42637)
+++ trunk/e/src/bin/e_utils.c	2009-09-23 06:12:53 UTC (rev 42638)
@@ -579,9 +579,9 @@
    else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4;
    else pos = 5;
 
-   EINA_LIST_REVERSE_FOREACH(eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd), l, bd2)
+   for (l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd); l; l = l->prev)
      {
-	if (!eina_list_prev(l) || below) break;
+        if (!eina_list_prev(l) || below) break;
 	below = eina_list_data_get(eina_list_prev(l));
 	if ((below->desk != bd->desk) && (!below->sticky))
 	  below = NULL;
@@ -593,9 +593,10 @@
 	  {
 	     if (bd->zone->container->layers[i].clients)
 	       {
-		  EINA_LIST_REVERSE_FOREACH(eina_list_last(bd->zone->container->layers[i].clients), l, bd2)
+		  l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd);
+		  for (; l && !below; l = l->prev)
 		    {
-		       if (below) break;
+		       bd2 = l->data;
 		       below = bd2;
 		       if ((below->desk != bd->desk) && (!below->sticky))
 			 below = NULL;

Log:
  - focus new window when it's the only one on current desk
  - fix resizing by moveresize_request
  
Author:       jeffdameth
Date:         2009-09-24 11:23:40 -0700 (Thu, 24 Sep 2009)
New Revision: 42681

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-24 18:05:46 UTC (rev 42680)
+++ trunk/e/src/bin/e_border.c	2009-09-24 18:23:40 UTC (rev 42681)
@@ -490,8 +490,7 @@
    ecore_x_window_show(bd->client.shell_win);
    bd->shape = e_container_shape_add(con);
 
-   if (e_config->focus_setting != E_FOCUS_NONE)
-     bd->take_focus = 1;
+   bd->take_focus = 1;
    bd->new_client = 1;
    bd->changed = 1;
 
@@ -4754,6 +4753,7 @@
       case RESIZE_BR:
 	 bd->resize_mode = RESIZE_BR;
 	 GRAV_SET(bd, ECORE_X_GRAVITY_NW);
+	 break;
       case RESIZE_B:
 	 bd->resize_mode = RESIZE_B;
 	 GRAV_SET(bd, ECORE_X_GRAVITY_N);
@@ -4776,10 +4776,10 @@
 	if ((!bd->cur_mouse_action->func.end_mouse) &&
 	    (!bd->cur_mouse_action->func.end))
 	  bd->cur_mouse_action = NULL;
-	if (bd->cur_mouse_action)
-	  e_object_ref(E_OBJECT(bd->cur_mouse_action));
      }
-
+   if (bd->cur_mouse_action)
+     e_object_ref(E_OBJECT(bd->cur_mouse_action));
+   
    return 1;
 }
 
@@ -6837,19 +6837,31 @@
 		  e_border_focus_set_with_pointer(bd);
 	       }
 	  }
+	else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
+	  {
+	     if ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
+		 ((e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED) &&
+		  (e_border_find_by_client_window(bd->client.icccm.transient_for) ==
+		   e_border_focused_get())))
+	       {
+		  if (!bd->lock_focus_out)
+		    e_border_focus_set_with_pointer(bd);
+	       }
+	  }
 	else
 	  {
-	     if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
+	     /* focus window by default when it is the only one on desk */
+	     E_Border *bd2 = NULL;
+	     Eina_List *l;
+	     EINA_LIST_FOREACH(focus_stack, l, bd2)
 	       {
-		  if ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
-		      ((e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED) &&
-		       (e_border_find_by_client_window(bd->client.icccm.transient_for) ==
-			e_border_focused_get())))
-		    {
-		       if (!bd->lock_focus_out)
-			 e_border_focus_set_with_pointer(bd);
-		    }
+		  if (bd == bd2) continue;
+		  if ((!bd2->iconic) && (bd2->visible) &&  (bd->desk == bd2->desk))
+		    break;
 	       }
+
+	     if (!bd2)
+	       e_border_focus_set_with_pointer(bd);
 	  }
      }
 
@@ -7336,10 +7348,14 @@
 
    if (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) &&
        (!e_config->allow_manip))
- 
-   if (grabbed)
-     e_grabinput_get(bd->win, 0, bd->win);
+     return 0;
 
+   if (grabbed && !e_grabinput_get(bd->win, 0, bd->win))
+     {
+	grabbed = 0;
+	return 0;
+     }
+   
    if (bd->client.netwm.sync.request)
      {
 	bd->client.netwm.sync.alarm = ecore_x_sync_alarm_new(bd->client.netwm.sync.counter);
@@ -7358,8 +7374,10 @@
 _e_border_resize_end(E_Border *bd)
 {
    if (grabbed)
-     e_grabinput_release(bd->win, bd->win);
-   grabbed = 0;
+     {
+	e_grabinput_release(bd->win, bd->win);
+	grabbed = 0;
+     }
    if (bd->client.netwm.sync.alarm)
      {
 	ecore_x_sync_alarm_free(bd->client.netwm.sync.alarm);
@@ -7398,8 +7416,11 @@
        (!e_config->allow_manip))
      return 0;
 
-   if (grabbed)
-     e_grabinput_get(bd->win, 0, bd->win);
+   if (grabbed && !e_grabinput_get(bd->win, 0, bd->win))
+     {
+	grabbed = 0;
+	return 0;
+     }
 #if 0
    if (bd->client.netwm.sync.request)
      {
@@ -7419,8 +7440,10 @@
 _e_border_move_end(E_Border *bd)
 {
    if (grabbed)
-     e_grabinput_release(bd->win, bd->win);
-   grabbed = 0;
+     {
+	e_grabinput_release(bd->win, bd->win);
+	grabbed = 0;
+     }
 #if 0
    if (bd->client.netwm.sync.alarm)
      {

Log:
  fix segv in internal window restore code
  
Author:       jeffdameth
Date:         2009-09-24 23:24:48 -0700 (Thu, 24 Sep 2009)
New Revision: 42690

Modified:
  trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-09-25 03:40:18 UTC (rev 42689)
+++ trunk/e/src/bin/e_remember.c	2009-09-25 06:24:48 UTC (rev 42690)
@@ -616,18 +616,21 @@
 	  }
      }
    
-   if (bd->internal && remembers && bd->client.icccm.class)
+   if (bd->internal && remembers && bd->client.icccm.class && bd->client.icccm.class[0])
      {
 	Eina_List *l;
 	EINA_LIST_FOREACH(remembers->list, l, rem)
 	  {
-	     if (!strcmp(rem->class, bd->client.icccm.class))
+	     if (rem->class && !strcmp(rem->class, bd->client.icccm.class))
 		 break;
 	  }
 	if (rem)
 	  {
 	     temporary = 1;
 	     remembers->list = eina_list_remove(remembers->list, rem);
+	     if (!remembers->list)
+	       e_config_domain_save("e_remember_restart",
+				    e_remember_list_edd, remembers);
 	  }
 	else rem = bd->remember;
      }

Log:
  reduce continous debug output for deleted borders
  
Author:       jeffdameth
Date:         2009-09-27 15:22:39 -0700 (Sun, 27 Sep 2009)
New Revision: 42746

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-27 20:10:03 UTC (rev 42745)
+++ trunk/e/src/bin/e_border.c	2009-09-27 22:22:39 UTC (rev 42746)
@@ -6213,7 +6213,8 @@
 
    if (e_object_is_del(E_OBJECT(bd)))
      {
-	fprintf(stderr, "ERROR: _e_border_eval(%p) with deleted border!\n", bd);
+	fprintf(stderr, "ERROR: _e_border_eval(%p) with deleted border! - %d\n", bd, bd->new_client);
+	bd->changed = 0;
 	return;
      }
    if (bd->zone)

Log:
  fix unmaximize in smart and fill mode.
  - move policy handling of move/resize to the externally accessible functions
  
Author:       jeffdameth
Date:         2009-09-27 18:48:26 -0700 (Sun, 27 Sep 2009)
New Revision: 42751

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-28 01:18:04 UTC (rev 42750)
+++ trunk/e/src/bin/e_border.c	2009-09-28 01:48:26 UTC (rev 42751)
@@ -831,12 +831,6 @@
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
-   if (bd->fullscreen) return;
-
-   /* allow border to unshade when it was maximized _and_ shaded */
-   if ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading))
-     return;
-
    ecore_x_window_shadow_tree_flush();
    if (bd->new_client)
      {
@@ -898,6 +892,13 @@
 EAPI void
 e_border_move(E_Border *bd, int x, int y)
 {
+   if (bd->fullscreen)
+     return;
+
+   /* allow border to unshade when it was maximized _and_ shaded */
+   if ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading))
+     return;
+
    _e_border_move_internal(bd, x, y, 0);
 }
 
@@ -920,6 +921,13 @@
 EAPI void
 e_border_move_without_border(E_Border *bd, int x, int y)
 {
+   if (bd->fullscreen)
+     return;
+
+   /* allow border to unshade when it was maximized _and_ shaded */
+   if ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading))
+     return;
+
    _e_border_move_internal(bd, x, y, 1);
 }
 
@@ -971,11 +979,6 @@
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
-   if (bd->fullscreen) return;
-   
-   if ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading))
-     return;
-
    ecore_x_window_shadow_tree_flush();
 
    if (bd->new_client)
@@ -1073,6 +1076,10 @@
 EAPI void
 e_border_move_resize(E_Border *bd, int x, int y, int w, int h)
 {
+   if ((bd->fullscreen) ||
+       ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading)))
+     return;
+
    _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
 }
 
@@ -1094,6 +1101,10 @@
 EAPI void
 e_border_move_resize_without_border(E_Border *bd, int x, int y, int w, int h)
 {
+   if ((bd->fullscreen) ||
+       ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading)))
+     return;
+
    _e_border_move_resize_internal(bd, x, y, w, h, 1, 1);
 }
 
@@ -1113,6 +1124,10 @@
 EAPI void
 e_border_resize(E_Border *bd, int w, int h)
 {
+   if ((bd->fullscreen) ||
+       ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading)))
+     return;
+
    _e_border_move_resize_internal(bd, 0, 0, w, h, 0, 0);
 }
 
@@ -1135,6 +1150,10 @@
 EAPI void
 e_border_resize_without_border(E_Border *bd, int w, int h)
 {
+   if ((bd->fullscreen) ||
+       ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading)))
+     return;
+
    _e_border_move_resize_internal(bd, 0, 0, w, h, 1, 0);
 }
 
@@ -2018,11 +2037,9 @@
 	     max = E_MAXIMIZE_NONE;
 	     break;
 	   case E_MAXIMIZE_FULLSCREEN:
-	      printf("max fullscreen %d\n", max);
-
 	      w = bd->zone->w;
 	      h = bd->zone->h;
-
+	      
 	      if (bd->bg_object)
 	       {
 		  Evas_Coord cx, cy, cw, ch;
@@ -2151,11 +2168,8 @@
 	bd->pre_res_change.valid = 0;
 	bd->need_maximize = 0;
 
-	printf("unmax  %d\n", max);
 	if ((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN)
 	  {
-	     printf("fullscreen\n");
-
 	     if (bd->bg_object)
 	       {
 		  Evas_Coord cx, cy, cw, ch;
@@ -2178,7 +2192,10 @@
 	       }
 
 	     bd->maximized = E_MAXIMIZE_NONE;
-	     e_border_move_resize(bd, bd->zone->x + bd->saved.x, bd->zone->y + bd->saved.y, bd->saved.w, bd->saved.h);
+	     _e_border_move_resize_internal(bd,
+					    bd->zone->x + bd->saved.x,
+					    bd->zone->y + bd->saved.y,
+					    bd->saved.w, bd->saved.h, 0, 1);
 	     bd->saved.x = bd->saved.y = bd->saved.w = bd->saved.h = 0;
 	     e_hints_window_size_unset(bd);
 	  }
@@ -2209,7 +2226,8 @@
 	       }
 
 	     e_border_resize_limit(bd, &w, &h);
-	     e_border_move_resize(bd, x, y, w, h);
+	     
+	     _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
 	     if (!(bd->maximized & E_MAXIMIZE_DIRECTION))
 	       {
 		  bd->maximized = E_MAXIMIZE_NONE;

Log:
  cleanups and updated comment on sync.wait
  
Author:       jeffdameth
Date:         2009-10-01 03:22:27 -0700 (Thu, 01 Oct 2009)
New Revision: 42837

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-10-01 09:04:02 UTC (rev 42836)
+++ trunk/e/src/bin/e_border.c	2009-10-01 10:22:27 UTC (rev 42837)
@@ -1036,9 +1036,8 @@
      }
    else
      {
-	if (1 && resize && bd->client.netwm.sync.request)
+	if (resize && bd->client.netwm.sync.request)
 	  {
-	     /* printf("add resize %d\n", bd->client.netwm.sync.serial); */
 	     bd->client.netwm.sync.wait++;
 	     _e_border_pending_move_resize_add(bd, move, 1, x, y, w, h, without_border,
 					       bd->client.netwm.sync.serial);
@@ -4857,11 +4856,12 @@
    e = ev;
    bd = e_border_find_by_alarm(e->alarm);
    if (!bd) return 1;
-   bd->client.netwm.sync.wait--;
-   bd->client.netwm.sync.send_time = ecore_loop_time_get();
 
+   if (bd->client.netwm.sync.wait)
+     bd->client.netwm.sync.wait--;
+
    if (ecore_x_sync_counter_query(bd->client.netwm.sync.counter, &serial))
-   {
+     {
 	E_Border_Pending_Move_Resize *pnd = NULL;
 
 	/* skip pending for which we didnt get a reply */
@@ -4878,8 +4878,6 @@
 
 	if (pnd)
 	  {
-	     bd->client.netwm.sync.send_time = ecore_time_get();
-		  
 	     bd->x = pnd->x;
 	     bd->y = pnd->y;
 	     bd->w = pnd->w;
@@ -4892,7 +4890,7 @@
 
    bd->changes.size = 1;
    bd->changes.pos = 1;		  
-   
+
    _e_border_eval(bd);
    evas_render(bd->bg_evas);
 
@@ -4900,6 +4898,7 @@
 			  &bd->mouse.current.mx,
 			  &bd->mouse.current.my); 
 
+   bd->client.netwm.sync.send_time = ecore_loop_time_get();
    _e_border_resize_handle(bd);
 
    return 1;
@@ -5379,15 +5378,26 @@
 	     if ((ecore_loop_time_get() - bd->client.netwm.sync.send_time) > 0.5)
 	       {
 		  E_Border_Pending_Move_Resize  *pnd;
+
+		  if (bd->pending_move_resize)
+		    {
+		       bd->changes.pos = 1;
+		       bd->changes.size = 1;
+		       bd->changed = 1;
+		       _e_border_client_move_resize_send(bd);
+		    }
 		  EINA_LIST_FREE(bd->pending_move_resize, pnd)
-		    E_FREE(pnd);	
+		    E_FREE(pnd);
+
 		  bd->client.netwm.sync.wait = 0;
-		  /* XXX bd->changes.pos/size = 1 ? */
 	       }
-	     /* sync wait is only used for initial resize and timeout
-	        otherwise resize handle is called in sync alarm */
+	     /* sync.wait is incremented when resize_handle sends
+	      * sync-request and decremented by sync-alarm cb. so
+	      * we resize here either on initial resize, timeout or
+	      * when no new resize-request was added by sync-alarm cb.
+	      */
 	     if (!bd->client.netwm.sync.wait)
-	       _e_border_resize_handle(bd);
+		  _e_border_resize_handle(bd);
 	  }
 	else
 	  _e_border_resize_handle(bd);
@@ -7467,24 +7477,16 @@
 	ecore_x_sync_alarm_free(bd->client.netwm.sync.alarm);
 	bd->client.netwm.sync.alarm = 0;
 	/* resize to last geometry if sync alarm for it was not yet handled */
-	EINA_LIST_FREE(bd->pending_move_resize, pnd)
+	if (bd->pending_move_resize)
 	  {
-	     bd->x = pnd->x;
-	     bd->y = pnd->y;
-	     bd->w = pnd->w;
-	     bd->h = pnd->h;     
 	     bd->changed = 1;
 	     bd->changes.pos = 1;
 	     bd->changes.size = 1;
-	     E_FREE(pnd);
-	  }
-	if (bd->changes.size)
-	  {
-	     bd->client.w = bd->w - (bd->client_inset.l + bd->client_inset.r);
-	     bd->client.h = bd->h - (bd->client_inset.t + bd->client_inset.b);
-	     /* needed ? */
 	     _e_border_client_move_resize_send(bd);
 	  }
+	
+	EINA_LIST_FREE(bd->pending_move_resize, pnd)
+	  E_FREE(pnd);
      }
 
    _e_border_hook_call(E_BORDER_HOOK_RESIZE_END, bd);

Log:
  fix pending_mode_resize
  
Author:       jeffdameth
Date:         2009-10-04 20:05:10 -0700 (Sun, 04 Oct 2009)
New Revision: 42882

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-10-05 00:38:45 UTC (rev 42881)
+++ trunk/e/src/bin/e_border.c	2009-10-05 03:05:10 UTC (rev 42882)
@@ -832,7 +832,7 @@
    pnd = E_NEW(E_Border_Pending_Move_Resize, 1);
    if (!pnd) return;
    pnd->resize = resize;
-   pnd->resize = move;
+   pnd->move = move;
    pnd->without_border = without_border;
    pnd->x = x;
    pnd->y = y;

Log:
  remember windows after initialization
  
Author:       jeffdameth
Date:         2009-10-04 20:05:50 -0700 (Sun, 04 Oct 2009)
New Revision: 42883

Modified:
  trunk/e/src/bin/e_remember.c 

Modified: trunk/e/src/bin/e_remember.c
===================================================================
--- trunk/e/src/bin/e_remember.c	2009-10-05 03:05:10 UTC (rev 42882)
+++ trunk/e/src/bin/e_remember.c	2009-10-05 03:05:50 UTC (rev 42883)
@@ -564,7 +564,8 @@
 {
    E_Border *bd = border;
 
-   if (!bd->new_client) return;
+   // remember only when window was modified
+   // if (!bd->new_client) return;
 
    if ((bd->internal) && (!bd->remember) &&
        (e_config->remember_internal_windows) &&

Log:
  add motif wm hints to supported porperties
  
Author:       jeffdameth
Date:         2009-10-05 08:43:46 -0700 (Mon, 05 Oct 2009)
New Revision: 42888

Modified:
  trunk/e/src/bin/e_hints.c 

Modified: trunk/e/src/bin/e_hints.c
===================================================================
--- trunk/e/src/bin/e_hints.c	2009-10-05 13:58:13 UTC (rev 42887)
+++ trunk/e/src/bin/e_hints.c	2009-10-05 15:43:46 UTC (rev 42888)
@@ -37,7 +37,7 @@
    roots = ecore_x_window_root_list(&num);
    if (roots)
      {
-	Ecore_X_Atom supported[41];
+	Ecore_X_Atom supported[42];
 	int supported_num, i;
 
 	supported_num = 0;
@@ -114,6 +114,7 @@
 	supported[supported_num++] = ECORE_X_ATOM_NET_WM_PING;
 	supported[supported_num++] = ECORE_X_ATOM_NET_WM_SYNC_REQUEST;
 	supported[supported_num++] = ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER;
+	supported[supported_num++] = ECORE_X_ATOM_MOTIF_WM_HINTS;
 
 	for (i = 0; i < num; i++)
 	  {

Log:
  fake to be mwm
  
Author:       jeffdameth
Date:         2009-10-05 12:34:35 -0700 (Mon, 05 Oct 2009)
New Revision: 42895

Modified:
  trunk/e/src/bin/e_hints.c 

Modified: trunk/e/src/bin/e_hints.c
===================================================================
--- trunk/e/src/bin/e_hints.c	2009-10-05 19:00:47 UTC (rev 42894)
+++ trunk/e/src/bin/e_hints.c	2009-10-05 19:34:35 UTC (rev 42895)
@@ -181,6 +181,10 @@
 
 	     ecore_x_netwm_supported_set(roots[i], supported, supported_num);
 
+	     /* fake mwm, this might crash some ol' motif apps, if
+		they still exist, but at least it makes borderless
+		feature of Eterm and urxvt work... */
+	     ecore_x_atom_get("_MOTIF_WM_INFO");
 	  }
         free(roots);
      }

Log:
  revert: motif_wm_hints does not belong in _net_supported hints
  
Author:       jeffdameth
Date:         2009-10-07 04:27:15 -0700 (Wed, 07 Oct 2009)
New Revision: 42931

Modified:
  trunk/e/src/bin/e_hints.c 

Modified: trunk/e/src/bin/e_hints.c
===================================================================
--- trunk/e/src/bin/e_hints.c	2009-10-07 10:55:48 UTC (rev 42930)
+++ trunk/e/src/bin/e_hints.c	2009-10-07 11:27:15 UTC (rev 42931)
@@ -37,7 +37,7 @@
    roots = ecore_x_window_root_list(&num);
    if (roots)
      {
-	Ecore_X_Atom supported[42];
+	Ecore_X_Atom supported[41];
 	int supported_num, i;
 
 	supported_num = 0;
@@ -114,7 +114,6 @@
 	supported[supported_num++] = ECORE_X_ATOM_NET_WM_PING;
 	supported[supported_num++] = ECORE_X_ATOM_NET_WM_SYNC_REQUEST;
 	supported[supported_num++] = ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER;
-	supported[supported_num++] = ECORE_X_ATOM_MOTIF_WM_HINTS;
 
 	for (i = 0; i < num; i++)
 	  {

Log:
  keep windows in current zone when it requests to be outside an existing zone
  
Author:       jeffdameth
Date:         2009-10-25 08:58:19 -0700 (Sun, 25 Oct 2009)
New Revision: 43271

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-10-25 15:55:11 UTC (rev 43270)
+++ trunk/e/src/bin/e_border.c	2009-10-25 15:58:19 UTC (rev 43271)
@@ -6297,7 +6297,6 @@
    E_Border_Pending_Move_Resize *pnd;
    int rem_change = 0;
    int send_event = 1;
-   int zx, zy, zw, zh;
 
    if (e_object_is_del(E_OBJECT(bd)))
      {
@@ -6305,12 +6304,17 @@
 	bd->changed = 0;
 	return;
      }
-   if (bd->zone)
-     e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
+
    _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_NEW_BORDER, bd);
    
    if (bd->new_client)
      {
+	int zx, zy, zw, zh;
+	zx = zy = zw = zh = 0;
+
+	if (bd->zone)
+	  e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
+
 	if (bd->re_manage)
 	  {
 	     bd->x -= bd->client_inset.l;
@@ -6366,10 +6370,13 @@
 		       bd->x = att->x;
 		       bd->y = att->y;
 		    }
-		  bd->changes.pos = 1;
-		  bd->placed = 1;
+		  if (e_container_zone_at_point_get(bd->zone->container, bd->x, bd->y))
+		    {
+		       bd->changes.pos = 1;
+		       bd->placed = 1;
+		    }
 	       }
-	     else
+	     if (!bd->placed)
 	       {
 		  /* FIXME: special placement for dialogs etc. etc. etc goes
 		   * here */

Log:
  fix possible segv on restart
  
Author:       jeffdameth
Date:         2010-04-11 20:00:50 -0700 (Sun, 11 Apr 2010)
New Revision: 47943

Modified:
  trunk/e/src/bin/e_hints.c 

Modified: trunk/e/src/bin/e_hints.c
===================================================================
--- trunk/e/src/bin/e_hints.c	2010-04-12 02:51:32 UTC (rev 47942)
+++ trunk/e/src/bin/e_hints.c	2010-04-12 03:00:50 UTC (rev 47943)
@@ -137,12 +137,15 @@
 		       if (twin != win) break;
 		       if (ecore_x_netwm_name_get(win, &name))
 			 {
-			    if (strcmp(name, "Enlightenment"))
+			    if (name)
 			      {
+				 if (strcmp(name, "Enlightenment"))
+				   {
+				      free(name);
+				      break;
+				   }
 				 free(name);
-				 break;
 			      }
-			    free(name);
 			 }
 		       ecore_x_sync();
 		       if ((ecore_time_get() - ts) > 2.0)

Log:
  fix last commit. those shouldnt have slipped in..
  
Author:       jeffdameth
Date:         2010-04-20 16:42:57 -0700 (Tue, 20 Apr 2010)
New Revision: 48192

Modified:
  trunk/e/src/bin/e_shelf.c trunk/e/src/bin/e_utils.h 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2010-04-20 23:25:42 UTC (rev 48191)
+++ trunk/e/src/bin/e_shelf.c	2010-04-20 23:42:57 UTC (rev 48192)
@@ -1518,7 +1518,7 @@
       case E_GADCON_ORIENT_FLOAT:
       case E_GADCON_ORIENT_HORIZ:
       case E_GADCON_ORIENT_VERT:
-	 goto end;
+	break;
      }
 
    step = (hide_max / e_config->framerate) / es->cfg->hide_duration;

Modified: trunk/e/src/bin/e_utils.h
===================================================================
--- trunk/e/src/bin/e_utils.h	2010-04-20 23:25:42 UTC (rev 48191)
+++ trunk/e/src/bin/e_utils.h	2010-04-20 23:42:57 UTC (rev 48192)
@@ -71,7 +71,6 @@
 EAPI void         e_util_defer_object_del(E_Object *obj);
 EAPI const char  *e_util_winid_str_get(Ecore_X_Window win);
 EAPI void         e_util_win_auto_resize_fill(E_Win *win);
-EAPI Eina_Bool    e_util_module_config_check(const char *module_name, int required, int version);
 
 EAPI E_Dialog                   *e_util_image_import_settings_new(const char *path, void (*cb)(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode), const void *data);
 EAPI E_Util_Image_Import_Handle *e_util_image_import(const char *image_path, const char *edje_path, const char *edje_group, Eina_Bool external, int quality, E_Image_Import_Mode mode, void (*cb)(void *data, Eina_Bool ok, const char *image_path, const char *edje_path), const void *data);

Log:
  if bindings context is 'any' then action is triggerd twice, for container and for zone. maybe not the best solution but otherwise one would have to create three bindings to get the 'any' behaviour
  
Author:       jeffdameth
Date:         2010-05-01 06:26:10 -0700 (Sat, 01 May 2010)
New Revision: 48499

Modified:
  trunk/e/src/bin/e_bindings.c 

Modified: trunk/e/src/bin/e_bindings.c
===================================================================
--- trunk/e/src/bin/e_bindings.c	2010-05-01 12:40:27 UTC (rev 48498)
+++ trunk/e/src/bin/e_bindings.c	2010-05-01 13:26:10 UTC (rev 48499)
@@ -926,7 +926,8 @@
 static int
 _e_bindings_context_match(E_Binding_Context bctxt, E_Binding_Context ctxt)
 {
-   if (bctxt == E_BINDING_CONTEXT_ANY) return 1;
+   if (bctxt == E_BINDING_CONTEXT_ANY &&
+       !(ctxt == E_BINDING_CONTEXT_ZONE)) return 1;
    if (ctxt == E_BINDING_CONTEXT_UNKNOWN) return 0;
    if (bctxt == ctxt) return 1;
    return 0;

Log:
  fix warnings
  
Author:       jeffdameth
Date:         2010-05-01 06:26:32 -0700 (Sat, 01 May 2010)
New Revision: 48500

Modified:
  trunk/e/src/bin/e_int_gadcon_config.c trunk/e/src/bin/e_int_shelf_config.c 

Modified: trunk/e/src/bin/e_int_gadcon_config.c
===================================================================
--- trunk/e/src/bin/e_int_gadcon_config.c	2010-05-01 13:26:10 UTC (rev 48499)
+++ trunk/e/src/bin/e_int_gadcon_config.c	2010-05-01 13:26:32 UTC (rev 48500)
@@ -280,7 +280,7 @@
         if ((!it->selected) || (it->header)) continue;
         if (!(name = e_widget_ilist_item_value_get(it))) continue;
         if (!(cgc = e_gadcon_client_config_new(cfdata->gc, name))) continue;
-        if (end = e_widget_ilist_item_end_get(it))
+        if ((end = e_widget_ilist_item_end_get(it)))
           edje_object_signal_emit(end, "e,state,checked", "e");
 
         gad = E_NEW(CFGadget, 1);
@@ -328,7 +328,7 @@
              if (strcmp(name, cgc->name)) continue;
 
              /* remove from gadget hash if exists */
-             if (gad = eina_hash_find(cfdata->gadget_hash, cgc->id))
+             if ((gad = eina_hash_find(cfdata->gadget_hash, cgc->id)))
                {
                   eina_hash_del(cfdata->gadget_hash, gad->id, gad);
                   if (gad->name) eina_stringshare_del(gad->name);
@@ -339,7 +339,7 @@
              /* set ilist end toggle if we don't have any more in the hash */
              if (!_search_hash(cfdata, name))
                {
-                  if (end = e_widget_ilist_item_end_get(it))
+                  if ((end = e_widget_ilist_item_end_get(it)))
                     edje_object_signal_emit(end, "e,state,unchecked", "e");
                }
 

Modified: trunk/e/src/bin/e_int_shelf_config.c
===================================================================
--- trunk/e/src/bin/e_int_shelf_config.c	2010-05-01 13:26:10 UTC (rev 48499)
+++ trunk/e/src/bin/e_int_shelf_config.c	2010-05-01 13:26:32 UTC (rev 48500)
@@ -334,7 +334,7 @@
 
    if (cfdata->desk_show_mode) 
      {
-        Eina_List *l, *dl;
+        Eina_List *l;
         const E_Ilist_Item *it;
         int idx = -1;

Log:
  added utility function to check module config version and show dialog when required. works with the common VERSION macros. 
  
Author:       jeffdameth
Date:         2010-05-10 16:44:53 -0700 (Mon, 10 May 2010)
New Revision: 48742

Modified:
  trunk/e/src/bin/e_utils.c trunk/e/src/bin/e_utils.h 

Modified: trunk/e/src/bin/e_utils.c
===================================================================
--- trunk/e/src/bin/e_utils.c	2010-05-10 22:35:42 UTC (rev 48741)
+++ trunk/e/src/bin/e_utils.c	2010-05-10 23:44:53 UTC (rev 48742)
@@ -1475,3 +1475,69 @@
    E_FREE(handle);
 }
 
+static int
+_e_util_conf_timer_old(void *data)
+{
+   char *module_name = data;
+   char buf[4096];
+   char *msg =
+     _("Configuration data needed "
+       "upgrading. Your old configuration<br> has been"
+       " wiped and a new set of defaults initialized. "
+       "This<br>will happen regularly during "
+       "development, so don't report a<br>bug. "
+       "This simply means the module needs "
+       "new configuration<br>data by default for "
+       "usable functionality that your old<br>"
+       "configuration simply lacks. This new set of "
+       "defaults will fix<br>that by adding it in. "
+       "You can re-configure things now to your<br>"
+       "liking. Sorry for the inconvenience.<br>");
+
+   snprintf(buf, sizeof(buf),N_("%s Configuration Updated"), module_name);
+   e_util_dialog_internal(buf, msg);
+   E_FREE(module_name);
+
+   return 0;
+}
+
+static int
+_e_util_conf_timer_new(void *data)
+{
+   char *module_name = data;
+   char buf[4096];
+   char *msg =
+     _("Your module configuration is NEWER "
+       "than the module version. This is "
+       "very<br>strange. This should not happen unless"
+       " you downgraded<br>the module or "
+       "copied the configuration from a place where"
+       "<br>a newer version of the module "
+       "was running. This is bad and<br>as a "
+       "precaution your configuration has been now "
+       "restored to<br>defaults. Sorry for the "
+       "inconvenience.<br>");
+
+   snprintf(buf, sizeof(buf),N_("%s Configuration Updated"), module_name);
+   e_util_dialog_internal(buf, msg);
+   E_FREE(module_name);
+
+   return 0;
+}
+
+EAPI Eina_Bool
+e_util_module_config_check(const char *module_name, int conf, int epoch, int version)
+{
+   if ((conf >> 16) < epoch)
+     {
+	ecore_timer_add(1.0, _e_util_conf_timer_old, strdup(module_name));
+	return EINA_FALSE;
+     }
+   else if (conf > version)
+     {
+	ecore_timer_add(1.0, _e_util_conf_timer_new, strdup(module_name));
+	return EINA_FALSE;
+     }
+
+   return EINA_TRUE;
+}

Modified: trunk/e/src/bin/e_utils.h
===================================================================
--- trunk/e/src/bin/e_utils.h	2010-05-10 22:35:42 UTC (rev 48741)
+++ trunk/e/src/bin/e_utils.h	2010-05-10 23:44:53 UTC (rev 48742)
@@ -71,6 +71,7 @@
 EAPI void         e_util_defer_object_del(E_Object *obj);
 EAPI const char  *e_util_winid_str_get(Ecore_X_Window win);
 EAPI void         e_util_win_auto_resize_fill(E_Win *win);
+EAPI Eina_Bool    e_util_module_config_check(const char *module_name, int conf, int epoch, int version);
 
 EAPI E_Dialog                   *e_util_image_import_settings_new(const char *path, void (*cb)(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode), const void *data);
 EAPI E_Util_Image_Import_Handle *e_util_image_import(const char *image_path, const char *edje_path, const char *edje_group, Eina_Bool external, int quality, E_Image_Import_Mode mode, void (*cb)(void *data, Eina_Bool ok, const char *image_path, const char *edje_path), const void *data);

Log:
  dont skip windows that should only not be shown in taskbar.
  
Author:       jeffdameth
Date:         2010-05-12 11:33:05 -0700 (Wed, 12 May 2010)
New Revision: 48785

Modified:
  trunk/e/src/bin/e_int_menus.c 

Modified: trunk/e/src/bin/e_int_menus.c
===================================================================
--- trunk/e/src/bin/e_int_menus.c	2010-05-12 18:31:27 UTC (rev 48784)
+++ trunk/e/src/bin/e_int_menus.c	2010-05-12 18:33:05 UTC (rev 48785)
@@ -1100,7 +1100,6 @@
      l = e_border_client_list();
    EINA_LIST_FOREACH(l, l, border)
      {
-	if (border->client.netwm.state.skip_taskbar) continue;
 	if (border->user_skip_winlist) continue;
 	if ((border->zone == zone) || (border->iconic) ||
 	    (border->zone != zone && e_config->clientlist_include_all_zones))

Log:
  test if svg loader works, if so add svg to efreet theme supported types
  
Author:       jeffdameth
Date:         2010-05-15 10:56:50 -0700 (Sat, 15 May 2010)
New Revision: 48896

Modified:
  trunk/e/src/bin/e_main.c 

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2010-05-15 17:55:41 UTC (rev 48895)
+++ trunk/e/src/bin/e_main.c	2010-05-15 17:56:50 UTC (rev 48896)
@@ -86,6 +86,7 @@
 static int _e_main_cb_startup_fake_end(void *data __UNUSED__);
 static void _e_main_desk_save(void);
 static void _e_main_desk_restore(E_Manager *man, E_Container *con);
+static void _e_main_test_svg_loader(void);
 
 /* local subsystem globals */
 #define MAX_LEVEL 64
@@ -796,6 +797,7 @@
 	     *list = eina_list_prepend(*list, (void *)eina_stringshare_add(buf));
 	  }
      }
+   _e_main_test_svg_loader();
    efreet_icon_extension_add(".edj");
    TS("efreet paths done");
 
@@ -1663,3 +1665,34 @@
 	e_desk_show(desk);
      }
 }
+
+static void
+_e_main_test_svg_loader(void)
+{
+   Evas_Imaging_Image *tmp;
+   char file[] = "/tmp/e17-1341234234.svg";
+   FILE *fp = fopen(file, "w");
+   if (!fp) return;
+
+   fputs("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"
+	 "<svg xmlns:svg=\"http://www.w3.org/2000/svg\""
+	 " xmlns=\"http://www.w3.org/2000/svg\""
+	 " xmlns:xlink=\"http://www.w3.org/1999/xlink\""
+	 " version=\"1.0\""
+	 " width=\"128\""
+	 " height=\"128\""
+	 " id=\"svg3486\">"
+	 "</svg>", fp);
+   fclose(fp);
+
+   tmp = evas_imaging_image_load (file, NULL);
+   ecore_file_remove(file);
+
+   if (tmp)
+     {
+	evas_imaging_image_free(tmp);
+	efreet_icon_extension_add(".svg");
+	/* prefer png over svg */
+	efreet_icon_extension_add(".png");
+     }
+}

Log:
  fix bug with popups no showing up when using composite. seems to happen only on 'slow' machines
  
Author:       jeffdameth
Date:         2010-05-20 21:30:44 -0700 (Thu, 20 May 2010)
New Revision: 49082

Modified:
  trunk/e/src/bin/e_popup.c 

Modified: trunk/e/src/bin/e_popup.c
===================================================================
--- trunk/e/src/bin/e_popup.c	2010-05-21 04:11:58 UTC (rev 49081)
+++ trunk/e/src/bin/e_popup.c	2010-05-21 04:30:44 UTC (rev 49082)
@@ -85,7 +85,7 @@
    E_OBJECT_TYPE_CHECK(pop, E_POPUP_TYPE);
    if (pop->visible) return;
    pop->visible = 1;
-   if (pop->shaped)
+   if (pop->shaped && !e_config->use_composite)
      {
         ecore_evas_move(pop->ecore_evas,
                         pop->zone->container->manager->w,
@@ -324,8 +324,7 @@
 		   pop->zone->x + pop->x, 
 		   pop->zone->y + pop->y);
 
-   if (!(pop->shaped && e_config->use_composite))
-     e_container_shape_show(pop->shape);
+   e_container_shape_show(pop->shape);
    
    pop->idle_enterer = NULL;
    return 0;

Log:
  fix previous commit
  
Author:       jeffdameth
Date:         2010-05-21 04:30:10 -0700 (Fri, 21 May 2010)
New Revision: 49094

Modified:
  trunk/e/src/bin/e_popup.c 

Modified: trunk/e/src/bin/e_popup.c
===================================================================
--- trunk/e/src/bin/e_popup.c	2010-05-21 11:28:13 UTC (rev 49093)
+++ trunk/e/src/bin/e_popup.c	2010-05-21 11:30:10 UTC (rev 49094)
@@ -98,7 +98,8 @@
    else
      {
         ecore_evas_show(pop->ecore_evas);
-        e_container_shape_show(pop->shape);
+	if (!(pop->shaped && e_config->use_composite))
+	  e_container_shape_show(pop->shape);
      }
 }

Log:
  check strings not null
  
Author:       jeffdameth
Date:         2010-05-27 05:45:41 -0700 (Thu, 27 May 2010)
New Revision: 49230

Modified:
  trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_fm_dbus.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2010-05-27 12:23:39 UTC (rev 49229)
+++ trunk/e/src/bin/e_fm.c	2010-05-27 12:45:41 UTC (rev 49230)
@@ -2563,6 +2563,9 @@
    char *d;
    int l, l1, l2;
 
+   if (!udi || !mountpoint)
+     return 0;
+
    l1 = strlen(udi);
    l2 = strlen(mountpoint);
    l = l1 + 1 + l2 + 1;
@@ -2579,6 +2582,9 @@
    char *d;
    int l, l1;
 
+   if (!udi)
+     return 0;
+
    l1 = strlen(udi);
    l = l1 + 1;
    d = alloca(l);
@@ -2595,6 +2601,9 @@
    char *data;
    int size;
 
+   if (!udi)
+     return 0;
+
    size = strlen(udi) + 1;
    data = alloca(size);
    strcpy(data, udi);

Modified: trunk/e/src/bin/e_fm_dbus.c
===================================================================
--- trunk/e/src/bin/e_fm_dbus.c	2010-05-27 12:23:39 UTC (rev 49229)
+++ trunk/e/src/bin/e_fm_dbus.c	2010-05-27 12:45:41 UTC (rev 49230)
@@ -463,6 +463,7 @@
    EINA_LIST_FOREACH(_e_vols, l, v)
      {
 	if (v->mounted
+	    && v->mount_point
 	    && !strncmp(path, v->mount_point, strlen(v->mount_point))
 	    && v->mounts) 
 	  return eina_list_data_get(v->mounts);

Log:
  fix bottom right and bottom left edge position
  
Author:       jeffdameth
Date:         2010-05-29 11:21:23 -0700 (Sat, 29 May 2010)
New Revision: 49305

Modified:
  trunk/e/src/bin/e_zone.c 

Modified: trunk/e/src/bin/e_zone.c
===================================================================
--- trunk/e/src/bin/e_zone.c	2010-05-29 17:18:17 UTC (rev 49304)
+++ trunk/e/src/bin/e_zone.c	2010-05-29 18:21:23 UTC (rev 49305)
@@ -794,8 +794,9 @@
 			if (!zone->corner.bottom_right)
 			  {
 			     zone->corner.bottom_right = ecore_x_window_input_new(con->win,
-										  zone->x + 1,
+										  zone->x + zone->w - cw - 2,
 										  zone->y + zone->h - 1, cw, 1);
+
 			     ecore_x_window_show(zone->corner.bottom_right);
 			  }
 			break;
@@ -803,7 +804,7 @@
 			if (!zone->corner.bottom_left)
 			  {
 			     zone->corner.bottom_left = ecore_x_window_input_new(con->win,
-										 zone->x + zone->w - cw - 2,
+										 zone->x + 1,
 										 zone->y + zone->h - 1, cw, 1);
 			     ecore_x_window_show(zone->corner.bottom_left);
 			  }

Log:
  allow direct editing of icon name. 
  before it was not possible to set an icon by name and not by path.
  also one has now direct feedback if an icon can be found in theme
  
Author:       jeffdameth
Date:         2010-06-02 12:59:48 -0700 (Wed, 02 Jun 2010)
New Revision: 49398

Modified:
  trunk/e/src/bin/e_eap_editor.c 

Modified: trunk/e/src/bin/e_eap_editor.c
===================================================================
--- trunk/e/src/bin/e_eap_editor.c	2010-06-02 19:30:54 UTC (rev 49397)
+++ trunk/e/src/bin/e_eap_editor.c	2010-06-02 19:59:48 UTC (rev 49398)
@@ -26,6 +26,7 @@
 
    char *orig_path; /* informational only */
    Evas_Object *orig_path_entry; /* to set when info changes */
+   Evas_Object *icon_entry; /* to set when icon changes */
 
    /* speed up check_changed tests */
    Eina_Bool changed_categories;
@@ -54,6 +55,7 @@
 static void         _e_desktop_edit_cb_exec_select_cancel(void *data, E_Dialog *dia);
 static void         _e_desktop_editor_exec_update(E_Config_Dialog_Data *cfdata);
 static void         _e_desktop_edit_select_cb(void *data, Evas_Object *obj);
+static void         _e_desktop_editor_icon_entry_changed(void *data, Evas_Object *obj);
 
 #define IFADD(src, dst) if (src) dst = eina_stringshare_add(src); else dst = NULL
 #define IFDEL(src) if (src) eina_stringshare_del(src);  src = NULL;
@@ -611,6 +613,13 @@
 }
 
 static void
+_e_desktop_editor_icon_entry_changed(void *data, Evas_Object *obj __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   _e_desktop_editor_icon_update(cfdata);
+}
+
+static void
 _e_desktop_editor_mimes_changed(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata = data;
@@ -665,17 +674,28 @@
    e_widget_toolbook_page_append
      (otb, NULL, _("Basic"), ol, 1, 0, 1, 0, 0.5, 0.0);
 
-   e_widget_size_min_get(ol, &mw, &mh);
+   /* e_widget_size_min_get(ol, &mw, &mh); */
 
+   ol = e_widget_list_add(evas, 0, 0);
+   
    editor->img_widget = e_widget_button_add
      (evas, "", NULL, _e_desktop_editor_cb_icon_select, cfdata, editor);
    _e_desktop_editor_icon_update(cfdata);
-   e_widget_size_min_set(editor->img_widget, 128, 128);
+   e_widget_size_min_set(editor->img_widget, 192, 192);
 
-   e_widget_toolbook_page_append
-     (otb, NULL, _("Icon"), editor->img_widget, 0, 0, 0, 0, 0.5, 0.5);
+   e_widget_list_object_append(ol, editor->img_widget, 1, 0, 0.0);
 
+   o = e_widget_label_add(evas, _("Icon"));
+   e_widget_list_object_append(ol, o, 1, 0, 0.0);
 
+   o = e_widget_entry_add(evas, &(cfdata->icon), NULL, NULL, NULL);
+   cfdata->icon_entry = o;
+   e_widget_on_change_hook_set(o, _e_desktop_editor_icon_entry_changed, cfdata);
+   e_widget_list_object_append(ol, o, 1, 0, 0.0);
+
+   e_widget_toolbook_page_append
+     (otb, NULL, _("Icon"), ol, 0, 0, 0, 0, 0.5, 0.5);
+   
    ol = e_widget_list_add(evas, 0, 0);
 
    o = e_widget_label_add(evas, _("Generic Name"));
@@ -896,6 +916,7 @@
 
    IFFREE(cfdata->icon);
    IFDUP(file, cfdata->icon);
+   e_widget_entry_text_set(cfdata->icon_entry, cfdata->icon);
 
    _e_desktop_edit_cb_icon_select_cancel(data, dia);
 }
@@ -917,7 +938,7 @@
    Evas_Object *o;
 
    if (!cfdata->editor->img_widget) return;
-   o = e_util_icon_theme_icon_add(cfdata->icon, 32, cfdata->editor->evas);
+   o = e_util_icon_theme_icon_add(cfdata->icon, 128, cfdata->editor->evas);
 
    /* NB this takes care of freeing any previous icon object */
    e_widget_button_icon_set(cfdata->editor->img_widget, o);

Log:
add __UNUSED__
  

Author:       jeffdameth
Date:         2011-01-25 10:20:13 -0800 (Tue, 25 Jan 2011)
New Revision: 56300
Trac:         http://trac.enlightenment.org/e/changeset/56300

Modified:
  trunk/e/src/bin/e_actions.c 

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2011-01-25 12:57:09 UTC (rev 56299)
+++ trunk/e/src/bin/e_actions.c	2011-01-25 18:20:13 UTC (rev 56300)
@@ -1597,7 +1597,7 @@
 
 /***************************************************************************/
 static void
-_e_actions_cb_menu_end(void *data, E_Menu *m)
+_e_actions_cb_menu_end(void *data __UNUSED__, E_Menu *m)
 {
    e_object_del(E_OBJECT(m));
 }
@@ -1784,7 +1784,7 @@
 static E_Dialog *exit_dialog = NULL;
 
 static void
-_e_actions_cb_exit_dialog_ok(void *data, E_Dialog *dia)
+_e_actions_cb_exit_dialog_ok(void *data __UNUSED__, E_Dialog *dia)
 {
    if (dia)
      {
@@ -1795,7 +1795,7 @@
 }
 
 static void
-_e_actions_cb_exit_dialog_cancel(void *data, E_Dialog *dia)
+_e_actions_cb_exit_dialog_cancel(void *data __UNUSED__, E_Dialog *dia)
 {
    e_object_del(E_OBJECT(exit_dialog));
    exit_dialog = NULL;
@@ -1881,7 +1881,7 @@
 static E_Dialog *logout_dialog = NULL;
 
 static void
-_e_actions_cb_logout_dialog_ok(void *data, E_Dialog *dia)
+_e_actions_cb_logout_dialog_ok(void *data __UNUSED__, E_Dialog *dia)
 {
    if (dia)
      {
@@ -1892,7 +1892,7 @@
 }
 
 static void
-_e_actions_cb_logout_dialog_cancel(void *data, E_Dialog *dia)
+_e_actions_cb_logout_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__)
 {
    e_object_del(E_OBJECT(logout_dialog));
    logout_dialog = NULL;
@@ -1944,7 +1944,7 @@
 static E_Dialog *halt_dialog = NULL;
 
 static void
-_e_actions_cb_halt_dialog_ok(void *data, E_Dialog *dia)
+_e_actions_cb_halt_dialog_ok(void *data __UNUSED__, E_Dialog *dia)
 {
    if (dia)
      {
@@ -1955,7 +1955,7 @@
 }
 
 static void
-_e_actions_cb_halt_dialog_cancel(void *data, E_Dialog *dia)
+_e_actions_cb_halt_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__)
 {
    e_object_del(E_OBJECT(halt_dialog));
    halt_dialog = NULL;
@@ -2007,7 +2007,7 @@
 static E_Dialog *reboot_dialog = NULL;
 
 static void
-_e_actions_cb_reboot_dialog_ok(void *data, E_Dialog *dia)
+_e_actions_cb_reboot_dialog_ok(void *data __UNUSED__, E_Dialog *dia)
 {
    if (dia)
      {
@@ -2018,7 +2018,7 @@
 }
 
 static void
-_e_actions_cb_reboot_dialog_cancel(void *data, E_Dialog *dia)
+_e_actions_cb_reboot_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__)
 {
    e_object_del(E_OBJECT(reboot_dialog));
    reboot_dialog = NULL;
@@ -2070,7 +2070,7 @@
 static E_Dialog *suspend_dialog = NULL;
 
 static void
-_e_actions_cb_suspend_dialog_ok(void *data, E_Dialog *dia)
+_e_actions_cb_suspend_dialog_ok(void *data __UNUSED__, E_Dialog *dia)
 {
    if (dia)
      {
@@ -2081,7 +2081,7 @@
 }
 
 static void
-_e_actions_cb_suspend_dialog_cancel(void *data, E_Dialog *dia)
+_e_actions_cb_suspend_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__)
 {
    e_object_del(E_OBJECT(suspend_dialog));
    suspend_dialog = NULL;
@@ -2138,7 +2138,7 @@
 static E_Dialog *hibernate_dialog = NULL;
 
 static void
-_e_actions_cb_hibernate_dialog_ok(void *data, E_Dialog *dia)
+_e_actions_cb_hibernate_dialog_ok(void *data __UNUSED__, E_Dialog *dia)
 {
    if (dia)
      {
@@ -2149,7 +2149,7 @@
 }
 
 static void
-_e_actions_cb_hibernate_dialog_cancel(void *data, E_Dialog *dia)
+_e_actions_cb_hibernate_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__)
 {
    e_object_del(E_OBJECT(hibernate_dialog));
    hibernate_dialog = NULL;
@@ -2479,7 +2479,7 @@
 }
 
 static void
-_delayed_action_key_del(E_Object *obj, const char *params, Ecore_Event_Key *ev)
+_delayed_action_key_del(E_Object *obj, const char *params __UNUSED__, Ecore_Event_Key *ev)
 {
    Eina_List *l;
    Delayed_Action *da;
@@ -2516,7 +2516,7 @@
 }
 
 static void
-_delayed_action_mouse_del(E_Object *obj, const char *params, Ecore_Event_Mouse_Button *ev)
+_delayed_action_mouse_del(E_Object *obj, const char *params __UNUSED__, Ecore_Event_Mouse_Button *ev)
 {
    Eina_List *l;
    Delayed_Action *da;

Log:
fix loop in fm favorites view: delete .desktop for non existing device
  

Author:       jeffdameth
Date:         2011-02-04 12:33:30 -0800 (Fri, 04 Feb 2011)
New Revision: 56715
Trac:         http://trac.enlightenment.org/e/changeset/56715

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-02-04 18:28:01 UTC (rev 56714)
+++ trunk/e/src/bin/e_fm.c	2011-02-04 20:33:30 UTC (rev 56715)
@@ -4973,7 +4973,12 @@
                   if ((!e_fm2_device_storage_find(ic->info.link)) &&
                       (!e_fm2_device_volume_find(ic->info.link)))
                     {
-                       _e_fm2_live_file_del(ic->sd->obj, ic->info.file);
+		       /* delete .desktop for non existing device */
+		       if (ecore_file_remove(buf))
+			 _e_fm2_live_file_del(ic->sd->obj, ic->info.file);
+		       else /* ignore */
+			 _e_fm2_file_del(ic->sd->obj, ic->info.file);
+
                        efreet_desktop_free(desktop);
                        goto error;
                     }

Log:
do not crop labels at bottom: add extra space in icon-view mode
  

Author:       jeffdameth
Date:         2011-02-08 13:30:48 -0800 (Tue, 08 Feb 2011)
New Revision: 56821
Trac:         http://trac.enlightenment.org/e/changeset/56821

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-02-08 21:00:16 UTC (rev 56820)
+++ trunk/e/src/bin/e_fm.c	2011-02-08 21:30:48 UTC (rev 56821)
@@ -3,6 +3,7 @@
 #include "e_fm_op.h"
 
 #define OVERCLIP 128
+#define ICON_BOTTOM_SPACE 100
 
 /* in order to check files (ie: extensions) use simpler and faster
  * strcasecmp version that instead of checking case for each
@@ -4098,24 +4099,29 @@
      {
       case E_FM2_VIEW_MODE_ICONS:
         _e_fm2_icons_place_icons(sd);
+	sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_GRID_ICONS:
         _e_fm2_icons_place_grid_icons(sd);
+	sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_CUSTOM_ICONS:
         _e_fm2_icons_place_custom_icons(sd);
+	sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS:
         /* FIXME: not going to implement this at this stage */
         _e_fm2_icons_place_custom_grid_icons(sd);
+	sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS:
         /* FIXME: not going to implement this at this stage */
         _e_fm2_icons_place_custom_smart_grid_icons(sd);
+	sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_LIST:
@@ -5103,7 +5109,7 @@
 
         if (
           ((ic->y - ic->sd->pos.y) >= 0) &&
-          ((ic->y + ic->h - ic->sd->pos.y) <= (ic->sd->h)) &&
+          ((ic->y + ic->h + ICON_BOTTOM_SPACE - ic->sd->pos.y) <= (ic->sd->h)) &&
           ((ic->x - ic->sd->pos.x) >= 0) &&
           ((ic->x + ic->w - ic->sd->pos.x) <= (ic->sd->w))
           )
@@ -5116,8 +5122,8 @@
         y = ic->sd->pos.y;
         if ((ic->y - ic->sd->pos.y) < 0)
           y = ic->y;
-        else if ((ic->y + ic->h - ic->sd->pos.y) > (ic->sd->h))
-          y = ic->y + ic->h - ic->sd->h;
+        else if ((ic->y + ic->h + ICON_BOTTOM_SPACE - ic->sd->pos.y) > (ic->sd->h))
+          y = ic->y + ic->h + ICON_BOTTOM_SPACE - ic->sd->h;
         e_fm2_pan_set(ic->sd->obj, x, y);
      }
    evas_object_smart_callback_call(ic->sd->obj, "pan_changed", NULL);
@@ -6514,6 +6520,7 @@
           {
              if (!ic->selected) sel_change = EINA_TRUE;
              _e_fm2_icon_select(ic);
+	     _e_fm2_icon_make_visible(ic);
              ic->down_sel = EINA_TRUE;
              ic->last_selected = EINA_TRUE;
           }

Log:
efm add keybindings:
  - ctrl+h toggle show hidden files
  - ctrl+1 icon view
  - ctrl+2 list view
  - ctrl+3 custom grid view
  

Author:       jeffdameth
Date:         2011-02-09 05:12:38 -0800 (Wed, 09 Feb 2011)
New Revision: 56839
Trac:         http://trac.enlightenment.org/e/changeset/56839

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-02-09 08:40:39 UTC (rev 56838)
+++ trunk/e/src/bin/e_fm.c	2011-02-09 13:12:38 UTC (rev 56839)
@@ -6928,6 +6928,43 @@
              _e_fm2_file_paste(obj);
              return;
           }
+        else if (!strcmp(ev->key, "h"))
+          {
+	     if (sd->show_hidden_files)
+	       sd->show_hidden_files = EINA_FALSE;
+	     else
+	       sd->show_hidden_files = EINA_TRUE;
+	     sd->inherited_dir_props = EINA_FALSE;
+	     _e_fm2_refresh(data, NULL, NULL);
+             return;
+          }
+        else if (!strcmp(ev->key, "1"))
+          {
+	     if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_GRID_ICONS)
+	       return;
+	     sd->view_mode = E_FM2_VIEW_MODE_GRID_ICONS;
+	     sd->inherited_dir_props = EINA_FALSE;
+	     _e_fm2_refresh(sd, NULL, NULL);
+	     return;
+	  }
+        else if (!strcmp(ev->key, "2"))
+          {
+	     if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_LIST)
+	       return;
+	     sd->view_mode = E_FM2_VIEW_MODE_LIST;
+	     sd->inherited_dir_props = EINA_FALSE;
+	     _e_fm2_refresh(sd, NULL, NULL);
+	     return;
+	  }
+        else if (!strcmp(ev->key, "3"))
+          {
+	     if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_CUSTOM_ICONS)
+	       return;
+	     sd->view_mode = E_FM2_VIEW_MODE_CUSTOM_ICONS;
+	     sd->inherited_dir_props = EINA_FALSE;
+	     _e_fm2_refresh(sd, NULL, NULL);
+	     return;
+	  }
      }
 
    if (!strcmp(ev->key, "Left"))

Log:
fix deskpreview widget (dont expand over tablesize) and use theme again
  

Author:       jeffdameth
Date:         2011-02-10 09:08:07 -0800 (Thu, 10 Feb 2011)
New Revision: 56927
Trac:         http://trac.enlightenment.org/e/changeset/56927

Modified:
  trunk/e/src/bin/e_widget_deskpreview.c 

Modified: trunk/e/src/bin/e_widget_deskpreview.c
===================================================================
--- trunk/e/src/bin/e_widget_deskpreview.c	2011-02-10 16:50:18 UTC (rev 56926)
+++ trunk/e/src/bin/e_widget_deskpreview.c	2011-02-10 17:08:07 UTC (rev 56927)
@@ -37,8 +37,7 @@
    e_widget_del_hook_set(obj, _e_wid_del_hook);
 
    wd->table = evas_object_table_add(evas);
-   evas_object_table_homogeneous_set(wd->table, EINA_TRUE);
-   evas_object_table_padding_set(wd->table, 1, 1);
+   evas_object_table_padding_set(wd->table, 0, 0);
    evas_object_table_align_set(wd->table, 0.5, 0.5);
    e_widget_resize_object_set(wd->obj, wd->table);
    evas_object_show(wd->table);
@@ -79,15 +78,20 @@
    dd->x = x;
    dd->y = y;
 
-   dd->icon = e_icon_add(evas_object_evas_get(obj));
-   evas_object_data_set(dd->icon, "desk_data", dd);
-   e_icon_fill_inside_set(dd->icon, EINA_FALSE);
-   e_icon_file_edje_set(dd->icon, bgfile, "e/desktop/background");
+   dd->icon = edje_object_add(evas_object_evas_get(obj));
+   e_theme_edje_object_set(dd->icon, "base/theme/widgets",
+			   "e/widgets/deskpreview/desk");
+
+   dd->thumb = e_icon_add(evas_object_evas_get(obj));
+   e_icon_fill_inside_set(dd->thumb, EINA_FALSE);
+   e_icon_file_edje_set(dd->thumb, bgfile, "e/desktop/background");
+   evas_object_show(dd->thumb);
+   edje_object_part_swallow(dd->icon, "e.swallow.content", dd->thumb); 
+
    evas_object_size_hint_min_set(dd->icon, w, h);
    evas_object_size_hint_max_set(dd->icon, w, h);
-   evas_object_resize(dd->icon, w, h);
    evas_object_show(dd->icon);
-
+   evas_object_data_set(dd->icon, "desk_data", dd);
    evas_object_event_callback_add(dd->icon, EVAS_CALLBACK_MOUSE_DOWN, 
                                   _e_wid_desk_cb_config, dd);
 
@@ -109,6 +113,7 @@
         E_Widget_Desk_Data *dd;
 
         if (!(dd = evas_object_data_get(o, "desk_data"))) continue;
+	evas_object_del(dd->thumb);
         evas_object_del(o);
         E_FREE(dd);
      }
@@ -119,57 +124,53 @@
 static void 
 _e_wid_reconfigure(E_Widget_Data *wd) 
 {
-   Eina_List *l, *del = NULL;
+   Eina_List *l, *ll;
    Evas_Object *dw;
    E_Zone *zone;
-   int tw, th, mw, mh, y;
-
+   int tw, th, mw, mh, x, y;
+   E_Widget_Desk_Data *dd;
+   
    zone = e_util_zone_current_get(e_manager_current_get());
 
    evas_object_geometry_get(wd->table, NULL, NULL, &tw, &th);
 
-   if (wd->dy >= wd->dx) 
+   if (wd->dy > wd->dx) 
      {
         mh = th / wd->dy;
         mw = (mh * zone->w) / zone->h;
      }
-   else 
+   else if (wd->dy < wd->dx) 
      {
         mw = tw / wd->dx;
         mh = (mw * zone->h) / zone->w;
      }
-
-   if (mw > tw) 
+   else 
      {
-        mw = (tw * zone->h) / zone->w;
-        mh = (mw * zone->h) / zone->w;
+   	mw = tw / wd->dx;
+   	mh = th / wd->dy;
      }
-   if (mh > th) 
+   
+   if (mw > tw/wd->dx) 
+     mw = (tw * zone->h) / zone->w;
+   if (mh > th/wd->dy) 
+     mh = (th * zone->w) / zone->h;
+   
+   EINA_LIST_FOREACH_SAFE(wd->desks, l, ll, dw) 
      {
-        mh = (th * zone->w) / zone->h;
-        mw = (mh * zone->w) / zone->h;
-     }
-
-   EINA_LIST_FOREACH(wd->desks, l, dw) 
-     {
-        E_Widget_Desk_Data *dd;
-
         if (!(dd = evas_object_data_get(dw, "desk_data"))) continue;
         if ((dd->x < wd->dx) && (dd->y < wd->dy)) 
           {
              evas_object_size_hint_min_set(dw, mw, mh);
              evas_object_size_hint_max_set(dw, mw, mh);
-             evas_object_resize(dw, mw, mh);
           }
         else
-          del = eina_list_append(del, dw);
+	  {
+	     evas_object_del(dd->thumb);
+	     evas_object_del(dw);
+	     wd->desks = eina_list_remove(wd->desks, dw);
+	     E_FREE(dd);     
+	  }	
      }
-   EINA_LIST_FREE(del, dw) 
-     {
-        evas_object_table_unpack(wd->table, dw);
-        evas_object_del(dw);
-        wd->desks = eina_list_remove(wd->desks, dw);
-     }
 
    for (y = 0; y < wd->dy; y++) 
      {
@@ -182,6 +183,7 @@
              Evas_Object *dw;
 
              dw = e_widget_deskpreview_desk_add(wd->obj, zone, x, y, mw, mh);
+	     evas_object_size_hint_aspect_set(dw, EVAS_ASPECT_CONTROL_BOTH, zone->w, zone->h);
              evas_object_table_pack(wd->table, dw, x, y, 1, 1);
              wd->desks = eina_list_append(wd->desks, dw);
           }
@@ -245,7 +247,7 @@
              const char *bgfile;
 
              bgfile = e_bg_file_get(dd->con, dd->zone, dd->x, dd->y);
-             e_icon_file_edje_set(dd->icon, bgfile, "e/desktop/background");
+             e_icon_file_edje_set(dd->thumb, bgfile, "e/desktop/background");
           }
      }

Log:
set preferred size when loading svg icons
  

Author:       jeffdameth
Date:         2011-02-14 06:05:45 -0800 (Mon, 14 Feb 2011)
New Revision: 57018
Trac:         http://trac.enlightenment.org/e/changeset/57018

Modified:
  trunk/e/src/bin/e_utils.c 

Modified: trunk/e/src/bin/e_utils.c
===================================================================
--- trunk/e/src/bin/e_utils.c	2011-02-14 13:59:36 UTC (rev 57017)
+++ trunk/e/src/bin/e_utils.c	2011-02-14 14:05:45 UTC (rev 57018)
@@ -62,6 +62,7 @@
 
 static Eina_Bool _e_util_image_import_exit(void *data, int type __UNUSED__, void *event);
 static void _e_util_image_import_handle_free(E_Util_Image_Import_Handle *handle);
+static Evas_Object *_e_util_icon_add(const char *path, Evas *evas, int size);
 
 /* local subsystem globals */
 static Ecore_Timer *_e_util_dummy_timer = NULL;
@@ -953,27 +954,7 @@
 EAPI Evas_Object *
 e_util_icon_add(const char *path, Evas *evas)
 {
-   Evas_Object *o = NULL;
-   const char *ext;
-
-   if (!path) return NULL;
-   if (!ecore_file_exists(path)) return NULL;
-
-   o = e_icon_add(evas);
-   e_icon_preload_set(o, 1);
-   ext = strrchr(path, '.');
-   if (ext)
-     {
-	if (!strcmp(ext, ".edj"))
-	  e_icon_file_edje_set(o, path, "icon");
-	else
-	  e_icon_file_set(o, path);
-     }
-   else
-     e_icon_file_set(o, path);
-   e_icon_fill_inside_set(o, 1);
-
-   return o;
+   return _e_util_icon_add(path, evas, 64); 
 }
 
 EAPI Evas_Object *
@@ -996,7 +977,7 @@
 	path = efreet_icon_path_find(e_config->icon_theme, icon_name, size);
 	if (path)
 	  {
-	     obj = e_util_icon_add(path, evas);
+	     obj = _e_util_icon_add(path, evas, size);
 	     return obj;
 	  }
      }
@@ -1428,6 +1409,34 @@
 }
 
 /* local subsystem functions */
+
+static Evas_Object *
+_e_util_icon_add(const char *path, Evas *evas, int size)
+{
+   Evas_Object *o = NULL;
+   const char *ext;
+
+   if (!path) return NULL;
+   if (!ecore_file_exists(path)) return NULL;
+
+   o = e_icon_add(evas);
+   e_icon_scale_size_set(o, size); 
+   e_icon_preload_set(o, 1);
+   ext = strrchr(path, '.');
+   if (ext)
+     {
+	if (!strcmp(ext, ".edj"))
+	  e_icon_file_edje_set(o, path, "icon");
+	else
+	  e_icon_file_set(o, path);
+     }
+   else
+     e_icon_file_set(o, path);
+   e_icon_fill_inside_set(o, 1);
+
+   return o;
+}
+
 static Eina_Bool
 _e_util_cb_delayed_del(void *data)
 {

Log:
- remove deprecated e_util_menu_item_edje_icon_set
  - change default icon lookup order from 
    user theme > default theme > fdo theme to
    user theme > fdo theme > default theme
  

Author:       jeffdameth
Date:         2011-02-16 15:47:06 -0800 (Wed, 16 Feb 2011)
New Revision: 57105
Trac:         http://trac.enlightenment.org/e/changeset/57105

Modified:
  trunk/e/src/bin/e_theme.c trunk/e/src/bin/e_theme.h trunk/e/src/bin/e_utils.c trunk/e/src/bin/e_utils.h 

Modified: trunk/e/src/bin/e_theme.c
===================================================================
--- trunk/e/src/bin/e_theme.c	2011-02-16 21:58:31 UTC (rev 57104)
+++ trunk/e/src/bin/e_theme.c	2011-02-16 23:47:06 UTC (rev 57105)
@@ -165,8 +165,8 @@
    return e_theme_edje_object_set(o, buf, group);
 }
 
-EAPI const char *
-e_theme_edje_file_get(const char *category, const char *group)
+const char *
+_e_theme_edje_file_get(const char *category, const char *group, Eina_Bool fallback_icon)
 {
    E_Theme_Result *res;
    char buf[4096];
@@ -176,6 +176,13 @@
    /* find category -> edje mapping */
    _e_theme_category_register(category);
    res = eina_hash_find(mappings, category);
+
+   if (e_config->icon_theme &&
+       (!fallback_icon) &&
+       (!strcmp(category, "base")) &&
+       (!strncmp(group, "e/icons", 7)))
+     return "";
+
    if (res)
      {
 	const char *str;
@@ -208,8 +215,9 @@
 		       const char *col;
 
 		       res->quickfind = eina_hash_string_superfast_new(NULL);
-		       /* great a quick find hash of all group entires */
+		       /* create a quick find hash of all group entries */
 		       coll = edje_file_collection_list(str);
+
 		       EINA_LIST_FOREACH(coll, l, col)
 			 {
 			    q = eina_stringshare_add(col);
@@ -247,6 +255,18 @@
    return e_theme_edje_file_get(buf, group);
 }
 
+EAPI const char *
+e_theme_edje_file_get(const char *category, const char *group)
+{
+   return _e_theme_edje_file_get(category, group, EINA_FALSE);
+}
+
+EAPI const char *
+e_theme_edje_icon_fallback_file_get(const char *group)
+{
+   return _e_theme_edje_file_get("base", group, EINA_TRUE);
+}
+
 /*
  * this is used to set the theme for a CATEGORY of E17. "base" is always set
  * to the default theme - because if a selected theme wants "base/theme", but

Modified: trunk/e/src/bin/e_theme.h
===================================================================
--- trunk/e/src/bin/e_theme.h	2011-02-16 21:58:31 UTC (rev 57104)
+++ trunk/e/src/bin/e_theme.h	2011-02-16 23:47:06 UTC (rev 57105)
@@ -8,6 +8,7 @@
 
 EAPI int         e_theme_edje_object_set(Evas_Object *o, const char *category, const char *group);
 EAPI const char *e_theme_edje_file_get(const char *category, const char *group);
+EAPI const char *e_theme_edje_icon_fallback_file_get(const char *group);
 EAPI void        e_theme_file_set(const char *category, const char *file);
 
 EAPI int             e_theme_config_set(const char *category, const char *file);

Modified: trunk/e/src/bin/e_utils.c
===================================================================
--- trunk/e/src/bin/e_utils.c	2011-02-16 21:58:31 UTC (rev 57104)
+++ trunk/e/src/bin/e_utils.c	2011-02-16 23:47:06 UTC (rev 57105)
@@ -418,19 +418,25 @@
 }
 
 static int
-_e_util_icon_theme_set(Evas_Object *obj, const char *icon)
+_e_util_icon_theme_set(Evas_Object *obj, const char *icon, Eina_Bool fallback)
 {
    const char *file;
    char buf[PATH_MAX];
 
    if ((!icon) || (!icon[0])) return 0;
    snprintf(buf, sizeof(buf), "e/icons/%s", icon);
-   file = e_theme_edje_file_get("base/theme/icons", buf);
+
+   if (fallback)
+     file = e_theme_edje_icon_fallback_file_get(buf);
+   else
+     file = e_theme_edje_file_get("base/theme/icons", buf);
+
    if (file[0])
      {
 	e_icon_file_edje_set(obj, file, buf);
 	return 1;
      }
+
    return 0;
 }
 
@@ -455,33 +461,40 @@
      {
 	if (_e_util_icon_fdo_set(obj, icon))
 	  return 1;
-	return _e_util_icon_theme_set(obj, icon);
+	if (_e_util_icon_theme_set(obj, icon, EINA_FALSE))
+	  return 1;
+	return _e_util_icon_theme_set(obj, icon, EINA_TRUE);
      }
    else
      {
-	if (_e_util_icon_theme_set(obj, icon))
+	if (_e_util_icon_theme_set(obj, icon, EINA_FALSE))
 	  return 1;
-	return _e_util_icon_fdo_set(obj, icon);
+	if (_e_util_icon_fdo_set(obj, icon))
+	  return 1;
+	return _e_util_icon_theme_set(obj, icon, EINA_TRUE);
      }
 }
 
-/* WARNING This function is deprecated, You should
- * use e_util_menu_item_theme_icon_set() instead.
- * It provide fallback (e theme <-> fdo theme) in both direction */
-EAPI int
-e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name)
+int
+_e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name, Eina_Bool fallback)
 {
    const char *file;
    char buf[PATH_MAX];
 
    if ((!name) || (!name[0])) return 0;
-   if (name[0]=='/' && ecore_file_exists(name))
+
+   if ((!fallback) && (name[0]=='/') && ecore_file_exists(name))
      {
 	e_menu_item_icon_edje_set(mi, name, "icon");
 	return 1;
      }
    snprintf(buf, sizeof(buf), "e/icons/%s", name);
-   file = e_theme_edje_file_get("base/theme/icons", buf);
+
+   if (fallback)
+     file = e_theme_edje_icon_fallback_file_get(buf);
+   else
+     file = e_theme_edje_file_get("base/theme/icons", buf);
+
    if (file[0])
      {
 	e_menu_item_icon_edje_set(mi, file, buf);
@@ -526,13 +539,17 @@
      {
 	if (_e_util_menu_item_fdo_icon_set(mi, icon))
 	  return 1;
-	return e_util_menu_item_edje_icon_set(mi, icon);
+	if (_e_util_menu_item_edje_icon_set(mi, icon, EINA_FALSE))
+	  return 1;
+	return _e_util_menu_item_edje_icon_set(mi, icon, EINA_TRUE);
      }
    else
      {
-	if (e_util_menu_item_edje_icon_set(mi, icon))
+	if (_e_util_menu_item_edje_icon_set(mi, icon, EINA_FALSE))
 	  return 1;
-	return _e_util_menu_item_fdo_icon_set(mi, icon);
+	if (_e_util_menu_item_fdo_icon_set(mi, icon))
+	  return 1;
+	return _e_util_menu_item_edje_icon_set(mi, icon, EINA_TRUE);
      }
 }
 

Modified: trunk/e/src/bin/e_utils.h
===================================================================
--- trunk/e/src/bin/e_utils.h	2011-02-16 21:58:31 UTC (rev 57104)
+++ trunk/e/src/bin/e_utils.h	2011-02-16 23:47:06 UTC (rev 57105)
@@ -44,7 +44,6 @@
 EAPI int          e_util_edje_icon_check(const char *name);
 EAPI int          e_util_edje_icon_set(Evas_Object *obj, const char *name);
 EAPI int          e_util_icon_theme_set(Evas_Object *obj, const char *icon);
-EAPI int          e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name);
 EAPI unsigned int e_util_icon_size_normalize(unsigned int desired);
 EAPI int          e_util_menu_item_theme_icon_set(E_Menu_Item *mi, const char *icon);
 EAPI E_Container *e_util_container_window_find(Ecore_X_Window win);

Log:
 e_util_icon_theme_set: use e_icon_scale_size_set to request fdo icon size
  

Author:       jeffdameth
Date:         2011-02-17 12:21:02 -0800 (Thu, 17 Feb 2011)
New Revision: 57136
Trac:         http://trac.enlightenment.org/e/changeset/57136

Modified:
  trunk/e/src/bin/e_utils.c 

Modified: trunk/e/src/bin/e_utils.c
===================================================================
--- trunk/e/src/bin/e_utils.c	2011-02-17 20:12:43 UTC (rev 57135)
+++ trunk/e/src/bin/e_utils.c	2011-02-17 20:21:02 UTC (rev 57136)
@@ -445,15 +445,18 @@
 {
    const char *path = NULL;
    unsigned int size;
-
+   
    if ((!icon) || (!icon[0])) return 0;
-   size = e_util_icon_size_normalize(48 * e_scale);
+   size = e_icon_scale_size_get(obj);
+   if (size < 16) size = 16;
+   size = e_util_icon_size_normalize(size * e_scale);
    path = efreet_icon_path_find(e_config->icon_theme, icon, size);
    if (!path) return 0;
    e_icon_file_set(obj, path);
    return 1;
 }
 
+/* use e_icon_size_scale_set(obj, size) to set the preferred icon size */
 EAPI int
 e_util_icon_theme_set(Evas_Object *obj, const char *icon)
 {

Log:
e17/fm: select next item after deleting a file
  

Author:       jeffdameth
Date:         2011-02-23 02:18:41 -0800 (Wed, 23 Feb 2011)
New Revision: 57258
Trac:         http://trac.enlightenment.org/e/changeset/57258

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-02-23 09:33:24 UTC (rev 57257)
+++ trunk/e/src/bin/e_fm.c	2011-02-23 10:18:41 UTC (rev 57258)
@@ -9504,7 +9504,7 @@
 static void
 _e_fm2_file_delete_yes_cb(void *data, E_Dialog *dialog)
 {
-   E_Fm2_Icon *ic;
+   E_Fm2_Icon *ic, *ic_next;
    char buf[PATH_MAX];
    char *files = NULL;
    size_t size = 0;
@@ -9516,11 +9516,15 @@
    ic->dialog = NULL;
 
    e_object_del(E_OBJECT(dialog));
+   ic_next = _e_fm2_icon_next_find(ic->sd->obj, 1, NULL, NULL); 
    sel = e_fm2_selected_list_get(ic->sd->obj);
    if (sel && (eina_list_count(sel) != 1))
      {
         EINA_LIST_FOREACH(sel, l, ici)
           {
+	     if (&(ic_next->info) == ici)
+	       ic_next = NULL;
+	     
              snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath, ici->file);
              if (e_filereg_file_protected(buf)) continue;
 
@@ -9542,6 +9546,13 @@
 
    free(files);
 
+   if (ic_next)
+     {
+	_e_fm2_icon_select(ic_next);
+	evas_object_smart_callback_call(ic_next->sd->obj, "selection_change", NULL);
+	_e_fm2_icon_make_visible(ic_next);
+     }
+   
    evas_object_smart_callback_call(ic->sd->obj, "files_deleted", NULL);
 }

Log:
e17/fm: fix last commit. 
  
  it's possible that ic_next could be NULL
  

Author:       jeffdameth
Date:         2011-02-23 02:37:17 -0800 (Wed, 23 Feb 2011)
New Revision: 57260
Trac:         http://trac.enlightenment.org/e/changeset/57260

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-02-23 10:36:18 UTC (rev 57259)
+++ trunk/e/src/bin/e_fm.c	2011-02-23 10:37:17 UTC (rev 57260)
@@ -9522,7 +9522,7 @@
      {
         EINA_LIST_FOREACH(sel, l, ici)
           {
-	     if (&(ic_next->info) == ici)
+	     if (ic_next && (&(ic_next->info) == ici))
 	       ic_next = NULL;
 	     
              snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath, ici->file);

Log:
e17: startup: cancel cb. this needs to run just once
  

Author:       jeffdameth
Date:         2011-02-27 03:09:49 -0800 (Sun, 27 Feb 2011)
New Revision: 57370
Trac:         http://trac.enlightenment.org/e/changeset/57370

Modified:
  trunk/e/src/bin/e_startup.c 

Modified: trunk/e/src/bin/e_startup.c
===================================================================
--- trunk/e/src/bin/e_startup.c	2011-02-27 10:34:55 UTC (rev 57369)
+++ trunk/e/src/bin/e_startup.c	2011-02-27 11:09:49 UTC (rev 57370)
@@ -64,7 +64,7 @@
      }
    e_exec(NULL, desktop, NULL, NULL, NULL);
    snprintf(buf, sizeof(buf), "%s %s", _("Starting"), desktop->name);
-   e_init_status_set(buf);   
+   e_init_status_set(buf);
    ecore_job_add(_e_startup_next_cb, NULL);
 }
 
@@ -86,5 +86,5 @@
       start_app_pos = 0;
    free(buf);
    _e_startup();
-   return ECORE_CALLBACK_PASS_ON;
+   return ECORE_CALLBACK_CANCEL;
 }

Log:
e17/fm: fix segv
  

Author:       jeffdameth
Date:         2011-02-27 14:39:51 -0800 (Sun, 27 Feb 2011)
New Revision: 57399
Trac:         http://trac.enlightenment.org/e/changeset/57399

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-02-27 22:31:17 UTC (rev 57398)
+++ trunk/e/src/bin/e_fm.c	2011-02-27 22:39:51 UTC (rev 57399)
@@ -8214,7 +8214,7 @@
                }
           }
 
-        if (!strcmp(ic->info.mime, "application/x-desktop"))
+        if (ic->info.mime && !strcmp(ic->info.mime, "application/x-desktop"))
           {
              mi = e_menu_item_new(mn);
              e_menu_item_label_set(mi, _("Application Properties"));

Log:
e17: allow themes to request argb window frames
  
  if your window border theme will use transparency add:
  data { item: "argb" "1" } to the respective border groups 
  

Author:       jeffdameth
Date:         2011-03-01 08:17:23 -0800 (Tue, 01 Mar 2011)
New Revision: 57458
Trac:         http://trac.enlightenment.org/e/changeset/57458

Modified:
  trunk/e/src/bin/e_border.c trunk/e/src/bin/e_border.h 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-01 14:03:50 UTC (rev 57457)
+++ trunk/e/src/bin/e_border.c	2011-03-01 16:17:23 UTC (rev 57458)
@@ -197,6 +197,10 @@
 
 static void _e_border_client_move_resize_send(E_Border *bd);
 
+static void _e_border_frame_replace(E_Border *bd,
+				    Eina_Bool argb);
+
+
 /* local subsystem globals */
 static Eina_List *handlers = NULL;
 static Eina_List *borders = NULL;
@@ -965,6 +969,95 @@
 }
 
 static void
+_e_border_frame_replace(E_Border *bd, Eina_Bool argb)
+{
+   Ecore_X_Window win;
+   Ecore_Evas *bg_ecore_evas;
+   char buf[PATH_MAX];
+   
+   bd->argb = argb;
+
+   win = bd->win;
+   bg_ecore_evas = bd->bg_ecore_evas;
+
+   /* unregister old frame window */
+   eina_hash_del(borders_hash, e_util_winid_str_get(bd->bg_win), bd);
+   eina_hash_del(borders_hash, e_util_winid_str_get(bd->win), bd);
+
+   e_focus_setdown(bd);
+   e_bindings_mouse_ungrab(E_BINDING_CONTEXT_BORDER, bd->win);
+   e_bindings_wheel_ungrab(E_BINDING_CONTEXT_BORDER, bd->win);
+
+   if (bd->icon_object)
+     evas_object_del(bd->icon_object);
+   
+   evas_object_del(bd->bg_object);
+   e_canvas_del(bg_ecore_evas);
+   ecore_evas_free(bg_ecore_evas);
+
+   if (bd->pointer)
+     e_object_del(E_OBJECT(bd->pointer));
+
+   /* create new frame */
+   if (argb)
+     bd->win = ecore_x_window_manager_argb_new(bd->zone->container->win,
+					       bd->x, bd->y, bd->w, bd->h);
+   else
+     {
+        bd->win = ecore_x_window_override_new(bd->zone->container->win,
+					      bd->x, bd->y, bd->w, bd->h);
+        ecore_x_window_shape_events_select(bd->win, 1);
+     }
+   
+   ecore_x_window_configure(bd->win,
+			    ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
+			    ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
+			    0, 0, 0, 0, 0,
+			    win, ECORE_X_WINDOW_STACK_BELOW);
+
+   e_bindings_mouse_grab(E_BINDING_CONTEXT_BORDER, bd->win);
+   e_bindings_wheel_grab(E_BINDING_CONTEXT_BORDER, bd->win);
+   e_focus_setup(bd);
+
+   bd->bg_ecore_evas = e_canvas_new(e_config->evas_engine_borders, bd->win,
+                                    0, 0, bd->w, bd->h, 1, 0,
+                                    &(bd->bg_win));
+
+   e_canvas_add(bd->bg_ecore_evas);
+   ecore_x_window_reparent(bd->event_win, bd->win, 0, 0);
+   
+   bd->bg_evas = ecore_evas_get(bd->bg_ecore_evas);
+   ecore_evas_name_class_set(bd->bg_ecore_evas, "E", "Frame_Window");
+   ecore_evas_title_set(bd->bg_ecore_evas, "Enlightenment Frame");
+
+   ecore_x_window_shape_events_select(bd->bg_win, 1);
+
+   /* move client with shell win over to new frame */
+   ecore_x_window_reparent(bd->client.shell_win, bd->win,
+			   bd->client_inset.l, bd->client_inset.t);
+
+   bd->pointer = e_pointer_window_new(bd->win, 0);
+
+   eina_hash_add(borders_hash, e_util_winid_str_get(bd->bg_win), bd);
+   eina_hash_add(borders_hash, e_util_winid_str_get(bd->win), bd);
+
+   if (bd->visible)
+     {
+	ecore_evas_show(bd->bg_ecore_evas);
+	ecore_x_window_show(bd->win);
+     }
+   
+   bd->bg_object = edje_object_add(bd->bg_evas);
+   snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", bd->client.border.name);
+   e_theme_edje_object_set(bd->bg_object, "base/theme/borders", buf);
+
+   bd->icon_object = e_border_icon_add(bd, bd->bg_evas);
+   
+   /* cleanup old frame */
+   ecore_x_window_free(win);
+}
+
+static void
 _e_border_client_move_resize_send(E_Border *bd)
 {
    if (bd->internal_ecore_evas)
@@ -6651,17 +6744,34 @@
                         e_config_save_queue();
                     }
                }
-
+	     
              bd->shaped = 0;
              if (ok)
                {
-                  const char *shape_option;
+                  const char *shape_option, *argb_option;
+		  int use_argb = 0;
 
-                  bd->bg_object = o;
-                  shape_option = edje_object_data_get(o, "shaped");
-                  if ((shape_option) && (!strcmp(shape_option, "1")))
-                    bd->shaped = 1;
+		  bd->bg_object = o;
+		  
+		  if (!bd->client.argb)
+		    {
+		       argb_option = edje_object_data_get(o, "argb");
+		       if ((argb_option) && (!strcmp(argb_option, "1")))
+			 use_argb = 1;
 
+		       if (use_argb != bd->argb)
+			 _e_border_frame_replace(bd, use_argb);
+
+		       o = bd->bg_object;
+		    }
+		  
+		  if (!bd->argb)
+		    {
+		       shape_option = edje_object_data_get(o, "shaped");
+		       if ((shape_option) && (!strcmp(shape_option, "1")))
+			 bd->shaped = 1;
+		    }
+		  
                   if (bd->client.netwm.name)
                     edje_object_part_text_set(o, "e.text.title",
                                               bd->client.netwm.name);

Modified: trunk/e/src/bin/e_border.h
===================================================================
--- trunk/e/src/bin/e_border.h	2011-03-01 14:03:50 UTC (rev 57457)
+++ trunk/e/src/bin/e_border.h	2011-03-01 16:17:23 UTC (rev 57458)
@@ -564,6 +564,8 @@
    unsigned char post_resize : 1;
    unsigned char post_show : 1;
    Ecore_Idle_Enterer *post_job;
+
+   Eina_Bool argb;
 };
 
 struct _E_Border_Pending_Move_Resize

Log:
e17: disable pointer warp on _net_active_window client message
  

Author:       jeffdameth
Date:         2011-03-08 15:09:09 -0800 (Tue, 08 Mar 2011)
New Revision: 57608
Trac:         http://trac.enlightenment.org/e/changeset/57608

Modified:
  trunk/e/src/bin/e_manager.c 

Modified: trunk/e/src/bin/e_manager.c
===================================================================
--- trunk/e/src/bin/e_manager.c	2011-03-08 22:35:11 UTC (rev 57607)
+++ trunk/e/src/bin/e_manager.c	2011-03-08 23:09:09 UTC (rev 57608)
@@ -969,8 +969,15 @@
 		  if (!bd->lock_user_stacking) e_border_raise(bd);
 		  if (!bd->lock_focus_out)
 		    {
-		       if (e_config->focus_policy != E_FOCUS_CLICK)
-			 ecore_x_pointer_warp(bd->zone->container->win,
+		       int requestor_id = e->data.l[2];
+		       /* FIXME for now only set pointer when not
+		       requested by a client. ooffice does send this
+		       request for dialogs which should be modal when
+		       the main window gets focus. causing the pointer
+		       to jump back and forth. are there any other
+		       apps that use _net_active_window ? */
+		       if ((requestor_id == 2) && (e_config->focus_policy != E_FOCUS_CLICK))
+		       	 ecore_x_pointer_warp(bd->zone->container->win,
 					      bd->x + (bd->w / 2), bd->y + (bd->h / 2));
 		       e_border_focus_set(bd, 1, 1);
 		    }

Log:
e17: handle ooffice _net_active window messages specifically
  

Author:       jeffdameth
Date:         2011-03-08 19:09:59 -0800 (Tue, 08 Mar 2011)
New Revision: 57610
Trac:         http://trac.enlightenment.org/e/changeset/57610

Modified:
  trunk/e/src/bin/e_manager.c 

Modified: trunk/e/src/bin/e_manager.c
===================================================================
--- trunk/e/src/bin/e_manager.c	2011-03-09 00:05:03 UTC (rev 57609)
+++ trunk/e/src/bin/e_manager.c	2011-03-09 03:09:59 UTC (rev 57610)
@@ -969,14 +969,11 @@
 		  if (!bd->lock_user_stacking) e_border_raise(bd);
 		  if (!bd->lock_focus_out)
 		    {
-		       int requestor_id = e->data.l[2];
-		       /* FIXME for now only set pointer when not
-		       requested by a client. ooffice does send this
-		       request for dialogs which should be modal when
-		       the main window gets focus. causing the pointer
-		       to jump back and forth. are there any other
-		       apps that use _net_active_window ? */
-		       if ((requestor_id == 2) && (e_config->focus_policy != E_FOCUS_CLICK))
+		       /* XXX ooffice does send this request for
+		       config dialogs when the main window gets focus.
+		       causing the pointer to jump back and forth.  */
+		       if ((e_config->focus_policy != E_FOCUS_CLICK) &&
+			   !(bd->client.icccm.name && !strcmp(bd->client.icccm.name, "VCLSalFrame")))
 		       	 ecore_x_pointer_warp(bd->zone->container->win,
 					      bd->x + (bd->w / 2), bd->y + (bd->h / 2));
 		       e_border_focus_set(bd, 1, 1);

Log:
e17: simplify e_border_focus_set logic and fix (some) focus issue with 
       not focusing the last active window after deskswitch
  

Author:       jeffdameth
Date:         2011-03-09 05:15:33 -0800 (Wed, 09 Mar 2011)
New Revision: 57622
Trac:         http://trac.enlightenment.org/e/changeset/57622

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-09 13:10:17 UTC (rev 57621)
+++ trunk/e/src/bin/e_border.c	2011-03-09 13:15:33 UTC (rev 57622)
@@ -1868,8 +1868,8 @@
                    int       focus,
                    int       set)
 {
-   int focus_changed = 0;
-
+   E_Border *unfocus = NULL;
+   
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
    /* note: this is here as it seems there are enough apps that do not even
@@ -1883,221 +1883,115 @@
    /* dont focus an iconified window. that's silly! */
    if ((focus) && (bd->iconic))
      return;
+
+   if ((focus) && (!bd->visible))
+     return;
+
    if ((bd->modal) && (bd->modal != bd) && (bd->modal->visible))
      {
-        e_border_focus_set(bd->modal, focus, set);
-        return;
+	e_border_focus_set(bd->modal, focus, set);
+	return;
      }
    else if ((bd->leader) && (bd->leader->modal) && (bd->leader->modal != bd))
      {
-        e_border_focus_set(bd->leader->modal, focus, set);
-        return;
+	e_border_focus_set(bd->leader->modal, focus, set);
+	return;
      }
 
-   if ((focus) && (set) && (!bd->focused))
-     {
-        if ((bd->client.icccm.accepts_focus) &&
-            (bd->client.icccm.take_focus))
-          {
-             if ((bd->visible) && (bd->changes.visible))
-               {
-////		  e_border_focus_latest_set(bd);
-                    bd->want_focus = 1;
-                    bd->changed = 1;
-                    return;
-               }
-             e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
-             return;
-          }
-        else if ((!bd->client.icccm.accepts_focus) &&
-                 (bd->client.icccm.take_focus))
-          {
-             if ((bd->visible) && (bd->changes.visible))
-               {
-////		  e_border_focus_latest_set(bd);
-                    bd->want_focus = 1;
-                    bd->changed = 1;
-                    return;
-               }
-             e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
-             return;
-          }
-     }
-
-   if ((bd->visible) && (bd->changes.visible))
-     {
-        if ((bd->want_focus) && (set) && (!focus))
-          bd->want_focus = 0;
-     }
-   if ((!bd->visible) && (focus))
-     {
-////	e_border_focus_latest_set(bd);
-//	bd->want_focus = 1;
-//	bd->changed = 1;
-              return;
-     }
    if ((focus) && (!bd->focused))
-     {
-        if ((bd->visible) && (bd->changes.visible))
-          {
-////	     e_border_focus_latest_set(bd);
-               bd->want_focus = 1;
-               bd->changed = 1;
-               return;
-          }
-//	if (bd->visible)
-//	  {
-//	     if (focus_track_frozen == 0)
-//	       {
-////		  e_border_focus_latest_set(bd);
-//	       }
-//	  }
-        e_border_focus_latest_set(bd);
-        edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
-        if (bd->icon_object)
-          edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
-        e_focus_event_focus_in(bd);
-     }
-   else if ((!focus) && (bd->focused))
-     {
-        edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e");
-        if (bd->icon_object)
-          edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e");
-        e_focus_event_focus_out(bd);
-        /* FIXME: Sometimes we should leave the window fullscreen! */
-//	if (bd->fullscreen)
-//	  e_border_unfullscreen(bd);
-        if (bd->raise_timer)
-          {
-             ecore_timer_del(bd->raise_timer);
-             bd->raise_timer = NULL;
-          }
-     }
-   if (((bd->focused) && (!focus)) || ((!bd->focused) && (focus)))
-     focus_changed = 1;
-   bd->focused = focus;
-   if (set)
-     {
-        if (bd->focused)
-          {
-             if (bd->internal)
-               e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
-             else
-               {
-                  if ((!bd->client.icccm.accepts_focus) &&
-                      (!bd->client.icccm.take_focus))
-                    e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_NO_INPUT);
-                  else if ((bd->client.icccm.accepts_focus) &&
-                           (bd->client.icccm.take_focus))
-                    e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
-                  else if ((!bd->client.icccm.accepts_focus) &&
-                           (bd->client.icccm.take_focus))
-                    e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
-                  else if ((bd->client.icccm.accepts_focus) &&
-                           (!bd->client.icccm.take_focus))
-                    e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
-               }
-          }
-        else
-          {
-//	     ecore_x_window_focus(bd->zone->container->manager->root);
-//	     ecore_x_window_focus(bd->zone->container->bg_win);
-                 e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
-          }
-     }
-   if ((bd->focused) && (focused != bd))
-     {
-        if (focused)
-          {
-             if ((!e_object_is_del(E_OBJECT(focused))) &&
-                 (e_object_ref_get(E_OBJECT(focused)) > 0))
-               {
-                  E_Event_Border_Focus_Out *ev;
+     {	
+	E_Event_Border_Focus_In *ev;
+	
+	if ((bd->visible) && (bd->changes.visible))
+	  {
+	     bd->want_focus = 1;
+	     bd->changed = 1;
+	     return;
+	  }
+	if (set)
+	  {
+	     if ((bd->client.icccm.take_focus) &&
+		 (bd->client.icccm.accepts_focus))
+	       {
+		  e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
+		  return;
+	       }
+	     else if (!bd->client.icccm.accepts_focus)
+	       {
+		  e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
+		  return;
+	       }
+	     else if (!bd->client.icccm.take_focus)
+	       {
+		  e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
+	       }
+	  }
 
-                  edje_object_signal_emit(focused->bg_object, "e,state,unfocused", "e");
-                  if (focused->icon_object)
-                    edje_object_signal_emit(focused->icon_object, "e,state,unfocused", "e");
-                  e_focus_event_focus_out(focused);
+	if (focused)
+	  unfocus = focused;
 
-                  ev = E_NEW(E_Event_Border_Focus_Out, 1);
-                  ev->border = focused;
-                  e_object_ref(E_OBJECT(focused));
+	bd->focused = 1;
+	focused = bd;
+	e_focus_event_focus_in(bd);
+	e_border_focus_latest_set(bd);
+	e_hints_active_window_set(bd->zone->container->manager, bd);
 
-                  ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
-                                  _e_border_event_border_focus_out_free, NULL);
+	e_hints_active_window_set(bd->zone->container->manager, bd);
+	edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
+	if (bd->icon_object)
+	  edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
 
-     /* FIXME: Sometimes we should leave the window fullscreen! */
-//		  if (focused->fullscreen) e_border_unfullscreen(focused);
-                  focused->focused = 0;
-//		  e_border_focus_set(focused, 0, 0);
-                  if (focused->raise_timer)
-                    {
-                       ecore_timer_del(focused->raise_timer);
-                       focused->raise_timer = NULL;
-                    }
-                  focused = NULL;
-               }
-          }
-        e_hints_active_window_set(bd->zone->container->manager, bd);
-     }
+	ev = E_NEW(E_Event_Border_Focus_In, 1);
+	ev->border = bd;
+	e_object_ref(E_OBJECT(bd));
 
-#if 0
-   /* i'm pretty sure this case is handled above -- this was resulting in the "passive"
-    * event getting sent twice when going from a window to the desktop. --rephorm */
-/*
-   else if ((!bd->focused) && (focused == bd))
+	ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
+			_e_border_event_border_focus_in_free, NULL);
+     }
+   else if ((!focus) && (bd->want_focus))
      {
-        if (focused)
-          {
-   //	     printf("unfocus previous 2\n");
-             edje_object_signal_emit(focused->bg_object, "e,state,unfocused", "e");
-             if (focused->icon_object)
-               edje_object_signal_emit(focused->icon_object, "e,state,unfocused", "e");
-             e_focus_event_focus_out(focused);
-             // FIXME: Sometimes we should leave the window fullscreen!
-             if (focused->fullscreen) e_border_unfullscreen(focused);
-             focused->focused = 0;
-   //		  e_border_focus_set(focused, 0, 0);
-             if (focused->raise_timer)
-               {
-                  ecore_timer_del(focused->raise_timer);
-                  focused->raise_timer = NULL;
-               }
-          }
-        e_hints_active_window_set(bd->zone->container->manager, NULL);
+	if ((bd->visible) && (bd->changes.visible))
+	  {
+	     bd->want_focus = 0;
+	     return;
+	  }
      }
- */
-#endif
-   if (focus_changed)
+   else if ((!focus) && (bd->focused))
      {
-        if (bd->focused)
-          {
-             E_Event_Border_Focus_In *ev;
+	unfocus = bd;
+	
+	/* should always be the case. anyway */
+	if (bd == focused)
+	  focused = NULL;
 
-             focused = bd;
-             // Let send the focus event iff the focus is set explicitly,
-             // not via callback
-             ev = E_NEW(E_Event_Border_Focus_In, 1);
-             ev->border = bd;
-             e_object_ref(E_OBJECT(bd));
+	if (set)
+	  e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
+     }
 
-             ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
-                             _e_border_event_border_focus_in_free, NULL);
-          }
-        else
-          {
-             E_Event_Border_Focus_Out *ev;
+   if ((unfocus) &&
+       (!e_object_is_del(E_OBJECT(unfocus)) &&
+	(e_object_ref_get(E_OBJECT(unfocus)) > 0)))
+     {   
+	E_Event_Border_Focus_Out *ev;
 
-             focused = NULL;
-             // Let send the focus event iff the focus is set explicitly,
-             // not via callback
-             ev = E_NEW(E_Event_Border_Focus_Out, 1);
-             ev->border = bd;
-             e_object_ref(E_OBJECT(bd));
+	bd = unfocus;
+	bd->focused = 0;
+	e_focus_event_focus_out(bd);
 
-             ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
-                             _e_border_event_border_focus_out_free, NULL);
-          }
+	if (bd->raise_timer)
+	  ecore_timer_del(bd->raise_timer);
+	bd->raise_timer = NULL;
+
+	edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e");
+	if (bd->icon_object)
+	  edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e");
+
+	ev = E_NEW(E_Event_Border_Focus_Out, 1);
+	ev->border = bd;
+	e_object_ref(E_OBJECT(bd));
+
+	ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
+			_e_border_event_border_focus_out_free, NULL);
      }
 }
 
@@ -8594,7 +8488,8 @@
    warp_to = 1;
    warp_to_win = bd->zone->container->win;
    ecore_x_pointer_xy_get(bd->zone->container->win, &warp_x, &warp_y);
-   warp_timer = ecore_timer_add(0.01, _e_border_pointer_warp_to_center_timer, (const void *)bd);
+   if (!warp_timer)
+     warp_timer = ecore_timer_add(0.01, _e_border_pointer_warp_to_center_timer, (const void *)bd);
    return 1;
 }

Log:
e17: fetch netwm state ealier so netwm.state.modal is set before used in icccm.fetch.client_leader case
  

Author:       jeffdameth
Date:         2011-03-09 05:28:31 -0800 (Wed, 09 Mar 2011)
New Revision: 57623
Trac:         http://trac.enlightenment.org/e/changeset/57623

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-09 13:15:33 UTC (rev 57622)
+++ trunk/e/src/bin/e_border.c	2011-03-09 13:28:31 UTC (rev 57623)
@@ -5956,6 +5956,12 @@
    bd->changes.border = 0;
 
    /* fetch any info queued to be fetched */
+   if (bd->client.netwm.fetch.state)
+     {
+        e_hints_window_state_get(bd);
+        bd->client.netwm.fetch.state = 0;
+        rem_change = 1;
+     }
    if (bd->client.icccm.fetch.client_leader)
      {
         /* TODO: What do to if the client leader isn't mapped yet? */
@@ -5980,7 +5986,7 @@
            {
               bd_leader->group = eina_list_append(bd_leader->group, bd);
               bd->leader = bd_leader;
-     /* Only set the window modal to the leader it there is no parent */
+	      /* Only set the window modal to the leader it there is no parent */
               if ((e_config->modal_windows) && (bd->client.netwm.state.modal) &&
                   ((!bd->parent) || (bd->parent->modal != bd)))
                 {
@@ -6059,12 +6065,6 @@
         bd->client.icccm.fetch.state = 0;
         rem_change = 1;
      }
-   if (bd->client.netwm.fetch.state)
-     {
-        e_hints_window_state_get(bd);
-        bd->client.netwm.fetch.state = 0;
-        rem_change = 1;
-     }
    if (bd->client.e.fetch.state)
      {
         e_hints_window_e_state_get(bd);

Log:
e17: take sticky windows state into account in e_desk_last_focused_focus
  

Author:       jeffdameth
Date:         2011-03-09 12:30:22 -0800 (Wed, 09 Mar 2011)
New Revision: 57636
Trac:         http://trac.enlightenment.org/e/changeset/57636

Modified:
  trunk/e/src/bin/e_desk.c 

Modified: trunk/e/src/bin/e_desk.c
===================================================================
--- trunk/e/src/bin/e_desk.c	2011-03-09 20:29:38 UTC (rev 57635)
+++ trunk/e/src/bin/e_desk.c	2011-03-09 20:30:22 UTC (rev 57636)
@@ -369,14 +369,14 @@
    
    EINA_LIST_FOREACH(e_border_focus_stack_get(), l, bd)
      {
-	if ((!bd->iconic) && (bd->visible) && (bd->desk == desk) &&
+	if ((!bd->iconic) && (bd->visible) &&
+	    ((bd->desk == desk) || ((bd->zone == desk->zone) && bd->sticky)) &&
 	    (bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) &&
 	    (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_DOCK) &&
 	    (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_TOOLBAR) &&
 	    (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_MENU) &&
 	    (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_SPLASH) &&
-	    (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_DESKTOP)
-	    )
+	    (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_DESKTOP))
 	  {
 	     /* this was the window last focused in this desktop */
              if (!bd->lock_focus_out)

Log:
e17: fix, remove duplicated line
  

Author:       jeffdameth
Date:         2011-03-09 14:07:32 -0800 (Wed, 09 Mar 2011)
New Revision: 57637
Trac:         http://trac.enlightenment.org/e/changeset/57637

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-09 20:30:22 UTC (rev 57636)
+++ trunk/e/src/bin/e_border.c	2011-03-09 22:07:32 UTC (rev 57637)
@@ -1936,7 +1936,6 @@
 	e_border_focus_latest_set(bd);
 	e_hints_active_window_set(bd->zone->container->manager, bd);
 
-	e_hints_active_window_set(bd->zone->container->manager, bd);
 	edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
 	if (bd->icon_object)
 	  edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");

Log:
e17: fix the rare case that the last focused border had lock_focus_out. try next instead of break
  

Author:       jeffdameth
Date:         2011-03-09 16:04:31 -0800 (Wed, 09 Mar 2011)
New Revision: 57644
Trac:         http://trac.enlightenment.org/e/changeset/57644

Modified:
  trunk/e/src/bin/e_desk.c 

Modified: trunk/e/src/bin/e_desk.c
===================================================================
--- trunk/e/src/bin/e_desk.c	2011-03-09 23:09:07 UTC (rev 57643)
+++ trunk/e/src/bin/e_desk.c	2011-03-10 00:04:31 UTC (rev 57644)
@@ -380,8 +380,10 @@
 	  {
 	     /* this was the window last focused in this desktop */
              if (!bd->lock_focus_out)
-	       e_border_focus_set(bd, 1, 1);
-	     break;
+	       {
+		  e_border_focus_set(bd, 1, 1);
+		  break;
+	       }
 	  }
      }
 }

Log:
e17: set focus at the end of border_idler_before to the last focused window.
  
  No need to sync ecore_x_window_focus then. in next mainloop 
  iteration all requests should have been processed by X, or doesnt it? 
  

Author:       jeffdameth
Date:         2011-03-09 18:29:01 -0800 (Wed, 09 Mar 2011)
New Revision: 57647
Trac:         http://trac.enlightenment.org/e/changeset/57647

Modified:
  trunk/e/src/bin/e_border.c trunk/e/src/bin/e_grabinput.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-10 01:56:20 UTC (rev 57646)
+++ trunk/e/src/bin/e_border.c	2011-03-10 02:29:01 UTC (rev 57647)
@@ -206,6 +206,8 @@
 static Eina_List *borders = NULL;
 static Eina_Hash *borders_hash = NULL;
 static E_Border *focused = NULL;
+static Eina_List *focus_next = NULL;
+static Ecore_X_Time focus_time = 0;
 
 static E_Border *resize = NULL;
 static E_Border *move = NULL;
@@ -1902,36 +1904,18 @@
      {	
 	E_Event_Border_Focus_In *ev;
 	
-	if ((bd->visible) && (bd->changes.visible))
-	  {
-	     bd->want_focus = 1;
-	     bd->changed = 1;
+	if (set)
+	  {	     
+	     focus_next = eina_list_prepend(focus_next, bd);
 	     return;
 	  }
-	if (set)
-	  {
-	     if ((bd->client.icccm.take_focus) &&
-		 (bd->client.icccm.accepts_focus))
-	       {
-		  e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
-		  return;
-	       }
-	     else if (!bd->client.icccm.accepts_focus)
-	       {
-		  e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
-		  return;
-	       }
-	     else if (!bd->client.icccm.take_focus)
-	       {
-		  e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
-	       }
-	  }
 
 	if (focused)
 	  unfocus = focused;
 
 	bd->focused = 1;
 	focused = bd;
+
 	e_focus_event_focus_in(bd);
 	e_border_focus_latest_set(bd);
 	e_hints_active_window_set(bd->zone->container->manager, bd);
@@ -2957,6 +2941,36 @@
              e_container_border_list_free(bl);
           }
      }
+
+   if (focus_next)
+     {
+	E_Border *bd = NULL, *bd2;
+	
+	EINA_LIST_FREE(focus_next, bd2)
+	  if ((!bd) && (bd2->visible)) bd = bd2;
+
+	if (!bd)
+	  {
+	     /* TODO revert focus when lost here ? */
+	     return;
+	  }
+	
+	focus_time = ecore_x_current_time_get();
+	
+	if ((bd->client.icccm.take_focus) &&
+	    (bd->client.icccm.accepts_focus))
+	  {
+	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
+	  }
+	else if (!bd->client.icccm.accepts_focus)
+	  {
+	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
+	  }
+	else if (!bd->client.icccm.take_focus)
+	  {
+	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
+	  }
+     }
 }
 
 EAPI Eina_List *
@@ -4163,6 +4177,11 @@
    E_Event_Border_Remove *ev;
    E_Border *child;
 
+   if (bd == focused)
+     focused = NULL;
+
+   focus_next = eina_list_remove(focus_next, bd);
+   
    if (bd->fullscreen) bd->desk->fullscreen_borders--;
 
    if ((drag_border) && (drag_border->data == bd))
@@ -5001,7 +5020,8 @@
      {
         if (e->detail == ECORE_X_EVENT_DETAIL_POINTER) return ECORE_CALLBACK_PASS_ON;
      }
-   e_border_focus_set(bd, 1, 0);
+   if (e->time >= focus_time)
+     e_border_focus_set(bd, 1, 0);
    return ECORE_CALLBACK_PASS_ON;
 }
 

Modified: trunk/e/src/bin/e_grabinput.c
===================================================================
--- trunk/e/src/bin/e_grabinput.c	2011-03-10 01:56:20 UTC (rev 57646)
+++ trunk/e/src/bin/e_grabinput.c	2011-03-10 02:29:01 UTC (rev 57647)
@@ -1,7 +1,6 @@
 #include "e.h"
 
 /* local subsystem functions */
-static void _e_grabinput_focus_job(void *data);
 static void _e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method);
 
 /* local subsystem globals */
@@ -9,9 +8,6 @@
 static Ecore_X_Window grab_key_win = 0;
 static Ecore_X_Window focus_win = 0;
 static E_Focus_Method focus_method = E_FOCUS_METHOD_NO_INPUT;
-static Ecore_X_Window do_focus_win = 0;
-static E_Focus_Method do_focus_method = E_FOCUS_METHOD_NO_INPUT;
-static Ecore_Job *focus_job = NULL;
 static double last_focus_time = 0.0;
 
 /* externally accessible functions */
@@ -101,12 +97,8 @@
 	focus_method = method;
      }
    else
-     {
-        do_focus_win = win;
-        do_focus_method = method;
-        if (!focus_job)
-          focus_job = ecore_job_add(_e_grabinput_focus_job, NULL);
-	//_e_grabinput_focus(win, method);
+     {	
+	_e_grabinput_focus(win, method);
      }
 }
 
@@ -116,16 +108,7 @@
    return last_focus_time;
 }
 
-/* local subsystem functions */
 static void
-_e_grabinput_focus_job(void *data __UNUSED__)
-{
-   focus_job = NULL;
-   _e_grabinput_focus(do_focus_win, do_focus_method);
-   do_focus_win = 0;
-}
-
-static void
 _e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method)
 {
    switch (method)
@@ -134,17 +117,13 @@
 	break;
       case E_FOCUS_METHOD_LOCALLY_ACTIVE:
 	ecore_x_window_focus(win);
-        ecore_x_sync(); // let x actually get the x focus request
 	ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
-        ecore_x_sync(); // let x actually get the x focus request
 	break;
       case E_FOCUS_METHOD_GLOBALLY_ACTIVE:
 	ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
-        ecore_x_sync(); // let x actually get the x focus request
 	break;
       case E_FOCUS_METHOD_PASSIVE:
 	ecore_x_window_focus(win);
-        ecore_x_sync(); // let x actually get the x focus request
 	break;
       default:
 	break;

Log:
e17: remove redundant checks. lock_focus_out is check in e_boder_focus_set*
  

Author:       jeffdameth
Date:         2011-03-09 18:44:02 -0800 (Wed, 09 Mar 2011)
New Revision: 57648
Trac:         http://trac.enlightenment.org/e/changeset/57648

Modified:
  trunk/e/src/bin/e_actions.c trunk/e/src/bin/e_border.c trunk/e/src/bin/e_focus.c 

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2011-03-10 02:29:01 UTC (rev 57647)
+++ trunk/e/src/bin/e_actions.c	2011-03-10 02:44:02 UTC (rev 57648)
@@ -1192,8 +1192,7 @@
 	     e_zone_desk_flip_by(bd->zone, to_x - dx, to_y - dy);
 	     /* send the border to the required desktop. */
 	     e_border_desk_set(bd, desk);
-	     if (!bd->lock_focus_out)
-	       e_border_focus_set(bd, 1, 1);
+	     e_border_focus_set(bd, 1, 1);
 	  }
      }
 }

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-10 02:29:01 UTC (rev 57647)
+++ trunk/e/src/bin/e_border.c	2011-03-10 02:44:02 UTC (rev 57648)
@@ -7487,10 +7487,7 @@
             (bd->want_focus))
           {
              bd->want_focus = 0;
-             if (!bd->lock_focus_out)
-               {
-                  e_border_focus_set_with_pointer(bd);
-               }
+	     e_border_focus_set_with_pointer(bd);
           }
         else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
           {
@@ -7499,8 +7496,7 @@
                   (e_border_find_by_client_window(bd->client.icccm.transient_for) ==
                    e_border_focused_get())))
                {
-                  if (!bd->lock_focus_out)
-                    e_border_focus_set_with_pointer(bd);
+		  e_border_focus_set_with_pointer(bd);
                }
           }
         else

Modified: trunk/e/src/bin/e_focus.c
===================================================================
--- trunk/e/src/bin/e_focus.c	2011-03-10 02:29:01 UTC (rev 57647)
+++ trunk/e/src/bin/e_focus.c	2011-03-10 02:44:02 UTC (rev 57648)
@@ -30,11 +30,7 @@
    if ((e_config->focus_policy == E_FOCUS_MOUSE) ||
        (e_config->focus_policy == E_FOCUS_SLOPPY))
      {
-	if (!bd->lock_focus_out)
-          {
-             //if (!bd->focused)
-               e_border_focus_set(bd, 1, 1);
-          }
+	e_border_focus_set(bd, 1, 1);
      }
    if (bd->raise_timer) ecore_timer_del(bd->raise_timer);
    bd->raise_timer = NULL;
@@ -85,11 +81,8 @@
 {
    if (e_config->focus_policy == E_FOCUS_CLICK)
      {
-	if (!bd->lock_focus_out)
-          {
-             if (!bd->focused)
-               e_border_focus_set(bd, 1, 1);
-          }
+	e_border_focus_set(bd, 1, 1);
+
 	if (!bd->lock_user_stacking)
 	  {
 	     if (e_config->border_raise_on_focus)
@@ -106,11 +99,7 @@
      }
    else if (e_config->always_click_to_focus)
      {
-	if (!bd->lock_focus_out)
-	  {
-	     if (!bd->focused)
-	       e_border_focus_set(bd, 1, 1);
-	  }
+	e_border_focus_set(bd, 1, 1);
      }
 }

Log:
e17: fix comp test message handler visible.src -> visibility.src
  

Author:       jeffdameth
Date:         2011-03-10 06:50:04 -0800 (Thu, 10 Mar 2011)
New Revision: 57671
Trac:         http://trac.enlightenment.org/e/changeset/57671

Modified:
  trunk/e/src/bin/e_test.c 

Modified: trunk/e/src/bin/e_test.c
===================================================================
--- trunk/e/src/bin/e_test.c	2011-03-10 12:18:46 UTC (rev 57670)
+++ trunk/e/src/bin/e_test.c	2011-03-10 14:50:04 UTC (rev 57671)
@@ -962,7 +962,7 @@
      {
         printf("%s: %p | %p\n", info, man, src);
      }
-   else if (!strcmp(info, "visible.src"))
+   else if (!strcmp(info, "visibility.src"))
      {
         printf("%s: %p | %p\n", info, man, src);
      }

Log:
e17: focus: on focus_set promote border in focus_next even if it has already focus.
  
  this fixes the problem when within one mainloop iteration the currently focused
  border is unfocused and refocused.
  

Author:       jeffdameth
Date:         2011-03-10 08:23:57 -0800 (Thu, 10 Mar 2011)
New Revision: 57674
Trac:         http://trac.enlightenment.org/e/changeset/57674

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-10 15:16:50 UTC (rev 57673)
+++ trunk/e/src/bin/e_border.c	2011-03-10 16:23:57 UTC (rev 57674)
@@ -1899,16 +1899,26 @@
 	e_border_focus_set(bd->leader->modal, focus, set);
 	return;
      }
+#ifdef INOUTDEBUG_FOCUS
+   printf("%s focus set %d %d\n", e_border_name_get(bd), focus, set);
+#endif
 
-   if ((focus) && (!bd->focused))
-     {	
-	E_Event_Border_Focus_In *ev;
-	
-	if (set)
-	  {	     
-	     focus_next = eina_list_prepend(focus_next, bd);
+   if ((set) && (focus))
+     {
+	if ((!bd->focused) || (focus_next && (bd != eina_list_data_get(focus_next))))
+	  {
+	     Eina_List *l;
+	     
+	     if ((l = eina_list_data_find_list(focus_next, bd)))
+	       focus_next = eina_list_promote_list(focus_next, l); 
+	     else
+	       focus_next = eina_list_prepend(focus_next, bd);
 	     return;
 	  }
+     }
+   else if ((focus) && (!bd->focused))
+     {		
+	E_Event_Border_Focus_In *ev;  
 
 	if (focused)
 	  unfocus = focused;
@@ -2954,6 +2964,11 @@
 	     /* TODO revert focus when lost here ? */
 	     return;
 	  }
+#ifdef INOUTDEBUG_FOCUS
+	printf("%s idler focus\n", e_border_name_get(bd));
+#endif
+	if (bd == focused)
+	  return;
 	
 	focus_time = ecore_x_current_time_get();
 	
@@ -2961,6 +2976,7 @@
 	    (bd->client.icccm.accepts_focus))
 	  {
 	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
+	     /* TODO what if the client doesnt took focus ? */
 	  }
 	else if (!bd->client.icccm.accepts_focus)
 	  {
@@ -2969,6 +2985,7 @@
 	else if (!bd->client.icccm.take_focus)
 	  {
 	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
+	     e_border_focus_set(bd, 1, 0);
 	  }
      }
 }
@@ -5010,6 +5027,11 @@
              ct,
              modes[e->mode],
              details[e->detail]);
+
+      printf("%s cb focus in %d %d\n",
+	     e_border_name_get(bd),
+	     bd->client.icccm.accepts_focus,
+	     bd->client.icccm.take_focus);
    }
 #endif
    if (e->mode == ECORE_X_EVENT_MODE_GRAB)
@@ -5020,6 +5042,12 @@
      {
         if (e->detail == ECORE_X_EVENT_DETAIL_POINTER) return ECORE_CALLBACK_PASS_ON;
      }
+
+   /* ignore focus in from !take_focus windows, we just gave it em */
+   if (!bd->client.icccm.take_focus)
+     return ECORE_CALLBACK_PASS_ON;
+
+   /* should be equal, maybe some clients dont reply with the proper timestamp ? */
    if (e->time >= focus_time)
      e_border_focus_set(bd, 1, 0);
    return ECORE_CALLBACK_PASS_ON;
@@ -5066,6 +5094,11 @@
              ct,
              modes[e->mode],
              details[e->detail]);
+
+      printf("%s cb focus out %d %d\n",
+	     e_border_name_get(bd),
+	     bd->client.icccm.accepts_focus,
+	     bd->client.icccm.take_focus);
    }
 #endif
    if (e->mode == ECORE_X_EVENT_MODE_NORMAL)

Log:
e17: on _NET_ACTIVE_WINDOW client message: only switch to desk if border is not sticky
  

Author:       jeffdameth
Date:         2011-03-10 08:52:22 -0800 (Thu, 10 Mar 2011)
New Revision: 57676
Trac:         http://trac.enlightenment.org/e/changeset/57676

Modified:
  trunk/e/src/bin/e_manager.c 

Modified: trunk/e/src/bin/e_manager.c
===================================================================
--- trunk/e/src/bin/e_manager.c	2011-03-10 16:47:14 UTC (rev 57675)
+++ trunk/e/src/bin/e_manager.c	2011-03-10 16:52:22 UTC (rev 57676)
@@ -965,7 +965,8 @@
 		       if (!bd->lock_user_iconify)
 			 e_border_uniconify(bd);
 		    }
-		  if (!bd->iconic) e_desk_show(bd->desk);
+		  if ((!bd->iconic) && (!bd->sticky))
+		    e_desk_show(bd->desk);
 		  if (!bd->lock_user_stacking) e_border_raise(bd);
 		  if (!bd->lock_focus_out)
 		    {

Log:
e17: allow  window manipulation for any type of window maximize policy when 'allow maipulation of maximized windows' is enabled
  
  fixing http://trac.enlightenment.org/e/ticket/430
  

Author:       jeffdameth
Date:         2011-03-10 12:58:55 -0800 (Thu, 10 Mar 2011)
New Revision: 57681
Trac:         http://trac.enlightenment.org/e/changeset/57681

Modified:
  trunk/e/src/bin/e_actions.c 

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2011-03-10 20:22:10 UTC (rev 57680)
+++ trunk/e/src/bin/e_actions.c	2011-03-10 20:58:55 UTC (rev 57681)
@@ -2280,9 +2280,7 @@
 
 	bd = (E_Border *)obj;
 	if ((bd->lock_user_size) || (bd->shaded) || (bd->shading) ||
-	    (bd->fullscreen) ||
-	    ((bd->maximized == E_MAXIMIZE_FULLSCREEN) &&
-	     (!e_config->allow_manip)))
+	    (bd->fullscreen) || ((bd->maximized) && (!e_config->allow_manip)))
 	  return;
 	e_pointer_type_push(bd->pointer, bd, params);
      }
@@ -2298,8 +2296,7 @@
 
 	bd = (E_Border *)obj;
 	if ((bd->lock_user_size) || (bd->shaded) || (bd->shading) ||
-	    (bd->fullscreen) ||
-		((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)))
+	    (bd->fullscreen) || ((bd->maximized) && (!e_config->allow_manip)))
 	  return;
 	e_pointer_type_pop(bd->pointer, bd, params);
      }

Log:
e17: raise border in window_desk_move_by action
  

Author:       jeffdameth
Date:         2011-03-12 07:09:49 -0800 (Sat, 12 Mar 2011)
New Revision: 57703
Trac:         http://trac.enlightenment.org/e/changeset/57703

Modified:
  trunk/e/src/bin/e_actions.c 

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2011-03-12 06:36:21 UTC (rev 57702)
+++ trunk/e/src/bin/e_actions.c	2011-03-12 15:09:49 UTC (rev 57703)
@@ -1192,6 +1192,8 @@
 	     e_zone_desk_flip_by(bd->zone, to_x - dx, to_y - dy);
 	     /* send the border to the required desktop. */
 	     e_border_desk_set(bd, desk);
+	     if (!bd->lock_user_stacking)
+	       e_border_raise(bd);
 	     e_border_focus_set(bd, 1, 1);
 	  }
      }

Log:
e17: fix focus new window with click to focus. delay setting focus again
  

Author:       jeffdameth
Date:         2011-03-12 08:24:37 -0800 (Sat, 12 Mar 2011)
New Revision: 57704
Trac:         http://trac.enlightenment.org/e/changeset/57704

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-12 15:09:49 UTC (rev 57703)
+++ trunk/e/src/bin/e_border.c	2011-03-12 16:24:37 UTC (rev 57704)
@@ -1905,6 +1905,11 @@
 
    if ((set) && (focus))
      {
+	if (bd->visible && bd->changes.visible)
+	  {
+	     bd->want_focus = 1;
+	     return;
+	  }
 	if ((!bd->focused) || (focus_next && (bd != eina_list_data_get(focus_next))))
 	  {
 	     Eina_List *l;

Log:
e17: possible focus fix: wait for windows focus_in event also if it does not !take_focus
  

Author:       jeffdameth
Date:         2011-03-12 08:59:02 -0800 (Sat, 12 Mar 2011)
New Revision: 57705
Trac:         http://trac.enlightenment.org/e/changeset/57705

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-12 16:24:37 UTC (rev 57704)
+++ trunk/e/src/bin/e_border.c	2011-03-12 16:59:02 UTC (rev 57705)
@@ -2990,7 +2990,7 @@
 	else if (!bd->client.icccm.take_focus)
 	  {
 	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
-	     e_border_focus_set(bd, 1, 0);
+	     /* e_border_focus_set(bd, 1, 0); */
 	  }
      }
 }
@@ -5049,8 +5049,8 @@
      }
 
    /* ignore focus in from !take_focus windows, we just gave it em */
-   if (!bd->client.icccm.take_focus)
-     return ECORE_CALLBACK_PASS_ON;
+   /* if (!bd->client.icccm.take_focus)
+    *   return ECORE_CALLBACK_PASS_ON; */
 
    /* should be equal, maybe some clients dont reply with the proper timestamp ? */
    if (e->time >= focus_time)
@@ -7525,6 +7525,9 @@
             (bd->want_focus))
           {
              bd->want_focus = 0;
+#ifdef INOUTDEBUG_FOCUS	     
+	     printf("__________ focus new window _________\n");
+#endif
 	     e_border_focus_set_with_pointer(bd);
           }
         else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
@@ -7534,11 +7537,18 @@
                   (e_border_find_by_client_window(bd->client.icccm.transient_for) ==
                    e_border_focused_get())))
                {
+#ifdef INOUTDEBUG_FOCUS	     
+		  printf("__________ focus new dialog _________\n");
+#endif
+
 		  e_border_focus_set_with_pointer(bd);
                }
           }
         else
           {
+#ifdef INOUTDEBUG_FOCUS	     
+	     printf("__________ window takes focus _________\n");
+#endif
              /* focus window by default when it is the only one on desk */
               E_Border *bd2 = NULL;
               Eina_List *l;

Log:
e17: e_widget_ilist: 
  - fix return e_widget_ilist_count: return listcnt + queue
  - dont add artificial upadte delay, use idler.
  

Author:       jeffdameth
Date:         2011-03-14 16:43:16 -0700 (Mon, 14 Mar 2011)
New Revision: 57755
Trac:         http://trac.enlightenment.org/e/changeset/57755

Modified:
  trunk/e/src/bin/e_widget_ilist.c 

Modified: trunk/e/src/bin/e_widget_ilist.c
===================================================================
--- trunk/e/src/bin/e_widget_ilist.c	2011-03-14 23:28:40 UTC (rev 57754)
+++ trunk/e/src/bin/e_widget_ilist.c	2011-03-14 23:43:16 UTC (rev 57755)
@@ -12,7 +12,7 @@
    struct 
      {
         Eina_List *queue;
-        Ecore_Timer *timer;
+        Ecore_Idler *idler;
         int count;
         int show_nth;
         int select_nth;
@@ -48,13 +48,13 @@
 static void _e_wid_cb_selected(void *data, Evas_Object *obj, void *event_info);
 static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
-static Eina_Bool _queue_timer(void *data);
+static Eina_Bool _queue_idler(void *data);
 static void _queue_queue(Evas_Object *obj);
 static void _queue_append(Evas_Object *obj, int command, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data), void *data, const char *val, int relative, int use_relative, int item);
 static void _queue_remove(Evas_Object *obj, E_Widget_Queue_Item *qi, int del);
 
 static Eina_Bool
-_queue_timer(void *data)
+_queue_idler(void *data)
 {
    Evas_Object *obj;
    E_Widget_Data *wd;
@@ -62,7 +62,7 @@
 
    obj = data;
    wd = e_widget_data_get(obj);
-   wd->queue.timer = NULL;
+   wd->queue.idler = NULL;
    e_widget_ilist_freeze(obj);
    num = 0;
    while (wd->queue.queue)
@@ -189,8 +189,9 @@
 
    wd = e_widget_data_get(obj);
    if (!wd->queue.queue) return;
-   if (wd->queue.timer) return;
-   wd->queue.timer = ecore_timer_add(0.05, _queue_timer, obj);
+   if (wd->queue.idler) return;
+   e_util_wakeup();
+   wd->queue.idler = ecore_idler_add(_queue_idler, obj);
 }
 
 static void
@@ -244,8 +245,8 @@
    wd = e_widget_data_get(obj);
    while (wd->queue.queue)
      _queue_remove(obj, eina_list_data_get(wd->queue.queue), 1);
-   if (wd->queue.timer) ecore_timer_del(wd->queue.timer);
-   wd->queue.timer = NULL;
+   if (wd->queue.idler) ecore_idler_del(wd->queue.idler);
+   wd->queue.idler = NULL;
 }
 
 /* externally accessible functions */
@@ -510,8 +511,9 @@
    E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
+   
    if (wd->queue.queue) 
-     return eina_list_count(wd->queue.queue);
+     return (eina_list_count(wd->queue.queue) + e_ilist_count(wd->o_ilist));
    else
      return e_ilist_count(wd->o_ilist);
 }

Log:
e17: fix segv in client list menu with sort by class
  

Author:       jeffdameth
Date:         2011-03-15 09:33:46 -0700 (Tue, 15 Mar 2011)
New Revision: 57766
Trac:         http://trac.enlightenment.org/e/changeset/57766

Modified:
  trunk/e/src/bin/e_int_menus.c 

Modified: trunk/e/src/bin/e_int_menus.c
===================================================================
--- trunk/e/src/bin/e_int_menus.c	2011-03-15 16:20:57 UTC (rev 57765)
+++ trunk/e/src/bin/e_int_menus.c	2011-03-15 16:33:46 UTC (rev 57766)
@@ -883,15 +883,12 @@
    bd1 = d1;
    bd2 = d2;
 
-   if (strcmp((const char*)bd1->client.icccm.class, 
-	      (const char*)bd2->client.icccm.class) > 0) 
+   if (!bd1->client.icccm.class)
+     return -1;
+   if (!bd2->client.icccm.class)
      return 1;
 
-   if (strcmp((const char*)bd1->client.icccm.class, 
-	      (const char*)bd2->client.icccm.class) < 0) 
-     return -1;
-
-   return -1;   /* Returning '-1' on equal is intentional */
+   return (strcmp(bd1->client.icccm.class, bd2->client.icccm.class) > 0 ? 1 : -1);
 }
 
 static int

Log:
e17: e_widget_ilist return correct list count. only count queue commands that add something
  

Author:       jeffdameth
Date:         2011-03-16 01:22:09 -0700 (Wed, 16 Mar 2011)
New Revision: 57788
Trac:         http://trac.enlightenment.org/e/changeset/57788

Modified:
  trunk/e/src/bin/e_widget_ilist.c 

Modified: trunk/e/src/bin/e_widget_ilist.c
===================================================================
--- trunk/e/src/bin/e_widget_ilist.c	2011-03-16 06:50:09 UTC (rev 57787)
+++ trunk/e/src/bin/e_widget_ilist.c	2011-03-16 08:22:09 UTC (rev 57788)
@@ -511,9 +511,18 @@
    E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
-   
-   if (wd->queue.queue) 
-     return (eina_list_count(wd->queue.queue) + e_ilist_count(wd->o_ilist));
+
+   if (wd->queue.queue)
+     {
+	E_Widget_Queue_Item *qi;
+	Eina_List *l;
+	int cnt = 0;
+
+	EINA_LIST_FOREACH(wd->queue.queue, l, qi)
+	  if (qi->command == 0) cnt++;
+
+	return (cnt + e_ilist_count(wd->o_ilist));
+     }
    else
      return e_ilist_count(wd->o_ilist);
 }

Log:
e17: e_widget_ilist make queue command codes being an enum
  

Author:       jeffdameth
Date:         2011-03-16 01:25:40 -0700 (Wed, 16 Mar 2011)
New Revision: 57789
Trac:         http://trac.enlightenment.org/e/changeset/57789

Modified:
  trunk/e/src/bin/e_widget_ilist.c 

Modified: trunk/e/src/bin/e_widget_ilist.c
===================================================================
--- trunk/e/src/bin/e_widget_ilist.c	2011-03-16 08:22:09 UTC (rev 57788)
+++ trunk/e/src/bin/e_widget_ilist.c	2011-03-16 08:25:40 UTC (rev 57789)
@@ -53,6 +53,25 @@
 static void _queue_append(Evas_Object *obj, int command, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data), void *data, const char *val, int relative, int use_relative, int item);
 static void _queue_remove(Evas_Object *obj, E_Widget_Queue_Item *qi, int del);
 
+static enum _Queue_Command
+{
+  CMD_ADD,
+  CMD_REMOVE,
+  CMD_APPEND,
+  CMD_PREPEND,
+  CMD_APPEND_RELATIVE,
+  CMD_PREPEND_RELATIVE,
+  CMD_SELECT,
+  CMD_UNSELECT,
+  CMD_RANGE_SELECT,
+  CMD_MULTI_SELECT,
+  CMD_LABEL_SET,
+  CMD_ICON_SET,
+  CMD_END_SET,
+  CMD_SHOW
+} Queue_Command;
+
+  
 static Eina_Bool
 _queue_idler(void *data)
 {
@@ -70,7 +89,7 @@
         E_Widget_Queue_Item *qi;
 
         qi = eina_list_data_get(wd->queue.queue);
-        if (qi->command == 0)
+        if (qi->command == CMD_ADD)
           {
              E_Widget_Callback *wcb, *rcb;
 
@@ -79,19 +98,19 @@
              wcb->func = qi->func;
              wcb->data = qi->data;
              if (qi->val) wcb->value = strdup(qi->val);
-             if (qi->use_relative == 0) // append
+             if (qi->use_relative == CMD_APPEND)
                {
                   wd->callbacks = eina_list_append(wd->callbacks, wcb);
                   e_ilist_append(wd->o_ilist, qi->icon, qi->end, qi->label, qi->header,
                                  _e_wid_cb_item_sel, _e_wid_cb_item_hilight, wd, wcb);
                }
-             else if (qi->use_relative == 2) // prepend
+             else if (qi->use_relative == CMD_PREPEND)
                {
                   wd->callbacks = eina_list_append(wd->callbacks, wcb);
                   e_ilist_prepend(wd->o_ilist, qi->icon, qi->end, qi->label, qi->header,
                                   _e_wid_cb_item_sel, _e_wid_cb_item_hilight, wd, wcb);
                }
-             else if (qi->use_relative == 1) // append relative
+             else if (qi->use_relative == CMD_APPEND_RELATIVE)
                {
                   rcb = eina_list_nth(wd->callbacks, qi->relative);
                   if (rcb)
@@ -107,7 +126,7 @@
                                       _e_wid_cb_item_sel, _e_wid_cb_item_hilight, wd, wcb);
                     }
                }
-             else if (qi->use_relative == 3) // prepend relative
+             else if (qi->use_relative == CMD_PREPEND_RELATIVE)
                {
                   rcb = eina_list_nth(wd->callbacks, qi->relative);
                   if (rcb)
@@ -126,11 +145,11 @@
              if (qi->icon) evas_object_show(qi->icon);
 	     if (qi->end) evas_object_show(qi->end);
           }
-        else if (qi->command == 1)
+        else if (qi->command ==CMD_LABEL_SET)
           e_ilist_nth_label_set(wd->o_ilist, qi->item, qi->label);
-        else if (qi->command == 2)
+        else if (qi->command == CMD_ICON_SET)
           e_ilist_nth_icon_set(wd->o_ilist, qi->item, qi->icon);
-        else if (qi->command == 3)
+        else if (qi->command == CMD_SHOW)
           {
              Evas_Coord x, y, w, h;
 
@@ -140,9 +159,9 @@
              else
                e_scrollframe_child_region_show(wd->o_scrollframe, x, y, w, h);
           }
-        else if (qi->command == 4)
+        else if (qi->command == CMD_SELECT)
           e_ilist_selected_set(wd->o_ilist, qi->item);
-        else if (qi->command == 5)
+        else if (qi->command == CMD_UNSELECT)
           {
              if ((wd->value) && *(wd->value))
                {
@@ -151,7 +170,8 @@
                }
              e_ilist_unselect(wd->o_ilist);
           }
-        else if (qi->command == 6)
+#if 0
+        else if (qi->command == CMD_REMOVE)
           {
              E_Widget_Callback *wcb;
 	     Eina_List *item;
@@ -166,11 +186,12 @@
                   wd->callbacks = eina_list_remove_list(wd->callbacks, item);
                }
           }
-        else if (qi->command == 7)
+#endif	
+        else if (qi->command == CMD_MULTI_SELECT)
           e_ilist_multi_select(wd->o_ilist, qi->item);
-        else if (qi->command == 8)
+        else if (qi->command == CMD_RANGE_SELECT)
           e_ilist_range_select(wd->o_ilist, qi->item);
-	else if (qi->command == 9)
+	else if (qi->command == CMD_END_SET)
 	  e_ilist_nth_end_set(wd->o_ilist, qi->item, qi->end);
         _queue_remove(obj, qi, 0);
         num++;
@@ -311,7 +332,7 @@
 EAPI void
 e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val)
 {
-   _queue_append(obj, 0, icon, NULL, label, 0, func, data, val, 0, 0, 0);
+   _queue_append(obj, CMD_ADD, icon, NULL, label, 0, func, data, val, 0, CMD_APPEND, 0);
 /*
    E_Widget_Data *wd;
    E_Widget_Callback *wcb;
@@ -332,13 +353,13 @@
 EAPI void
 e_widget_ilist_append_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val)
 {
-   _queue_append(obj, 0, icon, end, label, 0, func, data, val, 0, 0, 0);
+   _queue_append(obj, CMD_ADD, icon, end, label, 0, func, data, val, 0, CMD_APPEND, 0);
 }
 
 EAPI void
 e_widget_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val, int relative)
 {
-   _queue_append(obj, 0, icon, NULL, label, 0, func, data, val, relative,1, 0);
+   _queue_append(obj, CMD_ADD, icon, NULL, label, 0, func, data, val, relative, CMD_APPEND_RELATIVE, 0);
 /*
    E_Widget_Data *wd;
    E_Widget_Callback *wcb, *rcb;
@@ -370,13 +391,13 @@
 EAPI void
 e_widget_ilist_append_relative_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val, int relative)
 {
-   _queue_append(obj, 0, icon, end, label, 0, func, data, val, relative,1, 0);
+   _queue_append(obj, CMD_ADD, icon, end, label, 0, func, data, val, relative, CMD_APPEND_RELATIVE, 0);
 }
 
 EAPI void
 e_widget_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val)
 {
-   _queue_append(obj, 0, icon, NULL, label, 0, func, data, val, 0, 2, 0);
+   _queue_append(obj, CMD_ADD, icon, NULL, label, 0, func, data, val, 0, CMD_PREPEND, 0);
 /*
    E_Widget_Data *wd;
    E_Widget_Callback *wcb;
@@ -397,13 +418,13 @@
 EAPI void
 e_widget_ilist_prepend_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val)
 {
-   _queue_append(obj, 0, icon, end, label, 0, func, data, val, 0, 2, 0);
+   _queue_append(obj, CMD_ADD, icon, end, label, 0, func, data, val, 0, CMD_PREPEND, 0);
 }
 
 EAPI void
 e_widget_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val, int relative)
 {
-   _queue_append(obj, 0, icon, NULL, label, 0, func, data, val, relative, 3, 0);
+   _queue_append(obj, CMD_ADD, icon, NULL, label, 0, func, data, val, relative, CMD_PREPEND_RELATIVE, 0);
 /*
    E_Widget_Data *wd;
    E_Widget_Callback *wcb, *rcb;
@@ -435,13 +456,13 @@
 EAPI void
 e_widget_ilist_prepend_relative_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val, int relative)
 {
-   _queue_append(obj, 0, icon, end, label, 0, func, data, val, relative, 3, 0);
+   _queue_append(obj, CMD_ADD, icon, end, label, 0, func, data, val, relative, CMD_PREPEND_RELATIVE, 0);
 }
 
 EAPI void
 e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *label)
 {
-   _queue_append(obj, 0, icon, NULL, label, 1, NULL, NULL, NULL, 0, 0, 0);
+   _queue_append(obj, CMD_ADD, icon, NULL, label, 1, NULL, NULL, NULL, 0, CMD_APPEND, 0);
 /*
    E_Widget_Data *wd;
    E_Widget_Callback *wcb;
@@ -519,7 +540,7 @@
 	int cnt = 0;
 
 	EINA_LIST_FOREACH(wd->queue.queue, l, qi)
-	  if (qi->command == 0) cnt++;
+	  if (qi->command == CMD_ADD) cnt++;
 
 	return (cnt + e_ilist_count(wd->o_ilist));
      }
@@ -548,7 +569,7 @@
 EAPI void
 e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
 {
-   _queue_append(obj, 1, NULL, NULL, label, 0, NULL, NULL, NULL, 0, 0, n);
+   _queue_append(obj, CMD_LABEL_SET, NULL, NULL, label, 0, NULL, NULL, NULL, 0, 0, n);
 /*
    E_Widget_Data *wd;
 
@@ -569,7 +590,7 @@
 EAPI void
 e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
 {
-   _queue_append(obj, 2, icon, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n);
+   _queue_append(obj, CMD_ICON_SET, icon, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n);
 /*
    E_Widget_Data *wd;
 
@@ -590,7 +611,7 @@
 EAPI void
 e_widget_ilist_nth_end_set(Evas_Object *obj, int n, Evas_Object *end)
 {
-   _queue_append(obj, 9, NULL, end, NULL, 0, NULL, NULL, NULL, 0, 0, n);
+   _queue_append(obj, CMD_END_SET, NULL, end, NULL, 0, NULL, NULL, NULL, 0, 0, n);
 }
 
 EAPI Evas_Object *
@@ -730,7 +751,7 @@
 EAPI void
 e_widget_ilist_nth_show(Evas_Object *obj, int n, int top)
 {
-   _queue_append(obj, 3, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, top, n);
+   _queue_append(obj, CMD_SHOW, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, top, n);
 /*
    E_Widget_Data *wd;
    Evas_Coord x, y, w, h;
@@ -747,7 +768,7 @@
 EAPI void
 e_widget_ilist_selected_set(Evas_Object *obj, int n)
 {
-   _queue_append(obj, 4, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n);
+   _queue_append(obj, CMD_SELECT, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n);
 /*
    E_Widget_Data *wd;
 
@@ -831,7 +852,7 @@
 EAPI void
 e_widget_ilist_unselect(Evas_Object *obj)
 {
-   _queue_append(obj, 5, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, 0);
+   _queue_append(obj, CMD_UNSELECT, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, 0);
 /*
    E_Widget_Data *wd;
 
@@ -848,7 +869,7 @@
 EAPI void
 e_widget_ilist_remove_num(Evas_Object *obj, int n)
 {
-/*    _queue_append(obj, 6, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n); */
+/*    _queue_append(obj, CMD_REMOVE, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n); */
    E_Widget_Callback *wcb;
    E_Widget_Data *wd;
    Eina_List *item;
@@ -886,7 +907,7 @@
 EAPI void
 e_widget_ilist_multi_select(Evas_Object *obj, int n)
 {
-   _queue_append(obj, 7, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n);
+   _queue_append(obj, CMD_MULTI_SELECT, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n);
 /*
    E_Widget_Data *wd;
 
@@ -898,7 +919,7 @@
 EAPI void
 e_widget_ilist_range_select(Evas_Object *obj, int n)
 {
-   _queue_append(obj, 8, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n);
+   _queue_append(obj, CMD_RANGE_SELECT, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n);
 /*
    E_Widget_Data *wd;

Log:
e17: e_widget_ilist: avoid too much idling
  

Author:       jeffdameth
Date:         2011-03-16 02:07:01 -0700 (Wed, 16 Mar 2011)
New Revision: 57791
Trac:         http://trac.enlightenment.org/e/changeset/57791

Modified:
  trunk/e/src/bin/e_widget_ilist.c 

Modified: trunk/e/src/bin/e_widget_ilist.c
===================================================================
--- trunk/e/src/bin/e_widget_ilist.c	2011-03-16 08:29:13 UTC (rev 57790)
+++ trunk/e/src/bin/e_widget_ilist.c	2011-03-16 09:07:01 UTC (rev 57791)
@@ -71,13 +71,15 @@
   CMD_SHOW
 } Queue_Command;
 
-  
+
+
 static Eina_Bool
 _queue_idler(void *data)
 {
    Evas_Object *obj;
    E_Widget_Data *wd;
    int num;
+   double start = ecore_time_get();
 
    obj = data;
    wd = e_widget_data_get(obj);
@@ -194,8 +196,9 @@
 	else if (qi->command == CMD_END_SET)
 	  e_ilist_nth_end_set(wd->o_ilist, qi->item, qi->end);
         _queue_remove(obj, qi, 0);
-        num++;
-        if (num >= 10) break;
+
+        if ((num++ >= 10) && (ecore_time_get() - start > 0.01))
+	  break;
      }
    e_widget_ilist_thaw(obj);
    e_widget_ilist_go(obj);

Log:
e17: e_widget_ilist: do reveal(show) item in next idler. if other commands were in queue list geomentry is not up to date anymore
  
  fixes: showing the right area with e_widget_ilist_show after items were removed
  

Author:       jeffdameth
Date:         2011-03-16 02:34:46 -0700 (Wed, 16 Mar 2011)
New Revision: 57792
Trac:         http://trac.enlightenment.org/e/changeset/57792

Modified:
  trunk/e/src/bin/e_widget_ilist.c 

Modified: trunk/e/src/bin/e_widget_ilist.c
===================================================================
--- trunk/e/src/bin/e_widget_ilist.c	2011-03-16 09:07:01 UTC (rev 57791)
+++ trunk/e/src/bin/e_widget_ilist.c	2011-03-16 09:34:46 UTC (rev 57792)
@@ -71,8 +71,6 @@
   CMD_SHOW
 } Queue_Command;
 
-
-
 static Eina_Bool
 _queue_idler(void *data)
 {
@@ -154,7 +152,8 @@
         else if (qi->command == CMD_SHOW)
           {
              Evas_Coord x, y, w, h;
-
+	     if (num > 0) break;
+	     
              e_ilist_nth_geometry_get(wd->o_ilist, qi->item, &x, &y, &w, &h);
              if (qi->use_relative)
                e_scrollframe_child_pos_set(wd->o_scrollframe, x, y);

Log:
e17: focus fix. forgot to set bd->changed to handle want_focus in eval..
  

Author:       jeffdameth
Date:         2011-03-16 06:31:43 -0700 (Wed, 16 Mar 2011)
New Revision: 57799
Trac:         http://trac.enlightenment.org/e/changeset/57799

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-16 13:16:36 UTC (rev 57798)
+++ trunk/e/src/bin/e_border.c	2011-03-16 13:31:43 UTC (rev 57799)
@@ -1908,6 +1908,7 @@
 	if (bd->visible && bd->changes.visible)
 	  {
 	     bd->want_focus = 1;
+	     bd->changed = 1;
 	     return;
 	  }
 	if ((!bd->focused) || (focus_next && (bd != eina_list_data_get(focus_next))))
@@ -1951,6 +1952,7 @@
 	if ((bd->visible) && (bd->changes.visible))
 	  {
 	     bd->want_focus = 0;
+	     bd->changed = 1;
 	     return;
 	  }
      }

Log:
e17 patches from T_UNIX:
  0001-Small-fixes-possible-segv-in-e-s-randr-subsystem.patch
  0002-Add-common-modes-to-CRTC-information-structure.patch
  

Author:       jeffdameth
Date:         2011-03-17 16:02:02 -0700 (Thu, 17 Mar 2011)
New Revision: 57833
Trac:         http://trac.enlightenment.org/e/changeset/57833

Modified:
  trunk/e/src/bin/e_randr.c trunk/e/src/bin/e_randr.h 

Modified: trunk/e/src/bin/e_randr.c
===================================================================
--- trunk/e/src/bin/e_randr.c	2011-03-17 18:43:44 UTC (rev 57832)
+++ trunk/e/src/bin/e_randr.c	2011-03-17 23:02:02 UTC (rev 57833)
@@ -531,6 +531,7 @@
    if (crtc_info->current_mode)
      fprintf(stderr, "found CRTC %d in mode %d\n", crtc_info->xid, crtc_info->current_mode->xid);
    crtc_info->current_orientation = ecore_x_randr_crtc_orientation_get(e_randr_screen_info->root, crtc_info->xid);
+   crtc_info->outputs_common_modes = _e_randr_outputs_common_modes_get(crtc_info->outputs, NULL);
 }
 
 /*
@@ -548,6 +549,9 @@
 
    if (E_RANDR_NO_12 || !(modes = ecore_x_randr_output_modes_get(e_randr_screen_info->root, output_info->xid, &nmodes, &npreferred))) return EINA_FALSE;
 
+   //In case the monitor does not have any preferred mode at all
+   if (nmodes > 0 && npreferred == 0) npreferred = 1;
+
    while (--nmodes >= 0)
      {
         added_yet = EINA_FALSE;
@@ -562,10 +566,10 @@
         if(!added_yet)
           {
              mode_info = ecore_x_randr_mode_info_get(e_randr_screen_info->root, modes[nmodes]);
-             e_randr_screen_info->rrvd_info.randr_info_12->modes = eina_list_append(e_randr_screen_info->rrvd_info.randr_info_12->modes, mode_info);
+             e_randr_screen_info->rrvd_info.randr_info_12->modes = eina_list_prepend(e_randr_screen_info->rrvd_info.randr_info_12->modes, mode_info);
           }
-        output_info->modes = eina_list_append(output_info->modes, mode_info);
-        if (nmodes < npreferred) output_info->preferred_modes = eina_list_append(output_info->preferred_modes, mode_info);
+        output_info->modes = eina_list_prepend(output_info->modes, mode_info);
+        if (nmodes < npreferred) output_info->preferred_modes = eina_list_prepend(output_info->preferred_modes, mode_info);
 
      }
 
@@ -1282,7 +1286,12 @@
         if ((usable_crtc && (!usable_crtc->current_mode)) || force)
           {
              //enable and position according to used policies
-             mode_info = ((Ecore_X_Randr_Mode_Info*)eina_list_nth(output_info->preferred_modes, 0));
+             if(!(mode_info = ((Ecore_X_Randr_Mode_Info*)eina_list_nth(output_info->preferred_modes, 0))))
+               {
+                  fprintf(stderr, "E_RANDR: Could not enable output(%d), as it has no preferred (and there for none at all) modes.!\n", output_info->xid);
+                  ret = EINA_FALSE;
+                  break;
+               }
              if((ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid)))
                {
                   usable_crtc->geometry.w = mode_info->width;
@@ -1515,20 +1524,20 @@
 _e_randr_crtc_outputs_mode_max_set(E_Randr_Crtc_Info *crtc_info)
 {
    Ecore_X_Randr_Mode_Info *mode_info;
-   Eina_List *common_modes, *iter;
+   Eina_List *iter;
    Eina_Bool ret = EINA_TRUE;
    Ecore_X_Randr_Output *outputs;
 
-   if (!crtc_info || !crtc_info->outputs || !(common_modes = _e_randr_outputs_common_modes_get(crtc_info->outputs, NULL))) return EINA_FALSE;
+   if (!crtc_info || !crtc_info->outputs || !crtc_info->outputs_common_modes) return EINA_FALSE;
 
-   EINA_LIST_REVERSE_FOREACH(common_modes, iter, mode_info)
+   EINA_LIST_REVERSE_FOREACH(crtc_info->outputs_common_modes, iter, mode_info)
      {
         if (!_e_randr_crtc_mode_intersects_crtcs(crtc_info, mode_info))
           break;
      }
    if (!mode_info)
      {
-        eina_list_free(common_modes);
+        eina_list_free(crtc_info->outputs_common_modes);
         return EINA_FALSE;
      }
    if ((outputs = _e_randr_outputs_to_array(crtc_info->outputs)))
@@ -1536,7 +1545,7 @@
         ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, crtc_info->xid, outputs, eina_list_count(crtc_info->outputs), mode_info->xid);
         free(outputs);
      }
-   eina_list_free(common_modes);
+   eina_list_free(crtc_info->outputs_common_modes);
 
    ecore_x_randr_screen_reset(e_randr_screen_info->root);
 

Modified: trunk/e/src/bin/e_randr.h
===================================================================
--- trunk/e/src/bin/e_randr.h	2011-03-17 18:43:44 UTC (rev 57832)
+++ trunk/e/src/bin/e_randr.h	2011-03-17 23:02:02 UTC (rev 57833)
@@ -31,6 +31,7 @@
    int gamma_ramp_size;
    Eina_List *outputs;
    Eina_List *possible_outputs;
+   Eina_List *outputs_common_modes;
    Ecore_X_Randr_Mode_Info *current_mode;
 };

Log:
e17: use non-translateable string for gadcon client shelf menu item. as before. 
  

Author:       jeffdameth
Date:         2011-03-22 17:18:15 -0700 (Tue, 22 Mar 2011)
New Revision: 58006
Trac:         http://trac.enlightenment.org/e/changeset/58006

Modified:
  trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2011-03-23 00:11:00 UTC (rev 58005)
+++ trunk/e/src/bin/e_shelf.c	2011-03-23 00:18:15 UTC (rev 58006)
@@ -1164,12 +1164,17 @@
 {
    E_Menu_Item *mi;
    E_Menu *subm;
+   const char *name;
+   char buf[256];
 
+   name = e_shelf_orient_string_get (es);
+   snprintf(buf, sizeof(buf), "Shelf %s", name);
+
    e_shelf_locked_set(es, 1);
 
    subm = e_menu_new();
    mi = e_menu_item_new(mn);
-   e_menu_item_label_set(mi, _("Shelf Settings"));
+   e_menu_item_label_set(mi, buf);
    e_util_menu_item_theme_icon_set(mi, "preferences-desktop-shelf");
    e_menu_pre_activate_callback_set(subm, _e_shelf_menu_pre_cb, es);
    e_object_free_attach_func_set(E_OBJECT(mi), _e_shelf_menu_item_free);

Log:
e17: remove redundant code: 
  line 2901: 
  (bd->changes.pos && !bd->changes.size) || (!bd->changes.pos && bd->changes.size)
  cant be the case as before (!bd->changes.pos) && (!bd->changes.size) was checked.
  
  line 2935ff: new_client is always false after eval
  bd->changes.size/pos is always false after eval
  

Author:       jeffdameth
Date:         2011-03-25 13:22:52 -0700 (Fri, 25 Mar 2011)
New Revision: 58089
Trac:         http://trac.enlightenment.org/e/changeset/58089

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-25 09:05:23 UTC (rev 58088)
+++ trunk/e/src/bin/e_border.c	2011-03-25 20:22:52 UTC (rev 58089)
@@ -2898,10 +2898,7 @@
                       (!bd->changes.size))
                     {
                        ecore_evas_show(bd->bg_ecore_evas);
-                       if ((1) &&
-                           ((bd->changes.pos && !bd->changes.size) ||
-                            (!bd->changes.pos && bd->changes.size) ||
-                            (bd->post_job)))
+                       if (bd->post_job)
                          {
                             bd->post_show = 1;
                          }
@@ -2935,14 +2932,10 @@
                        bd->changes.visible = 0;
                     }
                   if (bd->changed) _e_border_eval(bd);
-                  if ((bd->changes.visible) && (bd->visible) &&
-                      (!bd->new_client))
+                  if ((bd->changes.visible) && (bd->visible))
                     {
                        ecore_evas_show(bd->bg_ecore_evas);
-                       if ((1) &&
-                           ((bd->changes.pos && !bd->changes.size) ||
-                            (!bd->changes.pos && bd->changes.size) ||
-                            (bd->post_job)))
+                       if (bd->post_job)
                          {
                             bd->post_show = 1;
                          }
@@ -7337,17 +7330,10 @@
      }
    else if (bd->changes.pos)
      {
-        if (1)
-          {
-             if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-             bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job,
-                                                   bd);
-             bd->post_move = 1;
-          }
-        else
-          {
-             ecore_x_window_move(bd->win, bd->x + bd->fx.x, bd->y + bd->fx.y);
-          }
+	if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
+	bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job, bd);
+	bd->post_move = 1;
+
         e_container_shape_move(bd->shape, bd->x + bd->fx.x, bd->y + bd->fx.y);
 
         _e_border_client_move_resize_send(bd);

Log:
e17: set border fx offset directly. should give smoother desk flip animation
  

Author:       jeffdameth
Date:         2011-03-25 13:26:06 -0700 (Fri, 25 Mar 2011)
New Revision: 58090
Trac:         http://trac.enlightenment.org/e/changeset/58090

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-25 20:22:52 UTC (rev 58089)
+++ trunk/e/src/bin/e_border.c	2011-03-25 20:26:06 UTC (rev 58090)
@@ -1243,10 +1243,12 @@
    if ((x == bd->fx.x) && (y == bd->fx.y)) return;
    bd->fx.x = x;
    bd->fx.y = y;
-   bd->changed = 1;
-   bd->changes.pos = 1;
 
-   _e_border_client_move_resize_send(bd);
+   ecore_x_window_move(bd->win, bd->x + bd->fx.start.x, bd->y + bd->fx.start.y);
+   bd->changes.pos = 0;
+
+   /* client doesnt need to know fx offset, or does it? */
+   /* _e_border_client_move_resize_send(bd); */
    if (bd->moving) _e_border_move_update(bd);
 }

Log:
e17: revert last commit. causes lost window on restart
  

Author:       jeffdameth
Date:         2011-03-25 13:52:19 -0700 (Fri, 25 Mar 2011)
New Revision: 58091
Trac:         http://trac.enlightenment.org/e/changeset/58091

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-25 20:26:06 UTC (rev 58090)
+++ trunk/e/src/bin/e_border.c	2011-03-25 20:52:19 UTC (rev 58091)
@@ -1244,11 +1244,9 @@
    bd->fx.x = x;
    bd->fx.y = y;
 
-   ecore_x_window_move(bd->win, bd->x + bd->fx.start.x, bd->y + bd->fx.start.y);
-   bd->changes.pos = 0;
-
-   /* client doesnt need to know fx offset, or does it? */
-   /* _e_border_client_move_resize_send(bd); */
+   bd->changes.pos = 1;
+   bd->changed = 1;
+   
    if (bd->moving) _e_border_move_update(bd);
 }

Log:
e17: disable input events of windows while deskflip animation is going
  
  - set focus at the end of deskflip animation
  - delay show after first move to not draw at final position first
  - move window further out to decrease the chance of having comp 
    get border_hide event before final position..   
  

Author:       jeffdameth
Date:         2011-03-25 16:14:52 -0700 (Fri, 25 Mar 2011)
New Revision: 58092
Trac:         http://trac.enlightenment.org/e/changeset/58092

Modified:
  trunk/e/src/bin/e_desk.c trunk/e/src/bin/e_desk.h 

Modified: trunk/e/src/bin/e_desk.c
===================================================================
--- trunk/e/src/bin/e_desk.c	2011-03-25 20:52:19 UTC (rev 58091)
+++ trunk/e/src/bin/e_desk.c	2011-03-25 23:14:52 UTC (rev 58092)
@@ -576,6 +576,11 @@
    E_Border *bd;
    double t;
 
+   if (dx < 0) dx = -1;
+   if (dx > 0) dx = 1;
+   if (dy < 0) dy = -1;
+   if (dy > 0) dy = 1;
+   
    t = ecore_loop_time_get();
    bl = e_container_border_list_first(desk->zone->container);
    while ((bd = e_container_border_list_next(bl)))
@@ -595,8 +600,8 @@
 		  bd->fx.start.t = t;
 		  if (mode == 1)
 		    {
-		       bd->fx.start.x = bd->zone->w * dx;
-		       bd->fx.start.y = bd->zone->h * dy;
+		       bd->fx.start.x = bd->zone->w * (dx * 1.5);
+		       bd->fx.start.y = bd->zone->h * (dy * 1.5);
 		    }
 		  else if (mode == 2)
 		    {
@@ -633,13 +638,14 @@
 		  else
 		    bd->fx.start.y += bd->zone->container->h - (bd->zone->y + bd->zone->h);
 		  e_border_fx_offset(bd, bd->fx.start.x, bd->fx.start.y);
-		  e_border_show(bd);
+		  e_border_comp_hidden_set(bd, EINA_TRUE);
 	       }
 	  }
      }
    e_container_border_list_free(bl);
    if (desk->animator) ecore_animator_del(desk->animator);
    desk->animator = ecore_animator_add(_e_desk_show_animator, desk);
+   desk->animating = EINA_TRUE;
 }
 
 static void
@@ -657,9 +663,19 @@
 	     if (bd->moving)
 	       e_border_fx_offset(bd, 0, 0);
 	     else if ((bd->desk == desk) && (!bd->sticky))
-	       e_border_fx_offset(bd, 0, 0);
+	       {
+		  e_border_fx_offset(bd, 0, 0);
+		  e_border_comp_hidden_set(bd, EINA_FALSE);
+
+		  if (!bd->visible)
+		    e_border_show(bd);
+	       }
 	  }
      }
+
+   if (e_config->focus_last_focused_per_desktop)
+     e_desk_last_focused_focus(desk);
+
    e_container_border_list_free(bl);
    ecore_x_window_shadow_tree_flush();
    ev = E_NEW(E_Event_Desk_After_Show, 1);
@@ -678,6 +694,14 @@
    double t, dt, spd;
 
    desk = data;
+
+   if (!desk->animating)
+     {
+	_e_desk_show_end(desk);
+	desk->animator = NULL;
+	return ECORE_CALLBACK_CANCEL;
+     }
+
    t = ecore_loop_time_get();
    dt = -1.0;
    spd = e_config->desk_flip_animate_time;
@@ -691,11 +715,14 @@
 	       }
 	     else if ((bd->desk == desk) && (!bd->sticky))
 	       {
+		  if (!bd->visible)
+		    e_border_show(bd);
+		  
 		  dt = (t - bd->fx.start.t) / spd;
 		  if (dt > 1.0) dt = 1.0;
 		  dt = 1.0 - dt;
 		  dt *= dt; /* decelerate - could be a better hack */
-                  e_border_fx_offset(bd, 
+		  e_border_fx_offset(bd,
 				     ((double)bd->fx.start.x * dt),
 				     ((double)bd->fx.start.y * dt));
 	       }
@@ -703,11 +730,8 @@
      }
    e_container_border_list_free(bl);
    if (dt <= 0.0)
-     {
-	_e_desk_show_end(desk);
-	desk->animator = NULL;
-	return ECORE_CALLBACK_CANCEL;
-     }
+     desk->animating = EINA_FALSE;
+
    return ECORE_CALLBACK_RENEW;
 }
 
@@ -718,6 +742,11 @@
    E_Border *bd;
    double t;
 
+   if (dx < 0) dx = -1;
+   if (dx > 0) dx = 1;
+   if (dy < 0) dy = -1;
+   if (dy > 0) dy = 1;
+
    t = ecore_loop_time_get();
    bl = e_container_border_list_first(desk->zone->container);
    while ((bd = e_container_border_list_next(bl)))
@@ -735,8 +764,8 @@
 		  bd->fx.start.t = t;
 		  if (mode == 1)
 		    {
-		       bd->fx.start.x = bd->zone->w * -dx;
-		       bd->fx.start.y = bd->zone->h * -dy;
+		       bd->fx.start.x = bd->zone->w * (-dx * 1.5);
+		       bd->fx.start.y = bd->zone->h * (-dy * 1.5);
 		    }
 		  else if (mode == 2)
 		    {
@@ -773,12 +802,14 @@
 		  else
 		    bd->fx.start.y += bd->zone->container->h - (bd->zone->y + bd->zone->h);
 		  e_border_fx_offset(bd, 0, 0);
+		  e_border_comp_hidden_set(bd, EINA_TRUE);
 	       }
 	  }
      }
    e_container_border_list_free(bl);
    if (desk->animator) ecore_animator_del(desk->animator);
    desk->animator = ecore_animator_add(_e_desk_hide_animator, desk);
+   desk->animating = EINA_TRUE;
 }
 
 static void
@@ -797,6 +828,7 @@
 	     else if ((bd->desk == desk) && (!bd->sticky))
 	       {
 		  e_border_fx_offset(bd, 0, 0);
+		  e_border_comp_hidden_set(bd, EINA_FALSE);
 		  e_border_hide(bd, 2);
 	       }
 	  }
@@ -814,6 +846,14 @@
    double t, dt, spd;
 
    desk = data;
+
+   if (!desk->animating)
+     {
+	_e_desk_hide_end(desk);
+	desk->animator = NULL;
+	return ECORE_CALLBACK_CANCEL;
+     }
+   
    t = ecore_loop_time_get();
    dt = -1.0;
    spd = e_config->desk_flip_animate_time;
@@ -837,11 +877,9 @@
 	  }
      }
    e_container_border_list_free(bl);
+
    if ((dt < 0.0) || (dt >= 1.0))
-     {
-	_e_desk_hide_end(desk);
-	desk->animator = NULL;
-	return ECORE_CALLBACK_CANCEL;
-     }
+     desk->animating = EINA_FALSE;
+
    return ECORE_CALLBACK_RENEW;
 }

Modified: trunk/e/src/bin/e_desk.h
===================================================================
--- trunk/e/src/bin/e_desk.h	2011-03-25 20:52:19 UTC (rev 58091)
+++ trunk/e/src/bin/e_desk.h	2011-03-25 23:14:52 UTC (rev 58092)
@@ -27,6 +27,7 @@
    Evas_Object         *bg_object;
    
    Ecore_Animator      *animator;
+   Eina_Bool            animating;
 };
 
 struct _E_Event_Desk_Show

Log:
e17: deskflip anim.. dont set focus on windows from previous desk
  

Author:       jeffdameth
Date:         2011-03-25 17:39:59 -0700 (Fri, 25 Mar 2011)
New Revision: 58093
Trac:         http://trac.enlightenment.org/e/changeset/58093

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-25 23:14:52 UTC (rev 58092)
+++ trunk/e/src/bin/e_border.c	2011-03-26 00:39:59 UTC (rev 58093)
@@ -1883,12 +1883,23 @@
      return;
    if ((set) && (focus) && (bd->lock_focus_out)) return;
    /* dont focus an iconified window. that's silly! */
-   if ((focus) && (bd->iconic))
-     return;
+   if (focus)
+     {
+	if (bd->iconic)
+	  return;
 
-   if ((focus) && (!bd->visible))
-     return;
+	if (!bd->visible)
+	  return;
 
+	/* FIXME: hack for deskflip animation:
+	 * dont update focus when sliding previous desk */
+	if (bd->desk != e_desk_current_get(bd->desk->zone))
+	  return;
+
+	/* TODO */
+	/* if !set and no other window is focused 'revert focus when lost' */
+     }
+
    if ((bd->modal) && (bd->modal != bd) && (bd->modal->visible))
      {
 	e_border_focus_set(bd->modal, focus, set);

Log:
e17: allow focusing sticky windows from other desk again.. 
  
  TODO need to have a zone overlay input window that locks all mouse input while deskflip anim and mous warp
  

Author:       jeffdameth
Date:         2011-03-27 12:23:12 -0700 (Sun, 27 Mar 2011)
New Revision: 58126
Trac:         http://trac.enlightenment.org/e/changeset/58126

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-03-27 18:59:17 UTC (rev 58125)
+++ trunk/e/src/bin/e_border.c	2011-03-27 19:23:12 UTC (rev 58126)
@@ -1893,7 +1893,7 @@
 
 	/* FIXME: hack for deskflip animation:
 	 * dont update focus when sliding previous desk */
-	if (bd->desk != e_desk_current_get(bd->desk->zone))
+	if ((!bd->sticky) && (bd->desk != e_desk_current_get(bd->desk->zone)))
 	  return;
 
 	/* TODO */

Log:
e17: fix dnd to invisible windows and fix e_border_comp_hidden_set 
  
  - dont drop e drags (e.g. efm files) to windows from other desks
  - should also fix wrong last desk focus set with deskflip animations enabled
  

Author:       jeffdameth
Date:         2011-04-11 05:22:17 -0700 (Mon, 11 Apr 2011)
New Revision: 58551
Trac:         http://trac.enlightenment.org/e/changeset/58551

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-04-11 12:18:10 UTC (rev 58550)
+++ trunk/e/src/bin/e_border.c	2011-04-11 12:22:17 UTC (rev 58551)
@@ -200,6 +200,8 @@
 static void _e_border_frame_replace(E_Border *bd,
 				    Eina_Bool argb);
 
+static void _e_border_show(E_Border *bd);
+static void _e_border_hide(E_Border *bd);
 
 /* local subsystem globals */
 static Eina_List *handlers = NULL;
@@ -2907,20 +2909,10 @@
                   if ((bd->changes.visible) && (bd->visible) &&
                       (!bd->new_client) && (!bd->changes.pos) &&
                       (!bd->changes.size))
-                    {
-                       ecore_evas_show(bd->bg_ecore_evas);
-                       if (bd->post_job)
-                         {
-                            bd->post_show = 1;
-                         }
-                       else
-                         {
-                            if (!bd->comp_hidden)
-                              ecore_x_composite_window_events_enable(bd->win);
-                            ecore_x_window_show(bd->win);
-                         }
-                       bd->changes.visible = 0;
-                    }
+		    {
+		       _e_border_show(bd);
+		       bd->changes.visible = 0;
+		    }		  
                }
              e_container_border_list_free(bl);
 
@@ -2929,35 +2921,21 @@
              while ((bd = e_container_border_list_next(bl)))
                {
                   if (e_object_is_del(E_OBJECT(bd))) continue;
-                  if ((bd->changes.visible) && (!bd->visible))
-                    {
-                       if (!e_manager_comp_evas_get(bd->zone->container->manager))
-                         {
-                            ecore_x_window_hide(bd->win);
-                            ecore_evas_hide(bd->bg_ecore_evas);
-                         }
-                       else
-                         {
-                            ecore_x_composite_window_events_disable(bd->win);
-                         }
-                       bd->changes.visible = 0;
-                    }
+
+		  if ((bd->changes.visible) && (!bd->visible))
+		    {
+		       _e_border_hide(bd);
+		       bd->changes.visible = 0;
+		    }
+
                   if (bd->changed) _e_border_eval(bd);
+
                   if ((bd->changes.visible) && (bd->visible))
-                    {
-                       ecore_evas_show(bd->bg_ecore_evas);
-                       if (bd->post_job)
-                         {
-                            bd->post_show = 1;
-                         }
-                       else
-                         {
-                            if (!bd->comp_hidden)
-                              ecore_x_composite_window_events_enable(bd->win);
-                            ecore_x_window_show(bd->win);
-                         }
-                       bd->changes.visible = 0;
-                    }
+		    {
+		       _e_border_show(bd);
+		       bd->changes.visible = 0;
+		    }
+		  
                }
              e_container_border_list_free(bl);
           }
@@ -3015,6 +2993,41 @@
 static Ecore_Timer *action_timer = NULL;
 static Ecore_X_Rectangle action_orig;
 
+static void
+_e_border_show(E_Border *bd)
+{			    
+   ecore_evas_show(bd->bg_ecore_evas);
+   
+   if (bd->post_job)
+     {	
+	bd->post_show = 1;
+	return;
+     }
+   
+   if (!bd->comp_hidden)
+     {
+	ecore_x_composite_window_events_enable(bd->win);
+	ecore_x_window_ignore_set(bd->win, EINA_FALSE);
+     }
+			    
+   ecore_x_window_show(bd->win);
+}
+
+static void
+_e_border_hide(E_Border *bd)
+{   
+   if (!e_manager_comp_evas_get(bd->zone->container->manager))
+     {
+	ecore_x_window_hide(bd->win);
+	ecore_evas_hide(bd->bg_ecore_evas);
+     }
+   else
+     {
+	ecore_x_composite_window_events_disable(bd->win);
+	ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+     }
+}
+
 static int
 _e_border_action_input_win_del(void)
 {
@@ -5980,13 +5993,13 @@
      {
         ecore_x_window_resize(bd->win, bd->w, bd->h);
      }
+   
    if (bd->post_show)
      {
         if (bd->visible)
           {
-             ecore_x_window_show(bd->win);
-             if (!bd->comp_hidden)
-               ecore_x_composite_window_events_enable(bd->win);
+	     bd->post_job = NULL;
+	     _e_border_show(bd);
           }
      }
    bd->post_show = 0;
@@ -7520,17 +7533,9 @@
                      }
                 }
           }
-        ecore_evas_show(bd->bg_ecore_evas);
-        if (bd->post_job)
-          {
-             bd->post_show = 1;
-          }
-        else
-          {
-             if (!bd->comp_hidden)
-               ecore_x_composite_window_events_enable(bd->win);
-             ecore_x_window_show(bd->win);
-          }
+
+	_e_border_show(bd);
+	
         if (bd->cur_mouse_action)
           {
              bd->moveinfo.down.x = bd->x + bd->fx.x;
@@ -8683,9 +8688,18 @@
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
    if (bd->comp_hidden == hidden) return;
+
+   bd->comp_hidden = hidden;
+   
    if (bd->comp_hidden)
-     ecore_x_composite_window_events_disable(bd->win);
+     {
+	ecore_x_composite_window_events_disable(bd->win);
+	ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+     }
    else
-     ecore_x_composite_window_events_enable(bd->win);
+     {
+	ecore_x_composite_window_events_enable(bd->win);
+	ecore_x_window_ignore_set(bd->win, EINA_FALSE);
+     }
 }
 /*vim:ts=8 sw=3 sts=3 expandtab cino=>5n-3f0^-2{2(0W1st0*/

Log:
e17/gadcon: dont show 'move to' entries for sites to which gadgets cannot be moved
  

Author:       jeffdameth
Date:         2011-04-11 13:39:42 -0700 (Mon, 11 Apr 2011)
New Revision: 58568
Trac:         http://trac.enlightenment.org/e/changeset/58568

Modified:
  trunk/e/src/bin/e_gadcon.c 

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2011-04-11 20:25:31 UTC (rev 58567)
+++ trunk/e/src/bin/e_gadcon.c	2011-04-11 20:39:42 UTC (rev 58568)
@@ -1343,10 +1343,14 @@
    e_menu_pre_activate_callback_set(m, NULL, NULL);
    gcc = data;
 
-   _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_SHELF, &n);
-   _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_DESKTOP, &n);
-   _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_TOOLBAR, &n);
-   _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_EFM_TOOLBAR, &n);
+   if (gcc->client_class->func.is_site && gcc->client_class->func.is_site(E_GADCON_SITE_SHELF))
+     _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_SHELF, &n);
+   if (gcc->client_class->func.is_site && gcc->client_class->func.is_site(E_GADCON_SITE_DESKTOP))
+     _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_DESKTOP, &n);
+   if (gcc->client_class->func.is_site && gcc->client_class->func.is_site(E_GADCON_SITE_TOOLBAR))
+     _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_TOOLBAR, &n);
+   if (gcc->client_class->func.is_site && gcc->client_class->func.is_site(E_GADCON_SITE_EFM_TOOLBAR))
+     _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_EFM_TOOLBAR, &n);
    _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_UNKNOWN, &n);
 }

Log:
e17/shelf: dont show shelf menu in extra submenu when clicking on the shelf
  

Author:       jeffdameth
Date:         2011-04-11 14:43:49 -0700 (Mon, 11 Apr 2011)
New Revision: 58572
Trac:         http://trac.enlightenment.org/e/changeset/58572

Modified:
  trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2011-04-11 21:35:24 UTC (rev 58571)
+++ trunk/e/src/bin/e_shelf.c	2011-04-11 21:43:49 UTC (rev 58572)
@@ -1334,7 +1334,7 @@
 	e_menu_post_deactivate_callback_set(mn, _e_shelf_cb_menu_post, es);
 	es->menu = mn;
 
-	_e_shelf_menu_append(es, mn);
+	_e_shelf_menu_pre_cb(es, mn);
 
         e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, NULL, NULL);
 	e_menu_activate_mouse(mn,

Log:
e17/gadcon client menu: dont restrict 'move to' when gadcon has no site restrictions
  

Author:       jeffdameth
Date:         2011-04-12 13:42:19 -0700 (Tue, 12 Apr 2011)
New Revision: 58600
Trac:         http://trac.enlightenment.org/e/changeset/58600

Modified:
  trunk/e/src/bin/e_gadcon.c 

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2011-04-12 18:29:46 UTC (rev 58599)
+++ trunk/e/src/bin/e_gadcon.c	2011-04-12 20:42:19 UTC (rev 58600)
@@ -1343,13 +1343,13 @@
    e_menu_pre_activate_callback_set(m, NULL, NULL);
    gcc = data;
 
-   if (gcc->client_class->func.is_site && gcc->client_class->func.is_site(E_GADCON_SITE_SHELF))
+   if (!gcc->client_class->func.is_site || gcc->client_class->func.is_site(E_GADCON_SITE_SHELF))
      _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_SHELF, &n);
-   if (gcc->client_class->func.is_site && gcc->client_class->func.is_site(E_GADCON_SITE_DESKTOP))
+   if (!gcc->client_class->func.is_site || gcc->client_class->func.is_site(E_GADCON_SITE_DESKTOP))
      _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_DESKTOP, &n);
-   if (gcc->client_class->func.is_site && gcc->client_class->func.is_site(E_GADCON_SITE_TOOLBAR))
+   if (!gcc->client_class->func.is_site || gcc->client_class->func.is_site(E_GADCON_SITE_TOOLBAR))
      _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_TOOLBAR, &n);
-   if (gcc->client_class->func.is_site && gcc->client_class->func.is_site(E_GADCON_SITE_EFM_TOOLBAR))
+   if (!gcc->client_class->func.is_site || gcc->client_class->func.is_site(E_GADCON_SITE_EFM_TOOLBAR))
      _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_EFM_TOOLBAR, &n);
    _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_UNKNOWN, &n);
 }

Log:
e17: use timer instead of idler again
  

Author:       jeffdameth
Date:         2011-04-16 05:22:57 -0700 (Sat, 16 Apr 2011)
New Revision: 58699
Trac:         http://trac.enlightenment.org/e/changeset/58699

Modified:
  trunk/e/src/bin/e_widget_ilist.c 

Modified: trunk/e/src/bin/e_widget_ilist.c
===================================================================
--- trunk/e/src/bin/e_widget_ilist.c	2011-04-16 12:09:16 UTC (rev 58698)
+++ trunk/e/src/bin/e_widget_ilist.c	2011-04-16 12:22:57 UTC (rev 58699)
@@ -12,7 +12,7 @@
    struct 
      {
         Eina_List *queue;
-        Ecore_Idler *idler;
+        Ecore_Timer *timer;
         int count;
         int show_nth;
         int select_nth;
@@ -48,7 +48,7 @@
 static void _e_wid_cb_selected(void *data, Evas_Object *obj, void *event_info);
 static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
-static Eina_Bool _queue_idler(void *data);
+static Eina_Bool _queue_timer(void *data);
 static void _queue_queue(Evas_Object *obj);
 static void _queue_append(Evas_Object *obj, int command, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data), void *data, const char *val, int relative, int use_relative, int item);
 static void _queue_remove(Evas_Object *obj, E_Widget_Queue_Item *qi, int del);
@@ -72,7 +72,7 @@
 } Queue_Command;
 
 static Eina_Bool
-_queue_idler(void *data)
+_queue_timer(void *data)
 {
    Evas_Object *obj;
    E_Widget_Data *wd;
@@ -81,7 +81,7 @@
 
    obj = data;
    wd = e_widget_data_get(obj);
-   wd->queue.idler = NULL;
+   wd->queue.timer = NULL;
    e_widget_ilist_freeze(obj);
    num = 0;
    while (wd->queue.queue)
@@ -212,9 +212,8 @@
 
    wd = e_widget_data_get(obj);
    if (!wd->queue.queue) return;
-   if (wd->queue.idler) return;
-   e_util_wakeup();
-   wd->queue.idler = ecore_idler_add(_queue_idler, obj);
+   if (wd->queue.timer) return;
+   wd->queue.timer = ecore_timer_add(0.00001, _queue_timer, obj);
 }
 
 static void
@@ -268,8 +267,8 @@
    wd = e_widget_data_get(obj);
    while (wd->queue.queue)
      _queue_remove(obj, eina_list_data_get(wd->queue.queue), 1);
-   if (wd->queue.idler) ecore_idler_del(wd->queue.idler);
-   wd->queue.idler = NULL;
+   if (wd->queue.timer) ecore_timer_del(wd->queue.timer);
+   wd->queue.timer = NULL;
 }
 
 /* externally accessible functions */

Log:
e17:  manage xembed windows as long as they are not override_redirect.
  
  - might fix urxvt tabs, might break other stuff
  

Author:       jeffdameth
Date:         2011-05-12 06:23:57 -0700 (Thu, 12 May 2011)
New Revision: 59346
Trac:         http://trac.enlightenment.org/e/changeset/59346

Modified:
  trunk/e/src/bin/e_manager.c 

Modified: trunk/e/src/bin/e_manager.c
===================================================================
--- trunk/e/src/bin/e_manager.c	2011-05-12 09:11:36 UTC (rev 59345)
+++ trunk/e/src/bin/e_manager.c	2011-05-12 13:23:57 UTC (rev 59346)
@@ -190,12 +190,13 @@
 		  else
                     continue;
 	       }
-	     if (!ecore_x_window_prop_property_get(windows[i],
-						   atom_xmbed,
-						   atom_xmbed, 32,
-						   &data, &count))
-	       data = NULL;
-	     if (!data)
+	     /* XXX manage xembed windows as long as they are not override_redirect..
+	     /* if (!ecore_x_window_prop_property_get(windows[i],
+	      * 					   atom_xmbed,
+	      * 					   atom_xmbed, 32,
+	      * 					   &data, &count))
+	      *   data = NULL;
+	      * if (!data) */
 	       {
 		  if (!ecore_x_window_prop_property_get(windows[i],
 							atom_kde_netwm_systray,

Log:
e17: fix resize of windows setting normal_hints. urxvt and others
  

Author:       jeffdameth
Date:         2011-06-25 14:39:29 -0700 (Sat, 25 Jun 2011)
New Revision: 60688
Trac:         http://trac.enlightenment.org/e/changeset/60688

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-06-25 17:48:55 UTC (rev 60687)
+++ trunk/e/src/bin/e_border.c	2011-06-25 21:39:29 UTC (rev 60688)
@@ -6419,8 +6419,8 @@
              
              x = bd->x;
              y = bd->y;
-             w = bd->client.w;
-             h = bd->client.h;
+             w = bd->w;
+             h = bd->h;
              new_w = w;
              new_h = h;
              e_border_resize_limit(bd, &new_w, &new_h);

Log:
e17: raise desklock window above again when other windows try to raise. if someone has a better solution, go ahead!
  

Author:       jeffdameth
Date:         2011-07-10 03:16:51 -0700 (Sun, 10 Jul 2011)
New Revision: 61194
Trac:         http://trac.enlightenment.org/e/changeset/61194

Modified:
  trunk/e/src/bin/e_desklock.c 

Modified: trunk/e/src/bin/e_desklock.c
===================================================================
--- trunk/e/src/bin/e_desklock.c	2011-07-10 09:00:57 UTC (rev 61193)
+++ trunk/e/src/bin/e_desklock.c	2011-07-10 10:16:51 UTC (rev 61194)
@@ -69,6 +69,7 @@
 static Eina_Bool _e_desklock_cb_mouse_move(void *data, int type, void *event);
 static Eina_Bool _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event);
 static Eina_Bool _e_desklock_cb_idle_poller(void *data);
+static Eina_Bool _e_desklock_cb_window_stack(void *data, int type, void *event);
 
 static void _e_desklock_null(void);
 static void _e_desklock_passwd_update(void);
@@ -362,6 +363,18 @@
      eina_list_append(edd->handlers,
 		      ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
 					      _e_desklock_cb_key_down, NULL));
+   edd->handlers =
+     eina_list_append(edd->handlers,
+		      ecore_event_handler_add(ECORE_X_EVENT_WINDOW_STACK,
+					      _e_desklock_cb_window_stack, NULL));
+   edd->handlers =
+     eina_list_append(edd->handlers,
+		      ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE,
+					      _e_desklock_cb_window_stack, NULL));
+   edd->handlers =
+     eina_list_append(edd->handlers,
+		      ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CREATE,
+					      _e_desklock_cb_window_stack, NULL));
 
    if ((total_zone_num > 1) && (e_config->desklock_login_box_zone == -2)) 
      {
@@ -445,6 +458,43 @@
 }
 
 static Eina_Bool
+_e_desklock_cb_window_stack(void *data __UNUSED__,
+			    int   type,
+			    void *event)
+{
+   Ecore_X_Window win;
+   E_Desklock_Popup_Data *edp;
+   Eina_List *l;
+   Eina_Bool raise = EINA_TRUE;
+
+   if (type == ECORE_X_EVENT_WINDOW_STACK)
+     win = ((Ecore_X_Event_Window_Stack*) event)->event_win;
+   else if (type == ECORE_X_EVENT_WINDOW_STACK)
+     win = ((Ecore_X_Event_Window_Configure*) event)->event_win;
+   else if (type == ECORE_X_EVENT_WINDOW_CREATE)
+     win = ((Ecore_X_Event_Window_Create*) event)->win;
+   else 
+     return ECORE_CALLBACK_PASS_ON;
+   
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
+     {
+	if (win == edp->popup_wnd->evas_win)
+	  {
+	     raise = EINA_FALSE;	     
+	     break;
+	  }
+     }
+
+   if (raise)
+     {
+	EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
+	  ecore_evas_raise(edp->popup_wnd->ecore_evas);
+     }
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
 _e_desklock_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev = event;

Log:
e17/efm: show mime icons when thumbnail failed 
  

Author:       jeffdameth
Date:         2011-07-24 13:36:52 -0700 (Sun, 24 Jul 2011)
New Revision: 61654
Trac:         http://trac.enlightenment.org/e/changeset/61654

Modified:
  trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_thumb.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-07-24 15:37:04 UTC (rev 61653)
+++ trunk/e/src/bin/e_fm.c	2011-07-24 20:36:52 UTC (rev 61654)
@@ -180,6 +180,7 @@
    Eina_Bool odd : 1;
    Eina_Bool down_sel : 1;
    Eina_Bool removable_state_change : 1;
+   Eina_Bool thumb_failed : 1;
 };
 
 struct _E_Fm2_Finfo
@@ -1901,6 +1902,9 @@
    Evas_Object *o;
    char buf[PATH_MAX];
 
+   if (ic->thumb_failed)
+     return NULL;
+   
    if (!_e_fm2_icon_realpath(ic, buf, sizeof(buf)))
      return NULL;
 
@@ -2081,39 +2085,7 @@
 _e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_func, void *data, int force_gen, const char **type_ret)
 {
    Evas_Object *o;
-   const char *icon;
 
-   /* create thumbnails for edje files */
-   if (_e_fm2_file_is_edje(ic->info.file))
-     {
-        o = _e_fm2_icon_thumb_edje_get
-            (evas, ic, gen_func, data, force_gen, type_ret);
-        if (o) return o;
-     }
-
-   /* disabled until everyone has edje in mime.types:
-    *  use mimetype to identify edje.
-    * if (ic->info.mime == _e_fm2_mime_app_edje)
-    *   return _e_fm2_icon_thumb_edje_get
-    *     (evas, ic, gen_func, data, force_gen, type_ret); */
-
-   /* check user preferences */
-   icon = _e_fm2_icon_mime_type_special_match(ic);
-   if (icon)
-     {
-        if (icon == _e_fm2_icon_desktop_str)
-          return _e_fm2_icon_desktop_get(evas, ic, type_ret);
-        else if (icon == _e_fm2_icon_thumb_str)
-          {
-             return _e_fm2_icon_thumb_get
-                      (evas, ic, NULL, gen_func, data, force_gen, type_ret);
-          }
-        else if (strncmp(icon, "e/icons/fileman/", 16) == 0)
-          return _e_fm2_icon_explicit_theme_get(evas, ic, icon + 16, type_ret);
-        else
-          return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
-     }
-
    if (e_config->icon_theme_overrides)
      o = _e_fm2_icon_mime_fdo_get(evas, ic, type_ret);
    else
@@ -2129,20 +2101,6 @@
    if (o) return o;
 
    return NULL;
-
-   /* XXX REMOVE/DEPRECATED below here */
-   /* icon = e_fm_mime_icon_get(ic->info.mime);
-    * if (!icon) return NULL;
-    *
-    * if (icon == _e_fm2_icon_desktop_str)
-    *   return _e_fm2_icon_desktop_get(evas, ic, type_ret);
-    * else if (icon == _e_fm2_icon_thumb_str)
-    *   return _e_fm2_icon_thumb_get(evas, ic, NULL,
-    *           gen_func, data, force_gen, type_ret);
-    * else if (strncmp(icon, "e/icons/fileman/", 16) == 0)
-    *   return _e_fm2_icon_explicit_theme_get(evas, ic, icon + 16, type_ret);
-    * else
-    * return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret); */
 }
 
 /**
@@ -2228,10 +2186,11 @@
                Evas_Smart_Cb gen_func,
                void *data, int force_gen, const char **type_ret)
 {
+   const char *icon;
+   Evas_Object *o;
+   
    if (ic->info.icon)
      {
-        Evas_Object *o;
-
         if ((ic->info.icon[0] == '/') ||
             ((ic->info.icon[0] == '.') &&
              ((ic->info.icon[1] == '/') ||
@@ -2241,23 +2200,46 @@
              if (o) return o;
           }
 
-        if (ic->info.mime)
-          {
-             o = _e_fm2_icon_mime_get(evas, ic, gen_func, data,
-                                      force_gen, type_ret);
-             if (o) return o;
-          }
+	o = _e_fm2_icon_explicit_theme_icon_get(evas, ic, ic->info.icon, type_ret);
+	if (o) return o;
+     }
 
-        o = _e_fm2_icon_explicit_theme_icon_get(evas, ic, ic->info.icon, type_ret);
-        if (!o) goto fallback;
-
-        return o;
+   /* create thumbnails for edje files */
+   if (_e_fm2_file_is_edje(ic->info.file))
+     {
+	o = _e_fm2_icon_thumb_edje_get
+	  (evas, ic, gen_func, data, force_gen, type_ret);
+	if (o) return o;
      }
 
-   if (ic->info.icon_type == 1)
+   /* disabled until everyone has edje in mime.types:
+    *  use mimetype to identify edje.
+    * if (ic->info.mime == _e_fm2_mime_app_edje)
+    *   return _e_fm2_icon_thumb_edje_get
+    *     (evas, ic, gen_func, data, force_gen, type_ret); */
+
+   /* check user preferences */
+   icon = _e_fm2_icon_mime_type_special_match(ic);
+   if (icon)
      {
-        Evas_Object *o;
+	if (icon == _e_fm2_icon_desktop_str)
+	  o = _e_fm2_icon_desktop_get(evas, ic, type_ret);
+	else if (icon == _e_fm2_icon_thumb_str)
+	  {
+	     if (!ic->thumb_failed)
+	       o = _e_fm2_icon_thumb_get
+		 (evas, ic, NULL, gen_func, data, force_gen, type_ret);
+	  }
+	else if (strncmp(icon, "e/icons/fileman/", 16) == 0)
+	  o = _e_fm2_icon_explicit_theme_get(evas, ic, icon + 16, type_ret);
+	else
+	  o = _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
 
+	if (o) return o;
+     }
+
+   if ((!ic->thumb_failed) && (ic->info.icon_type == 1))
+     {
         o = _e_fm2_icon_thumb_get(evas, ic, NULL,
                                   gen_func, data, force_gen, type_ret);
         if (o) return o;
@@ -2265,21 +2247,20 @@
 
    if (ic->info.mime)
      {
-        Evas_Object *o;
-
         o = _e_fm2_icon_mime_get(evas, ic, gen_func, data, force_gen, type_ret);
         if (o) return o;
      }
    else if (ic->info.file)
      {
-        Evas_Object *o;
-
         o = _e_fm2_icon_discover_get(evas, ic, gen_func, data,
                                      force_gen, type_ret);
         if (o) return o;
      }
 
 fallback:
+   o = _e_fm2_icon_explicit_theme_icon_get(evas, ic, "unknown", type_ret);
+   if (o) return o;
+   
    return _e_fm2_icon_explicit_theme_get(evas, ic, "text/plain", type_ret);
 }
 
@@ -6888,11 +6869,15 @@
    E_Fm2_Icon *ic;
 
    ic = data;
-   if (ic->realized)
+   
+   if (e_icon_file_get(obj))
      {
         Evas_Coord w = 0, h = 0;
         int have_alpha;
 
+	if (!ic->realized)
+	  return;
+
         e_icon_size_get(obj, &w, &h);
         have_alpha = e_icon_alpha_get(obj);
 //	if (_e_fm2_view_mode_get(ic->sd) == E_FM2_VIEW_MODE_LIST)
@@ -6906,6 +6891,14 @@
         else
           edje_object_signal_emit(ic->obj, "e,action,thumb,gen", "e");
      }
+   else
+     {
+	ic->thumb_failed = EINA_TRUE;
+	evas_object_del(obj);
+
+	if (ic->realized)
+	  _e_fm2_icon_icon_set(ic);
+     }
 }
 
 static void
@@ -9868,7 +9861,7 @@
 //   if (sd->custom_theme_content)
 //     snprintf(buf, sizeof(buf), "e/icons/fileman/%s/%s", sd->custom_theme_content, group);
 //   else
-   snprintf(buf, sizeof(buf), "e/icons/fileman/%s", group);
+   snprintf(buf, sizeof(buf), "e/icons/fileman/mime/%s", group);
 
    if (sd->custom_theme)
      {

Modified: trunk/e/src/bin/e_thumb.c
===================================================================
--- trunk/e/src/bin/e_thumb.c	2011-07-24 15:37:04 UTC (rev 61653)
+++ trunk/e/src/bin/e_thumb.c	2011-07-24 20:36:52 UTC (rev 61654)
@@ -259,9 +259,13 @@
 		       _pending--;
 		       eth->done = 1;
 		       if (_pending == 0) _e_thumb_thumbnailers_kill();
-                       e_icon_preload_set(obj, 1);
-		       e_icon_file_key_set(obj, icon, "/thumbnail/data");
-                       _e_thumb_key_load(eth, icon);
+		       if (ecore_file_exists(icon))
+			 {
+			    e_icon_preload_set(obj, 1);
+			    e_icon_file_key_set(obj, icon, "/thumbnail/data");
+			    _e_thumb_key_load(eth, icon);
+			 }
+
 		       evas_object_smart_callback_call(obj, "e_thumb_gen", NULL);
 		    }
 	       }

Log:
e17: workaround for closing fsel widget causing to stuck in a loop. needs real fix ASAP
  

Author:       jeffdameth
Date:         2011-07-25 03:07:12 -0700 (Mon, 25 Jul 2011)
New Revision: 61682
Trac:         http://trac.enlightenment.org/e/changeset/61682

Modified:
  trunk/e/src/bin/e_widget_fsel.c 

Modified: trunk/e/src/bin/e_widget_fsel.c
===================================================================
--- trunk/e/src/bin/e_widget_fsel.c	2011-07-25 09:47:57 UTC (rev 61681)
+++ trunk/e/src/bin/e_widget_fsel.c	2011-07-25 10:07:12 UTC (rev 61682)
@@ -749,5 +749,12 @@
    E_FREE(wd->preview_perms_text);
    E_FREE(wd->preview_time_text);
    E_FREE(wd->path);
+
+   // XXX FIXME workaround for e_widget _sub_obj_del not being called
+   e_widget_sub_object_del(obj, wd->o_favorites_fm);
+   e_widget_sub_object_del(obj, wd->o_files_fm);
+   evas_object_del(wd->o_favorites_fm);
+   evas_object_del(wd->o_files_fm);
+   
    free(wd);
 }

Log:
e17/efm: fix e_fm2_path_set: show contents of 'removable' mountpoints also when the device is already mounted
  

Author:       jeffdameth
Date:         2011-07-25 03:14:37 -0700 (Mon, 25 Jul 2011)
New Revision: 61683
Trac:         http://trac.enlightenment.org/e/changeset/61683

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-07-25 10:07:12 UTC (rev 61682)
+++ trunk/e/src/bin/e_fm.c	2011-07-25 10:14:37 UTC (rev 61683)
@@ -1001,30 +1001,33 @@
         sd->mount = NULL;
      }
 
-   /* If the path is of type removable: we add a new mountpoint */
-   if (sd->dev && !sd->mount && !strncmp(sd->dev, "removable:", 10))
+   if (!realpath)
      {
-        E_Volume *v = NULL;
+	/* If the path is of type removable: we add a new mountpoint */
+	if (sd->dev && !sd->mount && !strncmp(sd->dev, "removable:", 10))
+	  {
+	     E_Volume *v = NULL;
 
-        v = e_fm2_device_volume_find(sd->dev + sizeof("removable:") - 1);
-        if (v)
-          {
-             sd->mount = e_fm2_device_mount(v,
-                                            _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
-                                            _e_fm2_cb_unmount_ok, NULL, obj);
-             if (v->efm_mode != EFM_MODE_USING_HAL_MOUNT) return;
-          }
+	     v = e_fm2_device_volume_find(sd->dev + sizeof("removable:") - 1);
+	     if (v)
+	       {
+		  sd->mount = e_fm2_device_mount(v,
+						 _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
+						 _e_fm2_cb_unmount_ok, NULL, obj);
+		  if (v->efm_mode != EFM_MODE_USING_HAL_MOUNT) return;
+	       }
+	  }
+	else if (sd->config->view.open_dirs_in_place == 0)
+	  {
+	     E_Fm2_Mount *m;
+	     m = e_fm2_device_mount_find(sd->realpath);
+	     if (m)
+	       sd->mount = e_fm2_device_mount(m->volume,
+					      _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
+					      _e_fm2_cb_unmount_ok, NULL, obj);
+	  }
      }
-   else if (sd->config->view.open_dirs_in_place == 0)
-     {
-        E_Fm2_Mount *m;
-        m = e_fm2_device_mount_find(sd->realpath);
-        if (m)
-          sd->mount = e_fm2_device_mount(m->volume,
-                                         _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
-                                         _e_fm2_cb_unmount_ok, NULL, obj);
-     }
-
+   
    if (!sd->mount || sd->mount->mounted)
      {
         sd->id = _e_fm2_client_monitor_add(sd->realpath);

Log:
e17: remove workaround
  

Author:       jeffdameth
Date:         2011-07-25 05:09:08 -0700 (Mon, 25 Jul 2011)
New Revision: 61690
Trac:         http://trac.enlightenment.org/e/changeset/61690

Modified:
  trunk/e/src/bin/e_widget_fsel.c 

Modified: trunk/e/src/bin/e_widget_fsel.c
===================================================================
--- trunk/e/src/bin/e_widget_fsel.c	2011-07-25 12:08:20 UTC (rev 61689)
+++ trunk/e/src/bin/e_widget_fsel.c	2011-07-25 12:09:08 UTC (rev 61690)
@@ -750,11 +750,5 @@
    E_FREE(wd->preview_time_text);
    E_FREE(wd->path);
 
-   // XXX FIXME workaround for e_widget _sub_obj_del not being called
-   e_widget_sub_object_del(obj, wd->o_favorites_fm);
-   e_widget_sub_object_del(obj, wd->o_files_fm);
-   evas_object_del(wd->o_favorites_fm);
-   evas_object_del(wd->o_files_fm);
-   
    free(wd);
 }

Log:
e17/efm: revert, seems this was no fix
  

Author:       jeffdameth
Date:         2011-07-25 06:05:49 -0700 (Mon, 25 Jul 2011)
New Revision: 61693
Trac:         http://trac.enlightenment.org/e/changeset/61693

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-07-25 12:15:02 UTC (rev 61692)
+++ trunk/e/src/bin/e_fm.c	2011-07-25 13:05:49 UTC (rev 61693)
@@ -1001,33 +1001,30 @@
         sd->mount = NULL;
      }
 
-   if (!realpath)
+   /* If the path is of type removable: we add a new mountpoint */
+   if (sd->dev && !sd->mount && !strncmp(sd->dev, "removable:", 10))
      {
-	/* If the path is of type removable: we add a new mountpoint */
-	if (sd->dev && !sd->mount && !strncmp(sd->dev, "removable:", 10))
-	  {
-	     E_Volume *v = NULL;
+	E_Volume *v = NULL;
 
-	     v = e_fm2_device_volume_find(sd->dev + sizeof("removable:") - 1);
-	     if (v)
-	       {
-		  sd->mount = e_fm2_device_mount(v,
-						 _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
-						 _e_fm2_cb_unmount_ok, NULL, obj);
-		  if (v->efm_mode != EFM_MODE_USING_HAL_MOUNT) return;
-	       }
-	  }
-	else if (sd->config->view.open_dirs_in_place == 0)
+	v = e_fm2_device_volume_find(sd->dev + sizeof("removable:") - 1);
+	if (v)
 	  {
-	     E_Fm2_Mount *m;
-	     m = e_fm2_device_mount_find(sd->realpath);
-	     if (m)
-	       sd->mount = e_fm2_device_mount(m->volume,
-					      _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
-					      _e_fm2_cb_unmount_ok, NULL, obj);
+	     sd->mount = e_fm2_device_mount(v,
+					    _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
+					    _e_fm2_cb_unmount_ok, NULL, obj);
+	     if (v->efm_mode != EFM_MODE_USING_HAL_MOUNT) return;
 	  }
      }
-   
+   else if (sd->config->view.open_dirs_in_place == 0)
+     {
+	E_Fm2_Mount *m;
+	m = e_fm2_device_mount_find(sd->realpath);
+	if (m)
+	  sd->mount = e_fm2_device_mount(m->volume,
+					 _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
+					 _e_fm2_cb_unmount_ok, NULL, obj);
+     }
+
    if (!sd->mount || sd->mount->mounted)
      {
         sd->id = _e_fm2_client_monitor_add(sd->realpath);

Log:
e17/border: use e/widgets/border/internal_fileman/border to define borderstyle for efm windows
  

Author:       jeffdameth
Date:         2011-07-27 13:33:33 -0700 (Wed, 27 Jul 2011)
New Revision: 61819
Trac:         http://trac.enlightenment.org/e/changeset/61819

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-07-27 20:31:40 UTC (rev 61818)
+++ trunk/e/src/bin/e_border.c	2011-07-27 20:33:33 UTC (rev 61819)
@@ -6974,6 +6974,9 @@
         else if ((bd->client.netwm.state.skip_taskbar) ||
                  (bd->client.netwm.state.skip_pager))
           bordername = "skipped";
+        else if ((bd->internal) && (bd->client.icccm.class) &&
+		 (!strncmp(bd->client.icccm.class, "e_fwin", 6)))
+          bordername = "internal_fileman";
         else
           bordername = e_config->theme_default_border_style;
         if (!bordername) bordername = "default";

Log:
e17/border: cleanup focus debugging
  

Author:       jeffdameth
Date:         2011-07-27 13:35:23 -0700 (Wed, 27 Jul 2011)
New Revision: 61820
Trac:         http://trac.enlightenment.org/e/changeset/61820

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-07-27 20:33:33 UTC (rev 61819)
+++ trunk/e/src/bin/e_border.c	2011-07-27 20:35:23 UTC (rev 61820)
@@ -2034,9 +2034,6 @@
 	e_border_focus_set(bd->leader->modal, focus, set);
 	return;
      }
-#ifdef INOUTDEBUG_FOCUS
-   printf("%s focus set %d %d\n", e_border_name_get(bd), focus, set);
-#endif
 
    if ((set) && (focus))
      {
@@ -3161,9 +3158,7 @@
 	     /* TODO revert focus when lost here ? */
 	     return;
 	  }
-#ifdef INOUTDEBUG_FOCUS
-	printf("%s idler focus\n", e_border_name_get(bd));
-#endif
+
 	if (bd == focused)
 	  return;
 
@@ -7958,9 +7953,6 @@
             (bd->want_focus))
           {
              bd->want_focus = 0;
-#ifdef INOUTDEBUG_FOCUS
-	     printf("__________ focus new window _________\n");
-#endif
 	     e_border_focus_set_with_pointer(bd);
           }
         else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
@@ -7970,18 +7962,11 @@
                   (e_border_find_by_client_window(bd->client.icccm.transient_for) ==
                    e_border_focused_get())))
                {
-#ifdef INOUTDEBUG_FOCUS
-		  printf("__________ focus new dialog _________\n");
-#endif
-
 		  e_border_focus_set_with_pointer(bd);
                }
           }
         else
           {
-#ifdef INOUTDEBUG_FOCUS
-	     printf("__________ window takes focus _________\n");
-#endif
              /* focus window by default when it is the only one on desk */
               E_Border *bd2 = NULL;
               Eina_List *l;

Log:
e17/efm: set e_icon_scale_size to render scalable icons with correct size
  

Author:       jeffdameth
Date:         2011-08-08 04:20:30 -0700 (Mon, 08 Aug 2011)
New Revision: 62199
Trac:         http://trac.enlightenment.org/e/changeset/62199

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-08-08 10:50:27 UTC (rev 62198)
+++ trunk/e/src/bin/e_fm.c	2011-08-08 11:20:30 UTC (rev 62199)
@@ -577,6 +577,12 @@
    return sd->config->icon.list.h;
 }
 
+static inline unsigned int
+_e_fm2_icon_mime_size_normalize(const E_Fm2_Icon *ic)
+{
+   return e_util_icon_size_normalize(_e_fm2_icon_w_get(ic->sd));
+}
+
 static Eina_Bool
 _e_fm2_mime_flush_cb(void *data __UNUSED__)
 {
@@ -1814,6 +1820,8 @@
 
    if (!o) return NULL;
 
+   e_icon_scale_size_set(o, _e_fm2_icon_mime_size_normalize(ic)); 
+
    if (!e_util_icon_theme_set(o, name))
      {
         evas_object_del(o);
@@ -1879,6 +1887,7 @@
         if (!o)
           return NULL;
 
+	e_icon_scale_size_set(o, _e_fm2_icon_mime_size_normalize(ic)); 
         e_icon_file_set(o, iconpath);
         e_icon_fill_inside_set(o, 1);
         if (type_ret) *type_ret = "CUSTOM";
@@ -2029,12 +2038,6 @@
    return NULL;
 }
 
-static inline unsigned int
-_e_fm2_icon_mime_size_normalize(const E_Fm2_Icon *ic)
-{
-   return e_util_icon_size_normalize(_e_fm2_icon_w_get(ic->sd));
-}
-
 static Evas_Object *
 _e_fm2_icon_mime_fdo_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_ret)
 {
@@ -8526,8 +8529,9 @@
    char buf[64];
    int icon_size = _e_fm2_icon_w_get(sd);
 
-   if (e_scale > 0.0)
-     icon_size /= e_scale;
+   // show the icon size as selected (even if it might be influnced by e_scale)
+   /* if (e_scale > 0.0)
+    *   icon_size /= e_scale; */
 
    snprintf(buf, sizeof(buf), _("Icon Size (%d)"), icon_size);

Log:
e17: fix resize of efm_toolbar gadcon
  

Author:       jeffdameth
Date:         2011-08-09 01:28:13 -0700 (Tue, 09 Aug 2011)
New Revision: 62233
Trac:         http://trac.enlightenment.org/e/changeset/62233

Modified:
  trunk/e/src/bin/e_toolbar.c 

Modified: trunk/e/src/bin/e_toolbar.c
===================================================================
--- trunk/e/src/bin/e_toolbar.c	2011-08-09 08:26:40 UTC (rev 62232)
+++ trunk/e/src/bin/e_toolbar.c	2011-08-09 08:28:13 UTC (rev 62233)
@@ -174,6 +174,8 @@
    E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
    tbar->w = w;
    tbar->h = h;
+   if (tbar->gadcon)
+     e_gadcon_swallowed_min_size_set(tbar->gadcon, w, h);
    evas_object_resize(tbar->o_event, tbar->w, tbar->h);
    evas_object_resize(tbar->o_base, tbar->w, tbar->h);
 }
@@ -187,6 +189,8 @@
    tbar->y = y;
    tbar->w = w;
    tbar->h = h;
+   if (tbar->gadcon)
+     e_gadcon_swallowed_min_size_set(tbar->gadcon, w, h);
    evas_object_move(tbar->o_event, x, y);
    evas_object_move(tbar->o_base, x, y);
    evas_object_resize(tbar->o_event, w, h);

Log:
e17:e_util_icon_theme_icon_add return icon of requested size when possible
  

Author:       jeffdameth
Date:         2011-08-16 15:47:48 -0700 (Tue, 16 Aug 2011)
New Revision: 62517
Trac:         http://trac.enlightenment.org/e/changeset/62517

Modified:
  trunk/e/src/bin/e_utils.c 

Modified: trunk/e/src/bin/e_utils.c
===================================================================
--- trunk/e/src/bin/e_utils.c	2011-08-16 21:13:20 UTC (rev 62516)
+++ trunk/e/src/bin/e_utils.c	2011-08-16 22:47:48 UTC (rev 62517)
@@ -985,7 +985,7 @@
 e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas)
 {
    if (!icon_name) return NULL;
-   if (icon_name[0] == '/') return e_util_icon_add(icon_name, evas);
+   if (icon_name[0] == '/') return _e_util_icon_add(icon_name, evas, size);
    else
      {
 	Evas_Object *obj;

Log:
e17: set focus again, also if e believes that the border has it already. fixes input focus with illume for internal borders
  

Author:       jeffdameth
Date:         2011-08-16 21:24:32 -0700 (Tue, 16 Aug 2011)
New Revision: 62528
Trac:         http://trac.enlightenment.org/e/changeset/62528

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-17 02:57:57 UTC (rev 62527)
+++ trunk/e/src/bin/e_border.c	2011-08-17 04:24:32 UTC (rev 62528)
@@ -3160,8 +3160,12 @@
 	  }
 
 	if (bd == focused)
-	  return;
-
+	  {
+	     /* already focused. but anyway dont be so strict, this
+		fcks up illume setting focus on internal windows */
+	     // return;
+	  }
+	
 	focus_time = ecore_x_current_time_get();
 
 	if ((bd->client.icccm.take_focus) &&

Log:
e17: remove focus workaround for illume. 
  - keep track to which window was grabinput_focus set last, so that 
  unfocusing last visible window will only set focus to container->bg_win
  if no window is 'focusing' or 'focusing_next'   
  

Author:       jeffdameth
Date:         2011-08-17 01:33:35 -0700 (Wed, 17 Aug 2011)
New Revision: 62529
Trac:         http://trac.enlightenment.org/e/changeset/62529

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-17 04:24:32 UTC (rev 62528)
+++ trunk/e/src/bin/e_border.c	2011-08-17 08:33:35 UTC (rev 62529)
@@ -211,6 +211,7 @@
 static Eina_List *borders = NULL;
 static Eina_Hash *borders_hash = NULL;
 static E_Border *focused = NULL;
+static E_Border *focusing = NULL;
 static Eina_List *focus_next = NULL;
 static Ecore_X_Time focus_time = 0;
 
@@ -2009,121 +2010,124 @@
    /* dont focus an iconified window. that's silly! */
    if (focus)
      {
-	if (bd->iconic)
-	  return;
+        if (bd->iconic)
+          return;
 
-	if (!bd->visible)
-	  return;
+        if (!bd->visible)
+          return;
 
-	/* FIXME: hack for deskflip animation:
-	 * dont update focus when sliding previous desk */
-	if ((!bd->sticky) && (bd->desk != e_desk_current_get(bd->desk->zone)))
-	  return;
+        /* FIXME: hack for deskflip animation:
+         * dont update focus when sliding previous desk */
+        if ((!bd->sticky) && (bd->desk != e_desk_current_get(bd->desk->zone)))
+          return;
 
-	/* TODO */
-	/* if !set and no other window is focused 'revert focus when lost' */
+        /* TODO */
+        /* if !set and no other window is focused 'revert focus when lost' */
      }
 
    if ((bd->modal) && (bd->modal != bd) && (bd->modal->visible))
      {
-	e_border_focus_set(bd->modal, focus, set);
-	return;
+        e_border_focus_set(bd->modal, focus, set);
+        return;
      }
    else if ((bd->leader) && (bd->leader->modal) && (bd->leader->modal != bd))
      {
-	e_border_focus_set(bd->leader->modal, focus, set);
-	return;
+        e_border_focus_set(bd->leader->modal, focus, set);
+        return;
      }
 
-   if ((set) && (focus))
+   if (focus)
      {
-	if (bd->visible && bd->changes.visible)
-	  {
-	     bd->want_focus = 1;
-	     bd->changed = 1;
-	     return;
-	  }
-	if ((!bd->focused) || (focus_next && (bd != eina_list_data_get(focus_next))))
-	  {
-	     Eina_List *l;
+        if (set)
+          {
+             if (bd->visible && bd->changes.visible)
+               {
+                  bd->want_focus = 1;
+                  bd->changed = 1;
+               }
+             else if ((!bd->focused) || (focus_next && (bd != eina_list_data_get(focus_next))))
+               {
+                  Eina_List *l;
+             
+                  if ((l = eina_list_data_find_list(focus_next, bd)))
+                    focus_next = eina_list_promote_list(focus_next, l);
+                  else
+                    focus_next = eina_list_prepend(focus_next, bd);
+               }
+             
+             return;
+          }
 
-	     if ((l = eina_list_data_find_list(focus_next, bd)))
-	       focus_next = eina_list_promote_list(focus_next, l);
-	     else
-	       focus_next = eina_list_prepend(focus_next, bd);
-	     return;
-	  }
-     }
-   else if ((focus) && (!bd->focused))
-     {
-	E_Event_Border_Focus_In *ev;
+        if (!bd->focused)
+          {
+             E_Event_Border_Focus_In *ev;
 
-	if (focused)
-	  unfocus = focused;
+             if (focused) unfocus = focused;
+             if (focusing == bd) focusing = NULL;
+             
+             bd->focused = 1;
+             focused = bd;
 
-	bd->focused = 1;
-	focused = bd;
+             e_focus_event_focus_in(bd);
+             e_border_focus_latest_set(bd);
+             e_hints_active_window_set(bd->zone->container->manager, bd);
 
-	e_focus_event_focus_in(bd);
-	e_border_focus_latest_set(bd);
-	e_hints_active_window_set(bd->zone->container->manager, bd);
+             edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
+             if (bd->icon_object)
+               edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
 
-	edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
-	if (bd->icon_object)
-	  edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
+             ev = E_NEW(E_Event_Border_Focus_In, 1);
+             ev->border = bd;
+             e_object_ref(E_OBJECT(bd));
 
-	ev = E_NEW(E_Event_Border_Focus_In, 1);
-	ev->border = bd;
-	e_object_ref(E_OBJECT(bd));
-
-	ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
-			_e_border_event_border_focus_in_free, NULL);
+             ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
+                             _e_border_event_border_focus_in_free, NULL);
+          }
      }
-   else if ((!focus) && (bd->want_focus))
+   else
      {
-	if ((bd->visible) && (bd->changes.visible))
-	  {
-	     bd->want_focus = 0;
-	     bd->changed = 1;
-	     return;
-	  }
-     }
-   else if ((!focus) && (bd->focused))
-     {
-	unfocus = bd;
+        bd->want_focus = 0;
+	focus_next = eina_list_remove(focus_next, bd);
+	if (bd == focusing) focusing = NULL;
+	
+        if (bd->focused)
+          {
+             unfocus = bd;
 
-	/* should always be the case. anyway */
-	if (bd == focused)
-	  focused = NULL;
+             /* should always be the case. anyway */
+             if (bd == focused) focused = NULL;
 
-	if (set)
-	  e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
+             if ((set) && (!focus_next) && (!focusing))
+               {
+                  e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
+               }
+          }
      }
-
+   
    if ((unfocus) &&
        (!e_object_is_del(E_OBJECT(unfocus)) &&
-	(e_object_ref_get(E_OBJECT(unfocus)) > 0)))
+        (e_object_ref_get(E_OBJECT(unfocus)) > 0)))
      {
-	E_Event_Border_Focus_Out *ev;
+        E_Event_Border_Focus_Out *ev;
 
-	bd = unfocus;
-	bd->focused = 0;
-	e_focus_event_focus_out(bd);
+        bd = unfocus;
+        bd->focused = 0;
+        e_focus_event_focus_out(bd);
 
-	if (bd->raise_timer)
-	  ecore_timer_del(bd->raise_timer);
-	bd->raise_timer = NULL;
+        if (bd->raise_timer)
+          ecore_timer_del(bd->raise_timer);
+        bd->raise_timer = NULL;
 
-	edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e");
-	if (bd->icon_object)
-	  edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e");
+        edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e");
+        if (bd->icon_object)
+          edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e");
 
-	ev = E_NEW(E_Event_Border_Focus_Out, 1);
-	ev->border = bd;
-	e_object_ref(E_OBJECT(bd));
+        ev = E_NEW(E_Event_Border_Focus_Out, 1);
+        ev->border = bd;
+        e_object_ref(E_OBJECT(bd));
 
-	ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
-			_e_border_event_border_focus_out_free, NULL);
+        ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
+                	_e_border_event_border_focus_out_free, NULL);
      }
 }
 
@@ -3163,11 +3167,13 @@
 	  {
 	     /* already focused. but anyway dont be so strict, this
 		fcks up illume setting focus on internal windows */
-	     // return;
+	     return;
 	  }
-	
+
 	focus_time = ecore_x_current_time_get();
 
+	focusing = bd;
+	
 	if ((bd->client.icccm.take_focus) &&
 	    (bd->client.icccm.accepts_focus))
 	  {
@@ -4330,12 +4336,18 @@
 
    e_int_border_menu_del(bd);
 
+   if (focusing == bd)
+     focusing = NULL;
+   
    if (focused == bd)
      {
-//	ecore_x_window_focus(bd->zone->container->manager->root);
-          e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
-          e_hints_active_window_set(bd->zone->container->manager, NULL);
-          focused = NULL;
+	if ((!focus_next) && (!focusing))
+	  {
+	     e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
+	     e_hints_active_window_set(bd->zone->container->manager, NULL);
+	  }
+	
+	focused = NULL;
      }
    E_FREE_LIST(bd->handlers, ecore_event_handler_del);
    if (bd->remember)
@@ -4434,6 +4446,9 @@
    if (bd == focused)
      focused = NULL;
 
+   if (bd == focusing)
+     focusing = NULL;
+
    focus_next = eina_list_remove(focus_next, bd);
 
    if (bd->fullscreen) bd->desk->fullscreen_borders--;

Log:
e17: send focus_out event before focus_in.
  - fixes issue with illume kbd as it relies on this
  

Author:       jeffdameth
Date:         2011-08-18 07:22:48 -0700 (Thu, 18 Aug 2011)
New Revision: 62567
Trac:         http://trac.enlightenment.org/e/changeset/62567

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-18 11:41:04 UTC (rev 62566)
+++ trunk/e/src/bin/e_border.c	2011-08-18 14:22:48 UTC (rev 62567)
@@ -1995,8 +1995,9 @@
                    int       focus,
                    int       set)
 {
-   E_Border *unfocus = NULL;
-
+   E_Border *bd_unfocus = NULL;
+   Eina_Bool focus_changed = EINA_FALSE;
+   
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
    /* note: this is here as it seems there are enough apps that do not even
@@ -2020,9 +2021,6 @@
          * dont update focus when sliding previous desk */
         if ((!bd->sticky) && (bd->desk != e_desk_current_get(bd->desk->zone)))
           return;
-
-        /* TODO */
-        /* if !set and no other window is focused 'revert focus when lost' */
      }
 
    if ((bd->modal) && (bd->modal != bd) && (bd->modal->visible))
@@ -2060,29 +2058,14 @@
 
         if (!bd->focused)
           {
-             E_Event_Border_Focus_In *ev;
-
-             if (focused) unfocus = focused;
+             if (focused) bd_unfocus = focused;
              if (focusing == bd) focusing = NULL;
              
              bd->focused = 1;
              focused = bd;
 
-             e_focus_event_focus_in(bd);
-             e_border_focus_latest_set(bd);
-             e_hints_active_window_set(bd->zone->container->manager, bd);
-
-             edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
-             if (bd->icon_object)
-               edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
-
-             ev = E_NEW(E_Event_Border_Focus_In, 1);
-             ev->border = bd;
-             e_object_ref(E_OBJECT(bd));
-
-             ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
-                             _e_border_event_border_focus_in_free, NULL);
-          }
+	     focus_changed = EINA_TRUE;
+	  }
      }
    else
      {
@@ -2092,7 +2075,7 @@
 	
         if (bd->focused)
           {
-             unfocus = bd;
+             bd_unfocus = bd;
 
              /* should always be the case. anyway */
              if (bd == focused) focused = NULL;
@@ -2103,32 +2086,52 @@
                }
           }
      }
-   
-   if ((unfocus) &&
-       (!e_object_is_del(E_OBJECT(unfocus)) &&
-        (e_object_ref_get(E_OBJECT(unfocus)) > 0)))
+
+   if ((bd_unfocus) &&
+       (!e_object_is_del(E_OBJECT(bd_unfocus)) &&
+	(e_object_ref_get(E_OBJECT(bd_unfocus)) > 0)))
      {
-        E_Event_Border_Focus_Out *ev;
+	E_Event_Border_Focus_Out *ev;
+	E_Border *bd = bd_unfocus;
 
-        bd = unfocus;
-        bd->focused = 0;
-        e_focus_event_focus_out(bd);
+	bd->focused = 0;
+	e_focus_event_focus_out(bd);
 
-        if (bd->raise_timer)
-          ecore_timer_del(bd->raise_timer);
-        bd->raise_timer = NULL;
+	if (bd->raise_timer)
+	  ecore_timer_del(bd->raise_timer);
+	bd->raise_timer = NULL;
 
-        edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e");
-        if (bd->icon_object)
-          edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e");
+	edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e");
+	if (bd->icon_object)
+	  edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e");
 
-        ev = E_NEW(E_Event_Border_Focus_Out, 1);
-        ev->border = bd;
-        e_object_ref(E_OBJECT(bd));
+	ev = E_NEW(E_Event_Border_Focus_Out, 1);
+	ev->border = bd;
+	e_object_ref(E_OBJECT(bd));
 
-        ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
-                	_e_border_event_border_focus_out_free, NULL);
+	ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
+			_e_border_event_border_focus_out_free, NULL);
      }
+
+   if (focus_changed)
+     {
+	E_Event_Border_Focus_In *ev;
+
+	e_focus_event_focus_in(bd);
+	e_border_focus_latest_set(bd);
+	e_hints_active_window_set(bd->zone->container->manager, bd);
+
+	edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
+	if (bd->icon_object)
+	  edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
+
+	ev = E_NEW(E_Event_Border_Focus_In, 1);
+	ev->border = bd;
+	e_object_ref(E_OBJECT(bd));
+
+	ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
+			_e_border_event_border_focus_in_free, NULL);
+     }
 }
 
 EAPI void

Log:
e17: show fallback border icon again
  

Author:       jeffdameth
Date:         2011-08-19 19:43:05 -0700 (Fri, 19 Aug 2011)
New Revision: 62611
Trac:         http://trac.enlightenment.org/e/changeset/62611

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-20 02:33:57 UTC (rev 62610)
+++ trunk/e/src/bin/e_border.c	2011-08-20 02:43:05 UTC (rev 62611)
@@ -3750,9 +3750,11 @@
    o = NULL;
    if (bd->internal)
      {
-        o = edje_object_add(evas);
         if (!bd->internal_icon)
-          e_util_edje_icon_set(o, "enlightenment");
+	  {
+	     o = e_icon_add(evas);     
+	     e_util_icon_theme_set(o, "enlightenment");
+	  }
         else
           {
              if (!bd->internal_icon_key)
@@ -3762,18 +3764,17 @@
                   ext = strrchr(bd->internal_icon, '.');
                   if ((ext) && ((!strcmp(ext, ".edj"))))
                     {
+		       o = edje_object_add(evas);
                        if (!edje_object_file_set(o, bd->internal_icon, "icon"))
-                         e_util_edje_icon_set(o, "enlightenment");
+                         e_util_icon_theme_set(o, "enlightenment");
                     }
                   else if (ext)
                     {
-                       evas_object_del(o);
                        o = e_icon_add(evas);
                        e_icon_file_set(o, bd->internal_icon);
                     }
                   else
                     {
-                       evas_object_del(o);
                        o = e_icon_add(evas);
                        if (!e_util_icon_theme_set(o, bd->internal_icon))
                          e_util_icon_theme_set(o, "enlightenment");
@@ -3781,6 +3782,7 @@
                }
              else
                {
+		  o = edje_object_add(evas);
                   edje_object_file_set(o, bd->internal_icon,
                                        bd->internal_icon_key);
                }

Log:
e17: leak--
  

Author:       jeffdameth
Date:         2011-08-21 12:53:00 -0700 (Sun, 21 Aug 2011)
New Revision: 62665
Trac:         http://trac.enlightenment.org/e/changeset/62665

Modified:
  trunk/e/src/bin/e_msg.c 

Modified: trunk/e/src/bin/e_msg.c
===================================================================
--- trunk/e/src/bin/e_msg.c	2011-08-21 15:44:09 UTC (rev 62664)
+++ trunk/e/src/bin/e_msg.c	2011-08-21 19:53:00 UTC (rev 62665)
@@ -143,4 +143,6 @@
 
    e = ev;
    if (e->obj) e_object_unref(e->obj);
+
+   E_FREE(ev);
 }

Log:
e17: my suggestion for a better window menu. 
  
  I'm open to critique for improvements :)
  

Author:       jeffdameth
Date:         2011-08-21 16:37:31 -0700 (Sun, 21 Aug 2011)
New Revision: 62670
Trac:         http://trac.enlightenment.org/e/changeset/62670

Modified:
  trunk/e/src/bin/e_int_border_menu.c 

Modified: trunk/e/src/bin/e_int_border_menu.c
===================================================================
--- trunk/e/src/bin/e_int_border_menu.c	2011-08-21 21:36:16 UTC (rev 62669)
+++ trunk/e/src/bin/e_int_border_menu.c	2011-08-21 23:37:31 UTC (rev 62670)
@@ -48,6 +48,7 @@
 static void _e_border_menu_cb_iconpref_user(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_default_icon(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_netwm_icon(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_border_menu_cb_settings_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi);
 
 EAPI void
 e_int_border_menu_create(E_Border *bd)
@@ -67,28 +68,51 @@
 
    if (!bd->internal)
      {
-        if (bd->client.icccm.class)
-          snprintf(buf, sizeof(buf), "%s", bd->client.icccm.class);
-        else
-          snprintf(buf, sizeof(buf), _("Application"));
-        mi = e_menu_item_new(m);
-        e_menu_item_label_set(mi, buf);
-        e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_application_pre, bd);
-        if (bd->desktop)
-          e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi);
+	if (bd->client.icccm.class)
+	  snprintf(buf, sizeof(buf), "%s", bd->client.icccm.class);
+	else
+	  snprintf(buf, sizeof(buf), _("Application"));
+	mi = e_menu_item_new(m);
+	e_menu_item_label_set(mi, buf);
+	e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_application_pre, bd);
+	if (bd->desktop)
+	  e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi);
      }
 
    mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, _("Window"));
-   e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_window_pre, bd);
-   e_menu_item_icon_edje_set(mi,
-                             e_theme_edje_file_get("base/theme/borders",
-                                                   "e/widgets/border/default/window"),
-                                                   "e/widgets/border/default/window");
-
-   mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
 
+   if ((!bd->lock_user_stacking) && (!bd->fullscreen))
+     {
+        mi = e_menu_item_new(m);
+        e_menu_item_label_set(mi, _("Stacking"));
+        e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_stacking_pre, bd);
+        e_menu_item_icon_edje_set(mi,
+                                  e_theme_edje_file_get("base/theme/borders",
+                                                        "e/widgets/border/default/stacking"),
+				  "e/widgets/border/default/stacking");
+     }
+
+   if ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
+       (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
+     {
+        if (!(((bd->client.icccm.min_w == bd->client.icccm.max_w) &&
+               (bd->client.icccm.min_h == bd->client.icccm.max_h)) ||
+              (bd->lock_user_maximize)))
+          {
+             if ((!bd->lock_user_maximize) && (!bd->shaded))
+               {
+                  mi = e_menu_item_new(m);
+                  e_menu_item_label_set(mi, _("Maximize"));
+                  e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_maximize_pre, bd);
+                  e_menu_item_icon_edje_set(mi,
+                                            e_theme_edje_file_get("base/theme/borders",
+                                                                  "e/widgets/border/default/maximize"),
+					    "e/widgets/border/default/maximize");
+               }
+          }
+     }
+
    if ((!bd->sticky) && ((bd->zone->desk_x_count > 1) || (bd->zone->desk_y_count > 1))) 
      {
         mi = e_menu_item_new(m);
@@ -97,35 +121,28 @@
         e_menu_item_icon_edje_set(mi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/sendto"),
-                                                        "e/widgets/border/default/sendto");
+				  "e/widgets/border/default/sendto");
      }
 
    mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, _("Always on Top"));
-   e_menu_item_check_set(mi, 1);
-   e_menu_item_toggle_set(mi, (bd->layer == 150 ? 1 : 0));
-   if (bd->layer == 150)
-     e_menu_item_callback_set(mi, _e_border_menu_cb_normal, bd);
-   else
-     e_menu_item_callback_set(mi, _e_border_menu_cb_on_top, bd);
+   e_menu_item_label_set(mi, _("Window"));
+   e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_window_pre, bd);
    e_menu_item_icon_edje_set(mi,
-			     e_theme_edje_file_get("base/theme/borders",
-						   "e/widgets/border/default/stack_on_top"),
-                                                   "e/widgets/border/default/stack_on_top");
+                             e_theme_edje_file_get("base/theme/borders",
+                                                   "e/widgets/border/default/window"),
+			     "e/widgets/border/default/window");
 
-   if (!bd->lock_user_sticky)
-     {
-        mi = e_menu_item_new(m);
-        e_menu_item_label_set(mi, _("Sticky"));
-        e_menu_item_check_set(mi, 1);
-        e_menu_item_toggle_set(mi, (bd->sticky ? 1 : 0));
-        e_menu_item_callback_set(mi, _e_border_menu_cb_stick, bd);
-        e_menu_item_icon_edje_set(mi,
-                                  e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/stick"),
-                                                        "e/widgets/border/default/stick");
-     }
+   mi = e_menu_item_new(m);
+   e_menu_item_separator_set(mi, 1);
 
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Settings"));
+   e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_settings_pre, bd);
+   e_menu_item_icon_edje_set(mi,
+                             e_theme_edje_file_get("base/theme/borders",
+                                                   "e/widgets/border/default/settings"),
+			     "e/widgets/border/default/settings");
+
    if (!bd->lock_close)
      {
         mi = e_menu_item_new(m);
@@ -137,7 +154,7 @@
 	e_menu_item_icon_edje_set(mi,
 				  e_theme_edje_file_get("base/theme/borders",
 							"e/widgets/border/default/close"),
-							"e/widgets/border/default/close");
+				  "e/widgets/border/default/close");
      }
 }
 
@@ -295,7 +312,7 @@
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/fullscreen"),
-                                                        "e/widgets/border/default/fullscreen");
+				  "e/widgets/border/default/fullscreen");
      }
 
    if (!bd->fullscreen)
@@ -309,7 +326,7 @@
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/maximize"),
-                                                        "e/widgets/border/default/maximize");
+				  "e/widgets/border/default/maximize");
 
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Maximize vertically"));
@@ -320,7 +337,7 @@
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/maximize"),
-                                                        "e/widgets/border/default/maximize");
+				  "e/widgets/border/default/maximize");
 
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Maximize horizontally"));
@@ -331,7 +348,7 @@
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/maximize"),
-                                                        "e/widgets/border/default/maximize");
+				  "e/widgets/border/default/maximize");
 
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Unmaximize"));
@@ -342,7 +359,7 @@
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/maximize"),
-                                                        "e/widgets/border/default/maximize");
+				  "e/widgets/border/default/maximize");
      }
 }
 
@@ -444,17 +461,17 @@
 
    if (bd->desktop)
      {
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Edit Icon"));
-        e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
-        e_util_desktop_menu_item_icon_add(bd->desktop, 16, submi);
+	submi = e_menu_item_new(subm);
+	e_menu_item_label_set(submi, _("Edit Icon"));
+	e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
+	e_util_desktop_menu_item_icon_add(bd->desktop, 16, submi);
      }
    else if (bd->client.icccm.class) 
      {
-        /* icons with no class useless to borders */
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Create Icon"));
-        e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
+	/* icons with no class useless to borders */
+	submi = e_menu_item_new(subm);
+	e_menu_item_label_set(submi, _("Create Icon"));
+	e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
      }
 
    submi = e_menu_item_new(subm);
@@ -468,7 +485,7 @@
    submi = e_menu_item_new(subm);
    e_menu_item_label_set(submi, _("Add to IBar"));
    e_menu_item_submenu_pre_callback_set(submi, 
-                                        _e_border_menu_cb_ibar_add_pre, bd);
+					_e_border_menu_cb_ibar_add_pre, bd);
    e_util_menu_item_theme_icon_set(submi, "preferences-applications-ibar");
 
    if (e_configure_registry_exists("keyboard_and_mouse/key_bindings"))
@@ -481,7 +498,7 @@
 }
 
 static void
-_e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
+_e_border_menu_cb_settings_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
 {
    E_Menu *subm;
    E_Menu_Item *submi;
@@ -493,57 +510,32 @@
    e_object_data_set(E_OBJECT(subm), bd);
    e_menu_item_submenu_set(mi, subm);
 
-   submi = e_menu_item_new(subm);
-   e_menu_item_label_set(submi, _("Placement"));
-   e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_placement_pre, bd);
-   e_menu_item_icon_edje_set(submi,
-                             e_theme_edje_file_get("base/theme/borders",
-                                                   "e/widgets/border/default/placement"),
-                                                   "e/widgets/border/default/placement");
-
-   if ((!bd->lock_user_stacking) && (!bd->fullscreen))
+   if (!bd->lock_border)
      {
         submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Stacking"));
-        e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_stacking_pre, bd);
+        e_menu_item_label_set(submi, _("Border"));
+        e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_border_pre, bd);
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/stacking"),
-                                                        "e/widgets/border/default/stacking");
+                                                        "e/widgets/border/default/borderless"),
+				  "e/widgets/border/default/borderless");
      }
 
    submi = e_menu_item_new(subm);
-   e_menu_item_separator_set(submi, 1);
-
-   submi = e_menu_item_new(subm);
    e_menu_item_label_set(submi, _("Skip"));
    e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_skip_pre, bd);
    e_menu_item_icon_edje_set(submi,
 			     e_theme_edje_file_get("base/theme/borders",
 						   "e/widgets/border/default/skip"),
-                                                   "e/widgets/border/default/skip");
+			     "e/widgets/border/default/skip");
 
-   if (!bd->lock_border)
-     {
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Border"));
-        e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_border_pre, bd);
-        e_menu_item_icon_edje_set(submi,
-                                  e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/borderless"),
-                                                        "e/widgets/border/default/borderless");
-     }
-
    submi = e_menu_item_new(subm);
-   e_menu_item_separator_set(submi, 1);
-
-   submi = e_menu_item_new(subm);
    e_menu_item_label_set(submi, _("Locks"));
    e_menu_item_callback_set(submi, _e_border_menu_cb_locks, bd);
    e_menu_item_icon_edje_set(submi,
                              e_theme_edje_file_get("base/theme/borders",
                                                    "e/widgets/border/default/locks"),
-                                                   "e/widgets/border/default/locks");
+			     "e/widgets/border/default/locks");
 
    submi = e_menu_item_new(subm);
    e_menu_item_label_set(submi, _("Remember"));
@@ -551,33 +543,22 @@
    e_menu_item_icon_edje_set(submi,
                              e_theme_edje_file_get("base/theme/borders",
                                                    "e/widgets/border/default/remember"),
-                                                   "e/widgets/border/default/remember");
+			     "e/widgets/border/default/remember");
 
    submi = e_menu_item_new(subm);
    e_menu_item_separator_set(submi, 1);
 
-   if ((!bd->internal) && (!bd->lock_close))
-     {
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Kill"));
-        e_menu_item_callback_set(submi, _e_border_menu_cb_kill, bd);
-        e_menu_item_icon_edje_set(submi,
-                                  e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/kill"),
-                                                        "e/widgets/border/default/kill");
-     }
-
    submi = e_menu_item_new(subm);
    e_menu_item_label_set(submi, _("ICCCM/NetWM"));
    e_menu_item_callback_set(submi, _e_border_menu_cb_prop, bd);
    e_menu_item_icon_edje_set(submi,
                              e_theme_edje_file_get("base/theme/borders",
                                                    "e/widgets/border/default/properties"),
-                                                   "e/widgets/border/default/properties");
+			     "e/widgets/border/default/properties");
 }
 
 static void
-_e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
+_e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
 {
    E_Menu *subm;
    E_Menu_Item *submi;
@@ -589,17 +570,6 @@
    e_object_data_set(E_OBJECT(subm), bd);
    e_menu_item_submenu_set(mi, subm);
 
-   if ((!bd->sticky) && ((bd->zone->desk_x_count > 1) || (bd->zone->desk_y_count > 1))) 
-     {
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Move to"));
-        e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_sendto_pre, bd);
-        e_menu_item_icon_edje_set(submi,
-                                  e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/sendto"),
-                                                        "e/widgets/border/default/sendto");
-     }
-
    if (!bd->lock_user_sticky)
      {
         submi = e_menu_item_new(subm);
@@ -610,43 +580,37 @@
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/stick"),
-                                                        "e/widgets/border/default/stick");
+				  "e/widgets/border/default/stick");
      }
 
-   submi = e_menu_item_new(subm);
-   e_menu_item_separator_set(submi, 1);
-
-   if ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
-       (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
+   if ((!bd->lock_user_iconify) && (!bd->fullscreen))
      {
-        if (!(((bd->client.icccm.min_w == bd->client.icccm.max_w) &&
-               (bd->client.icccm.min_h == bd->client.icccm.max_h)) ||
-              (bd->lock_user_maximize)))
-          {
-             if ((!bd->lock_user_maximize) && (!bd->shaded))
-               {
-                  submi = e_menu_item_new(subm);
-                  e_menu_item_label_set(submi, _("Maximize"));
-                  e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_maximize_pre, bd);
-                  e_menu_item_icon_edje_set(submi,
-                                            e_theme_edje_file_get("base/theme/borders",
-                                                                  "e/widgets/border/default/maximize"),
-                                                                  "e/widgets/border/default/maximize");
-               }
-          }
+	submi = e_menu_item_new(subm);
+	e_menu_item_label_set(submi, _("Iconify"));
+	e_menu_item_callback_set(submi, _e_border_menu_cb_iconify, bd);
+	e_menu_item_icon_edje_set(submi,
+				  e_theme_edje_file_get("base/theme/borders",
+							"e/widgets/border/default/minimize"),
+				  "e/widgets/border/default/minimize");
+     }
 
-        if ((!bd->lock_user_iconify) && (!bd->fullscreen))
-          {
-             submi = e_menu_item_new(subm);
-             e_menu_item_label_set(submi, _("Iconify"));
-             e_menu_item_callback_set(submi, _e_border_menu_cb_iconify, bd);
-             e_menu_item_icon_edje_set(submi,
-                                       e_theme_edje_file_get("base/theme/borders",
-                                                             "e/widgets/border/default/minimize"),
-                                                             "e/widgets/border/default/minimize");
-          }
+   if ((!bd->lock_user_shade) && (!bd->fullscreen) && (!bd->maximized) &&
+       ((!bd->client.border.name) || (strcmp("borderless", bd->client.border.name))))
+     {
+        submi = e_menu_item_new(subm);
+        e_menu_item_label_set(submi, _("Shade"));
+        e_menu_item_check_set(submi, 1);
+        e_menu_item_toggle_set(submi, (bd->shaded ? 1 : 0));
+        e_menu_item_callback_set(submi, _e_border_menu_cb_shade, bd);
+        e_menu_item_icon_edje_set(submi,
+                                  e_theme_edje_file_get("base/theme/borders",
+                                                        "e/widgets/border/default/shade"),
+				  "e/widgets/border/default/shade");
      }
 
+   submi = e_menu_item_new(subm);
+   e_menu_item_separator_set(submi, 1);
+
    if ((!bd->lock_user_location) && (!bd->fullscreen) &&
        (((bd->maximized & E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || e_config->allow_manip))
      {
@@ -656,11 +620,11 @@
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/move_icon"),
-                                                        "e/widgets/border/default/move_icon");
+				  "e/widgets/border/default/move_icon");
      }
 
    if (((!bd->lock_user_size) && (!bd->fullscreen) &&
-       (((bd->maximized & E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || e_config->allow_manip)) &&
+	(((bd->maximized & E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || e_config->allow_manip)) &&
        ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
         (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN)))
      {
@@ -670,25 +634,40 @@
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/resize_icon"),
-                                                        "e/widgets/border/default/resize_icon");
+				  "e/widgets/border/default/resize_icon");
      }
 
-   if ((!bd->lock_user_shade) && (!bd->fullscreen) && (!bd->maximized) &&
-       ((!bd->client.border.name) || (strcmp("borderless", bd->client.border.name))))
+   submi = e_menu_item_new(subm);
+   e_menu_item_separator_set(submi, 1);
+
+   if ((!bd->internal) && (!bd->lock_close))
      {
         submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Shade"));
-        e_menu_item_check_set(submi, 1);
-        e_menu_item_toggle_set(submi, (bd->shaded ? 1 : 0));
-        e_menu_item_callback_set(submi, _e_border_menu_cb_shade, bd);
+        e_menu_item_label_set(submi, _("Kill"));
+        e_menu_item_callback_set(submi, _e_border_menu_cb_kill, bd);
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/shade"),
-                                                        "e/widgets/border/default/shade");
+                                                        "e/widgets/border/default/kill"),
+				  "e/widgets/border/default/kill");
      }
 }
 
 static void
+_e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
+{
+   E_Menu *subm;
+   E_Menu_Item *submi;
+   E_Border *bd;
+
+   if (!(bd = data)) return;
+
+   subm = e_menu_new();
+   e_object_data_set(E_OBJECT(subm), bd);
+   e_menu_item_submenu_set(mi, subm);
+
+}
+
+static void
 _e_border_menu_cb_prop(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
 {
    E_Border *bd;
@@ -867,8 +846,8 @@
              e_menu_item_disabled_set(submi, EINA_TRUE);
           }
 		  
-// FIXME: Remove labels and add deskpreview to menu.
-// Evas_Object *o = e_widget_deskpreview_add(m->evas, 4, 2);
+	// FIXME: Remove labels and add deskpreview to menu.
+	// Evas_Object *o = e_widget_deskpreview_add(m->evas, 4, 2);
 
         for (i = 0; i < zone->desk_x_count * zone->desk_y_count; i++)
           {
@@ -985,7 +964,7 @@
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/stack_on_top"),
-                                                        "e/widgets/border/default/stack_on_top");
+				  "e/widgets/border/default/stack_on_top");
 
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Lower"));
@@ -993,7 +972,7 @@
         e_menu_item_icon_edje_set(submi,
                                   e_theme_edje_file_get("base/theme/borders",
                                                         "e/widgets/border/default/stack_below"),
-                                                        "e/widgets/border/default/stack_below");
+				  "e/widgets/border/default/stack_below");
      }
 
    submi = e_menu_item_new(subm);
@@ -1011,7 +990,7 @@
              e_menu_item_icon_edje_set(submi,
                                        e_theme_edje_file_get("base/theme/borders",
                                                              "e/widgets/border/default/stick"),
-                                                             "e/widgets/border/default/stick");
+				       "e/widgets/border/default/stick");
           }
         if ((bd->client.netwm.state.stacking == E_STACKING_BELOW) &&
             (bd->user_skip_winlist) && (bd->borderless))
@@ -1022,7 +1001,7 @@
              e_menu_item_icon_edje_set(submi,
                                        e_theme_edje_file_get("base/theme/borders",
                                                              "e/widgets/border/default/stick"),
-                                                             "e/widgets/border/default/stick");
+				       "e/widgets/border/default/stick");
           }
      }
 }
@@ -1149,9 +1128,9 @@
    e_menu_item_toggle_set(submi, (bd->offer_resistance ? 1 : 0));
    e_menu_item_callback_set(submi, _e_border_menu_cb_resistance, bd);
    e_menu_item_icon_edje_set(submi,
-   e_theme_edje_file_get("base/theme/borders",
-				"e/widgets/border/default/borderless"),
-				"e/widgets/border/default/borderless");
+			     e_theme_edje_file_get("base/theme/borders",
+						   "e/widgets/border/default/borderless"),
+			     "e/widgets/border/default/borderless");
 }
 
 static void

Log:
e17/bordermenu: 'sticky' shouldnt be grouped with iconify and shade
  

Author:       jeffdameth
Date:         2011-08-21 16:49:14 -0700 (Sun, 21 Aug 2011)
New Revision: 62673
Trac:         http://trac.enlightenment.org/e/changeset/62673

Modified:
  trunk/e/src/bin/e_int_border_menu.c 

Modified: trunk/e/src/bin/e_int_border_menu.c
===================================================================
--- trunk/e/src/bin/e_int_border_menu.c	2011-08-21 23:46:03 UTC (rev 62672)
+++ trunk/e/src/bin/e_int_border_menu.c	2011-08-21 23:49:14 UTC (rev 62673)
@@ -583,31 +583,6 @@
 				  "e/widgets/border/default/stick");
      }
 
-   if ((!bd->lock_user_iconify) && (!bd->fullscreen))
-     {
-	submi = e_menu_item_new(subm);
-	e_menu_item_label_set(submi, _("Iconify"));
-	e_menu_item_callback_set(submi, _e_border_menu_cb_iconify, bd);
-	e_menu_item_icon_edje_set(submi,
-				  e_theme_edje_file_get("base/theme/borders",
-							"e/widgets/border/default/minimize"),
-				  "e/widgets/border/default/minimize");
-     }
-
-   if ((!bd->lock_user_shade) && (!bd->fullscreen) && (!bd->maximized) &&
-       ((!bd->client.border.name) || (strcmp("borderless", bd->client.border.name))))
-     {
-        submi = e_menu_item_new(subm);
-        e_menu_item_label_set(submi, _("Shade"));
-        e_menu_item_check_set(submi, 1);
-        e_menu_item_toggle_set(submi, (bd->shaded ? 1 : 0));
-        e_menu_item_callback_set(submi, _e_border_menu_cb_shade, bd);
-        e_menu_item_icon_edje_set(submi,
-                                  e_theme_edje_file_get("base/theme/borders",
-                                                        "e/widgets/border/default/shade"),
-				  "e/widgets/border/default/shade");
-     }
-
    submi = e_menu_item_new(subm);
    e_menu_item_separator_set(submi, 1);
 
@@ -639,7 +614,35 @@
 
    submi = e_menu_item_new(subm);
    e_menu_item_separator_set(submi, 1);
+   
+   if ((!bd->lock_user_iconify) && (!bd->fullscreen))
+     {
+	submi = e_menu_item_new(subm);
+	e_menu_item_label_set(submi, _("Iconify"));
+	e_menu_item_callback_set(submi, _e_border_menu_cb_iconify, bd);
+	e_menu_item_icon_edje_set(submi,
+				  e_theme_edje_file_get("base/theme/borders",
+							"e/widgets/border/default/minimize"),
+				  "e/widgets/border/default/minimize");
+     }
 
+   if ((!bd->lock_user_shade) && (!bd->fullscreen) && (!bd->maximized) &&
+       ((!bd->client.border.name) || (strcmp("borderless", bd->client.border.name))))
+     {
+        submi = e_menu_item_new(subm);
+        e_menu_item_label_set(submi, _("Shade"));
+        e_menu_item_check_set(submi, 1);
+        e_menu_item_toggle_set(submi, (bd->shaded ? 1 : 0));
+        e_menu_item_callback_set(submi, _e_border_menu_cb_shade, bd);
+        e_menu_item_icon_edje_set(submi,
+                                  e_theme_edje_file_get("base/theme/borders",
+                                                        "e/widgets/border/default/shade"),
+				  "e/widgets/border/default/shade");
+     }
+
+   submi = e_menu_item_new(subm);
+   e_menu_item_separator_set(submi, 1);
+
    if ((!bd->internal) && (!bd->lock_close))
      {
         submi = e_menu_item_new(subm);

Log:
e17: dont show separator if there is nothing to separate
  

Author:       jeffdameth
Date:         2011-08-21 17:13:23 -0700 (Sun, 21 Aug 2011)
New Revision: 62674
Trac:         http://trac.enlightenment.org/e/changeset/62674

Modified:
  trunk/e/src/bin/e_int_border_menu.c 

Modified: trunk/e/src/bin/e_int_border_menu.c
===================================================================
--- trunk/e/src/bin/e_int_border_menu.c	2011-08-21 23:49:14 UTC (rev 62673)
+++ trunk/e/src/bin/e_int_border_menu.c	2011-08-22 00:13:23 UTC (rev 62674)
@@ -77,11 +77,11 @@
 	e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_application_pre, bd);
 	if (bd->desktop)
 	  e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi);
+
+	mi = e_menu_item_new(m);
+	e_menu_item_separator_set(mi, 1);
      }
 
-   mi = e_menu_item_new(m);
-   e_menu_item_separator_set(mi, 1);
-
    if ((!bd->lock_user_stacking) && (!bd->fullscreen))
      {
         mi = e_menu_item_new(m);

Log:
e17: free more than half of action_list on shutdown
  

Author:       jeffdameth
Date:         2011-08-24 18:25:43 -0700 (Wed, 24 Aug 2011)
New Revision: 62768
Trac:         http://trac.enlightenment.org/e/changeset/62768

Modified:
  trunk/e/src/bin/e_actions.c 

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2011-08-25 00:55:39 UTC (rev 62767)
+++ trunk/e/src/bin/e_actions.c	2011-08-25 01:25:43 UTC (rev 62768)
@@ -3135,7 +3135,8 @@
 {
    e_action_predef_name_all_del();
 
-   E_FREE_LIST(action_list, e_object_del);
+   while(action_list)
+     e_object_del(action_list->data);
 
    action_names = eina_list_free(action_names);
    eina_hash_free(actions);

Log:
e17: fix focus with pointer.
  - dont update focus_track when focus is frozen
  

Author:       jeffdameth
Date:         2011-08-25 07:26:16 -0700 (Thu, 25 Aug 2011)
New Revision: 62822
Trac:         http://trac.enlightenment.org/e/changeset/62822

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-25 14:22:26 UTC (rev 62821)
+++ trunk/e/src/bin/e_border.c	2011-08-25 14:26:16 UTC (rev 62822)
@@ -1954,40 +1954,20 @@
        (!bd->client.icccm.take_focus)) return;
    if (bd->lock_focus_out) return;
 
-   /* Try to grab the pointer to make sure it's not "in use" */
-/*
- * this causes problems as the grab can cause an in/out event (by grab) that
- * normally would be like a grab from a menu or something else and e gets into
- * a self-feeding loop. sorry - can't grab :(
-   if (!ecore_x_pointer_grab(bd->zone->container->win))
+   e_border_focus_set(bd, 1, 1);
+   
+   if (e_config->focus_policy == E_FOCUS_CLICK)
      return;
- */
-
+   
    if (e_config->focus_policy == E_FOCUS_SLOPPY)
      {
-        if (e_border_under_pointer_get(bd->desk, bd))
-          {
-             if (!e_border_pointer_warp_to_center(bd))
-               {
-                  e_border_focus_set(bd, 1, 1);
-               }
-          }
-        else
-          {
-             e_border_focus_set(bd, 1, 1);
-          }
+	if (e_border_under_pointer_get(bd->desk, bd))
+	  e_border_pointer_warp_to_center(bd);
      }
-   else if (e_config->focus_policy == E_FOCUS_CLICK)
-     {
-        e_border_focus_set(bd, 1, 1);
-     }
    else
-   if (!e_border_pointer_warp_to_center(bd))
      {
-        e_border_focus_set(bd, 1, 1);
+	e_border_pointer_warp_to_center(bd);
      }
-
-   //ecore_x_pointer_ungrab();
 }
 
 EAPI void
@@ -2037,7 +2017,7 @@
    if (focus)
      {
         if (set)
-          {
+          {	     
              if (bd->visible && bd->changes.visible)
                {
                   bd->want_focus = 1;
@@ -2046,6 +2026,9 @@
              else if ((!bd->focused) || (focus_next && (bd != eina_list_data_get(focus_next))))
                {
                   Eina_List *l;
+		  
+		  /* waiting for pointer warp timer to reach its window...*/
+		  if (warp_timer) return;
              
                   if ((l = eina_list_data_find_list(focus_next, bd)))
                     focus_next = eina_list_promote_list(focus_next, l);
@@ -2118,7 +2101,10 @@
 	E_Event_Border_Focus_In *ev;
 
 	e_focus_event_focus_in(bd);
-	e_border_focus_latest_set(bd);
+
+	if (focus_track_frozen)
+	  e_border_focus_latest_set(bd);
+
 	e_hints_active_window_set(bd->zone->container->manager, bd);
 
 	edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
@@ -8965,8 +8951,9 @@
             (y - warp_y) > 5 || (y - warp_y) < -5)
           {
              /* User moved the mouse, so stop warping */
-              warp_to = 0;
-              goto cleanup;
+	     printf("user stopped pinter warp\n");
+	     warp_to = 0;
+	     goto cleanup;
           }
 
         /* We just use the same warp speed as configured

Log:
e17: add icon cache for speeding up mainly svg icon load on slow devices. and make everything smooth :)
  - need to be build with USE_ICON_CACHE defined 
  

Author:       jeffdameth
Date:         2011-08-25 17:44:45 -0700 (Thu, 25 Aug 2011)
New Revision: 62842
Trac:         http://trac.enlightenment.org/e/changeset/62842

Modified:
  trunk/e/src/bin/e_icon.c trunk/e/src/bin/e_icon.h trunk/e/src/bin/e_main.c 

Modified: trunk/e/src/bin/e_icon.c
===================================================================
--- trunk/e/src/bin/e_icon.c	2011-08-25 22:35:33 UTC (rev 62841)
+++ trunk/e/src/bin/e_icon.c	2011-08-26 00:44:45 UTC (rev 62842)
@@ -1,6 +1,10 @@
 #include "e.h"
 
+//#define USE_ICON_CACHE
+
 typedef struct _E_Smart_Data E_Smart_Data;
+typedef struct _Cache_Item Cache_Item;
+typedef struct _Cache Cache;
 
 struct _E_Smart_Data
 {
@@ -15,8 +19,31 @@
    unsigned char scale_up : 1;
    unsigned char preload : 1;
    unsigned char loading : 1;
+#ifdef USE_ICON_CACHE
+   const char *file;
+   Cache_Item *ci;
+#endif
 };
 
+struct _Cache_Item
+{
+  unsigned int timestamp;
+  
+  Evas_Object *icon, *obj;
+  const char *id;
+  Eina_List *objs;
+};
+
+struct _Cache
+{
+  Eina_Hash *hash;
+
+  char *file;
+  Eet_File *ef;
+  Ecore_Timer *timer;
+  Eina_List *load_queue;
+};
+
 /* local subsystem functions */
 static void _e_icon_smart_reconfigure(E_Smart_Data *sd);
 static void _e_icon_smart_init(void);
@@ -32,9 +59,96 @@
 static void _e_icon_obj_prepare(Evas_Object *obj, E_Smart_Data *sd);
 static void _e_icon_preloaded(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
+#ifdef USE_ICON_CACHE
+static Eina_Bool _e_icon_cache_find(Evas_Object *o, const char *file);
+static void _e_icon_cache_icon_loaded(Cache_Item *ci);
+static void _e_icon_cache_icon_try_next(Cache_Item *ci);
+static void _e_icon_cache_item_free(void *data);
+static void _e_icon_obj_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
+#endif
+
 /* local subsystem globals */
 static Evas_Smart *_e_smart = NULL;
 
+static Cache *_cache = NULL;
+static E_Config_DD *cache_edd = NULL;
+static E_Config_DD *cache_item_edd = NULL;
+
+#define DBG(...)
+
+EINTERN int
+e_icon_init(void)
+{
+#ifdef USE_ICON_CACHE
+
+   Eet_File *ef;
+   void *data = NULL;
+   char buf[PATH_MAX];
+
+#undef T
+#undef D
+#define T Cache_Item
+#define D cache_item_edd
+   D = E_CONFIG_DD_NEW("Cache_Item", T);
+   E_CONFIG_VAL(D, T, timestamp, UINT);
+#undef T
+#undef D
+#define T Cache
+#define D cache_edd
+   D = E_CONFIG_DD_NEW("Cache", T);
+   E_CONFIG_HASH(D, T, hash, cache_item_edd);
+#undef T
+#undef D
+
+   e_user_dir_concat_static(buf, "icon_cache.eet");
+
+   ef = eet_open(buf, EET_FILE_MODE_READ_WRITE);
+   if (!ef) return 1; /* not critical */
+
+   _cache = eet_data_read(ef, cache_edd, "idx");
+   if (!_cache)
+     _cache = E_NEW(Cache, 1);
+
+   if (!_cache->hash)
+     _cache->hash = eina_hash_string_superfast_new(_e_icon_cache_item_free);
+
+   eet_close(ef);
+
+   _cache->file = strdup(buf);
+   
+   _cache->ef = NULL;
+#endif
+   return 1;
+}
+
+EINTERN int
+e_icon_shutdown(void)
+{
+#ifdef USE_ICON_CACHE
+   if (_cache)
+     {
+        E_FREE(_cache->file);
+
+        if (_cache->ef)
+          eet_close(_cache->ef);
+
+        if (_cache->load_queue)
+          {
+             printf("EEEK!!! e_icons in load queue...\n");
+             eina_list_free(_cache->load_queue);
+          }
+        
+        eina_hash_free(_cache->hash);
+        E_FREE(_cache);
+     }
+
+   E_CONFIG_DD_FREE(cache_item_edd);
+   E_CONFIG_DD_FREE(cache_edd);
+#endif
+   
+   return 1;
+}
+
 /* externally accessible functions */
 EAPI Evas_Object *
 e_icon_add(Evas *evas)
@@ -54,6 +168,9 @@
 
         pclip = evas_object_clip_get(sd->obj);
         evas_object_del(sd->obj);
+#ifdef USE_ICON_CACHE
+        eina_stringshare_replace(&sd->file, NULL);
+#endif
         sd->obj = evas_object_image_add(evas_object_evas_get(obj));
         evas_object_image_scale_hint_set(sd->obj, EVAS_IMAGE_SCALE_HINT_STATIC);
         evas_object_smart_member_add(sd->obj, obj);
@@ -136,6 +253,15 @@
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
    if (sd->preload) evas_object_hide(sd->obj);
+
+#ifdef USE_ICON_CACHE
+   if (_e_icon_cache_find(obj, file))
+     {
+        _e_icon_smart_reconfigure(sd);
+        return EINA_TRUE;
+     }
+#endif
+   
    evas_object_image_file_set(sd->obj, file, NULL);
    if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
      return EINA_FALSE;
@@ -147,9 +273,24 @@
              evas_object_image_preload(sd->obj, EINA_FALSE);
           }
         else if (evas_object_visible_get(obj))
-           evas_object_show(sd->obj);
+          {	     	     
+             evas_object_show(sd->obj);
+#ifdef USE_ICON_CACHE
+             _e_icon_cache_icon_loaded(sd->ci);
+#endif
+	  }
      }
-
+#ifdef USE_ICON_CACHE
+   else
+     {
+	evas_object_event_callback_del_full(sd->obj, EVAS_CALLBACK_DEL,
+					    _e_icon_obj_del, obj);
+	_cache->load_queue = eina_list_remove(_cache->load_queue, sd->ci);
+	eina_stringshare_del(sd->ci->id);
+	E_FREE(sd->ci);
+     }
+#endif
+   
    _e_icon_smart_reconfigure(sd);
    return EINA_TRUE;
 }
@@ -304,6 +445,9 @@
    const char *file;
 
    if (!(sd = evas_object_smart_data_get(obj))) return NULL;
+#ifdef USE_ICON_CACHE
+   if (sd->file) return sd->file;
+#endif
    if (!strcmp(evas_object_type_get(sd->obj), "edje"))
      {
 	edje_object_file_get(sd->obj, &file, NULL);
@@ -580,6 +724,10 @@
    evas_object_smart_callback_call(data, "preloaded", NULL);
    evas_object_show(sd->obj);
    sd->loading = 0;
+
+#ifdef USE_ICON_CACHE
+   _e_icon_cache_icon_loaded(sd->ci);
+#endif
 }
 
 static void
@@ -615,6 +763,9 @@
    evas_object_del(sd->obj);
    evas_object_del(sd->eventarea);
    if (sd->fdo) eina_stringshare_del(sd->fdo);
+#ifdef USE_ICON_CACHE
+   if (sd->file) eina_stringshare_del(sd->file);
+#endif
    if (sd->timer) ecore_timer_del(sd->timer);
    free(sd);
 }
@@ -668,7 +819,13 @@
 
    if (!(sd = evas_object_smart_data_get(obj))) return;
    if (!((sd->preload) && (sd->loading)))
-     evas_object_show(sd->obj);
+     {	
+	evas_object_show(sd->obj);
+#ifdef USE_ICON_CACHE
+	_e_icon_cache_icon_loaded(sd->ci);
+#endif
+     }
+   
    evas_object_show(sd->eventarea);
 }
 
@@ -710,3 +867,235 @@
    evas_object_clip_unset(sd->obj);
    evas_object_clip_unset(sd->eventarea);
 }
+
+#ifdef USE_ICON_CACHE
+
+static void
+_e_icon_cache_item_free(void *data)
+{
+   Cache_Item *ci = data;
+   eina_stringshare_del(ci->id);
+   E_FREE(ci);
+}
+
+static Eina_Bool
+_e_icon_cache_find(Evas_Object *obj, const char *file)
+{
+   E_Smart_Data *sd;
+   Cache_Item *ci;
+   char buf[PATH_MAX];
+   const char *id;
+   Eina_List *l;
+   
+   if (!(sd = evas_object_smart_data_get(obj))) 
+     return EINA_FALSE;
+
+   snprintf(buf, PATH_MAX, "%d:%s", sd->size, file);
+
+   if ((ci = eina_hash_find(_cache->hash, buf)))
+     {	
+	unsigned int w, h, alpha;
+	void *data;
+	int found = 0;
+
+	if (!_cache->ef)
+	  _cache->ef = eet_open(_cache->file, EET_FILE_MODE_READ_WRITE);
+
+	if (_cache->ef && (data = eet_data_image_read(_cache->ef, buf,
+						      &w, &h, &alpha,
+						      NULL, NULL, NULL)))
+	  {
+	     evas_object_image_size_set(sd->obj, w, h);
+	     evas_object_image_alpha_set(sd->obj, alpha); 
+	     evas_object_image_data_copy_set(sd->obj, data);
+	     evas_object_smart_callback_call(obj, "preloaded", NULL);
+	     evas_object_show(sd->obj);
+	     free(data);
+	     found = 1;     
+	  }
+
+	if ((_cache->ef) && !(_cache->timer))
+	  {
+	     eet_close(_cache->ef);
+	     _cache->ef = NULL;
+	  }
+
+	if (found)
+	  return EINA_TRUE;
+
+	eina_hash_del_by_key(_cache->hash, ci->id);
+	ci = NULL;
+     }
+
+   id = eina_stringshare_add(buf);   
+
+   /* not found in cache, check load queue */
+   EINA_LIST_FOREACH(_cache->load_queue, l, ci)
+     {
+	if (ci->id != id) continue;	     
+	ci->objs = eina_list_append(ci->objs, obj);
+	sd->ci = ci;
+	evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_DEL,
+				       _e_icon_obj_del, obj);
+	eina_stringshare_del(id);
+	return EINA_TRUE;
+     }
+
+   ci = E_NEW(Cache_Item, 1);
+   ci->id = id;
+   ci->icon = sd->obj;
+   ci->obj = obj;
+   sd->ci = ci;
+   sd->file = eina_stringshare_add(file);
+
+   evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_DEL, _e_icon_obj_del, obj);
+
+   _cache->load_queue = eina_list_append(_cache->load_queue, ci);
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+_e_icon_cache_save(void *data)
+{
+   if (_cache->load_queue)
+     {
+	DBG("wating for icon load queue to write\n");
+	Cache_Item *ci;
+	Eina_List *l;
+	
+	EINA_LIST_FOREACH(_cache->load_queue, l, ci)
+	  DBG("  : %s\n", ci->id);
+	
+	return ECORE_CALLBACK_RENEW;
+     }
+
+   eet_sync(_cache->ef);
+   eet_close(_cache->ef);
+   
+   _cache->ef = NULL;
+   _cache->timer = NULL;
+
+   DBG("icon cache written\n");
+   
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static void
+_e_icon_cache_icon_try_next(Cache_Item *ci)
+{
+   Evas_Object *obj;
+   E_Smart_Data *sd;
+
+   if (!ci->objs)
+     {	
+	/* no more e_icon wait for this object to bet loaded */
+	_cache->load_queue = eina_list_remove(_cache->load_queue, ci);
+	_e_icon_cache_item_free(ci);
+	return;
+     }
+   
+   obj = eina_list_data_get(ci->objs);
+   ci->objs = eina_list_remove_list(ci->objs, ci->objs);
+   
+   if (!obj)
+     goto __try_next;
+   
+   if (!(sd = evas_object_smart_data_get(obj)))
+     goto __try_next;
+   
+   evas_object_image_file_set(sd->obj, sd->file, NULL);
+   if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
+     goto __try_next;
+   
+   sd->ci->icon = sd->obj;
+   sd->ci->obj = obj;
+   evas_object_image_preload(sd->obj, EINA_FALSE);
+   return;
+
+ __try_next:
+   evas_object_event_callback_del_full(sd->obj, EVAS_CALLBACK_DEL,
+				       _e_icon_obj_del, obj);
+   _e_icon_cache_icon_try_next(ci);
+}
+
+static void
+_e_icon_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   E_Smart_Data *sd;
+
+   if (!(sd = evas_object_smart_data_get(data))) return;
+   if (!sd->ci) return;
+   
+   /* check if the deleted object is the one that is used for
+      preloading.  when other objs wait for this image data start
+      preloading again with the next. */
+
+   if (sd->ci->icon == obj)
+     _e_icon_cache_icon_try_next(sd->ci); 
+   else
+     sd->ci->objs = eina_list_remove(sd->ci->objs, data);
+}
+
+static void
+_e_icon_cache_icon_loaded(Cache_Item *ci)
+{
+   int w, h, alpha;
+   E_Smart_Data *sd;
+   Evas_Object *obj, *so;
+   void *data;
+
+   if (!ci || !ci->id) return;   
+   _cache->load_queue = eina_list_remove(_cache->load_queue, ci); 
+   
+   data = evas_object_image_data_get(ci->icon, EINA_FALSE);
+   evas_object_image_size_get(ci->icon, &w, &h); 
+   alpha = evas_object_image_alpha_get(ci->icon); 
+
+   evas_object_event_callback_del_full(ci->icon, EVAS_CALLBACK_DEL,
+				       _e_icon_obj_del, ci->obj);
+   evas_object_smart_callback_call(ci->obj, "preloaded", NULL);
+   
+   DBG("icon loaded %p, %s\n", data, ci->id);
+
+   sd = evas_object_smart_data_get(ci->obj);
+   sd->ci = NULL;
+   
+   /* pass loaded data to other e_icon wating for this */
+   EINA_LIST_FREE(ci->objs, obj)
+     {	     
+	sd = evas_object_smart_data_get(obj);
+	sd->ci = NULL;
+	evas_object_event_callback_del_full(sd->obj, EVAS_CALLBACK_DEL,
+					    _e_icon_obj_del, obj);
+	if (!data) continue;
+
+	evas_object_image_size_set(sd->obj, w, h);
+	evas_object_image_alpha_set(sd->obj, alpha);
+	evas_object_image_data_copy_set(sd->obj, data);
+	evas_object_show(sd->obj);
+	evas_object_smart_callback_call(obj, "preloaded", NULL);
+     }
+
+   if (data)
+     {
+	if (!_cache->ef)
+	  _cache->ef = eet_open(_cache->file, EET_FILE_MODE_READ_WRITE);
+	if (_cache->ef && eet_data_image_write(_cache->ef, ci->id, data,
+					       w, h, alpha, 1, 100, 0))
+	  {
+	     eina_hash_add(_cache->hash, ci->id, ci);
+	     int ok = eet_data_write(_cache->ef, cache_edd, "idx", _cache, 1);
+
+	     if (!_cache->timer)
+	       _cache->timer = ecore_timer_add(3.0, _e_icon_cache_save, NULL);
+
+	     eina_stringshare_replace(&ci->id, NULL);
+	     return;
+	  }
+     }
+   
+   DBG("couldnt write cache %p !!!\n", _cache->ef);
+   _e_icon_cache_item_free(ci);
+}
+#endif

Modified: trunk/e/src/bin/e_icon.h
===================================================================
--- trunk/e/src/bin/e_icon.h	2011-08-25 22:35:33 UTC (rev 62841)
+++ trunk/e/src/bin/e_icon.h	2011-08-26 00:44:45 UTC (rev 62842)
@@ -3,6 +3,9 @@
 #ifndef E_ICON_H
 #define E_ICON_H
 
+EINTERN int e_icon_init(void);
+EINTERN int e_icon_shutdown(void);
+
 EAPI Evas_Object *e_icon_add              (Evas *evas);
 EAPI Eina_Bool    e_icon_file_set         (Evas_Object *obj, const char *file);
 EAPI Eina_Bool    e_icon_file_key_set     (Evas_Object *obj, const char *file, const char *key);
@@ -10,6 +13,7 @@
 EAPI Eina_Bool    e_icon_fdo_icon_set     (Evas_Object *obj, const char *icon);
 EAPI void         e_icon_object_set       (Evas_Object *obj, Evas_Object *o);
 EAPI const char  *e_icon_file_get         (const Evas_Object *obj);
+EAPI const char  *e_icon_file_key_get     (const Evas_Object *obj, const char **key);
 EAPI void         e_icon_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth);
 EAPI Eina_Bool    e_icon_smooth_scale_get (const Evas_Object *obj);
 EAPI void         e_icon_alpha_set        (Evas_Object *obj, Eina_Bool smooth);

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2011-08-25 22:35:33 UTC (rev 62841)
+++ trunk/e/src/bin/e_main.c	2011-08-26 00:44:45 UTC (rev 62842)
@@ -851,6 +851,15 @@
    TS("E_Thumb Init Done");
    _e_main_shutdown_push(e_thumb_shutdown);
 
+   TS("E_Icon Init");
+   if (!e_icon_init()) 
+     {
+        e_error_message_show(_("Enlightenment cannot initialize the Icon Cache system.\n"));
+        _e_main_shutdown(-1);
+     }
+   TS("E_Thumb Init Done");
+   _e_main_shutdown_push(e_icon_shutdown);
+
    if (!after_restart) 
      {
         if (e_config->show_splash)

Log:
e17/focus: remove hack waiting for pointer warp to finish
  

Author:       jeffdameth
Date:         2011-08-27 20:53:29 -0700 (Sat, 27 Aug 2011)
New Revision: 62896
Trac:         http://trac.enlightenment.org/e/changeset/62896

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-28 03:41:18 UTC (rev 62895)
+++ trunk/e/src/bin/e_border.c	2011-08-28 03:53:29 UTC (rev 62896)
@@ -2026,10 +2026,7 @@
              else if ((!bd->focused) || (focus_next && (bd != eina_list_data_get(focus_next))))
                {
                   Eina_List *l;
-		  
-		  /* waiting for pointer warp timer to reach its window...*/
-		  if (warp_timer) return;
-             
+
                   if ((l = eina_list_data_find_list(focus_next, bd)))
                     focus_next = eina_list_promote_list(focus_next, l);
                   else

Log:
e17: refactor code duplication.
  - added _e_border_maximize used by e_border_maximze and eval for changed border  
  - added _e_border_client_inset_calc, same code was used in various places
  

Author:       jeffdameth
Date:         2011-08-27 21:22:29 -0700 (Sat, 27 Aug 2011)
New Revision: 62897
Trac:         http://trac.enlightenment.org/e/changeset/62897

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-28 03:53:29 UTC (rev 62896)
+++ trunk/e/src/bin/e_border.c	2011-08-28 04:22:29 UTC (rev 62897)
@@ -2314,6 +2314,146 @@
    e_remember_update(bd);
 }
 
+static void
+_e_border_client_inset_calc(E_Border *bd)
+{
+   /* int w, h; */
+   Evas_Coord cx, cy, cw, ch;
+
+   if (bd->bg_object)
+     {
+	evas_object_resize(bd->bg_object, 1000, 1000);
+	edje_object_calc_force(bd->bg_object);
+	edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
+	bd->client_inset.l = cx;
+	bd->client_inset.r = 1000 - (cx + cw);
+	bd->client_inset.t = cy;
+	bd->client_inset.b = 1000 - (cy + ch);
+     }
+   else
+     {
+	bd->client_inset.l = 0;
+	bd->client_inset.r = 0;
+	bd->client_inset.t = 0;
+	bd->client_inset.b = 0;
+     }
+   
+   ecore_x_netwm_frame_size_set(bd->client.win,
+				bd->client_inset.l, bd->client_inset.r,
+				bd->client_inset.t, bd->client_inset.b);
+   ecore_x_e_frame_size_set(bd->client.win,
+			    bd->client_inset.l, bd->client_inset.r,
+			    bd->client_inset.t, bd->client_inset.b);
+}
+
+static void
+_e_border_maximize(E_Border *bd, E_Maximize max)
+{
+   int x1, y1, x2, y2;
+   int w, h, pw, ph;
+   int zx, zy, zw, zh;
+
+   zx = zy = zw = zh = 0;
+
+   switch (max & E_MAXIMIZE_TYPE)
+     {
+      case E_MAXIMIZE_NONE:
+	 /* Ignore */
+	 max = E_MAXIMIZE_NONE;
+	 break;
+
+      case E_MAXIMIZE_FULLSCREEN:
+	 w = bd->zone->w;
+	 h = bd->zone->h;
+
+	 if (bd->bg_object)
+	   {
+	      edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
+	      _e_border_client_inset_calc(bd);
+	   }
+	 e_border_resize_limit(bd, &w, &h);
+	 /* center x-direction */
+	 x1 = bd->zone->x + (bd->zone->w - w) / 2;
+	 /* center y-direction */
+	 y1 = bd->zone->y + (bd->zone->h - h) / 2;
+
+	 if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
+	   e_border_move_resize(bd, x1, y1, w, h);
+	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
+	   e_border_move_resize(bd, bd->x, y1, bd->w, h);
+	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
+	   e_border_move_resize(bd, x1, bd->y, w, bd->h);
+	 break;
+
+      case E_MAXIMIZE_SMART:
+      case E_MAXIMIZE_EXPAND:
+	 if (bd->zone)
+	   e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
+
+	 if (bd->w < zw)
+	   w = bd->w;
+	 else
+	   w = zw;
+
+	 if (bd->h < zh)
+	   h = bd->h;
+	 else
+	   h = zh;
+
+	 if (bd->x < zx) // window left not useful coordinates
+	   x1 = zx;
+	 else if (bd->x + bd->w > zx + zw) // window right not useful coordinates
+	   x1 = zx + zw - bd->w;
+	 else // window normal position
+	   x1 = bd->x;
+
+	 if (bd->y < zy) // window top not useful coordinates
+	   y1 = zy;
+	 else if (bd->y + bd->h > zy + zh) // window bottom not useful coordinates
+	   y1 = zy + zh - bd->h;
+	 else // window normal position
+	   y1 = bd->y;
+
+	 if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
+	   e_border_move_resize(bd, zx, zy, zw, zh);
+	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
+	   e_border_move_resize(bd, x1, zy, w, zh);
+	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
+	   e_border_move_resize(bd, zx, y1, zw, h);
+	 edje_object_signal_emit(bd->bg_object, "e,action,maximize", "e");
+	 break;
+
+      case E_MAXIMIZE_FILL:
+	 x1 = bd->zone->x;
+	 y1 = bd->zone->y;
+	 x2 = bd->zone->x + bd->zone->w;
+	 y2 = bd->zone->y + bd->zone->h;
+
+	 /* walk through all shelves */
+	 e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, max);
+
+	 /* walk through all windows */
+	 e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, max);
+
+	 w = x2 - x1;
+	 h = y2 - y1;
+	 pw = w;
+	 ph = h;
+	 e_border_resize_limit(bd, &w, &h);
+	 /* center x-direction */
+	 x1 = x1 + (pw - w) / 2;
+	 /* center y-direction */
+	 y1 = y1 + (ph - h) / 2;
+	 if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
+	   e_border_move_resize(bd, x1, y1, w, h);
+	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
+	   e_border_move_resize(bd, bd->x, y1, bd->w, h);
+	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
+	   e_border_move_resize(bd, x1, bd->y, w, bd->h);
+	 break;
+     }
+}
+
 EAPI void
 e_border_maximize(E_Border  *bd,
                   E_Maximize max)
@@ -2337,152 +2477,35 @@
         bd->maximized |= max;
         return;
      }
+ 
+   bd->pre_res_change.valid = 0;
+   if (!(bd->maximized & E_MAXIMIZE_HORIZONTAL))
+     {
+	/* Horizontal hasn't been set */
+	bd->saved.x = bd->x - bd->zone->x;
+	bd->saved.w = bd->w;
+     }
+   if (!(bd->maximized & E_MAXIMIZE_VERTICAL))
+     {
+	/* Vertical hasn't been set */
+	bd->saved.y = bd->y - bd->zone->y;
+	bd->saved.h = bd->h;
+     }
+   bd->saved.zone = bd->zone->num;
+   e_hints_window_size_set(bd);
 
-   {
-      int x1, y1, x2, y2;
-      int w, h, pw, ph;
-      int zx, zy, zw, zh;
+   e_border_raise(bd);
 
-      zx = zy = zw = zh = 0;
+   _e_border_maximize(bd, max);
 
-      bd->pre_res_change.valid = 0;
-      if (!(bd->maximized & E_MAXIMIZE_HORIZONTAL))
-        {
-           /* Horizontal hasn't been set */
-           bd->saved.x = bd->x - bd->zone->x;
-           bd->saved.w = bd->w;
-        }
-      if (!(bd->maximized & E_MAXIMIZE_VERTICAL))
-        {
-           /* Vertical hasn't been set */
-           bd->saved.y = bd->y - bd->zone->y;
-           bd->saved.h = bd->h;
-        }
-      bd->saved.zone = bd->zone->num;
-      e_hints_window_size_set(bd);
 
-      e_border_raise(bd);
-      switch (max & E_MAXIMIZE_TYPE)
-        {
-         case E_MAXIMIZE_NONE:
-           /* Ignore */
-           max = E_MAXIMIZE_NONE;
-           break;
+   /* Remove previous type */
+   bd->maximized &= ~E_MAXIMIZE_TYPE;
+   /* Add new maximization. It must be added, so that VERTICAL + HORIZONTAL == BOTH */
+   bd->maximized |= max;
 
-         case E_MAXIMIZE_FULLSCREEN:
-           w = bd->zone->w;
-           h = bd->zone->h;
-
-           if (bd->bg_object)
-             {
-                Evas_Coord cx, cy, cw, ch;
-
-                edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
-
-                evas_object_resize(bd->bg_object, w, h);
-                edje_object_calc_force(bd->bg_object);
-                edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
-                bd->client_inset.l = cx;
-                bd->client_inset.r = w - (cx + cw);
-                bd->client_inset.t = cy;
-                bd->client_inset.b = h - (cy + ch);
-                ecore_x_netwm_frame_size_set(bd->client.win,
-                                             bd->client_inset.l, bd->client_inset.r,
-                                             bd->client_inset.t, bd->client_inset.b);
-                ecore_x_e_frame_size_set(bd->client.win,
-                                         bd->client_inset.l, bd->client_inset.r,
-                                         bd->client_inset.t, bd->client_inset.b);
-             }
-           e_border_resize_limit(bd, &w, &h);
-           /* center x-direction */
-           x1 = bd->zone->x + (bd->zone->w - w) / 2;
-           /* center y-direction */
-           y1 = bd->zone->y + (bd->zone->h - h) / 2;
-
-           if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-             e_border_move_resize(bd, x1, y1, w, h);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-             e_border_move_resize(bd, bd->x, y1, bd->w, h);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-             e_border_move_resize(bd, x1, bd->y, w, bd->h);
-           break;
-
-         case E_MAXIMIZE_SMART:
-         case E_MAXIMIZE_EXPAND:
-           if (bd->zone)
-             e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
-
-           if (bd->w < zw)
-             w = bd->w;
-           else
-             w = zw;
-
-           if (bd->h < zh)
-             h = bd->h;
-           else
-             h = zh;
-
-           if (bd->x < zx) // window left not useful coordinates
-             x1 = zx;
-           else if (bd->x + bd->w > zx + zw) // window right not useful coordinates
-             x1 = zx + zw - bd->w;
-           else // window normal position
-             x1 = bd->x;
-
-           if (bd->y < zy) // window top not useful coordinates
-             y1 = zy;
-           else if (bd->y + bd->h > zy + zh) // window bottom not useful coordinates
-             y1 = zy + zh - bd->h;
-           else // window normal position
-             y1 = bd->y;
-
-           if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-             e_border_move_resize(bd, zx, zy, zw, zh);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-             e_border_move_resize(bd, x1, zy, w, zh);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-             e_border_move_resize(bd, zx, y1, zw, h);
-           edje_object_signal_emit(bd->bg_object, "e,action,maximize", "e");
-           break;
-
-         case E_MAXIMIZE_FILL:
-           x1 = bd->zone->x;
-           y1 = bd->zone->y;
-           x2 = bd->zone->x + bd->zone->w;
-           y2 = bd->zone->y + bd->zone->h;
-
-           /* walk through all shelves */
-           e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, max);
-
-           /* walk through all windows */
-           e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, max);
-
-           w = x2 - x1;
-           h = y2 - y1;
-           pw = w;
-           ph = h;
-           e_border_resize_limit(bd, &w, &h);
-           /* center x-direction */
-           x1 = x1 + (pw - w) / 2;
-           /* center y-direction */
-           y1 = y1 + (ph - h) / 2;
-           if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-             e_border_move_resize(bd, x1, y1, w, h);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-             e_border_move_resize(bd, bd->x, y1, bd->w, h);
-           else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-             e_border_move_resize(bd, x1, bd->y, w, bd->h);
-           break;
-        }
-
-      /* Remove previous type */
-      bd->maximized &= ~E_MAXIMIZE_TYPE;
-      /* Add new maximization. It must be added, so that VERTICAL + HORIZONTAL == BOTH */
-      bd->maximized |= max;
-
-      e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL,
-                                   bd->maximized & E_MAXIMIZE_VERTICAL);
-   }
+   e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL,
+				bd->maximized & E_MAXIMIZE_VERTICAL);
    e_remember_update(bd);
 }
 
@@ -2513,23 +2536,8 @@
           {
              if (bd->bg_object)
                {
-                  Evas_Coord cx, cy, cw, ch;
-
                   edje_object_signal_emit(bd->bg_object, "e,action,unmaximize,fullscreen", "e");
-
-                  evas_object_resize(bd->bg_object, 1000, 1000);
-                  edje_object_calc_force(bd->bg_object);
-                  edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
-                  bd->client_inset.l = cx;
-                  bd->client_inset.r = 1000 - (cx + cw);
-                  bd->client_inset.t = cy;
-                  bd->client_inset.b = 1000 - (cy + ch);
-                  ecore_x_netwm_frame_size_set(bd->client.win,
-                                               bd->client_inset.l, bd->client_inset.r,
-                                               bd->client_inset.t, bd->client_inset.b);
-                  ecore_x_e_frame_size_set(bd->client.win,
-                                           bd->client_inset.l, bd->client_inset.r,
-                                           bd->client_inset.t, bd->client_inset.b);
+		  _e_border_client_inset_calc(bd);
                }
 
              bd->maximized = E_MAXIMIZE_NONE;
@@ -3982,26 +3990,12 @@
 EAPI void
 e_border_frame_recalc(E_Border *bd)
 {
-   Evas_Coord cx, cy, cw, ch;
-
    if (!bd->bg_object) return;
 
    bd->w -= (bd->client_inset.l + bd->client_inset.r);
    bd->h -= (bd->client_inset.t + bd->client_inset.b);
 
-   evas_object_resize(bd->bg_object, 1000, 1000);
-   edje_object_calc_force(bd->bg_object);
-   edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
-   bd->client_inset.l = cx;
-   bd->client_inset.r = 1000 - (cx + cw);
-   bd->client_inset.t = cy;
-   bd->client_inset.b = 1000 - (cy + ch);
-   ecore_x_netwm_frame_size_set(bd->client.win,
-                                bd->client_inset.l, bd->client_inset.r,
-                                bd->client_inset.t, bd->client_inset.b);
-   ecore_x_e_frame_size_set(bd->client.win,
-                            bd->client_inset.l, bd->client_inset.r,
-                            bd->client_inset.t, bd->client_inset.b);
+   _e_border_client_inset_calc(bd);
 
    bd->w += (bd->client_inset.l + bd->client_inset.r);
    bd->h += (bd->client_inset.t + bd->client_inset.b);
@@ -6987,22 +6981,15 @@
           {
              Evas_Object *o;
              char buf[PATH_MAX];
-             Evas_Coord cx, cy, cw, ch;
-             int l, r, t, b, ok;
+             int ok;
 
              bd->changes.border = 1;
-             if (bd->client.border.name)
-               eina_stringshare_del(bd->client.border.name);
-             bd->client.border.name = eina_stringshare_add(bordername);
+	     eina_stringshare_replace(&bd->client.border.name, bordername);
 
              if (bd->bg_object)
                {
                   bd->w -= (bd->client_inset.l + bd->client_inset.r);
                   bd->h -= (bd->client_inset.t + bd->client_inset.b);
-                  bd->client_inset.l = 0;
-                  bd->client_inset.r = 0;
-                  bd->client_inset.t = 0;
-                  bd->client_inset.b = 0;
                   bd->changes.size = 1;
                   evas_object_del(bd->bg_object);
                }
@@ -7017,9 +7004,7 @@
                   if (ok)
                     {
                        /* Reset default border style to default */
-                       if (e_config->theme_default_border_style)
-                         eina_stringshare_del(e_config->theme_default_border_style);
-                       e_config->theme_default_border_style = eina_stringshare_add("default");
+		       eina_stringshare_replace(&e_config->theme_default_border_style, "default"); 
                        e_config_save_queue();
                     }
                }
@@ -7057,155 +7042,33 @@
                   else if (bd->client.icccm.title)
                     edje_object_part_text_set(o, "e.text.title",
                                               bd->client.icccm.title);
-                  evas_object_resize(o, 1000, 1000);
-                  edje_object_calc_force(o);
-                  edje_object_part_geometry_get(o, "e.swallow.client",
-                                                &cx, &cy, &cw, &ch);
-                  l = cx;
-                  r = 1000 - (cx + cw);
-                  t = cy;
-                  b = 1000 - (cy + ch);
                }
              else
                {
                   evas_object_del(o);
                   bd->bg_object = NULL;
-                  l = 0;
-                  r = 0;
-                  t = 0;
-                  b = 0;
                }
-             bd->client_inset.l = l;
-             bd->client_inset.r = r;
-             bd->client_inset.t = t;
-             bd->client_inset.b = b;
-             ecore_x_netwm_frame_size_set(bd->client.win, l, r, t, b);
-             ecore_x_e_frame_size_set(bd->client.win, l, r, t, b);
+
+	     _e_border_client_inset_calc(bd);
+
              bd->w += (bd->client_inset.l + bd->client_inset.r);
              bd->h += (bd->client_inset.t + bd->client_inset.b);
              ecore_evas_shaped_set(bd->bg_ecore_evas, bd->shaped);
              bd->changes.size = 1;
-             ecore_x_window_move(bd->client.shell_win, l, t);
+	     /*  really needed ? */
+             ecore_x_window_move(bd->client.shell_win,
+				 bd->client_inset.l,
+				 bd->client_inset.t);
 
              if (bd->maximized != E_MAXIMIZE_NONE)
                {
-                  int x1, y1, x2, y2;
-                  int w, h, pw, ph;
-                  int zx, zy, zw, zh;
                   E_Maximize maximized = bd->maximized;
 
                   /* to force possible resizes */
                   bd->maximized = E_MAXIMIZE_NONE;
 
-                  zx = zy = zw = zh = 0;
+		  _e_border_maximize(bd, maximized); 
 
-                  switch (maximized & E_MAXIMIZE_TYPE)
-                    {
-                     case E_MAXIMIZE_FULLSCREEN:
-                        w = bd->zone->w;
-                        h = bd->zone->h;
-
-                        if (bd->bg_object)
-                          {
-                             Evas_Coord cx, cy, cw, ch;
-
-                             edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
-
-                             evas_object_resize(bd->bg_object, w, h);
-                             edje_object_calc_force(bd->bg_object);
-                             edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
-                             bd->client_inset.l = cx;
-                             bd->client_inset.r = w - (cx + cw);
-                             bd->client_inset.t = cy;
-                             bd->client_inset.b = h - (cy + ch);
-                             ecore_x_netwm_frame_size_set(bd->client.win,
-                                                          bd->client_inset.l, bd->client_inset.r,
-                                                          bd->client_inset.t, bd->client_inset.b);
-                             ecore_x_e_frame_size_set(bd->client.win,
-                                                      bd->client_inset.l, bd->client_inset.r,
-                                                      bd->client_inset.t, bd->client_inset.b);
-                          }
-                        e_border_resize_limit(bd, &w, &h);
-                        /* center x-direction */
-                        x1 = bd->zone->x + (bd->zone->w - w) / 2;
-                        /* center y-direction */
-                        y1 = bd->zone->y + (bd->zone->h - h) / 2;
-
-                        if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-                          _e_border_move_resize_internal(bd, x1, y1, w, h, 0, 1);
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-                          _e_border_move_resize_internal(bd, bd->x, y1, bd->w, h, 0, 1);
-
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-                          _e_border_move_resize_internal(bd, x1, bd->y, w, bd->h, 0, 1);
-                        break;
-
-                     case E_MAXIMIZE_SMART:
-                     case E_MAXIMIZE_EXPAND:
-                        if (bd->zone)
-                          e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
-
-                        if (bd->w < zw)
-                          w = bd->w;
-                        else
-                          w = zw;
-
-                        if (bd->h < zh)
-                          h = bd->h;
-                        else
-                          h = zh;
-
-                        if (bd->x < zx) // window left not useful coordinates
-                          x1 = zx;
-                        else if (bd->x + bd->w > zx + zw) // window right not useful coordinates
-                          x1 = zx + zw - bd->w;
-                        else // window normal position
-                          x1 = bd->x;
-
-                        if (bd->y < zy) // window top not useful coordinates
-                          y1 = zy;
-                        else if (bd->y + bd->h > zy + zh) // window bottom not useful coordinates
-                          y1 = zy + zh - bd->h;
-                        else // window normal position
-                          y1 = bd->y;
-
-                        if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-                          _e_border_move_resize_internal(bd, zx, zy, zw, zh, 0, 1);
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-                          _e_border_move_resize_internal(bd, x1, zy, w, zh, 0, 1);
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-                          _e_border_move_resize_internal(bd, zx, y1, zw, h, 0, 1);
-                        break;
-
-                     case E_MAXIMIZE_FILL:
-                        x1 = bd->zone->x;
-                        y1 = bd->zone->y;
-                        x2 = bd->zone->x + bd->zone->w;
-                        y2 = bd->zone->y + bd->zone->h;
-
-                        /* walk through all shelves */
-                        e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, maximized);
-
-                        /* walk through all windows */
-                        e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, maximized);
-
-                        w = x2 - x1;
-                        h = y2 - y1;
-                        pw = w;
-                        ph = h;
-                        e_border_resize_limit(bd, &w, &h);
-                        /* center x-direction */
-                        x1 = x1 + (pw - w) / 2;
-                        /* center y-direction */
-                        y1 = y1 + (ph - h) / 2;
-                        if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-                          _e_border_move_resize_internal(bd, x1, y1, w, h, 0, 1);
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-                          _e_border_move_resize_internal(bd, bd->x, y1, bd->w, h, 0, 1);
-                        else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-                          _e_border_move_resize_internal(bd, x1, bd->y, w, bd->h, 0, 1);
-                        break;
-                    }
                   /* restore maximized state */
                   bd->maximized = maximized;

Log:
e17/border: fix formatting, tabs and trailing whitespace
  

Author:       jeffdameth
Date:         2011-08-27 23:48:33 -0700 (Sat, 27 Aug 2011)
New Revision: 62901
Trac:         http://trac.enlightenment.org/e/changeset/62901

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-28 06:30:51 UTC (rev 62900)
+++ trunk/e/src/bin/e_border.c	2011-08-28 06:48:33 UTC (rev 62901)
@@ -200,7 +200,7 @@
 static void _e_border_client_move_resize_send(E_Border *bd);
 
 static void _e_border_frame_replace(E_Border *bd,
-				    Eina_Bool argb);
+            Eina_Bool argb);
 
 static void _e_border_shape_input_rectangle_set(E_Border* bd);
 static void _e_border_show(E_Border *bd);
@@ -986,7 +986,7 @@
    setpriority(PRIO_PROCESS, pid, newpri);
 // shouldnt need to do this as default ionice class is "none" (0), and
 // this inherits io priority FROM nice level
-//        ioprio_set(IOPRIO_WHO_PROCESS, pid, 
+//        ioprio_set(IOPRIO_WHO_PROCESS, pid,
 //                   IOPRIO_PRIO_VALUE(2, 5));
    if (do_children)
      {
@@ -1014,10 +1014,10 @@
                             if (ppid == pid)
                               {
                                  if (adj_children)
-                                    _pri_adj(pid2, set, adj, EINA_TRUE, 
+                                    _pri_adj(pid2, set, adj, EINA_TRUE,
                                              adj_children, do_children);
                                  else
-                                    _pri_adj(pid2, set, adj, use_adj, 
+                                    _pri_adj(pid2, set, adj, use_adj,
                                              adj_children, do_children);
                               }
                          }
@@ -1034,8 +1034,8 @@
 {
    if (bd->client.netwm.pid <= 0) return;
    if (bd->client.netwm.pid == getpid()) return;
-   _pri_adj(bd->client.netwm.pid, 
-            e_config->priority - 1, -1, EINA_FALSE, 
+   _pri_adj(bd->client.netwm.pid,
+            e_config->priority - 1, -1, EINA_FALSE,
 //            EINA_TRUE, EINA_TRUE);
             EINA_TRUE, EINA_FALSE);
 //   printf("WIN: pid %i, title %s (HI!!!!!!!!!!!!!!!!!!)\n",
@@ -1047,8 +1047,8 @@
 {
    if (bd->client.netwm.pid <= 0) return;
    if (bd->client.netwm.pid == getpid()) return;
-   _pri_adj(bd->client.netwm.pid, 
-            e_config->priority, 1, EINA_FALSE, 
+   _pri_adj(bd->client.netwm.pid,
+            e_config->priority, 1, EINA_FALSE,
 //            EINA_TRUE, EINA_TRUE);
             EINA_TRUE, EINA_FALSE);
 //   printf("WIN: pid %i, title %s (NORMAL)\n",
@@ -1088,19 +1088,19 @@
    /* create new frame */
    if (argb)
      bd->win = ecore_x_window_manager_argb_new(bd->zone->container->win,
-					       bd->x, bd->y, bd->w, bd->h);
+                 bd->x, bd->y, bd->w, bd->h);
    else
      {
         bd->win = ecore_x_window_override_new(bd->zone->container->win,
-					      bd->x, bd->y, bd->w, bd->h);
+                bd->x, bd->y, bd->w, bd->h);
         ecore_x_window_shape_events_select(bd->win, 1);
      }
 
    ecore_x_window_configure(bd->win,
-			    ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
-			    ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
-			    0, 0, 0, 0, 0,
-			    win, ECORE_X_WINDOW_STACK_BELOW);
+          ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
+          ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
+          0, 0, 0, 0, 0,
+          win, ECORE_X_WINDOW_STACK_BELOW);
 
    e_bindings_mouse_grab(E_BINDING_CONTEXT_BORDER, bd->win);
    e_bindings_wheel_grab(E_BINDING_CONTEXT_BORDER, bd->win);
@@ -1121,7 +1121,7 @@
 
    /* move client with shell win over to new frame */
    ecore_x_window_reparent(bd->client.shell_win, bd->win,
-			   bd->client_inset.l, bd->client_inset.t);
+         bd->client_inset.l, bd->client_inset.t);
 
    bd->pointer = e_pointer_window_new(bd->win, 0);
 
@@ -1130,8 +1130,8 @@
 
    if (bd->visible)
      {
-	ecore_evas_show(bd->bg_ecore_evas);
-	ecore_x_window_show(bd->win);
+  ecore_evas_show(bd->bg_ecore_evas);
+  ecore_x_window_show(bd->win);
      }
 
    bd->bg_object = edje_object_add(bd->bg_evas);
@@ -1220,8 +1220,7 @@
                   y = bd->y;
               }
          }
-       else
-       if (e_config->allow_manip)
+       else if (e_config->allow_manip)
          bd->maximized = 0;
        else
          return;
@@ -1955,18 +1954,18 @@
    if (bd->lock_focus_out) return;
 
    e_border_focus_set(bd, 1, 1);
-   
+
    if (e_config->focus_policy == E_FOCUS_CLICK)
      return;
-   
+
    if (e_config->focus_policy == E_FOCUS_SLOPPY)
      {
-	if (e_border_under_pointer_get(bd->desk, bd))
-	  e_border_pointer_warp_to_center(bd);
+        if (e_border_under_pointer_get(bd->desk, bd))
+          e_border_pointer_warp_to_center(bd);
      }
    else
      {
-	e_border_pointer_warp_to_center(bd);
+        e_border_pointer_warp_to_center(bd);
      }
 }
 
@@ -1977,7 +1976,7 @@
 {
    E_Border *bd_unfocus = NULL;
    Eina_Bool focus_changed = EINA_FALSE;
-   
+
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
    /* note: this is here as it seems there are enough apps that do not even
@@ -2017,7 +2016,7 @@
    if (focus)
      {
         if (set)
-          {	     
+          {
              if (bd->visible && bd->changes.visible)
                {
                   bd->want_focus = 1;
@@ -2032,7 +2031,7 @@
                   else
                     focus_next = eina_list_prepend(focus_next, bd);
                }
-             
+
              return;
           }
 
@@ -2040,19 +2039,17 @@
           {
              if (focused) bd_unfocus = focused;
              if (focusing == bd) focusing = NULL;
-             
              bd->focused = 1;
              focused = bd;
 
-	     focus_changed = EINA_TRUE;
-	  }
+             focus_changed = EINA_TRUE;
+          }
      }
    else
      {
         bd->want_focus = 0;
-	focus_next = eina_list_remove(focus_next, bd);
-	if (bd == focusing) focusing = NULL;
-	
+        focus_next = eina_list_remove(focus_next, bd);
+        if (bd == focusing) focusing = NULL;
         if (bd->focused)
           {
              bd_unfocus = bd;
@@ -2069,51 +2066,51 @@
 
    if ((bd_unfocus) &&
        (!e_object_is_del(E_OBJECT(bd_unfocus)) &&
-	(e_object_ref_get(E_OBJECT(bd_unfocus)) > 0)))
+        (e_object_ref_get(E_OBJECT(bd_unfocus)) > 0)))
      {
-	E_Event_Border_Focus_Out *ev;
-	E_Border *bd = bd_unfocus;
+        E_Event_Border_Focus_Out *ev;
+        E_Border *bd = bd_unfocus;
 
-	bd->focused = 0;
-	e_focus_event_focus_out(bd);
+        bd->focused = 0;
+        e_focus_event_focus_out(bd);
 
-	if (bd->raise_timer)
-	  ecore_timer_del(bd->raise_timer);
-	bd->raise_timer = NULL;
+        if (bd->raise_timer)
+          ecore_timer_del(bd->raise_timer);
+        bd->raise_timer = NULL;
 
-	edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e");
-	if (bd->icon_object)
-	  edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e");
+        edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e");
+        if (bd->icon_object)
+          edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e");
 
-	ev = E_NEW(E_Event_Border_Focus_Out, 1);
-	ev->border = bd;
-	e_object_ref(E_OBJECT(bd));
+        ev = E_NEW(E_Event_Border_Focus_Out, 1);
+        ev->border = bd;
+        e_object_ref(E_OBJECT(bd));
 
-	ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
-			_e_border_event_border_focus_out_free, NULL);
+        ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
+                        _e_border_event_border_focus_out_free, NULL);
      }
 
    if (focus_changed)
      {
-	E_Event_Border_Focus_In *ev;
+        E_Event_Border_Focus_In *ev;
 
-	e_focus_event_focus_in(bd);
+        e_focus_event_focus_in(bd);
 
-	if (focus_track_frozen)
-	  e_border_focus_latest_set(bd);
+        if (focus_track_frozen)
+          e_border_focus_latest_set(bd);
 
-	e_hints_active_window_set(bd->zone->container->manager, bd);
+        e_hints_active_window_set(bd->zone->container->manager, bd);
 
-	edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
-	if (bd->icon_object)
-	  edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
+        edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
+        if (bd->icon_object)
+          edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
 
-	ev = E_NEW(E_Event_Border_Focus_In, 1);
-	ev->border = bd;
-	e_object_ref(E_OBJECT(bd));
+        ev = E_NEW(E_Event_Border_Focus_In, 1);
+        ev->border = bd;
+        e_object_ref(E_OBJECT(bd));
 
-	ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
-			_e_border_event_border_focus_in_free, NULL);
+        ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
+                        _e_border_event_border_focus_in_free, NULL);
      }
 }
 
@@ -2322,28 +2319,28 @@
 
    if (bd->bg_object)
      {
-	evas_object_resize(bd->bg_object, 1000, 1000);
-	edje_object_calc_force(bd->bg_object);
-	edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
-	bd->client_inset.l = cx;
-	bd->client_inset.r = 1000 - (cx + cw);
-	bd->client_inset.t = cy;
-	bd->client_inset.b = 1000 - (cy + ch);
+        evas_object_resize(bd->bg_object, 1000, 1000);
+        edje_object_calc_force(bd->bg_object);
+        edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
+        bd->client_inset.l = cx;
+        bd->client_inset.r = 1000 - (cx + cw);
+        bd->client_inset.t = cy;
+        bd->client_inset.b = 1000 - (cy + ch);
      }
    else
      {
-	bd->client_inset.l = 0;
-	bd->client_inset.r = 0;
-	bd->client_inset.t = 0;
-	bd->client_inset.b = 0;
+        bd->client_inset.l = 0;
+        bd->client_inset.r = 0;
+        bd->client_inset.t = 0;
+        bd->client_inset.b = 0;
      }
-   
+
    ecore_x_netwm_frame_size_set(bd->client.win,
-				bd->client_inset.l, bd->client_inset.r,
-				bd->client_inset.t, bd->client_inset.b);
+                                bd->client_inset.l, bd->client_inset.r,
+                                bd->client_inset.t, bd->client_inset.b);
    ecore_x_e_frame_size_set(bd->client.win,
-			    bd->client_inset.l, bd->client_inset.r,
-			    bd->client_inset.t, bd->client_inset.b);
+                            bd->client_inset.l, bd->client_inset.r,
+                            bd->client_inset.t, bd->client_inset.b);
 }
 
 static void
@@ -2358,99 +2355,99 @@
    switch (max & E_MAXIMIZE_TYPE)
      {
       case E_MAXIMIZE_NONE:
-	 /* Ignore */
-	 max = E_MAXIMIZE_NONE;
-	 break;
+         /* Ignore */
+         max = E_MAXIMIZE_NONE;
+         break;
 
       case E_MAXIMIZE_FULLSCREEN:
-	 w = bd->zone->w;
-	 h = bd->zone->h;
+         w = bd->zone->w;
+         h = bd->zone->h;
 
-	 if (bd->bg_object)
-	   {
-	      edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
-	      _e_border_client_inset_calc(bd);
-	   }
-	 e_border_resize_limit(bd, &w, &h);
-	 /* center x-direction */
-	 x1 = bd->zone->x + (bd->zone->w - w) / 2;
-	 /* center y-direction */
-	 y1 = bd->zone->y + (bd->zone->h - h) / 2;
+         if (bd->bg_object)
+           {
+              edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
+              _e_border_client_inset_calc(bd);
+           }
+         e_border_resize_limit(bd, &w, &h);
+         /* center x-direction */
+         x1 = bd->zone->x + (bd->zone->w - w) / 2;
+         /* center y-direction */
+         y1 = bd->zone->y + (bd->zone->h - h) / 2;
 
-	 if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-	   e_border_move_resize(bd, x1, y1, w, h);
-	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-	   e_border_move_resize(bd, bd->x, y1, bd->w, h);
-	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-	   e_border_move_resize(bd, x1, bd->y, w, bd->h);
-	 break;
+         if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
+           e_border_move_resize(bd, x1, y1, w, h);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
+           e_border_move_resize(bd, bd->x, y1, bd->w, h);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
+           e_border_move_resize(bd, x1, bd->y, w, bd->h);
+         break;
 
       case E_MAXIMIZE_SMART:
       case E_MAXIMIZE_EXPAND:
-	 if (bd->zone)
-	   e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
+         if (bd->zone)
+           e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
 
-	 if (bd->w < zw)
-	   w = bd->w;
-	 else
-	   w = zw;
+         if (bd->w < zw)
+           w = bd->w;
+         else
+           w = zw;
 
-	 if (bd->h < zh)
-	   h = bd->h;
-	 else
-	   h = zh;
+         if (bd->h < zh)
+           h = bd->h;
+         else
+           h = zh;
 
-	 if (bd->x < zx) // window left not useful coordinates
-	   x1 = zx;
-	 else if (bd->x + bd->w > zx + zw) // window right not useful coordinates
-	   x1 = zx + zw - bd->w;
-	 else // window normal position
-	   x1 = bd->x;
+         if (bd->x < zx) // window left not useful coordinates
+           x1 = zx;
+         else if (bd->x + bd->w > zx + zw) // window right not useful coordinates
+           x1 = zx + zw - bd->w;
+         else // window normal position
+           x1 = bd->x;
 
-	 if (bd->y < zy) // window top not useful coordinates
-	   y1 = zy;
-	 else if (bd->y + bd->h > zy + zh) // window bottom not useful coordinates
-	   y1 = zy + zh - bd->h;
-	 else // window normal position
-	   y1 = bd->y;
+         if (bd->y < zy) // window top not useful coordinates
+           y1 = zy;
+         else if (bd->y + bd->h > zy + zh) // window bottom not useful coordinates
+           y1 = zy + zh - bd->h;
+         else // window normal position
+           y1 = bd->y;
 
-	 if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-	   e_border_move_resize(bd, zx, zy, zw, zh);
-	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-	   e_border_move_resize(bd, x1, zy, w, zh);
-	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-	   e_border_move_resize(bd, zx, y1, zw, h);
-	 edje_object_signal_emit(bd->bg_object, "e,action,maximize", "e");
-	 break;
+         if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
+           e_border_move_resize(bd, zx, zy, zw, zh);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
+           e_border_move_resize(bd, x1, zy, w, zh);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
+           e_border_move_resize(bd, zx, y1, zw, h);
+         edje_object_signal_emit(bd->bg_object, "e,action,maximize", "e");
+         break;
 
       case E_MAXIMIZE_FILL:
-	 x1 = bd->zone->x;
-	 y1 = bd->zone->y;
-	 x2 = bd->zone->x + bd->zone->w;
-	 y2 = bd->zone->y + bd->zone->h;
+         x1 = bd->zone->x;
+         y1 = bd->zone->y;
+         x2 = bd->zone->x + bd->zone->w;
+         y2 = bd->zone->y + bd->zone->h;
 
-	 /* walk through all shelves */
-	 e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, max);
+         /* walk through all shelves */
+         e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, max);
 
-	 /* walk through all windows */
-	 e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, max);
+         /* walk through all windows */
+         e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, max);
 
-	 w = x2 - x1;
-	 h = y2 - y1;
-	 pw = w;
-	 ph = h;
-	 e_border_resize_limit(bd, &w, &h);
-	 /* center x-direction */
-	 x1 = x1 + (pw - w) / 2;
-	 /* center y-direction */
-	 y1 = y1 + (ph - h) / 2;
-	 if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-	   e_border_move_resize(bd, x1, y1, w, h);
-	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
-	   e_border_move_resize(bd, bd->x, y1, bd->w, h);
-	 else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-	   e_border_move_resize(bd, x1, bd->y, w, bd->h);
-	 break;
+         w = x2 - x1;
+         h = y2 - y1;
+         pw = w;
+         ph = h;
+         e_border_resize_limit(bd, &w, &h);
+         /* center x-direction */
+         x1 = x1 + (pw - w) / 2;
+         /* center y-direction */
+         y1 = y1 + (ph - h) / 2;
+         if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
+           e_border_move_resize(bd, x1, y1, w, h);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
+           e_border_move_resize(bd, bd->x, y1, bd->w, h);
+         else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
+           e_border_move_resize(bd, x1, bd->y, w, bd->h);
+         break;
      }
 }
 
@@ -2477,19 +2474,19 @@
         bd->maximized |= max;
         return;
      }
- 
+
    bd->pre_res_change.valid = 0;
    if (!(bd->maximized & E_MAXIMIZE_HORIZONTAL))
      {
-	/* Horizontal hasn't been set */
-	bd->saved.x = bd->x - bd->zone->x;
-	bd->saved.w = bd->w;
+        /* Horizontal hasn't been set */
+        bd->saved.x = bd->x - bd->zone->x;
+        bd->saved.w = bd->w;
      }
    if (!(bd->maximized & E_MAXIMIZE_VERTICAL))
      {
-	/* Vertical hasn't been set */
-	bd->saved.y = bd->y - bd->zone->y;
-	bd->saved.h = bd->h;
+        /* Vertical hasn't been set */
+        bd->saved.y = bd->y - bd->zone->y;
+        bd->saved.h = bd->h;
      }
    bd->saved.zone = bd->zone->num;
    e_hints_window_size_set(bd);
@@ -2505,7 +2502,7 @@
    bd->maximized |= max;
 
    e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL,
-				bd->maximized & E_MAXIMIZE_VERTICAL);
+                                bd->maximized & E_MAXIMIZE_VERTICAL);
    e_remember_update(bd);
 }
 
@@ -2537,7 +2534,7 @@
              if (bd->bg_object)
                {
                   edje_object_signal_emit(bd->bg_object, "e,action,unmaximize,fullscreen", "e");
-		  _e_border_client_inset_calc(bd);
+                  _e_border_client_inset_calc(bd);
                }
 
              bd->maximized = E_MAXIMIZE_NONE;
@@ -2579,14 +2576,14 @@
              if (!(bd->maximized & E_MAXIMIZE_DIRECTION))
                {
                   bd->maximized = E_MAXIMIZE_NONE;
-                   _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
+                  _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
                   e_hints_window_size_unset(bd);
                   edje_object_signal_emit(bd->bg_object, "e,action,unmaximize", "e");
                }
              else
                {
-                 _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
-                 e_hints_window_size_set(bd);
+                  _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
+                  e_hints_window_size_set(bd);
                }
           }
         e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL,
@@ -2637,7 +2634,8 @@
         if (!e_config->allow_above_fullscreen)
           e_border_layer_set(bd, 200);
 
-        if ((eina_list_count(bd->zone->container->zones) > 1) || (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query()))
+        if ((eina_list_count(bd->zone->container->zones) > 1) ||
+            (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query()))
           {
              e_border_move_resize(bd, bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
           }
@@ -2646,8 +2644,12 @@
              Ecore_X_Randr_Screen_Size_MM *sizes;
              int num_sizes, i, best_size_index = 0;
 
-             ecore_x_randr_screen_primary_output_current_size_get(bd->zone->container->manager->root, &screen_size.width, &screen_size.height, NULL, NULL, NULL);
-             sizes = ecore_x_randr_screen_primary_output_sizes_get(bd->zone->container->manager->root, &num_sizes);
+             ecore_x_randr_screen_primary_output_current_size_get(bd->zone->container->manager->root,
+                                                                  &screen_size.width,
+                                                                  &screen_size.height,
+                                                                  NULL, NULL, NULL);
+             sizes = ecore_x_randr_screen_primary_output_sizes_get(bd->zone->container->manager->root,
+                                                                   &num_sizes);
              if (sizes)
                {
                   Ecore_X_Randr_Screen_Size best_size = { -1, -1 };
@@ -2698,7 +2700,7 @@
    ev = E_NEW(E_Event_Border_Fullscreen, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
-//   e_object_breadcrumb_add(E_OBJECT(bd), "border_fullscreen_event");
+   //   e_object_breadcrumb_add(E_OBJECT(bd), "border_fullscreen_event");
    ecore_event_add(E_EVENT_BORDER_FULLSCREEN, ev, _e_border_event_border_fullscreen_free, NULL);
 
    e_remember_update(bd);
@@ -2722,9 +2724,10 @@
 
         if ((screen_size.width != -1) && (screen_size.height != -1))
           {
-             ecore_x_randr_screen_primary_output_size_set(bd->zone->container->manager->root, screen_size_index);
-                                                          screen_size.width = -1;
-                                                          screen_size.height = -1;
+             ecore_x_randr_screen_primary_output_size_set(bd->zone->container->manager->root,
+                                                          screen_size_index);
+             screen_size.width = -1;
+             screen_size.height = -1;
           }
         e_border_move_resize(bd,
                              bd->saved.x + bd->zone->x,
@@ -2745,7 +2748,7 @@
    ev = E_NEW(E_Event_Border_Unfullscreen, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
-//   e_object_breadcrumb_add(E_OBJECT(bd), "border_unfullscreen_event");
+   //   e_object_breadcrumb_add(E_OBJECT(bd), "border_unfullscreen_event");
    ecore_event_add(E_EVENT_BORDER_UNFULLSCREEN, ev, _e_border_event_border_unfullscreen_free, NULL);
 
    e_remember_update(bd);
@@ -3113,10 +3116,10 @@
                   if ((bd->changes.visible) && (bd->visible) &&
                       (!bd->new_client) && (!bd->changes.pos) &&
                       (!bd->changes.size))
-		    {
-		       _e_border_show(bd);
-		       bd->changes.visible = 0;
-		    }
+                    {
+                       _e_border_show(bd);
+                       bd->changes.visible = 0;
+                    }
                }
              e_container_border_list_free(bl);
 
@@ -3126,19 +3129,19 @@
                {
                   if (e_object_is_del(E_OBJECT(bd))) continue;
 
-		  if ((bd->changes.visible) && (!bd->visible))
-		    {
-		       _e_border_hide(bd);
-		       bd->changes.visible = 0;
-		    }
+                  if ((bd->changes.visible) && (!bd->visible))
+                    {
+                       _e_border_hide(bd);
+                       bd->changes.visible = 0;
+                    }
 
                   if (bd->changed) _e_border_eval(bd);
 
                   if ((bd->changes.visible) && (bd->visible))
-		    {
-		       _e_border_show(bd);
-		       bd->changes.visible = 0;
-		    }
+                    {
+                       _e_border_show(bd);
+                       bd->changes.visible = 0;
+                    }
                }
              e_container_border_list_free(bl);
           }
@@ -3146,43 +3149,43 @@
 
    if (focus_next)
      {
-	E_Border *bd = NULL, *bd2;
+        E_Border *bd = NULL, *bd2;
 
-	EINA_LIST_FREE(focus_next, bd2)
-	  if ((!bd) && (bd2->visible)) bd = bd2;
+        EINA_LIST_FREE(focus_next, bd2)
+          if ((!bd) && (bd2->visible)) bd = bd2;
 
-	if (!bd)
-	  {
-	     /* TODO revert focus when lost here ? */
-	     return;
-	  }
+        if (!bd)
+          {
+             /* TODO revert focus when lost here ? */
+             return;
+          }
 
-	if (bd == focused)
-	  {
-	     /* already focused. but anyway dont be so strict, this
-		fcks up illume setting focus on internal windows */
-	     return;
-	  }
+        if (bd == focused)
+          {
+             /* already focused. but anyway dont be so strict, this
+                fcks up illume setting focus on internal windows */
+             return;
+          }
 
-	focus_time = ecore_x_current_time_get();
+        focus_time = ecore_x_current_time_get();
 
-	focusing = bd;
-	
-	if ((bd->client.icccm.take_focus) &&
-	    (bd->client.icccm.accepts_focus))
-	  {
-	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
-	     /* TODO what if the client doesnt took focus ? */
-	  }
-	else if (!bd->client.icccm.accepts_focus)
-	  {
-	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
-	  }
-	else if (!bd->client.icccm.take_focus)
-	  {
-	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
-	     /* e_border_focus_set(bd, 1, 0); */
-	  }
+        focusing = bd;
+
+        if ((bd->client.icccm.take_focus) &&
+            (bd->client.icccm.accepts_focus))
+          {
+             e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
+             /* TODO what if the client doesnt took focus ? */
+          }
+        else if (!bd->client.icccm.accepts_focus)
+          {
+             e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
+          }
+        else if (!bd->client.icccm.take_focus)
+          {
+             e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
+             /* e_border_focus_set(bd, 1, 0); */
+          }
      }
 }
 
@@ -3190,7 +3193,7 @@
 e_border_client_list()
 {
    /* FIXME: This should be a somewhat ordered list */
-    return borders;
+   return borders;
 }
 
 static Ecore_X_Window action_input_win = 0;
@@ -3207,16 +3210,16 @@
 
    if (bd->post_job)
      {
-	bd->post_show = 1;
-	return;
+        bd->post_show = 1;
+        return;
      }
 
    if (!((bd->comp_hidden) || (bd->tmp_input_hidden > 0)))
      {
         _e_border_shape_input_rectangle_set(bd);
-// not anymore
-//	ecore_x_composite_window_events_enable(bd->win);
-	ecore_x_window_ignore_set(bd->win, EINA_FALSE);
+        // not anymore
+        //	ecore_x_composite_window_events_enable(bd->win);
+        ecore_x_window_ignore_set(bd->win, EINA_FALSE);
      }
 
    ecore_x_window_show(bd->win);
@@ -3227,13 +3230,13 @@
 {
    if (!e_manager_comp_evas_get(bd->zone->container->manager))
      {
-	ecore_x_window_hide(bd->win);
-	ecore_evas_hide(bd->bg_ecore_evas);
+        ecore_x_window_hide(bd->win);
+        ecore_evas_hide(bd->bg_ecore_evas);
      }
    else
      {
-	ecore_x_composite_window_events_disable(bd->win);
-	ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+        ecore_x_composite_window_events_disable(bd->win);
+        ecore_x_window_ignore_set(bd->win, EINA_TRUE);
      }
 }
 
@@ -3742,10 +3745,10 @@
    if (bd->internal)
      {
         if (!bd->internal_icon)
-	  {
-	     o = e_icon_add(evas);     
-	     e_util_icon_theme_set(o, "enlightenment");
-	  }
+          {
+             o = e_icon_add(evas);
+             e_util_icon_theme_set(o, "enlightenment");
+          }
         else
           {
              if (!bd->internal_icon_key)
@@ -3755,7 +3758,7 @@
                   ext = strrchr(bd->internal_icon, '.');
                   if ((ext) && ((!strcmp(ext, ".edj"))))
                     {
-		       o = edje_object_add(evas);
+                       o = edje_object_add(evas);
                        if (!edje_object_file_set(o, bd->internal_icon, "icon"))
                          e_util_icon_theme_set(o, "enlightenment");
                     }
@@ -3773,7 +3776,7 @@
                }
              else
                {
-		  o = edje_object_add(evas);
+                  o = edje_object_add(evas);
                   edje_object_file_set(o, bd->internal_icon,
                                        bd->internal_icon_key);
                }
@@ -3870,51 +3873,51 @@
    E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
    EINA_LIST_FOREACH(borders, l, bd)
      {
-        if (bd->zone)
+        if (!bd->zone)
+          continue;
+
+        if ((bd->zone != zone) ||
+            (bd->zone->container != zone->container))
+          continue;
+
+        if (!E_INTERSECTS(bd->zone->x + loss_overlap,
+                          bd->zone->y + loss_overlap,
+                          bd->zone->w - (2 * loss_overlap),
+                          bd->zone->h - (2 * loss_overlap),
+                          bd->x, bd->y, bd->w, bd->h))
           {
-             if ((bd->zone == zone) ||
-                 (bd->zone->container == zone->container))
+             list = eina_list_append(list, bd);
+          }
+        else if ((!E_CONTAINS(bd->zone->x, bd->zone->y,
+                              bd->zone->w, bd->zone->h,
+                              bd->x, bd->y, bd->w, bd->h)) &&
+                 (bd->shaped))
+          {
+             Ecore_X_Rectangle *rect;
+             int i, num;
+
+             rect = ecore_x_window_shape_rectangles_get(bd->win, &num);
+             if (rect)
                {
-                  if (!E_INTERSECTS(bd->zone->x + loss_overlap,
-                                    bd->zone->y + loss_overlap,
-                                    bd->zone->w - (2 * loss_overlap),
-                                    bd->zone->h - (2 * loss_overlap),
-                                    bd->x, bd->y, bd->w, bd->h))
+                  int ok;
+
+                  ok = 0;
+                  for (i = 0; i < num; i++)
                     {
-                       list = eina_list_append(list, bd);
-                    }
-                  else if ((!E_CONTAINS(bd->zone->x, bd->zone->y,
-                                        bd->zone->w, bd->zone->h,
-                                        bd->x, bd->y, bd->w, bd->h)) &&
-                           (bd->shaped))
-                    {
-                       Ecore_X_Rectangle *rect;
-                       int i, num;
-
-                       rect = ecore_x_window_shape_rectangles_get(bd->win, &num);
-                       if (rect)
+                       if (E_INTERSECTS(bd->zone->x + loss_overlap,
+                                        bd->zone->y + loss_overlap,
+                                        bd->zone->w - (2 * loss_overlap),
+                                        bd->zone->h - (2 * loss_overlap),
+                                        rect[i].x, rect[i].y,
+                                        (int)rect[i].width, (int)rect[i].height))
                          {
-                            int ok;
-
-                            ok = 0;
-                            for (i = 0; i < num; i++)
-                              {
-                                 if (E_INTERSECTS(bd->zone->x + loss_overlap,
-                                                  bd->zone->y + loss_overlap,
-                                                  bd->zone->w - (2 * loss_overlap),
-                                                  bd->zone->h - (2 * loss_overlap),
-                                                  rect[i].x, rect[i].y,
-                                                  (int)rect[i].width, (int)rect[i].height))
-                                   {
-                                      ok = 1;
-                                      break;
-                                   }
-                              }
-                            free(rect);
-                            if (!ok)
-                              list = eina_list_append(list, bd);
+                            ok = 1;
+                            break;
                          }
                     }
+                  free(rect);
+                  if (!ok)
+                    list = eina_list_append(list, bd);
                }
           }
      }
@@ -4320,16 +4323,16 @@
 
    if (focusing == bd)
      focusing = NULL;
-   
+
    if (focused == bd)
      {
-	if ((!focus_next) && (!focusing))
-	  {
-	     e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
-	     e_hints_active_window_set(bd->zone->container->manager, NULL);
-	  }
-	
-	focused = NULL;
+        if ((!focus_next) && (!focusing))
+          {
+             e_grabinput_focus(bd->zone->container->bg_win, E_FOCUS_METHOD_PASSIVE);
+             e_hints_active_window_set(bd->zone->container->manager, NULL);
+          }
+
+        focused = NULL;
      }
    E_FREE_LIST(bd->handlers, ecore_event_handler_del);
    if (bd->remember)
@@ -5251,20 +5254,20 @@
       char *ct;
 
       const char *modes[] = {
-         "MODE_NORMAL",
-         "MODE_WHILE_GRABBED",
-         "MODE_GRAB",
-         "MODE_UNGRAB"
+        "MODE_NORMAL",
+        "MODE_WHILE_GRABBED",
+        "MODE_GRAB",
+        "MODE_UNGRAB"
       };
       const char *details[] = {
-         "DETAIL_ANCESTOR",
-         "DETAIL_VIRTUAL",
-         "DETAIL_INFERIOR",
-         "DETAIL_NON_LINEAR",
-         "DETAIL_NON_LINEAR_VIRTUAL",
-         "DETAIL_POINTER",
-         "DETAIL_POINTER_ROOT",
-         "DETAIL_DETAIL_NONE"
+        "DETAIL_ANCESTOR",
+        "DETAIL_VIRTUAL",
+        "DETAIL_INFERIOR",
+        "DETAIL_NON_LINEAR",
+        "DETAIL_NON_LINEAR_VIRTUAL",
+        "DETAIL_POINTER",
+        "DETAIL_POINTER_ROOT",
+        "DETAIL_DETAIL_NONE"
       };
       t = time(NULL);
       ct = ctime(&t);
@@ -5277,9 +5280,9 @@
              details[e->detail]);
 
       printf("%s cb focus in %d %d\n",
-	     e_border_name_get(bd),
-	     bd->client.icccm.accepts_focus,
-	     bd->client.icccm.take_focus);
+             e_border_name_get(bd),
+             bd->client.icccm.accepts_focus,
+             bd->client.icccm.take_focus);
    }
 #endif
    _e_border_pri_raise(bd);
@@ -5319,20 +5322,20 @@
       char *ct;
 
       const char *modes[] = {
-         "MODE_NORMAL",
-         "MODE_WHILE_GRABBED",
-         "MODE_GRAB",
-         "MODE_UNGRAB"
+        "MODE_NORMAL",
+        "MODE_WHILE_GRABBED",
+        "MODE_GRAB",
+        "MODE_UNGRAB"
       };
       const char *details[] = {
-         "DETAIL_ANCESTOR",
-         "DETAIL_VIRTUAL",
-         "DETAIL_INFERIOR",
-         "DETAIL_NON_LINEAR",
-         "DETAIL_NON_LINEAR_VIRTUAL",
-         "DETAIL_POINTER",
-         "DETAIL_POINTER_ROOT",
-         "DETAIL_DETAIL_NONE"
+        "DETAIL_ANCESTOR",
+        "DETAIL_VIRTUAL",
+        "DETAIL_INFERIOR",
+        "DETAIL_NON_LINEAR",
+        "DETAIL_NON_LINEAR_VIRTUAL",
+        "DETAIL_POINTER",
+        "DETAIL_POINTER_ROOT",
+        "DETAIL_DETAIL_NONE"
       };
       t = time(NULL);
       ct = ctime(&t);
@@ -5345,9 +5348,9 @@
              details[e->detail]);
 
       printf("%s cb focus out %d %d\n",
-	     e_border_name_get(bd),
-	     bd->client.icccm.accepts_focus,
-	     bd->client.icccm.take_focus);
+             e_border_name_get(bd),
+             bd->client.icccm.accepts_focus,
+             bd->client.icccm.take_focus);
    }
 #endif
    _e_border_pri_norm(bd);
@@ -5375,9 +5378,9 @@
      {
         /* for firefox/thunderbird (xul) menu walking */
         /* NB: why did i disable this before? */
-          if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
-          else if (e->detail == ECORE_X_EVENT_DETAIL_POINTER)
-            return ECORE_CALLBACK_PASS_ON;
+        if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
+        else if (e->detail == ECORE_X_EVENT_DETAIL_POINTER)
+          return ECORE_CALLBACK_PASS_ON;
      }
    else if (e->mode == ECORE_X_EVENT_MODE_WHILE_GRABBED)
      {
@@ -6223,8 +6226,8 @@
      {
         if (bd->visible)
           {
-	     bd->post_job = NULL;
-	     _e_border_show(bd);
+             bd->post_job = NULL;
+             _e_border_show(bd);
           }
      }
    bd->post_show = 0;
@@ -6266,49 +6269,49 @@
    if (bd->client.icccm.fetch.client_leader)
      {
         /* TODO: What do to if the client leader isn't mapped yet? */
-         E_Border *bd_leader = NULL;
+        E_Border *bd_leader = NULL;
 
-         bd->client.icccm.client_leader = ecore_x_icccm_client_leader_get(bd->client.win);
-         if (bd->client.icccm.client_leader)
-           bd_leader = e_border_find_by_client_window(bd->client.icccm.client_leader);
-         if (bd->leader)
-           {
-              if (bd->leader != bd_leader)
-                {
-                   bd->leader->group = eina_list_remove(bd->leader->group, bd);
-                   if (bd->leader->modal == bd) bd->leader->modal = NULL;
-                   bd->leader = NULL;
-                }
-              else
-                bd_leader = NULL;
-           }
-         /* If this border is the leader of the group, don't register itself */
-         if ((bd_leader) && (bd_leader != bd))
-           {
-              bd_leader->group = eina_list_append(bd_leader->group, bd);
-              bd->leader = bd_leader;
-	      /* Only set the window modal to the leader it there is no parent */
-              if ((e_config->modal_windows) && (bd->client.netwm.state.modal) &&
-                  ((!bd->parent) || (bd->parent->modal != bd)))
-                {
-                   bd->leader->modal = bd;
-                   if (bd->leader->focused)
-                     e_border_focus_set(bd, 1, 1);
-                   else
-                     {
-                        Eina_List *l;
-                        E_Border *child;
+        bd->client.icccm.client_leader = ecore_x_icccm_client_leader_get(bd->client.win);
+        if (bd->client.icccm.client_leader)
+          bd_leader = e_border_find_by_client_window(bd->client.icccm.client_leader);
+        if (bd->leader)
+          {
+             if (bd->leader != bd_leader)
+               {
+                  bd->leader->group = eina_list_remove(bd->leader->group, bd);
+                  if (bd->leader->modal == bd) bd->leader->modal = NULL;
+                  bd->leader = NULL;
+               }
+             else
+               bd_leader = NULL;
+          }
+        /* If this border is the leader of the group, don't register itself */
+        if ((bd_leader) && (bd_leader != bd))
+          {
+             bd_leader->group = eina_list_append(bd_leader->group, bd);
+             bd->leader = bd_leader;
+             /* Only set the window modal to the leader it there is no parent */
+             if ((e_config->modal_windows) && (bd->client.netwm.state.modal) &&
+                 ((!bd->parent) || (bd->parent->modal != bd)))
+               {
+                  bd->leader->modal = bd;
+                  if (bd->leader->focused)
+                    e_border_focus_set(bd, 1, 1);
+                  else
+                    {
+                       Eina_List *l;
+                       E_Border *child;
 
-                        EINA_LIST_FOREACH(bd->leader->group, l, child)
-                          {
-                             if ((child != bd) && (child->focused))
-                               e_border_focus_set(bd, 1, 1);
-                          }
-                     }
-                }
-           }
-         bd->client.icccm.fetch.client_leader = 0;
-         rem_change = 1;
+                       EINA_LIST_FOREACH(bd->leader->group, l, child)
+                         {
+                            if ((child != bd) && (child->focused))
+                              e_border_focus_set(bd, 1, 1);
+                         }
+                    }
+               }
+          }
+        bd->client.icccm.fetch.client_leader = 0;
+        rem_change = 1;
      }
    if (bd->client.icccm.fetch.title)
      {
@@ -6488,13 +6491,13 @@
         if (bd->client.icccm.max_h > 32767) bd->client.icccm.max_h = 32767;
         if (bd->client.icccm.base_w > 32767) bd->client.icccm.base_w = 32767;
         if (bd->client.icccm.base_h > 32767) bd->client.icccm.base_h = 32767;
-//	if (bd->client.icccm.step_w < 1) bd->client.icccm.step_w = 1;
-//	if (bd->client.icccm.step_h < 1) bd->client.icccm.step_h = 1;
+        //	if (bd->client.icccm.step_w < 1) bd->client.icccm.step_w = 1;
+        //	if (bd->client.icccm.step_h < 1) bd->client.icccm.step_h = 1;
         // if doing a resize, fix it up
         if (bd->resize_mode != RESIZE_NONE)
           {
              int x, y, w, h, new_w, new_h;
-             
+
              x = bd->x;
              y = bd->y;
              w = bd->w;
@@ -6505,11 +6508,11 @@
              if ((bd->resize_mode == RESIZE_TL) ||
                  (bd->resize_mode == RESIZE_L) ||
                  (bd->resize_mode == RESIZE_BL))
-                x += (w - new_w);
+               x += (w - new_w);
              if ((bd->resize_mode == RESIZE_TL) ||
                  (bd->resize_mode == RESIZE_T) ||
                  (bd->resize_mode == RESIZE_TR))
-                y += (h - new_h);
+               y += (h - new_h);
              e_border_move_resize(bd, x, y, new_w, new_h);
           }
         bd->client.icccm.fetch.size_pos_hints = 0;
@@ -6553,37 +6556,37 @@
    if (bd->client.icccm.fetch.transient_for)
      {
         /* TODO: What do to if the transient for isn't mapped yet? */
-         E_Border *bd_parent = NULL;
+        E_Border *bd_parent = NULL;
 
-         bd->client.icccm.transient_for = ecore_x_icccm_transient_for_get(bd->client.win);
-         if (bd->client.icccm.transient_for)
-           bd_parent = e_border_find_by_client_window(bd->client.icccm.transient_for);
-         /* If we already have a parent, remove it */
-         if (bd->parent)
-           {
-              if (bd_parent != bd->parent)
-                {
-                   bd->parent->transients = eina_list_remove(bd->parent->transients, bd);
-                   if (bd->parent->modal == bd) bd->parent->modal = NULL;
-                   bd->parent = NULL;
-                }
-              else
-                bd_parent = NULL;
-           }
-         if ((bd_parent) && (bd_parent != bd))
-           {
-              bd_parent->transients = eina_list_append(bd_parent->transients, bd);
-              bd->parent = bd_parent;
-              e_border_layer_set(bd, bd->parent->layer);
-              if ((e_config->modal_windows) && (bd->client.netwm.state.modal))
-                bd->parent->modal = bd;
+        bd->client.icccm.transient_for = ecore_x_icccm_transient_for_get(bd->client.win);
+        if (bd->client.icccm.transient_for)
+          bd_parent = e_border_find_by_client_window(bd->client.icccm.transient_for);
+        /* If we already have a parent, remove it */
+        if (bd->parent)
+          {
+             if (bd_parent != bd->parent)
+               {
+                  bd->parent->transients = eina_list_remove(bd->parent->transients, bd);
+                  if (bd->parent->modal == bd) bd->parent->modal = NULL;
+                  bd->parent = NULL;
+               }
+             else
+               bd_parent = NULL;
+          }
+        if ((bd_parent) && (bd_parent != bd))
+          {
+             bd_parent->transients = eina_list_append(bd_parent->transients, bd);
+             bd->parent = bd_parent;
+             e_border_layer_set(bd, bd->parent->layer);
+             if ((e_config->modal_windows) && (bd->client.netwm.state.modal))
+               bd->parent->modal = bd;
 
-              if (e_config->focus_setting == E_FOCUS_NEW_DIALOG ||
-                  (bd->parent->focused && (e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED)))
-                bd->take_focus = 1;
-           }
-         bd->client.icccm.fetch.transient_for = 0;
-         rem_change = 1;
+             if (e_config->focus_setting == E_FOCUS_NEW_DIALOG ||
+                 (bd->parent->focused && (e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED)))
+               bd->take_focus = 1;
+          }
+        bd->client.icccm.fetch.transient_for = 0;
+        rem_change = 1;
      }
    if (bd->client.icccm.fetch.window_role)
      {
@@ -6802,7 +6805,7 @@
               */
              ecore_x_window_size_get(bd->client.win, &cw, &ch);
              if ((cw != bd->client.w) || (ch != bd->client.h))
-                bd->changes.shape_input = 1;
+               bd->changes.shape_input = 1;
              if ((num == 1) &&
                  (rects[0].x == 0) &&
                  (rects[0].y == 0) &&
@@ -6813,7 +6816,7 @@
                     {
                        bd->shaped_input = 0;
                        if (!bd->bordername)
-                          bd->client.border.changed = 1;
+                         bd->client.border.changed = 1;
                     }
                }
              else
@@ -6822,7 +6825,7 @@
                     {
                        bd->shaped_input = 1;
                        if (!bd->bordername)
-                          bd->client.border.changed = 1;
+                         bd->client.border.changed = 1;
                     }
                }
              free(rects);
@@ -6831,7 +6834,7 @@
           {
              bd->shaped_input = 1;
              if (!bd->bordername)
-                bd->client.border.changed = 1;
+               bd->client.border.changed = 1;
           }
         bd->need_shape_merge = 1;
      }
@@ -6909,7 +6912,7 @@
         ev = E_NEW(E_Event_Border_Add, 1);
         ev->border = bd;
         e_object_ref(E_OBJECT(bd));
-//	e_object_breadcrumb_add(E_OBJECT(bd), "border_add_event");
+        //	e_object_breadcrumb_add(E_OBJECT(bd), "border_add_event");
         ecore_event_add(E_EVENT_BORDER_ADD, ev, _e_border_event_border_add_free, NULL);
 
         if ((!bd->lock_border) || (!bd->client.border.name))
@@ -6971,7 +6974,7 @@
                  (bd->client.netwm.state.skip_pager))
           bordername = "skipped";
         else if ((bd->internal) && (bd->client.icccm.class) &&
-		 (!strncmp(bd->client.icccm.class, "e_fwin", 6)))
+                 (!strncmp(bd->client.icccm.class, "e_fwin", 6)))
           bordername = "internal_fileman";
         else
           bordername = e_config->theme_default_border_style;
@@ -6984,7 +6987,7 @@
              int ok;
 
              bd->changes.border = 1;
-	     eina_stringshare_replace(&bd->client.border.name, bordername);
+             eina_stringshare_replace(&bd->client.border.name, bordername);
 
              if (bd->bg_object)
                {
@@ -6994,8 +6997,7 @@
                   evas_object_del(bd->bg_object);
                }
              o = edje_object_add(bd->bg_evas);
-             snprintf(buf, sizeof(buf), "e/widgets/border/%s/border",
-                      bd->client.border.name);
+             snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", bd->client.border.name);
              ok = e_theme_edje_object_set(o, "base/theme/borders", buf);
              if ((!ok) && (strcmp(bd->client.border.name, "borderless")))
                {
@@ -7004,7 +7006,7 @@
                   if (ok)
                     {
                        /* Reset default border style to default */
-		       eina_stringshare_replace(&e_config->theme_default_border_style, "default"); 
+                       eina_stringshare_replace(&e_config->theme_default_border_style, "default");
                        e_config_save_queue();
                     }
                }
@@ -7049,16 +7051,16 @@
                   bd->bg_object = NULL;
                }
 
-	     _e_border_client_inset_calc(bd);
+             _e_border_client_inset_calc(bd);
 
              bd->w += (bd->client_inset.l + bd->client_inset.r);
              bd->h += (bd->client_inset.t + bd->client_inset.b);
              ecore_evas_shaped_set(bd->bg_ecore_evas, bd->shaped);
              bd->changes.size = 1;
-	     /*  really needed ? */
+             /*  really needed ? */
              ecore_x_window_move(bd->client.shell_win,
-				 bd->client_inset.l,
-				 bd->client_inset.t);
+                                 bd->client_inset.l,
+                                 bd->client_inset.t);
 
              if (bd->maximized != E_MAXIMIZE_NONE)
                {
@@ -7067,7 +7069,7 @@
                   /* to force possible resizes */
                   bd->maximized = E_MAXIMIZE_NONE;
 
-		  _e_border_maximize(bd, maximized); 
+                  _e_border_maximize(bd, maximized);
 
                   /* restore maximized state */
                   bd->maximized = maximized;
@@ -7093,9 +7095,9 @@
                     edje_object_signal_emit(bd->bg_object, "e,state,hung", "e");
                   if (bd->client.icccm.urgent)
                     edje_object_signal_emit(bd->bg_object, "e,state,urgent", "e");
-// FIXME: in eval -do differently
-//	     edje_object_message_signal_process(bd->bg_object);
-//	     e_border_frame_recalc(bd);
+                  // FIXME: in eval -do differently
+                  //	     edje_object_message_signal_process(bd->bg_object);
+                  //	     e_border_frame_recalc(bd);
 
                   evas_object_move(bd->bg_object, 0, 0);
                   evas_object_resize(bd->bg_object, bd->w, bd->h);
@@ -7167,21 +7169,21 @@
         // TODO: temoporary limited maximize algorithm
         // ->
         /*if (bd->w > zw)
-           rw = zw;
-           else
-           rw = bd->w;
+          rw = zw;
+          else
+          rw = bd->w;
 
-           if (bd->h > zh)
-           rh = zh;
-           else
-           rh = bd->h;
+          if (bd->h > zh)
+          rh = zh;
+          else
+          rh = bd->h;
 
-           if ((rw != bd->w) || (rh != bd->h))
-           {
-              bd->w = rw;
-              bd->h = rh;
-              e_border_resize (bd, bd->w, bd->h);
-           }*/
+          if ((rw != bd->w) || (rh != bd->h))
+          {
+          bd->w = rw;
+          bd->h = rh;
+          e_border_resize (bd, bd->w, bd->h);
+          }*/
         // <-
 
         if (bd->re_manage)
@@ -7191,150 +7193,148 @@
              bd->changes.pos = 1;
              bd->placed = 1;
           }
-        else if (!bd->placed)
+        else if ((!bd->placed) && (bd->client.icccm.request_pos))
           {
-             if (bd->client.icccm.request_pos)
+
+             Ecore_X_Window_Attributes *att;
+             int bw;
+
+             att = &bd->client.initial_attributes;
+             bw = att->border * 2;
+             switch (bd->client.icccm.gravity)
                {
-                  Ecore_X_Window_Attributes *att;
-                  int bw;
+                case ECORE_X_GRAVITY_N:
+                   bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
+                   bd->y = att->y;
+                   break;
 
-                  att = &bd->client.initial_attributes;
-                  bw = att->border * 2;
-                  switch (bd->client.icccm.gravity)
-                    {
-                     case ECORE_X_GRAVITY_N:
-                       bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
-                       bd->y = att->y;
-                       break;
+                case ECORE_X_GRAVITY_NE:
+                   bd->x = (att->x - (bw)) - (bd->client_inset.l);
+                   bd->y = att->y;
+                   break;
 
-                     case ECORE_X_GRAVITY_NE:
-                       bd->x = (att->x - (bw)) - (bd->client_inset.l);
-                       bd->y = att->y;
-                       break;
+                case ECORE_X_GRAVITY_E:
+                   bd->x = (att->x - (bw)) - (bd->client_inset.l);
+                   bd->y = (att->y - (bw / 2)) - (bd->client_inset.t / 2);
+                   break;
 
-                     case ECORE_X_GRAVITY_E:
-                       bd->x = (att->x - (bw)) - (bd->client_inset.l);
-                       bd->y = (att->y - (bw / 2)) - (bd->client_inset.t / 2);
-                       break;
+                case ECORE_X_GRAVITY_SE:
+                   bd->x = (att->x - (bw)) - (bd->client_inset.l);
+                   bd->y = (att->y - (bw)) - (bd->client_inset.t);
+                   break;
 
-                     case ECORE_X_GRAVITY_SE:
-                       bd->x = (att->x - (bw)) - (bd->client_inset.l);
-                       bd->y = (att->y - (bw)) - (bd->client_inset.t);
-                       break;
+                case ECORE_X_GRAVITY_S:
+                   bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
+                   bd->y = (att->y - (bw)) - (bd->client_inset.t);
+                   break;
 
-                     case ECORE_X_GRAVITY_S:
-                       bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
-                       bd->y = (att->y - (bw)) - (bd->client_inset.t);
-                       break;
+                case ECORE_X_GRAVITY_SW:
+                   bd->x = att->x;
+                   bd->y = (att->y - (bw)) - (bd->client_inset.t);
+                   break;
 
-                     case ECORE_X_GRAVITY_SW:
-                       bd->x = att->x;
-                       bd->y = (att->y - (bw)) - (bd->client_inset.t);
-                       break;
+                case ECORE_X_GRAVITY_W:
+                   bd->x = att->x;
+                   bd->y = (att->y - (bw)) - (bd->client_inset.t);
+                   break;
 
-                     case ECORE_X_GRAVITY_W:
-                       bd->x = att->x;
-                       bd->y = (att->y - (bw)) - (bd->client_inset.t);
-                       break;
+                case ECORE_X_GRAVITY_CENTER:
+                   bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
+                   bd->y = (att->y - (bw / 2)) - (bd->client_inset.t / 2);
+                   break;
 
-                     case ECORE_X_GRAVITY_CENTER:
-                       bd->x = (att->x - (bw / 2)) - (bd->client_inset.l / 2);
-                       bd->y = (att->y - (bw / 2)) - (bd->client_inset.t / 2);
-                       break;
+                case ECORE_X_GRAVITY_NW:
+                default:
+                   bd->x = att->x;
+                   bd->y = att->y;
+               }
 
-                     case ECORE_X_GRAVITY_NW:
-                     default:
-                       bd->x = att->x;
-                       bd->y = att->y;
-                    }
+             /*
+              * This ensures that windows that like to open with a x/y
+              * position smaller than returned by e_zone_useful_geometry_get()
+              * are moved to useful positions.
+              */
+             // ->
+             if (bd->x < zx)
+               bd->x = zx;
 
-     /*
-      * This ensures that windows that like to open with a x/y
-      * position smaller than returned by e_zone_useful_geometry_get()
-      * are moved to useful positions.
-      */
-                  // ->
-                  if (bd->x < zx)
-                    bd->x = zx;
+             if (bd->y < zy)
+               bd->y = zy;
 
-                  if (bd->y < zy)
-                    bd->y = zy;
+             if (bd->x + bd->w > zx + zw)
+               bd->x = zx + zw - bd->w;
 
-                  if (bd->x + bd->w > zx + zw)
-                    bd->x = zx + zw - bd->w;
+             if (bd->y + bd->h > zy + zh)
+               bd->y = zy + zh - bd->h;
+             // <--
 
-                  if (bd->y + bd->h > zy + zh)
-                    bd->y = zy + zh - bd->h;
-     // <--
-
-                  if (bd->zone && e_container_zone_at_point_get(bd->zone->container, bd->x, bd->y))
-                    {
-                       bd->changes.pos = 1;
-                       bd->placed = 1;
-                    }
+             if (bd->zone && e_container_zone_at_point_get(bd->zone->container, bd->x, bd->y))
+               {
+                  bd->changes.pos = 1;
+                  bd->placed = 1;
                }
-             if (!bd->placed)
+          }
+        if (!bd->placed)
+          {
+             /* FIXME: special placement for dialogs etc. etc. etc goes
+              * here */
+             /* FIXME: what if parent is not on this desktop - or zone? */
+             if ((bd->parent) && (bd->parent->visible))
                {
-     /* FIXME: special placement for dialogs etc. etc. etc goes
-      * here */
-                  /* FIXME: what if parent is not on this desktop - or zone? */
-                     if ((bd->parent) && (bd->parent->visible))
-                       {
-                          bd->x = bd->parent->x + ((bd->parent->w - bd->w) / 2);
-                          bd->y = bd->parent->y + ((bd->parent->h - bd->h) / 2);
-                          bd->changes.pos = 1;
-                          bd->placed = 1;
-                       }
+                  bd->x = bd->parent->x + ((bd->parent->w - bd->w) / 2);
+                  bd->y = bd->parent->y + ((bd->parent->h - bd->h) / 2);
+                  bd->changes.pos = 1;
+                  bd->placed = 1;
+               }
 #if 0
-                     else if ((bd->leader) && (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG))
-                       {
-     /* TODO: Place in center of group */
-                       }
+             else if ((bd->leader) && (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG))
+               {
+                  /* TODO: Place in center of group */
+               }
 #endif
-                     else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
-                       {
-                          bd->x = zx + ((zw - bd->w) / 2);
-                          bd->y = zy + ((zh - bd->h) / 2);
-                          bd->changes.pos = 1;
-                          bd->placed = 1;
-                       }
-                     if (!bd->placed)
-                       {
-                          Eina_List *skiplist = NULL;
-                          int new_x, new_y;
+             else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
+               {
+                  bd->x = zx + ((zw - bd->w) / 2);
+                  bd->y = zy + ((zh - bd->h) / 2);
+                  bd->changes.pos = 1;
+                  bd->placed = 1;
+               }
+          }
+        if (!bd->placed)
+          {
+             Eina_List *skiplist = NULL;
+             int new_x, new_y;
 
-                          if (zw > bd->w)
-                            new_x = zx + (rand() % (zw - bd->w));
-                          else
-                            new_x = zx;
-                          if (zh > bd->h)
-                            new_y = zy + (rand() % (zh - bd->h));
-                          else
-                            new_y = zy;
+             if (zw > bd->w)
+               new_x = zx + (rand() % (zw - bd->w));
+             else
+               new_x = zx;
+             if (zh > bd->h)
+               new_y = zy + (rand() % (zh - bd->h));
+             else
+               new_y = zy;
 
-                          if ((e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART) || (e_config->window_placement_policy == E_WINDOW_PLACEMENT_ANTIGADGET))
-                            {
-                               skiplist = eina_list_append(skiplist, bd);
-                               e_place_zone_region_smart(bd->zone, skiplist,
-                                                         bd->x, bd->y, bd->w, bd->h,
-                                                         &new_x, &new_y);
-                               eina_list_free(skiplist);
-                            }
-                          else if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_MANUAL)
-                            {
-                               e_place_zone_manual(bd->zone, bd->w, bd->client_inset.t,
-                                                   &new_x, &new_y);
-                            }
-                          else
-                            {
-                               e_place_zone_cursor(bd->zone, bd->x, bd->y, bd->w, bd->h,
-                                                   bd->client_inset.t, &new_x, &new_y);
-                            }
-                          bd->x = new_x;
-                          bd->y = new_y;
-                          bd->changes.pos = 1;
-                       }
+             if ((e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART) || (e_config->window_placement_policy == E_WINDOW_PLACEMENT_ANTIGADGET))
+               {
+                  skiplist = eina_list_append(skiplist, bd);
+                  e_place_zone_region_smart(bd->zone, skiplist,
+                                            bd->x, bd->y, bd->w, bd->h,
+                                            &new_x, &new_y);
+                  eina_list_free(skiplist);
                }
+             else if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_MANUAL)
+               {
+                  e_place_zone_manual(bd->zone, bd->w, bd->client_inset.t,
+                                      &new_x, &new_y);
+               }
+             else
+               {
+                  e_place_zone_cursor(bd->zone, bd->x, bd->y, bd->w, bd->h,
+                                      bd->client_inset.t, &new_x, &new_y);
+               }
+             bd->x = new_x;
+             bd->y = new_y;
+             bd->changes.pos = 1;
           }
         EINA_LIST_FREE(bd->pending_move_resize, pnd)
           {
@@ -7402,7 +7402,7 @@
            if ((zone) && (zone != bd->zone))
              {
                 e_border_zone_set(bd, zone);
-     /* e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh); */
+                /* e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh); */
              }
         }
      }
@@ -7413,10 +7413,10 @@
    if ((bd->changes.shading))
      {
         /*  show at start of unshade (but don't hide until end of shade) */
-         if (bd->shaded)
-           ecore_x_window_raise(bd->client.shell_win);
-         bd->changes.shading = 0;
-         rem_change = 1;
+        if (bd->shaded)
+          ecore_x_window_raise(bd->client.shell_win);
+        bd->changes.shading = 0;
+        rem_change = 1;
      }
    if ((bd->changes.shaded) && (bd->changes.pos) && (bd->changes.size))
      {
@@ -7526,9 +7526,9 @@
      }
    else if (bd->changes.pos)
      {
-	if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-	bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job, bd);
-	bd->post_move = 1;
+        if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
+        bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job, bd);
+        bd->post_move = 1;
 
         e_container_shape_move(bd->shape, bd->x + bd->fx.x, bd->y + bd->fx.y);
 
@@ -7554,7 +7554,7 @@
              int x, y;
 
              twin = ecore_x_window_override_new
-                (bd->zone->container->scratch_win, 0, 0, bd->w, bd->h);
+               (bd->zone->container->scratch_win, 0, 0, bd->w, bd->h);
              if (bd->shaped)
                ecore_x_window_shape_window_set(twin, bd->bg_win);
              else
@@ -7580,9 +7580,9 @@
                   ecore_x_window_shape_rectangles_set(twin, rects, 4);
                }
              twin2 = ecore_x_window_override_new
-                (bd->zone->container->scratch_win, 0, 0,
-                    bd->w - bd->client_inset.l - bd->client_inset.r,
-                    bd->h - bd->client_inset.t - bd->client_inset.b);
+               (bd->zone->container->scratch_win, 0, 0,
+                bd->w - bd->client_inset.l - bd->client_inset.r,
+                bd->h - bd->client_inset.t - bd->client_inset.b);
              x = 0;
              y = 0;
              if ((bd->shading) || (bd->shaded))
@@ -7606,7 +7606,7 @@
           }
         else
           ecore_x_window_shape_mask_set(bd->win, 0);
-//	bd->need_shape_export = 1;
+        //	bd->need_shape_export = 1;
         bd->need_shape_merge = 0;
      }
 
@@ -7691,25 +7691,25 @@
           {
              /* Set this window into moving state */
 
-              bd->cur_mouse_action = e_action_find("window_move");
-              if (bd->cur_mouse_action)
-                {
-                   if ((!bd->cur_mouse_action->func.end_mouse) &&
-                       (!bd->cur_mouse_action->func.end))
-                     bd->cur_mouse_action = NULL;
-                   if (bd->cur_mouse_action)
-                     {
-                        bd->x = x - (bd->w >> 1);
-                        bd->y = y - (bd->client_inset.t >> 1);
-                        bd->changed = 1;
-                        bd->changes.pos = 1;
+             bd->cur_mouse_action = e_action_find("window_move");
+             if (bd->cur_mouse_action)
+               {
+                  if ((!bd->cur_mouse_action->func.end_mouse) &&
+                      (!bd->cur_mouse_action->func.end))
+                    bd->cur_mouse_action = NULL;
+                  if (bd->cur_mouse_action)
+                    {
+                       bd->x = x - (bd->w >> 1);
+                       bd->y = y - (bd->client_inset.t >> 1);
+                       bd->changed = 1;
+                       bd->changes.pos = 1;
 
-                        _e_border_client_move_resize_send(bd);
-                     }
-                }
+                       _e_border_client_move_resize_send(bd);
+                    }
+               }
           }
 
-	_e_border_show(bd);
+        _e_border_show(bd);
 
         if (bd->cur_mouse_action)
           {
@@ -7770,7 +7770,7 @@
           {
              /* this works for most cases as fallback. useful when app is
                 run from a shell  */
-               bd->desktop = efreet_util_desktop_exec_find(bd->client.icccm.name);
+             bd->desktop = efreet_util_desktop_exec_find(bd->client.icccm.name);
           }
         if (!bd->desktop && bd->client.icccm.transient_for)
           {
@@ -7804,7 +7804,7 @@
            ev = E_NEW(E_Event_Border_Icon_Change, 1);
            ev->border = bd;
            e_object_ref(E_OBJECT(bd));
-//	     e_object_breadcrumb_add(E_OBJECT(bd), "border_icon_change_event");
+           //	     e_object_breadcrumb_add(E_OBJECT(bd), "border_icon_change_event");
            ecore_event_add(E_EVENT_BORDER_ICON_CHANGE, ev,
                            _e_border_event_border_icon_change_free, NULL);
         }
@@ -7818,12 +7818,9 @@
 
    if ((bd->take_focus) || (bd->want_focus))
      {
-        bd->take_focus = 0;
-        if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) ||
-            (bd->want_focus))
+        if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) || (bd->want_focus))
           {
-             bd->want_focus = 0;
-	     e_border_focus_set_with_pointer(bd);
+             e_border_focus_set_with_pointer(bd);
           }
         else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
           {
@@ -7832,24 +7829,27 @@
                   (e_border_find_by_client_window(bd->client.icccm.transient_for) ==
                    e_border_focused_get())))
                {
-		  e_border_focus_set_with_pointer(bd);
+                  e_border_focus_set_with_pointer(bd);
                }
           }
         else
           {
              /* focus window by default when it is the only one on desk */
-              E_Border *bd2 = NULL;
-              Eina_List *l;
-              EINA_LIST_FOREACH(focus_stack, l, bd2)
-                {
-                   if (bd == bd2) continue;
-                   if ((!bd2->iconic) && (bd2->visible) && (bd->desk == bd2->desk))
-                     break;
-                }
+             E_Border *bd2 = NULL;
+             Eina_List *l;
+             EINA_LIST_FOREACH(focus_stack, l, bd2)
+               {
+                  if (bd == bd2) continue;
+                  if ((!bd2->iconic) && (bd2->visible) &&
+                      ((bd->desk == bd2->desk) || bd2->sticky))
+                    break;
+               }
 
-              if (!bd2)
-                e_border_focus_set_with_pointer(bd);
+             if (!bd2)
+               e_border_focus_set_with_pointer(bd);
           }
+        bd->want_focus = 0;
+        bd->take_focus = 0;
      }
 
    if (bd->need_maximize)
@@ -7872,10 +7872,10 @@
 
    if (send_event) // FIXME: send only if a property changed - above need to
      { // check on that. for now - always send.
-         event = E_NEW(E_Event_Border_Property, 1);
-         event->border = bd;
-         e_object_ref(E_OBJECT(bd));
-         ecore_event_add(E_EVENT_BORDER_PROPERTY, event, _e_border_event_border_property_free, NULL);
+        event = E_NEW(E_Event_Border_Property, 1);
+        event->border = bd;
+        e_object_ref(E_OBJECT(bd));
+        ecore_event_add(E_EVENT_BORDER_PROPERTY, event, _e_border_event_border_property_free, NULL);
      }
    _e_border_hook_call(E_BORDER_HOOK_EVAL_END, bd);
 }
@@ -8010,65 +8010,65 @@
 
    if (e_config->border_shade_transition == E_TRANSITION_SINUSOIDAL)
      {
-        bd->shade.val = 
+        bd->shade.val =
            ecore_animator_pos_map(val, ECORE_POS_MAP_SINUSOIDAL, 0.0, 0.0);
         if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else if (e_config->border_shade_transition == E_TRANSITION_DECELERATE)
      {
-        bd->shade.val = 
+        bd->shade.val =
            ecore_animator_pos_map(val, ECORE_POS_MAP_DECELERATE, 0.0, 0.0);
         if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else if (e_config->border_shade_transition == E_TRANSITION_ACCELERATE)
      {
-        bd->shade.val = 
+        bd->shade.val =
            ecore_animator_pos_map(val, ECORE_POS_MAP_ACCELERATE, 0.0, 0.0);
         if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else if (e_config->border_shade_transition == E_TRANSITION_LINEAR)
      {
-        bd->shade.val = 
+        bd->shade.val =
            ecore_animator_pos_map(val, ECORE_POS_MAP_LINEAR, 0.0, 0.0);
         if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else if (e_config->border_shade_transition == E_TRANSITION_ACCELERATE_LOTS)
      {
-        bd->shade.val = 
+        bd->shade.val =
            ecore_animator_pos_map(val, ECORE_POS_MAP_ACCELERATE_FACTOR, 1.7, 0.0);
         if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else if (e_config->border_shade_transition == E_TRANSITION_DECELERATE_LOTS)
      {
-        bd->shade.val = 
+        bd->shade.val =
            ecore_animator_pos_map(val, ECORE_POS_MAP_DECELERATE_FACTOR, 1.7, 0.0);
         if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else if (e_config->border_shade_transition == E_TRANSITION_SINUSOIDAL_LOTS)
      {
-        bd->shade.val = 
+        bd->shade.val =
            ecore_animator_pos_map(val, ECORE_POS_MAP_SINUSOIDAL_FACTOR, 1.7, 0.0);
         if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else if (e_config->border_shade_transition == E_TRANSITION_BOUNCE)
      {
-        bd->shade.val = 
+        bd->shade.val =
            ecore_animator_pos_map(val, ECORE_POS_MAP_BOUNCE, 1.2, 3.0);
         if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else if (e_config->border_shade_transition == E_TRANSITION_BOUNCE_LOTS)
      {
-        bd->shade.val = 
+        bd->shade.val =
            ecore_animator_pos_map(val, ECORE_POS_MAP_BOUNCE, 1.2, 5.0);
         if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
    else
      {
-        bd->shade.val = 
+        bd->shade.val =
            ecore_animator_pos_map(val, ECORE_POS_MAP_LINEAR, 0.0, 0.0);
         if (!bd->shaded) bd->shade.val = 1.0 - bd->shade.val;
      }
-   
+
    /* due to M_PI's innacuracy, cos(M_PI/2) != 0.0, so we need this */
    if (bd->shade.val < 0.001) bd->shade.val = 0.0;
    else if (bd->shade.val > .999)
@@ -8811,9 +8811,9 @@
             (y - warp_y) > 5 || (y - warp_y) < -5)
           {
              /* User moved the mouse, so stop warping */
-	     printf("user stopped pinter warp\n");
-	     warp_to = 0;
-	     goto cleanup;
+             printf("user stopped pinter warp\n");
+             warp_to = 0;
+             goto cleanup;
           }
 
         /* We just use the same warp speed as configured
@@ -8833,7 +8833,7 @@
         ecore_x_pointer_warp(warp_to_win, warp_x, warp_y);
         return ECORE_CALLBACK_RENEW;
      }
-cleanup:
+ cleanup:
    ecore_timer_del(warp_timer);
    warp_timer = NULL;
    return ECORE_CALLBACK_CANCEL;
@@ -8887,13 +8887,13 @@
 
    if ((bd->comp_hidden) || (bd->tmp_input_hidden > 0))
      {
-	ecore_x_composite_window_events_disable(bd->win);
-	ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+        ecore_x_composite_window_events_disable(bd->win);
+        ecore_x_window_ignore_set(bd->win, EINA_TRUE);
      }
    else
      {
         _e_border_shape_input_rectangle_set(bd);
-	ecore_x_window_ignore_set(bd->win, EINA_FALSE);
+        ecore_x_window_ignore_set(bd->win, EINA_FALSE);
      }
 }
 
@@ -8905,16 +8905,16 @@
 
    bd->tmp_input_hidden++;
    if (bd->tmp_input_hidden != 1) return;
-   
+
    if ((bd->comp_hidden) || (bd->tmp_input_hidden > 0))
      {
-	ecore_x_composite_window_events_disable(bd->win);
-	ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+        ecore_x_composite_window_events_disable(bd->win);
+        ecore_x_window_ignore_set(bd->win, EINA_TRUE);
      }
    else
      {
         _e_border_shape_input_rectangle_set(bd);
-	ecore_x_window_ignore_set(bd->win, EINA_FALSE);
+        ecore_x_window_ignore_set(bd->win, EINA_FALSE);
      }
 }
 
@@ -8926,16 +8926,16 @@
 
    bd->tmp_input_hidden--;
    if (bd->tmp_input_hidden != 0) return;
-   
+
    if ((bd->comp_hidden) || (bd->tmp_input_hidden > 0))
      {
-	ecore_x_composite_window_events_disable(bd->win);
-	ecore_x_window_ignore_set(bd->win, EINA_TRUE);
+        ecore_x_composite_window_events_disable(bd->win);
+        ecore_x_window_ignore_set(bd->win, EINA_TRUE);
      }
    else
      {
         _e_border_shape_input_rectangle_set(bd);
-	ecore_x_window_ignore_set(bd->win, EINA_FALSE);
+        ecore_x_window_ignore_set(bd->win, EINA_FALSE);
      }
 }
 /*vim:ts=8 sw=3 sts=3 expandtab cino=>5n-3f0^-2{2(0W1st0*/

Log:
e17/border: fix focus latest set
  

Author:       jeffdameth
Date:         2011-08-27 23:49:59 -0700 (Sat, 27 Aug 2011)
New Revision: 62902
Trac:         http://trac.enlightenment.org/e/changeset/62902

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-28 06:48:33 UTC (rev 62901)
+++ trunk/e/src/bin/e_border.c	2011-08-28 06:49:59 UTC (rev 62902)
@@ -2096,7 +2096,7 @@
 
         e_focus_event_focus_in(bd);
 
-        if (focus_track_frozen)
+        if (!focus_track_frozen)
           e_border_focus_latest_set(bd);
 
         e_hints_active_window_set(bd->zone->container->manager, bd);

Log:
e17: remove unused function, move 'skip' from 'settings' to 'window'
  

Author:       jeffdameth
Date:         2011-08-28 00:03:29 -0700 (Sun, 28 Aug 2011)
New Revision: 62903
Trac:         http://trac.enlightenment.org/e/changeset/62903

Modified:
  trunk/e/src/bin/e_int_border_menu.c 

Modified: trunk/e/src/bin/e_int_border_menu.c
===================================================================
--- trunk/e/src/bin/e_int_border_menu.c	2011-08-28 06:49:59 UTC (rev 62902)
+++ trunk/e/src/bin/e_int_border_menu.c	2011-08-28 07:03:29 UTC (rev 62903)
@@ -522,14 +522,6 @@
      }
 
    submi = e_menu_item_new(subm);
-   e_menu_item_label_set(submi, _("Skip"));
-   e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_skip_pre, bd);
-   e_menu_item_icon_edje_set(submi,
-			     e_theme_edje_file_get("base/theme/borders",
-						   "e/widgets/border/default/skip"),
-			     "e/widgets/border/default/skip");
-
-   submi = e_menu_item_new(subm);
    e_menu_item_label_set(submi, _("Locks"));
    e_menu_item_callback_set(submi, _e_border_menu_cb_locks, bd);
    e_menu_item_icon_edje_set(submi,
@@ -584,6 +576,14 @@
      }
 
    submi = e_menu_item_new(subm);
+   e_menu_item_label_set(submi, _("Skip"));
+   e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_skip_pre, bd);
+   e_menu_item_icon_edje_set(submi,
+                             e_theme_edje_file_get("base/theme/borders",
+                                                   "e/widgets/border/default/skip"),
+                             "e/widgets/border/default/skip");
+
+   submi = e_menu_item_new(subm);
    e_menu_item_separator_set(submi, 1);
 
    if ((!bd->lock_user_location) && (!bd->fullscreen) &&
@@ -656,21 +656,6 @@
 }
 
 static void
-_e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
-{
-   E_Menu *subm;
-   E_Menu_Item *submi;
-   E_Border *bd;
-
-   if (!(bd = data)) return;
-
-   subm = e_menu_new();
-   e_object_data_set(E_OBJECT(subm), bd);
-   e_menu_item_submenu_set(mi, subm);
-
-}
-
-static void
 _e_border_menu_cb_prop(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
 {
    E_Border *bd;

Log:
e17: remove undefined declaration
  

Author:       jeffdameth
Date:         2011-08-28 00:05:43 -0700 (Sun, 28 Aug 2011)
New Revision: 62904
Trac:         http://trac.enlightenment.org/e/changeset/62904

Modified:
  trunk/e/src/bin/e_int_border_menu.c 

Modified: trunk/e/src/bin/e_int_border_menu.c
===================================================================
--- trunk/e/src/bin/e_int_border_menu.c	2011-08-28 07:03:29 UTC (rev 62903)
+++ trunk/e/src/bin/e_int_border_menu.c	2011-08-28 07:05:43 UTC (rev 62904)
@@ -19,7 +19,6 @@
 static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_application_pre(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi);
-static void _e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi);
 static void _e_border_menu_cb_prop(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_stick(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_stacking_pre(void *data, E_Menu *m, E_Menu_Item *mi);

Log:
e17: use stringshare for icccm/netwm properties 
  

Author:       jeffdameth
Date:         2011-08-29 01:24:55 -0700 (Mon, 29 Aug 2011)
New Revision: 62935
Trac:         http://trac.enlightenment.org/e/changeset/62935

Modified:
  trunk/e/src/bin/e_border.c trunk/e/src/bin/e_border.h 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-29 05:36:47 UTC (rev 62934)
+++ trunk/e/src/bin/e_border.c	2011-08-29 08:24:55 UTC (rev 62935)
@@ -4362,14 +4362,23 @@
      }
    if (bd->client.netwm.extra_types)
      free(bd->client.netwm.extra_types);
-   if (bd->client.border.name) eina_stringshare_del(bd->client.border.name);
-   if (bd->bordername) eina_stringshare_del(bd->bordername);
-   if (bd->client.icccm.title) free(bd->client.icccm.title);
-   if (bd->client.icccm.name) free(bd->client.icccm.name);
-   if (bd->client.icccm.class) free(bd->client.icccm.class);
-   if (bd->client.icccm.icon_name) free(bd->client.icccm.icon_name);
-   if (bd->client.icccm.machine) free(bd->client.icccm.machine);
-   if (bd->client.icccm.window_role) free(bd->client.icccm.window_role);
+   if (bd->client.border.name)
+     eina_stringshare_del(bd->client.border.name);
+   if (bd->bordername)
+     eina_stringshare_del(bd->bordername);
+   if (bd->client.icccm.name)
+     eina_stringshare_del(bd->client.icccm.name);
+   if (bd->client.icccm.class)
+     eina_stringshare_del(bd->client.icccm.class);
+   if (bd->client.icccm.title)
+     eina_stringshare_del(bd->client.icccm.title);
+   if (bd->client.icccm.icon_name)
+     eina_stringshare_del(bd->client.icccm.icon_name);
+   if (bd->client.icccm.machine)
+     eina_stringshare_del(bd->client.icccm.machine);
+   if (bd->client.icccm.window_role)
+     eina_stringshare_del(bd->client.icccm.window_role);
+
    if ((bd->client.icccm.command.argc > 0) && (bd->client.icccm.command.argv))
      {
         int i;
@@ -4378,8 +4387,10 @@
           free(bd->client.icccm.command.argv[i]);
         free(bd->client.icccm.command.argv);
      }
-   if (bd->client.netwm.name) free(bd->client.netwm.name);
-   if (bd->client.netwm.icon_name) free(bd->client.netwm.icon_name);
+   if (bd->client.netwm.name)
+     eina_stringshare_del(bd->client.netwm.name);
+   if (bd->client.netwm.icon_name)
+     eina_stringshare_del(bd->client.netwm.icon_name);
    e_object_del(E_OBJECT(bd->shape));
    if (bd->internal_icon) eina_stringshare_del(bd->internal_icon);
    if (bd->internal_icon_key) eina_stringshare_del(bd->internal_icon_key);
@@ -6315,51 +6326,50 @@
      }
    if (bd->client.icccm.fetch.title)
      {
-        if (bd->client.icccm.title) free(bd->client.icccm.title);
-        bd->client.icccm.title = ecore_x_icccm_title_get(bd->client.win);
-
-        bd->client.icccm.fetch.title = 0;
+        char *title = ecore_x_icccm_title_get(bd->client.win);
+        eina_stringshare_replace(&bd->client.icccm.title, title);
+        if (title) free(title);
+                                 
         if (bd->bg_object)
           edje_object_part_text_set(bd->bg_object, "e.text.title",
                                     bd->client.icccm.title);
+        bd->client.icccm.fetch.title = 0;
         rem_change = 1;
      }
    if (bd->client.netwm.fetch.name)
      {
-        if (bd->client.netwm.name) free(bd->client.netwm.name);
-        ecore_x_netwm_name_get(bd->client.win, &bd->client.netwm.name);
+        char *name;
+        ecore_x_netwm_name_get(bd->client.win, &name);
+        eina_stringshare_replace(&bd->client.netwm.name, name);
+        if (name) free(name);
 
-        bd->client.netwm.fetch.name = 0;
         if (bd->bg_object)
           edje_object_part_text_set(bd->bg_object, "e.text.title",
                                     bd->client.netwm.name);
+        bd->client.netwm.fetch.name = 0;
         rem_change = 1;
      }
    if (bd->client.icccm.fetch.name_class)
      {
-        int nc_change = 0;
-        char *pname, *pclass;
+        const char *pname, *pclass;
+        char *nname, *nclass;
 
         pname = bd->client.icccm.name;
         pclass = bd->client.icccm.class;
-        ecore_x_icccm_name_class_get(bd->client.win, &bd->client.icccm.name, &bd->client.icccm.class);
-        if ((pname) && (bd->client.icccm.name) &&
-            (pclass) && (bd->client.icccm.class))
-          {
-             if (!((!strcmp(bd->client.icccm.name, pname)) &&
-                   (!strcmp(bd->client.icccm.class, pclass))))
-               nc_change = 1;
-          }
-        else if (((!pname) || (!pclass)) &&
-                 ((bd->client.icccm.name) || (bd->client.icccm.class)))
-          nc_change = 1;
-        else if (((bd->client.icccm.name) || (bd->client.icccm.class)) &&
-                 ((!pname) || (!pclass)))
-          nc_change = 1;
-        if (pname) free(pname);
-        if (pclass) free(pclass);
-        if (nc_change)
+
+        ecore_x_icccm_name_class_get(bd->client.win, &nname, &nclass);
+
+        eina_stringshare_replace(&bd->client.icccm.name, nname);
+        eina_stringshare_replace(&bd->client.icccm.class, nclass);
+        if (nname) free(nname);
+        if (nclass) free(nclass);
+
+        if (!((bd->client.icccm.name == pname) &&
+              (bd->client.icccm.class == pclass)))
           bd->changes.icon = 1;
+        
+        if (pname) eina_stringshare_del(pname);
+        if (pclass) eina_stringshare_del(pclass);
         bd->client.icccm.fetch.name_class = 0;
         rem_change = 1;
      }
@@ -6398,11 +6408,14 @@
      }
    if (bd->client.icccm.fetch.machine)
      {
-        if (bd->client.icccm.machine) free(bd->client.icccm.machine);
-        bd->client.icccm.machine = ecore_x_icccm_client_machine_get(bd->client.win);
-        if ((bd->client.icccm.client_leader) &&
-            (!bd->client.icccm.machine))
-          ecore_x_icccm_client_machine_get(bd->client.icccm.client_leader);
+        char *machine = ecore_x_icccm_client_machine_get(bd->client.win);
+
+        if ((!machine) && (bd->client.icccm.client_leader))
+          machine = ecore_x_icccm_client_machine_get(bd->client.icccm.client_leader);
+        
+        eina_stringshare_replace(&bd->client.icccm.machine, machine);
+        if (machine) free(machine);
+        
         bd->client.icccm.fetch.machine = 0;
         rem_change = 1;
      }
@@ -6590,22 +6603,29 @@
      }
    if (bd->client.icccm.fetch.window_role)
      {
-        if (bd->client.icccm.window_role) free(bd->client.icccm.window_role);
-        bd->client.icccm.window_role = ecore_x_icccm_window_role_get(bd->client.win);
+        char *role = ecore_x_icccm_window_role_get(bd->client.win);
+        eina_stringshare_replace(&bd->client.icccm.window_role, role);
+        if (role) free(role);
+
         bd->client.icccm.fetch.window_role = 0;
         rem_change = 1;
      }
    if (bd->client.icccm.fetch.icon_name)
      {
-        if (bd->client.icccm.icon_name) free(bd->client.icccm.icon_name);
-        bd->client.icccm.icon_name = ecore_x_icccm_icon_name_get(bd->client.win);
+        char *icon_name = ecore_x_icccm_icon_name_get(bd->client.win);
+        eina_stringshare_replace(&bd->client.icccm.icon_name, icon_name); 
+        if (icon_name) free(icon_name);
+        
         bd->client.icccm.fetch.icon_name = 0;
         rem_change = 1;
      }
    if (bd->client.netwm.fetch.icon_name)
      {
-        if (bd->client.netwm.icon_name) free(bd->client.netwm.icon_name);
-        ecore_x_netwm_icon_name_get(bd->client.win, &bd->client.netwm.icon_name);
+        char *icon_name;
+        ecore_x_netwm_icon_name_get(bd->client.win, &icon_name);
+        eina_stringshare_replace(&bd->client.netwm.icon_name, icon_name); 
+        if (icon_name) free(icon_name);
+        
         bd->client.netwm.fetch.icon_name = 0;
         rem_change = 1;
      }

Modified: trunk/e/src/bin/e_border.h
===================================================================
--- trunk/e/src/bin/e_border.h	2011-08-29 05:36:47 UTC (rev 62934)
+++ trunk/e/src/bin/e_border.h	2011-08-29 08:24:55 UTC (rev 62935)
@@ -195,11 +195,11 @@
       
       /* ICCCM */
       struct {
-         char *title;
-         char *name;
-         char *class;
-         char *icon_name;
-         char *machine;
+	 const char *title;
+	 const char *name;
+	 const char *class;
+         const char *icon_name;
+         const char *machine;
          int min_w, min_h;
          int max_w, max_h;
          int base_w, base_h;
@@ -215,7 +215,7 @@
          Ecore_X_Window transient_for;
          Ecore_X_Window client_leader;
          Ecore_X_Gravity gravity;
-         char *window_role;
+         const char *window_role;
          unsigned char take_focus : 1;
          unsigned char accepts_focus : 1;
          unsigned char urgent : 1;
@@ -257,8 +257,8 @@
       struct {
          pid_t         pid;
          unsigned int  desktop;
-         char         *name;
-         char         *icon_name;
+         const char         *name;
+         const char         *icon_name;
          Ecore_X_Icon *icons;
          int           num_icons;
          unsigned int  user_time;

Log:
e17:e_icon: some safety checks for iconcache, cleanups
  

Author:       jeffdameth
Date:         2011-08-29 01:30:23 -0700 (Mon, 29 Aug 2011)
New Revision: 62936
Trac:         http://trac.enlightenment.org/e/changeset/62936

Modified:
  trunk/e/src/bin/e_icon.c 

Modified: trunk/e/src/bin/e_icon.c
===================================================================
--- trunk/e/src/bin/e_icon.c	2011-08-29 08:24:55 UTC (rev 62935)
+++ trunk/e/src/bin/e_icon.c	2011-08-29 08:30:23 UTC (rev 62936)
@@ -28,7 +28,7 @@
 struct _Cache_Item
 {
   unsigned int timestamp;
-  
+
   Evas_Object *icon, *obj;
   const char *id;
   Eina_List *objs;
@@ -82,7 +82,6 @@
 #ifdef USE_ICON_CACHE
 
    Eet_File *ef;
-   void *data = NULL;
    char buf[PATH_MAX];
 
 #undef T
@@ -115,7 +114,7 @@
    eet_close(ef);
 
    _cache->file = strdup(buf);
-   
+
    _cache->ef = NULL;
 #endif
    return 1;
@@ -127,25 +126,25 @@
 #ifdef USE_ICON_CACHE
    if (_cache)
      {
-        E_FREE(_cache->file);
+	E_FREE(_cache->file);
 
-        if (_cache->ef)
-          eet_close(_cache->ef);
+	if (_cache->ef)
+	  eet_close(_cache->ef);
 
-        if (_cache->load_queue)
-          {
-             printf("EEEK!!! e_icons in load queue...\n");
-             eina_list_free(_cache->load_queue);
-          }
-        
-        eina_hash_free(_cache->hash);
-        E_FREE(_cache);
+	if (_cache->load_queue)
+	  {
+	     printf("EEEK!!! e_icons in load queue...\n");
+	     eina_list_free(_cache->load_queue);
+	  }
+
+	eina_hash_free(_cache->hash);
+	E_FREE(_cache);
      }
 
    E_CONFIG_DD_FREE(cache_item_edd);
    E_CONFIG_DD_FREE(cache_edd);
 #endif
-   
+
    return 1;
 }
 
@@ -164,19 +163,19 @@
 
    if (!strcmp(evas_object_type_get(sd->obj), "edje"))
      {
-        Evas_Object *pclip;
+	Evas_Object *pclip;
 
-        pclip = evas_object_clip_get(sd->obj);
-        evas_object_del(sd->obj);
+	pclip = evas_object_clip_get(sd->obj);
+	evas_object_del(sd->obj);
 #ifdef USE_ICON_CACHE
-        eina_stringshare_replace(&sd->file, NULL);
+	eina_stringshare_replace(&sd->file, NULL);
 #endif
-        sd->obj = evas_object_image_add(evas_object_evas_get(obj));
-        evas_object_image_scale_hint_set(sd->obj, EVAS_IMAGE_SCALE_HINT_STATIC);
-        evas_object_smart_member_add(sd->obj, obj);
-        evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED,
-                                       _e_icon_preloaded, obj);
-        evas_object_clip_set(sd->obj, pclip);
+	sd->obj = evas_object_image_add(evas_object_evas_get(obj));
+	evas_object_image_scale_hint_set(sd->obj, EVAS_IMAGE_SCALE_HINT_STATIC);
+	evas_object_smart_member_add(sd->obj, obj);
+	evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED,
+				       _e_icon_preloaded, obj);
+	evas_object_clip_set(sd->obj, pclip);
      }
 }
 
@@ -199,7 +198,7 @@
 _handle_anim(E_Smart_Data *sd)
 {
    double t;
-   
+
    if (sd->timer) ecore_timer_del(sd->timer);
    sd->timer = NULL;
    sd->frame = 0;
@@ -207,11 +206,11 @@
    if (!evas_object_image_animated_get(sd->obj)) return 0;
    // FIXME: hack around jiyouns BUG!!!!!!!!
      {
-        const char *file;
-        char buf[256];
-        snprintf(buf, sizeof(buf), "%ld", (long)sd);
-        evas_object_image_file_get(sd->obj, &file, NULL);
-        evas_object_image_file_set(sd->obj, file, buf);
+	const char *file;
+	char buf[256];
+	snprintf(buf, sizeof(buf), "%ld", (long)sd);
+	evas_object_image_file_get(sd->obj, &file, NULL);
+	evas_object_image_file_set(sd->obj, file, buf);
      }
    sd->frame_count = evas_object_image_animated_frame_count_get(sd->obj);
    if (sd->frame_count < 2) return 0;
@@ -228,28 +227,28 @@
    int len;
 
    if (!file) return EINA_FALSE;
-   if (!(sd = evas_object_smart_data_get(obj))) 
+   if (!(sd = evas_object_smart_data_get(obj)))
      return EINA_FALSE;
 
    len = strlen(file);
    if ((len > 4) && (!strcasecmp(file + len - 4, ".edj")))
       return e_icon_file_edje_set(obj, file, "icon");
-   
+
    /* smart code here */
    _e_icon_obj_prepare(obj, sd);
    /* FIXME: 64x64 - unhappy about this. use icon size */
    sd->loading = 0;
    if (sd->fdo)
      {
-        eina_stringshare_del(sd->fdo);
-        sd->fdo = NULL;
+	eina_stringshare_del(sd->fdo);
+	sd->fdo = NULL;
      }
 
    if (sd->timer) ecore_timer_del(sd->timer);
    sd->timer = NULL;
    sd->frame = 0;
    sd->frame_count = 0;
-   
+
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
    if (sd->preload) evas_object_hide(sd->obj);
@@ -257,26 +256,26 @@
 #ifdef USE_ICON_CACHE
    if (_e_icon_cache_find(obj, file))
      {
-        _e_icon_smart_reconfigure(sd);
-        return EINA_TRUE;
+	_e_icon_smart_reconfigure(sd);
+	return EINA_TRUE;
      }
 #endif
-   
+
    evas_object_image_file_set(sd->obj, file, NULL);
    if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
      return EINA_FALSE;
    if (!_handle_anim(sd))
      {
-        if (sd->preload)
-          {
-             sd->loading = 1;
-             evas_object_image_preload(sd->obj, EINA_FALSE);
-          }
-        else if (evas_object_visible_get(obj))
-          {	     	     
-             evas_object_show(sd->obj);
+	if (sd->preload)
+	  {
+	     sd->loading = 1;
+	     evas_object_image_preload(sd->obj, EINA_FALSE);
+	  }
+	else if (evas_object_visible_get(obj))
+	  {
+	     evas_object_show(sd->obj);
 #ifdef USE_ICON_CACHE
-             _e_icon_cache_icon_loaded(sd->ci);
+	     _e_icon_cache_icon_loaded(sd->ci);
 #endif
 	  }
      }
@@ -290,7 +289,7 @@
 	E_FREE(sd->ci);
      }
 #endif
-   
+
    _e_icon_smart_reconfigure(sd);
    return EINA_TRUE;
 }
@@ -300,22 +299,22 @@
 {
    E_Smart_Data *sd;
 
-   if (!(sd = evas_object_smart_data_get(obj))) 
+   if (!(sd = evas_object_smart_data_get(obj)))
      return EINA_FALSE;
 
    /* smart code here */
    sd->loading = 0;
    if (sd->fdo)
      {
-        eina_stringshare_del(sd->fdo);
-        sd->fdo = NULL;
+	eina_stringshare_del(sd->fdo);
+	sd->fdo = NULL;
      }
-   
+
    if (sd->timer) ecore_timer_del(sd->timer);
    sd->timer = NULL;
    sd->frame = 0;
    sd->frame_count = 0;
-   
+
    _e_icon_obj_prepare(obj, sd);
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
@@ -325,13 +324,13 @@
      return EINA_FALSE;
    if (!_handle_anim(sd))
      {
-        if (sd->preload)
-          {
-             sd->loading = 1;
-             evas_object_image_preload(sd->obj, 0);
-          }
-        else if (evas_object_visible_get(obj))
-           evas_object_show(sd->obj);
+	if (sd->preload)
+	  {
+	     sd->loading = 1;
+	     evas_object_image_preload(sd->obj, 0);
+	  }
+	else if (evas_object_visible_get(obj))
+	   evas_object_show(sd->obj);
      }
    _e_icon_smart_reconfigure(sd);
    return EINA_TRUE;
@@ -342,7 +341,7 @@
 {
    E_Smart_Data *sd;
 
-   if (!(sd = evas_object_smart_data_get(obj))) 
+   if (!(sd = evas_object_smart_data_get(obj)))
      return EINA_FALSE;
 
    /* smart code here */
@@ -350,15 +349,15 @@
    sd->loading = 0;
    if (sd->fdo)
      {
-        eina_stringshare_del(sd->fdo);
-        sd->fdo = NULL;
+	eina_stringshare_del(sd->fdo);
+	sd->fdo = NULL;
      }
-   
+
    if (sd->timer) ecore_timer_del(sd->timer);
    sd->timer = NULL;
    sd->frame = 0;
    sd->frame_count = 0;
-   
+
    sd->obj = edje_object_add(evas_object_evas_get(obj));
    edje_object_file_set(sd->obj, file, part);
    if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
@@ -375,18 +374,18 @@
    E_Smart_Data *sd;
    const char *path;
    int len;
-   
+
    if (!icon) return EINA_TRUE;
    if (icon[0] == '/') return e_icon_file_set(obj, icon);
 
-   if (!(sd = evas_object_smart_data_get(obj))) 
+   if (!(sd = evas_object_smart_data_get(obj)))
      return EINA_FALSE;
 
    if (sd->timer) ecore_timer_del(sd->timer);
    sd->timer = NULL;
    sd->frame = 0;
    sd->frame_count = 0;
-   
+
    eina_stringshare_replace(&sd->fdo, icon);
    if (!sd->fdo) return EINA_FALSE;
 
@@ -396,7 +395,7 @@
    len = strlen(icon);
    if ((len > 4) && (!strcasecmp(icon + len - 4, ".edj")))
       return e_icon_file_edje_set(obj, path, "icon");
-   
+
    /* smart code here */
    _e_icon_obj_prepare(obj, sd);
    sd->loading = 0;
@@ -408,8 +407,8 @@
      return EINA_FALSE;
    if (sd->preload)
      {
-        sd->loading = 1;
-        evas_object_image_preload(sd->obj, 0);
+	sd->loading = 1;
+	evas_object_image_preload(sd->obj, 0);
      }
    else if (evas_object_visible_get(obj))
      evas_object_show(sd->obj);
@@ -428,7 +427,7 @@
    sd->timer = NULL;
    sd->frame = 0;
    sd->frame_count = 0;
-   
+
    /* smart code here */
    if (sd->obj) evas_object_del(sd->obj);
    sd->loading = 0;
@@ -521,7 +520,7 @@
 {
    E_Smart_Data *sd;
 
-   if (!(sd = evas_object_smart_data_get(obj))) 
+   if (!(sd = evas_object_smart_data_get(obj)))
      {
 	if (w) *w = 0;
 	if (h) *h = 0;
@@ -742,7 +741,7 @@
 
    sd->obj = evas_object_image_add(evas_object_evas_get(obj));
    evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED,
-                                  _e_icon_preloaded, obj);
+				  _e_icon_preloaded, obj);
    sd->x = 0;
    sd->y = 0;
    sd->w = 0;
@@ -793,20 +792,20 @@
    sd->h = h;
    if (sd->fdo)
      {
-        const char *path;
+	const char *path;
 
-        sd->size = MAX(w, h);
-        path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size);
-        if (!path) return;
+	sd->size = MAX(w, h);
+	path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size);
+	if (!path) return;
 
-        /* smart code here */
-        evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
-        evas_object_image_file_set(sd->obj, path, NULL);
-        if (sd->preload)
-          {
-             sd->loading = 1;
-             evas_object_image_preload(sd->obj, 0);
-          }
+	/* smart code here */
+	evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
+	evas_object_image_file_set(sd->obj, path, NULL);
+	if (sd->preload)
+	  {
+	     sd->loading = 1;
+	     evas_object_image_preload(sd->obj, 0);
+	  }
      }
 
    _e_icon_smart_reconfigure(sd);
@@ -819,13 +818,13 @@
 
    if (!(sd = evas_object_smart_data_get(obj))) return;
    if (!((sd->preload) && (sd->loading)))
-     {	
+     {
 	evas_object_show(sd->obj);
 #ifdef USE_ICON_CACHE
 	_e_icon_cache_icon_loaded(sd->ci);
 #endif
      }
-   
+
    evas_object_show(sd->eventarea);
 }
 
@@ -886,14 +885,16 @@
    char buf[PATH_MAX];
    const char *id;
    Eina_List *l;
-   
-   if (!(sd = evas_object_smart_data_get(obj))) 
+
+   if (!_cache) return EINA_FALSE;
+
+   if (!(sd = evas_object_smart_data_get(obj)))
      return EINA_FALSE;
 
    snprintf(buf, PATH_MAX, "%d:%s", sd->size, file);
 
    if ((ci = eina_hash_find(_cache->hash, buf)))
-     {	
+     {
 	unsigned int w, h, alpha;
 	void *data;
 	int found = 0;
@@ -906,12 +907,12 @@
 						      NULL, NULL, NULL)))
 	  {
 	     evas_object_image_size_set(sd->obj, w, h);
-	     evas_object_image_alpha_set(sd->obj, alpha); 
+	     evas_object_image_alpha_set(sd->obj, alpha);
 	     evas_object_image_data_copy_set(sd->obj, data);
 	     evas_object_smart_callback_call(obj, "preloaded", NULL);
 	     evas_object_show(sd->obj);
 	     free(data);
-	     found = 1;     
+	     found = 1;
 	  }
 
 	if ((_cache->ef) && !(_cache->timer))
@@ -927,12 +928,12 @@
 	ci = NULL;
      }
 
-   id = eina_stringshare_add(buf);   
+   id = eina_stringshare_add(buf);
 
    /* not found in cache, check load queue */
    EINA_LIST_FOREACH(_cache->load_queue, l, ci)
      {
-	if (ci->id != id) continue;	     
+	if (ci->id != id) continue;
 	ci->objs = eina_list_append(ci->objs, obj);
 	sd->ci = ci;
 	evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_DEL,
@@ -960,24 +961,24 @@
 {
    if (_cache->load_queue)
      {
-	DBG("wating for icon load queue to write\n");
+	printf("wating for icon load queue to write\n");
 	Cache_Item *ci;
 	Eina_List *l;
-	
+
 	EINA_LIST_FOREACH(_cache->load_queue, l, ci)
-	  DBG("  : %s\n", ci->id);
-	
+	  printf("  : %s\n", ci->id);
+
 	return ECORE_CALLBACK_RENEW;
      }
 
    eet_sync(_cache->ef);
    eet_close(_cache->ef);
-   
+
    _cache->ef = NULL;
    _cache->timer = NULL;
 
-   DBG("icon cache written\n");
-   
+   printf("icon cache written\n");
+
    return ECORE_CALLBACK_CANCEL;
 }
 
@@ -988,26 +989,26 @@
    E_Smart_Data *sd;
 
    if (!ci->objs)
-     {	
+     {
 	/* no more e_icon wait for this object to bet loaded */
 	_cache->load_queue = eina_list_remove(_cache->load_queue, ci);
 	_e_icon_cache_item_free(ci);
 	return;
      }
-   
+
    obj = eina_list_data_get(ci->objs);
    ci->objs = eina_list_remove_list(ci->objs, ci->objs);
-   
+
    if (!obj)
      goto __try_next;
-   
+
    if (!(sd = evas_object_smart_data_get(obj)))
      goto __try_next;
-   
+
    evas_object_image_file_set(sd->obj, sd->file, NULL);
    if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
      goto __try_next;
-   
+
    sd->ci->icon = sd->obj;
    sd->ci->obj = obj;
    evas_object_image_preload(sd->obj, EINA_FALSE);
@@ -1026,15 +1027,18 @@
 
    if (!(sd = evas_object_smart_data_get(data))) return;
    if (!sd->ci) return;
-   
+
    /* check if the deleted object is the one that is used for
       preloading.  when other objs wait for this image data start
       preloading again with the next. */
 
    if (sd->ci->icon == obj)
-     _e_icon_cache_icon_try_next(sd->ci); 
+     _e_icon_cache_icon_try_next(sd->ci);
    else
-     sd->ci->objs = eina_list_remove(sd->ci->objs, data);
+     {
+	sd->ci->objs = eina_list_remove(sd->ci->objs, data);
+	sd->ci = NULL;
+     }
 }
 
 static void
@@ -1042,28 +1046,30 @@
 {
    int w, h, alpha;
    E_Smart_Data *sd;
-   Evas_Object *obj, *so;
+   Evas_Object *obj;
    void *data;
 
-   if (!ci || !ci->id) return;   
-   _cache->load_queue = eina_list_remove(_cache->load_queue, ci); 
-   
+   if (!_cache) return;
+
+   if (!ci || !ci->id) return;
+   _cache->load_queue = eina_list_remove(_cache->load_queue, ci);
+
    data = evas_object_image_data_get(ci->icon, EINA_FALSE);
-   evas_object_image_size_get(ci->icon, &w, &h); 
-   alpha = evas_object_image_alpha_get(ci->icon); 
+   evas_object_image_size_get(ci->icon, &w, &h);
+   alpha = evas_object_image_alpha_get(ci->icon);
 
    evas_object_event_callback_del_full(ci->icon, EVAS_CALLBACK_DEL,
 				       _e_icon_obj_del, ci->obj);
    evas_object_smart_callback_call(ci->obj, "preloaded", NULL);
-   
-   DBG("icon loaded %p, %s\n", data, ci->id);
 
+   printf("icon loaded %p, %s\n", data, ci->id);
+
    sd = evas_object_smart_data_get(ci->obj);
    sd->ci = NULL;
-   
+
    /* pass loaded data to other e_icon wating for this */
    EINA_LIST_FREE(ci->objs, obj)
-     {	     
+     {
 	sd = evas_object_smart_data_get(obj);
 	sd->ci = NULL;
 	evas_object_event_callback_del_full(sd->obj, EVAS_CALLBACK_DEL,
@@ -1085,7 +1091,7 @@
 					       w, h, alpha, 1, 100, 0))
 	  {
 	     eina_hash_add(_cache->hash, ci->id, ci);
-	     int ok = eet_data_write(_cache->ef, cache_edd, "idx", _cache, 1);
+	     eet_data_write(_cache->ef, cache_edd, "idx", _cache, 1);
 
 	     if (!_cache->timer)
 	       _cache->timer = ecore_timer_add(3.0, _e_icon_cache_save, NULL);
@@ -1094,7 +1100,7 @@
 	     return;
 	  }
      }
-   
+
    DBG("couldnt write cache %p !!!\n", _cache->ef);
    _e_icon_cache_item_free(ci);
 }

Log:
e17: e_icon cleanup
  

Author:       jeffdameth
Date:         2011-08-29 07:02:20 -0700 (Mon, 29 Aug 2011)
New Revision: 62947
Trac:         http://trac.enlightenment.org/e/changeset/62947

Modified:
  trunk/e/src/bin/e_icon.c 

Modified: trunk/e/src/bin/e_icon.c
===================================================================
--- trunk/e/src/bin/e_icon.c	2011-08-29 12:52:41 UTC (rev 62946)
+++ trunk/e/src/bin/e_icon.c	2011-08-29 14:02:20 UTC (rev 62947)
@@ -70,11 +70,12 @@
 /* local subsystem globals */
 static Evas_Smart *_e_smart = NULL;
 
+#ifdef USE_ICON_CACHE
 static Cache *_cache = NULL;
 static E_Config_DD *cache_edd = NULL;
 static E_Config_DD *cache_item_edd = NULL;
-
 #define DBG(...)
+#endif
 
 EINTERN int
 e_icon_init(void)

Log:
e17: fix icccm.class string replace
  

Author:       jeffdameth
Date:         2011-08-29 07:06:00 -0700 (Mon, 29 Aug 2011)
New Revision: 62948
Trac:         http://trac.enlightenment.org/e/changeset/62948

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-29 14:02:20 UTC (rev 62947)
+++ trunk/e/src/bin/e_border.c	2011-08-29 14:06:00 UTC (rev 62948)
@@ -6354,13 +6354,11 @@
         const char *pname, *pclass;
         char *nname, *nclass;
 
+	ecore_x_icccm_name_class_get(bd->client.win, &nname, &nclass);
         pname = bd->client.icccm.name;
         pclass = bd->client.icccm.class;
-
-        ecore_x_icccm_name_class_get(bd->client.win, &nname, &nclass);
-
-        eina_stringshare_replace(&bd->client.icccm.name, nname);
-        eina_stringshare_replace(&bd->client.icccm.class, nclass);
+        bd->client.icccm.name = eina_stringshare_add(nname);
+        bd->client.icccm.class = eina_stringshare_add(nclass);
         if (nname) free(nname);
         if (nclass) free(nclass);

Log:
e17: removed bd->changed from deleted border to prevent loop with illume hook calls
  

Author:       jeffdameth
Date:         2011-08-31 04:36:46 -0700 (Wed, 31 Aug 2011)
New Revision: 63025
Trac:         http://trac.enlightenment.org/e/changeset/63025

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-08-31 11:12:56 UTC (rev 63024)
+++ trunk/e/src/bin/e_border.c	2011-08-31 11:36:46 UTC (rev 63025)
@@ -6263,6 +6263,7 @@
    if (e_object_is_del(E_OBJECT(bd)))
      {
         fprintf(stderr, "ERROR: _e_border_eval(%p) with deleted border!\n", bd);
+	bd->changed = 0;
         return;
      }

Log:
e17: free gadcon location
  

Author:       jeffdameth
Date:         2011-08-31 05:52:28 -0700 (Wed, 31 Aug 2011)
New Revision: 63027
Trac:         http://trac.enlightenment.org/e/changeset/63027

Modified:
  trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2011-08-31 12:30:56 UTC (rev 63026)
+++ trunk/e/src/bin/e_shelf.c	2011-08-31 12:52:28 UTC (rev 63027)
@@ -824,6 +824,7 @@
    _e_shelf_bindings_del(es);
 
    e_gadcon_location_unregister(es->gadcon->location);
+   e_gadcon_location_free(es->gadcon->location); 
    e_zone_useful_geometry_dirty(es->zone);
    E_FREE_LIST(es->handlers, ecore_event_handler_del);

Log:
e17: remove undefined declaration
  

Author:       jeffdameth
Date:         2011-08-31 05:54:23 -0700 (Wed, 31 Aug 2011)
New Revision: 63028
Trac:         http://trac.enlightenment.org/e/changeset/63028

Modified:
  trunk/e/src/bin/e_icon.h 

Modified: trunk/e/src/bin/e_icon.h
===================================================================
--- trunk/e/src/bin/e_icon.h	2011-08-31 12:52:28 UTC (rev 63027)
+++ trunk/e/src/bin/e_icon.h	2011-08-31 12:54:23 UTC (rev 63028)
@@ -13,7 +13,6 @@
 EAPI Eina_Bool    e_icon_fdo_icon_set     (Evas_Object *obj, const char *icon);
 EAPI void         e_icon_object_set       (Evas_Object *obj, Evas_Object *o);
 EAPI const char  *e_icon_file_get         (const Evas_Object *obj);
-EAPI const char  *e_icon_file_key_get     (const Evas_Object *obj, const char **key);
 EAPI void         e_icon_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth);
 EAPI Eina_Bool    e_icon_smooth_scale_get (const Evas_Object *obj);
 EAPI void         e_icon_alpha_set        (Evas_Object *obj, Eina_Bool smooth);

Log:
e17: one more focus fix, e_border_focus_set_with_pointer could set bd->want_focus again.
  

Author:       jeffdameth
Date:         2011-09-02 04:12:03 -0700 (Fri, 02 Sep 2011)
New Revision: 63088
Trac:         http://trac.enlightenment.org/e/changeset/63088

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-09-02 08:51:56 UTC (rev 63087)
+++ trunk/e/src/bin/e_border.c	2011-09-02 11:12:03 UTC (rev 63088)
@@ -7837,8 +7837,10 @@
 
    if ((bd->take_focus) || (bd->want_focus))
      {
+        bd->take_focus = 0;
         if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) || (bd->want_focus))
           {
+	     bd->want_focus = 0;
              e_border_focus_set_with_pointer(bd);
           }
         else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
@@ -7867,8 +7869,6 @@
              if (!bd2)
                e_border_focus_set_with_pointer(bd);
           }
-        bd->want_focus = 0;
-        bd->take_focus = 0;
      }
 
    if (bd->need_maximize)

Log:
e17: move freeing of pending move/resize for new client up to eval0, before layout hook is called
  

Author:       jeffdameth
Date:         2011-09-02 18:32:39 -0700 (Fri, 02 Sep 2011)
New Revision: 63099
Trac:         http://trac.enlightenment.org/e/changeset/63099

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-09-03 01:31:23 UTC (rev 63098)
+++ trunk/e/src/bin/e_border.c	2011-09-03 01:32:39 UTC (rev 63099)
@@ -6927,6 +6927,7 @@
    if (bd->new_client)
      {
         E_Event_Border_Add *ev;
+        E_Border_Pending_Move_Resize *pnd;
 
         ev = E_NEW(E_Event_Border_Add, 1);
         ev->border = bd;
@@ -6936,6 +6937,33 @@
 
         if ((!bd->lock_border) || (!bd->client.border.name))
           bd->client.border.changed = 1;
+
+	EINA_LIST_FREE(bd->pending_move_resize, pnd)
+          {
+             if ((!bd->lock_client_location) && (pnd->move))
+               {
+                  bd->x = pnd->x;
+                  bd->y = pnd->y;
+                  bd->changes.pos = 1;
+                  bd->placed = 1;
+                  if (pnd->without_border)
+                    {
+                       bd->x -= bd->client_inset.l;
+                       bd->y -= bd->client_inset.t;
+                    }
+               }
+             if ((!bd->lock_client_size) && (pnd->resize))
+               {
+                  bd->w = pnd->w + (bd->client_inset.l + bd->client_inset.r);
+                  bd->h = pnd->h + (bd->client_inset.t + bd->client_inset.b);
+                  bd->client.w = pnd->w;
+                  bd->client.h = pnd->h;
+                  bd->changes.size = 1;
+               }
+	     printf("free pendig %dx%d\n", bd->w, bd->h);
+
+             free(pnd);
+          }
      }
 
    /* PRE_POST_FETCH calls e_remember apply for new client */
@@ -7162,7 +7190,6 @@
 _e_border_eval(E_Border *bd)
 {
    E_Event_Border_Property *event;
-   E_Border_Pending_Move_Resize *pnd;
    int rem_change = 0;
    int send_event = 1;
 
@@ -7355,30 +7382,6 @@
              bd->y = new_y;
              bd->changes.pos = 1;
           }
-        EINA_LIST_FREE(bd->pending_move_resize, pnd)
-          {
-             if ((!bd->lock_client_location) && (pnd->move))
-               {
-                  bd->x = pnd->x;
-                  bd->y = pnd->y;
-                  bd->changes.pos = 1;
-                  bd->placed = 1;
-                  if (pnd->without_border)
-                    {
-                       bd->x -= bd->client_inset.l;
-                       bd->y -= bd->client_inset.t;
-                    }
-               }
-             if ((!bd->lock_client_size) && (pnd->resize))
-               {
-                  bd->w = pnd->w + (bd->client_inset.l + bd->client_inset.r);
-                  bd->h = pnd->h + (bd->client_inset.t + bd->client_inset.b);
-                  bd->client.w = pnd->w;
-                  bd->client.h = pnd->h;
-                  bd->changes.size = 1;
-               }
-             free(pnd);
-          }
 
         /* Recreate state */
         e_hints_window_init(bd);
@@ -7419,10 +7422,7 @@
                                                   bd->x,
                                                   bd->y + bd->h - 1);
            if ((zone) && (zone != bd->zone))
-             {
-                e_border_zone_set(bd, zone);
-                /* e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh); */
-             }
+	     e_border_zone_set(bd, zone);
         }
      }

Log:
e17: add macro to get gacon client config item by id, if id is NULL get a new id.
  
  seems almost all modules got it wrong (those with uuid counter). 
  when there are two gcc and gcc 1 is removed and e is restarted 
  uuid counter will be 1, so when you add a new one it will get id of gcc 2
  

Author:       jeffdameth
Date:         2011-09-03 07:27:27 -0700 (Sat, 03 Sep 2011)
New Revision: 63123
Trac:         http://trac.enlightenment.org/e/changeset/63123

Modified:
  trunk/e/src/bin/e_gadcon.h 

Modified: trunk/e/src/bin/e_gadcon.h
===================================================================
--- trunk/e/src/bin/e_gadcon.h	2011-09-03 13:20:12 UTC (rev 63122)
+++ trunk/e/src/bin/e_gadcon.h	2011-09-03 14:27:27 UTC (rev 63123)
@@ -315,5 +315,29 @@
 EAPI void e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name);
 EAPI void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu);
 
+#define GADCON_CLIENT_CONFIG_GET(_type, _items, _gc_class, _id)		\
+  if (!_id)								\
+    {									\
+       char buf[128];							\
+       int num = 0;							\
+       _type *ci;							\
+       if (_items)							\
+	 {								\
+	    const char *p;						\
+	    ci = eina_list_last(_items)->data;				\
+	    p = strrchr (ci->id, '.');					\
+	    if (p) num = atoi (p + 1) + 1;				\
+	 }								\
+       snprintf (buf, sizeof (buf), "%s.%d", _gc_class.name, num);	\
+       _id = buf;							\
+    }									\
+  else									\
+    {									\
+       Eina_List *l;							\
+       _type *ci;							\
+       EINA_LIST_FOREACH(_items, l, ci)					\
+	 if ((ci->id) && (!strcmp(ci->id, id))) return ci;		\
+    }
+
 #endif
 #endif

Log:
e17: use argb border only when compositing is enabled
  

Author:       jeffdameth
Date:         2011-09-04 13:03:00 -0700 (Sun, 04 Sep 2011)
New Revision: 63170
Trac:         http://trac.enlightenment.org/e/changeset/63170

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-09-04 19:54:01 UTC (rev 63169)
+++ trunk/e/src/bin/e_border.c	2011-09-04 20:03:00 UTC (rev 63170)
@@ -7066,7 +7066,7 @@
 
                   bd->bg_object = o;
 
-                  if (!bd->client.argb)
+                  if ((e_config->use_composite) && (!bd->client.argb))
                     {
                        argb_option = edje_object_data_get(o, "argb");
                        if ((argb_option) && (!strcmp(argb_option, "1")))

Log:
e17/menu: set icon scale size
  

Author:       jeffdameth
Date:         2011-09-05 07:52:32 -0700 (Mon, 05 Sep 2011)
New Revision: 63200
Trac:         http://trac.enlightenment.org/e/changeset/63200

Modified:
  trunk/e/src/bin/e_menu.c 

Modified: trunk/e/src/bin/e_menu.c
===================================================================
--- trunk/e/src/bin/e_menu.c	2011-09-05 14:36:49 UTC (rev 63199)
+++ trunk/e/src/bin/e_menu.c	2011-09-05 14:52:32 UTC (rev 63200)
@@ -1362,6 +1362,7 @@
 		    {
 		       o = e_icon_add(mi->menu->evas);
 		       mi->icon_object = o;
+		       e_icon_scale_size_set(o, e_util_icon_size_normalize(24 * e_scale)); 
                        e_icon_preload_set(mi->icon_object, 1);
 		       e_icon_file_set(o, mi->icon);
 		       e_icon_fill_inside_set(mi->icon_object, 1);

Log:
e17: icon chache (still disabled): keep cache file open for a bit. this really speeds things up :)
  

Author:       jeffdameth
Date:         2011-09-06 14:23:35 -0700 (Tue, 06 Sep 2011)
New Revision: 63239
Trac:         http://trac.enlightenment.org/e/changeset/63239

Modified:
  trunk/e/src/bin/e_icon.c 

Modified: trunk/e/src/bin/e_icon.c
===================================================================
--- trunk/e/src/bin/e_icon.c	2011-09-06 21:15:53 UTC (rev 63238)
+++ trunk/e/src/bin/e_icon.c	2011-09-06 21:23:35 UTC (rev 63239)
@@ -133,10 +133,7 @@
 	  eet_close(_cache->ef);
 
 	if (_cache->load_queue)
-	  {
-	     printf("EEEK!!! e_icons in load queue...\n");
-	     eina_list_free(_cache->load_queue);
-	  }
+	  eina_list_free(_cache->load_queue);
 
 	eina_hash_free(_cache->hash);
 	E_FREE(_cache);
@@ -169,6 +166,7 @@
 	pclip = evas_object_clip_get(sd->obj);
 	evas_object_del(sd->obj);
 #ifdef USE_ICON_CACHE
+	sd->ci = NULL;
 	eina_stringshare_replace(&sd->file, NULL);
 #endif
 	sd->obj = evas_object_image_add(evas_object_evas_get(obj));
@@ -265,6 +263,7 @@
    evas_object_image_file_set(sd->obj, file, NULL);
    if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
      return EINA_FALSE;
+
    if (!_handle_anim(sd))
      {
 	if (sd->preload)
@@ -288,6 +287,7 @@
 	_cache->load_queue = eina_list_remove(_cache->load_queue, sd->ci);
 	eina_stringshare_del(sd->ci->id);
 	E_FREE(sd->ci);
+	sd->ci = NULL;
      }
 #endif
 
@@ -721,6 +721,7 @@
    E_Smart_Data *sd;
 
    if (!(sd = evas_object_smart_data_get(data))) return;
+
    evas_object_smart_callback_call(data, "preloaded", NULL);
    evas_object_show(sd->obj);
    sd->loading = 0;
@@ -742,7 +743,7 @@
 
    sd->obj = evas_object_image_add(evas_object_evas_get(obj));
    evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED,
-				  _e_icon_preloaded, obj);
+   				  _e_icon_preloaded, obj);
    sd->x = 0;
    sd->y = 0;
    sd->w = 0;
@@ -822,7 +823,8 @@
      {
 	evas_object_show(sd->obj);
 #ifdef USE_ICON_CACHE
-	_e_icon_cache_icon_loaded(sd->ci);
+	if (!sd->preload)
+	  _e_icon_cache_icon_loaded(sd->ci);
 #endif
      }
 
@@ -879,6 +881,29 @@
 }
 
 static Eina_Bool
+_e_icon_cache_save(void *data)
+{
+   if (_cache->load_queue)
+     {
+	Cache_Item *ci;
+	Eina_List *l;
+
+	/* EINA_LIST_FOREACH(_cache->load_queue, l, ci)
+	 *   printf("  : %s\n", ci->id); */
+
+	return ECORE_CALLBACK_RENEW;
+     }
+
+   eet_sync(_cache->ef);
+   eet_close(_cache->ef);
+
+   _cache->ef = NULL;
+   _cache->timer = NULL;
+
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool
 _e_icon_cache_find(Evas_Object *obj, const char *file)
 {
    E_Smart_Data *sd;
@@ -915,12 +940,9 @@
 	     free(data);
 	     found = 1;
 	  }
-
+	
 	if ((_cache->ef) && !(_cache->timer))
-	  {
-	     eet_close(_cache->ef);
-	     _cache->ef = NULL;
-	  }
+	  _cache->timer = ecore_timer_add(3.0, _e_icon_cache_save, NULL);
 
 	if (found)
 	  return EINA_TRUE;
@@ -957,32 +979,6 @@
    return EINA_FALSE;
 }
 
-static Eina_Bool
-_e_icon_cache_save(void *data)
-{
-   if (_cache->load_queue)
-     {
-	printf("wating for icon load queue to write\n");
-	Cache_Item *ci;
-	Eina_List *l;
-
-	EINA_LIST_FOREACH(_cache->load_queue, l, ci)
-	  printf("  : %s\n", ci->id);
-
-	return ECORE_CALLBACK_RENEW;
-     }
-
-   eet_sync(_cache->ef);
-   eet_close(_cache->ef);
-
-   _cache->ef = NULL;
-   _cache->timer = NULL;
-
-   printf("icon cache written\n");
-
-   return ECORE_CALLBACK_CANCEL;
-}
-
 static void
 _e_icon_cache_icon_try_next(Cache_Item *ci)
 {
@@ -1034,7 +1030,10 @@
       preloading again with the next. */
 
    if (sd->ci->icon == obj)
-     _e_icon_cache_icon_try_next(sd->ci);
+     {
+	_e_icon_cache_icon_try_next(sd->ci);
+	sd->ci = NULL;
+     }
    else
      {
 	sd->ci->objs = eina_list_remove(sd->ci->objs, data);
@@ -1063,7 +1062,7 @@
 				       _e_icon_obj_del, ci->obj);
    evas_object_smart_callback_call(ci->obj, "preloaded", NULL);
 
-   printf("icon loaded %p, %s\n", data, ci->id);
+   DBG("icon loaded %p, %s\n", data, ci->id);
 
    sd = evas_object_smart_data_get(ci->obj);
    sd->ci = NULL;

Log:
e17: revert r63099, causes issues with tiling
  

Author:       jeffdameth
Date:         2011-09-12 04:27:05 -0700 (Mon, 12 Sep 2011)
New Revision: 63347
Trac:         http://trac.enlightenment.org/e/changeset/63347

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-09-12 09:23:38 UTC (rev 63346)
+++ trunk/e/src/bin/e_border.c	2011-09-12 11:27:05 UTC (rev 63347)
@@ -6927,7 +6927,6 @@
    if (bd->new_client)
      {
         E_Event_Border_Add *ev;
-        E_Border_Pending_Move_Resize *pnd;
 
         ev = E_NEW(E_Event_Border_Add, 1);
         ev->border = bd;
@@ -6937,32 +6936,6 @@
 
         if ((!bd->lock_border) || (!bd->client.border.name))
           bd->client.border.changed = 1;
-
-        EINA_LIST_FREE(bd->pending_move_resize, pnd)
-          {
-             if ((!bd->lock_client_location) && (pnd->move))
-               {
-                  bd->x = pnd->x;
-                  bd->y = pnd->y;
-                  bd->changes.pos = 1;
-                  bd->placed = 1;
-                  if (pnd->without_border)
-                    {
-                       bd->x -= bd->client_inset.l;
-                       bd->y -= bd->client_inset.t;
-                    }
-               }
-             if ((!bd->lock_client_size) && (pnd->resize))
-               {
-                  bd->w = pnd->w + (bd->client_inset.l + bd->client_inset.r);
-                  bd->h = pnd->h + (bd->client_inset.t + bd->client_inset.b);
-                  bd->client.w = pnd->w;
-                  bd->client.h = pnd->h;
-                  bd->changes.size = 1;
-               }
-
-             free(pnd);
-          }
      }
 
    /* PRE_POST_FETCH calls e_remember apply for new client */
@@ -7189,6 +7162,7 @@
 _e_border_eval(E_Border *bd)
 {
    E_Event_Border_Property *event;
+   E_Border_Pending_Move_Resize *pnd;
    int rem_change = 0;
    int send_event = 1;
 
@@ -7382,6 +7356,32 @@
              bd->changes.pos = 1;
           }
 
+        EINA_LIST_FREE(bd->pending_move_resize, pnd)
+          {
+             if ((!bd->lock_client_location) && (pnd->move))
+               {
+                  bd->x = pnd->x;
+                  bd->y = pnd->y;
+                  bd->changes.pos = 1;
+                  bd->placed = 1;
+                  if (pnd->without_border)
+                    {
+                       bd->x -= bd->client_inset.l;
+                       bd->y -= bd->client_inset.t;
+                    }
+               }
+             if ((!bd->lock_client_size) && (pnd->resize))
+               {
+                  bd->w = pnd->w + (bd->client_inset.l + bd->client_inset.r);
+                  bd->h = pnd->h + (bd->client_inset.t + bd->client_inset.b);
+                  bd->client.w = pnd->w;
+                  bd->client.h = pnd->h;
+                  bd->changes.size = 1;
+               }
+
+             free(pnd);
+          }
+
         /* Recreate state */
         e_hints_window_init(bd);
         if ((bd->client.e.state.centered) &&

Log:
e17: merge config for xsettings
  

Author:       jeffdameth
Date:         2011-09-24 16:31:43 -0700 (Sat, 24 Sep 2011)
New Revision: 63593
Trac:         http://trac.enlightenment.org/e/changeset/63593

Modified:
  trunk/e/src/bin/e_config.c 

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-09-24 22:19:01 UTC (rev 63592)
+++ trunk/e/src/bin/e_config.c	2011-09-24 23:31:43 UTC (rev 63593)
@@ -1189,7 +1189,7 @@
         COPYVAL(backlight.transition);
         IFCFGEND;
 
-        IFCFG(0x0143);
+        IFCFG(0x0144);
         COPYVAL(xsettings.match_e17_theme);
         COPYVAL(xsettings.match_e17_icon_theme);
         IFCFGEND;

Log:
e17: workaround segv when mounting cdrom with udisk. btw opening devices in efm that are already mounted shows empty window
  

Author:       jeffdameth
Date:         2011-09-24 23:53:58 -0700 (Sat, 24 Sep 2011)
New Revision: 63600
Trac:         http://trac.enlightenment.org/e/changeset/63600

Modified:
  trunk/e/src/bin/e_fm.c 

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-09-25 04:43:02 UTC (rev 63599)
+++ trunk/e/src/bin/e_fm.c	2011-09-25 06:53:58 UTC (rev 63600)
@@ -2881,18 +2881,23 @@
 //             printf("E_FM_OP_FILE_DEL\n");
              path = e->data;
              evdir = ecore_file_dir_get(path);
-             if ((sd->id == e->ref_to) && (!strcmp(dir, evdir)))
+             if ((dir) && (evdir) && (sd->id == e->ref_to) && (!strcmp(dir, evdir)))
                {
                   _e_fm2_live_file_del
                     (obj, ecore_file_file_get(path));
                }
-             free(evdir);
+             if (evdir) free(evdir);
              break;
 
            case E_FM_OP_MONITOR_END: /*mon dir del*/
 //             printf("E_FM_OP_MONITOR_END\n");
              path = e->data;
-             if ((sd->id == e->ref_to) && (!strcmp(dir, path)))
+             /* FIXME dir should not be null but can. fix segv
+                when mounting cdrom with udisk here
+                btw monitor end seems to be a strange event for
+                mounting disks.
+             */
+             if ((dir) && (path) && (sd->id == e->ref_to) && (!strcmp(dir, path)))
                {
                   dels = eina_list_append(dels, obj);
                }

Log:
e17: find .desktops for libreoffice
  

Author:       jeffdameth
Date:         2011-10-11 13:10:29 -0700 (Tue, 11 Oct 2011)
New Revision: 63989
Trac:         http://trac.enlightenment.org/e/changeset/63989

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-10-11 19:41:54 UTC (rev 63988)
+++ trunk/e/src/bin/e_border.c	2011-10-11 20:10:29 UTC (rev 63989)
@@ -6365,6 +6365,7 @@
         if (pname) eina_stringshare_del(pname);
         if (pclass) eina_stringshare_del(pclass);
         bd->client.icccm.fetch.name_class = 0;
+        bd->changes.icon = 1;
         rem_change = 1;
      }
    if (bd->client.icccm.fetch.state)
@@ -7776,6 +7777,17 @@
           }
         if (!bd->desktop)
           {
+             /* libreoffice and maybe others match window class
+                with .desktop file name */
+             if (bd->client.icccm.class)
+               {
+                  char buf[128];
+                  snprintf(buf, sizeof(buf), "%s.desktop", bd->client.icccm.class);
+                  bd->desktop = efreet_util_desktop_file_id_find(buf);
+               }             
+          }
+        if (!bd->desktop)
+          {
              bd->desktop = e_exec_startup_id_pid_find(bd->client.netwm.startup_id,
                                                       bd->client.netwm.pid);
              if (bd->desktop) efreet_desktop_ref(bd->desktop);

Log:
e17/xsettings: fix theme option
  - started to provide dpi setting, not enabled yet
  

Author:       jeffdameth
Date:         2011-11-03 14:22:23 -0700 (Thu, 03 Nov 2011)
New Revision: 64711
Trac:         http://trac.enlightenment.org/e/changeset/64711

Modified:
  trunk/e/src/bin/e_xsettings.c 

Modified: trunk/e/src/bin/e_xsettings.c
===================================================================
--- trunk/e/src/bin/e_xsettings.c	2011-11-03 17:21:23 UTC (rev 64710)
+++ trunk/e/src/bin/e_xsettings.c	2011-11-03 21:22:23 UTC (rev 64711)
@@ -51,8 +51,9 @@
 static Eina_List *settings = NULL;
 static Eina_Bool running = EINA_FALSE;
 static const char _setting_icon_theme_name[] = "Net/IconThemeName";
-static const char _setting_theme_name[]	     = "Net/ThemeName";
-static const char _setting_font_name[]	     = "Gtk/FontName";
+static const char _setting_theme_name[]      = "Net/ThemeName";
+static const char _setting_font_name[]       = "Gtk/FontName";
+static const char _setting_xft_dpi[]         = "Xft/DPI";
 
 static Ecore_X_Atom
 _e_xsettings_atom_screen_get(int screen_num)
@@ -77,7 +78,7 @@
    ret = (cur_selection == sm->selection);
    if (!ret)
      fprintf(stderr, "XSETTINGS: tried to set selection to %#x, but got %#x\n",
-	     sm->selection, cur_selection);
+             sm->selection, cur_selection);
 
    return ret;
 }
@@ -114,15 +115,15 @@
 
    if (!_e_xsettings_selection_owner_set(sm))
      {
-	ecore_x_window_free(sm->selection);
-	sm->selection = 0;
-	return 0;
+        ecore_x_window_free(sm->selection);
+        sm->selection = 0;
+        return 0;
      }
 
    ecore_x_client_message32_send(e_manager_current_get()->root, _atom_manager,
-				 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
-				 ecore_x_current_time_get(), atom,
-				 sm->selection, 0, 0);
+                                 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
+                                 ecore_x_current_time_get(), atom,
+                                 sm->selection, 0, 0);
 
    _e_xsettings_apply(sm);
 
@@ -141,7 +142,7 @@
      fputs("XSETTINGS: activate success!\n", stderr);
    else
      fprintf(stderr, "XSETTINGS: activate failure! retrying in %0.1f seconds\n",
-	     RETRY_TIMEOUT);
+             RETRY_TIMEOUT);
 
    if (!ret)
      return ECORE_CALLBACK_RENEW;
@@ -169,36 +170,36 @@
 
    EINA_LIST_FOREACH(settings, l, s)
      {
-	if (s->type != SETTING_TYPE_STRING) continue;
-	if (s->name == name) break;
+        if (s->type != SETTING_TYPE_STRING) continue;
+        if (s->name == name) break;
      }
    if (!value)
      {
-	if (!s) return;
-	DBG("remove %s\n", name);
-	eina_stringshare_del(name);
-	eina_stringshare_del(s->name);
-	eina_stringshare_del(s->s.value);
-	settings = eina_list_remove(settings, s);
-	E_FREE(s);
-	return;
+        if (!s) return;
+        DBG("remove %s\n", name);
+        eina_stringshare_del(name);
+        eina_stringshare_del(s->name);
+        eina_stringshare_del(s->s.value);
+        settings = eina_list_remove(settings, s);
+        E_FREE(s);
+        return;
      }
    if (s)
      {
-	DBG("update %s %s\n", name, value);
-	eina_stringshare_del(name);
-	eina_stringshare_replace(&s->s.value, value);
+        DBG("update %s %s\n", name, value);
+        eina_stringshare_del(name);
+        eina_stringshare_replace(&s->s.value, value);
      }
    else
      {
-	DBG("add %s %s\n", name, value);
-	s = E_NEW(Setting, 1);
-	s->type = SETTING_TYPE_STRING;
-	s->name = name;
-	s->s.value = eina_stringshare_add(value);
-	settings = eina_list_append(settings, s);
+        DBG("add %s %s\n", name, value);
+        s = E_NEW(Setting, 1);
+        s->type = SETTING_TYPE_STRING;
+        s->name = name;
+        s->s.value = eina_stringshare_add(value);
+        settings = eina_list_append(settings, s);
      }
-   
+
    /* type + pad + name-len + last-change-serial + str_len */
    s->length = 12;
    s->length += OFFSET_ADD(strlen(name));
@@ -206,9 +207,9 @@
    s->last_change = ecore_x_current_time_get();
 }
 
-/* not used!!!
+
 static void
-_e_xsettings_int_set(const char *name, int value)
+_e_xsettings_int_set(const char *name, int value, Eina_Bool set)
 {
    Setting *s;
    Eina_List *l;
@@ -218,41 +219,40 @@
 
    EINA_LIST_FOREACH(settings, l, s)
      {
-	if (s->type != SETTING_TYPE_INT) continue;
-	if (s->name == name) break;
+        if (s->type != SETTING_TYPE_INT) continue;
+        if (s->name == name) break;
      }
-   if (!value)
+   if (!set)
      {
-	if (!s) return;
-	DBG("remove %s\n", name);
-	eina_stringshare_del(name);
-	eina_stringshare_del(s->name);
-	settings = eina_list_remove(settings, s);
-	E_FREE(s);
-	return;
+        if (!s) return;
+        DBG("remove %s\n", name);
+        eina_stringshare_del(name);
+        eina_stringshare_del(s->name);
+        settings = eina_list_remove(settings, s);
+        E_FREE(s);
+        return;
      }
    if (s)
      {
-	DBG("update %s %d\n", name, value);
-	eina_stringshare_del(name);
-	s->i.value = value;
+        DBG("update %s %d\n", name, value);
+        eina_stringshare_del(name);
+        s->i.value = value;
      }
    else
      {
-	DBG("add %s %d\n", name, value);
-	s = E_NEW(Setting, 1);
-	s->type = SETTING_TYPE_INT;
-	s->name = name;
-	s->i.value = value;
-	settings = eina_list_append(settings, s);
+        DBG("add %s %d\n", name, value);
+        s = E_NEW(Setting, 1);
+        s->type = SETTING_TYPE_INT;
+        s->name = name;
+        s->i.value = value;
+        settings = eina_list_append(settings, s);
      }
-   
+
    // type + pad + name-len + last-change-serial + value
    s->length = 12;
    s->length += OFFSET_ADD(strlen(name));
 }
-*/
-   
+
 static unsigned char *
 _e_xsettings_copy(unsigned char *buffer, Setting *s)
 {
@@ -280,30 +280,30 @@
    switch (s->type)
      {
       case SETTING_TYPE_INT:
-	 *(CARD32 *)(buffer) = s->i.value;
-	 buffer += 4;
-	 break;
+         *(CARD32 *)(buffer) = s->i.value;
+         buffer += 4;
+         break;
 
       case SETTING_TYPE_STRING:
-	 str_len = strlen (s->s.value);
-	 *(CARD32 *)(buffer) = str_len;
-	 buffer += 4;
+         str_len = strlen (s->s.value);
+         *(CARD32 *)(buffer) = str_len;
+         buffer += 4;
 
-	 memcpy(buffer, s->s.value, str_len);
-	 buffer += str_len;
+         memcpy(buffer, s->s.value, str_len);
+         buffer += str_len;
 
-	 len = OFFSET_ADD(str_len) - str_len;
-	 memset(buffer, 0, len);
-	 buffer += len;
-	 break;
+         len = OFFSET_ADD(str_len) - str_len;
+         memset(buffer, 0, len);
+         buffer += len;
+         break;
 
       case SETTING_TYPE_COLOR:
-	 *(CARD16 *)(buffer) = s->c.red;
-	 *(CARD16 *)(buffer + 2) = s->c.green;
-	 *(CARD16 *)(buffer + 4) = s->c.blue;
-	 *(CARD16 *)(buffer + 6) = s->c.alpha;
-	 buffer += 8;
-	 break;
+         *(CARD16 *)(buffer) = s->c.red;
+         *(CARD16 *)(buffer + 2) = s->c.green;
+         *(CARD16 *)(buffer + 4) = s->c.blue;
+         *(CARD16 *)(buffer + 6) = s->c.alpha;
+         buffer += 8;
+         break;
      }
 
    return buffer;
@@ -323,7 +323,7 @@
 
    pos = data = malloc(len);
    if (!data) return;
-   
+
 #if __BYTE_ORDER == __LITTLE_ENDIAN
    *pos = LSBFirst;
 #else
@@ -340,9 +340,9 @@
      pos = _e_xsettings_copy(pos, s);
 
    ecore_x_window_prop_property_set(sm->selection,
-				    _atom_xsettings,
-				    _atom_xsettings,
-				    8, data, len);
+                                    _atom_xsettings,
+                                    _atom_xsettings,
+                                    8, data, len);
    free(data);
 }
 
@@ -363,9 +363,9 @@
 
    if (e_config->xsettings.match_e17_icon_theme)
      {
-	_e_xsettings_string_set(_setting_icon_theme_name,
-			      ev->icon_theme);
-	_e_xsettings_update();
+        _e_xsettings_string_set(_setting_icon_theme_name,
+                              ev->icon_theme);
+        _e_xsettings_update();
      }
 
    return ECORE_CALLBACK_PASS_ON;
@@ -377,15 +377,16 @@
 {
    if (e_config->xsettings.match_e17_icon_theme)
      {
-	_e_xsettings_string_set(_setting_icon_theme_name,
-			      e_config->icon_theme);
-	return;
+        _e_xsettings_string_set(_setting_icon_theme_name,
+                                e_config->icon_theme);
+        return;
      }
-   else if (e_config->xsettings.net_icon_theme_name)
+
+   if (e_config->xsettings.net_icon_theme_name)
      {
-	_e_xsettings_string_set(_setting_icon_theme_name,
-			      e_config->xsettings.net_icon_theme_name);
-	return;
+        _e_xsettings_string_set(_setting_icon_theme_name,
+                              e_config->xsettings.net_icon_theme_name);
+        return;
      }
 
    _e_xsettings_string_set(_setting_icon_theme_name, NULL);
@@ -396,22 +397,42 @@
 {
    if (e_config->xsettings.match_e17_theme)
      {
-	E_Config_Theme *ct;
-	if ((ct = e_theme_config_get("theme")))
-	  {
-	     char *theme;
-	     if ((theme = edje_file_data_get(ct->file, "gtk-theme")))
-	       {
-		  _e_xsettings_string_set(_setting_theme_name, theme);
-		  return;
-	       }
-	  }
+        E_Config_Theme *ct;
+        if ((ct = e_theme_config_get("theme")))
+          {
+             char *theme;
+
+             if ((theme = edje_file_data_get(ct->file, "gtk-theme")))
+               {
+                  char buf[4096], *dir;
+                  Eina_List *xdg_dirs, *l;
+
+                  e_user_homedir_snprintf(buf, sizeof(buf), ".themes/%s", theme);
+                  if (ecore_file_exists(buf))
+                    {
+                       _e_xsettings_string_set(_setting_theme_name, theme);
+                       return;
+                    }
+
+                  xdg_dirs = efreet_data_dirs_get();
+                  EINA_LIST_FOREACH(xdg_dirs, l, dir)
+                    {
+                       snprintf(buf, sizeof(buf), "%s/themes/%s", dir, theme);
+                       if (ecore_file_exists(buf))
+                         {
+                            _e_xsettings_string_set(_setting_theme_name, theme);
+                            return;
+                         }
+                    }
+               }
+          }
      }
-   else if (e_config->xsettings.net_theme_name)
+
+   if (e_config->xsettings.net_theme_name)
      {
-	_e_xsettings_string_set(_setting_theme_name,
-			      e_config->xsettings.net_theme_name);
-	return;
+        _e_xsettings_string_set(_setting_theme_name,
+                              e_config->xsettings.net_theme_name);
+        return;
      }
 
    _e_xsettings_string_set(_setting_theme_name, NULL);
@@ -422,7 +443,7 @@
 {
    E_Font_Default *efd;
    E_Font_Properties *efp;
-   
+
    efd = e_font_default_get("application");
 
    if (efd && efd->font)
@@ -450,6 +471,17 @@
 }
 
 static void
+_e_xsettings_xft_set(void)
+{
+
+   if (e_config->scale.use_dpi)
+     _e_xsettings_int_set(_setting_xft_dpi, e_config->scale.base_dpi, EINA_TRUE);
+   else
+     _e_xsettings_int_set(_setting_xft_dpi, 0, EINA_FALSE);
+
+}
+
+static void
 _e_xsettings_start(void)
 {
    Eina_List *l;
@@ -460,20 +492,20 @@
    _e_xsettings_theme_set();
    _e_xsettings_icon_theme_set();
    _e_xsettings_font_set();
-   
+
    EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	Settings_Manager *sm = E_NEW(Settings_Manager, 1);
-	sm->man = man;
+        Settings_Manager *sm = E_NEW(Settings_Manager, 1);
+        sm->man = man;
 
-	if (!_e_xsettings_activate(sm))
-	  _e_xsettings_retry(sm);
+        if (!_e_xsettings_activate(sm))
+          _e_xsettings_retry(sm);
 
-	managers = eina_list_append(managers, sm);
+        managers = eina_list_append(managers, sm);
      }
 
    handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_CONFIG_ICON_THEME,
-								 _cb_icon_theme_change, NULL));   
+                                                                 _cb_icon_theme_change, NULL));
 
    running = EINA_TRUE;
 }
@@ -489,19 +521,19 @@
 
    EINA_LIST_FREE(managers, sm)
      {
-	if (sm->timer_retry)
-	  ecore_timer_del(sm->timer_retry);
+        if (sm->timer_retry)
+          ecore_timer_del(sm->timer_retry);
 
-	_e_xsettings_deactivate(sm);
+        _e_xsettings_deactivate(sm);
 
-	E_FREE(sm);
+        E_FREE(sm);
      }
 
    EINA_LIST_FREE(settings, s)
      {
-	if (s->name) eina_stringshare_del(s->name);
-	if (s->s.value) eina_stringshare_del(s->s.value);
-	E_FREE(s);
+        if (s->name) eina_stringshare_del(s->name);
+        if (s->s.value) eina_stringshare_del(s->s.value);
+        E_FREE(s);
      }
 
    EINA_LIST_FREE(handlers, h)
@@ -518,7 +550,7 @@
 
    if (e_config->xsettings.enabled)
      _e_xsettings_start();
-   
+
    return 1;
 }
 
@@ -526,30 +558,28 @@
 e_xsettings_shutdown(void)
 {
    _e_xsettings_stop();
-   
+
    return 1;
 }
 
 EAPI void
 e_xsettings_config_update(void)
 {
-   DBG("update\n");
-   
    if (!e_config->xsettings.enabled)
      {
         _e_xsettings_stop();
         return;
      }
-   
+
    if (!running)
      {
         _e_xsettings_start();
-     }        
+     }
    else
      {
         _e_xsettings_theme_set();
         _e_xsettings_icon_theme_set();
         _e_xsettings_font_set();
         _e_xsettings_update();
-     }        
+     }
 }

Log:
e17: remove debug printf
  

Author:       jeffdameth
Date:         2011-12-27 05:23:07 -0800 (Tue, 27 Dec 2011)
New Revision: 66571
Trac:         http://trac.enlightenment.org/e/changeset/66571

Modified:
  trunk/e/src/bin/e_border.c 

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-12-27 12:03:03 UTC (rev 66570)
+++ trunk/e/src/bin/e_border.c	2011-12-27 13:23:07 UTC (rev 66571)
@@ -9074,7 +9074,6 @@
             (y - warp_y) > 5 || (y - warp_y) < -5)
           {
              /* User moved the mouse, so stop warping */
-             printf("user stopped pinter warp\n");
              warp_to = 0;
              goto cleanup;
           }

Log:
e17/shelf: fix wrong autohide with systray on second zone
  

Author:       jeffdameth
Date:         2012-12-21 07:54:45 -0800 (Fri, 21 Dec 2012)
New Revision: 81557
Trac:         http://trac.enlightenment.org/e/changeset/81557

Modified:
  trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2012-12-21 15:48:56 UTC (rev 81556)
+++ trunk/e/src/bin/e_shelf.c	2012-12-21 15:54:45 UTC (rev 81557)
@@ -1967,7 +1967,7 @@
         if (!inside)
           {
              inside = E_INSIDE(ev->root.x, ev->root.y, es->zone->x, es->zone->y, es->zone->w + 4, es->zone->h + 4);
-             x = ev->root.x - es->zone->x, y = ev->root.y - es->zone->x;
+             x = ev->root.x - es->zone->x, y = ev->root.y - es->zone->y;
              if (inside)
                inside = (
                          ((E_INSIDE(x, y, es->x, es->y, es->w, es->h)) ||