Changeset 103 for trunk/src

Timestamp:

Jun 19, 2008, 1:02:02 AM (17 years ago)

Author:

lpino

Message:

Fixed showing popups menus and posting events from menu bars

Location:

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets

Files:

• Control.java (modified) (12 diffs)
• Menu.java (modified) (1 diff)
• MenuItem.java (modified) (2 diffs)
• Shell.java (modified) (2 diffs)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Control.java

@@ -13 +13 @@
  */
 
+import java.util.MissingResourceException;
 import org.eclipse.swt.internal.pm.*;
 import org.eclipse.swt.graphics.*;
@@ -2942 +2943 @@
     switch (msg) {
 //        case OS.WM_ADJUSTWINDOWPOS: result = WM_ADJUSTWINDOWPOS (mp1, mp2); break;
+//        case OS.WM_BUTTON2DBLCLK: result = WM_BUTTON2DBLCLK (mp1, mp2); break;
         case OS.WM_CALCVALIDRECTS: result = WM_CALCVALIDRECTS (mp1, mp2); break;
         case OS.WM_CHAR: result = WM_CHAR (mp1, mp2); break;
@@ -2964 +2966 @@
 //        case OS.WM_ENDSESSION: result = WM_ENDSESSION (wParam, lParam); break;
         case OS.WM_ERASEBACKGROUND: result = WM_ERASEBACKGROUND (mp1, mp2); break;
+        case OS.WM_FOCUSCHANGE: result = WM_FOCUSCHANGE (mp1, mp2); break;
         case OS.WM_QUERYDLGCODE: result = WM_QUERYDLGCODE (mp1, mp2); break;
 //        case OS.WM_HELP: result = WM_HELP (wParam, lParam); break;
@@ -3028 +3031 @@
     return null;
 }
-
+//MRESULT OS.WM_BUTTON2DBLCLK (int mp1, int mp2) {
+//    return null;
+//}
 MRESULT WM_CALCVALIDRECTS (int mp1, int mp2) {
     return null;
@@ -3051 +3056 @@
 
 MRESULT WM_COMMAND (int mp1, int mp2) {
-//@@TODO(dmik): do we need this?
-//      /*
-//      * When the WM_COMMAND message is sent from a
-//      * menu, the HWND parameter in LPARAM is zero.
-//      */
-//      if (lParam == 0) {
-//              Decorations shell = menuShell ();
-//              if (shell.isEnabled ()) {
-//                      int id = wParam & 0xFFFF;
-//                      MenuItem item = shell.findMenuItem (id);
-//                      if (item != null && item.isEnabled ()) {
-//                              return item.wmCommandChild (wParam, lParam);
-//                      }
-//              }
-//              return null;
-//      }
-//      Control control = WidgetTable.get (lParam);
-//      if (control == null) return null;
-//      return control.wmCommandChild (wParam, lParam);
     switch (OS.SHORT1FROMMP (mp2)) {
-        //@@TODO(dmik)
         case OS.CMDSRC_MENU:
-            System.out.println("Control:WM_COMMAND - CMDSRC_MENU");
+            Decorations shell = menuShell ();
+            if (shell.isEnabled ()) {
+                    int id = mp1;
+                    MenuItem item = shell.findMenuItem (id);
+                    if (item != null && item.isEnabled ()) {
+                            return item.wmCommandChild (mp1, mp2);
+                    }
+            }
             break;
         //    return null;
@@ -3086 +3078 @@
         //case OS.CMDSRC_PRINTDLG:
     }
-    System.out.println("Control:WM_COMMAND - Calling wmCommandChild");
     int hwndChild = OS.WinWindowFromID (handle, OS.SHORT1FROMMP (mp1));
     Control control = WidgetTable.get (hwndChild);
-    System.out.println("Control:WM_COMMAND - Control handle = " + Integer.toHexString (handle));
-    System.out.println("Control:WM_COMMAND - Child handle = " + Integer.toHexString (hwndChild));
-//    System.out.println("Control:WM_COMMAND - Menu handle = " + Integer.toHexString (menu.handle));
     if (control == null) return null;
     return control.wmCommandChild (mp1, mp2);
@@ -3105 +3093 @@
       */
 //      if (mp2 != handle) return null;
-      boolean bIsWaiting = true;
-      System.out.println("Control:WM_CONTEXTMENU - PARENT HANDLE = " + Integer.toHexString (handle));
+      int parentHandle = OS.WinQueryWindow(menu.handle, OS.QW_PARENT);
       int hab = parent.getDisplay ().hab;
     //@@TODO(lpino) Remove debug msg
-      System.out.println("Control:WM_CONTEXTMENU - MENU HANDLE = " + Integer.toHexString (menu.handle));
-      short flOptions = OS.PU_HCONSTRAIN | OS.PU_VCONSTRAIN | OS.PU_MOUSEBUTTON1DOWN | OS.PU_KEYBOARD | OS.PU_MOUSEBUTTON1;
-      boolean rc = OS.WinPopupMenu(handle, handle, menu.handle, 0, OS.SHORT1FROMMP(mp1), OS.SHORT2FROMMP(mp1), flOptions);
+//      System.out.println("Control:WM_CONTEXTMENU - PARENT HANDLE = " + Integer.toHexString (parentHandle));
+//      System.out.println("Control:WM_CONTEXTMENU - MENU HANDLE = " + Integer.toHexString (menu.handle));
+      short flOptions = OS.PU_HCONSTRAIN | OS.PU_VCONSTRAIN | OS.PU_KEYBOARD | OS.PU_MOUSEBUTTON1;
+      boolean rc = OS.WinPopupMenu(parentHandle, parentHandle, menu.handle, 0, OS.SHORT1FROMMP(mp1), OS.SHORT2FROMMP(mp1), flOptions);
 //      if (menu != null && !menu.isDisposed ()) {
 //              menu.setVisible (true);
 //      }
-//       while(bIsWaiting){        
-//            QMSG qmsg = new QMSG ();
-//
-//            OS.WinGetMsg(hab,qmsg, 0, 0, 0);
-//            if (qmsg.msg == OS.WM_COMMAND)
-//                bIsWaiting = false;
-//            OS.WinDispatchMsg(hab, qmsg);
-//          System.out.println("Control:WM_CONTEXTMENU");
-//        }
-      System.out.println("Control:WM_CONTEXTMENU - ABOUT TO RETURN" );
       return MRESULT.TRUE;
 }
@@ -3256 +3234 @@
 
       /* Ignore WM_INITMENU for an accelerator */
-      System.out.println("Control:WM_INITMENU " + OS.WinIsWindowVisible(mp2));
+      System.out.println("Control:WM_INITMENU -  MENU HANDLE = " + Integer.toHexString (mp2));
       Display display = getDisplay ();
       if (display.accelKeyHit) return null;
@@ -3294 +3272 @@
               }
       }
-      System.out.println("Control:WM_INITMENU " + menu);
+      if(menu == null)
+        System.out.println("Control:WM_INITMENU " + menu);
+      else
+        System.out.println("Control:WM_INITMENU " + Integer.toHexString (menu.handle));   
 //
 //      /*
@@ -3491 +3472 @@
 //
 MRESULT WM_MENUSELECT (int mp1, int mp2) {
-    System.out.println("Control:WM_MENUSELECT");
+    System.out.println("Control:WM_MENUSELECT - MP1 SHORT 1= " + OS.SHORT1FROMMP(mp1));
+    System.out.println("Control:WM_MENUSELECT - MP1 SHORT 2= " + OS.SHORT2FROMMP(mp1));
+    if(OS.SHORT2FROMMP(mp1) == 0) return MRESULT.FALSE;
 //      int code = wParam >> 16;
-//      Shell shell = getShell ();
+      Shell shell = getShell ();
 //      if (code == -1 && lParam == 0) {
 //              Menu menu = shell.activeMenu;
@@ -3573 +3556 @@
 //              if (item != null) item.sendEvent (SWT.Arm);
 //      }
-      return null;
+//      int parentHandle = OS.WinQueryWindow(menu.handle, OS.QW_PARENT);
+//      boolean bIsWaiting = true;
+//      int hab = 0;
+//      if(parent == null)
+//          hab = getDisplay().hab;
+//      else
+//          hab = parent.getDisplay ().hab;
+//       while(bIsWaiting){        
+//            QMSG qmsg = new QMSG ();
+//
+//            OS.WinGetMsg(hab,qmsg, 0, 0, 0);
+//            if (qmsg.msg == OS.WM_COMMAND || qmsg.msg == OS.WM_MENUSELECT)
+//                bIsWaiting = false;
+//            OS.WinDispatchMsg(hab, qmsg);
+//          System.out.println("Control:WM_CONTEXTMENU");
+//        }
+      return MRESULT.TRUE;
 }
 //
@@ -4040 +4039 @@
     return new MRESULT (result);
 }
-
+MRESULT WM_FOCUSCHANGE (int mp1, int mp2) {
+    System.out.println("Control:WM_FOCUSCHANGE - HANDLE = " + Integer.toHexString (mp1));
+    callWindowProc (OS.WM_FOCUSCHANGE, mp1, mp2);
+    return MRESULT.ZERO;
+}
 //MRESULT WM_ADJUSTWINDOWPOS (int mp1, int mp2) {
 //    System.out.println("Control:WM_ADJUSTWINDOWPOS");

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Menu.java

@@ -241 +241 @@
 );
         } else  if ((style & SWT.POP_UP) != 0) {
-//            short flOptions = OS.PU_MOUSEBUTTON1DOWN | OS.PU_KEYBOARD | OS.PU_MOUSEBUTTON1;
-            handle = OS.WinCreateWindow (OS.HWND_DESKTOP,       /* parent window */
+            handle = OS.WinCreateWindow (parent.handle,                     /* parent window */
                                                         PSZ.getAtom (OS.WC_MENU),       /* class name */
-                                                        null,   /* window text */
-                                                        0,      /* window style */
-                                                        0, 0, 0, 0, /* size and position */
-                                                        OS.NULLHANDLE,  /* owner window */
-                                                        OS.HWND_TOP, /* sibling window */
-                                                        0,      /* ID */
-                                                        OS.NULLHANDLE,  /* control data */
-                                                        0               /* presentation parameters */
+                                                        null,                                               /* window text */
+                                                        0,                                                   /* window style */
+                                                        0, 0, 0, 0,                                       /* size and position */
+                                                        parent.handle,                              /* owner window */
+                                                        OS.HWND_TOP,                            /* sibling window */
+                                                        0,                                                  /* ID */
+                                                        OS.NULLHANDLE,                          /* control data */
+                                                        0                                                   /* presentation parameters */
                                                         );
-//          boolean rc = OS.WinPopupMenu(OS.HWND_DESKTOP, OS.HWND_DESKTOP, handle, 0, 0, 0, flOptions);
 System.out.println (
     "Menu.createHandle(): POPUP menu window has been created:\n" +

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/MenuItem.java

@@ -633 +633 @@
         if(rc == OS.MIT_ERROR || rc == OS.MIT_MEMERROR)
             error (SWT.ERROR_CANNOT_SET_MENU);
-//      parent.destroyAcceleratorTable ();
+        parent.destroyAcceleratorTable ();
 }
 
@@ -683 +683 @@
 
 MRESULT wmCommandChild (int mp1, int mp2) {
-    System.out.println("MenuItem:wmCommandChild");
         if ((style & (SWT.CHECK | SWT.RADIO)) != 0) {
                 setSelection (!getSelection ());

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Shell.java

@@ -102 +102 @@
 public class Shell extends Decorations {
     Display display;
-//@@TODO(dmik)
     Menu activeMenu;
 //    int hIMC;
@@ -1249 +1248 @@
 //      return result;
 //}
-//MRESULT WM_CONTEXTMENU (int mp1, int mp2) {
-//    System.out.println("Shell:WM_CONTEXTMENU - PARENT HANDLE = " + Integer.toHexString (handle));
-//    System.out.println("Control:WM_CONTEXTMENU - MENU HANDLE = " + Integer.toHexString (activeMenu.handle));
-//    return MRESULT.TRUE;
-//}
-}
+}