Changeset 46 for trunk/src/helpers/winh.c

Timestamp:

Mar 13, 2001, 9:56:01 AM (24 years ago)

Author:

umoeller

Message:

Mistc. updates for WarpIN, new features.

File:

• trunk/src/helpers/winh.c (modified) (17 diffs)

trunk/src/helpers/winh.c

@@ -52 +52 @@
 #define INCL_WINRECTANGLES
 #define INCL_WINSHELLDATA
+#define INCL_WINTIMER
 #define INCL_WINSYS
 #define INCL_WINHELP
@@ -332 +333 @@
                     {
                         // now copy all the items in the submenu
-                        SHORT cMenuItems = (SHORT)WinSendMsg(mi.hwndSubMenu,
+                        SHORT cMenuItems = SHORT1FROMMR(WinSendMsg(mi.hwndSubMenu,
                                                              MM_QUERYITEMCOUNT,
-                                                             0, 0);
+                                                             0, 0));
                         // loop through all entries in the original submenu
                         ULONG i;
@@ -342 +343 @@
                         {
                             CHAR szItemText[100];
-                            SHORT id = (SHORT)WinSendMsg(mi.hwndSubMenu,
+                            SHORT id = SHORT1FROMMR(WinSendMsg(mi.hwndSubMenu,
                                                          MM_ITEMIDFROMPOSITION,
                                                          MPFROMSHORT(i),
-                                                         0);
+                                                         0));
                             // recurse
                             winhCopyMenuItem(hwndSubMenu,
@@ -361 +362 @@
                         {
                             // get the original default item
-                            SHORT sDefID = (SHORT)WinSendMsg(mi.hwndSubMenu,
+                            SHORT sDefID = SHORT1FROMMR(WinSendMsg(mi.hwndSubMenu,
                                                              MM_QUERYDEFAULTITEMID,
-                                                             0, 0);
+                                                             0, 0));
                             // set "conditional cascade style" on target too
                             WinSetWindowBits(hwndSubMenu,
@@ -383 +384 @@
                     SHORT s;
                     mi.iPosition = sTargetPosition;
-                    s = (SHORT)WinSendMsg(hmenuTarget,
+                    s = SHORT1FROMMR(WinSendMsg(hmenuTarget,
                                           MM_INSERTITEM,
                                           MPFROMP(&mi),
-                                          MPFROMP(pszSource));
+                                          MPFROMP(pszSource)));
                     if (s != MIT_MEMERROR && s != MIT_ERROR)
                         brc = TRUE;
@@ -447 +448 @@
         {
             int i;
-            SHORT cMenuItems = (SHORT)WinSendMsg(hmenuSource,
+            SHORT cMenuItems = SHORT1FROMMR(WinSendMsg(hmenuSource,
                                                  MM_QUERYITEMCOUNT,
-                                                 0, 0);
+                                                 0, 0));
 
             // loop through all entries in the original menu
             for (i = 0; i < cMenuItems; i++)
             {
-                SHORT id = (SHORT)WinSendMsg(hmenuSource,
+                SHORT id = SHORT1FROMMR(WinSendMsg(hmenuSource,
                                              MM_ITEMIDFROMPOSITION,
                                              MPFROMSHORT(i),
-                                             0);
+                                             0));
                 winhCopyMenuItem(hwndNewSubmenu,
                                  hmenuSource,
@@ -481 +482 @@
  *      not found.
  *
- *      Returns NULL on error. Use winhFree()
+ *      Returns NULL on error. Use free()
  *      to free the return value.
  *
@@ -1171 +1172 @@
  *      buffer.
  *
- *      Returns NULL on error. Use winhFree()
+ *      Returns NULL on error. Use fre()
  *      to free the return value.
  *
@@ -1650 +1651 @@
  *      -- "End": scroll rightmost.
  *      -- "Ctrl+ End": scroll bottommost.
- *      -- "Ctrl + page up, down": scroll topmost or bottommost.
- *
- *      This is roughly CUA behavior.
+ *      -- "Ctrl + page up, down": scroll one screen left or right.
+ *
+ *      This is CUA behavior.
  *
  *      Returns TRUE if the message has been
@@ -1658 +1659 @@
  *
  *@@added V0.9.3 (2000-04-29) [umoeller]
+ *@@changed V0.9.9 (2001-02-01) [lafaix]: Ctrl+PgUp/Dn now do one screen left/right
  */
 
@@ -1705 +1707 @@
 
             case VK_PAGEUP:
-                ulMsg = WM_VSCROLL;
                 if (usFlags & KC_CTRL)
-                {
-                    sPos = 0;
-                    usCmd = SB_SLIDERPOSITION;
-                }
+                    ulMsg = WM_HSCROLL;
+                 else
+                    ulMsg = WM_VSCROLL;
+                usCmd = SB_PAGEUP;
+            break;
+
+            case VK_PAGEDOWN:
+                if (usFlags & KC_CTRL)
+                    ulMsg = WM_HSCROLL;
                 else
-                    usCmd = SB_PAGEUP;
-            break;
-
-            case VK_PAGEDOWN:
-                ulMsg = WM_VSCROLL;
-                if (usFlags & KC_CTRL)
-                {
-                    sPos = ulVertMax;
-                    usCmd = SB_SLIDERPOSITION;
-                }
-                else
-                    usCmd = SB_PAGEDOWN;
+                    ulMsg = WM_VSCROLL;
+                usCmd = SB_PAGEDOWN;
             break;
 
@@ -2255 +2251 @@
  *      in a newly allocated buffer.
  *
- *      Returns NULL on error. Use winhFree()
+ *      Returns NULL on error. Use free()
  *      to free the return value.
  *
@@ -3253 +3249 @@
  *      without blocking the message queue.
  *
+ *      NOTE: This function is a bit expensive because
+ *      it creates a temporary object window. If you
+ *      need to sleep several times, you should rather
+ *      use a private timer.
+ *
  *@@added V0.9.4 (2000-07-11) [umoeller]
- */
-
-VOID winhSleep(HAB hab,
-               ULONG ulSleep)    // in: sleep time in milliseconds
-{
-    ULONG ul = 0;
-    QMSG qmsg;
-    for (ul = 0;
-         ul < (ulSleep / 50);
-         ul++)
-    {
-        DosSleep(50);
-        while (WinPeekMsg(hab,
-                          &qmsg, 0, 0, 0,
-                          PM_REMOVE))
-            WinDispatchMsg(hab, &qmsg);
-
-    }
+ *@@changed V0.9.9 (2001-03-11) [umoeller]: rewritten
+ */
+
+VOID winhSleep(ULONG ulSleep)    // in: sleep time in milliseconds
+{
+    HWND hwnd = winhCreateObjectWindow(WC_STATIC, NULL);
+    if (hwnd)
+    {
+        QMSG qmsg;
+        HAB hab = WinQueryAnchorBlock(hwnd);
+        if (WinStartTimer(hab,
+                          hwnd,
+                          1,
+                          ulSleep))
+        {
+            while (WinGetMsg(hab, &qmsg, NULLHANDLE, 0, 0))
+            {
+                if (    (qmsg.hwnd == hwnd)
+                     && (qmsg.msg == WM_TIMER)
+                     && (qmsg.mp1 == (MPARAM)1)     // timer ID
+                   )
+                    break;
+
+                WinDispatchMsg(hab, &qmsg);
+            }
+            WinStopTimer(hab,
+                         hwnd,
+                         1);
+        }
+        else
+            // timer creation failed:
+            DosSleep(ulSleep);
+
+        WinDestroyWindow(hwnd);
+    }
+    else
+        DosSleep(ulSleep);
 }
 
@@ -3415 +3435 @@
  *      HWND in a newly allocated buffer.
  *
- *      Returns NULL on error. Use winhFree()
+ *      Returns NULL on error. Use free()
  *      to free the return value.
  */
@@ -3532 +3552 @@
  *      positioned automatically, using a given
  *      SWP structure (*pswpFrame).
+ *
+ *      The frame is created with the specified parent
+ *      (usually HWND_DESKTOP), but no owner.
  *
  *      The client window is created with the frame as
@@ -4052 +4075 @@
  *
  *      Returns NULL on errors. Use
- *      winhFree to free the return value.
+ *      free() to free the return value.
  *
  *@@added V0.9.7 (2000-12-06) [umoeller]
@@ -4285 +4308 @@
  *      See WinEnumObjectClasses() for details.
  *
- *      Returns NULL on error. Use winhFree()
+ *      Returns NULL on error. Use free()
  *      to free the return value.
  *