Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_border.c e_border.h 


Log Message:


ping stuff now can emit a hung/unhung signal to window borders and delete of
windows if hung will revert to a kill of the pid if it can (or the client) if
the app gets hung after 10 secs of waiting (should make this a config option
though)

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -3 -r1.276 -r1.277
--- e_border.c  20 Jun 2005 08:56:54 -0000      1.276
+++ e_border.c  22 Jun 2005 06:28:46 -0000      1.277
@@ -79,6 +79,7 @@
 static void _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int 
key);
 static void _e_border_menu_cb_close(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_iconify(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_border_menu_cb_kill(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_maximize(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_shade(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item 
*mi);
@@ -117,6 +118,7 @@
 
 static int  _e_border_cb_focus_fix(void *data);
 static int  _e_border_cb_ping_timer(void *data);
+static int  _e_border_cb_kill_timer(void *data);
 
 static char *_e_border_winid_str_get(Ecore_X_Window win);
     
@@ -1668,9 +1670,16 @@
 void
 e_border_act_kill_begin(E_Border *bd)
 {
-   ecore_x_kill(bd->client.win);
+   if (bd->client.netwm.pid != 0)
+     {
+       kill(bd->client.netwm.pid, SIGINT);
+       bd->kill_timer = ecore_timer_add(10.0, _e_border_cb_kill_timer, bd);
+     }
+   else
+     {
+       ecore_x_kill(bd->client.win);
+     }
    e_border_hide(bd, 0);
-   e_object_del(E_OBJECT(bd));
 }
 
 /* FIXME: Prefer app icon or own icon? */
@@ -1815,6 +1824,11 @@
        ecore_timer_del(bd->dangling_ref_check);
        bd->dangling_ref_check = NULL;
      }
+   if (bd->kill_timer)
+     {
+       ecore_timer_del(bd->kill_timer);
+       bd->kill_timer = NULL;
+     }
    if (bd->ping_timer)
      {
        ecore_timer_del(bd->ping_timer);
@@ -4629,6 +4643,16 @@
    e_menu_item_separator_set(mi, 1);
 
    mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Kill"));
+   e_menu_item_callback_set(mi, _e_border_menu_cb_kill, bd);
+   e_menu_item_icon_edje_set(mi, 
+                            (char *)e_theme_edje_file_get("base/theme/borders",
+                                                          
"widgets/border/default/kill"),
+                            "widgets/border/default/kill");
+   mi = e_menu_item_new(m);
+   e_menu_item_separator_set(mi, 1);
+   
+   mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Shaded"));
    e_menu_item_check_set(mi, 1);
    e_menu_item_toggle_set(mi, (bd->shaded ? 1 : 0));
@@ -4769,6 +4793,15 @@
 }
 
 static void
+_e_border_menu_cb_kill(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   E_Border *bd;
+
+   bd = data;
+   e_border_act_kill_begin(bd);
+}
+
+static void
 _e_border_menu_cb_maximize(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Border *bd;
@@ -5264,24 +5297,43 @@
    bd = data;
    if (bd->ping_ok)
      {
-       /* FIXME: if hung, reset hung state to normal */
-       e_border_ping(bd);
+       if (bd->hung)
+         {
+            bd->hung = 0;
+            edje_object_signal_emit(bd->bg_object, "unhung", "");
+         }
      }
    else
      {
-       /* FIXME: if !hung, set hung state then... */
-       if (bd->delete_requested)
+       if (!bd->hung)
          {
-            printf("DELETE REQ HUNG: BORDER %p [%s] not responding to 
ping!!!!\n",
-                   bd, bd->client.icccm.title);
+            bd->hung = 1;
+            edje_object_signal_emit(bd->bg_object, "hung", "");
+            /* if dialog is up - hide it now */
          }
-       else
+       if (bd->delete_requested)
          {
-            printf("HUNG APP: BORDER %p [%s] not responding to ping!!!!\n",
+            /* FIXME: pop up dialog saying app is hung - kill client, or pid */
+            printf("DELETE REQ HUNG: BORDER %p [%s] not responding to 
ping!!!!\n",
                    bd, bd->client.icccm.title);
+            e_border_act_kill_begin(bd);
          }
      }
-   return 1;
+   bd->ping_timer = NULL;
+   e_border_ping(bd);
+   return 0;
+}
+
+static int
+_e_border_cb_kill_timer(void *data)
+{
+   E_Border *bd;
+   
+   bd = data;
+   if (bd->client.netwm.pid != 0)
+     kill(bd->client.netwm.pid, SIGKILL);
+   bd->kill_timer = NULL;
+   return 0;
 }
 
 static char *
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- e_border.h  20 Jun 2005 08:56:54 -0000      1.81
+++ e_border.h  22 Jun 2005 06:28:46 -0000      1.82
@@ -274,6 +274,7 @@
    unsigned int    button_grabbed : 1;
    unsigned int    delete_requested : 1;
    unsigned int    ping_ok : 1;
+   unsigned int    hung : 1;
    E_Maximize      maximized;
 
    double          ping;
@@ -322,6 +323,7 @@
    E_Action *cur_mouse_action;
    Ecore_Timer *raise_timer;
    Ecore_Timer *ping_timer;
+   Ecore_Timer *kill_timer;
 
    Ecore_Timer *dangling_ref_check;
 };




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to