Changeset 40

Timestamp:

02/02/08 18:47:27 (10 months ago)

Author:

cinc

Message:

Added function to helpers for pressed key detecting. Some font and color tweaks for the info window

Location:

trunk/helper

Files:

• folderinfownd.c (modified) (1 diff)
• ft2lib-htmlwnd.c (modified) (6 diffs)
• helper_gcc.c (modified) (3 diffs)

trunk/helper/folderinfownd.c

@@ -251 +251 @@
     case WM_PRESPARAMCHANGED:
       {
-        char fontName[255];
-        ULONG  len;
-        ULONG  attrFound;
-
-        len=WinQueryPresParam(hwnd,
-                              //len=WinQueryPresParam(WinQueryWindow(hwnd, QW_PARENT),
-                              PP_FONTNAMESIZE,0,&attrFound,sizeof(fontName),
-                              fontName, 0 /*QPF_NOINHERIT*/);
-
-
-        WinSetPresParam(WinWindowFromID(hwnd, FLDRINFO_WINDOWID_TEXTCTRL),PP_FONTNAMESIZE,
-                   len, fontName);
-
+#if 0
+        DosBeep(3000, 20);
+        /* Forward presentation parameters to the windows on the top */
+
+        switch(LONGFROMMP(mp1))
+          {
+          case PP_BACKGROUNDCOLOR:
+            SysWriteToTrapLog("PP_BACKGROUNDCOLOR\n");
+            break;
+          case PP_FONTNAMESIZE:
+            SysWriteToTrapLog("PP_FONTNAMESIZE\n");
+          default:
+            break;
+          };
+        SysWriteToTrapLog("\n");
+#endif
+
+        if(PP_FONTNAMESIZE==LONGFROMMP(mp1))
+          {
+            char fontName[255];
+            ULONG  len;
+            ULONG  attrFound;
+
+            len=WinQueryPresParam(hwnd,
+                                  //len=WinQueryPresParam(WinQueryWindow(hwnd, QW_PARENT),
+                                  PP_FONTNAMESIZE,0,&attrFound,sizeof(fontName),
+                                  fontName, 0 /*QPF_NOINHERIT*/);
+            
+            WinSetPresParam(WinWindowFromID(hwnd, FLDRINFO_WINDOWID_TEXTCTRL),PP_FONTNAMESIZE,
+                            len, fontName);
+          }
         break;
       }

trunk/helper/ft2lib-htmlwnd.c

@@ -1616 +1616 @@
           /* Set it */
           WinFillRect(hps, &rcl, (LONG) lBg);
-          //     WinFillRect(hps, &rcl, 0x00FFFFFF);
         }
 #else
@@ -1638 +1637 @@
     case WM_PRESPARAMCHANGED:
       {
+        MRESULT mr;
+
+        if(g_oldStatic)
+          mr=g_oldStatic( hwnd, msg, mp1, mp2);
+        else
+          mr=WinDefWindowProc( hwnd, msg, mp1, mp2);
+
+#if 0
+        DosBeep(3000, 20);
+        /* Forward presentation parameters to the windows on the top */
+        SysWriteToTrapLog("%s:\n", __FUNCTION__);
+
+        switch(LONGFROMMP(mp1))
+          {
+          case PP_BACKGROUNDCOLOR:
+            SysWriteToTrapLog("PP_BACKGROUNDCOLOR\n");
+            break;
+          case PP_FONTNAMESIZE:
+            SysWriteToTrapLog("PP_FONTNAMESIZE\n");
+          case PP_FOREGROUNDCOLOR:
+            SysWriteToTrapLog("%s: PP_FOREGROUNDCOLOR\n", __FUNCTION__);
+          default:
+            break;
+          };
+        SysWriteToTrapLog("\n");
+#endif
         switch(LONGFROMMP(mp1))
           {
@@ -1664 +1689 @@
                                    PP_FOREGROUNDCOLOR,0,&attrFound,sizeof(fg),
                                    &fg, QPF_NOINHERIT))
-
+                
                 wndData->lForeColor=(LONG)fg;
-            break;
+              break;
             }
-
           case PP_FONTNAMESIZE:
             {
@@ -1682 +1706 @@
 
                 WinInvalidateRect(hwnd, NULLHANDLE, TRUE);
+                break;
               }
             }
@@ -1687 +1712 @@
             break;
           }
-        break;
+        return mr;
+        // break;
       }
       /* Vertical slider */
@@ -1911 +1937 @@
 
           // Set the font
+          /* If the font isn't set properly the code will more or less randomly grab some font. Note
+             that by setting the font here the set font of a folder container is *not* used. */
           WinSetPresParam(hwnd,
                           PP_FONTNAMESIZE,(ULONG) strlen(fontName)+1, /* +1 because of terminating 0 */

trunk/helper/helper_gcc.c

@@ -18 +18 @@
  */
 #define INCL_DOS
+#define INCL_DOSDEVIOCTL
 #define INCL_DOSERRORS
 #define INCL_WIN
@@ -115 +116 @@
     WinSetObjectData(hObject, command);
   }
+}
+
+static USHORT queryShiftState(void)
+{
+    USHORT     usRc=0;
+    HFILE      hf;
+    ULONG      ulAction;
+
+    if (NO_ERROR==DosOpen("KBD$", &hf, &ulAction, 0, FILE_NORMAL,
+                          OPEN_ACTION_OPEN_IF_EXISTS, /* fsOpenFlags */
+                          OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE,
+                          NULLHANDLE))
+      {
+        SHIFTSTATE      ss;
+        ULONG           cbDataLen = sizeof(ss);
+        
+        if (NO_ERROR == DosDevIOCtl(hf, IOCTL_KEYBOARD, KBD_GETSHIFTSTATE,
+                                    NULL, 0, NULL, &ss, cbDataLen, &cbDataLen))
+          {
+            usRc=ss.fsState;
+          }/* DosDevIOCtl() */
+        DosClose(hf);
+      }/* DosOpen() */
+
+    return usRc;
+}
+
+/*
+  This function returns true if the Alt and the Ctrl keys are currently pressed.
+ */
+BOOL SysQueryAltCtrlPressed(void)
+{
+  /* Either Alt and Ctrl key */
+  return ((queryShiftState() & 12)!=0);
 }
 
@@ -172 +207 @@
 
 
-
-
-
-