Enlightenment

Author:       raster
Date:         2008-08-25 21:12:41 -0700 (Mon, 25 Aug 2008)
New Revision: 35676

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

emove debug printf's



Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2008-08-26 03:04:07 UTC (rev 35675)
+++ trunk/e/src/bin/e_border.c	2008-08-26 04:12:41 UTC (rev 35676)
@@ -1369,14 +1369,9 @@
     * focus as we do - so simply abort any focuse set on such windows */
    /* be strict about accepting focus hint */
 //   printf(" 2accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
-   printf("e_border_focus_set_with_pointer .. %i %i\n",
-	  bd->client.icccm.accepts_focus,
-	  bd->client.icccm.take_focus);
    if ((!bd->client.icccm.accepts_focus) &&
        (!bd->client.icccm.take_focus)) return;
-   printf("e_border_focus_set_with_pointer A\n");
    if (bd->lock_focus_out) return;
-   printf("e_border_focus_set_with_pointer B\n");
  
    /* Try to grab the pointer to make sure it's not "in use" */
 /* 
@@ -1398,7 +1393,6 @@
      }
    else if (e_config->focus_policy == E_FOCUS_CLICK)
      {
-	printf("e_border_focus_set_with_pointer C\n");
 	e_border_focus_set(bd, 1, 1);
      }
    else
@@ -1426,13 +1420,10 @@
    if ((!bd->client.icccm.accepts_focus) &&
        (!bd->client.icccm.take_focus))
 	return;
-   printf("  A\n");
    if ((set) && (focus) && (bd->lock_focus_out)) return;
-   printf("  B\n");
    /* dont focus an iconified window. that's silly! */
    if ((focus) && (bd->iconic))
      return;
-   printf("  C\n");
    if ((bd->modal) && (bd->modal != bd))
      {
 	e_border_focus_set(bd->modal, focus, set);
@@ -1443,7 +1434,6 @@
 	e_border_focus_set(bd->leader->modal, focus, set);
 	return;
      }
-   printf("  D\n");
 
    if ((focus) && (set) && (!bd->focused))
      {
@@ -1455,10 +1445,8 @@
 ////		  e_border_focus_latest_set(bd);
 		  bd->want_focus = 1;
 		  bd->changed = 1;
-		  printf("    Ret1\n");
 		  return;
 	       }
-	     printf("    Foc1\n");
 	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
 	     return;
 	  }
@@ -1470,15 +1458,12 @@
 ////		  e_border_focus_latest_set(bd);
 		  bd->want_focus = 1;
 		  bd->changed = 1;
-		  printf("    Ret2\n");
 		  return;
 	       }
-	     printf("    Foc2\n");
 	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
 	     return;
 	  }
      }
-   printf("  E\n");
 
    if ((bd->visible) && (bd->changes.visible))
      {  
@@ -1492,7 +1477,6 @@
 	bd->changed = 1;
 	return;
      }
-   printf("  F\n");
    if ((focus) && (!bd->focused))
      {
 	if ((bd->visible) && (bd->changes.visible))
@@ -1500,8 +1484,6 @@
 ////	     e_border_focus_latest_set(bd);
 	     bd->want_focus = 1;
 	     bd->changed = 1;
-	     printf("    %i %i needs to be visible - abort now\n",
-		    bd->visible, bd->changes.visible);
 	     return;
 	  }
 //	if (bd->visible)
@@ -1517,7 +1499,6 @@
 	if (bd->icon_object)
 	  edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
 	e_focus_event_focus_in(bd);
-	printf("F IN %p %s\n", bd, (bd->client.icccm.title ? bd->client.icccm.title : bd->client.netwm.name));
      }
    else if ((!focus) && (bd->focused))
      {
@@ -1534,9 +1515,7 @@
 	     ecore_timer_del(bd->raise_timer);
 	     bd->raise_timer = NULL;
 	  }
-	printf("F OUT %p %s\n", bd, (bd->client.icccm.title ? bd->client.icccm.title : bd->client.netwm.name));
      }
-   printf("  G\n");
    if (((bd->focused) && (!focus)) || ((!bd->focused) && (focus)))
      focus_changed = 1;
    bd->focused = focus;
@@ -1600,7 +1579,6 @@
 		       focused->raise_timer = NULL;
 		    }
 		  focused = NULL;
-		  printf("F OUT %p %s\n", bd, (bd->client.icccm.title ? bd->client.icccm.title : bd->client.netwm.name));
 	       }
 	  }
 	e_hints_active_window_set(bd->zone->container->manager, bd);
@@ -1668,7 +1646,6 @@
 			     _e_border_event_border_focus_out_free, NULL);
 	  }
      }
-   printf("  Z\n");
 }
 
 EAPI void
@@ -2553,7 +2530,6 @@
 			    ecore_x_window_show(bd->win);
 			 }
 		       bd->changes.visible = 0;
-		       printf("reset visible changes to 0 A\n");
 		    }
 	       }
 	     e_container_border_list_free(bl);
@@ -2580,7 +2556,6 @@
 		       ecore_x_window_hide(bd->win);
 		       ecore_evas_hide(bd->bg_ecore_evas);
 		       bd->changes.visible = 0;
-		       printf("reset visible changes to 0 B\n");
 		    }
 		  if (bd->changed) _e_border_eval(bd);
 		  if ((bd->changes.visible) && (bd->visible) && 
@@ -2599,7 +2574,6 @@
 			    ecore_x_window_show(bd->win);
 			 }
 		       bd->changes.visible = 0;
-		       printf("reset visible changes to 0 C\n");
 		    }
 	       }
 	     e_container_border_list_free(bl);
@@ -6870,7 +6844,6 @@
 	  }
 	bd->changes.visible = 0;
 	rem_change = 1;
-	printf("reset visible changes to 0 C\n");
      }
 
    if (bd->changes.icon)
@@ -6947,7 +6920,6 @@
 	     bd->want_focus = 0;
 	     if (!bd->lock_focus_out)
 	       {
-		  printf("FF needs in... %p BLAH\n", bd);
 		  e_border_focus_set_with_pointer(bd);
 	       }
 	  }

Modified: trunk/e/src/bin/e_grabinput.c
===================================================================
--- trunk/e/src/bin/e_grabinput.c	2008-08-26 03:04:07 UTC (rev 35675)
+++ trunk/e/src/bin/e_grabinput.c	2008-08-26 04:12:41 UTC (rev 35676)
@@ -96,13 +96,11 @@
 {
    if (grab_key_win != 0)
      {
-	printf("      A\n");
 	focus_win = win;
 	focus_method = method;
      }
    else
      {
-	printf("      B\n");
 	_e_grabinput_focus(win, method);
      }
 }
@@ -120,23 +118,18 @@
    switch (method)
      {
       case E_FOCUS_METHOD_NO_INPUT:
-	printf("--a\n");
 	break;
       case E_FOCUS_METHOD_LOCALLY_ACTIVE:
-	printf("--b\n");
 	ecore_x_window_focus(win);
 	ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
 	break;
       case E_FOCUS_METHOD_GLOBALLY_ACTIVE:
-	printf("--c\n");
 	ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
 	break;
       case E_FOCUS_METHOD_PASSIVE:
-	printf("--d\n");
 	ecore_x_window_focus(win);
 	break;
       default:
-	printf("--x\n");
 	break;
      }
    last_focus_time = ecore_time_get();

Author:       raster
Date:         2008-08-28 20:30:45 -0700 (Thu, 28 Aug 2008)
New Revision: 35726

Modified:
  trunk/e/src/bin/e_border.c trunk/e/src/bin/e_desk.c trunk/e/src/bin/e_table.c 
Log:

some debugging printfs - also avoid feeding focus back to the last focused
window if its one of a set of types.



Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2008-08-29 02:48:36 UTC (rev 35725)
+++ trunk/e/src/bin/e_border.c	2008-08-29 03:30:45 UTC (rev 35726)
@@ -1424,6 +1424,7 @@
    /* dont focus an iconified window. that's silly! */
    if ((focus) && (bd->iconic))
      return;
+   printf("  actually try...\n");
    if ((bd->modal) && (bd->modal != bd))
      {
 	e_border_focus_set(bd->modal, focus, set);
@@ -4252,6 +4253,7 @@
 	if (e->detail == ECORE_X_EVENT_DETAIL_ANCESTOR) return 1;
 	else if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1;
      }
+   printf("fout 1\n");
    e_border_focus_set(bd, 0, 0);
    return 1;
 }

Modified: trunk/e/src/bin/e_desk.c
===================================================================
--- trunk/e/src/bin/e_desk.c	2008-08-29 02:48:36 UTC (rev 35725)
+++ trunk/e/src/bin/e_desk.c	2008-08-29 03:30:45 UTC (rev 35726)
@@ -361,10 +361,21 @@
    Evas_List *l = NULL;
    E_Border *bd;
 
+   
+   printf("== e_desk_last_focused_focus\n");
    for (l = e_border_focus_stack_get(); l; l = l->next)
      {
 	bd = l->data;
-	if ((!bd->iconic) && (bd->visible) && (bd->desk == desk))
+	printf("LAST %p ic=%i vis=%i desk=%p==%p\n",
+	       bd, bd->iconic, bd->visible, bd->desk, desk);
+	if ((!bd->iconic) && (bd->visible) && (bd->desk == desk) &&
+	    (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)
+	    )
 	  {
 	     /* this was the window last focused in this desktop */
              if (!bd->lock_focus_out)

Modified: trunk/e/src/bin/e_table.c
===================================================================
--- trunk/e/src/bin/e_table.c	2008-08-29 02:48:36 UTC (rev 35725)
+++ trunk/e/src/bin/e_table.c	2008-08-29 03:30:45 UTC (rev 35726)
@@ -322,7 +322,7 @@
 	obj = l->data;
 	ti = evas_object_data_get(obj, "e_table_data");
 	if (ti->expand_w) expandw++;
-	if (ti->expand_w) expandh++;
+	if (ti->expand_h) expandh++;
      }
    if (expandw == 0)
      {

Author:       raster
Date:         2008-08-31 23:23:20 -0700 (Sun, 31 Aug 2008)
New Revision: 35768

Modified:
  trunk/e/src/bin/e_pointer.c 
Log:

my bad! fix.



Modified: trunk/e/src/bin/e_pointer.c
===================================================================
--- trunk/e/src/bin/e_pointer.c	2008-09-01 04:56:31 UTC (rev 35767)
+++ trunk/e/src/bin/e_pointer.c	2008-09-01 06:23:20 UTC (rev 35768)
@@ -333,7 +333,10 @@
    
    if (p->idle_timer) ecore_timer_del(p->idle_timer);
    if (p->idle_poller) ecore_poller_del(p->idle_poller);
-   
+
+   p->type = NULL;
+   p->idle_timer = NULL;
+   p->idle_poller = NULL;
    free(p);
 }
 
@@ -478,7 +481,11 @@
 {
    /* we got some mouse event - if there was an idle timer emit an active
     * signal as we WERE idle, NOW we are active */
-   if (p->idle_timer) ecore_timer_del(p->idle_timer);
+   if (p->idle_timer)
+     {
+	ecore_timer_del(p->idle_timer);
+	p->idle_timer = NULL;
+     }
    if (p->idle_poller)
      {
 	ecore_poller_del(p->idle_poller);

Author:       raster
Date:         2008-09-04 06:57:52 -0700 (Thu, 04 Sep 2008)
New Revision: 35826

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

support ilist-stule stacking info in odd/even items



Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2008-09-04 13:37:09 UTC (rev 35825)
+++ trunk/e/src/bin/e_fm.c	2008-09-04 13:57:52 UTC (rev 35826)
@@ -3610,6 +3610,8 @@
    evas_object_stack_below(ic->obj, ic->sd->drop);
    if (ic->sd->config->view.mode == E_FM2_VIEW_MODE_LIST)
      {
+	const char *stacking;
+	
 //        if (ic->sd->config->icon.fixed.w)
 //	  {
 	if (ic->odd)
@@ -3620,6 +3622,15 @@
 	  _e_fm2_theme_edje_object_set(ic->sd, ic->obj,
 				       "base/theme/widgets",
 				       "list/fixed");
+	stacking = edje_object_data_get(ic->obj, "stacking");
+	if (stacking)
+	  {
+	     if (!strcmp(stacking, "below"))
+	       evas_object_stack_above(ic->obj, ic->sd->underlay);
+	     else if (!strcmp(stacking, "above"))
+	       evas_object_stack_below(ic->obj, ic->sd->drop);
+	  }
+	
 //	  }
 //	else
 //	  {
@@ -3661,11 +3672,16 @@
 
    if (ic->selected)
      {
+	const char *selectraise;
+	
 	/* FIXME: need new signal to INSTANTLY activate - no anim */
 	/* FIXME: while listing dirs need to use icons in-place and not
 	 * unrealize and re-realize */
 	edje_object_signal_emit(ic->obj, "e,state,selected", "e");
 	edje_object_signal_emit(ic->obj_icon, "e,state,selected", "e");
+	selectraise = edje_object_data_get(ic->obj, "selectraise");
+        if ((selectraise) && (!strcmp(selectraise, "on")))
+	  evas_object_stack_below(ic->obj, ic->sd->drop);
      }
 //   printf("realize %s full = %i\n", ic->info.file, (int)ic->info.removable_full);
    if (ic->info.removable_full)
@@ -3780,9 +3796,14 @@
    ic->last_selected = 1;
    if (ic->realized)
      {
+	const char *selectraise;
+	
 	edje_object_signal_emit(ic->obj, "e,state,selected", "e");
 	edje_object_signal_emit(ic->obj_icon, "e,state,selected", "e");
 	evas_object_stack_below(ic->obj, ic->sd->drop);
+	selectraise = edje_object_data_get(ic->obj, "selectraise");
+        if ((selectraise) && (!strcmp(selectraise, "on")))
+	  evas_object_stack_below(ic->obj, ic->sd->drop);
      }
 }
 
@@ -3794,8 +3815,17 @@
    ic->last_selected = 0;
    if (ic->realized)
      {
+	const char *stacking, *selectraise;
+	
 	edje_object_signal_emit(ic->obj, "e,state,unselected", "e");
 	edje_object_signal_emit(ic->obj_icon, "e,state,unselected", "e");
+        stacking = edje_object_data_get(ic->obj, "stacking");
+	selectraise = edje_object_data_get(ic->obj, "selectraise");
+	if ((selectraise) && (!strcmp(selectraise, "on")))
+	  {
+	     if ((stacking) && (!strcmp(stacking, "below")))
+	       evas_object_stack_above(ic->obj, ic->sd->underlay);
+	  }
      }
 }

Author:       raster
Date:         2008-09-04 19:12:41 -0700 (Thu, 04 Sep 2008)
New Revision: 35835

Modified:
  trunk/e/src/bin/e_int_config_modules.c 
Log:

useless evas_list_free()'s



Modified: trunk/e/src/bin/e_int_config_modules.c
===================================================================
--- trunk/e/src/bin/e_int_config_modules.c	2008-09-05 00:40:12 UTC (rev 35834)
+++ trunk/e/src/bin/e_int_config_modules.c	2008-09-05 02:12:41 UTC (rev 35835)
@@ -142,7 +142,6 @@
 	if (!ecore_file_is_dir(epd->dir)) continue;
 	_load_modules(epd->dir);
      }
-   if (l) evas_list_free(l);
    if (mdirs) e_path_dir_list_free(mdirs);
 }
 
@@ -317,12 +316,8 @@
 	       }
 
 	     if (l) count = evas_list_count(l);
-	     if (count < 1) 
-	       {
-		  if (l) evas_list_free(l);
-		  continue;
-	       }
-
+	     else continue;
+	    
 	     /* We have at least one, append header */
 	     e_widget_ilist_header_append(obj, NULL, cft->name);
 
@@ -332,7 +327,11 @@
 
 	     _list_widget_load(obj, l);
 
-	     if (l) evas_list_free(l);
+	     if (l)
+	       {
+		  evas_list_free(l);
+		  l = NULL;
+	       }
 	  }
      }
 
@@ -446,7 +445,6 @@
 	else if (mod->short_name)
 	  e_widget_ilist_append(obj, ic, mod->short_name, NULL, mod, NULL);
      }
-   if (ml) evas_list_free(ml);
 }
 
 static void 
@@ -552,7 +550,6 @@
 	  e_widget_textblock_markup_set(cfdata->o_desc, 
 					_("Description: Unavailable"));
      }
-   if (l) evas_list_free(l);
 }
 
 static void

Author:       raster
Date:         2008-09-09 21:33:57 -0700 (Tue, 09 Sep 2008)
New Revision: 35914

Modified:
  trunk/e/src/bin/e_editable.c 
Log:

removed editable change - breaks entering text!



Modified: trunk/e/src/bin/e_editable.c
===================================================================
--- trunk/e/src/bin/e_editable.c	2008-09-10 04:29:52 UTC (rev 35913)
+++ trunk/e/src/bin/e_editable.c	2008-09-10 04:33:57 UTC (rev 35914)
@@ -876,8 +876,7 @@
 _e_editable_text_insert(Evas_Object *editable, int pos, const char *text)
 {
    E_Editable_Smart_Data *sd;
-   int char_length, unicode_length;
-   int prev_char_length, new_char_length, new_unicode_length;
+   int char_length, unicode_length, prev_length;
    int index;
    int i;
    
@@ -902,48 +901,35 @@
    index = 0;
    for (i = 0; i < pos; i++)
      index = evas_string_char_next_get(sd->text, index, NULL);
-
+   
    if ((unicode_length <= 0) || (char_length <= 0))
      return 0;
    
-   prev_char_length = sd->char_length;
-   new_char_length = sd->char_length + char_length;
-   new_unicode_length = sd->unicode_length + unicode_length;
+   prev_length = sd->char_length;
+   sd->char_length += char_length;
+   sd->unicode_length += unicode_length;
    
-   if (new_char_length > sd->allocated_length)
+   if (sd->char_length > sd->allocated_length)
      {
-	int new_allocated_length = E_EDITABLE_SIZE_TO_ALLOC(new_char_length);
-	char *old = sd->text;
-
 	if (sd->password_mode)
 	  {
 	     /* security -- copy contents into new buffer, and overwrite old contents */
-	     sd->text = malloc(new_allocated_length + 1);
-	     if (!sd->text)
-	       {
-		  sd->text = old;
-		  return 0;
-	       }
-	     memcpy(sd->text, old, prev_char_length + 1);
-	     memset(old, 0, prev_char_length);
+	     char *old = sd->text;
+	     sd->text = malloc(E_EDITABLE_SIZE_TO_ALLOC(sd->char_length) + 1);
+	     memcpy(sd->text, old, sd->char_length + 1);
+	     memset(old, 0, sd->char_length);
 	     free(old);
 	  }
 	else
 	  {
-	     sd->text = realloc(sd->text, new_allocated_length + 1);
-	     if (!sd->text)
-	       {
-		  sd->text = old;
-		  return 0;
-	       }
+	     sd->text = realloc(sd->text,
+                           E_EDITABLE_SIZE_TO_ALLOC(sd->char_length) + 1);
 	  }
-        sd->unicode_length = new_unicode_length;
-        sd->char_length = new_char_length;
-        sd->allocated_length = new_allocated_length;
+        sd->allocated_length = E_EDITABLE_SIZE_TO_ALLOC(sd->char_length);
      }
    
-   if (prev_char_length > index)
-     memmove(&sd->text[index + char_length], &sd->text[index], prev_char_length - index);
+   if (prev_length > index)
+     memmove(&sd->text[index + char_length], &sd->text[index], prev_length - index);
    strncpy(&sd->text[index], text, char_length);
    sd->text[sd->char_length] = '\0';

Author:       raster
Date:         2008-09-09 21:34:42 -0700 (Tue, 09 Sep 2008)
New Revision: 35915

Modified:
  trunk/e/src/bin/e_canvas.c 
Log:

commented out.. scale testing!



Modified: trunk/e/src/bin/e_canvas.c
===================================================================
--- trunk/e/src/bin/e_canvas.c	2008-09-10 04:33:57 UTC (rev 35914)
+++ trunk/e/src/bin/e_canvas.c	2008-09-10 04:34:42 UTC (rev 35915)
@@ -39,6 +39,8 @@
      }
    else if (e_config->font_hinting == 2)
      evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
+// FIXME: testing.   
+//   edje_scale_set(2.0);
 }
 
 EAPI void

Author:       raster
Date:         2008-09-09 23:40:24 -0700 (Tue, 09 Sep 2008)
New Revision: 35923

Modified:
  trunk/e/src/bin/e_canvas.c 
Log:

just testing.



Modified: trunk/e/src/bin/e_canvas.c
===================================================================
--- trunk/e/src/bin/e_canvas.c	2008-09-10 06:39:57 UTC (rev 35922)
+++ trunk/e/src/bin/e_canvas.c	2008-09-10 06:40:24 UTC (rev 35923)
@@ -40,7 +40,7 @@
    else if (e_config->font_hinting == 2)
      evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
 // FIXME: testing.   
-//   edje_scale_set(2.0);
+//   edje_scale_set(1.0);
 }
 
 EAPI void

more eyes on the scale please....

dh

no-reply@... wrote:
> Author:       raster
> Date:         2008-09-09 21:34:42 -0700 (Tue, 09 Sep 2008)
> New Revision: 35915
> 
> Modified:
>   trunk/e/src/bin/e_canvas.c 
> Log:
> 
> commented out.. scale testing!
> 
> 
> 
> Modified: trunk/e/src/bin/e_canvas.c
> ===================================================================
> --- trunk/e/src/bin/e_canvas.c	2008-09-10 04:33:57 UTC (rev 35914)
> +++ trunk/e/src/bin/e_canvas.c	2008-09-10 04:34:42 UTC (rev 35915)
> @@ -39,6 +39,8 @@
>       }
>     else if (e_config->font_hinting == 2)
>       evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
> +// FIXME: testing.   
> +//   edje_scale_set(2.0);
>  }
>  
>  EAPI void
> 
> 
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
> Build the coolest Linux based applications with Moblin SDK & win great prizes
> Grand prize is a trip for two to an Open Source event anywhere in the world
> http://moblin-contest.org/redirect.php?banner_id=100&url=/
> _______________________________________________
> enlightenment-svn mailing list
> enlightenment-svn@...
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
>

Author:       raster
Date:         2008-09-10 05:42:39 -0700 (Wed, 10 Sep 2008)
New Revision: 35928

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

fix focus set loop.



Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2008-09-10 10:44:31 UTC (rev 35927)
+++ trunk/e/src/bin/e_border.c	2008-09-10 12:42:39 UTC (rev 35928)
@@ -1386,18 +1386,28 @@
 	if (e_border_under_pointer_get(bd->desk, bd))
 	  {
 	     if (!e_border_pointer_warp_to_center(bd))
-	       e_border_focus_set(bd, 1, 1);
+	       {
+//		  printf("F1\n");
+		  e_border_focus_set(bd, 1, 1);
+	       }
 	  }
 	else
-	  e_border_focus_set(bd, 1, 1);
+	  {
+//	     printf("F2\n");
+	     e_border_focus_set(bd, 1, 1);
+	  }
      }
    else if (e_config->focus_policy == E_FOCUS_CLICK)
      {
+//	printf("F3\n");
 	e_border_focus_set(bd, 1, 1);
      }
    else
      if (!e_border_pointer_warp_to_center(bd))
-       e_border_focus_set(bd, 1, 1);
+       {
+//	  printf("F4\n");
+	  e_border_focus_set(bd, 1, 1);
+       }
 
    ecore_x_pointer_ungrab();
 }
@@ -1416,7 +1426,9 @@
 //   printf("e_border_focus_set(%p, %s, %i %i);\n", bd, bd->client.icccm.name, focus, set);
 //   printf(" accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
 //   if (!bd->client.icccm.accepts_focus) return;
-   printf("e_border_focus_set(%p, %i %i)\n", bd, focus, set);
+//   printf("e_border_focus_set(%p [%s][%s], %i %i)\n", 
+//	  bd, bd->client.icccm.title, bd->client.netwm.name,
+//	  focus, set);
    if ((!bd->client.icccm.accepts_focus) &&
        (!bd->client.icccm.take_focus))
 	return;
@@ -1424,7 +1436,6 @@
    /* dont focus an iconified window. that's silly! */
    if ((focus) && (bd->iconic))
      return;
-   printf("  actually try...\n");
    if ((bd->modal) && (bd->modal != bd))
      {
 	e_border_focus_set(bd->modal, focus, set);
@@ -1443,11 +1454,13 @@
 	  {
 	     if ((bd->visible) && (bd->changes.visible))
 	       {
+//		  printf("want!\n");
 ////		  e_border_focus_latest_set(bd);
 		  bd->want_focus = 1;
 		  bd->changed = 1;
 		  return;
 	       }
+//	     printf("  real foc - locally active...\n");
 	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
 	     return;
 	  }
@@ -1456,11 +1469,13 @@
 	  {
 	     if ((bd->visible) && (bd->changes.visible))
 	       {
+//		  printf("want2!\n");
 ////		  e_border_focus_latest_set(bd);
 		  bd->want_focus = 1;
 		  bd->changed = 1;
 		  return;
 	       }
+//	     printf("  real foc - globally active...\n");
 	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
 	     return;
 	  }
@@ -1473,15 +1488,17 @@
      }
    if ((!bd->visible) && (focus))
      {
+//	printf("want3!\n");
 ////	e_border_focus_latest_set(bd);
-	bd->want_focus = 1;
-	bd->changed = 1;
+//	bd->want_focus = 1;
+//	bd->changed = 1;
 	return;
      }
    if ((focus) && (!bd->focused))
      {
 	if ((bd->visible) && (bd->changes.visible))
 	  {
+//	     printf("want4!\n");
 ////	     e_border_focus_latest_set(bd);
 	     bd->want_focus = 1;
 	     bd->changed = 1;
@@ -1524,6 +1541,7 @@
      {
 	if (bd->focused)
 	  {
+//	     printf("  real foc - GO...\n");
 	     if (bd->internal)
 	       e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
 	     else
@@ -6916,12 +6934,14 @@
    if ((bd->take_focus) || (bd->want_focus))
      {
 	bd->take_focus = 0;
+	printf("bd->want_focus = %i\n", bd->want_focus);
 	if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) ||
 	    (bd->want_focus))
 	  {
 	     bd->want_focus = 0;
 	     if (!bd->lock_focus_out)
 	       {
+		  printf("E1\n");
 		  e_border_focus_set_with_pointer(bd);
 	       }
 	  }
@@ -6935,7 +6955,10 @@
 			e_border_focused_get())))
 		    {
 		       if (!bd->lock_focus_out)
-			 e_border_focus_set_with_pointer(bd);
+			 {
+			    printf("E2\n");
+			    e_border_focus_set_with_pointer(bd);
+			 }
 		    }
 	       }
 	  }

Author:       raster
Date:         2008-09-10 20:27:34 -0700 (Wed, 10 Sep 2008)
New Revision: 35938

Modified:
  trunk/e/src/bin/e_canvas.c 
Log:

just a env var hack for playing with scaling.. for now.



Modified: trunk/e/src/bin/e_canvas.c
===================================================================
--- trunk/e/src/bin/e_canvas.c	2008-09-11 02:06:54 UTC (rev 35937)
+++ trunk/e/src/bin/e_canvas.c	2008-09-11 03:27:34 UTC (rev 35938)
@@ -39,8 +39,20 @@
      }
    else if (e_config->font_hinting == 2)
      evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
-// FIXME: testing.   
-//   edje_scale_set(1.0);
+// FIXME: just a hack.
+     {
+	static scale = -1.0;
+	
+	if (scale == -1.0)
+	  {
+	     char *s;
+	     
+	     s = getenv("E_SCALE");
+	     if (s) scale = atof(s);
+	     else scale = 1.0;
+	  }
+	edje_scale_set(scale);
+     }
 }
 
 EAPI void

Author:       raster
Date:         2008-09-10 20:37:06 -0700 (Wed, 10 Sep 2008)
New Revision: 35940

Modified:
  trunk/e/src/bin/e_scrollframe.c 
Log:

simplify thumbscroll a little.



Modified: trunk/e/src/bin/e_scrollframe.c
===================================================================
--- trunk/e/src/bin/e_scrollframe.c	2008-09-11 03:36:52 UTC (rev 35939)
+++ trunk/e/src/bin/e_scrollframe.c	2008-09-11 03:37:06 UTC (rev 35940)
@@ -603,22 +603,21 @@
 		    evas_event_feed_hold(e, 1, ev->timestamp, ev->data);
 		  ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
 		  sd->down.dragged = 1;
-	       }
-	     x = sd->down.sx - (ev->cur.canvas.x - sd->down.x);
-	     y = sd->down.sy - (ev->cur.canvas.y - sd->down.y);
-	     if ((sd->down.dir_x) || (sd->down.dir_y))
-	       {
-		  if (!sd->down.locked)
+		  x = sd->down.sx - (ev->cur.canvas.x - sd->down.x);
+		  y = sd->down.sy - (ev->cur.canvas.y - sd->down.y);
+		  if ((sd->down.dir_x) || (sd->down.dir_y))
 		    {
-		       printf("lock dir to x%iy%i\n", sd->down.dir_x, sd->down.dir_y);
-		       sd->down.locked_x = x;
-		       sd->down.locked_y = y;
-		       sd->down.locked = 1;
+		       if (!sd->down.locked)
+			 {
+			    sd->down.locked_x = x;
+			    sd->down.locked_y = y;
+			    sd->down.locked = 1;
+			 }
+		       if (sd->down.dir_x) y = sd->down.locked_y;
+		       else x = sd->down.locked_x;
 		    }
-		  if (sd->down.dir_x) y = sd->down.locked_y;
-		  else x = sd->down.locked_x;
+		  e_scrollframe_child_pos_set(sd->smart_obj, x, y);
 	       }
-	     e_scrollframe_child_pos_set(sd->smart_obj, x, y);
 	  }
      }
 }

Author:       raster
Date:         2008-09-11 16:31:11 -0700 (Thu, 11 Sep 2008)
New Revision: 35959

Modified:
  trunk/e/src/bin/e_pointer.c trunk/e/src/bin/e_scrollframe.c 
Log:

fix hotspot in e17 - cedrics deferred edje stuff b0rked it! :(



Modified: trunk/e/src/bin/e_pointer.c
===================================================================
--- trunk/e/src/bin/e_pointer.c	2008-09-11 17:05:47 UTC (rev 35958)
+++ trunk/e/src/bin/e_pointer.c	2008-09-11 23:31:11 UTC (rev 35959)
@@ -307,7 +307,9 @@
 
    p = data;
    if (!p->e_cursor) return;
-   evas_object_geometry_get(p->hot_object, &x, &y, NULL, NULL);
+   edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot",
+				 &x, &y, NULL, NULL);
+   printf("@@@@@@@@@@@@@@@@@@@@@@ HOT CHANGE -> %i %i\n", x, y);
    if ((p->hot.x != x) || (p->hot.y != y))
      {
 	p->hot.x = x;
@@ -360,7 +362,8 @@
      {
 	Evas_Object *o;
 	char cursor[1024];
-
+	Evas_Coord x, y;
+	
 	if (!p->evas) _e_pointer_canvas_add(p);
 	o = p->pointer_object;
 	if (p->color)
@@ -376,6 +379,14 @@
 	       goto fallback;
 	  }
 	edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", p->hot_object);
+	edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot", 
+				      &x, &y, NULL, NULL);
+	printf("@@@@@@@@@@@@@@@@@@@@@@ HOT @ -> %i %i\n", x, y);
+	if ((p->hot.x != x) || (p->hot.y != y))
+	  {
+	     p->hot.x = x;
+	     p->hot.y = y;
+	  }
 	p->hot.update = 1;
 	return 1;
      }

Modified: trunk/e/src/bin/e_scrollframe.c
===================================================================
--- trunk/e/src/bin/e_scrollframe.c	2008-09-11 17:05:47 UTC (rev 35958)
+++ trunk/e/src/bin/e_scrollframe.c	2008-09-11 23:31:11 UTC (rev 35959)
@@ -675,6 +675,8 @@
    x = vx * (double)mx;
    y = vy * (double)my;
    sd->pan_func.set(sd->pan_obj, x, y);
+   if ((e_config->thumbscroll_enable) && (sd->down.now) && (!sd->down.dragged))
+     sd->down.now = 0;
 }
 
 static void

Author:       raster
Date:         2008-09-16 19:21:00 -0700 (Tue, 16 Sep 2008)
New Revision: 36033

Log:
  been hacking... umm. config dialog additions.

  

  

Modified:
  trunk/e/src/bin/e_canvas.c trunk/e/src/bin/e_config_dialog.c trunk/e/src/bin/e_config_dialog.h trunk/e/src/bin/e_main.c trunk/e/src/bin/e_test.c trunk/e/src/bin/e_widget.c trunk/e/src/bin/e_widget_button.c 
Modified: trunk/e/src/bin/e_canvas.c
===================================================================
--- trunk/e/src/bin/e_canvas.c	2008-09-17 02:16:34 UTC (rev 36032)
+++ trunk/e/src/bin/e_canvas.c	2008-09-17 02:21:00 UTC (rev 36033)
@@ -39,20 +39,6 @@
      }
    else if (e_config->font_hinting == 2)
      evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
-// FIXME: just a hack.
-     {
-	static scale = -1.0;
-	
-	if (scale == -1.0)
-	  {
-	     char *s;
-	     
-	     s = getenv("E_SCALE");
-	     if (s) scale = atof(s);
-	     else scale = 1.0;
-	  }
-	edje_scale_set(scale);
-     }
 }
 
 EAPI void

Modified: trunk/e/src/bin/e_config_dialog.c
===================================================================
--- trunk/e/src/bin/e_config_dialog.c	2008-09-17 02:16:34 UTC (rev 36032)
+++ trunk/e/src/bin/e_config_dialog.c	2008-09-17 02:21:00 UTC (rev 36033)
@@ -173,6 +173,7 @@
    else
      snprintf(buf, sizeof(buf), "%s...%s", cfd->class, "ADVANCED");
    cfd->dia = e_dialog_new(cfd->con, cfd->name, buf);
+   if (cfd->view->normal_win) e_win_dialog_set(cfd->dia->win, 0);
    cfd->dia->data = cfd;
    e_object_del_attach_func_set(E_OBJECT(cfd->dia), _e_config_dialog_cb_dialog_del);
    e_dialog_title_set(cfd->dia, cfd->title);
@@ -210,6 +211,7 @@
      }
    
    e_widget_min_size_get(o, &mw, &mh);
+   printf("SET changed on %p @ %p\n", o, _e_config_dialog_cb_changed);
    e_widget_on_change_hook_set(o, _e_config_dialog_cb_changed, cfd);
    e_dialog_content_set(cfd->dia, o, mw, mh);
    
@@ -226,7 +228,8 @@
    e_dialog_button_add(cfd->dia, _("Close"), NULL, _e_config_dialog_cb_close, cfd);
    if (!pdia)
      {
-	e_win_centered_set(cfd->dia->win, 1);
+	if (!cfd->view->normal_win)
+	  e_win_centered_set(cfd->dia->win, 1);
 	e_dialog_show(cfd->dia);
 	if (cfd->icon) e_dialog_border_icon_set(cfd->dia, cfd->icon);
      }
@@ -364,6 +367,7 @@
    E_Config_Dialog *cfd;
  
    cfd = data;
+   printf("_e_config_dialog_cb_changed\n");
    if (!cfd->hide_buttons)
       {
 	 cfd->cfg_changed = 1;

Modified: trunk/e/src/bin/e_config_dialog.h
===================================================================
--- trunk/e/src/bin/e_config_dialog.h	2008-09-17 02:16:34 UTC (rev 36032)
+++ trunk/e/src/bin/e_config_dialog.h	2008-09-17 02:21:00 UTC (rev 36033)
@@ -22,8 +22,9 @@
 
 struct _E_Config_Dialog_View
 {
-   int override_auto_apply;
-   int basic_only;
+   unsigned char override_auto_apply : 1;
+   unsigned char basic_only : 1;
+   unsigned char normal_win : 1;
    
    void           *(*create_cfdata)     (E_Config_Dialog *cfd);
    void            (*free_cfdata)       (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2008-09-17 02:16:34 UTC (rev 36032)
+++ trunk/e/src/bin/e_main.c	2008-09-17 02:21:00 UTC (rev 36033)
@@ -534,6 +534,21 @@
    /* setup edje to animate @ e_config->framerate frames per sec. */
    edje_frametime_set(1.0 / e_config->framerate);
 
+// FIXME: just a hack.
+     {
+	static scale = -1.0;
+	
+	if (scale == -1.0)
+	  {
+	     char *s;
+	     
+	     s = getenv("E_SCALE");
+	     if (s) scale = atof(s);
+	     else scale = 1.0;
+	  }
+	edje_scale_set(scale);
+     }
+
    TS("font");
    /* init font system */
    if (!e_font_init())

Modified: trunk/e/src/bin/e_test.c
===================================================================
--- trunk/e/src/bin/e_test.c	2008-09-17 02:16:34 UTC (rev 36032)
+++ trunk/e/src/bin/e_test.c	2008-09-17 02:21:00 UTC (rev 36033)
@@ -187,7 +187,7 @@
    e_dialog_title_set(dia, "A Test Dialog");
    
    o = e_icon_add(dia->win->evas);
-   e_icon_file_set(o, "/home/rephorm/scroll.png");
+   e_icon_file_set(o, "/home/raster/scroll.png");
    evas_object_resize(o, 1024, 768);
    evas_object_focus_set(o, 1);
    evas_object_show(o);

Modified: trunk/e/src/bin/e_widget.c
===================================================================
--- trunk/e/src/bin/e_widget.c	2008-09-17 02:16:34 UTC (rev 36032)
+++ trunk/e/src/bin/e_widget.c	2008-09-17 02:21:00 UTC (rev 36033)
@@ -134,22 +134,21 @@
 e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj)
 {
    API_ENTRY return;
-/* enable if i want to hunt bad things in widgets  
-   if (evas_list_find(sd->subobjs, sobj))
-     {
-	printf("----------EEEEEK! dupe sub obj is a sub obj!\n");
-	abort();
-     }
-  */
    sd->subobjs = evas_list_append(sd->subobjs, sobj);
    if (!sd->child_can_focus)
      {
 	if (e_widget_can_focus_get(sobj)) sd->child_can_focus = 1;
      }
+   printf("ADD SUB %p -> %p [%s]\n", obj, sobj, evas_object_type_get(sobj));
    if (!strcmp(evas_object_type_get(sobj), SMART_NAME))
      {
 	sd = evas_object_smart_data_get(sobj);
-	if (sd) sd->parent_obj = obj;
+	if (sd)
+	  {
+	     if (sd->parent_obj) e_widget_sub_object_del(sd->parent_obj, sobj);
+	     sd->parent_obj = obj;
+	  }
+	printf("  SD = %p\n", sd);
      }
 }
 
@@ -157,6 +156,7 @@
 e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj)
 {
    API_ENTRY return;
+   printf("DEL SUB %p -> %p\n", obj, sobj);
    sd->subobjs = evas_list_remove(sd->subobjs, sobj);
    if (!sd->child_can_focus)
      {

Modified: trunk/e/src/bin/e_widget_button.c
===================================================================
--- trunk/e/src/bin/e_widget_button.c	2008-09-17 02:16:34 UTC (rev 36032)
+++ trunk/e/src/bin/e_widget_button.c	2008-09-17 02:21:00 UTC (rev 36033)
@@ -61,12 +61,12 @@
 	edje_object_part_text_set(o, "e.text.label", label);
 	wd->type |= E_WIDGET_BUTTON_TEXT;
      }
-   evas_object_show(o);
 
    e_widget_sub_object_add(obj, o);
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, 
 				  _e_wid_focus_steal, obj);
    e_widget_resize_object_set(obj, o);
+   evas_object_show(o);
 
    if (icon)
      {
@@ -74,8 +74,8 @@
 	wd->o_icon = o;
 	e_util_edje_icon_set(o, icon);
 	edje_object_part_swallow(wd->o_button, "e.swallow.icon", o);
+	e_widget_sub_object_add(obj, o);
 	evas_object_show(o);
-	e_widget_sub_object_add(obj, o);
 	wd->type |= E_WIDGET_BUTTON_ICON;
      }

Author:       raster
Date:         2008-09-16 22:58:46 -0700 (Tue, 16 Sep 2008)
New Revision: 36035

Log:
  add a widget resize to min size call - convenience. tnx k-s for the oopsie
  catch!
  
  

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

Modified: trunk/e/src/bin/e_widget.c
===================================================================
--- trunk/e/src/bin/e_widget.c	2008-09-17 05:22:08 UTC (rev 36034)
+++ trunk/e/src/bin/e_widget.c	2008-09-17 05:58:46 UTC (rev 36035)
@@ -139,7 +139,6 @@
      {
 	if (e_widget_can_focus_get(sobj)) sd->child_can_focus = 1;
      }
-   printf("ADD SUB %p -> %p [%s]\n", obj, sobj, evas_object_type_get(sobj));
    if (!strcmp(evas_object_type_get(sobj), SMART_NAME))
      {
 	sd = evas_object_smart_data_get(sobj);
@@ -148,7 +147,6 @@
 	     if (sd->parent_obj) e_widget_sub_object_del(sd->parent_obj, sobj);
 	     sd->parent_obj = obj;
 	  }
-	printf("  SD = %p\n", sd);
      }
 }
 
@@ -156,7 +154,6 @@
 e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj)
 {
    API_ENTRY return;
-   printf("DEL SUB %p -> %p\n", obj, sobj);
    sd->subobjs = evas_list_remove(sd->subobjs, sobj);
    if (!sd->child_can_focus)
      {
@@ -462,6 +459,13 @@
    return NULL;
 }
 
+EAPI void
+e_widget_min_size_resize(Evas_Object *obj)
+{
+   API_ENTRY return;
+   evas_object_resize(obj, sd->minw, sd->minh);
+}
+
 /* local subsystem functions */
 static void
 _e_smart_reconfigure(E_Smart_Data *sd)

Modified: trunk/e/src/bin/e_widget.h
===================================================================
--- trunk/e/src/bin/e_widget.h	2008-09-17 05:22:08 UTC (rev 36034)
+++ trunk/e/src/bin/e_widget.h	2008-09-17 05:58:46 UTC (rev 36035)
@@ -34,6 +34,7 @@
 EAPI void e_widget_disabled_set(Evas_Object *obj, int disabled);
 EAPI int  e_widget_disabled_get(Evas_Object *obj);
 EAPI E_Pointer *e_widget_pointer_get(Evas_Object *obj);
+EAPI void e_widget_min_size_resize(Evas_Object *obj);
 
 #endif
 #endif

Author:       raster
Date:         2008-09-16 23:03:00 -0700 (Tue, 16 Sep 2008)
New Revision: 36036

Log:
  remove some printf's
  
  

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

Modified: trunk/e/src/bin/e_config_dialog.c
===================================================================
--- trunk/e/src/bin/e_config_dialog.c	2008-09-17 05:58:46 UTC (rev 36035)
+++ trunk/e/src/bin/e_config_dialog.c	2008-09-17 06:03:00 UTC (rev 36036)
@@ -211,7 +211,6 @@
      }
    
    e_widget_min_size_get(o, &mw, &mh);
-   printf("SET changed on %p @ %p\n", o, _e_config_dialog_cb_changed);
    e_widget_on_change_hook_set(o, _e_config_dialog_cb_changed, cfd);
    e_dialog_content_set(cfd->dia, o, mw, mh);
    
@@ -367,7 +366,6 @@
    E_Config_Dialog *cfd;
  
    cfd = data;
-   printf("_e_config_dialog_cb_changed\n");
    if (!cfd->hide_buttons)
       {
 	 cfd->cfg_changed = 1;

Author:       raster
Date:         2008-09-16 23:29:16 -0700 (Tue, 16 Sep 2008)
New Revision: 36039

Log:
  get geometry form edje - not obj. deferred calc bork bork
  
  

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

Modified: trunk/e/src/bin/e_scrollframe.c
===================================================================
--- trunk/e/src/bin/e_scrollframe.c	2008-09-17 06:26:32 UTC (rev 36038)
+++ trunk/e/src/bin/e_scrollframe.c	2008-09-17 06:29:16 UTC (rev 36039)
@@ -271,7 +271,7 @@
 {
    API_ENTRY return;
    edje_object_calc_force(sd->edje_obj);
-   evas_object_geometry_get(sd->pan_obj, NULL, NULL, w, h);
+   edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, w, h);
 }
 
 EAPI void
@@ -633,7 +633,7 @@
    ev = event_info;
    e_scrollframe_child_pos_get(sd->smart_obj, &x, &y);
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
-   evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh);
+   edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
    if (!strcmp(ev->keyname, "Left"))
      x -= sd->step.x;
    else if (!strcmp(ev->keyname, "Right"))
@@ -700,7 +700,7 @@
    
    w = sd->child.w;
    h = sd->child.h;
-   evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh);
+   edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
    if (sd->vbar_visible)
      {
 	if (sd->vbar_flags == E_SCROLLFRAME_POLICY_AUTO)
@@ -764,7 +764,7 @@
    
    w = sd->child.w;
    h = sd->child.h;
-   evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh);
+   edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
    if (sd->hbar_visible)
      {
 	if (sd->hbar_flags == E_SCROLLFRAME_POLICY_AUTO)
@@ -841,8 +841,8 @@
      {
 	Evas_Coord x, y, w, h, mx = 0, my = 0, vw = 0, vh = 0;
 	double vx, vy, size;
-	
-	evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh);
+
+	edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
 	w = sd->child.w;
 	if (w < 1) w = 1;
 	size = (double)vw / (double)w;

Author:       raster
Date:         2008-09-19 02:44:07 -0700 (Fri, 19 Sep 2008)
New Revision: 36093

Log:
  and - that vlc fullscreen bug. found. fixed. but vlc's x11 code is really
  nasty. does some utterly evil things. should i send off some suggestions to
  them? (like 1. dont reparent the window in xcommon.c line 217, dont play with
  wm focus policies in xcommon.c line 2269 - just dont send the
  _NET_ACTIVE_WINDOW, you shouldnt' need to (wm should make the focus be
  correct itself and wm's that don't should get a freindly reminder from users
  when they dont remain consistent with focus policy), and then... xcommon.c
  2317 remove the do {} while loop - i can think of many reasons the wm may
  choose not to map your client window (yet - or ever), so this will never work
  "reliably" always. just put in an XSync(p_vout->p_sys->p_display, False);
  instead to force the x pipe to flush and do everything you asked before
  returning control to the code and thus avoiding any badaccess stuff from x).
  
  

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

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2008-09-19 09:36:48 UTC (rev 36092)
+++ trunk/e/src/bin/e_border.c	2008-09-19 09:44:07 UTC (rev 36093)
@@ -222,7 +222,7 @@
 EAPI E_Border *
 e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
 {
-   E_Border *bd;
+   E_Border *bd, *bd2;
    Ecore_X_Window_Attributes *att;
    unsigned int managed, desk[2];
    int deskx, desky;
@@ -484,6 +484,19 @@
    bd->desk = e_desk_current_get(bd->zone);
    e_container_border_add(bd);
    borders = evas_list_append(borders, bd);
+   bd2 = evas_hash_find(borders_hash, e_util_winid_str_get(bd->client.win));
+   if (bd2)
+     {
+	printf("EEEEK! 2 borders with same client window id in them! very bad!\n");
+	printf("optimisations failing due to bizarre client behavior. will\n");
+	printf("work around.\n");
+	printf("bd=%p, bd->references=%i, bd->deleted=%i, bd->client.win=%x\n",
+	       bd2, bd2->e_obj_inherit.references, bd2->e_obj_inherit.deleted,
+	       bd2->client.win);
+	borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd->client.win), bd2);
+	borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd2->bg_win), bd2);
+	borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd2->win), bd2);
+     }
    borders_hash = evas_hash_add(borders_hash, e_util_winid_str_get(bd->client.win), bd);
    borders_hash = evas_hash_add(borders_hash, e_util_winid_str_get(bd->bg_win), bd);
    borders_hash = evas_hash_add(borders_hash, e_util_winid_str_get(bd->win), bd);
@@ -1369,7 +1382,6 @@
     * expect us to emulate a look of focus but not actually set x input
     * focus as we do - so simply abort any focuse set on such windows */
    /* be strict about accepting focus hint */
-//   printf(" 2accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
    if ((!bd->client.icccm.accepts_focus) &&
        (!bd->client.icccm.take_focus)) return;
    if (bd->lock_focus_out) return;
@@ -1388,25 +1400,21 @@
 	  {
 	     if (!e_border_pointer_warp_to_center(bd))
 	       {
-//		  printf("F1\n");
 		  e_border_focus_set(bd, 1, 1);
 	       }
 	  }
 	else
 	  {
-//	     printf("F2\n");
 	     e_border_focus_set(bd, 1, 1);
 	  }
      }
    else if (e_config->focus_policy == E_FOCUS_CLICK)
      {
-//	printf("F3\n");
 	e_border_focus_set(bd, 1, 1);
      }
    else
      if (!e_border_pointer_warp_to_center(bd))
        {
-//	  printf("F4\n");
 	  e_border_focus_set(bd, 1, 1);
        }
 
@@ -1424,12 +1432,6 @@
     * expect us to emulate a look of focus but not actually set x input
     * focus as we do - so simply abort any focuse set on such windows */
    /* be strict about accepting focus hint */
-//   printf("e_border_focus_set(%p, %s, %i %i);\n", bd, bd->client.icccm.name, focus, set);
-//   printf(" accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
-//   if (!bd->client.icccm.accepts_focus) return;
-//   printf("e_border_focus_set(%p [%s][%s], %i %i)\n", 
-//	  bd, bd->client.icccm.title, bd->client.netwm.name,
-//	  focus, set);
    if ((!bd->client.icccm.accepts_focus) &&
        (!bd->client.icccm.take_focus))
 	return;
@@ -1455,13 +1457,11 @@
 	  {
 	     if ((bd->visible) && (bd->changes.visible))
 	       {
-//		  printf("want!\n");
 ////		  e_border_focus_latest_set(bd);
 		  bd->want_focus = 1;
 		  bd->changed = 1;
 		  return;
 	       }
-//	     printf("  real foc - locally active...\n");
 	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
 	     return;
 	  }
@@ -1470,13 +1470,11 @@
 	  {
 	     if ((bd->visible) && (bd->changes.visible))
 	       {
-//		  printf("want2!\n");
 ////		  e_border_focus_latest_set(bd);
 		  bd->want_focus = 1;
 		  bd->changed = 1;
 		  return;
 	       }
-//	     printf("  real foc - globally active...\n");
 	     e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
 	     return;
 	  }
@@ -1489,7 +1487,6 @@
      }
    if ((!bd->visible) && (focus))
      {
-//	printf("want3!\n");
 ////	e_border_focus_latest_set(bd);
 //	bd->want_focus = 1;
 //	bd->changed = 1;
@@ -1499,7 +1496,6 @@
      {
 	if ((bd->visible) && (bd->changes.visible))
 	  {
-//	     printf("want4!\n");
 ////	     e_border_focus_latest_set(bd);
 	     bd->want_focus = 1;
 	     bd->changed = 1;
@@ -1512,7 +1508,6 @@
 ////		  e_border_focus_latest_set(bd);
 //	       }
 //	  }
-//	printf("EMIT 0x%x activeve\n", bd->client.win);
 	e_border_focus_latest_set(bd);
 	edje_object_signal_emit(bd->bg_object, "e,state,focused", "e");
 	if (bd->icon_object)
@@ -1521,7 +1516,6 @@
      }
    else if ((!focus) && (bd->focused))
      {
-//	printf("EMIT 0x%x passive\n", bd->client.win);
 	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");
@@ -1542,7 +1536,6 @@
      {
 	if (bd->focused)
 	  {
-//	     printf("  real foc - GO...\n");
 	     if (bd->internal)
 	       e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
 	     else
@@ -1638,8 +1631,6 @@
 	     E_Event_Border_Focus_In	 *ev;
 	     
 	     focused = bd;
-	     //printf("set focused to %p\n", focused);
-	     
 	     // Let send the focus event iff the focus is set explicitly,
 	     // not via callback
 	     ev = calloc(1, sizeof(E_Event_Border_Focus_In)); 
@@ -1654,8 +1645,6 @@
 	     E_Event_Border_Focus_Out *ev;
 
 	     focused = NULL;
-	     //printf("set focused to %p\n", focused);
-
 	     // Let send the focus event iff the focus is set explicitly,
 	     // not via callback
 	     ev = calloc(1, sizeof(E_Event_Border_Focus_Out)); 
@@ -1682,8 +1671,6 @@
    ecore_x_window_shadow_tree_flush();
    if (!bd->shaded)
      {
-//	printf("SHADE!\n");
-
 	bd->shade.x = bd->x;
 	bd->shade.y = bd->y;
 	bd->shade.dir = dir;
@@ -1773,8 +1760,6 @@
    ecore_x_window_shadow_tree_flush();
    if (bd->shaded)
      {
-//	printf("UNSHADE!\n");
-
 	bd->shade.dir = dir;
 
 	e_hints_window_shaded_set(bd, 0);
@@ -2231,7 +2216,6 @@
    if (bd->fullscreen)
      {
 	bd->pre_res_change.valid = 0;
-//	printf("UNFULLSCREEEN!\n");
 	bd->fullscreen = 0;
 	bd->need_fullscreen = 0;
 
@@ -2351,7 +2335,6 @@
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
    if (bd->sticky) return;
-//   printf("STICK!\n");
    bd->sticky = 1;
    e_hints_window_sticky_set(bd, 1);
    e_border_show(bd);
@@ -2389,7 +2372,6 @@
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
    /* Set the desk before we unstick the border */
    if (!bd->sticky) return;
-//   printf("UNSTICK!\n");
    bd->sticky = 0;
    e_hints_window_sticky_set(bd, 0);
 
@@ -2460,6 +2442,17 @@
 }
 
 EAPI E_Border *
+e_border_find_all_by_client_window(Ecore_X_Window win)
+{
+   E_Border *bd;
+   
+   bd = evas_hash_find(borders_hash, e_util_winid_str_get(win));
+   if ((bd) && (bd->client.win == win))
+     return bd;
+   return NULL;
+}
+
+EAPI E_Border *
 e_border_find_by_frame_window(Ecore_X_Window win)
 {
    E_Border *bd;
@@ -3740,6 +3733,8 @@
 				bd->x + bd->client_inset.l,
 				bd->y + bd->client_inset.t);
 	ecore_x_window_save_set_del(bd->client.win);
+	bd->already_unparented = 1;
+//	bd->client.win = 0;
      }
    bd->already_unparented = 1;
 
@@ -3840,9 +3835,10 @@
    E_Border *bd;
    Ecore_X_Event_Window_Hide *e;
 
-//   printf("in hide cb\n");
    bd = data;
    e = ev;
+// not interested in hide events from windows other than the window in question
+   if (e->win != e->event_win) return 1;
    bd = e_border_find_by_client_window(e->win);
    if (!bd) return 1;
    if (bd->ignore_first_unmap > 0)
@@ -3855,7 +3851,9 @@
        (bd->await_hide_event > 0))
      {
 	if (bd->await_hide_event > 0)
-	  bd->await_hide_event--;
+	  {
+	     bd->await_hide_event--;
+	  }
 	else
 	  {
 	     /* Only hide the border if it is visible */
@@ -3902,10 +3900,14 @@
 
    bd = data;
    e = ev;
+   return 1;
    bd = e_border_find_by_client_window(e->win);
    if (!bd) return 1;
-//   if (e->parent == bd->client.shell_win) return 1;
-   if (ecore_x_window_parent_get(e->win) == bd->client.shell_win) return 1;
+   if (e->parent == bd->client.shell_win) return 1;
+   if (ecore_x_window_parent_get(e->win) == bd->client.shell_win)
+     {
+	return 1;
+     }
    e_border_hide(bd, 0);
    e_object_del(E_OBJECT(bd));
    return 1;
@@ -3919,32 +3921,16 @@
 
    bd = data;
    e = ev;
-//   printf("##- CONF REQ 0x%x , %iX%i+%i+%i\n",
-//	  e->win, e->w, e->h, e->x, e->y);
    bd = e_border_find_by_client_window(e->win);
    if (!bd)
      {
 	if (e_stolen_win_get(e->win)) return 1;
-//	printf("generic config request 0x%x 0x%lx %i %i %ix%i %i 0x%x 0x%x...\n",
-//	       e->win, e->value_mask, e->x, e->y, e->w, e->h, e->border, e->abovewin, e->detail);
 	if (!e_util_container_window_find(e->win))
 	  ecore_x_window_configure(e->win, e->value_mask,
 				   e->x, e->y, e->w, e->h, e->border,
 				   e->abovewin, e->detail);
 	return 1;
      }
-#if 0
-   printf("##- CONFIGURE REQ 0x%0x mask: %c%c%c%c%c%c%c\n",
-	  e->win,
-	  (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) ? 'X':' ',
-	  (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y) ? 'Y':' ',
-	  (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) ? 'W':' ',
-	  (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H) ? 'H':' ',
-	  (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_BORDER_WIDTH) ? 'B':' ',
-	  (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING) ? 'C':' ',
-	  (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE) ? 'S':' '
-	  );
-#endif
 
    if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) ||
        (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y))
@@ -3953,13 +3939,6 @@
 
 	x = bd->x;
 	y = bd->y;
-#if 0
-	printf("##- ASK FOR 0x%x TO MOVE TO [FLG X%liY%li] %i,%i -> %i,%i\n",
-	       bd->client.win,
-	       e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X,
-	       e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y,
-	       x, y, e->x, e->y);
-#endif
 	if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X)
 	  x = e->x;
 	if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y)
@@ -3975,13 +3954,6 @@
 	       w = e->w + bd->client_inset.l + bd->client_inset.r;
 	     if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H)
 	       h = e->h + bd->client_inset.t + bd->client_inset.b;
-#if 0
-	     printf("##- ASK FOR 0x%x TO RESIZE TO [FLG W%liH%li] %i,%i\n",
-		    bd->client.win,
-		    e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W,
-		    e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H,
-		    e->w, e->h);
-#endif
 	     if ((!bd->lock_client_location) && (!bd->lock_client_size))
 	       {
 		  if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE)
@@ -4061,13 +4033,6 @@
 	  w = e->w + bd->client_inset.l + bd->client_inset.r;
 	if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H)
 	  h = e->h + bd->client_inset.t + bd->client_inset.b;
-#if 0
-	printf("##- ASK FOR 0x%x TO RESIZE TO [FLG W%liH%li] %i,%i\n",
-	       bd->client.win,
-	       e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W,
-	       e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H,
-	       e->w, e->h);
-#endif
 	if (!bd->lock_client_size)
 	  {
 	     if ((bd->shaded) || (bd->shading))
@@ -4162,18 +4127,13 @@
 
    bd = data;
    e = ev;
-//   printf("##- RESZ REQ 0x%x , %iX%i\n",
-//	  e->win, e->w, e->h);
    bd = e_border_find_by_client_window(e->win);
    if (!bd)
      {
 	if (e_stolen_win_get(e->win)) return 1;
-//	printf("generic resize request %x %ix%i ...\n",
-//	       e->win, e->w, e->h);
 	ecore_x_window_resize(e->win, e->w, e->h);
 	return 1;
      }
-//   printf("##- RESIZE REQ 0x%x\n", bd->client.win);
      {
 	int w, h;
 
@@ -4181,8 +4141,6 @@
 	w = bd->w;
 	w = e->w + bd->client_inset.l + bd->client_inset.r;
 	h = e->h + bd->client_inset.t + bd->client_inset.b;
-//	printf("##- ASK FOR 0x%x TO RESIZE TO %i,%i\n",
-//	       bd->client.win, e->w, e->h);
 	if ((bd->shaded) || (bd->shading))
 	  {
 	     int pw, ph;
@@ -4216,7 +4174,6 @@
    e = ev;
    bd = e_border_find_by_client_window(e->win);
    if (!bd) return 1;
-//   printf("gravity for %0x\n", e->win);
    return 1;
 }
 
@@ -4228,7 +4185,6 @@
 
    e = ev;
    bd = e_border_find_by_client_window(e->win);
-//   printf("stack req for %0x bd %p\n", e->win, bd);
    if (!bd)
      {
 	if (e_stolen_win_get(e->win)) return 1;
@@ -4551,7 +4507,6 @@
 	if (e->detail == ECORE_X_EVENT_DETAIL_ANCESTOR) return 1;
 	else if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1;
      }
-   printf("fout 1\n");
    e_border_focus_set(bd, 0, 0);
    return 1;
 }
@@ -5158,7 +5113,6 @@
      }
    if ((ev->win != bd->event_win) && (ev->event_win != bd->win))
      {
-//	printf("abort ev\n");
 	return 1;
      }
    if ((ev->button >= 1) && (ev->button <= 3))
@@ -5182,8 +5136,6 @@
 /*   
    if (bd->moving)
      {
-
- printf("moving\n");
      }
    else if (bd->resize_mode != RESIZE_NONE)
      {
@@ -5261,10 +5213,6 @@
 
    ev = event;
    bd = data;
-   if (ev->event_win == bd->win)
-     {
-//	printf("GRABMOVE2!\n");
-     }
    if ((ev->win != bd->event_win) &&
        (ev->event_win != bd->win)) return 1;
    bd->mouse.current.mx = ev->root.x;
@@ -5675,7 +5623,6 @@
 	  }
 	else
 	  {
-//	     printf("##- NO SIZE HINTS!\n");
 	  }
 	if (bd->client.icccm.min_w > 32767) bd->client.icccm.min_w = 32767;
 	if (bd->client.icccm.min_h > 32767) bd->client.icccm.min_h = 32767;
@@ -5685,15 +5632,6 @@
 	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 0
-	printf("##- SIZE HINTS for 0x%x: min %ix%i, max %ix%i, base %ix%i, step %ix%i, aspect (%f, %f)\n",
-	       bd->client.win,
-	       bd->client.icccm.min_w, bd->client.icccm.min_h,
-	       bd->client.icccm.max_w, bd->client.icccm.max_h,
-	       bd->client.icccm.base_w, bd->client.icccm.base_h,
-	       bd->client.icccm.step_w, bd->client.icccm.step_h,
-	       bd->client.icccm.min_aspect, bd->client.icccm.max_aspect);
-#endif
 
 	bd->client.icccm.fetch.size_pos_hints = 0;
 	rem_change = 1;
@@ -5802,7 +5740,6 @@
 	if (!ecore_x_netwm_icons_get(bd->client.win,
 				     &bd->client.netwm.icons, &bd->client.netwm.num_icons))
 	  {
-//	     printf("ERROR: Fetch icon from client\n");
 	     bd->client.netwm.icons = NULL;
 	     bd->client.netwm.num_icons = 0;
 	  }
@@ -5933,7 +5870,6 @@
 	bd->client.mwm.borderless = 0;
 	if (bd->client.mwm.exists)
 	  {
-//	     printf("##- MWM HINTS SET 0x%x!\n", bd->client.win);
 	     if ((!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_ALL)) &&
 		 (!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_TITLE)) &&
 		 (!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_BORDER)))
@@ -6420,10 +6356,8 @@
    
    if (bd->new_client)
      {
-//	printf("##- NEW CLIENT SETUP 0x%x\n", bd->client.win);
 	if (bd->re_manage)
 	  {
-//	     printf("##- REMANAGE!\n");
 	     bd->x -= bd->client_inset.l;
 	     bd->y -= bd->client_inset.t;
 	     bd->changes.pos = 1;
@@ -6437,8 +6371,6 @@
 		  int bw;
 
 		  att = &bd->client.initial_attributes;
-//		  printf("##- REQUEST POS 0x%x [%i,%i]\n",
-//			 bd->client.win, att->x, att->y);
 		  bw = att->border * 2;
 		  switch (bd->client.icccm.gravity)
 		    {
@@ -6512,7 +6444,6 @@
 		       Evas_List *skiplist = NULL;
 		       int new_x, new_y;
 
-//		  printf("##- AUTO POS 0x%x\n", bd->client.win);
 		       if (bd->zone->w > bd->w)
 			 new_x = bd->zone->x + (rand() % (bd->zone->w - bd->w));
 		       else
@@ -6696,7 +6627,6 @@
 	  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);
-//	printf("##- BORDER NEEDS POS/SIZE CHANGE 0x%x\n", bd->client.win);
 	if ((bd->shaded) && (!bd->shading))
 	  {
 	     evas_obscured_clear(bd->bg_evas);
@@ -6839,7 +6769,6 @@
 	  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);
-//	printf("##- BORDER NEEDS SIZE CHANGE 0x%x\n", bd->client.win);
 	if (bd->shaded && !bd->shading)
 	  {
 	     evas_obscured_clear(bd->bg_evas);
@@ -7214,14 +7143,12 @@
    if ((bd->take_focus) || (bd->want_focus))
      {
 	bd->take_focus = 0;
-	printf("bd->want_focus = %i\n", bd->want_focus);
 	if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) ||
 	    (bd->want_focus))
 	  {
 	     bd->want_focus = 0;
 	     if (!bd->lock_focus_out)
 	       {
-		  printf("E1\n");
 		  e_border_focus_set_with_pointer(bd);
 	       }
 	  }
@@ -7235,10 +7162,7 @@
 			e_border_focused_get())))
 		    {
 		       if (!bd->lock_focus_out)
-			 {
-			    printf("E2\n");
-			    e_border_focus_set_with_pointer(bd);
-			 }
+			 e_border_focus_set_with_pointer(bd);
 		    }
 	       }
 	  }

Modified: trunk/e/src/bin/e_border.h
===================================================================
--- trunk/e/src/bin/e_border.h	2008-09-19 09:36:48 UTC (rev 36092)
+++ trunk/e/src/bin/e_border.h	2008-09-19 09:44:07 UTC (rev 36093)
@@ -589,6 +589,7 @@
 EAPI void      e_border_pinned_set(E_Border *bd, int set);
 
 EAPI E_Border *e_border_find_by_client_window(Ecore_X_Window win);
+EAPI E_Border *e_border_find_all_by_client_window(Ecore_X_Window win);
 EAPI E_Border *e_border_find_by_frame_window(Ecore_X_Window win);
 EAPI E_Border *e_border_find_by_window(Ecore_X_Window win);
 EAPI E_Border *e_border_find_by_alarm(Ecore_X_Sync_Alarm alarm);

Modified: trunk/e/src/bin/e_desk.c
===================================================================
--- trunk/e/src/bin/e_desk.c	2008-09-19 09:36:48 UTC (rev 36092)
+++ trunk/e/src/bin/e_desk.c	2008-09-19 09:44:07 UTC (rev 36093)
@@ -360,14 +360,10 @@
 {
    Evas_List *l = NULL;
    E_Border *bd;
-
    
-   printf("== e_desk_last_focused_focus\n");
    for (l = e_border_focus_stack_get(); l; l = l->next)
      {
 	bd = l->data;
-	printf("LAST %p ic=%i vis=%i desk=%p==%p\n",
-	       bd, bd->iconic, bd->visible, bd->desk, desk);
 	if ((!bd->iconic) && (bd->visible) && (bd->desk == desk) &&
 	    (bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) &&
 	    (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_DOCK) &&

Author:       raster
Date:         2008-09-19 02:47:00 -0700 (Fri, 19 Sep 2008)
New Revision: 36094

Log:
  remvoe printfs's
  
  

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

Modified: trunk/e/src/bin/e_canvas.c
===================================================================
--- trunk/e/src/bin/e_canvas.c	2008-09-19 09:44:07 UTC (rev 36093)
+++ trunk/e/src/bin/e_canvas.c	2008-09-19 09:47:00 UTC (rev 36094)
@@ -124,7 +124,6 @@
      }
    edje_file_cache_flush();
    edje_collection_cache_flush();
-   printf("...caches flushed.\n");
 }
 
 EAPI void

Modified: trunk/e/src/bin/e_exec.c
===================================================================
--- trunk/e/src/bin/e_exec.c	2008-09-19 09:44:07 UTC (rev 36093)
+++ trunk/e/src/bin/e_exec.c	2008-09-19 09:47:00 UTC (rev 36094)
@@ -290,17 +290,13 @@
    E_Exec_Instance *inst;
 
    ev = event;
-   printf("child exit...\n");
    if (!ev->exe) return 1;
    if (ecore_exe_tag_get(ev->exe)) printf("  tag %s\n", ecore_exe_tag_get(ev->exe));
    if (!(ecore_exe_tag_get(ev->exe) && 
 	 (!strcmp(ecore_exe_tag_get(ev->exe), "E/exec")))) return 1;
    inst = ecore_exe_data_get(ev->exe);
-   printf("  inst = %p\n", inst);
    if (!inst) return 1;
 
-   printf("  inst exec line -- '%s'\n", ecore_exe_cmd_get(inst->exe));
-   
    /* /bin/sh uses this if cmd not found */
    if ((ev->exited) &&
        ((ev->exit_code == 127) || (ev->exit_code == 255)))

Author:       raster
Date:         2008-09-19 16:58:07 -0700 (Fri, 19 Sep 2008)
New Revision: 36103

Log:
  fix dnd for desktop - if you have multiple zones! remove printf's too. lots
  of noisiness in e.
  
  

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

Modified: trunk/e/src/bin/e_dnd.c
===================================================================
--- trunk/e/src/bin/e_dnd.c	2008-09-19 15:20:14 UTC (rev 36102)
+++ trunk/e/src/bin/e_dnd.c	2008-09-19 23:58:07 UTC (rev 36103)
@@ -241,7 +241,6 @@
    drag->x = x;
    drag->y = y;
    drag->xy_update = 1;
-//   printf("DND MOVE %i %i\n", x, y);
 }
 
 EAPI void
@@ -335,7 +334,7 @@
 
    drag->dx = x - drag->x;
    drag->dy = y - drag->y;
-
+   
    ecore_x_dnd_aware_set(_drag_win, 1);
    ecore_x_dnd_types_set(_drag_win, drag->types, drag->num_types);
    ecore_x_dnd_actions_set(_drag_win, actions, 5);
@@ -502,7 +501,6 @@
 	  }
         if (drag->xy_update)
 	  {
-//	     printf("DND REAL MOVE\n");
 	     ecore_evas_move(drag->ecore_evas, drag->x, drag->y);
 	     e_container_shape_move(drag->shape, drag->x, drag->y);
 	     drag->xy_update = 0;
@@ -587,7 +585,6 @@
    drag->x = x - drag->dx;
    drag->y = y - drag->dy;
    drag->xy_update = 1;
-//   printf("DND MOVE 2 %i %i\n", x, y);
 }
 
 static void
@@ -615,8 +612,8 @@
 	     py = ((E_Win *)(h->obj))->y;
 	     break;
 	   case E_ZONE_TYPE:
-	     px = ((E_Zone *)(h->obj))->x;
-	     py = ((E_Zone *)(h->obj))->y;
+//	     px = ((E_Zone *)(h->obj))->x;
+//	     py = ((E_Zone *)(h->obj))->y;
 	     break;
 	   case E_BORDER_TYPE:
 	     px = ((E_Border *)(h->obj))->x + ((E_Border *)(h->obj))->fx.x;
@@ -633,6 +630,7 @@
      }
    *dx += px;
    *dy += py;
+   printf("T: %x | dx = %i dy = %i\n", h->obj->type, *dx, *dy);
 }
 
 static Ecore_X_Window
@@ -776,6 +774,7 @@
 
    if (_drag_current)
      {
+	printf("--\n");
 	for (l = _drop_handlers; l; l = l->next)
 	  {
 	     E_Drop_Handler *h;
@@ -792,9 +791,16 @@
 	     move_ev.action = action;
 	     leave_ev.x = x - dx;
 	     leave_ev.y = y - dy;
-	     if (E_INSIDE(x, y, dx, dy, dw, dh) && _e_drag_win_matches(h, win, 0))
+	     
+	     int inside, matches;
+	     
+	     inside = E_INSIDE(x, y, dx, dy, dw, dh);
+	     matches = _e_drag_win_matches(h, win, 0);
+	     printf(" inside = %i, matches = %i\n", inside, matches);
+	     if (E_INSIDE(x, y, dx, dy, dw, dh) && 
+		 _e_drag_win_matches(h, win, 0))
 	       {
-		  if(e_drop_handler_responsive_get(h)) responsive = 1;
+		  if (e_drop_handler_responsive_get(h)) responsive = 1;
 
 		  if (!h->entered)
 		    {
@@ -808,6 +814,7 @@
 			      }
 			    else
 			      enter_ev.data = _drag_current->data;
+			    printf("ENTER!\n");
 			    h->cb.enter(h->cb.data, h->active_type, &enter_ev);
 			 }
 		       h->entered = 1;
@@ -1223,7 +1230,6 @@
 
    id = e_util_winid_str_get(ev->win);
    if (!evas_hash_find(_drop_win_hash, id)) return 1;
-   printf("Xdnd leave\n");
 
    leave_ev.x = 0;
    leave_ev.y = 0;
@@ -1333,7 +1339,6 @@
    Ecore_X_Event_Xdnd_Finished *ev;
 
    ev = event;
-   printf("Xdnd finished\n");
 
    if (!ev->completed)
      return 1;
@@ -1360,7 +1365,6 @@
    ev = event;
    id = e_util_winid_str_get(ev->win);
    if (!evas_hash_find(_drop_win_hash, id)) return 1;
-   printf("Xdnd drop %x %s\n", ev->win, _xdnd->type);
 
    ecore_x_selection_xdnd_request(ev->win, _xdnd->type);
 
@@ -1381,7 +1385,6 @@
    id = e_util_winid_str_get(ev->win);
    if (!evas_hash_find(_drop_win_hash, id)) return 1;
    if (ev->selection != ECORE_X_SELECTION_XDND) return 1;
-   printf("Xdnd selection\n");
 
    if (!strcmp("text/uri-list", _xdnd->type))
      {
@@ -1390,7 +1393,7 @@
 
 	files = ev->data;
 	for (i = 0; i < files->num_files; i++)
-	  l = evas_list_append(l, files->files[i]), printf("file: %s\n", files->files[i]);
+	  l = evas_list_append(l, files->files[i]);
 	_xdnd->data = l;
 	_e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y);
 	evas_list_free(l);
@@ -1425,9 +1428,9 @@
 	       }
 	       */
 	  }
-	printf("\n");
+//	printf("\n");
 	file[i] = '\0';
-	printf("file: %d \"%s\"\n", i, file);
+//	printf("file: %d \"%s\"\n", i, file);
 	l = evas_list_append(l, file);
 
 	_xdnd->data = l;

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2008-09-19 15:20:14 UTC (rev 36102)
+++ trunk/e/src/bin/e_fm.c	2008-09-19 23:58:07 UTC (rev 36103)
@@ -471,7 +471,6 @@
    /* FIXME; some dialog */
    if (sd->mount)
      {
-	printf("UM1\n");
 	e_fm2_hal_unmount(sd->mount);
 	sd->mount = NULL;
 	evas_object_smart_callback_call(data, "dir_deleted", NULL);
@@ -573,7 +572,6 @@
        && strncmp(sd->mount->mount_point, sd->realpath, 
 		  strlen(sd->mount->mount_point)))
      {
-	printf("UM2\n");
 	e_fm2_hal_unmount(sd->mount);
 	sd->mount = NULL;
      }
@@ -985,7 +983,8 @@
 					 _e_fm2_cb_dnd_move,
 					 _e_fm2_cb_dnd_leave,
 					 _e_fm2_cb_dnd_drop,
-					 drop, 3, sd->x, sd->y, sd->w, sd->h);
+					 drop, 3, 
+					 sd->x, sd->y, sd->w, sd->h);
    e_drop_handler_responsive_set(sd->drop_handler);
 }
 
@@ -1726,7 +1725,6 @@
    d = alloca(l);
    strcpy(d, udi);
    strcpy(d + l1 + 1, mountpoint);
-   printf("SEND %s %s\n", udi, mountpoint);
 
    return _e_fm_client_send_new(E_FM_OP_MOUNT, (void *)d, l);
 }
@@ -1744,7 +1742,6 @@
    strcpy(d, udi);
 
    cl = _e_fm2_client_get();
-   printf("send UM %s\n", udi);
    
    return _e_fm_client_send_new(E_FM_OP_UNMOUNT, (void *)d, l);
 }
@@ -2919,8 +2916,6 @@
 	l = l->next;
         if ((ic2 != ic) && (ic2->saved_pos))
 	  {
-//	     printf("REMOVE %p [%s]\n", 
-//		    pl->data, ((E_Fm2_Icon *)pl->data)->info.file);
 //	     ic->sd->icons_place = evas_list_remove_list(ic->sd->icons_place, pl);
 	  }
      }
@@ -3474,7 +3469,6 @@
 	 * fileman/list_odd/variable
 	 * 
 	 */
-//	printf("CALC ICON\n");
 	if ((!ic->sd->config->icon.fixed.w) || (!ic->sd->config->icon.fixed.h))
 	  {
 	     obj = ic->sd->tmp.obj;
@@ -3490,7 +3484,6 @@
 						 "base/theme/fileman",
 						 "icon/variable");
                   ic->sd->tmp.obj = obj;
-//		  printf("CALC OBJ %p\n", ic->sd->tmp.obj);
 	       }
 	     _e_fm2_icon_label_set(ic, obj);
 	     obj2 = ic->sd->tmp.obj2;
@@ -3504,7 +3497,6 @@
 	     edje_extern_object_max_size_set(obj2, ic->sd->config->icon.icon.w, ic->sd->config->icon.icon.h);
 	     edje_object_part_swallow(obj, "e.swallow.icon", obj2);
 	     edje_object_size_min_calc(obj, &mw, &mh);
-//	     printf("CALC %ix%i\n", mw, mh);
 	  }
 	ic->w = mw;
 	ic->h = mh;
@@ -3684,7 +3676,6 @@
         if ((selectraise) && (!strcmp(selectraise, "on")))
 	  evas_object_stack_below(ic->obj, ic->sd->drop);
      }
-//   printf("realize %s full = %i\n", ic->info.file, (int)ic->info.removable_full);
    if (ic->info.removable_full)
      edje_object_signal_emit(ic->obj_icon, "e,state,removable,full", "e");
 //   else
@@ -3862,7 +3853,6 @@
    if (!desktop) goto error;
 //   if (desktop->type != EFREET_DESKTOP_TYPE_LINK) goto error;
 
-//   printf("  mod time %lli\n", desktop->load_time);
    ic->info.removable = 0;
    ic->info.removable_full = 0;
    if (desktop->name)         ic->info.label   = evas_stringshare_add(desktop->name);
@@ -3882,18 +3872,15 @@
 	     else if (!strcmp(type, "Removable"))
 	       {
 		  ic->info.removable = 1;
-//		  printf("REMOVABLE %s\n", ic->info.link);
 		  if ((!e_fm2_hal_storage_find(ic->info.link)) &&
 		       (!e_fm2_hal_volume_find(ic->info.link)))
 		    {
-//		       printf("REMOVE IT %s\n", ic->info.file);
 		       _e_fm2_live_file_del(ic->sd->obj, ic->info.file);
 		       efreet_desktop_free(desktop);
 		       goto error;
 		    }
 	       }
 	     type = ecore_hash_get(desktop->x, "X-Enlightenment-Removable-State");
-//	     printf(" rem state type = %s\n", type);
 	     if (type)
 	       {
 		  if (!strcmp(type, "Full"))
@@ -4416,7 +4403,6 @@
      }
    if (!sd->drop_all)
      {
-	printf("DISP DROP ALL SHOW\n");
 	edje_object_signal_emit(sd->overlay, "e,state,drop,start", "e");
 	sd->drop_all = 1;
      }
@@ -4434,7 +4420,6 @@
    if (!sd) return;
    if (sd->drop_all)
      {
-	printf("DISP DROP ALL HIDE\n");
 	edje_object_signal_emit(sd->overlay, "e,state,drop,stop", "e");
 	sd->drop_all = 0;
      }
@@ -4459,7 +4444,6 @@
      {  
 	if (ic->sd->drop_after != -1)
 	  {
-	     printf("DISP DROP ON drop\n");
 	     edje_object_signal_emit(ic->sd->drop_in, "e,state,unselected", "e");
 	     edje_object_signal_emit(ic->sd->drop, "e,state,selected", "e");
 	     ic->sd->drop_in_show = 0;
@@ -4467,7 +4451,6 @@
 	  }
 	else
 	  {
-	     printf("DISP DROP ON drop_in\n");
 	     edje_object_signal_emit(ic->sd->drop, "e,state,unselected", "e");
 	     edje_object_signal_emit(ic->sd->drop_in, "e,state,selected", "e");
 	     ic->sd->drop_in_show = 1;
@@ -4486,7 +4469,6 @@
    
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
-   printf("DISP DROP OFF BOTH\n");
    if (sd->drop_show)
      {
 	edje_object_signal_emit(sd->drop, "e,state,unselected", "e");
@@ -4534,7 +4516,6 @@
    if (!type) return;
    if (strcmp(type, "text/uri-list")) return;
    ev = (E_Event_Dnd_Enter *)event;
-   printf("DND IN %i %i\n", ev->x, ev->y);
    e_drop_handler_action_set(ev->action);
 }
  
@@ -4550,14 +4531,12 @@
    if (!type) return;
    if (strcmp(type, "text/uri-list")) return;
    ev = (E_Event_Dnd_Move *)event;
-   printf("DND MOVE %i %i\n", ev->x, ev->y);
    e_drop_handler_action_set(ev->action);
    for (l = sd->icons; l; l = l->next) /* FIXME: should only walk regions and skip non-visible ones */
      {
 	ic = l->data;
 	if (E_INSIDE(ev->x, ev->y, ic->x - ic->sd->pos.x, ic->y - ic->sd->pos.y, ic->w, ic->h))
 	  {
-	     printf("OVER %s\n", ic->info.file);
 	     if (ic->drag.dnd) continue;
 	     /* if list view */
 	     if (ic->sd->config->view.mode == E_FM2_VIEW_MODE_LIST)
@@ -4574,17 +4553,14 @@
 			    if (ev->y <= (ic->y - ic->sd->pos.y + (ic->h / 4)))
 			      {
 				 _e_fm2_dnd_drop_show(ic, 0);
-				 printf("DDD 0\n");
 			      }
 			    else if (ev->y > (ic->y - ic->sd->pos.y + ((ic->h * 3) / 4)))
 			      {
 				 _e_fm2_dnd_drop_show(ic, 1);
-				 printf("DDD 1\n");
 			      }
 			    else
 			      {
 				 _e_fm2_dnd_drop_show(ic, -1);
-				 printf("DDD -1\n");
 			      }
 			 }
 		       else
@@ -4660,7 +4636,6 @@
    if (!type) return;
    if (strcmp(type, "text/uri-list")) return;
    ev = (E_Event_Dnd_Leave *)event;
-   printf("DND LEAVE %i %i\n", ev->x, ev->y);
    _e_fm2_dnd_drop_hide(sd->obj);
    _e_fm2_dnd_drop_all_hide(sd->obj);
 }
@@ -4832,15 +4807,9 @@
    if (strcmp(type, "text/uri-list")) return;
    ev = (E_Event_Dnd_Drop *)event;
 
-   printf("DROP: %i %i\n", ev->x, ev->y);
    fsel = _e_fm2_uri_path_list_get(ev->data);
    isel = _e_fm2_uri_icon_list_get(fsel);
    if (!isel) return;
-   for (l = fsel; l; l = l->next)
-     {
-	fl = l->data;
-	printf("  %s\n", fl);
-     }
    dx = 0; dy = 0;
    ox = 0; oy = 0;
    for (l = isel; l; l = l->next)
@@ -4852,11 +4821,6 @@
 	     oy = ic->y;
 	     dx = (ic->drag.x + ic->x - ic->sd->pos.x);
 	     dy = (ic->drag.y + ic->y - ic->sd->pos.y);
-	     printf("DND offset %i %i | %i %i | %i %i | %i %i\n", 
-		    dx, dy,
-		    ic->drag.x, ic->drag.y,
-		    ic->x, ic->y,
-		    ic->sd->pos.x, ic->sd->pos.y);
 	     break;
 	  }
      }
@@ -4870,7 +4834,6 @@
     */
    if (sd->drop_all) /* drop arbitarily into the dir */
      {
-	printf("drop all\n");
 	/* move file into this fm dir */
 	for (ll = fsel, il = isel; ll && il; ll = ll->next, il = il->next)
 	  {
@@ -4931,7 +4894,6 @@
      }
    else if (sd->drop_icon) /* inot or before/after an icon */
      {
-	printf("drop on/before/after icon\n");
 	if (sd->drop_after == -1) /* put into subdir in icon */
 	  {
 	     /* move file into dir that this icon is for */
@@ -4943,7 +4905,6 @@
 		  /* move the file into the subdir */
 		  snprintf(buf, sizeof(buf), "%s/%s/%s",
 			   sd->realpath, sd->drop_icon->info.file, ecore_file_file_get(fp));
-		  printf("mv %s %s\n", (char *)fp, buf);
 
 		  args = _e_fm_string_append_quoted(args, &size, &length, fp);
 		  args = _e_fm_string_append_char(args, &size, &length, ' ');
@@ -4967,7 +4928,6 @@
 			     sd->realpath, ecore_file_file_get(fp));
 		       if (sd->config->view.link_drop)
 			 {
-			    printf("ln -s %s %s\n", (char *)fp, buf);
 			    _e_fm2_client_file_symlink(buf, fp, sd->drop_icon->info.file, sd->drop_after, -9999, -9999, sd->h, sd->h);
 			 }
 		       else
@@ -5060,7 +5020,6 @@
 	else if (evas_key_modifier_is_set(modifiers, "Shift"))
 	  multi_sel = 1;
      }
-//   printf("MOUSE 1 range=%i multi=%i\n", range_sel, multi_sel);
    if (ic->sd->config->selection.single)
      {
 	multi_sel = 0;
@@ -5200,7 +5159,6 @@
 	  {
 	     ic->drag.x = ev->output.x - ic->x - ic->sd->x + ic->sd->pos.x;
 	     ic->drag.y = ev->output.y - ic->y - ic->sd->y + ic->sd->pos.y;
-//	     printf("DX: %i %i\n", ic->drag.x, ic->drag.y);
 	     ic->drag.start = 1;
 	     ic->drag.dnd = 0;
 	     ic->drag.src = 1;
@@ -5906,7 +5864,6 @@
 	_e_fm2_regions_populate(sd->obj);
 	break;
       case E_FM2_VIEW_MODE_CUSTOM_ICONS:
-	printf("CUSTOM ICONRESIZE HANDLE\n");
 	if (sd->config->view.fit_custom_pos)
 	  {
 	     for (l = sd->icons; l; l = l->next)
@@ -5938,7 +5895,6 @@
 	_e_fm2_regions_populate(sd->obj);
 	break;
       case E_FM2_VIEW_MODE_LIST:
-//	printf("LIST RESIZE HANDLE\n");
 	if (sd->iconlist_changed)
 	  {
 	     for (l = sd->icons; l; l = l->next)
@@ -6200,7 +6156,6 @@
    if (sd->path) evas_stringshare_del(sd->path);
    if (sd->mount)
      {
-	printf("UM3\n");
 	e_fm2_hal_unmount(sd->mount);
 	sd->mount = NULL;
      }
@@ -7767,7 +7722,6 @@
    _e_fm2_cb_live_timer(data);
    if ((sd->order_file) || (sd->config->view.always_order))
      {
-	printf("refresh from .order\n");
 	e_fm2_refresh(data);
      }
    sd->live.idler = NULL;

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2008-09-19 15:20:14 UTC (rev 36102)
+++ trunk/e/src/bin/e_shelf.c	2008-09-19 23:58:07 UTC (rev 36103)
@@ -184,7 +184,7 @@
      {
 	e_drop_xdnd_register_set(es->zone->container->bg_win, 1);
 	e_gadcon_xdnd_window_set(es->gadcon, es->zone->container->bg_win);
-	e_gadcon_dnd_window_set(es->gadcon, es->zone->container->event_win);
+	e_gadcon_dnd_window_set(es->gadcon, es->zone->container->bg_win);
      }
    e_gadcon_util_menu_attach_func_set(es->gadcon,
 				      _e_shelf_cb_menu_items_append, es);

Author:       raster
Date:         2008-09-19 16:59:29 -0700 (Fri, 19 Sep 2008)
New Revision: 36104

Log:
  remove debugging i added to fix dnd.
  
  

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

Modified: trunk/e/src/bin/e_dnd.c
===================================================================
--- trunk/e/src/bin/e_dnd.c	2008-09-19 23:58:07 UTC (rev 36103)
+++ trunk/e/src/bin/e_dnd.c	2008-09-19 23:59:29 UTC (rev 36104)
@@ -612,6 +612,8 @@
 	     py = ((E_Win *)(h->obj))->y;
 	     break;
 	   case E_ZONE_TYPE:
+// zone based drag targets are in a container thus their coords should be
+// screen-relative as containers just cover the screen
 //	     px = ((E_Zone *)(h->obj))->x;
 //	     py = ((E_Zone *)(h->obj))->y;
 	     break;
@@ -630,7 +632,6 @@
      }
    *dx += px;
    *dy += py;
-   printf("T: %x | dx = %i dy = %i\n", h->obj->type, *dx, *dy);
 }
 
 static Ecore_X_Window
@@ -774,7 +775,6 @@
 
    if (_drag_current)
      {
-	printf("--\n");
 	for (l = _drop_handlers; l; l = l->next)
 	  {
 	     E_Drop_Handler *h;
@@ -792,11 +792,6 @@
 	     leave_ev.x = x - dx;
 	     leave_ev.y = y - dy;
 	     
-	     int inside, matches;
-	     
-	     inside = E_INSIDE(x, y, dx, dy, dw, dh);
-	     matches = _e_drag_win_matches(h, win, 0);
-	     printf(" inside = %i, matches = %i\n", inside, matches);
 	     if (E_INSIDE(x, y, dx, dy, dw, dh) && 
 		 _e_drag_win_matches(h, win, 0))
 	       {
@@ -814,7 +809,6 @@
 			      }
 			    else
 			      enter_ev.data = _drag_current->data;
-			    printf("ENTER!\n");
 			    h->cb.enter(h->cb.data, h->active_type, &enter_ev);
 			 }
 		       h->entered = 1;

Log:
  fix gadcon popups across multiple zones.
  
  

Author:       raster
Date:         2008-09-19 22:16:49 -0700 (Fri, 19 Sep 2008)
New Revision: 36120

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

Modified: trunk/e/src/bin/e_gadcon_popup.c
===================================================================
--- trunk/e/src/bin/e_gadcon_popup.c	2008-09-20 05:09:06 UTC (rev 36119)
+++ trunk/e/src/bin/e_gadcon_popup.c	2008-09-20 05:16:49 UTC (rev 36120)
@@ -62,7 +62,7 @@
 e_gadcon_popup_show(E_Gadcon_Popup *pop)
 {
    Evas_Object *o;
-   Evas_Coord gx, gy, gw, gh, zw, zh, zx;
+   Evas_Coord gx, gy, gw, gh, zw, zh, zx, zy;
    Evas_Coord px, py, ww, wh;
 
    if (!pop) return;
@@ -91,9 +91,10 @@
 
    /* Popup positioning */
    e_gadcon_client_geometry_get(pop->gcc, &gx, &gy, &gw, &gh);
+   zx = pop->gcc->gadcon->zone->x;
+   zy = pop->gcc->gadcon->zone->y;
    zw = pop->gcc->gadcon->zone->w;
    zh = pop->gcc->gadcon->zone->h;
-   zx = pop->gcc->gadcon->zone->x;
    switch (pop->gcc->gadcon->orient)
      {
       case E_GADCON_ORIENT_CORNER_RT:
@@ -101,7 +102,7 @@
       case E_GADCON_ORIENT_RIGHT:
 	px = gx - pop->w;
 	py = gy;
-	if (py + pop->h >= zh)
+	if (py + pop->h >= (zy + zh))
 	  py = gy + gh - pop->h;
 	break;
       case E_GADCON_ORIENT_LEFT:
@@ -109,7 +110,7 @@
       case E_GADCON_ORIENT_CORNER_LB:
 	px = gx + gw;
 	py = gy;
-	if (py + pop->h >= zh)
+	if (py + pop->h >= (zy + zh))
 	  py = gy + gh - pop->h;
 	break;
 	break;
@@ -118,7 +119,7 @@
       case E_GADCON_ORIENT_CORNER_TR:
 	py = gy + gh;
 	px = (gx + (gw / 2)) - (pop->w / 2);
-	if (px + pop->w >= zw)
+	if ((px + pop->w) >= (zx + zw))
 	  px = gx + gw - pop->w;
         else if (px < zx)
           px = zx;
@@ -128,19 +129,19 @@
       case E_GADCON_ORIENT_CORNER_BR:
 	py = gy - pop->h;
 	px = (gx + (gw / 2)) - (pop->w / 2);
-	if (px + pop->w >= zw)
+	if ((px + pop->w) >= (zx + zw))
 	  px = gx + gw - pop->w;
         else if (px < zx)
           px = zx;
 	break;
       case E_GADCON_ORIENT_FLOAT:
 	px = (gx + (gw / 2)) - (pop->w / 2);
-	if (gy >= zh / 2)
+	if (gy >= (zy + (zh / 2)))
 	  py = gy - pop->h;
 	else
 	  py = gy + gh;
-	if (px + pop->w >= zw)
-	  px = zw - pop->w;
+	if ((px + pop->w) >= (zx + zw))
+	  px = gx + gw - pop->w;
         else if (px < zx)
           px = zx;
 	break;
@@ -148,7 +149,7 @@
 	e_popup_move_resize(pop->win, 50, 50, pop->w, pop->h);
 	return;
      }
-   e_popup_move_resize(pop->win, px, py, pop->w, pop->h);
+   e_popup_move_resize(pop->win, px - zx, py - zy, pop->w, pop->h);
 }
 
 EAPI void

Log:
  fix e_box fill/expand.
  
  

Author:       raster
Date:         2008-09-21 01:25:53 -0700 (Sun, 21 Sep 2008)
New Revision: 36143

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

Modified: trunk/e/src/bin/e_box.c
===================================================================
--- trunk/e/src/bin/e_box.c	2008-09-21 07:43:46 UTC (rev 36142)
+++ trunk/e/src/bin/e_box.c	2008-09-21 08:25:53 UTC (rev 36143)
@@ -532,10 +532,10 @@
 		       ww = w;
 		       hh = (h / (Evas_Coord)count);
 		       ow = bi->min.w;
-		       if (bi->expand_w) ow = ww;
+		       if (bi->fill_w) ow = ww;
 		       if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w;
 		       oh = bi->min.h;
-		       if (bi->expand_h) oh = hh;
+		       if (bi->fill_h) oh = hh;
 		       if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h;
 		       evas_object_move(obj, 
 					xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
@@ -557,10 +557,10 @@
 			    hh += oh;
 			 }
 		       ow = bi->min.w;
-		       if (bi->expand_w) ow = ww;
+		       if (bi->fill_w) ow = ww;
 		       if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w;
 		       oh = bi->min.h;
-		       if (bi->expand_h) oh = hh;
+		       if (bi->fill_h) oh = hh;
 		       if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h;
 		       evas_object_move(obj, 
 					xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),

Log:
  fix rememebr box to actually match basic/advanced and even be consistent with
  basic with "everything" flags.
  
  

Author:       raster
Date:         2008-09-24 17:40:56 -0700 (Wed, 24 Sep 2008)
New Revision: 36226

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	2008-09-24 17:21:53 UTC (rev 36225)
+++ trunk/e/src/bin/e_int_border_remember.c	2008-09-25 00:40:56 UTC (rev 36226)
@@ -114,8 +114,7 @@
 	    (cfdata->remember.apply_border) && (cfdata->remember.apply_sticky) &&
 	    (cfdata->remember.apply_desktop) && (cfdata->remember.apply_shade) &&
 	    (cfdata->remember.apply_zone) && (cfdata->remember.apply_skip_winlist) &&
-	    (cfdata->remember.apply_skip_pager) && (cfdata->remember.apply_skip_taskbar) &&
-	    (cfdata->remember.set_focus_on_start))
+	    (cfdata->remember.apply_skip_pager) && (cfdata->remember.apply_skip_taskbar))
      cfdata->mode = MODE_ALL;
    else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size) && 
 	    (cfdata->remember.apply_locks))
@@ -284,7 +283,8 @@
 	  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 | 
-					    E_REMEMBER_APPLY_SKIP_WINLIST | E_REMEMBER_APPLY_SKIP_PAGER | E_REMEMBER_APPLY_SKIP_TASKBAR;
+					    E_REMEMBER_APPLY_SKIP_WINLIST | E_REMEMBER_APPLY_SKIP_PAGER | E_REMEMBER_APPLY_SKIP_TASKBAR |
+	                                    E_REMEMBER_APPLY_ICON_PREF;
 	cfdata->border->remember->apply_first_only = 0;
        e_remember_update(cfdata->border->remember, cfdata->border);
      }

Log:
  fix remember to actually rememebr skip* stuff and save it
  
  

Author:       raster
Date:         2008-09-24 18:01:07 -0700 (Wed, 24 Sep 2008)
New Revision: 36227

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

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2008-09-25 00:40:56 UTC (rev 36226)
+++ trunk/e/src/bin/e_border.c	2008-09-25 01:01:07 UTC (rev 36227)
@@ -5946,7 +5946,7 @@
 	if (bd->remember)
 	  {
 	     rem  = bd->remember;
-	     
+
 	     if (rem->apply & E_REMEMBER_APPLY_ZONE)
 	       {
 		  E_Zone *zone;

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2008-09-25 00:40:56 UTC (rev 36226)
+++ trunk/e/src/bin/e_config.c	2008-09-25 01:01:07 UTC (rev 36227)
@@ -343,6 +343,8 @@
    E_CONFIG_VAL(D, T, prop.sticky, UCHAR);
    E_CONFIG_VAL(D, T, prop.shaded, UCHAR);
    E_CONFIG_VAL(D, T, prop.skip_winlist, UCHAR);
+   E_CONFIG_VAL(D, T, prop.skip_pager, UCHAR);
+   E_CONFIG_VAL(D, T, prop.skip_taskbar, UCHAR);
    E_CONFIG_VAL(D, T, prop.desk_x, INT);
    E_CONFIG_VAL(D, T, prop.desk_y, INT);
    E_CONFIG_VAL(D, T, prop.zone, INT);

Log:
  shorter text for disable
  
  

Author:       raster
Date:         2008-09-24 21:47:27 -0700 (Wed, 24 Sep 2008)
New Revision: 36237

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

Modified: trunk/e/src/bin/e_init_main.c
===================================================================
--- trunk/e/src/bin/e_init_main.c	2008-09-25 04:30:53 UTC (rev 36236)
+++ trunk/e/src/bin/e_init_main.c	2008-09-25 04:47:27 UTC (rev 36237)
@@ -305,7 +305,7 @@
      }
    
    edje_object_part_text_set(_e_init_object, "e.text.disable_text", 
-			     "Disable this splash screen in the future?");
+			     "Disable this splash screen");
    edje_object_signal_callback_add(_e_init_object, "e,action,init,disable", "e",
 				   _e_init_cb_signal_disable, NULL);
    edje_object_signal_callback_add(_e_init_object, "e,action,init,enable", "e",

Log:
  reduce text.
  
  

Author:       raster
Date:         2008-09-25 07:15:16 -0700 (Thu, 25 Sep 2008)
New Revision: 36254

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

Modified: trunk/e/src/bin/e_init.c
===================================================================
--- trunk/e/src/bin/e_init.c	2008-09-25 13:52:56 UTC (rev 36253)
+++ trunk/e/src/bin/e_init.c	2008-09-25 14:15:16 UTC (rev 36254)
@@ -359,7 +359,7 @@
    if (s) evas_stringshare_del(s);
 
    edje_object_part_text_set(_e_init_object, "e.text.disable_text",
-			     _("Disable this splash screen in the future?"));
+			     _("Disable splash screen"));
    edje_object_signal_callback_add(_e_init_object, "e,action,init,disable", "e",
 				   _e_init_cb_signal_disable, NULL);
    edje_object_signal_callback_add(_e_init_object, "e,action,init,enable", "e",

Log:
  and match both text to be smaller.
  
  

Author:       raster
Date:         2008-09-25 07:16:30 -0700 (Thu, 25 Sep 2008)
New Revision: 36255

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

Modified: trunk/e/src/bin/e_init_main.c
===================================================================
--- trunk/e/src/bin/e_init_main.c	2008-09-25 14:15:16 UTC (rev 36254)
+++ trunk/e/src/bin/e_init_main.c	2008-09-25 14:16:30 UTC (rev 36255)
@@ -305,7 +305,7 @@
      }
    
    edje_object_part_text_set(_e_init_object, "e.text.disable_text", 
-			     "Disable this splash screen");
+			     "Disable splash screen");
    edje_object_signal_callback_add(_e_init_object, "e,action,init,disable", "e",
 				   _e_init_cb_signal_disable, NULL);
    edje_object_signal_callback_add(_e_init_object, "e,action,init,enable", "e",

Log:
  add auto-scrolloption to dialogs (place content in scrolled viw).
  
  

Author:       raster
Date:         2008-09-26 10:00:32 -0700 (Fri, 26 Sep 2008)
New Revision: 36268

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

Modified: trunk/e/src/bin/e_config_dialog.c
===================================================================
--- trunk/e/src/bin/e_config_dialog.c	2008-09-26 15:27:46 UTC (rev 36267)
+++ trunk/e/src/bin/e_config_dialog.c	2008-09-26 17:00:32 UTC (rev 36268)
@@ -163,7 +163,7 @@
 _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
 {
    E_Dialog *pdia;
-   Evas_Object *o, *ob;
+   Evas_Object *o, *ob, *sf;
    Evas_Coord mw = 0, mh = 0;
    char buf[256];
    
@@ -186,14 +186,28 @@
 	  {
 	     o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0);
 	     ob = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata);
-	     e_widget_list_object_append(o, ob, 1, 1, 0.0);
+	     if (cfd->view->scroll)
+	       {
+		  e_widget_min_size_resize(ob);
+		  sf = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), ob);
+		  e_widget_list_object_append(o, sf, 1, 1, 0.0);
+	       }
+	     else
+	       e_widget_list_object_append(o, ob, 1, 1, 0.0);
 	     ob = e_widget_button_add(e_win_evas_get(cfd->dia->win),
 				      _("Advanced"), "widget/new_dialog",
 				      _e_config_dialog_cb_advanced, cfd, NULL);
 	     e_widget_list_object_append(o, ob, 0, 0, 1.0);
 	  }
 	else
-	  o = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata);
+	  {
+	     o = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata);
+	     if (cfd->view->scroll)
+	       {
+		  e_widget_min_size_resize(o);
+		  o = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), o);
+	       }
+	  }
      }
    else
      {
@@ -201,14 +215,28 @@
 	  {
 	     o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0);
 	     ob = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata);
-	     e_widget_list_object_append(o, ob, 1, 1, 0.0);
+	     if (cfd->view->scroll)
+	       {
+		  e_widget_min_size_resize(ob);
+		  sf = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), ob);
+		  e_widget_list_object_append(o, sf, 1, 1, 0.0);
+	       }
+	     else
+	       e_widget_list_object_append(o, ob, 1, 1, 0.0);
 	     ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), 
 				      _("Basic"), "widget/new_dialog",
 				      _e_config_dialog_cb_basic, cfd, NULL);
 	     e_widget_list_object_append(o, ob, 0, 0, 1.0);
 	  }
 	else
-	  o = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata);
+	  {
+	     o = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata);
+	     if (cfd->view->scroll)
+	       {
+		  e_widget_min_size_resize(o);
+		  o = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), o);
+	       }
+	  }
      }
    
    e_widget_min_size_get(o, &mw, &mh);

Modified: trunk/e/src/bin/e_config_dialog.h
===================================================================
--- trunk/e/src/bin/e_config_dialog.h	2008-09-26 15:27:46 UTC (rev 36267)
+++ trunk/e/src/bin/e_config_dialog.h	2008-09-26 17:00:32 UTC (rev 36268)
@@ -25,6 +25,7 @@
    unsigned char override_auto_apply : 1;
    unsigned char basic_only : 1;
    unsigned char normal_win : 1;
+   unsigned char scroll : 1;
    
    void           *(*create_cfdata)     (E_Config_Dialog *cfd);
    void            (*free_cfdata)       (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);

Log:
  fix theme about to use max size.. properly. and calc min size too.
  
  
Author:       raster
Date:         2008-10-18 21:23:04 -0700 (Sat, 18 Oct 2008)
New Revision: 36799

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

Modified: trunk/e/src/bin/e_theme_about.c
===================================================================
--- trunk/e/src/bin/e_theme_about.c	2008-10-19 04:22:51 UTC (rev 36798)
+++ trunk/e/src/bin/e_theme_about.c	2008-10-19 04:23:04 UTC (rev 36799)
@@ -69,8 +69,7 @@
    
    o = edje_object_add(e_win_evas_get(about->win));
    about->bg_object = o;
-   e_theme_edje_object_set(o, "base/theme",
-			   "e/theme/about");
+   e_theme_edje_object_set(o, "base/theme", "e/theme/about");
    evas_object_move(o, 0, 0);
    evas_object_show(o);
    
@@ -85,9 +84,10 @@
 EAPI void
 e_theme_about_show(E_Theme_About *about)
 {
-   Evas_Coord w, h, mw, mh;
+   Evas_Coord w, h, mw, mh, mcw, mch;
    
    edje_object_size_min_get(about->bg_object, &mw, &mh);
+   edje_object_size_min_restricted_calc(about->bg_object, &mw, &mh, mw, mh);
    evas_object_resize(about->bg_object, mw, mh);
    e_win_resize(about->win, mw, mh);
    e_win_size_min_set(about->win, mw, mh);
@@ -97,7 +97,7 @@
      {
 	if (w < mw) w = mw;
 	if (h < mh) h = mh;
-	e_win_size_max_set(about->win, mw, mh);
+	e_win_size_max_set(about->win, w, h);
      }
    e_win_show(about->win);
    e_win_border_icon_set(about->win, "enlightenment/themes");

Log:
  oh yeah. handle sizing right.
  
  
Author:       raster
Date:         2008-10-19 07:15:23 -0700 (Sun, 19 Oct 2008)
New Revision: 36818

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

Modified: trunk/e/src/bin/e_about.c
===================================================================
--- trunk/e/src/bin/e_about.c	2008-10-19 14:13:17 UTC (rev 36817)
+++ trunk/e/src/bin/e_about.c	2008-10-19 14:15:23 UTC (rev 36818)
@@ -158,7 +158,7 @@
    Evas_Coord w, h, mw, mh;
 
    edje_object_size_min_get(about->bg_object, &w, &h);
-   edje_object_size_min_calc(about->bg_object, &mw, &mh);
+   edje_object_size_min_restricted_calc(about->bg_object, &mw, &mh, w, h);
    if (w > mw) mw = w;
    if (h > mh) mh = h;
    evas_object_resize(about->bg_object, mw, mh);
@@ -170,7 +170,7 @@
      {
 	if (w < mw) w = mw;
 	if (h < mh) h = mh;
-	e_win_size_max_set(about->win, mw, mh);
+	e_win_size_max_set(about->win, w, h);
      }
    e_win_show(about->win);
 }

Log:
  was using this for debugging. keep it there for future reference. didn't know
  we had such malloc hooks! i might consider using these in future!
  
  
Author:       raster
Date:         2008-10-19 20:30:22 -0700 (Sun, 19 Oct 2008)
New Revision: 36831

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2008-10-20 02:45:38 UTC (rev 36830)
+++ trunk/e/src/bin/e_main.c	2008-10-20 03:30:22 UTC (rev 36831)
@@ -7,6 +7,53 @@
 #include <Ecore_IMF.h>
 #endif
 
+/*
+ * i need to make more use of these when i'm baffled as to when something is
+ * up. other hooks:
+ * 
+ *      void *(*__malloc_hook)(size_t size, const void *caller);
+ * 
+ *      void *(*__realloc_hook)(void *ptr, size_t size, const void *caller);
+ *
+ *      void *(*__memalign_hook)(size_t alignment, size_t size,
+ *                               const void *caller);
+ *
+ *      void (*__free_hook)(void *ptr, const void *caller);
+ *
+ *      void (*__malloc_initialize_hook)(void);
+ *
+ *      void (*__after_morecore_hook)(void);
+ *
+
+static void my_init_hook(void);
+static void my_free_hook(void *p, const void *caller);
+
+static void (*old_free_hook)(void *ptr, const void *caller) = NULL;
+void (*__free_hook)(void *ptr, const void *caller);
+
+void (*__malloc_initialize_hook) (void) = my_init_hook;
+static void
+my_init_hook(void)
+{
+   old_free_hook = __free_hook;
+   __free_hook = my_free_hook;
+}
+
+//void *magicfree = NULL;
+
+static void my_free_hook(void *p, const void *caller)
+{
+   __free_hook = old_free_hook;
+//   if ((p) && (p == magicfree))
+//     {
+//	printf("CAUGHT!!!!! %p ...\n", p);
+//	abort();
+//     }
+   free(p);
+   __free_hook = my_free_hook;
+}
+*/
+
 EAPI int e_precache_end = 0;
 
 /* local subsystem functions */

Log:
  enable instant_edit (pesss and hold for 1 second to drag around)
  
  
Author:       raster
Date:         2008-10-22 17:55:21 -0700 (Wed, 22 Oct 2008)
New Revision: 37009

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

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2008-10-23 00:51:42 UTC (rev 37008)
+++ trunk/e/src/bin/e_shelf.c	2008-10-23 00:55:21 UTC (rev 37009)
@@ -158,6 +158,7 @@
      }
 
    es->gadcon = e_gadcon_swallowed_new(es->name, es->id, es->o_base, "e.swallow.content");
+   es->gadcon->instant_edit = 1;
    e_gadcon_min_size_request_callback_set(es->gadcon,
 					  _e_shelf_gadcon_min_size_request, es);

Log:
  instant edit --
  
Author:       raster
Date:         2008-10-22 21:49:52 -0700 (Wed, 22 Oct 2008)
New Revision: 37012

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

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2008-10-23 03:58:18 UTC (rev 37011)
+++ trunk/e/src/bin/e_shelf.c	2008-10-23 04:49:52 UTC (rev 37012)
@@ -158,7 +158,8 @@
      }
 
    es->gadcon = e_gadcon_swallowed_new(es->name, es->id, es->o_base, "e.swallow.content");
-   es->gadcon->instant_edit = 1;
+// hmm dnd in ibar and ibox kill this. ok. need to look into this more   
+//   es->gadcon->instant_edit = 1;
    e_gadcon_min_size_request_callback_set(es->gadcon,
 					  _e_shelf_gadcon_min_size_request, es);

Log:
  sort profiles.
  
  
Author:       raster
Date:         2008-10-26 02:11:49 -0700 (Sun, 26 Oct 2008)
New Revision: 37121

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2008-10-26 09:11:45 UTC (rev 37120)
+++ trunk/e/src/bin/e_config.c	2008-10-26 09:11:49 UTC (rev 37121)
@@ -1409,6 +1409,11 @@
    return NULL;
 }
 
+static int _cb_sort_files(char *f1, char *f2)
+{
+   return strcmp(f1, f2);
+}
+
 EAPI Eina_List *
 e_config_profile_list(void)
 {
@@ -1425,6 +1430,7 @@
      {
 	char *file;
 	
+	ecore_list_sort(files, ECORE_COMPARE_CB(_cb_sort_files), ECORE_SORT_MIN);
 	ecore_list_first_goto(files);
 	while ((file = ecore_list_current(files)))
 	  {
@@ -1442,6 +1448,7 @@
      {
 	char *file;
 	
+	ecore_list_sort(files, ECORE_COMPARE_CB(_cb_sort_files), ECORE_SORT_MIN);
 	ecore_list_first_goto(files);
 	while ((file = ecore_list_current(files)))
 	  {

Log:
  oops. i was on drugs that day. wrong call (right parameters!)
  good catch
  
  
Author:       raster
Date:         2008-10-26 15:44:57 -0700 (Sun, 26 Oct 2008)
New Revision: 37178

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

Modified: trunk/e/src/bin/e_desklock.c
===================================================================
--- trunk/e/src/bin/e_desklock.c	2008-10-26 20:50:21 UTC (rev 37177)
+++ trunk/e/src/bin/e_desklock.c	2008-10-26 22:44:57 UTC (rev 37178)
@@ -297,8 +297,7 @@
 		       edje_object_part_text_set(edp->login_box, "e.text.title", 
 						 _("Please enter your unlock password"));
 		       edje_object_size_min_calc(edp->login_box, &mw, &mh);
-		       /* FIXME: This is wrong, edje_file_group_exists needs a file, not an object! */
-		       if (edje_file_group_exists(edp->bg_object, "e.swallow.login_box"))
+		       if (edje_object_part_exists(edp->bg_object, "e.swallow.login_box"))
 			 {
 			    edje_extern_object_min_size_set(edp->login_box, mw, mh);
 			    edje_object_part_swallow(edp->bg_object, "e.swallow.login_box", edp->login_box);

Log:
  add a (disabled) dump call for string dumping.
  
  
Author:       raster
Date:         2008-10-26 17:38:03 -0700 (Sun, 26 Oct 2008)
New Revision: 37187

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2008-10-27 00:36:22 UTC (rev 37186)
+++ trunk/e/src/bin/e_main.c	2008-10-27 00:38:03 UTC (rev 37187)
@@ -106,7 +106,14 @@
 #else
 #define TS(x)
 #endif
-   
+
+static int stdbg(void)
+{
+// enable to debug eina stringshare usage   
+//   eina_stringshare_dump();
+   return 0;
+}
+
 /* externally accessible functions */
 int
 main(int argc, char **argv)
@@ -994,6 +1001,9 @@
    /* no longer starting up */
    starting = 0;
    /* start our main loop */
+   
+   ecore_timer_add(5.0, stdbg, NULL);
+   
    ecore_main_loop_begin();
 
    e_canvas_idle_flush();

Log:
  an d link to e_hal in e17's bin too
  
  
Author:       raster
Date:         2008-10-26 22:30:39 -0700 (Sun, 26 Oct 2008)
New Revision: 37197

Modified:
  trunk/e/src/bin/Makefile.am 

Modified: trunk/e/src/bin/Makefile.am
===================================================================
--- trunk/e/src/bin/Makefile.am	2008-10-27 05:24:12 UTC (rev 37196)
+++ trunk/e/src/bin/Makefile.am	2008-10-27 05:30:39 UTC (rev 37197)
@@ -7,6 +7,7 @@
 	   @cf_cflags@ \
 	   @VALGRIND_CFLAGS@ \
 	   @EDJE_DEF@ \
+	   @E_HAL_CFLAGS@ \
 	   -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
 	   -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
 	   -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
@@ -304,7 +305,7 @@
 e_main.c \
 $(enlightenment_src)
 
-enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @E_DBUS_LIBS@
+enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @E_DBUS_LIBS@ @E_HAL_LIBS@
 
 enlightenment_remote_SOURCES = \
 e.h \

Log:
  try and make intl more forgiving of encoding-free locales (assume encoding
  works?)
  
  
Author:       raster
Date:         2008-10-28 06:32:21 -0700 (Tue, 28 Oct 2008)
New Revision: 37272

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

Modified: trunk/e/src/bin/e_intl.c
===================================================================
--- trunk/e/src/bin/e_intl.c	2008-10-28 13:30:39 UTC (rev 37271)
+++ trunk/e/src/bin/e_intl.c	2008-10-28 13:32:21 UTC (rev 37272)
@@ -143,6 +143,7 @@
 e_intl_language_set(const char *lang)
 {
    int set_envars;
+   int ok;
 
    set_envars = 1;
    /* NULL lang means set everything back to the original environment
@@ -172,12 +173,27 @@
    else
      _e_intl_language = NULL;
 
-   if ((!_e_intl_locale_validate(_e_intl_language_alias)) &&
-	 (strcmp(_e_intl_language_alias, "C")))
+   ok = 1;
+   if (strcmp(_e_intl_language_alias, "C"))
      {
+	ok = _e_intl_locale_validate(_e_intl_language_alias);
+	if (!ok)
+	  {
+	     char *p, *new_lang;
+	     
+	     new_lang = _e_intl_language_alias;
+	     p = strchr(new_lang, '.');
+	     if (p) *p = 0;
+	     _e_intl_language_alias = strdup(new_lang);
+	     E_FREE(new_lang);
+	     ok = _e_intl_locale_validate(_e_intl_language_alias);
+	  }
+     }
+   if (!ok)
+     {
 	fprintf(stderr, "The locale '%s' cannot be found on your "
-	       "system. Please install this locale or try "
-               "something else.", _e_intl_language_alias);
+		"system. Please install this locale or try "
+		"something else.", _e_intl_language_alias);
      }
    else
      {
@@ -563,6 +579,7 @@
    Evas_Hash *alias_hash;
    char *alias;
    char *lower_language;
+   char *noenc_language;
    int i;
 
    if ((language == NULL) || (!strncmp(language, "POSIX", strlen("POSIX"))))
@@ -900,7 +917,6 @@
    locale_lr = 
      e_intl_locale_parts_combine(locale_parts, 
 				 E_INTL_LOC_LANG | E_INTL_LOC_REGION);
-
    if (locale_lr == NULL)
      {
 	/* Not valid locale, maybe its an alias */

Log:
  use priority set call
  
  
Author:       raster
Date:         2008-11-01 18:29:15 -0700 (Sat, 01 Nov 2008)
New Revision: 37390

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2008-11-02 01:29:08 UTC (rev 37389)
+++ trunk/e/src/bin/e_main.c	2008-11-02 01:29:15 UTC (rev 37390)
@@ -561,6 +561,9 @@
 	_e_main_shutdown(-1);
      }
    _e_main_shutdown_push(e_config_shutdown);
+
+   /* set all execced stuff to pri 1 - nice. make this config later? */
+   ecore_exe_run_priority_set(1);
    
    TS("scale");
    /* init config system */

Log:
  make e_start run dbus-launch - if that fails, fall back.
  
  
Author:       raster
Date:         2008-11-02 23:34:44 -0800 (Sun, 02 Nov 2008)
New Revision: 37433

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

Modified: trunk/e/src/bin/e_start_main.c
===================================================================
--- trunk/e/src/bin/e_start_main.c	2008-11-03 07:33:39 UTC (rev 37432)
+++ trunk/e/src/bin/e_start_main.c	2008-11-03 07:34:44 UTC (rev 37433)
@@ -388,14 +388,27 @@
 	precache();
      }
    done:
+
+   /* try dbus-launch */
+   snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path);
    
-   args = alloca((argc + 1) * sizeof(char *));
+   args = alloca((argc + 3) * sizeof(char *));
+   if (!getenv("DBUS_SESSION_BUS_ADDRESS"))
+     {
+	args[0] = "dbus-launch";
+	args[1] = "--exit-with-session";
+	args[2] = buf;
+	for (i = 1; i < argc; i++) args[2 + i] = argv[i];
+	args[2 + i] = NULL;
+	execvp("dbus-launch", args);
+     }
+   
+   /* dbus-launch failed - run e direct */
    args[0] = "enlightenment";
    for (i = 1; i < argc; i++) args[i] = argv[i];
    args[i] = NULL;
-   
-   snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path);
    execv(buf, args);
+
    printf("FAILED TO RUN:\n");
    printf("  %s\n", buf);
    perror("execv");

Log:
  thomas fix for single click dirs
  
  
Author:       raster
Date:         2008-11-03 00:56:16 -0800 (Mon, 03 Nov 2008)
New Revision: 37436

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2008-11-03 08:21:36 UTC (rev 37435)
+++ trunk/e/src/bin/e_fm.c	2008-11-03 08:56:16 UTC (rev 37436)
@@ -5155,18 +5155,17 @@
      {
 	/* if its a directory && open dirs in-place is set then change the dir
 	 * to be the dir + file */
-	if ((S_ISDIR(ic->info.statinfo.st_mode)) && 
+	if (
+	    (S_ISDIR(ic->info.statinfo.st_mode)) && 
 	    (ic->sd->config->view.open_dirs_in_place) &&
 	    (!ic->sd->config->view.no_subdir_jump) &&
 	    (!ic->sd->config->view.single_click)
 	    )
 	  {
-	     char buf[4096], *dev = NULL;
+	     char buf[4096];
 	     
-	     if (ic->sd->dev) dev = strdup(ic->sd->dev);
 	     snprintf(buf, sizeof(buf), "%s/%s", ic->sd->path, ic->info.file);
-	     e_fm2_path_set(ic->sd->obj, dev, buf);
-	     E_FREE(dev);
+	     e_fm2_path_set(ic->sd->obj, ic->sd->dev, buf);
 	  }
 	else
 	  evas_object_smart_callback_call(ic->sd->obj, "selected", NULL);
@@ -5189,7 +5188,7 @@
 	     ic->drag.dnd = 0;
 	     ic->drag.src = 1;
 	  }
-	_e_fm2_mouse_1_handler(ic, 0, ev->modifiers);
+	  _e_fm2_mouse_1_handler(ic, 0, ev->modifiers);
      }
    else if (ev->button == 3)
      {
@@ -5214,6 +5213,24 @@
         ic->drag.start = 0;
 	ic->drag.dnd = 0;
 	ic->drag.src = 0;
+
+        if (
+	    (S_ISDIR(ic->info.statinfo.st_mode)) &&
+            (ic->sd->config->view.open_dirs_in_place) &&
+            (!ic->sd->config->view.no_subdir_jump) &&
+            (ic->sd->config->view.single_click)
+            )
+          {
+             char buf[4096];
+
+             snprintf(buf, sizeof(buf), "%s/%s", ic->sd->path, ic->info.file);
+             e_fm2_path_set(ic->sd->obj, ic->sd->dev, buf);
+          }
+        else if ((S_ISDIR(ic->info.statinfo.st_mode)) && (ic->sd->config->view.single_click))
+          evas_object_smart_callback_call(ic->sd->obj, "selected", NULL);
+
+
+
      }
    ic->down_sel = 0;
 }

Log:
  fix restart! mouse bindings broken! manage windows and use config before
  config loaded!
  
  
Author:       raster
Date:         2008-11-14 02:53:03 -0800 (Fri, 14 Nov 2008)
New Revision: 37619

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2008-11-14 10:22:57 UTC (rev 37618)
+++ trunk/e/src/bin/e_main.c	2008-11-14 10:53:03 UTC (rev 37619)
@@ -65,6 +65,7 @@
 static int  _e_main_dirs_shutdown(void);
 static int  _e_main_screens_init(void);
 static int  _e_main_screens_shutdown(void);
+static void _e_main_manage_all(void);
 static int  _e_main_path_init(void);
 static int  _e_main_path_shutdown(void);
 
@@ -1016,6 +1017,9 @@
    TS("shelf config init");
    e_shelf_config_init();
 
+   TS("manage all windows");
+   _e_main_manage_all();
+   
    /* an idle enterer to be called after all others */
    _e_main_idle_enterer_after = ecore_idle_enterer_add(_e_main_cb_idler_after, NULL);
 
@@ -1242,7 +1246,7 @@
 	     e_grabinput_focus(con->bg_win, E_FOCUS_METHOD_PASSIVE);
 	     e_hints_manager_init(man);
 	     _e_main_desk_restore(man, con);
-	     e_manager_manage_windows(man);
+//	     e_manager_manage_windows(man);
 	  }
 	else
 	  {
@@ -1278,6 +1282,15 @@
    return 1;
 }
 
+static void
+_e_main_manage_all(void)
+{
+   Eina_List *l;
+   
+   for (l = e_manager_list(); l; l = l->next)
+     e_manager_manage_windows(l->data);
+}
+
 static int
 _e_main_path_init(void)
 {

Modified: trunk/e/src/bin/e_manager.c
===================================================================
--- trunk/e/src/bin/e_manager.c	2008-11-14 10:22:57 UTC (rev 37618)
+++ trunk/e/src/bin/e_manager.c	2008-11-14 10:53:03 UTC (rev 37619)
@@ -285,7 +285,7 @@
 			    /* FIXME:
 			     * It's enough to set the desk, the zone will
 			     * be set according to the desk */
-			    if (zone) e_border_zone_set(bd, zone);
+//			    if (zone) e_border_zone_set(bd, zone);
 			    if (desk) e_border_desk_set(bd, desk);
 			 }
 		    }

Log:
  leak--!
  
  
Author:       raster
Date:         2008-11-14 17:26:20 -0800 (Fri, 14 Nov 2008)
New Revision: 37645

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

Modified: trunk/e/src/bin/e_fm_main.c
===================================================================
--- trunk/e/src/bin/e_fm_main.c	2008-11-15 00:53:22 UTC (rev 37644)
+++ trunk/e/src/bin/e_fm_main.c	2008-11-15 01:26:20 UTC (rev 37645)
@@ -434,12 +434,12 @@
 _e_dbus_cb_dev_add(void *data, DBusMessage *msg)
 {
    DBusError err;
-   char *udi;
+   char *udi = NULL;
    int ret;
    
    dbus_error_init(&err);
    dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
-   udi = strdup(udi);
+   if (!udi) return;
 //   printf("DB DEV+: %s\n", udi);
    ret = e_hal_device_query_capability(_e_dbus_conn, udi, "storage", 
 				       _e_dbus_cb_store_is, strdup(udi));

Log:
  disable feeds in popup - its the same window! how did this all of a sudden
  start happening now?.... hmmmm..
  
  
Author:       raster
Date:         2008-11-14 21:12:31 -0800 (Fri, 14 Nov 2008)
New Revision: 37649

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

Modified: trunk/e/src/bin/e_popup.c
===================================================================
--- trunk/e/src/bin/e_popup.c	2008-11-15 04:25:09 UTC (rev 37648)
+++ trunk/e/src/bin/e_popup.c	2008-11-15 05:12:31 UTC (rev 37649)
@@ -7,15 +7,19 @@
 static void _e_popup_free(E_Popup *pop);
 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 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);
+*/
 
 /* local subsystem globals */
 static Ecore_Event_Handler *_e_popup_window_shape_handler = NULL;
+/*
 static Ecore_Event_Handler *_e_popup_mouse_down_handler = NULL;
 static Ecore_Event_Handler *_e_popup_mouse_up_handler = NULL;
 static Ecore_Event_Handler *_e_popup_mouse_wheel_handler = NULL;
+ */
 static Eina_List *_e_popup_list = NULL;
 
 /* externally accessible functions */
@@ -25,12 +29,14 @@
 {
    _e_popup_window_shape_handler = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE,
 							   _e_popup_cb_window_shape, NULL);
+/*   
    _e_popup_mouse_down_handler = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN,
 							 _e_popup_cb_mouse_down, NULL);
    _e_popup_mouse_up_handler = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP,
 						       _e_popup_cb_mouse_up, NULL);
    _e_popup_mouse_wheel_handler = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL,
 							  _e_popup_cb_mouse_wheel, NULL);
+ */
    return 1;
 }
 
@@ -38,9 +44,11 @@
 e_popup_shutdown(void)
 {
    E_FN_DEL(ecore_event_handler_del, _e_popup_window_shape_handler);
+/*   
    E_FN_DEL(ecore_event_handler_del, _e_popup_mouse_down_handler);
    E_FN_DEL(ecore_event_handler_del, _e_popup_mouse_up_handler);
    E_FN_DEL(ecore_event_handler_del, _e_popup_mouse_wheel_handler);
+ */
    return 1;
 }
 
@@ -315,7 +323,7 @@
      }
    return NULL;
 }
-
+/*
 static int
 _e_popup_cb_mouse_down(void *data, int type, void *event)
 {
@@ -373,3 +381,4 @@
      }
    return 1;
 }
+*/

Log:
  add Sans font test.
  
  
Author:       raster
Date:         2008-11-20 20:35:26 -0800 (Thu, 20 Nov 2008)
New Revision: 37722

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2008-11-21 03:59:30 UTC (rev 37721)
+++ trunk/e/src/bin/e_main.c	2008-11-21 04:35:26 UTC (rev 37722)
@@ -662,8 +662,9 @@
    TS("test file format support");   
      {
 	Ecore_Evas *ee;
-	Evas_Object *im;
+	Evas_Object *im, *txt;
 	char buf[4096];
+        Evas_Coord tw, th;
 	
 	ee = ecore_evas_buffer_new(1, 1);
 	if (!ee)
@@ -672,6 +673,7 @@
 				    "Evas has Software Buffer engine support.\n"));
 	     _e_main_shutdown(-1);
 	  }
+        e_canvas_add(ee);
 	im = evas_object_image_add(ecore_evas_get(ee));
 
 	snprintf(buf, sizeof(buf), "%s/data/images/test.png", e_prefix_data_get());
@@ -701,6 +703,18 @@
 	     _e_main_shutdown(-1);
 	  }
 	evas_object_del(im);
+        txt = evas_object_text_add(ecore_evas_get(ee));
+        evas_object_text_font_set(txt, "Sans", 10);
+        evas_object_text_text_set(txt, "Hello");
+        evas_object_geometry_get(txt, NULL, NULL, &tw, &th);
+        if ((tw <= 0) && (th <= 0))
+          {
+	     e_error_message_show(_("Enlightenment found Evas can't load the 'Sans' font. Check Evas has fontconfig\n"
+				    "support and system fontconfig defines a 'Sans' font.\n"));
+	     _e_main_shutdown(-1);
+          }
+        evas_object_del(txt);
+        e_canvas_del(ee);
 	ecore_evas_free(ee);
      }

Log:
  fix config upgrade for syscon.
  
  
Author:       raster
Date:         2008-11-25 15:43:00 -0800 (Tue, 25 Nov 2008)
New Revision: 37807

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2008-11-25 23:26:14 UTC (rev 37806)
+++ trunk/e/src/bin/e_config.c	2008-11-25 23:43:00 UTC (rev 37807)
@@ -848,6 +848,11 @@
         IFCFGEND;
         
         IFCFG(0x012c);
+        COPYVAL(syscon.main.icon_size);
+        COPYVAL(syscon.secondary.icon_size);
+        COPYVAL(syscon.extra.icon_size);
+        COPYVAL(syscon.timeout);
+        COPYVAL(syscon.do_input);
         COPYPTR(syscon.actions);
         IFCFGEND;

Log:
  unfortunately disable.. breaks! need to find exactly why and fix though...
  
  
Author:       raster
Date:         2008-12-01 18:29:50 -0800 (Mon, 01 Dec 2008)
New Revision: 37897

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2008-12-02 01:40:13 UTC (rev 37896)
+++ trunk/e/src/bin/e_fm.c	2008-12-02 02:29:50 UTC (rev 37897)
@@ -3054,8 +3054,8 @@
 static inline char
 _e_fm2_view_mode_get(const E_Fm2_Smart_Data *sd)
 {
-   if (sd->view_mode > -1)
-     return sd->view_mode;
+//   if (sd->view_mode > -1)
+//     return sd->view_mode;
    return sd->config->view.mode;
 }

Log:
  mark it with a comment
  
  
Author:       raster
Date:         2008-12-01 19:46:50 -0800 (Mon, 01 Dec 2008)
New Revision: 37900

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2008-12-02 02:33:09 UTC (rev 37899)
+++ trunk/e/src/bin/e_fm.c	2008-12-02 03:46:50 UTC (rev 37900)
@@ -3054,6 +3054,7 @@
 static inline char
 _e_fm2_view_mode_get(const E_Fm2_Smart_Data *sd)
 {
+// this breaks illume on openembedded. disable! :(   
 //   if (sd->view_mode > -1)
 //     return sd->view_mode;
    return sd->config->view.mode;

Log:
  char is used for numeric values... thus should be explicitly signed!
  
  
Author:       raster
Date:         2008-12-07 13:57:11 -0800 (Sun, 07 Dec 2008)
New Revision: 37991

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2008-12-07 20:40:17 UTC (rev 37990)
+++ trunk/e/src/bin/e_fm.c	2008-12-07 21:57:11 UTC (rev 37991)
@@ -76,8 +76,8 @@
    unsigned char     typebuf_visible : 1;
    unsigned char     show_hidden_files : 1;
    unsigned char     listing : 1;
-   char              view_mode; /* -1 = unset */
-   short             icon_size; /* -1 = unset */
+   signed char       view_mode; /* -1 = unset */
+   signed short      icon_size; /* -1 = unset */
    
    E_Fm2_Config     *config;
    const char       *custom_theme;
@@ -114,11 +114,10 @@
    unsigned char       drop_all : 1;
    unsigned char       drag : 1;
    unsigned char       selecting : 1;
-   struct 
-     {
-	int ox, oy;
-	int x, y, w, h;
-     } selrect;
+   struct {
+      int ox, oy;
+      int x, y, w, h;
+   } selrect;
 };
  
 struct _E_Fm2_Region

Log:
  fix double-manage of windows on start!
  
  
Author:       raster
Date:         2008-12-08 21:16:52 -0800 (Mon, 08 Dec 2008)
New Revision: 38040

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

Modified: trunk/e/src/bin/e_manager.c
===================================================================
--- trunk/e/src/bin/e_manager.c	2008-12-09 03:44:18 UTC (rev 38039)
+++ trunk/e/src/bin/e_manager.c	2008-12-09 05:16:52 UTC (rev 38040)
@@ -186,6 +186,7 @@
 	     unsigned int ret_val, deskxy[2];
 	     int ret;
 
+             if (e_border_find_by_client_window(windows[i])) continue;
 	     ecore_x_window_attributes_get(windows[i], &att);
 	     if ((att.override) || (att.input_only))
 	       {

Log:
  avoid o_box being null by creating early.
  
  
Author:       raster
Date:         2008-12-10 02:48:42 -0800 (Wed, 10 Dec 2008)
New Revision: 38081

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

Modified: trunk/e/src/bin/e_widget_toolbar.c
===================================================================
--- trunk/e/src/bin/e_widget_toolbar.c	2008-12-10 10:25:00 UTC (rev 38080)
+++ trunk/e/src/bin/e_widget_toolbar.c	2008-12-10 10:48:42 UTC (rev 38081)
@@ -52,6 +52,9 @@
    
    o = e_scrollframe_add(evas);
    wd->o_base = o;
+   o = e_box_add(evas);
+   wd->o_box = o;
+   o = wd->o_base;
    e_scrollframe_custom_theme_set(o, "base/theme/widgets", "e/widgets/toolbar");
    e_scrollframe_single_dir_set(o, 1);
    e_scrollframe_policy_set(o, E_SCROLLFRAME_POLICY_AUTO, E_SCROLLFRAME_POLICY_OFF);
@@ -66,9 +69,8 @@
    evas_object_show(o);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
-   
-   o = e_box_add(evas);
-   wd->o_box = o;
+
+   o = wd->o_box;
    e_box_orientation_set(o, 1);
    e_box_homogenous_set(o, 1);
    e_scrollframe_child_set(wd->o_base, o);

Log:
  move internal binaries to subdir - patch from albin
  
  
Author:       raster
Date:         2009-01-01 17:08:14 -0800 (Thu, 01 Jan 2009)
New Revision: 38414

Modified:
  trunk/e/src/bin/Makefile.am trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_fm_main.c trunk/e/src/bin/e_init.c trunk/e/src/bin/e_sys.c trunk/e/src/bin/e_thumb.c 

Modified: trunk/e/src/bin/Makefile.am
===================================================================
--- trunk/e/src/bin/Makefile.am	2009-01-01 20:42:28 UTC (rev 38413)
+++ trunk/e/src/bin/Makefile.am	2009-01-02 01:08:14 UTC (rev 38414)
@@ -1,4 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
+
 INCLUDES = -I$(top_srcdir) \
 	   -I$(top_srcdir)/src/bin \
 	   -I$(top_srcdir)/src/lib \
@@ -18,12 +19,15 @@
 enlightenment_remote \
 enlightenment_imc \
 enlightenment_start \
-enlightenment_thumb \
-enlightenment_sys \
+enlightenment_fm_open
+
+internal_bindir = $(libdir)/enlightenment/utils
+internal_bin_PROGRAMS = \
+enlightenment_init \
 enlightenment_fm \
-enlightenment_init \
 enlightenment_fm_op \
-enlightenment_fm_open
+enlightenment_sys \
+enlightenment_thumb
 
 ENLIGHTENMENTHEADERS = \
 e.h \

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2009-01-01 20:42:28 UTC (rev 38413)
+++ trunk/e/src/bin/e_fm.c	2009-01-02 01:08:14 UTC (rev 38414)
@@ -1511,7 +1511,7 @@
    char buf[4096];
    
    if (_e_fm2_client_spawning) return;
-   snprintf(buf, sizeof(buf), "%s/enlightenment_fm", e_prefix_bin_get());
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_fm", e_prefix_lib_get());
    exe = ecore_exe_run(buf, NULL);
    _e_fm2_client_spawning = 1;
 }

Modified: trunk/e/src/bin/e_fm_main.c
===================================================================
--- trunk/e/src/bin/e_fm_main.c	2009-01-01 20:42:28 UTC (rev 38413)
+++ trunk/e/src/bin/e_fm_main.c	2009-01-02 01:08:14 UTC (rev 38414)
@@ -2177,7 +2177,7 @@
 
    length = 256 + strlen(e_prefix_bin_get()) + strlen(args);
    buffer = malloc(length);
-   length = snprintf(buffer, length, "%s/enlightenment_fm_op %s %s", e_prefix_bin_get(), command, args);
+   length = snprintf(buffer, length, "%s/enlightenment/utils/enlightenment_fm_op %s %s", e_prefix_lib_get(), command, args);
 
    return buffer;
 }

Modified: trunk/e/src/bin/e_init.c
===================================================================
--- trunk/e/src/bin/e_init.c	2009-01-01 20:42:28 UTC (rev 38413)
+++ trunk/e/src/bin/e_init.c	2009-01-02 01:08:14 UTC (rev 38414)
@@ -77,8 +77,8 @@
    if (version) ver = strdup(e_util_filename_escape(version));
    else ver = strdup("XvX");
 
-   snprintf(buf, sizeof(buf), "%s/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'",
-	    e_prefix_bin_get(),
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'",
+	    e_prefix_lib_get(),
 	    theme,
 	    e_canvas_engine_decide(e_config->evas_engine_init),
 	    e_config->font_hinting,

Modified: trunk/e/src/bin/e_sys.c
===================================================================
--- trunk/e/src/bin/e_sys.c	2009-01-01 20:42:28 UTC (rev 38413)
+++ trunk/e/src/bin/e_sys.c	2009-01-02 01:08:14 UTC (rev 38414)
@@ -168,13 +168,13 @@
    char buf[4096];
    
    e_init_status_set(_("Checking System Permissions"));
-   snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t halt", e_prefix_bin_get());
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t halt", e_prefix_lib_get());
    _e_sys_halt_check_exe = ecore_exe_run(buf, NULL);
-   snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t reboot", e_prefix_bin_get());
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t reboot", e_prefix_lib_get());
    _e_sys_reboot_check_exe = ecore_exe_run(buf, NULL);
-   snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t suspend", e_prefix_bin_get());
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t suspend", e_prefix_lib_get());
    _e_sys_suspend_check_exe = ecore_exe_run(buf, NULL);
-   snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t hibernate", e_prefix_bin_get());
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t hibernate", e_prefix_lib_get());
    _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL);
    return 0;
 }
@@ -515,8 +515,8 @@
       case E_SYS_HALT_NOW:
 	/* shutdown -h now */
 	if (e_util_immortal_check()) return 0;
-	snprintf(buf, sizeof(buf), "%s/enlightenment_sys halt",
-		 e_prefix_bin_get());
+	snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys halt",
+		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
 	     _e_sys_current_action();
@@ -542,8 +542,8 @@
       case E_SYS_REBOOT:
 	/* shutdown -r now */
 	if (e_util_immortal_check()) return 0;
-	snprintf(buf, sizeof(buf), "%s/enlightenment_sys reboot",
-		 e_prefix_bin_get());
+	snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys reboot",
+		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
 	     _e_sys_current_action();
@@ -568,8 +568,8 @@
 	break;
       case E_SYS_SUSPEND:
 	/* /etc/acpi/sleep.sh force */
-	snprintf(buf, sizeof(buf), "%s/enlightenment_sys suspend",
-		 e_prefix_bin_get());
+	snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys suspend",
+		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
 	     _e_sys_current_action();
@@ -594,8 +594,8 @@
 	break;
       case E_SYS_HIBERNATE:
 	/* /etc/acpi/hibernate.sh force */
-	snprintf(buf, sizeof(buf), "%s/enlightenment_sys hibernate",
-		 e_prefix_bin_get());
+	snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys hibernate",
+		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
 	     _e_sys_current_action();

Modified: trunk/e/src/bin/e_thumb.c
===================================================================
--- trunk/e/src/bin/e_thumb.c	2009-01-01 20:42:28 UTC (rev 38413)
+++ trunk/e/src/bin/e_thumb.c	2009-01-02 01:08:14 UTC (rev 38414)
@@ -135,7 +135,7 @@
 	  {
 	     Ecore_Exe *exe;
 
-	     snprintf(buf, sizeof(buf), "%s/enlightenment_thumb --nice=%d", e_prefix_bin_get(),
+	     snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_thumb --nice=%d", e_prefix_lib_get(),
 		      e_config->thumb_nice);
 	     exe = ecore_exe_run(buf, NULL);
 	     _thumbnailers_exe = eina_list_append(_thumbnailers_exe, exe);

Log:
  fix things that broke after utils moved to lib/e/subdir
  
  
Author:       raster
Date:         2009-01-02 03:19:06 -0800 (Fri, 02 Jan 2009)
New Revision: 38418

Modified:
  trunk/e/src/bin/Makefile.am trunk/e/src/bin/e_fm_main.c trunk/e/src/bin/e_prefix.c 

Modified: trunk/e/src/bin/Makefile.am
===================================================================
--- trunk/e/src/bin/Makefile.am	2009-01-02 10:57:02 UTC (rev 38417)
+++ trunk/e/src/bin/Makefile.am	2009-01-02 11:19:06 UTC (rev 38418)
@@ -345,8 +345,7 @@
 enlightenment_fm_SOURCES = \
 e_fm_main.c \
 e_user.c \
-e_sha1.c \
-e_prefix.c
+e_sha1.c
 
 enlightenment_fm_LDADD = @E_FM_LIBS@
 enlightenment_fm_CFLAGS = $(INCLUDES)
@@ -375,9 +374,12 @@
 
 enlightenment_init_LDADD = @E_INIT_LIBS@
 
+# HACK! why install-data-hook? install-exec-hook is run after bin_PROGRAMS
+# and before internal_bin_PROGRAMS are installed. install-data-hook is
+# run after both
 setuid_root_mode = a=rx,u+xs
-install-exec-hook:
-	@chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/enlightenment_sys$(EXEEXT) || true
+install-data-hook:
+	@chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
 
 installed_headersdir = $(prefix)/include/enlightenment
 installed_headers_DATA = $(ENLIGHTENMENTHEADERS)

Modified: trunk/e/src/bin/e_fm_main.c
===================================================================
--- trunk/e/src/bin/e_fm_main.c	2009-01-02 10:57:02 UTC (rev 38417)
+++ trunk/e/src/bin/e_fm_main.c	2009-01-02 11:19:06 UTC (rev 38418)
@@ -41,11 +41,9 @@
 #define E_TYPEDEFS
 #include "e_config_data.h"
 #include "e_fm_op.h"
-#include "e_prefix.h"
 #undef E_TYPEDEFS
 #include "e_config_data.h"
 #include "e_fm_op.h"
-#include "e_prefix.h"
 
 /* FIXME: things to add to the slave enlightenment_fm process and ipc to e:
  * 
@@ -254,17 +252,6 @@
    ecore_file_init();
    ecore_ipc_init();
 
-   if (!e_prefix_determine(argv[0]))
-     {
-	fprintf(stderr,
-		"ERROR: Enlightenment cannot determine its installed\n"
-		"       prefix from the system or argv[0].\n"
-		"       This is because it is not on Linux AND has been\n"
-		"       Executed strangely. This is unusual.\n"
-		);
-	e_prefix_fallback();
-     }
-
    ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _e_fm_slave_data_cb, NULL);
    ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _e_fm_slave_error_cb, NULL);
    ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_fm_slave_del_cb, NULL);
@@ -306,8 +293,6 @@
    e_dbus_shutdown();
    _e_storage_volume_edd_shutdown();
    
-   e_prefix_shutdown();
-
    ecore_ipc_shutdown();
    ecore_file_shutdown();
    eina_stringshare_shutdown();
@@ -2175,9 +2160,11 @@
    else
      strcpy(command, "cp");
 
-   length = 256 + strlen(e_prefix_bin_get()) + strlen(args);
+   length = 256 + strlen(getenv("E_LIB_DIR")) + strlen(args);
    buffer = malloc(length);
-   length = snprintf(buffer, length, "%s/enlightenment/utils/enlightenment_fm_op %s %s", e_prefix_lib_get(), command, args);
+   length = snprintf(buffer, length, 
+                     "%s/enlightenment/utils/enlightenment_fm_op %s %s", 
+                     getenv("E_LIB_DIR"), command, args);
 
    return buffer;
 }

Modified: trunk/e/src/bin/e_prefix.c
===================================================================
--- trunk/e/src/bin/e_prefix.c	2009-01-02 10:57:02 UTC (rev 38417)
+++ trunk/e/src/bin/e_prefix.c	2009-01-02 11:19:06 UTC (rev 38418)
@@ -29,6 +29,7 @@
 {
    char *p, buf[4096];
 
+   printf("e_prefix_determine()\n");
    e_prefix_shutdown();
 
    /* if user provides E_PREFIX - then use that or also more specific sub
@@ -37,28 +38,40 @@
      {
 	_prefix_path = strdup(getenv("E_PREFIX"));
 	if (getenv("E_BIN_DIR"))
-	  snprintf(buf, sizeof(buf), "%s/bin", getenv("E_BIN_DIR"));
+          _prefix_path_bin = strdup(getenv("E_BIN_DIR"));
 	else
-	  snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
-	_prefix_path_bin = strdup(buf);
+          {
+             snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
+             _prefix_path_bin = strdup(buf);
+             e_util_env_set("E_BIN_DIR", _prefix_path_bin);
+          }
 
 	if (getenv("E_LIB_DIR"))
-	  snprintf(buf, sizeof(buf), "%s/lib", getenv("E_LIB_DIR"));
+          _prefix_path_lib = strdup(getenv("E_LIB_DIR"));
 	else
-	  snprintf(buf, sizeof(buf), "%s/lib", _prefix_path);
-	_prefix_path_lib = strdup(buf);
+          {
+             snprintf(buf, sizeof(buf), "%s/lib", _prefix_path);
+             _prefix_path_lib = strdup(buf);
+             e_util_env_set("E_LIB_DIR", _prefix_path_lib);
+          }
 	
 	if (getenv("E_DATA_DIR"))
-	  snprintf(buf, sizeof(buf), "%s/"SHARE_D, getenv("E_DATA_DIR"));
+          _prefix_path_data = strdup(getenv("E_DATA_DIR"));
 	else
-	  snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path);
-	_prefix_path_data = strdup(buf);
+          {
+             snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path);
+             _prefix_path_data = strdup(buf);
+             e_util_env_set("E_DATA_DIR", _prefix_path_data);
+          }
 	
 	if (getenv("E_LOCALE_DIR"))
-	  snprintf(buf, sizeof(buf), "%s/"LOCALE_D, getenv("E_LOCALE_DIR"));
+          _prefix_path_locale = strdup(getenv("E_LOCALE_DIR"));
 	else
-	  snprintf(buf, sizeof(buf), "%s/"LOCALE_D, _prefix_path);
-	_prefix_path_locale = strdup(buf);
+          {
+             snprintf(buf, sizeof(buf), "%s/"LOCALE_D, _prefix_path);
+             _prefix_path_locale = strdup(buf);
+             e_util_env_set("E_LOCALE_DIR", _prefix_path_locale);
+          }
 	return 1;
      }
    /* no env var - examine process and possible argv0 */
@@ -67,6 +80,10 @@
 	if (!_e_prefix_try_argv(argv0))
 	  {
 	     e_prefix_fallback();
+             e_util_env_set("E_PREFIX", _prefix_path);
+             e_util_env_set("E_BIN_DIR", _prefix_path_bin);
+             e_util_env_set("E_LIB_DIR", _prefix_path_lib);
+             e_util_env_set("E_DATA_DIR", _prefix_path_data);
 	     return 0;
 	  }
      }
@@ -121,14 +138,26 @@
 			    else
 			      {
 				 e_prefix_fallback();
+                                 e_util_env_set("E_PREFIX", _prefix_path);
+                                 e_util_env_set("E_BIN_DIR", _prefix_path_bin);
+                                 e_util_env_set("E_LIB_DIR", _prefix_path_lib);
+                                 e_util_env_set("E_DATA_DIR", _prefix_path_data);
 				 return 0;
 			      }
 			 }
+                       e_util_env_set("E_PREFIX", _prefix_path);
+                       e_util_env_set("E_BIN_DIR", _prefix_path_bin);
+                       e_util_env_set("E_LIB_DIR", _prefix_path_lib);
+                       e_util_env_set("E_DATA_DIR", _prefix_path_data);
 		       return 1;
 		    }
 		  else
 		    {
 		       e_prefix_fallback();
+                       e_util_env_set("E_PREFIX", _prefix_path);
+                       e_util_env_set("E_BIN_DIR", _prefix_path_bin);
+                       e_util_env_set("E_LIB_DIR", _prefix_path_lib);
+                       e_util_env_set("E_DATA_DIR", _prefix_path_data);
 		       return 0;
 		    }
 	       }
@@ -136,6 +165,10 @@
 	  }
      }
    e_prefix_fallback();
+   e_util_env_set("E_PREFIX", _prefix_path);
+   e_util_env_set("E_BIN_DIR", _prefix_path_bin);
+   e_util_env_set("E_LIB_DIR", _prefix_path_lib);
+   e_util_env_set("E_DATA_DIR", _prefix_path_data);
    return 0;
 }

Log:
  allow check widget to have a file path for icon.
  
  
Author:       raster
Date:         2009-01-05 04:55:19 -0800 (Mon, 05 Jan 2009)
New Revision: 38460

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

Modified: trunk/e/src/bin/e_widget_check.c
===================================================================
--- trunk/e/src/bin/e_widget_check.c	2009-01-05 04:06:19 UTC (rev 38459)
+++ trunk/e/src/bin/e_widget_check.c	2009-01-05 12:55:19 UTC (rev 38460)
@@ -120,13 +120,21 @@
      }
    if (icon) 
      {
-	o2 = edje_object_add(evas);
-	wd->o_icon = o2;
-	e_util_edje_icon_set(o2, icon);
-	edje_extern_object_min_size_set(o2, icon_w, icon_h);
+        if (icon[0] == '/')
+          {
+             o2 = e_icon_add(evas);
+             e_icon_file_set(o2, icon);
+          }
+        else
+          {
+             o2 = edje_object_add(evas);
+             e_util_edje_icon_set(o2, icon);
+          }
+        edje_extern_object_min_size_set(o2, icon_w, icon_h);
 	edje_object_part_swallow(wd->o_check, "e.swallow.icon", o2);
 	evas_object_show(o2);
 	e_widget_sub_object_add(obj, o2);
+	wd->o_icon = o2;
      }
    
    edje_object_size_min_calc(o, &mw, &mh);

Log:
  this apparently fixes some fullscreen maximising issues
  
  
Author:       raster
Date:         2009-01-05 05:07:19 -0800 (Mon, 05 Jan 2009)
New Revision: 38461

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

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-01-05 12:55:19 UTC (rev 38460)
+++ trunk/e/src/bin/e_border.c	2009-01-05 13:07:19 UTC (rev 38461)
@@ -1915,7 +1915,8 @@
 	     if (bd->bg_object)
 	       {
 		  Evas_Coord cx, cy, cw, ch;
-		  
+
+		  edje_object_message_signal_process(bd->bg_object);
 		  edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
 		  edje_object_message_signal_process(bd->bg_object);
 		  
@@ -2049,6 +2050,7 @@
 	       {
 		  Evas_Coord cx, cy, cw, ch;
 		  
+		  edje_object_message_signal_process(bd->bg_object);
 		  edje_object_signal_emit(bd->bg_object, "e,action,unmaximize,fullscreen", "e");
 		  edje_object_message_signal_process(bd->bg_object);

Log:
  only use evdir.. if its there.
  
  
Author:       raster
Date:         2009-01-05 23:55:03 -0800 (Mon, 05 Jan 2009)
New Revision: 38478

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2009-01-06 07:51:15 UTC (rev 38477)
+++ trunk/e/src/bin/e_fm.c	2009-01-06 07:55:03 UTC (rev 38478)
@@ -1901,16 +1901,20 @@
 	switch (e->minor)
 	  {  
 	   case E_FM_OP_HELLO:/*hello*/
+//             printf("E_FM_OP_HELLO\n");
 	     break;
 	   case E_FM_OP_OK:/*req ok*/
+//             printf("E_FM_OP_OK\n");
 	     cl->req--;
 	     break;
 	   case E_FM_OP_FILE_ADD:/*file add*/
+//             printf("E_FM_OP_FILE_ADD\n");
 	   case E_FM_OP_FILE_CHANGE:/*file change*/
+//             printf("E_FM_OP_FILE_CHANGE\n");
 	       {
 		  E_Fm2_Finfo finf;
-					   
-		  p = e->data;
+                  
+                  p = e->data;
 		  /* NOTE: i am NOT converting this data to portable arch/os independant
 		   * format. i am ASSUMING e_fm_main and e are local and built together
 		   * and thus this will work. if this ever changes this here needs to
@@ -1936,9 +1940,10 @@
 		  finf.rlnk = rlnk;
 		  
 		  evdir = ecore_file_dir_get(path);
-		  if ((sd->id == e->ref_to) && 
+		  if ((evdir) && (sd->id == e->ref_to) && 
 		      ((!strcmp(evdir, "") || (!strcmp(dir, evdir)))))
 		    {
+//                       printf(" ch/add response = %i\n", e->response);
 		       if (e->response == 0)/*live changes*/
 			 {
 			    if (e->minor == E_FM_OP_FILE_ADD)/*file add*/
@@ -2003,8 +2008,10 @@
 		    }
 		  else
 		    {
+//                       printf(" ...\n");
 		       if ((sd->id == e->ref_to) && (path[0] == 0))
 			 {
+//                            printf(" end response = %i\n", e->response);
 			    if (e->response == 2)/* end of scan */
 			      {
 				 sd->listing = 0;
@@ -2023,10 +2030,11 @@
 			      }
 			 }
 		   }
-		  free(evdir);
+		  if (evdir) free(evdir);
 	       }
 	     break;
 	   case E_FM_OP_FILE_DEL:/*file del*/
+//             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)))
@@ -2037,6 +2045,7 @@
 	     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)))
 	       {

Log:
  shorten system action text - simpler. also fix actiosn to be system.
  
  
Author:       raster
Date:         2009-01-22 12:54:26 -0800 (Thu, 22 Jan 2009)
New Revision: 38698

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

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2009-01-22 18:33:23 UTC (rev 38697)
+++ trunk/e/src/bin/e_actions.c	2009-01-22 20:54:26 UTC (rev 38698)
@@ -2612,7 +2612,7 @@
 
    /* exec */
    ACT_GO(exec);
-   e_action_predef_name_set(_("Launch"), _("Defined Command"), "exec", NULL,
+   e_action_predef_name_set(_("Launch"), _("Command"), "exec", NULL,
 			    "syntax: CommandName, example: /usr/bin/xmms", 1);
 
    /* app */
@@ -2628,20 +2628,20 @@
    e_action_predef_name_set(_("Enlightenment"), _("Exit"), "exit", 
 			    NULL, NULL, 0);
 
+   ACT_GO(exit_now);
+   e_action_predef_name_set(_("Enlightenment"), _("Exit Now"), 
+			    "exit_now", NULL, NULL, 0);
+
    ACT_GO(logout);
-   e_action_predef_name_set(_("Enlightenment"), _("Log Out"), "logout", 
+   e_action_predef_name_set(_("System"), _("Log Out"), "logout", 
 			    NULL, NULL, 0);
 
-   ACT_GO(exit_now);
-   e_action_predef_name_set(_("Enlightenment"), _("Exit Immediately"), 
-			    "exit_now", NULL, NULL, 0);
-
    ACT_GO(halt_now);
-   e_action_predef_name_set(_("Enlightenment"), _("Off Now"),
+   e_action_predef_name_set(_("System"), _("Power Off Now"),
 			    "halt_now", NULL, NULL, 0);
 
    ACT_GO(halt);
-   e_action_predef_name_set(_("System"), _("Off"), "halt", 
+   e_action_predef_name_set(_("System"), _("Power Off"), "halt", 
 			    NULL, NULL, 0);
 
    ACT_GO(reboot);

Modified: trunk/e/src/bin/e_sys.c
===================================================================
--- trunk/e/src/bin/e_sys.c	2009-01-22 18:33:23 UTC (rev 38697)
+++ trunk/e/src/bin/e_sys.c	2009-01-22 20:54:26 UTC (rev 38698)
@@ -363,7 +363,7 @@
 			 _("Logout in progress"), "E", "_sys_logout");
    e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/logout");
    e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
-				  _("Logout is currently in progress.<br>"
+				  _("Logout in progress.<br>"
 				    "<hilight>Please wait.</hilight>"));
    e_obj_dialog_show(od);
    e_obj_dialog_icon_set(od, "enlightenment/logout");
@@ -398,7 +398,7 @@
      {
       case E_SYS_LOGOUT:
 	e_dialog_text_set(dia,
-			  _("Enlightenment is busy logging out.<br>"
+			  _("Logging out.<br>"
 			    "You cannot perform other system actions<br>"
 			    "once a logout has begun.")
 			  );
@@ -406,28 +406,28 @@
       case E_SYS_HALT:
       case E_SYS_HALT_NOW:
 	e_dialog_text_set(dia,
-			  _("Enlightenment is shutting the system down.<br>"
+			  _("Powering off.<br>"
 			    "You cannot do any other system actions<br>"
 			    "once a shutdown has been started.")
 			  );
 	break;
       case E_SYS_REBOOT:
 	e_dialog_text_set(dia,
-			  _("Enlightenment is rebooting the system.<br>"
+			  _("Resetting.<br>"
 			    "You cannot do any other system actions<br>"
 			    "once a reboot has begun.")
 			  );
 	break;
       case E_SYS_SUSPEND:
 	e_dialog_text_set(dia,
-			  _("Enlightenment is suspending the system.<br>"
+			  _("Suspending.<br>"
 			    "Until suspend is complete you cannot perform<br>"
 			    "any other system actions.")
 			  );
 	break;
       case E_SYS_HIBERNATE:
 	e_dialog_text_set(dia,
-			  _("Enlightenment is hibernating the system.<br>"
+			  _("Hibernating.<br>"
 			    "You cannot perform an other system actions<br>"
 			    "until this is complete.")
 			  );
@@ -460,22 +460,22 @@
       case E_SYS_HALT:
       case E_SYS_HALT_NOW:
 	e_dialog_text_set(dia,
-			  _("Shutting down of your system failed.")
+			  _("Power off failed.")
 			  );
 	break;
       case E_SYS_REBOOT:
 	e_dialog_text_set(dia,
-			  _("Rebooting your system failed.")
+			  _("Reset failed.")
 			  );
 	break;
       case E_SYS_SUSPEND:
 	e_dialog_text_set(dia,
-			  _("Suspend of your system failed.")
+			  _("Suspend failed.")
 			  );
 	break;
       case E_SYS_HIBERNATE:
 	e_dialog_text_set(dia,
-			  _("Hibernating your system failed.")
+			  _("Hibernate failed.")
 			  );
 	break;
       default:
@@ -526,10 +526,10 @@
 	  {
 	     _e_sys_exe = ecore_exe_run(buf, NULL);
 	     od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()),
-				   _("Shutting down"), "E", "_sys_halt");
+				   _("Power off"), "E", "_sys_halt");
 	     e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/halt");
 	     e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
-					    _("Shutting down your Computer.<br>"
+					    _("Power off.<br>"
 					      "<hilight>Please wait.</hilight>"));
 	     e_obj_dialog_show(od);
 	     e_obj_dialog_icon_set(od, "enlightenment/halt");
@@ -553,10 +553,10 @@
 	  {
 	     _e_sys_exe = ecore_exe_run(buf, NULL);
 	     od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()),
-				   _("Rebooting"), "E", "_sys_reboot");
+				   _("Resetting"), "E", "_sys_reboot");
 	     e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/reboot");
 	     e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
-					    _("Rebooting your Computer.<br>"
+					    _("Resetting.<br>"
 					      "<hilight>Please wait.</hilight>"));
 	     e_obj_dialog_show(od);
 	     e_obj_dialog_icon_set(od, "enlightenment/reboot");
@@ -582,7 +582,7 @@
 				   _("Suspending"), "E", "_sys_suspend");
 	     e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/suspend");
 	     e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
-					    _("Suspending your Computer.<br>"
+					    _("Suspending.<br>"
 					      "<hilight>Please wait.</hilight>"));
 	     e_obj_dialog_show(od);
 	     e_obj_dialog_icon_set(od, "enlightenment/suspend");
@@ -608,7 +608,7 @@
 				   _("Hibernating"), "E", "_sys_hibernate");
 	     e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/hibernate");
 	     e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
-					    _("Hibernating your Computer.<br>"
+					    _("Hibernating.<br>"
 					      "<hilight>Please wait.</hilight>"));
 	     e_obj_dialog_show(od);
 	     e_obj_dialog_icon_set(od, "enlightenment/hibernate");

Log:
  by popular request - reboot.
  
  
Author:       raster
Date:         2009-01-31 15:57:32 -0800 (Sat, 31 Jan 2009)
New Revision: 38868

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

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2009-01-31 23:23:51 UTC (rev 38867)
+++ trunk/e/src/bin/e_actions.c	2009-01-31 23:57:32 UTC (rev 38868)
@@ -2645,7 +2645,7 @@
 			    NULL, NULL, 0);
 
    ACT_GO(reboot);
-   e_action_predef_name_set(_("System"), _("Reset"), "reboot", 
+   e_action_predef_name_set(_("System"), _("Reboot"), "reboot", 
 			    NULL, NULL, 0);
 
    ACT_GO(suspend);

Log:
  use new efreet api fo extra icon dirs.
  
  
Author:       raster
Date:         2009-02-25 19:46:59 -0800 (Wed, 25 Feb 2009)
New Revision: 39227

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2009-02-26 03:46:35 UTC (rev 39226)
+++ trunk/e/src/bin/e_main.c	2009-02-26 03:46:59 UTC (rev 39227)
@@ -762,15 +762,15 @@
    e_init_status_set(_("Setting up Paths"));
    TS("efreet paths");
      {
-	Eina_List *list;
+	Eina_List **list;
 	
 	list = efreet_icon_extra_list_get();
 	if (list)
 	  {
 	     snprintf(buf, sizeof(buf), "%s/.e/e/icons", e_user_homedir_get());
-	     list = eina_list_prepend(list, (void *)eina_stringshare_add(buf));
+	     *list = eina_list_prepend(*list, (void *)eina_stringshare_add(buf));
 	     snprintf(buf, sizeof(buf), "%s/data/icons", e_prefix_data_get());
-	     list = eina_list_prepend(list, (void *)eina_stringshare_add(buf));
+	     *list = eina_list_prepend(*list, (void *)eina_stringshare_add(buf));
 	  }
      }
    efreet_icon_extension_add(".edj");

Log:
  use new timer add func - for when u want the timer to be relative to the loop
  tick time - not "now".
  
  
Author:       raster
Date:         2009-03-22 19:14:10 -0700 (Sun, 22 Mar 2009)
New Revision: 39639

Modified:
  trunk/e/src/bin/e_object.c trunk/e/src/bin/e_pointer.c 

Modified: trunk/e/src/bin/e_object.c
===================================================================
--- trunk/e/src/bin/e_object.c	2009-03-23 02:13:50 UTC (rev 39638)
+++ trunk/e/src/bin/e_object.c	2009-03-23 02:14:10 UTC (rev 39639)
@@ -107,6 +107,29 @@
    return obj->references;
 }
 
+#if 0   
+EAPI void
+e_bt(void)
+{
+   int i, trace_num;
+   void *trace[128];
+   char **messages = NULL;
+   trace_num = backtrace(trace, 128);
+   messages = backtrace_symbols(trace, trace_num);
+   if (messages)
+     {
+        for (i = 1; i < trace_num; i++)
+          {
+             int j;
+             
+             for (j = 1; j < i; j++) putchar(' ');
+             printf("%s\n", messages[i]);
+          }
+        free(messages);
+     }
+}
+#endif   
+
 EAPI int
 e_object_error(E_Object *obj)
 {

Modified: trunk/e/src/bin/e_pointer.c
===================================================================
--- trunk/e/src/bin/e_pointer.c	2009-03-23 02:13:50 UTC (rev 39638)
+++ trunk/e/src/bin/e_pointer.c	2009-03-23 02:14:10 UTC (rev 39639)
@@ -528,7 +528,7 @@
    if (e_powersave_mode_get() >= E_POWERSAVE_MODE_MEDIUM) return;
    /* and scedule a pre-idle check in 1 second if no more events happen */
    if (!e_config->idle_cursor) return;
-   p->idle_timer = ecore_timer_add(1.0, _e_pointer_cb_idle_timer_pre, p);
+   p->idle_timer = ecore_timer_loop_add(1.0, _e_pointer_cb_idle_timer_pre, p);
 }
 
 static int
@@ -625,7 +625,7 @@
    ecore_x_pointer_xy_get(p->win, &x, &y);
    p->x = x;
    p->y = y;
-   p->idle_timer = ecore_timer_add(4.0, _e_pointer_cb_idle_timer_wait, p);
+   p->idle_timer = ecore_timer_loop_add(4.0, _e_pointer_cb_idle_timer_wait, p);
    return 0;
 }

Log:
  nuke segv in fm and leaks in menus.
  
  
Author:       raster
Date:         2009-03-23 02:36:11 -0700 (Mon, 23 Mar 2009)
New Revision: 39644

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2009-03-23 04:58:31 UTC (rev 39643)
+++ trunk/e/src/bin/e_fm.c	2009-03-23 09:36:11 UTC (rev 39644)
@@ -1970,7 +1970,13 @@
 
    size = _e_fm2_icon_mime_size_normalize(ic);
    icon = efreet_mime_type_icon_get(ic->info.mime, e_config->icon_theme, size);
-   if (icon) return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
+   if (icon)
+     {
+        Evas_Object *o;
+        o =  _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
+        free(icon);
+        return o;
+     }
    return NULL;
 }
 
@@ -6325,13 +6331,13 @@
         ic->drag.start = 0;
 	ic->drag.dnd = 0;
 	ic->drag.src = 0;
+        ic->down_sel = 0;
 
 	if ((_e_fm2_inplace_open(ic) == 0) &&
 	    (S_ISDIR(ic->info.statinfo.st_mode)) &&
 	    (ic->sd->config->view.single_click))
           evas_object_smart_callback_call(ic->sd->obj, "selected", NULL);
      }
-   ic->down_sel = 0;
 }
 
 static void

Modified: trunk/e/src/bin/e_int_menus.c
===================================================================
--- trunk/e/src/bin/e_int_menus.c	2009-03-23 04:58:31 UTC (rev 39643)
+++ trunk/e/src/bin/e_int_menus.c	2009-03-23 09:36:11 UTC (rev 39644)
@@ -513,6 +513,8 @@
                                                    _e_int_menus_apps_start, 
                                                    entry);
 		  e_menu_item_submenu_set(mi, subm);
+                  e_object_free_attach_func_set(E_OBJECT(subm), 
+                                                _e_int_menus_apps_free_hook2);
 	       }
 	     /* TODO: Highlight header
 	     else if (entry->type == EFREET_MENU_ENTRY_HEADER)
@@ -567,8 +569,15 @@
 {
    E_Menu *m;
    Efreet_Menu *menu;
+   Eina_List *l;
+   E_Menu_Item *mi;
 
    m = obj;
+   EINA_LIST_FOREACH(m->items, l, mi)
+     {
+        if (mi->submenu)
+          e_object_del(E_OBJECT(mi->submenu));
+     }
    menu = e_object_data_get(E_OBJECT(m));
    if (menu) efreet_menu_free(menu);
 }

Log:
  more leak--!
  
  
Author:       raster
Date:         2009-03-23 03:19:13 -0700 (Mon, 23 Mar 2009)
New Revision: 39646

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

Modified: trunk/e/src/bin/e_int_menus.c
===================================================================
--- trunk/e/src/bin/e_int_menus.c	2009-03-23 10:02:26 UTC (rev 39645)
+++ trunk/e/src/bin/e_int_menus.c	2009-03-23 10:19:13 UTC (rev 39646)
@@ -60,6 +60,7 @@
 static void _e_int_menus_main_showhide(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_int_menus_main_restart(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_int_menus_main_exit(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_int_menus_desktops_free_hook(void *obj);
 static void _e_int_menus_desk_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi);
 
@@ -272,6 +273,7 @@
    e_util_menu_item_theme_icon_set(mi, "preferences-system-windows");
    e_menu_item_callback_set(mi, _e_int_menus_main_showhide, NULL);
 
+   e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_desktops_free_hook);
    return m;
 }
 
@@ -663,6 +665,21 @@
 }
 
 static void
+_e_int_menus_desktops_free_hook(void *obj)
+{
+   E_Menu *m;
+   Eina_List *l;
+   E_Menu_Item *mi;
+
+   m = obj;
+   EINA_LIST_FOREACH(m->items, l, mi)
+     {
+        if (mi->submenu)
+          e_object_del(E_OBJECT(mi->submenu));
+     }
+}
+
+static void
 _e_int_menus_desk_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    e_configure_registry_call("screen/virtual_desktops", m->zone->container, NULL);

Modified: trunk/e/src/bin/e_intl.c
===================================================================
--- trunk/e/src/bin/e_intl.c	2009-03-23 10:02:26 UTC (rev 39645)
+++ trunk/e/src/bin/e_intl.c	2009-03-23 10:19:13 UTC (rev 39646)
@@ -906,6 +906,7 @@
 
    /* Match locale with one from the list */
    EINA_LIST_FREE(all_locales, locale_next)
+     {
 	if (found == 0)
 	  {
 	     E_Locale_Parts *locale_parts_next;
@@ -973,7 +974,9 @@
 	     e_intl_locale_parts_free(locale_parts_next);
 	     E_FREE(locale_lr_next);
 	  }
-
+        free (locale_next);
+     }
+   
    e_intl_locale_parts_free(locale_parts);
    free(locale_lr);
    E_FREE(locale_cs_canonic);

Log:
  lost windows.. back!
  
  
Author:       raster
Date:         2009-03-23 06:04:02 -0700 (Mon, 23 Mar 2009)
New Revision: 39652

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-23 12:28:15 UTC (rev 39651)
+++ trunk/e/src/bin/e_int_menus.c	2009-03-23 13:04:02 UTC (rev 39652)
@@ -134,7 +134,7 @@
    e_menu_item_label_set(mi, _("Windows"));
    e_util_menu_item_theme_icon_set(mi, "preferences-system-windows");
    e_menu_item_submenu_set(mi, subm);
-/*
+
    subm = e_int_menus_lost_clients_new();
    e_object_data_set(E_OBJECT(subm), dat);   
    dat->lost_clients = subm;
@@ -142,7 +142,6 @@
    e_menu_item_label_set(mi, _("Lost Windows"));
    e_util_menu_item_theme_icon_set(mi, "preferences-windows-lost");
    e_menu_item_submenu_set(mi, subm);
- */
 
    l = eina_hash_find(_e_int_menus_augmentation, "main/3");
    if (l) _e_int_menus_augmentation_add(m, l);

Log:
  ghost windows-- ?
  
  
Author:       raster
Date:         2009-03-23 06:39:24 -0700 (Mon, 23 Mar 2009)
New Revision: 39655

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

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-03-23 13:28:59 UTC (rev 39654)
+++ trunk/e/src/bin/e_border.c	2009-03-23 13:39:24 UTC (rev 39655)
@@ -467,7 +467,8 @@
 	bd->y = att->y;
 	bd->changes.pos = 1;
 	bd->re_manage = 1;
-	bd->ignore_first_unmap = 2;
+// needed to be 1 for internal windw and on restart.        
+//	bd->ignore_first_unmap = 2;
      }
 
    /* just to friggin make java happy - we're DELAYING the reparent until
@@ -3902,10 +3903,13 @@
 
    bd = data;
    e = ev;
+//   printf("HIDE: %x, event %x\n", e->win, e->event_win);
 // not interested in hide events from windows other than the window in question
    if (e->win != e->event_win) return 1;
    bd = e_border_find_by_client_window(e->win);
+//   printf("  bd = %p\n", bd);
    if (!bd) return 1;
+//   printf("  bd->ignore_first_unmap = %i\n", bd->ignore_first_unmap);
    if (bd->ignore_first_unmap > 0)
      {
 	bd->ignore_first_unmap--;
@@ -3915,18 +3919,23 @@
    if ((bd->iconic) || ((!bd->visible) && (!bd->new_client)) || 
        (bd->await_hide_event > 0))
      {
+//        printf("  Don't delete hidden or iconified windows\n");
+//        printf("  bd->iconic = %i, bd->visible = %i, bd->new_client = %i, bd->await_hide_event = %i\n",
+//               bd->iconic, bd->visible, bd->new_client, bd->await_hide_event);
 	if (bd->await_hide_event > 0)
 	  {
 	     bd->await_hide_event--;
 	  }
 	else
 	  {
+//             printf("  hide really\n");
 	     /* Only hide the border if it is visible */
 	     if (bd->visible) e_border_hide(bd, 1);
 	  }
      }
    else
      {
+//             printf("  hide2\n");
 	e_border_hide(bd, 0);
 	if (e_config->focus_revert_on_hide_or_close)
 	  {

Modified: trunk/e/src/bin/e_manager.c
===================================================================
--- trunk/e/src/bin/e_manager.c	2009-03-23 13:28:59 UTC (rev 39654)
+++ trunk/e/src/bin/e_manager.c	2009-03-23 13:39:24 UTC (rev 39655)
@@ -280,6 +280,7 @@
 		       bd = e_border_new(con, windows[i], 1, 0);
 		       if (bd)
 			 {
+                            bd->ignore_first_unmap = 1;
 			    /* FIXME:
 			     * It's enough to set the desk, the zone will
 			     * be set according to the desk */

Modified: trunk/e/src/bin/e_win.c
===================================================================
--- trunk/e/src/bin/e_win.c	2009-03-23 13:28:59 UTC (rev 39654)
+++ trunk/e/src/bin/e_win.c	2009-03-23 13:39:24 UTC (rev 39655)
@@ -90,6 +90,7 @@
 	_e_win_prop_update(win);
 	ecore_evas_lower(win->ecore_evas);
 	win->border = e_border_new(win->container, win->evas_win, 1, 1);
+        win->border->ignore_first_unmap = 1;
 	if (!win->placed)
 	  win->border->re_manage = 0;
 	win->border->internal = 1;

Log:
  and properly hide windows that ask to be iconified on start!
  
  
Author:       raster
Date:         2009-04-04 00:18:55 -0700 (Sat, 04 Apr 2009)
New Revision: 39853

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

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-04-04 04:14:01 UTC (rev 39852)
+++ trunk/e/src/bin/e_border.c	2009-04-04 07:18:55 UTC (rev 39853)
@@ -5691,7 +5691,10 @@
 	     /* If this is a new window, set the state as requested. */
 	     if ((bd->new_client) &&
 		 (bd->client.icccm.initial_state == ECORE_X_WINDOW_STATE_HINT_ICONIC))
-	       e_border_iconify(bd);
+               {
+                  e_border_iconify(bd);
+                  e_border_hide(bd, 1);
+               }
 	  }
 	bd->client.icccm.fetch.hints = 0;
 	rem_change = 1;

Log:
  for e_thumb.. use preload!
  
  
Author:       raster
Date:         2009-04-04 20:49:16 -0700 (Sat, 04 Apr 2009)
New Revision: 39866

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

Modified: trunk/e/src/bin/e_icon.c
===================================================================
--- trunk/e/src/bin/e_icon.c	2009-04-05 00:26:31 UTC (rev 39865)
+++ trunk/e/src/bin/e_icon.c	2009-04-05 03:49:16 UTC (rev 39866)
@@ -12,6 +12,7 @@
    int          size;
    unsigned char fill_inside : 1;
    unsigned char scale_up : 1;
+   unsigned char preload : 1;
 }; 
 
 /* local subsystem functions */
@@ -50,6 +51,7 @@
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
    evas_object_image_file_set(sd->obj, file, NULL);
+   if (sd->preload) evas_object_image_preload(sd->obj, 0);
    _e_icon_smart_reconfigure(sd);
 }
 
@@ -64,6 +66,7 @@
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
    evas_object_image_file_set(sd->obj, file, key);
+   if (sd->preload) evas_object_image_preload(sd->obj, 0);
    _e_icon_smart_reconfigure(sd);
 }
 
@@ -162,6 +165,26 @@
 }
 
 EAPI void
+e_icon_preload_set(Evas_Object *obj, int preload)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   sd->preload = preload;
+}
+
+EAPI int
+e_icon_preload_get(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return 0;
+   return sd->preload;
+}
+
+EAPI void
 e_icon_size_get(Evas_Object *obj, int *w, int *h)
 {
    E_Smart_Data *sd;
@@ -355,6 +378,12 @@
 }
 
 static void
+_e_icon_preloaded(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "preloaded", NULL);
+}
+
+static void
 _e_icon_smart_add(Evas_Object *obj)
 {
    E_Smart_Data *sd;
@@ -362,6 +391,8 @@
    sd = calloc(1, sizeof(E_Smart_Data));
    if (!sd) return;
    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);
    sd->x = 0;
    sd->y = 0;
    sd->w = 0;

Modified: trunk/e/src/bin/e_icon.h
===================================================================
--- trunk/e/src/bin/e_icon.h	2009-04-05 00:26:31 UTC (rev 39865)
+++ trunk/e/src/bin/e_icon.h	2009-04-05 03:49:16 UTC (rev 39866)
@@ -16,6 +16,8 @@
 EAPI int          e_icon_smooth_scale_get (Evas_Object *obj);
 EAPI void         e_icon_alpha_set        (Evas_Object *obj, int smooth);
 EAPI int          e_icon_alpha_get        (Evas_Object *obj);
+EAPI void         e_icon_preload_set      (Evas_Object *obj, int preload);
+EAPI int          e_icon_preload_get      (Evas_Object *obj);
 EAPI void         e_icon_size_get         (Evas_Object *obj, int *w, int *h);
 EAPI int          e_icon_fill_inside_get  (Evas_Object *obj);
 EAPI void         e_icon_fill_inside_set  (Evas_Object *obj, int fill_inside);

Modified: trunk/e/src/bin/e_thumb.c
===================================================================
--- trunk/e/src/bin/e_thumb.c	2009-04-05 00:26:31 UTC (rev 39865)
+++ trunk/e/src/bin/e_thumb.c	2009-04-05 03:49:16 UTC (rev 39866)
@@ -71,6 +71,12 @@
    return 1;
 }
 
+static void
+_thumb_preloaded(void *data, Evas_Object *obj, void *event)
+{
+   evas_object_smart_callback_call(data, "e_thumb_gen", NULL);
+}
+
 EAPI Evas_Object *
 e_thumb_icon_add(Evas *evas)
 {
@@ -78,6 +84,7 @@
    E_Thumb *eth;
 
    obj = e_icon_add(evas);
+   evas_object_smart_callback_add(obj, "preloaded", _thumb_preloaded, obj);
    _objid++;
    eth = E_NEW(E_Thumb, 1);
    eth->objid = _objid;
@@ -221,8 +228,9 @@
 		       _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");
-		       evas_object_smart_callback_call(obj, "e_thumb_gen", NULL);
+//x//		       evas_object_smart_callback_call(obj, "e_thumb_gen", NULL);
 		    }
 	       }
 	  }

Log:
  From: Sergey Semernin <sergey.semernin@...>
  
  In E_Dialog space key grabbed before than keydown event reach to entry widget
  in E_Entry_Dialog.
  Thus, I forced ungrab space key in e_entry_dialog_show constructor.
  Moreover, I added escape key handling in _e_entry_cb_key_down callback.
  
  I do not delete space key grub in E_Dialog, because, I think, it may be
  usefull here, 
  when we need selecting controls with space. Or not?
  
  
  
Author:       raster
Date:         2009-04-10 07:21:36 -0700 (Fri, 10 Apr 2009)
New Revision: 39936

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

Modified: trunk/e/src/bin/e_entry_dialog.c
===================================================================
--- trunk/e/src/bin/e_entry_dialog.c	2009-04-10 14:05:50 UTC (rev 39935)
+++ trunk/e/src/bin/e_entry_dialog.c	2009-04-10 14:21:36 UTC (rev 39936)
@@ -18,6 +18,7 @@
    E_Entry_Dialog *ed;
    E_Dialog *dia;
    Evas_Object *o, *ob;
+   Evas_Modifier_Mask mask;
    int w, h;
 
    ed = E_OBJECT_ALLOC(E_Entry_Dialog, E_ENTRY_DIALOG_TYPE, _e_entry_dialog_free);
@@ -37,6 +38,9 @@
    dia->data = ed;
    ed->dia = dia;
    
+   mask = 0;
+   evas_object_key_ungrab(dia->event_object, "space", mask, ~mask);
+   
    e_win_delete_callback_set(dia->win, _e_entry_dialog_delete);
    
    if (title) e_dialog_title_set(dia, title);
@@ -116,10 +120,10 @@
    E_Entry_Dialog *ed;
    
    ev = event_info;
-   if (strcmp(ev->keyname, "Return")) return;
    if (!(ed = data)) return;
-   e_object_ref(E_OBJECT(ed));
-   if (ed->ok.func) ed->ok.func(ed->text, ed->ok.data);
-   e_object_del(E_OBJECT(ed));
-   e_object_unref(E_OBJECT(ed));
+   if (!strcmp(ev->keyname, "Return")) 
+      _e_entry_dialog_ok(data, ed->dia);
+   else
+      if (!strcmp(ev->keyname, "Escape"))
+         _e_entry_dialog_cancel(data, ed->dia);
 }

Log:
  allow for system startup .orders... not great - but simple.
  
  
Author:       raster
Date:         2009-04-10 23:20:11 -0700 (Fri, 10 Apr 2009)
New Revision: 39963

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

Modified: trunk/e/src/bin/e_startup.c
===================================================================
--- trunk/e/src/bin/e_startup.c	2009-04-11 06:13:34 UTC (rev 39962)
+++ trunk/e/src/bin/e_startup.c	2009-04-11 06:20:11 UTC (rev 39963)
@@ -20,14 +20,23 @@
 EAPI void
 e_startup(E_Startup_Mode mode)
 {
-   const char *homedir;
+   const char *homedir, *prefixdir;
    char buf[PATH_MAX];
    
    homedir = e_user_homedir_get();
+   prefixdir = e_prefix_data_get();
    if (mode == E_STARTUP_START)
-     snprintf(buf, sizeof(buf), "%s/.e/e/applications/startup/.order", homedir);
+     {
+        snprintf(buf, sizeof(buf), "%s/.e/e/applications/startup/.order", homedir);
+        if (!ecore_file_exists(buf))
+          snprintf(buf, sizeof(buf), "%s/data/applications/startup/.order", prefixdir);
+     }
    else if (mode == E_STARTUP_RESTART)
-     snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order", homedir);
+     {
+        snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order", homedir);
+        if (!ecore_file_exists(buf))
+          snprintf(buf, sizeof(buf), "%s/data/applications/restart/.order", prefixdir);
+     }
    startup_apps = e_order_new(buf);
    if (!startup_apps) return;
    start_app_pos = 0;

Log:
  and handle premapped windows
  
  
Author:       raster
Date:         2009-04-14 21:52:40 -0700 (Tue, 14 Apr 2009)
New Revision: 40075

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

Modified: trunk/e/src/bin/e_manager.c
===================================================================
--- trunk/e/src/bin/e_manager.c	2009-04-15 03:14:41 UTC (rev 40074)
+++ trunk/e/src/bin/e_manager.c	2009-04-15 04:52:40 UTC (rev 40075)
@@ -156,6 +156,7 @@
 
    /* a manager is designated for each root. lets get all the windows in 
       the managers root */
+   printf("--------BD DO!!!\n");
    windows = ecore_x_window_children_get(man->root, &wnum);
    if (windows)
      {
@@ -183,7 +184,8 @@
 	     unsigned int ret_val, deskxy[2];
 	     int ret;
 
-             if (e_border_find_by_client_window(windows[i])) continue;
+             if (e_border_find_by_client_window(windows[i]))
+               continue;
 	     ecore_x_window_attributes_get(windows[i], &att);
 	     if ((att.override) || (att.input_only))
 	       {
@@ -209,7 +211,7 @@
 			 }
 		    }
 		  else
-		    continue;
+                    continue;
 	       }
 	     if (!ecore_x_window_prop_property_get(windows[i],
 						   atom_xmbed,
@@ -299,7 +301,11 @@
 		  
 		  con = e_container_current_get(man);
 		  bd = e_border_new(con, windows[i], 1, 0);
-		  if (bd) e_border_show(bd);
+		  if (bd)
+                    {
+                       bd->ignore_first_unmap = 1;
+                       e_border_show(bd);
+                    }
 	       }
 	  }
 	free(windows);

Log:
  1. fix thumb to not use preload thread - i spotted bugs. concurrency ones.
  2. also write a sort id (harmless - doesnt affect anything). useful for...
  sorting.
  
  
  
Author:       raster
Date:         2009-04-18 06:52:24 -0700 (Sat, 18 Apr 2009)
New Revision: 40166

Modified:
  trunk/e/src/bin/Makefile.am trunk/e/src/bin/e_thumb.c trunk/e/src/bin/e_thumb.h trunk/e/src/bin/e_thumb_main.c 

Modified: trunk/e/src/bin/Makefile.am
===================================================================
--- trunk/e/src/bin/Makefile.am	2009-04-18 13:47:29 UTC (rev 40165)
+++ trunk/e/src/bin/Makefile.am	2009-04-18 13:52:24 UTC (rev 40166)
@@ -344,7 +344,7 @@
 e_user.c \
 e_sha1.c
 
-enlightenment_thumb_LDADD = @E_THUMB_LIBS@
+enlightenment_thumb_LDADD = @E_THUMB_LIBS@ -lm
 
 enlightenment_fm_SOURCES = \
 e_fm_main.c \

Modified: trunk/e/src/bin/e_thumb.c
===================================================================
--- trunk/e/src/bin/e_thumb.c	2009-04-18 13:47:29 UTC (rev 40165)
+++ trunk/e/src/bin/e_thumb.c	2009-04-18 13:52:24 UTC (rev 40166)
@@ -11,6 +11,7 @@
    int   w, h;
    const char *file;
    const char *key;
+   char *sort_id;
    unsigned char queued : 1;
    unsigned char busy : 1;
    unsigned char done : 1;
@@ -108,6 +109,8 @@
    eth->file = NULL;
    if (eth->key) eina_stringshare_del(eth->key);
    eth->key = NULL;
+   if (eth->sort_id) free(eth->sort_id);
+   eth->sort_id = NULL;
    if (file) eth->file = eina_stringshare_add(file);
    if (key) eth->key = eina_stringshare_add(key);
 }
@@ -201,7 +204,44 @@
    e_thumb_icon_begin(obj);
 }
 
+#define A(v) (((v) >> 24) & 0xff)
+#define R(v) (((v) >> 16) & 0xff)
+#define G(v) (((v) >> 8 ) & 0xff)
+#define B(v) (((v)      ) & 0xff)
+#define PIX(p, x, y) p[((y) << 2) + (x)]
+#define PIX2(p, x, y) p[((y) << 1) + (x)]
 
+static void
+_e_thumb_key_load(E_Thumb *eth, const char *icon)
+{
+   Eet_File *ef;
+   int size = 0;
+   
+   ef = eet_open(icon, EET_FILE_MODE_READ);
+   if (!ef) return;
+   eth->sort_id = eet_read(ef, "/thumbnail/sort_id", &size);
+   if (eth->sort_id)
+     {
+        if (size > 0) eth->sort_id[size - 1] = 0;
+        else
+          {
+             free(eth->sort_id);
+             eth->sort_id = NULL;
+          }
+     }
+   eet_close(ef);
+}
+
+EAPI const char *
+e_thumb_sort_id_get(Evas_Object *obj)
+{
+   E_Thumb *eth;
+   eth = evas_object_data_get(obj, "e_thumbdata");
+   if (!eth) return "";
+   if (!eth->sort_id) return "";
+   return eth->sort_id;
+}
+
 EAPI void
 e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e)
 {
@@ -228,9 +268,10 @@
 		       _pending--;
 		       eth->done = 1;
 		       if (_pending == 0) _e_thumb_thumbnailers_kill();
-                       e_icon_preload_set(obj, 1);
+//y//                  e_icon_preload_set(obj, 1);
 		       e_icon_file_key_set(obj, icon, "/thumbnail/data");
-//x//		       evas_object_smart_callback_call(obj, "e_thumb_gen", NULL);
+                       _e_thumb_key_load(eth, icon);
+		       evas_object_smart_callback_call(obj, "e_thumb_gen", NULL);
 		    }
 	       }
 	  }
@@ -316,6 +357,7 @@
      _thumb_queue = eina_list_remove(_thumb_queue, eth);
    if (eth->file) eina_stringshare_del(eth->file);
    if (eth->key) eina_stringshare_del(eth->key);
+   if (eth->sort_id) free(eth->sort_id);
    free(eth);
 }
 

Modified: trunk/e/src/bin/e_thumb.h
===================================================================
--- trunk/e/src/bin/e_thumb.h	2009-04-18 13:47:29 UTC (rev 40165)
+++ trunk/e/src/bin/e_thumb.h	2009-04-18 13:52:24 UTC (rev 40166)
@@ -17,7 +17,8 @@
 EAPI void                  e_thumb_icon_begin(Evas_Object *obj);
 EAPI void                  e_thumb_icon_end(Evas_Object *obj);
 EAPI void		   e_thumb_icon_rethumb(Evas_Object *obj);
-
+EAPI const char           *e_thumb_sort_id_get(Evas_Object *obj);
+    
 EAPI void                  e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e);
 EAPI void                  e_thumb_client_del(Ecore_Ipc_Event_Client_Del *e);
 

Modified: trunk/e/src/bin/e_thumb_main.c
===================================================================
--- trunk/e/src/bin/e_thumb_main.c	2009-04-18 13:47:29 UTC (rev 40165)
+++ trunk/e/src/bin/e_thumb_main.c	2009-04-18 13:52:24 UTC (rev 40166)
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <math.h>
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <Ecore_Ipc.h>
@@ -236,6 +237,23 @@
    return 0;
 }
 
+typedef struct _Color Color;
+
+struct _Color
+{
+   Color *closest;
+   int closest_dist;
+   int use;
+   unsigned char r, g, b;
+};
+
+static int
+_sort_col(const void *d1, const void *d2)
+{
+   Color *c1 = (Color *)d1, *c2 = (Color *)d2;
+   return c2->use - c1->use;
+}
+
 static void
 _e_thumb_generate(E_Thumb *eth)
 {
@@ -245,7 +263,7 @@
    Evas_Object *im = NULL, *edje = NULL;
    Eet_File *ef;
    int iw, ih, alpha, ww, hh;
-   int *data = NULL;
+   unsigned int *data = NULL;
    time_t mtime_orig, mtime_thumb;
    
    id = _e_thumb_file_id(eth->file, eth->key);
@@ -294,7 +312,7 @@
 	     evas_im = ecore_evas_get(ee_im);
 	     evas_image_cache_set(evas_im, 0);
 	     evas_font_cache_set(evas_im, 0);
-	     evas_object_image_size_set(im, ww * 8, hh * 8);
+	     evas_object_image_size_set(im, ww * 4, hh * 4);
 	     evas_object_image_fill_set(im, 0, 0, ww, hh);
 	     edje = edje_object_add(evas_im);
 	     if ((eth->key) && 
@@ -304,7 +322,7 @@
 	     if (edje_object_file_set(edje, eth->file, eth->key))
 	       {
 		  evas_object_move(edje, 0, 0);
-		  evas_object_resize(edje, ww * 8, hh * 8);
+		  evas_object_resize(edje, ww * 4, hh * 4);
 		  evas_object_show(edje);
 	       }
 	  }
@@ -348,10 +366,136 @@
 		       eet_data_image_write(ef, "/thumbnail/data",
 					    (void *)data, ww, hh, alpha,
 					    0, 91, 1);
+                       ww = 4; hh = 4;
+                       evas_object_image_fill_set(im, 0, 0, ww, hh);
+                       evas_object_resize(im, ww, hh);
+                       ecore_evas_resize(ee, ww, hh);
+                       data = (int *)ecore_evas_buffer_pixels_get(ee);
+                       if (data)
+                         {
+                            unsigned int *data1;
+                            
+                            data1 = malloc(ww * hh * sizeof(unsigned int));
+                            memcpy(data1, data, ww * hh * sizeof(unsigned int));
+                            ww = 2; hh = 2;
+                            evas_object_image_fill_set(im, 0, 0, ww, hh);
+                            evas_object_resize(im, ww, hh);
+                            ecore_evas_resize(ee, ww, hh);
+                            data = (int *)ecore_evas_buffer_pixels_get(ee);
+                            if (data)
+                              {
+                                 unsigned int *data2;
+                                 
+                                 data2 = malloc(ww * hh * sizeof(unsigned int));
+                                 memcpy(data2, data, ww * hh * sizeof(unsigned int));
+                                 ww = 1; hh = 1;
+                                 evas_object_image_fill_set(im, 0, 0, ww, hh);
+                                 evas_object_resize(im, ww, hh);
+                                 ecore_evas_resize(ee, ww, hh);
+                                 data = (int *)ecore_evas_buffer_pixels_get(ee);
+                                 if (data)
+                                   {
+                                      unsigned int *data3;
+                                      unsigned char id[(21 * 4) + 1];
+                                      int n, i;
+                                      int hi, si, vi;
+                                      float h, s, v;
+                                      const int pat2[4] =
+                                        {
+                                           0, 3, 1, 2
+                                        };
+                                      const int pat1[16] =
+                                        {
+                                           5, 10, 6, 9,
+                                             0, 15, 3, 12,
+                                             1, 14, 7, 8,
+                                             4, 11, 2, 13
+                                        };
+                                      
+                                      data3 = malloc(ww * hh * sizeof(unsigned int));
+                                      memcpy(data3, data, ww * hh * sizeof(unsigned int));
+                                      // sort_id
+                                      n = 0;
+#define A(v) (((v) >> 24) & 0xff)
+#define R(v) (((v) >> 16) & 0xff)
+#define G(v) (((v) >> 8 ) & 0xff)
+#define B(v) (((v)      ) & 0xff)
+#define HSV(p) \
+   evas_color_rgb_to_hsv(R(p), G(p), B(p), &h, &s, &v); \
+   hi = 20 * (h / 360.0); \
+   si = 20 * s; \
+   vi = 20 * v; \
+   if (si < 2) hi = 25;
+#define SAVEHSV(h, s, v) \
+   id[n++] = 'a' + h; \
+   id[n++] = 'a' + v; \
+   id[n++] = 'a' + s;
+#define SAVEX(x) \
+   id[n++] = 'a' + x;
+#if 0                                      
+                                      HSV(data3[0]);
+                                      SAVEHSV(hi, si, vi);
+                                      for (i = 0; i < 4; i++)
+                                        {
+                                           HSV(data2[pat2[i]]);
+                                           SAVEHSV(hi, si, vi);
+                                        }
+                                      for (i = 0; i < 16; i++)
+                                        {
+                                           HSV(data1[pat1[i]]);
+                                           SAVEHSV(hi, si, vi);
+                                        }
+#else                                      
+                                      HSV(data3[0]);
+                                      SAVEX(hi);
+                                      for (i = 0; i < 4; i++)
+                                        {
+                                           HSV(data2[pat2[i]]);
+                                           SAVEX(hi);
+                                        }
+                                      for (i = 0; i < 16; i++)
+                                        {
+                                           HSV(data1[pat1[i]]);
+                                           SAVEX(hi);
+                                        }
+                                      HSV(data3[0]);
+                                      SAVEX(vi);
+                                      for (i = 0; i < 4; i++)
+                                        {
+                                           HSV(data2[pat2[i]]);
+                                           SAVEX(vi);
+                                        }
+                                      for (i = 0; i < 16; i++)
+                                        {
+                                           HSV(data1[pat1[i]]);
+                                           SAVEX(vi);
+                                        }
+                                      HSV(data3[0]);
+                                      SAVEX(si);
+                                      for (i = 0; i < 4; i++)
+                                        {
+                                           HSV(data2[pat2[i]]);
+                                           SAVEX(si);
+                                        }
+                                      for (i = 0; i < 16; i++)
+                                        {
+                                           HSV(data1[pat1[i]]);
+                                           SAVEX(si);
+                                        }
+#endif                                      
+                                      id[n++] = 0;
+                                      eet_write(ef, "/thumbnail/sort_id", id, n, 1);
+                                      free(data3);
+                                   }
+                                 free(data2);
+                              }
+                            free(data1);
+                         }
 		       eet_close(ef);
 		    }
 	       }
 	  }
+        
 	/* will free all */
 	if (edje) evas_object_del(edje);
 	if (ee_im) ecore_evas_free(ee_im);

Log:
  -lm -- and printf--
  
  
Author:       raster
Date:         2009-04-18 06:53:23 -0700 (Sat, 18 Apr 2009)
New Revision: 40168

Modified:
  trunk/e/src/bin/Makefile.am trunk/e/src/bin/e_thumb_main.c 

Modified: trunk/e/src/bin/Makefile.am
===================================================================
--- trunk/e/src/bin/Makefile.am	2009-04-18 13:52:41 UTC (rev 40167)
+++ trunk/e/src/bin/Makefile.am	2009-04-18 13:53:23 UTC (rev 40168)
@@ -344,7 +344,7 @@
 e_user.c \
 e_sha1.c
 
-enlightenment_thumb_LDADD = @E_THUMB_LIBS@ -lm
+enlightenment_thumb_LDADD = @E_THUMB_LIBS@
 
 enlightenment_fm_SOURCES = \
 e_fm_main.c \

Modified: trunk/e/src/bin/e_thumb_main.c
===================================================================
--- trunk/e/src/bin/e_thumb_main.c	2009-04-18 13:52:41 UTC (rev 40167)
+++ trunk/e/src/bin/e_thumb_main.c	2009-04-18 13:53:23 UTC (rev 40168)
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <math.h>
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <Ecore_Ipc.h>

Log:
  mount by label first - more useful in real life
  
  
Author:       raster
Date:         2009-05-09 03:26:12 -0700 (Sat, 09 May 2009)
New Revision: 40566

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

Modified: trunk/e/src/bin/e_fm_hal.c
===================================================================
--- trunk/e/src/bin/e_fm_hal.c	2009-05-09 06:59:00 UTC (rev 40565)
+++ trunk/e/src/bin/e_fm_hal.c	2009-05-09 10:26:12 UTC (rev 40566)
@@ -382,10 +382,10 @@
 	return strdup(v->mount_point);
      }
    
-   if (v->uuid && v->uuid[0] != '\0')
+   if (v->label && v->label[0] != '\0')
+     snprintf(buf, sizeof(buf) - 1, "/media/%s", v->label);
+   else if (v->uuid && v->uuid[0] != '\0')
      snprintf(buf, sizeof(buf) - 1, "/media/%s", v->uuid);
-   else if (v->label && v->label[0] != '\0')
-     snprintf(buf, sizeof(buf) - 1, "/media/%s", v->label);
    else if ((v->storage) && (v->storage->serial) && v->storage->serial[0] != '\0')
      snprintf(buf, sizeof(buf) - 1, "/media/%s", v->storage->serial);
    else

Log:
  fix placement to actually respect overlay allow of shelves
  
  
Author:       raster
Date:         2009-07-16 18:42:37 -0700 (Thu, 16 Jul 2009)
New Revision: 41376

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

Modified: trunk/e/src/bin/e_grabinput.c
===================================================================
--- trunk/e/src/bin/e_grabinput.c	2009-07-16 23:13:16 UTC (rev 41375)
+++ trunk/e/src/bin/e_grabinput.c	2009-07-17 01:42:37 UTC (rev 41376)
@@ -121,6 +121,7 @@
 	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());
 	break;
       case E_FOCUS_METHOD_GLOBALLY_ACTIVE:

Modified: trunk/e/src/bin/e_place.c
===================================================================
--- trunk/e/src/bin/e_place.c	2009-07-16 23:13:16 UTC (rev 41375)
+++ trunk/e/src/bin/e_place.c	2009-07-17 01:42:37 UTC (rev 41376)
@@ -121,7 +121,23 @@
 	if (es->zone != zone) continue;
 	x2 = es->x; y2 = es->y; w2 = es->w; h2 = es->h;
 	if (E_INTERSECTS(x, y, w, h, x2, y2, w2, h2))
-	  return 0x7fffffff;
+          {
+             int x0, x00, y0, y00;
+             int iw, ih;
+             
+             if (!es->cfg->overlap) return 0x7fffffff;
+	     x0 = x;
+	     if (x < x2) x0 = x2;
+	     x00 = (x + w);
+	     if ((x2 + w2) < (x + w)) x00 = (x2 + w2);
+	     y0 = y;
+	     if (y < y2) y0 = y2;
+	     y00 = (y + h);
+	     if ((y2 + h2) < (y + h)) y00 = (y2 + h2);
+	     iw = x00 - x0;
+	     ih = y00 - y0;
+	     ar += (iw * ih);
+          }
      }
    return ar;
 }

Log:
  fix evas error debug where passing in null objects is bad.
  
  
Author:       raster
Date:         2009-08-15 04:32:32 -0700 (Sat, 15 Aug 2009)
New Revision: 41788

Modified:
  trunk/e/src/bin/e_menu.c trunk/e/src/bin/e_pan.c trunk/e/src/bin/e_scrollframe.c trunk/e/src/bin/e_widget.c 

Modified: trunk/e/src/bin/e_menu.c
===================================================================
--- trunk/e/src/bin/e_menu.c	2009-08-15 10:46:57 UTC (rev 41787)
+++ trunk/e/src/bin/e_menu.c	2009-08-15 11:32:32 UTC (rev 41788)
@@ -1680,7 +1680,7 @@
 static void
 _e_menu_item_unrealize(E_Menu_Item *mi)
 {
-   e_box_freeze(mi->container_object);
+   if (mi->container_object) e_box_freeze(mi->container_object);
    if (mi->separator_object) evas_object_del(mi->separator_object);
    mi->separator_object = NULL;
    if (mi->bg_object) evas_object_del(mi->bg_object);

Modified: trunk/e/src/bin/e_pan.c
===================================================================
--- trunk/e/src/bin/e_pan.c	2009-08-15 10:46:57 UTC (rev 41787)
+++ trunk/e/src/bin/e_pan.c	2009-08-15 11:32:32 UTC (rev 41788)
@@ -150,6 +150,7 @@
    Evas_Coord w, h;
 
    sd = data;
+   if (!sd->child_obj) return;
    evas_object_geometry_get(sd->child_obj, NULL, NULL, &w, &h);
    if ((w != sd->child_w) || (h != sd->child_h))
      {
@@ -163,7 +164,8 @@
 static void
 _e_smart_reconfigure(E_Smart_Data *sd)
 {
-   evas_object_move(sd->child_obj, sd->x - sd->px, sd->y - sd->py);
+   if (sd->child_obj)
+     evas_object_move(sd->child_obj, sd->x - sd->px, sd->y - sd->py);
 }
 
 static void
@@ -212,35 +214,40 @@
 _e_smart_show(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_show(sd->child_obj);
+   if (sd->child_obj)
+     evas_object_show(sd->child_obj);
 }
 
 static void
 _e_smart_hide(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_hide(sd->child_obj);
+   if (sd->child_obj)
+     evas_object_hide(sd->child_obj);
 }
 
 static void
 _e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
 {
    INTERNAL_ENTRY;
-   evas_object_color_set(sd->child_obj, r, g, b, a);
+   if (sd->child_obj)
+     evas_object_color_set(sd->child_obj, r, g, b, a);
 }
 
 static void
 _e_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
 {
    INTERNAL_ENTRY;
-   evas_object_clip_set(sd->child_obj, clip);
+   if (sd->child_obj)
+     evas_object_clip_set(sd->child_obj, clip);
 }
 
 static void
 _e_smart_clip_unset(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_clip_unset(sd->child_obj);
+   if (sd->child_obj)
+     evas_object_clip_unset(sd->child_obj);
 }
 
 /* never need to touch this */

Modified: trunk/e/src/bin/e_scrollframe.c
===================================================================
--- trunk/e/src/bin/e_scrollframe.c	2009-08-15 10:46:57 UTC (rev 41787)
+++ trunk/e/src/bin/e_scrollframe.c	2009-08-15 11:32:32 UTC (rev 41788)
@@ -114,9 +114,12 @@
    API_ENTRY return;
    if (sd->child_obj)
      {
-	e_pan_child_set(sd->pan_obj, NULL);
-	evas_object_event_callback_del(sd->child_obj, EVAS_CALLBACK_FREE, 
-                                       _e_smart_child_del_hook);
+        if (sd->pan_obj)
+          {
+             e_pan_child_set(sd->pan_obj, NULL);
+             evas_object_event_callback_del(sd->child_obj, EVAS_CALLBACK_FREE, 
+                                            _e_smart_child_del_hook);
+          }
      }
 
    sd->child_obj = child;
@@ -229,6 +232,7 @@
    double vx, vy;
 
    API_ENTRY return;
+   if (!sd->pan_obj) return;
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    if (mx > 0) vx = (double)x / (double)mx;
    else vx = 0.0;
@@ -247,7 +251,13 @@
 e_scrollframe_child_pos_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
 {
    API_ENTRY return;
-   sd->pan_func.get(sd->pan_obj, x, y);
+   if (sd->pan_obj)
+     sd->pan_func.get(sd->pan_obj, x, y);
+   else
+     {
+        *x = 0;
+        *y = 0;
+     }
 }
 
 EAPI void
@@ -256,6 +266,7 @@
    Evas_Coord mx = 0, my = 0, cw = 0, ch = 0, px = 0, py = 0, nx, ny;
 
    API_ENTRY return;
+   if (!sd->pan_obj) return;
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    sd->pan_func.child_size_get(sd->pan_obj, &cw, &ch);
    sd->pan_func.get(sd->pan_obj, &px, &py);
@@ -406,6 +417,7 @@
    E_Smart_Data *sd;
 
    sd = data;
+   if (!sd->pan_obj) return;
    sd->pan_func.child_size_get(sd->pan_obj, &w, &h);
    if ((w != sd->child.w) || (h != sd->child.h))
      {
@@ -422,6 +434,7 @@
    E_Smart_Data *sd;
 
    sd = data;
+   if (!sd->pan_obj) return;
    sd->pan_func.get(sd->pan_obj, &x, &y);
    e_scrollframe_child_pos_set(sd->smart_obj, x, y);
 }
@@ -655,6 +668,7 @@
    sd = data;
    ev = event_info;
    e_scrollframe_child_pos_get(sd->smart_obj, &x, &y);
+   if (!sd->pan_obj) return;
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
    if (!strcmp(ev->keyname, "Left"))
@@ -694,10 +708,12 @@
 
    edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.vbar", NULL, &vy);
    edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.hbar", &vx, NULL);
+   if (!sd->pan_obj) return;
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    x = vx * (double)mx;
    y = vy * (double)my;
-   sd->pan_func.set(sd->pan_obj, x, y);
+   if (sd->pan_obj)
+     sd->pan_func.set(sd->pan_obj, x, y);
    if (((e_config->thumbscroll_enable) || (sd->thumbscroll.forced))
        && (sd->down.now) && (!sd->down.dragged))
      sd->down.now = 0;
@@ -713,7 +729,8 @@
 	edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", 1.0, 1.0);
 	edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", 1.0, 1.0);
      }
-   sd->pan_func.set(sd->pan_obj, 0, 0);
+   if (sd->pan_obj)
+     sd->pan_func.set(sd->pan_obj, 0, 0);
 }
 
 static int
@@ -904,9 +921,12 @@
                                         &vx, NULL);
 	edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.vbar", 
                                         NULL, &vy);
-	sd->pan_func.max_get(sd->pan_obj, &mx, &my);
-	x = vx * mx;
-	y = vy * my;
+        if (sd->pan_obj)
+          {
+             sd->pan_func.max_get(sd->pan_obj, &mx, &my);
+             x = vx * mx;
+             y = vy * my;
+          }
 
 	edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.hbar", 
                                        (double)sd->step.x / (double)w, 0.0);
@@ -925,7 +945,8 @@
 	  edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", 
                                          0.0, -((double)sd->page.y * ((double)vh / (double)h)) / 100.0);
 
-	sd->pan_func.set(sd->pan_obj, x, y);
+        if (sd->pan_obj)
+          sd->pan_func.set(sd->pan_obj, x, y);
      }
    else
      {
@@ -933,7 +954,8 @@
                                        1.0, 1.0);
 	edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", 
                                        1.0, 1.0);
-	sd->pan_func.set(sd->pan_obj, 0, 0);
+        if (sd->pan_obj)
+          sd->pan_func.set(sd->pan_obj, 0, 0);
      }
    _e_smart_scrollbar_bar_visibility_adjust(sd);
 }
@@ -1013,7 +1035,10 @@
 {
    INTERNAL_ENTRY;
    e_scrollframe_child_set(obj, NULL);
-   if (!sd->extern_pan) evas_object_del(sd->pan_obj);
+   if (sd->pan_obj)
+     {
+        if (!sd->extern_pan) evas_object_del(sd->pan_obj);
+     }
    evas_object_del(sd->edje_obj);
    evas_object_del(sd->event_obj);
    if (sd->down.momentum_animator) 

Modified: trunk/e/src/bin/e_widget.c
===================================================================
--- trunk/e/src/bin/e_widget.c	2009-08-15 10:46:57 UTC (rev 41787)
+++ trunk/e/src/bin/e_widget.c	2009-08-15 11:32:32 UTC (rev 41788)
@@ -416,6 +416,7 @@
 e_widget_change(Evas_Object *obj)
 {
    API_ENTRY return;
+   if (!e_widget_parent_get(obj)) return;
    e_widget_change(e_widget_parent_get(obj));
    if (sd->on_change_func) sd->on_change_func(sd->on_change_data, obj);
 }
@@ -532,35 +533,40 @@
 _e_smart_show(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_show(sd->resize_obj);
+   if (sd->resize_obj)
+     evas_object_show(sd->resize_obj);
 }
 
 static void
 _e_smart_hide(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_hide(sd->resize_obj);
+   if (sd->resize_obj)
+     evas_object_hide(sd->resize_obj);
 }
 
 static void
 _e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
 {
    INTERNAL_ENTRY;
-   evas_object_color_set(sd->resize_obj, r, g, b, a);
+   if (sd->resize_obj)
+     evas_object_color_set(sd->resize_obj, r, g, b, a);
 }
 
 static void
 _e_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
 {
    INTERNAL_ENTRY;
-   evas_object_clip_set(sd->resize_obj, clip);
+   if (sd->resize_obj)
+     evas_object_clip_set(sd->resize_obj, clip);
 }
 
 static void
 _e_smart_clip_unset(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_clip_unset(sd->resize_obj);
+   if (sd->resize_obj)
+     evas_object_clip_unset(sd->resize_obj);
 }  
 
 /* never need to touch this */

Log:
  From: victor <victor.scorpion@...>
  
  shelf resize patch.  tnx!
  
  
Author:       raster
Date:         2009-08-15 04:54:35 -0700 (Sat, 15 Aug 2009)
New Revision: 41789

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

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2009-08-15 11:32:32 UTC (rev 41788)
+++ trunk/e/src/bin/e_shelf.c	2009-08-15 11:54:35 UTC (rev 41789)
@@ -228,11 +228,30 @@
 {
    Eina_List *l;
    E_Shelf *es;
+   Evas_Coord w, h;
 
    for (l = shelves; l; l = l->next)
      {
 	es = l->data;
-	if (es->zone == zone) e_shelf_position_calc(es);
+	if (es->zone == zone) 
+	  {
+	     E_Gadcon * gc;
+
+	     gc = es->gadcon;
+	     if (gc->min_size_request.func)
+	       {
+	          /* let gadcon container decrease to any size */
+	          edje_extern_object_min_size_set(gc->o_container, 0, 0);
+	       }
+	     evas_object_smart_callback_call (gc->o_container, "min_size_request", NULL);
+	     e_shelf_position_calc(es);
+	     if (gc->min_size_request.func)
+	       {
+	          evas_object_geometry_get(gc->o_container, NULL, NULL, &w, &h);
+	          /* fix gadcon container min size to current geometry */
+	          edje_extern_object_min_size_set(gc->o_container, w, h);
+	       }
+	  }
      }
 }

Log:
  fix redraw flashes for popus.
  
  
Author:       raster
Date:         2009-08-15 22:05:59 -0700 (Sat, 15 Aug 2009)
New Revision: 41808

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

Modified: trunk/e/src/bin/e_popup.c
===================================================================
--- trunk/e/src/bin/e_popup.c	2009-08-16 04:47:43 UTC (rev 41807)
+++ trunk/e/src/bin/e_popup.c	2009-08-16 05:05:59 UTC (rev 41808)
@@ -5,6 +5,7 @@
 
 /* local subsystem functions */
 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);
 /*
@@ -93,8 +94,21 @@
    E_OBJECT_TYPE_CHECK(pop, E_POPUP_TYPE);
    if (pop->visible) return;
    pop->visible = 1;
-   ecore_evas_show(pop->ecore_evas);
-   e_container_shape_show(pop->shape);
+   if (pop->shaped)
+     {
+        ecore_evas_move(pop->ecore_evas,
+                        pop->zone->container->manager->w,
+                        pop->zone->container->manager->h);
+        ecore_evas_show(pop->ecore_evas);
+        e_container_shape_show(pop->shape);
+        if (pop->idle_enterer) ecore_idle_enterer_del(pop->idle_enterer);
+        pop->idle_enterer = ecore_idle_enterer_add(_e_popup_idle_enterer, pop);
+     }
+   else
+     {
+        ecore_evas_show(pop->ecore_evas);
+        e_container_shape_show(pop->shape);
+     }
 }
 
 EAPI void
@@ -103,6 +117,8 @@
    E_OBJECT_CHECK(pop);
    E_OBJECT_TYPE_CHECK(pop, E_POPUP_TYPE);
    if (!pop->visible) return;
+   if (pop->idle_enterer) ecore_idle_enterer_del(pop->idle_enterer);
+   pop->idle_enterer = NULL;
    pop->visible = 0;
    ecore_evas_hide(pop->ecore_evas);
    e_container_shape_hide(pop->shape);
@@ -280,6 +296,8 @@
 static void
 _e_popup_free(E_Popup *pop)
 {
+   if (pop->idle_enterer) ecore_idle_enterer_del(pop->idle_enterer);
+   pop->idle_enterer = NULL;
    E_FREE(pop->shape_rects);
    pop->shape_rects_num = 0;
    e_container_shape_hide(pop->shape);
@@ -293,6 +311,19 @@
 }
 
 static int
+_e_popup_idle_enterer(void *data)
+{
+   E_Popup *pop;
+   
+   pop = (E_Popup *)data;
+   ecore_evas_move(pop->ecore_evas,
+		   pop->zone->x + pop->x, 
+		   pop->zone->y + pop->y);
+   pop->idle_enterer = NULL;
+   return 0;
+}
+
+static int
 _e_popup_cb_window_shape(void *data, int ev_type, void *ev)
 {
    Eina_List *l;

Modified: trunk/e/src/bin/e_popup.h
===================================================================
--- trunk/e/src/bin/e_popup.h	2009-08-16 04:47:43 UTC (rev 41807)
+++ trunk/e/src/bin/e_popup.h	2009-08-16 05:05:59 UTC (rev 41808)
@@ -28,6 +28,7 @@
    E_Zone              *zone;
    int                  shape_rects_num;
    Ecore_X_Rectangle   *shape_rects;
+   Ecore_Idle_Enterer  *idle_enterer;
 };
 
 EAPI int         e_popup_init(void);

Log:
  and fix dropshadow flash too.
  
  
Author:       raster
Date:         2009-08-15 22:08:40 -0700 (Sat, 15 Aug 2009)
New Revision: 41809

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-16 05:05:59 UTC (rev 41808)
+++ trunk/e/src/bin/e_popup.c	2009-08-16 05:08:40 UTC (rev 41809)
@@ -100,7 +100,6 @@
                         pop->zone->container->manager->w,
                         pop->zone->container->manager->h);
         ecore_evas_show(pop->ecore_evas);
-        e_container_shape_show(pop->shape);
         if (pop->idle_enterer) ecore_idle_enterer_del(pop->idle_enterer);
         pop->idle_enterer = ecore_idle_enterer_add(_e_popup_idle_enterer, pop);
      }
@@ -286,7 +285,7 @@
 	       }
 	     pop->need_shape_export = 0;
 	  }
-	if (pop->visible)
+	if ((pop->visible) && (!pop->idle_enterer))
 	  e_container_shape_show(pop->shape);
      }
 }
@@ -319,6 +318,7 @@
    ecore_evas_move(pop->ecore_evas,
 		   pop->zone->x + pop->x, 
 		   pop->zone->y + pop->y);
+   e_container_shape_show(pop->shape);
    pop->idle_enterer = NULL;
    return 0;
 }

Log:
  lets sync on focus - just in case.. butit doesn't seem to help :/
  
  
Author:       raster
Date:         2009-08-17 00:52:59 -0700 (Mon, 17 Aug 2009)
New Revision: 41834

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

Modified: trunk/e/src/bin/e_grabinput.c
===================================================================
--- trunk/e/src/bin/e_grabinput.c	2009-08-17 07:24:02 UTC (rev 41833)
+++ trunk/e/src/bin/e_grabinput.c	2009-08-17 07:52:59 UTC (rev 41834)
@@ -123,12 +123,15 @@
 	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:
  move eval into 2 stages - much better for the illumes of this world.
  
  
Author:       raster
Date:         2009-08-17 00:54:02 -0700 (Mon, 17 Aug 2009)
New Revision: 41835

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	2009-08-17 07:52:59 UTC (rev 41834)
+++ trunk/e/src/bin/e_border.c	2009-08-17 07:54:02 UTC (rev 41835)
@@ -60,6 +60,9 @@
 static void _e_border_cb_drag_finished(E_Drag *drag, int dropped);
 
 static void _e_border_eval(E_Border *bd);
+static void _e_border_eval0(E_Border *bd);
+static void _e_border_container_layout_hook(E_Container *con);
+
 static void _e_border_moveinfo_gather(E_Border *bd, const char *source);
 static void _e_border_resize_handle(E_Border *bd);
 
@@ -102,7 +105,7 @@
 static void _e_border_pointer_move_begin(E_Border *bd);
 static void _e_border_pointer_move_end(E_Border *bd);
 
-static void _e_border_hook_call(E_Border_Hook_Point hookpoint, E_Border *bd);
+static void _e_border_hook_call(E_Border_Hook_Point hookpoint, void *bd);
 
 /* local subsystem globals */
 static Eina_List *handlers = NULL;
@@ -2692,10 +2695,6 @@
    if (!borders)
      return;
 
-   /* We need to loop two times through the borders.
-    * 1. show windows
-    * 2. hide windows and evaluate rest
-    */
    for (ml = e_manager_list(); ml; ml = ml->next)
      {
 	E_Manager *man;
@@ -2708,9 +2707,24 @@
 	     E_Border *bd;
 
 	     con = cl->data;
+             
+             // pass 1 - eval0. fetch properties on new or on change and
+             // call hooks to decide what to do - maybe move/resize
 	     bl = e_container_border_list_last(con);
 	     while ((bd = e_container_border_list_prev(bl)))
 	       {
+		  if (bd->changed) _e_border_eval0(bd);
+	       }
+	     e_container_border_list_free(bl);
+             
+             // layout hook - this is where a hook gets to figure out what to
+             // do if anything.
+             _e_border_container_layout_hook(con);
+             
+             // pass 2 - show windows needing show
+	     bl = e_container_border_list_last(con);
+	     while ((bd = e_container_border_list_prev(bl)))
+	       {
  		  if ((bd->changes.visible) && (bd->visible) && 
 		      (!bd->new_client) && (!bd->changes.pos) &&
 		      (!bd->changes.size))
@@ -2731,21 +2745,8 @@
 		    }
 	       }
 	     e_container_border_list_free(bl);
-	  }
-     }
-
-   for (ml = e_manager_list(); ml; ml = ml->next)
-     {
-	E_Manager *man;
-
-	man = ml->data;
-	for (cl = man->containers; cl; cl = cl->next)
-	  {
-	     E_Container *con;
-	     E_Border_List *bl;
-	     E_Border *bd;
-
-	     con = cl->data;
+             
+             // pass 3 - hide windows needing hide and eval (main eval)
 	     bl = e_container_border_list_first(con);
 	     while ((bd = e_container_border_list_next(bl)))
 	       {
@@ -5660,14 +5661,18 @@
 }
 
 static void
-_e_border_eval(E_Border *bd)
-{	
-   E_Event_Border_Property *event;
+_e_border_container_layout_hook(E_Container *con)
+{
+   _e_border_hook_call(E_BORDER_HOOK_CONTAINER_LAYOUT, con);
+}
+
+static void
+_e_border_eval0(E_Border *bd)
+{
    int change_urgent = 0;
    int rem_change = 0;
-   int send_event = 1;
    int zx, zy, zw, zh;
-
+   
    if (e_object_is_del(E_OBJECT(bd)))
      {
 	fprintf(stderr, "ERROR: _e_border_eval(%p) with deleted border!\n", bd);
@@ -6462,6 +6467,15 @@
    _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_FETCH, bd);
    _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN, bd);
    
+   if (bd->need_reparent)
+     {     
+	ecore_x_window_save_set_add(bd->client.win);
+	ecore_x_window_reparent(bd->client.win, bd->client.shell_win, 0, 0);
+	if (bd->visible)
+	  ecore_x_window_show(bd->client.win);
+	bd->need_reparent = 0;
+     }
+   
    if ((bd->client.border.changed) && (!bd->shaded) &&
        (!(((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN))))
      {
@@ -6630,16 +6644,42 @@
 	  }
      }
    
-   if (bd->need_reparent)
-     {     
-	ecore_x_window_save_set_add(bd->client.win);
-	ecore_x_window_reparent(bd->client.win, bd->client.shell_win, 0, 0);
-	if (bd->visible)
-	  ecore_x_window_show(bd->client.win);
-	bd->need_reparent = 0;
+   if ((bd->remember) && (rem_change))
+     e_remember_update(bd->remember, bd);
+   
+   if (change_urgent)
+     {
+	if (bd->client.icccm.urgent)
+	  edje_object_signal_emit(bd->bg_object, "e,state,urgent", "e");
+	else
+	  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->border = bd;
+	e_object_ref(E_OBJECT(bd));
+	ecore_event_add(E_EVENT_BORDER_URGENT_CHANGE, ev,
+	      _e_border_event_border_urgent_change_free, NULL);
      }
    
    _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN, bd);
+}
+
+static void
+_e_border_eval(E_Border *bd)
+{	
+   E_Event_Border_Property *event;
+   int rem_change = 0;
+   int send_event = 1;
+   int zx, zy, zw, zh;
+
+   if (e_object_is_del(E_OBJECT(bd)))
+     {
+	fprintf(stderr, "ERROR: _e_border_eval(%p) with deleted border!\n", bd);
+	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)
@@ -7042,7 +7082,7 @@
 	bd->changes.pos = 0;
 	bd->changes.size = 0;
 	rem_change = 1;
-    }
+     }
    else if (bd->changes.pos)
      {
 	if (1)
@@ -7430,21 +7470,6 @@
 	bd->changes.icon = 0;
      }
 
-   if (change_urgent)
-     {
-	if (bd->client.icccm.urgent)
-	  edje_object_signal_emit(bd->bg_object, "e,state,urgent", "e");
-	else
-	  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->border = bd;
-	e_object_ref(E_OBJECT(bd));
-	ecore_event_add(E_EVENT_BORDER_URGENT_CHANGE, ev,
-	      _e_border_event_border_urgent_change_free, NULL);
-     }
-   
    bd->new_client = 0;
    bd->changed = 0;
    bd->changes.stack = 0;
@@ -8277,7 +8302,7 @@
 }
 
 static void
-_e_border_hook_call(E_Border_Hook_Point hookpoint, E_Border *bd)
+_e_border_hook_call(E_Border_Hook_Point hookpoint, void *bd)
 {
    Eina_List *l;
 
@@ -8296,7 +8321,7 @@
 }
 
 EAPI E_Border_Hook *
-e_border_hook_add(E_Border_Hook_Point hookpoint, void (*func) (void *data, E_Border *bd), void *data)
+e_border_hook_add(E_Border_Hook_Point hookpoint, void (*func) (void *data, void *bd), void *data)
 {
    E_Border_Hook *bh;
    

Modified: trunk/e/src/bin/e_border.h
===================================================================
--- trunk/e/src/bin/e_border.h	2009-08-17 07:52:59 UTC (rev 41834)
+++ trunk/e/src/bin/e_border.h	2009-08-17 07:54:02 UTC (rev 41835)
@@ -88,6 +88,7 @@
    E_BORDER_HOOK_EVAL_PRE_NEW_BORDER,
    E_BORDER_HOOK_EVAL_POST_NEW_BORDER,
    E_BORDER_HOOK_EVAL_END,
+   E_BORDER_HOOK_CONTAINER_LAYOUT
 } E_Border_Hook_Point;
 
 typedef struct _E_Border                     E_Border;
@@ -521,7 +522,7 @@
 struct _E_Border_Hook
 {
    E_Border_Hook_Point   hookpoint;
-   void                (*func) (void *data, E_Border *bd);
+   void                (*func) (void *data, void *bd);
    void                 *data;
    unsigned char         delete_me : 1;
 };
@@ -638,7 +639,7 @@
 EAPI void e_border_signal_resize_end(E_Border *bd, const char *dir, const char *sig, const char *src);
 EAPI void e_border_resize_limit(E_Border *bd, int *w, int *h);
 
-EAPI E_Border_Hook *e_border_hook_add(E_Border_Hook_Point hookpoint, void (*func) (void *data, E_Border *bd), void *data);
+EAPI E_Border_Hook *e_border_hook_add(E_Border_Hook_Point hookpoint, void (*func) (void *data, void *bd), void *data);
 EAPI void e_border_hook_del(E_Border_Hook *bh);
 EAPI void e_border_focus_track_freeze(void);
 EAPI void e_border_focus_track_thaw(void);

Log:
  ecomorph hookes from <hannes.janetzek@...>
  
  
Author:       raster
Date:         2009-09-03 05:37:10 -0700 (Thu, 03 Sep 2009)
New Revision: 42203

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

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2009-09-03 12:36:39 UTC (rev 42202)
+++ trunk/e/src/bin/e_border.c	2009-09-03 12:37:10 UTC (rev 42203)
@@ -245,8 +245,10 @@
    if (bd->client.argb)
      bd->win = ecore_x_window_manager_argb_new(con->win, 0, 0, bd->w, bd->h);
    else
-     bd->win = ecore_x_window_override_new(con->win, 0, 0, bd->w, bd->h);
-   ecore_x_window_shape_events_select(bd->win, 1);
+     {
+	bd->win = ecore_x_window_override_new(con->win, 0, 0, bd->w, bd->h);
+	ecore_x_window_shape_events_select(bd->win, 1);
+     }
    e_bindings_mouse_grab(E_BINDING_CONTEXT_BORDER, bd->win);
    e_bindings_wheel_grab(E_BINDING_CONTEXT_BORDER, bd->win);
    e_focus_setup(bd);
@@ -281,6 +283,28 @@
 	return NULL;
      }
 
+   /* printf("##- ON MAP CLIENT 0x%x SIZE %ix%i %i:%i\n",
+    * 	  bd->client.win, bd->client.w, bd->client.h, att->x, att->y); */
+
+   /* FIXME: if first_map is 1 then we should ignore the first hide event
+    * or ensure the window is alreayd hidden and events flushed before we
+    * create a border for it */
+   if (first_map)
+     {
+	// printf("##- FIRST MAP\n");
+	bd->x = att->x;
+	bd->y = att->y;
+	bd->changes.pos = 1;
+	bd->re_manage = 1;
+	// needed to be 1 for internal windw and on restart.        
+	// bd->ignore_first_unmap = 2;
+     }
+   
+   bd->client.win = win;
+   bd->zone = e_zone_current_get(con);
+   
+   _e_border_hook_call(E_BORDER_HOOK_NEW_BORDER, bd);   
+
    bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_border_cb_mouse_in, bd));
    bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_border_cb_mouse_out, bd));
    bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_border_cb_mouse_down, bd));
@@ -288,8 +312,6 @@
    bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _e_border_cb_mouse_move, bd));
    bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, _e_border_cb_mouse_wheel, bd));
 
-   bd->client.win = win;
-
    bd->client.icccm.title = NULL;
    bd->client.icccm.name = NULL;
    bd->client.icccm.class = NULL;
@@ -455,23 +477,6 @@
    bd->changes.size = 1;
    bd->changes.shape = 1;
 
-//   printf("##- ON MAP CLIENT 0x%x SIZE %ix%i\n",
-//	  bd->client.win, bd->client.w, bd->client.h);
-
-   /* FIXME: if first_map is 1 then we should ignore the first hide event
-    * or ensure the window is alreayd hidden and events flushed before we
-    * create a border for it */
-   if (first_map)
-     {
-//	printf("##- FIRST MAP\n");
-	bd->x = att->x;
-	bd->y = att->y;
-	bd->changes.pos = 1;
-	bd->re_manage = 1;
-// needed to be 1 for internal windw and on restart.        
-//	bd->ignore_first_unmap = 2;
-     }
-
    /* just to friggin make java happy - we're DELAYING the reparent until
     * eval time...
     */
@@ -683,6 +688,7 @@
    bd->desk = desk;
    e_border_zone_set(bd, desk->zone);
 
+   _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));
@@ -7920,8 +7926,6 @@
 static int
 _e_border_resize_begin(E_Border *bd)
 {
-   int w, h;
-
    if (!bd->lock_user_stacking)
      {
 	if (e_config->border_raise_on_mouse_action)
@@ -7932,29 +7936,6 @@
        (bd->fullscreen) || (bd->lock_user_size))
      return 0;
 
-   if ((bd->client.icccm.base_w >= 0) &&
-       (bd->client.icccm.base_h >= 0))
-     {
-	if (bd->client.icccm.step_w > 0)
-	  w = (bd->client.w - bd->client.icccm.base_w) / bd->client.icccm.step_w;
-	else
-	  w = bd->client.w;
-	if (bd->client.icccm.step_h > 0)
-	  h = (bd->client.h - bd->client.icccm.base_h) / bd->client.icccm.step_h;
-	else
-	  h = bd->client.h;
-     }
-   else
-     {
-	if (bd->client.icccm.step_w > 0)
-	  w = (bd->client.w - bd->client.icccm.min_w) / bd->client.icccm.step_w;
-	else
-	  w = bd->client.w;
-	if (bd->client.icccm.step_h > 0)
-	  h = (bd->client.h - bd->client.icccm.min_h) / bd->client.icccm.step_h;
-	else
-	  h = bd->client.h;
-     }
    if (grabbed)
      e_grabinput_get(bd->win, 0, bd->win);
    if (bd->client.netwm.sync.request)
@@ -7964,11 +7945,9 @@
 	bd->client.netwm.sync.wait = 0;
 	bd->client.netwm.sync.send_time = ecore_loop_time_get();
      }
-   if (e_config->resize_info_follows)
-     e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h); 
-   else
-     e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
-   e_resize_begin(bd->zone, w, h);
+
+   _e_border_hook_call(E_BORDER_HOOK_RESIZE_BEGIN, bd); 
+   
    resize = bd;
    return 1;
 }
@@ -7984,7 +7963,8 @@
 	ecore_x_sync_alarm_free(bd->client.netwm.sync.alarm);
 	bd->client.netwm.sync.alarm = 0;
      }
-   e_resize_end();
+   _e_border_hook_call(E_BORDER_HOOK_RESIZE_END, bd); 
+   
    resize = NULL;
    
    /* If this border was maximized, we need to unset Maximized state or
@@ -7998,36 +7978,7 @@
 static void
 _e_border_resize_update(E_Border *bd)
 {
-   int w, h;
-
-   if ((bd->client.icccm.base_w >= 0) &&
-       (bd->client.icccm.base_h >= 0))
-     {
-	if (bd->client.icccm.step_w > 0)
-	  w = (bd->client.w - bd->client.icccm.base_w) / bd->client.icccm.step_w;
-	else
-	  w = bd->client.w;
-	if (bd->client.icccm.step_h > 0)
-	  h = (bd->client.h - bd->client.icccm.base_h) / bd->client.icccm.step_h;
-	else
-	  h = bd->client.h;
-     }
-   else
-     {
-	if (bd->client.icccm.step_w > 0)
-	  w = (bd->client.w - bd->client.icccm.min_w) / bd->client.icccm.step_w;
-	else
-	  w = bd->client.w;
-	if (bd->client.icccm.step_h > 0)
-	  h = (bd->client.h - bd->client.icccm.min_h) / bd->client.icccm.step_h;
-	else
-	  h = bd->client.h;
-     }
-   if (e_config->resize_info_follows)
-     e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h);
-   else
-     e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
-   e_resize_update(w, h);
+   _e_border_hook_call(E_BORDER_HOOK_RESIZE_UPDATE, bd);
 }
 
 static int
@@ -8053,11 +8004,8 @@
 	bd->client.netwm.sync.time = ecore_loop_time_get();
      }
 #endif
-   if (e_config->move_info_follows)
-     e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h); 
-   else
-     e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
-   e_move_begin(bd->zone, bd->x, bd->y);
+   _e_border_hook_call(E_BORDER_HOOK_MOVE_BEGIN, bd);
+   
    move = bd;
    return 1;
 }
@@ -8075,7 +8023,8 @@
 	bd->client.netwm.sync.alarm = 0;
      }
 #endif
-   e_move_end();
+   _e_border_hook_call(E_BORDER_HOOK_MOVE_END, bd);
+   
    move = NULL;
    return 1;
 }
@@ -8083,11 +8032,7 @@
 static void
 _e_border_move_update(E_Border *bd)
 {
-   if (e_config->move_info_follows)
-     e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h); 
-   else
-     e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
-   e_move_update(bd->x, bd->y);
+   _e_border_hook_call(E_BORDER_HOOK_MOVE_UPDATE, bd);
 }
 
 static int

Modified: trunk/e/src/bin/e_border.h
===================================================================
--- trunk/e/src/bin/e_border.h	2009-09-03 12:36:39 UTC (rev 42202)
+++ trunk/e/src/bin/e_border.h	2009-09-03 12:37:10 UTC (rev 42203)
@@ -88,7 +88,15 @@
    E_BORDER_HOOK_EVAL_PRE_NEW_BORDER,
    E_BORDER_HOOK_EVAL_POST_NEW_BORDER,
    E_BORDER_HOOK_EVAL_END,
-   E_BORDER_HOOK_CONTAINER_LAYOUT
+   E_BORDER_HOOK_CONTAINER_LAYOUT,
+   E_BORDER_HOOK_NEW_BORDER,
+   E_BORDER_HOOK_SET_DESK,
+   E_BORDER_HOOK_MOVE_BEGIN,
+   E_BORDER_HOOK_MOVE_UPDATE,
+   E_BORDER_HOOK_MOVE_END,
+   E_BORDER_HOOK_RESIZE_BEGIN,
+   E_BORDER_HOOK_RESIZE_UPDATE,
+   E_BORDER_HOOK_RESIZE_END
 } E_Border_Hook_Point;
 
 typedef struct _E_Border                     E_Border;
@@ -666,5 +674,7 @@
 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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2009-09-03 12:36:39 UTC (rev 42202)
+++ trunk/e/src/bin/e_main.c	2009-09-03 12:37:10 UTC (rev 42203)
@@ -650,6 +650,11 @@
      }
    _e_main_shutdown_push(e_intl_post_shutdown);
 
+   TS("move/resize info");
+   /* init move resize popup */
+   e_moveresize_init();
+   _e_main_shutdown_push(e_moveresize_shutdown);
+   
    TS("splash");
    if (!((!e_config->show_splash) || (after_restart)))
      {

Modified: trunk/e/src/bin/e_moveresize.c
===================================================================
--- trunk/e/src/bin/e_moveresize.c	2009-09-03 12:36:39 UTC (rev 42202)
+++ trunk/e/src/bin/e_moveresize.c	2009-09-03 12:37:10 UTC (rev 42203)
@@ -3,60 +3,113 @@
  */
 #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_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_resize_object_coords_set(int x, int y, int w, int h);
+
 static E_Popup *_disp_pop = NULL;
 static Evas_Object *_obj = NULL;
-
+static Eina_List *hooks = NULL;
 static int visible = 0;
 static int obj_x = 0;
 static int obj_y = 0;
 static int obj_w = 0;
 static int obj_h = 0;
 
-EAPI void
-e_resize_begin(E_Zone *zone, int w, int h)
+EAPI int
+e_moveresize_init(void)
 {
+   E_Border_Hook *h;
+
+   h = e_border_hook_add(E_BORDER_HOOK_RESIZE_BEGIN, _e_resize_begin, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_RESIZE_UPDATE, _e_resize_update, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_RESIZE_END, _e_resize_end, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_MOVE_BEGIN, _e_move_begin, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_MOVE_UPDATE, _e_move_update, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_MOVE_END, _e_move_end, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+
+   return 1;
+}
+
+EAPI int
+e_moveresize_shutdown(void)
+{
+   E_Border_Hook *h;
+
+   EINA_LIST_FREE(hooks, h)
+     e_border_hook_del(h);
+}
+
+static void
+_e_resize_begin(void *data, E_Border *bd)
+{
    Evas_Coord ew, eh;
    char buf[40];
+   int w, h;
 
+   if (_disp_pop) e_object_del(E_OBJECT(_disp_pop));
+   _disp_pop = NULL;
    _obj = NULL;
-   if (_disp_pop) e_object_del(E_OBJECT(_disp_pop));
 
-   if (e_config->resize_info_visible)
-     {
-	_disp_pop = e_popup_new(zone, 0, 0, 1, 1);
-	if (!_disp_pop) return;
-	e_popup_layer_set(_disp_pop, 255);
-	_obj = edje_object_add(_disp_pop->evas);
-	e_theme_edje_object_set(_obj, "base/theme/borders",
-	      "e/widgets/border/default/resize");
-	snprintf(buf, sizeof(buf), "9999x9999");
-	edje_object_part_text_set(_obj, "e.text.label", buf);
+   if (!e_config->resize_info_visible)
+     return;
 
-	edje_object_size_min_calc(_obj, &ew, &eh);
-	evas_object_move(_obj, 0, 0);
-	evas_object_resize(_obj, ew, eh);
-	evas_object_show(_obj);
-	e_popup_edje_bg_object_set(_disp_pop, _obj);
-     }
-   
-   e_resize_update(w, h);
+   if (e_config->resize_info_follows)
+     _e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h);
+   else
+     _e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
 
-   if (e_config->resize_info_visible)
+   _e_resize_border_extents(bd, &w, &h);
+
+   _disp_pop = e_popup_new(bd->zone, 0, 0, 1, 1);
+   if (!_disp_pop) return;
+   e_popup_layer_set(_disp_pop, 255);
+   _obj = edje_object_add(_disp_pop->evas);
+   e_theme_edje_object_set(_obj, "base/theme/borders",
+			   "e/widgets/border/default/resize");
+   snprintf(buf, sizeof(buf), "9999x9999");
+   edje_object_part_text_set(_obj, "e.text.label", buf);
+
+   edje_object_size_min_calc(_obj, &ew, &eh);
+   evas_object_move(_obj, 0, 0);
+   evas_object_resize(_obj, ew, eh);
+   evas_object_show(_obj);
+   e_popup_edje_bg_object_set(_disp_pop, _obj);
+
+   if (!visible)
      {
-	e_popup_move_resize(_disp_pop,
-	      (obj_x - _disp_pop->zone->x) +
-	      ((obj_w - ew) / 2),
-	      (obj_y - _disp_pop->zone->y) +
-	      ((obj_h - eh) / 2),
-	      ew, eh);
+	evas_object_show(_obj);
 	e_popup_show(_disp_pop);
+	visible = 1;
      }
+   snprintf(buf, sizeof(buf), "%ix%i", w, h);
+   edje_object_part_text_set(_obj, "e.text.label", buf);
 
+   e_popup_move_resize(_disp_pop,
+		       (obj_x - _disp_pop->zone->x) +
+		       ((obj_w - ew) / 2),
+		       (obj_y - _disp_pop->zone->y) +
+		       ((obj_h - eh) / 2),
+		       ew, eh);
+
+   e_popup_show(_disp_pop);
+
    visible = 1;
 }
 
-EAPI void
-e_resize_end(void)
+static void
+_e_resize_end(void *data, E_Border *bd)
 {
    if (e_config->resize_info_visible)
      {
@@ -75,12 +128,21 @@
    visible = 0;
 }
 
-EAPI void
-e_resize_update(int w, int h)
+static void
+_e_resize_update(void *data, E_Border *bd)
 {
    char buf[40];
+   int w, h;
 
    if (!_disp_pop) return;
+
+   if (e_config->resize_info_follows)
+     _e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h);
+   else
+     _e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
+
+   _e_resize_border_extents(bd, &w, &h);
+
    if (!visible)
      {
 	evas_object_show(_obj);
@@ -91,44 +153,75 @@
    edje_object_part_text_set(_obj, "e.text.label", buf);
 }
 
-EAPI void
-e_move_begin(E_Zone *zone, int x, int y)
+static void
+_e_resize_border_extents(E_Border *bd, int *w, int *h)
 {
+   if ((bd->client.icccm.base_w >= 0) &&
+       (bd->client.icccm.base_h >= 0))
+     {
+	if (bd->client.icccm.step_w > 0)
+	  *w = (bd->client.w - bd->client.icccm.base_w) / bd->client.icccm.step_w;
+	else
+	  *w = bd->client.w;
+	if (bd->client.icccm.step_h > 0)
+	  *h = (bd->client.h - bd->client.icccm.base_h) / bd->client.icccm.step_h;
+	else
+	  *h = bd->client.h;
+     }
+   else
+     {
+	if (bd->client.icccm.step_w > 0)
+	  *w = (bd->client.w - bd->client.icccm.min_w) / bd->client.icccm.step_w;
+	else
+	  *w = bd->client.w;
+	if (bd->client.icccm.step_h > 0)
+	  *h = (bd->client.h - bd->client.icccm.min_h) / bd->client.icccm.step_h;
+	else
+	  *h = bd->client.h;
+     }
+}
+
+static void
+_e_move_begin(void *data, E_Border *bd)
+{
    Evas_Coord ew, eh;
    char buf[40];
 
+   if (_disp_pop) e_object_del(E_OBJECT(_disp_pop));
+   _disp_pop = NULL;
    _obj = NULL;
-   if (_disp_pop) e_object_del(E_OBJECT(_disp_pop));
 
-   if (e_config->move_info_visible)
-     {
-	_disp_pop = e_popup_new(zone, 0, 0, 1, 1);
-	_obj = edje_object_add(_disp_pop->evas);
-	e_theme_edje_object_set(_obj, "base/theme/borders",
-	      "e/widgets/border/default/move");
-	snprintf(buf, sizeof(buf), "9999 9999");
-	edje_object_part_text_set(_obj, "e.text.label", buf);
+   if (!e_config->move_info_visible)
+     return;
 
-	edje_object_size_min_calc(_obj, &ew, &eh);
-	evas_object_move(_obj, 0, 0);
-	evas_object_resize(_obj, ew, eh);
-	evas_object_show(_obj);
-	e_popup_edje_bg_object_set(_disp_pop, _obj);
-     }
+   if (e_config->move_info_follows)
+     _e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h);
+   else
+     _e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
 
-   if (e_config->move_info_visible)
-     {
-	e_popup_move_resize(_disp_pop,
-	      (obj_x - _disp_pop->zone->x) +
-	      ((obj_w - ew) / 2),
-	      (obj_y - _disp_pop->zone->y) +
-	      ((obj_h - eh) / 2),
-	      ew, eh);
-     }
+   _disp_pop = e_popup_new(bd->zone, 0, 0, 1, 1);
+   _obj = edje_object_add(_disp_pop->evas);
+   e_theme_edje_object_set(_obj, "base/theme/borders",
+			   "e/widgets/border/default/move");
+   snprintf(buf, sizeof(buf), "9999 9999");
+   edje_object_part_text_set(_obj, "e.text.label", buf);
+
+   edje_object_size_min_calc(_obj, &ew, &eh);
+   evas_object_move(_obj, 0, 0);
+   evas_object_resize(_obj, ew, eh);
+   evas_object_show(_obj);
+   e_popup_edje_bg_object_set(_disp_pop, _obj);
+
+   e_popup_move_resize(_disp_pop,
+		       (obj_x - _disp_pop->zone->x) +
+		       ((obj_w - ew) / 2),
+		       (obj_y - _disp_pop->zone->y) +
+		       ((obj_h - eh) / 2),
+		       ew, eh);
 }
 
-EAPI void
-e_move_end(void)
+static void
+_e_move_end(void *data, E_Border *bd)
 {
    if (e_config->move_info_visible)
      {
@@ -147,24 +240,30 @@
    visible = 0;
 }
 
-EAPI void
-e_move_update(int x, int y)
+static void
+_e_move_update(void *data, E_Border *bd)
 {
    char buf[40];
 
    if (!_disp_pop) return;
+
+   if (e_config->move_info_follows)
+     _e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h);
+   else
+     _e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
+
    if (!visible)
      {
 	evas_object_show(_obj);
 	e_popup_show(_disp_pop);
 	visible = 1;
      }
-   snprintf(buf, sizeof(buf), "%i %i", x, y);
+   snprintf(buf, sizeof(buf), "%i %i", bd->x, bd->y);
    edje_object_part_text_set(_obj, "e.text.label", buf);
 }
 
-EAPI void
-e_move_resize_object_coords_set(int x, int y, int w, int h)
+static void
+_e_move_resize_object_coords_set(int x, int y, int w, int h)
 {
    obj_x = x;
    obj_y = y;

Modified: trunk/e/src/bin/e_moveresize.h
===================================================================
--- trunk/e/src/bin/e_moveresize.h	2009-09-03 12:36:39 UTC (rev 42202)
+++ trunk/e/src/bin/e_moveresize.h	2009-09-03 12:37:10 UTC (rev 42203)
@@ -7,15 +7,8 @@
 #ifndef E_MOVERESIZE_H
 #define E_MOVERESIZE_H
 
-EAPI void e_resize_begin(E_Zone *zone, int w, int h);
-EAPI void e_resize_end(void);
-EAPI void e_resize_update(int w, int h);
+EAPI int e_moveresize_init(void);
+EAPI int e_moveresize_shutdown(void);
 
-EAPI void e_move_begin(E_Zone *zone, int x, int y);
-EAPI void e_move_end(void);
-EAPI void e_move_update(int x, int y);
-
-EAPI void e_move_resize_object_coords_set(int x, int y, int w, int h);
-
 #endif
 #endif

Log:
  partly revert your stuff cedric... BAD frenchie! BAD! segv's for e17 all
  round. members of E_Volume are strduped. rest of e's code still deals with it
  that way. e_hal from dbus also returns duped strings (thats why)
  
  
Author:       raster
Date:         2009-09-03 06:33:35 -0700 (Thu, 03 Sep 2009)
New Revision: 42204

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

Modified: trunk/e/src/bin/e_fm_shared.h
===================================================================
--- trunk/e/src/bin/e_fm_shared.h	2009-09-03 12:37:10 UTC (rev 42203)
+++ trunk/e/src/bin/e_fm_shared.h	2009-09-03 13:33:35 UTC (rev 42204)
@@ -117,16 +117,38 @@
    free(s);
 }
 
+static inline Eina_Hash *
+eet_eina_hash_add_alloc(Eina_Hash *hash, const void *key, void *data)
+{
+   if (!hash) hash = eina_hash_string_superfast_new(NULL);
+   if (!hash) return NULL;
+   eina_hash_add(hash, key, data);
+   return hash;
+}
+
 static Eet_Data_Descriptor *
 _e_volume_edd_new(void)
 {
    Eet_Data_Descriptor *edd;
    Eet_Data_Descriptor_Class eddc;
 
-   if (!eet_eina_stream_data_descriptor_class_set(&eddc, "e_volume", sizeof (E_Volume)))
-     return NULL;
+   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
+   eddc.func.mem_alloc = NULL;
+   eddc.func.mem_free = NULL;
+   eddc.func.str_alloc = (char *(*)(const char *)) strdup;
+   eddc.func.str_free = (void (*)(const char *)) free;
+   eddc.func.list_next = (void *(*)(void *)) eina_list_next;
+   eddc.func.list_append = (void *(*)(void *l, void *d)) eina_list_append;
+   eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
+   eddc.func.hash_foreach =
+     (void  (*) (void *, int (*) (void *, const char *, void *, void *), void *))
+     eina_hash_foreach;
+   eddc.func.hash_add = (void* (*) (void *, const char *, void *)) eet_eina_hash_add_alloc;
+   eddc.func.hash_free = (void  (*) (void *)) eina_hash_free;
+   eddc.name = "e_volume";
+   eddc.size = sizeof(E_Volume);
 
-   edd = eet_data_descriptor_stream_new(&eddc);
+   edd = eet_data_descriptor2_new(&eddc);
 #define DAT(x, y, z) EET_DATA_DESCRIPTOR_ADD_BASIC(edd, E_Volume, x, y, z)
    DAT("type", type, EET_T_INT);
    DAT("udi", udi, EET_T_STRING);
@@ -151,10 +173,23 @@
    Eet_Data_Descriptor *edd;
    Eet_Data_Descriptor_Class eddc;
 
-   if (!eet_eina_stream_data_descriptor_class_set(&eddc, "e_storage", sizeof (E_Storage)))
-     return NULL;
+   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
+   eddc.func.mem_alloc = NULL;
+   eddc.func.mem_free = NULL;
+   eddc.func.str_alloc = (char *(*)(const char *)) strdup;
+   eddc.func.str_free = (void (*)(const char *)) free;
+   eddc.func.list_next = (void *(*)(void *)) eina_list_next;
+   eddc.func.list_append = (void *(*)(void *l, void *d)) eina_list_append;
+   eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
+   eddc.func.hash_foreach =
+     (void  (*) (void *, int (*) (void *, const char *, void *, void *), void *))
+     eina_hash_foreach;
+   eddc.func.hash_add = (void* (*) (void *, const char *, void *)) eet_eina_hash_add_alloc;
+   eddc.func.hash_free = (void  (*) (Eina_Hash *)) eina_hash_free;
+   eddc.name = "e_storage";
+   eddc.size = sizeof(E_Storage);
 
-   edd = eet_data_descriptor_stream_new(&eddc);
+   edd = eet_data_descriptor2_new(&eddc);
 #define DAT(x, y, z) EET_DATA_DESCRIPTOR_ADD_BASIC(edd, E_Storage, x, y, z)
    DAT("type", type, EET_T_INT);
    DAT("udi", udi, EET_T_STRING);

Log:
  from jeffdameth: fix sync protocol handling - re-enable it.
  
  
Author:       raster
Date:         2009-10-01 01:45:24 -0700 (Thu, 01 Oct 2009)
New Revision: 42834

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	2009-10-01 08:43:54 UTC (rev 42833)
+++ trunk/e/src/bin/e_border.c	2009-10-01 08:45:24 UTC (rev 42834)
@@ -822,7 +822,26 @@
 				  bd->client.h);
 }
 
+static void
+_e_border_pending_move_resize_add(E_Border *bd, int move, int resize,
+				  int x, int y, int w, int h,
+				  Eina_Bool without_border, unsigned int serial)
+{
+   E_Border_Pending_Move_Resize *pnd;
 
+   pnd = E_NEW(E_Border_Pending_Move_Resize, 1);
+   if (!pnd) return;
+   pnd->resize = resize;
+   pnd->resize = move;
+   pnd->without_border = without_border;
+   pnd->x = x;
+   pnd->y = y;
+   pnd->w = w;
+   pnd->h = h;
+   pnd->serial = serial;
+   bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
+}
+
 static void
 _e_border_move_internal(E_Border *bd, int x, int y, Eina_Bool without_border)
 {
@@ -834,15 +853,7 @@
    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->move = 1;
-	pnd->x = x;
-	pnd->y = y;
-	pnd->without_border = without_border;
-	bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
+	_e_border_pending_move_resize_add(bd, 1, 0, x, y, 0, 0, without_border, 0);
 	return;
      }
 
@@ -983,21 +994,7 @@
 
    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;
-	if (move)
-	  {
-	     pnd->move = 1;
-	     pnd->x = x;
-	     pnd->y = y;
-	  }
-	pnd->w = w;
-	pnd->h = h;
-	bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
+	_e_border_pending_move_resize_add(bd, move, 1, x, y, w, h, without_border, 0);
 	return;
      }
 
@@ -1025,21 +1022,38 @@
    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;
 
    if ((bd->shaped) || (bd->client.shaped))
      {
 	bd->need_shape_merge = 1;
 	bd->need_shape_export = 1;
      }
-   if (bd->client.netwm.sync.request)
+
+   if (bd->internal_ecore_evas)
      {
-	bd->client.netwm.sync.wait++;
-	ecore_x_netwm_sync_request_send(bd->client.win, bd->client.netwm.sync.serial++);
+	bd->changed = 1;
+	bd->changes.size = 1;
      }
+   else
+     {
+	if (1 && 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);
+	     ecore_x_netwm_sync_request_send(bd->client.win,
+					     bd->client.netwm.sync.serial++);
+	  }
+	else
+	  {
+	     bd->changed = 1;
+	     bd->changes.size = 1;
+	  }
+     }
 
    _e_border_client_move_resize_send(bd);
+   
    _e_border_resize_update(bd);
    if (move)
      {
@@ -4838,14 +4852,56 @@
 {
    E_Border *bd;
    Ecore_X_Event_Sync_Alarm *e;
-
+   unsigned int serial;
+   
    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 <= 0)
-     _e_border_resize_handle(bd);
+
+   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 */
+	while (bd->pending_move_resize)
+	  {
+	     pnd = bd->pending_move_resize->data;
+	     bd->pending_move_resize = eina_list_remove(bd->pending_move_resize, pnd);
+
+	     if (serial == pnd->serial)
+	       break;
+
+	     E_FREE(pnd);
+	  }
+
+	if (pnd)
+	  {
+	     bd->client.netwm.sync.send_time = ecore_time_get();
+		  
+	     bd->x = pnd->x;
+	     bd->y = pnd->y;
+	     bd->w = pnd->w;
+	     bd->h = pnd->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);
+	     E_FREE(pnd);
+	  }
+     }
+
+   bd->changes.size = 1;
+   bd->changes.pos = 1;		  
+   
+   _e_border_eval(bd);
+   evas_render(bd->bg_evas);
+
+   ecore_x_pointer_xy_get(e_manager_current_get()->root,
+			  &bd->mouse.current.mx,
+			  &bd->mouse.current.my); 
+
+   _e_border_resize_handle(bd);
+
    return 1;
 }
 
@@ -5279,15 +5335,14 @@
 	int x, y, new_x, new_y;
 	int new_w, new_h;
 	Eina_List *skiplist = NULL;
-
 #if 0
+	// FIXME: remove? sync what for when only moving?
 	if ((ecore_loop_time_get() - bd->client.netwm.sync.time) > 0.5)
 	  bd->client.netwm.sync.wait = 0;
 	if ((bd->client.netwm.sync.request) &&
 	    (bd->client.netwm.sync.alarm) &&
 	    (bd->client.netwm.sync.wait > 1)) return 1;
 #endif
-
 	if ((bd->moveinfo.down.button >= 1) && (bd->moveinfo.down.button <= 3))
 	  {
 	     x = bd->mouse.last_down[bd->moveinfo.down.button - 1].x +
@@ -5318,19 +5373,24 @@
      }
    else if (bd->resize_mode != RESIZE_NONE)
      {
-#if 0
-	/* FIXME: it seems we send sync requests we dont get replies to */
-	/* ie our sync wait > 1 often - try eclipse - its slow enough to */
-	/* REALLY show how bad this is */
-	printf("SYNC %i - %3.3f\n", bd->client.netwm.sync.wait,
-	       ecore_loop_time_get() - bd->client.netwm.sync.time);
-	if ((ecore_loop_time_get() - bd->client.netwm.sync.time) > 0.5)
-	  bd->client.netwm.sync.wait = 0;
 	if ((bd->client.netwm.sync.request) &&
-	    (bd->client.netwm.sync.alarm) &&
-	    (bd->client.netwm.sync.wait > 1)) return 1;
-#endif
-	_e_border_resize_handle(bd);
+	    (bd->client.netwm.sync.alarm))
+	  {
+	     if ((ecore_loop_time_get() - bd->client.netwm.sync.send_time) > 0.5)
+	       {
+		  E_Border_Pending_Move_Resize  *pnd;
+		  EINA_LIST_FREE(bd->pending_move_resize, 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 */
+	     if (!bd->client.netwm.sync.wait)
+	       _e_border_resize_handle(bd);
+	  }
+	else
+	  _e_border_resize_handle(bd);
      }
    else
      {
@@ -7381,7 +7441,7 @@
    if (bd->client.netwm.sync.request)
      {
 	bd->client.netwm.sync.alarm = ecore_x_sync_alarm_new(bd->client.netwm.sync.counter);
-	bd->client.netwm.sync.serial = 0;
+	bd->client.netwm.sync.serial = 1;
 	bd->client.netwm.sync.wait = 0;
 	bd->client.netwm.sync.send_time = ecore_loop_time_get();
      }
@@ -7402,9 +7462,31 @@
      }
    if (bd->client.netwm.sync.alarm)
      {
+	E_Border_Pending_Move_Resize  *pnd;
+	
 	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)
+	  {
+	     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);
+	  }
      }
+
    _e_border_hook_call(E_BORDER_HOOK_RESIZE_END, bd); 
    
    resize = NULL;

Modified: trunk/e/src/bin/e_border.h
===================================================================
--- trunk/e/src/bin/e_border.h	2009-10-01 08:43:54 UTC (rev 42833)
+++ trunk/e/src/bin/e_border.h	2009-10-01 08:45:24 UTC (rev 42834)
@@ -525,6 +525,7 @@
    unsigned char move : 1;
    unsigned char resize : 1;
    unsigned char without_border : 1;
+   unsigned int  serial;
 };
 
 struct _E_Border_Hook

Log:
  allow menu actions if unknown type too. believe it or not not every app sets
  netwm hints.
  
  
Author:       raster
Date:         2009-10-07 17:11:07 -0700 (Wed, 07 Oct 2009)
New Revision: 42946

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	2009-10-07 18:38:08 UTC (rev 42945)
+++ trunk/e/src/bin/e_int_border_menu.c	2009-10-08 00:11:07 UTC (rev 42946)
@@ -144,7 +144,9 @@
 	 (bd->lock_user_maximize)))
      {
 	if ((!bd->lock_user_maximize) && (!bd->shaded) && (!bd->fullscreen) && 
-            (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL))
+            ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
+             (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
+            )
 	  {
 	     separator = 0;
 	     mi = e_menu_item_new(m);
@@ -160,7 +162,9 @@
    if (!bd->internal)
      {
 	if ((!bd->lock_user_iconify) && (!bd->fullscreen) && 
-            (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL))
+            ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
+             (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
+            )
 	  {
 	     separator = 0;
 	     mi = e_menu_item_new(m);
@@ -1035,7 +1039,9 @@
      }
 
    if ((!bd->lock_user_fullscreen) && (!bd->shaded) && 
-       (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL))
+       ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
+        (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
+       )
      {
 	submi = e_menu_item_new(subm);
 	e_menu_item_label_set(submi, _("Fullscreen"));

Log:
  disable gdb. toruble-maker.
  
  
Author:       raster
Date:         2009-10-22 17:56:41 -0700 (Thu, 22 Oct 2009)
New Revision: 43223

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

Modified: trunk/e/src/bin/e_signals.c
===================================================================
--- trunk/e/src/bin/e_signals.c	2009-10-23 00:01:15 UTC (rev 43222)
+++ trunk/e/src/bin/e_signals.c	2009-10-23 00:56:41 UTC (rev 43223)
@@ -56,7 +56,15 @@
    char cmd[1024];
    size_t size;
 
-   if(getenv("E_NO_GDB_BACKTRACE"))
+   // FIXME: we are in a segv'd state. do as few function calls and things
+   // depending on a known working state as possible. this also prevents the
+   // white box allowing recovery or deeper gdbing, thus until this works
+   // properly, it's disabled (properly means always reliable, always
+   // printf bt and allows e to continue and pop up box, perferably allowing
+   // debugging in the gui etc. etc.
+   return;
+   
+   if (getenv("E_NO_GDB_BACKTRACE"))
      return;
 
    size = snprintf(cmd, sizeof(cmd),

Log:
  i could have sworn i disabled this! disable again.
  
  
Author:       raster
Date:         2009-11-01 17:18:26 -0800 (Sun, 01 Nov 2009)
New Revision: 43404

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

Modified: trunk/e/src/bin/e_signals.c
===================================================================
--- trunk/e/src/bin/e_signals.c	2009-11-01 22:20:24 UTC (rev 43403)
+++ trunk/e/src/bin/e_signals.c	2009-11-02 01:18:26 UTC (rev 43404)
@@ -89,6 +89,8 @@
    void *array[255];
    size_t size;
 
+   return; // disable. causes hangs and problems
+   
    _e_write_safe_int(fd, msg, msg_len);
    _e_write_safe(fd, "\nBEGIN TRACEBACK\n");
    size = backtrace(array, 255);

Log:
  inst->exe is null if exe exited. it will be deleted by ecore, so cant keep it
  around.
  
  
Author:       raster
Date:         2009-11-01 18:51:21 -0800 (Sun, 01 Nov 2009)
New Revision: 43405

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

Modified: trunk/e/src/bin/e_exec.c
===================================================================
--- trunk/e/src/bin/e_exec.c	2009-11-02 01:18:26 UTC (rev 43404)
+++ trunk/e/src/bin/e_exec.c	2009-11-02 02:51:21 UTC (rev 43405)
@@ -391,6 +391,7 @@
      {
 	if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
 	inst->expire_timer = ecore_timer_add(30.0, _e_exec_cb_instance_finish, inst); 
+        inst->exe = NULL;
      }
    else
      _e_exec_instance_free(inst);

Log:
  remove 2 pointless stacks. evas smart obj chiuldren are stacked withint the obj
  
  
Author:       raster
Date:         2009-11-15 05:20:22 -0800 (Sun, 15 Nov 2009)
New Revision: 43705

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

Modified: trunk/e/src/bin/e_table.c
===================================================================
--- trunk/e/src/bin/e_table.c	2009-11-15 13:02:51 UTC (rev 43704)
+++ trunk/e/src/bin/e_table.c	2009-11-15 13:20:22 UTC (rev 43705)
@@ -246,12 +246,12 @@
    ti->max.w = 0;
    ti->max.h = 0;
    evas_object_clip_set(obj, sd->clip);
-   evas_object_stack_above(obj, sd->obj);
+//   evas_object_stack_above(obj, sd->obj);
    evas_object_smart_member_add(obj, ti->sd->obj);
    evas_object_data_set(obj, "e_table_data", ti);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
 				  _e_table_smart_item_del_hook, NULL);
-   evas_object_stack_below(obj, sd->obj);
+//   evas_object_stack_below(obj, sd->obj);
    if ((!evas_object_visible_get(sd->clip)) &&
        (evas_object_visible_get(sd->obj)))
      evas_object_show(sd->clip);

Log:
  dont use void *'s and poitner arithmetic! char * is what was intended
  
  
Author:       raster
Date:         2009-12-18 15:53:39 -0800 (Fri, 18 Dec 2009)
New Revision: 44558

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

Modified: trunk/e/src/bin/e_fm_main.c
===================================================================
--- trunk/e/src/bin/e_fm_main.c	2009-12-18 23:51:54 UTC (rev 44557)
+++ trunk/e/src/bin/e_fm_main.c	2009-12-18 23:53:39 UTC (rev 44558)
@@ -1676,7 +1676,7 @@
 	  {
 	     const char *file, *dst, *relative;
 	     int after;
-	     void *p = e->data;
+	     char *p = e->data;
 
 	     file = p;
 	     p += strlen(file) + 1;
@@ -1687,8 +1687,8 @@
 	     relative = p;
 	     p += strlen(relative) + 1;
 
-	     after = *(int *)p;
-
+	     after = *((int *)p);
+             
 	     _e_fm_reorder(file, dst, relative, after);
 	  }
 	break;
@@ -1752,7 +1752,7 @@
 
 static int _e_fm_slave_send(E_Fm_Slave *slave, E_Fm_Op_Type type, void *data, int size)
 {
-   void *sdata;
+   char *sdata;
    int ssize;
    int magic = E_FM_OP_MAGIC;
    int result;
@@ -1780,7 +1780,7 @@
    Ecore_Exe_Event_Data *e = event;
    E_Fm_Slave *slave;
    int magic, id, size;
-   void *sdata;
+   char *sdata;
    int ssize;
 
    if (!e) return 1;

Log:
  fix more void * arith!
  
  
Author:       raster
Date:         2009-12-18 16:15:16 -0800 (Fri, 18 Dec 2009)
New Revision: 44560

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2009-12-18 23:58:51 UTC (rev 44559)
+++ trunk/e/src/bin/e_fm.c	2009-12-19 00:15:16 UTC (rev 44560)
@@ -3082,7 +3082,7 @@
 	     off_t done, total;
 	     char *src = NULL;
 	     char *dst = NULL;
-	     void *p = e->data;
+	     char *p = e->data;
 
 	     if (!e->data) return;
 
@@ -5959,7 +5959,7 @@
 _e_fm_file_reorder(const char *file, const char *dst, const char *relative, int after)
 {
    unsigned int length = strlen(file) + 1 + strlen(dst) + 1 + strlen(relative) + 1 + sizeof(after);
-   void *data, *p;
+   char *data, *p;
 
    data = alloca(length);
    if (!data) return;

Modified: trunk/e/src/bin/e_fm_op.c
===================================================================
--- trunk/e/src/bin/e_fm_op.c	2009-12-18 23:58:51 UTC (rev 44559)
+++ trunk/e/src/bin/e_fm_op.c	2009-12-19 00:15:16 UTC (rev 44560)
@@ -417,7 +417,7 @@
 _e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler)
 {
    int fd;
-   static void *buf = NULL;
+   static char *buf = NULL;
    static int length = 0;
    void *begin = NULL;
    ssize_t num = 0;
@@ -455,7 +455,7 @@
              begin = buf;
 
 	     /* Check magic. */
-	     if (*(int *)buf != E_FM_OP_MAGIC)
+	     if (*((int *)buf) != E_FM_OP_MAGIC)
                {
                   E_FM_OP_DEBUG("Error while reading from STDIN: magic is not correct!\n");
                   break;
@@ -858,8 +858,8 @@
 {
    va_list ap;
    char buffer[READBUFSIZE];
-   void *buf = &buffer[0];
-   char *str = buf + 3 * sizeof(int);
+   char *buf = &buffer[0];
+   char *str = buf + (3 * sizeof(int));
    int len = 0;
 
    va_start(ap, fmt);
@@ -873,11 +873,11 @@
         vsnprintf(str, READBUFSIZE - 3 * sizeof(int), fmt, ap);
         len = strlen(str);
 
-        *(int *)buf = E_FM_OP_MAGIC;
-        *(int *)(buf + sizeof(int)) = type;
-        *(int *)(buf + 2 * sizeof(int)) = len + 1;
+        *((int *)buf) = E_FM_OP_MAGIC;
+        *((int *)(buf + sizeof(int))) = type;
+        *((int *)(buf + (2 * sizeof(int)))) = len + 1;
 
-        write(STDOUT_FILENO, buf, 3*sizeof(int) + len + 1);
+        write(STDOUT_FILENO, buf, (3 * sizeof(int)) + len + 1);
 
         E_FM_OP_DEBUG("%s", str);
 	E_FM_OP_DEBUG(" Error sent.\n");
@@ -925,13 +925,13 @@
 {
    const int magic = E_FM_OP_MAGIC;
    const int id = E_FM_OP_PROGRESS;
-   void *p, *data;
+   char *p, *data;
    int size, src_len, dst_len;
 
    src_len = strlen(src);
    dst_len = strlen(dst);
 
-   size = 2 * sizeof(int) + 2 * sizeof(off_t) + src_len + 1 + dst_len + 1;
+   size = (2 * sizeof(int)) + (2 * sizeof(off_t)) + src_len + 1 + dst_len + 1;
    data = alloca(3 * sizeof(int) + size);
    if (!data) return;
    p = data;
@@ -954,7 +954,7 @@
    P(dst);
 #undef P
 
-   write(STDOUT_FILENO, data, 3 * sizeof(int) + size);
+   write(STDOUT_FILENO, data, (3 * sizeof(int)) + size);
 
    E_FM_OP_DEBUG("Time left: %d at %e\n", eta, elapsed);
    E_FM_OP_DEBUG("Progress %d. \n", percent);

Log:
  dont show ecore-evas of internal windows b4efore border evals! do it there!
  
  
Author:       raster
Date:         2010-01-08 15:08:07 -0800 (Fri, 08 Jan 2010)
New Revision: 44995

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

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2010-01-08 22:32:15 UTC (rev 44994)
+++ trunk/e/src/bin/e_border.c	2010-01-08 23:08:07 UTC (rev 44995)
@@ -6187,11 +6187,17 @@
    _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN, bd);
 
    if (bd->need_reparent)
-     {     
-	ecore_x_window_save_set_add(bd->client.win);
+     {
+        if (!bd->internal)
+          ecore_x_window_save_set_add(bd->client.win);
 	ecore_x_window_reparent(bd->client.win, bd->client.shell_win, 0, 0);
 	if (bd->visible)
-	  ecore_x_window_show(bd->client.win);
+          {
+             if ((bd->new_client) && (bd->internal) && 
+                 (bd->internal_ecore_evas))
+               ecore_evas_show(bd->internal_ecore_evas);
+             ecore_x_window_show(bd->client.win);
+          }
 	bd->need_reparent = 0;
      }
 

Modified: trunk/e/src/bin/e_win.c
===================================================================
--- trunk/e/src/bin/e_win.c	2010-01-08 22:32:15 UTC (rev 44994)
+++ trunk/e/src/bin/e_win.c	2010-01-08 23:08:07 UTC (rev 44995)
@@ -90,7 +90,7 @@
 	_e_win_prop_update(win);
 	ecore_evas_lower(win->ecore_evas);
 	win->border = e_border_new(win->container, win->evas_win, 1, 1);
-        win->border->ignore_first_unmap = 1;
+//        win->border->ignore_first_unmap = 1;
 	if (!win->placed)
 	  win->border->re_manage = 0;
 	win->border->internal = 1;
@@ -99,7 +99,7 @@
      }
    _e_win_prop_update(win);
    e_border_show(win->border);
-   ecore_evas_show(win->ecore_evas);
+//   ecore_evas_show(win->ecore_evas);
 }
 
 EAPI void

Log:
  comments++
  
  
Author:       raster
Date:         2010-01-08 17:01:56 -0800 (Fri, 08 Jan 2010)
New Revision: 44999

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

Modified: trunk/e/src/bin/e_win.c
===================================================================
--- trunk/e/src/bin/e_win.c	2010-01-09 00:35:21 UTC (rev 44998)
+++ trunk/e/src/bin/e_win.c	2010-01-09 01:01:56 UTC (rev 44999)
@@ -90,6 +90,7 @@
 	_e_win_prop_update(win);
 	ecore_evas_lower(win->ecore_evas);
 	win->border = e_border_new(win->container, win->evas_win, 1, 1);
+// dont need this - special stuff        
 //        win->border->ignore_first_unmap = 1;
 	if (!win->placed)
 	  win->border->re_manage = 0;
@@ -99,6 +100,7 @@
      }
    _e_win_prop_update(win);
    e_border_show(win->border);
+// done now by e_border specially   
 //   ecore_evas_show(win->ecore_evas);
 }

Log:
  s = NULL
  
  
Author:       raster
Date:         2010-01-10 16:50:14 -0800 (Sun, 10 Jan 2010)
New Revision: 45027

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2010-01-10 22:42:34 UTC (rev 45026)
+++ trunk/e/src/bin/e_config.c	2010-01-11 00:50:14 UTC (rev 45027)
@@ -72,6 +72,7 @@
                   break;
                }
           }
+        s = NULL;
         if (ok)
           {
              s = malloc(data_len + 1);

Log:
  config to turn off exec fail dialog
  
  
Author:       raster
Date:         2010-01-24 23:38:48 -0800 (Sun, 24 Jan 2010)
New Revision: 45544

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2010-01-25 05:54:31 UTC (rev 45543)
+++ trunk/e/src/bin/e_config.c	2010-01-25 07:38:48 UTC (rev 45544)
@@ -743,6 +743,10 @@
    E_CONFIG_VAL(D, T, mode.presentation, UCHAR);
    E_CONFIG_VAL(D, T, mode.offline, UCHAR);
 
+   E_CONFIG_VAL(D, T, exec.expire_timeout, DOUBLE);
+   E_CONFIG_VAL(D, T, exec.show_run_dialog, UCHAR);
+   E_CONFIG_VAL(D, T, exec.show_exit_dialog, UCHAR);
+   
    e_config_load();
    
    e_config_save_queue();
@@ -965,11 +969,6 @@
 	COPYVAL(desklock_ask_presentation_timeout);
 	COPYVAL(screensaver_ask_presentation);
 	COPYVAL(screensaver_ask_presentation_timeout);
-	IFCFGELSE;
-	e_config->desklock_ask_presentation = 1;
-	e_config->desklock_ask_presentation_timeout = 30.0;
-	e_config->screensaver_ask_presentation = 1;
-	e_config->screensaver_ask_presentation_timeout = 30.0;
 	IFCFGEND;
 
         IFCFG(0x0133);
@@ -978,6 +977,12 @@
         COPYVAL(desk_flip_pan_y_axis_factor);
         IFCFGEND;
 
+        IFCFG(0x0134);
+        COPYVAL(exec.expire_timeout);
+        COPYVAL(exec.show_run_dialog);
+        COPYVAL(exec.show_exit_dialog);
+        IFCFGEND;
+
         e_config->config_version = E_CONFIG_FILE_VERSION;   
         _e_config_free(tcfg);
      }
@@ -1123,6 +1128,10 @@
    E_CONFIG_LIMIT(e_config->mode.presentation, 0, 1);
    E_CONFIG_LIMIT(e_config->mode.offline, 0, 1);
 
+   E_CONFIG_LIMIT(e_config->exec.expire_timeout, 0.1, 1000);
+   E_CONFIG_LIMIT(e_config->exec.show_run_dialog, 0, 1);
+   E_CONFIG_LIMIT(e_config->exec.show_exit_dialog, 0, 1);
+   
    /* FIXME: disabled auto apply because it causes problems */
    e_config->cfgdlg_auto_apply = 0;
    /* FIXME: desklock personalized password id disabled for security reasons */

Modified: trunk/e/src/bin/e_config.h
===================================================================
--- trunk/e/src/bin/e_config.h	2010-01-25 05:54:31 UTC (rev 45543)
+++ trunk/e/src/bin/e_config.h	2010-01-25 07:38:48 UTC (rev 45544)
@@ -35,7 +35,7 @@
 /* increment this whenever a new set of config values are added but the users
  * config doesn't need to be wiped - simply new values need to be put in
  */
-#define E_CONFIG_FILE_GENERATION 0x0133
+#define E_CONFIG_FILE_GENERATION 0x0134
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
 
 #define E_EVAS_ENGINE_DEFAULT         0
@@ -346,6 +346,12 @@
       Eina_Bool presentation;
       Eina_Bool offline;
    } mode;
+   
+   struct {
+      double    expire_timeout;
+      Eina_Bool show_run_dialog;
+      Eina_Bool show_exit_dialog;
+   } exec;
 };
 
 struct _E_Config_Syscon_Action

Modified: trunk/e/src/bin/e_exec.c
===================================================================
--- trunk/e/src/bin/e_exec.c	2010-01-25 05:54:31 UTC (rev 45543)
+++ trunk/e/src/bin/e_exec.c	2010-01-25 07:38:48 UTC (rev 45544)
@@ -248,7 +248,7 @@
 	inst->exe = exe;
 	inst->startup_id = startup_id;
 	inst->launch_time = ecore_time_get();
-	inst->expire_timer = ecore_timer_add(10.0, 
+	inst->expire_timer = ecore_timer_add(e_config->exec.expire_timeout, 
                                              _e_exec_cb_expire_timer, inst);
 
 	l = eina_hash_find(e_exec_instances, desktop->orig_path);
@@ -345,52 +345,58 @@
    if ((ev->exited) &&
        ((ev->exit_code == 127) || (ev->exit_code == 255)))
      {
-	E_Dialog *dia;
-
-	dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
-			   "E", "_e_exec_run_error_dialog");
-	if (dia)
-	  {
-	     char buf[4096];
-
-	     e_dialog_title_set(dia, _("Application run error"));
-	     snprintf(buf, sizeof(buf),
-		      _("Enlightenment was unable to run the application:<br>"
-			"<br>"
-			"%s<br>"
-			"<br>"
-			"The application failed to start."),
-		      ecore_exe_cmd_get(ev->exe));
-	     e_dialog_text_set(dia, buf);
-	     e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
-	     e_dialog_button_focus_num(dia, 1);
-	     e_win_centered_set(dia->win, 1);
-	     e_dialog_show(dia);
-	  }
+        if (e_config->exec.show_run_dialog)
+          {
+             E_Dialog *dia;
+             
+             dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
+                                "E", "_e_exec_run_error_dialog");
+             if (dia)
+               {
+                  char buf[4096];
+                  
+                  e_dialog_title_set(dia, _("Application run error"));
+                  snprintf(buf, sizeof(buf),
+                           _("Enlightenment was unable to run the application:<br>"
+                             "<br>"
+                             "%s<br>"
+                             "<br>"
+                             "The application failed to start."),
+                           ecore_exe_cmd_get(ev->exe));
+                  e_dialog_text_set(dia, buf);
+                  e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
+                  e_dialog_button_focus_num(dia, 1);
+                  e_win_centered_set(dia->win, 1);
+                  e_dialog_show(dia);
+               }
+          }
      }
    /* Let's hope that everything returns this properly. */
    else if (!((ev->exited) && (ev->exit_code == EXIT_SUCCESS))) 
      {
-	/* filter out common exits via signals - int/term/quit. not really
-	 * worth popping up a dialog for */
-	if (!((ev->signalled) &&
-	     ((ev->exit_signal == SIGINT) ||
-	      (ev->exit_signal == SIGQUIT) ||
-	      (ev->exit_signal == SIGTERM)))
-	    )
-	  {
-	     /* Show the error dialog with details from the exe. */
-	     _e_exec_error_dialog(inst->desktop, ecore_exe_cmd_get(ev->exe), ev,
-				  ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_ERROR),
-				  ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_READ));
-	  }
+        if (e_config->exec.show_exit_dialog)
+          {
+             /* filter out common exits via signals - int/term/quit. not really
+              * worth popping up a dialog for */
+             if (!((ev->signalled) &&
+                   ((ev->exit_signal == SIGINT) ||
+                    (ev->exit_signal == SIGQUIT) ||
+                    (ev->exit_signal == SIGTERM)))
+                 )
+               {
+                  /* Show the error dialog with details from the exe. */
+                  _e_exec_error_dialog(inst->desktop, ecore_exe_cmd_get(ev->exe), ev,
+                                       ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_ERROR),
+                                       ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_READ));
+               }
+          }
      }
 
    /* maybe better 1 minute? it might be openoffice */
-   if (ecore_time_get() - inst->launch_time < 5.0)
+   if (ecore_time_get() - inst->launch_time < 2.0)
      {
 	if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
-	inst->expire_timer = ecore_timer_add(30.0, _e_exec_cb_instance_finish, inst); 
+	inst->expire_timer = ecore_timer_add(e_config->exec.expire_timeout, _e_exec_cb_instance_finish, inst); 
      }
    else
      _e_exec_instance_free(inst);

Log:
  dont unload - restarts handle that. too unsafe.
  
  
Author:       raster
Date:         2010-01-27 07:18:51 -0800 (Wed, 27 Jan 2010)
New Revision: 45627

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

Modified: trunk/e/src/bin/e_module.c
===================================================================
--- trunk/e/src/bin/e_module.c	2010-01-27 10:19:54 UTC (rev 45626)
+++ trunk/e/src/bin/e_module.c	2010-01-27 15:18:51 UTC (rev 45627)
@@ -482,7 +482,7 @@
      }
    if (m->name) eina_stringshare_del(m->name);
    if (m->dir) eina_stringshare_del(m->dir);
-   if (m->handle) dlclose(m->handle);
+//   if (m->handle) dlclose(m->handle); DONT dlclose! causes problems with deferred callbacks for free etc. - when their code goes away!
    _e_modules = eina_list_remove(_e_modules, m);
    free(m);
 }

Log:
  and dont set sync for your own windows! deadlock in compositing otherwise
  
  
Author:       raster
Date:         2010-02-01 06:16:27 -0800 (Mon, 01 Feb 2010)
New Revision: 45774

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2010-02-01 14:15:14 UTC (rev 45773)
+++ trunk/e/src/bin/e_main.c	2010-02-01 14:16:27 UTC (rev 45774)
@@ -508,6 +508,7 @@
 			       "Perhaps you are out of memory?"));
 	_e_main_shutdown(-1);
     }
+   ecore_evas_app_comp_sync_set(0); /* e doesnt sync to compositor - it should be one */
    if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_XLIB))
      {
 	e_error_message_show(_("Enlightenment found ecore_evas doesn't support the Software X11\n"

Log:
  make back./fwd arrow actuall advance items in toolbar
  
  
Author:       raster
Date:         2010-02-05 02:22:21 -0800 (Fri, 05 Feb 2010)
New Revision: 45894

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

Modified: trunk/e/src/bin/e_widget_toolbar.c
===================================================================
--- trunk/e/src/bin/e_widget_toolbar.c	2010-02-05 08:17:21 UTC (rev 45893)
+++ trunk/e/src/bin/e_widget_toolbar.c	2010-02-05 10:22:21 UTC (rev 45894)
@@ -29,6 +29,8 @@
 static void _e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_wid_cb_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
+static void _e_wid_signal_prev(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _e_wid_signal_next(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _item_show(Item *it);
 static void _item_select(Item *it);
 static void _item_unselect(Item *it);
@@ -71,6 +73,13 @@
                                   _e_wid_focus_steal, obj);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN,
                                   _e_wid_cb_key_down, obj);
+   
+   edje_object_signal_callback_add(e_scrollframe_edje_object_get(o),
+                                   "e,action,prev", "e",
+                                   _e_wid_signal_prev, obj);
+   edje_object_signal_callback_add(e_scrollframe_edje_object_get(o),
+                                   "e,action,next", "e",
+                                   _e_wid_signal_next, obj);
    evas_object_show(o);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
@@ -327,6 +336,56 @@
 }
 
 static void
+_e_wid_signal_prev(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   E_Widget_Data *wd;
+   Eina_List *l, *l2;
+   Item *it = NULL, *it2 = NULL;
+
+   wd = e_widget_data_get(data);
+   if ((!wd->o_base) || (!wd->o_box)) return;
+   EINA_LIST_FOREACH(wd->items, l, it)
+     {
+        if (it->selected)
+          {
+             l2 = eina_list_prev(l);
+             if (l2) it2 = eina_list_data_get(l2);
+             break;
+          }
+     }
+   if ((it) && (it2) && (it != it2))
+     {
+	_item_unselect(it);
+	_item_select(it2);
+     }
+}
+
+static void
+_e_wid_signal_next(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   E_Widget_Data *wd;
+   Eina_List *l, *l2;
+   Item *it = NULL, *it2 = NULL;
+
+   wd = e_widget_data_get(data);
+   if ((!wd->o_base) || (!wd->o_box)) return;
+   EINA_LIST_FOREACH(wd->items, l, it)
+     {
+        if (it->selected)
+          {
+             l2 = eina_list_next(l);
+             if (l2) it2 = eina_list_data_get(l2);
+             break;
+          }
+     }
+   if ((it) && (it2) && (it != it2))
+     {
+	_item_unselect(it);
+	_item_select(it2);
+     }
+}
+
+static void
 _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    E_Widget_Data *wd;

Log:
  fix toolbar bug in sizing
  
  
Author:       raster
Date:         2010-02-05 04:24:42 -0800 (Fri, 05 Feb 2010)
New Revision: 45896

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

Modified: trunk/e/src/bin/e_widget_toolbar.c
===================================================================
--- trunk/e/src/bin/e_widget_toolbar.c	2010-02-05 10:22:42 UTC (rev 45895)
+++ trunk/e/src/bin/e_widget_toolbar.c	2010-02-05 12:24:42 UTC (rev 45896)
@@ -7,7 +7,7 @@
 typedef struct _Item Item;
 struct _E_Widget_Data
 {
-   Evas_Object *o_base, *o_box, *o_scrollframe0;
+   Evas_Object *o_base, *o_box;
    int icon_w, icon_h;
    Eina_List *items;
    Eina_Bool scrollable : 1;
@@ -128,7 +128,6 @@
    edje_object_size_min_calc(o, &mw, &mh);
    e_widget_sub_object_add(obj, o);
    e_box_pack_end(wd->o_box, o);
-   evas_object_show(o);
    e_box_pack_options_set(o,
 			  1, 1, /* fill */
 			  0, 0, /* expand */
@@ -136,6 +135,7 @@
 			  mw, mh, /* min */
 			  9999, 9999 /* max */
 			  );
+   evas_object_show(o);
    e_box_size_min_get(wd->o_box, &mw, &mh);
    evas_object_resize(wd->o_box, mw, mh);
    evas_object_resize(wd->o_base, 500, 500);
@@ -144,6 +144,7 @@
      e_widget_size_min_set(obj, 500 - vw, mh + (500 - vh));
    else
      e_widget_size_min_set(obj, mw + (500 - vw), mh + (500 - vh));
+   evas_object_resize(wd->o_box, mw, mh);
 }
 
 EAPI void
@@ -226,6 +227,7 @@
      e_widget_size_min_set(obj, 500 - vw, mh + (500 - vh));
    else
      e_widget_size_min_set(obj, mw + (500 - vw), mh + (500 - vh));
+   evas_object_resize(wd->o_box, mw, mh);
 }
 
 EAPI void

Log:
  add sugusr1 to bring uo std config panel
  
  
Author:       raster
Date:         2010-02-06 01:47:17 -0800 (Sat, 06 Feb 2010)
New Revision: 45929

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2010-02-06 08:38:26 UTC (rev 45928)
+++ trunk/e/src/bin/e_main.c	2010-02-06 09:47:17 UTC (rev 45929)
@@ -77,6 +77,7 @@
 static void _e_main_cb_x_fatal(void *data);
 static int  _e_main_cb_signal_exit(void *data, int ev_type, void *ev);
 static int  _e_main_cb_signal_hup(void *data, int ev_type, void *ev);
+static int  _e_main_cb_signal_user(void *data, int ev_type, void *ev);
 static int  _e_main_cb_x_flusher(void *data);
 static int  _e_main_cb_idler_before(void *data);
 static int  _e_main_cb_idler_after(void *data);
@@ -429,6 +430,12 @@
 			       "Perhaps you are out of memory?"));
 	_e_main_shutdown(-1);
      }
+   if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, _e_main_cb_signal_user, NULL))
+     {
+	e_error_message_show(_("Enlightenment cannot set up a USER signal handler.\n"
+			       "Perhaps you are out of memory?"));
+	_e_main_shutdown(-1);
+     }
 
    /* an idle enterer to be called before all others */
    _e_main_idle_enterer_before = ecore_idle_enterer_before_add(_e_main_cb_idler_before, NULL);
@@ -1495,6 +1502,23 @@
 }
 
 static int
+_e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
+{
+   Ecore_Event_Signal_User *e = ev;
+   
+   if (e->number == 1)
+     {
+        E_Action *a = e_action_find("configuration");
+        if ((a) && (a->func.go)) a->func.go(NULL, NULL);
+     }
+   else if (e->number == 2)
+     {
+        // FIXME: another core util for doing things with e
+     }
+   return 1;
+}
+
+static int
 _e_main_cb_x_flusher(void *data __UNUSED__)
 {
    eet_clearcache();

Log:
  fix long-standing bug in exe exit handling! ugh...
  
  
Author:       raster
Date:         2010-02-12 18:47:21 -0800 (Fri, 12 Feb 2010)
New Revision: 46123

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

Modified: trunk/e/src/bin/e_exec.c
===================================================================
--- trunk/e/src/bin/e_exec.c	2010-02-12 23:53:15 UTC (rev 46122)
+++ trunk/e/src/bin/e_exec.c	2010-02-13 02:47:21 UTC (rev 46123)
@@ -113,17 +113,14 @@
      }
    if (launch_method) 
      launch->launch_method = eina_stringshare_add(launch_method);
-
+   
    if (desktop)
      {
 	if (exec)
 	  inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
 	else 
-          {
-             inst = 
-               efreet_desktop_command_get(desktop, files, 
-                                          _e_exec_cb_exec, launch);
-          }
+          inst = efreet_desktop_command_get(desktop, files, 
+                                            _e_exec_cb_exec, launch);
      }
    else
      inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
@@ -242,28 +239,24 @@
    if (desktop)
      {
 	Eina_List *l;
-
+        
 	efreet_desktop_ref(desktop);
 	inst->desktop = desktop;
+        inst->key = eina_stringshare_add(desktop->orig_path);
 	inst->exe = exe;
 	inst->startup_id = startup_id;
 	inst->launch_time = ecore_time_get();
 	inst->expire_timer = ecore_timer_add(e_config->exec.expire_timeout, 
                                              _e_exec_cb_expire_timer, inst);
-
+        
 	l = eina_hash_find(e_exec_instances, desktop->orig_path);
+        l = eina_list_append(l, inst);
 	if (l)
-	  {
-	     l = eina_list_append(l, inst);
-	     eina_hash_modify(e_exec_instances, desktop->orig_path, l);
-	  }
+          eina_hash_modify(e_exec_instances, desktop->orig_path, l);
 	else
-	  {
-	     l = eina_list_append(l, inst);
-	     eina_hash_add(e_exec_instances, desktop->orig_path, l);
-	  }
+          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)
@@ -272,12 +265,12 @@
 	inst = NULL;
 	ecore_exe_free(exe);
      }
-
+   
    if (!remaining)
      {
 	if (launch->launch_method) eina_stringshare_del(launch->launch_method);
 	if (launch->zone) e_object_unref(E_OBJECT(launch->zone));
-      	free(launch);
+        free(launch);
      }
    return inst;
 }
@@ -298,17 +291,18 @@
 {
    Eina_List *instances;
    
-   if (inst->desktop)
+   if (inst->key)
      {
-	instances = eina_hash_find(e_exec_instances, inst->desktop->orig_path);
+	instances = eina_hash_find(e_exec_instances, inst->key);
 	if (instances)
 	  {
 	     instances = eina_list_remove(instances, inst);
 	     if (instances)
-	       eina_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
+	       eina_hash_modify(e_exec_instances, inst->key, instances);
 	     else
-	       eina_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
+	       eina_hash_del(e_exec_instances, inst->key, NULL);
 	  }
+        eina_stringshare_del(inst->key);
      }
    e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop);
    if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
@@ -322,7 +316,6 @@
 _e_exec_cb_instance_finish(void *data)
 {
    _e_exec_instance_free(data);
-   
    return 0;
 }
 
@@ -337,7 +330,8 @@
    if (!ev->exe) return 1;
 //   if (ecore_exe_tag_get(ev->exe)) printf("  tag %s\n", ecore_exe_tag_get(ev->exe));
    if (!(ecore_exe_tag_get(ev->exe) && 
-	 (!strcmp(ecore_exe_tag_get(ev->exe), "E/exec")))) return 1;
+	 (!strcmp(ecore_exe_tag_get(ev->exe), "E/exec"))))
+     return 1;
    inst = ecore_exe_data_get(ev->exe);
    if (!inst) return 1;
 
@@ -395,8 +389,9 @@
    /* maybe better 1 minute? it might be openoffice */
    if (ecore_time_get() - inst->launch_time < 2.0)
      {
+        inst->exe = NULL;
 	if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
-	inst->expire_timer = ecore_timer_add(e_config->exec.expire_timeout, _e_exec_cb_instance_finish, inst); 
+	inst->expire_timer = ecore_timer_add(e_config->exec.expire_timeout, _e_exec_cb_instance_finish, inst);
      }
    else
      _e_exec_instance_free(inst);
@@ -412,16 +407,17 @@
    Eina_List *l;
 
    search = data;
-
    EINA_LIST_FOREACH(value, l, inst)
-     if (((search->startup_id > 0) && (search->startup_id == inst->startup_id)) ||
-         ((inst->exe) && (search->pid > 1) && 
-          (search->pid == ecore_exe_pid_get(inst->exe))))
-       {
-          search->desktop = inst->desktop;
-          return EINA_FALSE;
-       }
-
+     {
+        if (((search->startup_id > 0) && 
+             (search->startup_id == inst->startup_id)) ||
+            ((inst->exe) && (search->pid > 1) && 
+             (search->pid == ecore_exe_pid_get(inst->exe))))
+          {
+             search->desktop = inst->desktop;
+             return EINA_FALSE;
+          }
+     }
    return EINA_TRUE;
 }
 

Modified: trunk/e/src/bin/e_exec.h
===================================================================
--- trunk/e/src/bin/e_exec.h	2010-02-12 23:53:15 UTC (rev 46122)
+++ trunk/e/src/bin/e_exec.h	2010-02-13 02:47:21 UTC (rev 46123)
@@ -12,6 +12,7 @@
 struct _E_Exec_Instance
 {
    Efreet_Desktop *desktop;
+   const char     *key;
    Ecore_Exe      *exe;
    int             startup_id;
    double          launch_time;

Log:
  delay order re-load from monitor signal
  
  
Author:       raster
Date:         2010-02-22 00:04:41 -0800 (Mon, 22 Feb 2010)
New Revision: 46351

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

Modified: trunk/e/src/bin/e_order.c
===================================================================
--- trunk/e/src/bin/e_order.c	2010-02-21 19:40:32 UTC (rev 46350)
+++ trunk/e/src/bin/e_order.c	2010-02-22 08:04:41 UTC (rev 46351)
@@ -152,6 +152,7 @@
 static void
 _e_order_free(E_Order *eo)
 {
+   if (eo->delay) ecore_timer_del(eo->delay);
    E_FREE_LIST(eo->desktops, efreet_desktop_free);
    if (eo->path) eina_stringshare_del(eo->path);
    if (eo->monitor) ecore_file_monitor_del(eo->monitor);
@@ -159,19 +160,28 @@
    free(eo);
 }
 
-static void
-_e_order_cb_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path)
+static int
+_e_order_cb_monitor_delay(void *data)
 {
-   E_Order *eo;
-
-   eo = data;
-
+   E_Order *eo = data;
+   
    /* It doesn't really matter what the change is, just re-read the file */
    _e_order_read(eo);
    if (eo->cb.update) eo->cb.update(eo->cb.data, eo);
+   eo->delay = NULL;
+   return 0;
 }
 
 static void
+_e_order_cb_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path)
+{
+   E_Order *eo = data;
+
+   if (eo->delay) ecore_timer_del(eo->delay);
+   eo->delay = ecore_timer_add(0.2, _e_order_cb_monitor_delay, eo);
+}
+
+static void
 _e_order_read(E_Order *eo)
 {
    FILE *f;

Modified: trunk/e/src/bin/e_order.h
===================================================================
--- trunk/e/src/bin/e_order.h	2010-02-21 19:40:32 UTC (rev 46350)
+++ trunk/e/src/bin/e_order.h	2010-02-22 08:04:41 UTC (rev 46351)
@@ -18,6 +18,7 @@
    const char         *path;
    Eina_List          *desktops; /* A list of Efreet_Desktop files this .order contains */
    Ecore_File_Monitor *monitor; /* Check for changes int the .order file */
+   Ecore_Timer        *delay;
 
    struct {
 	void (*update)(void *data, E_Order *eo);

Log:
  oooold patch from manio! in!
  
  
Author:       raster
Date:         2010-03-02 16:32:39 -0800 (Tue, 02 Mar 2010)
New Revision: 46807

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

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2010-03-02 23:08:04 UTC (rev 46806)
+++ trunk/e/src/bin/e_border.c	2010-03-03 00:32:39 UTC (rev 46807)
@@ -720,10 +720,13 @@
    e_object_ref(E_OBJECT(desk));
    ecore_event_add(E_EVENT_BORDER_DESK_SET, ev, _e_border_event_border_desk_set_free, NULL);
 
-   if ((bd->desk->visible) || (bd->sticky))
-     e_border_show(bd);
-   else
-     e_border_hide(bd, 1);
+   if (bd->ignore_first_unmap != 1)
+     {
+	if ((bd->desk->visible) || (bd->sticky))
+	  e_border_show(bd);
+	else
+	  e_border_hide(bd, 1);
+     }
 
    if (e_config->transient.desktop)
      {

Log:
  load modules before execcing apps.
  
  
Author:       raster
Date:         2010-03-08 07:00:29 -0800 (Mon, 08 Mar 2010)
New Revision: 47000

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2010-03-08 14:50:50 UTC (rev 46999)
+++ trunk/e/src/bin/e_main.c	2010-03-08 15:00:29 UTC (rev 47000)
@@ -1015,26 +1015,6 @@
 
    /* ecore_x_ungrab(); */
 
-   TS("init properites");
-   if (!nostartup)
-     {
-	if (after_restart) e_startup(E_STARTUP_RESTART);
-	else e_startup(E_STARTUP_START);
-     }
-
-   if (!((!e_config->show_splash) || (after_restart)))
-     {
-	ecore_timer_add(16.0, _e_main_cb_startup_fake_end, NULL);
-
-	if (locked) e_desklock_show();
-     }
-
-   e_container_all_thaw();
-
-   TS("test code");
-   /* run any testing code now we are set up */
-   e_test();
-
    /* load modules */
    e_init_status_set(_("Load Modules"));
    TS("load modules");
@@ -1060,6 +1040,26 @@
 	e_config_save_queue();
      }
 
+   TS("init properites");
+   if (!nostartup)
+     {
+	if (after_restart) e_startup(E_STARTUP_RESTART);
+	else e_startup(E_STARTUP_START);
+     }
+
+   if (!((!e_config->show_splash) || (after_restart)))
+     {
+	ecore_timer_add(16.0, _e_main_cb_startup_fake_end, NULL);
+
+	if (locked) e_desklock_show();
+     }
+
+   e_container_all_thaw();
+
+   TS("test code");
+   /* run any testing code now we are set up */
+   e_test();
+
    e_init_status_set(_("Configure Shelves"));
    TS("shelf config init");
    e_shelf_config_init();

Log:
  and on osx -  they use some other env var apparently.
  
  
Author:       raster
Date:         2010-03-16 01:11:23 -0700 (Tue, 16 Mar 2010)
New Revision: 47281

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

Modified: trunk/e/src/bin/e_start_main.c
===================================================================
--- trunk/e/src/bin/e_start_main.c	2010-03-16 05:49:13 UTC (rev 47280)
+++ trunk/e/src/bin/e_start_main.c	2010-03-16 08:11:23 UTC (rev 47281)
@@ -529,7 +529,8 @@
    snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path);
 
    args = alloca((argc + 2 + VALGRIND_MAX_ARGS) * sizeof(char *));
-   if (!getenv("DBUS_SESSION_BUS_ADDRESS"))
+   if ((!getenv("DBUS_SESSION_BUS_ADDRESS")) &&
+       (!getenv("DBUS_LAUNCHD_SESSION_BUS_SOCKET")))
      {
 	args[0] = "dbus-launch";
 	args[1] = "--exit-with-session";

Log:
  nice alert to tell u what went wrong
  
  
Author:       raster
Date:         2010-03-16 20:40:21 -0700 (Tue, 16 Mar 2010)
New Revision: 47303

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2010-03-17 01:08:39 UTC (rev 47302)
+++ trunk/e/src/bin/e_config.c	2010-03-17 03:40:21 UTC (rev 47303)
@@ -850,6 +850,15 @@
      {
         printf("EEEK! no config of any sort! abort abort abort!\n");
         fprintf(stderr, "EEEK! no config of any sort! abort abort abort!\n");
+        e_alert_show("Enlightenment was started without any configuration\n"
+                     "files available for the given profile (normally\n"
+                     "default or the last profile used or provided on the\n"
+                     "command-line with -profile etc.)\n"
+                     "\n"
+                     "Cannot contiue without configuration to work with.\n"
+                     "Please ensure you have system or user configuration\n"
+                     "for the profile you are using before proceeeding."
+                     );
         abort();
      }
    if (e_config->config_version < E_CONFIG_FILE_VERSION)

Log:
  comment out too.
  
  
Author:       raster
Date:         2010-04-12 02:05:37 -0700 (Mon, 12 Apr 2010)
New Revision: 47951

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

Modified: trunk/e/src/bin/e_signals.c
===================================================================
--- trunk/e/src/bin/e_signals.c	2010-04-12 08:28:51 UTC (rev 47950)
+++ trunk/e/src/bin/e_signals.c	2010-04-12 09:05:37 UTC (rev 47951)
@@ -94,7 +94,7 @@
    size_t size;
 
    return; // disable. causes hangs and problems
-   
+/*
    _e_write_safe_int(fd, msg, msg_len);
    _e_write_safe(fd, "\nBEGIN TRACEBACK\n");
    size = backtrace(array, 255);
@@ -107,6 +107,7 @@
      _e_write_safe_int(fd, attachmsg, size);
 
    _e_gdb_print_backtrace(fd);
+ */
 }
 
 /* a tricky little devil, requires e and it's libs to be built

Log:
  use utf8 mount options for some fs's
  
  
Author:       raster
Date:         2010-04-18 19:09:46 -0700 (Sun, 18 Apr 2010)
New Revision: 48116

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

Modified: trunk/e/src/bin/e_fm_main.c
===================================================================
--- trunk/e/src/bin/e_fm_main.c	2010-04-19 01:56:41 UTC (rev 48115)
+++ trunk/e/src/bin/e_fm_main.c	2010-04-19 02:09:46 UTC (rev 48116)
@@ -955,6 +955,7 @@
 e_volume_mount(E_Volume *v)
 {
    char buf[256];
+   char buf2[256];
    char *mount_point;
    Eina_List *opt = NULL;
 
@@ -964,13 +965,31 @@
    mount_point = v->mount_point + 7;
 //   printf("mount %s %s [fs type = %s]\n", v->udi, v->mount_point, v->fstype);
 
-   if ((!strcmp(v->fstype, "vfat")) || (!strcmp(v->fstype, "ntfs"))
-//       || (!strcmp(v->fstype, "iso9660")) || (!strcmp(v->fstype, "udf"))
+   if ((!strcmp(v->fstype, "vfat")) ||
+       (!strcmp(v->fstype, "ntfs"))
        )
      {
 	snprintf(buf, sizeof(buf), "uid=%i", (int)getuid());
 	opt = eina_list_append(opt, buf);
      }
+
+   if ((!strcmp(v->fstype, "vfat")) || 
+       (!strcmp(v->fstype, "ntfs")) ||
+       (!strcmp(v->fstype, "iso9660"))
+       )
+     {
+        snprintf(buf2, sizeof(buf2), "utf8");
+        opt = eina_list_append(opt, buf2);
+     }
+   else if ((!strcmp(v->fstype, "fat")) || 
+            (!strcmp(v->fstype, "jfs")) || 
+            (!strcmp(v->fstype, "udf"))
+            )
+     {
+        snprintf(buf2, sizeof(buf2), "iocharset=utf8");
+        opt = eina_list_append(opt, buf2);
+     }
+
    v->guard = ecore_timer_add(E_FM_MOUNT_TIMEOUT, _e_dbus_vol_mount_timeout, v);
    v->op = e_hal_device_volume_mount(_e_dbus_conn, v->udi, mount_point,
                                      v->fstype, opt, _e_dbus_cb_vol_mounted, v);

Log:
  no more e_fm_open - use dbus... eg:
  
  dbus-send --session --dest=org.enlightenment.FileManager /org/enlightenment/FileManager org.enlightenment.FileManager.OpenDirectory string:'/home/raster'
  
  
Author:       raster
Date:         2010-04-27 06:30:33 -0700 (Tue, 27 Apr 2010)
New Revision: 48362

Removed:
  trunk/e/src/bin/e_fm_open.c 
Modified:
  trunk/e/src/bin/e_ipc.c 

Modified: trunk/e/src/bin/e_ipc.c
===================================================================
--- trunk/e/src/bin/e_ipc.c	2010-04-27 11:54:43 UTC (rev 48361)
+++ trunk/e/src/bin/e_ipc.c	2010-04-27 13:30:33 UTC (rev 48362)
@@ -169,9 +169,12 @@
                             free(d);
                          }
                        
-                       E_FREE(req->str1);
-                       E_FREE(req->str2);
-                       E_FREE(req);
+                       if (req)
+                         {
+                            E_FREE(req->str1);
+                            E_FREE(req->str2);
+                            E_FREE(req);
+                         }
                     }
                }
              break;

Log:
  DONT strip file://! efm etc. expects it.. as its a uri! dnd broke as of this
  change completely... bad englebass! bad! spank! :)
  
  
Author:       raster
Date:         2010-04-27 20:30:31 -0700 (Tue, 27 Apr 2010)
New Revision: 48379

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

Modified: trunk/e/src/bin/e_dnd.c
===================================================================
--- trunk/e/src/bin/e_dnd.c	2010-04-28 03:30:20 UTC (rev 48378)
+++ trunk/e/src/bin/e_dnd.c	2010-04-28 03:30:31 UTC (rev 48379)
@@ -764,7 +764,7 @@
 	     /* A little bit of caching to avoid trips to X. */
 	     cache.win = root;
 // wtf - get root of root window? pointless!             
-//	     cache.root = ecore_x_window_root_get(root);
+	     cache.root = ecore_x_window_root_get(root);
 	     cache.root = root;
 	  }
 	win = ecore_x_window_shadow_tree_at_xy_with_skip_get(cache.root, x, y, ignore_win, 2);
@@ -1389,7 +1389,7 @@
 	  {
 	     /* TODO: Check if hostname is in file:// uri */
 	     if (!strncmp(files->files[i], "file://", 7))
-	       l = eina_list_append(l, files->files[i] + 7);
+	       l = eina_list_append(l, files->files[i]);
 	     /* TODO: download files
 	     else if (!strncmp(files->files[i], "http://", 7))
 	     else if (!strncmp(files->files[i], "ftp://", 6))

Log:
  be lenient on uri';s allow boring full paths.
  
  
Author:       raster
Date:         2010-04-27 20:30:48 -0700 (Tue, 27 Apr 2010)
New Revision: 48380

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2010-04-28 03:30:31 UTC (rev 48379)
+++ trunk/e/src/bin/e_fm.c	2010-04-28 03:30:48 UTC (rev 48380)
@@ -4196,6 +4196,14 @@
    char hostname[PATH_MAX], path[PATH_MAX];
    int i = 0;
 
+   /* if value is a raw path: /path/to/blah just return it */
+   if (val[0] == '/')
+     {
+        uri = E_NEW(E_Fm2_Uri, 1);
+        uri->hostname = NULL;
+        uri->path = eina_stringshare_add(val);
+        return uri;
+     }
    /* The shortest possible path is file:///
     * anything smaller than that can't be a valid uri
     */
@@ -4278,7 +4286,6 @@
 	E_Fm2_Icon *ic;
 
 	ic = NULL;
-
 	fm = _e_fm2_file_fm2_find(path);
 	if (fm)
 	  {

Log:
  fix segv with removable devices!!!! decode forced strdup/free etc... but rest
  of code assumed stringshare.
  
  
Author:       raster
Date:         2010-05-02 05:05:56 -0700 (Sun, 02 May 2010)
New Revision: 48546

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2010-05-02 11:59:23 UTC (rev 48545)
+++ trunk/e/src/bin/e_fm.c	2010-05-02 12:05:56 UTC (rev 48546)
@@ -2958,20 +2958,20 @@
 	     mountpoint = udi + strlen(udi) + 1;
 	     v = e_fm2_dbus_volume_find(udi);
 	     if (v) 
-	        {
-	           e_fm2_dbus_mount_add(v, mountpoint);
-	           _e_fm2_volume_icon_update(v);
-	           if (e_config->dbus_auto_open && !eina_list_count(v->mounts))
-	             {
-	                E_Action *a;
-	                Eina_List *m;
-
-	                a = e_action_find("fileman");
-	                m = e_manager_list();
-	                if (a && a->func.go && m && eina_list_data_get(m))
-	                   a->func.go(E_OBJECT(eina_list_data_get(m)), mountpoint);
-	             }
-	        }
+               {
+                  e_fm2_dbus_mount_add(v, mountpoint);
+                  _e_fm2_volume_icon_update(v);
+                  if (e_config->dbus_auto_open && !eina_list_count(v->mounts))
+                    {
+                       E_Action *a;
+                       Eina_List *m;
+                       
+                       a = e_action_find("fileman");
+                       m = e_manager_list();
+                       if (a && a->func.go && m && eina_list_data_get(m))
+                         a->func.go(E_OBJECT(eina_list_data_get(m)), mountpoint);
+                    }
+               }
 	  }
 	break;
 
@@ -2984,10 +2984,10 @@
 	     udi = e->data;
 	     v = e_fm2_dbus_volume_find(udi);
 	     if (v) 
-	        {
-	           e_fm2_dbus_mount_del(v);
-	           _e_fm2_volume_icon_update(v);
-	        }
+               {
+                  e_fm2_dbus_mount_del(v);
+                  _e_fm2_volume_icon_update(v);
+               }
 	  }
 	break;
 

Modified: trunk/e/src/bin/e_fm_dbus.c
===================================================================
--- trunk/e/src/bin/e_fm_dbus.c	2010-05-02 11:59:23 UTC (rev 48545)
+++ trunk/e/src/bin/e_fm_dbus.c	2010-05-02 12:05:56 UTC (rev 48546)
@@ -269,18 +269,19 @@
 EAPI void
 e_fm2_dbus_volume_del(E_Volume *v)
 {
-   Eina_List *l, *l_nxt;
    E_Fm2_Mount *m;
-   
+
 //   printf("VOL- %s\n", v->udi);
-   if (v->storage) 
-     v->storage->volumes = eina_list_remove(v->storage->volumes, v);
    _e_vols = eina_list_remove(_e_vols, v);
    _e_fm2_volume_erase(v);
-   EINA_LIST_FOREACH_SAFE(v->mounts, l, l_nxt, m)
+   if (v->storage) 
      {
+        v->storage->volumes = eina_list_remove(v->storage->volumes, v);
+        v->storage = NULL;
+     }
+   EINA_LIST_FREE(v->mounts, m)
+     {
         _e_fm2_dbus_unmount_ok(m);
-        v->mounts = eina_list_remove_list(v->mounts, l);
         _e_fm2_dbus_mount_free(m);
      }
    _e_volume_free(v);
@@ -302,8 +303,6 @@
    f = fopen(buf, "w");
    if (f)
      {
-
-	
 	fprintf(f,
 		"[Desktop Entry]\n"
 		"Encoding=UTF-8\n"
@@ -373,7 +372,7 @@
 
    EINA_LIST_FOREACH(_e_vols, l, v)
      {
-	if (!strcmp(udi, v->udi)) return v;
+	if ((v->udi) && (!strcmp(udi, v->udi))) return v;
      }
    return NULL;
 }
@@ -428,7 +427,6 @@
 EAPI void
 e_fm2_dbus_mount_del(E_Volume *v)
 {
-   Eina_List *l, *l_nxt;
    E_Fm2_Mount *m;
    
    v->mounted = 0;
@@ -437,11 +435,10 @@
         eina_stringshare_del(v->mount_point);
         v->mount_point = NULL;
      }
-
-   EINA_LIST_FOREACH_SAFE(v->mounts, l, l_nxt, m)
+   
+   EINA_LIST_FREE(v->mounts, m)
      {
         _e_fm2_dbus_unmount_ok(m);
-        v->mounts = eina_list_remove_list(v->mounts, l);
         _e_fm2_dbus_mount_free(m);
      }
 }
@@ -515,7 +512,6 @@
 EAPI void
 e_fm2_dbus_mount_fail(E_Volume *v)
 {
-   Eina_List *l, *l_nxt;
    E_Fm2_Mount *m;
 
    v->mounted = 0;
@@ -525,10 +521,9 @@
         v->mount_point = NULL;
      }
 
-   EINA_LIST_FOREACH_SAFE(v->mounts, l, l_nxt, m)
+   EINA_LIST_FREE(v->mounts, m)
      {
-        _e_fm2_dbus_mount_fail(m);
-        v->mounts = eina_list_remove_list(v->mounts, l);
+        _e_fm2_dbus_unmount_ok(m);
         _e_fm2_dbus_mount_free(m);
      }
 }
@@ -561,6 +556,7 @@
 static void
 _e_fm2_dbus_mount_ok(E_Fm2_Mount *m)
 {
+   if (m->mounted) return;
    m->mounted = 1;
    if (m->volume) 
       m->mount_point = eina_stringshare_add(m->volume->mount_point);
@@ -572,6 +568,7 @@
 static void
 _e_fm2_dbus_mount_fail(E_Fm2_Mount *m)
 {
+   if (!m->mounted) return;
    m->mounted = 0;
    if (m->mount_point)
      {
@@ -585,6 +582,7 @@
 static void
 _e_fm2_dbus_unmount_ok(E_Fm2_Mount *m)
 {
+   if (!m->mounted) return;
    m->mounted = 0;
    if (m->mount_point)
      {
@@ -598,6 +596,7 @@
 static void
 _e_fm2_dbus_unmount_fail(E_Fm2_Mount *m)
 {
+   if (m->mounted) return;
    m->mounted = 1;
    if (m->unmount_fail) 
      m->unmount_fail(m->data);

Modified: trunk/e/src/bin/e_fm_shared.h
===================================================================
--- trunk/e/src/bin/e_fm_shared.h	2010-05-02 11:59:23 UTC (rev 48545)
+++ trunk/e/src/bin/e_fm_shared.h	2010-05-02 12:05:56 UTC (rev 48546)
@@ -104,6 +104,7 @@
    E_Volume *v;
    EINA_LIST_FREE(s->volumes, v)
      {
+        v->storage = NULL;
 	_e_volume_free(v);
      }
    if (s->udi) eina_stringshare_del(s->udi);
@@ -126,8 +127,8 @@
    if (!eet_eina_stream_data_descriptor_class_set(&eddc, "e_volume", sizeof (E_Volume)))
      return NULL;
 
-   eddc.func.str_alloc = (char *(*)(const char *)) strdup;
-   eddc.func.str_free = (void (*)(const char *)) free;
+//   eddc.func.str_alloc = (char *(*)(const char *)) strdup;
+//   eddc.func.str_free = (void (*)(const char *)) free;
 
    edd = eet_data_descriptor_stream_new(&eddc);
 #define DAT(x, y, z) EET_DATA_DESCRIPTOR_ADD_BASIC(edd, E_Volume, x, y, z)
@@ -157,8 +158,8 @@
    if (!eet_eina_stream_data_descriptor_class_set(&eddc, "e_storage", sizeof (E_Storage)))
      return NULL;
 
-   eddc.func.str_alloc = (char *(*)(const char *)) strdup;
-   eddc.func.str_free = (void (*)(const char *)) free;
+//   eddc.func.str_alloc = (char *(*)(const char *)) strdup;
+//   eddc.func.str_free = (void (*)(const char *)) free;
 
    edd = eet_data_descriptor_stream_new(&eddc);
 #define DAT(x, y, z) EET_DATA_DESCRIPTOR_ADD_BASIC(edd, E_Storage, x, y, z)

Log:
  iocharset not valid for udf (and normal user id) :/
  
  
Author:       raster
Date:         2010-05-02 18:53:27 -0700 (Sun, 02 May 2010)
New Revision: 48572

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

Modified: trunk/e/src/bin/e_fm_main.c
===================================================================
--- trunk/e/src/bin/e_fm_main.c	2010-05-02 22:25:32 UTC (rev 48571)
+++ trunk/e/src/bin/e_fm_main.c	2010-05-03 01:53:27 UTC (rev 48572)
@@ -986,8 +986,8 @@
         opt = eina_list_append(opt, buf2);
      }
    else if ((!strcmp(v->fstype, "fat")) || 
-            (!strcmp(v->fstype, "jfs")) || 
-            (!strcmp(v->fstype, "udf"))
+            (!strcmp(v->fstype, "jfs")) 
+//            (!strcmp(v->fstype, "udf"))
             )
      {
         snprintf(buf2, sizeof(buf2), "iocharset=utf8");

Log:
  add names to popups
  
  
Author:       raster
Date:         2010-05-15 05:25:33 -0700 (Sat, 15 May 2010)
New Revision: 48888

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

Modified: trunk/e/src/bin/e_popup.c
===================================================================
--- trunk/e/src/bin/e_popup.c	2010-05-15 10:55:12 UTC (rev 48887)
+++ trunk/e/src/bin/e_popup.c	2010-05-15 12:25:33 UTC (rev 48888)
@@ -72,6 +72,13 @@
 }
 
 EAPI void
+e_popup_name_set(E_Popup *pop, const char *name)
+{
+   if (eina_stringshare_replace(&pop->name, name))
+     ecore_evas_name_class_set(pop->ecore_evas, "E", pop->name);
+}
+
+EAPI void
 e_popup_show(E_Popup *pop)
 {
    E_OBJECT_CHECK(pop);
@@ -303,6 +310,7 @@
    pop->zone->popups = eina_list_remove(pop->zone->popups, pop);
    _e_popup_list = eina_list_remove(_e_popup_list, pop);
    eina_hash_del(_e_popup_hash, e_util_winid_str_get(pop->evas_win), pop);
+   if (pop->name) eina_stringshare_del(pop->name);
    free(pop);
 }
 

Modified: trunk/e/src/bin/e_popup.h
===================================================================
--- trunk/e/src/bin/e_popup.h	2010-05-15 10:55:12 UTC (rev 48887)
+++ trunk/e/src/bin/e_popup.h	2010-05-15 12:25:33 UTC (rev 48888)
@@ -26,6 +26,7 @@
    Ecore_X_Window       evas_win;
    E_Container_Shape   *shape;
    E_Zone              *zone;
+   const char          *name;
    int                  shape_rects_num;
    Ecore_X_Rectangle   *shape_rects;
    Ecore_Idle_Enterer  *idle_enterer;
@@ -35,6 +36,7 @@
 EAPI int         e_popup_shutdown(void);
 
 EAPI E_Popup    *e_popup_new(E_Zone *zone, int x, int y, int w, int h);
+EAPI void        e_popup_name_set(E_Popup *pop, const char *name);
 EAPI void        e_popup_show(E_Popup *pop);
 EAPI void        e_popup_hide(E_Popup *pop);
 EAPI void        e_popup_move(E_Popup *pop, int x, int y);

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2010-05-15 10:55:12 UTC (rev 48887)
+++ trunk/e/src/bin/e_shelf.c	2010-05-15 12:25:33 UTC (rev 48888)
@@ -111,6 +111,7 @@
    if (popup)
      {
 	es->popup = e_popup_new(zone, es->x, es->y, es->w, es->h);
+        e_popup_name_set(es->popup, "shelf");
 	e_popup_layer_set(es->popup, layer);
 	es->ee = es->popup->ecore_evas;
 	es->evas = es->popup->evas;
@@ -684,6 +685,7 @@
    if (popup) 
      {
 	es->popup = e_popup_new(es->zone, es->x, es->y, es->w, es->h);
+        e_popup_name_set(es->popup, "shelf");
 	e_popup_layer_set(es->popup, es->cfg->layer);
 
 	es->ee = es->popup->ecore_evas;

Log:
  call sys action for exit on io error - cleaner.
  
  
Author:       raster
Date:         2010-05-18 00:50:56 -0700 (Tue, 18 May 2010)
New Revision: 48966

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-18 07:14:27 UTC (rev 48965)
+++ trunk/e/src/bin/e_main.c	2010-05-18 07:50:56 UTC (rev 48966)
@@ -1512,7 +1512,8 @@
 _e_main_cb_x_fatal(void *data __UNUSED__)
 {
    e_error_message_show("Lost X connection.");
-   ecore_main_loop_quit();
+   e_sys_action_do(E_SYS_EXIT, NULL);
+//   ecore_main_loop_quit();
 }
 
 static int

Log:
  dont use bg pixmap if compositing (or async rendering).
  
  
Author:       raster
Date:         2010-05-21 10:08:22 -0700 (Fri, 21 May 2010)
New Revision: 49108

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

Modified: trunk/e/src/bin/e_container.c
===================================================================
--- trunk/e/src/bin/e_container.c	2010-05-21 16:50:25 UTC (rev 49107)
+++ trunk/e/src/bin/e_container.c	2010-05-21 17:08:22 UTC (rev 49108)
@@ -91,10 +91,30 @@
    con->bg_evas = ecore_evas_get(con->bg_ecore_evas);
    ecore_evas_name_class_set(con->bg_ecore_evas, "E", "Background_Window");
    ecore_evas_title_set(con->bg_ecore_evas, "Enlightenment Background");
-   if (getenv("REDRAW_DEBUG"))
-     ecore_evas_avoid_damage_set(con->bg_ecore_evas, !atoi(getenv("REDRAW_DEBUG")));
-   else
-     ecore_evas_avoid_damage_set(con->bg_ecore_evas, ECORE_EVAS_AVOID_DAMAGE_BUILT_IN);
+   if (!getenv("EVAS_RENDER_MODE"))
+     {
+        int have_comp = 0;
+        Eina_List *l;
+        E_Config_Module *em;
+        
+        // FIXME: major hack. checking in advance for comp. eventully comp
+        // will be rolled into e17 core and this won't be needed
+        EINA_LIST_FOREACH(e_config->modules, l, em)
+          {
+             if (!strcmp(em->name, "comp"))
+               {
+                  have_comp = 1;
+                  break;
+               }
+          }
+        if (!have_comp)
+          {
+             if (getenv("REDRAW_DEBUG"))
+               ecore_evas_avoid_damage_set(con->bg_ecore_evas, !atoi(getenv("REDRAW_DEBUG")));
+             else
+               ecore_evas_avoid_damage_set(con->bg_ecore_evas, ECORE_EVAS_AVOID_DAMAGE_BUILT_IN);
+          }
+     }
    ecore_x_window_lower(con->bg_win);
 
    o = evas_object_rectangle_add(con->bg_evas);

Log:
  just nuke 1 line.
  
  
Author:       raster
Date:         2010-06-01 16:49:52 -0700 (Tue, 01 Jun 2010)
New Revision: 49386

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

Modified: trunk/e/src/bin/e_order.c
===================================================================
--- trunk/e/src/bin/e_order.c	2010-06-01 23:35:39 UTC (rev 49385)
+++ trunk/e/src/bin/e_order.c	2010-06-01 23:49:52 UTC (rev 49386)
@@ -211,9 +211,8 @@
 		    }
 		  if (len > 0)
 		    {
-		       Efreet_Desktop *desktop;
+		       Efreet_Desktop *desktop = NULL;
 		       
-		       desktop = NULL;
 		       if (buf[0] == '/')
 		         desktop = efreet_desktop_get(buf);
 		       if (!desktop)

Log:
  toolbar - be happy without icon
  
  
Author:       raster
Date:         2010-06-20 03:55:08 -0700 (Sun, 20 Jun 2010)
New Revision: 49767

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

Modified: trunk/e/src/bin/e_widget_toolbar.c
===================================================================
--- trunk/e/src/bin/e_widget_toolbar.c	2010-06-20 06:49:15 UTC (rev 49766)
+++ trunk/e/src/bin/e_widget_toolbar.c	2010-06-20 10:55:08 UTC (rev 49767)
@@ -158,7 +158,7 @@
    if (it)
      {
 	evas_object_del(it->o_base);
-	evas_object_del(it->o_icon);
+	if (it->o_icon) evas_object_del(it->o_icon);
 	wd->items = eina_list_remove(wd->items, it);
 	E_FREE(it);
      }
@@ -263,7 +263,7 @@
    EINA_LIST_FREE(wd->items, it)
      {
         evas_object_del(it->o_base);
-        evas_object_del(it->o_icon);
+        if (it->o_icon) evas_object_del(it->o_icon);
         E_FREE(it);
      }
 }
@@ -296,7 +296,7 @@
    EINA_LIST_FREE(wd->items, it)
      {
         evas_object_del(it->o_base);
-        evas_object_del(it->o_icon);
+        if (it->o_icon) evas_object_del(it->o_icon);
         E_FREE(it);
      }
    E_FREE(wd);
@@ -525,10 +525,13 @@
 {
    it->selected = EINA_TRUE;
    edje_object_signal_emit(it->o_base, "e,state,selected", "e");
-   if (strcmp(evas_object_type_get(it->o_icon), "e_icon"))
-     edje_object_signal_emit(it->o_icon, "e,state,selected", "e");
-   else
-     e_icon_selected_set(it->o_icon, EINA_TRUE);
+   if (it->o_icon)
+     {
+        if (strcmp(evas_object_type_get(it->o_icon), "e_icon"))
+          edje_object_signal_emit(it->o_icon, "e,state,selected", "e");
+        else
+          e_icon_selected_set(it->o_icon, EINA_TRUE);
+     }
    _item_show(it);
    if (it->func) it->func((void *)it->data1, (void *)it->data2);
 }
@@ -538,8 +541,11 @@
 {
    it->selected = EINA_FALSE;
    edje_object_signal_emit(it->o_base, "e,state,unselected", "e");
-   if (strcmp(evas_object_type_get(it->o_icon), "e_icon"))
-     edje_object_signal_emit(it->o_icon, "e,state,unselected", "e");
-   else
-     e_icon_selected_set(it->o_icon, EINA_FALSE);
+   if (it->o_icon)
+     {
+        if (strcmp(evas_object_type_get(it->o_icon), "e_icon"))
+          edje_object_signal_emit(it->o_icon, "e,state,unselected", "e");
+        else
+          e_icon_selected_set(it->o_icon, EINA_FALSE);
+     }
 }

Log:
  check here too
  
  
Author:       raster
Date:         2010-06-20 04:13:31 -0700 (Sun, 20 Jun 2010)
New Revision: 49768

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

Modified: trunk/e/src/bin/e_menu.c
===================================================================
--- trunk/e/src/bin/e_menu.c	2010-06-20 10:55:08 UTC (rev 49767)
+++ trunk/e/src/bin/e_menu.c	2010-06-20 11:13:31 UTC (rev 49768)
@@ -853,10 +853,13 @@
 	  edje_object_signal_emit(mi->toggle_object, "e,state,selected", "e");
 	if (mi->icon_key)
 	  {
-	     if (strcmp(evas_object_type_get(mi->icon_object), "e_icon"))
-	       edje_object_signal_emit(mi->icon_object, "e,state,selected", "e");
-	     else
-	       e_icon_selected_set(mi->icon_object, EINA_TRUE);
+             if (mi->icon_object)
+               {
+                  if (strcmp(evas_object_type_get(mi->icon_object), "e_icon"))
+                    edje_object_signal_emit(mi->icon_object, "e,state,selected", "e");
+                  else
+                    e_icon_selected_set(mi->icon_object, EINA_TRUE);
+               }
 	  }
 	edje_object_signal_emit(mi->menu->bg_object, "e,state,selected", "e");
 	_e_menu_submenu_activate(mi);
@@ -877,10 +880,13 @@
 	  edje_object_signal_emit(mi->toggle_object, "e,state,unselected", "e");
 	if (mi->icon_key)
 	  {
-	     if (strcmp(evas_object_type_get(mi->icon_object), "e_icon"))
-	       edje_object_signal_emit(mi->icon_object, "e,state,unselected", "e");
-	     else
-	       e_icon_selected_set(mi->icon_object, EINA_FALSE);
+             if (mi->icon_object)
+               {
+                  if (strcmp(evas_object_type_get(mi->icon_object), "e_icon"))
+                    edje_object_signal_emit(mi->icon_object, "e,state,unselected", "e");
+                  else
+                    e_icon_selected_set(mi->icon_object, EINA_FALSE);
+               }
 	  }
 	edje_object_signal_emit(mi->menu->bg_object, "e,state,unselected", "e");
 	_e_menu_submenu_deactivate(mi);

Log:
  edge -> no ev. dont seg
  
  
Author:       raster
Date:         2010-06-27 01:35:59 -0700 (Sun, 27 Jun 2010)
New Revision: 49884

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

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2010-06-27 08:25:58 UTC (rev 49883)
+++ trunk/e/src/bin/e_actions.c	2010-06-27 08:35:59 UTC (rev 49884)
@@ -1213,7 +1213,8 @@
    E_Desk *current = NULL;
    E_Event_Pointer_Warp *wev;
    int x, y, offset = 25;
-
+   
+   if (!ev) return; // with flip on _e_zone_cb_edge_timer we don't have ev!!!
    zone = _e_actions_zone_get(obj);
    wev = E_NEW(E_Event_Pointer_Warp, 1);
    if ((!wev) || (!zone)) return;
@@ -1225,9 +1226,9 @@
 	if (sscanf(params, "%i", &offset) != 1)
 	  offset = 25;
      }
-   switch(ev->edge)
+   switch (ev->edge)
      {
-      case E_ZONE_EDGE_LEFT:
+     case E_ZONE_EDGE_LEFT:
 	if (ACT_FLIP_LEFT(zone))
 	  {
 	     e_zone_desk_flip_by(zone, -1, 0);
@@ -1235,26 +1236,26 @@
 	     wev->curr.y = y;
 	     wev->curr.x = zone->w - offset;
 	  }
-	 break;
-      case E_ZONE_EDGE_RIGHT:
-	 if (ACT_FLIP_RIGHT(zone))
-	   {
-	      e_zone_desk_flip_by(zone, 1, 0);
-	      ecore_x_pointer_warp(zone->container->win, offset, y);
-	      wev->curr.y = y;
-	      wev->curr.x = offset;
-	   }
-	 break;
-      case E_ZONE_EDGE_TOP:
-	 if (ACT_FLIP_UP(zone))
-	   {
-	      e_zone_desk_flip_by(zone, 0, -1);
-	      ecore_x_pointer_warp(zone->container->win, x, zone->h - offset);
-	      wev->curr.x = x;
-	      wev->curr.y = zone->h - offset;
-	   }
-	 break;
-      case E_ZONE_EDGE_BOTTOM:
+        break;
+     case E_ZONE_EDGE_RIGHT:
+        if (ACT_FLIP_RIGHT(zone))
+          {
+             e_zone_desk_flip_by(zone, 1, 0);
+             ecore_x_pointer_warp(zone->container->win, offset, y);
+             wev->curr.y = y;
+             wev->curr.x = offset;
+          }
+        break;
+     case E_ZONE_EDGE_TOP:
+        if (ACT_FLIP_UP(zone))
+          {
+             e_zone_desk_flip_by(zone, 0, -1);
+             ecore_x_pointer_warp(zone->container->win, x, zone->h - offset);
+             wev->curr.x = x;
+             wev->curr.y = zone->h - offset;
+          }
+        break;
+     case E_ZONE_EDGE_BOTTOM:
 	if (ACT_FLIP_DOWN(zone))
 	  {
 	     e_zone_desk_flip_by(zone, 0, 1);
@@ -1262,26 +1263,26 @@
 	     wev->curr.x = x;
 	     wev->curr.y = offset;
 	  }
-	 break;
-      case E_ZONE_EDGE_TOP_LEFT:
-	 if (ACT_FLIP_UP_LEFT(zone))
-	   {
-	      e_zone_desk_flip_by(zone, -1, -1);
-	      ecore_x_pointer_warp(zone->container->win, zone->w - offset, zone->h - offset);
-	      wev->curr.x = zone->w - offset;
-	      wev->curr.y = zone->h - offset;
-	   }
-	 break;
-      case E_ZONE_EDGE_TOP_RIGHT:
-	 if (ACT_FLIP_UP_RIGHT(zone))
-	   {
-	      e_zone_desk_flip_by(zone, 1, -1);
-	      ecore_x_pointer_warp(zone->container->win, offset, zone->h - offset);
-	      wev->curr.x = offset;
-	      wev->curr.y = zone->h - offset;
-	   }
-	 break;
-      case E_ZONE_EDGE_BOTTOM_LEFT:
+        break;
+     case E_ZONE_EDGE_TOP_LEFT:
+        if (ACT_FLIP_UP_LEFT(zone))
+          {
+             e_zone_desk_flip_by(zone, -1, -1);
+             ecore_x_pointer_warp(zone->container->win, zone->w - offset, zone->h - offset);
+             wev->curr.x = zone->w - offset;
+             wev->curr.y = zone->h - offset;
+          }
+        break;
+     case E_ZONE_EDGE_TOP_RIGHT:
+        if (ACT_FLIP_UP_RIGHT(zone))
+          {
+             e_zone_desk_flip_by(zone, 1, -1);
+             ecore_x_pointer_warp(zone->container->win, offset, zone->h - offset);
+             wev->curr.x = offset;
+             wev->curr.y = zone->h - offset;
+          }
+        break;
+     case E_ZONE_EDGE_BOTTOM_LEFT:
 	if (ACT_FLIP_DOWN_LEFT(zone))
 	  {
 	     e_zone_desk_flip_by(zone, -1, 1);
@@ -1289,8 +1290,8 @@
 	     wev->curr.y = offset;
 	     wev->curr.x = zone->w - offset;
 	  }
-	 break;
-      case E_ZONE_EDGE_BOTTOM_RIGHT:
+        break;
+     case E_ZONE_EDGE_BOTTOM_RIGHT:
 	if (ACT_FLIP_DOWN_RIGHT(zone))
 	  {
 	     e_zone_desk_flip_by(zone, 1, 1);
@@ -1298,11 +1299,11 @@
 	     wev->curr.y = offset;
 	     wev->curr.x = offset;
 	  }
-	 break;
-      default:
-	 break;
+        break;
+     default:
+        break;
      }
-
+   
    current = e_desk_current_get(zone);
    if (current)
      ecore_event_add(E_EVENT_POINTER_WARP, wev, NULL, NULL);
@@ -2266,12 +2267,14 @@
 {
    Eina_List *l;
    E_Shelf *es;
-
+   
    if (params)
      {
 	for (; *params != '\0'; params++)
-	  if (!isspace(*params))
-	    break;
+          {
+             if (!isspace(*params))
+               break;
+          }
 	if (*params == '\0')
 	  params = NULL;
      }
@@ -2280,36 +2283,36 @@
      {
 	switch(ev->edge)
 	  {
-	   case E_ZONE_EDGE_LEFT:
-	      if ((es->gadcon->orient == E_GADCON_ORIENT_LEFT ||
-		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_LT ||
-		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_LB) &&
-		  (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
-		ACT_SHELF_SHOW(params, es);
-	      break;
-	   case E_ZONE_EDGE_RIGHT:
-	      if ((es->gadcon->orient == E_GADCON_ORIENT_RIGHT ||
-		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_RT ||
-		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_RB) &&
-		  (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
-		ACT_SHELF_SHOW(params, es);
-	      break;
-	   case E_ZONE_EDGE_TOP:
-	      if ((es->gadcon->orient == E_GADCON_ORIENT_TOP ||
-		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_TL ||
-		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_TR) &&
-		  (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
-		ACT_SHELF_SHOW(params, es);
-	      break;
-	   case E_ZONE_EDGE_BOTTOM:
-	      if ((es->gadcon->orient == E_GADCON_ORIENT_BOTTOM ||
-		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_BL ||
-		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_BR) &&
-		  (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
-		ACT_SHELF_SHOW(params, es);
-	      break;
-	   default:
-	      break;
+          case E_ZONE_EDGE_LEFT:
+             if ((es->gadcon->orient == E_GADCON_ORIENT_LEFT ||
+                  es->gadcon->orient == E_GADCON_ORIENT_CORNER_LT ||
+                  es->gadcon->orient == E_GADCON_ORIENT_CORNER_LB) &&
+                 (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
+               ACT_SHELF_SHOW(params, es);
+             break;
+          case E_ZONE_EDGE_RIGHT:
+             if ((es->gadcon->orient == E_GADCON_ORIENT_RIGHT ||
+                  es->gadcon->orient == E_GADCON_ORIENT_CORNER_RT ||
+                  es->gadcon->orient == E_GADCON_ORIENT_CORNER_RB) &&
+                 (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
+               ACT_SHELF_SHOW(params, es);
+             break;
+          case E_ZONE_EDGE_TOP:
+             if ((es->gadcon->orient == E_GADCON_ORIENT_TOP ||
+                  es->gadcon->orient == E_GADCON_ORIENT_CORNER_TL ||
+                  es->gadcon->orient == E_GADCON_ORIENT_CORNER_TR) &&
+                 (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
+               ACT_SHELF_SHOW(params, es);
+             break;
+          case E_ZONE_EDGE_BOTTOM:
+             if ((es->gadcon->orient == E_GADCON_ORIENT_BOTTOM ||
+                  es->gadcon->orient == E_GADCON_ORIENT_CORNER_BL ||
+                  es->gadcon->orient == E_GADCON_ORIENT_CORNER_BR) &&
+                 (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
+               ACT_SHELF_SHOW(params, es);
+             break;
+          default:
+             break;
 	  }
      }
 }

Log:
  some more of dso fix
  
  
Author:       raster
Date:         2010-07-11 17:16:16 -0700 (Sun, 11 Jul 2010)
New Revision: 50188

Modified:
  trunk/e/src/bin/Makefile.am 

Modified: trunk/e/src/bin/Makefile.am
===================================================================
--- trunk/e/src/bin/Makefile.am	2010-07-12 00:12:17 UTC (rev 50187)
+++ trunk/e/src/bin/Makefile.am	2010-07-12 00:16:16 UTC (rev 50188)
@@ -322,7 +322,6 @@
 e_intl_data.c \
 e_config_data.c \
 e_imc_main.c
-# $(enlightenment_src)
 
 enlightenment_imc_LDADD = @E_IMC_LIBS@

Log:
  should set stacking in db struct too after stacking req
  
  
Author:       raster
Date:         2010-07-13 05:25:20 -0700 (Tue, 13 Jul 2010)
New Revision: 50217

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

Modified: trunk/e/src/bin/e_hints.c
===================================================================
--- trunk/e/src/bin/e_hints.c	2010-07-13 12:08:22 UTC (rev 50216)
+++ trunk/e/src/bin/e_hints.c	2010-07-13 12:25:20 UTC (rev 50217)
@@ -904,16 +904,24 @@
 	 switch (action)
 	   {
 	    case ECORE_X_WINDOW_STATE_ACTION_REMOVE:
-	       e_border_layer_set(bd, 100);
-	       break;
+              e_border_layer_set(bd, 100);
+              e_hints_window_stacking_set(bd, E_STACKING_NONE);
+              break;
 	    case ECORE_X_WINDOW_STATE_ACTION_ADD:
-	       e_border_layer_set(bd, 150);
+              e_hints_window_stacking_set(bd, E_STACKING_ABOVE);
+              e_border_layer_set(bd, 150);
 	       break;
 	    case ECORE_X_WINDOW_STATE_ACTION_TOGGLE:
-	       if (bd->layer == 150)
-		 e_border_layer_set(bd, 100);
-	       else
-		 e_border_layer_set(bd, 150);
+              if (bd->layer == 150)
+                {
+                   e_hints_window_stacking_set(bd, E_STACKING_NONE);
+                   e_border_layer_set(bd, 100);
+                }
+              else
+                {
+                   e_hints_window_stacking_set(bd, E_STACKING_ABOVE);
+                   e_border_layer_set(bd, 150);
+                }
 	       break;
 	   }
 	 break;
@@ -924,17 +932,25 @@
 	 switch (action)
 	   {
 	    case ECORE_X_WINDOW_STATE_ACTION_REMOVE:
-	       e_border_layer_set(bd, 100);
-	       break;
+              e_hints_window_stacking_set(bd, E_STACKING_NONE);
+              e_border_layer_set(bd, 100);
+              break;
 	    case ECORE_X_WINDOW_STATE_ACTION_ADD:
-	       e_border_layer_set(bd, 50);
-	       break;
+              e_hints_window_stacking_set(bd, E_STACKING_BELOW);
+              e_border_layer_set(bd, 50);
+              break;
 	    case ECORE_X_WINDOW_STATE_ACTION_TOGGLE:
-	       if (bd->layer == 50)
-		 e_border_layer_set(bd, 100);
-	       else
-		 e_border_layer_set(bd, 50);
-	       break;
+              if (bd->layer == 50)
+                {
+                   e_hints_window_stacking_set(bd, E_STACKING_NONE);
+                   e_border_layer_set(bd, 100);
+                }
+              else
+                {
+                   e_hints_window_stacking_set(bd, E_STACKING_BELOW);
+                   e_border_layer_set(bd, 50);
+                }
+              break;
 	   }
 	 break;
       case ECORE_X_WINDOW_STATE_DEMANDS_ATTENTION:

Log:
  ---------------------------+------------------------------------------------
   Reporter:  ruben          |       Owner:  raster            
   Type:  Bug                |      Status:  new               
   Priority:  Major          |   Milestone:  Enlightenment 0.17
   Component:  enlightenment |    Keywords:  dpms, fullscreen  
   Blocking:                 |   Blockedby:                    
  ---------------------------+------------------------------------------------
          
  patch - Close Ticket #562
  
  
Author:       raster
Date:         2010-07-13 16:56:47 -0700 (Tue, 13 Jul 2010)
New Revision: 50240

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

Modified: trunk/e/src/bin/e_dpms.c
===================================================================
--- trunk/e/src/bin/e_dpms.c	2010-07-13 23:36:32 UTC (rev 50239)
+++ trunk/e/src/bin/e_dpms.c	2010-07-13 23:56:47 UTC (rev 50240)
@@ -6,6 +6,7 @@
 static Ecore_Event_Handler *_e_dpms_handler_config_mode = NULL;
 static Ecore_Event_Handler *_e_dpms_handler_border_fullscreen = NULL;
 static Ecore_Event_Handler *_e_dpms_handler_border_unfullscreen = NULL;
+static Ecore_Event_Handler *_e_dpms_handler_border_remove = NULL;
 static int _e_dpms_fullscreen_count = 0;
 
 static Eina_Bool
@@ -19,6 +20,7 @@
 _e_dpms_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    _e_dpms_fullscreen_count++;
+printf("incremented fs_count: %d\n", _e_dpms_fullscreen_count); 
    if (_e_dpms_fullscreen_count == 1) e_dpms_init();
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -27,17 +29,33 @@
 _e_dpms_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    _e_dpms_fullscreen_count--;
+printf("decremented fs_count: %d\n", _e_dpms_fullscreen_count); 
    if (_e_dpms_fullscreen_count == 0) e_dpms_init();
    else if (_e_dpms_fullscreen_count < 0) _e_dpms_fullscreen_count = 0;
    return ECORE_CALLBACK_PASS_ON;
 }
 
+static Eina_Bool
+_e_dpms_handler_border_remove_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   E_Event_Border_Remove *ev = event;
+
+   if (ev->border->fullscreen) {
+      _e_dpms_fullscreen_count--;
+printf("decremented fs_count from remove: %d\n", _e_dpms_fullscreen_count); 
+      if (_e_dpms_fullscreen_count == 0) e_dpms_init();
+      else if (_e_dpms_fullscreen_count < 0) _e_dpms_fullscreen_count = 0;
+                               }
+   return ECORE_CALLBACK_PASS_ON;
+}
+
 EAPI int
 e_dpms_init(void)
 {
    int standby=0, suspend=0, off=0;
    int enabled = ((e_config->dpms_enable) && (!e_config->mode.presentation) &&
 		  (_e_dpms_fullscreen_count <= 0));
+printf("checking fs_count and if enabled: %d, %d\n", _e_dpms_fullscreen_count, enabled); 
 
    if (!_e_dpms_handler_config_mode)
      _e_dpms_handler_config_mode = ecore_event_handler_add
@@ -51,6 +69,10 @@
      _e_dpms_handler_border_unfullscreen = ecore_event_handler_add
        (E_EVENT_BORDER_UNFULLSCREEN, _e_dpms_handler_border_unfullscreen_cb, NULL);
 
+   if (!_e_dpms_handler_border_remove)
+     _e_dpms_handler_border_remove = ecore_event_handler_add
+       (E_EVENT_BORDER_REMOVE, _e_dpms_handler_border_remove_cb, NULL);
+
    ecore_x_dpms_enabled_set(enabled);
    if (!enabled)
      return 1;

Log:
  fix shelf add to add to right zone.
  
  
Author:       raster
Date:         2010-08-03 18:25:57 -0700 (Tue, 03 Aug 2010)
New Revision: 50795

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

Modified: trunk/e/src/bin/e_int_menus.c
===================================================================
--- trunk/e/src/bin/e_int_menus.c	2010-08-04 01:09:08 UTC (rev 50794)
+++ trunk/e/src/bin/e_int_menus.c	2010-08-04 01:25:57 UTC (rev 50795)
@@ -1512,7 +1512,7 @@
    cs = E_NEW(E_Config_Shelf, 1);
    cs->name = eina_stringshare_add("shelf");
    cs->container = con->num;
-   cs->zone = zone->num;
+   cs->zone = zone->id;
    cs->popup = 1;
    cs->layer = 200;
    cs->orient = E_GADCON_ORIENT_CORNER_BR;

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2010-08-04 01:09:08 UTC (rev 50794)
+++ trunk/e/src/bin/e_shelf.c	2010-08-04 01:25:57 UTC (rev 50795)
@@ -78,7 +78,7 @@
 
 	if (cf_es->id <= 0) cf_es->id = id + 1;
 	zone = e_util_container_zone_id_get(cf_es->container, cf_es->zone);
-	if (zone) 
+	if (zone)
 	  e_shelf_config_new(zone, cf_es);
 	id = cf_es->id;
      }

Log:
  warning--
  
  
Author:       raster
Date:         2010-08-16 03:40:23 -0700 (Mon, 16 Aug 2010)
New Revision: 51199

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

Modified: trunk/e/src/bin/e_randr.c
===================================================================
--- trunk/e/src/bin/e_randr.c	2010-08-16 10:33:17 UTC (rev 51198)
+++ trunk/e/src/bin/e_randr.c	2010-08-16 10:40:23 UTC (rev 51199)
@@ -4,7 +4,6 @@
 #include "e.h"
 #include <stdio.h>
 #include <Ecore.h>
-#include "e_randr.h"
 
 #define ECORE_X_RANDR_1_1 ((1 << 16) | 1)
 #define ECORE_X_RANDR_1_2 ((1 << 16) | 2)
@@ -1121,7 +1120,7 @@
 
    if (!outputs_info || !(ret = malloc(sizeof(Ecore_X_Randr_Output) * eina_list_count(outputs_info)))) return NULL;
    EINA_LIST_FOREACH(outputs_info, output_iter, output_info)
-     ret[i++] = output_info ? output_info->xid : NULL;
+     ret[i++] = output_info ? output_info->xid : 0;
    return ret;
 }

Log:
  dont need randr for that! well not if it needs all of e's config!
  
  
Author:       raster
Date:         2010-08-16 05:50:32 -0700 (Mon, 16 Aug 2010)
New Revision: 51207

Modified:
  trunk/e/src/bin/Makefile.am 

Modified: trunk/e/src/bin/Makefile.am
===================================================================
--- trunk/e/src/bin/Makefile.am	2010-08-16 12:47:44 UTC (rev 51206)
+++ trunk/e/src/bin/Makefile.am	2010-08-16 12:50:32 UTC (rev 51207)
@@ -360,8 +360,7 @@
 
 enlightenment_init_SOURCES = \
 e_init_main.c \
-e_xinerama.c \
-e_randr.c
+e_xinerama.c
 
 enlightenment_init_LDADD = @E_INIT_LIBS@

Log:
  simply breaking some long lines for readability.
  
  
Author:       raster
Date:         2010-08-20 18:48:19 -0700 (Fri, 20 Aug 2010)
New Revision: 51473

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

Modified: trunk/e/src/bin/e_randr.c
===================================================================
--- trunk/e/src/bin/e_randr.c	2010-08-21 01:18:47 UTC (rev 51472)
+++ trunk/e/src/bin/e_randr.c	2010-08-21 01:48:19 UTC (rev 51473)
@@ -301,7 +301,7 @@
 _e_randr_screen_info_11_set(void)
 {
    E_RANDR_NO_11_RET(EINA_FALSE);
-
+   
    E_Randr_Screen_Info_11 *screen_info_11 = e_randr_screen_info->rrvd_info.randr_info_11;
    Ecore_X_Randr_Screen_Size_MM *sizes = NULL;
    Ecore_X_Randr_Refresh_Rate *rates = NULL;
@@ -309,24 +309,28 @@
    int i, nsizes, nrates;
 
    if (!(sizes = ecore_x_randr_screen_primary_output_sizes_get(e_randr_screen_info->root, &nsizes))) 
-     return EINA_FALSE;
+      return EINA_FALSE;
    for (i = 0; i < nsizes; i++)
-     if (!(screen_info_11->sizes = eina_list_append(screen_info_11->sizes, &sizes[i]))) goto _e_randr_screen_info_11_fill_fail_sizes;
+      if (!(screen_info_11->sizes = eina_list_append(screen_info_11->sizes, &sizes[i])))
+         goto _e_randr_screen_info_11_fill_fail_sizes;
    ecore_x_randr_screen_primary_output_current_size_get(e_randr_screen_info->root, NULL, NULL, NULL, NULL, &(screen_info_11->csize_index));
    screen_info_11->corientation = ecore_x_randr_screen_primary_output_orientation_get(e_randr_screen_info->root);
    screen_info_11->orientations = ecore_x_randr_screen_primary_output_orientations_get(e_randr_screen_info->root);
    for (i = 0; i < nsizes; i++)
      {
         rates_list = NULL;
-        if (!(rates = ecore_x_randr_screen_primary_output_refresh_rates_get(e_randr_screen_info->root, i, &nrates))) return EINA_FALSE;
+        if (!(rates = ecore_x_randr_screen_primary_output_refresh_rates_get(e_randr_screen_info->root, i, &nrates)))
+           return EINA_FALSE;
         for (i = 0; i < nrates; i++)
-          if (!(rates_list = eina_list_append(rates_list, &rates[i]))) goto _e_randr_screen_info_11_fill_fail_rates_list;
-        if (!(screen_info_11->rates = eina_list_append(screen_info_11->rates, rates_list))) goto _e_randr_screen_info_11_fill_fail_rates;
+           if (!(rates_list = eina_list_append(rates_list, &rates[i])))
+              goto _e_randr_screen_info_11_fill_fail_rates_list;
+        if (!(screen_info_11->rates = eina_list_append(screen_info_11->rates, rates_list)))
+           goto _e_randr_screen_info_11_fill_fail_rates;
      }
    screen_info_11->current_rate = ecore_x_randr_screen_primary_output_current_refresh_rate_get(e_randr_screen_info->root);
-
+   
    return EINA_TRUE;
-
+   
 _e_randr_screen_info_11_fill_fail_rates_list:
    eina_list_free(rates_list);
 _e_randr_screen_info_11_fill_fail_rates:

Log:
  j++!!!!
  
  
Author:       raster
Date:         2010-08-20 18:52:20 -0700 (Fri, 20 Aug 2010)
New Revision: 51474

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

Modified: trunk/e/src/bin/e_randr.c
===================================================================
--- trunk/e/src/bin/e_randr.c	2010-08-21 01:48:19 UTC (rev 51473)
+++ trunk/e/src/bin/e_randr.c	2010-08-21 01:52:20 UTC (rev 51474)
@@ -306,7 +306,7 @@
    Ecore_X_Randr_Screen_Size_MM *sizes = NULL;
    Ecore_X_Randr_Refresh_Rate *rates = NULL;
    Eina_List *rates_list;
-   int i, nsizes, nrates;
+   int i, j, nsizes, nrates;
 
    if (!(sizes = ecore_x_randr_screen_primary_output_sizes_get(e_randr_screen_info->root, &nsizes))) 
       return EINA_FALSE;
@@ -321,8 +321,8 @@
         rates_list = NULL;
         if (!(rates = ecore_x_randr_screen_primary_output_refresh_rates_get(e_randr_screen_info->root, i, &nrates)))
            return EINA_FALSE;
-        for (i = 0; i < nrates; i++)
-           if (!(rates_list = eina_list_append(rates_list, &rates[i])))
+        for (j = 0; j < nrates; j++)
+           if (!(rates_list = eina_list_append(rates_list, &rates[j])))
               goto _e_randr_screen_info_11_fill_fail_rates_list;
         if (!(screen_info_11->rates = eina_list_append(screen_info_11->rates, rates_list)))
            goto _e_randr_screen_info_11_fill_fail_rates;

Log:
  disable union for randr config... THIS is causing problems... big time.
  
  
Author:       raster
Date:         2010-08-20 19:51:54 -0700 (Fri, 20 Aug 2010)
New Revision: 51477

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2010-08-21 02:37:55 UTC (rev 51476)
+++ trunk/e/src/bin/e_config.c	2010-08-21 02:51:54 UTC (rev 51477)
@@ -587,7 +587,7 @@
    EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_11", edd_11_info);
    EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_12", edd_12_info);
    EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_13", edd_12_info);
-   EET_DATA_DESCRIPTOR_ADD_UNION(D, T, "E_Randr_Screen_Restore_Info_Union", rrvd_restore_info, randr_version, unified);
+//   EET_DATA_DESCRIPTOR_ADD_UNION(D, T, "E_Randr_Screen_Restore_Info_Union", rrvd_restore_info, randr_version, unified);
    E_CONFIG_VAL(D, T, randr_version, INT);
 
    _e_config_edd = E_CONFIG_DD_NEW("E_Config", E_Config);

Log:
  notes.
  
  
Author:       raster
Date:         2010-08-20 20:27:21 -0700 (Fri, 20 Aug 2010)
New Revision: 51478

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2010-08-21 02:51:54 UTC (rev 51477)
+++ trunk/e/src/bin/e_config.c	2010-08-21 03:27:21 UTC (rev 51478)
@@ -540,6 +540,9 @@
    E_CONFIG_VAL(D, T, w, INT);
    E_CONFIG_VAL(D, T, h, INT);
 
+   // FIXME: need to totally re-do this randr config stuff - remove the
+   // union stuff. do this differently to not use unions really. not
+   // intended for how it is used here really.
     _e_config_screen_output_restore_info_edd = E_CONFIG_DD_NEW("E_Randr_Output_Restore_Info", Eina_Rectangle);
 #undef T
 #undef D
@@ -587,6 +590,7 @@
    EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_11", edd_11_info);
    EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_12", edd_12_info);
    EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_13", edd_12_info);
+// DISABLE! crashie crashie long time   
 //   EET_DATA_DESCRIPTOR_ADD_UNION(D, T, "E_Randr_Screen_Restore_Info_Union", rrvd_restore_info, randr_version, unified);
    E_CONFIG_VAL(D, T, randr_version, INT);

Log:
  From: Leif Middelschulte <leif.middelschulte@...>
  
  this is a little patch for e_randr related stuff.
  
  - replace the saving of a monitor's EDID with a hash of it.
  - rename a variable name
  
  
Author:       raster
Date:         2010-08-21 20:49:34 -0700 (Sat, 21 Aug 2010)
New Revision: 51508

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2010-08-22 02:32:47 UTC (rev 51507)
+++ trunk/e/src/bin/e_config.c	2010-08-22 03:49:34 UTC (rev 51508)
@@ -70,6 +70,7 @@
 static E_Config_DD *_e_config_screen_info_edd = NULL;
 static E_Config_DD *_e_config_screen_restore_info_11_edd = NULL;
 static E_Config_DD *_e_config_screen_restore_info_12_edd = NULL;
+static E_Config_DD *_e_config_screen_output_edid_hash_edd = NULL;
 static E_Config_DD *_e_config_screen_output_restore_info_edd = NULL;
 static E_Config_DD *_e_config_screen_crtc_restore_info_edd = NULL;
 
@@ -540,15 +541,22 @@
    E_CONFIG_VAL(D, T, w, INT);
    E_CONFIG_VAL(D, T, h, INT);
 
+      _e_config_screen_output_edid_hash_edd = E_CONFIG_DD_NEW("E_Randr_Output_Edid_Hash", E_Randr_Output_Edid_Hash);
+#undef T
+#undef D
+#define T E_Randr_Output_Edid_Hash
+#define D _e_config_screen_output_edid_hash_edd
+   E_CONFIG_VAL(D, T, hash, INT);
+
    // FIXME: need to totally re-do this randr config stuff - remove the
    // union stuff. do this differently to not use unions really. not
    // intended for how it is used here really.
-    _e_config_screen_output_restore_info_edd = E_CONFIG_DD_NEW("E_Randr_Output_Restore_Info", Eina_Rectangle);
+    _e_config_screen_output_restore_info_edd = E_CONFIG_DD_NEW("E_Randr_Output_Restore_Info", E_Randr_Output_Restore_Info);
 #undef T
 #undef D
 #define T E_Randr_Output_Restore_Info
 #define D _e_config_screen_output_restore_info_edd
-   E_CONFIG_VAL(D, T, edid, STR);
+   E_CONFIG_SUB(D, T, edid_hash, _e_config_screen_output_edid_hash_edd);
    E_CONFIG_VAL(D, T, backlight_level, DOUBLE);
 
   _e_config_screen_crtc_restore_info_edd = E_CONFIG_DD_NEW("E_Randr_Crtc_Restore_Info", E_Randr_Crtc_Restore_Info);
@@ -566,6 +574,8 @@
 #define T E_Randr_Screen_Restore_Info_12
 #define D _e_config_screen_restore_info_12_edd
    E_CONFIG_LIST(D, T, crtcs, _e_config_screen_crtc_restore_info_edd);
+   E_CONFIG_LIST(D, T, outputs_edid_hashes, _e_config_screen_output_edid_hash_edd);
+   E_CONFIG_VAL(D, T, noutputs, INT);
    E_CONFIG_VAL(D, T, output_policy, INT);
    E_CONFIG_VAL(D, T, alignment, INT);
 

Modified: trunk/e/src/bin/e_config.h
===================================================================
--- trunk/e/src/bin/e_config.h	2010-08-22 02:32:47 UTC (rev 51507)
+++ trunk/e/src/bin/e_config.h	2010-08-22 03:49:34 UTC (rev 51508)
@@ -32,7 +32,7 @@
 /* increment this whenever a new set of config values are added but the users
  * config doesn't need to be wiped - simply new values need to be put in
  */
-#define E_CONFIG_FILE_GENERATION 0x0140
+#define E_CONFIG_FILE_GENERATION 0x0141
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
 
 #define E_EVAS_ENGINE_DEFAULT         0

Modified: trunk/e/src/bin/e_randr.c
===================================================================
--- trunk/e/src/bin/e_randr.c	2010-08-22 02:32:47 UTC (rev 51507)
+++ trunk/e/src/bin/e_randr.c	2010-08-22 03:49:34 UTC (rev 51508)
@@ -447,7 +447,7 @@
         .possible_crtcs = NULL,
         .preferred_modes = NULL,
         .max_backlight = Ecore_X_Randr_Unset,
-        .current_backlight = Ecore_X_Randr_Unset,
+        .backlight_level = 0.0,
         .edid = NULL,
         .edid_length = 0,
         .size_mm = {Ecore_X_Randr_Unset, Ecore_X_Randr_Unset},
@@ -1058,7 +1058,8 @@
 
    EINA_LIST_FOREACH(e_config->screen_info, cfg_screen_restore_info_iter, screen_restore_info)
      {
-	if (!screen_restore_info) continue ;
+        /* 'screen_restore_info' should _never_ be NULL, since this functions shouldn't be called due to randr init failing. */
+	if (!screen_restore_info) continue;
         if (screen_restore_info->randr_version != ECORE_X_RANDR_1_1) continue;
         restore_info_11 = screen_restore_info->rrvd_restore_info.restore_info_11;
         if((sizes = ecore_x_randr_screen_primary_output_sizes_get(e_randr_screen_info->root, &nsizes)))
@@ -1135,7 +1136,8 @@
 
    if (!outputs_info || !(ret = malloc(sizeof(Ecore_X_Randr_Output) * eina_list_count(outputs_info)))) return NULL;
    EINA_LIST_FOREACH(outputs_info, output_iter, output_info)
-     ret[i++] = output_info ? output_info->xid : 0;
+     /* output_info == NULL should _not_ be possible! */
+     ret[i++] = output_info ? output_info->xid : Ecore_X_Randr_None;
    return ret;
 }
 

Modified: trunk/e/src/bin/e_randr.h
===================================================================
--- trunk/e/src/bin/e_randr.h	2010-08-22 02:32:47 UTC (rev 51507)
+++ trunk/e/src/bin/e_randr.h	2010-08-22 03:49:34 UTC (rev 51508)
@@ -6,6 +6,7 @@
 typedef struct _E_Randr_Screen_Info_12 E_Randr_Screen_Info_12;
 typedef union _E_Randr_Screen_RRVD_Info E_Randr_Screen_RRVD_Info;
 typedef struct _E_Randr_Screen_Info E_Randr_Screen_Info;
+typedef struct _E_Randr_Output_Edid_Hash E_Randr_Output_Edid_Hash;
 typedef struct _E_Randr_Output_Restore_Info E_Randr_Output_Restore_Info;
 typedef struct _E_Randr_Crtc_Restore_Info E_Randr_Crtc_Restore_Info;
 typedef struct _E_Randr_Screen_Restore_Info_11 E_Randr_Screen_Restore_Info_11;
@@ -56,12 +57,12 @@
    unsigned char *edid;
    unsigned long edid_length;
    int max_backlight;
-   double current_backlight;
+   double backlight_level;
    Ecore_X_Render_Subpixel_Order subpixel_order;
    Eina_List *compatible_outputs;
 };
 
-struct _E_Randr_Screen_Info_11 
+struct _E_Randr_Screen_Info_11
 {
    //List of Ecore_X_Randr_Screen_Size_MM*
    Eina_List *sizes;
@@ -101,13 +102,17 @@
 };
 
 //Following stuff is just for configuration purposes
-struct _E_Randr_Output_Restore_Info 
+struct _E_Randr_Output_Edid_Hash {
+   int hash;
+};
+
+struct _E_Randr_Output_Restore_Info
 {
-   const char *edid;
+   E_Randr_Output_Edid_Hash edid_hash;
    double backlight_level;
 };
 
-struct _E_Randr_Crtc_Restore_Info 
+struct _E_Randr_Crtc_Restore_Info
 {
    Eina_Rectangle geometry;
    Ecore_X_Randr_Orientation orientation;
@@ -124,6 +129,8 @@
 
 struct _E_Randr_Screen_Restore_Info_12 
 {
+   Eina_List *outputs_edid_hashes;
+   int noutputs;
    Eina_List *crtcs;
    Ecore_X_Randr_Output_Policy output_policy;
    Ecore_X_Randr_Relative_Alignment alignment;

Log:
  be a bit nicer in auto desktop creation from bd
  
  
Author:       raster
Date:         2010-08-26 05:14:38 -0700 (Thu, 26 Aug 2010)
New Revision: 51657

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-08-26 11:45:45 UTC (rev 51656)
+++ trunk/e/src/bin/e_eap_editor.c	2010-08-26 12:14:38 UTC (rev 51657)
@@ -66,14 +66,15 @@
 {
    Efreet_Desktop *desktop = NULL;
    const char *desktop_dir, *icon_dir;
-   const char *bname, *bclass;
+   const char *bname, *bclass, *btitle;
    char path[PATH_MAX];
 
    bname = bd->client.icccm.name;
    if ((bname) && (bname[0] == 0)) bname = NULL;
    bclass = bd->client.icccm.class;
    if ((bclass) && (bclass[0] == 0)) bclass = NULL;
-
+   btitle = e_border_name_get(bd);
+   
    desktop_dir = e_user_desktop_dir_get();
 
    if ((!desktop_dir) || (!e_util_dir_check(desktop_dir))) return NULL;
@@ -114,6 +115,11 @@
 	return NULL;
      }
    if (bclass) desktop->name = strdup(bclass);
+   else if (bname) desktop->name = strdup(bname);
+   else if (btitle) desktop->name = strdup(btitle);
+   
+   if (btitle) desktop->comment = strdup(btitle);
+   
    if (bclass) desktop->startup_wm_class = strdup(bclass);
    if (bd->client.icccm.command.argc > 0)
      // FIXME this should concat the entire argv array together
@@ -121,7 +127,8 @@
    else if (bname)
      desktop->exec = strdup(bname); 
 
-   if (bd->client.netwm.startup_id > 0) desktop->startup_notify = 1;
+// disable this   
+//   if (bd->client.netwm.startup_id > 0) desktop->startup_notify = 1;
    if (bd->client.netwm.icons)
      {
 	/* FIXME

Log:
  bah! brokne inst matching.. e literally lost all inst's! fixed.
  
  
Author:       raster
Date:         2010-09-07 01:53:34 -0700 (Tue, 07 Sep 2010)
New Revision: 51936

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

Modified: trunk/e/src/bin/e_exec.c
===================================================================
--- trunk/e/src/bin/e_exec.c	2010-09-07 06:56:16 UTC (rev 51935)
+++ trunk/e/src/bin/e_exec.c	2010-09-07 08:53:34 UTC (rev 51936)
@@ -239,7 +239,7 @@
 
    if (desktop)
      {
-	Eina_List *l;
+	Eina_List *l, *lnew;
 
 	efreet_desktop_ref(desktop);
 	inst->desktop = desktop;
@@ -249,13 +249,12 @@
 	inst->launch_time = ecore_time_get();
 	inst->expire_timer = ecore_timer_add(e_config->exec.expire_timeout, 
                                              _e_exec_cb_expire_timer, inst);
-
 	l = eina_hash_find(e_exec_instances, desktop->orig_path);
-        l = eina_list_append(l, inst);
+        lnew = eina_list_append(l, inst);
 	if (l)
-          eina_hash_modify(e_exec_instances, desktop->orig_path, l);
+          eina_hash_modify(e_exec_instances, desktop->orig_path, lnew);
 	else
-          eina_hash_add(e_exec_instances, desktop->orig_path, l);
+          eina_hash_add(e_exec_instances, desktop->orig_path, lnew);
 	e_exec_start_pending = eina_list_append(e_exec_start_pending, desktop);
 
 	e_exehist_add(launch->launch_method, desktop->exec);
@@ -410,6 +409,10 @@
    search = data;
    EINA_LIST_FOREACH(value, l, inst)
      {
+        int pid = -1;
+        
+        if (inst->exe)
+           pid = ecore_exe_pid_get(inst->exe);
         if (((search->startup_id > 0) && 
              (search->startup_id == inst->startup_id)) ||
             ((inst->exe) && (search->pid > 1) &&

Log:
  fmting
  
  
Author:       raster
Date:         2010-09-07 02:08:34 -0700 (Tue, 07 Sep 2010)
New Revision: 51937

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

Modified: trunk/e/src/bin/e_border.h
===================================================================
--- trunk/e/src/bin/e_border.h	2010-09-07 08:53:34 UTC (rev 51936)
+++ trunk/e/src/bin/e_border.h	2010-09-07 09:08:34 UTC (rev 51937)
@@ -296,19 +296,19 @@
          } state;
 
          /* NetWM Window allowed actions */
-                struct {
-                   unsigned char move : 1;
-                   unsigned char resize : 1;
-                   unsigned char minimize : 1;
-                   unsigned char shade : 1;
-                   unsigned char stick : 1;
-                   unsigned char maximized_h : 1;
-                   unsigned char maximized_v : 1;
-                   unsigned char fullscreen : 1;
-                   unsigned char change_desktop : 1;
-                   unsigned char close : 1;
-                } action;
-
+         struct {
+            unsigned char move : 1;
+            unsigned char resize : 1;
+            unsigned char minimize : 1;
+            unsigned char shade : 1;
+            unsigned char stick : 1;
+            unsigned char maximized_h : 1;
+            unsigned char maximized_v : 1;
+            unsigned char fullscreen : 1;
+            unsigned char change_desktop : 1;
+            unsigned char close : 1;
+         } action;
+         
          Ecore_X_Window_Type type;
          Ecore_X_Window_Type *extra_types;
          int extra_types_num;

Log:
  menu icons.. are meant to be e_icon objects... devilhorns!
  :)
  (damned 64bit shit found it)
  
  
Author:       raster
Date:         2010-09-09 21:09:00 -0700 (Thu, 09 Sep 2010)
New Revision: 52119

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

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2010-09-10 02:05:45 UTC (rev 52118)
+++ trunk/e/src/bin/e_gadcon.c	2010-09-10 04:09:00 UTC (rev 52119)
@@ -2704,12 +2704,17 @@
    if (!(gcc = data)) return;
    if (gcc->client_class->func.icon) 
      {
-        mi->icon_object = 
-          gcc->client_class->func.icon((E_Gadcon_Client_Class *)gcc->client_class, 
-                                       mi->menu->evas);
+        Evas_Object *ic;
+        
+        // e menu ASSUMES... EXPECTS the icon to be an.... e_icon! make it so.
+        ic = gcc->client_class->func.icon
+           ((E_Gadcon_Client_Class *)gcc->client_class, 
+               mi->menu->evas);
+        mi->icon_object = e_icon_add(mi->menu->evas);
+        e_icon_object_set(mi->icon_object, ic);
      }
    else
-     e_util_menu_item_theme_icon_set(mi, "preferences-gadget"); // FIXME: Needs icon in theme
+      e_util_menu_item_theme_icon_set(mi, "preferences-gadget"); // FIXME: Needs icon in theme
 }
 
 static void

Log:
  bad horns!
  
  
Author:       raster
Date:         2010-09-24 06:39:19 -0700 (Fri, 24 Sep 2010)
New Revision: 52682

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

Modified: trunk/e/src/bin/e_acpi.c
===================================================================
--- trunk/e/src/bin/e_acpi.c	2010-09-24 13:01:17 UTC (rev 52681)
+++ trunk/e/src/bin/e_acpi.c	2010-09-24 13:39:19 UTC (rev 52682)
@@ -180,15 +180,21 @@
    E_Event_Acpi *acpi_event;
    int sig, status, event_type;
    char device[1024], bus[1024];
+   char *sdata;
 
    ev = event;
 
    /* write out actual acpi received data to stdout for debugging
    res = fwrite(ev->data, ev->size, 1, stdout);
     */
-
+   /* data from a server isnt a string - its not 0 byte terminated. it's just
+    * a blob of data. copy to string and 0 byte terminate it so it can be
+    * string-swizzled/parsed etc. */
+   sdata = alloca(ev->size + 1);
+   memcpy(sdata, ev->data, ev->size);
+   sdata[ev->size] = 0;
    /* parse out this acpi string into separate pieces */
-   if (sscanf(ev->data, "%s %s %d %d", device, bus, &sig, &status) != 4)
+   if (sscanf(sdata, "%s %s %d %d", device, bus, &sig, &status) != 4)
      return ECORE_CALLBACK_PASS_ON;
 
    /* create new event structure to raise */

Log:
  dont code drunk.
  
  
Author:       raster
Date:         2010-10-06 21:45:01 -0700 (Wed, 06 Oct 2010)
New Revision: 53133

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

Modified: trunk/e/src/bin/e_fm_dbus.c
===================================================================
--- trunk/e/src/bin/e_fm_dbus.c	2010-10-07 03:54:51 UTC (rev 53132)
+++ trunk/e/src/bin/e_fm_dbus.c	2010-10-07 04:45:01 UTC (rev 53133)
@@ -82,9 +82,10 @@
    E_Storage  *s;
 
    if (!udi) return NULL;
-
    EINA_LIST_FOREACH(_e_stores, l, s)   
-	if (!strcmpudi, s->udi)) return s;
+     {
+        if (!strcmp(udi, s->udi)) return s;
+     }
    return NULL;
 }

Log:
  init efreet after intl so desktop locale is right.
  
  
Author:       raster
Date:         2010-10-07 16:14:13 -0700 (Thu, 07 Oct 2010)
New Revision: 53173

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2010-10-07 22:31:46 UTC (rev 53172)
+++ trunk/e/src/bin/e_main.c	2010-10-07 23:14:13 UTC (rev 53173)
@@ -552,17 +552,6 @@
    TS("test done");
 
    /*** Finished loading subsystems, Loading WM Specifics ***/
-   TS("efreet");
-   /* init FDO desktop */
-   if (!efreet_init())
-     {
-        e_error_message_show(_("Enlightenment cannot initialize the FDO desktop system.\n"
-                               "Perhaps you are out of memory?"));
-        _e_main_shutdown(-1);
-     }
-   _e_main_shutdown_push(efreet_shutdown);
-   TS("efreet done");
-
    TS("configure");
    e_configure_init();
 
@@ -688,6 +677,17 @@
      }
    _e_main_shutdown_push(e_intl_post_shutdown);
 
+   TS("efreet");
+   /* init FDO desktop */
+   if (!efreet_init())
+     {
+        e_error_message_show(_("Enlightenment cannot initialize the FDO desktop system.\n"
+                               "Perhaps you are out of memory?"));
+        _e_main_shutdown(-1);
+     }
+   _e_main_shutdown_push(efreet_shutdown);
+   TS("efreet done");
+
    if (!really_know)
      {
         e_init_status_set(_("Testing Format Support"));

Log:
  "shorter text... that's MUCH better!"
  
  
Author:       raster
Date:         2010-10-17 17:38:02 -0700 (Sun, 17 Oct 2010)
New Revision: 53550

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

Modified: trunk/e/src/bin/e_int_config_modules.c
===================================================================
--- trunk/e/src/bin/e_int_config_modules.c	2010-10-18 00:09:07 UTC (rev 53549)
+++ trunk/e/src/bin/e_int_config_modules.c	2010-10-18 00:38:02 UTC (rev 53550)
@@ -53,8 +53,8 @@
   _CFT("look", N_("Look"), "preferences-look"),
   _CFT("system", N_("System"), "system"),
   _CFT("config", N_("Settings"), "preferences-system"),
-  _CFT("everything", N_("Everything Launcher"), "system-run"),
-  _CFT("fileman", N_("File Manager"), "system-file-manager"),
+  _CFT("everything", N_("Launcher"), "system-run"),
+  _CFT("fileman", N_("Fileman"), "system-file-manager"),
 #undef _CFT
   {0, NULL, NULL, NULL}
 };

Log:
  that actually can be a bit longer due to i's and l's... :)
  
  
Author:       raster
Date:         2010-10-17 17:39:02 -0700 (Sun, 17 Oct 2010)
New Revision: 53551

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

Modified: trunk/e/src/bin/e_int_config_modules.c
===================================================================
--- trunk/e/src/bin/e_int_config_modules.c	2010-10-18 00:38:02 UTC (rev 53550)
+++ trunk/e/src/bin/e_int_config_modules.c	2010-10-18 00:39:02 UTC (rev 53551)
@@ -49,7 +49,7 @@
 {
 #define _CFT(k, n, i)				\
   {sizeof(k) - 1, k, n, i}
-  _CFT("utils", N_("Utils"), "preferences-utils"),
+  _CFT("utils", N_("Utilities"), "preferences-utils"),
   _CFT("look", N_("Look"), "preferences-look"),
   _CFT("system", N_("System"), "system"),
   _CFT("config", N_("Settings"), "preferences-system"),

Log:
  system settings menu in config panel is back.
  
  
Author:       raster
Date:         2010-10-20 07:49:58 -0700 (Wed, 20 Oct 2010)
New Revision: 53674

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

Modified: trunk/e/src/bin/e_configure.c
===================================================================
--- trunk/e/src/bin/e_configure.c	2010-10-20 14:44:45 UTC (rev 53673)
+++ trunk/e/src/bin/e_configure.c	2010-10-20 14:49:58 UTC (rev 53674)
@@ -1,5 +1,6 @@
 #include "e.h"
 
+static void _e_configure_efreet_desktop_cleanup(void);
 static void _e_configure_efreet_desktop_update(void);
 static Eina_Bool _e_configure_cb_efreet_desktop_cache_update(void *data, int type, void *event);
 static void _e_configure_registry_item_full_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params), void (*generic_func) (E_Container *con, const char *params), Efreet_Desktop *desktop);
@@ -8,6 +9,7 @@
 
 static Eina_List *handlers = NULL;
 static E_Int_Menu_Augmentation *maug = NULL;
+static Ecore_Job *update_job = NULL;
 
 static void
 _e_configure_menu_module_item_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
@@ -26,6 +28,21 @@
    e_menu_item_callback_set(mi, _e_configure_menu_module_item_cb, NULL);
 }
 
+static void
+_configure_job(void *data __UNUSED__)
+{
+   _e_configure_efreet_desktop_update();
+   update_job = NULL;
+}
+
+static Eina_Bool
+_configure_init_timer(void *data __UNUSED__)
+{
+   if (update_job) ecore_job_del(update_job);
+   update_job = ecore_job_add(_configure_job, NULL);
+   return EINA_FALSE;
+}
+
 EAPI void
 e_configure_init(void)
 {
@@ -38,21 +55,24 @@
    handlers = eina_list_append
      (handlers, ecore_event_handler_add
          (EFREET_EVENT_DESKTOP_CACHE_UPDATE, _e_configure_cb_efreet_desktop_cache_update, NULL));
-   //_e_configure_efreet_desktop_update();
+   if (update_job)
+      {
+         ecore_job_del(update_job);
+         update_job = NULL;
+      }
+   ecore_timer_add(0.0, _configure_init_timer, NULL);
 }
 
 static void
-_e_configure_efreet_desktop_update(void)
+_e_configure_efreet_desktop_cleanup(void)
 {
-   Eina_List *settings_desktops, *system_desktops;
    Eina_List *remove_items = NULL;
    Eina_List *remove_cats = NULL;
    Eina_List *l;
-   Efreet_Desktop *desktop;
    E_Configure_Cat *ecat;
+   char buf[1024];
    void *data;
-   char buf[1024];
-
+   
    /* remove anything with a desktop entry */
    EINA_LIST_FOREACH(e_configure_registry, l, ecat)
      {
@@ -77,7 +97,16 @@
 	e_configure_registry_category_del(data);
 	free(data);
      }
+}
 
+static void
+_e_configure_efreet_desktop_update(void)
+{
+   Eina_List *settings_desktops, *system_desktops;
+   Efreet_Desktop *desktop;
+   Eina_List *l;
+   char buf[1024];
+
    /* get desktops */
    settings_desktops = efreet_util_desktop_category_list("Settings");
    system_desktops = efreet_util_desktop_category_list("System");
@@ -177,7 +206,9 @@
 static Eina_Bool
 _e_configure_cb_efreet_desktop_cache_update(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
-   _e_configure_efreet_desktop_update();
+   _e_configure_efreet_desktop_cleanup();
+   if (update_job) ecore_job_del(update_job);
+   update_job = ecore_job_add(_configure_job, NULL);
    return 1;
 }

Log:
  expoand group list # to 65k - in case, and handle < 0 return.
  
  
Author:       raster
Date:         2010-10-21 08:04:48 -0700 (Thu, 21 Oct 2010)
New Revision: 53716

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

Modified: trunk/e/src/bin/e_sys_main.c
===================================================================
--- trunk/e/src/bin/e_sys_main.c	2010-10-21 14:20:51 UTC (rev 53715)
+++ trunk/e/src/bin/e_sys_main.c	2010-10-21 15:04:48 UTC (rev 53716)
@@ -30,7 +30,7 @@
    int test = 0;
    char *action, *cmd;
    uid_t uid;
-   gid_t gid, gl[1024], egid;
+   gid_t gid, gl[65536], egid;
 
    for (i = 1; i < argc; i++)
      {
@@ -62,8 +62,12 @@
    uid = getuid();
    gid = getgid();
    egid = getegid();
-   gn = getgroups(1024, gl);
-   
+   gn = getgroups(65536, gl);
+   if (gn < 0)
+     {
+	printf("ERROR: MEMBER OF MORE THAN 65536 GROUPS\n");
+	exit(3);
+     }
    if (setuid(0) != 0)
      {
 	printf("ERROR: UNABLE TO ASSUME ROOT PRIVILEDGES\n");

Log:
  1. only make zone black win+canvas if/when needed (btw - can still do
  better and only create what is needed to surround the fullscreen
  window if it cant be fullscren and needs a black border).
  2. set bg color of root to black - e has its own bg anyway.
  
  
Author:       raster
Date:         2010-11-20 08:18:58 -0800 (Sat, 20 Nov 2010)
New Revision: 54748

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

Modified: trunk/e/src/bin/e_manager.c
===================================================================
--- trunk/e/src/bin/e_manager.c	2010-11-20 16:07:08 UTC (rev 54747)
+++ trunk/e/src/bin/e_manager.c	2010-11-20 16:18:58 UTC (rev 54748)
@@ -87,6 +87,7 @@
    Ecore_Event_Handler *h;
 
    if (!ecore_x_window_manage(root)) return NULL;
+   ecore_x_window_background_color_set(root, 0, 0, 0);
    man = E_OBJECT_ALLOC(E_Manager, E_MANAGER_TYPE, _e_manager_free);
    if (!man) return NULL;
    managers = eina_list_append(managers, man);

Modified: trunk/e/src/bin/e_zone.c
===================================================================
--- trunk/e/src/bin/e_zone.c	2010-11-20 16:07:08 UTC (rev 54747)
+++ trunk/e/src/bin/e_zone.c	2010-11-20 16:18:58 UTC (rev 54748)
@@ -58,13 +58,48 @@
    return 1;
 }
 
+static void
+_e_zone_black_get(E_Zone *zone)
+{
+   Evas_Object *o;
+   char name[256];
+  
+   if (zone->black_ecore_evas) return;
+   zone->black_ecore_evas = 
+     e_canvas_new(e_config->evas_engine_zone, zone->container->win,
+                  zone->x, zone->y, zone->w, zone->h, 1, 1, &(zone->black_win));
+   e_canvas_add(zone->black_ecore_evas);
+   ecore_evas_layer_set(zone->black_ecore_evas, 6);
+   zone->black_evas = ecore_evas_get(zone->black_ecore_evas);
+
+   o = evas_object_rectangle_add(zone->black_evas);
+   evas_object_move(o, 0, 0);
+   evas_object_resize(o, zone->w, zone->h);
+   evas_object_color_set(o, 0, 0, 0, 255);
+   evas_object_show(o);
+
+   ecore_evas_name_class_set(zone->black_ecore_evas, "E", "Black_Window");
+   snprintf(name, sizeof(name), "Enlightenment Black Zone (%d)", zone->num);
+   ecore_evas_title_set(zone->black_ecore_evas, name);
+}
+
+static void
+_e_zone_black_unget(E_Zone *zone)
+{
+   if (!zone->black_ecore_evas) return;
+   e_canvas_del(zone->black_ecore_evas);
+   ecore_evas_free(zone->black_ecore_evas);
+   zone->black_ecore_evas = NULL;
+   zone->black_win = 0;
+}
+
 EAPI E_Zone *
 e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
 {
    E_Zone *zone;
-   char name[40];
    Evas_Object *o;
    E_Event_Zone_Add *ev;
+   char name[40];
 
    zone = E_OBJECT_ALLOC(E_Zone, E_ZONE_TYPE, _e_zone_free);
    if (!zone) return NULL;
@@ -128,23 +163,7 @@
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _e_zone_cb_bg_mouse_up, zone);
 
    /* TODO: config the ecore_evas type. */
-   zone->black_ecore_evas = 
-     e_canvas_new(e_config->evas_engine_zone, zone->container->win,
-                  zone->x, zone->y, zone->w, zone->h, 1, 1, &(zone->black_win));
-   e_canvas_add(zone->black_ecore_evas);
-   ecore_evas_layer_set(zone->black_ecore_evas, 6);
-   zone->black_evas = ecore_evas_get(zone->black_ecore_evas);
-
-   o = evas_object_rectangle_add(zone->black_evas);
-   evas_object_move(o, 0, 0);
-   evas_object_resize(o, zone->w, zone->h);
-   evas_object_color_set(o, 0, 0, 0, 255);
-   evas_object_show(o);
-
-   ecore_evas_name_class_set(zone->black_ecore_evas, "E", "Black_Window");
-   snprintf(name, sizeof(name), "Enlightenment Black Zone (%d)", zone->num);
-   ecore_evas_title_set(zone->black_ecore_evas, name);
-
+  
    zone->desk_x_count = 0;
    zone->desk_y_count = 0;
    zone->desk_x_current = 0;
@@ -271,6 +290,7 @@
 
    if ((!zone->fullscreen) && (on))
      {
+        _e_zone_black_get(zone);
 	ecore_evas_show(zone->black_ecore_evas);
 	e_container_window_raise(zone->container, zone->black_win, 150);
 	zone->fullscreen = 1;
@@ -279,6 +299,7 @@
      {
 	ecore_evas_hide(zone->black_ecore_evas);
 	zone->fullscreen = 0;
+        _e_zone_black_unget(zone);
      }
 }

Log:
ok - always kepe black win. need for illume. just make 1x1 when not
  used.
  
  

Author:       raster
Date:         2010-11-30 01:21:23 -0800 (Tue, 30 Nov 2010)
New Revision: 55078
Trac:         http://trac.enlightenment.org/e/changeset/55078

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

Modified: trunk/e/src/bin/e_zone.c
===================================================================
--- trunk/e/src/bin/e_zone.c	2010-11-30 02:33:22 UTC (rev 55077)
+++ trunk/e/src/bin/e_zone.c	2010-11-30 09:21:23 UTC (rev 55078)
@@ -59,7 +59,7 @@
 }
 
 static void
-_e_zone_black_get(E_Zone *zone)
+_e_zone_black_new(E_Zone *zone)
 {
    Evas_Object *o;
    char name[256];
@@ -67,7 +67,7 @@
    if (zone->black_ecore_evas) return;
    zone->black_ecore_evas = 
      e_canvas_new(e_config->evas_engine_zone, zone->container->win,
-                  zone->x, zone->y, zone->w, zone->h, 1, 1, &(zone->black_win));
+                  zone->x, zone->y, 1, 1, 1, 1, &(zone->black_win));
    e_canvas_add(zone->black_ecore_evas);
    ecore_evas_layer_set(zone->black_ecore_evas, 6);
    zone->black_evas = ecore_evas_get(zone->black_ecore_evas);
@@ -84,7 +84,7 @@
 }
 
 static void
-_e_zone_black_unget(E_Zone *zone)
+_e_zone_black_free(E_Zone *zone)
 {
    if (!zone->black_ecore_evas) return;
    e_canvas_del(zone->black_ecore_evas);
@@ -93,6 +93,30 @@
    zone->black_win = 0;
 }
 
+static void
+_e_zone_black_get(E_Zone *zone)
+{
+   zone->black_need++;
+   if (!zone->black_ecore_evas) return;
+   if (zone->black_need == 1)
+     {
+       ecore_evas_move(zone->black_ecore_evas, zone->x, zone->y);
+       ecore_evas_resize(zone->black_ecore_evas, zone->w, zone->h);
+     }
+}
+
+static void
+_e_zone_black_unget(E_Zone *zone)
+{
+   zone->black_need--;
+   if (!zone->black_ecore_evas) return;
+   if (zone->black_need == 0)
+     {
+       ecore_evas_move(zone->black_ecore_evas, zone->x, zone->y);
+       ecore_evas_resize(zone->black_ecore_evas, 1, 1);
+     }
+}
+
 EAPI E_Zone *
 e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
 {
@@ -172,6 +196,8 @@
 			 e_config->zone_desks_y_count);
 
    e_object_del_attach_func_set(E_OBJECT(zone), _e_zone_object_del_attach);
+  
+   _e_zone_black_new(zone);
 
    ev = E_NEW(E_Event_Zone_Add, 1);
    ev->zone = zone;
@@ -215,6 +241,11 @@
 
    _e_zone_edge_move_resize(zone);
    e_zone_bg_reconfigure(zone);
+   if (zone->black_need > 0)
+     {
+       ecore_evas_move(zone->black_ecore_evas, zone->x, zone->y);
+       ecore_evas_resize(zone->black_ecore_evas, zone->w, zone->h);
+     }
 }
 
 EAPI void
@@ -242,6 +273,11 @@
 
    _e_zone_edge_move_resize(zone);
    e_zone_bg_reconfigure(zone);
+   if (zone->black_need > 0)
+     {
+       ecore_evas_move(zone->black_ecore_evas, zone->x, zone->y);
+       ecore_evas_resize(zone->black_ecore_evas, zone->w, zone->h);
+     }
 }
 
 EAPI void
@@ -280,6 +316,11 @@
    _e_zone_edge_move_resize(zone);
 
    e_zone_bg_reconfigure(zone);
+   if (zone->black_need > 0)
+     {
+       ecore_evas_move(zone->black_ecore_evas, zone->x, zone->y);
+       ecore_evas_resize(zone->black_ecore_evas, zone->w, zone->h);
+     }
 } 
 
 EAPI void
@@ -1109,6 +1150,9 @@
 	  e_object_del(E_OBJECT(zone->desks[x + (y * zone->desk_x_count)]));
      }
    free(zone->desks);
+  
+   _e_zone_black_free(zone);
+  
    free(zone);
 }
 

Modified: trunk/e/src/bin/e_zone.h
===================================================================
--- trunk/e/src/bin/e_zone.h	2010-11-30 02:33:22 UTC (rev 55077)
+++ trunk/e/src/bin/e_zone.h	2010-11-30 09:21:23 UTC (rev 55078)
@@ -75,6 +75,7 @@
    Ecore_Evas          *black_ecore_evas;
    Evas                *black_evas;
    Ecore_X_Window       black_win;
+   int                  black_need;
    int                  id;
 
    struct {

Log:
well well - e wasnt handling all of eet's errors. fixed. at least it's
  picking up my permission denined error now.
  
  

Author:       raster
Date:         2011-01-02 20:28:53 -0800 (Sun, 02 Jan 2011)
New Revision: 55807
Trac:         http://trac.enlightenment.org/e/changeset/55807

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-01-03 02:09:42 UTC (rev 55806)
+++ trunk/e/src/bin/e_config.c	2011-01-03 04:28:53 UTC (rev 55807)
@@ -145,7 +145,7 @@
 	  {
              int i;
 
-             for (i =1; i <= _e_config_revisions; i++)
+             for (i = 1; i <= _e_config_revisions; i++)
                {
                   e_user_dir_snprintf(buf, sizeof(buf), "config/profile.%i.cfg", i);
                   ef = eet_open(buf, EET_FILE_MODE_READ);
@@ -1635,7 +1635,7 @@
 	     ret = ecore_file_mv(buf2, buf);
 	     if (!ret)
 	       {
-		  printf("*** Error saving config. ***");
+		  printf("*** Error saving config. ***\n");
 	       }
 	  }
 	ecore_file_unlink(buf2);
@@ -2021,65 +2021,65 @@
    err = eet_close(ef);
    switch (err)
      {
+      case EET_ERROR_NONE:
+        /* all good - no error */
+	break;
+      case EET_ERROR_BAD_OBJECT:
+	erstr = _("The EET file handle is bad.");
+	break;
+      case EET_ERROR_EMPTY:
+	erstr = _("The file data is empty.");
+	break;
+      case EET_ERROR_NOT_WRITABLE:
+	erstr = _("The file is not writable. Perhaps the disk is read-only<br>or you lost permissions to your files.");
+	break;
+      case EET_ERROR_OUT_OF_MEMORY:
+	erstr = _("Memory ran out while preparing the write.<br>Please free up memory.");
+	break;
       case EET_ERROR_WRITE_ERROR:
-	erstr = _("An error occurred while saving Enlightenment's<br>"
-		  "settings to disk. The error could not be<br>"
-		  "deterimined.<br>"
-		  "<br>"
-		  "The file where the error occurred was:<br>"
-		  "%s<br>"
-		  "<br>"
-		  "This file has been deleted to avoid corrupt data.<br>"
-		  );
-	break;
+	erstr = _("This is a generic error.");
       case EET_ERROR_WRITE_ERROR_FILE_TOO_BIG:
-	erstr = _("Enlightenment's settings files are too big<br>"
-		  "for the file system they are being saved to.<br>"
-		  "This error is very strange as the files should<br>"
-		  "be extremely small. Please check the settings<br>"
-		  "for your home directory.<br>"
-		  "<br>"
-		  "The file where the error occurred was:<br>"
-		  "%s<br>"
-		  "<br>"
-		  "This file has been deleted to avoid corrupt data.<br>"
-		  );
+	erstr = _("The settings file is too large.<br>It should be very small (a few hundred KB at most).");
 	break;
       case EET_ERROR_WRITE_ERROR_IO_ERROR:
-	erstr = _("An output error occurred when writing the settings<br>"
-		  "files for Enlightenment. Your disk is having troubles<br>"
-		  "and possibly needs replacement.<br>"
-		  "<br>"
-		  "The file where the error occurred was:<br>"
-		  "%s<br>"
-		  "<br>"
-		  "This file has been deleted to avoid corrupt data.<br>"
-		  );
+	erstr = _("You have I/O errors on the disk.<br>Maybe it needs replacing?");
 	break;
       case EET_ERROR_WRITE_ERROR_OUT_OF_SPACE:
-	erstr = _("Enlightenment cannot write its settings file<br>"
-		  "because it ran out of space to write the file.<br>"
-		  "You have either run out of disk space or have<br>"
-		  "gone over your quota limit.<br>"
-		  "<br>"
-		  "The file where the error occurred was:<br>"
-		  "%s<br>"
-		  "<br>"
-		  "This file has been deleted to avoid corrupt data.<br>"
-		  );
+	erstr = _("You ran out of space while writing the file");
 	break;
       case EET_ERROR_WRITE_ERROR_FILE_CLOSED:
-	erstr = _("Enlightenment unexpectedly had the settings file<br>"
-		  "it was writing closed on it. This is very unusual.<br>"
-		  "<br>"
-		  "The file where the error occurred was:<br>"
-		  "%s<br>"
-		  "<br>"
-		  "This file has been deleted to avoid corrupt data.<br>"
-		  );
+	erstr = _("The file was closed on it while writing.");
 	break;
-      default:
+      case EET_ERROR_MMAP_FAILED:
+	erstr = _("Memory-mapping (mmap) of the file failed.");
 	break;
+      case EET_ERROR_X509_ENCODING_FAILED:
+	erstr = _("X509 Encoding failed.");
+	break;
+      case EET_ERROR_SIGNATURE_FAILED:
+	erstr = _("Signature failed.");
+	break;
+      case EET_ERROR_INVALID_SIGNATURE:
+        erstr = _("The signature was invalid.");
+	break;
+      case EET_ERROR_NOT_SIGNED:
+	erstr = _("Not signed.");
+	break;
+      case EET_ERROR_NOT_IMPLEMENTED:
+	erstr = _("Feature not implemented.");
+	break;
+      case EET_ERROR_PRNG_NOT_SEEDED:
+	erstr = _("PRNG was not seeded.");
+	break;
+      case EET_ERROR_ENCRYPT_FAILED:
+	erstr = _("Encryption failed.");
+	break;
+      case EET_ERROR_DECRYPT_FAILED:
+	erstr = _("Decruption failed.");
+	break;
+      default: /* if we get here eet added errors we don't know */
+	erstr = _("The error is unknown to Enlightenment.");
+	break;
      }
    if (erstr)
      {
@@ -2089,19 +2089,30 @@
 	  {
              E_Dialog *dia;
 
-	     dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_sys_error_logout_slow");
+	     dia = e_dialog_new(e_container_current_get(e_manager_current_get()), 
+                                "E", "_sys_error_logout_slow");
 	     if (dia)
 	       {
 		  char buf[8192];
 
 		  e_dialog_title_set(dia, _("Enlightenment Settings Write Problems"));
 		  e_dialog_icon_set(dia, "dialog-error", 64);
-		  snprintf(buf, sizeof(buf), erstr, file);
+		  snprintf(buf, sizeof(buf), 
+                           _("Enlightenment has an error while writing<br>"
+                             "its config file.<br>"
+                             "%s<br>"
+                             "<br>"
+                             "The file where the error occurred was:<br>"
+                             "%s<br>"
+                             "<br>"
+                             "This file has been deleted to avoid corrupt data.<br>"),
+                           erstr, file);
 		  e_dialog_text_set(dia, buf);
 		  e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
 		  e_dialog_button_focus_num(dia, 0);
 		  e_win_centered_set(dia->win, 1);
-		  e_object_del_attach_func_set(E_OBJECT(dia), _e_config_error_dialog_cb_delete);
+		  e_object_del_attach_func_set(E_OBJECT(dia),
+                                               _e_config_error_dialog_cb_delete);
 		  e_dialog_show(dia);
 		  _e_config_error_dialog = dia;
 	       }

Log:
why did you turn off config versioning devilhorns? back on!
  
  

Author:       raster
Date:         2011-01-02 20:33:31 -0800 (Sun, 02 Jan 2011)
New Revision: 55808
Trac:         http://trac.enlightenment.org/e/changeset/55808

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-01-03 04:28:53 UTC (rev 55807)
+++ trunk/e/src/bin/e_config.c	2011-01-03 04:33:31 UTC (rev 55808)
@@ -26,7 +26,7 @@
 
 EAPI E_Config *e_config = NULL;
 
-static int _e_config_revisions = 0;
+static int _e_config_revisions = 9;
 
 /* local subsystem functions */
 static void _e_config_save_cb(void *data);

Log:
actually handle errors on all mv's of old config revs
  
  

Author:       raster
Date:         2011-01-02 20:41:05 -0800 (Sun, 02 Jan 2011)
New Revision: 55809
Trac:         http://trac.enlightenment.org/e/changeset/55809

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-01-03 04:33:31 UTC (rev 55808)
+++ trunk/e/src/bin/e_config.c	2011-01-03 04:41:05 UTC (rev 55809)
@@ -1500,7 +1500,7 @@
         if (data) return data;
      }
 
-   for (i =1; i <= _e_config_revisions; i++)
+   for (i = 1; i <= _e_config_revisions; i++)
      {
         e_user_dir_snprintf(buf, sizeof(buf), "config/%s/%s.%i.cfg",
                             _e_config_profile, domain, i);
@@ -1553,7 +1553,7 @@
 		       strlen(_e_config_profile), 0);
 	if (_e_config_eet_close_handle(ef, buf2))
 	  {
-	     int ret;
+	     Eina_Bool ret;
 
              if (_e_config_revisions > 0)
                {
@@ -1564,11 +1564,23 @@
                     {
                        e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/profile.%i.cfg", i - 1);
                        e_user_dir_snprintf(bdst, sizeof(bdst), "config/profile.%i.cfg", i);
-                       ecore_file_mv(bsrc, bdst);
+                       ret = ecore_file_mv(bsrc, bdst);
+                       if (!ret)
+                         {
+                            printf("*** Error saving profile. ***");
+                            break;
+                         }
                     }
-                  e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/profile.cfg");
-                  e_user_dir_snprintf(bdst, sizeof(bdst), "config/profile.1.cfg");
-                  ecore_file_mv(bsrc, bdst);
+                  if (ret)
+                    {
+                       e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/profile.cfg");
+                       e_user_dir_snprintf(bdst, sizeof(bdst), "config/profile.1.cfg");
+                       ret = ecore_file_mv(bsrc, bdst);
+                       if (!ret)
+                         {
+                            printf("*** Error saving profile. ***");
+                         }
+                    }
                }
              ret = ecore_file_mv(buf2, buf);
 	     if (!ret)

Log:
and disable other engines in choices. software only one left.
  
  

Author:       raster
Date:         2011-01-02 20:41:57 -0800 (Sun, 02 Jan 2011)
New Revision: 55810
Trac:         http://trac.enlightenment.org/e/changeset/55810

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-01-03 04:41:05 UTC (rev 55809)
+++ trunk/e/src/bin/e_config.c	2011-01-03 04:41:57 UTC (rev 55810)
@@ -1460,13 +1460,17 @@
     * contexts, so for now just disable it. xrender is much more complete in
     * this regard.
     */
-#if 0
+#if 0 /* opengl cant do occludes for frames - only useful for compositor */
    l = eina_list_append(l, strdup("GL"));
 #endif
+#if 0 /* xrender too incomplete these days */   
    if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_XRENDER_X11))
      l = eina_list_append(l, strdup("XRENDER"));
+#endif   
+#if 0 /* software-16 too incomplete and buggy */
    if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_16_X11))
      l = eina_list_append(l, strdup("SOFTWARE_16"));
+#endif   
    return l;
 }

Log:
more comments.
  
  

Author:       raster
Date:         2011-01-02 20:44:29 -0800 (Sun, 02 Jan 2011)
New Revision: 55811
Trac:         http://trac.enlightenment.org/e/changeset/55811

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-01-03 04:41:57 UTC (rev 55810)
+++ trunk/e/src/bin/e_config.c	2011-01-03 04:44:29 UTC (rev 55811)
@@ -2101,6 +2101,8 @@
      {
 	/* delete any partially-written file */
 	ecore_file_unlink(file);
+        /* only show dialog for first error - further ones are likely */
+        /* more of the same error */
 	if (!_e_config_error_dialog)
 	  {
              E_Dialog *dia;

Log:
and actually complain when mv's fail too - and abort writes.
  
  

Author:       raster
Date:         2011-01-02 20:52:48 -0800 (Sun, 02 Jan 2011)
New Revision: 55812
Trac:         http://trac.enlightenment.org/e/changeset/55812

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-01-03 04:44:29 UTC (rev 55811)
+++ trunk/e/src/bin/e_config.c	2011-01-03 04:52:48 UTC (rev 55812)
@@ -78,6 +78,15 @@
 EAPI int E_EVENT_CONFIG_ICON_THEME = 0;
 EAPI int E_EVENT_CONFIG_MODE_CHANGED = 0;
 
+static E_Dialog *_e_config_error_dialog = NULL;
+
+static void
+_e_config_error_dialog_cb_delete(void *dia)
+{
+   if (dia == _e_config_error_dialog)
+     _e_config_error_dialog = NULL;
+}
+
 static char *
 _e_config_profile_name_get(Eet_File *ef)
 {
@@ -1539,6 +1548,43 @@
    return data;
 }
 
+static void
+_e_config_mv_error(const char *from, const char *to)
+{
+   if (!_e_config_error_dialog)
+     {
+        E_Dialog *dia;
+        
+        dia = e_dialog_new(e_container_current_get(e_manager_current_get()), 
+                           "E", "_sys_error_logout_slow");
+        if (dia)
+          {
+             char buf[8192];
+             
+             e_dialog_title_set(dia, _("Enlightenment Settings Write Problems"));
+             e_dialog_icon_set(dia, "dialog-error", 64);
+             snprintf(buf, sizeof(buf), 
+                      _("Enlightenment has an error while moving config files<br>"
+                        "from:<br>"
+                        "%s<br>"
+                        "<br>"
+                        "to:<br>"
+                        "%s<br>"
+                        "<br>"
+                        "The rest of the write has been aborted for safety.<br>"),
+                      from, to);
+             e_dialog_text_set(dia, buf);
+             e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
+             e_dialog_button_focus_num(dia, 0);
+             e_win_centered_set(dia->win, 1);
+             e_object_del_attach_func_set(E_OBJECT(dia),
+                                          _e_config_error_dialog_cb_delete);
+             e_dialog_show(dia);
+             _e_config_error_dialog = dia;
+          }
+     }
+}
+
 EAPI int
 e_config_profile_save(void)
 {
@@ -1557,7 +1603,7 @@
 		       strlen(_e_config_profile), 0);
 	if (_e_config_eet_close_handle(ef, buf2))
 	  {
-	     Eina_Bool ret;
+	     Eina_Bool ret = EINA_TRUE;
 
              if (_e_config_revisions > 0)
                {
@@ -1568,11 +1614,14 @@
                     {
                        e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/profile.%i.cfg", i - 1);
                        e_user_dir_snprintf(bdst, sizeof(bdst), "config/profile.%i.cfg", i);
-                       ret = ecore_file_mv(bsrc, bdst);
-                       if (!ret)
+                       if (ecore_file_exists(bsrc))
                          {
-                            printf("*** Error saving profile. ***");
-                            break;
+                            ret = ecore_file_mv(bsrc, bdst);
+                            if (!ret)
+                              {
+                                 _e_config_mv_error(bsrc, bdst);
+                                 break;
+                              }
                          }
                     }
                   if (ret)
@@ -1581,16 +1630,11 @@
                        e_user_dir_snprintf(bdst, sizeof(bdst), "config/profile.1.cfg");
                        ret = ecore_file_mv(bsrc, bdst);
                        if (!ret)
-                         {
-                            printf("*** Error saving profile. ***");
-                         }
+                          _e_config_mv_error(bsrc, bdst);
                     }
                }
              ret = ecore_file_mv(buf2, buf);
-	     if (!ret)
-	       {
-		  printf("*** Error saving profile. ***");
-	       }
+	     if (!ret) _e_config_mv_error(buf2, buf);
 	  }
 	ecore_file_unlink(buf2);
      }
@@ -2019,15 +2063,6 @@
    return 0;
 }
 
-static E_Dialog *_e_config_error_dialog = NULL;
-
-static void
-_e_config_error_dialog_cb_delete(void *dia)
-{
-   if (dia == _e_config_error_dialog)
-     _e_config_error_dialog = NULL;
-}
-
 static int
 _e_config_eet_close_handle(Eet_File *ef, char *file)
 {

Log:
dont access null cf in gcc.
  
  

Author:       raster
Date:         2011-01-03 07:37:49 -0800 (Mon, 03 Jan 2011)
New Revision: 55827
Trac:         http://trac.enlightenment.org/e/changeset/55827

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

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2011-01-03 10:12:17 UTC (rev 55826)
+++ trunk/e/src/bin/e_gadcon.c	2011-01-03 15:37:49 UTC (rev 55827)
@@ -1639,8 +1639,9 @@
      }
    e_gadcon_client_edit_end(gcc);
    gcc->client_class->func.shutdown(gcc);
-   if (gcc->client_class->func.id_del)
-     gcc->client_class->func.id_del((E_Gadcon_Client_Class *)gcc->client_class, gcc->cf->id);
+   if ((gcc->client_class->func.id_del) && (gcc->cf))
+     gcc->client_class->func.id_del((E_Gadcon_Client_Class *)gcc->client_class,
+                                    gcc->cf->id);
    gcc->gadcon->clients = eina_list_remove(gcc->gadcon->clients, gcc);
    if (gcc->o_box) evas_object_del(gcc->o_box);
    if (gcc->o_frame) evas_object_del(gcc->o_frame);

Log:
try and avoid a segv if info is null on ret.
  
  

Author:       raster
Date:         2011-01-03 07:49:51 -0800 (Mon, 03 Jan 2011)
New Revision: 55828
Trac:         http://trac.enlightenment.org/e/changeset/55828

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

Modified: trunk/e/src/bin/e_randr.c
===================================================================
--- trunk/e/src/bin/e_randr.c	2011-01-03 15:37:49 UTC (rev 55827)
+++ trunk/e/src/bin/e_randr.c	2011-01-03 15:49:51 UTC (rev 55828)
@@ -750,7 +750,7 @@
      }
    else if (type == ECORE_X_EVENT_RANDR_OUTPUT_CHANGE)
      {
-        Ecore_X_Event_Randr_Output_Change *event = (Ecore_X_Event_Randr_Output_Change*) ev;
+        Ecore_X_Event_Randr_Output_Change *event = ev;
         const E_Randr_Screen_Restore_Info_12 *restore_info;
         E_Randr_Output_Info* output_info = NULL;
         /* available information:
@@ -776,20 +776,21 @@
                 event->win, event->output, event->crtc, event->mode, event->orientation, event->connection, ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED, ECORE_X_RANDR_CONNECTION_STATUS_DISCONNECTED, ECORE_X_RANDR_CONNECTION_STATUS_UNKNOWN, event->subpixel_order);
 
         output_info = _e_randr_output_info_get(event->output);
-        if((output_info->crtc = _e_randr_crtc_info_get(event->crtc)))
+        if (!output_info) goto on_exit;
+        
+        if ((output_info->crtc = _e_randr_crtc_info_get(event->crtc)))
           {
-	     if (output_info->crtc)
-	       if (!eina_list_data_find(output_info->crtc->outputs, output_info))
-		 output_info->crtc->outputs = eina_list_append(output_info->crtc->outputs, output_info);
+             if (!eina_list_data_find(output_info->crtc->outputs, output_info))
+                output_info->crtc->outputs = eina_list_append(output_info->crtc->outputs, output_info);
           }
 
         output_info->connection_status = event->connection;
         output_info->subpixel_order = event->subpixel_order;
-
-        if(event->connection == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
+        
+        if (event->connection == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
           {
              if (event->crtc)
-               output_info->crtc = _e_randr_crtc_info_get(event->crtc);
+                output_info->crtc = _e_randr_crtc_info_get(event->crtc);
 
              if (output_info && !output_info->crtc && !event->crtc && !event->mode)
                {
@@ -797,12 +798,12 @@
                   _e_randr_output_info_hw_info_set(output_info);
                   //make the crtcs aware of their possibly new output
                   _e_randr_crtcs_possible_output_update(output_info);
-                  if((restore_info = _e_randr_config_find_suiting_config_12()))
-                    //maybe we have a suiting configuration
-                    //_e_randr_config_enable_12(restore_info);
-                    ;
+                  if ((restore_info = _e_randr_config_find_suiting_config_12()))
+                     //maybe we have a suiting configuration
+                     //_e_randr_config_enable_12(restore_info);
+                     ;
                   else
-                    enabled = _e_randr_try_enable_output(output_info, EINA_FALSE); //maybe give a success message?
+                     enabled = _e_randr_try_enable_output(output_info, EINA_FALSE); //maybe give a success message?
                }
              _e_randr_notify_output_change(output_info);
           }
@@ -824,14 +825,14 @@
                             ecore_x_randr_screen_reset(e_randr_screen_info->root);
                          }
                        else
-                         _e_randr_crtc_outputs_mode_max_set(output_info->crtc);
+                          _e_randr_crtc_outputs_mode_max_set(output_info->crtc);
                     }
-
+                  
                   if (e_randr_screen_info->rrvd_info.randr_info_12->primary_output && (output_info == e_randr_screen_info->rrvd_info.randr_info_12->primary_output))
-                    _e_randr_screen_primary_output_assign(output_info);
+                     _e_randr_screen_primary_output_assign(output_info);
                   //let's try to get a proper config for the new setup and crop the
                   //screen afterwards.
-                  if((restore_info = _e_randr_config_find_suiting_config_12()))
+                  if ((restore_info = _e_randr_config_find_suiting_config_12()))
 		    {
 		       //in case we didn't have, init it anyway...
 		       //_e_randr_config_enable_12(restore_info);

Log:
on free of list.. set list ptr to null tnx. :)
  
  

Author:       raster
Date:         2011-01-04 19:14:34 -0800 (Tue, 04 Jan 2011)
New Revision: 55859
Trac:         http://trac.enlightenment.org/e/changeset/55859

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

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2011-01-04 23:16:34 UTC (rev 55858)
+++ trunk/e/src/bin/e_gadcon.c	2011-01-05 03:14:34 UTC (rev 55859)
@@ -202,13 +202,13 @@
 EINTERN int
 e_gadcon_shutdown(void)
 {
-   eina_list_free(populate_requests);
+   populate_requests = eina_list_free(populate_requests);
    if (populate_idler)
      {
 	ecore_idler_del(populate_idler);
 	populate_idler = NULL;
      }
-   eina_list_free(custom_populate_requests);
+   custom_populate_requests = eina_list_free(custom_populate_requests);
    if (custom_populate_idler)
      {
 	ecore_idler_del(custom_populate_idler);

Log:
desklock - dont ret 1 on failure to auth. only on failure to init!
  
  

Author:       raster
Date:         2011-01-05 19:58:58 -0800 (Wed, 05 Jan 2011)
New Revision: 55923
Trac:         http://trac.enlightenment.org/e/changeset/55923

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

Modified: trunk/e/src/bin/e_desklock.c
===================================================================
--- trunk/e/src/bin/e_desklock.c	2011-01-06 03:57:37 UTC (rev 55922)
+++ trunk/e/src/bin/e_desklock.c	2011-01-06 03:58:58 UTC (rev 55923)
@@ -718,7 +718,7 @@
 	if (pamerr != PAM_SUCCESS)
 	  {
 	     free(current_user);
-	     exit(pamerr);
+	     exit(1);
 	  }
 	pamerr = pam_authenticate(da.pam.handle, 0);
 	pam_end(da.pam.handle, pamerr);
@@ -730,7 +730,7 @@
 	     exit(0);
 	  }
 	free(current_user);
-	exit(1);
+	exit(-1);
      }
    else
      {

Log:
fix e icon setting of fdo icon if fdo icon ends up being an edje file.
  
  

Author:       raster
Date:         2011-01-06 20:31:47 -0800 (Thu, 06 Jan 2011)
New Revision: 55964
Trac:         http://trac.enlightenment.org/e/changeset/55964

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

Modified: trunk/e/src/bin/e_icon.c
===================================================================
--- trunk/e/src/bin/e_icon.c	2011-01-07 04:02:55 UTC (rev 55963)
+++ trunk/e/src/bin/e_icon.c	2011-01-07 04:31:47 UTC (rev 55964)
@@ -154,7 +154,8 @@
 {
    E_Smart_Data *sd;
    const char *path;
-
+   int len;
+   
    if (!icon) return EINA_TRUE;
    if (icon[0] == '/') return e_icon_file_set(obj, icon);
 
@@ -166,6 +167,10 @@
    path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size);
    if (!path) return EINA_TRUE;
 
+   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;

Log:
and fix mounty to be SAFE woth udisks.
  
  

Author:       raster
Date:         2011-01-08 10:18:17 -0800 (Sat, 08 Jan 2011)
New Revision: 55994
Trac:         http://trac.enlightenment.org/e/changeset/55994

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-01-08 17:30:38 UTC (rev 55993)
+++ trunk/e/src/bin/e_fm.c	2011-01-08 18:18:17 UTC (rev 55994)
@@ -833,7 +833,7 @@
         _e_fm2_dir_load_props(sd);
      }
 
-   if (strcmp(sd->mount->mount_point, sd->realpath))
+   if ((sd->realpath) && (strcmp(sd->mount->mount_point, sd->realpath)))
      {
         e_fm2_path_set(sd->obj, "/", sd->mount->mount_point);
      }
@@ -2800,7 +2800,7 @@
 
               evdir = ecore_file_dir_get(path);
               if ((evdir) && (sd->id == e->ref_to) &&
-                  ((!strcmp(evdir, "") || (!strcmp(dir, evdir)))))
+                  ((!strcmp(evdir, "") || ((dir) && (!strcmp(dir, evdir))))))
                 {
 //                       printf(" ch/add response = %i\n", e->response);
                      if (e->response == 0)  /*live changes*/
@@ -3265,7 +3265,7 @@
                {
                   if ((!v->mount_point) && (v->efm_mode == EFM_MODE_USING_HAL_MOUNT))
                     v->mount_point = e_fm2_device_volume_mountpoint_get(v);
-                  else return NULL;
+                  else if (!v->mount_point) return NULL;
 
                   if (PRT("%s/%s", v->mount_point, path) >= sizeof(buf))
                     return NULL;
@@ -9897,7 +9897,7 @@
             (eina_list_data_find(_e_fm2_list_remove, o))) continue;
 
         rp = e_fm2_real_path_get(o);
-        if (strcmp(rp, fav) && strcmp(rp, desk)) continue;
+        if ((rp) && (strcmp(rp, fav)) && (strcmp(rp, desk))) continue;
 
         ic = _e_fm2_icon_find(o, file);
         if (ic)

Log:
why was that deleted? add back!
  
  

Author:       raster
Date:         2011-01-08 10:21:56 -0800 (Sat, 08 Jan 2011)
New Revision: 55995
Trac:         http://trac.enlightenment.org/e/changeset/55995

Added:
  trunk/e/src/bin/e_fm_shared_types.h

Log:
wow.. well.. seems this became a .in file - that explains why it was
  rtemoved. modify .in.
  
  

Author:       raster
Date:         2011-01-08 10:25:20 -0800 (Sat, 08 Jan 2011)
New Revision: 55996
Trac:         http://trac.enlightenment.org/e/changeset/55996

Removed:
  trunk/e/src/bin/e_fm_shared_types.h 
Modified:
  trunk/e/src/bin/e_fm_shared_types.h.in 

Modified: trunk/e/src/bin/e_fm_shared_types.h.in
===================================================================
--- trunk/e/src/bin/e_fm_shared_types.h.in	2011-01-08 18:21:56 UTC (rev 55995)
+++ trunk/e/src/bin/e_fm_shared_types.h.in	2011-01-08 18:25:20 UTC (rev 55996)
@@ -44,6 +44,7 @@
 
    Eina_Bool removable;
    Eina_Bool media_available;
+   Eina_Bool system_internal;
    unsigned long long media_size;
 
    Eina_Bool requires_eject;

Log:
fix edj icon in menu :)
  
  

Author:       raster
Date:         2011-01-09 22:35:04 -0800 (Sun, 09 Jan 2011)
New Revision: 56018
Trac:         http://trac.enlightenment.org/e/changeset/56018

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

Modified: trunk/e/src/bin/e_menu.c
===================================================================
--- trunk/e/src/bin/e_menu.c	2011-01-10 05:39:13 UTC (rev 56017)
+++ trunk/e/src/bin/e_menu.c	2011-01-10 06:35:04 UTC (rev 56018)
@@ -609,6 +609,7 @@
 EAPI void
 e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon)
 {
+   int len;
    E_OBJECT_CHECK(mi);
    E_OBJECT_TYPE_CHECK(mi, E_MENU_ITEM_TYPE);
    if (((mi->icon) && (icon) && (!strcmp(icon, mi->icon))) ||
@@ -619,6 +620,9 @@
    mi->icon = NULL;
    mi->icon_key = NULL;
    if (icon) mi->icon = eina_stringshare_add(icon);
+   len = strlen(icon);
+   if ((len > 4) && (!strcasecmp(icon + len - 4, ".edj")))
+      mi->icon_key = eina_stringshare_add("icon");
    mi->changed = 1;
    mi->menu->changed = 1;
 }

Log:
ooh and ALSO handle files if .edj - if full path set.
  
  

Author:       raster
Date:         2011-01-11 02:09:48 -0800 (Tue, 11 Jan 2011)
New Revision: 56050
Trac:         http://trac.enlightenment.org/e/changeset/56050

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

Modified: trunk/e/src/bin/e_icon.c
===================================================================
--- trunk/e/src/bin/e_icon.c	2011-01-11 09:58:34 UTC (rev 56049)
+++ trunk/e/src/bin/e_icon.c	2011-01-11 10:09:48 UTC (rev 56050)
@@ -60,10 +60,15 @@
 e_icon_file_set(Evas_Object *obj, const char *file)
 {
    E_Smart_Data *sd;
+   int len;
 
    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 */

Log:
makr strings to be translatable - but dont translate
  
  

Author:       raster
Date:         2011-01-14 03:19:30 -0800 (Fri, 14 Jan 2011)
New Revision: 56109
Trac:         http://trac.enlightenment.org/e/changeset/56109

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-14 10:35:59 UTC (rev 56108)
+++ trunk/e/src/bin/e_actions.c	2011-01-14 11:19:30 UTC (rev 56109)
@@ -2575,7 +2575,7 @@
 
    actions = eina_hash_string_superfast_new(NULL);
    ACT_GO(window_move);
-   e_action_predef_name_set("Window : Actions", "Move",
+   e_action_predef_name_set(N_("Window : Actions"), N_("Move"),
 			    "window_move", NULL, NULL, 0);
 
    ACT_GO_MOUSE(window_move);
@@ -2586,7 +2586,7 @@
 
    /* window_resize */
    ACT_GO(window_resize);
-   e_action_predef_name_set("Window : Actions", "Resize", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Resize"), 
 			    "window_resize", NULL, NULL, 0);
 
    ACT_GO_MOUSE(window_resize);
@@ -2597,7 +2597,7 @@
 
    /* window_menu */
    ACT_GO(window_menu);
-   e_action_predef_name_set("Menu", "Window Menu", 
+   e_action_predef_name_set(N_("Menu"), N_("Window Menu"), 
 			    "window_menu", NULL, NULL, 0);
 
    ACT_GO_MOUSE(window_menu);
@@ -2605,356 +2605,356 @@
 
    /* window_raise */
    ACT_GO(window_raise);
-   e_action_predef_name_set("Window : Actions", "Raise", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Raise"), 
 			    "window_raise", NULL, NULL, 0);
 
    /* window_lower */
    ACT_GO(window_lower);
-   e_action_predef_name_set("Window : Actions", "Lower", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Lower"), 
 			    "window_lower", NULL, NULL, 0);
 
    /* window_close */
    ACT_GO(window_close);
-   e_action_predef_name_set("Window : Actions", "Close", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Close"), 
 			    "window_close", NULL, NULL, 0);
 
    /* window_kill */
    ACT_GO(window_kill);
-   e_action_predef_name_set("Window : Actions", "Kill", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Kill"), 
 			    "window_kill", NULL, NULL, 0);
 
    /* window_sticky_toggle */
    ACT_GO(window_sticky_toggle);
-   e_action_predef_name_set("Window : State", "Sticky Mode Toggle", 
+   e_action_predef_name_set(N_("Window : State"), N_("Sticky Mode Toggle"), 
 			    "window_sticky_toggle", NULL, NULL, 0);
 
    ACT_GO(window_sticky);
    
    /* window_iconic_toggle */
    ACT_GO(window_iconic_toggle);
-   e_action_predef_name_set("Window : State", "Iconic Mode Toggle", 
+   e_action_predef_name_set(N_("Window : State"), N_("Iconic Mode Toggle"), 
 			    "window_iconic_toggle", NULL, NULL, 0);
 
    ACT_GO(window_iconic);
 
    /* window_fullscreen_toggle */
    ACT_GO(window_fullscreen_toggle);
-   e_action_predef_name_set("Window : State", "Fullscreen Mode Toggle",
+   e_action_predef_name_set(N_("Window : State"), N_("Fullscreen Mode Toggle"),
 			    "window_fullscreen_toggle", NULL, NULL, 0);
 
    ACT_GO(window_fullscreen);
 
    /* window_maximized_toggle */
    ACT_GO(window_maximized_toggle);
-   e_action_predef_name_set("Window : State", "Maximize", 
+   e_action_predef_name_set(N_("Window : State"), N_("Maximize"), 
 			    "window_maximized_toggle", NULL, NULL, 0);
-   e_action_predef_name_set("Window : State", "Maximize Vertically",
+   e_action_predef_name_set(N_("Window : State"), N_("Maximize Vertically"),
 			    "window_maximized_toggle", "default vertical", 
 			    NULL, 0);
-   e_action_predef_name_set("Window : State", "Maximize Horizontally",
+   e_action_predef_name_set(N_("Window : State"), N_("Maximize Horizontally"),
 			    "window_maximized_toggle", "default horizontal", 
 			    NULL, 0);
-   e_action_predef_name_set("Window : State", "Maximize Fullscreen",
+   e_action_predef_name_set(N_("Window : State"), N_("Maximize Fullscreen"),
 			    "window_maximized_toggle", "fullscreen", NULL, 0);
-   e_action_predef_name_set("Window : State", "Maximize Mode \"Smart\"", 
+   e_action_predef_name_set(N_("Window : State"), N_("Maximize Mode \"Smart\""), 
 			    "window_maximized_toggle", "smart", NULL, 0);
-   e_action_predef_name_set("Window : State", "Maximize Mode \"Expand\"",
+   e_action_predef_name_set(N_("Window : State"), N_("Maximize Mode \"Expand\""),
 			    "window_maximized_toggle", "expand", NULL, 0);
-   e_action_predef_name_set("Window : State", "Maximize Mode \"Fill\"", 
+   e_action_predef_name_set(N_("Window : State"), N_("Maximize Mode \"Fill\""), 
 			    "window_maximized_toggle", "fill", NULL, 0);
 
    ACT_GO(window_maximized);
 
    /* window_shaded_toggle */
    ACT_GO(window_shaded_toggle);
-   e_action_predef_name_set("Window : State", "Shade Up Mode Toggle", 
+   e_action_predef_name_set(N_("Window : State"), N_("Shade Up Mode Toggle"), 
 			    "window_shaded_toggle", "up", NULL, 0);
-   e_action_predef_name_set("Window : State", "Shade Down Mode Toggle",
+   e_action_predef_name_set(N_("Window : State"), N_("Shade Down Mode Toggle"),
 			    "window_shaded_toggle", "down", NULL, 0);
-   e_action_predef_name_set("Window : State", "Shade Left Mode Toggle",
+   e_action_predef_name_set(N_("Window : State"), N_("Shade Left Mode Toggle"),
 			    "window_shaded_toggle", "left", NULL, 0);
-   e_action_predef_name_set("Window : State", "Shade Right Mode Toggle",
+   e_action_predef_name_set(N_("Window : State"), N_("Shade Right Mode Toggle"),
 			    "window_shaded_toggle", "right", NULL, 0);
-   e_action_predef_name_set("Window : State", "Shade Mode Toggle", 
+   e_action_predef_name_set(N_("Window : State"), N_("Shade Mode Toggle"), 
 			    "window_shaded_toggle", NULL, NULL, 0);
 
    ACT_GO(window_shaded);
 
    /* window_borderless_toggle */
    ACT_GO(window_borderless_toggle);
-   e_action_predef_name_set("Window : State", "Toggle Borderless State",
+   e_action_predef_name_set(N_("Window : State"), N_("Toggle Borderless State"),
 			    "window_borderless_toggle", NULL, NULL, 0);
 
    /* window_pinned_toggle */
    ACT_GO(window_pinned_toggle);
-   e_action_predef_name_set("Window : State", "Toggle Pinned State",
+   e_action_predef_name_set(N_("Window : State"), N_("Toggle Pinned State"),
 			    "window_pinned_toggle", NULL, NULL, 0);
 
    /* desk_flip_by */
    ACT_GO(desk_flip_by);
-   e_action_predef_name_set("Desktop", "Flip Desktop Left", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Left"), 
 			    "desk_flip_by", "-1 0", NULL, 0);
-   e_action_predef_name_set("Desktop", "Flip Desktop Right", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Right"), 
 			    "desk_flip_by", "1 0", NULL, 0);
-   e_action_predef_name_set("Desktop", "Flip Desktop Up", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Up"), 
 			    "desk_flip_by", "0 -1", NULL, 0);
-   e_action_predef_name_set("Desktop", "Flip Desktop Down", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Down"), 
 			    "desk_flip_by", "0 1", NULL, 0);
-   e_action_predef_name_set("Desktop", "Flip Desktop By...", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop By..."), 
 			    "desk_flip_by", NULL,
 			    "syntax: X-offset Y-offset, example: -1 0", 1);
 
    /* desk_deskshow_toggle */
    ACT_GO(desk_deskshow_toggle);
-   e_action_predef_name_set("Desktop", "Show The Desktop", 
+   e_action_predef_name_set(N_("Desktop"), N_("Show The Desktop"), 
 			    "desk_deskshow_toggle", NULL, NULL, 0);
 
    /* shelf_show */
    ACT_GO(shelf_show);
    ACT_GO_EDGE(shelf_show);
-   e_action_predef_name_set("Desktop", "Show The Shelf", "shelf_show",
+   e_action_predef_name_set(N_("Desktop"), N_("Show The Shelf"), "shelf_show",
 			    NULL, "shelf name glob: Shelf-* ", 1);
 
    /* desk_linear_flip_to */
    ACT_GO(desk_flip_to);
-   e_action_predef_name_set("Desktop", "Flip Desktop To...", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop To..."), 
 			    "desk_flip_to", NULL,
 			    "syntax: X Y, example: 1 2", 1);
 
    /* desk_linear_flip_by */
    ACT_GO(desk_linear_flip_by);
-   e_action_predef_name_set("Desktop", "Flip Desktop Linearly...", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Linearly..."), 
 			    "desk_linear_flip_by",
 			    NULL, "syntax: N-offset, example: -2", 1);
 
    /* desk_linear_flip_to */
    ACT_GO(desk_linear_flip_to);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 0", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 0"), 
 			    "desk_linear_flip_to", "0", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 1", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 1"), 
 			    "desk_linear_flip_to", "1", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 2", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 2"), 
 			    "desk_linear_flip_to", "2", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 3", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 3"), 
 			    "desk_linear_flip_to", "3", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 4", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 4"), 
 			    "desk_linear_flip_to", "4", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 5", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 5"), 
 			    "desk_linear_flip_to", "5", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 6", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 6"), 
 			    "desk_linear_flip_to", "6", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 7", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 7"), 
 			    "desk_linear_flip_to", "7", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 8", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 8"), 
 			    "desk_linear_flip_to", "8", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 9", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 9"), 
 			    "desk_linear_flip_to", "9", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 10", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 10"), 
 			    "desk_linear_flip_to", "10", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 11", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 11"), 
 			    "desk_linear_flip_to", "11", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop...", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop..."), 
 			    "desk_linear_flip_to", NULL,
 			    "syntax: N, example: 1", 1);
 
    /* desk_flip_by_all */
    ACT_GO(desk_flip_by_all);
-   e_action_predef_name_set("Desktop", "Flip Desktop Left (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Left (All Screens)"), 
 			    "desk_flip_by_all", "-1 0", NULL, 0);
-   e_action_predef_name_set("Desktop", "Flip Desktop Right (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Right (All Screens)"), 
 			    "desk_flip_by_all", "1 0", NULL, 0);
-   e_action_predef_name_set("Desktop", "Flip Desktop Up (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Up (All Screens)"), 
 			    "desk_flip_by_all", "0 -1", NULL, 0);
-   e_action_predef_name_set("Desktop", "Flip Desktop Down (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Down (All Screens)"), 
 			    "desk_flip_by_all", "0 1", NULL, 0);
-   e_action_predef_name_set("Desktop", "Flip Desktop By... (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop By... (All Screens)"), 
 			    "desk_flip_by_all", NULL,
 			    "syntax: X-offset Y-offset, example: -1 0", 1);
 
    /* desk_flip_to_all */
    ACT_GO(desk_flip_to_all);
-   e_action_predef_name_set("Desktop", "Flip Desktop To... (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop To... (All Screens)"), 
 			    "desk_flip_to_all", NULL,
 			    "syntax: X Y, example: 1 2", 1);
 
    /* desk_linear_flip_by_all */
    ACT_GO(desk_linear_flip_by_all);
-   e_action_predef_name_set("Desktop", "Flip Desktop Linearly... (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Linearly... (All Screens)"), 
 			    "desk_linear_flip_by_all",
 			    NULL, "syntax: N-offset, example: -2", 1);
 
    /* desk_flip_in_direction */
    ACT_GO_EDGE(desk_flip_in_direction);
-   e_action_predef_name_set("Desktop", "Flip Desktop In Direction...", 
+   e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop In Direction..."), 
 			    "desk_flip_in_direction", NULL, "syntax: N-pixel-offset, example: 25", 1);
 
    /* desk_linear_flip_to_all */
    ACT_GO(desk_linear_flip_to_all);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 0 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 0 (All Screens)"), 
 			    "desk_linear_flip_to_all", "0", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 1 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 1 (All Screens)"), 
 			    "desk_linear_flip_to_all", "1", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 2 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 2 (All Screens)"), 
 			    "desk_linear_flip_to_all", "2", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 3 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 3 (All Screens)"), 
 			    "desk_linear_flip_to_all", "3", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 4 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 4 (All Screens)"), 
 			    "desk_linear_flip_to_all", "4", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 5 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 5 (All Screens)"), 
 			    "desk_linear_flip_to_all", "5", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 6 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 6 (All Screens)"), 
 			    "desk_linear_flip_to_all", "6", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 7 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 7 (All Screens)"), 
 			    "desk_linear_flip_to_all", "7", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 8 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 8 (All Screens)"), 
 			    "desk_linear_flip_to_all", "8", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 9 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 9 (All Screens)"), 
 			    "desk_linear_flip_to_all", "9", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 10 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 10 (All Screens)"), 
 			    "desk_linear_flip_to_all", "10", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop 11 (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 11 (All Screens)"), 
 			    "desk_linear_flip_to_all", "11", NULL, 0);
-   e_action_predef_name_set("Desktop", "Switch To Desktop... (All Screens)", 
+   e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop... (All Screens)"), 
 			    "desk_linear_flip_to_all", NULL,
 			    "syntax: N, example: 1", 1);
 
    /* screen_send_to */
    ACT_GO(screen_send_to);
-   e_action_predef_name_set("Screen", "Send Mouse To Screen 0", 
+   e_action_predef_name_set(N_("Screen"), N_("Send Mouse To Screen 0"), 
 			    "screen_send_to", "0", NULL, 0);
-   e_action_predef_name_set("Screen", "Send Mouse To Screen 1", 
+   e_action_predef_name_set(N_("Screen"), N_("Send Mouse To Screen 1"), 
 			    "screen_send_to", "1", NULL, 0);
-   e_action_predef_name_set("Screen", "Send Mouse To Screen...", 
+   e_action_predef_name_set(N_("Screen"), N_("Send Mouse To Screen..."), 
 			    "screen_send_to", NULL,
 			    "syntax: N, example: 0", 1);
 
    /* screen_send_by */
    ACT_GO(screen_send_by);
-   e_action_predef_name_set("Screen", "Send Mouse Forward 1 Screen", 
+   e_action_predef_name_set(N_("Screen"), N_("Send Mouse Forward 1 Screen"), 
 			    "screen_send_by", "1", NULL, 0);
-   e_action_predef_name_set("Screen", "Send Mouse Back 1 Screen", 
+   e_action_predef_name_set(N_("Screen"), N_("Send Mouse Back 1 Screen"), 
 			    "screen_send_by", "-1", NULL, 0);
-   e_action_predef_name_set("Screen", "Send Mouse Forward/Back Screens...", 
+   e_action_predef_name_set(N_("Screen"), N_("Send Mouse Forward/Back Screens..."), 
 			    "screen_send_by", NULL, 
 			    "syntax: N-offset, example: -2", 1);
 
    /* window_move_to_center */
    ACT_GO(window_move_to_center);
-   e_action_predef_name_set("Window : Actions", "Move To Center", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Move To Center"), 
 			    "window_move_to_center", NULL, NULL, 0);
    /* window_move_to */
    ACT_GO(window_move_to);
-   e_action_predef_name_set("Window : Actions", "Move To...", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Move To..."), 
 			    "window_move_to", NULL,
 			    "syntax: [+,-]X [+,-]Y or * [+,-]Y or [+,-]X *, example: -1 +1", 1);
    /* window_move_by */
    ACT_GO(window_move_by);
-   e_action_predef_name_set("Window : Actions", "Move By...", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Move By..."), 
 			    "window_move_by", NULL,
 			    "syntax: X-offset Y-offset, example: -1 0", 1);
 
    /* window_resize_by */
    ACT_GO(window_resize_by);
-   e_action_predef_name_set("Window : Actions", "Resize By...", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Resize By..."), 
 			    "window_resize_by", NULL,
 			    "syntax: W H, example: 100 150", 1);
 
    /* window_push */
    ACT_GO(window_push);
-   e_action_predef_name_set("Window : Actions", "Push in Direction...", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Push in Direction..."), 
 			    "window_push", NULL,
 			    "syntax: direction, example: up, down, left, right, up-left, up-right, down-left, down-right", 1);
 
    /* window_drag_icon */
    ACT_GO(window_drag_icon);
-   e_action_predef_name_set("Window : Actions", "Drag Icon...", 
+   e_action_predef_name_set(N_("Window : Actions"), N_("Drag Icon..."), 
 			    "window_drag_icon", NULL, NULL, 0);
 
    /* window_desk_move_by */
    ACT_GO(window_desk_move_by);
-   e_action_predef_name_set("Window : Moving", "To Next Desktop", 
+   e_action_predef_name_set(N_("Window : Moving"), N_("To Next Desktop"), 
 			    "window_desk_move_by", "1 0", NULL, 0);
-   e_action_predef_name_set("Window : Moving", "To Previous Desktop", 
+   e_action_predef_name_set(N_("Window : Moving"), N_("To Previous Desktop"), 
 			    "window_desk_move_by", "-1 0", NULL, 0);
-   e_action_predef_name_set("Window : Moving", "By Desktop #...", 
+   e_action_predef_name_set(N_("Window : Moving"), N_("By Desktop #..."), 
 			    "window_desk_move_by", NULL,
 			    "syntax: X-offset Y-offset, example: -2 2", 1);
 
    /* window_desk_move_to */
    ACT_GO(window_desk_move_to);
-   e_action_predef_name_set("Window : Moving", "To Desktop...", 
+   e_action_predef_name_set(N_("Window : Moving"), N_("To Desktop..."), 
 			    "window_desk_move_to", NULL,
 			    "syntax: X Y, example: 0 1", 1);
 
    /* menu_show */
    ACT_GO(menu_show);
-   e_action_predef_name_set("Menu", "Show Main Menu", 
+   e_action_predef_name_set(N_("Menu"), N_("Show Main Menu"), 
 			    "menu_show", "main", NULL, 0);
-   e_action_predef_name_set("Menu", "Show Favorites Menu", "menu_show", 
+   e_action_predef_name_set(N_("Menu"), N_("Show Favorites Menu"), "menu_show", 
 			    "favorites", NULL, 0);
-   e_action_predef_name_set("Menu", "Show All Applications Menu", 
+   e_action_predef_name_set(N_("Menu"), N_("Show All Applications Menu"), 
 			    "menu_show", "all", NULL, 0);
-   e_action_predef_name_set("Menu", "Show Clients Menu", "menu_show", 
+   e_action_predef_name_set(N_("Menu"), N_("Show Clients Menu"), "menu_show", 
 			    "clients", NULL, 0);
-   e_action_predef_name_set("Menu", "Show Menu...", "menu_show", NULL,
+   e_action_predef_name_set(N_("Menu"), N_("Show Menu..."), "menu_show", NULL,
 			    "syntax: MenuName, example: MyMenu", 1);
    ACT_GO_MOUSE(menu_show);
    ACT_GO_KEY(menu_show);
 
    /* exec */
    ACT_GO(exec);
-   e_action_predef_name_set("Launch", "Command", "exec", NULL,
+   e_action_predef_name_set(N_("Launch"), N_("Command"), "exec", NULL,
 			    "syntax: CommandName, example: /usr/bin/xmms", 1);
 
    /* app */
    ACT_GO(app);
-   e_action_predef_name_set("Launch", "Application", "app", NULL, 
+   e_action_predef_name_set(N_("Launch"), N_("Application"), "app", NULL, 
 			    "syntax: , example:", 1);
 
    ACT_GO(restart);
-   e_action_predef_name_set("Enlightenment", "Restart", "restart", 
+   e_action_predef_name_set(N_("Enlightenment"), N_("Restart"), "restart", 
 			    NULL, NULL, 0);
 
    ACT_GO(exit);
-   e_action_predef_name_set("Enlightenment", "Exit", "exit", 
+   e_action_predef_name_set(N_("Enlightenment"), N_("Exit"), "exit", 
 			    NULL, NULL, 0);
 
    ACT_GO(exit_now);
-   e_action_predef_name_set("Enlightenment", "Exit Now", 
+   e_action_predef_name_set(N_("Enlightenment"), N_("Exit Now"), 
 			    "exit_now", NULL, NULL, 0);
 
    ACT_GO(mode_presentation_toggle);
-   e_action_predef_name_set("Enlightenment : Mode",
-			    "Presentation Mode Toggle",
+   e_action_predef_name_set(N_("Enlightenment : Mode"),
+			    N_("Presentation Mode Toggle"),
 			    "mode_presentation_toggle", NULL, NULL, 0);
 
    ACT_GO(mode_offline_toggle);
-   e_action_predef_name_set("Enlightenment : Mode",
-			    "Offline Mode Toggle",
+   e_action_predef_name_set(N_("Enlightenment : Mode"),
+			    N_("Offline Mode Toggle"),
 			    "mode_offline_toggle", NULL, NULL, 0);
 
    ACT_GO(logout);
-   e_action_predef_name_set("System", "Log Out", "logout", 
+   e_action_predef_name_set(N_("System"), N_("Log Out"), "logout", 
 			    NULL, NULL, 0);
 
    ACT_GO(halt_now);
-   e_action_predef_name_set("System", "Power Off Now",
+   e_action_predef_name_set(N_("System"), N_("Power Off Now"),
 			    "halt_now", NULL, NULL, 0);
 
    ACT_GO(halt);
-   e_action_predef_name_set("System", "Power Off", "halt", 
+   e_action_predef_name_set(N_("System"), N_("Power Off"), "halt", 
 			    NULL, NULL, 0);
 
    ACT_GO(reboot);
-   e_action_predef_name_set("System", "Reboot", "reboot", 
+   e_action_predef_name_set(N_("System"), N_("Reboot"), "reboot", 
 			    NULL, NULL, 0);
 
    ACT_GO(suspend);
-   e_action_predef_name_set("System", "Suspend", "suspend", 
+   e_action_predef_name_set(N_("System"), N_("Suspend"), "suspend", 
 			    NULL, NULL, 0);
 
    ACT_GO(hibernate);
-   e_action_predef_name_set("System", "Hibernate", "hibernate", 
+   e_action_predef_name_set(N_("System"), N_("Hibernate"), "hibernate", 
 			    NULL, NULL, 0);
 
    ACT_GO(pointer_resize_push);
@@ -2962,28 +2962,28 @@
 
    /* desk_lock */
    ACT_GO(desk_lock);
-   e_action_predef_name_set("Desktop", "Lock", "desk_lock", 
+   e_action_predef_name_set(N_("Desktop"), N_("Lock"), "desk_lock", 
 			    NULL, NULL, 0);
 
    /* cleanup_windows */
    ACT_GO(cleanup_windows);
-   e_action_predef_name_set("Desktop", "Cleanup Windows", 
+   e_action_predef_name_set(N_("Desktop"), N_("Cleanup Windows"), 
 			    "cleanup_windows", NULL, NULL, 0);
 
    /* delayed_action */
    ACT_GO_KEY(delayed_action);
-   e_action_predef_name_set("Generic : Actions", "Delayed Action", 
+   e_action_predef_name_set(N_("Generic : Actions"), N_("Delayed Action"), 
 			    "delayed_action", NULL, "[0.0 exec xterm] [0.3 exec xev]", 1);
    ACT_GO_MOUSE(delayed_action);
    ACT_END_KEY(delayed_action);
    ACT_END_MOUSE(delayed_action);
 
    ACT_GO_ACPI(dim_screen);
-   e_action_predef_name_set("Acpi", "Dim Screen", "dim_screen", 
+   e_action_predef_name_set(N_("Acpi"), N_("Dim Screen"), "dim_screen", 
 			    NULL, NULL, 0);
 
    ACT_GO_ACPI(undim_screen);
-   e_action_predef_name_set("Acpi", "Undim Screen", "undim_screen", 
+   e_action_predef_name_set(N_("Acpi"), N_("Undim Screen"), "undim_screen", 
 			    NULL, NULL, 0);
 
    return 1;

Log:
note sigusr2 is for fps thing.
  
  

Author:       raster
Date:         2011-01-27 18:24:04 -0800 (Thu, 27 Jan 2011)
New Revision: 56337
Trac:         http://trac.enlightenment.org/e/changeset/56337

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2011-01-27 22:58:28 UTC (rev 56336)
+++ trunk/e/src/bin/e_main.c	2011-01-28 02:24:04 UTC (rev 56337)
@@ -1592,7 +1592,7 @@
      }
    else if (e->number == 2)
      {
-        // FIXME: another core util for doing things with e
+        // comp module has its own handler for this for enabling/disabling fps debug
      }
    return ECORE_CALLBACK_RENEW;
 }

Log:
and extend acpi support some more - allow bus matching too. start
  listing specific device models tested etc. and their  specific tables
  
  

Author:       raster
Date:         2011-02-08 17:17:14 -0800 (Tue, 08 Feb 2011)
New Revision: 56829
Trac:         http://trac.enlightenment.org/e/changeset/56829

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

Modified: trunk/e/src/bin/e_acpi.c
===================================================================
--- trunk/e/src/bin/e_acpi.c	2011-02-09 01:07:52 UTC (rev 56828)
+++ trunk/e/src/bin/e_acpi.c	2011-02-09 01:17:14 UTC (rev 56829)
@@ -25,6 +25,7 @@
 struct _E_ACPI_Device_Multiplexed
 {
    const char *name;
+   const char *bus;
    int         status;
    // ->
    int         type;
@@ -62,17 +63,32 @@
 static E_ACPI_Device_Multiplexed _devices_multiplexed[] =
 {
    /* NB: DO NOT TRANSLATE THESE. */
-   {"sony/hotkey",  0x10, E_ACPI_TYPE_BRIGHTNESS_DOWN},
-   {"sony/hotkey",  0x11, E_ACPI_TYPE_BRIGHTNESS_UP},
-   {"sony/hotkey",  0x12, E_ACPI_TYPE_VIDEO},
-   {"sony/hotkey",  0x14, E_ACPI_TYPE_ZOOM_OUT},
-   {"sony/hotkey",  0x15, E_ACPI_TYPE_ZOOM_IN},
-   {"sony/hotkey",  0x17, E_ACPI_TYPE_HIBERNATE},
-   {"sony/hotkey",  0xa6, E_ACPI_TYPE_ASSIST},
-   {"sony/hotkey",  0x20, E_ACPI_TYPE_S1},
-   {"sony/hotkey",  0xa5, E_ACPI_TYPE_VAIO},
+/* Sony VAIO - VPCF115FM / PCG-81114L - nvidia gfx */
+   {"sony/hotkey", NULL,   0x10, E_ACPI_TYPE_BRIGHTNESS_DOWN},
+   {"sony/hotkey", NULL,   0x11, E_ACPI_TYPE_BRIGHTNESS_UP},
+   {"sony/hotkey", NULL,   0x12, E_ACPI_TYPE_VIDEO},
+   {"sony/hotkey", NULL,   0x14, E_ACPI_TYPE_ZOOM_OUT},
+   {"sony/hotkey", NULL,   0x15, E_ACPI_TYPE_ZOOM_IN},
+   {"sony/hotkey", NULL,   0x17, E_ACPI_TYPE_HIBERNATE},
+   {"sony/hotkey", NULL,   0xa6, E_ACPI_TYPE_ASSIST},
+   {"sony/hotkey", NULL,   0x20, E_ACPI_TYPE_S1},
+   {"sony/hotkey", NULL,   0xa5, E_ACPI_TYPE_VAIO},
+
+/* Sony VAIO - X505 - intel gfx */
+   {"sony/hotkey", NULL,   0x0e, E_ACPI_TYPE_MUTE},
+   {"sony/hotkey", NULL,   0x0f, E_ACPI_TYPE_VOLUME},
+   {"sony/hotkey", NULL,   0x10, E_ACPI_TYPE_BRIGHTNESS},
+   {"sony/hotkey", NULL,   0x12, E_ACPI_TYPE_VIDEO},
    
-   {NULL,           0x00, E_ACPI_TYPE_UNKNOWN}
+/* HP Compaq Presario - CQ61 - intel gfx */
+/** interesting these get auto-mapped to keys in x11. here for documentation
+ ** but not enabled as we can use regular keybinds for these
+   {"video",       "DD03", 0x87, E_ACPI_TYPE_BRIGHTNESS_DOWN},
+   {"video",       "DD03", 0x86, E_ACPI_TYPE_BRIGHTNESS_UP},
+   {"video",       "OVGA", 0x80, E_ACPI_TYPE_VIDEO},
+ */
+/* END */   
+   {NULL,          NULL, 0x00, E_ACPI_TYPE_UNKNOWN}
 };
 
 /* public variables */
@@ -204,7 +220,13 @@
                {
                   for (i = 0; _devices_multiplexed[i].name; i++)
                     {
+                       // if device name matches
                        if ((!strcmp(device, _devices_multiplexed[i].name)) &&
+                           // AND busname not set OR device name matches
+                           (!_devices_multiplexed[i].bus ||
+                               (_devices_multiplexed[i].bus &&
+                                   (!strcmp(bus, _devices_multiplexed[i].bus)))) &&
+                           // AND status matches
                            (_devices_multiplexed[i].status == status))
                          {
                             acpi_event->type = _devices_multiplexed[i].type;
@@ -215,6 +237,7 @@
                }
              if (!done)
                {
+                  // if device name matches
                   for (i = 0; _devices_simple[i].name; i++)
                     {
                        if (!strcmp(device, _devices_simple[i].name))

Modified: trunk/e/src/bin/e_acpi.h
===================================================================
--- trunk/e/src/bin/e_acpi.h	2011-02-09 01:07:52 UTC (rev 56828)
+++ trunk/e/src/bin/e_acpi.h	2011-02-09 01:17:14 UTC (rev 56829)
@@ -23,7 +23,10 @@
    E_ACPI_TYPE_BRIGHTNESS_UP,
    E_ACPI_TYPE_ASSIST,
    E_ACPI_TYPE_S1,
-   E_ACPI_TYPE_VAIO
+   E_ACPI_TYPE_VAIO,
+   E_ACPI_TYPE_MUTE,
+   E_ACPI_TYPE_VOLUME,
+   E_ACPI_TYPE_BRIGHTNESS
 } E_Acpi_Type;
 
 /* enum for acpi signals */

Log:
pointed out by doyoun kim - why ever this was -2 beats me. it'd skip a
  layer below the given one.
  
  

Author:       raster
Date:         2011-02-15 19:51:08 -0800 (Tue, 15 Feb 2011)
New Revision: 57074
Trac:         http://trac.enlightenment.org/e/changeset/57074

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

Modified: trunk/e/src/bin/e_container.c
===================================================================
--- trunk/e/src/bin/e_container.c	2011-02-16 03:46:27 UTC (rev 57073)
+++ trunk/e/src/bin/e_container.c	2011-02-16 03:51:08 UTC (rev 57074)
@@ -669,7 +669,7 @@
    else
      {
 	/* Need to check the layers below */
-	for (i = pos - 2; i >= 0; i--)
+	for (i = pos - 1; i >= 0; i--)
 	  {
 	     if ((bd->zone->container->layers[i].clients) &&
 		 (l = eina_list_last(bd->zone->container->layers[i].clients)))

Log:
fix case where we could have x fatal stuff happen during shutdown or
  we try use x on shutdown when x io fatal conditions have happened.
  x_fatal flag around for that now too. tested. seems to now be happy
  and not cause aborts on shutdown when x has gone.
  
  

Author:       raster
Date:         2011-02-15 21:20:13 -0800 (Tue, 15 Feb 2011)
New Revision: 57075
Trac:         http://trac.enlightenment.org/e/changeset/57075

Modified:
  trunk/e/src/bin/e.h trunk/e/src/bin/e_alert.c trunk/e/src/bin/e_desklock.c trunk/e/src/bin/e_main.c trunk/e/src/bin/e_menu.c trunk/e/src/bin/e_module.c trunk/e/src/bin/e_shelf.c 

Modified: trunk/e/src/bin/e.h
===================================================================
--- trunk/e/src/bin/e.h	2011-02-16 03:51:08 UTC (rev 57074)
+++ trunk/e/src/bin/e.h	2011-02-16 05:20:13 UTC (rev 57075)
@@ -231,6 +231,8 @@
 extern EAPI int     starting;
 extern EAPI int     stopping;
 
+extern EAPI Eina_Bool x_fatal;
+
 extern EAPI unsigned long e_alert_composite_win;
 
 #endif

Modified: trunk/e/src/bin/e_alert.c
===================================================================
--- trunk/e/src/bin/e_alert.c	2011-02-16 03:51:08 UTC (rev 57074)
+++ trunk/e/src/bin/e_alert.c	2011-02-16 05:20:13 UTC (rev 57075)
@@ -76,10 +76,13 @@
 EINTERN int
 e_alert_shutdown(void)
 {
-   XDestroyWindow(dd, win);
-   XFreeGC(dd, gc);
-   XFreeFont(dd, fs);
-   XCloseDisplay(dd);
+   if (!x_fatal)
+     {
+        XDestroyWindow(dd, win);
+        XFreeGC(dd, gc);
+        XFreeFont(dd, fs);
+        XCloseDisplay(dd);
+     }
    title = NULL;
    str1 = NULL;
    str2 = NULL;

Modified: trunk/e/src/bin/e_desklock.c
===================================================================
--- trunk/e/src/bin/e_desklock.c	2011-02-16 03:51:08 UTC (rev 57074)
+++ trunk/e/src/bin/e_desklock.c	2011-02-16 05:20:13 UTC (rev 57075)
@@ -109,7 +109,8 @@
 EINTERN int
 e_desklock_shutdown(void)
 {
-   e_desklock_hide();
+   if (!x_fatal)
+      e_desklock_hide();
    if (e_config->desklock_background)
      e_filereg_deregister(e_config->desklock_background);
 

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2011-02-16 03:51:08 UTC (rev 57074)
+++ trunk/e/src/bin/e_main.c	2011-02-16 05:20:13 UTC (rev 57075)
@@ -9,6 +9,7 @@
 #endif
 
 #include <fcntl.h>
+#include <setjmp.h>
 
 /*
  * i need to make more use of these when i'm baffled as to when something is
@@ -59,6 +60,7 @@
 */
 
 EAPI int e_precache_end = 0;
+EAPI Eina_Bool x_fatal = EINA_FALSE;
 
 static int really_know = 0;
 
@@ -94,6 +96,9 @@
 static int _e_cacheburst = 0;
 static Eina_Bool locked = EINA_FALSE;
 
+static jmp_buf x_fatal_buf;
+static Eina_Bool inloop = EINA_FALSE;
+
 static Eina_List *_e_main_idler_before_list = NULL;
 
 static Ecore_Idle_Enterer *_e_main_idle_enterer_before  = NULL;
@@ -1155,11 +1160,17 @@
    ecore_timer_add(5.0, stdbg, NULL);
 #endif
 
-   ecore_main_loop_begin();
-
-   e_canvas_idle_flush();
+   inloop = EINA_TRUE;
+   if (!setjmp(x_fatal_buf))
+      ecore_main_loop_begin();
+   else
+      printf("FATAL: X died. Connection gone. abbreviated shutdown\n");
+   inloop = EINA_FALSE;
+   
    stopping = 1;
 
+   if (!x_fatal) e_canvas_idle_flush();
+
    /* ask all modules to save their config and then shutdown */
    /* NB: no need to do this as config shutdown will flush any saves */
    /*     and all changed config was already saved before */
@@ -1249,6 +1260,7 @@
 static int
 _e_main_x_shutdown(void)
 {
+   if (x_fatal) return 1;
 /* ecore_x_ungrab(); */
    ecore_x_focus_reset();
    ecore_x_events_allow_all();
@@ -1561,8 +1573,13 @@
 _e_main_cb_x_fatal(void *data __UNUSED__)
 {
    e_error_message_show("Lost X connection.");
-   e_sys_action_do(E_SYS_EXIT, NULL);
-//   ecore_main_loop_quit();
+   ecore_main_loop_quit();
+   // x is foobared - best to get the hell out of the mainloop
+   if (!x_fatal)
+     {
+        x_fatal = EINA_TRUE;
+        if (inloop) longjmp(x_fatal_buf, -99);
+     }
 }
 
 static Eina_Bool

Modified: trunk/e/src/bin/e_menu.c
===================================================================
--- trunk/e/src/bin/e_menu.c	2011-02-16 03:51:08 UTC (rev 57074)
+++ trunk/e/src/bin/e_menu.c	2011-02-16 05:20:13 UTC (rev 57075)
@@ -176,12 +176,15 @@
    E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_wheel_handler);
    E_FN_DEL(ecore_event_handler_del, _e_menu_window_shape_handler);
 
-   EINA_LIST_FREE(_e_active_menus, m)
+   if (!x_fatal)
      {
-	m->active = 0;
-	_e_menu_unrealize(m);
-	m->in_active_list = 0;
-	e_object_unref(E_OBJECT(m));
+        EINA_LIST_FREE(_e_active_menus, m)
+          {
+             m->active = 0;
+             _e_menu_unrealize(m);
+             m->in_active_list = 0;
+             e_object_unref(E_OBJECT(m));
+          }
      }
    _e_active_menus = NULL;
    if (_e_menu_categories)

Modified: trunk/e/src/bin/e_module.c
===================================================================
--- trunk/e/src/bin/e_module.c	2011-02-16 03:51:08 UTC (rev 57074)
+++ trunk/e/src/bin/e_module.c	2011-02-16 05:20:13 UTC (rev 57075)
@@ -45,17 +45,24 @@
 #endif
 
    /* do not use EINA_LIST_FREE! e_object_del modifies list */
-   while (_e_modules)
+   if (x_fatal)
      {
-	m = _e_modules->data;
-	if ((m) && (m->enabled) && !(m->error))
-	  {
-	     m->func.save(m);
-	     m->func.shutdown(m);
-	     m->enabled = 0;
-	  }
-	e_object_del(E_OBJECT(m));
+        e_module_save_all();
      }
+   else
+     {
+        while (_e_modules)
+          {
+             m = _e_modules->data;
+             if ((m) && (m->enabled) && !(m->error))
+               {
+                  m->func.save(m);
+                  m->func.shutdown(m);
+                  m->enabled = 0;
+               }
+             e_object_del(E_OBJECT(m));
+          }
+     }
 
    return 1;
 }

Modified: trunk/e/src/bin/e_shelf.c
===================================================================
--- trunk/e/src/bin/e_shelf.c	2011-02-16 03:51:08 UTC (rev 57074)
+++ trunk/e/src/bin/e_shelf.c	2011-02-16 05:20:13 UTC (rev 57075)
@@ -42,6 +42,7 @@
 EINTERN int
 e_shelf_shutdown(void)
 {
+   if (x_fatal) return 1;
    while (shelves)
      {
 	E_Shelf *es;

Log:
work around weird eina-ism fo strlening a strign it already knows the
  length of.
  
  

Author:       raster
Date:         2011-02-20 22:20:28 -0800 (Sun, 20 Feb 2011)
New Revision: 57202
Trac:         http://trac.enlightenment.org/e/changeset/57202

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

Modified: trunk/e/src/bin/e_acpi.c
===================================================================
--- trunk/e/src/bin/e_acpi.c	2011-02-21 06:12:28 UTC (rev 57201)
+++ trunk/e/src/bin/e_acpi.c	2011-02-21 06:20:28 UTC (rev 57202)
@@ -184,11 +184,13 @@
    Ecore_Con_Event_Server_Data *ev;
    E_Event_Acpi *acpi_event;
    int sig, status, i, done = 0;
-   char device[1024], bus[1024], *sdata;
+   char device[1024], bus[1024], *sdata, *stmp;
    const char *str, *p;
    
    ev = event;
 
+   if ((!ev->data) || (ev->size < 1)) return ECORE_CALLBACK_PASS_ON;
+   
    /* write out actual acpi received data to stdout for debugging
    res = fwrite(ev->data, ev->size, 1, stdout);
     */
@@ -196,7 +198,10 @@
     * a blob of data. copy to string and 0 byte terminate it so it can be
     * string-swizzled/parsed etc. */
    if (!acpibuf) acpibuf = eina_strbuf_new();
-   eina_strbuf_append_n(acpibuf, ev->data, ev->size);
+   stmp = alloca(ev->size + 1);
+   memcpy(stmp, ev->data, ev->size);
+   stmp[ev->size] = 0;
+   eina_strbuf_append_n(acpibuf, stmp, ev->size);
    str = eina_strbuf_string_get(acpibuf);
    p = strchr(str, '\n');
    if (!p) return ECORE_CALLBACK_PASS_ON;

Log:
first step in removing container win (compositor can replace it al
  with its own objects directly and expose comp canvas to gadgets/fm and
  so on just like container canvas does now. a lot of e's code can be
  simplified if we went totally compositing... worry about that for e18,
  but for now put in hooks).
  
  

Author:       raster
Date:         2011-03-26 19:24:19 -0700 (Sat, 26 Mar 2011)
New Revision: 58112
Trac:         http://trac.enlightenment.org/e/changeset/58112

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-03-27 00:36:53 UTC (rev 58111)
+++ trunk/e/src/bin/e_config.c	2011-03-27 02:24:19 UTC (rev 58112)
@@ -891,6 +891,8 @@
    E_CONFIG_VAL(D, T, exec.show_run_dialog, UCHAR);
    E_CONFIG_VAL(D, T, exec.show_exit_dialog, UCHAR);
 
+   E_CONFIG_VAL(D, T, null_container_win, UCHAR);
+   
    e_config_load();
 
    e_config_save_queue();
@@ -1298,6 +1300,8 @@
    E_CONFIG_LIMIT(e_config->exec.show_run_dialog, 0, 1);
    E_CONFIG_LIMIT(e_config->exec.show_exit_dialog, 0, 1);
 
+   E_CONFIG_LIMIT(e_config->null_container_win, 0, 1);
+   
    /* FIXME: disabled auto apply because it causes problems */
    e_config->cfgdlg_auto_apply = 0;
    /* FIXME: desklock personalized password id disabled for security reasons */

Modified: trunk/e/src/bin/e_config.h
===================================================================
--- trunk/e/src/bin/e_config.h	2011-03-27 00:36:53 UTC (rev 58111)
+++ trunk/e/src/bin/e_config.h	2011-03-27 02:24:19 UTC (rev 58112)
@@ -338,6 +338,8 @@
       Eina_Bool show_run_dialog;
       Eina_Bool show_exit_dialog;
    } exec;
+   
+   unsigned char null_container_win;
 };
 
 struct _E_Config_Syscon_Action

Modified: trunk/e/src/bin/e_container.c
===================================================================
--- trunk/e/src/bin/e_container.c	2011-03-27 00:36:53 UTC (rev 58111)
+++ trunk/e/src/bin/e_container.c	2011-03-27 02:24:19 UTC (rev 58112)
@@ -83,7 +83,7 @@
 				     0, 0, con->w, con->h, 1, 1,
 				     &(con->bg_win));
    e_canvas_add(con->bg_ecore_evas);
-   con->event_win = ecore_x_window_input_new(con->bg_win, 0, 0, con->w, con->h);
+   con->event_win = ecore_x_window_input_new(con->win, 0, 0, con->w, con->h);
    ecore_x_window_show(con->event_win);
    con->bg_evas = ecore_evas_get(con->bg_ecore_evas);
    ecore_evas_name_class_set(con->bg_ecore_evas, "E", "Background_Window");
@@ -189,12 +189,18 @@
    E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
 
    if (con->visible) return;
-   ecore_evas_show(con->bg_ecore_evas);
+   if (!e_config->null_container_win)
+      ecore_evas_show(con->bg_ecore_evas);
    ecore_x_window_configure(con->bg_win,
 			    ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
 			    ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
 			    0, 0, 0, 0, 0,
 			    con->layers[0].win, ECORE_X_WINDOW_STACK_BELOW);
+   ecore_x_window_configure(con->event_win,
+			    ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
+			    ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
+			    0, 0, 0, 0, 0,
+			    con->layers[0].win, ECORE_X_WINDOW_STACK_BELOW);
    if (con->win != con->manager->win)
      ecore_x_window_show(con->win);
    ecore_x_icccm_state_set(con->bg_win, ECORE_X_WINDOW_STATE_HINT_NORMAL);
@@ -272,7 +278,9 @@
    con->h = h;
    if (con->win != con->manager->win)
      ecore_x_window_resize(con->win, con->w, con->h);
-   ecore_evas_resize(con->bg_ecore_evas, con->w, con->h);
+   ecore_x_window_resize(con->event_win, con->w, con->h);
+   if (!e_config->null_container_win)
+      ecore_evas_resize(con->bg_ecore_evas, con->w, con->h);
    evas_object_resize(con->bg_blank_object, con->w, con->h);
    _e_container_resize_handle(con);
 }
@@ -289,7 +297,9 @@
    con->h = h;
    if (con->win != con->manager->win)
      ecore_x_window_move_resize(con->win, con->x, con->y, con->w, con->h);
-   ecore_evas_resize(con->bg_ecore_evas, con->w, con->h);
+   ecore_x_window_move_resize(con->event_win, con->x, con->y, con->w, con->h);
+   if (!e_config->null_container_win)
+      ecore_evas_resize(con->bg_ecore_evas, con->w, con->h);
    evas_object_move(con->bg_blank_object, con->x, con->y);
    evas_object_resize(con->bg_blank_object, con->w, con->h);
    _e_container_resize_handle(con);

Log:
oops - fix null container. now actually 1x1 from start.
  
  

Author:       raster
Date:         2011-03-28 20:08:57 -0700 (Mon, 28 Mar 2011)
New Revision: 58169
Trac:         http://trac.enlightenment.org/e/changeset/58169

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

Modified: trunk/e/src/bin/e_container.c
===================================================================
--- trunk/e/src/bin/e_container.c	2011-03-29 02:28:41 UTC (rev 58168)
+++ trunk/e/src/bin/e_container.c	2011-03-29 03:08:57 UTC (rev 58169)
@@ -79,9 +79,14 @@
    else
      con->win = con->manager->win;
 
-   con->bg_ecore_evas = e_canvas_new(e_config->evas_engine_container, con->win,
-				     0, 0, con->w, con->h, 1, 1,
-				     &(con->bg_win));
+   if (!e_config->null_container_win)
+      con->bg_ecore_evas = e_canvas_new(e_config->evas_engine_container, con->win,
+                                        0, 0, con->w, con->h, 1, 1,
+                                        &(con->bg_win));
+   else
+      con->bg_ecore_evas = e_canvas_new(e_config->evas_engine_container, con->win,
+                                        0, 0, 1, 1, 1, 1,
+                                        &(con->bg_win));
    e_canvas_add(con->bg_ecore_evas);
    con->event_win = ecore_x_window_input_new(con->win, 0, 0, con->w, con->h);
    ecore_x_window_show(con->event_win);

Log:
dont wait until its hung to kill -9 it .. as the user selected kill.
  just give it a timeout from the sigint. :)
  
  

Author:       raster
Date:         2011-04-04 16:51:46 -0700 (Mon, 04 Apr 2011)
New Revision: 58341
Trac:         http://trac.enlightenment.org/e/changeset/58341

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-04 22:54:42 UTC (rev 58340)
+++ trunk/e/src/bin/e_border.c	2011-04-04 23:51:46 UTC (rev 58341)
@@ -8382,11 +8382,12 @@
    E_Border *bd;
 
    bd = data;
-   if (bd->hung)
-     {
+// dont wait until it's hung -    
+//   if (bd->hung)
+//     {
         if (bd->client.netwm.pid > 1)
           kill(bd->client.netwm.pid, SIGKILL);
-     }
+//     }
    bd->kill_timer = NULL;
    return ECORE_CALLBACK_CANCEL;
 }

Log:
From: Doyun Kang <doyoun.kang@...>
  
  Add support for shape input inheritance alongside normal shape support.
  
  

Author:       raster
Date:         2011-04-13 02:06:34 -0700 (Wed, 13 Apr 2011)
New Revision: 58622
Trac:         http://trac.enlightenment.org/e/changeset/58622

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

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-04-13 09:06:05 UTC (rev 58621)
+++ trunk/e/src/bin/e_border.c	2011-04-13 09:06:34 UTC (rev 58622)
@@ -200,6 +200,7 @@
 static void _e_border_frame_replace(E_Border *bd,
 				    Eina_Bool argb);
 
+static void _e_border_shape_input_rectangle_set(E_Border* bd);
 static void _e_border_show(E_Border *bd);
 static void _e_border_hide(E_Border *bd);
 
@@ -599,6 +600,7 @@
    bd->changes.icon = 1;
    bd->changes.size = 1;
    bd->changes.shape = 1;
+   bd->changes.shape_input = 1;
    
    bd->offer_resistance = 1;
 
@@ -1305,6 +1307,10 @@
         bd->need_shape_merge = 1;
         bd->need_shape_export = 1;
      }
+   if (bd->shaped_input)
+     {
+        bd->need_shape_merge = 1;
+     }
 
    if (bd->internal_ecore_evas)
      {
@@ -2074,15 +2080,15 @@
              bd->need_shape_merge = 1;
              bd->need_shape_export = 1;
           }
+        if (bd->shaped_input)
+          {
+             bd->need_shape_merge = 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 = E_NEW(E_Event_Border_Resize, 1);
@@ -2182,15 +2188,15 @@
              bd->need_shape_merge = 1;
              bd->need_shape_export = 1;
           }
+        if (bd->shaped_input)
+          {
+             bd->need_shape_merge = 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 = E_NEW(E_Event_Border_Resize, 1);
@@ -2876,6 +2882,68 @@
    return focused;
 }
 
+static void 
+_e_border_shape_input_rectangle_set(E_Border* bd)
+{
+   if (!bd) return;
+
+   if (bd->shaped_input)
+     {
+        Ecore_X_Rectangle rects[4];
+        Ecore_X_Window twin, twin2;
+        int x, y;
+        
+        twin = ecore_x_window_override_new(bd->zone->container->scratch_win, 
+                                           0, 0, bd->w, bd->h);
+        rects[0].x = 0;
+        rects[0].y = 0;
+        rects[0].width = bd->w;
+        rects[0].height = bd->client_inset.t;
+        rects[1].x = 0;
+        rects[1].y = bd->client_inset.t;
+        rects[1].width = bd->client_inset.l;
+        rects[1].height = bd->h - bd->client_inset.t - bd->client_inset.b;
+        rects[2].x = bd->w - bd->client_inset.r;
+        rects[2].y = bd->client_inset.t;
+        rects[2].width = bd->client_inset.r;
+        rects[2].height = bd->h - bd->client_inset.t - bd->client_inset.b;
+        rects[3].x = 0;
+        rects[3].y = bd->h - bd->client_inset.b;
+        rects[3].width = bd->w;
+        rects[3].height = bd->client_inset.b;
+        ecore_x_window_shape_input_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);
+        x = 0;
+        y = 0;
+        if ((bd->shading) || (bd->shaded))
+          {
+             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.w;
+          }
+        ecore_x_window_shape_input_window_set_xy(twin2, bd->client.win,
+                                                 x, y);
+        ecore_x_window_shape_input_rectangle_clip(twin2, 0, 0,
+                                                  bd->w - bd->client_inset.l - bd->client_inset.r,
+                                                  bd->h - bd->client_inset.t - bd->client_inset.b);
+        ecore_x_window_shape_input_window_add_xy(twin, twin2,
+                                                 bd->client_inset.l,
+                                                 bd->client_inset.t);
+        ecore_x_window_shape_input_window_set(bd->win, twin);
+        ecore_x_window_free(twin2);
+        ecore_x_window_free(twin);
+     }
+   else
+      ecore_x_composite_window_events_enable(bd->win);
+}
+
 EAPI void
 e_border_idler_before(void)
 {
@@ -2939,7 +3007,6 @@
 		       _e_border_show(bd);
 		       bd->changes.visible = 0;
 		    }
-		  
                }
              e_container_border_list_free(bl);
           }
@@ -3010,7 +3077,9 @@
    
    if (!bd->comp_hidden)
      {
-	ecore_x_composite_window_events_enable(bd->win);
+        _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);
      }
 			    
@@ -3814,6 +3883,10 @@
         bd->need_shape_merge = 1;
         bd->need_shape_export = 1;
      }
+   if (bd->shaped_input)
+     {
+        bd->need_shape_merge = 1;
+     }
    _e_border_client_move_resize_send(bd);
 }
 
@@ -4991,6 +5064,20 @@
 
    e = ev;
    bd = e_border_find_by_client_window(e->win);
+
+   if (e->type == ECORE_X_SHAPE_INPUT)
+     {
+        if (bd)
+          {
+             bd->need_shape_merge = 1;
+// YYY             bd->shaped_input = 1;
+             bd->changes.shape_input = 1;
+             bd->changed = 1;
+          }
+
+        return ECORE_CALLBACK_PASS_ON;
+     }
+
    if (bd)
      {
         bd->changes.shape = 1;
@@ -6536,12 +6623,63 @@
           }
         else
           {
+             // FIXME: no rects i think can mean... totally empty window
              bd->client.shaped = 0;
              if (!bd->bordername)
                bd->client.border.changed = 1;
           }
         bd->need_shape_merge = 1;
      }
+   if (bd->changes.shape_input)
+     {
+        Ecore_X_Rectangle *rects;
+        int num;
+        
+        bd->changes.shape_input = 0;
+        rects = ecore_x_window_shape_input_rectangles_get(bd->client.win, &num);
+        if (rects)
+          {
+             int cw = 0, ch = 0;
+
+             /* This doesn't fix the race, but makes it smaller. we detect
+              * this and if cw and ch != client w/h then mark this as needing
+              * a shape change again to fixup next event loop.
+              */
+             ecore_x_window_size_get(bd->client.win, &cw, &ch);
+             if ((cw != bd->client.w) || (ch != bd->client.h))
+                bd->changes.shape_input = 1;
+             if ((num == 1) &&
+                 (rects[0].x == 0) &&
+                 (rects[0].y == 0) &&
+                 ((int)rects[0].width == cw) &&
+                 ((int)rects[0].height == ch))
+               {
+                  if (bd->shaped_input)
+                    {
+                       bd->shaped_input = 0;
+                       if (!bd->bordername)
+                          bd->client.border.changed = 1;
+                    }
+               }
+             else
+               {
+                  if (!bd->shaped_input)
+                    {
+                       bd->shaped_input = 1;
+                       if (!bd->bordername)
+                          bd->client.border.changed = 1;
+                    }
+               }
+             free(rects);
+          }
+        else
+          {
+             bd->shaped_input = 1;
+             if (!bd->bordername)
+                bd->client.border.changed = 1;
+          }
+        bd->need_shape_merge = 1;
+     }
    if (bd->client.mwm.fetch.hints)
      {
         int pb;
@@ -7379,12 +7517,14 @@
 
    if (bd->need_shape_merge)
      {
+        _e_border_shape_input_rectangle_set(bd);
         if ((bd->shaped) || (bd->client.shaped))
           {
              Ecore_X_Window twin, twin2;
              int x, y;
 
-             twin = ecore_x_window_override_new(bd->win, 0, 0, bd->w, bd->h);
+             twin = ecore_x_window_override_new
+                (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
@@ -7409,9 +7549,10 @@
                   rects[3].height = bd->client_inset.b;
                   ecore_x_window_shape_rectangles_set(twin, rects, 4);
                }
-             twin2 = ecore_x_window_override_new(bd->win, 0, 0,
-                                                 bd->w - bd->client_inset.l - bd->client_inset.r,
-                                                 bd->h - bd->client_inset.t - bd->client_inset.b);
+             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);
              x = 0;
              y = 0;
              if ((bd->shading) || (bd->shaded))
@@ -7904,6 +8045,10 @@
         bd->need_shape_merge = 1;
         bd->need_shape_export = 1;
      }
+   if (bd->shaped_input)
+     {
+        bd->need_shape_merge = 1;
+     }
    bd->changes.size = 1;
    bd->changed = 1;
 
@@ -8702,7 +8847,7 @@
      }
    else
      {
-	ecore_x_composite_window_events_enable(bd->win);
+        _e_border_shape_input_rectangle_set(bd);
 	ecore_x_window_ignore_set(bd->win, EINA_FALSE);
      }
 }

Modified: trunk/e/src/bin/e_border.h
===================================================================
--- trunk/e/src/bin/e_border.h	2011-04-13 09:06:05 UTC (rev 58621)
+++ trunk/e/src/bin/e_border.h	2011-04-13 09:06:34 UTC (rev 58622)
@@ -427,6 +427,7 @@
    unsigned int    deskshow : 1;
    unsigned int    sticky : 1;
    unsigned int    shaped : 1;
+   unsigned int    shaped_input : 1;
    unsigned int    need_shape_merge : 1;
    unsigned int    need_shape_export : 1;
    unsigned int    fullscreen : 1;
@@ -530,6 +531,7 @@
       unsigned char shading : 1;
       unsigned char shaded : 1;
       unsigned char shape : 1;
+      unsigned char shape_input : 1;
       unsigned char icon : 1;
    } changes;
 

Modified: trunk/e/src/bin/e_container.c
===================================================================
--- trunk/e/src/bin/e_container.c	2011-04-13 09:06:05 UTC (rev 58621)
+++ trunk/e/src/bin/e_container.c	2011-04-13 09:06:34 UTC (rev 58622)
@@ -134,6 +134,9 @@
    snprintf(name, sizeof(name), _("Container %d"), con->num);
    con->name = eina_stringshare_add(name);
 
+   /* create a scratch window for putting stuff into */
+   con->scratch_win = ecore_x_window_override_new(con->win, 0, 0, 7, 7);
+   
    /* init layers */
    for (i = 0; i < 7; i++)
      {
@@ -931,24 +934,25 @@
 _e_container_free(E_Container *con)
 {
    Eina_List *l;
+   int i;
 
+   ecore_x_window_free(con->scratch_win);
    ecore_x_window_free(con->event_win);
    /* We can't use e_object_del here, because border adds a ref to itself
     * when it is removed, and the ref is never unref'ed */
+   for (i = 0; i < 7; i++)
+     {
+        ecore_x_window_free(con->layers[i].win);
 /* FIXME: had to disable this as it was freeing already freed items during
  * looping (particularly remember/lock config dialogs). this is just
  * disabled until we put in some special handling for this
  *
-   int i;
-
-   for (i = 0; i < 7; i++)
-     {
 	EINA_LiST_FOREACH(con->layers[i].clients, l, tmp)
 	  {
 	     e_object_free(E_OBJECT(tmp));
 	  }
+ */   
      }
- */   
    l = con->zones;
    con->zones = NULL;
    E_FREE_LIST(l, e_object_del);

Modified: trunk/e/src/bin/e_container.h
===================================================================
--- trunk/e/src/bin/e_container.h	2011-04-13 09:06:05 UTC (rev 58621)
+++ trunk/e/src/bin/e_container.h	2011-04-13 09:06:34 UTC (rev 58622)
@@ -51,6 +51,8 @@
       Ecore_X_Window win;
       Eina_List *clients;
    } layers[7];
+   
+   Ecore_X_Window       scratch_win;
 };
 
 struct _E_Border_List

Log:
e17 -> use eina prefix stuff.
  
  

Author:       raster
Date:         2011-04-24 01:06:18 -0700 (Sun, 24 Apr 2011)
New Revision: 58853
Trac:         http://trac.enlightenment.org/e/changeset/58853

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2011-04-24 07:57:16 UTC (rev 58852)
+++ trunk/e/src/bin/e_main.c	2011-04-24 08:06:18 UTC (rev 58853)
@@ -216,38 +216,7 @@
 		"       This is because it is not on Linux AND has been\n"
 		"       Executed strangely. This is unusual.\n"
 		);
-	e_prefix_fallback();
      }
-   else
-     {
-	/* do some extra tests to see if the prefix really is right */
-	char buf[PATH_MAX];
-
-	e_prefix_data_concat_static(buf, "data/themes/default.edj");
-	if (!ecore_file_exists(buf))
-	  {
-	     printf("WARNING: Prefix guess was wrong. Guessed:\n"
-		    "         %s\n"
-		    "         Tried to find file:\n"
-		    "         %s\n",
-		    e_prefix_get(), buf);
-	     e_prefix_fallback();
-	  }
-	else
-	  {
-	     snprintf(buf, sizeof(buf), "%s/enlightenment/modules",
-		      e_prefix_lib_get());
-	     if (!ecore_file_is_dir(buf))
-	       {
-		  printf("WARNING: Prefix guess was wrong. Guessed:\n"
-			 "         %s\n"
-			 "         Tried to find directory:\n"
-			 "         %s\n",
-			 e_prefix_get(), buf);
-		  e_prefix_fallback();
-	       }
-	  }
-     }
    TS("prefix done");
 
    /* for debugging by redirecting stdout of e to a log file to tail */

Modified: trunk/e/src/bin/e_prefix.c
===================================================================
--- trunk/e/src/bin/e_prefix.c	2011-04-24 07:57:16 UTC (rev 58852)
+++ trunk/e/src/bin/e_prefix.c	2011-04-24 08:06:18 UTC (rev 58853)
@@ -1,556 +1,125 @@
 #include "e.h"
 
-/* local subsystem functions */
-static int _e_prefix_share_hunt(void);
-static int _e_prefix_fallbacks(void);
-static int _e_prefix_try_proc(void);
-static int _e_prefix_try_argv(char *argv0);
+static Eina_Prefix *pfx = NULL;
 
-/* local subsystem globals */
-static char *_exe_path = NULL;
-static char *_prefix_path = NULL;
-static char *_prefix_path_locale = NULL;
-static char *_prefix_path_bin = NULL;
-static char *_prefix_path_data = NULL;
-static char *_prefix_path_lib = NULL;
+static const char *_prefix_path_data = NULL;
+static unsigned int _prefix_path_data_len = 0;
 
-static size_t _prefix_path_data_len = 0;
-
-#define PREFIX_CACHE_FILE 1
-#define SHARE_D "share/enlightenment"
-#define MAGIC_FILE "AUTHORS"
-#define MAGIC_DAT SHARE_D"/"MAGIC_FILE
-#define LOCALE_D "share/locale"
-
 /* externally accessible functions */
 EAPI int
 e_prefix_determine(char *argv0)
 {
-   char *p, buf[4096];
+   if (pfx) return 1;
+   
+   pfx = eina_prefix_new(argv0, e_prefix_determine, 
+                         "E", "enlightenment", "AUTHORS",
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         LOCALE_DIR);
+   if (!pfx) return 0;
+   
+   _prefix_path_data = eina_prefix_data_get(pfx);
+   _prefix_path_data_len= strlen(_prefix_path_data);
 
-   e_prefix_shutdown();
-
-   /* if user provides E_PREFIX - then use that or also more specific sub
-    * dirs for bin, lib, data and locale */
-   if (getenv("E_PREFIX"))
-     {
-	_prefix_path = strdup(getenv("E_PREFIX"));
-	if (getenv("E_BIN_DIR"))
-          _prefix_path_bin = strdup(getenv("E_BIN_DIR"));
-	else
-          {
-             snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
-             _prefix_path_bin = strdup(buf);
-             e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-          }
-
-	if (getenv("E_LIB_DIR"))
-          _prefix_path_lib = strdup(getenv("E_LIB_DIR"));
-	else
-          {
-             snprintf(buf, sizeof(buf), "%s/lib", _prefix_path);
-             _prefix_path_lib = strdup(buf);
-             e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-          }
-	
-	if (getenv("E_DATA_DIR"))
-	  {
-	     _prefix_path_data = strdup(getenv("E_DATA_DIR"));
-	     _prefix_path_data_len = strlen(_prefix_path_data);
-	  }
-	else
-          {
-             _prefix_path_data_len = snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path);
-             _prefix_path_data = strdup(buf);
-             e_util_env_set("E_DATA_DIR", _prefix_path_data);
-          }
-	
-	if (getenv("E_LOCALE_DIR"))
-          _prefix_path_locale = strdup(getenv("E_LOCALE_DIR"));
-	else
-          {
-             snprintf(buf, sizeof(buf), "%s/"LOCALE_D, _prefix_path);
-             _prefix_path_locale = strdup(buf);
-             e_util_env_set("E_LOCALE_DIR", _prefix_path_locale);
-          }
-	return 1;
-     }
-   /* no env var - examine process and possible argv0 */
-   if (!_e_prefix_try_proc())
-     {
-	if (!_e_prefix_try_argv(argv0))
-	  {
-	     e_prefix_fallback();
-             e_util_env_set("E_PREFIX", _prefix_path);
-             e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-             e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-             e_util_env_set("E_DATA_DIR", _prefix_path_data);
-	     return 0;
-	  }
-     }
-   /* _exe_path is now a full absolute path TO this exe - figure out rest */
-   /*   if
-    * exe        = /blah/whatever/bin/exe
-    *   then
-    * prefix     = /blah/whatever
-    * bin_dir    = /blah/whatever/bin
-    * data_dir   = /blah/whatever/share/enlightenment
-    * locale_dir = /blah/whatever/share/locale
-    * lib_dir    = /blah/whatever/lib
-    */
-   p = strrchr(_exe_path, '/');
-   if (p)
-     {
-	p--;
-	while (p >= _exe_path)
-	  {
-	     if (*p == '/')
-	       {
-		  _prefix_path = malloc(p - _exe_path + 1);
-		  if (_prefix_path)
-		    {
-		       eina_strlcpy(_prefix_path, _exe_path, p - _exe_path + 1);
-
-		       /* bin and lib always together */
-		       snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
-		       _prefix_path_bin = strdup(buf);
-		       snprintf(buf, sizeof(buf), "%s/lib", _prefix_path);
-		       _prefix_path_lib = strdup(buf);
-		       
-		       printf("DYNAMIC DETERMINED PREFIX: %s\n", _prefix_path);
-
-		       /* check if AUTHORS file is there - then our guess is right */
-		       snprintf(buf, sizeof(buf), "%s/"MAGIC_DAT, _prefix_path);
-		       if (ecore_file_exists(buf))
-			 {
-			    _prefix_path_data_len = snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path);
-			    _prefix_path_data = strdup(buf);
-			    snprintf(buf, sizeof(buf), "%s/"LOCALE_D, _prefix_path);
-			    _prefix_path_locale = strdup(buf);
-			 }
-		       /* AUTHORS file not there. time to start hunting! */
-		       else
-			 {
-			    if (_e_prefix_share_hunt())
-			      {
-				 printf("DIFFERENT DYNAMIC DETERMINED DATA DIR: %s\n", _prefix_path_data);
-				 printf("DIFFERENT DYNAMIC DETERMINED LOCALE DIR: %s\n", _prefix_path_locale);
-			      }
-			    else
-			      {
-				 e_prefix_fallback();
-                                 e_util_env_set("E_PREFIX", _prefix_path);
-                                 e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-                                 e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-                                 e_util_env_set("E_DATA_DIR", _prefix_path_data);
-				 return 0;
-			      }
-			 }
-                       e_util_env_set("E_PREFIX", _prefix_path);
-                       e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-                       e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-                       e_util_env_set("E_DATA_DIR", _prefix_path_data);
-		       return 1;
-		    }
-		  else
-		    {
-		       e_prefix_fallback();
-                       e_util_env_set("E_PREFIX", _prefix_path);
-                       e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-                       e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-                       e_util_env_set("E_DATA_DIR", _prefix_path_data);
-		       return 0;
-		    }
-	       }
-	     p--;
-	  }
-     }
-   e_prefix_fallback();
-   e_util_env_set("E_PREFIX", _prefix_path);
-   e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-   e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-   e_util_env_set("E_DATA_DIR", _prefix_path_data);
-   return 0;
+   printf("=================================\n");
+   printf("Enlightenment relocation handling\n");
+   printf("=================================\n");
+   printf("PREFIX:  %s\n", eina_prefix_get(pfx));
+   printf("BINDIR:  %s\n", eina_prefix_bin_get(pfx));
+   printf("LIBDIR:  %s\n", eina_prefix_lib_get(pfx));
+   printf("DATADIR: %s\n", eina_prefix_data_get(pfx));
+   printf("LOCALE:  %s\n", eina_prefix_locale_get(pfx));
+   printf("=================================\n");
+   e_util_env_set("E_PREFIX", eina_prefix_get(pfx));
+   e_util_env_set("E_BIN_DIR", eina_prefix_bin_get(pfx));
+   e_util_env_set("E_LIB_DIR", eina_prefix_lib_get(pfx));
+   e_util_env_set("E_DATA_DIR", eina_prefix_data_get(pfx));
+   e_util_env_set("E_LOCALE_DIR", eina_prefix_locale_get(pfx));
+   return 1;
 }
 
 EINTERN void
 e_prefix_shutdown(void)
 {
-   E_FREE(_exe_path);
-   E_FREE(_prefix_path);
-   E_FREE(_prefix_path_locale);
-   E_FREE(_prefix_path_bin);
-   E_FREE(_prefix_path_data);
-   E_FREE(_prefix_path_lib);
+   if (!pfx) return;
+   _prefix_path_data = NULL;
+   _prefix_path_data_len = 0;
+   eina_prefix_free(pfx);
+   pfx = NULL;
 }
    
 EAPI void
 e_prefix_fallback(void)
 {
-   e_prefix_shutdown();
-   _e_prefix_fallbacks();
 }
 
 EAPI const char *
 e_prefix_get(void)
 {
-   return _prefix_path;
+   return eina_prefix_get(pfx);
 }
 
 EAPI const char *
 e_prefix_locale_get(void)
 {
-   return _prefix_path_locale;
+   return eina_prefix_locale_get(pfx);
 }
 
 EAPI const char *
 e_prefix_bin_get(void)
 {
-   return _prefix_path_bin;
+   return eina_prefix_bin_get(pfx);
 }
 
 EAPI const char *
 e_prefix_data_get(void)
 {
-   return _prefix_path_data;
+   return eina_prefix_data_get(pfx);
 }
 
 EAPI const char *
 e_prefix_lib_get(void)
 {
-   return _prefix_path_lib;
+   return eina_prefix_lib_get(pfx);
 }
 
-/* local subsystem functions */
-static int
-_e_prefix_share_hunt(void)
-{
-   char buf[4096], buf2[4096], *p;
-   FILE *f;
-
-   /* sometimes this isn't the case - so we need to do a more exhaustive search
-    * through more parent and subdirs. hre is an example i have seen:
-    * 
-    * /blah/whatever/exec/bin/exe
-    * ->
-    * /blah/whatever/exec/bin
-    * /blah/whatever/common/share/enlightenment
-    * /blah/whatever/common/share/locale
-    * /blah/whatever/exec/lib
-    */
-   
-   /* this is pure black magic to try and find data shares */
-#ifdef PREFIX_CACHE_FILE
-   /* 1. check cache file - as a first attempt. this will speed up subsequent
-    * hunts - if needed */
-   e_user_dir_concat_static(buf, "prefix_share_cache.txt");
-   f = fopen(buf, "r");
-   if (f)
-     {
-	if (fgets(buf2, sizeof(buf2), f))
-	  {
-	     int len;
-	     
-	     len = strlen(buf2);
-	     if (len > 1) buf2[len - 1] = 0;
-	     snprintf(buf, sizeof(buf), "%s/"MAGIC_FILE, buf2);
-	     if (ecore_file_exists(buf))
-	       {
-		  /* path is ok - magic file found */
-		  _prefix_path_data = strdup(buf2);
-		  _prefix_path_data_len = eina_strlcpy(buf, buf2, sizeof(buf));
-		  p = strrchr(buf, '/');
-		  if (p) *p = 0;
-		  snprintf(buf2, sizeof(buf2), "%s/locale", buf);
-		  _prefix_path_locale = strdup(buf2);
-		  fclose(f);
-		  return 1;
-	       }
-	  }
-	fclose(f);
-     }
-#endif   
-   /* 2. cache file doesn't exist or is invalid - we need to search - this is
-    * where the real black magic begins */
-   
-   /* BLACK MAGIC 1:
-    * /blah/whatever/dir1/bin
-    * /blah/whatever/dir2/share/enlightenment
-    */
-   if (!_prefix_path_data)
-     {
-	Eina_List *files;
-	Eina_List *l;
-
-	eina_strlcpy(buf, _prefix_path, sizeof(buf));
-	p = strrchr(buf, '/');
-	if (p) *p = 0;
-	files = ecore_file_ls(buf);
-	if (files)
-	  {
-	     char *file;
-	     
-	     EINA_LIST_FOREACH(files, l, file)
-	       {
-		  snprintf(buf2, sizeof(buf2), "%s/%s/"MAGIC_DAT, buf, file);
-		  if (ecore_file_exists(buf2))
-		    {
-		       _prefix_path_data_len = snprintf(buf2, sizeof(buf2), "%s/%s/"SHARE_D, buf, file);
-		       _prefix_path_data = strdup(buf2);
-		       snprintf(buf2, sizeof(buf2), "%s/%s/"LOCALE_D, buf, file);
-		       _prefix_path_locale = strdup(buf2);
-		       break;
-		    }
-	       }
-	     EINA_LIST_FREE(files, p)
-	       {
-		  free(p);
-	       }
-	  }
-     }
-   
-   /* BLACK MAGIC 2:
-    * /blah/whatever/dir1/bin
-    * /blah/whatever/share/enlightenment
-    */
-   if (!_prefix_path_data)
-     {
-	eina_strlcpy(buf, _prefix_path, sizeof(buf));
-	p = strrchr(buf, '/');
-	if (p) *p = 0;
-	snprintf(buf2, sizeof(buf2), "%s/"MAGIC_DAT, buf);
-	if (ecore_file_exists(buf2))
-	  {
-	     _prefix_path_data_len = snprintf(buf2, sizeof(buf2), "%s/"SHARE_D, buf);
-	     _prefix_path_data = strdup(buf2);
-	     snprintf(buf2, sizeof(buf2), "%s/"LOCALE_D, buf);
-	     _prefix_path_locale = strdup(buf2);
-	  }
-     }
-   
-   /* add more black magic as required as we discover weridnesss - remember
-    * this is to save users having to set environment variables to tell
-    * e where it lives, so e auto-adapts. so these code snippets are just
-    * logic to figure that out for the user
-    */
-   
-   /* done. we found it - write cache file */
-   if (_prefix_path_data)
-     {
-#ifdef PREFIX_CACHE_FILE
-	ecore_file_mkpath(e_user_dir_get());
-	e_user_dir_concat_static(buf, "prefix_share_cache.txt");
-	f = fopen(buf, "w");
-	if (f)
-	  {
-	     fprintf(f, "%s\n", _prefix_path_data);
-	     fclose(f);
-	  }
-#endif	
-	return 1;
-     }
-   /* fail. everything failed */
-   return 0;
-}
-
-static int
-_e_prefix_fallbacks(void)
-{
-   char *p;
-
-   _prefix_path = strdup(PACKAGE_BIN_DIR);
-   p = strrchr(_prefix_path, '/');
-   if (p) *p = 0;
-   _prefix_path_locale = strdup(LOCALE_DIR);
-   _prefix_path_bin    = strdup(PACKAGE_BIN_DIR);
-   _prefix_path_data   = strdup(PACKAGE_DATA_DIR);
-   _prefix_path_data_len = strlen(_prefix_path_data);
-   _prefix_path_lib    = strdup(PACKAGE_LIB_DIR);
-   printf("WARNING: Enlightenment could not determine its installed prefix\n"
-	  "         and is falling back on the compiled in default:\n"
-	  "           %s\n"
-	  "         You might like to try setting the following environment variables:\n"
-	  "           E_PREFIX     - points to the base prefix of install\n"
-	  "           E_BIN_DIR    - optional in addition to E_PREFIX to provide\n"
-	  "                          a more specific binary directory\n"
-	  "           E_LIB_DIR    - optional in addition to E_PREFIX to provide\n"
-	  "                          a more specific library dir\n"
-	  "           E_DATA_DIR   - optional in addition to E_PREFIX to provide\n"
-	  "                          a more specific location for shared data\n"
-	  "           E_LOCALE_DIR - optional in addition to E_PREFIX to provide\n"
-	  "                          a more specific location for locale data\n"
-	  ,
-	  _prefix_path);
-   return 1;
-}
-
-static int
-_e_prefix_try_proc(void)
-{
-   FILE *f;
-   char buf[4096];
-   void *func = NULL;
-
-   func = (void *)_e_prefix_try_proc;
-   f = fopen("/proc/self/maps", "r");
-   if (!f) return 0;
-   while (fgets(buf, sizeof(buf), f))
-     {
-	int len;
-	char *p, mode[5] = "";
-	unsigned long ptr1 = 0, ptr2 = 0;
-	
-	len = strlen(buf);
-	if (buf[len - 1] == '\n')
-	  {
-	     buf[len - 1] = 0;
-	     len--;
-	  }
-	if (sscanf(buf, "%lx-%lx %4s", &ptr1, &ptr2, mode) == 3)
-	  {
-	     if (!strcmp(mode, "r-xp"))
-	       {
-		  if (((void *)ptr1 <= func) && (func < (void *)ptr2))
-		    {
-		       p = strchr(buf, '/');
-		       if (p)
-			 {
-			    if (len > 10)
-			      {
-				 if (!strcmp(buf + len - 10, " (deleted)"))
-				   buf[len - 10] = 0;
-			      }
-			    _exe_path = strdup(p);
-			    fclose(f);
-			    return 1;
-			 }
-		       else
-			 break;
-		    }
-	       }
-	  }
-     }
-   fclose(f);
-   return 0;
-}
-
-static int
-_e_prefix_try_argv(char *argv0)
-{
-   char *path, *p, *cp, *s;
-   int len, lenexe;
-   char buf[4096], buf2[4096], buf3[4096];
-   
-   /* 1. is argv0 abs path? */
-   if (argv0[0] == '/')
-     {
-	_exe_path = strdup(argv0);
-	if (access(_exe_path, X_OK) == 0) return 1;
-	free(_exe_path);
-	_exe_path = NULL;
-	return 0;
-     }
-   /* 2. relative path */
-   if (strchr(argv0, '/'))
-     {
-	if (getcwd(buf3, sizeof(buf3)))
-	  {
-	     snprintf(buf2, sizeof(buf2), "%s/%s", buf3, argv0);
-	     if (realpath(buf2, buf))
-	       {
-		  _exe_path = strdup(buf);
-		  if (access(_exe_path, X_OK) == 0) return 1;
-		  free(_exe_path);
-		  _exe_path = NULL;
-	       }
-	  }
-     }
-   /* 3. argv0 no path - look in PATH */
-   path = getenv("PATH");
-   if (!path) return 0;
-   p = path;
-   cp = p;
-   lenexe = strlen(argv0);
-   while ((p = strchr(cp, ':')))
-     {
-	len = p - cp;
-	s = malloc(len + 1 + lenexe + 1);
-	if (s)
-	  {
-	     strncpy(s, cp, len);
-	     s[len] = '/';
-	     strcpy(s + len + 1, argv0);
-	     if (realpath(s, buf))
-	       {
-		  if (access(buf, X_OK) == 0)
-		    {
-		       _exe_path = strdup(buf);
-		       free(s);
-		       return 1;
-		    }
-	       }
-	     free(s);
-	  }
-        cp = p + 1;
-     }
-   len = strlen(cp);
-   s = malloc(len + 1 + lenexe + 1);
-   if (s)
-     {
-	strncpy(s, cp, len);
-	s[len] = '/';
-	strcpy(s + len + 1, argv0);
-	if (realpath(s, buf))
-	  {
-	     if (access(buf, X_OK) == 0)
-	       {
-		  _exe_path = strdup(buf);
-		  free(s);
-		  return 1;
-	       }
-	  }
-	free(s);
-     }
-   /* 4. big problems. arg[0] != executable - weird execution */
-   return 0;
-}
-
-size_t
+EAPI size_t
 e_prefix_data_concat_len(char *dst, size_t size, const char *path, size_t path_len)
 {
    return eina_str_join_len(dst, size, '/', _prefix_path_data, _prefix_path_data_len, path, path_len);
 }
 
-size_t
+EAPI size_t
 e_prefix_data_concat(char *dst, size_t size, const char *path)
 {
    return e_prefix_data_concat_len(dst, size, path, strlen(path));
 }
 
-size_t
+EAPI size_t
 e_prefix_data_snprintf(char *dst, size_t size, const char *fmt, ...)
 {
    size_t off, ret;
    va_list ap;
-
+   
    va_start(ap, fmt);
-
+   
    off = _prefix_path_data_len + 1;
    if (size < _prefix_path_data_len + 2)
      {
-	if (size > 1)
-	  {
-	     memcpy(dst, _prefix_path_data, size - 1);
-	     dst[size - 1] = '\0';
-	  }
-	ret = off + vsnprintf(dst + off, size - off, fmt, ap);
-	va_end(ap);
-	return ret;
+        if (size > 1)
+          {
+             memcpy(dst, _prefix_path_data, size - 1);
+             dst[size - 1] = '\0';
+          }
+        ret = off + vsnprintf(dst + off, size - off, fmt, ap);
+        va_end(ap);
+        return ret;
      }
-
+   
    memcpy(dst, _prefix_path_data, _prefix_path_data_len);
    dst[_prefix_path_data_len] = '/';
-
+   
    ret = off + vsnprintf(dst + off, size - off, fmt, ap);
    va_end(ap);
    return ret;

Modified: trunk/e/src/bin/e_prefix.h
===================================================================
--- trunk/e/src/bin/e_prefix.h	2011-04-24 07:57:16 UTC (rev 58852)
+++ trunk/e/src/bin/e_prefix.h	2011-04-24 08:06:18 UTC (rev 58853)
@@ -5,7 +5,7 @@
 #define E_PREFIX_H
 
 EAPI int         e_prefix_determine(char *argv0);
-EINTERN void        e_prefix_shutdown(void);
+EINTERN void     e_prefix_shutdown(void);
 EAPI void        e_prefix_fallback(void);
 EAPI const char *e_prefix_get(void);
 EAPI const char *e_prefix_locale_get(void);

Log:
fix shape input changes while hidden.
  
  

Author:       raster
Date:         2011-04-29 00:11:08 -0700 (Fri, 29 Apr 2011)
New Revision: 59029
Trac:         http://trac.enlightenment.org/e/changeset/59029

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-29 06:23:02 UTC (rev 59028)
+++ trunk/e/src/bin/e_border.c	2011-04-29 07:11:08 UTC (rev 59029)
@@ -2929,7 +2929,7 @@
 {
    if (!bd) return;
 
-   if (bd->shaped_input)
+   if ((bd->visible) && (bd->shaped_input))
      {
         Ecore_X_Rectangle rects[4];
         Ecore_X_Window twin, twin2;
@@ -2983,7 +2983,22 @@
         ecore_x_window_free(twin);
      }
    else
-      ecore_x_composite_window_events_enable(bd->win);
+     {
+        if (bd->visible) // not shaped input
+          {
+             if (!bd->comp_hidden)
+                ecore_x_composite_window_events_enable(bd->win);
+             else
+                ecore_x_composite_window_events_disable(bd->win);
+          }
+        else
+          {
+             if (!e_manager_comp_evas_get(bd->zone->container->manager))
+                ecore_x_composite_window_events_enable(bd->win);
+             else
+                ecore_x_composite_window_events_disable(bd->win);
+          }
+     }
 }
 
 EAPI void

Log:
add a resolution display field for file info in fsel
  
  

Author:       raster
Date:         2011-04-30 22:24:30 -0700 (Sat, 30 Apr 2011)
New Revision: 59061
Trac:         http://trac.enlightenment.org/e/changeset/59061

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-05-01 04:44:56 UTC (rev 59060)
+++ trunk/e/src/bin/e_widget_fsel.c	2011-05-01 05:24:30 UTC (rev 59061)
@@ -10,6 +10,8 @@
    Evas_Object *o_preview_preview_table;
    Evas_Object *o_preview_frame;
    Evas_Object *o_preview_scroll;
+   Evas_Object *o_preview_extra;
+   Evas_Object *o_preview_extra_entry;
    Evas_Object *o_preview_size;
    Evas_Object *o_preview_size_entry;
    Evas_Object *o_preview_owner;
@@ -28,6 +30,7 @@
    Evas_Object *o_entry;
    Evas_Coord   preview_w, preview_h;
    char *entry_text;
+   char *preview_extra_text;
    char *preview_size_text;
    char *preview_owner_text;
    char *preview_perms_text;
@@ -325,12 +328,28 @@
                                      wd->o_preview_preview,
                                      0, 0, 1, 1, 0, 0, 1, 1);
 	
+        o = e_widget_label_add(evas, _("Resolution:"));
+        wd->o_preview_extra = o;
+        e_widget_sub_object_add(obj, o);
+        e_widget_table_object_append(wd->o_preview_table,
+				     wd->o_preview_extra,
+                                     0, 0, 1, 1, 1, 1, 1, 1);
+
+        o = e_widget_entry_add(evas, &(wd->preview_extra_text), NULL, NULL, NULL);
+	e_widget_entry_readonly_set(o, 1);
+        wd->o_preview_extra_entry = o;
+        e_widget_sub_object_add(obj, o);
+        e_widget_size_min_set(o, 100, -1);
+        e_widget_table_object_append(wd->o_preview_table,
+				     wd->o_preview_extra_entry,
+				     1, 0, 1, 1, 1, 1, 1, 1);
+
         o = e_widget_label_add(evas, _("Size:"));
         wd->o_preview_size = o;
         e_widget_sub_object_add(obj, o);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_size,
-                                     0, 0, 1, 1, 1, 1, 1, 1);
+                                     0, 1, 1, 1, 1, 1, 1, 1);
 
         o = e_widget_entry_add(evas, &(wd->preview_size_text), NULL, NULL, NULL);
 	e_widget_entry_readonly_set(o, 1);
@@ -339,14 +358,14 @@
         e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_size_entry,
-				     1, 0, 1, 1, 1, 1, 1, 1);
+				     1, 1, 1, 1, 1, 1, 1, 1);
 
         o = e_widget_label_add(evas, _("Owner:"));
         wd->o_preview_owner = o;
         e_widget_sub_object_add(obj, o);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_owner,
-                                     0, 1, 1, 1, 1, 1, 1, 1);
+                                     0, 2, 1, 1, 1, 1, 1, 1);
 
         o = e_widget_entry_add(evas, &(wd->preview_owner_text), NULL, NULL, NULL);
 	e_widget_entry_readonly_set(o, 1);
@@ -355,14 +374,14 @@
         e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_owner_entry, 
-				     1, 1, 1, 1, 1, 1, 1, 1);
+				     1, 2, 1, 1, 1, 1, 1, 1);
 
         o = e_widget_label_add(evas, _("Permissions:"));
         wd->o_preview_perms = o;
         e_widget_sub_object_add(obj, o);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_perms,
-                                     0, 2, 1, 1, 1, 1, 1, 1);
+                                     0, 3, 1, 1, 1, 1, 1, 1);
 	
         o = e_widget_entry_add(evas, &(wd->preview_perms_text), NULL, NULL, NULL);
 	e_widget_entry_readonly_set(o, 1);
@@ -371,14 +390,14 @@
         e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_perms_entry,
-				     1, 2, 1, 1, 1, 1, 1, 1);
+				     1, 3, 1, 1, 1, 1, 1, 1);
 
         o = e_widget_label_add(evas, _("Modified:"));
         wd->o_preview_time = o;
         e_widget_sub_object_add(obj, o);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_time,
-                                     0, 3, 1, 1, 1, 1, 1, 1);
+                                     0, 4, 1, 1, 1, 1, 1, 1);
 
         o = e_widget_entry_add(evas, &(wd->preview_time_text), NULL, NULL, NULL);
 	e_widget_entry_readonly_set(o, 1);
@@ -387,7 +406,7 @@
         e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_time_entry,
-				     1, 3, 1, 1, 1, 1, 1, 1);
+				     1, 4, 1, 1, 1, 1, 1, 1);
      }
 
    o = e_fm2_add(evas);
@@ -510,6 +529,8 @@
      {
         evas_object_show(wd->o_preview_preview);
         evas_object_show(wd->o_preview_preview_table);
+        evas_object_show(wd->o_preview_extra);
+        evas_object_show(wd->o_preview_extra_entry);
         evas_object_show(wd->o_preview_size);
         evas_object_show(wd->o_preview_size_entry);
         evas_object_show(wd->o_preview_owner);
@@ -558,11 +579,23 @@
 }
 
 static void
-_e_wid_fsel_preview_update(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_e_wid_fsel_preview_update(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    E_Widget_Data *wd;
+   Evas_Object *o;
+   char buf[256];
+   int iw = 0, ih = 0;
    
    wd = data;
+   o = evas_object_image_add(evas_object_evas_get(obj));
+   evas_object_image_file_set(o, wd->path, NULL);
+   evas_object_image_size_get(o, &iw, &ih);
+   evas_object_del(o);
+   if ((iw > 0) && (ih > 0))
+     {
+        snprintf(buf, sizeof(buf), "%ix%i", iw, ih);
+        e_widget_entry_text_set(wd->o_preview_extra_entry, buf);
+     }
    e_widget_table_object_repack(wd->o_preview_preview_table,
 				wd->o_preview_preview,
 				0, 0, 1, 1, 0, 0, 1, 1);
@@ -588,6 +621,7 @@
 				wd->o_preview_preview,
 				0, 0, 1, 1, 0, 0, 1, 1);
    
+   e_widget_entry_text_set(wd->o_preview_extra_entry, "");
    e_widget_entry_text_set(wd->o_preview_size_entry, size);
    e_widget_entry_text_set(wd->o_preview_owner_entry, owner);
    e_widget_entry_text_set(wd->o_preview_perms_entry, perms);
@@ -704,6 +738,7 @@
    
    wd = e_widget_data_get(obj);
    E_FREE(wd->entry_text);
+   E_FREE(wd->preview_extra_text);
    E_FREE(wd->preview_size_text);
    E_FREE(wd->preview_owner_text);
    E_FREE(wd->preview_perms_text);

Log:
make enlightenment.menu default if applications.menu not found.
  
  

Author:       raster
Date:         2011-05-12 22:49:36 -0700 (Thu, 12 May 2011)
New Revision: 59360
Trac:         http://trac.enlightenment.org/e/changeset/59360

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

Modified: trunk/e/src/bin/e_order.c
===================================================================
--- trunk/e/src/bin/e_order.c	2011-05-13 05:26:56 UTC (rev 59359)
+++ trunk/e/src/bin/e_order.c	2011-05-13 05:49:36 UTC (rev 59360)
@@ -14,12 +14,37 @@
 EINTERN int
 e_order_init(void)
 {
+   char *menu_file = NULL;
+   
    handlers = 
      eina_list_append(handlers, 
                       ecore_event_handler_add(EFREET_EVENT_DESKTOP_CACHE_UPDATE, 
                                               _e_order_cb_efreet_cache_update, 
                                               NULL));
-   efreet_menu_file_set(e_config->default_system_menu);
+   if (e_config->default_system_menu)
+      menu_file = strdup(e_config->default_system_menu);
+   if (!menu_file)
+      menu_file = strdup("/etc/xdg/menus/applications.menu");
+   if (menu_file)
+     {
+        if (!ecore_file_exists(menu_file))
+          {
+             char buf[PATH_MAX];
+             
+             free(menu_file);
+             snprintf(buf, sizeof(buf), "/etc/xdg/menus/enlightenment.menu");
+             if (ecore_file_exists(buf)) menu_file = strdup(buf);
+             else
+               {
+                  snprintf(buf, sizeof(buf), 
+                           "%s/etc/xdg/menus/enlightenment.menu",
+                           e_prefix_get());
+                  if (ecore_file_exists(buf)) menu_file = strdup(buf);
+               }
+          }
+     }
+   efreet_menu_file_set(menu_file);
+   if (menu_file) free(menu_file);
    return 1;
 }

Log:
patch from From: Mark-Willem Jansen <markwillem@...>
  
  use desktop file path field for cwd.
  
  

Author:       raster
Date:         2011-05-26 03:27:21 -0700 (Thu, 26 May 2011)
New Revision: 59701
Trac:         http://trac.enlightenment.org/e/changeset/59701

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

Modified: trunk/e/src/bin/e_exec.c
===================================================================
--- trunk/e/src/bin/e_exec.c	2011-05-26 09:27:30 UTC (rev 59700)
+++ trunk/e/src/bin/e_exec.c	2011-05-26 10:27:21 UTC (rev 59701)
@@ -210,7 +210,18 @@
 //			    ECORE_EXE_PIPE_AUTO | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR |
 //			    ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
 //			    inst);
-   exe = ecore_exe_run(exec, inst);
+   if (desktop->path)
+     {
+        if (!getcwd(buf, sizeof(buf))) return NULL;
+        if (chdir(desktop->path)) return NULL;
+        exe = ecore_exe_run(exec, inst);
+        if (chdir(buf)) return NULL;
+     }
+   else
+     {
+        exe = ecore_exe_run(exec, inst);
+     }
+
    e_util_library_path_restore();
    if (penv_display)
      {

Log:
fix entry content to always have full path
  
  

Author:       raster
Date:         2011-05-29 00:51:55 -0700 (Sun, 29 May 2011)
New Revision: 59774
Trac:         http://trac.enlightenment.org/e/changeset/59774

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-05-29 05:09:50 UTC (rev 59773)
+++ trunk/e/src/bin/e_widget_fsel.c	2011-05-29 07:51:55 UTC (rev 59774)
@@ -239,9 +239,9 @@
    if (stat(wd->path, &st) == 0)
      {
 	if (wd->preview) _e_wid_fsel_preview_file(wd);
-	if (!S_ISDIR(st.st_mode))
-	  e_widget_entry_text_set(wd->o_entry, ici->file);
-	else
+//	if (!S_ISDIR(st.st_mode))
+//	  e_widget_entry_text_set(wd->o_entry, ici->file);
+//	else
 	  e_widget_entry_text_set(wd->o_entry, wd->path);
      }
    eina_list_free(selected);

Log:
make some notes in header for when iw as fixing up default bindings
  
  

Author:       raster
Date:         2011-06-05 20:11:34 -0700 (Sun, 05 Jun 2011)
New Revision: 59983
Trac:         http://trac.enlightenment.org/e/changeset/59983

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

Modified: trunk/e/src/bin/e_acpi.h
===================================================================
--- trunk/e/src/bin/e_acpi.h	2011-06-06 02:53:39 UTC (rev 59982)
+++ trunk/e/src/bin/e_acpi.h	2011-06-06 03:11:34 UTC (rev 59983)
@@ -5,34 +5,34 @@
 {
    E_ACPI_TYPE_UNKNOWN = 0,
       
-   E_ACPI_TYPE_AC_ADAPTER, //
-   E_ACPI_TYPE_BATTERY,
-   E_ACPI_TYPE_BUTTON,
-   E_ACPI_TYPE_FAN,
-   E_ACPI_TYPE_LID,
-   E_ACPI_TYPE_POWER,
-   E_ACPI_TYPE_PROCESSOR,
-   E_ACPI_TYPE_SLEEP,
-   E_ACPI_TYPE_THERMAL,
-   E_ACPI_TYPE_VIDEO,
-   E_ACPI_TYPE_WIFI,
-   E_ACPI_TYPE_HIBERNATE,
-   E_ACPI_TYPE_ZOOM_OUT,
-   E_ACPI_TYPE_ZOOM_IN,
-   E_ACPI_TYPE_BRIGHTNESS_DOWN,
-   E_ACPI_TYPE_BRIGHTNESS_UP,
-   E_ACPI_TYPE_ASSIST,
-   E_ACPI_TYPE_S1,
-   E_ACPI_TYPE_VAIO,
-   E_ACPI_TYPE_MUTE,
-   E_ACPI_TYPE_VOLUME,
-   E_ACPI_TYPE_BRIGHTNESS
+   E_ACPI_TYPE_AC_ADAPTER, // 1
+   E_ACPI_TYPE_BATTERY, // 2
+   E_ACPI_TYPE_BUTTON, // 3
+   E_ACPI_TYPE_FAN, // 4
+   E_ACPI_TYPE_LID, // 5
+   E_ACPI_TYPE_POWER, // 6
+   E_ACPI_TYPE_PROCESSOR, // 7
+   E_ACPI_TYPE_SLEEP, // 8
+   E_ACPI_TYPE_THERMAL, // 9
+   E_ACPI_TYPE_VIDEO, // 10
+   E_ACPI_TYPE_WIFI, // 11
+   E_ACPI_TYPE_HIBERNATE, // 12
+   E_ACPI_TYPE_ZOOM_OUT, // 13
+   E_ACPI_TYPE_ZOOM_IN, // 14
+   E_ACPI_TYPE_BRIGHTNESS_DOWN, // 15
+   E_ACPI_TYPE_BRIGHTNESS_UP, // 16
+   E_ACPI_TYPE_ASSIST, // 17
+   E_ACPI_TYPE_S1, // 18
+   E_ACPI_TYPE_VAIO, // 19
+   E_ACPI_TYPE_MUTE, // 20
+   E_ACPI_TYPE_VOLUME, // 21
+   E_ACPI_TYPE_BRIGHTNESS // 22
 } E_Acpi_Type;
 
 /* enum for acpi signals */
 typedef enum _E_Acpi_Device_Signal 
 {
-   E_ACPI_DEVICE_SIGNAL_UNKNOWN,
+   E_ACPI_DEVICE_SIGNAL_UNKNOWN, // 0
    E_ACPI_DEVICE_SIGNAL_NOTIFY = 80,
    E_ACPI_DEVICE_SIGNAL_CHANGED = 82, // device added or removed
    E_ACPI_DEVICE_SIGNAL_AWAKE = 83,
@@ -42,9 +42,9 @@
 /* enum for lid status */
 typedef enum _E_Acpi_Lid_Status 
 {
-   E_ACPI_LID_UNKNOWN,
-   E_ACPI_LID_CLOSED,
-   E_ACPI_LID_OPEN
+   E_ACPI_LID_UNKNOWN, // 0
+   E_ACPI_LID_CLOSED, // 1
+   E_ACPI_LID_OPEN // 2
 } E_Acpi_Lid_Status;
 
 /* struct used to pass to event handlers */

Log:
fix resize if minx/max etc. props changed during reisze.
  
  

Author:       raster
Date:         2011-06-13 02:12:50 -0700 (Mon, 13 Jun 2011)
New Revision: 60263
Trac:         http://trac.enlightenment.org/e/changeset/60263

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-13 08:05:26 UTC (rev 60262)
+++ trunk/e/src/bin/e_border.c	2011-06-13 09:12:50 UTC (rev 60263)
@@ -6412,7 +6412,28 @@
         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 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->client.w;
+             h = bd->client.h;
+             new_w = w;
+             new_h = h;
+             e_border_resize_limit(bd, &new_w, &new_h);
+             if ((bd->resize_mode == RESIZE_TL) ||
+                 (bd->resize_mode == RESIZE_L) ||
+                 (bd->resize_mode == RESIZE_BL))
+                x += (w - new_w);
+             if ((bd->resize_mode == RESIZE_TL) ||
+                 (bd->resize_mode == RESIZE_T) ||
+                 (bd->resize_mode == RESIZE_TR))
+                y += (h - new_h);
+             e_border_move_resize(bd, x, y, new_w, new_h);
+          }
         bd->client.icccm.fetch.size_pos_hints = 0;
         rem_change = 1;
      }

Log:
backlight support for non randr (go right to /sys via suid root tool).
  test keybindings too and make brightness be 0->100 to avoid float
  parsing issues
  
  

Author:       raster
Date:         2011-06-15 07:18:23 -0700 (Wed, 15 Jun 2011)
New Revision: 60350
Trac:         http://trac.enlightenment.org/e/changeset/60350

Added:
  trunk/e/src/bin/e_backlight_main.c 
Modified:
  trunk/e/src/bin/Makefile.am trunk/e/src/bin/e_actions.c trunk/e/src/bin/e_backlight.c 

Modified: trunk/e/src/bin/Makefile.am
===================================================================
--- trunk/e/src/bin/Makefile.am	2011-06-15 14:13:58 UTC (rev 60349)
+++ trunk/e/src/bin/Makefile.am	2011-06-15 14:18:23 UTC (rev 60350)
@@ -29,7 +29,8 @@
 enlightenment_fm_op \
 enlightenment_init \
 enlightenment_sys \
-enlightenment_thumb
+enlightenment_thumb \
+enlightenment_backlight
 
 ENLIGHTENMENTHEADERS = \
 e_about.h \
@@ -361,6 +362,11 @@
 
 enlightenment_sys_LDADD = @E_SYS_LIBS@
 
+enlightenment_backlight_SOURCES = \
+e_backlight_main.c
+
+enlightenment_backlight_LDADD = 
+
 enlightenment_init_SOURCES = \
 e_init_main.c \
 e_xinerama.c
@@ -373,6 +379,7 @@
 setuid_root_mode = a=rx,u+xs
 install-data-hook:
 	@chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
+	@chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_backlight$(EXEEXT) || true
 
 installed_headersdir = $(prefix)/include/enlightenment
 installed_headers_DATA = $(ENLIGHTENMENTHEADERS)

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2011-06-15 14:13:58 UTC (rev 60349)
+++ trunk/e/src/bin/e_actions.c	2011-06-15 14:18:23 UTC (rev 60350)
@@ -2644,20 +2644,20 @@
    e_backlight_mode_set(zone, E_BACKLIGHT_MODE_NORMAL);
 }
 
-ACT_FN_GO_ACPI(backlight_set, )
+ACT_FN_GO(backlight_set, )
 {
    E_Zone *zone = _e_actions_zone_get(obj);
-   double v = atof(params);
+   int v = atoi(params);
    e_backlight_mode_set(zone, E_BACKLIGHT_MODE_NORMAL);
-   e_backlight_level_set(zone, v, -1.0);
+   e_backlight_level_set(zone, ((double)v / 100.0), -1.0);
 }
 
-ACT_FN_GO_ACPI(backlight_adjust, )
+ACT_FN_GO(backlight_adjust, )
 {
    E_Zone *zone = _e_actions_zone_get(obj);
-   double v = atof(params);
+   int v = atoi(params);
    e_backlight_mode_set(zone, E_BACKLIGHT_MODE_NORMAL);
-   e_backlight_level_set(zone, e_backlight_level_get(zone) + v, -1.0);
+   e_backlight_level_set(zone, e_backlight_level_get(zone) + ((double)v / 100.0), -1.0);
 }
 
 /* local subsystem globals */
@@ -2956,22 +2956,22 @@
    ACT_GO_ACPI(undim_screen);
    e_action_predef_name_set(N_("Screen"), N_("Undim"), "undim_screen",
 			    NULL, NULL, 0);
-   ACT_GO_ACPI(backlight_set);
+   ACT_GO(backlight_set);
    e_action_predef_name_set(N_("Screen"), N_("Backlight Set"), "backlight_set",
-			    NULL, "syntax: brightness(0.0 - 1.0), example: 0.5", 1);
+			    NULL, "syntax: brightness(0 - 100), example: 50", 1);
    e_action_predef_name_set(N_("Screen"), N_("Backlight Min"), "backlight_set",
-			    "0.0", NULL, 0);
+			    "0", NULL, 0);
    e_action_predef_name_set(N_("Screen"), N_("Backlight Mid"), "backlight_set",
-			    "0.5", NULL, 0);
+			    "50", NULL, 0);
    e_action_predef_name_set(N_("Screen"), N_("Backlight Max"), "backlight_set",
-			    "1.0", NULL, 0);
-   ACT_GO_ACPI(backlight_adjust);
+			    "100", NULL, 0);
+   ACT_GO(backlight_adjust);
    e_action_predef_name_set(N_("Screen"), N_("Backlight Adjust"), "backlight_adjust",
-			    NULL, "syntax: brightness(-1.0 - 1.0), example: -0.2", 1);
+			    NULL, "syntax: brightness(-100 - 100), example: -20", 1);
    e_action_predef_name_set(N_("Screen"), N_("Backlight Up"), "backlight_adjust",
-			    "0.1", NULL, 0);
+			    "10", NULL, 0);
    e_action_predef_name_set(N_("Screen"), N_("Backlight Down"), "backlight_adjust",
-			    "-0.1", NULL, 0);
+			    "-10", NULL, 0);
 
    /* window_move_to_center */
    ACT_GO(window_move_to_center);

Modified: trunk/e/src/bin/e_backlight.c
===================================================================
--- trunk/e/src/bin/e_backlight.c	2011-06-15 14:13:58 UTC (rev 60349)
+++ trunk/e/src/bin/e_backlight.c	2011-06-15 14:18:23 UTC (rev 60350)
@@ -1,40 +1,31 @@
 #include "e.h"
-#include <E_DBus.h>
-#ifdef HAVE_HAL
-#include <E_Hal.h>
-#endif
 
 // FIXME: backlight should be tied per zone but this implementation is just
 // a signleton right now as thats 99% of use cases. but api supports
 // doing more. for now make it work in the singleton
 
-// FIXME: backlight should have config values for:
-//        1. normal mode (eg on login/ start of e)
-//        2. dim level (eg 0.5)
-//        3. anim slide time (eg 0.5)
-
-// FIXME: tried using hal backlight stuff... doesn't work
-//#define HAL_BL 1
-
 #define MODE_RANDR 0
-#define MODE_HAL 1
+#define MODE_SYS   1
 
 static double bl_val = 1.0;
 static double bl_animval = 1.0;
 static E_Backlight_Mode bl_mode = E_BACKLIGHT_MODE_NORMAL;
 static int sysmode = MODE_RANDR;
 static Ecore_Animator *bl_anim = NULL;
+static const char *bl_sysval = NULL;
+static Ecore_Event_Handler *bl_sys_exit_handler = NULL;
+static Ecore_Exe *bl_sys_set_exe = NULL;
+static Eina_Bool bl_sys_pending_set = EINA_FALSE;
 
-#ifdef HAL_BL        
-static E_DBus_Connection *_hal_conn = NULL;
-static const char *_hal_bl_dev = NULL;
-static const char *_hal_bl_iface = NULL;
-static int _hal_nlevels = 1;
-#endif
-
 static void _e_backlight_update(E_Zone *zone);
 static void _e_backlight_set(E_Zone *zone, double val);
 static Eina_Bool _bl_anim(void *data, double pos);
+static char *_bl_read_file(const char *file);
+static int _bl_sys_num_get(const char *file);
+static void _bl_sys_find(void);
+static void _bl_sys_level_get(void);
+static Eina_Bool _e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event);
+static void _bl_sys_level_set(double val);
 
 EINTERN int
 e_backlight_init(void)
@@ -48,29 +39,14 @@
 EINTERN int
 e_backlight_shutdown(void)
 {
-#ifdef HAL_BL        
-   if (_hal_conn)
-     {
-        e_dbus_connection_close(_hal_conn);
-        _hal_conn = NULL;
-#ifdef HAVE_HAL
-        e_hal_shutdown();
-#endif
-        e_dbus_shutdown();
-        if (_hal_bl_dev)
-          {
-             eina_stringshare_del(_hal_bl_dev);
-             _hal_bl_dev = NULL;
-          }
-        if (_hal_bl_iface)
-          {
-             eina_stringshare_del(_hal_bl_iface);
-             _hal_bl_iface = NULL;
-          }
-     }
-#endif   
    if (bl_anim) ecore_animator_del(bl_anim);
    bl_anim = NULL;
+   if (bl_sysval) eina_stringshare_del(bl_sysval);
+   bl_sysval = NULL;
+   if (bl_sys_exit_handler) ecore_event_handler_del(bl_sys_exit_handler);
+   bl_sys_exit_handler = NULL;
+   bl_sys_set_exe = NULL;
+   bl_sys_pending_set = EINA_FALSE;
    return 1;
 }
 
@@ -81,7 +57,7 @@
    E_Manager *man;
    E_Container *con;
    E_Zone *zone;
-   
+
    EINA_LIST_FOREACH(e_manager_list(), m, man)
      {
         EINA_LIST_FOREACH(man->containers, c, con)
@@ -102,15 +78,14 @@
    // set backlight associated with zone to val over period of tim
    // if tim == 0.0 - then do it instantnly, if time == -1 use some default
    // transition time
-   if (!zone) e_backlight_update();
-   else _e_backlight_update(zone);
+   if (val < 0.0) val = 0.0;
+   else if (val > 1.0) val = 1.0;
    if (val == bl_val) return;
    if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
    bl_now = bl_val;
    bl_val = val;
    if (bl_mode != E_BACKLIGHT_MODE_NORMAL) return;
    if (tim < 0.0) tim = e_config->backlight.transition;
-   // FIXME: save bl level for normal
    if (tim == 0.0)
      {
         if (bl_anim)
@@ -130,8 +105,6 @@
 e_backlight_level_get(E_Zone *zone)
 {
    // zone == NULL == everything
-   if (!zone) e_backlight_update();
-   else _e_backlight_update(zone);
    return bl_val;
 }
 
@@ -161,141 +134,8 @@
 }
 
 /* local subsystem functions */
-#ifdef HAL_BL        
-#ifdef HAVE_HAL
-void
-_e_backlight_hal_val_reply(void *data __UNUSED__, 
-                           DBusMessage *reply, 
-                           DBusError *error)
-{
-   dbus_uint32_t val;
-   
-   if (dbus_error_is_set(error))
-     {
-        printf("Error: %s - %s\n", error->name, error->message);
-        return;
-     }
-   dbus_message_get_args(reply, error, DBUS_TYPE_UINT32, 
-                         &val, DBUS_TYPE_INVALID);
-   printf("Received: %i\n", val);
-}
-   
-static void
-_e_backlight_hal_val_get(void)
-{
-   DBusMessage *msg;
-   
-   if (!_hal_bl_dev) return;
-   msg = dbus_message_new_method_call
-   ("org.freedesktop.Hal",
-       _hal_bl_dev,
-       _hal_bl_iface,
-       "GetBrightness"
-   );
-   e_dbus_message_send(_hal_conn, msg, _e_backlight_hal_val_reply, -1, NULL);
-   dbus_message_unref(msg);
-}
 
 static void
-_e_backlight_hal_val_set(double val)
-{
-   DBusMessage *msg;
-   dbus_uint32_t ival = 0;
-   
-   if (!_hal_bl_dev) return;
-   msg = dbus_message_new_method_call
-   ("org.freedesktop.Hal",
-       _hal_bl_dev,
-       _hal_bl_iface,
-       "SetBrightness"
-   );
-   ival = val * (_hal_nlevels - 1);
-   printf("hal set %i\n", ival);
-   dbus_message_append_args(msg, DBUS_TYPE_UINT32, &ival, DBUS_TYPE_INVALID);
-   dbus_message_set_no_reply(msg, EINA_TRUE);
-   e_dbus_message_send(_hal_conn, msg, NULL, -1, NULL);
-   dbus_message_unref(msg);
-}
-
-static void
-_e_backlight_prop(void      *data __UNUSED__,
-                  void      *reply_data,
-                  DBusError *error)
-{
-   E_Hal_Properties *ret = reply_data;
-   int err;
-   int nlevels;
-   const Eina_List *sl;
-   
-   if (!ret) goto error;
-   
-   if (dbus_error_is_set(error))
-     {
-        dbus_error_free(error);
-        goto error;
-     }
-   nlevels = e_hal_property_bool_get(ret, "laptop_panel.num_levels", &err);
-   if (err) goto error;
-   _hal_nlevels = nlevels;
-   printf("nlevels: %i\n", nlevels);
-
-   sl = e_hal_property_strlist_get(ret, "info.interfaces", &err);
-   if (err) goto error;
-   if (sl)
-     {
-        if (_hal_bl_iface) eina_stringshare_del(_hal_bl_iface);
-        _hal_bl_iface = eina_stringshare_add(sl->data);
-        printf("%s\n", _hal_bl_iface);
-     }
-   _e_backlight_hal_val_get();
-   return;
-error:
-   if (_hal_bl_dev)
-     {
-        eina_stringshare_del(_hal_bl_dev);
-        _hal_bl_dev = NULL;
-     }
-   if (_hal_bl_iface)
-     {
-        eina_stringshare_del(_hal_bl_iface);
-        _hal_bl_iface = NULL;
-     }
-}
-
-static void
-_e_backlight_panel_found(void *user_data __UNUSED__,
-                            void           *reply_data,
-                            DBusError      *error)
-{
-   E_Hal_Manager_Find_Device_By_Capability_Return *ret = reply_data;
-   Eina_List *l;
-   char *device;
-   
-   if (!ret || !ret->strings) return;
-   
-   if (dbus_error_is_set(error))
-     {
-        dbus_error_free(error);
-        return;
-     }
-   if (!_hal_bl_dev)
-     {
-        EINA_LIST_FOREACH(ret->strings, l, device)
-          {
-             printf("BL+: %s\n", device);
-             if (!_hal_bl_dev) _hal_bl_dev = eina_stringshare_add(device);
-          }
-     }
-   if (_hal_bl_dev)
-     {
-        e_hal_device_get_all_properties(_hal_conn, _hal_bl_dev,
-                                        _e_backlight_prop, NULL);
-     }
-}
-#endif
-#endif
-
-static void
 _e_backlight_update(E_Zone *zone)
 {
    double x_bl = -1.0;
@@ -316,24 +156,12 @@
      }
    else
      {
-#ifdef HAL_BL        
-#ifdef HAVE_HAL
-        sysmode = MODE_HAL;
-        if (!_hal_conn)
-           {
-              e_dbus_init();
-              e_hal_init();
-              _hal_conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
-           }
-        if (_hal_conn)
+        _bl_sys_find();
+        if (bl_sysval)
           {
-             if (!_hal_bl_dev)
-                e_hal_manager_find_device_by_capability
-                (_hal_conn, "laptop_panel",
-                    _e_backlight_panel_found, NULL);
+             sysmode = MODE_SYS;
+             _bl_sys_level_get();
           }
-#endif
-#endif        
      }
 }
 
@@ -354,13 +182,12 @@
           }
         if (out) free(out);
      }
-   else if (sysmode == MODE_HAL)
+   else if (sysmode == MODE_SYS)
      {
-#ifdef HAL_BL        
-#ifdef HAVE_HAL
-        _e_backlight_hal_val_set(val);
-#endif
-#endif        
+        if (bl_sysval)
+          {
+             _bl_sys_level_set(val);
+          }
      }
 }
 
@@ -381,3 +208,143 @@
      }
    return EINA_TRUE;
 }
+
+static char *
+_bl_read_file(const char *file)
+{
+   FILE *f = fopen(file, "r");
+   size_t len;
+   char buf[4096], *p;
+   if (!f) return NULL;
+   len = fread(buf, 1, sizeof(buf) - 1, f);
+   if (len == 0)
+     {
+        fclose(f);
+        return NULL;
+     }
+   buf[len] = 0;
+   for (p = buf; *p; p++)
+     {
+        if (p[0] == '\n') p[0] = 0;
+     }
+   fclose(f);
+   return strdup(buf);
+}
+
+static int
+_bl_sys_num_get(const char *file)
+{
+   char *max;
+   int maxval = -1;
+   
+   max = _bl_read_file(file);
+   if (max)
+     {
+        maxval = atoi(max);
+        free(max);
+     }
+   return maxval;
+}
+
+static void
+_bl_sys_find(void)
+{
+   int maxval = 0;
+   const char *tryfile;
+   
+   if (bl_sysval) return;
+   tryfile = "/sys/devices/virtual/backlight/acpi_video0/max_brightness";
+   maxval = _bl_sys_num_get(tryfile);
+   if (maxval > 0)
+     {
+        bl_sysval = eina_stringshare_add(tryfile);
+        return;
+     }
+   else
+     {
+        Eina_List *files;
+        const char *dir = "/sys/devices/virtual/backlight";
+        
+        files = ecore_file_ls(dir);
+        if (files)
+          {
+             char *file;
+             
+             EINA_LIST_FREE(files, file)
+               {
+                  if (!bl_sysval)
+                    {
+                       char buf[PATH_MAX];
+                       
+                       snprintf(buf, sizeof(buf), 
+                                "%s/%s/max_brightness", dir, file);
+                       maxval = _bl_sys_num_get(buf);
+                       if (maxval > 0)
+                          bl_sysval = eina_stringshare_add(buf);
+                    }
+                  free(file);
+               }
+          }
+     }
+}
+
+static void
+_bl_sys_level_get(void)
+{
+   const char *maxfile = bl_sysval;
+   char *valfile, *p;
+   int maxval, val;
+   
+   if (!bl_sysval) return;
+   valfile = strdup(maxfile);
+   p = strrchr(valfile, '/');
+   if (p)
+     {
+        p[1] = 0;
+        strcat(p, "brightness");
+     }
+   maxval = _bl_sys_num_get(maxfile);
+   if (maxval > 0)
+     {
+        val = _bl_sys_num_get(valfile);
+        if ((val >= 0) && (val <= maxval))
+           bl_val = (double)val / (double)maxval;
+     }
+}
+
+static Eina_Bool
+_e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   Ecore_Exe_Event_Del *ev;
+   
+   ev = event;
+   if (ev->exe == bl_sys_set_exe)
+     {
+        bl_sys_set_exe = NULL;
+        if (bl_sys_pending_set)
+          {
+             bl_sys_pending_set = EINA_FALSE;
+             _bl_sys_level_set(bl_val);
+          }
+     }
+   return ECORE_CALLBACK_RENEW;
+}
+
+static void
+_bl_sys_level_set(double val)
+{
+   char buf[PATH_MAX];
+   
+   if (!bl_sys_exit_handler)
+      bl_sys_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
+                                                    _e_bl_cb_exit, NULL);
+   if (bl_sys_set_exe)
+     {
+        bl_sys_pending_set = EINA_TRUE;
+        return;
+     }
+   snprintf(buf, sizeof(buf), 
+            "%s/enlightenment/utils/enlightenment_backlight %i", 
+            e_prefix_lib_get(), (int)(val * 1000.0));
+   bl_sys_set_exe = ecore_exe_run(buf, NULL);
+}

Log:
fix removal from list for randr init stuff that is begging to crash
  and create bugs! (valgrind caught it)
  
  

Author:       raster
Date:         2011-06-18 06:56:08 -0700 (Sat, 18 Jun 2011)
New Revision: 60475
Trac:         http://trac.enlightenment.org/e/changeset/60475

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

Modified: trunk/e/src/bin/e_randr.c
===================================================================
--- trunk/e/src/bin/e_randr.c	2011-06-18 13:04:08 UTC (rev 60474)
+++ trunk/e/src/bin/e_randr.c	2011-06-18 13:56:08 UTC (rev 60475)
@@ -1608,8 +1608,10 @@
      }
 
    //sort modes desc. by their sizes
-   EINA_LIST_REVERSE_FOREACH(common_modes, iter, mode_info)
+   for (iter = eina_list_last(common_modes); iter;)
      {
+        mode_info = iter->data;
+        iter = iter->prev;
         outputs_mode_found = 0;
         EINA_LIST_FOREACH(outputs, output_iter, output_info)
           {

Log:
make rounding happen up and down for e_backlight util when converting
  to integer.
  
  

Author:       raster
Date:         2011-06-18 23:26:29 -0700 (Sat, 18 Jun 2011)
New Revision: 60481
Trac:         http://trac.enlightenment.org/e/changeset/60481

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

Modified: trunk/e/src/bin/e_backlight_main.c
===================================================================
--- trunk/e/src/bin/e_backlight_main.c	2011-06-19 05:32:28 UTC (rev 60480)
+++ trunk/e/src/bin/e_backlight_main.c	2011-06-19 06:26:29 UTC (rev 60481)
@@ -151,7 +151,7 @@
      }
    if (maxlevel > 0)
      {
-        curlevel = (maxlevel * level) / 1000;
+        curlevel = ((maxlevel * level) + (500 / maxlevel)) / 1000;
         return write_file(file, curlevel);
      }
    return -1;

Log:
add preferences tab to config registry for the prefs menu (vs system
  config menu). this pretty much matches what ubuntu does for these 2
  menus, so it makes integrating easier.
  
  

Author:       raster
Date:         2011-06-25 19:56:25 -0700 (Sat, 25 Jun 2011)
New Revision: 60695
Trac:         http://trac.enlightenment.org/e/changeset/60695

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

Modified: trunk/e/src/bin/e_configure.c
===================================================================
--- trunk/e/src/bin/e_configure.c	2011-06-26 02:55:29 UTC (rev 60694)
+++ trunk/e/src/bin/e_configure.c	2011-06-26 02:56:25 UTC (rev 60695)
@@ -295,7 +295,7 @@
    /* get desktops */
    settings_desktops = efreet_util_desktop_category_list("Settings");
    system_desktops = efreet_util_desktop_category_list("System");
-   if ((!settings_desktops) || (!system_desktops))
+   if ((!settings_desktops) && (!system_desktops))
      {
 	EINA_LIST_FREE(settings_desktops, desktop)
 	   efreet_desktop_free(desktop);
@@ -315,8 +315,9 @@
 	const char *cfg_icon;
 	char *label;
 	int cfg_pri;
-
-	if (!eina_list_data_find(system_desktops, desktop)) continue;
+        int dopref;
+        
+        dopref = 0;
 	cfg_cat = NULL;
 	cfg_icon = NULL;
 	cfg_cat_cfg = NULL;
@@ -324,6 +325,11 @@
 	cfg_cat_name = NULL;
 	cfg_cat_icon = NULL;
 	label = NULL;
+	if (!eina_list_data_find(system_desktops, desktop))
+          {
+             /* settings desktop but not in system -> put in preferened */
+             dopref = 1;
+          }
 	if (desktop->x)
 	  {
 	     cfg_cat_cfg = eina_hash_find(desktop->x, "X-Enlightenment-Config-Category");
@@ -346,34 +352,45 @@
 	if (desktop->name) label = desktop->name;
 	else if (desktop->generic_name) label = desktop->generic_name;
 	else label = "???";
-	if (!cfg_cat_cfg)
-	  {
-	     const char *ic;
-
-	     snprintf(buf, sizeof(buf), "system/%s", label);
-	     cfg_cat_cfg = buf;
-	     ic = cfg_cat_icon;
-	     if (!ic) ic = "system";
-	     e_configure_registry_category_add("system", 1000, _("System"),
-					       NULL, ic);
-	  }
-	else
-	  {
-	     cfg_cat = ecore_file_dir_get(cfg_cat_cfg);
-	     if (!cfg_cat) cfg_cat = strdup(cfg_cat_cfg);
-	     if (cfg_cat)
-	       {
-		  if (!cfg_cat_name) cfg_cat_name = cfg_cat;
-		  e_configure_registry_category_add(cfg_cat,
-						    1000, cfg_cat_name,
-						    NULL, cfg_cat_icon);
-		  free(cfg_cat);
-		  cfg_cat = NULL;
-	       }
-	  }
-	_e_configure_registry_item_full_add(cfg_cat_cfg, cfg_pri, label,
-					    NULL, cfg_icon,
-					    NULL, NULL, desktop, NULL);
+        if (!cfg_cat_cfg)
+          {
+             const char *ic = cfg_cat_icon;
+             
+             if (dopref)
+               {
+                  snprintf(buf, sizeof(buf), "preferences/%s", label);
+                  if (!ic) ic = "preferences-preferences";
+                  e_configure_registry_category_add("preferences", 900,
+                                                    _("Preferences"),
+                                                    NULL, ic);
+               }
+             else
+               {
+                  snprintf(buf, sizeof(buf), "system/%s", label);
+                  if (!ic) ic = "preferences-system";
+                  e_configure_registry_category_add("system", 1000, 
+                                                    _("System"),
+                                                    NULL, ic);
+               }
+             cfg_cat_cfg = buf;
+          }
+        else
+          {
+             cfg_cat = ecore_file_dir_get(cfg_cat_cfg);
+             if (!cfg_cat) cfg_cat = strdup(cfg_cat_cfg);
+             if (cfg_cat)
+               {
+                  if (!cfg_cat_name) cfg_cat_name = cfg_cat;
+                  e_configure_registry_category_add(cfg_cat,
+                                                    1000, cfg_cat_name,
+                                                    NULL, cfg_cat_icon);
+                  free(cfg_cat);
+                  cfg_cat = NULL;
+               }
+          }
+        _e_configure_registry_item_full_add(cfg_cat_cfg, cfg_pri, label,
+                                            NULL, cfg_icon,
+                                            NULL, NULL, desktop, NULL);
      }
    EINA_LIST_FREE(settings_desktops, desktop)
       efreet_desktop_free(desktop);

Log:
convert UTF-8 -> utf8 and vice-versa if locale validation says the
  system uses another utf8 definition.
  
  

Author:       raster
Date:         2011-06-29 06:24:19 -0700 (Wed, 29 Jun 2011)
New Revision: 60815
Trac:         http://trac.enlightenment.org/e/changeset/60815

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

Modified: trunk/e/src/bin/e_intl.c
===================================================================
--- trunk/e/src/bin/e_intl.c	2011-06-29 13:22:16 UTC (rev 60814)
+++ trunk/e/src/bin/e_intl.c	2011-06-29 13:24:19 UTC (rev 60815)
@@ -39,7 +39,7 @@
 static char		*_e_intl_locale_alias_get(const char *language);
 static Eina_List	*_e_intl_locale_system_locales_get(void);
 static Eina_List	*_e_intl_locale_search_order_get(const char *locale);
-static int		 _e_intl_locale_validate(const char *locale);
+static int		 _e_intl_locale_validate(const char *locale, char **chset);
 static void 		 _e_intl_locale_hash_free(Eina_Hash *language_hash);
 static Eina_Bool 	 _e_intl_locale_hash_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
 
@@ -118,6 +118,25 @@
    return 1;
 }
 
+static char *
+_fix_chset(char *lang, char *chset)
+{
+   char *p, *new_lang;
+   
+   if (!chset) return lang;
+	     
+   p = strchr(lang, '.');
+   if (p) *p = 0;
+   new_lang = malloc(strlen(lang) + 1 + strlen(chset));
+   strcpy(new_lang, lang);
+   strcat(new_lang, ".");
+   strcat(new_lang, chset);
+   free(chset);
+   E_FREE(lang);
+   lang = new_lang;
+   return lang;
+}
+
 /*
  * TODO
  * - Add error dialogs explaining any errors while setting the locale
@@ -159,7 +178,11 @@
    ok = 1;
    if (strcmp(_e_intl_language_alias, "C"))
      {
-	ok = _e_intl_locale_validate(_e_intl_language_alias);
+        char *chset = NULL;
+        
+	ok = _e_intl_locale_validate(_e_intl_language_alias, &chset);
+        _e_intl_language_alias = _fix_chset(_e_intl_language_alias, chset);
+        chset = NULL;
 	if (!ok)
 	  {
 	     char *p, *new_lang;
@@ -169,7 +192,9 @@
 	     if (p) *p = 0;
 	     _e_intl_language_alias = strdup(new_lang);
 	     E_FREE(new_lang);
-	     ok = _e_intl_locale_validate(_e_intl_language_alias);
+	     ok = _e_intl_locale_validate(_e_intl_language_alias, &chset);
+             _e_intl_language_alias = _fix_chset(_e_intl_language_alias, chset);
+             chset = NULL;
 	  }
      }
    if (!ok)
@@ -180,6 +205,11 @@
      }
    else
      {
+        char *chset = NULL;
+        
+	ok = _e_intl_locale_validate(_e_intl_language, &chset);
+        _e_intl_language = _fix_chset(_e_intl_language, chset);
+        chset = NULL;
 	/* Only set env vars is a non NULL locale was passed */
 	if (set_envars)
 	  {
@@ -273,7 +303,8 @@
 
 	EINA_LIST_FREE(dir_languages, language)
 	     if ((_e_intl_language_list_find(all_languages, language)) || 
-		 ((strlen(language) > 2) && (!_e_intl_locale_validate(language))))
+		 ((strlen(language) > 2) && 
+                     (!_e_intl_locale_validate(language, NULL))))
 	       {
 		  free(language);
 	       }
@@ -847,7 +878,7 @@
  * must be an un aliased locale;
  */
 static int
-_e_intl_locale_validate(const char *locale)
+_e_intl_locale_validate(const char *locale, char **chset)
 {
    Eina_List *all_locales;
    E_Locale_Parts *locale_parts;
@@ -940,6 +971,16 @@
 				      found = 1;
 				   }
 			      }
+                            if ((found) && (chset))
+                              {
+                                 if (*chset) free(*chset);
+                                 if ((!strcmp(locale_parts->codeset, "UTF-8")) &&
+                                     (!strcmp(locale_parts_next->codeset, "utf8")))
+                                    *chset = strdup("utf8");
+                                 else if ((!strcmp(locale_parts->codeset, "utf8")) &&
+                                          (!strcmp(locale_parts_next->codeset, "UTF-8")))
+                                    *chset = strdup("UTF-8");
+                              }
 			 }
 		    }
 	       }

Log:
also adjust child process nice levels too.
  
  

Author:       raster
Date:         2011-07-02 20:58:56 -0700 (Sat, 02 Jul 2011)
New Revision: 60942
Trac:         http://trac.enlightenment.org/e/changeset/60942

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-02 16:00:45 UTC (rev 60941)
+++ trunk/e/src/bin/e_border.c	2011-07-03 03:58:56 UTC (rev 60942)
@@ -977,37 +977,77 @@
 }
 
 static void
-_e_border_pri_raise(E_Border *bd)
+_pri_adj(int pid, int set, int adj, Eina_Bool use_adj, Eina_Bool adj_children, Eina_Bool do_children)
 {
-   if (bd->client.netwm.pid > 0)
+   int newpri = set;
+
+   if (use_adj) newpri = getpriority(PRIO_PROCESS, pid) + adj;
+   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_PRIO_VALUE(2, 5));
+   if (do_children)
      {
-        int newpri;
-        
-//             newpri = getpriority(PRIO_PROCESS, bd->client.netwm.pid) - 1;
-        newpri = e_config->priority - 1;
-        setpriority(PRIO_PROCESS, bd->client.netwm.pid, newpri);
-        printf("WIN: pid %i, title %s TO: %i (HI!!!)\n",
-               bd->client.netwm.pid,
-               e_border_name_get(bd),
-               newpri);
+        Eina_List *files;
+        char *file, buf[PATH_MAX];
+        FILE *f;
+        int pid2, ppid;
+
+        // yes - this is /proc specific... so this may not work on some
+        // os's - works on linux. too bad for others.
+        files = ecore_file_ls("/proc");
+        EINA_LIST_FREE(files, file)
+          {
+             if (isdigit(file[0]))
+               {
+                  snprintf(buf, sizeof(buf), "/proc/%s/stat", file);
+                  f = fopen(buf, "r");
+                  if (f)
+                    {
+                       pid2 = -1;
+                       ppid = -1;
+                       if (fscanf(f, "%i %*s %*s %i %*s", &pid2, &ppid) == 2)
+                         {
+                            fclose(f);
+                            if (ppid == pid)
+                              {
+                                 if (adj_children)
+                                    _pri_adj(pid2, set, adj, EINA_TRUE, 
+                                             adj_children, do_children);
+                                 else
+                                    _pri_adj(pid2, set, adj, use_adj, 
+                                             adj_children, do_children);
+                              }
+                         }
+                       else fclose(f);
+                    }
+               }
+             free(file);
+          }
      }
 }
 
 static void
+_e_border_pri_raise(E_Border *bd)
+{
+   if (bd->client.netwm.pid <= 0) return;
+   _pri_adj(bd->client.netwm.pid, 
+            e_config->priority - 1, -1, EINA_FALSE, 
+            EINA_TRUE, EINA_TRUE);
+//   printf("WIN: pid %i, title %s (HI!!!!!!!!!!!!!!!!!!)\n",
+//          bd->client.netwm.pid, e_border_name_get(bd));
+}
+
+static void
 _e_border_pri_norm(E_Border *bd)
 {
-   if (bd->client.netwm.pid > 0)
-     {
-        int newpri;
-        
-//             newpri = getpriority(PRIO_PROCESS, bd->client.netwm.pid) + 1;
-        newpri = e_config->priority;
-        setpriority(PRIO_PROCESS, bd->client.netwm.pid, newpri);
-        printf("WIN: pid %i, title %s TO: %i\n",
-               bd->client.netwm.pid,
-               e_border_name_get(bd),
-               newpri);
-     }
+   if (bd->client.netwm.pid <= 0) return;
+   _pri_adj(bd->client.netwm.pid, 
+            e_config->priority, 1, EINA_FALSE, 
+            EINA_TRUE, EINA_TRUE);
+//   printf("WIN: pid %i, title %s (NORMAL)\n",
+//          bd->client.netwm.pid, e_border_name_get(bd));
 }
 
 static void

Log:
dont complain about the file rename for first rev of profile.cfg
  
  

Author:       raster
Date:         2011-07-04 02:43:29 -0700 (Mon, 04 Jul 2011)
New Revision: 60980
Trac:         http://trac.enlightenment.org/e/changeset/60980

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-07-04 09:36:07 UTC (rev 60979)
+++ trunk/e/src/bin/e_config.c	2011-07-04 09:43:29 UTC (rev 60980)
@@ -1657,8 +1657,8 @@
                        e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/profile.cfg");
                        e_user_dir_snprintf(bdst, sizeof(bdst), "config/profile.1.cfg");
                        ret = ecore_file_mv(bsrc, bdst);
-                       if (!ret)
-                          _e_config_mv_error(bsrc, bdst);
+//                       if (!ret)
+//                          _e_config_mv_error(bsrc, bdst);
                     }
                }
              ret = ecore_file_mv(buf2, buf);

Log:
init eina before e prefix.
  
  

Author:       raster
Date:         2011-07-04 02:43:46 -0700 (Mon, 04 Jul 2011)
New Revision: 60981
Trac:         http://trac.enlightenment.org/e/changeset/60981

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2011-07-04 09:43:29 UTC (rev 60980)
+++ trunk/e/src/bin/e_main.c	2011-07-04 09:43:46 UTC (rev 60981)
@@ -203,10 +203,10 @@
    snprintf(buf, sizeof(buf), "%1.1f", tstart);
    e_util_env_set("E_START_TIME", buf);
 
-   /* FIXME: this is the init code for letting e be relocatable. right now
-    * its not used - so i want to see if it can reliably determine its exe
-    * prefix
-    */
+   TS("eina init");
+   eina_init();
+   _e_main_shutdown_push(eina_shutdown);
+
    TS("determine prefix");
    if (!e_prefix_determine(argv[0]))
      {
@@ -234,10 +234,6 @@
    e_util_env_set("PANTS", "ON");
    e_util_env_set("DESKTOP", "Enlightenment-0.17.0");
 
-   TS("eina init");
-   eina_init();
-   _e_main_shutdown_push(eina_shutdown);
-
    TS("intl init");
    e_intl_init();
    _e_main_shutdown_push(e_intl_shutdown);

Log:
eek typo. max_brightness
  
  

Author:       raster
Date:         2011-07-05 03:56:56 -0700 (Tue, 05 Jul 2011)
New Revision: 61038
Trac:         http://trac.enlightenment.org/e/changeset/61038

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

Modified: trunk/e/src/bin/e_backlight_main.c
===================================================================
--- trunk/e/src/bin/e_backlight_main.c	2011-07-05 10:33:24 UTC (rev 61037)
+++ trunk/e/src/bin/e_backlight_main.c	2011-07-05 10:56:56 UTC (rev 61038)
@@ -99,7 +99,7 @@
         exit(7);
      }
    
-   maxstr = read_file("/sys/devices/virtual/backlight/acpi_video0/max_brightness_max");
+   maxstr = read_file("/sys/devices/virtual/backlight/acpi_video0/max_brightness");
    if (maxstr)
      {
         maxlevel = atoi(maxstr);

Log:
revert local changes - tasn doent seem to be any happier.
  
  

Author:       raster
Date:         2011-07-05 04:20:56 -0700 (Tue, 05 Jul 2011)
New Revision: 61044
Trac:         http://trac.enlightenment.org/e/changeset/61044

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

Modified: trunk/e/src/bin/e_intl.c
===================================================================
--- trunk/e/src/bin/e_intl.c	2011-07-05 11:13:47 UTC (rev 61043)
+++ trunk/e/src/bin/e_intl.c	2011-07-05 11:20:56 UTC (rev 61044)
@@ -39,7 +39,7 @@
 static char		*_e_intl_locale_alias_get(const char *language);
 static Eina_List	*_e_intl_locale_system_locales_get(void);
 static Eina_List	*_e_intl_locale_search_order_get(const char *locale);
-static int		 _e_intl_locale_validate(const char *locale, char **chset);
+static int		 _e_intl_locale_validate(const char *locale);
 static void 		 _e_intl_locale_hash_free(Eina_Hash *language_hash);
 static Eina_Bool 	 _e_intl_locale_hash_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
 
@@ -118,25 +118,6 @@
    return 1;
 }
 
-static char *
-_fix_chset(char *lang, char *chset)
-{
-   char *p, *new_lang;
-   
-   if (!chset) return lang;
-	     
-   p = strchr(lang, '.');
-   if (p) *p = 0;
-   new_lang = malloc(strlen(lang) + 1 + strlen(chset));
-   strcpy(new_lang, lang);
-   strcat(new_lang, ".");
-   strcat(new_lang, chset);
-   free(chset);
-   E_FREE(lang);
-   lang = new_lang;
-   return lang;
-}
-
 /*
  * TODO
  * - Add error dialogs explaining any errors while setting the locale
@@ -178,11 +159,7 @@
    ok = 1;
    if (strcmp(_e_intl_language_alias, "C"))
      {
-        char *chset = NULL;
-        
-	ok = _e_intl_locale_validate(_e_intl_language_alias, &chset);
-        _e_intl_language_alias = _fix_chset(_e_intl_language_alias, chset);
-        chset = NULL;
+	ok = _e_intl_locale_validate(_e_intl_language_alias);
 	if (!ok)
 	  {
 	     char *p, *new_lang;
@@ -192,9 +169,7 @@
 	     if (p) *p = 0;
 	     _e_intl_language_alias = strdup(new_lang);
 	     E_FREE(new_lang);
-	     ok = _e_intl_locale_validate(_e_intl_language_alias, &chset);
-             _e_intl_language_alias = _fix_chset(_e_intl_language_alias, chset);
-             chset = NULL;
+	     ok = _e_intl_locale_validate(_e_intl_language_alias);
 	  }
      }
    if (!ok)
@@ -205,11 +180,6 @@
      }
    else
      {
-        char *chset = NULL;
-        
-	ok = _e_intl_locale_validate(_e_intl_language, &chset);
-        _e_intl_language = _fix_chset(_e_intl_language, chset);
-        chset = NULL;
 	/* Only set env vars is a non NULL locale was passed */
 	if (set_envars)
 	  {
@@ -303,8 +273,7 @@
 
 	EINA_LIST_FREE(dir_languages, language)
 	     if ((_e_intl_language_list_find(all_languages, language)) || 
-		 ((strlen(language) > 2) && 
-                     (!_e_intl_locale_validate(language, NULL))))
+		 ((strlen(language) > 2) && (!_e_intl_locale_validate(language))))
 	       {
 		  free(language);
 	       }
@@ -878,7 +847,7 @@
  * must be an un aliased locale;
  */
 static int
-_e_intl_locale_validate(const char *locale, char **chset)
+_e_intl_locale_validate(const char *locale)
 {
    Eina_List *all_locales;
    E_Locale_Parts *locale_parts;
@@ -971,16 +940,6 @@
 				      found = 1;
 				   }
 			      }
-                            if ((found) && (chset))
-                              {
-                                 if (*chset) free(*chset);
-                                 if ((!strcmp(locale_parts->codeset, "UTF-8")) &&
-                                     (!strcmp(locale_parts_next->codeset, "utf8")))
-                                    *chset = strdup("utf8");
-                                 else if ((!strcmp(locale_parts->codeset, "utf8")) &&
-                                          (!strcmp(locale_parts_next->codeset, "UTF-8")))
-                                    *chset = strdup("UTF-8");
-                              }
 			 }
 		    }
 	       }

Log:
dont change pri of e's own wins
  
  

Author:       raster
Date:         2011-07-06 02:03:18 -0700 (Wed, 06 Jul 2011)
New Revision: 61074
Trac:         http://trac.enlightenment.org/e/changeset/61074

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-06 08:57:03 UTC (rev 61073)
+++ trunk/e/src/bin/e_border.c	2011-07-06 09:03:18 UTC (rev 61074)
@@ -1032,6 +1032,7 @@
 _e_border_pri_raise(E_Border *bd)
 {
    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, 
             EINA_TRUE, EINA_TRUE);
@@ -1043,6 +1044,7 @@
 _e_border_pri_norm(E_Border *bd)
 {
    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, 
             EINA_TRUE, EINA_TRUE);

Log:
for now... dont adjust children too. this seems to consume a fair bit
  of time to do...
  
  

Author:       raster
Date:         2011-07-06 02:11:16 -0700 (Wed, 06 Jul 2011)
New Revision: 61075
Trac:         http://trac.enlightenment.org/e/changeset/61075

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-06 09:03:18 UTC (rev 61074)
+++ trunk/e/src/bin/e_border.c	2011-07-06 09:11:16 UTC (rev 61075)
@@ -1035,7 +1035,8 @@
    if (bd->client.netwm.pid == getpid()) return;
    _pri_adj(bd->client.netwm.pid, 
             e_config->priority - 1, -1, EINA_FALSE, 
-            EINA_TRUE, EINA_TRUE);
+//            EINA_TRUE, EINA_TRUE);
+            EINA_TRUE, EINA_FALSE);
 //   printf("WIN: pid %i, title %s (HI!!!!!!!!!!!!!!!!!!)\n",
 //          bd->client.netwm.pid, e_border_name_get(bd));
 }
@@ -1047,7 +1048,8 @@
    if (bd->client.netwm.pid == getpid()) return;
    _pri_adj(bd->client.netwm.pid, 
             e_config->priority, 1, EINA_FALSE, 
-            EINA_TRUE, EINA_TRUE);
+//            EINA_TRUE, EINA_TRUE);
+            EINA_TRUE, EINA_FALSE);
 //   printf("WIN: pid %i, title %s (NORMAL)\n",
 //          bd->client.netwm.pid, e_border_name_get(bd));
 }

Log:
change err message to help ppl in future.
  
  

Author:       raster
Date:         2011-07-06 19:19:18 -0700 (Wed, 06 Jul 2011)
New Revision: 61100
Trac:         http://trac.enlightenment.org/e/changeset/61100

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2011-07-06 20:56:55 UTC (rev 61099)
+++ trunk/e/src/bin/e_main.c	2011-07-07 02:19:18 UTC (rev 61100)
@@ -661,7 +661,8 @@
    if (!efreet_init())
      {
         e_error_message_show(_("Enlightenment cannot initialize the FDO desktop system.\n"
-                               "Perhaps you are out of memory?"));
+                               "Perhaps you lack permissions on ~/.cache/efreet or are\n"
+                               "out of memory or disk space?"));
         _e_main_shutdown(-1);
      }
    _e_main_shutdown_push(efreet_shutdown);

Log:
handle hooglands silly tablet kernel. :)
  
  

Author:       raster
Date:         2011-07-07 19:17:44 -0700 (Thu, 07 Jul 2011)
New Revision: 61140
Trac:         http://trac.enlightenment.org/e/changeset/61140

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

Modified: trunk/e/src/bin/e_backlight_main.c
===================================================================
--- trunk/e/src/bin/e_backlight_main.c	2011-07-08 00:21:17 UTC (rev 61139)
+++ trunk/e/src/bin/e_backlight_main.c	2011-07-08 02:17:44 UTC (rev 61140)
@@ -149,6 +149,18 @@
           }
         closedir(dirp);
      }
+   if (maxlevel <= 0)
+     {
+        struct stat st;
+        
+        snprintf(file, sizeof(file), "/sys/class/leds/lcd-backlight/brightness");
+        if (stat(file, &st) >= 0)
+          {
+             maxstr = read_file("/sys/devices/leds/lcd-backlight/max_brightness");
+             maxlevel = 255;
+             if (maxstr) maxlevel = atoi(maxstr);
+          }
+     }
    if (maxlevel > 0)
      {
         curlevel = ((maxlevel * level) + (500 / maxlevel)) / 1000;

Log:
even though it doesnt matter. lets be nice and free things eh?
  
  

Author:       raster
Date:         2011-07-07 19:24:56 -0700 (Thu, 07 Jul 2011)
New Revision: 61141
Trac:         http://trac.enlightenment.org/e/changeset/61141

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

Modified: trunk/e/src/bin/e_backlight_main.c
===================================================================
--- trunk/e/src/bin/e_backlight_main.c	2011-07-08 02:17:44 UTC (rev 61140)
+++ trunk/e/src/bin/e_backlight_main.c	2011-07-08 02:24:56 UTC (rev 61141)
@@ -156,9 +156,13 @@
         snprintf(file, sizeof(file), "/sys/class/leds/lcd-backlight/brightness");
         if (stat(file, &st) >= 0)
           {
+             maxlevel = 255;
              maxstr = read_file("/sys/devices/leds/lcd-backlight/max_brightness");
-             maxlevel = 255;
-             if (maxstr) maxlevel = atoi(maxstr);
+             if (maxstr)
+               {
+                  maxlevel = atoi(maxstr);
+                  free(maxstr);
+               }
           }
      }
    if (maxlevel > 0)

Log:
get rid of crash vector with obj del tracking
  
  

Author:       raster
Date:         2011-07-23 21:13:23 -0700 (Sat, 23 Jul 2011)
New Revision: 61628
Trac:         http://trac.enlightenment.org/e/changeset/61628

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

Modified: trunk/e/src/bin/e_widget.c
===================================================================
--- trunk/e/src/bin/e_widget.c	2011-07-24 03:59:09 UTC (rev 61627)
+++ trunk/e/src/bin/e_widget.c	2011-07-24 04:13:23 UTC (rev 61628)
@@ -124,10 +124,26 @@
    if (minh) *minh = sd->minh;
 }
 
+static void
+_sub_obj_del(void        *data,
+             Evas        *e __UNUSED__,
+             Evas_Object *obj,
+             void        *event_info __UNUSED__)
+{
+   E_Smart_Data *sd = data;
+   
+   sd->subobjs = eina_list_remove(sd->subobjs, obj);
+   evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _sub_obj_del);
+}
+
 EAPI void
 e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj)
 {
    API_ENTRY return;
+   
+   evas_object_event_callback_del(sobj, EVAS_CALLBACK_DEL, _sub_obj_del);
+   evas_object_event_callback_add(sobj, EVAS_CALLBACK_DEL, _sub_obj_del, sd);
+   
    sd->subobjs = eina_list_append(sd->subobjs, sobj);
    if (!sd->child_can_focus)
      {
@@ -496,7 +512,7 @@
 {
    INTERNAL_ENTRY;
    if (sd->del_func) sd->del_func(obj);
-   E_FREE_LIST(sd->subobjs, evas_object_del);
+   while (sd->subobjs) evas_object_del(sd->subobjs->data);
    free(sd);
 }

Log:
quick hack to fix inf loop on del onf fsel.
  
  

Author:       raster
Date:         2011-07-25 04:29:37 -0700 (Mon, 25 Jul 2011)
New Revision: 61686
Trac:         http://trac.enlightenment.org/e/changeset/61686

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

Modified: trunk/e/src/bin/e_widget.c
===================================================================
--- trunk/e/src/bin/e_widget.c	2011-07-25 10:37:43 UTC (rev 61685)
+++ trunk/e/src/bin/e_widget.c	2011-07-25 11:29:37 UTC (rev 61686)
@@ -141,8 +141,9 @@
 {
    API_ENTRY return;
    
+   if (eina_list_data_find(sd->subobjs, obj)) return;
+   
    evas_object_event_callback_del(sobj, EVAS_CALLBACK_DEL, _sub_obj_del);
-   evas_object_event_callback_add(sobj, EVAS_CALLBACK_DEL, _sub_obj_del, sd);
    
    sd->subobjs = eina_list_append(sd->subobjs, sobj);
    if (!sd->child_can_focus)
@@ -158,12 +159,14 @@
 	     sd->parent_obj = obj;
 	  }
      }
+   evas_object_event_callback_add(sobj, EVAS_CALLBACK_DEL, _sub_obj_del, sd);
 }
 
 EAPI void
 e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj)
 {
    API_ENTRY return;
+   evas_object_event_callback_del(sobj, EVAS_CALLBACK_DEL, _sub_obj_del);
    sd->subobjs = eina_list_remove(sd->subobjs, sobj);
    if (!sd->child_can_focus)
      {
@@ -511,8 +514,20 @@
 _e_smart_del(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
+   void *po = NULL;
+   
    if (sd->del_func) sd->del_func(obj);
-   while (sd->subobjs) evas_object_del(sd->subobjs->data);
+   while (sd->subobjs)
+     {
+        if (sd->subobjs->data == po)
+          {
+             po = sd->subobjs->data;
+             sd->subobjs = eina_list_remove_list(sd->subobjs, sd->subobjs);
+             continue;
+          }
+        po = sd->subobjs->data;
+        evas_object_del(sd->subobjs->data);
+     }
    free(sd);
 }

Log:
fix click to focus last window focus on deskt switch.
  
  

Author:       raster
Date:         2011-07-28 21:51:32 -0700 (Thu, 28 Jul 2011)
New Revision: 61875
Trac:         http://trac.enlightenment.org/e/changeset/61875

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

Modified: trunk/e/src/bin/e_desk.c
===================================================================
--- trunk/e/src/bin/e_desk.c	2011-07-28 23:18:21 UTC (rev 61874)
+++ trunk/e/src/bin/e_desk.c	2011-07-29 04:51:32 UTC (rev 61875)
@@ -258,10 +258,12 @@
 
    if (e_config->desk_flip_animate_mode > 0)
      _e_desk_show_begin(desk, e_config->desk_flip_animate_mode, dx, dy);
+   else
+     {
+        if (e_config->focus_last_focused_per_desktop)
+           e_desk_last_focused_focus(desk);
+     }
 
-   if (e_config->focus_last_focused_per_desktop)
-     e_desk_last_focused_focus(desk);
-
    if (was_zone)
      {
 	if (e_config->desk_flip_pan_bg)
@@ -684,6 +686,11 @@
                 e_desk_last_focused_focus(desk);
           }
      }
+   else
+     {
+        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();

Log:
fix up menu augomentation in main menu - re-number slots and rename
  enlightenment submenu slots
  
  

Author:       raster
Date:         2011-08-01 21:53:44 -0700 (Mon, 01 Aug 2011)
New Revision: 61975
Trac:         http://trac.enlightenment.org/e/changeset/61975

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-08-02 04:13:33 UTC (rev 61974)
+++ trunk/e/src/bin/e_int_menus.c	2011-08-02 04:53:44 UTC (rev 61975)
@@ -174,6 +174,10 @@
 
    subm = e_menu_new();
    dat->enlightenment = subm;
+   
+   l = _e_int_menus_augmentation_find("enlightenment/0");
+   if (l) _e_int_menus_augmentation_add(subm, l);
+   
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Enlightenment"));
    e_util_menu_item_theme_icon_set(mi, "enlightenment");
@@ -189,14 +193,14 @@
    e_util_menu_item_theme_icon_set(mi, "preferences-desktop-theme");
    e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL);
 
-   l = _e_int_menus_augmentation_find("main/5");
-   if (l) _e_int_menus_augmentation_add(m, l);
+   l = _e_int_menus_augmentation_find("enlightenment/1");
+   if (l) _e_int_menus_augmentation_add(subm, l);
 
    mi = e_menu_item_new(subm);
    e_menu_item_separator_set(mi, 1);
 
-   l = _e_int_menus_augmentation_find("main/6");
-   if (l) _e_int_menus_augmentation_add(m, l);
+   l = _e_int_menus_augmentation_find("enlightenment/2");
+   if (l) _e_int_menus_augmentation_add(subm, l);
 
    mi = e_menu_item_new(subm);
    e_menu_item_label_set(mi, _("Restart"));
@@ -208,13 +212,16 @@
    e_util_menu_item_theme_icon_set(mi, "application-exit");
    e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
 
-   l = _e_int_menus_augmentation_find("main/7");
+   l = _e_int_menus_augmentation_find("enlightenment/3");
+   if (l) _e_int_menus_augmentation_add(subm, l);
+   
+   l = _e_int_menus_augmentation_find("main/5");
    if (l) _e_int_menus_augmentation_add(m, l);
 
    mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
 
-   l = _e_int_menus_augmentation_find("main/8");
+   l = _e_int_menus_augmentation_find("main/6");
    if (l) _e_int_menus_augmentation_add(m, l);
 
    subm = e_int_menus_config_new();
@@ -224,10 +231,10 @@
    e_util_menu_item_theme_icon_set(mi, "preferences-system");
    e_menu_item_submenu_set(mi, subm);
 
-   l = _e_int_menus_augmentation_find("main/9");
+   l = _e_int_menus_augmentation_find("main/7");
    if (l) _e_int_menus_augmentation_add(m, l);
 
-   l = eina_hash_find(_e_int_menus_augmentation, "main/10");
+   l = eina_hash_find(_e_int_menus_augmentation, "main/8");
    if (l) 
      {
         separator = 1;
@@ -236,7 +243,7 @@
         _e_int_menus_augmentation_add(m, l);
      }
 
-   l = eina_hash_find(_e_int_menus_augmentation, "main/11");
+   l = eina_hash_find(_e_int_menus_augmentation, "main/9");
    if (l) 
      {
         if (!separator)

Log:
setjmp.h -> default header.
  
  

Author:       raster
Date:         2011-08-02 06:22:08 -0700 (Tue, 02 Aug 2011)
New Revision: 61995
Trac:         http://trac.enlightenment.org/e/changeset/61995

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

Modified: trunk/e/src/bin/e.h
===================================================================
--- trunk/e/src/bin/e.h	2011-08-02 12:30:25 UTC (rev 61994)
+++ trunk/e/src/bin/e.h	2011-08-02 13:22:08 UTC (rev 61995)
@@ -76,9 +76,9 @@
 
 # ifdef __GLIBC__
 #  include <execinfo.h>
-#  include <setjmp.h>
 # endif
 
+# include <setjmp.h>
 # include <Eina.h>
 # include <Eet.h>
 # include <Evas.h>

Log:
remove startic 4k buffer from stack (down to 32bytes) thats alweays
  there through all of e's runtime.
  
  

Author:       raster
Date:         2011-08-07 16:40:15 -0700 (Sun, 07 Aug 2011)
New Revision: 62187
Trac:         http://trac.enlightenment.org/e/changeset/62187

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2011-08-07 16:47:09 UTC (rev 62186)
+++ trunk/e/src/bin/e_main.c	2011-08-07 23:40:15 UTC (rev 62187)
@@ -115,6 +115,16 @@
 EAPI Eina_Bool stopping = EINA_FALSE;
 EAPI Eina_Bool restart = EINA_FALSE;
 
+static void
+_fix_user_default_edj(void)
+{
+   char buff[PATH_MAX];
+   
+   /* fix for FOOLS that keep cp'ing default.edj into ~/.e/e/themes */
+   e_user_dir_concat_static(buff, "themes/default.edj");
+   if (ecore_file_exists(buff)) ecore_file_unlink(buff);
+}
+
 /* externally accessible functions */
 int 
 main(int argc, char **argv) 
@@ -123,7 +133,7 @@
    Eina_Bool safe_mode = EINA_FALSE;
    Eina_Bool after_restart = EINA_FALSE;
    double t = 0.0, tstart = 0.0;
-   char *s = NULL, buff[PATH_MAX];
+   char *s = NULL, buff[32];
    struct sigaction action;
 #ifdef TS_DO
    t0 = t1 = t2 = ecore_time_unix_get();
@@ -436,9 +446,7 @@
    TS("E_Config Init Done");
    _e_main_shutdown_push(e_config_shutdown);
 
-   /* fix for FOOLS that keep cp'ing default.edj into ~/.e/e/themes */
-   e_user_dir_concat_static(buff, "themes/default.edj");
-   if (ecore_file_exists(buff)) ecore_file_unlink(buff);
+   _fix_user_default_edj();
 
    TS("E_Env Init");
    if (!e_env_init())

Log:
use sizeof for buffers - safer for modifications.
  
  

Author:       raster
Date:         2011-08-07 23:10:36 -0700 (Sun, 07 Aug 2011)
New Revision: 62191
Trac:         http://trac.enlightenment.org/e/changeset/62191

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

Modified: trunk/e/src/bin/e_desklock.c
===================================================================
--- trunk/e/src/bin/e_desklock.c	2011-08-08 05:42:29 UTC (rev 62190)
+++ trunk/e/src/bin/e_desklock.c	2011-08-08 06:10:36 UTC (rev 62191)
@@ -757,8 +757,8 @@
 	sigaction(SIGABRT, &action, NULL);
 
 	current_user = _desklock_auth_get_current_user();
-	eina_strlcpy(da.user, current_user, PATH_MAX);
-	eina_strlcpy(da.passwd, passwd, PATH_MAX);
+	eina_strlcpy(da.user, current_user, sizeof(da.user));
+	eina_strlcpy(da.passwd, passwd, sizeof(da.passwd));
 	/* security - null out passwd string once we are done with it */
 	for (p = passwd; *p; p++) *p = 0;
 	da.pam.handle = NULL;

Log:
add explicit vsize setting for preview widget
  
  

Author:       raster
Date:         2011-08-07 23:18:00 -0700 (Sun, 07 Aug 2011)
New Revision: 62192
Trac:         http://trac.enlightenment.org/e/changeset/62192

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

Modified: trunk/e/src/bin/e_widget_preview.c
===================================================================
--- trunk/e/src/bin/e_widget_preview.c	2011-08-08 06:10:36 UTC (rev 62191)
+++ trunk/e/src/bin/e_widget_preview.c	2011-08-08 06:18:00 UTC (rev 62192)
@@ -121,6 +121,15 @@
    return 1;
 }
 
+EAPI void
+e_widget_preview_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+{
+   E_Widget_Data *wd;
+
+   wd = e_widget_data_get(obj);
+   e_livethumb_vsize_set(wd->img, w, h);
+}
+
 static void
 _e_wid_preview_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {

Modified: trunk/e/src/bin/e_widget_preview.h
===================================================================
--- trunk/e/src/bin/e_widget_preview.h	2011-08-08 06:10:36 UTC (rev 62191)
+++ trunk/e/src/bin/e_widget_preview.h	2011-08-08 06:18:00 UTC (rev 62192)
@@ -9,6 +9,7 @@
 EAPI int              e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key);
 EAPI int	      e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key, int w, int h);
 EAPI int              e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group);
-    
+EAPI void             e_widget_preview_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+
 #endif
 #endif

Log:
make default bg work again.
  
  

Author:       raster
Date:         2011-08-11 22:17:07 -0700 (Thu, 11 Aug 2011)
New Revision: 62371
Trac:         http://trac.enlightenment.org/e/changeset/62371

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

Modified: trunk/e/src/bin/e_bg.c
===================================================================
--- trunk/e/src/bin/e_bg.c	2011-08-12 03:50:57 UTC (rev 62370)
+++ trunk/e/src/bin/e_bg.c	2011-08-12 05:17:07 UTC (rev 62371)
@@ -223,7 +223,6 @@
                   edje_file_collection_list_free(entries);
                }
           }
-        else ok = 1;
 	if (!ok)
 	  bgfile = e_theme_edje_file_get("base/theme/background",
 					 "e/desktop/background");

Log:
add api to detect backlight availability
  
  

Author:       raster
Date:         2011-08-14 07:35:41 -0700 (Sun, 14 Aug 2011)
New Revision: 62444
Trac:         http://trac.enlightenment.org/e/changeset/62444

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

Modified: trunk/e/src/bin/e_backlight.c
===================================================================
--- trunk/e/src/bin/e_backlight.c	2011-08-14 14:29:10 UTC (rev 62443)
+++ trunk/e/src/bin/e_backlight.c	2011-08-14 14:35:41 UTC (rev 62444)
@@ -4,13 +4,14 @@
 // a signleton right now as thats 99% of use cases. but api supports
 // doing more. for now make it work in the singleton
 
+#define MODE_NONE  -1
 #define MODE_RANDR 0
 #define MODE_SYS   1
 
 static double bl_val = 1.0;
 static double bl_animval = 1.0;
 static E_Backlight_Mode bl_mode = E_BACKLIGHT_MODE_NORMAL;
-static int sysmode = MODE_RANDR;
+static int sysmode = MODE_NONE;
 static Ecore_Animator *bl_anim = NULL;
 static const char *bl_sysval = NULL;
 static Ecore_Event_Handler *bl_sys_exit_handler = NULL;
@@ -50,6 +51,13 @@
    return 1;
 }
 
+EAPI Eina_Bool
+e_backlight_exists(void)
+{
+   if (sysmode == MODE_NONE) return EINA_FALSE;
+   return EINA_TRUE;
+}
+
 EAPI void
 e_backlight_update(void)
 {

Modified: trunk/e/src/bin/e_backlight.h
===================================================================
--- trunk/e/src/bin/e_backlight.h	2011-08-14 14:29:10 UTC (rev 62443)
+++ trunk/e/src/bin/e_backlight.h	2011-08-14 14:35:41 UTC (rev 62444)
@@ -26,6 +26,7 @@
 
 EINTERN int              e_backlight_init(void);
 EINTERN int              e_backlight_shutdown(void);
+EAPI Eina_Bool           e_backlight_exists(void);
 EAPI void                e_backlight_update(void);
 EAPI void                e_backlight_level_set(E_Zone *zone, double val, double tim);
 EAPI double              e_backlight_level_get(E_Zone *zone);

Log:
use PATH_MAX
  
  

Author:       raster
Date:         2011-08-14 07:45:38 -0700 (Sun, 14 Aug 2011)
New Revision: 62445
Trac:         http://trac.enlightenment.org/e/changeset/62445

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-08-14 14:35:41 UTC (rev 62444)
+++ trunk/e/src/bin/e_config.c	2011-08-14 14:45:38 UTC (rev 62445)
@@ -143,7 +143,7 @@
    else
      {
 	Eet_File *ef;
-	char buf[4096];
+	char buf[PATH_MAX];
 
 	/* try user profile config */
 	e_user_dir_concat_static(buf, "config/profile.cfg");

Log:
umm - probably clear up some invalid reads/uninit values here.
  
  

Author:       raster
Date:         2011-08-19 20:57:28 -0700 (Fri, 19 Aug 2011)
New Revision: 62615
Trac:         http://trac.enlightenment.org/e/changeset/62615

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-20 03:49:17 UTC (rev 62614)
+++ trunk/e/src/bin/e_fm.c	2011-08-20 03:57:28 UTC (rev 62615)
@@ -2047,11 +2047,7 @@
    size = _e_fm2_icon_mime_size_normalize(ic);
    icon = efreet_mime_type_icon_get(ic->info.mime, e_config->icon_theme, size);
    if (icon)
-     {
-        Evas_Object *o;
-        o = _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
-        return o;
-     }
+      return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
    return NULL;
 }
 
@@ -2068,14 +2064,14 @@
    file = e_theme_edje_file_get("base/theme/icons", buf);
    if (file && file[0])
      {
-        Evas_Object *obj = edje_object_add(evas);
-        if (!obj) return NULL;
-        if (!edje_object_file_set(obj, file, buf))
+        Evas_Object *o = edje_object_add(evas);
+        if (!o) return NULL;
+        if (!edje_object_file_set(o, file, buf))
           {
-             evas_object_del(obj);
+             evas_object_del(o);
              return NULL;
           }
-        return obj;
+        return o;
      }
 
    return NULL;
@@ -2087,7 +2083,7 @@
 static Evas_Object *
 _e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_func __UNUSED__, void *data __UNUSED__, int force_gen __UNUSED__, const char **type_ret)
 {
-   Evas_Object *o;
+   Evas_Object *o = NULL;
 
    if (e_config->icon_theme_overrides)
      o = _e_fm2_icon_mime_fdo_get(evas, ic, type_ret);
@@ -2101,9 +2097,7 @@
    else
      o = _e_fm2_icon_mime_theme_get(evas, ic, type_ret);
 
-   if (o) return o;
-
-   return NULL;
+   return o;
 }
 
 /**
@@ -2158,8 +2152,7 @@
    const char *p;
 
    p = strrchr(ic->info.file, '.');
-   if (!p)
-     return NULL;
+   if (!p) return NULL;
 
    p++;
    if (_e_fm2_ext_is_edje(p))
@@ -2169,8 +2162,7 @@
      return _e_fm2_icon_desktop_get(evas, ic, type_ret);
    else if (_e_fm2_ext_is_imc(p))
      return _e_fm2_icon_imc_get(evas, ic, type_ret);
-   else
-     return NULL;
+   return NULL;
 }
 
 /**
@@ -2190,7 +2182,7 @@
                void *data, int force_gen, const char **type_ret)
 {
    const char *icon;
-   Evas_Object *o;
+   Evas_Object *o = NULL;
    
    if (ic->info.icon)
      {

Log:
fix crash vector in e17 entry
  
  

Author:       raster
Date:         2011-08-19 21:27:41 -0700 (Fri, 19 Aug 2011)
New Revision: 62617
Trac:         http://trac.enlightenment.org/e/changeset/62617

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

Modified: trunk/e/src/bin/e_entry.c
===================================================================
--- trunk/e/src/bin/e_entry.c	2011-08-20 04:22:24 UTC (rev 62616)
+++ trunk/e/src/bin/e_entry.c	2011-08-20 04:27:41 UTC (rev 62617)
@@ -1038,7 +1038,7 @@
    if ((!object) || !(evas = evas_object_evas_get(object)))
      return;
 
-   sd = malloc(sizeof(E_Entry_Smart_Data));
+   sd = calloc(1, sizeof(E_Entry_Smart_Data));
    if (!sd) return;
    
    evas_object_smart_data_set(object, sd);

Log:
no - LC_ALL. not LANG.
  
  

Author:       raster
Date:         2011-08-19 22:11:12 -0700 (Fri, 19 Aug 2011)
New Revision: 62620
Trac:         http://trac.enlightenment.org/e/changeset/62620

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

Modified: trunk/e/src/bin/e_intl.c
===================================================================
--- trunk/e/src/bin/e_intl.c	2011-08-20 05:03:13 UTC (rev 62619)
+++ trunk/e/src/bin/e_intl.c	2011-08-20 05:11:12 UTC (rev 62620)
@@ -3,7 +3,7 @@
 static Ecore_Exe *_e_intl_input_method_exec = NULL;
 static Ecore_Event_Handler *_e_intl_exit_handler = NULL;
 
-static char *_e_intl_orig_lang = NULL;
+static char *_e_intl_orig_lc_all = NULL;
 static char *_e_intl_language = NULL;
 
 static char *_e_intl_language_alias = NULL;
@@ -55,7 +55,7 @@
 
    e_intl_data_init();
 
-   if ((s = getenv("LANG"))) _e_intl_orig_lang = strdup(s);
+   if ((s = getenv("LC_ALL"))) _e_intl_orig_lc_all = strdup(s);
 
    if ((s = getenv("GTK_IM_MODULE"))) _e_intl_orig_gtk_im_module = strdup(s);
    if ((s = getenv("QT_IM_MODULE"))) _e_intl_orig_qt_im_module = strdup(s);
@@ -69,7 +69,7 @@
 e_intl_shutdown(void)
 {
    E_FREE(_e_intl_language);
-   E_FREE(_e_intl_orig_lang);
+   E_FREE(_e_intl_orig_lc_all);
 
    E_FREE(_e_intl_orig_gtk_im_module);
    E_FREE(_e_intl_orig_qt_im_module);
@@ -142,7 +142,7 @@
     */
    if (!lang)
      {
-	e_util_env_set("LANG", _e_intl_orig_lang);
+	e_util_env_set("LC_ALL", _e_intl_orig_lc_all);
 
 	if (!lang) lang = getenv("LC_ALL");
 	if (!lang) lang = getenv("LANG");
@@ -186,7 +186,7 @@
 	/* Only set env vars is a non NULL locale was passed */
 	if (set_envars)
 	  {
-	     e_util_env_set("LANG", _e_intl_language);
+	     e_util_env_set("LC_ALL", _e_intl_language);
 	  }
 
     	setlocale(LC_ALL, _e_intl_language);

Log:
and lets have lang settings work by unsetting lang and language too if
  set.
  
  

Author:       raster
Date:         2011-08-19 22:16:42 -0700 (Fri, 19 Aug 2011)
New Revision: 62622
Trac:         http://trac.enlightenment.org/e/changeset/62622

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

Modified: trunk/e/src/bin/e_intl.c
===================================================================
--- trunk/e/src/bin/e_intl.c	2011-08-20 05:11:38 UTC (rev 62621)
+++ trunk/e/src/bin/e_intl.c	2011-08-20 05:16:42 UTC (rev 62622)
@@ -4,6 +4,8 @@
 static Ecore_Event_Handler *_e_intl_exit_handler = NULL;
 
 static char *_e_intl_orig_lc_all = NULL;
+static char *_e_intl_orig_lang = NULL;
+static char *_e_intl_orig_language = NULL;
 static char *_e_intl_language = NULL;
 
 static char *_e_intl_language_alias = NULL;
@@ -56,6 +58,8 @@
    e_intl_data_init();
 
    if ((s = getenv("LC_ALL"))) _e_intl_orig_lc_all = strdup(s);
+   if ((s = getenv("LANG"))) _e_intl_orig_lang = strdup(s);
+   if ((s = getenv("LANGUAGE"))) _e_intl_orig_language = strdup(s);
 
    if ((s = getenv("GTK_IM_MODULE"))) _e_intl_orig_gtk_im_module = strdup(s);
    if ((s = getenv("QT_IM_MODULE"))) _e_intl_orig_qt_im_module = strdup(s);
@@ -70,6 +74,8 @@
 {
    E_FREE(_e_intl_language);
    E_FREE(_e_intl_orig_lc_all);
+   E_FREE(_e_intl_orig_lang);
+   E_FREE(_e_intl_orig_language);
 
    E_FREE(_e_intl_orig_gtk_im_module);
    E_FREE(_e_intl_orig_qt_im_module);
@@ -146,6 +152,7 @@
 
 	if (!lang) lang = getenv("LC_ALL");
 	if (!lang) lang = getenv("LANG");
+	if (!lang) lang = getenv("LANGUAGE");
 
 	set_envars = 0;
      }
@@ -187,6 +194,8 @@
 	if (set_envars)
 	  {
 	     e_util_env_set("LC_ALL", _e_intl_language);
+             e_util_env_set("LANG", NULL);
+             e_util_env_set("LANGUAGE", NULL);
 	  }
 
     	setlocale(LC_ALL, _e_intl_language);

Log:
dont check immortal stuff on restart
  
  

Author:       raster
Date:         2011-08-21 00:38:52 -0700 (Sun, 21 Aug 2011)
New Revision: 62646
Trac:         http://trac.enlightenment.org/e/changeset/62646

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

Modified: trunk/e/src/bin/e_about.c
===================================================================
--- trunk/e/src/bin/e_about.c	2011-08-21 05:27:19 UTC (rev 62645)
+++ trunk/e/src/bin/e_about.c	2011-08-21 07:38:52 UTC (rev 62646)
@@ -30,9 +30,9 @@
 	"so please see the COPYING and COPYING-PLAIN licence files "
 	"installed on your system.<br>"
 	"<br>"
-	"Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
+	"Enlightenment is under <hilight>HEAVY DEVELOPMENT</> and it "
 	"is not stable. Many features are incomplete or even non-existent "
-	"yet and may have many bugs. You have been <hilight>WARNED!</hilight>"
+	"yet and may have many bugs. You have been <hilight>WARNED!</>"
 	)
       );
    
@@ -44,7 +44,7 @@
 	f = fopen(buf, "r");
 	if (f)
 	  {
-	     tbuf = strdup(_("<title>The Team</title>"));
+	     tbuf = strdup(_("<title>The Team</><br><br>"));
 	     while (fgets(buf, sizeof(buf), f))
 	       {
 		  int len;

Log:
and make e sys not complain about repeat requests if within 2 secs of
  eachother - solves a multi-press issues with pwr button etc.
  
  

Author:       raster
Date:         2011-08-21 00:51:05 -0700 (Sun, 21 Aug 2011)
New Revision: 62648
Trac:         http://trac.enlightenment.org/e/changeset/62648

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

Modified: trunk/e/src/bin/e_sys.c
===================================================================
--- trunk/e/src/bin/e_sys.c	2011-08-21 07:46:57 UTC (rev 62647)
+++ trunk/e/src/bin/e_sys.c	2011-08-21 07:51:05 UTC (rev 62648)
@@ -27,6 +27,7 @@
 static E_Sys_Action _e_sys_action_current = E_SYS_NONE;
 static E_Sys_Action _e_sys_action_after = E_SYS_NONE;
 static Ecore_Exe *_e_sys_exe = NULL;
+static double _e_sys_begin_time = 0.0;
 static double _e_sys_logout_begin_time = 0.0;
 static Ecore_Timer *_e_sys_logout_timer = NULL;
 static E_Obj_Dialog *_e_sys_dialog = NULL;
@@ -543,13 +544,14 @@
 	break;
       case E_SYS_RESTART:
 	// XXX TODO: check for e_fm_op_registry entries and confirm
-	if (!e_util_immortal_check())
+        // FIXME: we dont   share out immortal info to restarted e. :(
+//	if (!e_util_immortal_check())
 	  {
 	     restart = 1;
 	     ecore_main_loop_quit();
 	  }
-        else
-          return 0;
+//        else
+//          return 0;
 	break;
       case E_SYS_EXIT_NOW:
 	exit(0);
@@ -567,11 +569,13 @@
                  e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
-	     _e_sys_current_action();
+             if ((ecore_time_get() - _e_sys_begin_time) > 2.0)
+                _e_sys_current_action();
 	     return 0;
 	  }
 	else
 	  {
+             _e_sys_begin_time = ecore_time_get();
 	     _e_sys_exe = ecore_exe_run(buf, NULL);
 	     od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()),
 				   _("Power off"), "E", "_sys_halt");
@@ -595,11 +599,13 @@
 		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
-	     _e_sys_current_action();
+             if ((ecore_time_get() - _e_sys_begin_time) > 2.0)
+                _e_sys_current_action();
 	     return 0;
 	  }
 	else
 	  {
+             _e_sys_begin_time = ecore_time_get();
 	     _e_sys_exe = ecore_exe_run(buf, NULL);
 	     od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()),
 				   _("Resetting"), "E", "_sys_reboot");
@@ -622,13 +628,15 @@
 		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
-	     _e_sys_current_action();
+             if ((ecore_time_get() - _e_sys_begin_time) > 2.0)
+                _e_sys_current_action();
 	     return 0;
 	  }
 	else
 	  {
              if (e_config->desklock_on_suspend) e_desklock_show();
              
+             _e_sys_begin_time = ecore_time_get();
 	     _e_sys_exe = ecore_exe_run(buf, NULL);
 	     od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()),
 				   _("Suspending"), "E", "_sys_suspend");
@@ -651,13 +659,15 @@
 		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
-	     _e_sys_current_action();
+             if ((ecore_time_get() - _e_sys_begin_time) > 2.0)
+                _e_sys_current_action();
 	     return 0;
 	  }
 	else
 	  {
              if (e_config->desklock_on_suspend) e_desklock_show();
              
+             _e_sys_begin_time = ecore_time_get();
 	     _e_sys_exe = ecore_exe_run(buf, NULL);
 	     od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()),
 				   _("Hibernating"), "E", "_sys_hibernate");

Log:
and also use same delay from screensaver start to suspend for power
  removed to suspend.
  
  

Author:       raster
Date:         2011-08-21 04:14:36 -0700 (Sun, 21 Aug 2011)
New Revision: 62657
Trac:         http://trac.enlightenment.org/e/changeset/62657

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

Modified: trunk/e/src/bin/e_screensaver.c
===================================================================
--- trunk/e/src/bin/e_screensaver.c	2011-08-21 11:02:33 UTC (rev 62656)
+++ trunk/e/src/bin/e_screensaver.c	2011-08-21 11:14:36 UTC (rev 62657)
@@ -163,21 +163,6 @@
 }
 
 static Eina_Bool
-_e_screensaver_handler_powersave_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
-{
-   if ((_e_screensaver_on) && (!_e_screensaver_suspend_timer))
-     {
-        if (e_config->screensaver_suspend)
-          {
-             if ((e_config->screensaver_suspend_on_ac) ||
-                 (e_powersave_mode_get() > E_POWERSAVE_MODE_LOW))
-                e_sys_action_do(E_SYS_SUSPEND, NULL);
-          }
-     }
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-static Eina_Bool
 _e_screensaver_suspend_cb(void *data __UNUSED__)
 {
    _e_screensaver_suspend_timer = NULL;
@@ -191,6 +176,20 @@
 }
 
 static Eina_Bool
+_e_screensaver_handler_powersave_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+{
+   if ((e_config->screensaver_suspend) && (_e_screensaver_on))
+     {
+        if (_e_screensaver_suspend_timer)
+           ecore_timer_del(_e_screensaver_suspend_timer);
+        _e_screensaver_suspend_timer = 
+           ecore_timer_add(e_config->screensaver_suspend_delay,
+                           _e_screensaver_suspend_cb, NULL);
+     }
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
 _e_screensaver_handler_screensaver_notify_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Screensaver_Notify *e = event;

Log:
how did a duplicate dim mode get in?
  
  

Author:       raster
Date:         2011-08-21 08:09:48 -0700 (Sun, 21 Aug 2011)
New Revision: 62661
Trac:         http://trac.enlightenment.org/e/changeset/62661

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

Modified: trunk/e/src/bin/e_backlight.c
===================================================================
--- trunk/e/src/bin/e_backlight.c	2011-08-21 13:53:52 UTC (rev 62660)
+++ trunk/e/src/bin/e_backlight.c	2011-08-21 15:09:48 UTC (rev 62661)
@@ -127,8 +127,6 @@
    else if (bl_mode == E_BACKLIGHT_MODE_OFF)
       e_backlight_level_set(zone, 0.0, -1.0);
    else if (bl_mode == E_BACKLIGHT_MODE_DIM)
-      e_backlight_level_set(zone, 0.0, -1.0);
-   else if (bl_mode == E_BACKLIGHT_MODE_DIM)
       e_backlight_level_set(zone, e_config->backlight.dim, -1.0);
    else if (bl_mode == E_BACKLIGHT_MODE_MAX)
       e_backlight_level_set(zone, 1.0, -1.0);

Log:
From: Jihoon Kim <jihoon48.kim@...>
  Subject: [E-devel] [PATCH] e17: notify immodule to know the cursor
  location
  
  In immodule, the cursor location is needed to move the candidate word window.
  In this patch, calling ecore_imf_context_cursor_location_set in e_entry.c
  lets immodule know the cursor location. This patch is similar to
  http://www.mail-archive.com/enlightenment-devel@...>
  89.html, but it is for e17 entry.
  
  oh definitely! that helps.. it works well too! thanks! in svn
  
  

Author:       raster
Date:         2011-08-21 22:18:03 -0700 (Sun, 21 Aug 2011)
New Revision: 62676
Trac:         http://trac.enlightenment.org/e/changeset/62676

Modified:
  trunk/e/src/bin/e_editable.c trunk/e/src/bin/e_editable.h trunk/e/src/bin/e_entry.c 

Modified: trunk/e/src/bin/e_editable.c
===================================================================
--- trunk/e/src/bin/e_editable.c	2011-08-22 03:34:43 UTC (rev 62675)
+++ trunk/e/src/bin/e_editable.c	2011-08-22 05:18:03 UTC (rev 62676)
@@ -400,6 +400,26 @@
 }
 
 /**
+ * Gets the geometry of the cursor of the editable object
+ *
+ * @param editable an editable object
+ * @param cx the x of the cursor
+ * @param cy the y of the cursor
+ * @param cw the width of the cursor
+ * @param ch the height of the cursor
+ */
+EAPI void
+e_editable_cursor_geometry_get(Evas_Object *editable, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
+{
+   E_Editable_Smart_Data *sd;
+
+   if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
+     return;
+
+   evas_object_geometry_get(sd->cursor_object, cx, cy, cw, ch);
+}
+
+/**
  * Moves the cursor to the start of the editable object
  *
  * @param editable an editable object

Modified: trunk/e/src/bin/e_editable.h
===================================================================
--- trunk/e/src/bin/e_editable.h	2011-08-22 03:34:43 UTC (rev 62675)
+++ trunk/e/src/bin/e_editable.h	2011-08-22 05:18:03 UTC (rev 62676)
@@ -17,6 +17,7 @@
 
 EAPI void         e_editable_cursor_pos_set          (Evas_Object *editable, int pos);
 EAPI int          e_editable_cursor_pos_get          (Evas_Object *editable);
+EAPI void         e_editable_cursor_geometry_get     (Evas_Object *editable, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
 EAPI void         e_editable_cursor_move_to_start    (Evas_Object *editable);
 EAPI void         e_editable_cursor_move_to_end      (Evas_Object *editable);
 EAPI void         e_editable_cursor_move_left        (Evas_Object *editable);

Modified: trunk/e/src/bin/e_entry.c
===================================================================
--- trunk/e/src/bin/e_entry.c	2011-08-22 03:34:43 UTC (rev 62675)
+++ trunk/e/src/bin/e_entry.c	2011-08-22 05:18:03 UTC (rev 62676)
@@ -59,6 +59,8 @@
 static void _e_entry_cb_paste(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_entry_cb_select_all(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_entry_cb_delete(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_entry_imf_cursor_info_set(Evas_Object *object);
+static void _e_entry_imf_context_reset(Evas_Object *object);
 #ifdef HAVE_ECORE_IMF
 static Eina_Bool _e_entry_cb_imf_retrieve_surrounding(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos);
 static Eina_Bool _e_entry_cb_imf_event_commit(void *data, int type, void *event);
@@ -244,14 +246,10 @@
    if (!sd->selection_dragging)
      {
         e_editable_cursor_move_to_end(sd->editable_object);
-#ifdef HAVE_ECORE_IMF
-        if (sd->imf_context)
-          {
-             ecore_imf_context_reset(sd->imf_context);
-             ecore_imf_context_cursor_position_set(sd->imf_context,
-                                                   e_editable_cursor_pos_get(sd->editable_object));
-          }
-#endif
+
+        _e_entry_imf_context_reset(entry);
+        _e_entry_imf_cursor_info_set(entry);
+
         e_editable_selection_move_to_end(sd->editable_object);
      }
    if (sd->enabled)
@@ -541,14 +539,8 @@
 			      E_MENU_POP_DIRECTION_DOWN, event->timestamp);
      }
 
-#ifdef HAVE_ECORE_IMF
-   if (sd->imf_context)
-     {
-        ecore_imf_context_reset(sd->imf_context);
-        ecore_imf_context_cursor_position_set(sd->imf_context,
-                                              e_editable_cursor_pos_get(sd->editable_object));
-     }
-#endif
+   _e_entry_imf_context_reset(obj);
+   _e_entry_imf_cursor_info_set(obj);
 }
 
 /* Called when the entry object is released by the mouse */
@@ -614,14 +606,9 @@
                                              event->cur.canvas.x - ox,
                                              event->cur.canvas.y - oy);
         e_editable_cursor_pos_set(sd->editable_object, pos);
-#ifdef HAVE_ECORE_IMF
-        if (sd->imf_context)
-          {
-             ecore_imf_context_reset(sd->imf_context);
-             ecore_imf_context_cursor_position_set(sd->imf_context,
-                                                   pos);
-          }
-#endif
+
+        _e_entry_imf_context_reset(obj);
+        _e_entry_imf_cursor_info_set(obj);
      }
 }
 
@@ -853,14 +840,8 @@
         changed |= e_editable_insert(editable, start_pos, event->string);
      }
 
-#ifdef HAVE_ECORE_IMF
-   if (sd->imf_context)
-     {
-        ecore_imf_context_reset(sd->imf_context);
-        ecore_imf_context_cursor_position_set(sd->imf_context,
-                                              e_editable_cursor_pos_get(editable));
-     }
-#endif
+   _e_entry_imf_context_reset(entry);
+   _e_entry_imf_cursor_info_set(entry);
 
    if (changed)
      evas_object_smart_callback_call(entry, "changed", NULL);
@@ -1006,14 +987,8 @@
 	     (event->string[0] >= 0x20 && event->string[0] != 0x7f)))
      changed = e_editable_insert(editable, cursor_pos, event->string);
 
-#ifdef HAVE_ECORE_IMF
-   if (sd->imf_context)
-     {
-        ecore_imf_context_reset(sd->imf_context);
-        ecore_imf_context_cursor_position_set(sd->imf_context,
-                                              e_editable_cursor_pos_get(editable));
-     }
-#endif
+   _e_entry_imf_context_reset(entry);
+   _e_entry_imf_cursor_info_set(entry);
 
    if (changed)
      evas_object_smart_callback_call(entry, "changed", NULL);
@@ -1369,6 +1344,43 @@
      }
 }
 
+static void
+_e_entry_imf_context_reset(Evas_Object *object)
+{
+   E_Entry_Smart_Data *sd;
+
+   if ((!object) || !(sd = evas_object_smart_data_get(object)))
+     return;
+
+#ifdef HAVE_ECORE_IMF 
+   if (sd->imf_context)
+     ecore_imf_context_reset(sd->imf_context);
+#endif
+}
+
+static void
+_e_entry_imf_cursor_info_set(Evas_Object *object)
+{
+   E_Entry_Smart_Data *sd;
+   Evas_Coord cx, cy, cw, ch;
+   Evas_Object *editable;
+
+   if ((!object) || !(sd = evas_object_smart_data_get(object)))
+     return;
+
+#ifdef HAVE_ECORE_IMF 
+   if (!sd || !sd->imf_context) return;
+
+   editable = sd->editable_object;
+
+   e_editable_cursor_geometry_get(editable, &cx, &cy, &cw, &ch);
+
+   ecore_imf_context_cursor_position_set(sd->imf_context,
+                                         e_editable_cursor_pos_get(editable));
+   ecore_imf_context_cursor_location_set(sd->imf_context, cx, cy, cw, ch);
+#endif
+}
+
 #ifdef HAVE_ECORE_IMF
 static Eina_Bool 
 _e_entry_cb_imf_retrieve_surrounding(void *data, Ecore_IMF_Context *ctx __UNUSED__, char **text, int *cursor_pos)
@@ -1430,6 +1442,8 @@
 
    changed |= e_editable_insert(editable, start_pos, ev->str);
 
+   _e_entry_imf_cursor_info_set(entry);
+
    if (changed)
      evas_object_smart_callback_call(entry, "changed", NULL);
 
@@ -1489,6 +1503,8 @@
    else
      sd->have_preedit = EINA_TRUE;
 
+   _e_entry_imf_cursor_info_set(entry);
+
    if (changed)
      evas_object_smart_callback_call(entry, "preedit,changed", NULL);

Log:
who broke non edj bg's?
  
  

Author:       raster
Date:         2011-08-22 19:37:25 -0700 (Mon, 22 Aug 2011)
New Revision: 62708
Trac:         http://trac.enlightenment.org/e/changeset/62708

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

Modified: trunk/e/src/bin/e_bg.c
===================================================================
--- trunk/e/src/bin/e_bg.c	2011-08-23 01:44:46 UTC (rev 62707)
+++ trunk/e/src/bin/e_bg.c	2011-08-23 02:37:25 UTC (rev 62708)
@@ -223,6 +223,7 @@
                   edje_file_collection_list_free(entries);
                }
           }
+        else ok = 1;
 	if (!ok)
 	  bgfile = e_theme_edje_file_get("base/theme/background",
 					 "e/desktop/background");

Log:
and fallback to theme again.
  
  

Author:       raster
Date:         2011-08-22 20:28:27 -0700 (Mon, 22 Aug 2011)
New Revision: 62709
Trac:         http://trac.enlightenment.org/e/changeset/62709

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

Modified: trunk/e/src/bin/e_bg.c
===================================================================
--- trunk/e/src/bin/e_bg.c	2011-08-23 02:37:25 UTC (rev 62708)
+++ trunk/e/src/bin/e_bg.c	2011-08-23 03:28:27 UTC (rev 62709)
@@ -223,7 +223,7 @@
                   edje_file_collection_list_free(entries);
                }
           }
-        else ok = 1;
+        else if ((bgfile) && (bgfile[0])) ok = 1;
 	if (!ok)
 	  bgfile = e_theme_edje_file_get("base/theme/background",
 					 "e/desktop/background");

Log:
fsel -> only display filename in entry allowing for easier typing of
  save output.
  
  

Author:       raster
Date:         2011-08-29 17:30:28 -0700 (Mon, 29 Aug 2011)
New Revision: 62978
Trac:         http://trac.enlightenment.org/e/changeset/62978

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-08-29 23:45:24 UTC (rev 62977)
+++ trunk/e/src/bin/e_widget_fsel.c	2011-08-30 00:30:28 UTC (rev 62978)
@@ -62,8 +62,8 @@
      e_fm2_parent_go(wd->o_files_fm);
    if (wd->o_files_frame)
      e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
-   e_widget_entry_text_set(wd->o_entry, 
-			   e_fm2_real_path_get(wd->o_files_fm));
+//   e_widget_entry_text_set(wd->o_entry, 
+//			   e_fm2_real_path_get(wd->o_files_fm));
 }
 
 static void
@@ -155,7 +155,7 @@
 	  }
      }
    done:
-   e_widget_entry_text_set(wd->o_entry, rp);
+//   e_widget_entry_text_set(wd->o_entry, rp);
    E_FREE(p1);
    eina_list_free(icons);
 }
@@ -179,8 +179,8 @@
      e_fm2_path_set(wd->o_files_fm, NULL, ici->real_link);
    eina_list_free(selected);
    e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
-   e_widget_entry_text_set(wd->o_entry, 
-			   e_fm2_real_path_get(wd->o_files_fm));
+//   e_widget_entry_text_set(wd->o_entry, 
+//			   e_fm2_real_path_get(wd->o_files_fm));
 }
 
 static void
@@ -203,8 +203,8 @@
      }
    if (wd->o_files_frame)
      e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
-   if ((wd->path) && (stat(wd->path, &st) == 0))
-     e_widget_entry_text_set(wd->o_entry, wd->path);
+//   if ((wd->path) && (stat(wd->path, &st) == 0))
+//     e_widget_entry_text_set(wd->o_entry, ecore_file_file_get(wd->path));
    E_FREE(wd->path);
    if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj);
 }
@@ -239,10 +239,10 @@
    if (stat(wd->path, &st) == 0)
      {
 	if (wd->preview) _e_wid_fsel_preview_file(wd);
-//	if (!S_ISDIR(st.st_mode))
-//	  e_widget_entry_text_set(wd->o_entry, ici->file);
+	if (!S_ISDIR(st.st_mode))
+	  e_widget_entry_text_set(wd->o_entry, ici->file);
 //	else
-	  e_widget_entry_text_set(wd->o_entry, wd->path);
+//	  e_widget_entry_text_set(wd->o_entry, wd->path);
      }
    eina_list_free(selected);
    if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj);
@@ -262,7 +262,7 @@
 
 /* externally accessible functions */
 EAPI Evas_Object *
-e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected __UNUSED__, char *filter __UNUSED__, 
+e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, char *filter __UNUSED__, 
 		  void (*sel_func) (void *data, Evas_Object *obj), void *sel_data,
 		  void (*chg_func) (void *data, Evas_Object *obj), void *chg_data,
 		  int preview)
@@ -497,9 +497,10 @@
    o = e_widget_entry_add(evas, &(wd->entry_text), NULL, NULL, NULL);
    wd->o_entry = o;
    e_widget_sub_object_add(obj, o);
+   if (selected) e_widget_entry_text_set(o, selected);
    
-  if (preview)
-    {
+   if (preview)
+     {
 	e_widget_frametable_object_append(wd->o_preview_frame, 
 					  wd->o_preview_preview_table,
 					  0, 0, 1, 1, 0, 0, 1, 1);
@@ -509,8 +510,8 @@
         e_widget_table_object_append(wd->o_table2, 
 				     wd->o_preview_frame,
                                      2, 1, 1, 1, 0, 1, 0, 1);
-    }
-
+     }
+   
    e_widget_table_object_append(wd->o_table, wd->o_table2,
                                 0, 0, 1, 1, 1, 1, 1, 1);
    e_widget_table_object_append(wd->o_table, wd->o_entry,
@@ -562,13 +563,23 @@
 e_widget_fsel_selection_path_get(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   const char *s;
+   const char *s, *dir;
+   char buf[PATH_MAX];
    
    if (!obj) return NULL;
    wd = e_widget_data_get(obj);
    E_FREE(wd->path);
    s = e_widget_entry_text_get(wd->o_entry);
-   if (s) wd->path = strdup(s);
+   dir = e_fm2_real_path_get(wd->o_files_fm);
+   if (s)
+     {
+        snprintf(buf, sizeof(buf), "%s/%s", dir, s);
+        wd->path = strdup(buf);
+     }
+   else
+     {
+        wd->path = strdup(dir);
+     }
    return wd->path;
 }

Log:
bug pointed out by doyun - e can manipulate its list of windows while
  doing eval - so make an array copy of them for walking border list for
  safety.
  
  

Author:       raster
Date:         2011-08-31 06:02:04 -0700 (Wed, 31 Aug 2011)
New Revision: 63033
Trac:         http://trac.enlightenment.org/e/changeset/63033

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

Modified: trunk/e/src/bin/e_container.c
===================================================================
--- trunk/e/src/bin/e_container.c	2011-08-31 13:01:43 UTC (rev 63032)
+++ trunk/e/src/bin/e_container.c	2011-08-31 13:02:04 UTC (rev 63033)
@@ -819,79 +819,76 @@
       eina_list_prepend_relative(bd->zone->container->layers[pos].clients, bd, below);
 }
 
-EAPI E_Border_List *
-e_container_border_list_first(E_Container *con)
+static E_Border_List *
+_e_container_border_list_new(E_Container *con)
 {
    E_Border_List *list = NULL;
-
+   E_Border *bd;
+   int i;
+   Eina_List *l;
+   
    if (!(list = E_NEW(E_Border_List, 1))) return NULL;
    list->container = con;
-   e_object_ref(E_OBJECT(con));
-   list->layer = 0;
-   list->clients = list->container->layers[list->layer].clients;
-   while ((list->layer < 6) && (!list->clients))
-     list->clients = list->container->layers[++list->layer].clients;
+   e_object_ref(E_OBJECT(list->container));
+   eina_array_step_set(&(list->client_array), sizeof(list->client_array), 256);
+   for (i = 0; i < 7; i++)
+     {
+        EINA_LIST_FOREACH(con->layers[i].clients, l, bd)
+           eina_array_push(&(list->client_array), bd);
+     }
    return list;
 }
 
+static E_Border *
+_e_container_border_list_jump(E_Border_List *list, int dir)
+{
+   E_Border *bd;
+   
+   if ((list->pos < 0) || 
+       (list->pos >= eina_array_count_get(&(list->client_array))))
+      return NULL;
+   bd = eina_array_data_get(&(list->client_array), list->pos);
+   list->pos += dir;
+   return bd;
+}
+
 EAPI E_Border_List *
+e_container_border_list_first(E_Container *con)
+{
+   E_Border_List *list = NULL;
+   
+   list = _e_container_border_list_new(con);
+   list->pos = 0;
+   return list;
+}
+
+EAPI E_Border_List *
 e_container_border_list_last(E_Container *con)
 {
    E_Border_List *list = NULL;
 
-   if (!(list = E_NEW(E_Border_List, 1))) return NULL;
-   list->container = con;
-   e_object_ref(E_OBJECT(con));
-   list->layer = 6;
-   if (list->container->layers[list->layer].clients)
-     list->clients = eina_list_last(list->container->layers[list->layer].clients);
-   while ((list->layer > 0) && (!list->clients))
-     {
-	list->layer--;
-	if (list->container->layers[list->layer].clients)
-	  list->clients = eina_list_last(list->container->layers[list->layer].clients);
-     }
+   list = _e_container_border_list_new(con);
+   list->pos = eina_array_count_get(&(list->client_array)) - 1;
    return list;
 }
 
 EAPI E_Border *
 e_container_border_list_next(E_Border_List *list)
 {
-   E_Border *bd;
-
-   if (!list->clients) return NULL;
-
-   bd = eina_list_data_get(list->clients);
-
-   list->clients = eina_list_next(list->clients);
-   while ((list->layer < 6) && (!list->clients))
-     list->clients = list->container->layers[++list->layer].clients;
-   return bd;
+   return _e_container_border_list_jump(list, 1);
 }
 
 EAPI E_Border *
 e_container_border_list_prev(E_Border_List *list)
 {
-   E_Border *bd;
-
-   if (!list->clients) return NULL;
-
-   bd = eina_list_data_get(list->clients);
-
-   list->clients = eina_list_prev(list->clients);
-   while ((list->layer > 0) && (!list->clients))
-     {
-	list->layer--;
-	if (list->container->layers[list->layer].clients)
-	  list->clients = eina_list_last(list->container->layers[list->layer].clients);
-     }
-   return bd;
+   return _e_container_border_list_jump(list, -1);
 }
 
 EAPI void
 e_container_border_list_free(E_Border_List *list)
 {
    e_object_unref(E_OBJECT(list->container));
+   eina_array_flush(&(list->client_array));
    free(list);
 }
 

Modified: trunk/e/src/bin/e_container.h
===================================================================
--- trunk/e/src/bin/e_container.h	2011-08-31 13:01:43 UTC (rev 63032)
+++ trunk/e/src/bin/e_container.h	2011-08-31 13:02:04 UTC (rev 63033)
@@ -58,8 +58,8 @@
 struct _E_Border_List
 {
    E_Container *container;
-   int layer;
-   Eina_List *clients;
+   Eina_Array   client_array;
+   int          pos;
 };
 
 struct _E_Container_Shape

Log:
fix typo
  
  

Author:       raster
Date:         2011-09-02 18:31:23 -0700 (Fri, 02 Sep 2011)
New Revision: 63098
Trac:         http://trac.enlightenment.org/e/changeset/63098

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

Modified: trunk/e/src/bin/e_configure.c
===================================================================
--- trunk/e/src/bin/e_configure.c	2011-09-02 23:02:26 UTC (rev 63097)
+++ trunk/e/src/bin/e_configure.c	2011-09-03 01:31:23 UTC (rev 63098)
@@ -327,7 +327,7 @@
 	label = NULL;
 	if (!eina_list_data_find(system_desktops, desktop))
           {
-             /* settings desktop but not in system -> put in preferened */
+             /* settings desktop but not in system -> put in preferences */
              dopref = 1;
           }
 	if (desktop->x)

Log:
to fix missing efreet stuff... move efreet init to after intl init!
  
  

Author:       raster
Date:         2011-09-02 19:14:19 -0700 (Fri, 02 Sep 2011)
New Revision: 63100
Trac:         http://trac.enlightenment.org/e/changeset/63100

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

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2011-09-03 01:32:39 UTC (rev 63099)
+++ trunk/e/src/bin/e_main.c	2011-09-03 02:14:19 UTC (rev 63100)
@@ -348,17 +348,6 @@
      }
    TS("Ecore_Evas Engine Check Done");
 
-   TS("Efreet Init");
-   if (!efreet_init()) 
-     {
-        e_error_message_show(_("Enlightenment cannot initialize the FDO desktop system.\n"
-                               "Perhaps you lack permissions on ~/.cache/efreet or are\n"
-                               "out of memory or disk space?"));
-        _e_main_shutdown(-1);
-     }
-   TS("Efreet Init Done");
-   _e_main_shutdown_push(efreet_shutdown);
-
    TS("Edje Init");
    if (!edje_init()) 
      {
@@ -557,6 +546,17 @@
    TS("E_Intl Post Init Done");
    _e_main_shutdown_push(e_intl_post_shutdown);
 
+   TS("Efreet Init");
+   if (!efreet_init()) 
+     {
+        e_error_message_show(_("Enlightenment cannot initialize the FDO desktop system.\n"
+                               "Perhaps you lack permissions on ~/.cache/efreet or are\n"
+                               "out of memory or disk space?"));
+        _e_main_shutdown(-1);
+     }
+   TS("Efreet Init Done");
+   _e_main_shutdown_push(efreet_shutdown);
+
    if (!really_know) 
      {
         TS("Test File Format Support");

Log:
add some notes.
  
  

Author:       raster
Date:         2011-09-03 21:14:43 -0700 (Sat, 03 Sep 2011)
New Revision: 63148
Trac:         http://trac.enlightenment.org/e/changeset/63148

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

Modified: trunk/e/src/bin/e_randr.c
===================================================================
--- trunk/e/src/bin/e_randr.c	2011-09-04 03:55:03 UTC (rev 63147)
+++ trunk/e/src/bin/e_randr.c	2011-09-04 04:14:43 UTC (rev 63148)
@@ -694,6 +694,11 @@
    E_Randr_Crtc_Info *crtc_info;
    Eina_Bool enabled;
 
+   // FIXME: ecore_x_randr_screen_primary_output_orientation_get() should
+   // get regularly called to push x into polling outputs so we get these
+   // event callbacks - maybe do this every 100 mouse move events, or every
+   // mouse release or event mouse in or out, and in addition add a "poller"
+   // that runs every 256 ticks maybe?
    if (!e_randr_screen_info) return ECORE_CALLBACK_RENEW;
    if (type == ECORE_X_EVENT_RANDR_CRTC_CHANGE)
      {

Log:
fix mapping change event handler to actually WORK! (select right event
  id)
  
  

Author:       raster
Date:         2011-09-09 05:58:23 -0700 (Fri, 09 Sep 2011)
New Revision: 63308
Trac:         http://trac.enlightenment.org/e/changeset/63308

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

Modified: trunk/e/src/bin/e_bindings.c
===================================================================
--- trunk/e/src/bin/e_bindings.c	2011-09-09 12:49:54 UTC (rev 63307)
+++ trunk/e/src/bin/e_bindings.c	2011-09-09 12:58:23 UTC (rev 63308)
@@ -49,7 +49,7 @@
    Eina_List *l;
 
    mapping_handler = ecore_event_handler_add
-   (ECORE_X_EVENT_WINDOW_MAPPING, _e_bindings_mapping_change_event_cb, NULL);
+   (ECORE_X_EVENT_MAPPING_CHANGE, _e_bindings_mapping_change_event_cb, NULL);
   
    EINA_LIST_FOREACH(e_config->mouse_bindings, l, ebm)
      e_bindings_mouse_add(ebm->context, ebm->button, ebm->modifiers,
@@ -977,7 +977,6 @@
 _e_bindings_mapping_change_event_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
 //  Ecore_X_Event_Mapping_Change *ev = event;
-  
   e_managers_keys_ungrab();
   e_border_button_bindings_ungrab_all();
   e_border_button_bindings_grab_all();

Log:
all in comments.
  
  

Author:       raster
Date:         2011-10-04 04:38:52 -0700 (Tue, 04 Oct 2011)
New Revision: 63805
Trac:         http://trac.enlightenment.org/e/changeset/63805

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

Modified: trunk/e/src/bin/e_fm_op.c
===================================================================
--- trunk/e/src/bin/e_fm_op.c	2011-10-04 11:21:22 UTC (rev 63804)
+++ trunk/e/src/bin/e_fm_op.c	2011-10-04 11:38:52 UTC (rev 63805)
@@ -674,6 +674,14 @@
         if ((!_e_fm_op_scan_idler_p) && (!_e_fm_op_work_error) && 
             (!_e_fm_op_scan_error))
           ecore_main_loop_quit();
+        // if 
+        // _e_fm_op_scan_idler_p == NULL &&
+        // _e_fm_op_work_error == NULL &&
+        // _e_fm_op_scan_error == 1
+        // we can spin forever. why are we spinning at all? there are no
+        // tasks to be done. we have an error. wait for it to be handled
+        if (!_e_fm_op_work_queue)
+           ecore_main_loop_quit();
 
         return ECORE_CALLBACK_RENEW;
      }

Log:
warnings--
  
  

Author:       raster
Date:         2011-10-05 02:37:59 -0700 (Wed, 05 Oct 2011)
New Revision: 63829
Trac:         http://trac.enlightenment.org/e/changeset/63829

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

Modified: trunk/e/src/bin/e_widget_ilist.c
===================================================================
--- trunk/e/src/bin/e_widget_ilist.c	2011-10-05 09:28:19 UTC (rev 63828)
+++ trunk/e/src/bin/e_widget_ilist.c	2011-10-05 09:37:59 UTC (rev 63829)
@@ -53,7 +53,7 @@
 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
+enum
 {
   CMD_ADD,
   CMD_REMOVE,
@@ -69,7 +69,7 @@
   CMD_ICON_SET,
   CMD_END_SET,
   CMD_SHOW
-} Queue_Command;
+};
 
 static Eina_Bool
 _queue_timer(void *data)

Modified: trunk/e/src/bin/e_xsettings.c
===================================================================
--- trunk/e/src/bin/e_xsettings.c	2011-10-05 09:28:19 UTC (rev 63828)
+++ trunk/e/src/bin/e_xsettings.c	2011-10-05 09:37:59 UTC (rev 63829)
@@ -94,10 +94,8 @@
 static Eina_Bool
 _e_xsettings_activate(Settings_Manager *sm)
 {
-   unsigned int visual;
    Ecore_X_Atom atom;
    Ecore_X_Window old_win;
-   Ecore_X_Window_Attributes attr;
 
    if (sm->selection != 0) return 1;
 
@@ -203,6 +201,7 @@
    s->last_change = ecore_x_current_time_get();
 }
 
+/* not used!!!
 static void
 _e_xsettings_int_set(const char *name, int value)
 {
@@ -243,11 +242,12 @@
 	settings = eina_list_append(settings, s);
      }
    
-   /* type + pad + name-len + last-change-serial + value */
+   // 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)
 {
@@ -352,7 +352,7 @@
 }
 
 static Eina_Bool
-_cb_icon_theme_change(void *data, int type __UNUSED__, void *event)
+_cb_icon_theme_change(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    E_Event_Config_Icon_Theme *ev = event;

Log:
begin to fix up edge bindings.
  
  

Author:       raster
Date:         2011-10-15 00:11:11 -0700 (Sat, 15 Oct 2011)
New Revision: 64085
Trac:         http://trac.enlightenment.org/e/changeset/64085

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

Modified: trunk/e/src/bin/e_zone.c
===================================================================
--- trunk/e/src/bin/e_zone.c	2011-10-15 05:16:53 UTC (rev 64084)
+++ trunk/e/src/bin/e_zone.c	2011-10-15 07:11:11 UTC (rev 64085)
@@ -815,6 +815,78 @@
      }
 }
 
+EAPI Eina_Bool
+e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge)
+{
+   Eina_List *l;
+   E_Zone *z2;
+   
+   EINA_LIST_FOREACH(zone->container->zones, l, z2)
+     {
+        if (zone == z2) continue;
+        
+        switch (edge)
+          {
+           case E_ZONE_EDGE_TOP_LEFT:
+             if (((E_SPANS_COMMON(0, zone->x + zone->w, z2->x, z2->w)) &&
+                  (z2->y < zone->y)) ||
+                 ((E_SPANS_COMMON(0, zone->y + zone->h, z2->y, z2->h)) &&
+                  (z2->x < zone->x)))
+                return EINA_TRUE;
+             break;
+           case E_ZONE_EDGE_TOP:
+             if ((E_SPANS_COMMON(zone->x, zone->w, z2->x, z2->w)) &&
+                 (z2->y < zone->y))
+                return EINA_TRUE;
+             break;
+           case E_ZONE_EDGE_TOP_RIGHT:
+             if (((E_SPANS_COMMON(zone->x, 99999, z2->x, z2->w)) &&
+                  (z2->y < zone->y)) ||
+                 ((E_SPANS_COMMON(0, zone->y + zone->h, z2->y, z2->h)) &&
+                  (z2->x >= (zone->x + zone->w))))
+                return EINA_TRUE;
+             break;
+             
+           case E_ZONE_EDGE_LEFT:
+             if ((E_SPANS_COMMON(zone->y, zone->h, z2->y, z2->h)) &&
+                 (z2->x < zone->x))
+                return EINA_TRUE;
+             break;
+             
+           case E_ZONE_EDGE_RIGHT:
+             if ((E_SPANS_COMMON(zone->y, zone->h, z2->y, z2->h)) &&
+                 (z2->x >= (zone->x + zone->w)))
+                return EINA_TRUE;
+             break;
+             
+           case E_ZONE_EDGE_BOTTOM_LEFT:
+             if (((E_SPANS_COMMON(0, zone->x + zone->w, z2->x, z2->w)) &&
+                  (z2->y >= (zone->y + zone->h))) ||
+                 ((E_SPANS_COMMON(zone->y, 99999, z2->y, z2->h)) &&
+                  (z2->x < zone->x)))
+                return EINA_TRUE;
+             break;
+           case E_ZONE_EDGE_BOTTOM:
+             if ((E_SPANS_COMMON(zone->x, zone->w, z2->x, z2->w)) &&
+                 (z2->y >= (zone->y + zone->h)))
+                return EINA_TRUE;
+             break;
+           case E_ZONE_EDGE_BOTTOM_RIGHT:
+             if (((E_SPANS_COMMON(zone->x, 99999, z2->x, z2->w)) &&
+                  (z2->y >= (zone->y + zone->h))) ||
+                 ((E_SPANS_COMMON(zone->y, 99999, z2->y, z2->h)) &&
+                  (z2->x < zone->x)))
+                return EINA_TRUE;
+             break;
+             
+           default:
+             break;
+          }
+     }
+      
+   return EINA_FALSE;
+}
+
 EAPI void
 e_zone_edge_new(E_Zone_Edge edge)
 {
@@ -824,18 +896,25 @@
    E_Zone *zone;
    int cw, ch;
 
+   // explicitly disallow edge bindings when we have more than 1 root
+   // window (ie pure old multihead) since we don't know which direction
+   // other root windows are in
+   if (eina_list_count(e_manager_list()) > 1) return;
    EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
         EINA_LIST_FOREACH(man->containers, ll, con)
           {
              EINA_LIST_FOREACH(con->zones, lll, zone)
                {
+                  // don't allow bindings on edges that are on the boundary
+                  // between zones
+                  if (e_zone_exists_direction(zone, edge)) continue;
                   cw = zone->w * E_ZONE_CORNER_RATIO;
                   ch = zone->h * E_ZONE_CORNER_RATIO;
                   switch (edge)
                     {
                      case E_ZONE_EDGE_NONE:
-     /* noop */
+                       /* noop */
                        break;
 
                      case E_ZONE_EDGE_LEFT:
@@ -971,7 +1050,7 @@
                   switch (edge)
                     {
                      case E_ZONE_EDGE_NONE:
-     /* noop */
+                       /* noop */
                        break;
 
                      case E_ZONE_EDGE_LEFT:

Modified: trunk/e/src/bin/e_zone.h
===================================================================
--- trunk/e/src/bin/e_zone.h	2011-10-15 05:16:53 UTC (rev 64084)
+++ trunk/e/src/bin/e_zone.h	2011-10-15 07:11:11 UTC (rev 64085)
@@ -143,6 +143,7 @@
 EAPI void       e_zone_edge_free(E_Zone_Edge edge);
 EAPI void       e_zone_edge_enable(void);
 EAPI void       e_zone_edge_disable(void);
+EAPI Eina_Bool  e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge);
 EAPI void	e_zone_edge_win_layer_set(E_Zone *zone, int layer);
 
 EAPI void       e_zone_useful_geometry_dirty(E_Zone *zone);

Log:
make sure livethumbs have alpha! never made sure of that before. just
  assumed. :)
  
  

Author:       raster
Date:         2011-10-15 19:12:28 -0700 (Sat, 15 Oct 2011)
New Revision: 64099
Trac:         http://trac.enlightenment.org/e/changeset/64099

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

Modified: trunk/e/src/bin/e_livethumb.c
===================================================================
--- trunk/e/src/bin/e_livethumb.c	2011-10-15 12:56:27 UTC (rev 64098)
+++ trunk/e/src/bin/e_livethumb.c	2011-10-16 02:12:28 UTC (rev 64099)
@@ -117,6 +117,7 @@
    sd->vh = 1;
 
    sd->evas_obj = ecore_evas_object_image_new(ecore_evas_ecore_evas_get(evas_object_evas_get(obj)));
+   ecore_evas_alpha_set(evas_object_data_get(sd->evas_obj, "Ecore_Evas"), 1);
    evas_object_smart_member_add(sd->evas_obj, obj);
    evas_object_image_size_set(sd->evas_obj, sd->vw, sd->vh);
    sd->evas = ecore_evas_get(evas_object_data_get(sd->evas_obj, "Ecore_Evas"));

Log:
work on improving edge bindings. having a look at this i'm more
  convinced that we need to dump edge bindings as they stand entirely
  and turn it into an event registration system.
  
  virtual desktops register for edge events on the zone they are on as
  they flip around or are created or destroyed. shelf for audiohide
  registers a region of an edge etc.
  
  

Author:       raster
Date:         2011-10-15 21:24:27 -0700 (Sat, 15 Oct 2011)
New Revision: 64100
Trac:         http://trac.enlightenment.org/e/changeset/64100

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

Modified: trunk/e/src/bin/e_bindings.c
===================================================================
--- trunk/e/src/bin/e_bindings.c	2011-10-16 02:12:28 UTC (rev 64099)
+++ trunk/e/src/bin/e_bindings.c	2011-10-16 04:24:27 UTC (rev 64100)
@@ -514,6 +514,24 @@
    e_zone_edge_new(edge);
 }
 
+EAPI Eina_Bool
+e_bindings_edge_flippable_get(E_Zone_Edge edge)
+{
+   E_Binding_Edge *bind;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(edge_bindings, l, bind)
+     {
+        if ((bind->edge == edge) && (bind->action))
+          {
+             if ((!strcmp(bind->action, "desk_flip_in_direction")) ||
+                 (!strcmp(bind->action, "desk_flip_by")))
+                return EINA_TRUE;
+          }
+     }
+   return EINA_FALSE;
+}
+
 EAPI E_Binding_Edge *
 e_bindings_edge_get(const char *action, E_Zone_Edge edge, Eina_Bool click)
 {
@@ -525,8 +543,8 @@
         if ((bind->edge == edge) &&
             ((click && (bind->delay == -1.0))
              || (!click && (bind->delay >= 0.0))) &&
-            bind->action && action &&
-            !strcmp(action, bind->action))
+            (bind->action) && (action) &&
+            (!strcmp(action, bind->action)))
           return bind;
      }
    return NULL;

Modified: trunk/e/src/bin/e_bindings.h
===================================================================
--- trunk/e/src/bin/e_bindings.h	2011-10-16 02:12:28 UTC (rev 64099)
+++ trunk/e/src/bin/e_bindings.h	2011-10-16 04:24:27 UTC (rev 64100)
@@ -124,6 +124,7 @@
 EAPI E_Action   *e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev);
 
 EAPI void        e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay);
+EAPI Eina_Bool   e_bindings_edge_flippable_get(E_Zone_Edge edge);
 EAPI E_Binding_Edge *e_bindings_edge_get(const char *action, E_Zone_Edge edge, Eina_Bool click);
 EAPI void        e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay);
 EAPI E_Action   *e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);

Modified: trunk/e/src/bin/e_desk.c
===================================================================
--- trunk/e/src/bin/e_desk.c	2011-10-16 02:12:28 UTC (rev 64099)
+++ trunk/e/src/bin/e_desk.c	2011-10-16 04:24:27 UTC (rev 64100)
@@ -11,7 +11,7 @@
 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_begin(E_Desk *desk, int mode, int x, int dy);
 static void _e_desk_show_end(E_Desk *desk);
 static Eina_Bool _e_desk_show_animator(void *data);
 static void _e_desk_hide_begin(E_Desk *desk, int mode, int dx, int dy);
@@ -319,7 +319,7 @@
 	ecore_event_add(E_EVENT_DESK_AFTER_SHOW, eeev, 
 			_e_desk_event_desk_after_show_free, NULL);
      }
-
+   e_zone_edge_flip_eval(desk->zone);
 }
 
 EAPI void

Modified: trunk/e/src/bin/e_zone.c
===================================================================
--- trunk/e/src/bin/e_zone.c	2011-10-16 02:12:28 UTC (rev 64099)
+++ trunk/e/src/bin/e_zone.c	2011-10-16 04:24:27 UTC (rev 64100)
@@ -81,6 +81,26 @@
    return 1;
 }
 
+EAPI void
+e_zone_all_edge_flip_eval(void)
+{
+   Eina_List *l, *ll, *lll;
+   E_Manager *man;
+   E_Container *con;
+   E_Zone *zone;
+
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
+     {
+        EINA_LIST_FOREACH(man->containers, ll, con)
+          {
+             EINA_LIST_FOREACH(con->zones, lll, zone)
+               {
+                  e_zone_edge_flip_eval(zone);
+               }
+          }
+     }
+}
+
 static void
 _e_zone_black_new(E_Zone *zone)
 {
@@ -233,6 +253,7 @@
    e_object_ref(E_OBJECT(ev->zone));
    ecore_event_add(E_EVENT_ZONE_ADD, ev, _e_zone_event_add_free, NULL);
 
+   e_zone_all_edge_flip_eval();
    return zone;
 }
 
@@ -466,7 +487,6 @@
    else
      {
 noflip:
-
         if (zone->flip.es)
           e_shelf_toggle(zone->flip.es, 0);
         zone->flip.es = NULL;
@@ -475,7 +495,7 @@
    EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
         if (es->zone != zone) continue;
-        switch(es->gadcon->orient)
+        switch (es->gadcon->orient)
           {
            case E_GADCON_ORIENT_TOP:
            case E_GADCON_ORIENT_CORNER_TL:
@@ -516,7 +536,7 @@
         zone->flip.es = es;
         e_shelf_toggle(es, 1);
      }
-   switch(edge)
+   switch (edge)
      {
       case E_ZONE_EDGE_LEFT:
         if (E_ZONE_FLIP_LEFT(zone)) ok = 1;
@@ -540,6 +560,7 @@
      }
    if (!ok) return;
    bind = e_bindings_edge_get("desk_flip_in_direction", edge, 0);
+   if (!bind) bind = e_bindings_edge_get("desk_flip_by", edge, 0);
    if (bind)
      {
         zev = E_NEW(E_Event_Zone_Edge, 1);
@@ -661,6 +682,8 @@
         e_desk_show(desk);
      }
 
+   e_zone_edge_flip_eval(zone);
+   
    ev = E_NEW(E_Event_Zone_Desk_Count_Set, 1);
    if (!ev) return;
    ev->zone = zone;
@@ -692,6 +715,7 @@
    dx = zone->desk_x_current + dx;
    dy = zone->desk_y_current + dy;
    e_zone_desk_flip_to(zone, dx, dy);
+   e_zone_edge_flip_eval(zone);
 }
 
 EAPI void
@@ -722,6 +746,7 @@
      }
    desk = e_desk_at_xy_get(zone, x, y);
    if (desk) e_desk_show(desk);
+   e_zone_edge_flip_eval(zone);
 }
 
 EAPI void
@@ -737,6 +762,7 @@
    while (dx < 0)
      dx += (zone->desk_x_count * zone->desk_y_count);
    e_zone_desk_linear_flip_to(zone, dx);
+   e_zone_edge_flip_eval(zone);
 }
 
 EAPI void
@@ -751,6 +777,7 @@
    y = x / zone->desk_x_count;
    x = x - (y * zone->desk_x_count);
    e_zone_desk_flip_to(zone, x, y);
+   e_zone_edge_flip_eval(zone);
 }
 
 EAPI void
@@ -779,6 +806,7 @@
                   if (zone->corner.bottom_right) ecore_x_window_show(zone->corner.bottom_right);
                   if (zone->corner.bottom_left) ecore_x_window_show(zone->corner.bottom_left);
                   if (zone->corner.left_bottom) ecore_x_window_show(zone->corner.left_bottom);
+                  e_zone_edge_flip_eval(zone);
                }
           }
      }
@@ -815,6 +843,107 @@
      }
 }
 
+EAPI void
+e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool t, Eina_Bool b)
+{
+   if (l)
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_LEFT))
+          {
+             if (zone->edge.left) ecore_x_window_show(zone->edge.left);
+          }
+     }
+   else
+     {
+        if (zone->edge.left) ecore_x_window_hide(zone->edge.left);
+     }
+   if (r)
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_RIGHT))
+          {
+             if (zone->edge.right) ecore_x_window_show(zone->edge.right);
+          }
+     }
+   else
+     {
+        if (zone->edge.right) ecore_x_window_hide(zone->edge.right);
+     }
+   if (t)
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_TOP))
+          {
+             if (zone->edge.top) ecore_x_window_show(zone->edge.top);
+          }
+     }
+   else
+     {
+        if (zone->edge.top) ecore_x_window_hide(zone->edge.top);
+     }
+   if (b)
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_BOTTOM))
+          {
+             if (zone->edge.bottom) ecore_x_window_show(zone->edge.bottom);
+          }
+     }
+   else
+     {
+        if (zone->edge.bottom) ecore_x_window_hide(zone->edge.bottom);
+     }
+   if ((!l) && (!t))
+     {
+        if (zone->corner.left_top) ecore_x_window_hide(zone->corner.left_top);
+        if (zone->corner.top_left) ecore_x_window_hide(zone->corner.top_left);
+     }
+   else
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_TOP_LEFT))
+          {
+             if (zone->corner.left_top) ecore_x_window_show(zone->corner.left_top);
+             if (zone->corner.top_left) ecore_x_window_show(zone->corner.top_left);
+          }
+     }
+   if ((!r) && (!t))
+     {
+        if (zone->corner.right_top) ecore_x_window_hide(zone->corner.right_top);
+        if (zone->corner.top_right) ecore_x_window_hide(zone->corner.top_right);
+     }
+   else
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_TOP_RIGHT))
+          {
+             if (zone->corner.right_top) ecore_x_window_show(zone->corner.right_top);
+             if (zone->corner.top_right) ecore_x_window_show(zone->corner.top_right);
+          }
+     }
+   if ((!l) && (!b))
+     {
+        if (zone->corner.left_bottom) ecore_x_window_hide(zone->corner.left_bottom);
+        if (zone->corner.bottom_left) ecore_x_window_hide(zone->corner.bottom_left);
+     }
+   else
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_BOTTOM_LEFT))
+          {
+             if (zone->corner.left_bottom) ecore_x_window_show(zone->corner.left_bottom);
+             if (zone->corner.bottom_left) ecore_x_window_show(zone->corner.bottom_left);
+          }
+     }
+   if ((!r) && (!b))
+     {
+        if (zone->corner.right_bottom) ecore_x_window_hide(zone->corner.right_bottom);
+        if (zone->corner.bottom_right) ecore_x_window_hide(zone->corner.bottom_right);
+     }
+   else
+     {
+        if (e_bindings_edge_flippable_get(E_ZONE_EDGE_BOTTOM_RIGHT))
+          {
+             if (zone->corner.right_bottom) ecore_x_window_show(zone->corner.right_bottom);
+             if (zone->corner.bottom_right) ecore_x_window_show(zone->corner.bottom_right);
+          }
+     }
+}
+
 EAPI Eina_Bool
 e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge)
 {
@@ -887,7 +1016,29 @@
    return EINA_FALSE;
 }
 
+
 EAPI void
+e_zone_edge_flip_eval(E_Zone *zone)
+{
+   Eina_Bool lf, rf, tf, bf;
+   
+   lf = rf = tf = bf = EINA_TRUE;
+   if (zone->desk_x_count <= 1) lf = rf = EINA_FALSE;
+   else if (!e_config->desk_flip_wrap)
+     {
+        if (zone->desk_x_current == 0) lf = EINA_FALSE;
+        if (zone->desk_x_current == (zone->desk_x_count - 1)) rf = EINA_FALSE;
+     }
+   if (zone->desk_y_count <= 1) tf = bf = EINA_FALSE;
+   else if (!e_config->desk_flip_wrap)
+     {
+        if (zone->desk_y_current == 0) tf = EINA_FALSE;
+        if (zone->desk_y_current == (zone->desk_y_count - 1)) bf = EINA_FALSE;
+     }
+   e_zone_edges_desk_flip_capable(zone, lf, rf, tf, bf);
+}
+
+EAPI void
 e_zone_edge_new(E_Zone_Edge edge)
 {
    Eina_List *l, *ll, *lll;
@@ -1607,7 +1758,7 @@
    zone->flip.bind->timer = NULL;
 
    E_FREE(zone->flip.ev);
-   return ECORE_CALLBACK_RENEW;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void

Modified: trunk/e/src/bin/e_zone.h
===================================================================
--- trunk/e/src/bin/e_zone.h	2011-10-16 02:12:28 UTC (rev 64099)
+++ trunk/e/src/bin/e_zone.h	2011-10-16 04:24:27 UTC (rev 64100)
@@ -139,10 +139,12 @@
 EAPI void       e_zone_desk_flip_to(E_Zone *zone, int x, int y);
 EAPI void       e_zone_desk_linear_flip_by(E_Zone *zone, int dx);
 EAPI void       e_zone_desk_linear_flip_to(E_Zone *zone, int x);
+EAPI void       e_zone_edge_flip_eval(E_Zone *zone);
 EAPI void       e_zone_edge_new(E_Zone_Edge edge);
 EAPI void       e_zone_edge_free(E_Zone_Edge edge);
 EAPI void       e_zone_edge_enable(void);
 EAPI void       e_zone_edge_disable(void);
+EAPI void       e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool t, Eina_Bool b);
 EAPI Eina_Bool  e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge);
 EAPI void	e_zone_edge_win_layer_set(E_Zone *zone, int layer);

Log:
indeed - alloc enough space for the message as a whole - alloc only
  alloced 1 extra float in addition to the one already there. need an
  extra 4.
  
  

Author:       raster
Date:         2011-10-25 16:49:58 -0700 (Tue, 25 Oct 2011)
New Revision: 64401
Trac:         http://trac.enlightenment.org/e/changeset/64401

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

Modified: trunk/e/src/bin/e_desk.c
===================================================================
--- trunk/e/src/bin/e_desk.c	2011-10-25 23:10:49 UTC (rev 64400)
+++ trunk/e/src/bin/e_desk.c	2011-10-25 23:49:58 UTC (rev 64401)
@@ -237,7 +237,7 @@
    desk->zone->desk_y_current = desk->y;
    desk->visible = 1;
 
-   msg = alloca(sizeof(Edje_Message_Float_Set) + sizeof(double));
+   msg = alloca(sizeof(Edje_Message_Float_Set) + (4 * sizeof(double)));
    msg->count = 5;
    msg->val[0] = e_config->desk_flip_animate_time;
    msg->val[1] = (double) desk->x;

Log:
implement some more correct icccm stacking support
  
  

Author:       raster
Date:         2011-10-25 16:50:25 -0700 (Tue, 25 Oct 2011)
New Revision: 64402
Trac:         http://trac.enlightenment.org/e/changeset/64402

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-25 23:49:58 UTC (rev 64401)
+++ trunk/e/src/bin/e_border.c	2011-10-25 23:50:25 UTC (rev 64402)
@@ -4923,13 +4923,35 @@
                {
                   obd = e_border_find_by_client_window(e->abovewin);
                   if (obd)
-                    e_border_stack_above(bd, obd);
+                    {
+                       e_border_stack_above(bd, obd);
+                    }
+                  else
+                    {
+                       ecore_x_window_configure(bd->win,
+                                                ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
+                                                ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
+                                                0, 0, 0, 0, 0,
+                                                e->abovewin, ECORE_X_WINDOW_STACK_ABOVE);
+                       /* FIXME: need to rebuiuld border list from current stacking */
+                    }
                }
              else if (e->detail == ECORE_X_WINDOW_STACK_BELOW)
                {
                   obd = e_border_find_by_client_window(e->abovewin);
                   if (obd)
-                    e_border_stack_below(bd, obd);
+                    {
+                       e_border_stack_below(bd, obd);
+                    }
+                  else
+                    {
+                       ecore_x_window_configure(bd->win,
+                                                ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
+                                                ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
+                                                0, 0, 0, 0, 0,
+                                                e->abovewin, ECORE_X_WINDOW_STACK_BELOW);
+                       /* FIXME: need to rebuiuld border list from current stacking */
+                    }
                }
              else if (e->detail == ECORE_X_WINDOW_STACK_TOP_IF)
                {
@@ -4969,6 +4991,7 @@
           }
      }
 
+   /* FIXME: need to send synthetic stacking event too as well as move/resize */
    _e_border_client_move_resize_send(bd);
    return ECORE_CALLBACK_PASS_ON;
 }

Log:
make backlight code a bit more generic with a list of sysfs files to
  look at to get backlight working.
  
  

Author:       raster
Date:         2011-10-28 21:36:32 -0700 (Fri, 28 Oct 2011)
New Revision: 64503
Trac:         http://trac.enlightenment.org/e/changeset/64503

Modified:
  trunk/e/src/bin/e_backlight.c trunk/e/src/bin/e_backlight_main.c 

Modified: trunk/e/src/bin/e_backlight.c
===================================================================
--- trunk/e/src/bin/e_backlight.c	2011-10-29 04:32:24 UTC (rev 64502)
+++ trunk/e/src/bin/e_backlight.c	2011-10-29 04:36:32 UTC (rev 64503)
@@ -13,10 +13,12 @@
 static E_Backlight_Mode bl_mode = E_BACKLIGHT_MODE_NORMAL;
 static int sysmode = MODE_NONE;
 static Ecore_Animator *bl_anim = NULL;
+static const char *bl_sysvalmax = NULL;
 static const char *bl_sysval = NULL;
 static Ecore_Event_Handler *bl_sys_exit_handler = NULL;
 static Ecore_Exe *bl_sys_set_exe = NULL;
 static Eina_Bool bl_sys_pending_set = EINA_FALSE;
+static Eina_Bool bl_sys_set_exe_ready = EINA_TRUE;
 
 static void _e_backlight_update(E_Zone *zone);
 static void _e_backlight_set(E_Zone *zone, double val);
@@ -42,6 +44,8 @@
 {
    if (bl_anim) ecore_animator_del(bl_anim);
    bl_anim = NULL;
+   if (bl_sysval) eina_stringshare_del(bl_sysvalmax);
+   bl_sysvalmax = NULL;
    if (bl_sysval) eina_stringshare_del(bl_sysval);
    bl_sysval = NULL;
    if (bl_sys_exit_handler) ecore_event_handler_del(bl_sys_exit_handler);
@@ -252,87 +256,128 @@
    return maxval;
 }
 
+typedef struct _Bl_Entry
+{
+   char type;
+   const char *base;
+   const char *max;
+   const char *set;
+} Bl_Entry;
+
+static const Bl_Entry search[] =
+{
+   { 'F', "/sys/devices/virtual/backlight/acpi_video0", "max_brightness", "brightness" },
+   { 'D', "/sys/devices/virtual/backlight", "max_brightness", "brightness" },
+   { 'F', "/sys/class/leds/lcd-backlight", "max_brightness", "brightness" },
+   { 'F', "/sys/class/backlight/acpi_video0", "max_brightness", "brightness" },
+   { 'D', "/sys/class/backlight", "max_brightness", "brightness" }
+};
+
 static void
 _bl_sys_find(void)
 {
-   int maxval = 0;
-   const char *tryfile;
-   
-   if (bl_sysval) return;
-   tryfile = "/sys/devices/virtual/backlight/acpi_video0/max_brightness";
-   maxval = _bl_sys_num_get(tryfile);
-   if (maxval > 0)
+   int i, curlevel = 0;
+   char *valstr;
+   char file[4096] = "";
+
+   for (i = 0; i < (int)(sizeof(search) / sizeof(Bl_Entry)); i++)
      {
-        bl_sysval = eina_stringshare_add(tryfile);
-        return;
-     }
-   else
-     {
-        Eina_List *files;
-        const char *dir = "/sys/devices/virtual/backlight";
+        char buf[4096];
+        const Bl_Entry *b = &(search[i]);
         
-        files = ecore_file_ls(dir);
-        if (files)
+        if (b->type == 'F')
           {
-             char *file;
-             
-             EINA_LIST_FREE(files, file)
+             snprintf(buf, sizeof(buf), "%s/%s", b->base, b->set);
+             valstr = _bl_read_file(buf);
+             if (valstr)
                {
-                  if (!bl_sysval)
+                  curlevel = atoi(valstr);
+                  if (curlevel < 0)
                     {
-                       char buf[PATH_MAX];
-                       
-                       snprintf(buf, sizeof(buf), 
-                                "%s/%s/max_brightness", dir, file);
-                       maxval = _bl_sys_num_get(buf);
-                       if (maxval > 0)
-                          bl_sysval = eina_stringshare_add(buf);
+                       free(valstr);
+                       valstr = NULL;
                     }
-                  free(file);
+                  else
+                    {
+                       bl_sysval = eina_stringshare_add(buf);
+                       snprintf(file, sizeof(file), "%s/%s", b->base, b->max);
+                       bl_sysvalmax = eina_stringshare_add(file);
+                       free(valstr);
+                       valstr = NULL;
+                    }
                }
           }
-        if (maxval <= 0)
+        else if (b->type == 'D')
           {
-             struct stat st;
+             DIR *dirp = opendir(b->base);
+             struct dirent *dp;
              
-             tryfile = "/sys/class/leds/lcd-backlight/brightness";
-             if (stat(tryfile, &st) == 0)
+             if (dirp)
                {
-                  tryfile = "/sys/class/leds/lcd-backlight/max_brightness";
-                  bl_sysval = eina_stringshare_add(tryfile);
-                  maxval = _bl_sys_num_get(tryfile);
-                  if (maxval <= 0) maxval = 255;
-                  return;
+                  while ((dp = readdir(dirp)))
+                    {
+                       if ((strcmp(dp->d_name, ".")) &&
+                           (strcmp(dp->d_name, "..")))
+                         {
+                            snprintf(buf, sizeof(buf), "%s/%s/%s",
+                                     b->base, dp->d_name, b->set);
+                            valstr = _bl_read_file(buf);
+                            if (valstr)
+                              {
+                                 curlevel = atoi(valstr);
+                                 if (curlevel < 0)
+                                   {
+                                      free(valstr);
+                                      valstr = NULL;
+                                   }
+                                 else
+                                   {
+                                      bl_sysval = eina_stringshare_add(buf);
+                                      snprintf(file, sizeof(file), "%s/%s/%s",
+                                               b->base, dp->d_name, b->max);
+                                      bl_sysvalmax = eina_stringshare_add(file);
+                                      free(valstr);
+                                      valstr = NULL;
+                                      break;
+                                   }
+                              }
+                         }
+                    }
+                  closedir(dirp);
                }
           }
+        if (file[0]) break;
      }
 }
 
 static void
 _bl_sys_level_get(void)
 {
-   const char *maxfile = bl_sysval;
-   char *valfile, *p;
    int maxval, val;
    
    if (!bl_sysval) return;
-   valfile = strdup(maxfile);
-   p = strrchr(valfile, '/');
-   if (p)
-     {
-        p[1] = 0;
-        strcat(p, "brightness");
-     }
-   maxval = _bl_sys_num_get(maxfile);
-   if (maxval < 0) maxval = 255;
-   val = _bl_sys_num_get(valfile);
+   maxval = _bl_sys_num_get(bl_sysvalmax);
+   if (maxval <= 0) maxval = 255;
+   val = _bl_sys_num_get(bl_sysval);
    if ((val >= 0) && (val <= maxval))
       bl_val = (double)val / (double)maxval;
-//   printf("GET: %i/%i (%1.3f)\n", val, maxval, bl_val);
-   free(valfile);
+   printf("%s, %s\n", bl_sysvalmax, bl_sysval);
+   printf("GET: %i/%i (%1.3f)\n", val, maxval, bl_val);
 }
 
 static Eina_Bool
+_e_bl_cb_ext_delay(void *data __UNUSED__)
+{
+   bl_sys_set_exe_ready = EINA_TRUE;
+   if (bl_sys_pending_set)
+     {
+        bl_sys_pending_set = EINA_FALSE;
+        _bl_sys_level_set(bl_val);
+     }
+   return EINA_FALSE;
+}
+
+static Eina_Bool
 _e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Del *ev;
@@ -340,12 +385,9 @@
    ev = event;
    if (ev->exe == bl_sys_set_exe)
      {
+        bl_sys_set_exe_ready = EINA_FALSE;
         bl_sys_set_exe = NULL;
-        if (bl_sys_pending_set)
-          {
-             bl_sys_pending_set = EINA_FALSE;
-             _bl_sys_level_set(bl_val);
-          }
+        ecore_timer_add(0.1, _e_bl_cb_ext_delay, NULL);
      }
    return ECORE_CALLBACK_RENEW;
 }
@@ -358,7 +400,7 @@
    if (!bl_sys_exit_handler)
       bl_sys_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
                                                     _e_bl_cb_exit, NULL);
-   if (bl_sys_set_exe)
+   if ((bl_sys_set_exe) || (!bl_sys_set_exe_ready))
      {
         bl_sys_pending_set = EINA_TRUE;
         return;

Modified: trunk/e/src/bin/e_backlight_main.c
===================================================================
--- trunk/e/src/bin/e_backlight_main.c	2011-10-29 04:32:24 UTC (rev 64502)
+++ trunk/e/src/bin/e_backlight_main.c	2011-10-29 04:36:32 UTC (rev 64503)
@@ -11,7 +11,7 @@
 
 /* local subsystem functions */
 static char *
-read_file(const char *file)
+_bl_read_file(const char *file)
 {
    FILE *f = fopen(file, "r");
    size_t len;
@@ -33,7 +33,7 @@
 }
 
 static int
-write_file(const char *file, int val)
+_bl_write_file(const char *file, int val)
 {
    char buf[256];
    int fd = open(file, O_WRONLY);
@@ -54,16 +54,33 @@
 }
 
 /* local subsystem globals */
+typedef struct _Bl_Entry
+{
+   char type;
+   const char *base;
+   const char *max;
+   const char *set;
+} Bl_Entry;
 
+static const Bl_Entry search[] =
+{
+   { 'F', "/sys/devices/virtual/backlight/acpi_video0", "max_brightness", "brightness" },
+   { 'D', "/sys/devices/virtual/backlight", "max_brightness", "brightness" },
+   { 'F', "/sys/class/leds/lcd-backlight", "max_brightness", "brightness" },
+   { 'F', "/sys/class/backlight/acpi_video0", "max_brightness", "brightness" },
+   { 'D', "/sys/class/backlight", "max_brightness", "brightness" }
+};
+
 /* externally accessible functions */
 int
 main(int argc, char **argv)
 {
    int i;
    int level;
-   char *maxstr;
-   int maxlevel = 0, curlevel;
+   char *valstr;
+   int maxlevel = 0, curlevel = -1;
    char file[4096] = "";
+   char buf[4096] = "";
    
    for (i = 1; i < argc; i++)
      {
@@ -91,66 +108,92 @@
         printf("ERROR: UNABLE TO ASSUME ROOT GROUP PRIVILEGES\n");
         exit(7);
      }
-   
-   maxstr = read_file("/sys/devices/virtual/backlight/acpi_video0/max_brightness_max");
-   if (maxstr)
+
+   for (i = 0; i < (int)(sizeof(search) / sizeof(Bl_Entry)); i++)
      {
-        maxlevel = atoi(maxstr);
-        if (maxlevel <= 0)
-          {
-             free(maxstr);
-             maxstr = NULL;
-          }
-        else
-          {
-             snprintf(file, sizeof(file), 
-                      "/sys/devices/virtual/backlight/acpi_video0/brightness");
-             free(maxstr);
-             maxstr = NULL;
-          }
-     }
-   if (maxlevel <= 0)
-     {
-        DIR *dirp = opendir("/sys/devices/virtual/backlight");
-        struct dirent *dp;
+        const Bl_Entry *b = &(search[i]);
         
-        if (!dirp) return 1;
-        while ((dp = readdir(dirp)))
+        if (b->type == 'F')
           {
-             if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, "..")))
+             snprintf(buf, sizeof(buf), "%s/%s", b->base, b->set);
+             valstr = _bl_read_file(buf);
+             if (valstr)
                {
-                  char buf[4096];
-
-                  snprintf(buf, sizeof(buf), 
-                           "/sys/devices/virtual/backlight/%s/max_brightness", 
-                           dp->d_name);
-                  maxstr = read_file(buf);
-                  if (maxstr)
+                  curlevel = atoi(valstr);
+                  if (curlevel < 0)
                     {
-                       maxlevel = atoi(maxstr);
-                       if (maxlevel <= 0)
+                       free(valstr);
+                       valstr = NULL;
+                    }
+                  else
+                    {
+                       snprintf(file, sizeof(file), "%s/%s", b->base, b->max);
+                       free(valstr);
+                       valstr = _bl_read_file(file);
+                       if (valstr)
                          {
-                            free(maxstr);
-                            maxstr = NULL;
+                            maxlevel = atoi(valstr);
+                            free(valstr);
+                            valstr = NULL;
                          }
-                       else
+                    }
+               }
+          }
+        else if (b->type == 'D')
+          {
+             DIR *dirp = opendir(b->base);
+             struct dirent *dp;
+             
+             if (dirp)
+               {
+                  while ((dp = readdir(dirp)))
+                    {
+                       if ((strcmp(dp->d_name, ".")) && 
+                           (strcmp(dp->d_name, "..")))
                          {
-                            snprintf(file, sizeof(file), 
-                                     "/sys/devices/virtual/backlight/%s/brightness", 
-                                     dp->d_name);
-                            free(maxstr);
-                            maxstr = NULL;
-                            break;
+                            snprintf(buf, sizeof(buf), "%s/%s/%s", 
+                                     b->base, dp->d_name, b->set);
+                            valstr = _bl_read_file(buf);
+                            if (valstr)
+                              {
+                                 curlevel = atoi(valstr);
+                                 if (curlevel < 0)
+                                   {
+                                      free(valstr);
+                                      valstr = NULL;
+                                   }
+                                 else
+                                   {
+                                      snprintf(file, sizeof(file), "%s/%s/%s",
+                                                b->base, dp->d_name, b->max);
+                                      free(valstr);
+                                      valstr = _bl_read_file(file);
+                                      if (valstr)
+                                        {
+                                           maxlevel = atoi(valstr);
+                                           free(valstr);
+                                           valstr = NULL;
+                                        }
+                                      break;
+                                   }
+                              }
                          }
                     }
+                  closedir(dirp);
                }
           }
-        closedir(dirp);
+        if (file[0]) break;
      }
-   if (maxlevel > 0)
+   if (maxlevel <= 0) maxlevel = 255;
+   printf("curlevel = %i\n", curlevel);
+   printf("maxlevel = %i\n", maxlevel);
+   printf("file = %s\n", file);
+   printf("buf = %s\n", buf);
+   if (curlevel >= 0)
      {
         curlevel = ((maxlevel * level) + (500 / maxlevel)) / 1000;
-        return write_file(file, curlevel);
+        printf("SET: %i, %i/%i\n", level, curlevel, maxlevel);
+        return _bl_write_file(buf, curlevel);
      }
    return -1;
 }

Log:
debug printf--
  
  

Author:       raster
Date:         2011-10-28 23:58:50 -0700 (Fri, 28 Oct 2011)
New Revision: 64504
Trac:         http://trac.enlightenment.org/e/changeset/64504

Modified:
  trunk/e/src/bin/e_backlight.c trunk/e/src/bin/e_backlight_main.c 

Modified: trunk/e/src/bin/e_backlight.c
===================================================================
--- trunk/e/src/bin/e_backlight.c	2011-10-29 04:36:32 UTC (rev 64503)
+++ trunk/e/src/bin/e_backlight.c	2011-10-29 06:58:50 UTC (rev 64504)
@@ -361,8 +361,7 @@
    val = _bl_sys_num_get(bl_sysval);
    if ((val >= 0) && (val <= maxval))
       bl_val = (double)val / (double)maxval;
-   printf("%s, %s\n", bl_sysvalmax, bl_sysval);
-   printf("GET: %i/%i (%1.3f)\n", val, maxval, bl_val);
+//   printf("GET: %i/%i (%1.3f)\n", val, maxval, bl_val);
 }
 
 static Eina_Bool

Modified: trunk/e/src/bin/e_backlight_main.c
===================================================================
--- trunk/e/src/bin/e_backlight_main.c	2011-10-29 04:36:32 UTC (rev 64503)
+++ trunk/e/src/bin/e_backlight_main.c	2011-10-29 06:58:50 UTC (rev 64504)
@@ -185,14 +185,10 @@
         if (file[0]) break;
      }
    if (maxlevel <= 0) maxlevel = 255;
-   printf("curlevel = %i\n", curlevel);
-   printf("maxlevel = %i\n", maxlevel);
-   printf("file = %s\n", file);
-   printf("buf = %s\n", buf);
    if (curlevel >= 0)
      {
         curlevel = ((maxlevel * level) + (500 / maxlevel)) / 1000;
-        printf("SET: %i, %i/%i\n", level, curlevel, maxlevel);
+//        printf("SET: %i, %i/%i\n", level, curlevel, maxlevel);
         return _bl_write_file(buf, curlevel);
      }
    return -1;

Log:
disable resizable gadcon gadgets because we now have autoscroll expand
  stuff working.
  
  

Author:       raster
Date:         2011-10-31 03:10:17 -0700 (Mon, 31 Oct 2011)
New Revision: 64551
Trac:         http://trac.enlightenment.org/e/changeset/64551

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

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2011-10-31 09:41:27 UTC (rev 64550)
+++ trunk/e/src/bin/e_gadcon.c	2011-10-31 10:10:17 UTC (rev 64551)
@@ -54,7 +54,7 @@
 static void _e_gadcon_client_cb_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_gadcon_client_cb_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m, E_Menu_Item *mi);
+/*static void _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m, E_Menu_Item *mi);*/
 static void _e_gadcon_client_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_gadcon_client_cb_menu_remove(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_gadcon_client_cb_menu_pre(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -451,7 +451,7 @@
 		    e_gadcon_layout_pack_options_set(gcc->o_base, gcc);
 
 		  e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll);
-		  e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
+//		  e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
 		  if (gcc->client_class->func.orient)
 		    gcc->client_class->func.orient(gcc, gc->orient);
 
@@ -524,7 +524,7 @@
 		    e_gadcon_layout_pack_options_set(gcc->o_base, gcc);
 
 		  e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll);
-		  e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
+//		  e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
 		  if (gcc->client_class->func.orient)
 		    gcc->client_class->func.orient(gcc, gc->orient); 
 
@@ -923,7 +923,7 @@
    e_theme_edje_object_set(gcc->o_control, "base/theme/gadman", 
                            "e/gadman/control");
 
-   if ((gcc->autoscroll) || (gcc->resizable))
+   if ((gcc->autoscroll)/* || (gcc->resizable)*/)
      {
 	if (e_box_orientation_get(gcc->o_box))
 	  edje_object_signal_emit(gcc->o_control, "e,state,hsize,on", "e");
@@ -1132,7 +1132,7 @@
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
    gcc->min.w = w;
    gcc->min.h = h;
-   if (!gcc->resizable)
+/*   if (!gcc->resizable)*/
      {
 	if (gcc->o_frame)
 	  e_gadcon_layout_pack_min_size_set(gcc->o_frame, w + gcc->pad.w, 
@@ -1150,7 +1150,7 @@
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
    gcc->aspect.w = w;
    gcc->aspect.h = h;
-   if ((!gcc->autoscroll) && (!gcc->resizable))
+   if ((!gcc->autoscroll)/* && (!gcc->resizable)*/)
      {
 	if (gcc->o_frame)
 	  {
@@ -1212,7 +1212,7 @@
 {
    E_OBJECT_CHECK(gcc);
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
-
+/*
    gcc->resizable = resizable;
    if (gcc->resizable)
      {
@@ -1248,6 +1248,9 @@
                                              gcc->aspect.h);
 	  }
      }
+ */
+   resizable = 0;
+   gcc = NULL;
 }
 
 EAPI int
@@ -1403,14 +1406,14 @@
              e_util_menu_item_theme_icon_set(mi, "transform-scale");
              e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
 	  }
-
+/*
 	mi = e_menu_item_new(menu_gadget);
 	e_menu_item_label_set(mi, _("Resizeable"));
 	e_util_menu_item_theme_icon_set(mi, "transform-scale");
 	e_menu_item_check_set(mi, 1);
 	if (gcc->resizable) e_menu_item_toggle_set(mi, 1);
 	e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_resizable, gcc);
-
+ */
 	mi = e_menu_item_new(menu_gadget);
 	e_menu_item_label_set(mi, _("Automatically scroll contents"));
 	e_util_menu_item_theme_icon_set(mi, "transform-move");
@@ -1679,6 +1682,7 @@
    Evas_Coord w, h;
 
    evas_object_geometry_get(gcc->o_box, NULL, NULL, &w, &h);
+/*   
    if (gcc->resizable)
      {
 	if (e_box_orientation_get(gcc->o_box))
@@ -1692,6 +1696,7 @@
 	       h = (w * gcc->aspect.h) / gcc->aspect.w;
 	  }
      }
+ */
    if (gcc->autoscroll)
      {
 	if (e_box_orientation_get(gcc->o_box))
@@ -1795,7 +1800,8 @@
    gcc->cf->style = NULL;
    if (gcc->style)
      gcc->cf->style = eina_stringshare_add(gcc->style);
-   gcc->cf->resizable = gcc->resizable;
+/*   gcc->cf->resizable = gcc->resizable;*/
+   gcc->cf->resizable = 0;
    e_config_save_queue();
 }
 
@@ -2478,7 +2484,7 @@
 		    e_gadcon_layout_pack_options_set(new_gcc->o_base, new_gcc);
 
 		  e_gadcon_client_autoscroll_set(new_gcc, gcc->autoscroll);
-		  e_gadcon_client_resizable_set(new_gcc, gcc->resizable);
+/*		  e_gadcon_client_resizable_set(new_gcc, gcc->resizable);*/
 		  if (new_gcc->client_class->func.orient)
 		    new_gcc->client_class->func.orient(new_gcc, gc->orient);
 		  new_gcc->state_info.resist = 1;
@@ -2736,7 +2742,7 @@
    _e_gadcon_client_save(gcc);
    e_gadcon_layout_thaw(gcc->gadcon->o_container);
 }
-
+/*
 static void
 _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
 {
@@ -2750,7 +2756,7 @@
    _e_gadcon_client_save(gcc);
    e_gadcon_layout_thaw(gcc->gadcon->o_container);
 }
-
+*/
 static void
 _e_gadcon_client_cb_menu_edit(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
 {

Log:
and refine new gadcon layout somemore - so much simpler now! yay!
  
  

Author:       raster
Date:         2011-10-31 05:04:34 -0700 (Mon, 31 Oct 2011)
New Revision: 64556
Trac:         http://trac.enlightenment.org/e/changeset/64556

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

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2011-10-31 11:49:17 UTC (rev 64555)
+++ trunk/e/src/bin/e_gadcon.c	2011-10-31 12:04:34 UTC (rev 64556)
@@ -1150,7 +1150,7 @@
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
    gcc->aspect.w = w;
    gcc->aspect.h = h;
-   if ((!gcc->autoscroll)/* && (!gcc->resizable)*/)
+//   if ((!gcc->autoscroll)/* && (!gcc->resizable)*/)
      {
 	if (gcc->o_frame)
 	  {
@@ -1171,6 +1171,7 @@
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
 
    gcc->autoscroll = autoscroll;
+/*   
    if (gcc->autoscroll)
      {
 	if (gcc->o_frame)
@@ -1187,6 +1188,7 @@
 	  }
      }
    else
+ */
      {
 	if (gcc->o_frame)
 	  {
@@ -1402,7 +1404,7 @@
 	if (!gcc->o_control)
 	  {
              mi = e_menu_item_new(menu_gadget);
-             e_menu_item_label_set(mi, _("Begin move/resize"));
+             e_menu_item_label_set(mi, _("Move"));
              e_util_menu_item_theme_icon_set(mi, "transform-scale");
              e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
 	  }
@@ -1983,7 +1985,7 @@
 	gcc->menu = mn;
 
 	mi = e_menu_item_new(mn);
-	e_menu_item_label_set(mi, _("Stop move/resize this gadget"));
+	e_menu_item_label_set(mi, _("Stop moving"));
 	e_util_menu_item_theme_icon_set(mi, "enlightenment/edit");
 	e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
 
@@ -3710,123 +3712,55 @@
 static void 
 _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
 { 
-   E_Gadcon_Layout_Item *bi2 = NULL;
    E_Gadcon_Layout_Item *bi = NULL;
    Eina_List *l, *l2;
-   Evas_Object *item, *item2;
-   int need, limit = 0, reduce_total, reduce;
-   int max_size, c;
+   Evas_Object *item;
+   int need;
+   int max_size, autosize = 0;
 
    if (sd->w < cur)
      {
-	if (sd->w < min)
-	  max_size = min;
-	else
-	  max_size = cur;
-
+	if (sd->w < min) max_size = min;
+	else max_size = cur;
 	need = max_size - sd->w;
      }
    else
      return;
-
    
    sd->items = eina_list_sort(sd->items, eina_list_count(sd->items), 
 			      _e_gadcon_layout_smart_width_smart_sort_reverse_cb);
-
-   __adjust_size_again:
-   c = 0;
    EINA_LIST_FOREACH(sd->items, l, item)
      { 
-	if (eina_list_next(l)) 
-	  {
-	     item2 = eina_list_data_get(eina_list_next(l));
-	     bi = evas_object_data_get(item, "e_gadcon_layout_data");
-	     bi2 = evas_object_data_get(item2, "e_gadcon_layout_data"); 
-
-	     if (bi->ask.size2 > bi2->ask.size2)
-	       { 
-		  limit = bi2->ask.size2;
-		  c++;
-		  break;
-	       } 
-	     c++;
-	  }
+        bi = evas_object_data_get(item, "e_gadcon_layout_data");
+        if (bi->gcc->autoscroll) autosize += bi->ask.size2;
      } 
 
-   if (eina_list_count(sd->items) == 1) c = 1;
-
-   if (l)
+   if (autosize < 1) autosize = 1;
+   while (need > 0)
      { 
-	reduce = bi->ask.size2 - limit; 
-	reduce_total = reduce * c; 
-
-	if (reduce_total <= need) 
-	  {
-	     /* 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; 
-	       } 
-	     need -= reduce * c;
-	     if (need) 
-	       goto __adjust_size_again;
-	  } 
-	else
-	  { 
-	     int reduce_by, c2; 
-
-	     while (need > 0)
-	       { 
-		  reduce_by = 1;
-		  while (1) 
-		    { 
-		       if (((reduce_by + 1) * c) < need) 
-			 reduce_by++; 
-		       else 
-			 break; 
-		    } 
-		  c2 = c;
-		  EINA_LIST_REVERSE_FOREACH(sd->items, l2, item)
-		    { 
-		       if ((c2 <= 0) || (need <= 0)) break;
-		       bi2 = evas_object_data_get(item, "e_gadcon_layout_data");
-                       if (bi2->gcc->autoscroll)
-                         {
-                            bi2->ask.size2 -= reduce_by;
-                            need -= reduce_by; 
-                            c2--;
-                         }
-		    } 
+        EINA_LIST_REVERSE_FOREACH(sd->items, l2, item)
+          { 
+             if (need <= 0) break;
+             bi = evas_object_data_get(item, "e_gadcon_layout_data");
+             if (bi->gcc->autoscroll)
+               {
+                  int reduce_by; 
+                  
+                  reduce_by = (need * bi->ask.size2) / autosize;
+                  if (reduce_by < 1) reduce_by = 1;
+                  if (bi->ask.size2 - reduce_by > 8)
+                    {
+                       bi->ask.size2 -= reduce_by;
+                       need -= reduce_by ; 
+                    }
+                  else
+                    {
+                       need -= bi->ask.size2 - 8;
+                       bi->ask.size2 = 8;
+                    }
 	       }
 	  } 
      }
-   else
-     { 
-	int reduce_by, c2; 
-
-	while (need)
-	  { 
-	     reduce_by = 1;
-	     while (1) 
-	       { 
-		  if (((reduce_by + 1) * c) < need) 
-		    reduce_by++; 
-		  else 
-		    break; 
-	       } 
-	     c2 = c;
-	     EINA_LIST_FOREACH(sd->items, l2, item)
-	       {
-                  if ((!c2) || (!need)) break;
-		  bi2 = evas_object_data_get(item, "e_gadcon_layout_data");
-		  bi2->ask.size2 -= reduce_by; 
-		  need -= reduce_by;
-		  c2--;
-	       } 
-	  }
-     }
 }
 
 static int

Log:
overkill doing "Gadget nameofgadget in the menu. just nameofgadget
  will do. also it wasnt translated anyway.
  
  

Author:       raster
Date:         2011-11-01 15:33:38 -0700 (Tue, 01 Nov 2011)
New Revision: 64624
Trac:         http://trac.enlightenment.org/e/changeset/64624

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-11-01 22:28:45 UTC (rev 64623)
+++ trunk/e/src/bin/e_config.c	2011-11-01 22:33:38 UTC (rev 64624)
@@ -6,24 +6,10 @@
 #define DEF_MENUCLICK 0.25
 #endif
 
-typedef enum _Eet_Union
-{
-  EET_SCREEN_INFO_11 = (int)((1 << 16) | 1),
-  EET_SCREEN_INFO_12 = (int)((1 << 16) | 2),
-  EET_SCREEN_INFO_13 = (int)((1 << 16) | 3),
-  EET_UNKNOWN
-} Eet_Union;
+#define RANDR_SERIALIZED_SETUP_11 ((int)((1 << 16) | 1))
+#define RANDR_SERIALIZED_SETUP_12 ((int)((1 << 16) | 2))
+#define RANDR_SERIALIZED_SETUP_13 ((int)((1 << 16) | 3))
 
-struct {
-   Eet_Union u;
-   const char *name;
-} eet_mapping[] = {
-  { EET_SCREEN_INFO_11, "E_Config_Screen_11" },
-  { EET_SCREEN_INFO_12, "E_Config_Screen_12" },
-  { EET_SCREEN_INFO_12, "E_Config_Screen_13" },
-  { EET_UNKNOWN, NULL }
-};
-
 EAPI E_Config *e_config = NULL;
 
 static int _e_config_revisions = 9;
@@ -34,8 +20,6 @@
 static Eina_Bool _e_config_cb_timer(void *data);
 static int _e_config_eet_close_handle(Eet_File *ef, char *file);
 static void _e_config_acpi_bindings_add(void);
-static const char * _eet_union_type_get(const void *data, Eina_Bool *unknow);
-static Eina_Bool _eet_union_type_set(const char *type, void *data, Eina_Bool unknow);
 
 /* local subsystem globals */
 static int _e_config_save_block = 0;
@@ -65,15 +49,16 @@
 static E_Config_DD *_e_config_mime_icon_edd = NULL;
 static E_Config_DD *_e_config_syscon_action_edd = NULL;
 static E_Config_DD *_e_config_env_var_edd = NULL;
-static E_Config_DD *_e_config_screen_size_edd = NULL;
-static E_Config_DD *_e_config_screen_size_mm_edd = NULL;
-static E_Config_DD *_e_config_eina_rectangle_edd = NULL;
-static E_Config_DD *_e_config_screen_info_edd = NULL;
-static E_Config_DD *_e_config_screen_restore_info_11_edd = NULL;
-static E_Config_DD *_e_config_screen_restore_info_12_edd = NULL;
-static E_Config_DD *_e_config_screen_output_edid_hash_edd = NULL;
-static E_Config_DD *_e_config_screen_output_restore_info_edd = NULL;
-static E_Config_DD *_e_config_screen_crtc_restore_info_edd = NULL;
+static E_Config_DD *_e_config_randr_size_edd = NULL;
+static E_Config_DD *_e_config_randr_size_mm_edd = NULL;
+static E_Config_DD *_e_config_randr_edid_hash_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_setup_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_setup_11_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_setup_12_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_output_policy_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_output_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_mode_info_edd = NULL;
+static E_Config_DD *_e_config_randr_serialized_crtc_edd = NULL;
 
 
 EAPI int E_EVENT_CONFIG_ICON_THEME = 0;
@@ -526,107 +511,109 @@
    E_CONFIG_VAL(D, T, val, STR);
    E_CONFIG_VAL(D, T, unset, UCHAR);
 
-   _e_config_screen_size_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size", Ecore_X_Randr_Screen_Size);
+   _e_config_randr_size_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size", Ecore_X_Randr_Screen_Size);
 #undef T
 #undef D
 #define T Ecore_X_Randr_Screen_Size
-#define D _e_config_screen_size_edd
+#define D _e_config_randr_size_edd
    E_CONFIG_VAL(D, T, width, INT);
    E_CONFIG_VAL(D, T, height, INT);
    E_CONFIG_VAL(D, T, width, INT);
    E_CONFIG_VAL(D, T, height, INT);
 
-   _e_config_screen_size_mm_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size_MM", Ecore_X_Randr_Screen_Size_MM);
+   _e_config_randr_size_mm_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size_MM", Ecore_X_Randr_Screen_Size_MM);
 #undef T
 #undef D
 #define T Ecore_X_Randr_Screen_Size_MM
-#define D _e_config_screen_size_mm_edd
+#define D _e_config_randr_size_mm_edd
    E_CONFIG_VAL(D, T, width, INT);
    E_CONFIG_VAL(D, T, height, INT);
    E_CONFIG_VAL(D, T, width_mm, INT);
    E_CONFIG_VAL(D, T, height_mm, INT);
 
-   _e_config_screen_restore_info_11_edd = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_11", E_Randr_Screen_Restore_Info_11);
+   _e_config_randr_edid_hash_edd = E_CONFIG_DD_NEW("E_Randr_Edid_Hash", E_Randr_Edid_Hash);
 #undef T
 #undef D
-#define T E_Randr_Screen_Restore_Info_11
-#define D _e_config_screen_restore_info_11_edd
-   E_CONFIG_SUB(D, T, size, _e_config_screen_size_edd);
+#define T E_Randr_Edid_Hash
+#define D _e_config_randr_edid_hash_edd
+   E_CONFIG_VAL(D, T, hash, INT);
+
+   _e_config_randr_serialized_setup_11_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup_11", E_Randr_Serialized_Setup_11);
+#undef T
+#undef D
+#define T E_Randr_Serialized_Setup_11
+#define D _e_config_randr_serialized_setup_11_edd
+   E_CONFIG_SUB(D, T, size, _e_config_randr_size_edd);
    E_CONFIG_VAL(D, T, orientation, INT);
    E_CONFIG_VAL(D, T, refresh_rate, SHORT);
 
-    _e_config_eina_rectangle_edd = E_CONFIG_DD_NEW("Eina_Rectangle", Eina_Rectangle);
+    _e_config_randr_serialized_output_policy_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Output_Policy", E_Randr_Serialized_Output_Policy);
 #undef T
 #undef D
-#define T Eina_Rectangle
-#define D _e_config_eina_rectangle_edd
-   E_CONFIG_VAL(D, T, x, INT);
-   E_CONFIG_VAL(D, T, y, INT);
-   E_CONFIG_VAL(D, T, w, INT);
-   E_CONFIG_VAL(D, T, h, INT);
+#define T E_Randr_Serialized_Output_Policy
+#define D _e_config_randr_serialized_output_policy_edd
+   E_CONFIG_VAL(D, T, name, STR);
+   E_CONFIG_VAL(D, T, name_length, INT);
+   E_CONFIG_VAL(D, T, policy, INT);
 
-      _e_config_screen_output_edid_hash_edd = E_CONFIG_DD_NEW("E_Randr_Output_Edid_Hash", E_Randr_Output_Edid_Hash);
+    _e_config_randr_serialized_output_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Output", E_Randr_Serialized_Output);
 #undef T
 #undef D
-#define T E_Randr_Output_Edid_Hash
-#define D _e_config_screen_output_edid_hash_edd
-   E_CONFIG_VAL(D, T, hash, INT);
+#define T E_Randr_Serialized_Output
+#define D _e_config_randr_serialized_output_edd
+   E_CONFIG_VAL(D, T, name, STR);
+   E_CONFIG_VAL(D, T, name_length, INT);
+   E_CONFIG_SUB(D, T, edid_hash, _e_config_randr_edid_hash_edd);
+   E_CONFIG_VAL(D, T, backlight_level, DOUBLE);
 
-   // FIXME: need to totally re-do this randr config stuff - remove the
-   // union stuff. do this differently to not use unions really. not
-   // intended for how it is used here really.
-    _e_config_screen_output_restore_info_edd = E_CONFIG_DD_NEW("E_Randr_Output_Restore_Info", E_Randr_Output_Restore_Info);
+    _e_config_randr_serialized_mode_info_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Mode_Info", Ecore_X_Randr_Mode_Info);
 #undef T
 #undef D
-#define T E_Randr_Output_Restore_Info
-#define D _e_config_screen_output_restore_info_edd
-   E_CONFIG_SUB(D, T, edid_hash, _e_config_screen_output_edid_hash_edd);
-   E_CONFIG_VAL(D, T, backlight_level, DOUBLE);
+#define T Ecore_X_Randr_Mode_Info
+#define D _e_config_randr_serialized_mode_info_edd
+   E_CONFIG_VAL(D, T, width, INT);
+   E_CONFIG_VAL(D, T, height, INT);
+   E_CONFIG_VAL(D, T, dotClock, LL);
+   E_CONFIG_VAL(D, T, hSyncStart, INT);
+   E_CONFIG_VAL(D, T, hSyncEnd, INT);
+   E_CONFIG_VAL(D, T, hTotal, INT);
+   E_CONFIG_VAL(D, T, hSkew, INT);
+   E_CONFIG_VAL(D, T, vSyncStart, INT);
+   E_CONFIG_VAL(D, T, vSyncEnd, INT);
+   E_CONFIG_VAL(D, T, vTotal, INT);
+   E_CONFIG_VAL(D, T, name, STR);
+   E_CONFIG_VAL(D, T, nameLength, INT);
+   E_CONFIG_VAL(D, T, modeFlags, LL);
 
-  _e_config_screen_crtc_restore_info_edd = E_CONFIG_DD_NEW("E_Randr_Crtc_Restore_Info", E_Randr_Crtc_Restore_Info);
+  _e_config_randr_serialized_crtc_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Crtc", E_Randr_Serialized_Crtc);
 #undef T
 #undef D
-#define T E_Randr_Crtc_Restore_Info
-#define D _e_config_screen_crtc_restore_info_edd
-   E_CONFIG_SUB(D, T, geometry, _e_config_eina_rectangle_edd);
-   E_CONFIG_LIST(D, T, outputs, _e_config_screen_output_restore_info_edd);
+#define T E_Randr_Serialized_Crtc
+#define D _e_config_randr_serialized_crtc_edd
+   E_CONFIG_LIST(D, T, serialized_outputs, _e_config_randr_serialized_output_edd);
+   E_CONFIG_SUB(D, T, mode_info, _e_config_randr_serialized_mode_info_edd);
+   E_CONFIG_VAL(D, T, pos.x, INT);
+   E_CONFIG_VAL(D, T, pos.y, INT);
+   EET_DATA_DESCRIPTOR_ADD_LIST_STRING(D, T, "Crtc_Possible_Outputs_Names", possible_outputs_names);
    E_CONFIG_VAL(D, T, orientation, INT);
 
-   _e_config_screen_restore_info_12_edd = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_12", E_Randr_Screen_Restore_Info_12);
+   _e_config_randr_serialized_setup_12_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup_12", E_Randr_Serialized_Setup_12);
 #undef T
 #undef D
-#define T E_Randr_Screen_Restore_Info_12
-#define D _e_config_screen_restore_info_12_edd
-   E_CONFIG_LIST(D, T, crtcs, _e_config_screen_crtc_restore_info_edd);
-   E_CONFIG_LIST(D, T, outputs_edid_hashes, _e_config_screen_output_edid_hash_edd);
-   E_CONFIG_VAL(D, T, noutputs, INT);
-   E_CONFIG_VAL(D, T, output_policy, INT);
-   E_CONFIG_VAL(D, T, alignment, INT);
+#define T E_Randr_Serialized_Setup_12
+#define D _e_config_randr_serialized_setup_12_edd
+   E_CONFIG_VAL(D, T, timestamp, DOUBLE);
+   E_CONFIG_LIST(D, T, serialized_crtcs, _e_config_randr_serialized_crtc_edd);
+   E_CONFIG_LIST(D, T, serialized_edid_hashes, _e_config_randr_edid_hash_edd);
 
+   _e_config_randr_serialized_setup_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup", E_Randr_Serialized_Setup);
 #undef T
 #undef D
-#define T E_Randr_Screen_Restore_Info
-#define D _e_config_screen_info_edd
-   Eet_Data_Descriptor_Class eddc;
-   Eet_Data_Descriptor *unified, *edd_11_info, *edd_12_info;
-   EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, T);
-   D = eet_data_descriptor_stream_new(&eddc);
-   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
-   eddc.func.type_get = _eet_union_type_get;
-   eddc.func.type_set = _eet_union_type_set;
-   //virtual types to work around EET's inability to differentiate when it
-   //comes to pointers (a->b) vs. values (a.b) in union mappings
-   edd_11_info = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_11_Struct", E_Randr_Screen_Restore_Info_11);
-   E_CONFIG_SUB(edd_11_info, E_Randr_Screen_Restore_Info_Union, restore_info_11, _e_config_screen_restore_info_11_edd);
-   edd_12_info = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_12_Struct", E_Randr_Screen_Restore_Info_12);
-   E_CONFIG_LIST(edd_12_info, E_Randr_Screen_Restore_Info_Union, restore_info_12, _e_config_screen_restore_info_12_edd);
-   unified = eet_data_descriptor_stream_new(&eddc);
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_11", edd_11_info);
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_12", edd_12_info);
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_13", edd_12_info);
-// DISABLE! crashie crashie long time   
-//   EET_DATA_DESCRIPTOR_ADD_UNION(D, T, "E_Randr_Screen_Restore_Info_Union", rrvd_restore_info, randr_version, unified);
-   E_CONFIG_VAL(D, T, randr_version, INT);
+#define T E_Randr_Serialized_Setup
+#define D _e_config_randr_serialized_setup_edd
+   E_CONFIG_SUB(D, T, serialized_setup_11, _e_config_randr_serialized_setup_11_edd);
+   E_CONFIG_LIST(D, T, serialized_setups_12, _e_config_randr_serialized_setup_12_edd);
+   E_CONFIG_LIST(D, T, serialized_outputs_policies, _e_config_randr_serialized_output_policy_edd);
 
    _e_config_edd = E_CONFIG_DD_NEW("E_Config", E_Config);
 #undef T
@@ -787,7 +774,8 @@
    E_CONFIG_VAL(D, T, desklock_ask_presentation, UCHAR);
    E_CONFIG_VAL(D, T, desklock_ask_presentation_timeout, DOUBLE);
 
-   E_CONFIG_LIST(D, T, screen_info, _e_config_screen_info_edd);
+   //randr specifics
+   E_CONFIG_SUB(D, T, randr_serialized_setup, _e_config_randr_serialized_setup_edd);
 
    E_CONFIG_VAL(D, T, screensaver_enable, INT);
    E_CONFIG_VAL(D, T, screensaver_timeout, INT);
@@ -959,7 +947,7 @@
    E_CONFIG_DD_FREE(_e_config_mime_icon_edd);
    E_CONFIG_DD_FREE(_e_config_syscon_action_edd);
    E_CONFIG_DD_FREE(_e_config_env_var_edd);
-   E_CONFIG_DD_FREE(_e_config_screen_info_edd);
+   E_CONFIG_DD_FREE(_e_config_randr_serialized_setup_edd);
    return 1;
 }
 
@@ -1915,10 +1903,13 @@
    E_Color_Class *cc;
    E_Path_Dir *epd;
    E_Remember *rem;
-   E_Randr_Screen_Restore_Info *screen_info;
-   E_Randr_Crtc_Restore_Info *crtc_info;
-   E_Randr_Output_Info *output_info;
-   E_Randr_Screen_Restore_Info_12 *restore_info_12;
+   E_Randr_Serialized_Setup *serialized_setup;
+   E_Randr_Serialized_Setup_12 *serialized_setup_12;
+   E_Randr_Serialized_Crtc *serialized_crtc;
+   E_Randr_Serialized_Output_Policy *serialized_output_policy;
+   E_Randr_Serialized_Output *serialized_output;
+   E_Randr_Edid_Hash *edid_hash;
+   char *output_name;
    E_Config_Env_Var *evr;
 
 
@@ -2069,37 +2060,50 @@
         if (sca->icon) eina_stringshare_del(sca->icon);
         E_FREE(sca);
      }
-   if (ecf->screen_info)
+   if(ecf->randr_serialized_setup)
      {
-	EINA_LIST_FREE(ecf->screen_info, screen_info)
-	  {
-	     switch (screen_info->randr_version)
-	       {
-		case EET_SCREEN_INFO_11:
-		   free(screen_info->rrvd_restore_info.restore_info_11);
-		   break;
-		case EET_SCREEN_INFO_12:
-		case EET_SCREEN_INFO_13:
-		   EINA_LIST_FREE(screen_info->rrvd_restore_info.restore_info_12, restore_info_12)
-		     {
-			EINA_LIST_FREE(restore_info_12->crtcs, crtc_info)
-			  {
-			     EINA_LIST_FREE(crtc_info->outputs, output_info)
-			       {
-				  free(output_info->name);
-				  free(output_info->edid);
-				  free (output_info);
-			       }
-			     free (crtc_info);
-			  }
-			free(restore_info_12);
-		     }
-		   eina_list_free(screen_info->rrvd_restore_info.restore_info_12);
-		   break;
-	       }
-	     free(screen_info);
-	  }
+           if(ecf->randr_serialized_setup->serialized_setup_11)
+              free(serialized_setup->serialized_setup_11);
+           else if(ecf->randr_serialized_setup->serialized_setups_12)
+             {
+                EINA_LIST_FREE(ecf->randr_serialized_setup->serialized_setups_12, serialized_setup_12)
+                  {
+                     EINA_LIST_FREE(serialized_setup_12->serialized_crtcs, serialized_crtc)
+                       {
+                          if (!serialized_crtc) continue;
+                          EINA_LIST_FREE(serialized_crtc->serialized_outputs, serialized_output)
+                            {
+                               if (serialized_output)
+                                 {
+                                    if (serialized_output->name) free(serialized_output);
+                                    free(serialized_output);
+                                 }
+                            }
+                          EINA_LIST_FREE(serialized_crtc->possible_outputs_names, output_name)
+                            {
+                               if (output_name) free(output_name);
+                            }
+                          if (serialized_crtc->mode_info.name)
+                            free(serialized_crtc->mode_info.name);
+                          free(serialized_crtc);
+                       }
+                     EINA_LIST_FREE(serialized_setup_12->serialized_edid_hashes, edid_hash)
+                       {
+                          if (edid_hash) free(edid_hash);
+                       }
+                     free(serialized_setup_12);
+                  }
+             }
+           EINA_LIST_FREE(ecf->randr_serialized_setup->serialized_outputs_policies, serialized_output_policy)
+             {
+                if (!serialized_output) continue;
+                if (serialized_output_policy->name)
+                  free(serialized_output_policy->name);
+                free(serialized_output_policy);
+             }
+           free(ecf->randr_serialized_setup);
      }
+
    EINA_LIST_FREE(ecf->env_vars, evr)
      {
         if (evr->var) eina_stringshare_del(evr->var);
@@ -2116,14 +2120,14 @@
    E_FREE(ecf);
 }
 
-static Eina_Bool
+   static Eina_Bool
 _e_config_cb_timer(void *data)
 {
    e_util_dialog_show(_("Settings Upgraded"), "%s", (char *)data);
    return 0;
 }
 
-static int
+   static int
 _e_config_eet_close_handle(Eet_File *ef, char *file)
 {
    Eet_Error err;
@@ -2133,16 +2137,16 @@
    switch (err)
      {
       case EET_ERROR_NONE:
-        /* all good - no error */
-	break;
+         /* all good - no error */
+         break;
       case EET_ERROR_BAD_OBJECT:
-	erstr = _("The EET file handle is bad.");
-	break;
+         erstr = _("The EET file handle is bad.");
+         break;
       case EET_ERROR_EMPTY:
-	erstr = _("The file data is empty.");
-	break;
+         erstr = _("The file data is empty.");
+         break;
       case EET_ERROR_NOT_WRITABLE:
-	erstr = _("The file is not writable. Perhaps the disk is read-only<br>or you lost permissions to your files.");
+         erstr = _("The file is not writable. Perhaps the disk is read-only<br>or you lost permissions to your files.");
 	break;
       case EET_ERROR_OUT_OF_MEMORY:
 	erstr = _("Memory ran out while preparing the write.<br>Please free up memory.");
@@ -2280,36 +2284,3 @@
    bind->params = eina_stringshare_add("now");
    e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, bind);
 }
-
-static const char *
-_eet_union_type_get(const void *data, Eina_Bool *unknow)
-{
-   const Eet_Union *u = data;
-   int i;
-
-   if (unknow) *unknow = EINA_FALSE;
-   for (i = 0; eet_mapping[i].name; ++i)
-     if (*u == eet_mapping[i].u)
-       return eet_mapping[i].name;
-
-   if (unknow) *unknow = EINA_TRUE;
-   return NULL;
-}
-
-static Eina_Bool
-_eet_union_type_set(const char *type, void *data, Eina_Bool unknow)
-{
-   Eet_Union *u = data;
-   int i;
-
-   if (unknow) return EINA_FALSE;
-
-   for (i = 0; eet_mapping[i].name; ++i)
-     if (strcmp(eet_mapping[i].name, type) == 0)
-       {
-	  *u = eet_mapping[i].u;
-	  return EINA_TRUE;
-       }
-
-   return EINA_FALSE;
-}

Modified: trunk/e/src/bin/e_config.h
===================================================================
--- trunk/e/src/bin/e_config.h	2011-11-01 22:28:45 UTC (rev 64623)
+++ trunk/e/src/bin/e_config.h	2011-11-01 22:33:38 UTC (rev 64624)
@@ -33,7 +33,7 @@
 /* increment this whenever a new set of config values are added but the users
  * config doesn't need to be wiped - simply new values need to be put in
  */
-#define E_CONFIG_FILE_GENERATION 0x0145
+#define E_CONFIG_FILE_GENERATION 0x0146
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
 
 #define E_EVAS_ENGINE_DEFAULT         0
@@ -250,7 +250,7 @@
    int         mouse_accel_denominator; // GUI
    int         mouse_accel_threshold; // GUI
 
-   Eina_List   *screen_info; // GUI
+   E_Randr_Serialized_Setup   *randr_serialized_setup; // GUI
 
    int         border_raise_on_mouse_action; // GUI
    int         border_raise_on_focus; // GUI

Modified: trunk/e/src/bin/e_gadcon.c
===================================================================
--- trunk/e/src/bin/e_gadcon.c	2011-11-01 22:28:45 UTC (rev 64623)
+++ trunk/e/src/bin/e_gadcon.c	2011-11-01 22:33:38 UTC (rev 64624)
@@ -1466,10 +1466,10 @@
      {
 	mi = e_menu_item_new(menu_main);
 	if (gcc->client_class->func.label)
-	  snprintf(buf, sizeof(buf), "Gadget %s", 
+	  snprintf(buf, sizeof(buf), "%s", 
 		   gcc->client_class->func.label((E_Gadcon_Client_Class *)gcc->client_class));
 	else
-	  snprintf(buf, sizeof(buf), "Gadget %s", gcc->name);
+	  snprintf(buf, sizeof(buf), "%s", gcc->name);
 
 	e_menu_item_label_set(mi, _(buf));
 	e_menu_item_realize_callback_set(mi, _e_gadcon_client_cb_menu_pre, gcc);

Modified: trunk/e/src/bin/e_randr.c
===================================================================
--- trunk/e/src/bin/e_randr.c	2011-11-01 22:28:45 UTC (rev 64623)
+++ trunk/e/src/bin/e_randr.c	2011-11-01 22:33:38 UTC (rev 64624)
@@ -11,6 +11,13 @@
 #define Ecore_X_Randr_Unset -1
 
 /*
+ * Save mechanism:
+ * Single monitor:
+ * - Save monitor using the resolution
+ *
+ * Multiple monitors:
+ * - Use the EDID information to make sure we restore the right monitor.
+ *
  * TODO:
  * -fix output policies above and left
  */
@@ -57,6 +64,11 @@
 static void _e_randr_crtc_info_free(E_Randr_Crtc_Info *crtc_info);
 static Eina_Bool _e_randr_screen_outputs_init(void);
 static Eina_Bool _e_randr_screen_crtcs_init(void);
+
+static Eina_Bool _e_randr_try_restore_11(E_Randr_Screen_Info_11 *si_11);
+static Eina_Bool _e_randr_try_restore_12(E_Randr_Screen_Info_12 *si_12);
+EAPI void e_randr_store_configuration(E_Randr_Screen_Info *screen_info);
+EAPI Eina_Bool e_randr_try_restore_configuration(E_Randr_Screen_Info *screen_info);
 static Eina_Bool _e_randr_output_modes_add(E_Randr_Output_Info *output_info);
 static void _e_randr_notify_crtc_mode_change(E_Randr_Crtc_Info *crtc_info);
 static void _e_randr_notify_output_change(E_Randr_Output_Info *output_info);
@@ -66,12 +78,8 @@
 static void _e_randr_output_info_set(E_Randr_Output_Info *output_info);
 static void _e_randr_crtc_info_set(E_Randr_Crtc_Info *crtc_info);
 static const E_Randr_Crtc_Info *_e_randr_policy_crtc_get(E_Randr_Crtc_Info* but, E_Randr_Crtc_Info *hint, Ecore_X_Randr_Output_Policy policy);
-//static Eina_Bool _e_randr_outputs_connected(Eina_List *outputs_info);
 static Ecore_X_Randr_Output *_e_randr_outputs_to_array(Eina_List *outputs_info);
-//static int _e_randr_config_find_suiting_config_11(E_Randr_Screen_Restore_Info_11** restore_info);
-static E_Randr_Screen_Restore_Info_12 *	_e_randr_config_find_suiting_config_12(void);
-//static Eina_Bool _e_randr_config_enable_11(int size_index, Ecore_X_Randr_Refresh_Rate refresh_rate, Ecore_X_Randr_Orientation orientation);
-//static Eina_Bool _e_randr_config_enable_12(const E_Randr_Screen_Restore_Info_12 *restore_info);
+static E_Randr_Serialized_Setup_12 *	_e_randr_config_find_suiting_config_12(void);
 static Eina_Bool _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force);
 static void _e_randr_crtcs_possible_output_update(E_Randr_Output_Info *output_info);
 static void _e_randr_crtc_outputs_refs_update(E_Randr_Crtc_Info *crtc_info);
@@ -90,7 +98,7 @@
 static void _e_randr_output_hw_info_free(E_Randr_Output_Info *output_info);
 static Eina_Bool _e_randr_outputs_are_clones(E_Randr_Output_Info *output_info, Eina_List *outputs);
 
-E_Randr_Screen_Info *e_randr_screen_info = NULL;
+EAPI E_Randr_Screen_Info *e_randr_screen_info = NULL;
 static Eina_List *_e_randr_event_handlers = NULL;
 
 EINTERN Eina_Bool
@@ -270,7 +278,6 @@
         .crtcs = NULL,
         .outputs = NULL,
         .primary_output = NULL,
-        .output_policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE,
         .alignment = ECORE_X_RANDR_RELATIVE_ALIGNMENT_NONE
      };
 
@@ -459,7 +466,8 @@
         .connector_type = Ecore_X_Randr_Unset,
         .connection_status = ECORE_X_RANDR_CONNECTION_STATUS_DISCONNECTED,
         .subpixel_order= Ecore_X_Randr_Unset,
-        .compatible_outputs = NULL
+        .compatible_outputs = NULL,
+        .policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE
      };
 
    if (!(ret = malloc(sizeof(E_Randr_Output_Info) * nrequested))) return NULL;
@@ -760,7 +768,7 @@
    else if (type == ECORE_X_EVENT_RANDR_OUTPUT_CHANGE)
      {
         Ecore_X_Event_Randr_Output_Change *event = ev;
-        const E_Randr_Screen_Restore_Info_12 *restore_info;
+        const E_Randr_Serialized_Setup_12 *restore_info;
         E_Randr_Output_Info* output_info = NULL;
         /* available information:
            struct _Ecore_X_Event_Randr_Output_Change
@@ -807,11 +815,13 @@
                   _e_randr_output_info_hw_info_set(output_info);
                   //make the crtcs aware of their possibly new output
                   _e_randr_crtcs_possible_output_update(output_info);
+                  /*
                   if ((restore_info = _e_randr_config_find_suiting_config_12()))
                      //maybe we have a suiting configuration
                      //_e_randr_config_enable_12(restore_info);
                      ;
                   else
+                  */
                      enabled = _e_randr_try_enable_output(output_info, EINA_FALSE); //maybe give a success message?
                }
              _e_randr_notify_output_change(output_info);
@@ -841,11 +851,13 @@
                      _e_randr_screen_primary_output_assign(output_info);
                   //let's try to get a proper config for the new setup and crop the
                   //screen afterwards.
+                  /*
                   if ((restore_info = _e_randr_config_find_suiting_config_12()))
 		    {
 		       //in case we didn't have, init it anyway...
 		       //_e_randr_config_enable_12(restore_info);
                     }
+                  */
                }
              _e_randr_notify_output_change(output_info);
              _e_randr_output_hw_info_free(output_info);
@@ -865,6 +877,7 @@
            };
            */
      }
+   e_randr_try_restore_configuration(e_randr_screen_info);
  on_exit:
    return ECORE_CALLBACK_RENEW;
 }
@@ -999,146 +1012,602 @@
    return ret;
 }
 
-/*
-static Eina_Bool
-_e_randr_outputs_connected(Eina_List *outputs_info)
+// Setup store functions
+   Eina_Bool
+_e_randr_copy_mode_info(Ecore_X_Randr_Mode_Info *dest, Ecore_X_Randr_Mode_Info *src)
 {
-   Eina_List *iter;
-   E_Randr_Output_Info *output_info;
 
-   EINA_LIST_FOREACH(outputs_info, iter, output_info)
-     if (output_info->connection_status == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) return EINA_TRUE;
+   if (!dest || !src) return EINA_FALSE;
+
+   dest->width = src->width;
+   dest->height = src->height;
+   dest->dotClock = src->dotClock;
+   dest->hSyncStart = src->hSyncStart;
+   dest->hSyncEnd = src->hSyncEnd;
+   dest->hTotal = src->hTotal;
+   dest->hSkew = src->hSkew;
+   dest->vSyncStart = src->vSyncStart;
+   dest->vSyncEnd = src->vSyncEnd;
+   dest->vTotal = src->vTotal;
+   if (src->nameLength > 0)
+     {
+        if (!(dest->name = malloc(src->nameLength + 1))) return EINA_FALSE;
+        if (!strncpy(dest->name, src->name, src->nameLength)) goto _e_randr_copy_mode_info_fail_free_name;
+     }
+   dest->nameLength = src->nameLength;
+   dest->modeFlags = src->modeFlags;
+
+   return EINA_TRUE;
+
+_e_randr_copy_mode_info_fail_free_name:
+   free(dest->name);
    return EINA_FALSE;
 }
 
-static Eina_Bool
-_e_randr_config_enable_11(int size_index, Ecore_X_Randr_Refresh_Rate refresh_rate, Ecore_X_Randr_Orientation orientation)
+   void
+_e_randr_free_serialized_mode_info(Ecore_X_Randr_Mode_Info *mode_info)
 {
-   E_Randr_Screen_Info_11 *current_info_11;
+   if (mode_info->name) free(mode_info->name);
+}
 
-   if (E_RANDR_NO_11 || (size_index < 0) || (refresh_rate < 0) || 
-       (orientation < 0)) return EINA_FALSE;
+   Eina_List
+*_e_randr_create_outputs_policies_list(Eina_List *outputs)
+{
+   Eina_List *iter, *list = NULL;
+   E_Randr_Output_Info *oi;
+   E_Randr_Serialized_Output_Policy *sop;
+   char *name;
 
-   if (!ecore_x_randr_screen_primary_output_size_set(e_randr_screen_info->root, size_index)
-       || !ecore_x_randr_screen_primary_output_orientation_set(e_randr_screen_info->root, orientation)
-       || !ecore_x_randr_screen_primary_output_refresh_rate_set(e_randr_screen_info->root, size_index, refresh_rate)) return EINA_FALSE;
+   EINA_LIST_FOREACH(outputs, iter, oi)
+     {
+        if (!oi->name || (oi->name_length <= 0)) continue;
+        if (!(sop = E_NEW(E_Randr_Serialized_Output_Policy, 1))
+              || !(sop->name = malloc(oi->name_length + 1))
+              || !(strncpy(sop->name, oi->name, oi->name_length)))
+          goto _e_randr_create_outputs_policies_list_fail_free_list;
+        sop->name_length = oi->name_length;
+        sop->policy = oi->policy;
+        if (!(list = eina_list_append(list, sop)))
+          goto _e_randr_create_outputs_policies_list_fail_free_list;
+     }
 
-   //TODO: move this to the screen event later.
-   current_info_11 = e_randr_screen_info->rrvd_info.randr_info_11;
+   return list;
+_e_randr_create_outputs_policies_list_fail_free_list:
+   EINA_LIST_FREE(list, sop)
+     {
+        if (sop->name) free(sop->name);
+        free(sop);
+     }
+   return NULL;
+}
 
-   current_info_11->csize_index = size_index;
-   current_info_11->corientation = orientation;
-   current_info_11->current_rate = refresh_rate;
+void
+_e_randr_free_serialized_output_policy(E_Randr_Serialized_Output_Policy *sop)
+{
+   if (!sop) return;
+   if (sop->name) free(sop->name);
+   free(sop);
+}
 
-   return EINA_TRUE;
+   Eina_List
+*_e_randr_update_serialized_outputs_policies(E_Randr_Screen_Info_12 *si_12, Eina_List *sops)
+{
+   E_Randr_Serialized_Output_Policy *sop;
+
+   EINA_LIST_FREE(sops, sop)
+     {
+        _e_randr_free_serialized_output_policy(sop);
+     }
+
+   return _e_randr_create_outputs_policies_list(si_12->outputs);
 }
 
-static Eina_Bool
-_e_randr_config_enable_12(const E_Randr_Screen_Restore_Info_12 *restore_info __UNUSED__)
+   Eina_List
+*_e_randr_create_possible_outputs_names_list(Eina_List *outputs)
 {
-      if (E_RANDR_NO_12 || !restore_info) return EINA_FALSE;
-      E_Randr_Screen_Info_12 *current_info_12;
-      E_Randr_Screen_Restore_Info_12 *restore_info_12 = NULL;
-      E_Randr_Crtc_Restore_Info *crtc_restore_info = NULL;
-      E_Randr_Crtc_Info *crtc_info;
-      E_Randr_Output_Info *output_info;
-      Eina_List *crtc_restore_iter;
+   Eina_List *iter, *list = NULL;
+   E_Randr_Output_Info *oi;
+   char *name;
 
-      current_info_12 = (e_randr_screen_info->rrvd_info).randr_info_12;
-      EINA_LIST_FOREACH(restore_info_12->crtcs, crtc_restore_iter, crtc_restore_info)
-      {
-      ;
-      }
-      current_info_12->alignment = restore_info_12->alignment;
-      current_info_12->output_policy = restore_info_12->output_policy;
-      return EINA_TRUE;
-   return EINA_FALSE;
+   if (!outputs) return NULL;
+
+   EINA_LIST_FOREACH(outputs, iter, oi)
+     {
+        if (!oi->name || (oi->name_length <= 0)) continue;
+        if (!(name = malloc(oi->name_length))
+              || !strncpy(name, oi->name, oi->name_length)
+              || !(list = eina_list_append(list, name))) goto _e_randr_create_possible_outputs_names_list_fail_free_list;
+     }
+   return list;
+
+_e_randr_create_possible_outputs_names_list_fail_free_list:
+   EINA_LIST_FREE(list, name)
+     {
+        if(name) free(name);
+     }
+   return NULL;
 }
 
-static int
-_e_randr_config_find_suiting_config_11(E_Randr_Screen_Restore_Info_11 **restore_info)
+   E_Randr_Edid_Hash
+*_e_randr_create_edid_hash(E_Randr_Output_Info *output_info)
 {
-   E_RANDR_NO_11_RET(Ecore_X_Randr_None);
-   Eina_List *cfg_screen_restore_info_iter;
-   E_Randr_Screen_Restore_Info *screen_restore_info;
+   E_Randr_Edid_Hash *edid_hash;
 
-   E_Randr_Screen_Restore_Info_11 *restore_info_11;
-   Ecore_X_Randr_Screen_Size_MM *sizes;
-   Ecore_X_Randr_Refresh_Rate *rates = NULL;
-   int i = 0, j = 0, nsizes = 0, nrates = 0;
+   if (!output_info || (output_info->edid_hash.hash == 0) || !(edid_hash = malloc(sizeof(E_Randr_Edid_Hash)))) return NULL;
 
-   EINA_LIST_FOREACH(e_config->screen_info, cfg_screen_restore_info_iter, screen_restore_info)
+   edid_hash->hash = output_info->edid_hash.hash;
+
+   return edid_hash;
+}
+
+   E_Randr_Serialized_Output
+*_e_randr_create_serialized_output(E_Randr_Output_Info *output_info)
+{
+   E_Randr_Serialized_Output *so;
+   char *name;
+
+   if (!output_info || !output_info->name || (output_info->name_length <= 0) || !(so = malloc(sizeof(E_Randr_Serialized_Output)))) return NULL;
+
+   if (!(name = malloc(output_info->name_length))
+         || !strncpy(so->name, output_info->name, output_info->name_length))
+     goto _e_randr_create_serialized_outputs_fail_free_so;
+   so->name_length = output_info->name_length;
+   so->edid_hash.hash = output_info->edid_hash.hash;
+   so->backlight_level = output_info->backlight_level;
+
+   return so;
+
+_e_randr_create_serialized_outputs_fail_free_so:
+   free(so);
+   return NULL;
+}
+
+   void
+_e_randr_free_serialized_output(E_Randr_Serialized_Output *so)
+{
+   if (so->name) free(so->name);
+   free(so);
+}
+
+   E_Randr_Serialized_Crtc
+*_e_randr_create_serialized_crtc(E_Randr_Crtc_Info *crtc_info)
+{
+   E_Randr_Serialized_Crtc *sc;
+   E_Randr_Serialized_Output *so;
+   E_Randr_Output_Info *output_info;
+   Eina_List *iter;
+   char *output_name;
+   size_t len;
+
+   if (!(sc = E_NEW(E_Randr_Serialized_Crtc, 1))) return NULL;
+   if(!_e_randr_copy_mode_info(&sc->mode_info, crtc_info->current_mode)) goto _e_randr_create_serialized_crtc_free_sc;
+   if(!(sc->possible_outputs_names = _e_randr_create_possible_outputs_names_list(crtc_info->possible_outputs))) goto _e_randr_create_serialized_crtc_free_mode_sc;
+   //Create list of serialized outputs
+   EINA_LIST_FOREACH(crtc_info->outputs, iter, output_info)
      {
-        // 'screen_restore_info' should _never_ be NULL, since this functions shouldn't be called due to randr init failing.
-	if (!screen_restore_info) continue;
-        if (screen_restore_info->randr_version != ECORE_X_RANDR_1_1) continue;
-        restore_info_11 = screen_restore_info->rrvd_restore_info.restore_info_11;
-        if((sizes = ecore_x_randr_screen_primary_output_sizes_get(e_randr_screen_info->root, &nsizes)))
+        if(!(so = _e_randr_create_serialized_output(output_info))
+              || !(sc->serialized_outputs = eina_list_append(sc->serialized_outputs, so))) goto _e_randr_create_serialized_crtc_free_outputs_list_sc;
+     }
+   sc->pos.x = crtc_info->geometry.x;
+   sc->pos.y = crtc_info->geometry.y;
+   sc->orientation = crtc_info->current_orientation;
+
+   return sc;
+
+_e_randr_create_serialized_crtc_free_outputs_list_sc:
+   EINA_LIST_FREE(sc->possible_outputs_names, output_name)
+     {
+        if (output_name) free(output_name);
+     }
+   EINA_LIST_FREE(sc->serialized_outputs, so)
+     {
+        if (so) _e_randr_free_serialized_output(so);
+     }
+_e_randr_create_serialized_crtc_free_mode_sc:
+   _e_randr_free_serialized_mode_info(&sc->mode_info);
+_e_randr_create_serialized_crtc_free_sc:
+   E_FREE(sc);
+
+   return NULL;
+}
+
+   void
+_e_randr_free_serialized_crtc(E_Randr_Serialized_Crtc *sc)
+{
+   E_Randr_Serialized_Output *so;
+   char *name;
+
+   EINA_LIST_FREE(sc->serialized_outputs, so)
+      _e_randr_free_serialized_output(so);
+   _e_randr_free_serialized_mode_info(&sc->mode_info);
+   EINA_LIST_FREE(sc->possible_outputs_names, name)
+      free(name);
+   free(sc);
+}
+
+   E_Randr_Serialized_Setup_11
+*_e_randr_create_serialized_setup_11(E_Randr_Screen_Info_11 *screen_info_11)
+{
+   E_Randr_Serialized_Setup_11 *ss;
+   Ecore_X_Randr_Screen_Size_MM* size;
+
+   if (!(ss = malloc(sizeof(*ss)))) return NULL;
+   if(!(size = (Ecore_X_Randr_Screen_Size_MM*)eina_list_data_get(eina_list_nth(screen_info_11->sizes, screen_info_11->csize_index)))) goto _e_randr_create_serialized_setup_11_failed_free_ss;
+   ss->size.width = size->width;
+   ss->size.height = size->height;
+   ss->refresh_rate = screen_info_11->current_rate;
+   ss->orientation = screen_info_11->corientation;
+
+   return ss;
+
+_e_randr_create_serialized_setup_11_failed_free_ss:
+   free(ss);
+}
+
+   E_Randr_Serialized_Setup_11
+*_e_randr_update_serialized_setup_11(E_Randr_Serialized_Setup_11 *ss_11, E_Randr_Screen_Info_11 *si_11)
+{
+   Ecore_X_Randr_Screen_Size_MM* size;
+
+   if (ss_11)
+     {
+        if(!(size = (Ecore_X_Randr_Screen_Size_MM*)eina_list_data_get(eina_list_nth(si_11->sizes, si_11->csize_index)))) return NULL;
+        if (!memcpy(&ss_11->size, size, sizeof(Ecore_X_Randr_Screen_Size_MM)))
+          goto _e_randr_update_serialized_setup_11_failed_free_ss;
+        ss_11->refresh_rate = si_11->current_rate;
+        ss_11->orientation = si_11->corientation;
+     }
+   else
+     ss_11 = _e_randr_create_serialized_setup_11(si_11);
+
+   return ss_11;
+
+_e_randr_update_serialized_setup_11_failed_free_ss:
+   free(ss_11);
+   return NULL;
+}
+
+   E_Randr_Serialized_Setup_12
+*_e_randr_create_serialized_setup_12(E_Randr_Screen_Info_12 *screen_info_12)
+{
+   E_Randr_Serialized_Setup_12 *ss;
+   Eina_List *iter;
+   E_Randr_Crtc_Info *ci;
+   E_Randr_Output_Info *oi;
+   E_Randr_Serialized_Crtc *sc;
+   E_Randr_Edid_Hash *edid_hash;
+
+   if (!(ss = E_NEW(E_Randr_Serialized_Setup_12, 1))) return NULL;
+
+   ss->timestamp = ecore_time_get();
+
+   //Add CRTCs and their configuration
+   EINA_LIST_FOREACH(screen_info_12->crtcs, iter, ci)
+     {
+        //ignore disabled crtcs for now
+        if (!ci->current_mode) continue;
+
+        if (!(sc = _e_randr_create_serialized_crtc(ci))
+              || !(ss->serialized_crtcs = eina_list_append(ss->serialized_crtcs, sc)))
+          goto _e_randr_create_serialized_setup_12_failed_free_list_ss;
+     }
+
+   /*
+    * Add EDID hashes of connected and enabled
+    * outputs for easier comparison during
+    * setup restoration
+    */
+   EINA_LIST_FOREACH(screen_info_12->outputs, iter, oi)
+     {
+        if ((oi->connection_status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) || !oi->crtc || !oi->crtc->current_mode)
+          continue;
+        if (!(edid_hash = _e_randr_create_edid_hash(oi)) || !(ss->serialized_edid_hashes = eina_list_append(ss->serialized_edid_hashes, edid_hash)))
+          goto _e_randr_create_serialized_setup_12_failed_free_output_list_crtc_list_ss;
+     }
+
+   return ss;
+
+_e_randr_create_serialized_setup_12_failed_free_output_list_crtc_list_ss:
+   EINA_LIST_FREE(ss->serialized_edid_hashes, edid_hash)
+     {
+        if (edid_hash) free(edid_hash);
+   }
+_e_randr_create_serialized_setup_12_failed_free_list_ss:
+   EINA_LIST_FREE(ss->serialized_crtcs, sc)
+     {
+        _e_randr_free_serialized_crtc(sc);
+     }
+_e_randr_create_serialized_setup_12_failed_free_ss:
+   free(ss);
+}
+
+E_Randr_Serialized_Setup_12
+*_e_randr_find_matching_serialized_setup(Eina_List *setups_12, E_Randr_Screen_Info_12 *si_12)
+{
+   E_Randr_Serialized_Setup_12 *ss_12;
+   Eina_List *setups_iter, *r_iter, *s_iter;
+   Eina_Bool found = EINA_FALSE;
+   E_Randr_Edid_Hash *edid_hash;
+   E_Randr_Output_Info *oi;
+
+   if (!setups_12 || !si_12) return NULL;
+
+   EINA_LIST_FOREACH(setups_12, setups_iter, ss_12)
+     {
+        EINA_LIST_FOREACH(si_12->outputs, r_iter, oi)
           {
-             for (i = 0; i < nsizes; i++)
+             //skip disconnected/-abled monitors
+             if ((oi->connection_status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) || !oi->crtc || !oi->crtc->current_mode)
+               continue;
+             found = EINA_FALSE;
+             EINA_LIST_FOREACH(ss_12->serialized_edid_hashes, s_iter, edid_hash)
                {
-                  if ((restore_info_11->size.width == sizes[i].width)
-                      && (restore_info_11->size.height == sizes[i].height))
+                  if (oi->edid_hash.hash == edid_hash->hash)
                     {
-                       if ((rates = ecore_x_randr_screen_primary_output_refresh_rates_get(e_randr_screen_info->root, i, &nrates)))
-                         {
-                            for (j = 0; j < nrates; j++)
-                              if (rates[j] == restore_info_11->refresh_rate)
-                                {
-                                   if (restore_info) *restore_info = restore_info_11;
-                                   free(rates);
-                                   free(sizes);
-                                   return i;
-                                }
-                            free(rates);
-                         }
+                       found = EINA_TRUE;
+                       break;
                     }
                }
-             if (sizes) free(sizes);
+             if (!found)
+               break;
           }
+        if (found)
+          break;
      }
-   return Ecore_X_Randr_Unset;
+   if (found)
+     return ss_12;
+
+   return NULL;
 }
-*/
 
-/**
- * @Brief find configuration with the most hardware currently available
- */
-static E_Randr_Screen_Restore_Info_12 *
-_e_randr_config_find_suiting_config_12(void)
+   void
+_e_randr_free_serialized_setup_12(E_Randr_Serialized_Setup_12 *ss_12)
 {
-   //TODO: write geometry based loading
-   /*
-      Eina_List *cfg_screen_restore_info_iter;
-      E_Randr_Screen_Restore_Info *screen_restore_info;
+   E_Randr_Serialized_Crtc *sc;
+   E_Randr_Edid_Hash *edid_hash;
 
-      E_Randr_Screen_Info_12 *current_info_12;
-      E_Randr_Screen_Restore_Info_12 *restore_info_12, *most_matches = NULL;
-      E_Randr_Output_Info *output_info;
-      E_Randr_Crtc_Restore_Info *crtc_restore_info;
-      Ecore_X_Randr_Output *outputs_xids;
-      Ecore_X_Randr_Crtc *crtcs_xids;
-      Eina_List *restore_info_12_iter,  *output_iter, *restore_crtcs_iter;
+   if (!ss_12) return;
 
-      if (e_randr_screen_info && e_config && e_config->screen_info)
-      {
+   EINA_LIST_FREE(ss_12->serialized_crtcs, sc)
+     {
+        if (!sc) continue;
+        _e_randr_free_serialized_crtc(sc);
+     }
+   EINA_LIST_FREE(ss_12->serialized_edid_hashes, edid_hash)
+      if (edid_hash) free(edid_hash);
 
-      EINA_LIST_FOREACH(e_config->screen_info, cfg_screen_restore_info_iter, screen_restore_info)
-      {
-      if (screen_restore_info->randr_version < ECORE_X_RANDR_1_2) continue;
+   free(ss_12);
+}
 
-   //HINT: use eina_list_clone and a sort callback to find proper
-   //crtcs and outputs
+   Eina_List
+*_e_randr_update_serialized_setup_12(Eina_List *setups_12, E_Randr_Screen_Info_12 *si_12)
+{
+   E_Randr_Serialized_Setup_12 *ss_12;
+   E_Randr_Serialized_Output *so;
+   E_Randr_Output_Info *oi;
+   E_Randr_Edid_Hash *edid_hash;
 
-   //current_info_12 = e_randr_screen_info->rrvd_info.randr_info_12;
-   }
+   if (setups_12)
+     {
+        /*
+         * try to find the setup with the same monitors
+         * connected in order to replace it
+         */
+        if((ss_12 = _e_randr_find_matching_serialized_setup(setups_12, si_12)))
+          _e_randr_free_serialized_setup_12(ss_12);
+     }
+   ss_12 = _e_randr_create_serialized_setup_12(si_12);
+   setups_12 = eina_list_append(setups_12, ss_12);
 
-   }
-   */
+   return setups_12;
+}
+
+   E_Randr_Serialized_Setup
+*_e_randr_create_serialized_setup(E_Randr_Screen_Info *screen_info)
+{
+   E_Randr_Serialized_Setup *ss;
+   E_Randr_Serialized_Setup_12 *ss_12;
+
+   if (!(ss = E_NEW(E_Randr_Serialized_Setup, 1))) return NULL;
+   if ((screen_info->randr_version == ECORE_X_RANDR_1_1) && !(ss->serialized_setup_11 = _e_randr_create_serialized_setup_11(screen_info->rrvd_info.randr_info_11))) goto _e_randr_create_serialized_setup_failed_free_ss;
+   if ((screen_info->randr_version >= ECORE_X_RANDR_1_2))
+     {
+        if (!(ss_12 = _e_randr_create_serialized_setup_12(screen_info->rrvd_info.randr_info_12))
+              || !(ss->serialized_setups_12 = eina_list_append(ss->serialized_setups_12, ss_12)))
+          goto _e_randr_create_serialized_setup_failed_free_ss;
+     }
+
+   return ss;
+
+_e_randr_create_serialized_setup_failed_free_ss:
+   free(ss);
+}
+
+   EAPI void
+e_randr_store_configuration(E_Randr_Screen_Info *screen_info)
+{
+   if (E_RANDR_NO_11) return;
+
+   if (!e_config->randr_serialized_setup)
+     {
+        e_config->randr_serialized_setup = _e_randr_create_serialized_setup(screen_info);
+        e_config_save_queue();
+        return;
+     }
+
+   if (screen_info->randr_version == ECORE_X_RANDR_1_1)
+     {
+        e_config->randr_serialized_setup->serialized_setup_11 = _e_randr_update_serialized_setup_11(e_config->randr_serialized_setup->serialized_setup_11, screen_info->rrvd_info.randr_info_11);
+     }
+   else if (screen_info->randr_version >= ECORE_X_RANDR_1_2)
+     {
+        e_config->randr_serialized_setup->serialized_setups_12 = _e_randr_update_serialized_setup_12(e_config->randr_serialized_setup->serialized_setups_12, screen_info->rrvd_info.randr_info_12);
+
+        //Also, update output policies
+        e_config->randr_serialized_setup->serialized_outputs_policies = _e_randr_update_serialized_outputs_policies(screen_info->rrvd_info.randr_info_12, e_config->randr_serialized_setup->serialized_outputs_policies);
+     }
+   e_config_save_queue();
+}
+
+//setup restore functions
+   EAPI Eina_Bool
+e_randr_try_restore_configuration(E_Randr_Screen_Info *si)
+{
+   if (!e_config || !e_config->randr_serialized_setup) return EINA_FALSE;
+
+   if (si->randr_version == ECORE_X_RANDR_1_1)
+     return _e_randr_try_restore_11(si->rrvd_info.randr_info_11);
+   else if (si->randr_version >= ECORE_X_RANDR_1_2)
+     return _e_randr_try_restore_12(si->rrvd_info.randr_info_12);
+
+   return EINA_FALSE;
+}
+
+   Eina_Bool
+_e_randr_try_restore_11(E_Randr_Screen_Info_11 *si_11)
+{
+   E_Manager *man;
+   Eina_List *iter;
+   Ecore_X_Randr_Screen_Size_MM *stored_size, *size;
+   int i = 0;
+
+   if (!e_config->randr_serialized_setup->serialized_setup_11) return EINA_FALSE;
+   stored_size = &e_config->randr_serialized_setup->serialized_setup_11->size;
+   EINA_LIST_FOREACH(si_11->sizes, iter, size)
+     {
+        if ((stored_size->width == size->width)
+              && (stored_size->height == size->height)
+              && (stored_size->width_mm == size->width_mm)
+              && (stored_size->height_mm == size->height_mm))
+              {
+                 man = e_manager_current_get();
+                 return ecore_x_randr_screen_primary_output_size_set(man->root, i);
+              }
+        i++;
+     }
+
+   return EINA_FALSE;
+}
+
+   E_Randr_Crtc_Info
+*_e_randr_find_matching_crtc(Eina_List *crtcs, E_Randr_Serialized_Crtc *sc)
+{
+   Eina_List *iter, *s_name_iter, *p_output_iter;
+   E_Randr_Crtc_Info *ci;
+   E_Randr_Output_Info *oi;
+   char *s_output_name;
+   Eina_Bool name_found;
+
+   EINA_LIST_FOREACH(crtcs, iter, ci)
+     {
+        if (eina_list_count(ci->possible_outputs) != eina_list_count(sc->possible_outputs_names))
+          continue;
+        EINA_LIST_FOREACH(sc->possible_outputs_names, s_name_iter, s_output_name)
+           {
+              name_found = EINA_FALSE;
+              EINA_LIST_FOREACH(ci->possible_outputs, p_output_iter, oi)
+                {
+                   if (!strncmp(s_output_name, oi->name, oi->name_length))
+                     {
+                        name_found = EINA_TRUE;
+                        break;
+                     }
+                }
+              if (!name_found)
+                break;
+           }
+        if (name_found)
+          break;
+     }
+   if (name_found)
+     return ci;
+   else
+     return NULL;
+}
+
+   Eina_List
+*_e_randr_find_matching_outputs(Eina_List *sois, Eina_List *ois)
+{
+   Eina_List *r_output_iter, *s_output_iter, *list = NULL;
+   E_Randr_Output_Info *oi;
+   E_Randr_Serialized_Output *so;
+
+   EINA_LIST_FOREACH(sois, s_output_iter, so)
+     {
+        EINA_LIST_FOREACH(ois, r_output_iter, oi)
+          {
+             if (so->edid_hash.hash == oi->edid_hash.hash)
+               {
+                  list = eina_list_append(list, oi);
+                  break;
+               }
+          }
+     }
+   if (list && (eina_list_count(sois) != eina_list_count(list)))
+     {
+        eina_list_free(list);
+        list = NULL;
+     }
+
+   return list;
+}
+
+   Ecore_X_Randr_Mode_Info
+*_e_randr_find_matching_mode_info(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode)
+{
+   Eina_List *iter;
+   Ecore_X_Randr_Mode_Info *mi = NULL;
+
+   EINA_LIST_FOREACH(modes, iter, mi)
+     {
+        if ((mode->width == mi->width)
+              && (mode->height == mi->height)
+              && (mode->dotClock == mi->dotClock)
+              && (mode->hSyncStart == mi->hSyncStart)
+              && (mode->hSyncEnd == mi->hSyncEnd)
+              && (mode->hTotal == mi->hTotal)
+              && (mode->hSkew == mi->hSkew)
+              && (mode->vSyncStart == mi->vSyncStart)
+              && (mode->vSyncEnd == mi->vSyncEnd)
+              && (mode->vTotal == mi->vTotal)
+              && (mode->nameLength == mi->nameLength)
+              && !strncpy(mode->name, mi->name, mode->nameLength)
+              && (mode->modeFlags == mi->modeFlags))
+          return mi;
+     }
    return NULL;
 }
 
-static Ecore_X_Randr_Output *
+   Eina_Bool
+_e_randr_try_restore_12(E_Randr_Screen_Info_12 *si_12)
+{
+   E_Randr_Serialized_Setup_12 *ss_12;
+   E_Randr_Serialized_Crtc *sc;
+   E_Randr_Crtc_Info *ci;
+   Ecore_X_Randr_Output *outputs_array;
+   Ecore_X_Randr_Mode_Info *mi;
+   Eina_List *iter, *outputs_list;
+   Eina_Bool ret = EINA_TRUE;
+   E_Manager *man;
+
+   if(!(ss_12 = _e_randr_find_matching_serialized_setup(e_config->randr_serialized_setup->serialized_setups_12, si_12))) return EINA_FALSE;
+
+   man = e_manager_current_get();
+
+   EINA_LIST_FOREACH(ss_12->serialized_crtcs, iter, sc)
+     {
+        ci = _e_randr_find_matching_crtc(si_12->crtcs, sc);
+        outputs_list = _e_randr_find_matching_outputs(si_12->outputs, sc->serialized_outputs);
+        outputs_array = _e_randr_outputs_to_array(outputs_list);
+        mi = _e_randr_find_matching_mode_info(si_12->modes, &sc->mode_info);
+        ret &= ecore_x_randr_crtc_mode_set(man->root, ci->xid, outputs_array, eina_list_count(outputs_list), mi->xid);
+        ret &= ecore_x_randr_crtc_pos_set(man->root, ci->xid, sc->pos.x, sc->pos.y);
+     }
+   return ret;
+}
+
+//Utility functions
+   static Ecore_X_Randr_Output *
 _e_randr_outputs_to_array(Eina_List *outputs_info)
 {
    Ecore_X_Randr_Output *ret = NULL;
@@ -1148,7 +1617,7 @@
 
    if (!outputs_info || !(ret = malloc(sizeof(Ecore_X_Randr_Output) * eina_list_count(outputs_info)))) return NULL;
    EINA_LIST_FOREACH(outputs_info, output_iter, output_info)
-     /* output_info == NULL should _not_ be possible! */
+      /* output_info == NULL should _not_ be possible! */
      ret[i++] = output_info ? output_info->xid : Ecore_X_Randr_None;
    return ret;
 }
@@ -1191,7 +1660,7 @@
    if (!usable_crtc) return EINA_FALSE;
 
    //get the CRTC we will refer to, dependend on policy
-   switch (e_randr_screen_info->rrvd_info.randr_info_12->output_policy)
+   switch (output_info->policy)
      {
       case ECORE_X_RANDR_OUTPUT_POLICY_NONE:
          return EINA_TRUE;
@@ -1386,15 +1855,19 @@
 _e_randr_crtc_move_policy(E_Randr_Crtc_Info *new_crtc)
 {
    const E_Randr_Crtc_Info *crtc_rel;
+   E_Randr_Output_Info *last_output = NULL;
    int dx = Ecore_X_Randr_None, dy = Ecore_X_Randr_None;
    Eina_Bool ret = EINA_TRUE;
 
+   //use the policy of the new crtc's last output
+   last_output = (E_Randr_Output_Info*)eina_list_data_get(eina_list_last(new_crtc->outputs));
+   if (!last_output) return EINA_FALSE;
    //get the crtc we will place our's relative to. If it's NULL, this is the
    //only output attached, work done.
-   if(!(crtc_rel = _e_randr_policy_crtc_get(new_crtc, NULL, e_randr_screen_info->rrvd_info.randr_info_12->output_policy))) return EINA_TRUE;
+   if(!(crtc_rel = _e_randr_policy_crtc_get(new_crtc, NULL, last_output->policy))) return EINA_TRUE;
 
    //following is policy dependend.
-   switch (e_randr_screen_info->rrvd_info.randr_info_12->output_policy)
+   switch (last_output->policy)
      {
       case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE:
         dy = (crtc_rel->geometry.y - new_crtc->geometry.h);
@@ -1425,7 +1898,7 @@
       default:
         break;
      }
-   ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, new_crtc->xid, crtc_rel->xid, e_randr_screen_info->rrvd_info.randr_info_12->output_policy, e_randr_screen_info->rrvd_info.randr_info_12->alignment);
+   ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, new_crtc->xid, crtc_rel->xid, last_output->policy, e_randr_screen_info->rrvd_info.randr_info_12->alignment);
    return ret;
 }
 
@@ -1686,6 +2159,8 @@
 
    _e_randr_output_modes_add(output_info);
    output_info->edid = ecore_x_randr_output_edid_get(e_randr_screen_info->root, output_info->xid, &output_info->edid_length);
+   if (output_info->edid_length > 0)
+     output_info->edid_hash.hash = eina_hash_superfast(output_info->edid, output_info->edid_length);
    //get the outputs we can use on the same CRTC alongside this one.
    if ((outputs = ecore_x_randr_output_clones_get(e_randr_screen_info->root, output_info->xid, &num)))
      {
@@ -1711,6 +2186,10 @@
           }
         free(crtcs);
      }
+   else
+     {
+        fprintf(stderr, "E_RANDR: Output %x does not have a single possible CRTC.\n", output_info->xid);
+     }
 }
 
 /*

Modified: trunk/e/src/bin/e_randr.h
===================================================================
--- trunk/e/src/bin/e_randr.h	2011-11-01 22:28:45 UTC (rev 64623)
+++ trunk/e/src/bin/e_randr.h	2011-11-01 22:33:38 UTC (rev 64624)
@@ -1,24 +1,26 @@
 #ifdef E_TYPEDEFS
 
 typedef struct _E_Randr_Crtc_Info E_Randr_Crtc_Info;
+typedef struct _E_Randr_Edid_Hash E_Randr_Edid_Hash;
 typedef struct _E_Randr_Output_Info E_Randr_Output_Info;
 typedef struct _E_Randr_Screen_Info_11 E_Randr_Screen_Info_11;
 typedef struct _E_Randr_Screen_Info_12 E_Randr_Screen_Info_12;
 typedef union _E_Randr_Screen_RRVD_Info E_Randr_Screen_RRVD_Info;
 typedef struct _E_Randr_Screen_Info E_Randr_Screen_Info;
-typedef struct _E_Randr_Output_Edid_Hash E_Randr_Output_Edid_Hash;
-typedef struct _E_Randr_Output_Restore_Info E_Randr_Output_Restore_Info;
-typedef struct _E_Randr_Crtc_Restore_Info E_Randr_Crtc_Restore_Info;
-typedef struct _E_Randr_Screen_Restore_Info_11 E_Randr_Screen_Restore_Info_11;
-typedef struct _E_Randr_Screen_Restore_Info_12 E_Randr_Screen_Restore_Info_12;
-typedef union _E_Randr_Screen_Restore_Info_Union E_Randr_Screen_Restore_Info_Union;
-typedef struct _E_Randr_Screen_Restore_Info E_Randr_Screen_Restore_Info;
+typedef struct _E_Randr_Serialized_Output_Policy E_Randr_Serialized_Output_Policy;
+typedef struct _E_Randr_Serialized_Output E_Randr_Serialized_Output;
+typedef struct _E_Randr_Serialized_Crtc E_Randr_Serialized_Crtc;
+typedef struct _E_Randr_Serialized_Setup_11 E_Randr_Serialized_Setup_11;
+typedef struct _E_Randr_Serialized_Setup_12 E_Randr_Serialized_Setup_12;
+typedef struct _E_Randr_Serialized_Setup E_Randr_Serialized_Setup;
 
+EAPI void e_randr_store_configuration(E_Randr_Screen_Info *screen_info);
+
 #else
 #ifndef E_RANDR_H
 #define E_RANDR_H
 
-struct _E_Randr_Crtc_Info 
+struct _E_Randr_Crtc_Info
 {
    Ecore_X_ID xid;
    Eina_Rectangle geometry;
@@ -35,8 +37,13 @@
    Ecore_X_Randr_Mode_Info *current_mode;
 };
 
-struct _E_Randr_Output_Info 
+struct _E_Randr_Edid_Hash
 {
+   int hash;
+};
+
+struct _E_Randr_Output_Info
+{
    Ecore_X_ID xid;
    char *name;
    int name_length;
@@ -47,6 +54,7 @@
    int connector_number;
    Ecore_X_Randr_Connector_Type connector_type;
    Ecore_X_Randr_Connection_Status connection_status;
+   Ecore_X_Randr_Output_Policy policy;
    /*
     * Attached Monitor specific:
     */
@@ -57,6 +65,7 @@
    Ecore_X_Randr_Screen_Size size_mm;
    unsigned char *edid;
    unsigned long edid_length;
+   E_Randr_Edid_Hash edid_hash;
    int max_backlight;
    double backlight_level;
    Ecore_X_Render_Subpixel_Order subpixel_order;
@@ -75,7 +84,7 @@
    Ecore_X_Randr_Refresh_Rate current_rate;
 };
 
-struct _E_Randr_Screen_Info_12 
+struct _E_Randr_Screen_Info_12
 {
    Ecore_X_Randr_Screen_Size min_size;
    Ecore_X_Randr_Screen_Size max_size;
@@ -84,18 +93,17 @@
    Eina_List *crtcs;
    Eina_List *outputs;
    E_Randr_Output_Info *primary_output;
-   Ecore_X_Randr_Output_Policy output_policy;
    Ecore_X_Randr_Relative_Alignment alignment;
 };
 
 //RRVD == RandR(R) Version Depended
-union _E_Randr_Screen_RRVD_Info 
+union _E_Randr_Screen_RRVD_Info
 {
    E_Randr_Screen_Info_11 *randr_info_11;
    E_Randr_Screen_Info_12 *randr_info_12;
 };
 
-struct _E_Randr_Screen_Info 
+struct _E_Randr_Screen_Info
 {
    Ecore_X_Window root;
    int randr_version;
@@ -103,56 +111,67 @@
 };
 
 //Following stuff is just for configuration purposes
-struct _E_Randr_Output_Edid_Hash {
-   int hash;
-};
 
-struct _E_Randr_Output_Restore_Info
+struct _E_Randr_Serialized_Output_Policy
 {
-   E_Randr_Output_Edid_Hash edid_hash;
-   double backlight_level;
+   char *name;
+   int name_length;
+   Ecore_X_Randr_Output_Policy policy;
 };
 
-struct _E_Randr_Crtc_Restore_Info
+struct _E_Randr_Serialized_Output
 {
-   Eina_Rectangle geometry;
-   Ecore_X_Randr_Orientation orientation;
-   //list of the outputs;
-   Eina_List *outputs;
+   char *name;
+   int name_length;
+   E_Randr_Edid_Hash edid_hash;
+   double backlight_level;
 };
 
-struct _E_Randr_Screen_Restore_Info_11 
+struct _E_Randr_Serialized_Crtc
 {
-   Ecore_X_Randr_Screen_Size size;
-   Ecore_X_Randr_Refresh_Rate refresh_rate;
+   //List of E_Randr_Serialized_Output objects that were used on the same output
+   Eina_List *serialized_outputs;
+   //the serialized mode_info misses its xid value
+   Ecore_X_Randr_Mode_Info mode_info;
+   Evas_Coord_Point pos;
+   //List of all possible outputs' names
+   //e.g. "LVDS", "CRT-0", "VGA"
+   Eina_List *possible_outputs_names;
    Ecore_X_Randr_Orientation orientation;
 };
 
-struct _E_Randr_Screen_Restore_Info_12 
+struct _E_Randr_Serialized_Setup_12
 {
-   Eina_List *outputs_edid_hashes;
-   int noutputs;
-   Eina_List *crtcs;
-   Ecore_X_Randr_Output_Policy output_policy;
-   Ecore_X_Randr_Relative_Alignment alignment;
+   double timestamp;
+   //List of E_Randr_Serialized_Crtc objects
+   Eina_List *serialized_crtcs;
+   /*
+    * List of E_Randr_Edid_Hash elements of monitors,
+    * that were enabled, when the setup was stored
+    */
+   Eina_List *serialized_edid_hashes;
 };
 
-union _E_Randr_Screen_Restore_Info_Union 
+struct _E_Randr_Serialized_Setup_11
 {
-   E_Randr_Screen_Restore_Info_11 *restore_info_11;
-   Eina_List *restore_info_12;
+   Ecore_X_Randr_Screen_Size_MM size;
+   Ecore_X_Randr_Refresh_Rate refresh_rate;
+   Ecore_X_Randr_Orientation orientation;
 };
 
-struct _E_Randr_Screen_Restore_Info 
+struct _E_Randr_Serialized_Setup
 {
-   int randr_version;
-   E_Randr_Screen_Restore_Info_Union rrvd_restore_info;
+   E_Randr_Serialized_Setup_11 *serialized_setup_11;
+   //List of E_Randr_Serialized_Setup_12 objects
+   Eina_List *serialized_setups_12;
+   //List of E_Randr_Serialized_Output_Policy objects
+   Eina_List *serialized_outputs_policies;
 };
 
 EINTERN Eina_Bool e_randr_init(void);
 EINTERN int e_randr_shutdown(void);
 
-extern E_Randr_Screen_Info *e_randr_screen_info;
+EAPI extern E_Randr_Screen_Info *e_randr_screen_info;
 
 #endif
 #endif

Log:
revert parts of patch that committed randr to e... don't want that
  right now until rest of patch is in.
  
  

Author:       raster
Date:         2011-11-01 18:36:10 -0700 (Tue, 01 Nov 2011)
New Revision: 64629
Trac:         http://trac.enlightenment.org/e/changeset/64629

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

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2011-11-02 01:04:59 UTC (rev 64628)
+++ trunk/e/src/bin/e_config.c	2011-11-02 01:36:10 UTC (rev 64629)
@@ -6,10 +6,24 @@
 #define DEF_MENUCLICK 0.25
 #endif
 
-#define RANDR_SERIALIZED_SETUP_11 ((int)((1 << 16) | 1))
-#define RANDR_SERIALIZED_SETUP_12 ((int)((1 << 16) | 2))
-#define RANDR_SERIALIZED_SETUP_13 ((int)((1 << 16) | 3))
+typedef enum _Eet_Union
+{
+  EET_SCREEN_INFO_11 = (int)((1 << 16) | 1),
+  EET_SCREEN_INFO_12 = (int)((1 << 16) | 2),
+  EET_SCREEN_INFO_13 = (int)((1 << 16) | 3),
+  EET_UNKNOWN
+} Eet_Union;
 
+struct {
+   Eet_Union u;
+   const char *name;
+} eet_mapping[] = {
+  { EET_SCREEN_INFO_11, "E_Config_Screen_11" },
+  { EET_SCREEN_INFO_12, "E_Config_Screen_12" },
+  { EET_SCREEN_INFO_12, "E_Config_Screen_13" },
+  { EET_UNKNOWN, NULL }
+};
+
 EAPI E_Config *e_config = NULL;
 
 static int _e_config_revisions = 9;
@@ -20,6 +34,8 @@
 static Eina_Bool _e_config_cb_timer(void *data);
 static int _e_config_eet_close_handle(Eet_File *ef, char *file);
 static void _e_config_acpi_bindings_add(void);
+static const char * _eet_union_type_get(const void *data, Eina_Bool *unknow);
+static Eina_Bool _eet_union_type_set(const char *type, void *data, Eina_Bool unknow);
 
 /* local subsystem globals */
 static int _e_config_save_block = 0;
@@ -49,16 +65,15 @@
 static E_Config_DD *_e_config_mime_icon_edd = NULL;
 static E_Config_DD *_e_config_syscon_action_edd = NULL;
 static E_Config_DD *_e_config_env_var_edd = NULL;
-static E_Config_DD *_e_config_randr_size_edd = NULL;
-static E_Config_DD *_e_config_randr_size_mm_edd = NULL;
-static E_Config_DD *_e_config_randr_edid_hash_edd = NULL;
-static E_Config_DD *_e_config_randr_serialized_setup_edd = NULL;
-static E_Config_DD *_e_config_randr_serialized_setup_11_edd = NULL;
-static E_Config_DD *_e_config_randr_serialized_setup_12_edd = NULL;
-static E_Config_DD *_e_config_randr_serialized_output_policy_edd = NULL;
-static E_Config_DD *_e_config_randr_serialized_output_edd = NULL;
-static E_Config_DD *_e_config_randr_serialized_mode_info_edd = NULL;
-static E_Config_DD *_e_config_randr_serialized_crtc_edd = NULL;
+static E_Config_DD *_e_config_screen_size_edd = NULL;
+static E_Config_DD *_e_config_screen_size_mm_edd = NULL;
+static E_Config_DD *_e_config_eina_rectangle_edd = NULL;
+static E_Config_DD *_e_config_screen_info_edd = NULL;
+static E_Config_DD *_e_config_screen_restore_info_11_edd = NULL;
+static E_Config_DD *_e_config_screen_restore_info_12_edd = NULL;
+static E_Config_DD *_e_config_screen_output_edid_hash_edd = NULL;
+static E_Config_DD *_e_config_screen_output_restore_info_edd = NULL;
+static E_Config_DD *_e_config_screen_crtc_restore_info_edd = NULL;
 
 
 EAPI int E_EVENT_CONFIG_ICON_THEME = 0;
@@ -511,109 +526,107 @@
    E_CONFIG_VAL(D, T, val, STR);
    E_CONFIG_VAL(D, T, unset, UCHAR);
 
-   _e_config_randr_size_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size", Ecore_X_Randr_Screen_Size);
+   _e_config_screen_size_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size", Ecore_X_Randr_Screen_Size);
 #undef T
 #undef D
 #define T Ecore_X_Randr_Screen_Size
-#define D _e_config_randr_size_edd
+#define D _e_config_screen_size_edd
    E_CONFIG_VAL(D, T, width, INT);
    E_CONFIG_VAL(D, T, height, INT);
    E_CONFIG_VAL(D, T, width, INT);
    E_CONFIG_VAL(D, T, height, INT);
 
-   _e_config_randr_size_mm_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size_MM", Ecore_X_Randr_Screen_Size_MM);
+   _e_config_screen_size_mm_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size_MM", Ecore_X_Randr_Screen_Size_MM);
 #undef T
 #undef D
 #define T Ecore_X_Randr_Screen_Size_MM
-#define D _e_config_randr_size_mm_edd
+#define D _e_config_screen_size_mm_edd
    E_CONFIG_VAL(D, T, width, INT);
    E_CONFIG_VAL(D, T, height, INT);
    E_CONFIG_VAL(D, T, width_mm, INT);
    E_CONFIG_VAL(D, T, height_mm, INT);
 
-   _e_config_randr_edid_hash_edd = E_CONFIG_DD_NEW("E_Randr_Edid_Hash", E_Randr_Edid_Hash);
+   _e_config_screen_restore_info_11_edd = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_11", E_Randr_Screen_Restore_Info_11);
 #undef T
 #undef D
-#define T E_Randr_Edid_Hash
-#define D _e_config_randr_edid_hash_edd
-   E_CONFIG_VAL(D, T, hash, INT);
-
-   _e_config_randr_serialized_setup_11_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup_11", E_Randr_Serialized_Setup_11);
-#undef T
-#undef D
-#define T E_Randr_Serialized_Setup_11
-#define D _e_config_randr_serialized_setup_11_edd
-   E_CONFIG_SUB(D, T, size, _e_config_randr_size_edd);
+#define T E_Randr_Screen_Restore_Info_11
+#define D _e_config_screen_restore_info_11_edd
+   E_CONFIG_SUB(D, T, size, _e_config_screen_size_edd);
    E_CONFIG_VAL(D, T, orientation, INT);
    E_CONFIG_VAL(D, T, refresh_rate, SHORT);
 
-    _e_config_randr_serialized_output_policy_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Output_Policy", E_Randr_Serialized_Output_Policy);
+    _e_config_eina_rectangle_edd = E_CONFIG_DD_NEW("Eina_Rectangle", Eina_Rectangle);
 #undef T
 #undef D
-#define T E_Randr_Serialized_Output_Policy
-#define D _e_config_randr_serialized_output_policy_edd
-   E_CONFIG_VAL(D, T, name, STR);
-   E_CONFIG_VAL(D, T, name_length, INT);
-   E_CONFIG_VAL(D, T, policy, INT);
+#define T Eina_Rectangle
+#define D _e_config_eina_rectangle_edd
+   E_CONFIG_VAL(D, T, x, INT);
+   E_CONFIG_VAL(D, T, y, INT);
+   E_CONFIG_VAL(D, T, w, INT);
+   E_CONFIG_VAL(D, T, h, INT);
 
-    _e_config_randr_serialized_output_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Output", E_Randr_Serialized_Output);
+      _e_config_screen_output_edid_hash_edd = E_CONFIG_DD_NEW("E_Randr_Output_Edid_Hash", E_Randr_Output_Edid_Hash);
 #undef T
 #undef D
-#define T E_Randr_Serialized_Output
-#define D _e_config_randr_serialized_output_edd
-   E_CONFIG_VAL(D, T, name, STR);
-   E_CONFIG_VAL(D, T, name_length, INT);
-   E_CONFIG_SUB(D, T, edid_hash, _e_config_randr_edid_hash_edd);
-   E_CONFIG_VAL(D, T, backlight_level, DOUBLE);
+#define T E_Randr_Output_Edid_Hash
+#define D _e_config_screen_output_edid_hash_edd
+   E_CONFIG_VAL(D, T, hash, INT);
 
-    _e_config_randr_serialized_mode_info_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Mode_Info", Ecore_X_Randr_Mode_Info);
+   // FIXME: need to totally re-do this randr config stuff - remove the
+   // union stuff. do this differently to not use unions really. not
+   // intended for how it is used here really.
+    _e_config_screen_output_restore_info_edd = E_CONFIG_DD_NEW("E_Randr_Output_Restore_Info", E_Randr_Output_Restore_Info);
 #undef T
 #undef D
-#define T Ecore_X_Randr_Mode_Info
-#define D _e_config_randr_serialized_mode_info_edd
-   E_CONFIG_VAL(D, T, width, INT);
-   E_CONFIG_VAL(D, T, height, INT);
-   E_CONFIG_VAL(D, T, dotClock, LL);
-   E_CONFIG_VAL(D, T, hSyncStart, INT);
-   E_CONFIG_VAL(D, T, hSyncEnd, INT);
-   E_CONFIG_VAL(D, T, hTotal, INT);
-   E_CONFIG_VAL(D, T, hSkew, INT);
-   E_CONFIG_VAL(D, T, vSyncStart, INT);
-   E_CONFIG_VAL(D, T, vSyncEnd, INT);
-   E_CONFIG_VAL(D, T, vTotal, INT);
-   E_CONFIG_VAL(D, T, name, STR);
-   E_CONFIG_VAL(D, T, nameLength, INT);
-   E_CONFIG_VAL(D, T, modeFlags, LL);
+#define T E_Randr_Output_Restore_Info
+#define D _e_config_screen_output_restore_info_edd
+   E_CONFIG_SUB(D, T, edid_hash, _e_config_screen_output_edid_hash_edd);
+   E_CONFIG_VAL(D, T, backlight_level, DOUBLE);
 
-  _e_config_randr_serialized_crtc_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Crtc", E_Randr_Serialized_Crtc);
+  _e_config_screen_crtc_restore_info_edd = E_CONFIG_DD_NEW("E_Randr_Crtc_Restore_Info", E_Randr_Crtc_Restore_Info);
 #undef T
 #undef D
-#define T E_Randr_Serialized_Crtc
-#define D _e_config_randr_serialized_crtc_edd
-   E_CONFIG_LIST(D, T, serialized_outputs, _e_config_randr_serialized_output_edd);
-   E_CONFIG_SUB(D, T, mode_info, _e_config_randr_serialized_mode_info_edd);
-   E_CONFIG_VAL(D, T, pos.x, INT);
-   E_CONFIG_VAL(D, T, pos.y, INT);
-   EET_DATA_DESCRIPTOR_ADD_LIST_STRING(D, T, "Crtc_Possible_Outputs_Names", possible_outputs_names);
+#define T E_Randr_Crtc_Restore_Info
+#define D _e_config_screen_crtc_restore_info_edd
+   E_CONFIG_SUB(D, T, geometry, _e_config_eina_rectangle_edd);
+   E_CONFIG_LIST(D, T, outputs, _e_config_screen_output_restore_info_edd);
    E_CONFIG_VAL(D, T, orientation, INT);
 
-   _e_config_randr_serialized_setup_12_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup_12", E_Randr_Serialized_Setup_12);
+   _e_config_screen_restore_info_12_edd = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_12", E_Randr_Screen_Restore_Info_12);
 #undef T
 #undef D
-#define T E_Randr_Serialized_Setup_12
-#define D _e_config_randr_serialized_setup_12_edd
-   E_CONFIG_VAL(D, T, timestamp, DOUBLE);
-   E_CONFIG_LIST(D, T, serialized_crtcs, _e_config_randr_serialized_crtc_edd);
-   E_CONFIG_LIST(D, T, serialized_edid_hashes, _e_config_randr_edid_hash_edd);
+#define T E_Randr_Screen_Restore_Info_12
+#define D _e_config_screen_restore_info_12_edd
+   E_CONFIG_LIST(D, T, crtcs, _e_config_screen_crtc_restore_info_edd);
+   E_CONFIG_LIST(D, T, outputs_edid_hashes, _e_config_screen_output_edid_hash_edd);
+   E_CONFIG_VAL(D, T, noutputs, INT);
+   E_CONFIG_VAL(D, T, output_policy, INT);
+   E_CONFIG_VAL(D, T, alignment, INT);
 
-   _e_config_randr_serialized_setup_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup", E_Randr_Serialized_Setup);
 #undef T
 #undef D
-#define T E_Randr_Serialized_Setup
-#define D _e_config_randr_serialized_setup_edd
-   E_CONFIG_SUB(D, T, serialized_setup_11, _e_config_randr_serialized_setup_11_edd);
-   E_CONFIG_LIST(D, T, serialized_setups_12, _e_config_randr_serialized_setup_12_edd);
-   E_CONFIG_LIST(D, T, serialized_outputs_policies, _e_config_randr_serialized_output_policy_edd);
+#define T E_Randr_Screen_Restore_Info
+#define D _e_config_screen_info_edd
+   Eet_Data_Descriptor_Class eddc;
+   Eet_Data_Descriptor *unified, *edd_11_info, *edd_12_info;
+   EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, T);
+   D = eet_data_descriptor_stream_new(&eddc);
+   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
+   eddc.func.type_get = _eet_union_type_get;
+   eddc.func.type_set = _eet_union_type_set;
+   //virtual types to work around EET's inability to differentiate when it
+   //comes to pointers (a->b) vs. values (a.b) in union mappings
+   edd_11_info = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_11_Struct", E_Randr_Screen_Restore_Info_11);
+   E_CONFIG_SUB(edd_11_info, E_Randr_Screen_Restore_Info_Union, restore_info_11, _e_config_screen_restore_info_11_edd);
+   edd_12_info = E_CONFIG_DD_NEW("E_Randr_Screen_Restore_Info_12_Struct", E_Randr_Screen_Restore_Info_12);
+   E_CONFIG_LIST(edd_12_info, E_Randr_Screen_Restore_Info_Union, restore_info_12, _e_config_screen_restore_info_12_edd);
+   unified = eet_data_descriptor_stream_new(&eddc);
+   EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_11", edd_11_info);
+   EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_12", edd_12_info);
+   EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "E_Config_Screen_13", edd_12_info);
+// DISABLE! crashie crashie long time   
+//   EET_DATA_DESCRIPTOR_ADD_UNION(D, T, "E_Randr_Screen_Restore_Info_Union", rrvd_restore_info, randr_version, unified);
+   E_CONFIG_VAL(D, T, randr_version, INT);
 
    _e_config_edd = E_CONFIG_DD_NEW("E_Config", E_Config);
 #undef T
@@ -774,8 +787,7 @@
    E_CONFIG_VAL(D, T, desklock_ask_presentation, UCHAR);
    E_CONFIG_VAL(D, T, desklock_ask_presentation_timeout, DOUBLE);
 
-   //randr specifics
-   E_CONFIG_SUB(D, T, randr_serialized_setup, _e_config_randr_serialized_setup_edd);
+   E_CONFIG_LIST(D, T, screen_info, _e_config_screen_info_edd);
 
    E_CONFIG_VAL(D, T, screensaver_enable, INT);
    E_CONFIG_VAL(D, T, screensaver_timeout, INT);
@@ -947,7 +959,7 @@
    E_CONFIG_DD_FREE(_e_config_mime_icon_edd);
    E_CONFIG_DD_FREE(_e_config_syscon_action_edd);
    E_CONFIG_DD_FREE(_e_config_env_var_edd);
-   E_CONFIG_DD_FREE(_e_config_randr_serialized_setup_edd);
+   E_CONFIG_DD_FREE(_e_config_screen_info_edd);
    return 1;
 }
 
@@ -1903,13 +1915,10 @@
    E_Color_Class *cc;
    E_Path_Dir *epd;
    E_Remember *rem;
-   E_Randr_Serialized_Setup *serialized_setup;
-   E_Randr_Serialized_Setup_12 *serialized_setup_12;
-   E_Randr_Serialized_Crtc *serialized_crtc;
-   E_Randr_Serialized_Output_Policy *serialized_output_policy;
-   E_Randr_Serialized_Output *serialized_output;
-   E_Randr_Edid_Hash *edid_hash;
-   char *output_name;
+   E_Randr_Screen_Restore_Info *screen_info;
+   E_Randr_Crtc_Restore_Info *crtc_info;
+   E_Randr_Output_Info *output_info;
+   E_Randr_Screen_Restore_Info_12 *restore_info_12;
    E_Config_Env_Var *evr;
 
 
@@ -2060,50 +2069,37 @@
         if (sca->icon) eina_stringshare_del(sca->icon);
         E_FREE(sca);
      }
-   if(ecf->randr_serialized_setup)
+   if (ecf->screen_info)
      {
-           if(ecf->randr_serialized_setup->serialized_setup_11)
-              free(serialized_setup->serialized_setup_11);
-           else if(ecf->randr_serialized_setup->serialized_setups_12)
-             {
-                EINA_LIST_FREE(ecf->randr_serialized_setup->serialized_setups_12, serialized_setup_12)
-                  {
-                     EINA_LIST_FREE(serialized_setup_12->serialized_crtcs, serialized_crtc)
-                       {
-                          if (!serialized_crtc) continue;
-                          EINA_LIST_FREE(serialized_crtc->serialized_outputs, serialized_output)
-                            {
-                               if (serialized_output)
-                                 {
-                                    if (serialized_output->name) free(serialized_output);
-                                    free(serialized_output);
-                                 }
-                            }
-                          EINA_LIST_FREE(serialized_crtc->possible_outputs_names, output_name)
-                            {
-                               if (output_name) free(output_name);
-                            }
-                          if (serialized_crtc->mode_info.name)
-                            free(serialized_crtc->mode_info.name);
-                          free(serialized_crtc);
-                       }
-                     EINA_LIST_FREE(serialized_setup_12->serialized_edid_hashes, edid_hash)
-                       {
-                          if (edid_hash) free(edid_hash);
-                       }
-                     free(serialized_setup_12);
-                  }
-             }
-           EINA_LIST_FREE(ecf->randr_serialized_setup->serialized_outputs_policies, serialized_output_policy)
-             {
-                if (!serialized_output) continue;
-                if (serialized_output_policy->name)
-                  free(serialized_output_policy->name);
-                free(serialized_output_policy);
-             }
-           free(ecf->randr_serialized_setup);
+	EINA_LIST_FREE(ecf->screen_info, screen_info)
+	  {
+	     switch (screen_info->randr_version)
+	       {
+		case EET_SCREEN_INFO_11:
+		   free(screen_info->rrvd_restore_info.restore_info_11);
+		   break;
+		case EET_SCREEN_INFO_12:
+		case EET_SCREEN_INFO_13:
+		   EINA_LIST_FREE(screen_info->rrvd_restore_info.restore_info_12, restore_info_12)
+		     {
+			EINA_LIST_FREE(restore_info_12->crtcs, crtc_info)
+			  {
+			     EINA_LIST_FREE(crtc_info->outputs, output_info)
+			       {
+				  free(output_info->name);
+				  free(output_info->edid);
+				  free (output_info);
+			       }
+			     free (crtc_info);
+			  }
+			free(restore_info_12);
+		     }
+		   eina_list_free(screen_info->rrvd_restore_info.restore_info_12);
+		   break;
+	       }
+	     free(screen_info);
+	  }
      }
-
    EINA_LIST_FREE(ecf->env_vars, evr)
      {
         if (evr->var) eina_stringshare_del(evr->var);
@@ -2120,14 +2116,14 @@
    E_FREE(ecf);
 }
 
-   static Eina_Bool
+static Eina_Bool
 _e_config_cb_timer(void *data)
 {
    e_util_dialog_show(_("Settings Upgraded"), "%s", (char *)data);
    return 0;
 }
 
-   static int
+static int
 _e_config_eet_close_handle(Eet_File *ef, char *file)
 {
    Eet_Error err;
@@ -2137,16 +2133,16 @@
    switch (err)
      {
       case EET_ERROR_NONE:
-         /* all good - no error */
-         break;
+        /* all good - no error */
+	break;
       case EET_ERROR_BAD_OBJECT:
-         erstr = _("The EET file handle is bad.");
-         break;
+	erstr = _("The EET file handle is bad.");
+	break;
       case EET_ERROR_EMPTY:
-         erstr = _("The file data is empty.");
-         break;
+	erstr = _("The file data is empty.");
+	break;
       case EET_ERROR_NOT_WRITABLE:
-         erstr = _("The file is not writable. Perhaps the disk is read-only<br>or you lost permissions to your files.");
+	erstr = _("The file is not writable. Perhaps the disk is read-only<br>or you lost permissions to your files.");
 	break;
       case EET_ERROR_OUT_OF_MEMORY:
 	erstr = _("Memory ran out while preparing the write.<br>Please free up memory.");
@@ -2284,3 +2280,36 @@
    bind->params = eina_stringshare_add("now");
    e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, bind);
 }
+
+static const char *
+_eet_union_type_get(const void *data, Eina_Bool *unknow)
+{
+   const Eet_Union *u = data;
+   int i;
+
+   if (unknow) *unknow = EINA_FALSE;
+   for (i = 0; eet_mapping[i].name; ++i)
+     if (*u == eet_mapping[i].u)
+       return eet_mapping[i].name;
+
+   if (unknow) *unknow = EINA_TRUE;
+   return NULL;
+}
+
+static Eina_Bool
+_eet_union_type_set(const char *type, void *data, Eina_Bool unknow)
+{
+   Eet_Union *u = data;
+   int i;
+
+   if (unknow) return EINA_FALSE;
+
+   for (i = 0; eet_mapping[i].name; ++i)
+     if (strcmp(eet_mapping[i].name, type) == 0)
+       {
+	  *u = eet_mapping[i].u;
+	  return EINA_TRUE;
+       }
+
+   return EINA_FALSE;
+}

Modified: trunk/e/src/bin/e_config.h
===================================================================
--- trunk/e/src/bin/e_config.h	2011-11-02 01:04:59 UTC (rev 64628)
+++ trunk/e/src/bin/e_config.h	2011-11-02 01:36:10 UTC (rev 64629)
@@ -33,7 +33,7 @@
 /* increment this whenever a new set of config values are added but the users
  * config doesn't need to be wiped - simply new values need to be put in
  */
-#define E_CONFIG_FILE_GENERATION 0x0146
+#define E_CONFIG_FILE_GENERATION 0x0145
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
 
 #define E_EVAS_ENGINE_DEFAULT         0
@@ -250,7 +250,7 @@
    int         mouse_accel_denominator; // GUI
    int         mouse_accel_threshold; // GUI
 
-   E_Randr_Serialized_Setup   *randr_serialized_setup; // GUI
+   Eina_List   *screen_info; // GUI
 
    int         border_raise_on_mouse_action; // GUI
    int         border_raise_on_focus; // GUI

Modified: trunk/e/src/bin/e_randr.c
===================================================================
--- trunk/e/src/bin/e_randr.c	2011-11-02 01:04:59 UTC (rev 64628)
+++ trunk/e/src/bin/e_randr.c	2011-11-02 01:36:10 UTC (rev 64629)
@@ -11,13 +11,6 @@
 #define Ecore_X_Randr_Unset -1
 
 /*
- * Save mechanism:
- * Single monitor:
- * - Save monitor using the resolution
- *
- * Multiple monitors:
- * - Use the EDID information to make sure we restore the right monitor.
- *
  * TODO:
  * -fix output policies above and left
  */
@@ -64,11 +57,6 @@
 static void _e_randr_crtc_info_free(E_Randr_Crtc_Info *crtc_info);
 static Eina_Bool _e_randr_screen_outputs_init(void);
 static Eina_Bool _e_randr_screen_crtcs_init(void);
-
-static Eina_Bool _e_randr_try_restore_11(E_Randr_Screen_Info_11 *si_11);
-static Eina_Bool _e_randr_try_restore_12(E_Randr_Screen_Info_12 *si_12);
-EAPI void e_randr_store_configuration(E_Randr_Screen_Info *screen_info);
-EAPI Eina_Bool e_randr_try_restore_configuration(E_Randr_Screen_Info *screen_info);
 static Eina_Bool _e_randr_output_modes_add(E_Randr_Output_Info *output_info);
 static void _e_randr_notify_crtc_mode_change(E_Randr_Crtc_Info *crtc_info);
 static void _e_randr_notify_output_change(E_Randr_Output_Info *output_info);
@@ -78,8 +66,12 @@
 static void _e_randr_output_info_set(E_Randr_Output_Info *output_info);
 static void _e_randr_crtc_info_set(E_Randr_Crtc_Info *crtc_info);
 static const E_Randr_Crtc_Info *_e_randr_policy_crtc_get(E_Randr_Crtc_Info* but, E_Randr_Crtc_Info *hint, Ecore_X_Randr_Output_Policy policy);
+//static Eina_Bool _e_randr_outputs_connected(Eina_List *outputs_info);
 static Ecore_X_Randr_Output *_e_randr_outputs_to_array(Eina_List *outputs_info);
-static E_Randr_Serialized_Setup_12 *	_e_randr_config_find_suiting_config_12(void);
+//static int _e_randr_config_find_suiting_config_11(E_Randr_Screen_Restore_Info_11** restore_info);
+static E_Randr_Screen_Restore_Info_12 *	_e_randr_config_find_suiting_config_12(void);
+//static Eina_Bool _e_randr_config_enable_11(int size_index, Ecore_X_Randr_Refresh_Rate refresh_rate, Ecore_X_Randr_Orientation orientation);
+//static Eina_Bool _e_randr_config_enable_12(const E_Randr_Screen_Restore_Info_12 *restore_info);
 static Eina_Bool _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force);
 static void _e_randr_crtcs_possible_output_update(E_Randr_Output_Info *output_info);
 static void _e_randr_crtc_outputs_refs_update(E_Randr_Crtc_Info *crtc_info);
@@ -98,7 +90,7 @@
 static void _e_randr_output_hw_info_free(E_Randr_Output_Info *output_info);
 static Eina_Bool _e_randr_outputs_are_clones(E_Randr_Output_Info *output_info, Eina_List *outputs);
 
-EAPI E_Randr_Screen_Info *e_randr_screen_info = NULL;
+E_Randr_Screen_Info *e_randr_screen_info = NULL;
 static Eina_List *_e_randr_event_handlers = NULL;
 
 EINTERN Eina_Bool
@@ -278,6 +270,7 @@
         .crtcs = NULL,
         .outputs = NULL,
         .primary_output = NULL,
+        .output_policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE,
         .alignment = ECORE_X_RANDR_RELATIVE_ALIGNMENT_NONE
      };
 
@@ -466,8 +459,7 @@
         .connector_type = Ecore_X_Randr_Unset,
         .connection_status = ECORE_X_RANDR_CONNECTION_STATUS_DISCONNECTED,
         .subpixel_order= Ecore_X_Randr_Unset,
-        .compatible_outputs = NULL,
-        .policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE
+        .compatible_outputs = NULL
      };
 
    if (!(ret = malloc(sizeof(E_Randr_Output_Info) * nrequested))) return NULL;
@@ -768,7 +760,7 @@
    else if (type == ECORE_X_EVENT_RANDR_OUTPUT_CHANGE)
      {
         Ecore_X_Event_Randr_Output_Change *event = ev;
-        const E_Randr_Serialized_Setup_12 *restore_info;
+        const E_Randr_Screen_Restore_Info_12 *restore_info;
         E_Randr_Output_Info* output_info = NULL;
         /* available information:
            struct _Ecore_X_Event_Randr_Output_Change
@@ -815,13 +807,11 @@
                   _e_randr_output_info_hw_info_set(output_info);
                   //make the crtcs aware of their possibly new output
                   _e_randr_crtcs_possible_output_update(output_info);
-                  /*
                   if ((restore_info = _e_randr_config_find_suiting_config_12()))
                      //maybe we have a suiting configuration
                      //_e_randr_config_enable_12(restore_info);
                      ;
                   else
-                  */
                      enabled = _e_randr_try_enable_output(output_info, EINA_FALSE); //maybe give a success message?
                }
              _e_randr_notify_output_change(output_info);
@@ -851,13 +841,11 @@
                      _e_randr_screen_primary_output_assign(output_info);
                   //let's try to get a proper config for the new setup and crop the
                   //screen afterwards.
-                  /*
                   if ((restore_info = _e_randr_config_find_suiting_config_12()))
 		    {
 		       //in case we didn't have, init it anyway...
 		       //_e_randr_config_enable_12(restore_info);
                     }
-                  */
                }
              _e_randr_notify_output_change(output_info);
              _e_randr_output_hw_info_free(output_info);
@@ -877,7 +865,6 @@
            };
            */
      }
-   e_randr_try_restore_configuration(e_randr_screen_info);
  on_exit:
    return ECORE_CALLBACK_RENEW;
 }
@@ -1012,602 +999,146 @@
    return ret;
 }
 
-// Setup store functions
-   Eina_Bool
-_e_randr_copy_mode_info(Ecore_X_Randr_Mode_Info *dest, Ecore_X_Randr_Mode_Info *src)
+/*
+static Eina_Bool
+_e_randr_outputs_connected(Eina_List *outputs_info)
 {
+   Eina_List *iter;
+   E_Randr_Output_Info *output_info;
 
-   if (!dest || !src) return EINA_FALSE;
-
-   dest->width = src->width;
-   dest->height = src->height;
-   dest->dotClock = src->dotClock;
-   dest->hSyncStart = src->hSyncStart;
-   dest->hSyncEnd = src->hSyncEnd;
-   dest->hTotal = src->hTotal;
-   dest->hSkew = src->hSkew;
-   dest->vSyncStart = src->vSyncStart;
-   dest->vSyncEnd = src->vSyncEnd;
-   dest->vTotal = src->vTotal;
-   if (src->nameLength > 0)
-     {
-        if (!(dest->name = malloc(src->nameLength + 1))) return EINA_FALSE;
-        if (!strncpy(dest->name, src->name, src->nameLength)) goto _e_randr_copy_mode_info_fail_free_name;
-     }
-   dest->nameLength = src->nameLength;
-   dest->modeFlags = src->modeFlags;
-
-   return EINA_TRUE;
-
-_e_randr_copy_mode_info_fail_free_name:
-   free(dest->name);
+   EINA_LIST_FOREACH(outputs_info, iter, output_info)
+     if (output_info->connection_status == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) return EINA_TRUE;
    return EINA_FALSE;
 }
 
-   void
-_e_randr_free_serialized_mode_info(Ecore_X_Randr_Mode_Info *mode_info)
+static Eina_Bool
+_e_randr_config_enable_11(int size_index, Ecore_X_Randr_Refresh_Rate refresh_rate, Ecore_X_Randr_Orientation orientation)
 {
-   if (mode_info->name) free(mode_info->name);
-}
+   E_Randr_Screen_Info_11 *current_info_11;
 
-   Eina_List
-*_e_randr_create_outputs_policies_list(Eina_List *outputs)
-{
-   Eina_List *iter, *list = NULL;
-   E_Randr_Output_Info *oi;
-   E_Randr_Serialized_Output_Policy *sop;
-   char *name;
+   if (E_RANDR_NO_11 || (size_index < 0) || (refresh_rate < 0) || 
+       (orientation < 0)) return EINA_FALSE;
 
-   EINA_LIST_FOREACH(outputs, iter, oi)
-     {
-        if (!oi->name || (oi->name_length <= 0)) continue;
-        if (!(sop = E_NEW(E_Randr_Serialized_Output_Policy, 1))
-              || !(sop->name = malloc(oi->name_length + 1))
-              || !(strncpy(sop->name, oi->name, oi->name_length)))
-          goto _e_randr_create_outputs_policies_list_fail_free_list;
-        sop->name_length = oi->name_length;
-        sop->policy = oi->policy;
-        if (!(list = eina_list_append(list, sop)))
-          goto _e_randr_create_outputs_policies_list_fail_free_list;
-     }
+   if (!ecore_x_randr_screen_primary_output_size_set(e_randr_screen_info->root, size_index)
+       || !ecore_x_randr_screen_primary_output_orientation_set(e_randr_screen_info->root, orientation)
+       || !ecore_x_randr_screen_primary_output_refresh_rate_set(e_randr_screen_info->root, size_index, refresh_rate)) return EINA_FALSE;
 
-   return list;
-_e_randr_create_outputs_policies_list_fail_free_list:
-   EINA_LIST_FREE(list, sop)
-     {
-        if (sop->name) free(sop->name);
-        free(sop);
-     }
-   return NULL;
-}
+   //TODO: move this to the screen event later.
+   current_info_11 = e_randr_screen_info->rrvd_info.randr_info_11;
 
-void
-_e_randr_free_serialized_output_policy(E_Randr_Serialized_Output_Policy *sop)
-{
-   if (!sop) return;
-   if (sop->name) free(sop->name);
-   free(sop);
-}
+   current_info_11->csize_index = size_index;
+   current_info_11->corientation = orientation;
+   current_info_11->current_rate = refresh_rate;
 
-   Eina_List
-*_e_randr_update_serialized_outputs_policies(E_Randr_Screen_Info_12 *si_12, Eina_List *sops)
-{
-   E_Randr_Serialized_Output_Policy *sop;
-
-   EINA_LIST_FREE(sops, sop)
-     {
-        _e_randr_free_serialized_output_policy(sop);
-     }
-
-   return _e_randr_create_outputs_policies_list(si_12->outputs);
+   return EINA_TRUE;
 }
 
-   Eina_List
-*_e_randr_create_possible_outputs_names_list(Eina_List *outputs)
+static Eina_Bool
+_e_randr_config_enable_12(const E_Randr_Screen_Restore_Info_12 *restore_info __UNUSED__)
 {
-   Eina_List *iter, *list = NULL;
-   E_Randr_Output_Info *oi;
-   char *name;
+      if (E_RANDR_NO_12 || !restore_info) return EINA_FALSE;
+      E_Randr_Screen_Info_12 *current_info_12;
+      E_Randr_Screen_Restore_Info_12 *restore_info_12 = NULL;
+      E_Randr_Crtc_Restore_Info *crtc_restore_info = NULL;
+      E_Randr_Crtc_Info *crtc_info;
+      E_Randr_Output_Info *output_info;
+      Eina_List *crtc_restore_iter;
 
-   if (!outputs) return NULL;
-
-   EINA_LIST_FOREACH(outputs, iter, oi)
-     {
-        if (!oi->name || (oi->name_length <= 0)) continue;
-        if (!(name = malloc(oi->name_length))
-              || !strncpy(name, oi->name, oi->name_length)
-              || !(list = eina_list_append(list, name))) goto _e_randr_create_possible_outputs_names_list_fail_free_list;
-     }
-   return list;
-
-_e_randr_create_possible_outputs_names_list_fail_free_list:
-   EINA_LIST_FREE(list, name)
-     {
-        if(name) free(name);
-     }
-   return NULL;
+      current_info_12 = (e_randr_screen_info->rrvd_info).randr_info_12;
+      EINA_LIST_FOREACH(restore_info_12->crtcs, crtc_restore_iter, crtc_restore_info)
+      {
+      ;
+      }
+      current_info_12->alignment = restore_info_12->alignment;
+      current_info_12->output_policy = restore_info_12->output_policy;
+      return EINA_TRUE;
+   return EINA_FALSE;
 }
 
-   E_Randr_Edid_Hash
-*_e_randr_create_edid_hash(E_Randr_Output_Info *output_info)
+static int
+_e_randr_config_find_suiting_config_11(E_Randr_Screen_Restore_Info_11 **restore_info)
 {
-   E_Randr_Edid_Hash *edid_hash;
+   E_RANDR_NO_11_RET(Ecore_X_Randr_None);
+   Eina_List *cfg_screen_restore_info_iter;
+   E_Randr_Screen_Restore_Info *screen_restore_info;
 
-   if (!output_info || (output_info->edid_hash.hash == 0) || !(edid_hash = malloc(sizeof(E_Randr_Edid_Hash)))) return NULL;
+   E_Randr_Screen_Restore_Info_11 *restore_info_11;
+   Ecore_X_Randr_Screen_Size_MM *sizes;
+   Ecore_X_Randr_Refresh_Rate *rates = NULL;
+   int i = 0, j = 0, nsizes = 0, nrates = 0;
 
-   edid_hash->hash = output_info->edid_hash.hash;
-
-   return edid_hash;
-}
-
-   E_Randr_Serialized_Output
-*_e_randr_create_serialized_output(E_Randr_Output_Info *output_info)
-{
-   E_Randr_Serialized_Output *so;
-   char *name;
-
-   if (!output_info || !output_info->name || (output_info->name_length <= 0) || !(so = malloc(sizeof(E_Randr_Serialized_Output)))) return NULL;
-
-   if (!(name = malloc(output_info->name_length))
-         || !strncpy(so->name, output_info->name, output_info->name_length))
-     goto _e_randr_create_serialized_outputs_fail_free_so;
-   so->name_length = output_info->name_length;
-   so->edid_hash.hash = output_info->edid_hash.hash;
-   so->backlight_level = output_info->backlight_level;
-
-   return so;
-
-_e_randr_create_serialized_outputs_fail_free_so:
-   free(so);
-   return NULL;
-}
-
-   void
-_e_randr_free_serialized_output(E_Randr_Serialized_Output *so)
-{
-   if (so->name) free(so->name);
-   free(so);
-}
-
-   E_Randr_Serialized_Crtc
-*_e_randr_create_serialized_crtc(E_Randr_Crtc_Info *crtc_info)
-{
-   E_Randr_Serialized_Crtc *sc;
-   E_Randr_Serialized_Output *so;
-   E_Randr_Output_Info *output_info;
-   Eina_List *iter;
-   char *output_name;
-   size_t len;
-
-   if (!(sc = E_NEW(E_Randr_Serialized_Crtc, 1))) return NULL;
-   if(!_e_randr_copy_mode_info(&sc->mode_info, crtc_info->current_mode)) goto _e_randr_create_serialized_crtc_free_sc;
-   if(!(sc->possible_outputs_names = _e_randr_create_possible_outputs_names_list(crtc_info->possible_outputs))) goto _e_randr_create_serialized_crtc_free_mode_sc;
-   //Create list of serialized outputs
-   EINA_LIST_FOREACH(crtc_info->outputs, iter, output_info)
+   EINA_LIST_FOREACH(e_config->screen_info, cfg_screen_restore_info_iter, screen_restore_info)
      {
-        if(!(so = _e_randr_create_serialized_output(output_info))
-              || !(sc->serialized_outputs = eina_list_append(sc->serialized_outputs, so))) goto _e_randr_create_serialized_crtc_free_outputs_list_sc;
-     }
-   sc->pos.x = crtc_info->geometry.x;
-   sc->pos.y = crtc_info->geometry.y;
-   sc->orientation = crtc_info->current_orientation;
-
-   return sc;
-
-_e_randr_create_serialized_crtc_free_outputs_list_sc:
-   EINA_LIST_FREE(sc->possible_outputs_names, output_name)
-     {
-        if (output_name) free(output_name);
-     }
-   EINA_LIST_FREE(sc->serialized_outputs, so)
-     {
-        if (so) _e_randr_free_serialized_output(so);
-     }
-_e_randr_create_serialized_crtc_free_mode_sc:
-   _e_randr_free_serialized_mode_info(&sc->mode_info);
-_e_randr_create_serialized_crtc_free_sc:
-   E_FREE(sc);
-
-   return NULL;
-}
-
-   void
-_e_randr_free_serialized_crtc(E_Randr_Serialized_Crtc *sc)
-{
-   E_Randr_Serialized_Output *so;
-   char *name;
-
-   EINA_LIST_FREE(sc->serialized_outputs, so)
-      _e_randr_free_serialized_output(so);
-   _e_randr_free_serialized_mode_info(&sc->mode_info);
-   EINA_LIST_FREE(sc->possible_outputs_names, name)
-      free(name);
-   free(sc);
-}
-
-   E_Randr_Serialized_Setup_11
-*_e_randr_create_serialized_setup_11(E_Randr_Screen_Info_11 *screen_info_11)
-{
-   E_Randr_Serialized_Setup_11 *ss;
-   Ecore_X_Randr_Screen_Size_MM* size;
-
-   if (!(ss = malloc(sizeof(*ss)))) return NULL;
-   if(!(size = (Ecore_X_Randr_Screen_Size_MM*)eina_list_data_get(eina_list_nth(screen_info_11->sizes, screen_info_11->csize_index)))) goto _e_randr_create_serialized_setup_11_failed_free_ss;
-   ss->size.width = size->width;
-   ss->size.height = size->height;
-   ss->refresh_rate = screen_info_11->current_rate;
-   ss->orientation = screen_info_11->corientation;
-
-   return ss;
-
-_e_randr_create_serialized_setup_11_failed_free_ss:
-   free(ss);
-}
-
-   E_Randr_Serialized_Setup_11
-*_e_randr_update_serialized_setup_11(E_Randr_Serialized_Setup_11 *ss_11, E_Randr_Screen_Info_11 *si_11)
-{
-   Ecore_X_Randr_Screen_Size_MM* size;
-
-   if (ss_11)
-     {
-        if(!(size = (Ecore_X_Randr_Screen_Size_MM*)eina_list_data_get(eina_list_nth(si_11->sizes, si_11->csize_index)))) return NULL;
-        if (!memcpy(&ss_11->size, size, sizeof(Ecore_X_Randr_Screen_Size_MM)))
-          goto _e_randr_update_serialized_setup_11_failed_free_ss;
-        ss_11->refresh_rate = si_11->current_rate;
-        ss_11->orientation = si_11->corientation;
-     }
-   else
-     ss_11 = _e_randr_create_serialized_setup_11(si_11);
-
-   return ss_11;
-
-_e_randr_update_serialized_setup_11_failed_free_ss:
-   free(ss_11);
-   return NULL;
-}
-
-   E_Randr_Serialized_Setup_12
-*_e_randr_create_serialized_setup_12(E_Randr_Screen_Info_12 *screen_info_12)
-{
-   E_Randr_Serialized_Setup_12 *ss;
-   Eina_List *iter;
-   E_Randr_Crtc_Info *ci;
-   E_Randr_Output_Info *oi;
-   E_Randr_Serialized_Crtc *sc;
-   E_Randr_Edid_Hash *edid_hash;
-
-   if (!(ss = E_NEW(E_Randr_Serialized_Setup_12, 1))) return NULL;
-
-   ss->timestamp = ecore_time_get();
-
-   //Add CRTCs and their configuration
-   EINA_LIST_FOREACH(screen_info_12->crtcs, iter, ci)
-     {
-        //ignore disabled crtcs for now
-        if (!ci->current_mode) continue;
-
-        if (!(sc = _e_randr_create_serialized_crtc(ci))
-              || !(ss->serialized_crtcs = eina_list_append(ss->serialized_crtcs, sc)))
-          goto _e_randr_create_serialized_setup_12_failed_free_list_ss;
-     }
-
-   /*
-    * Add EDID hashes of connected and enabled
-    * outputs for easier comparison during
-    * setup restoration
-    */
-   EINA_LIST_FOREACH(screen_info_12->outputs, iter, oi)
-     {
-        if ((oi->connection_status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) || !oi->crtc || !oi->crtc->current_mode)
-          continue;
-        if (!(edid_hash = _e_randr_create_edid_hash(oi)) || !(ss->serialized_edid_hashes = eina_list_append(ss->serialized_edid_hashes, edid_hash)))
-          goto _e_randr_create_serialized_setup_12_failed_free_output_list_crtc_list_ss;
-     }
-
-   return ss;
-
-_e_randr_create_serialized_setup_12_failed_free_output_list_crtc_list_ss:
-   EINA_LIST_FREE(ss->serialized_edid_hashes, edid_hash)
-     {
-        if (edid_hash) free(edid_hash);
-   }
-_e_randr_create_serialized_setup_12_failed_free_list_ss:
-   EINA_LIST_FREE(ss->serialized_crtcs, sc)
-     {
-        _e_randr_free_serialized_crtc(sc);
-     }
-_e_randr_create_serialized_setup_12_failed_free_ss:
-   free(ss);
-}
-
-E_Randr_Serialized_Setup_12
-*_e_randr_find_matching_serialized_setup(Eina_List *setups_12, E_Randr_Screen_Info_12 *si_12)
-{
-   E_Randr_Serialized_Setup_12 *ss_12;
-   Eina_List *setups_iter, *r_iter, *s_iter;
-   Eina_Bool found = EINA_FALSE;
-   E_Randr_Edid_Hash *edid_hash;
-   E_Randr_Output_Info *oi;
-
-   if (!setups_12 || !si_12) return NULL;
-
-   EINA_LIST_FOREACH(setups_12, setups_iter, ss_12)
-     {
-        EINA_LIST_FOREACH(si_12->outputs, r_iter, oi)
+        // 'screen_restore_info' should _never_ be NULL, since this functions shouldn't be called due to randr init failing.
+	if (!screen_restore_info) continue;
+        if (screen_restore_info->randr_version != ECORE_X_RANDR_1_1) continue;
+        restore_info_11 = screen_restore_info->rrvd_restore_info.restore_info_11;
+        if((sizes = ecore_x_randr_screen_primary_output_sizes_get(e_randr_screen_info->root, &nsizes)))
           {
-             //skip disconnected/-abled monitors
-             if ((oi->connection_status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) || !oi->crtc || !oi->crtc->current_mode)
-               continue;
-             found = EINA_FALSE;
-             EINA_LIST_FOREACH(ss_12->serialized_edid_hashes, s_iter, edid_hash)
+             for (i = 0; i < nsizes; i++)
                {
-                  if (oi->edid_hash.hash == edid_hash->hash)
+                  if ((restore_info_11->size.width == sizes[i].width)
+                      && (restore_info_11->size.height == sizes[i].height))
                     {
-                       found = EINA_TRUE;
-                       break;
+                       if ((rates = ecore_x_randr_screen_primary_output_refresh_rates_get(e_randr_screen_info->root, i, &nrates)))
+                         {
+                            for (j = 0; j < nrates; j++)
+                              if (rates[j] == restore_info_11->refresh_rate)
+                                {
+                                   if (restore_info) *restore_info = restore_info_11;
+                                   free(rates);
+                                   free(sizes);
+                                   return i;
+                                }
+                            free(rates);
+                         }
                     }
                }
-             if (!found)
-               break;
+             if (sizes) free(sizes);
           }
-        if (found)
-          break;
      }
-   if (found)
-     return ss_12;
-
-   return NULL;
+   return Ecore_X_Randr_Unset;
 }
+*/
 
-   void
-_e_randr_free_serialized_setup_12(E_Randr_Serialized_Setup_12 *ss_12)
+/**
+ * @Brief find configuration with the most hardware currently available
+ */
+static E_Randr_Screen_Restore_Info_12 *
+_e_randr_config_find_suiting_config_12(void)
 {
-   E_Randr_Serialized_Crtc *sc;
-   E_Randr_Edid_Hash *edid_hash;
+   //TODO: write geometry based loading
+   /*
+      Eina_List *cfg_screen_restore_info_iter;
+      E_Randr_Screen_Restore_Info *screen_restore_info;
 
-   if (!ss_12) return;
+      E_Randr_Screen_Info_12 *current_info_12;
+      E_Randr_Screen_Restore_Info_12 *restore_info_12, *most_matches = NULL;
+      E_Randr_Output_Info *output_info;
+      E_Randr_Crtc_Restore_Info *crtc_restore_info;
+      Ecore_X_Randr_Output *outputs_xids;
+      Ecore_X_Randr_Crtc *crtcs_xids;
+      Eina_List *restore_info_12_iter,  *output_iter, *restore_crtcs_iter;
 
-   EINA_LIST_FREE(ss_12->serialized_crtcs, sc)
-     {
-        if (!sc) continue;
-        _e_randr_free_serialized_crtc(sc);
-     }
-   EINA_LIST_FREE(ss_12->serialized_edid_hashes, edid_hash)
-      if (edid_hash) free(edid_hash);
+      if (e_randr_screen_info && e_config && e_config->screen_info)
+      {
 
-   free(ss_12);
-}
+      EINA_LIST_FOREACH(e_config->screen_info, cfg_screen_restore_info_iter, screen_restore_info)
+      {
+      if (screen_restore_info->randr_version < ECORE_X_RANDR_1_2) continue;
 
-   Eina_List
-*_e_randr_update_serialized_setup_12(Eina_List *setups_12, E_Randr_Screen_Info_12 *si_12)
-{
-   E_Randr_Serialized_Setup_12 *ss_12;
-   E_Randr_Serialized_Output *so;
-   E_Randr_Output_Info *oi;
-   E_Randr_Edid_Hash *edid_hash;
+   //HINT: use eina_list_clone and a sort callback to find proper
+   //crtcs and outputs
 
-   if (setups_12)
-     {
-        /*
-         * try to find the setup with the same monitors
-         * connected in order to replace it
-         */
-        if((ss_12 = _e_randr_find_matching_serialized_setup(setups_12, si_12)))
-          _e_randr_free_serialized_setup_12(ss_12);
-     }
-   ss_12 = _e_randr_create_serialized_setup_12(si_12);
-   setups_12 = eina_list_append(setups_12, ss_12);
+   //current_info_12 = e_randr_screen_info->rrvd_info.randr_info_12;
+   }
 
-   return setups_12;
-}
-
-   E_Randr_Serialized_Setup
-*_e_randr_create_serialized_setup(E_Randr_Screen_Info *screen_info)
-{
-   E_Randr_Serialized_Setup *ss;
-   E_Randr_Serialized_Setup_12 *ss_12;
-
-   if (!(ss = E_NEW(E_Randr_Serialized_Setup, 1))) return NULL;
-   if ((screen_info->randr_version == ECORE_X_RANDR_1_1) && !(ss->serialized_setup_11 = _e_randr_create_serialized_setup_11(screen_info->rrvd_info.randr_info_11))) goto _e_randr_create_serialized_setup_failed_free_ss;
-   if ((screen_info->randr_version >= ECORE_X_RANDR_1_2))
-     {
-        if (!(ss_12 = _e_randr_create_serialized_setup_12(screen_info->rrvd_info.randr_info_12))
-              || !(ss->serialized_setups_12 = eina_list_append(ss->serialized_setups_12, ss_12)))
-          goto _e_randr_create_serialized_setup_failed_free_ss;
-     }
-
-   return ss;
-
-_e_randr_create_serialized_setup_failed_free_ss:
-   free(ss);
-}
-
-   EAPI void
-e_randr_store_configuration(E_Randr_Screen_Info *screen_info)
-{
-   if (E_RANDR_NO_11) return;
-
-   if (!e_config->randr_serialized_setup)
-     {
-        e_config->randr_serialized_setup = _e_randr_create_serialized_setup(screen_info);
-        e_config_save_queue();
-        return;
-     }
-
-   if (screen_info->randr_version == ECORE_X_RANDR_1_1)
-     {
-        e_config->randr_serialized_setup->serialized_setup_11 = _e_randr_update_serialized_setup_11(e_config->randr_serialized_setup->serialized_setup_11, screen_info->rrvd_info.randr_info_11);
-     }
-   else if (screen_info->randr_version >= ECORE_X_RANDR_1_2)
-     {
-        e_config->randr_serialized_setup->serialized_setups_12 = _e_randr_update_serialized_setup_12(e_config->randr_serialized_setup->serialized_setups_12, screen_info->rrvd_info.randr_info_12);
-
-        //Also, update output policies
-        e_config->randr_serialized_setup->serialized_outputs_policies = _e_randr_update_serialized_outputs_policies(screen_info->rrvd_info.randr_info_12, e_config->randr_serialized_setup->serialized_outputs_policies);
-     }
-   e_config_save_queue();
-}
-
-//setup restore functions
-   EAPI Eina_Bool
-e_randr_try_restore_configuration(E_Randr_Screen_Info *si)
-{
-   if (!e_config || !e_config->randr_serialized_setup) return EINA_FALSE;
-
-   if (si->randr_version == ECORE_X_RANDR_1_1)
-     return _e_randr_try_restore_11(si->rrvd_info.randr_info_11);
-   else if (si->randr_version >= ECORE_X_RANDR_1_2)
-     return _e_randr_try_restore_12(si->rrvd_info.randr_info_12);
-
-   return EINA_FALSE;
-}
-
-   Eina_Bool
-_e_randr_try_restore_11(E_Randr_Screen_Info_11 *si_11)
-{
-   E_Manager *man;
-   Eina_List *iter;
-   Ecore_X_Randr_Screen_Size_MM *stored_size, *size;
-   int i = 0;
-
-   if (!e_config->randr_serialized_setup->serialized_setup_11) return EINA_FALSE;
-   stored_size = &e_config->randr_serialized_setup->serialized_setup_11->size;
-   EINA_LIST_FOREACH(si_11->sizes, iter, size)
-     {
-        if ((stored_size->width == size->width)
-              && (stored_size->height == size->height)
-              && (stored_size->width_mm == size->width_mm)
-              && (stored_size->height_mm == size->height_mm))
-              {
-                 man = e_manager_current_get();
-                 return ecore_x_randr_screen_primary_output_size_set(man->root, i);
-              }
-        i++;
-     }
-
-   return EINA_FALSE;
-}
-
-   E_Randr_Crtc_Info
-*_e_randr_find_matching_crtc(Eina_List *crtcs, E_Randr_Serialized_Crtc *sc)
-{
-   Eina_List *iter, *s_name_iter, *p_output_iter;
-   E_Randr_Crtc_Info *ci;
-   E_Randr_Output_Info *oi;
-   char *s_output_name;
-   Eina_Bool name_found;
-
-   EINA_LIST_FOREACH(crtcs, iter, ci)
-     {
-        if (eina_list_count(ci->possible_outputs) != eina_list_count(sc->possible_outputs_names))
-          continue;
-        EINA_LIST_FOREACH(sc->possible_outputs_names, s_name_iter, s_output_name)
-           {
-              name_found = EINA_FALSE;
-              EINA_LIST_FOREACH(ci->possible_outputs, p_output_iter, oi)
-                {
-                   if (!strncmp(s_output_name, oi->name, oi->name_length))
-                     {
-                        name_found = EINA_TRUE;
-                        break;
-                     }
-                }
-              if (!name_found)
-                break;
-           }
-        if (name_found)
-          break;
-     }
-   if (name_found)
-     return ci;
-   else
-     return NULL;
-}
-
-   Eina_List
-*_e_randr_find_matching_outputs(Eina_List *sois, Eina_List *ois)
-{
-   Eina_List *r_output_iter, *s_output_iter, *list = NULL;
-   E_Randr_Output_Info *oi;
-   E_Randr_Serialized_Output *so;
-
-   EINA_LIST_FOREACH(sois, s_output_iter, so)
-     {
-        EINA_LIST_FOREACH(ois, r_output_iter, oi)
-          {
-             if (so->edid_hash.hash == oi->edid_hash.hash)
-               {
-                  list = eina_list_append(list, oi);
-                  break;
-               }
-          }
-     }
-   if (list && (eina_list_count(sois) != eina_list_count(list)))
-     {
-        eina_list_free(list);
-        list = NULL;
-     }
-
-   return list;
-}
-
-   Ecore_X_Randr_Mode_Info
-*_e_randr_find_matching_mode_info(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode)
-{
-   Eina_List *iter;
-   Ecore_X_Randr_Mode_Info *mi = NULL;
-
-   EINA_LIST_FOREACH(modes, iter, mi)
-     {
-        if ((mode->width == mi->width)
-              && (mode->height == mi->height)
-              && (mode->dotClock == mi->dotClock)
-              && (mode->hSyncStart == mi->hSyncStart)
-              && (mode->hSyncEnd == mi->hSyncEnd)
-              && (mode->hTotal == mi->hTotal)
-              && (mode->hSkew == mi->hSkew)
-              && (mode->vSyncStart == mi->vSyncStart)
-              && (mode->vSyncEnd == mi->vSyncEnd)
-              && (mode->vTotal == mi->vTotal)
-              && (mode->nameLength == mi->nameLength)
-              && !strncpy(mode->name, mi->name, mode->nameLength)
-              && (mode->modeFlags == mi->modeFlags))
-          return mi;
-     }
+   }
+   */
    return NULL;
 }
 
-   Eina_Bool
-_e_randr_try_restore_12(E_Randr_Screen_Info_12 *si_12)
-{
-   E_Randr_Serialized_Setup_12 *ss_12;
-   E_Randr_Serialized_Crtc *sc;
-   E_Randr_Crtc_Info *ci;
-   Ecore_X_Randr_Output *outputs_array;
-   Ecore_X_Randr_Mode_Info *mi;
-   Eina_List *iter, *outputs_list;
-   Eina_Bool ret = EINA_TRUE;
-   E_Manager *man;
-
-   if(!(ss_12 = _e_randr_find_matching_serialized_setup(e_config->randr_serialized_setup->serialized_setups_12, si_12))) return EINA_FALSE;
-
-   man = e_manager_current_get();
-
-   EINA_LIST_FOREACH(ss_12->serialized_crtcs, iter, sc)
-     {
-        ci = _e_randr_find_matching_crtc(si_12->crtcs, sc);
-        outputs_list = _e_randr_find_matching_outputs(si_12->outputs, sc->serialized_outputs);
-        outputs_array = _e_randr_outputs_to_array(outputs_list);
-        mi = _e_randr_find_matching_mode_info(si_12->modes, &sc->mode_info);
-        ret &= ecore_x_randr_crtc_mode_set(man->root, ci->xid, outputs_array, eina_list_count(outputs_list), mi->xid);
-        ret &= ecore_x_randr_crtc_pos_set(man->root, ci->xid, sc->pos.x, sc->pos.y);
-     }
-   return ret;
-}
-
-//Utility functions
-   static Ecore_X_Randr_Output *
+static Ecore_X_Randr_Output *
 _e_randr_outputs_to_array(Eina_List *outputs_info)
 {
    Ecore_X_Randr_Output *ret = NULL;
@@ -1617,7 +1148,7 @@
 
    if (!outputs_info || !(ret = malloc(sizeof(Ecore_X_Randr_Output) * eina_list_count(outputs_info)))) return NULL;
    EINA_LIST_FOREACH(outputs_info, output_iter, output_info)
-      /* output_info == NULL should _not_ be possible! */
+     /* output_info == NULL should _not_ be possible! */
      ret[i++] = output_info ? output_info->xid : Ecore_X_Randr_None;
    return ret;
 }
@@ -1660,7 +1191,7 @@
    if (!usable_crtc) return EINA_FALSE;
 
    //get the CRTC we will refer to, dependend on policy
-   switch (output_info->policy)
+   switch (e_randr_screen_info->rrvd_info.randr_info_12->output_policy)
      {
       case ECORE_X_RANDR_OUTPUT_POLICY_NONE:
          return EINA_TRUE;
@@ -1855,19 +1386,15 @@
 _e_randr_crtc_move_policy(E_Randr_Crtc_Info *new_crtc)
 {
    const E_Randr_Crtc_Info *crtc_rel;
-   E_Randr_Output_Info *last_output = NULL;
    int dx = Ecore_X_Randr_None, dy = Ecore_X_Randr_None;
    Eina_Bool ret = EINA_TRUE;
 
-   //use the policy of the new crtc's last output
-   last_output = (E_Randr_Output_Info*)eina_list_data_get(eina_list_last(new_crtc->outputs));
-   if (!last_output) return EINA_FALSE;
    //get the crtc we will place our's relative to. If it's NULL, this is the
    //only output attached, work done.
-   if(!(crtc_rel = _e_randr_policy_crtc_get(new_crtc, NULL, last_output->policy))) return EINA_TRUE;
+   if(!(crtc_rel = _e_randr_policy_crtc_get(new_crtc, NULL, e_randr_screen_info->rrvd_info.randr_info_12->output_policy))) return EINA_TRUE;
 
    //following is policy dependend.
-   switch (last_output->policy)
+   switch (e_randr_screen_info->rrvd_info.randr_info_12->output_policy)
      {
       case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE:
         dy = (crtc_rel->geometry.y - new_crtc->geometry.h);
@@ -1898,7 +1425,7 @@
       default:
         break;
      }
-   ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, new_crtc->xid, crtc_rel->xid, last_output->policy, e_randr_screen_info->rrvd_info.randr_info_12->alignment);
+   ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, new_crtc->xid, crtc_rel->xid, e_randr_screen_info->rrvd_info.randr_info_12->output_policy, e_randr_screen_info->rrvd_info.randr_info_12->alignment);
    return ret;
 }
 
@@ -2159,8 +1686,6 @@
 
    _e_randr_output_modes_add(output_info);
    output_info->edid = ecore_x_randr_output_edid_get(e_randr_screen_info->root, output_info->xid, &output_info->edid_length);
-   if (output_info->edid_length > 0)
-     output_info->edid_hash.hash = eina_hash_superfast(output_info->edid, output_info->edid_length);
    //get the outputs we can use on the same CRTC alongside this one.
    if ((outputs = ecore_x_randr_output_clones_get(e_randr_screen_info->root, output_info->xid, &num)))
      {
@@ -2186,10 +1711,6 @@
           }
         free(crtcs);
      }
-   else
-     {
-        fprintf(stderr, "E_RANDR: Output %x does not have a single possible CRTC.\n", output_info->xid);
-     }
 }
 
 /*

Modified: trunk/e/src/bin/e_randr.h
===================================================================
--- trunk/e/src/bin/e_randr.h	2011-11-02 01:04:59 UTC (rev 64628)
+++ trunk/e/src/bin/e_randr.h	2011-11-02 01:36:10 UTC (rev 64629)
@@ -1,26 +1,24 @@
 #ifdef E_TYPEDEFS
 
 typedef struct _E_Randr_Crtc_Info E_Randr_Crtc_Info;
-typedef struct _E_Randr_Edid_Hash E_Randr_Edid_Hash;
 typedef struct _E_Randr_Output_Info E_Randr_Output_Info;
 typedef struct _E_Randr_Screen_Info_11 E_Randr_Screen_Info_11;
 typedef struct _E_Randr_Screen_Info_12 E_Randr_Screen_Info_12;
 typedef union _E_Randr_Screen_RRVD_Info E_Randr_Screen_RRVD_Info;
 typedef struct _E_Randr_Screen_Info E_Randr_Screen_Info;
-typedef struct _E_Randr_Serialized_Output_Policy E_Randr_Serialized_Output_Policy;
-typedef struct _E_Randr_Serialized_Output E_Randr_Serialized_Output;
-typedef struct _E_Randr_Serialized_Crtc E_Randr_Serialized_Crtc;
-typedef struct _E_Randr_Serialized_Setup_11 E_Randr_Serialized_Setup_11;
-typedef struct _E_Randr_Serialized_Setup_12 E_Randr_Serialized_Setup_12;
-typedef struct _E_Randr_Serialized_Setup E_Randr_Serialized_Setup;
+typedef struct _E_Randr_Output_Edid_Hash E_Randr_Output_Edid_Hash;
+typedef struct _E_Randr_Output_Restore_Info E_Randr_Output_Restore_Info;
+typedef struct _E_Randr_Crtc_Restore_Info E_Randr_Crtc_Restore_Info;
+typedef struct _E_Randr_Screen_Restore_Info_11 E_Randr_Screen_Restore_Info_11;
+typedef struct _E_Randr_Screen_Restore_Info_12 E_Randr_Screen_Restore_Info_12;
+typedef union _E_Randr_Screen_Restore_Info_Union E_Randr_Screen_Restore_Info_Union;
+typedef struct _E_Randr_Screen_Restore_Info E_Randr_Screen_Restore_Info;
 
-EAPI void e_randr_store_configuration(E_Randr_Screen_Info *screen_info);
-
 #else
 #ifndef E_RANDR_H
 #define E_RANDR_H
 
-struct _E_Randr_Crtc_Info
+struct _E_Randr_Crtc_Info 
 {
    Ecore_X_ID xid;
    Eina_Rectangle geometry;
@@ -37,13 +35,8 @@
    Ecore_X_Randr_Mode_Info *current_mode;
 };
 
-struct _E_Randr_Edid_Hash
+struct _E_Randr_Output_Info 
 {
-   int hash;
-};
-
-struct _E_Randr_Output_Info
-{
    Ecore_X_ID xid;
    char *name;
    int name_length;
@@ -54,7 +47,6 @@
    int connector_number;
    Ecore_X_Randr_Connector_Type connector_type;
    Ecore_X_Randr_Connection_Status connection_status;
-   Ecore_X_Randr_Output_Policy policy;
    /*
     * Attached Monitor specific:
     */
@@ -65,7 +57,6 @@
    Ecore_X_Randr_Screen_Size size_mm;
    unsigned char *edid;
    unsigned long edid_length;
-   E_Randr_Edid_Hash edid_hash;
    int max_backlight;
    double backlight_level;
    Ecore_X_Render_Subpixel_Order subpixel_order;
@@ -84,7 +75,7 @@
    Ecore_X_Randr_Refresh_Rate current_rate;
 };
 
-struct _E_Randr_Screen_Info_12
+struct _E_Randr_Screen_Info_12 
 {
    Ecore_X_Randr_Screen_Size min_size;
    Ecore_X_Randr_Screen_Size max_size;
@@ -93,17 +84,18 @@
    Eina_List *crtcs;
    Eina_List *outputs;
    E_Randr_Output_Info *primary_output;
+   Ecore_X_Randr_Output_Policy output_policy;
    Ecore_X_Randr_Relative_Alignment alignment;
 };
 
 //RRVD == RandR(R) Version Depended
-union _E_Randr_Screen_RRVD_Info
+union _E_Randr_Screen_RRVD_Info 
 {
    E_Randr_Screen_Info_11 *randr_info_11;
    E_Randr_Screen_Info_12 *randr_info_12;
 };
 
-struct _E_Randr_Screen_Info
+struct _E_Randr_Screen_Info 
 {
    Ecore_X_Window root;
    int randr_version;
@@ -111,67 +103,56 @@
 };
 
 //Following stuff is just for configuration purposes
+struct _E_Randr_Output_Edid_Hash {
+   int hash;
+};
 
-struct _E_Randr_Serialized_Output_Policy
+struct _E_Randr_Output_Restore_Info
 {
-   char *name;
-   int name_length;
-   Ecore_X_Randr_Output_Policy policy;
+   E_Randr_Output_Edid_Hash edid_hash;
+   double backlight_level;
 };
 
-struct _E_Randr_Serialized_Output
+struct _E_Randr_Crtc_Restore_Info
 {
-   char *name;
-   int name_length;
-   E_Randr_Edid_Hash edid_hash;
-   double backlight_level;
+   Eina_Rectangle geometry;
+   Ecore_X_Randr_Orientation orientation;
+   //list of the outputs;
+   Eina_List *outputs;
 };
 
-struct _E_Randr_Serialized_Crtc
+struct _E_Randr_Screen_Restore_Info_11 
 {
-   //List of E_Randr_Serialized_Output objects that were used on the same output
-   Eina_List *serialized_outputs;
-   //the serialized mode_info misses its xid value
-   Ecore_X_Randr_Mode_Info mode_info;
-   Evas_Coord_Point pos;
-   //List of all possible outputs' names
-   //e.g. "LVDS", "CRT-0", "VGA"
-   Eina_List *possible_outputs_names;
+   Ecore_X_Randr_Screen_Size size;
+   Ecore_X_Randr_Refresh_Rate refresh_rate;
    Ecore_X_Randr_Orientation orientation;
 };
 
-struct _E_Randr_Serialized_Setup_12
+struct _E_Randr_Screen_Restore_Info_12 
 {
-   double timestamp;
-   //List of E_Randr_Serialized_Crtc objects
-   Eina_List *serialized_crtcs;
-   /*
-    * List of E_Randr_Edid_Hash elements of monitors,
-    * that were enabled, when the setup was stored
-    */
-   Eina_List *serialized_edid_hashes;
+   Eina_List *outputs_edid_hashes;
+   int noutputs;
+   Eina_List *crtcs;
+   Ecore_X_Randr_Output_Policy output_policy;
+   Ecore_X_Randr_Relative_Alignment alignment;
 };
 
-struct _E_Randr_Serialized_Setup_11
+union _E_Randr_Screen_Restore_Info_Union 
 {
-   Ecore_X_Randr_Screen_Size_MM size;
-   Ecore_X_Randr_Refresh_Rate refresh_rate;
-   Ecore_X_Randr_Orientation orientation;
+   E_Randr_Screen_Restore_Info_11 *restore_info_11;
+   Eina_List *restore_info_12;
 };
 
-struct _E_Randr_Serialized_Setup
+struct _E_Randr_Screen_Restore_Info 
 {
-   E_Randr_Serialized_Setup_11 *serialized_setup_11;
-   //List of E_Randr_Serialized_Setup_12 objects
-   Eina_List *serialized_setups_12;
-   //List of E_Randr_Serialized_Output_Policy objects
-   Eina_List *serialized_outputs_policies;
+   int randr_version;
+   E_Randr_Screen_Restore_Info_Union rrvd_restore_info;
 };
 
 EINTERN Eina_Bool e_randr_init(void);
 EINTERN int e_randr_shutdown(void);
 
-EAPI extern E_Randr_Screen_Info *e_randr_screen_info;
+extern E_Randr_Screen_Info *e_randr_screen_info;
 
 #endif
 #endif

Log:
fix warping of mouse on desk flip in multihead
  
  

Author:       raster
Date:         2011-11-05 23:37:02 -0700 (Sat, 05 Nov 2011)
New Revision: 64799
Trac:         http://trac.enlightenment.org/e/changeset/64799

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

Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c	2011-11-06 06:17:56 UTC (rev 64798)
+++ trunk/e/src/bin/e_actions.c	2011-11-06 06:37:02 UTC (rev 64799)
@@ -1318,7 +1318,7 @@
 	if (ACT_FLIP_LEFT(zone))
 	  {
 	     e_zone_desk_flip_by(zone, -1, 0);
-	     ecore_x_pointer_warp(zone->container->win, zone->w - offset, y);
+	     ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + zone->w - offset, y);
 	     wev->curr.y = y;
 	     wev->curr.x = zone->w - offset;
 	  }
@@ -1327,7 +1327,7 @@
         if (ACT_FLIP_RIGHT(zone))
           {
              e_zone_desk_flip_by(zone, 1, 0);
-             ecore_x_pointer_warp(zone->container->win, offset, y);
+             ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + offset, y);
              wev->curr.y = y;
              wev->curr.x = offset;
           }
@@ -1336,7 +1336,7 @@
         if (ACT_FLIP_UP(zone))
           {
              e_zone_desk_flip_by(zone, 0, -1);
-             ecore_x_pointer_warp(zone->container->win, x, zone->h - offset);
+             ecore_x_pointer_warp(zone->container->win, x, zone->container->y + zone->y + zone->h - offset);
              wev->curr.x = x;
              wev->curr.y = zone->h - offset;
           }
@@ -1345,7 +1345,7 @@
 	if (ACT_FLIP_DOWN(zone))
 	  {
 	     e_zone_desk_flip_by(zone, 0, 1);
-	     ecore_x_pointer_warp(zone->container->win, x, offset);
+	     ecore_x_pointer_warp(zone->container->win, x, zone->container->y + zone->y + offset);
 	     wev->curr.x = x;
 	     wev->curr.y = offset;
 	  }
@@ -1354,7 +1354,7 @@
         if (ACT_FLIP_UP_LEFT(zone))
           {
              e_zone_desk_flip_by(zone, -1, -1);
-             ecore_x_pointer_warp(zone->container->win, zone->w - offset, zone->h - offset);
+             ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + zone->w - offset, zone->container->y + zone->y + zone->h - offset);
              wev->curr.x = zone->w - offset;
              wev->curr.y = zone->h - offset;
           }
@@ -1363,7 +1363,7 @@
         if (ACT_FLIP_UP_RIGHT(zone))
           {
              e_zone_desk_flip_by(zone, 1, -1);
-             ecore_x_pointer_warp(zone->container->win, offset, zone->h - offset);
+             ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + offset, zone->container->y + zone->y + zone->h - offset);
              wev->curr.x = offset;
              wev->curr.y = zone->h - offset;
           }
@@ -1372,7 +1372,7 @@
 	if (ACT_FLIP_DOWN_LEFT(zone))
 	  {
 	     e_zone_desk_flip_by(zone, -1, 1);
-	     ecore_x_pointer_warp(zone->container->win, zone->w - offset, offset);
+	     ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + zone->w - offset, zone->container->y + zone->y + offset);
 	     wev->curr.y = offset;
 	     wev->curr.x = zone->w - offset;
 	  }
@@ -1381,7 +1381,7 @@
 	if (ACT_FLIP_DOWN_RIGHT(zone))
 	  {
 	     e_zone_desk_flip_by(zone, 1, 1);
-	     ecore_x_pointer_warp(zone->container->win, offset, offset);
+	     ecore_x_pointer_warp(zone->container->win, zone->container->x + zone->x + offset, zone->container->y + zone->y + offset);
 	     wev->curr.y = offset;
 	     wev->curr.x = offset;
 	  }

Log:
dont go hunt if ping to now interval not long enough in poller
  
  

Author:       raster
Date:         2011-11-16 02:08:28 -0800 (Wed, 16 Nov 2011)
New Revision: 65290
Trac:         http://trac.enlightenment.org/e/changeset/65290

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

Modified: trunk/e/src/bin/e_border.c
===================================================================
--- trunk/e/src/bin/e_border.c	2011-11-16 09:28:25 UTC (rev 65289)
+++ trunk/e/src/bin/e_border.c	2011-11-16 10:08:28 UTC (rev 65290)
@@ -8813,17 +8813,24 @@
      }
    else
      {
-        if (!bd->hung)
+        /* if time between last ping and now is greater
+         * than half the ping interval... */
+        if ((ecore_loop_time_get() - bd->ping) > 
+            ((e_config->ping_clients_interval * 
+              ecore_poller_poll_interval_get(ECORE_POLLER_CORE)) / 2.0))
           {
-             bd->hung = 1;
-             edje_object_signal_emit(bd->bg_object, "e,state,hung", "e");
-             /* FIXME: if below dialog is up - hide it now */
+             if (!bd->hung)
+               {
+                  bd->hung = 1;
+                  edje_object_signal_emit(bd->bg_object, "e,state,hung", "e");
+                  /* FIXME: if below dialog is up - hide it now */
+               }
+             if (bd->delete_requested)
+               {
+                  /* FIXME: pop up dialog saying app is hung - kill client, or pid */
+                  e_border_act_kill_begin(bd);
+               }
           }
-        if (bd->delete_requested)
-          {
-             /* FIXME: pop up dialog saying app is hung - kill client, or pid */
-              e_border_act_kill_begin(bd);
-          }
      }
    bd->ping_poller = NULL;
    e_border_ping(bd);

Log:
support mtrack... my new little memory tracker so i can finally live
  track down leaks and other badnesses.
  
  

Author:       raster
Date:         2011-11-17 02:19:50 -0800 (Thu, 17 Nov 2011)
New Revision: 65335
Trac:         http://trac.enlightenment.org/e/changeset/65335

Modified:
  trunk/e/src/bin/e_alert.c trunk/e/src/bin/e_ipc.c trunk/e/src/bin/e_main.c trunk/e/src/bin/e_start_main.c 

Modified: trunk/e/src/bin/e_alert.c
===================================================================
--- trunk/e/src/bin/e_alert.c	2011-11-17 09:59:28 UTC (rev 65334)
+++ trunk/e/src/bin/e_alert.c	2011-11-17 10:19:50 UTC (rev 65335)
@@ -73,6 +73,8 @@
      }
 
  restart_e:
+   if (getenv("E_START_MTRACK"))
+     e_util_env_set("MTRACK", "track");
    ecore_app_restart();
 }
 

Modified: trunk/e/src/bin/e_ipc.c
===================================================================
--- trunk/e/src/bin/e_ipc.c	2011-11-17 09:59:28 UTC (rev 65334)
+++ trunk/e/src/bin/e_ipc.c	2011-11-17 10:19:50 UTC (rev 65335)
@@ -207,6 +207,8 @@
              switch (e->minor)
                {
                 case E_ALERT_OP_RESTART:
+                  if (getenv("E_START_MTRACK"))
+                    e_util_env_set("MTRACK", "track");
                   ecore_app_restart();
                   break;
                 case E_ALERT_OP_EXIT:

Modified: trunk/e/src/bin/e_main.c
===================================================================
--- trunk/e/src/bin/e_main.c	2011-11-17 09:59:28 UTC (rev 65334)
+++ trunk/e/src/bin/e_main.c	2011-11-17 10:19:50 UTC (rev 65335)
@@ -182,6 +182,8 @@
    snprintf(buff, sizeof(buff), "%1.1f", tstart);
    e_util_env_set("E_START_TIME", buff);
 
+   if (getenv("E_START_MTRACK"))
+     e_util_env_set("MTRACK", NULL);
    TS("Eina Init");
    if (!eina_init()) 
      {
@@ -969,6 +971,8 @@
    if (restart) 
      {
         e_util_env_set("E_RESTART_OK", "1");
+        if (getenv("E_START_MTRACK"))
+          e_util_env_set("MTRACK", "track");
         ecore_app_restart();
      }
 

Modified: trunk/e/src/bin/e_start_main.c
===================================================================
--- trunk/e/src/bin/e_start_main.c	2011-11-17 09:59:28 UTC (rev 65334)
+++ trunk/e/src/bin/e_start_main.c	2011-11-17 10:19:50 UTC (rev 65335)
@@ -351,9 +351,40 @@
      }
 done:
    
+   /* mtrack memory tracker support */
+   p = getenv("HOME");
+   if (p)
+     {
+        FILE *f;
+
+        /* if you have ~/.e-mtrack, then the tracker will be enabled
+         * using the content of this file as the path to the mtrack.so
+         * shared object that is the mtrack preload */
+        snprintf(buf, sizeof(buf), "%s/.e-mtrack", p);
+        f = fopen(buf, "r");
+        if (f)
+          {
+             if (fgets(buf, sizeof(buf), f))
+               {
+                  int len = strlen(buf);
+                  if ((len > 1) && (buf[len - 1] == '\n'))
+                    {
+                       buf[len - 1] = 0;
+                       len--;
+                    }
+                  env_set("LD_PRELOAD", buf);
+                  env_set("MTRACK", "track");
+                  env_set("E_START_MTRACK", "track");
+                  snprintf(buf, sizeof(buf), "%s/.e-mtrack.log", p);
+                  env_set("MTRACK_TRACE_FILE", buf);
+               }
+             fclose(f);
+          }
+     }
+   
    /* try dbus-launch */
    snprintf(buf, sizeof(buf), "%s/enlightenment", eina_prefix_bin_get(pfx));
-   
+
    args = alloca((argc + 2 + VALGRIND_MAX_ARGS) * sizeof(char *));
    if ((!getenv("DBUS_SESSION_BUS_ADDRESS")) &&
        (!getenv("DBUS_LAUNCHD_SESSION_BUS_SOCKET")))

Log:
lets' delete files again shall we efm?
  
  

Author:       raster
Date:         2011-11-24 23:13:41 -0800 (Thu, 24 Nov 2011)
New Revision: 65591
Trac:         http://trac.enlightenment.org/e/changeset/65591

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

Modified: trunk/e/src/bin/e_fm_op.c
===================================================================
--- trunk/e/src/bin/e_fm_op.c	2011-11-24 23:58:26 UTC (rev 65590)
+++ trunk/e/src/bin/e_fm_op.c	2011-11-25 07:13:41 UTC (rev 65591)
@@ -156,17 +156,15 @@
    last = argc - 1;
    i = 2;
 
-   if (strcmp(argv[1], "cp") == 0)
-     type = E_FM_OP_COPY;
-   else if (strcmp(argv[1], "mv") == 0)
-     type = E_FM_OP_MOVE;
-   else if (strcmp(argv[1], "rm") == 0)
-     type = E_FM_OP_REMOVE;
-   else if (strcmp(argv[1], "lns") == 0)
-     type = E_FM_OP_SYMLINK;
+   if (!strcmp(argv[1], "cp")) type = E_FM_OP_COPY;
+   else if (!strcmp(argv[1], "mv")) type = E_FM_OP_MOVE;
+   else if (!strcmp(argv[1], "rm")) type = E_FM_OP_REMOVE;
+   else if (!strcmp(argv[1], "lns")) type = E_FM_OP_SYMLINK;
    else return 0;
 
-   if ((type == E_FM_OP_COPY) || (type == E_FM_OP_MOVE) || (type == E_FM_OP_SYMLINK))
+   if ((type == E_FM_OP_COPY) || 
+       (type == E_FM_OP_SYMLINK) || 
+       (type == E_FM_OP_MOVE))
      {
 	if (argc < 4) goto quit;
 
@@ -783,7 +781,13 @@
                                         task->dst.name);
           }
         else
-          task->started = 1;
+          {
+             task->started = 1;
+             _e_fm_op_scan_queue =
+               eina_list_remove_list(_e_fm_op_scan_queue, node);
+             node = NULL;
+             _e_fm_op_scan_atom(task);
+          }
      }
    else if (dir && !task->started)
      {

Log:
lets drop icons correctly if efm view is not at 0,0
  
  

Author:       raster
Date:         2011-11-24 23:46:50 -0800 (Thu, 24 Nov 2011)
New Revision: 65592
Trac:         http://trac.enlightenment.org/e/changeset/65592

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-11-25 07:13:41 UTC (rev 65591)
+++ trunk/e/src/bin/e_fm.c	2011-11-25 07:46:50 UTC (rev 65592)
@@ -6254,11 +6254,19 @@
 
               if ((ic) && (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_CUSTOM_ICONS))
                 {
-     /* dnd doesn't tell me all the co-ords of the icons being dragged so i can't place them accurately.
-      * need to fix this. ev->data probably needs to become more compelx than a list of url's
-      */
-                     x = ev->x + (ic->x - ox) - ic->drag.x + sd->pos.x;
-                     y = ev->y + (ic->y - oy) - ic->drag.y + sd->pos.y;
+                   /* dnd doesn't tell me all the co-ords of the icons being dragged so i can't place them accurately.
+                    * need to fix this. ev->data probably needs to become more compelx than a list of url's
+                    */
+                   
+                     x = ev->x + (ic->x - ox) - ic->drag.x + sd->pos.x - sd->x;
+                     y = ev->y + (ic->y - oy) - ic->drag.y + sd->pos.y - sd->y;
+                   
+                   printf("drop ev x, y: %i %i \n", ev->x, ev->y);
+                   printf("ic x, y: %i %i \n", ic->x, ic->y);
+                   printf("orig x, y: %i %i \n", ox, oy);
+                   printf("ic->drag x, y: %i %i \n", ic->drag.x, ic->drag.y);
+                   printf("sd->pos x, y: %i %i \n", sd->pos.x, sd->pos.y);
+                   printf("x, y of drop: %i %i \n", x, y);
 
                      if (x < 0) x = 0;
                      if (y < 0) y = 0;

Log:
and remove printfs
  
  

Author:       raster
Date:         2011-11-24 23:47:57 -0800 (Thu, 24 Nov 2011)
New Revision: 65593
Trac:         http://trac.enlightenment.org/e/changeset/65593

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-11-25 07:46:50 UTC (rev 65592)
+++ trunk/e/src/bin/e_fm.c	2011-11-25 07:47:57 UTC (rev 65593)
@@ -6261,13 +6261,6 @@
                      x = ev->x + (ic->x - ox) - ic->drag.x + sd->pos.x - sd->x;
                      y = ev->y + (ic->y - oy) - ic->drag.y + sd->pos.y - sd->y;
                    
-                   printf("drop ev x, y: %i %i \n", ev->x, ev->y);
-                   printf("ic x, y: %i %i \n", ic->x, ic->y);
-                   printf("orig x, y: %i %i \n", ox, oy);
-                   printf("ic->drag x, y: %i %i \n", ic->drag.x, ic->drag.y);
-                   printf("sd->pos x, y: %i %i \n", sd->pos.x, sd->pos.y);
-                   printf("x, y of drop: %i %i \n", x, y);
-
                      if (x < 0) x = 0;
                      if (y < 0) y = 0;

Log:
man that has annoyed me for AGES.. that uselss space at the bottom of
  efm views! argh! fix! disable it!
  
  

Author:       raster
Date:         2011-11-25 00:07:12 -0800 (Fri, 25 Nov 2011)
New Revision: 65594
Trac:         http://trac.enlightenment.org/e/changeset/65594

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-11-25 07:47:57 UTC (rev 65593)
+++ trunk/e/src/bin/e_fm.c	2011-11-25 08:07:12 UTC (rev 65594)
@@ -4122,29 +4122,29 @@
      {
       case E_FM2_VIEW_MODE_ICONS:
         _e_fm2_icons_place_icons(sd);
-	sd->max.h += ICON_BOTTOM_SPACE;
+//	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;
+//	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;
+//	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;
+//	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;
+//	sd->max.h += ICON_BOTTOM_SPACE;
         break;
 
       case E_FM2_VIEW_MODE_LIST:

Log:
fix sub object add for e widgets... will be happy to let elm do this
  in future :)
  
  

Author:       raster
Date:         2011-11-28 03:40:18 -0800 (Mon, 28 Nov 2011)
New Revision: 65644
Trac:         http://trac.enlightenment.org/e/changeset/65644

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

Modified: trunk/e/src/bin/e_widget.c
===================================================================
--- trunk/e/src/bin/e_widget.c	2011-11-28 10:21:55 UTC (rev 65643)
+++ trunk/e/src/bin/e_widget.c	2011-11-28 11:40:18 UTC (rev 65644)
@@ -141,7 +141,7 @@
 {
    API_ENTRY return;
    
-   if (eina_list_data_find(sd->subobjs, obj)) return;
+   if (eina_list_data_find(sd->subobjs, sobj)) return;
    
    evas_object_event_callback_del(sobj, EVAS_CALLBACK_DEL, _sub_obj_del);
    
@@ -514,19 +514,13 @@
 _e_smart_del(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   void *po = NULL;
    
    if (sd->del_func) sd->del_func(obj);
    while (sd->subobjs)
      {
-        if (sd->subobjs->data == po)
-          {
-             po = sd->subobjs->data;
-             sd->subobjs = eina_list_remove_list(sd->subobjs, sd->subobjs);
-             continue;
-          }
-        po = sd->subobjs->data;
-        evas_object_del(sd->subobjs->data);
+        Evas_Object *sobj = sd->subobjs->data;
+        evas_object_del(sobj);
+        sd->subobjs = eina_list_remove(sd->subobjs, sobj);
      }
    free(sd);
 }

Log:
oh dear.. more icon bottom space stuff in efm. fix!
  
  

Author:       raster
Date:         2011-11-28 04:18:58 -0800 (Mon, 28 Nov 2011)
New Revision: 65648
Trac:         http://trac.enlightenment.org/e/changeset/65648

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

Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c	2011-11-28 12:06:50 UTC (rev 65647)
+++ trunk/e/src/bin/e_fm.c	2011-11-28 12:18:58 UTC (rev 65648)
@@ -5132,7 +5132,7 @@
 
         if (
           ((ic->y - ic->sd->pos.y) >= 0) &&
-          ((ic->y + ic->h + ICON_BOTTOM_SPACE - 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))
           )
@@ -5145,8 +5145,8 @@
         y = ic->sd->pos.y;
         if ((ic->y - ic->sd->pos.y) < 0)
           y = ic->y;
-        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;
+        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);

Log:
well now this uses eeze - why keep the old search list?
  
  

Author:       raster
Date:         2011-12-05 22:49:58 -0800 (Mon, 05 Dec 2011)
New Revision: 65947
Trac:         http://trac.enlightenment.org/e/changeset/65947

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

Modified: trunk/e/src/bin/e_backlight_main.c
===================================================================
--- trunk/e/src/bin/e_backlight_main.c	2011-12-06 06:31:45 UTC (rev 65946)
+++ trunk/e/src/bin/e_backlight_main.c	2011-12-06 06:49:58 UTC (rev 65947)
@@ -33,24 +33,6 @@
    return 0;
 }
 
-/* local subsystem globals */
-typedef struct _Bl_Entry
-{
-   char type;
-   const char *base;
-   const char *max;
-   const char *set;
-} Bl_Entry;
-
-static const Bl_Entry search[] =
-{
-   { 'F', "/sys/devices/virtual/backlight/acpi_video0", "max_brightness", "brightness" },
-   { 'D', "/sys/devices/virtual/backlight", "max_brightness", "brightness" },
-   { 'F', "/sys/class/leds/lcd-backlight", "max_brightness", "brightness" },
-   { 'F', "/sys/class/backlight/acpi_video0", "max_brightness", "brightness" },
-   { 'D', "/sys/class/backlight",