Changeset 244

Timestamp:

Mar 10, 2007, 12:11:43 PM (18 years ago)

Author:

cinc

Message:

Implemented methods to add/remove objects to/from folders (and folder windows).

Location:

trunk/desktop

Files:

• class_c/wpfilesystem.c (modified) (1 diff)
• class_c/wpfolder.c (modified) (17 diffs)
• class_c/wpfolderwindow.c (modified) (3 diffs)
• class_c/wpobject.c (modified) (6 diffs)
• idl/wpfolder.idl (modified) (2 diffs)
• idl/wpnativetypes.idl (modified) (1 diff)
• idl/wpobject.idl (modified) (1 diff)
• include/desktoptypes.h (modified) (2 diffs)

trunk/desktop/class_c/wpfilesystem.c

@@ -105 +105 @@
 {
 /* WPFileSystemData* nomThis=WPFileSystemGetData(nomSelf); */
-
+  g_message("  %s", __FUNCTION__);
   return WPFileSystem_wpMoveObject_parent(nomSelf, wpTargetFolder,  ev);
   return FALSE;

trunk/desktop/class_c/wpfolder.c

@@ -77 +77 @@
 #include "nomdraginfo.h"
 
+/*
+  This struct is associated with the key in the contents tree of the
+  folder.
+ */
 typedef struct _FLDRGTREEVALUE
 {
   PGTree pGTree;
   WPObject* wpObject;
-  gchar* chrKey;
+  gchar* chrKey; /* <-- is this really needed? */
 }FLDRGTREEVALUE, *PFLDRGTREEVALUE;
 
@@ -95 +99 @@
 };
 
+/*************** Local vars ************************************/
+
+/* This ID is used as a namespace */
+static nomId WPFolderNomId;
+
+/***************************************************************/
+
+
+/* 
+   Private function to create the store with the data for displaying
+   objects in the icon view. 
+*/
 static GtkListStore * fldr_CreateStore (void)
 {
@@ -104 +120 @@
                               G_TYPE_STRING, 
                               GDK_TYPE_PIXBUF);
-  // g_message("%s: store: %x", __FUNCTION__, (UINT) store);
   return store;
 }
 
-/*************** Local vars ************************************/
-
-/* This ID is used as a namespace */
-static nomId WPFolderNomId;
-
-/***************************************************************/
+
 /*
   The folder is already populated, that means the internal folder list
@@ -122 +132 @@
 gboolean fillStoreTraverseFunc(gpointer pKey, gpointer pTraverseValue, gpointer pData)
 {
-  GtkTreeIter iter;
+  WPFolder* wpFolder=(PWPFolder)pData;
   PFLDRGTREEVALUE pValue=pTraverseValue;
-  gchar * display_name;
-  GtkListStore *store=(GtkListStore *)pData;
-  WPObject* wpObject;
-    
-  //  g_message("In %s with %s %x", __FUNCTION__, (char*)pKey, (UINT)pValue->wpObject);
-
-#warning !!!!! Use Title here !!!!!
-  display_name=g_strdup(pKey); /* New string necessary? */  
-
-  wpObject=pValue->wpObject;
-  
-  if(nomIsObj(wpObject)){
-#if 0
-    g_message("%d %s : %s, %s",
-              __LINE__, __FUNCTION__, (char*)pKey,
-              NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE), NULLHANDLE));
-#endif
-    
-    gtk_list_store_append (store, &iter);
-    
-    gtk_list_store_set (store, &iter,
-                        COL_OBJECT_PTR, wpObject,
-                        COL_PATH, "",
-                        COL_DISPLAY_NAME, display_name,
-                        COL_PIXBUF, _wpQueryIcon(wpObject, NULLHANDLE),
-                        -1);
-  }
-  return FALSE; /* Traverse every item */
-}
+
+  WPFolder_wpAddToStore(wpFolder, pValue->wpObject,
+                        NULLHANDLE);
+  return FALSE;
+}
+
 
 static gboolean
-fldr_fillStore (WPFolder* nomSelf, GtkListStore *store, const gchar* gchrPath)
+fldr_fillStore (WPFolder* nomSelf, GtkListStore *store)
 {
   WPFolderData* nomThis=WPFolderGetData(nomSelf); 
 
   /* First clear the store */
-  gtk_list_store_clear (store);
-
-  g_tree_foreach(_fldrObjects, (GTraverseFunc) fillStoreTraverseFunc, store);
+  if(_pListStore)
+    gtk_list_store_clear (_pListStore);
+
+  /* Go over all objects in the folder */
+  g_tree_foreach(_fldrObjects, (GTraverseFunc) fillStoreTraverseFunc, nomSelf);
 
   return TRUE;
@@ -168 +157 @@
 
 
+/**
+   Implementation for method wpAddToContent().
+
+   Each folder has a balanced binary tree (GTree) holding all the objects in it.
+   The key one may use to search the tree is the name of an object. The associated
+   data is a struct holding some more info e.g. the GTree* pointer.
+   Using the name as the key allows to quickly check for duplicates.
+
+   \sa wpAddToContent()
+ */
 NOM_Scope gulong NOMLINK impl_WPFolder_wpAddToContent(WPFolder* nomSelf, const PWPObject wpObject, 
                                                       const CORBA_char * chrFileName, CORBA_Environment *ev)
@@ -177 +176 @@
   pValue->pGTree=_fldrObjects;
   pValue->wpObject=wpObject;
-  pValue->chrKey=g_strdup(chrFileName);
+  pValue->chrKey=NOMPath_copyCString( WPFileSystem_wpQueryFileName(wpObject, FALSE, NULLHANDLE)
+                                      , NULLHANDLE);
 
   g_tree_insert(_fldrObjects, pValue->chrKey, pValue);
 
-#if 0
-  PFLDRGTREEKEY pKey;
-  pKey=(PFLDRGTREEKEY)NOMMalloc(sizeof(FLDRGTREEKEY));
-  pKey->pGTree=_fldrObjects;
-  pKey->chrKey=chrFileName;
-  g_tree_insert(_fldrObjects, pKey, wpObject);
-#endif
-
   return 0;
 }
 
+
+static gboolean fldrPrintListFunc(gpointer key, gpointer pValue, gpointer data)
+{
+
+  g_message("%s: key %x (%s), value %x, data %d", __FUNCTION__, key, key, pValue, data);
+  return FALSE;
+}
+
+static void fldrPrintContentsList(GTree* fldrObjects)
+{
+  g_tree_foreach(fldrObjects, (GTraverseFunc) fldrPrintListFunc, (gpointer)123); 
+}
+
+
 NOM_Scope PWPObject NOMLINK impl_WPFolder_wpQueryContent(WPFolder* nomSelf, CORBA_Environment *ev)
 {
-/* WPFolderData* nomThis=WPFolderGetData(nomSelf); */
+  WPFolderData* nomThis=WPFolderGetData(nomSelf);
+
+  fldrPrintContentsList(_fldrObjects);
 
   return NULLHANDLE;
+}
+
+NOM_Scope CORBA_boolean NOMLINK impl_WPFolder_wpDeleteFromContent(WPFolder* nomSelf,
+                                                                  const PWPObject wpObject,
+                                                                  CORBA_Environment *ev)
+{
+  WPFolderData* nomThis=WPFolderGetData(nomSelf);
+
+  /* The destroy function isn't called here. That doesn't matter because the GC
+     will delete our data struct. If we ever have some stuff in the struct which
+     needs freeing we have to think again because the destroy function used by
+     g_tree_remove() will reinsert any object coming by so g_tree_remove() can't
+     be used. */
+  g_tree_steal(_fldrObjects, NOMPath_queryCString(WPFileSystem_wpQueryFileName(wpObject, FALSE, NULLHANDLE),
+                                                  NULLHANDLE));
+
+
+  return TRUE;
+}
+
+
+NOM_Scope PUSEITEM NOMLINK impl_WPFolder_wpAddToStore(WPFolder* nomSelf, const PWPObject wpObject,
+                                                              CORBA_Environment *ev)
+{
+  WPFolderData* nomThis=WPFolderGetData(nomSelf);
+  PUSEITEM pui;
+  ULONG ulError;
+  GtkTreeIter iter;
+  gchar * display_name;
+
+  if(!nomIsObj(wpObject))
+    return NULLHANDLE;
+
+  if(!_pListStore)
+    return NULLHANDLE;
+
+#warning !!!!! Use Title here? !!!!!
+  display_name=NOMPath_copyCString(WPFileSystem_wpQueryFileName(wpObject, FALSE, NULLHANDLE),
+                                   NULLHANDLE);/* Do we need a copy here? */
+
+  gtk_list_store_append (_pListStore, &iter);
+  gtk_list_store_set (_pListStore, &iter,
+                      COL_OBJECT_PTR, wpObject,
+                      COL_PATH, "",
+                      COL_DISPLAY_NAME, display_name,
+                      COL_PIXBUF, _wpQueryIcon(wpObject, NULLHANDLE),
+                      -1);
+
+  /* Insert a STOREITEM into the objects inuse inuse list to track in which stores
+     the object lives. This item is later used when an object must be removed from
+     a folder window. */
+  pui=(PUSEITEM)_wpAllocMem(wpObject, sizeof(USEITEM)+sizeof(STOREITEM), &ulError, NULLHANDLE);
+  /* Fill the structures */
+  pui->type=(gulong)USAGE_STORE;
+  pui->wpObject=(PWPObject)wpObject;
+  pui++;
+  ((STOREITEM*)pui)->treeIter=iter;
+  ((STOREITEM*)pui)->pListStore=_pListStore;
+  pui--;
+  /* Object list not the one of the folder */
+  WPObject_wpAddToObjUseList(wpObject, pui, NULLHANDLE);
+
+  return pui;
+}
+
+
+NOM_Scope PUSEITEM NOMLINK impl_WPFolder_wpDeleteFromStore(WPFolder* nomSelf, const PWPObject wpObject,
+                                                           CORBA_Environment *ev)
+{
+  WPFolderData* nomThis=WPFolderGetData(nomSelf); 
+  PUSEITEM pui;
+
+  /* Remove the object from the folder window. That means from the store. */
+  if(_pListStore)
+    {
+      /* Each object which is added to a store */
+      pui=_wpFindUseItem(wpObject, USAGE_STORE,
+                         NULLHANDLE, NULLHANDLE);
+      while(pui){
+        GtkTreeIter iter;
+        pui++;
+        iter=((STOREITEM*)pui)->treeIter;
+        if(((STOREITEM*)pui)->pListStore==_pListStore)
+          {
+            pui--;
+            gtk_list_store_remove( _pListStore, &iter);
+            _wpDeleteFromObjUseList(wpObject, pui, NULLHANDLE);
+            //_wpFreeMem(wpObject, pui, NULLHANDLE);
+            break;
+          }
+        pui--;
+        pui=_wpFindUseItem(wpObject, USAGE_STORE,
+                           pui, NULLHANDLE);
+      }
+    }
+  return pui;
 }
 
@@ -210 +314 @@
   const gchar* gchrPath;
   PNOMPath fldrPath;
-
-  //  g_log("WPFolder", G_LOG_LEVEL_DEBUG, "%s: Populating %s (0x%x)\n", __FUNCTION__, pszPath, (UINT)nomSelf);
 
   /* Already populated? */
@@ -236 +338 @@
           WPObject* wpObject;
 
+          /* Filenames are in a special encoding with GLib */
           path = g_build_filename (gchrPath, gchrCurrentEntry, NULL);
 
+          /* The name to show to the user */
           display_name = g_filename_to_utf8 (gchrCurrentEntry, -1, NULL, NULL, NULL);
 
@@ -251 +355 @@
           if(nomIsObj((PNOMObject)wpObject))
             {
+              /* First ref living as long as the folder is awake */
               WPObject_wpLockObject(wpObject, NULLHANDLE);
               WPObject_wpSetTitleFromCString(wpObject, display_name, NULLHANDLE);
@@ -281 +386 @@
 /*
   This will change when NOMFolderWindow is migrated to WPFolderWindow.
+  
+  This delete handler is called when the folder window is closed. It removes
+  the view item from the folders inuse list.
  */
 static
@@ -301 +409 @@
   /* Remove the open folder view from the inuse list */
   WPObject_wpDeleteFromObjUseList(wpObject, pUseItem, NULLHANDLE);
+
+  _wpFreeMem(wpObject, pUseItem, NULLHANDLE);
 
   return FALSE; /* Let other handlers run */
@@ -331 +441 @@
             WPFolderWindow * wpFldrWindow;
             gchar* pszPath;
-            PPRIVFOLDERDATA priv;
-            GtkListStore* gStore;
+            //    PPRIVFOLDERDATA priv;
+            //    GtkListStore* gStore;
             GtkIconView*  gtkIconView;
 
             pszPath=NOMPath_queryCString(_wpQueryFileName(nomSelf, TRUE, NULLHANDLE), NULLHANDLE);
             g_message("%d %s, %s", __LINE__, __FUNCTION__, pszPath);
+            /* Create the internal list of objects and make all these objects awake */
             WPFolder_wpPopulate(nomSelf, 0L, pszPath, FALSE,  NULLHANDLE);
             
-            
+            /* The folder window holding the objects */
             wpFldrWindow=WPFolder_wpCreateFolderWindow(nomSelf, NULLHANDLE);
             
-            /* Insert it into inuse list */
+            /* Insert it into inuse list... */
             pui=(PUSEITEM)WPFolder_wpAllocMem(nomSelf, sizeof(USEITEM)+sizeof(VIEWITEM), &ulError, NULLHANDLE);
             /* Fill the structures */
@@ -352 +463 @@
             ((VIEWITEM*)pui)->nameSpaceId=WPFolderNomId;
             pui--;
-
             /* Make sure the view item is removed when the window is closed */
-            g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpFldrWindow, NULLHANDLE)),"delete-event", 
+            g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpFldrWindow, NULLHANDLE)),
+                             "delete-event", 
                              G_CALLBACK(tempWPWindowDeleteHandler), (gpointer) pui);
             WPFolder_wpAddToObjUseList(nomSelf, pui, NULLHANDLE);
-            
+
+#if 0            
             /* Now create a folder store and insert icons into the window */
             priv=_privFolderData;
-            gStore=priv->gstoreFldContents;
-            
+            gStore=priv->gstoreFldContents;            
             if(!gStore)
               {
@@ -375 +486 @@
                   return FALSE;
               }
-
             gtkIconView=WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, NULLHANDLE);
-
             gtk_icon_view_set_model(GTK_ICON_VIEW (gtkIconView),
                                     GTK_TREE_MODEL (priv->gstoreFldContents));
+#endif
+            if(!_pListStore)
+              {
+                
+                if(( _pListStore=fldr_CreateStore())==NULLHANDLE){
+                  g_warning("%s: Can't create store.", __FUNCTION__);
+                  return FALSE;
+                }
+                /* Fill our store */
+                fldr_fillStore(nomSelf, _pListStore);
+              }
+
+            gtkIconView=WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, NULLHANDLE);
+            
+            gtk_icon_view_set_model(GTK_ICON_VIEW (gtkIconView),
+                                    GTK_TREE_MODEL (_pListStore));            
 
             /* We now set which model columns that correspond to the text
@@ -641 +766 @@
   /* This balanced binary tree holds the objects in this folder. We create a tree
      which may be searched using the name of the file/directory */
-  //_fldrObjects=g_tree_new((GCompareFunc)strcmp);
-  _fldrObjects=g_tree_new_full((GCompareFunc)strcmp, nomSelf, NULL,
+  _fldrObjects=g_tree_new_full((GCompareDataFunc)strcmp, nomSelf, NULL,
                                (GDestroyNotify) fldrCatchDuplicates);
 }
@@ -668 +792 @@
     return 0;
 
+  /* That's the action the user selected by pressing a key during drop */
   gda=NOMDragInfo_queryChosenDropAction(nomDragInfo, NULLHANDLE);
 
@@ -693 +818 @@
             break;
           }
+          /* Copy shouldn't be default I guess... */
         default:
           {

trunk/desktop/class_c/wpfolderwindow.c

@@ -142 +142 @@
             /* Click on an icon */
             
-            g_message("%s: %s", __FUNCTION__, gtk_tree_path_to_string(treePath));
+            //g_message("%s: %s", __FUNCTION__, gtk_tree_path_to_string(treePath));
             
             model=gtk_icon_view_get_model(GTK_ICON_VIEW(widget));
-            g_message("%s: model: %x", __FUNCTION__, (UINT)model);
+            //g_message("%s: model: %x", __FUNCTION__, (UINT)model);
             
-            gtk_tree_model_get_iter(model , &iter, treePath);            
+            gtk_tree_model_get_iter(model , &iter, treePath);     
+            //g_message("%s: iter.stamp: %x %x %x %x", __FUNCTION__, (UINT)iter.stamp, (UINT) iter.user_data
+            //        , (UINT)iter.user_data2, (UINT)iter.user_data3);       
             gtk_tree_model_get(model, &iter, 0, &wpObject, -1);
 
@@ -236 +238 @@
     }
   rc=WPObject_wpDragOver(wpObject, wgtThis, nomDragInfo, NULL);
-  g_message("rc: %d", rc);
+
   if(dragContext->targets)
     {
@@ -544 +546 @@
                     guint uiTargetInfo, guint t, gpointer ptrUserData)
 {
-  DosBeep(100, 100);
+  
   g_message("%s", __FUNCTION__);
-  g_message("  info: %d, userData: %x", uiTargetInfo, ptrUserData);
+  //  g_message("  info: %d, userData: %x", uiTargetInfo, ptrUserData);
 
   switch(uiTargetInfo)

trunk/desktop/class_c/wpobject.c

@@ -250 +250 @@
             //g_message("   in %s wpNoteBook: %lx pui %lx", __FUNCTION__, wpNoteBook, pui);
             /* Make sure the view item is removed when the window is closed */
-            g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpNoteBook, NULLHANDLE)),"delete-event", 
+            g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpNoteBook, NULLHANDLE)),
+                             "delete-event", 
                              G_CALLBACK(defaultWPWindowDeleteHandler), (gpointer) pui);
             WPObject_wpAddToObjUseList(nomSelf, pui, ev);
@@ -418 +419 @@
   else{
     pUseItem=(PUSEITEM)pCurrentItem;
-    pUseItem--;
+    pUseItem--; /* Note that VIEWITEM comes after the USEITEM structure */
     pUseItem=WPObject_wpFindUseItem(nomSelf, USAGE_OPENVIEW,  pUseItem, ev);
   }
@@ -426 +427 @@
       ++pUseItem;
       pViewItem=(PVIEWITEM)pUseItem;
-      pUseItem--;
+      pUseItem--; /* Note that VIEWITEM comes after the USEITEM structure */
       //g_message("        a in %s %d", __FUNCTION__, flViews);
       if((pViewItem->ulView == ulView) && (pViewItem->nameSpaceId==nameSpaceId))
@@ -811 +812 @@
 }
 
+
 NOM_Scope CORBA_boolean NOMLINK impl_WPObject_wpMoveObject(WPObject* nomSelf,
                                                            const PWPFolder wpTargetFolder,
@@ -816 +818 @@
 {
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
-  g_message("Calling %s, not implemented yet", __FUNCTION__);
+  WPFolder * wpFolder;
+  PUSEITEM pui;
+
+  if(!nomIsObj(wpTargetFolder))
+    return FALSE;
+
+  /* Get folder holding the object */
+  wpFolder=WPObject_wpQueryFolder(nomSelf, NULLHANDLE);
+
+  g_message("Parent folder is %s", 
+            NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE),
+                                 NULLHANDLE));
+
+  /* Remove it from the parent folders content list. */
+  WPFolder_wpDeleteFromContent(wpFolder, nomSelf, NULLHANDLE);
+
+  /* Remove it from the folders model thus any folder window. */
+  pui=_wpDeleteFromStore(wpFolder, nomSelf, NULLHANDLE);
+  _wpFreeMem(nomSelf, pui, NULLHANDLE);
+
+  g_message("Target folder is %s", 
+            NOMPath_queryCString(WPFolder_wpQueryFileName(wpTargetFolder, TRUE, NULLHANDLE),
+                                 NULLHANDLE));
+
+  /* Insert into the new folder */
+  _wpAddToContent(wpTargetFolder, nomSelf, NULLHANDLE, NULLHANDLE);
+  _wpAddToStore(wpTargetFolder, nomSelf, NULLHANDLE);
 
   return FALSE;
@@ -828 +856 @@
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
 
-  g_message("Calling %s, not implmnted yet", __FUNCTION__);
+  g_message("Calling %s, not implmented yet", __FUNCTION__);
+
   return FALSE;
 }

trunk/desktop/idl/wpfolder.idl

@@ -67 +67 @@
   PWPObject wpQueryContent();
 
+  /**
+     Delete an object from the internal list of objects held by
+     the folder.
+
+     \param wpObject The object to be removed.
+
+     \return TRUE on success FALSE otherwise.
+
+     \sa wpQueryContents(), wpAddToContents()
+   */
+  boolean wpDeleteFromContent(in PWPObject wpObject);
+
+  PUSEITEM wpAddToStore(in PWPObject wpObject);
+  PUSEITEM wpDeleteFromStore(in PWPObject wpObject);
+
   NOMOVERRIDE(wpInitData);
   NOMOVERRIDE(wpOpen);
@@ -72 +87 @@
   NOMOVERRIDE(wpQueryDefaultView);
   NOMOVERRIDE(wpDragOver);
+  NOMOVERRIDE(wpDrop);
 
   NOMINSTANCEVAR(PPRIVFOLDERDATA privFolderData); /* This will go away... */
   NOMINSTANCEVAR(PGTree fldrObjects);
   NOMINSTANCEVAR(gulong ulFldrFlags);
+  NOMINSTANCEVAR(PGtkListStore pListStore);
 };
 

trunk/desktop/idl/wpnativetypes.idl

@@ -43 +43 @@
 native PUSEITEM;  /* For inuse list */
 native PVIEWITEM; /* For inuse list */
+native PGtkListStore;
 
 #endif /* WPFOLDERTYPES_IDL_INCLUDED */

trunk/desktop/idl/wpobject.idl

@@ -89 +89 @@
      will be collected later.
 
-     \par How to override:
-     This method is usually not overriden.
-
-     \param pByte Block of memory to be freed.
+     \remark It is save to call this method with a NULL memory pointer.
+
+     \par How to override:
+     This method is usually not overriden.
+
+     \param pByte Block of memory to be freed. This may be NULL.
      \return TRUE if successful.
 

trunk/desktop/include/desktoptypes.h

@@ -44 +44 @@
  } VIEWITEM, *PVIEWITEM;
 
+/* USAGE_STORE */
+typedef struct _STOREITEM {
+  GtkTreeIter    treeIter;
+  GtkListStore  *pListStore;
+}STOREITEM, *PSTOREITEM;
 
 #define USAGE_MEMORY          1
 #define USAGE_OPENVIEW        5
+#define USAGE_STORE           7
 
 #define OPEN_DEFAULT          0
@@ -84 +90 @@
 typedef GSList *PGSList;
 typedef GMutex *PGMutex;
-
+typedef GtkListStore  *PGtkListStore;
 /* Errors */ 
 #define NOMERROR_NOT_ENOUGH_MEMORY 8