Changeset 82 for trunk/src

Timestamp:

May 28, 2008, 12:46:14 AM (17 years ago)

Author:

lpino

Message:

(Decorations.java) - Basic implementation of accelerator tables

File:

• trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Decorations.java (modified) (6 diffs)

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

@@ -3 +3 @@
 /*
  * OS/2 version.
- * Copyright (c) 2002, 2004 EclipseOS2 Team.
+ * Copyright (c) 2002, 2008 EclipseOS2 Team.
  */
 
@@ -302 +302 @@
                 maxAccel = items.length;
         }
-        int size = ACCEL.sizeof;
-        ACCEL accel = new ACCEL ();
-        byte [] buffer1 = new byte [size];      
-        byte [] buffer2 = new byte [maxAccel * size];
+//      int size = ACCEL.sizeof;
+        ACCELTABLE pacctAccelTable = new ACCELTABLE();
+        ACCEL[] accelList = new ACCEL[maxAccel];
+//      byte [] buffer1 = new byte [size];      
+//      byte [] buffer2 = new byte [maxAccel * size];
         if (menuBar != null && items != null) {
                 for (int i=0; i<items.length; i++) {
@@ -315 +316 @@
                                 }
                                 if (parent == menuBar) {
+                                        ACCEL accel = new ACCEL ();
                                         item.fillAccel (accel);
-                                        OS.MoveMemory (buffer1, accel, size);
-                                        System.arraycopy (buffer1, 0, buffer2, nAccel * size, size);
+                                        accelList[nAccel] = accel;
+//                                      OS.MoveMemory (buffer1, accel, size);
+//                                      System.arraycopy (buffer1, 0, buffer2, nAccel * size, size);
                                         nAccel++;
                                 }
                         }
                 }
+                pacctAccelTable.cAccel = (short)nAccel;
+                //@@TEMP(lpino): in the future we should get this value from somewhere
+                pacctAccelTable.codepage = (short)437;
+                pacctAccelTable.aaccel = new ACCEL[nAccel];
+                for(int i= 0;i < nAccel;i++)
+                    pacctAccelTable.aaccel[i] = accelList[i];
         }
-//        hAccel = OS.WinCreateAccelTable(hab, pacctAccelTable);
-        if (nAccel != 0) hAccel = OS.CreateAcceleratorTable (buffer2, nAccel);
+        hAccel = OS.WinCreateAccelTable(getDisplay().hab, pacctAccelTable);
+        System.out.println("Decorations:createAcceleratorTable - Handle of accelerator table = " + hAccel);
+        if(!OS.WinSetAccelTable(getDisplay().hab, hAccel, frameHandle)){
+            System.out.println("Decorations:createAcceleratorTable - Thread did not attach accelerator table to the frame");
+            if(!OS.WinDestroyAccelTable(hAccel))
+                System.out.println("Decorations:createAcceleratorTable - The accelerator table was not destroyed");
+        }    
+//      if (nAccel != 0) hAccel = OS.CreateAcceleratorTable (buffer2, nAccel);
 }
 
@@ -429 +444 @@
 
 void destroyAcceleratorTable () {
-        if (hAccel != 0 && hAccel != -1) OS.DestroyAcceleratorTable (hAccel);
+        if (hAccel != 0 && hAccel != -1) OS.WinDestroyAccelTable (hAccel);
         hAccel = -1;
 }
@@ -1264 +1279 @@
 
 boolean translateAccelerator (QMSG qmsg) {
-    return false;
-//@@TODO (dmik): later    
-//      if (!isEnabled () || !isActive ()) return false;
-//      if (menuBar != null && !menuBar.isEnabled ()) return false;
-//      if (hAccel == -1) createAcceleratorTable ();
-//      if (hAccel == 0) return false;
-//      return OS.TranslateAccelerator (handle, hAccel, msg) != 0;
+        if (!isEnabled () || !isActive ()) return false;
+        if (menuBar != null && !menuBar.isEnabled ()) return false;
+        if (hAccel == -1) createAcceleratorTable ();
+        if (hAccel == 0) return false;
+        return OS.WinTranslateAccel (getDisplay().hab, handle, hAccel, qmsg);
+    
 }
 
@@ -1286 +1300 @@
 int windowProc (int msg, int mp1, int mp2) {
 //@@TODO (dmik): remove
-//    switch (msg) {
+    switch (msg) {
 //@@TODO(dmik)
-//        case OS.WM_APP:
-//        case OS.WM_APP+1:
-//            if (hAccel == -1) createAcceleratorTable ();
-//            return msg == OS.WM_APP ? nAccel : hAccel;
-//    }
+        case OS.WM_USER:
+        case OS.WM_USER+1:
+            if (hAccel == -1) createAcceleratorTable ();
+            return msg == OS.WM_USER ? nAccel : hAccel;
+    }
     return super.windowProc (msg, mp1, mp2);
 }