Changeset 166

Timestamp:

Jan 3, 2007, 10:27:53 AM (18 years ago)

Author:

cinc

Message:

Added code for object menus.

Location:

trunk/desktop

Files:

• class_c/wpclassmanager.c (modified) (1 diff)
• class_c/wpfolder.c (modified) (2 diffs)
• class_c/wpobject.c (modified) (4 diffs)
• idl/wpclassmanager.idl (modified) (1 diff)
• idl/wpfolder.idl (modified) (1 diff)
• idl/wpobject.idl (modified) (2 diffs)
• src/debug_window.c (modified) (1 diff)
• src/quitwindow.c (modified) (2 diffs)
• src/vdesktop.c (modified) (4 diffs)

trunk/desktop/class_c/wpclassmanager.c ¶

@@ -50 +50 @@
 #include "desktop.h"
 
-NOM_Scope CORBA_boolean NOMLINK impl_WPClassMgr_wpRegisterMenuItems(WPClassMgr* nomSelf, const gpointer ptrMenuItemInfo, CORBA_Environment *ev)
+
+NOM_Scope CORBA_boolean NOMLINK impl_WPClassMgr_wpRegisterMenuItems(WPClassMgr* nomSelf, CORBA_unsigned_long* ptrMenuItemInfo, CORBA_Environment *ev)
 {
 /* WPClassMgrData* nomThis=WPClassMgrGetData(nomSelf); */
-  CORBA_boolean nomRetval=FALSE;
+  CORBA_boolean nomRetval;
 
   return nomRetval;

trunk/desktop/class_c/wpfolder.c ¶

@@ -242 +242 @@
     case OPEN_DEFAULT:
       {
-        NOMFolderWindow * nomFldrWindow;
+        static NOMFolderWindow * nomFldrWindow;
 
 #warning !!!!! Folder window must be inserted into inuse list !!!!!
@@ -320 +320 @@
 
 #warning !!!!! This is only for testing !!!!!
-  priv->gtkIconView=NOMFolderWindow_getContainerHandle(nomFldrWindow, ev);
+  priv->gtkIconView=NOMFolderWindow_queryContainerHandle(nomFldrWindow, ev);
 
   /* Show the new window */

trunk/desktop/class_c/wpobject.c ¶

@@ -63 +63 @@
 
 #include "wpobject.ih"
-
 #include "nomfolderwindow.h"
+
+/*************** Local vars ************************************/
+
+static nomId WPObjectNomId;
+
+/***************************************************************/
 
 NOM_Scope gpointer NOMLINK impl_WPObject_wpAllocMem(WPObject* nomSelf, const CORBA_unsigned_long cbBytes,
@@ -146 +151 @@
   WPObjectData* nomThis=WPObjectGetData(nomSelf);
 
+  /* Get our unique class ID. We need it for example when inserting menu items to
+     specify the namespace. We query it here because getting a GQuark from a string
+     is rather time consuming. The result is saved in a var for later use. */
+  WPObjectNomId=g_quark_from_string("WPObject");
+
   /* Make sure a title exists (even if it's an empty string */
   _pnomStringTitle=NOMStringNew();
@@ -264 +274 @@
 
   /* And finally show it */
-  gtk_menu_popup(GTK_MENU(NOMMenu_getMenuHandle(nomMenu,ev)), NULL, NULL, NULL, NULL, 0,
+  gtk_menu_popup(GTK_MENU(NOMMenu_queryMenuHandle(nomMenu,ev)), NULL, NULL, NULL, NULL, 0,
                  gtk_get_current_event_time());
+
   return nomMenu;
 }
 
-NOM_Scope void NOMLINK impl_WPObject_wpModifyMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder, const PNOMMenu nomMenu, const CORBA_unsigned_long ulMenuType, CORBA_Environment *ev)
-{
-/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
-
-}
-
-NOM_Scope void NOMLINK impl_WPObject_wpFilterMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder, const PNOMMenu nomMenu, const CORBA_unsigned_long ulMenuType, const CORBA_unsigned_long ulFlags, CORBA_Environment *ev)
+NOM_Scope void NOMLINK impl_WPObject_wpModifyMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder, 
+                                                  const PNOMMenu nomMenu, const CORBA_unsigned_long ulMenuType,
+                                                  CORBA_Environment *ev)
+{
+  NOMMenuItem* mItem;
+  /*  WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+  mItem=NOMMenuItemNew();
+
+  NOMMenuItem_setup(mItem, __FUNCTION__, WPObjectNomId, 0, ev);
+  WPObject_wpInsertMenuItem(nomSelf, nomMenu, mItem, 0, ev);
+
+  mItem=NOMMenuItemNew();
+  NOMMenuItem_setup(mItem, "Settings...", WPObjectNomId, WPMENUID_PROPERTIES, ev);
+  WPObject_wpInsertMenuItem(nomSelf, nomMenu, mItem, 0, ev);
+}
+
+NOM_Scope void NOMLINK impl_WPObject_wpFilterMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
+                                                  const PNOMMenu nomMenu, const CORBA_unsigned_long ulMenuType,
+                                                  const CORBA_unsigned_long ulFlags, CORBA_Environment *ev)
 {
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
@@ -282 +306 @@
 
 NOM_Scope CORBA_boolean NOMLINK impl_WPObject_wpMenuItemSelected(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
-                                                                 const PNOMMenu nomMenu,
-                                                                 const CORBA_unsigned_long ulMenuType,
+                                                                 const PNOMMenuItem nomMenuItem,
                                                                  CORBA_Environment *ev)
 {
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
-  CORBA_boolean nomRetval;
-
+  CORBA_boolean nomRetval=FALSE;
+
+  /* We only handle items with in own name space */
+  if(WPObjectNomId==NOMMenuItem_queryNameSpaceId(nomMenuItem, ev))
+    {
+      switch(NOMMenuItem_queryId(nomMenuItem, ev))
+        {
+        default:
+          break;
+        }
+    }
   return nomRetval;
 }
 
+/*
+  Callback for desktop menu items. This callback takes the object pointer and call wpMenuItemSelected()
+  of the object.
+ */
+static void menuItemActivateCallBack(GtkMenuItem* gtkMenuItem, gpointer wpObject)
+{
+  PNOMMenuItem pItem;
+
+#if 0
+  if(!nomIsObj((WPObject*)wpObject))
+    return;
+#endif
+
+  pItem=(PNOMMenuItem) g_object_get_data(G_OBJECT(gtkMenuItem), NOMOBJECT_KEY_STRING);
+
+  WPObject_wpMenuItemSelected((WPObject*) wpObject, NULLHANDLE,
+                              pItem, NULLHANDLE);
+}
+
+/*
+  This method adds the correct callback function to the menuitem and inserts it into the given menu.
+
+  FIXME: position information for the menu item isn't used yet. The Item is always appended.
+  
+ */
 NOM_Scope void NOMLINK impl_WPObject_wpInsertMenuItem(WPObject* nomSelf, const PNOMMenu nomMenu,
-                                                      const CORBA_unsigned_long ulId, CORBA_Environment *ev)
-{
-/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
-
-}
+                                                      const PNOMMenuItem nomMenuItem, 
+                                                      const CORBA_unsigned_long ulPosition, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+  g_signal_connect(NOMMenuItem_queryMenuItemHandle(nomMenuItem, ev), "activate",
+                   (GCallback) menuItemActivateCallBack, (gpointer) nomSelf);
+
+  gtk_menu_shell_append(GTK_MENU_SHELL(NOMMenu_queryMenuHandle(nomMenu,ev)), 
+                        NOMMenuItem_queryMenuItemHandle(nomMenuItem, ev));
+
+}
+
+
+
+

trunk/desktop/idl/wpclassmanager.idl ¶

@@ -38 +38 @@
 #include "nomclassmanager.idl"
 
+native wpMenuItemInfo;
+
 interface WPClassMgr : NOMClassMgr
 {
   NOMCLASSVERSION(1, 0);
 
-  boolean  wpRegisterMenuItems(in gpointer ptrMenuItemInfo);
+  boolean  wpRegisterMenuItems(inout unsigned long ptrMenuItemInfo);
 
 };

trunk/desktop/idl/wpfolder.idl ¶

@@ -40 +40 @@
 /*#include "nomfolderwindow.idl"*/
 
+#ifndef NOMFolderWindow_defined
+#define NOMFolderWindow_defined
 native PNOMFolderWindow;
+#endif
 
 NOMCLASSNAME(WPFolder);

trunk/desktop/idl/wpobject.idl ¶

@@ -41 +41 @@
 #include "nomstring.idl"
 #include "nommenu.idl"
-
+#include "nommenuitem.idl"
 
 #ifndef NOMFolderWindow_defined
@@ -86 +86 @@
   void wpFilterMenu(in PNOMFolderWindow nomFolder, in PNOMMenu nomMenu, in unsigned long ulMenuType,
                     in unsigned long ulFlags);
-  boolean wpMenuItemSelected(in PNOMFolderWindow nomFolder, in PNOMMenu nomMenu, in unsigned long ulMenuType);
-  void wpInsertMenuItem( in PNOMMenu nomMenu, in unsigned long ulId);
+  boolean wpMenuItemSelected(in PNOMFolderWindow nomFolder, in PNOMMenuItem nomMenuItem);
+  void wpInsertMenuItem( in PNOMMenu nomMenu, in PNOMMenuItem nomMenuItem, in unsigned long ulPosition);
 
   /* Methods overriden by this class */

trunk/desktop/src/debug_window.c ¶

@@ -121 +121 @@
   va_list arg_ptr;
 
+  return;
+
   if(store==NULL)
     {

trunk/desktop/src/quitwindow.c ¶

@@ -69 +69 @@
 }
 
+static  GtkWidget *window;
 /*
   Main entry point. This function is called from the EMX wrapper. Be aware that gtk_init()
@@ -76 +77 @@
 {
  /* GtkWidget is the storage type for widgets */
-    GtkWidget *window;
+
     GtkWidget *button;
     

trunk/desktop/src/vdesktop.c ¶

@@ -33 +33 @@
 * ***** END LICENSE BLOCK ***** */
 
+#define INCL_DOSPROCESS
 #define INCL_DOS
+#define INCL_DOSPROFILE
+#define INCL_DOSERRORS
 #define INCL_PM
 #include <os2.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <gtk/gtk.h> 
 #include "debug_window.h"
@@ -44 +48 @@
 #include "nom.h"
 #include "nomtk.h"
+#include "nomgc.h"
+#include "nomguitk.h"
+#include "nomfolderwindow.h"
 #include "wpobject.h"
 #include "wpfolder.h"
@@ -50 +57 @@
 int createQuitWindow(void);
 
-PNOM_ENV pEnv;
-NOMClassMgr *NOMClassMgrObject;
+static gboolean
+handleEvent (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+{
 
+  DosBeep(5000, 100);
+  //g_malloc(1250000);
+  //g_message("%s: allocated...", __FUNCTION__);
+  //WPObject_wpDisplayMenu(wpFolder, pWindow, NULL, 0, 0, NULL);
+  
+  return FALSE;
+}
 
-/* Desktop folder */
-WPFolder *wpDesktop;
 /*
   Main entry point. This function is called from the EMX wrapper. Be aware that gtk_init()
@@ -62 +75 @@
 int _System  main_loop()
 {
- char desktopDir[CCHMAXPATH]={0};
+  char desktopDir[CCHMAXPATH]={0};
+  PNOM_ENV pEnv;
+  NOMClassMgr *NOMClassMgrObject;
+  GtkWidget* window;
+  int a;
+  ULONG pMem;
+  HREGDLL hReg=NULLHANDLE;
+  
+  /* Desktop folder */
+  WPFolder *wpDesktop;
+  
+  hReg=nomBeginRegisterDLLWithGC();
+  if(NULLHANDLE==hReg)
+    return 1;
+  
+  /* Register DLLs with the garbage collector */
+  g_assert(nomRegisterDLLByName(hReg, "GLIB2.DLL" ));
+  g_assert(nomRegisterDLLByName(hReg, "GOBJECT2.DLL"));
+  g_assert(nomRegisterDLLByName(hReg, "GMODULE2.DLL"));
+  g_assert(nomRegisterDLLByName(hReg, "GDK2.DLL"));
+  g_assert(nomRegisterDLLByName(hReg, "GDKPIX2.DLL"));
+  g_assert(nomRegisterDLLByName(hReg, "GTK2.DLL" ));
+  g_assert(nomRegisterDLLByName(hReg, "ATK.DLL" ));
+  g_assert(nomRegisterDLLByName(hReg, "NOBJTK.DLL"));
+  g_assert(nomRegisterDLLByName(hReg, "VDESKTOP.DLL"));
+  /* Add Pango here? */
 
- g_message("We started...\n");
+  nomEndRegisterDLLWithGC(hReg);
 
+  g_message("We started...\n");
 
 #if 0
- /* Initialize thread subsystem */
- if(!g_thread_supported())
-   g_thread_init(NULL);
+  /* Initialize thread subsystem */
+  if(!g_thread_supported())
+    g_thread_init(NULL);
 #endif
-
+  
   /* Create a window with a 'quit' button to terminate us */
- createQuitWindow();
-
-
+  createQuitWindow();
+    
   /* Query current dir */
   g_strlcpy(desktopDir, g_get_current_dir(), sizeof(desktopDir));
   dbgPrintf("Desktop: %s", desktopDir);
 
-    /*
-      Bootstrap our objects...
-     */
-    pEnv=nomTkInit();
-    //dbgPrintf( "nomTKinit returned: %x", pEnv);
+  /*
+    Bootstrap our objects...
+  */
+  pEnv=nomTkInit();
 
-    if(!pEnv) {
-      nomPrintf("Can't initialize NOM environment. Exit...\n");
-      return(1); 
-    }
-
-    /* Init SOM */
-    NOMClassMgrObject=nomEnvironmentNew();
-    //dbgPrintf( "NOMClassMgrObject: %x", NOMClassMgrObject);
+  if(!pEnv) {
+    nomPrintf("Can't initialize NOM environment. Exit...\n");
+    return(1); 
+  }
 
 
+  /* Init SOM */
+  NOMClassMgrObject=nomEnvironmentNew();
+  //dbgPrintf( "NOMClassMgrObject: %x", NOMClassMgrObject);
+  
+  /* Create desktop folder */
+  wpDesktop=WPFolderNew();
 
-    WPObject* wpObject;
-    wpObject=WPObjectNew();
-    //dbgPrintf( "wpObject: %x", wpObject);
+  dbgPrintf( "Created desktop object: %x", wpDesktop);
+  WPFolder_tstSetFullPath(wpDesktop, desktopDir, NULLHANDLE);
+  
+  WPFolder_wpOpen(wpDesktop, NULL, OPEN_DEFAULT,  NULL, NULL);
+  /*    WPFolder_wpPopulate(wpObject, 0,"blabla 2", 0,  NULL);  */
+    
+#if 0
+  /* Folder toplevel window. */
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-    /* Create desktop folder */
-    wpDesktop=WPFolderNew();
-    dbgPrintf( "Created desktop object: %x", wpDesktop);
-    WPFolder_tstSetFullPath(wpDesktop, desktopDir, NULLHANDLE);
+  /* FIXME: Set default size of folder frame. Will later use a stored value */
+  gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
-    WPFolder_wpOpen(wpDesktop, NULL, OPEN_DEFAULT,  NULL, NULL);
-    /*    WPFolder_wpPopulate(wpObject, 0,"blabla 2", 0,  NULL);  */
+  g_signal_connect (GTK_WIDGET(window), "size-request",
+                    G_CALLBACK (handleEvent), NULL/*nomSelf*/);
+
+  gtk_widget_show(window);
+  g_message("Window handle: %x", window);
+#endif
+
+  /* All GTK applications must have a gtk_main(). Control ends here
+   * and waits for an event to occur (like a key press or
+   * mouse event). */
+  gtk_main ();
 
     
 #if 0
-    /* Base classes */
-    wpObject=WPDataFileNew();
+    mem=g_malloc(1250000);
+    memset(mem, 0xaa, 10000);
+    //  *pGlobalMemInExe=mem;
+    for(a=0;a<50;a++){
+      g_malloc(1250000);
+      printf("%x %x %x %x %d\n", *mem, *(mem+1), *(mem+2), *(mem+3), 0);
+      //printf("%x\n", *((ULONG*)pGlobalMemInExe));
+    }
+#endif
 
-    somPrintf("\nNew wpObject: %x\n", wpObject);
-    somPrintf("  -> Classname is: %s\n", _somGetClassName(wpObject));
+    printf("And now we quit...\n");
 
-
-    /* Test only!!! */
-    _tstSetFullPath(wpDesktop, desktopDir);
-
-    _wpSetFolder(wpDesktop, NULLHANDLE); /* FIXME: Instance var is zero anyway but this way I don't forget it ;-) */
-    _wpOpen(wpDesktop, NULLHANDLE, OPEN_DEFAULT, 0); /* remove parameter later!!! */
-    /*  _dbgPrintRegisteredClasses(SOMClassMgrObject);*/
-
-#endif
-    /* All GTK applications must have a gtk_main(). Control ends here
-     * and waits for an event to occur (like a key press or
-     * mouse event). */
-    gtk_main ();
-
-    printf("And now we quit...\n");    
   return 0;
 }