Changeset e74f5abccbef74c6b76383e022750bfc7ea3e488

Timestamp:

03/13/10 20:58:33 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

66503b08c16d4d8b2529bd27e8e8b23c007a09ed

Parents:

50eb4581ce0c5073a949d45995032a5b0d447c16

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-03-13T20:58:33Z+0200

Message:

gui: add/remove room graph views on room appear/disappear

Location:

gui

Files:

• graph_view.c (modified) (1 diff)
• graph_view.h (modified) (2 diffs)
• main.c (modified) (1 diff)
• world_tree.c (modified) (1 diff)
• world_tree.h (modified) (2 diffs)

gui/graph_view.c

@@ -252 +252 @@
 }
 
+const char * get_view_opath(graph_view_handle view)
+{
+  return graph_proxy_get_object(view_ptr->graph);
+}
+
 bool set_view_name(graph_view_handle view, const char * cname)
 {

gui/graph_view.h

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
@@ -48 +48 @@
 void activate_view(graph_view_handle view);
 const char * get_view_name(graph_view_handle view);
+const char * get_view_opath(graph_view_handle view);
 bool set_view_name(graph_view_handle view, const char * name);
 canvas_handle get_current_canvas();

gui/main.c

@@ -1068 +1068 @@
 static void room_appeared(const char * opath, const char * name, const char * template)
 {
+  graph_view_handle graph_view;
+
   log_info("room \"%s\" appeared (%s). template is \"%s\"", name, opath, template);
+
+  if (!create_view(name, SERVICE_NAME, opath, true, false, false, &graph_view))
+  {
+    log_error("create_view() failed for room \"%s\"", name);
+  }
 }
 
 static void room_disappeared(const char * opath, const char * name, const char * template)
 {
+  graph_view_handle graph_view;
+
   log_info("room \"%s\" disappeared (%s). template is \"%s\"", name, opath, template);
+
+  graph_view = world_tree_find_by_opath(opath);
+  if (graph_view == NULL)
+  {
+    log_error("Unknown room disappeared");
+    return;
+  }
+
+  destroy_view(graph_view);
 }
 

gui/world_tree.c

@@ -466 +466 @@
 }
 
+graph_view_handle world_tree_find_by_opath(const char * opath)
+{
+  gint type;
+  graph_view_handle view;
+  GtkTreeIter iter;
+
+  if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(g_treestore), &iter))
+  {
+    do
+    {
+      gtk_tree_model_get(GTK_TREE_MODEL(g_treestore), &iter, COL_TYPE, &type, COL_VIEW, &view, -1);
+      if (type == entry_type_view)
+      {
+        if (strcmp(get_view_opath(view), opath) == 0)
+        {
+          return view;
+        }
+      }
+    }
+    while (gtk_tree_model_iter_next(GTK_TREE_MODEL(g_treestore), &iter));
+  }
+
+  return NULL;
+}
+
 static bool find_view(graph_view_handle view, GtkTreeIter * iter_ptr)
 {

gui/world_tree.h

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2008, 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2008, 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
@@ -34 +34 @@
 void world_tree_add(graph_view_handle view, bool force_activate);
 void world_tree_remove(graph_view_handle view);
+graph_view_handle world_tree_find_by_opath(const char * opath);
 void world_tree_activate(graph_view_handle view);
 void world_tree_name_changed(graph_view_handle view);