Changeset 237 for trunk/desktop

Timestamp:

Feb 11, 2007, 4:52:34 PM (19 years ago)

Author:

cinc

Message:

Started drag and drop implementation. Some dox additions.

Location:

trunk/desktop

Files:

• class_c/wpfolder.c (modified) (6 diffs)
• class_c/wpfolderwindow.c (modified) (2 diffs)
• class_c/wpobject.c (modified) (2 diffs)
• class_c/wpwindow.c (modified) (5 diffs)
• dox/examples (added)
• dox/examples/wpsetwpobject.c (added)
• idl/wpfolder.idl (modified) (2 diffs)
• idl/wpobject.idl (modified) (16 diffs)
• idl/wpwindow.idl (modified) (1 diff)

trunk/desktop/class_c/wpfolder.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -341 +341 @@
             
             wpFldrWindow=WPFolder_wpCreateFolderWindow(nomSelf, NULLHANDLE);
-            WPFolderWindow_wpSetWPObject(wpFldrWindow, (WPObject*)nomSelf, NULLHANDLE);
             
             /* Insert it into inuse list */
@@ -470 +469 @@
 }
 
-/*
+enum{
+  WPOBJECT_TARGET_PATH,
+  WPOBJECT_TARGET_OBJECT,
+  WPOBJECT_TARGET_STRING
+};
+
+static GtkTargetEntry targetEntries[]=
+{
+  {"WPObject-path", 0, WPOBJECT_TARGET_PATH},
+  {"WPObject", 0, WPOBJECT_TARGET_OBJECT},
+  {"STRING", 0, WPOBJECT_TARGET_STRING},
+};
+
+static void fldrDragDataReceived(GtkWidget * widget, GdkDragContext* dragContext, int x, int y, GtkSelectionData *seldata,
+                          guint info, guint uiTime, gpointer ptrUserData)
+{
+  DosBeep(5000, 100);
+  g_message("%s", __FUNCTION__);
+  return;
+}
+
+
+
+
+static void fldrDragDataGet(GtkWidget * widget, GdkDragContext* dragContext, GtkSelectionData *seldata,
+                    guint uiInfo, guint t, gpointer ptrUserData)
+{
+  DosBeep(100, 100);
+  g_message("%s", __FUNCTION__);
+  //  gtk_selection_data_set();
+  return;
+}
+
+
+#if 0
+/**
+   Get the WPFolder object from a container widget (icon view). If the object can't be queried
+   NULL is returned.
+   Note that this function checks if the pointer points to a NOMObject so a call to
+   nomIsObj() is not necessary.
+ */
+static PWPFolder fldrQueryWPFolderFromContainer(GtkWidget * wgtThis)
+{
+  GtkWidget* wgtToplevel;
+  PWPFolder wpFolder;
+
+  if((wgtToplevel=gtk_widget_get_toplevel(wgtThis))==NULLHANDLE)
+    return NULLHANDLE;
+
+  if(!GTK_WIDGET_TOPLEVEL(wgtToplevel))
+    return NULLHANDLE;
+
+  wpFolder=(PWPFolder) g_object_get_data(G_OBJECT(wgtToplevel), NOMOBJECT_KEY_STRING);
+  if(nomIsObj(wpFolder))
+    return wpFolder;
+
+  return NULLHANDLE;
+}
+#endif
+
+
+/**
   This method creates the folder window it doesn't query any files or creates
   models and stuff.
@@ -479 +539 @@
   PPRIVFOLDERDATA priv;
   WPFolderData *nomThis = WPFolderGetData(nomSelf);
-
+  
   priv=(PPRIVFOLDERDATA)_privFolderData;
 
   wpFldrWindow=WPFolderWindowNew();
+
+  /* Save a pointer to the desktop folder object */
+  WPFolderWindow_wpSetWPObject(wpFldrWindow, (WPObject*)nomSelf, NULLHANDLE);
 
   /* Connect to the "item_activated" signal */
@@ -489 +552 @@
 
   WPFolderWindow_wpSetWindowTitle(wpFldrWindow, WPFolder_wpQueryTitle(nomSelf, NULLHANDLE), NULLHANDLE);
+
+  /* Prepare drag and drop */
+  gtk_drag_source_set(WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, NULLHANDLE), GDK_BUTTON3_MASK, targetEntries,
+                      G_N_ELEMENTS(targetEntries) ,
+                      GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
+  gtk_drag_dest_set(WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, NULLHANDLE), GTK_DEST_DEFAULT_ALL, targetEntries, 1 ,
+                      GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
+  g_signal_connect(WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, NULLHANDLE),"drag_data_received",
+                   G_CALLBACK(fldrDragDataReceived), NULL);
+  g_signal_connect(WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, NULLHANDLE),"drag_data_get",
+                   G_CALLBACK(fldrDragDataGet), NULL);
 
   /* Show the new window */
@@ -572 +646 @@
 
 
-
-
+/* orbit-idl-c-stubs.c, cs_output_stub line 347 */
+NOM_Scope gulong NOMLINK impl_WPFolder_wpDragOver(WPFolder* nomSelf, const gpointer containerHandle,
+                                                  const gpointer pDragInfo, CORBA_Environment *ev)
+{
+/* WPFolderData* nomThis=WPFolderGetData(nomSelf); */
+
+  return GDK_ACTION_COPY;
+  
+#if 0
+  /* orbit-idl-c-stubs.c, VoyagerWriteProtoForParentCall line 119 */
+  WPFolder_wpDragOver_parent(nomSelf,  ev);
+#endif
+}
+
+

trunk/desktop/class_c/wpfolderwindow.c

@@ -166 +166 @@
 }
 
+static gboolean fldrWindowHandleDragDrop(GtkWidget * widget, GdkDragContext* dragContext, gint x, gint y,
+                         guint t, gpointer ptrUserData)
+{
+  DosBeep(2500, 10);
+  DosBeep(500, 10);
+  DosBeep(2500, 10);
+  g_message("%s", __FUNCTION__);
+  return FALSE;
+}
+
+#if 0
+static void fldrDragLeave(GtkWidget * widget, GdkDragContext* dragContext,
+                          guint t, gpointer ptrUserData)
+{
+  GdkPixmap *pixMapDrag;
+  
+  gdk_pixbuf_render_pixmap_and_mask(pixBufStop, &pixMapDrag, NULL, 128);
+  gdk_window_set_back_pixmap(wgtDrag->window, pixMapDrag, FALSE);
+  g_object_unref(pixMapDrag);
+  gtk_widget_queue_draw(wgtDrag);
+
+  g_message("%s", __FUNCTION__);
+
+  return;
+}
+#endif
+
+static GtkWidget *wgtDrag=NULL;
+
+static GdkPixmap *pixMapDrag=NULL;
+static GdkPixmap *pixMapStop=NULL;
+
+/*
+  Callback which loads a pixmap into the drag widget as soon as it#s realized.
+ */
+static void fldrWidgetRealize(GtkWidget * wgtDrag, gpointer ptrUserData)
+{
+  gdk_window_set_back_pixmap(wgtDrag->window, pixMapDrag, FALSE);
+
+  g_message("%s", __FUNCTION__);
+  return;
+}
+
+static void fldrWindowHandleDragBegin(GtkWidget * widget, GdkDragContext* dragContext,
+                    gpointer ptrUserData)
+{
+  if(NULLHANDLE==wgtDrag)
+    {
+      GdkPixbuf *pixBufDrag;
+      GdkPixbuf *pixBufStop;
+
+      wgtDrag=gtk_window_new(GTK_WINDOW_POPUP);
+
+      /*
+        FIXME:
+        In GTK 2.8 use *_HINT_DND instead.
+       */
+#warning move this somewhere else. Maybe into WPClassMgr 
+      gtk_window_set_type_hint(GTK_WINDOW(wgtDrag), GDK_WINDOW_TYPE_HINT_MENU);
+      gtk_widget_set_app_paintable(GTK_WIDGET(wgtDrag), TRUE);
+
+      pixBufDrag=gtk_widget_render_icon(wgtDrag, GTK_STOCK_DND, GTK_ICON_SIZE_DND, NULL);
+      gdk_pixbuf_render_pixmap_and_mask(pixBufDrag, &pixMapDrag, NULL, 128);
+
+      gtk_widget_set_size_request(wgtDrag, gdk_pixbuf_get_width(pixBufDrag), gdk_pixbuf_get_height(pixBufDrag));
+
+      g_object_unref(pixBufDrag);
+
+      pixBufStop=gtk_widget_render_icon(wgtDrag, GTK_STOCK_STOP, GTK_ICON_SIZE_DND, NULL);
+      gdk_pixbuf_render_pixmap_and_mask(pixBufStop, &pixMapStop, NULL, 128);
+      g_object_unref(pixBufStop);
+
+      if(!pixMapDrag)
+        g_warning("Cannot load pixbuf");
+      if(!pixMapStop)
+        g_warning("Cannot load stop pixbuf");
+
+      //      gdk_pixbuf_render_pixmap_and_mask(pixBufDrag, &pixMapDrag, NULL, 128);
+      //    gdk_window_set_back_pixmap(wgtDrag->window, pixMapDrag, FALSE);
+      //      g_object_unref(pixMapDrag);
+      g_signal_connect_after(GTK_WIDGET(wgtDrag), "realize", G_CALLBACK(fldrWidgetRealize), NULL);
+    }
+  DosBeep(1000, 10);
+  g_message("%s", __FUNCTION__);
+  //  if(wgtDrag->window)
+  //gdk_window_set_back_pixmap(wgtDrag->window, pixMapDrag, FALSE);
+
+  gtk_drag_set_icon_widget(dragContext, wgtDrag, 0, 0);
+
+  return;
+}
+
+static gboolean fldrWindowHandleDragMotion(GtkWidget * wgtThis, GdkDragContext* dragContext, int x, int y, guint t,
+                    gpointer ptrUserData)
+{
+  GtkWidget *wgtSource;
+  GtkTreePath* treePath;
+  PWPFolderWindow pWindow;
+  gulong rc=0;
+  static gulong oldRc=0;
+
+  if(dragContext==NULL)
+    return FALSE;
+
+  if((wgtSource=gtk_drag_get_source_widget(dragContext))==NULLHANDLE)
+    return FALSE;
+
+#if 0
+  if(wgtSource==wgtThis){
+    gdk_drag_status(dragContext, GDK_ACTION_MOVE, t);
+    //    gdk_drag_status(dragContext, 0, t);
+    gtk_drag_highlight(wgtThis);
+  }
+  else{
+    gdk_drag_status(dragContext, GDK_ACTION_COPY, t);
+    gtk_drag_unhighlight(wgtSource);
+  }
+#endif
+
+  treePath=gtk_icon_view_get_path_at_pos(GTK_ICON_VIEW(wgtThis), x, y );
+
+  if(NULL==treePath)
+    {      
+      PWPFolder wpFolder;
+      /* White space */
+
+      pWindow=(WPFolderWindow*)ptrUserData;
+      if(!nomIsObj(pWindow))
+        return FALSE;
+
+      wpFolder=(WPFolder*)WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);     
+
+      if(!nomIsObj(wpFolder))
+        return FALSE;
+
+      rc=WPObject_wpDragOver((WPObject*)wpFolder, wgtThis, dragContext, NULL);
+    }
+  else
+    {
+      GtkTreeIter iter;
+      GtkTreeModel* model;
+      WPObject *wpObject;
+      /* Over an icon */
+      
+      //   g_message("%s: %s", __FUNCTION__, gtk_tree_path_to_string(treePath));
+      //    gtk_icon_view_item_activated(GTK_ICON_VIEW(wgtThis), treePath);
+
+      model=gtk_icon_view_get_model(GTK_ICON_VIEW(wgtThis));
+            
+      gtk_tree_model_get_iter(model , &iter, treePath);            
+      gtk_tree_model_get(model, &iter, 0, &wpObject, -1);
+
+      //TST_OBJECT(wpObject);
+
+      //if(nomIsObj(wpObject))
+      rc=WPObject_wpDragOver((WPObject*)wpObject, wgtThis, dragContext, NULL);
+    }
+
+  if(oldRc!=rc)
+    {
+      /* drag icon */
+      switch(rc)
+        {
+        case 0:
+          {
+            /* Don't drop */    
+            gdk_window_set_back_pixmap(wgtDrag->window, pixMapStop, FALSE);
+            break;
+          }
+        default:
+          {
+            gdk_window_set_back_pixmap(wgtDrag->window, pixMapDrag, FALSE);
+            break;
+          }
+        } 
+      gtk_widget_queue_draw(wgtDrag);
+    }
+  oldRc=rc;
+
+  return FALSE;
+}
+
+
 NOM_Scope void NOMLINK impl_WPFolderWindow_nomInit(WPFolderWindow* nomSelf, CORBA_Environment *ev)
 {
@@ -255 +438 @@
                     G_CALLBACK (fldr_handleButtonEvent), nomSelf);
 
+  /* Handle folder DnD */
+  g_signal_connect(GTK_WIDGET(icon_view),"drag-begin",
+                   G_CALLBACK(fldrWindowHandleDragBegin), nomSelf);
+  g_signal_connect(GTK_WIDGET(icon_view),"drag-motion",
+                   G_CALLBACK(fldrWindowHandleDragMotion), nomSelf);
+  g_signal_connect(GTK_WIDGET(icon_view),"drag-drop",
+                   G_CALLBACK(fldrWindowHandleDragDrop), nomSelf);
+
+
 #if 0
   /* Connect to the "clicked" signal of the "Up" tool button */

trunk/desktop/class_c/wpobject.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -798 +798 @@
 
 
-
-
+NOM_Scope gulong NOMLINK impl_WPObject_wpDragOver(WPObject* nomSelf, const gpointer containerHandle,
+                                                  const gpointer pDragInfo, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+  return 0; /* Don't allow drop */
+}
+
+NOM_Scope gulong NOMLINK impl_WPObject_wpDrop(WPObject* nomSelf, const gpointer containerHandle,
+                                              const gpointer pDragInfo, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+  DosBeep(500, 100);
+  return 0;
+}
+
+

trunk/desktop/class_c/wpwindow.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -53 +53 @@
 #include "wpwindow.ih"
 
+/**
+   This function implements the wpSetWPObject() method of WPWindow. See method description for more
+   info.
+
+   \sa wpQueryWPObject(), wpSetWPObject()
+ */
 NOM_Scope void NOMLINK impl_WPWindow_wpSetWPObject(WPWindow* nomSelf, const PWPObject wpObject, CORBA_Environment *ev)
 {
@@ -59 +65 @@
 }
 
+/**
+   This function implements the wpQueryWPObject() method of WPWindow. See method description for more
+   info.
+
+   \sa wpQueryWPObject(), wpSetWPObject()
+ */
 NOM_Scope PWPObject NOMLINK impl_WPWindow_wpQueryWPObject(WPWindow* nomSelf, CORBA_Environment *ev)
 {
@@ -66 +78 @@
 }
 
+/**
+   This function implements the wpSetWindowTitle() method of WPWindow. See method description for more
+   info.
+
+   \sa wpSetWindowTitle()
+ */
 NOM_Scope void NOMLINK impl_WPWindow_wpSetWindowTitle(WPWindow* nomSelf, const PNOMString newTitle,
                                                       CORBA_Environment *ev)
@@ -75 +93 @@
 }
 
+

trunk/desktop/idl/wpfolder.idl

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -71 +71 @@
   NOMOVERRIDE(wpQueryIcon);
   NOMOVERRIDE(wpQueryDefaultView);
+  NOMOVERRIDE(wpDragOver);
 
   NOMINSTANCEVAR(PPRIVFOLDERDATA privFolderData); /* This will go away... */

trunk/desktop/idl/wpobject.idl

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -73 +73 @@
      is tracked in the objects inuse list.
 
-     \par How to override
+     \par How to override:
      This method is usually not overriden.
 
@@ -89 +89 @@
      will be collected later.
 
-     \par How to override
+     \par How to override:
      This method is usually not overriden.
 
@@ -104 +104 @@
      \remark Desktop classes should override this method instead of nomInit().
 
-     \par How to override
+     \par How to override:
      This method should be overriden by classes which need initialization. The parent
      must be called first.
@@ -129 +129 @@
      taken into account. wpViewObject() should be called most of the time.
 
-     \par How to override
+     \par How to override:
      Desktop objects override this method when they have a private view.
 
@@ -149 +149 @@
      that the method call itself is not.
 
-     \par How to override
+     \par How to override:
      This method is usually not overriden.
 
@@ -163 +163 @@
      that the method call itself is not.
 
-     \par How to override
+     \par How to override:
      This method is usually not overriden.
 
@@ -176 +176 @@
      in a multithreaded environment other threads may alter the use counter at any time.
 
-     \par How to override
+     \par How to override:
      This method is usually not overriden.
 
@@ -187 +187 @@
 
   /**
-
+     Request the object semaphor which protects the objects data structures. For example
+     before changing the in use list of the object the semaphor is aquired to prevent
+     access from several places at the same time.
+
+     \par How to override
+     This method is usually not overriden.
+
+     \return 0 if no error occured. Any other value describes an error.
+
+     \sa wpReleaseObjectMutexSem()
    */
   unsigned long  wpRequestObjectMutexSem(in unsigned long ulReserved);
-  unsigned long  wpReleaseObjectMutexSem();
+
+  /**
+     Release the object semaphor which protects the objects data structures. For example
+     before changing the in use list of the object the semaphor is aquired to prevent
+     access from several places at the same time.
+
+     \par How to override:
+     This method is usually not overriden.
+
+     \return 0 if no error occured. Any other value describes an error.
+
+     \sa wpRequestObjectMutexSem()
+   */
+  unsigned long wpReleaseObjectMutexSem();
 
   void wpSetTitle(in PNOMString pnomStrNewTitle);
@@ -218 +240 @@
      \remark This method should be use in preference to the wpOpen() method.
 
-     \par How to override
+     \par How to override:
      This method is usually not overriden.
 
@@ -235 +257 @@
      Search the objects inuse list for the given view and if found bring it to the front.
 
-     \par How to override
+     \par How to override:
      This method is usually not overriden.
 
@@ -253 +275 @@
      memory used by the object, open views and some more.
 
-     \How to override
-     This method is usually not overriden.
-
-     \param
+     \par How to override:
+     This method is usually not overriden.
+
+
      \return TRUE if success.
 
@@ -267 +289 @@
      memory used by the object, open views and some more.
 
-     \remark The use item will not be freed by this method.
-
-     \par How to override
+     \remark The use item will not be freed by this method. This must be done by the caller.
+
+     \par How to override:
      This method is usually not overriden.
 
@@ -288 +310 @@
   boolean wpSaveImmediate();
 
+  /**
+     Set the information about the folder this object is living in. This method is called for
+     example if the object is moved to another location.
+
+     \par How to override:
+     This method is usually not overriden.
+
+     \param wpParentFolder The folder this object is living in.
+     \return Folder object. Note that this is not a folder view (window).
+
+     \sa wpQueryFolder()
+   */
   void wpSetFolder(in PWPFolder wpParentFolder);
 
@@ -293 +327 @@
      Get the folder this object is living in.
 
-     \return Folder object. Note that this is not a folder view (window)
+     \par How to override:
+     This method is usually not overriden.
+
+     \return Folder object. Note that this is not a folder view (window).
 
      \sa wpSetFolder()
@@ -307 +344 @@
   gulong wpQueryConcurrentView();
 
+  gulong wpDragOver(in gpointer containerHandle, in gpointer pDragInfo);
+
+  gulong wpDrop(in gpointer containerHandle, in gpointer pDragInfo);
   /* Methods overriden by this class */
 

trunk/desktop/idl/wpwindow.idl

@@ -61 +61 @@
   NOMCLASSVERSION(1, 0);
 
+  /**
+     Instances of the WPWindow class (or subclasses of WPWindow) are usually created
+     by desktop classes. For example WPFolderWindow instances (folder views) or
+     WPNoteBook instances (settings notebooks). This method is used so the desktop class
+     can save a pointer to itself for use from within the WPWindow class code.
+  
+     \remark Note that this method is \b not a wrapper around
+     \code 
+     g_object_set_data(G_OBJECT(window), NOMOBJECT_KEY_STRING, nomSelf);
+     \endcode
+     That call is used internally by the WPWindow class to connect a WPWindow instance
+     (nomSelf in this call) with a GTK window.
+
+     \par How to override:
+     This method is usually not overriden.
+
+     \param wpObject The desktop object this window belongs to.
+
+     \par Example:
+     The follwing code is a method implementation of class WPFolder. It creates a new
+     folder window (of class WPFolderWindow) and uses wpSetWPObject() to connect the folder
+     object (nomSelf) with the folder window.
+     \include wpsetwpobject.c
+
+     \sa wpQueryWPObject()
+   */
   void wpSetWPObject(in PWPObject wpObject);
+
+  /**
+     Query the desktop object this window belongs to.
+
+     \remark Note that this method is \b not a wrapper around
+     \code 
+     g_object_get_data(G_OBJECT(window), NOMOBJECT_KEY_STRING);
+     \endcode
+     Using that call one queries the window object (\b not the desktop object) from
+     a GTK toplevel window.
+
+     \par How to override:
+     This method is usually not overriden.
+
+     \sa wpSetWPObject()
+  */
   PWPObject wpQueryWPObject();
   void wpSetWindowTitle(in PNOMString newTitle);