diff options
| -rw-r--r-- | plugins/Clist_modern/src/hdr/modern_commonprototypes.h | 2 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_skinengine.cpp | 1 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_skinselector.cpp | 48 |
3 files changed, 24 insertions, 27 deletions
diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h index 2040e1be3e..3fe99a1f86 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h @@ -38,7 +38,6 @@ extern HIMAGELIST hCListImages; extern BOOL g_mutex_bSizing;
extern BOOL LOCK_RECALC_SCROLLBAR;
extern HIMAGELIST g_himlCListClc;
-extern int currentDesiredStatusMode;
extern BYTE nameOrder[];
extern SortedList lContactsCache;
extern BOOL g_flag_bOnModulesLoadedCalled;
@@ -46,7 +45,6 @@ extern HIMAGELIST hCListImages; extern SKINOBJECTSLIST g_SkinObjectList;
extern CURRWNDIMAGEDATA * g_pCachedWindow;
extern BOOL g_mutex_bLockUpdating;
-extern LISTMODERNMASK *MainModernMaskList;
extern HIMAGELIST hCListImages;
extern STATUSBARDATA g_StatusBarData;
extern SKINOBJECTSLIST g_SkinObjectList;
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp index 4349d02416..75e42dac1a 100644 --- a/plugins/Clist_modern/src/modern_skinengine.cpp +++ b/plugins/Clist_modern/src/modern_skinengine.cpp @@ -74,6 +74,7 @@ static BOOL bGammaWeightFilled = FALSE; static CRITICAL_SECTION cs_SkinChanging = {0};
+static LISTMODERNMASK *MainModernMaskList = NULL;
/* Private module procedures */
static BOOL ske_GetMaskBit(BYTE *line, int x);
diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp index 523ebbdb84..22b067c5c5 100644 --- a/plugins/Clist_modern/src/modern_skinselector.cpp +++ b/plugins/Clist_modern/src/modern_skinselector.cpp @@ -30,8 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "m_api/m_skin_eng.h"
#include "m_api/m_skinbutton.h"
#include "hdr/modern_commonprototypes.h"
-LISTMODERNMASK * MainModernMaskList = NULL;
-
/// IMPLEMENTATIONS
char * ModernMaskToString(MODERNMASK *mm, char * buf, UINT bufsize)
@@ -296,16 +294,16 @@ int SortMaskList(LISTMODERNMASK * mmList) return 1;
}
-enum
-{
- EXCEPTION_EQUAL,
- EXCEPTION_NOT_EQUAL = 1,
+enum
+{
+ EXCEPTION_EQUAL,
+ EXCEPTION_NOT_EQUAL = 1,
EXCEPTION_WILD = 2,
};
static BOOL _GetParamValue( char * szText, unsigned int& start, unsigned int length, char* ¶m, unsigned int& paramlen, char* &value, unsigned int& valuelen, int& except )
{
char * curChar = szText + start;
- char * lastChar = szText + length;
+ char * lastChar = szText + length;
enum { STATE_PARAM, STATE_VALUE };
int state = STATE_PARAM;
@@ -331,7 +329,7 @@ static BOOL _GetParamValue( char * szText, unsigned int& start, unsigned int len except |= EXCEPTION_NOT_EQUAL;
exitLoop = TRUE;
//fall trough
- case '=':
+ case '=':
if ( state == STATE_VALUE ) break;
//search value end
paramlen = curChar - param;
@@ -339,7 +337,7 @@ static BOOL _GetParamValue( char * szText, unsigned int& start, unsigned int len break;
case ',':
- default:
+ default:
if ( *curChar != ',' && curChar < lastChar ) break;
if ( state == STATE_PARAM )
{
@@ -347,7 +345,7 @@ static BOOL _GetParamValue( char * szText, unsigned int& start, unsigned int len value = param;
param = NULL;
paramlen = 0;
- state = STATE_VALUE;
+ state = STATE_VALUE;
}
exitLoop = TRUE;
break;
@@ -382,23 +380,23 @@ static BOOL _GetParamValue( char * szText, unsigned int& start, unsigned int len // skip spaces
if ( value && valuelen )
{
- while ( *value == ' ' || *value == '\t' )
- {
- value++;
- valuelen--;
+ while ( *value == ' ' || *value == '\t' )
+ {
+ value++;
+ valuelen--;
}
- while ( *( value + valuelen - 1) == ' ' || *( value + valuelen -1 ) == '\t' )
+ while ( *( value + valuelen - 1) == ' ' || *( value + valuelen -1 ) == '\t' )
valuelen--;
}
if ( param && paramlen )
{
- while (*param == ' ' || *param == '\t' )
+ while (*param == ' ' || *param == '\t' )
{
- param++;
- paramlen--;
+ param++;
+ paramlen--;
}
- while (*(param+paramlen-1) == ' ' || *(param+paramlen-1) == '\t' )
+ while (*(param+paramlen-1) == ' ' || *(param+paramlen-1) == '\t' )
paramlen--;
}
@@ -422,8 +420,8 @@ int ParseToModernMask(MODERNMASK *mm, char * szText) int except;
while ( _GetParamValue( szText, startPos, textLen, pszParam, paramlen, pszValue, valuelen, except))
- {
- if ( except & EXCEPTION_NOT_EQUAL )
+ {
+ if ( except & EXCEPTION_NOT_EQUAL )
param.bMaskParamFlag = MPF_NOT_EQUAL;
else
param.bMaskParamFlag = MPF_EQUAL;
@@ -437,7 +435,7 @@ int ParseToModernMask(MODERNMASK *mm, char * szText) else //ParamName = 'Module'
{
param.szName = _strdup("Module");
- param.dwId = mod_CalcHash( param.szName );
+ param.dwId = mod_CalcHash( param.szName );
}
@@ -560,9 +558,9 @@ SKINOBJECTDESCRIPTOR * skin_FindObjectByRequest(char * szValue,LISTMODERNMASK * if ( !mmTemplateList)
if (g_SkinObjectList.pMaskList)
mmTemplateList = g_SkinObjectList.pMaskList;
- else
+ else
return NULL;
-
+
if ( !mmTemplateList) return NULL;
ParseToModernMask(&mm,szValue);
res = skin_FindObjectByMask(&mm,mmTemplateList);
@@ -764,7 +762,7 @@ int SkinDrawGlyphMask(HDC hdc, RECT *rcSize, RECT *rcClip, MODERNMASK *ModernMas SKINDRAWREQUEST rq;
rq.hDC = hdc;
rq.rcDestRect = *rcSize;
- rq.rcClipRect = *rcClip;
+ rq.rcClipRect = *rcClip;
strncpy(rq.szObjectID,"Masked draw",SIZEOF("Masked draw"));
return ske_Service_DrawGlyph((WPARAM)&rq,(LPARAM)ModernMask);
}
|