Changeset 1490

Timestamp:

Feb 3, 2025, 4:59:45 AM (2 months ago)

Author:

rlwalsh

Message:

XCenter: add object & class methods to get/set icon size

Location:

branches/branch-1-0

Files:

• idl/xcenter.idl (modified) (8 diffs)
• include/shared/common.h (modified) (1 diff)
• src/classes/xcenter.c (modified) (13 diffs)
• src/xcenter/ctr_engine.c (modified) (1 diff)
• src/xcenter/ctr_setup.c (modified) (1 diff)

branches/branch-1-0/idl/xcenter.idl ¶

@@ -109 +109 @@
     ULONG xwpDeleteWidgetClass(in PSZ pszWidgetClass);  //# V1.0.7 (2006-12-18) [pr]
 
+    ULONG xwpQueryIconSize();
+
+    BOOL xwpSetIconSize(in ULONG ulSize);
+
 #ifdef __SOMIDL__
   implementation {
@@ -123 +127 @@
                   xwpQuerySetup2,
                   xwpHotkeyOrBorderAction,
-                  xwpDeleteWidgetClass;
+                  xwpDeleteWidgetClass,
+                  xwpQueryIconSize,
+                  xwpSetIconSize;
 
     xwpQuerySetup2:nonstatic,reintroduce;
@@ -221 +227 @@
     wpInitData: override;
     wpUnInitData: override;
-    // wpObjectReady: override;     removed V0.9.9 (2001-03-13) [umoeller]
 
     wpSetup: override;
@@ -232 +237 @@
     wpMenuItemSelected: override;       //# V1.0.6 (2006-11-13) [pr]: added
 
-//#    wpQueryDefaultHelp: override;    replaced with class method V0.9.20 (2002-07-12) [umoeller]
     wpQueryDefaultView: override;
 
@@ -260 +264 @@
      */
 
-    void xwpclsAutoOpen();
-    BOOL xwpclsSetAutoOpen(in ULONG ulHandle, in BOOL fAutoOpen);
-    BOOL xwpclsSaveAutoOpen();
+    void  xwpclsAutoOpen();
+    BOOL  xwpclsSetAutoOpen(in ULONG ulHandle, in BOOL fAutoOpen);
+    BOOL  xwpclsSaveAutoOpen();
+    ULONG xwpclsQueryIconSize();
+    BOOL  xwpclsSetIconSize(in ULONG ulSize);
+    void  xwpclsRegisterOpenView(in XCenter pObj, in BOOL fAdd);
 
 #ifdef __SOMIDL__
@@ -269 +276 @@
     releaseorder: xwpclsAutoOpen,
                   xwpclsSetAutoOpen,
-                  xwpclsSaveAutoOpen;
+                  xwpclsSaveAutoOpen,
+                  xwpclsQueryIconSize,
+                  xwpclsSetIconSize,
+                  xwpclsRegisterOpenView;
 
     /*
@@ -287 +297 @@
 
     passthru C_ih_after =  ""
-"   #define XCTR_MAX_AUTO   5 "
+"   #define XCTR_MAX_OPEN   5 "
 "";
 
-    #define XCTR_MAX_AUTO   5
+    #define XCTR_MAX_OPEN   5
 
     /*
@@ -297 +307 @@
      */
 
-    ULONG aulAutoOpen[XCTR_MAX_AUTO];   // array of handles to automatically open
+    ULONG ulIconSize;
+    ULONG aulAutoOpen[XCTR_MAX_OPEN];   // array of handles to automatically open
+    XCenter aOpenViews[XCTR_MAX_OPEN];  // array of pointers to open XCenters
 
     /*

branches/branch-1-0/include/shared/common.h ¶

@@ -182 +182 @@
     DECLARE_CMN_STRING(INIKEY_XCENTERAUTOOPEN, "XCenterAutoOpen");
 
+    // default XCenter icon size
+    DECLARE_CMN_STRING(INIKEY_XCENTERICONSIZE, "XCenterIconSize");
+
     // window position of "WPS Class list" window (V0.9.0)
     DECLARE_CMN_STRING(INIKEY_WNDPOSCLASSINFO, "WndPosClassInfo");

branches/branch-1-0/src/classes/xcenter.c ¶

@@ -99 +99 @@
 #include "shared\notebook.h"            // generic XWorkplace notebook handling
 
+#include "shared\wpsh.h"
 #include "shared\center.h"              // public XCenter interfaces
 
@@ -1177 +1178 @@
 
 /*
+ *@@ xwpQueryIconSize:
+ *      Returns 0=mini, 1=full
+ *
+ *      A future enhancement may return the actual size
+ *      of a variable-size icon
+ */
+
+SOM_Scope ULONG SOMLINK xctr_xwpQueryIconSize(XCenter *somSelf)
+{
+    XCenterData *somThis = XCenterGetData(somSelf);
+    XCenterMethodDebug("XCenter","xctr_xwpQueryIconSize");
+
+    return ((_flDisplayStyle & XCS_LARGEICONS) ? 1 : 0);
+}
+
+/*
+ *@@ xwpSetIconSize:
+ *      Sets icon size to:  0=mini, 1=full
+ *      If this XCenter is open, its display will be updated.
+ *
+ *      A future enhancement may allow setting the actual size
+ *      of a variable-size icon
+ */
+
+SOM_Scope BOOL  SOMLINK xctr_xwpSetIconSize(XCenter *somSelf, ULONG ulSize)
+{
+    ULONG   style;
+    XCenterData *somThis = XCenterGetData(somSelf);
+    XCenterMethodDebug("XCenter","xctr_xwpSetIconSize");
+
+    if (ulSize > 1)
+        return FALSE;
+
+    // set possibly-new style
+    style = _flDisplayStyle;
+    if (ulSize)
+        _flDisplayStyle |= XCS_LARGEICONS;
+    else
+        _flDisplayStyle &= ~XCS_LARGEICONS;
+
+    // no change so nothing to do
+    if (_flDisplayStyle == style)
+        return TRUE;
+
+    // force recalc
+    _ulHeight = 0;
+
+    _wpSaveDeferred(somSelf);
+
+    // if view is currently open, post an update msg
+    // to ensure it occurs on this instance's thread
+    if (_pvOpenView)
+        WinPostMsg(((PXCENTERWINDATA)_pvOpenView)->Globals.hwndClient,
+                   XCM_REFORMAT, (MPARAM)XFMF_DISPLAYSTYLECHANGED, 0);
+
+    return TRUE;
+}
+
+/*
  *@@ wpInitData:
  *      this WPObject instance method gets called when the
@@ -1205 +1265 @@
     _pllAllWidgetSettings = NULL;
 }
-
-/*
- * wpObjectReady: override;     removed V0.9.9 (2001-03-13) [umoeller]
- */
 
 /*
@@ -1479 +1535 @@
                                                 // store in instance data
                                                 &_pvOpenView);
+
+            // let the class know we're open
+            if (hwndNewView)
+                _xwpclsRegisterOpenView(_XCenter, somSelf, TRUE);
+
             // V1.0.1 (2003-02-02) [umoeller]
             fl = cmnQuerySetting(sflIntroHelpShown);
@@ -1700 +1761 @@
     M_XCenterMethodDebug("M_XCenter","xctrM_xwpclsAutoOpen");
 
-    for (ctr = 0; ctr < XCTR_MAX_AUTO && _aulAutoOpen[ctr]; ctr++)
+    for (ctr = 0; ctr < XCTR_MAX_OPEN && _aulAutoOpen[ctr]; ctr++)
     {
         XCenter *obj = _wpclsObjectFromHandle(somSelf, _aulAutoOpen[ctr]);
@@ -1755 +1816 @@
 
     // loop until we reach the first empty slot
-    found = XCTR_MAX_AUTO;
-    for (ctr = 0; ctr < XCTR_MAX_AUTO && _aulAutoOpen[ctr]; ctr++)
+    found = XCTR_MAX_OPEN;
+    for (ctr = 0; ctr < XCTR_MAX_OPEN && _aulAutoOpen[ctr]; ctr++)
     {
         if (_aulAutoOpen[ctr] == ulHandle)
@@ -1764 +1825 @@
     if (fAutoOpen) {
         // already present
-        if (found < XCTR_MAX_AUTO)
+        if (found < XCTR_MAX_OPEN)
             return TRUE;
 
         // no room at the inn...
-        if (ctr >= XCTR_MAX_AUTO)
+        if (ctr >= XCTR_MAX_OPEN)
             return FALSE;
 
@@ -1776 +1837 @@
     else {
         // not found
-        if (found == XCTR_MAX_AUTO)
+        if (found == XCTR_MAX_OPEN)
             return FALSE;
 
-        // move the last non-zero item into the slot
-        // occupied by the item to be removed
-        // (if this is the only item, the one moved is already zero)
-        _aulAutoOpen[found] = _aulAutoOpen[--ctr];
+        // move the list down and zero the last non-zero entry
+        memcpy(&_aulAutoOpen[found], &_aulAutoOpen[found + 1], --ctr - found);
         _aulAutoOpen[ctr] = 0;
     }
@@ -1806 +1865 @@
     ULONG   i, j;
     char    *ptr;
-    char    buf[XCTR_MAX_AUTO * 8]; // somewhat larger than needed
+    char    buf[XCTR_MAX_OPEN * 8]; // somewhat larger than needed
 
     M_XCenterMethodDebug("M_XCenter","xctrM_xwpclsSaveAutoOpen");
 
     ptr = buf;
-    for (i = 0; i < XCTR_MAX_AUTO && _aulAutoOpen[i]; i++)
+    for (i = 0; i < XCTR_MAX_OPEN && _aulAutoOpen[i]; i++)
     {
         // remove entries other methods marked as invalid
         if (_aulAutoOpen[i] == (ULONG)-1) {
-            for (j = i + 1; j < XCTR_MAX_AUTO && _aulAutoOpen[j]; j++);
+            for (j = i + 1; j < XCTR_MAX_OPEN && _aulAutoOpen[j]; j++);
 
             _aulAutoOpen[i] = _aulAutoOpen[--j];
@@ -1834 +1893 @@
 
 /*
+ *@@ xwpclsQueryIconSize:
+ *      Returns the class default: 0=mini, 1=full
+ *
+ *      A future enhancement may return the actual size
+ *      of a variable-size icon
+ */
+
+SOM_Scope ULONG  SOMLINK xctrM_xwpclsQueryIconSize(M_XCenter *somSelf)
+{
+    M_XCenterData *somThis = M_XCenterGetData(somSelf);
+    M_XCenterMethodDebug("M_XCenter","xwpclsQueryIconSize");
+
+    return _ulIconSize;
+}
+
+/*
+ *@@ xwpclsSetIconSize:
+ *      Sets the class default icon size to:  0=mini, 1=full
+ *      If any XCenters are open, their settings and displays will be updated
+ *
+ *      A future enhancement may allow setting the actual size
+ *      of a variable-size icon
+ */
+
+SOM_Scope BOOL  SOMLINK xctrM_xwpclsSetIconSize(M_XCenter *somSelf, ULONG ulSize)
+{
+    ULONG   ctr;
+    M_XCenterData *somThis = M_XCenterGetData(somSelf);
+    M_XCenterMethodDebug("M_XCenter","xwpclsSetIconSize");
+
+    if (ulSize > 1 ||
+        !PrfWriteProfileString(HINI_USERPROFILE, (PSZ)INIAPP_XWORKPLACE,
+                               (PSZ)INIKEY_XCENTERICONSIZE,
+                               ulSize ? "1" : NULL))
+        return FALSE;
+
+    _ulIconSize = ulSize;
+
+    for (ctr = 0; ctr < XCTR_MAX_OPEN && _aOpenViews[ctr]; ctr++)
+    {
+        if (wpshCheckObject(_aOpenViews[ctr]))
+            _xwpSetIconSize(_aOpenViews[ctr], ulSize);
+        else {
+            _xwpclsRegisterOpenView(somSelf, _aOpenViews[ctr], FALSE);
+            ctr--;
+        }
+    }
+
+    return TRUE;
+}
+
+/*
+ *@@ xwpclsRegisterOpenView:
+ *      Maintains a list of open XCenters.
+ *      Used by xwpclsSetIconSize().
+ */
+
+SOM_Scope void  SOMLINK xctrM_xwpclsRegisterOpenView(M_XCenter *somSelf,
+                                                     XCenter *pObj, BOOL fAdd)
+{
+    ULONG   ctr;
+    ULONG   found;
+    M_XCenterData *somThis = M_XCenterGetData(somSelf);
+    M_XCenterMethodDebug("M_XCenter","xwpclsRegisterOpenView");
+
+    // loop until we reach the first empty slot
+    found = XCTR_MAX_OPEN;
+    for (ctr = 0; ctr < XCTR_MAX_OPEN && _aOpenViews[ctr]; ctr++)
+    {
+        if (_aOpenViews[ctr] == pObj)
+            found = ctr;
+    }
+
+    if (fAdd) {
+        // if not found & there's room, add to list
+        if (found == XCTR_MAX_OPEN && ctr < XCTR_MAX_OPEN)
+            _aOpenViews[ctr] = pObj;
+    }
+    else 
+    // move the list down and zero the last non-zero entry
+    if (found < XCTR_MAX_OPEN) {
+        memcpy(&_aOpenViews[found], &_aOpenViews[found + 1], --ctr - found);
+        _aOpenViews[ctr] = 0;
+    }
+
+    return;
+}
+
+/*
  *@@ wpclsInitData:
  *      this WPObject class method gets called when a class
@@ -1853 +2001 @@
     ULONG   handle;
     char    *ptr;
-    char    buf[XCTR_MAX_AUTO * 8]; // larger than needed, just in case
+    char    buf[XCTR_MAX_OPEN * 8]; // larger than needed, just in case
 
     M_XCenterMethodDebug("M_XCenter","xctrM_wpclsInitData");
@@ -1866 +2014 @@
     // register XCenter plugins category (ctr_model.c)
     arc = ctrpRegisterCategory();
+
+    // clear list of open XCenters
+    memset(_aOpenViews, 0, sizeof(_aOpenViews));
+
+    // get default icon size (currently 0=mini 1=full)
+    _ulIconSize = PrfQueryProfileInt(HINI_USERPROFILE, (PSZ)INIAPP_XWORKPLACE,
+                                     (PSZ)INIKEY_XCENTERICONSIZE, 0);
 
     // process the auto-open list of handles, if any
@@ -1878 +2033 @@
         // the list is formatted as "[handle][space]...nul"
         for (ctr = 0, ptr = strtok(buf, " ");
-             ctr < XCTR_MAX_AUTO && ptr;
+             ctr < XCTR_MAX_OPEN && ptr;
              ctr++, ptr = strtok(NULL, " "))
         {

branches/branch-1-0/src/xcenter/ctr_engine.c ¶

@@ -3952 +3952 @@
     PFNWP           pfnwpOrig = pXCenterData->pfnwpFrameOrig;
 
+    // remove this obj from the list of open instances
+    _xwpclsRegisterOpenView(_XCenter, pXCenterData->somSelf, FALSE);
     _pvOpenView = NULL;
 

branches/branch-1-0/src/xcenter/ctr_setup.c ¶

@@ -1314 +1314 @@
                                         _fAutoOpen);
 
+        // enable full-size icons if that's the class default
+        if (_xwpclsQueryIconSize(_XCenter))
+            _flDisplayStyle |= XCS_LARGEICONS;
+
         // create default widgets if we have no widgets yet
         // AND the WIDGETS string is not specified on