From 9ec3c7e78e560356066b272ad7a38d3d333de1b5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 27 May 2018 14:57:51 +0300 Subject: global variable name standardization --- plugins/Clist_modern/src/cluiframes.cpp | 150 +++++++-------- plugins/Clist_modern/src/init.cpp | 114 ++++++------ plugins/Clist_modern/src/modern_aniavatars.cpp | 28 +-- plugins/Clist_modern/src/modern_cachefuncs.cpp | 6 +- plugins/Clist_modern/src/modern_clc.cpp | 62 +++---- plugins/Clist_modern/src/modern_clcitems.cpp | 8 +- plugins/Clist_modern/src/modern_clcmsgs.cpp | 10 +- plugins/Clist_modern/src/modern_clcopts.cpp | 20 +- plugins/Clist_modern/src/modern_clcpaint.cpp | 14 +- plugins/Clist_modern/src/modern_clcutils.cpp | 32 ++-- plugins/Clist_modern/src/modern_clistevents.cpp | 22 +-- plugins/Clist_modern/src/modern_clistmenus.cpp | 2 +- plugins/Clist_modern/src/modern_clistmod.cpp | 34 ++-- plugins/Clist_modern/src/modern_clistsettings.cpp | 12 +- plugins/Clist_modern/src/modern_clisttray.cpp | 64 +++---- plugins/Clist_modern/src/modern_clui.cpp | 202 ++++++++++----------- plugins/Clist_modern/src/modern_cluiservices.cpp | 2 +- plugins/Clist_modern/src/modern_contact.cpp | 6 +- .../Clist_modern/src/modern_rowheight_funcs.cpp | 4 +- plugins/Clist_modern/src/modern_skinbutton.cpp | 6 +- plugins/Clist_modern/src/modern_skinengine.cpp | 32 ++-- plugins/Clist_modern/src/modern_skinopt.cpp | 10 +- plugins/Clist_modern/src/modern_skinselector.cpp | 4 +- .../src/modern_static_cluiframes_service.h | 44 ++--- plugins/Clist_modern/src/modern_statusbar.cpp | 12 +- plugins/Clist_modern/src/modern_tbbutton.cpp | 2 +- plugins/Clist_modern/src/modern_toolbar.cpp | 10 +- plugins/Clist_modern/src/modern_viewmodebar.cpp | 24 +-- 28 files changed, 468 insertions(+), 468 deletions(-) (limited to 'plugins/Clist_modern/src') diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp index 990e8f1215..d28d9068bf 100644 --- a/plugins/Clist_modern/src/cluiframes.cpp +++ b/plugins/Clist_modern/src/cluiframes.cpp @@ -187,7 +187,7 @@ int CLUIFrames_ActivateSubContainers(BOOL active) int CLUIFrames_SetParentForContainers(HWND parent) { - g_CluiData.fOnDesktop = (parent && parent != g_CLI.hwndContactList); + g_CluiData.fOnDesktop = (parent && parent != g_clistApi.hwndContactList); for (int i = 0; i < g_nFramesCount; i++) { FRAMEWND &F = g_pfwFrames[i]; @@ -227,7 +227,7 @@ int CLUIFrames_OnShowHide(int mode) } if (mode != SW_HIDE) - SetForegroundWindow(g_CLI.hwndContactList); + SetForegroundWindow(g_clistApi.hwndContactList); AniAva_RedrawAllAvatars(TRUE); return 0; } @@ -391,7 +391,7 @@ static void PositionThumb(FRAMEWND *pThumb, short nX, short nY) } memset(&fakeMainWindow, 0, sizeof(fakeMainWindow)); - fakeMainWindow.ContainerWnd = g_CLI.hwndContactList; + fakeMainWindow.ContainerWnd = g_clistApi.hwndContactList; fakeMainWindow.floating = TRUE; memset(&fakeTaskBarWindow, 0, sizeof(fakeTaskBarWindow)); @@ -1014,7 +1014,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam) SetWindowLongPtr(fw.TitleBar.hwnd, GWL_STYLE, style& ~(WS_VSCROLL | WS_HSCROLL)); } - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); SetWindowPos(fw.TitleBar.hwnd, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED | SWP_NOACTIVATE); return 0; @@ -1079,7 +1079,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam) if (!CLUIFramesFitInSize()) fw.height = retval; retval = fw.height; if (fw.height != oldHeight && !fw.floating) - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); } else { retval = fw.HeightWhenCollapsed; @@ -1117,7 +1117,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam) return 0; } - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); return -1; } @@ -1128,7 +1128,7 @@ static int _us_DoShowAllFrames(WPARAM, LPARAM) for (int i = 0; i < g_nFramesCount; i++) g_pfwFrames[i].visible = TRUE; - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); return 0; } @@ -1139,7 +1139,7 @@ static int _us_DoShowTitles(WPARAM, LPARAM) for (int i = 0; i < g_nFramesCount; i++) g_pfwFrames[i].TitleBar.ShowTitleBar = TRUE; - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); return 0; } @@ -1150,7 +1150,7 @@ static int _us_DoHideTitles(WPARAM, LPARAM) for (int i = 0; i < g_nFramesCount; i++) g_pfwFrames[i].TitleBar.ShowTitleBar = FALSE; - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); return 0; } @@ -1167,11 +1167,11 @@ static int _us_DoShowHideFrame(WPARAM wParam, LPARAM lParam) if (g_pfwFrames[pos].OwnerWindow != (HWND)-2) { if (g_pfwFrames[pos].OwnerWindow) - CLUI_ShowWindowMod(g_pfwFrames[pos].OwnerWindow, (g_pfwFrames[pos].visible && g_pfwFrames[pos].collapsed && IsWindowVisible(g_CLI.hwndContactList)) ? SW_SHOW/*NOACTIVATE*/ : SW_HIDE); + CLUI_ShowWindowMod(g_pfwFrames[pos].OwnerWindow, (g_pfwFrames[pos].visible && g_pfwFrames[pos].collapsed && IsWindowVisible(g_clistApi.hwndContactList)) ? SW_SHOW/*NOACTIVATE*/ : SW_HIDE); else if (g_pfwFrames[pos].visible) { - g_pfwFrames[pos].OwnerWindow = CreateSubContainerWindow(g_CLI.hwndContactList, g_pfwFrames[pos].FloatingPos.x, g_pfwFrames[pos].FloatingPos.y, 10, 10); + g_pfwFrames[pos].OwnerWindow = CreateSubContainerWindow(g_clistApi.hwndContactList, g_pfwFrames[pos].FloatingPos.x, g_pfwFrames[pos].FloatingPos.y, 10, 10); SetParent(g_pfwFrames[pos].hWnd, g_pfwFrames[pos].OwnerWindow); - CLUI_ShowWindowMod(g_pfwFrames[pos].OwnerWindow, (g_pfwFrames[pos].visible && g_pfwFrames[pos].collapsed && IsWindowVisible(g_CLI.hwndContactList)) ? SW_SHOW/*NOACTIVATE*/ : SW_HIDE); + CLUI_ShowWindowMod(g_pfwFrames[pos].OwnerWindow, (g_pfwFrames[pos].visible && g_pfwFrames[pos].collapsed && IsWindowVisible(g_clistApi.hwndContactList)) ? SW_SHOW/*NOACTIVATE*/ : SW_HIDE); } } @@ -1179,7 +1179,7 @@ static int _us_DoShowHideFrame(WPARAM wParam, LPARAM lParam) CLUIFrameResizeFloatingFrame(pos); if (!g_pfwFrames[pos].floating) - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); } return 0; } @@ -1194,7 +1194,7 @@ static int _us_DoShowHideFrameTitle(WPARAM wParam, LPARAM lParam) if (pos >= 0 && (int)pos < g_nFramesCount) g_pfwFrames[pos].TitleBar.ShowTitleBar = !g_pfwFrames[pos].TitleBar.ShowTitleBar; - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); return 0; } @@ -1251,7 +1251,7 @@ static int _us_DoMoveFrame(WPARAM wParam, LPARAM lParam) free(sd); CLUIFramesStoreFrameSettings(pos); - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); } return 0; @@ -1274,7 +1274,7 @@ static int _us_DoSetFrameAlign(WPARAM wParam, LPARAM lParam) if (_fCluiFramesModuleNotStarted) return -1; CLUIFrames_SetFrameOptions(MAKEWPARAM(FO_ALIGN, wParam), lParam); - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); return 0; } @@ -1359,7 +1359,7 @@ static int _us_DoCollapseFrame(WPARAM wParam, LPARAM lParam) RECT rc; if (Clist_IsDocked()) { return 0; }; if (!g_CluiData.fDocked && g_CluiData.fAutoSize) { return 0; }; - GetWindowRect(g_CLI.hwndContactList, &rc); + GetWindowRect(g_clistApi.hwndContactList, &rc); if (g_pfwFrames[FrameId].collapsed == TRUE) { rc.bottom -= rc.top; @@ -1373,7 +1373,7 @@ static int _us_DoCollapseFrame(WPARAM wParam, LPARAM lParam) g_pfwFrames[FrameId].collapsed = TRUE; } - SetWindowPos(g_CLI.hwndContactList, nullptr, 0, 0, rc.right - rc.left, rc.bottom, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE); + SetWindowPos(g_clistApi.hwndContactList, nullptr, 0, 0, rc.right - rc.left, rc.bottom, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE); CLUIFramesStoreAllFrames(); @@ -1440,9 +1440,9 @@ static int _us_DoCollapseFrame(WPARAM wParam, LPARAM lParam) } };//floating test - //CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList,0); + //CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList,0); if (!g_pfwFrames[FrameId].floating) { - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); } else { //SetWindowPos(Frames[FrameId].hWnd,HWND_TOP, 0, 0, Frames[FrameId].wndSize.right-Frames[FrameId].wndSize.left,Frames[FrameId].height,SWP_SHOWWINDOW|SWP_NOMOVE); @@ -1512,7 +1512,7 @@ static int _us_DoAddFrame(WPARAM wParam, LPARAM) //char * CustomName = nullptr; CLISTFrame *clfrm = (CLISTFrame *)wParam; - if (g_CLI.hwndContactList == nullptr) return -1; + if (g_clistApi.hwndContactList == nullptr) return -1; if (_fCluiFramesModuleNotStarted) return -1; if (clfrm->cbSize != sizeof(CLISTFrame)) return -1; if (!(_hTitleBarFont)) _hTitleBarFont = CLUILoadTitleBarFont(); @@ -1565,14 +1565,14 @@ static int _us_DoAddFrame(WPARAM wParam, LPARAM) | WS_CHILD | WS_CLIPCHILDREN | (F.TitleBar.ShowTitleBar ? WS_VISIBLE : 0) | WS_CLIPCHILDREN, - 0, 0, 0, 0, g_CLI.hwndContactList, nullptr, g_plugin.getInst(), nullptr); + 0, 0, 0, 0, g_clistApi.hwndContactList, nullptr, g_plugin.getInst(), nullptr); SetWindowLongPtr(F.TitleBar.hwnd, GWLP_USERDATA, F.id); F.TitleBar.hwndTip = CreateWindowEx(0, TOOLTIPS_CLASS, nullptr, WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - g_CLI.hwndContactList, nullptr, g_plugin.getInst(), + g_clistApi.hwndContactList, nullptr, g_plugin.getInst(), nullptr); SetWindowPos(F.TitleBar.hwndTip, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); @@ -1613,7 +1613,7 @@ static int _us_DoAddFrame(WPARAM wParam, LPARAM) // need to enlarge parent RECT mainRect; int mainHeight, minHeight; - GetWindowRect(g_CLI.hwndContactList, &mainRect); + GetWindowRect(g_clistApi.hwndContactList, &mainRect); mainHeight = mainRect.bottom - mainRect.top; minHeight = CLUIFrames_GetTotalHeight(); if (mainHeight < minHeight) { @@ -1622,13 +1622,13 @@ static int _us_DoAddFrame(WPARAM wParam, LPARAM) mainRect.top = mainRect.bottom - minHeight; else mainRect.bottom = mainRect.top + minHeight; - SetWindowPos(g_CLI.hwndContactList, nullptr, mainRect.left, mainRect.top, mainRect.right - mainRect.left, mainRect.bottom - mainRect.top, SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE | SWP_NOSENDCHANGING); + SetWindowPos(g_clistApi.hwndContactList, nullptr, mainRect.left, mainRect.top, mainRect.right - mainRect.left, mainRect.bottom - mainRect.top, SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE | SWP_NOSENDCHANGING); } - GetWindowRect(g_CLI.hwndContactList, &mainRect); + GetWindowRect(g_clistApi.hwndContactList, &mainRect); mainHeight = mainRect.bottom - mainRect.top; _nClientFrameId = eUnknownId; // recalc it - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); if (F.floating) { F.floating = false; @@ -1670,9 +1670,9 @@ static int _us_DoRemoveFrame(WPARAM wParam, LPARAM) F.OwnerWindow = nullptr; RemoveItemFromList(pos, &g_pfwFrames, &g_nFramesCount); - cliInvalidateRect(g_CLI.hwndContactList, nullptr, TRUE); - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); - cliInvalidateRect(g_CLI.hwndContactList, nullptr, TRUE); + cliInvalidateRect(g_clistApi.hwndContactList, nullptr, TRUE); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); + cliInvalidateRect(g_clistApi.hwndContactList, nullptr, TRUE); return 0; }; @@ -1721,8 +1721,8 @@ static int CLUIFrameMoveResize(const FRAMEWND *Frame) RECT pr; POINT Off = { 0 }; - ClientToScreen(g_CLI.hwndContactList, &Off); - GetWindowRect(g_CLI.hwndContactList, &pr); + ClientToScreen(g_clistApi.hwndContactList, &Off); + GetWindowRect(g_clistApi.hwndContactList, &pr); if (Frame->visible && (!Frame->collapsed || Frame->wndSize.bottom - Frame->wndSize.top == 0)) { ShowWindowAsync(Frame->OwnerWindow, SW_HIDE); @@ -1744,7 +1744,7 @@ static int CLUIFrameMoveResize(const FRAMEWND *Frame) Frame->wndSize.right - Frame->wndSize.left, g_nTitleBarHeight, SWP_NOZORDER | SWP_NOACTIVATE); } - if (Frame->visible && IsWindowVisible(g_CLI.hwndContactList) && Frame->collapsed && Frame->wndSize.bottom - Frame->wndSize.top != 0) { + if (Frame->visible && IsWindowVisible(g_clistApi.hwndContactList) && Frame->collapsed && Frame->wndSize.bottom - Frame->wndSize.top != 0) { ShowWindow(Frame->OwnerWindow, SW_SHOW); ShowWindow(Frame->hWnd, SW_SHOW); } @@ -1793,20 +1793,20 @@ static BOOL CLUIFramesFitInSize(void) int CLUIFrames_GetTotalHeight() { - if (g_CLI.hwndContactList == nullptr) return 0; + if (g_clistApi.hwndContactList == nullptr) return 0; int sumheight = 0; RECT border; for (int i = 0; i < g_nFramesCount; i++) { FRAMEWND &F = g_pfwFrames[i]; - if ((F.visible) && (!F.needhide) && (!F.floating) && (g_CLI.hwndContactTree) && (F.hWnd != g_CLI.hwndContactTree)) + if ((F.visible) && (!F.needhide) && (!F.floating) && (g_clistApi.hwndContactTree) && (F.hWnd != g_clistApi.hwndContactTree)) sumheight += (F.height) + (g_nTitleBarHeight*btoint(F.TitleBar.ShowTitleBar)); } - GetBorderSize(g_CLI.hwndContactList, &border); + GetBorderSize(g_clistApi.hwndContactList, &border); - //GetWindowRect(g_CLI.hwndContactList,&winrect); - //GetClientRect(g_CLI.hwndContactList,&clirect); + //GetWindowRect(g_clistApi.hwndContactList,&winrect); + //GetClientRect(g_clistApi.hwndContactList,&clirect); // clirect.bottom -= clirect.top; // clirect.bottom += border.top+border.bottom; //allbord = (winrect.bottom-winrect.top)-(clirect.bottom-clirect.top); @@ -1823,7 +1823,7 @@ int CLUIFramesGetMinHeight() int tbh = 0, sumheight = 0; RECT border; int allbord = 0; - if (g_CLI.hwndContactList == nullptr) return 0; + if (g_clistApi.hwndContactList == nullptr) return 0; // search for alClient frame and get the titlebar's height @@ -1841,10 +1841,10 @@ int CLUIFramesGetMinHeight() } } - GetBorderSize(g_CLI.hwndContactList, &border); + GetBorderSize(g_clistApi.hwndContactList, &border); - //GetWindowRect(g_CLI.hwndContactList,&winrect); - //GetClientRect(g_CLI.hwndContactList,&clirect); + //GetWindowRect(g_clistApi.hwndContactList,&winrect); + //GetClientRect(g_clistApi.hwndContactList,&clirect); // clirect.bottom -= clirect.top; // clirect.bottom += border.top+border.bottom; //allbord = (winrect.bottom-winrect.top)-(clirect.bottom-clirect.top); @@ -2040,7 +2040,7 @@ int CLUIFrames_ApplyNewSizes(int mode) CLUIFrameMoveResize(&g_pfwFrames[i]); }; } - if (IsWindowVisible(g_CLI.hwndContactList)) { + if (IsWindowVisible(g_clistApi.hwndContactList)) { ske_DrawNonFramedObjects(1, nullptr); CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE, 0, 0); } @@ -2054,12 +2054,12 @@ static int _us_DoUpdateFrame(WPARAM wParam, LPARAM lParam) return -1; if (wParam == -1) { - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); return 0; } if (lParam & FU_FMPOS) - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 1); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 1); int pos = id2pos(wParam); if (pos < 0 || pos >= g_nFramesCount) @@ -2079,7 +2079,7 @@ int CLUIFrames_OnClistResize_mod(WPARAM, LPARAM mode) if (_fCluiFramesModuleNotStarted) return -1; RECT nRect; - GetClientRect(g_CLI.hwndContactList, &nRect); + GetClientRect(g_clistApi.hwndContactList, &nRect); nRect.left += g_CluiData.LeftClientMargin; nRect.right -= g_CluiData.RightClientMargin; @@ -2219,7 +2219,7 @@ int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam) { RECT mainRect; int mainHeight, minHeight; - GetWindowRect(g_CLI.hwndContactList, &mainRect); + GetWindowRect(g_clistApi.hwndContactList, &mainRect); mainHeight = mainRect.bottom - mainRect.top; minHeight = CLUIFrames_GetTotalHeight(); if (mainHeight < minHeight) { @@ -2230,12 +2230,12 @@ int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam) mainRect.top = mainRect.bottom - minHeight; else mainRect.bottom = mainRect.top + minHeight; - SetWindowPos(g_CLI.hwndContactList, nullptr, mainRect.left, mainRect.top, mainRect.right - mainRect.left, mainRect.bottom - mainRect.top, SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE | SWP_NOSENDCHANGING); + SetWindowPos(g_clistApi.hwndContactList, nullptr, mainRect.left, mainRect.top, mainRect.right - mainRect.left, mainRect.bottom - mainRect.top, SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE | SWP_NOSENDCHANGING); } - GetWindowRect(g_CLI.hwndContactList, &mainRect); + GetWindowRect(g_clistApi.hwndContactList, &mainRect); mainHeight = mainRect.bottom - mainRect.top; } - GetClientRect(g_CLI.hwndContactList, &nRect); + GetClientRect(g_clistApi.hwndContactList, &nRect); //$$$ Fixed borders if (lParam && lParam != 1 && lParam != 2) { RECT oldRect; @@ -2245,7 +2245,7 @@ int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam) GetWindowRect((HWND)wParam, &oldRect); pt.x = nRect.left; pt.y = nRect.top; - ClientToScreen(g_CLI.hwndContactList, &pt); + ClientToScreen(g_clistApi.hwndContactList, &pt); dl = pt.x - oldRect.left; dt = pt.y - oldRect.top; dr = (oldRect.right - oldRect.left) - (nRect.right - nRect.left) - dl; @@ -2274,10 +2274,10 @@ int CLUIFramesOnClistResize(WPARAM wParam, LPARAM lParam) tick = GetTickCount() - tick; - if (g_CLI.hwndContactList != nullptr) cliInvalidateRect(g_CLI.hwndContactList, nullptr, TRUE); - if (g_CLI.hwndContactList != nullptr) UpdateWindow(g_CLI.hwndContactList); + if (g_clistApi.hwndContactList != nullptr) cliInvalidateRect(g_clistApi.hwndContactList, nullptr, TRUE); + if (g_clistApi.hwndContactList != nullptr) UpdateWindow(g_clistApi.hwndContactList); - if (lParam == 2) RedrawWindow(g_CLI.hwndContactList, nullptr, nullptr, RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_ERASE | RDW_INVALIDATE); + if (lParam == 2) RedrawWindow(g_clistApi.hwndContactList, nullptr, nullptr, RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_ERASE | RDW_INVALIDATE); Sleep(0); @@ -2314,9 +2314,9 @@ int OnFrameTitleBarBackgroundChange(WPARAM, LPARAM) sttBackgroundBmpUse = db_get_w(0, "FrameTitleBar", "BkBmpUse", CLCDEFAULT_BKBMPUSE); } - cliInvalidateRect(g_CLI.hwndContactList, nullptr, 0); + cliInvalidateRect(g_clistApi.hwndContactList, nullptr, 0); - RedrawWindow(g_CLI.hwndContactList, nullptr, nullptr, RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_ERASE | RDW_INVALIDATE); + RedrawWindow(g_clistApi.hwndContactList, nullptr, nullptr, RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_ERASE | RDW_INVALIDATE); return 0; } @@ -2458,7 +2458,7 @@ int DrawTitleBar(HDC hdcMem2, RECT *rect, int Frameid) if (g_CluiData.fDisableSkinEngine) { if (!sttBmpBackground && sttBkUseWinColours && xpt_IsThemed(_hFrameTitleTheme)) { int state = CS_ACTIVE; - // if (GetForegroundWindow() != g_CLI.hwndContactList) state = CS_INACTIVE; + // if (GetForegroundWindow() != g_clistApi.hwndContactList) state = CS_INACTIVE; xpt_DrawThemeBackground(_hFrameTitleTheme, hdcMem, WP_SMALLCAPTION, state, &rc, &rc); bThemed = true; } @@ -2574,7 +2574,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam CLUIFrames_SetFrameFloat(Frameid, 0); break; } - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); } break; @@ -2707,10 +2707,10 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam rcwnd.left = curpt.x; rcwnd.right = curpt.x + 5; - GetWindowRect(g_CLI.hwndContactList, &rcMiranda); + GetWindowRect(g_clistApi.hwndContactList, &rcMiranda); //GetWindowRect( Frames[pos].ContainerWnd, &rcwnd ); //IntersectRect( &rcOverlap, &rcwnd, &rcMiranda ) - if (IsWindowVisible(g_CLI.hwndContactList) && IntersectRect(&rcOverlap, &rcwnd, &rcMiranda)) { + if (IsWindowVisible(g_clistApi.hwndContactList) && IntersectRect(&rcOverlap, &rcwnd, &rcMiranda)) { int id = g_pfwFrames[pos].id; @@ -2741,7 +2741,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam rcwnd.left = curpt.x; rcwnd.right = curpt.x + 5; - GetWindowRect(g_CLI.hwndContactList, &rcMiranda); + GetWindowRect(g_clistApi.hwndContactList, &rcMiranda); //GetWindowRect( Frames[pos].ContainerWnd, &rcwnd ); //IntersectRect( &rcOverlap, &rcwnd, &rcMiranda ) @@ -2873,7 +2873,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam } if (newh > 0) - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); break; } s_nCurDragBar = -1; s_nLastByPos = -1; s_nOldFrameHeight = -1; ReleaseCapture(); @@ -2969,7 +2969,7 @@ static LRESULT CALLBACK CLUIFrameSubContainerProc(HWND hwnd, UINT msg, WPARAM wP case WM_NOTIFY: case WM_PARENTNOTIFY: case WM_SYSCOMMAND: - return SendMessage(g_CLI.hwndContactList, msg, wParam, lParam); + return SendMessage(g_clistApi.hwndContactList, msg, wParam, lParam); case WM_MOVE: if (g_CluiData.fDocked) @@ -3085,7 +3085,7 @@ static LRESULT CALLBACK CLUIFrameContainerWndProc(HWND hwnd, UINT msg, WPARAM wP rcwnd.left = curpt.x; rcwnd.right = curpt.x + 5; - GetWindowRect(g_CLI.hwndContactList, &rcMiranda); + GetWindowRect(g_clistApi.hwndContactList, &rcMiranda); if (IntersectRect(&rcOverlap, &rcwnd, &rcMiranda)) { GetCursorPos(&curpt); GetWindowRect(g_pfwFrames[framepos].hWnd, &rcwnd); @@ -3169,10 +3169,10 @@ static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam) if (g_pfwFrames[pos].floating || (lParam & 2)) { if (g_pfwFrames[pos].OwnerWindow != (HWND)-2 && g_pfwFrames[pos].visible) { - if (g_pfwFrames[pos].OwnerWindow == nullptr) g_pfwFrames[pos].OwnerWindow = CreateSubContainerWindow(g_CLI.hwndContactList, g_pfwFrames[pos].FloatingPos.x, g_pfwFrames[pos].FloatingPos.y, 10, 10); - CLUI_ShowWindowMod(g_pfwFrames[pos].OwnerWindow, (g_pfwFrames[pos].visible && g_pfwFrames[pos].collapsed && IsWindowVisible(g_CLI.hwndContactList)) ? SW_SHOW/*NOACTIVATE*/ : SW_HIDE); + if (g_pfwFrames[pos].OwnerWindow == nullptr) g_pfwFrames[pos].OwnerWindow = CreateSubContainerWindow(g_clistApi.hwndContactList, g_pfwFrames[pos].FloatingPos.x, g_pfwFrames[pos].FloatingPos.y, 10, 10); + CLUI_ShowWindowMod(g_pfwFrames[pos].OwnerWindow, (g_pfwFrames[pos].visible && g_pfwFrames[pos].collapsed && IsWindowVisible(g_clistApi.hwndContactList)) ? SW_SHOW/*NOACTIVATE*/ : SW_HIDE); SetParent(g_pfwFrames[pos].hWnd, g_pfwFrames[pos].OwnerWindow); - SetParent(g_pfwFrames[pos].TitleBar.hwnd, g_CLI.hwndContactList); + SetParent(g_pfwFrames[pos].TitleBar.hwnd, g_clistApi.hwndContactList); SetWindowLongPtr(g_pfwFrames[pos].OwnerWindow, GWLP_USERDATA, g_pfwFrames[pos].id); g_pfwFrames[pos].floating = FALSE; if (!(lParam & 2)) { @@ -3181,8 +3181,8 @@ static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam) } } else { - SetParent(g_pfwFrames[pos].hWnd, g_CLI.hwndContactList); - SetParent(g_pfwFrames[pos].TitleBar.hwnd, g_CLI.hwndContactList); + SetParent(g_pfwFrames[pos].hWnd, g_clistApi.hwndContactList); + SetParent(g_pfwFrames[pos].TitleBar.hwnd, g_clistApi.hwndContactList); g_pfwFrames[pos].floating = FALSE; if (g_pfwFrames[pos].ContainerWnd) DestroyWindow(g_pfwFrames[pos].ContainerWnd); g_pfwFrames[pos].ContainerWnd = nullptr; @@ -3204,7 +3204,7 @@ static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam) if (!g_pfwFrames[pos].TitleBar.ShowTitleBar) recttb.top = recttb.bottom = recttb.left = recttb.right = 0; - g_pfwFrames[pos].ContainerWnd = CreateContainerWindow(g_CLI.hwndContactList, g_pfwFrames[pos].FloatingPos.x, g_pfwFrames[pos].FloatingPos.y, 10, 10); + g_pfwFrames[pos].ContainerWnd = CreateContainerWindow(g_clistApi.hwndContactList, g_pfwFrames[pos].FloatingPos.x, g_pfwFrames[pos].FloatingPos.y, 10, 10); SetParent(g_pfwFrames[pos].hWnd, g_pfwFrames[pos].ContainerWnd); SetParent(g_pfwFrames[pos].TitleBar.hwnd, g_pfwFrames[pos].ContainerWnd); @@ -3249,7 +3249,7 @@ static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam) hwndtmp = g_pfwFrames[pos].ContainerWnd; - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); if (hwndtmp) SendMessage(hwndtmp, WM_SIZE, 0, 0); @@ -3367,7 +3367,7 @@ int UnLoadCLUIFramesModule(void) DeleteObject(sttBmpBackground); sttBmpBackground = nullptr; } - CLUIFramesOnClistResize((WPARAM)g_CLI.hwndContactList, 0); + CLUIFramesOnClistResize((WPARAM)g_clistApi.hwndContactList, 0); CLUIFramesStoreAllFrames(); CLUIFrameOnModulesUnload(0, 0); @@ -3378,7 +3378,7 @@ int UnLoadCLUIFramesModule(void) for (int i = 0; i < g_nFramesCount; i++) { FRAMEWND &F = g_pfwFrames[i]; - if (F.hWnd != g_CLI.hwndContactTree) + if (F.hWnd != g_clistApi.hwndContactTree) DestroyWindow(F.hWnd); F.hWnd = (HWND)-1; @@ -3429,9 +3429,9 @@ int CLUIFrames_SetLayeredMode(BOOL fLayeredMode, HWND hwnd) for (int i = 0; i < g_nFramesCount; i++) { FRAMEWND &F = g_pfwFrames[i]; if (fLayeredMode) { - if (F.visible && GetParent(F.hWnd) == g_CLI.hwndContactList && F.PaintCallbackProc == nullptr) { + if (F.visible && GetParent(F.hWnd) == g_clistApi.hwndContactList && F.PaintCallbackProc == nullptr) { //create owner window - F.OwnerWindow = CreateSubContainerWindow(g_CLI.hwndContactList, F.FloatingPos.x, F.FloatingPos.y, 10, 10); + F.OwnerWindow = CreateSubContainerWindow(g_clistApi.hwndContactList, F.FloatingPos.x, F.FloatingPos.y, 10, 10); SetParent(F.hWnd, F.OwnerWindow); } } diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index 40aa1ad468..03fd4a044e 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -101,9 +101,9 @@ extern "C" __declspec(dllexport) int Unload(void) { TRACE("Unloading Clist Modern\r\n"); - if (IsWindow(g_CLI.hwndContactList)) - DestroyWindow(g_CLI.hwndContactList); - g_CLI.hwndContactList = nullptr; + if (IsWindow(g_clistApi.hwndContactList)) + DestroyWindow(g_clistApi.hwndContactList); + g_clistApi.hwndContactList = nullptr; ToolbarButtonUnloadModule(); BackgroundsUnloadModule(); @@ -132,62 +132,62 @@ static HRESULT SubclassClistInterface() // 'cli_*' - new handler with default core service calling Clist_GetInterface(); - corecli = g_CLI; - - g_CLI.hInst = g_plugin.getInst(); - - g_CLI.pfnCreateCacheItem = cliCreateCacheItem; - g_CLI.pfnCheckCacheItem = cliCheckCacheItem; - g_CLI.pfnFreeCacheItem = cliFreeCacheItem; - g_CLI.pfnInvalidateDisplayNameCacheEntry = cliInvalidateDisplayNameCacheEntry; - - g_CLI.pfnTrayIconPauseAutoHide = cliTrayIconPauseAutoHide; - g_CLI.pfnTrayIconInit = cliTrayIconInit; - g_CLI.pfnTrayCalcChanged = cliTrayCalcChanged; - - g_CLI.pfnCluiProtocolStatusChanged = cliCluiProtocolStatusChanged; - - g_CLI.pfnBeginRenameSelection = cliBeginRenameSelection; - g_CLI.pfnCreateClcContact = cliCreateClcContact; - g_CLI.pfnGetRowBottomY = cliGetRowBottomY; - g_CLI.pfnGetRowHeight = cliGetRowHeight; - g_CLI.pfnGetRowTopY = cliGetRowTopY; - g_CLI.pfnGetRowTotalHeight = cliGetRowTotalHeight; - g_CLI.pfnInvalidateRect = cliInvalidateRect; - g_CLI.pfnOnCreateClc = CLUI::cliOnCreateClc; - g_CLI.pfnPaintClc = CLCPaint::cliPaintClc; - g_CLI.pfnRebuildEntireList = cliRebuildEntireList; - g_CLI.pfnIsVisibleContact = cliIsVisibleContact; - g_CLI.pfnRecalcScrollBar = cliRecalcScrollBar; - g_CLI.pfnRowHitTest = cliRowHitTest; - g_CLI.pfnScrollTo = cliScrollTo; - g_CLI.pfnShowHide = cliShowHideStub; - g_CLI.pfnHitTest = cliHitTest; - g_CLI.pfnCompareContacts = cliCompareContacts; - g_CLI.pfnGetIconFromStatusMode = cliGetIconFromStatusMode; - g_CLI.pfnFindItem = cliFindItem; - g_CLI.pfnGetRowByIndex = cliGetRowByIndex; - g_CLI.pfnGetRowsPriorTo = cliGetRowsPriorTo; - g_CLI.pfnGetGroupContentsCount = cliGetGroupContentsCount; - g_CLI.pfnFindRowByText = cliFindRowByText; - g_CLI.pfnGetContactHiddenStatus = CLVM_GetContactHiddenStatus; + corecli = g_clistApi; + + g_clistApi.hInst = g_plugin.getInst(); + + g_clistApi.pfnCreateCacheItem = cliCreateCacheItem; + g_clistApi.pfnCheckCacheItem = cliCheckCacheItem; + g_clistApi.pfnFreeCacheItem = cliFreeCacheItem; + g_clistApi.pfnInvalidateDisplayNameCacheEntry = cliInvalidateDisplayNameCacheEntry; + + g_clistApi.pfnTrayIconPauseAutoHide = cliTrayIconPauseAutoHide; + g_clistApi.pfnTrayIconInit = cliTrayIconInit; + g_clistApi.pfnTrayCalcChanged = cliTrayCalcChanged; + + g_clistApi.pfnCluiProtocolStatusChanged = cliCluiProtocolStatusChanged; + + g_clistApi.pfnBeginRenameSelection = cliBeginRenameSelection; + g_clistApi.pfnCreateClcContact = cliCreateClcContact; + g_clistApi.pfnGetRowBottomY = cliGetRowBottomY; + g_clistApi.pfnGetRowHeight = cliGetRowHeight; + g_clistApi.pfnGetRowTopY = cliGetRowTopY; + g_clistApi.pfnGetRowTotalHeight = cliGetRowTotalHeight; + g_clistApi.pfnInvalidateRect = cliInvalidateRect; + g_clistApi.pfnOnCreateClc = CLUI::cliOnCreateClc; + g_clistApi.pfnPaintClc = CLCPaint::cliPaintClc; + g_clistApi.pfnRebuildEntireList = cliRebuildEntireList; + g_clistApi.pfnIsVisibleContact = cliIsVisibleContact; + g_clistApi.pfnRecalcScrollBar = cliRecalcScrollBar; + g_clistApi.pfnRowHitTest = cliRowHitTest; + g_clistApi.pfnScrollTo = cliScrollTo; + g_clistApi.pfnShowHide = cliShowHideStub; + g_clistApi.pfnHitTest = cliHitTest; + g_clistApi.pfnCompareContacts = cliCompareContacts; + g_clistApi.pfnGetIconFromStatusMode = cliGetIconFromStatusMode; + g_clistApi.pfnFindItem = cliFindItem; + g_clistApi.pfnGetRowByIndex = cliGetRowByIndex; + g_clistApi.pfnGetRowsPriorTo = cliGetRowsPriorTo; + g_clistApi.pfnGetGroupContentsCount = cliGetGroupContentsCount; + g_clistApi.pfnFindRowByText = cliFindRowByText; + g_clistApi.pfnGetContactHiddenStatus = CLVM_GetContactHiddenStatus; // partialy overloaded - call default handlers from inside - g_CLI.pfnIconFromStatusMode = cli_IconFromStatusMode; - g_CLI.pfnLoadCluiGlobalOpts = CLUI_cli_LoadCluiGlobalOpts; - g_CLI.pfnLoadClcOptions = cli_LoadCLCOptions; - g_CLI.pfnSortCLC = cli_SortCLC; - g_CLI.pfnAddContactToGroup = cli_AddContactToGroup; - g_CLI.pfnAddContactToTree = cli_AddContactToTree; - g_CLI.pfnContactListWndProc = CLUI::cli_ContactListWndProc; - g_CLI.pfnFreeContact = cli_FreeContact; - g_CLI.pfnSetContactCheckboxes = cli_SetContactCheckboxes; - g_CLI.pfnTrayIconProcessMessage = cli_TrayIconProcessMessage; - g_CLI.pfnContactListControlWndProc = cli_ContactListControlWndProc; - g_CLI.pfnProcessExternalMessages = cli_ProcessExternalMessages; - g_CLI.pfnAddEvent = cli_AddEvent; - g_CLI.pfnRemoveEvent = cli_RemoveEvent; - g_CLI.pfnDocking_ProcessWindowMessage = Docking_ProcessWindowMessage; + g_clistApi.pfnIconFromStatusMode = cli_IconFromStatusMode; + g_clistApi.pfnLoadCluiGlobalOpts = CLUI_cli_LoadCluiGlobalOpts; + g_clistApi.pfnLoadClcOptions = cli_LoadCLCOptions; + g_clistApi.pfnSortCLC = cli_SortCLC; + g_clistApi.pfnAddContactToGroup = cli_AddContactToGroup; + g_clistApi.pfnAddContactToTree = cli_AddContactToTree; + g_clistApi.pfnContactListWndProc = CLUI::cli_ContactListWndProc; + g_clistApi.pfnFreeContact = cli_FreeContact; + g_clistApi.pfnSetContactCheckboxes = cli_SetContactCheckboxes; + g_clistApi.pfnTrayIconProcessMessage = cli_TrayIconProcessMessage; + g_clistApi.pfnContactListControlWndProc = cli_ContactListControlWndProc; + g_clistApi.pfnProcessExternalMessages = cli_ProcessExternalMessages; + g_clistApi.pfnAddEvent = cli_AddEvent; + g_clistApi.pfnRemoveEvent = cli_RemoveEvent; + g_clistApi.pfnDocking_ProcessWindowMessage = Docking_ProcessWindowMessage; return S_OK; } diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp index 7cfd68746a..41d6b51efb 100644 --- a/plugins/Clist_modern/src/modern_aniavatars.cpp +++ b/plugins/Clist_modern/src/modern_aniavatars.cpp @@ -229,7 +229,7 @@ static void CALLBACK _AniAva_SyncCallerUserAPCProc(DWORD_PTR dwParam) static INT_PTR _AniAva_CreateAvatarWindowSync_Worker(WPARAM tszName, LPARAM) { HWND hwnd = CreateWindowEx(WS_EX_TOPMOST | WS_EX_TRANSPARENT | WS_EX_NOPARENTNOTIFY, ANIAVAWINDOWCLASS, - (wchar_t*)tszName, WS_POPUP, 0, 0, 1, 1, g_CLI.hwndContactList, nullptr, g_CLI.hInst, nullptr); + (wchar_t*)tszName, WS_POPUP, 0, 0, 1, 1, g_clistApi.hwndContactList, nullptr, g_clistApi.hInst, nullptr); return (INT_PTR)hwnd; } @@ -474,9 +474,9 @@ static void _AniAva_LoadOptions() static void _AniAva_InvalidateParent(ANIAVA_WINDOWINFO * dat) { if (!IMMEDIATE_DRAW) return; - HWND hwndParent = g_CLI.hwndContactTree; + HWND hwndParent = g_clistApi.hwndContactTree; RECT rcPos = dat->rcPos; - g_CLI.pfnInvalidateRect(hwndParent, &rcPos, FALSE); + g_clistApi.pfnInvalidateRect(hwndParent, &rcPos, FALSE); } static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent = nullptr, RECT *rcInParent = nullptr) @@ -571,7 +571,7 @@ static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent = nullpt // intersect visible area // update layered window - GetWindowRect(g_CLI.hwndContactTree, &clistRect); + GetWindowRect(g_clistApi.hwndContactTree, &clistRect); if (dat->rcPos.top < 0) { pt_from.y += -dat->rcPos.top; szWnd.cy += dat->rcPos.top; @@ -596,7 +596,7 @@ static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent = nullpt exStyle |= WS_EX_LAYERED; SetWindowLongPtr(dat->hWindow, GWL_EXSTYLE, exStyle); if (!IMMEDIATE_DRAW) - SetWindowPos(g_CLI.hwndContactTree, dat->hWindow, 0, 0, 0, 0, SWP_ASYNCWINDOWPOS | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOSENDCHANGING); + SetWindowPos(g_clistApi.hwndContactTree, dat->hWindow, 0, 0, 0, 0, SWP_ASYNCWINDOWPOS | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOSENDCHANGING); UpdateLayeredWindow(dat->hWindow, hDC_animation, &ptWnd, &szWnd, copyFromDC, &pt_from, RGB(0, 0, 0), &bf, ULW_ALPHA); } @@ -695,10 +695,10 @@ static LRESULT CALLBACK _AniAva_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (dat->bOrderTop) SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_ASYNCWINDOWPOS); else { - LONG exStyle = GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE); - SetWindowPos(g_CLI.hwndContactList, hwnd, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + LONG exStyle = GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE); + SetWindowPos(g_clistApi.hwndContactList, hwnd, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); if (!(exStyle & WS_EX_TOPMOST)) - SetWindowPos(g_CLI.hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + SetWindowPos(g_clistApi.hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); } return 0; @@ -710,10 +710,10 @@ static LRESULT CALLBACK _AniAva_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (dat->bOrderTop) SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_ASYNCWINDOWPOS); else { - LONG exStyle = GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE); - SetWindowPos(g_CLI.hwndContactList, hwnd, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + LONG exStyle = GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE); + SetWindowPos(g_clistApi.hwndContactList, hwnd, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); if (!(exStyle&WS_EX_TOPMOST)) - SetWindowPos(g_CLI.hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + SetWindowPos(g_clistApi.hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); } } @@ -915,7 +915,7 @@ int AniAva_SetAvatarPos(MCONTACT hContact, RECT *rc, int overlayIdx, BYTE bAlpha _itoa((int)hContact, szName + 10, 16); HWND hwnd = _AniAva_CreateAvatarWindowSync(_A2T(szName)); - HWND parent = GetAncestor(g_CLI.hwndContactList, GA_PARENT); + HWND parent = GetAncestor(g_clistApi.hwndContactList, GA_PARENT); pai->hWindow = hwnd; SendMessage(hwnd, AAM_SETPARENT, (WPARAM)parent, 0); @@ -957,7 +957,7 @@ int AniAva_UpdateOptions() } if (bReloadAvatars) - PostMessage(g_CLI.hwndContactTree, INTM_AVATARCHANGED, 0, 0); + PostMessage(g_clistApi.hwndContactTree, INTM_AVATARCHANGED, 0, 0); else AniAva_RedrawAllAvatars(TRUE); return 0; @@ -970,7 +970,7 @@ void AniAva_UpdateParent() { aacheck; mir_cslock lck(s_CS); - HWND parent = GetAncestor(g_CLI.hwndContactList, GA_PARENT); + HWND parent = GetAncestor(g_clistApi.hwndContactList, GA_PARENT); for (auto &it : s_Objects) SendMessage(it->hWindow, AAM_SETPARENT, (WPARAM)parent, 0); } diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp index 65a350be88..7c8901bf67 100644 --- a/plugins/Clist_modern/src/modern_cachefuncs.cpp +++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp @@ -47,10 +47,10 @@ static BOOL ExecuteOnAllContactsOfGroup(ClcGroup *group, ExecuteOnAllContactsFun void Cache_GetTimezone(ClcData *dat, MCONTACT hContact) { ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact); - if (dat == nullptr && g_CLI.hwndContactTree) - dat = (ClcData *)GetWindowLongPtr(g_CLI.hwndContactTree, 0); + if (dat == nullptr && g_clistApi.hwndContactTree) + dat = (ClcData *)GetWindowLongPtr(g_clistApi.hwndContactTree, 0); - if (dat && dat->hWnd == g_CLI.hwndContactTree) { + if (dat && dat->hWnd == g_clistApi.hwndContactTree) { DWORD flags = dat->contact_time_show_only_if_different ? TZF_DIFONLY : 0; pdnce->hTimeZone = TimeZone_CreateByContact(hContact, nullptr, flags); } diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 923e67fda5..bf60ce87c9 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -119,7 +119,7 @@ static int clcHookSettingChanged(WPARAM hContact, LPARAM lParam) cliCluiProtocolStatusChanged(0, cws->szModule); else if (!strcmp(cws->szModule, "CList")) { if (!strcmp(cws->szSetting, "OnTop")) - SetWindowPos(g_CLI.hwndContactList, cws->value.bVal ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + SetWindowPos(g_clistApi.hwndContactList, cws->value.bVal ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); } } else { @@ -145,7 +145,7 @@ static int clcHookSettingChanged(WPARAM hContact, LPARAM lParam) else if (!strcmp(cws->szSetting, "ListeningTo")) Clist_Broadcast(INTM_STATUSMSGCHANGED, hContact, 0); else if (!strcmp(cws->szSetting, "Transport") || !strcmp(cws->szSetting, "IsTransported")) { - g_CLI.pfnInvalidateDisplayNameCacheEntry(hContact); + g_clistApi.pfnInvalidateDisplayNameCacheEntry(hContact); Clist_Broadcast(CLM_AUTOREBUILD, hContact, 0); } } @@ -236,8 +236,8 @@ static int clcSearchNextContact(HWND hwnd, ClcData *dat, int index, const wchar_ int contactScanIndex = group->scanIndex; int foundindex; for (; group; group = group->parent) - g_CLI.pfnSetGroupExpand(hwnd, dat, group, 1); - foundindex = g_CLI.pfnGetRowsPriorTo(&dat->list, contactGroup, contactScanIndex); + g_clistApi.pfnSetGroupExpand(hwnd, dat, group, 1); + foundindex = g_clistApi.pfnGetRowsPriorTo(&dat->list, contactGroup, contactScanIndex); if (fReturnAsFound) return foundindex; else if (nLastFound != -1 && fSearchUp && foundindex == index) @@ -313,7 +313,7 @@ static LRESULT clcOnHitTest(ClcData *, HWND hwnd, UINT, WPARAM wParam, LPARAM lP static LRESULT clcOnCommand(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM lParam) { ClcContact *contact; - int hit = g_CLI.pfnGetRowByIndex(dat, dat->selection, &contact, nullptr); + int hit = g_clistApi.pfnGetRowByIndex(dat, dat->selection, &contact, nullptr); if (hit != -1 && contact->type == CLCIT_GROUP) { switch (LOWORD(wParam)) { case POPUP_GROUPSHOWOFFLINE: @@ -384,7 +384,7 @@ static LRESULT clcOnChar(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARA static LRESULT clcOnPaint(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { if (IsWindowVisible(hwnd)) { - if (!g_CluiData.fLayered || GetParent(hwnd) != g_CLI.hwndContactList) { + if (!g_CluiData.fLayered || GetParent(hwnd) != g_clistApi.hwndContactList) { PAINTSTRUCT ps; HDC hdc = BeginPaint(hwnd, &ps); g_clcPainter.cliPaintClc(hwnd, dat, hdc, &ps.rcPaint); @@ -430,7 +430,7 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM } dat->selection = index; - g_CLI.pfnInvalidateRect(hwnd, nullptr, FALSE); + g_clistApi.pfnInvalidateRect(hwnd, nullptr, FALSE); Clist_EnsureVisible(hwnd, dat, dat->selection, 0); return 0; } @@ -443,7 +443,7 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM case VK_PRIOR: dat->selection -= pageSize; selMoved = 1; break; case VK_NEXT: dat->selection += pageSize; selMoved = 1; break; case VK_HOME: dat->selection = 0; selMoved = 1; break; - case VK_END: dat->selection = g_CLI.pfnGetGroupContentsCount(&dat->list, 1) - 1; selMoved = 1; break; + case VK_END: dat->selection = g_clistApi.pfnGetGroupContentsCount(&dat->list, 1) - 1; selMoved = 1; break; case VK_LEFT: changeGroupExpand = 1; break; case VK_RIGHT: changeGroupExpand = 2; break; case VK_RETURN: @@ -510,7 +510,7 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM db_set_b(contact->hContact, "CList", "Expanded", 0); ht = contact; dat->bNeedsResort = true; - g_CLI.pfnSortCLC(hwnd, dat, 1); + g_clistApi.pfnSortCLC(hwnd, dat, 1); cliRecalcScrollBar(hwnd, dat); hitcontact = nullptr; } @@ -525,7 +525,7 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM db_set_b(contact->hContact, "CList", "Expanded", 1); ht = contact; dat->bNeedsResort = true; - g_CLI.pfnSortCLC(hwnd, dat, 1); + g_clistApi.pfnSortCLC(hwnd, dat, 1); cliRecalcScrollBar(hwnd, dat); if (ht) { ClcContact *contact2; @@ -552,10 +552,10 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM dat->selection--; selMoved = 1; } - else g_CLI.pfnSetGroupExpand(hwnd, dat, contact->group, 0); + else g_clistApi.pfnSetGroupExpand(hwnd, dat, contact->group, 0); } else if (changeGroupExpand == 2) { - g_CLI.pfnSetGroupExpand(hwnd, dat, contact->group, 1); + g_clistApi.pfnSetGroupExpand(hwnd, dat, contact->group, 1); dat->selection++; selMoved = 1; } @@ -565,8 +565,8 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM } } if (selMoved) { - if (dat->selection >= g_CLI.pfnGetGroupContentsCount(&dat->list, 1)) - dat->selection = g_CLI.pfnGetGroupContentsCount(&dat->list, 1) - 1; + if (dat->selection >= g_clistApi.pfnGetGroupContentsCount(&dat->list, 1)) + dat->selection = g_clistApi.pfnGetGroupContentsCount(&dat->list, 1) - 1; if (dat->selection < 0) dat->selection = 0; if (dat->bCompactMode) SendMessage(hwnd, WM_SIZE, 0, 0); @@ -618,7 +618,7 @@ static LRESULT clcOnTimer(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPAR } dat->bNeedsResort = true; - g_CLI.pfnSortCLC(hwnd, dat, 1); + g_clistApi.pfnSortCLC(hwnd, dat, 1); cliRecalcScrollBar(hwnd, dat); if (ht) { int i = 0; @@ -636,13 +636,13 @@ static LRESULT clcOnTimer(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPAR case TIMERID_DELAYEDRESORTCLC: TRACE("Do sort on Timer\n"); KillTimer(hwnd, TIMERID_DELAYEDRESORTCLC); - g_CLI.pfnSortCLC(hwnd, dat, 1); - g_CLI.pfnInvalidateRect(hwnd, nullptr, FALSE); + g_clistApi.pfnSortCLC(hwnd, dat, 1); + g_clistApi.pfnInvalidateRect(hwnd, nullptr, FALSE); return 0; case TIMERID_RECALCSCROLLBAR: KillTimer(hwnd, TIMERID_RECALCSCROLLBAR); - g_CLI.pfnRecalcScrollBar(hwnd, dat); + g_clistApi.pfnRecalcScrollBar(hwnd, dat); return 0; default: @@ -745,7 +745,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP ClcGroup *selgroup; ClcContact *selcontact; dat->selection = cliGetRowByIndex(dat, dat->selection, &selcontact, &selgroup); - g_CLI.pfnSetGroupExpand(hwnd, dat, contact->group, -1); + g_clistApi.pfnSetGroupExpand(hwnd, dat, contact->group, -1); if (dat->selection != -1) { dat->selection = cliGetRowsPriorTo(&dat->list, selgroup, selgroup->cl.indexOf(selcontact)); if (dat->selection == -1) @@ -767,7 +767,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP if (contact->type == CLCIT_GROUP) Clist_SetGroupChildCheckboxes(contact->group, bNewState); else - g_CLI.pfnSetContactCheckboxes(contact, bNewState); + g_clistApi.pfnSetContactCheckboxes(contact, bNewState); Clist_RecalculateGroupCheckboxes(dat); cliInvalidateRect(hwnd, nullptr, FALSE); @@ -1203,8 +1203,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, { BOOL NeedRename = FALSE; wchar_t newName[128] = { 0 }; - g_CLI.pfnGetRowByIndex(dat, dat->iDragItem, &contact, &group); - int i = g_CLI.pfnGetRowByIndex(dat, dat->iInsertionMark, &destcontact, &destgroup); + g_clistApi.pfnGetRowByIndex(dat, dat->iDragItem, &contact, &group); + int i = g_clistApi.pfnGetRowByIndex(dat, dat->iInsertionMark, &destcontact, &destgroup); if (i != -1 && group->groupId != destgroup->groupId) { wchar_t *groupName = mir_wstrdup(Clist_GroupGetName(contact->groupId, nullptr)); wchar_t *shortGroup = nullptr; @@ -1303,7 +1303,7 @@ static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wPara Clist_DeleteItemFromTree(hwnd, wParam); if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !db_get_b(wParam, "CList", "Hidden", 0)) { NMCLISTCONTROL nm; - g_CLI.pfnAddContactToTree(hwnd, dat, wParam, 1, 1); + g_clistApi.pfnAddContactToTree(hwnd, dat, wParam, 1, 1); if (Clist_FindItem(hwnd, dat, wParam, &contact, nullptr, nullptr)) { memcpy(contact->iExtraImage, iExtraImage, sizeof(iExtraImage)); if (flags & CONTACTF_CHECKED) @@ -1350,9 +1350,9 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam ClcContact *contact = nullptr; if (!Clist_FindItem(hwnd, dat, wParam, &contact, &group, nullptr)) { if (shouldShow && db_is_contact(wParam)) { - if (dat->selection >= 0 && g_CLI.pfnGetRowByIndex(dat, dat->selection, &selcontact, nullptr) != -1) + if (dat->selection >= 0 && g_clistApi.pfnGetRowByIndex(dat, dat->selection, &selcontact, nullptr) != -1) hSelItem = Clist_ContactToHItem(selcontact); - g_CLI.pfnAddContactToTree(hwnd, dat, wParam, (style & CLS_CONTACTLIST) == 0, 0); + g_clistApi.pfnAddContactToTree(hwnd, dat, wParam, (style & CLS_CONTACTLIST) == 0, 0); needRepaint = TRUE; Clist_FindItem(hwnd, dat, wParam, &contact, nullptr, nullptr); if (contact) { @@ -1372,7 +1372,7 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam shouldShow = TRUE; if (!shouldShow && !(style & CLS_NOHIDEOFFLINE) && ((style & CLS_HIDEOFFLINE) || group->hideOffline || g_CluiData.bFilterEffective)) { // CLVM changed - if (dat->selection >= 0 && g_CLI.pfnGetRowByIndex(dat, dat->selection, &selcontact, nullptr) != -1) + if (dat->selection >= 0 && g_clistApi.pfnGetRowByIndex(dat, dat->selection, &selcontact, nullptr) != -1) hSelItem = Clist_ContactToHItem(selcontact); Clist_RemoveItemFromGroup(hwnd, group, contact, (style & CLS_CONTACTLIST) == 0); needRepaint = TRUE; @@ -1396,7 +1396,7 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam if (hSelItem) { if (Clist_FindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, nullptr)) - dat->selection = g_CLI.pfnGetRowsPriorTo(&dat->list, selgroup, selgroup->cl.indexOf(selcontact)); + dat->selection = g_clistApi.pfnGetRowsPriorTo(&dat->list, selgroup, selgroup->cl.indexOf(selcontact)); else dat->selection = -1; } @@ -1501,7 +1501,7 @@ static LRESULT clcOnIntmScrollBarChanged(ClcData *dat, HWND hwnd, UINT, WPARAM, if (dat->bNoVScrollbar) ShowScrollBar(hwnd, SB_VERT, FALSE); else - g_CLI.pfnRecalcScrollBar(hwnd, dat); + g_clistApi.pfnRecalcScrollBar(hwnd, dat); } return 0; } @@ -1538,11 +1538,11 @@ static LRESULT clcOnIntmStatusChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM static LRESULT clcOnIntmReloadOptions(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); - g_CLI.pfnLoadClcOptions(hwnd, dat, FALSE); + g_clistApi.pfnLoadClcOptions(hwnd, dat, FALSE); Clist_SaveStateAndRebuildList(hwnd, dat); - g_CLI.pfnSortCLC(hwnd, dat, 1); + g_clistApi.pfnSortCLC(hwnd, dat, 1); if (IsWindowVisible(hwnd)) - g_CLI.pfnInvalidateRect(GetParent(hwnd), nullptr, FALSE); + g_clistApi.pfnInvalidateRect(GetParent(hwnd), nullptr, FALSE); return TRUE; } diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index be79fcb714..d5c6efd7b0 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -208,7 +208,7 @@ bool CLCItems_IsShowOfflineGroup(ClcGroup *group) MCONTACT SaveSelection(ClcData *dat) { ClcContact *selcontact = nullptr; - if (g_CLI.pfnGetRowByIndex(dat, dat->selection, &selcontact, nullptr) == -1) + if (g_clistApi.pfnGetRowByIndex(dat, dat->selection, &selcontact, nullptr) == -1) return 0; return Clist_ContactToHItem(selcontact); @@ -224,9 +224,9 @@ int RestoreSelection(ClcData *dat, MCONTACT hSelected) } if (!selcontact->iSubNumber) - dat->selection = g_CLI.pfnGetRowsPriorTo(&dat->list, selgroup, selgroup->cl.indexOf(selcontact)); + dat->selection = g_clistApi.pfnGetRowsPriorTo(&dat->list, selgroup, selgroup->cl.indexOf(selcontact)); else { - dat->selection = g_CLI.pfnGetRowsPriorTo(&dat->list, selgroup, selgroup->cl.indexOf(selcontact->subcontacts)); + dat->selection = g_clistApi.pfnGetRowsPriorTo(&dat->list, selgroup, selgroup->cl.indexOf(selcontact->subcontacts)); if (dat->selection != -1) dat->selection += selcontact->iSubNumber; } @@ -247,7 +247,7 @@ int cliIsVisibleContact(ClcCacheEntry *pce, ClcGroup *group) void cliRebuildEntireList(HWND hwnd, ClcData *dat) { KillTimer(hwnd, TIMERID_REBUILDAFTER); - g_CLI.bAutoRebuild = false; + g_clistApi.bAutoRebuild = false; ImageArray_Clear(&dat->avatar_cache); RowHeights_Clear(dat); diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp index fead72d234..c05679e86b 100644 --- a/plugins/Clist_modern/src/modern_clcmsgs.cpp +++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp @@ -35,14 +35,14 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wP switch (msg) { case CLM_DELETEITEM: Clist_DeleteItemFromTree(hwnd, wParam); - clcSetDelayTimer(TIMERID_DELAYEDRESORTCLC, hwnd, 1); //g_CLI.pfnSortCLC(hwnd, dat, 1); - clcSetDelayTimer(TIMERID_RECALCSCROLLBAR, hwnd, 2); //g_CLI.pfnRecalcScrollBar(hwnd, dat); + clcSetDelayTimer(TIMERID_DELAYEDRESORTCLC, hwnd, 1); //g_clistApi.pfnSortCLC(hwnd, dat, 1); + clcSetDelayTimer(TIMERID_RECALCSCROLLBAR, hwnd, 2); //g_clistApi.pfnRecalcScrollBar(hwnd, dat); return 0; case CLM_AUTOREBUILD: if (dat->bForceInDialog) { Clist_SaveStateAndRebuildList(hwnd, dat); - g_CLI.bAutoRebuild = false; + g_clistApi.bAutoRebuild = false; } else clcSetDelayTimer(TIMERID_REBUILDAFTER, hwnd); return 0; @@ -190,7 +190,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wP if (!Clist_FindItem(hwnd, dat, wParam, &contact, &group, nullptr)) break; for (tgroup = group; tgroup; tgroup = tgroup->parent) - g_CLI.pfnSetGroupExpand(hwnd, dat, tgroup, 1); + g_clistApi.pfnSetGroupExpand(hwnd, dat, tgroup, 1); if (!contact->iSubNumber) { index = group->cl.indexOf(contact); @@ -211,7 +211,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wP } } - dat->selection = g_CLI.pfnGetRowsPriorTo(&dat->list, group, index); + dat->selection = g_clistApi.pfnGetRowsPriorTo(&dat->list, group, index); Clist_EnsureVisible(hwnd, dat, dat->selection, 0); } return 0; diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 229c8f1e53..7fbc457397 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -358,7 +358,7 @@ static INT_PTR CALLBACK DlgProcClistAdditionalOpts(HWND hwndDlg, UINT msg, WPARA db_set_b(0, "CLC", "SubIndent", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SUBINDENTSPIN, UDM_GETPOS, 0, 0)); ClcOptionsChanged(); CLUI_ReloadCLUIOptions(); - PostMessage(g_CLI.hwndContactList, WM_SIZE, 0, 0); + PostMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0); return TRUE; } } @@ -562,7 +562,7 @@ static INT_PTR CALLBACK DlgProcClistOpts(HWND hwndDlg, UINT msg, WPARAM wParam, db_set_b(0, "CList", "PlaceOfflineToRoot", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_OFFLINETOROOT)); Clist_LoadContactTree(); /* this won't do job properly since it only really works when changes happen */ - Clist_InitAutoRebuild(g_CLI.hwndContactTree); /* force reshuffle */ + Clist_InitAutoRebuild(g_clistApi.hwndContactTree); /* force reshuffle */ ClcOptionsChanged(); // Used to force loading avatar an list height related options return TRUE; } @@ -741,7 +741,7 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L Clist_TrayIconIconsChanged(); Clist_LoadContactTree(); /* this won't do job properly since it only really works when changes happen */ - Clist_InitAutoRebuild(g_CLI.hwndContactTree); /* force reshuffle */ + Clist_InitAutoRebuild(g_clistApi.hwndContactTree); /* force reshuffle */ ClcOptionsChanged(); // Used to force loading avatar an list height related options return TRUE; } @@ -905,7 +905,7 @@ static INT_PTR CALLBACK DlgProcClistBehaviourOpts(HWND hwndDlg, UINT msg, WPARAM db_set_b(0, "CList", "AutoHide", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); db_set_w(0, "CList", "HideTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0)); CLUI_ChangeWindowMode(); - SendMessage(g_CLI.hwndContactTree, WM_SIZE, 0, 0); //forces it to send a cln_listsizechanged + SendMessage(g_clistApi.hwndContactTree, WM_SIZE, 0, 0); //forces it to send a cln_listsizechanged CLUI_ReloadCLUIOptions(); EventArea_ConfigureEventArea(); cliShowHide(true); @@ -1126,7 +1126,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP g_CluiData.dwKeyColor = db_get_dw(0, "ModernSettings", "KeyColor", (DWORD)SETTING_KEYCOLOR_DEFAULT); db_set_b(0, "CList", "OnDesktop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)); db_set_b(0, "CList", "OnTop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONTOP)); - SetWindowPos(g_CLI.hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + SetWindowPos(g_clistApi.hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); db_set_b(0, "CLUI", "DragToScroll", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DRAGTOSCROLL)); { //====== Non-Layered Mode ====== @@ -1149,14 +1149,14 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP if (IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)) { HWND hProgMan = FindWindow(L"Progman", nullptr); if (IsWindow(hProgMan)) { - SetParent(g_CLI.hwndContactList, hProgMan); + SetParent(g_clistApi.hwndContactList, hProgMan); Sync(CLUIFrames_SetParentForContainers, (HWND)hProgMan); g_CluiData.fOnDesktop = true; } } else { - if (GetParent(g_CLI.hwndContactList)) { - SetParent(g_CLI.hwndContactList, nullptr); + if (GetParent(g_clistApi.hwndContactList)) { + SetParent(g_clistApi.hwndContactList, nullptr); Sync(CLUIFrames_SetParentForContainers, (HWND)nullptr); } g_CluiData.fOnDesktop = false; @@ -1170,7 +1170,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP db_set_dw(0, "CLUIFrames", "GapBetweenFrames", (DWORD)i1); db_set_dw(0, "CLUIFrames", "GapBetweenTitleBar", (DWORD)i2); - Sync(CLUIFramesOnClistResize, (WPARAM)g_CLI.hwndContactList, 0); + Sync(CLUIFramesOnClistResize, (WPARAM)g_clistApi.hwndContactList, 0); } db_set_b(0, "CList", "Transparent", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)); db_set_b(0, "CList", "Alpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0)); @@ -1180,7 +1180,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP ske_LoadSkinFromDB(); CLUI_UpdateLayeredMode(); CLUI_ChangeWindowMode(); - SendMessage(g_CLI.hwndContactTree, WM_SIZE, 0, 0); //forces it to send a cln_listsizechanged + SendMessage(g_clistApi.hwndContactTree, WM_SIZE, 0, 0); //forces it to send a cln_listsizechanged CLUI_ReloadCLUIOptions(); cliShowHide(true); g_mutex_bChangingMode = FALSE; diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index 8cdf7221c4..7de0e4022b 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -125,7 +125,7 @@ BOOL CLCPaint::IsForegroundWindow(HWND hWnd) HFONT CLCPaint::ChangeToFont(HDC hdc, ClcData *dat, int id, int *fontHeight) { if (!dat) - dat = (ClcData*)GetWindowLongPtr(g_CLI.hwndContactTree, 0); + dat = (ClcData*)GetWindowLongPtr(g_clistApi.hwndContactTree, 0); if (!dat) return nullptr; @@ -137,7 +137,7 @@ HFONT CLCPaint::ChangeToFont(HDC hdc, ClcData *dat, int id, int *fontHeight) *fontHeight = dat->fontModernInfo[id].fontHeight; ske_ResetTextEffect(hdc); - if (dat->hWnd == g_CLI.hwndContactTree && dat->fontModernInfo[id].effect != 0) + if (dat->hWnd == g_clistApi.hwndContactTree && dat->fontModernInfo[id].effect != 0) ske_SelectTextEffect(hdc, dat->fontModernInfo[id].effect - 1, dat->fontModernInfo[id].effectColour1, dat->fontModernInfo[id].effectColour2); else ske_ResetTextEffect(hdc); @@ -605,7 +605,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R // Let calc placeholder int minheight = dat->row_min_heigh; int mode2 = -1; - BOOL InClistWindow = (dat->hWnd == g_CLI.hwndContactTree); + BOOL InClistWindow = (dat->hWnd == g_clistApi.hwndContactTree); int height = RowHeight_CalcRowHeight(dat, Drawing, -1); ClcCacheEntry *pdnce = Drawing->pce; @@ -1233,7 +1233,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R break; case SETTING_AVATAR_OVERLAY_TYPE_PROTOCOL: { - int item = g_CLI.pfnIconFromStatusMode(Drawing->proto, Drawing->proto == nullptr ? ID_STATUS_OFFLINE : GetContactCachedStatus(Drawing->hContact), Drawing->hContact); + int item = g_clistApi.pfnIconFromStatusMode(Drawing->proto, Drawing->proto == nullptr ? ID_STATUS_OFFLINE : GetContactCachedStatus(Drawing->hContact), Drawing->hContact); if (item != -1) _DrawStatusIcon(Drawing, dat, item, hdcMem, p_rect.left, p_rect.top, ICON_HEIGHT, ICON_HEIGHT, @@ -2471,7 +2471,7 @@ void CLCPaint::_DrawContactAvatar(HDC hdcMem, ClcData *dat, ClcContact *Drawing, overlayIdx = g_pAvatarOverlayIcons[GetContactCachedStatus(Drawing->hContact) - ID_STATUS_OFFLINE].listID; break; case SETTING_AVATAR_OVERLAY_TYPE_PROTOCOL: - overlayIdx = g_CLI.pfnIconFromStatusMode(Drawing->proto, Drawing->proto == nullptr ? ID_STATUS_OFFLINE : GetContactCachedStatus(Drawing->hContact), Drawing->hContact); + overlayIdx = g_clistApi.pfnIconFromStatusMode(Drawing->proto, Drawing->proto == nullptr ? ID_STATUS_OFFLINE : GetContactCachedStatus(Drawing->hContact), Drawing->hContact); break; case SETTING_AVATAR_OVERLAY_TYPE_CONTACT: overlayIdx = Drawing->iImage; @@ -2545,7 +2545,7 @@ void CLCPaint::_DrawContactAvatar(HDC hdcMem, ClcData *dat, ClcContact *Drawing, break; case SETTING_AVATAR_OVERLAY_TYPE_PROTOCOL: { - int item = g_CLI.pfnIconFromStatusMode(Drawing->proto, Drawing->proto == nullptr ? ID_STATUS_OFFLINE : GetContactCachedStatus(Drawing->hContact), Drawing->hContact); + int item = g_clistApi.pfnIconFromStatusMode(Drawing->proto, Drawing->proto == nullptr ? ID_STATUS_OFFLINE : GetContactCachedStatus(Drawing->hContact), Drawing->hContact); if (item != -1) _DrawStatusIcon(Drawing, dat, item, hdcMem, ptOverlay.x, ptOverlay.y, ICON_HEIGHT, ICON_HEIGHT, @@ -2790,7 +2790,7 @@ void CLCPaint::_DrawContactItems(HDC hdcMem, ClcData *dat, ClcContact *Drawing, void CLCPaint::_PaintRowItems(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint) { // Extended LAYOUT - if (gl_RowRoot && (dat->hWnd == g_CLI.hwndContactTree)) { + if (gl_RowRoot && (dat->hWnd == g_clistApi.hwndContactTree)) { _PaintRowItemsEx(hdcMem, dat, Drawing, row_rc, free_row_rc, selected, hottrack); ske_ResetTextEffect(hdcMem); return; diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp index 5406a0e693..0648e1434c 100644 --- a/plugins/Clist_modern/src/modern_clcutils.cpp +++ b/plugins/Clist_modern/src/modern_clcutils.cpp @@ -234,7 +234,7 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar case WM_KILLFOCUS: Clist_EndRename((ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 1); - SendMessage(g_CLI.hwndContactTree, WM_SIZE, 0, 0); + SendMessage(g_clistApi.hwndContactTree, WM_SIZE, 0, 0); return 0; } return mir_callNextSubclass(hwnd, RenameEditSubclassProc, uMsg, wParam, lParam); @@ -464,7 +464,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) // Row dat->row_min_heigh = db_get_w(0, "CList", "MinRowHeight", CLCDEFAULT_ROWHEIGHT); dat->row_border = db_get_w(0, "CList", "RowBorder", SETTING_ROWBORDER_DEFAULT); - dat->row_before_group_space = ((hwnd != g_CLI.hwndContactTree && g_CLI.hwndContactTree != nullptr) + dat->row_before_group_space = ((hwnd != g_clistApi.hwndContactTree && g_clistApi.hwndContactTree != nullptr) || !db_get_b(0, "ModernData", "UseAdvancedRowLayout", SETTING_ROW_ADVANCEDLAYOUT_DEFAULT)) ? 0 : db_get_w(0, "ModernSkin", "SpaceBeforeGroup", SKIN_SPACEBEFOREGROUP_DEFAULT); dat->row_variable_height = db_get_b(0, "CList", "VariableRowHeight", SETTING_VARIABLEROWHEIGHT_DEFAULT); dat->row_align_left_items_to_left = db_get_b(0, "CList", "AlignLeftItemsToLeft", SETTING_ALIGNLEFTTOLEFT_DEFAULT); @@ -472,7 +472,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) dat->row_align_right_items_to_right = db_get_b(0, "CList", "AlignRightItemsToRight", SETTING_ALIGNRIGHTORIGHT_DEFAULT); //TODO: Add to settings dat->row_align_group_mode = db_get_b(0, "CList", "AlignGroupCaptions", SETTING_ALIGNGROPCAPTION_DEFAULT); - if (g_CLI.hwndContactTree == nullptr || dat->hWnd == g_CLI.hwndContactTree) { + if (g_clistApi.hwndContactTree == nullptr || dat->hWnd == g_clistApi.hwndContactTree) { int defItemsOrder[NUM_ITEM_TYPE] = SETTINS_ROWITEMORDER_DEFAULT; for (int i = 0; i < NUM_ITEM_TYPE; i++) { @@ -488,7 +488,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) } // Avatar - if (g_CLI.hwndContactTree == hwnd || g_CLI.hwndContactTree == nullptr) { + if (g_clistApi.hwndContactTree == hwnd || g_clistApi.hwndContactTree == nullptr) { dat->avatars_show = ServiceExists(MS_AV_GETAVATARBITMAP) && db_get_b(0, "CList", "AvatarsShow", SETTINGS_SHOWAVATARS_DEFAULT); dat->avatars_draw_border = db_get_b(0, "CList", "AvatarsDrawBorders", SETTINGS_AVATARDRAWBORDER_DEFAULT); dat->avatars_border_color = (COLORREF)db_get_dw(0, "CList", "AvatarsBorderColor", SETTINGS_AVATARBORDERCOLOR_DEFAULT); @@ -516,7 +516,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) } // Icon - if (g_CLI.hwndContactTree == hwnd || g_CLI.hwndContactTree == nullptr) { + if (g_clistApi.hwndContactTree == hwnd || g_clistApi.hwndContactTree == nullptr) { dat->icon_hide_on_avatar = db_get_b(0, "CList", "IconHideOnAvatar", SETTING_HIDEICONONAVATAR_DEFAULT); dat->icon_draw_on_avatar_space = db_get_b(0, "CList", "IconDrawOnAvatarSpace", SETTING_ICONONAVATARPLACE_DEFAULT); dat->icon_ignore_size_for_row_height = db_get_b(0, "CList", "IconIgnoreSizeForRownHeight", SETTING_ICONIGNORESIZE_DEFAULT); @@ -528,7 +528,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) } // Contact time - if (g_CLI.hwndContactTree == hwnd || g_CLI.hwndContactTree == nullptr) { + if (g_clistApi.hwndContactTree == hwnd || g_clistApi.hwndContactTree == nullptr) { dat->contact_time_show = db_get_b(0, "CList", "ContactTimeShow", SETTING_SHOWTIME_DEFAULT); dat->contact_time_show_only_if_different = db_get_b(0, "CList", "ContactTimeShowOnlyIfDifferent", SETTING_SHOWTIMEIFDIFF_DEFAULT); } @@ -545,7 +545,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) dat->text_smiley_height = 0; dat->text_use_protocol_smileys = db_get_b(0, "CList", "TextUseProtocolSmileys", SETTING_TEXT_PROTOSMILEY_DEFAULT); - if (g_CLI.hwndContactTree == hwnd || g_CLI.hwndContactTree == nullptr) + if (g_clistApi.hwndContactTree == hwnd || g_clistApi.hwndContactTree == nullptr) dat->text_ignore_size_for_row_height = db_get_b(0, "CList", "TextIgnoreSizeForRownHeight", SETTING_TEXT_IGNORESIZE_DEFAULT); else dat->text_ignore_size_for_row_height = 0; @@ -556,7 +556,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) gl_TrimText = db_get_b(0, "CList", "TrimText", SETTING_FIRSTLINE_TRIMTEXT_DEFAULT); // Second line - if (g_CLI.hwndContactTree == hwnd || g_CLI.hwndContactTree == nullptr) { + if (g_clistApi.hwndContactTree == hwnd || g_clistApi.hwndContactTree == nullptr) { dat->secondLine.show = db_get_b(0, "CList", "SecondLineShow", SETTING_SECONDLINE_SHOW_DEFAULT); dat->secondLine.top_space = db_get_w(0, "CList", "SecondLineTopSpace", SETTING_SECONDLINE_TOPSPACE_DEFAULT); dat->secondLine.draw_smileys = db_get_b(0, "CList", "SecondLineDrawSmileys", SETTING_SECONDLINE_SMILEYS_DEFAULT); @@ -576,7 +576,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) else memset(&dat->secondLine, 0, sizeof(dat->secondLine)); // Third line - if (g_CLI.hwndContactTree == hwnd || g_CLI.hwndContactTree == nullptr) { + if (g_clistApi.hwndContactTree == hwnd || g_clistApi.hwndContactTree == nullptr) { dat->thirdLine.show = db_get_b(0, "CList", "ThirdLineShow", SETTING_THIRDLINE_SHOW_DEFAULT); dat->thirdLine.top_space = db_get_w(0, "CList", "ThirdLineTopSpace", SETTING_THIRDLINE_TOPSPACE_DEFAULT); dat->thirdLine.draw_smileys = db_get_b(0, "CList", "ThirdLineDrawSmileys", SETTING_THIRDLINE_SMILEYS_DEFAULT); @@ -596,7 +596,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) else memset(&dat->thirdLine, 0, sizeof(dat->thirdLine)); dat->rightMargin = db_get_b(0, "CLC", "RightMargin", CLCDEFAULT_RIGHTMARGIN); - dat->bForceInDialog = (g_CLI.hwndContactTree) ? (hwnd != g_CLI.hwndContactTree) : 0; + dat->bForceInDialog = (g_clistApi.hwndContactTree) ? (hwnd != g_clistApi.hwndContactTree) : 0; dat->subIndent = db_get_b(0, "CLC", "SubIndent", CLCDEFAULT_GROUPINDENT); if (dat->hBmpBackground) { DeleteObject(dat->hBmpBackground); dat->hBmpBackground = nullptr; } @@ -619,7 +619,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst) dat->IsMetaContactsEnabled = (!(GetWindowLongPtr(hwnd, GWL_STYLE)&CLS_MANUALUPDATE)) && db_get_b(0, META_PROTO, "Enabled", 1); - if (g_CLI.hwndContactTree == nullptr || dat->hWnd == g_CLI.hwndContactTree) + if (g_clistApi.hwndContactTree == nullptr || dat->hWnd == g_clistApi.hwndContactTree) dat->bMetaIgnoreEmptyExtra = db_get_b(0, "CLC", "MetaIgnoreEmptyExtra", SETTING_METAIGNOREEMPTYEXTRA_DEFAULT) != 0; else dat->bMetaIgnoreEmptyExtra = false; @@ -651,7 +651,7 @@ int ExpandMetaContact(HWND hwnd, ClcContact *contact, ClcData *dat) contact->bSubExpanded = true; db_set_b(contact->hContact, "CList", "Expanded", contact->bSubExpanded); dat->bNeedsResort = true; - g_CLI.pfnSortCLC(hwnd, dat, 1); + g_clistApi.pfnSortCLC(hwnd, dat, 1); cliRecalcScrollBar(hwnd, dat); return contact->bSubExpanded; } @@ -685,8 +685,8 @@ int cliFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk) ClcGroup *ccGroup = group; int ccScanIndex = group->scanIndex; for (; group; group = group->parent) - g_CLI.pfnSetGroupExpand(hwnd, dat, group, 1); - return g_CLI.pfnGetRowsPriorTo(&dat->list, ccGroup, ccScanIndex + SubCount); + g_clistApi.pfnSetGroupExpand(hwnd, dat, group, 1); + return g_clistApi.pfnGetRowsPriorTo(&dat->list, ccGroup, ccScanIndex + SubCount); } if (cc->type == CLCIT_GROUP) { @@ -716,10 +716,10 @@ int cliFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk) ClcGroup *ccGroup = group; int ccScanIndex = group->scanIndex; for (; group; group = group->parent) - g_CLI.pfnSetGroupExpand(hwnd, dat, group, 1); + g_clistApi.pfnSetGroupExpand(hwnd, dat, group, 1); if (!cc->bSubExpanded) ExpandMetaContact(hwnd, cc, dat); - return g_CLI.pfnGetRowsPriorTo(&dat->list, ccGroup, ccScanIndex + SubCount + i + 1); + return g_clistApi.pfnGetRowsPriorTo(&dat->list, ccGroup, ccScanIndex + SubCount + i + 1); } } } diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp index 45c2c6db07..62447a7711 100644 --- a/plugins/Clist_modern/src/modern_clistevents.cpp +++ b/plugins/Clist_modern/src/modern_clistevents.cpp @@ -56,7 +56,7 @@ struct NotifyMenuItemExData static CLISTEVENT* MyGetEvent(int iSelection) { - for (auto &it : *g_CLI.events) + for (auto &it : *g_clistApi.events) if (it->menuId == iSelection) return it; @@ -142,7 +142,7 @@ CListEvent* cli_AddEvent(CLISTEVENT *cle) g_CluiData.hUpdateContact = p->hContact; } - if (g_CLI.events->getCount() > 0) { + if (g_clistApi.events->getCount() > 0) { g_CluiData.bEventAreaEnabled = true; if (g_CluiData.bNotifyActive == false) { g_CluiData.bNotifyActive = true; @@ -159,7 +159,7 @@ int cli_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent) { // Find the event that should be removed CListEvent *pEvent = nullptr; - for (auto &it : *g_CLI.events) + for (auto &it : *g_clistApi.events) if (it->hContact == hContact && it->hDbEvent == hDbEvent) { pEvent = it; break; @@ -186,7 +186,7 @@ int cli_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent) int res = corecli.pfnRemoveEvent(hContact, hDbEvent); - if (g_CLI.events->getCount() == 0) { + if (g_clistApi.events->getCount() == 0) { g_CluiData.bNotifyActive = false; EventArea_HideShowNotifyFrame(); } @@ -212,7 +212,7 @@ static event_area_t event_area; static BOOL sttDrawEventAreaBackground(HWND hwnd, HDC hdc, RECT *rect) { - BOOL bFloat = (GetParent(hwnd) != g_CLI.hwndContactList); + BOOL bFloat = (GetParent(hwnd) != g_clistApi.hwndContactList); if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat) { RECT rc; if (rect) @@ -247,13 +247,13 @@ static int ehhEventAreaBackgroundSettingsChanged(WPARAM, LPARAM) event_area.useWinColors = db_get_b(0, "EventArea", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS); event_area.backgroundBmpUse = db_get_w(0, "EventArea", "BkBmpUse", CLCDEFAULT_BKBMPUSE); } - PostMessage(g_CLI.hwndContactList, WM_SIZE, 0, 0); + PostMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0); return 0; } void EventArea_ConfigureEventArea() { - int iCount = g_CLI.events->getCount(); + int iCount = g_clistApi.events->getCount(); g_CluiData.dwFlags &= ~(CLUI_FRAME_AUTOHIDENOTIFY | CLUI_FRAME_SHOWALWAYS); if (db_get_b(0, "CLUI", "EventArea", SETTING_EVENTAREAMODE_DEFAULT) == 1) g_CluiData.dwFlags |= CLUI_FRAME_AUTOHIDENOTIFY; @@ -325,7 +325,7 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC) static int EventArea_Draw(HWND hwnd, HDC hDC) { if (hwnd == (HWND)-1) return 0; - if (GetParent(hwnd) == g_CLI.hwndContactList) + if (GetParent(hwnd) == g_clistApi.hwndContactList) return EventArea_DrawWorker(hwnd, hDC); cliInvalidateRect(hwnd, nullptr, FALSE); @@ -407,7 +407,7 @@ static LRESULT CALLBACK EventArea_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LP // event we're interested in was removed by the service (nasty one...) cle1 = MyGetEvent(iSelection); if (cle1 != nullptr) - g_CLI.pfnRemoveEvent(cle->hContact, cle->hDbEvent); + g_clistApi.pfnRemoveEvent(cle->hContact, cle->hDbEvent); } } } @@ -424,9 +424,9 @@ static LRESULT CALLBACK EventArea_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LP return 1; case WM_PAINT: - if (GetParent(hwnd) == g_CLI.hwndContactList && g_CluiData.fLayered) + if (GetParent(hwnd) == g_clistApi.hwndContactList && g_CluiData.fLayered) CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE, (WPARAM)hwnd, 0); - else if (GetParent(hwnd) == g_CLI.hwndContactList && !g_CluiData.fLayered) { + else if (GetParent(hwnd) == g_clistApi.hwndContactList && !g_CluiData.fLayered) { RECT rc = { 0 }; GetClientRect(hwnd, &rc); rc.right++; diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index 8c30001324..923242e93f 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -136,7 +136,7 @@ static INT_PTR CloseAction(WPARAM, LPARAM) } while (!k); if (k) - DestroyWindow(g_CLI.hwndContactList); + DestroyWindow(g_clistApi.hwndContactList); return 0; } diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index 2aae35ea02..4734bcada5 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -65,7 +65,7 @@ HICON cliGetIconFromStatusMode(MCONTACT hContact, const char *szProto, int statu } } - return ske_ImageList_GetIcon(g_himlCListClc, g_CLI.pfnIconFromStatusMode(szProto, status, hContact)); + return ske_ImageList_GetIcon(g_himlCListClc, g_clistApi.pfnIconFromStatusMode(szProto, status, hContact)); } int cli_IconFromStatusMode(const char *szProto, int nStatus, MCONTACT hContact) @@ -107,7 +107,7 @@ int cli_IconFromStatusMode(const char *szProto, int nStatus, MCONTACT hContact) int GetContactIconC(ClcCacheEntry *p) { - return g_CLI.pfnIconFromStatusMode(p->szProto, p->szProto == nullptr ? ID_STATUS_OFFLINE : p->m_iStatus, p->hContact); + return g_clistApi.pfnIconFromStatusMode(p->szProto, p->szProto == nullptr ? ID_STATUS_OFFLINE : p->m_iStatus, p->hContact); } //lParam @@ -193,7 +193,7 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY) return GWVS_VISIBLE; HWND hwndFocused = GetFocus(); - if (hwndFocused == g_CLI.hwndContactList || GetParent(hwndFocused) == g_CLI.hwndContactList) + if (hwndFocused == g_clistApi.hwndContactList || GetParent(hwndFocused) == g_clistApi.hwndContactList) return GWVS_VISIBLE; // Some defaults now. The routine is designed for thin and tall windows. @@ -307,7 +307,7 @@ int cliShowHide(bool bAlwaysShow) { BOOL bShow = FALSE; - int iVisibleState = GetWindowVisibleState(g_CLI.hwndContactList, 0, 0); + int iVisibleState = GetWindowVisibleState(g_clistApi.hwndContactList, 0, 0); int method = db_get_b(0, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT); //(0-none, 1-leftedge, 2-rightedge); if (method) { if (db_get_b(0, "ModernData", "BehindEdge", SETTING_BEHINDEDGE_DEFAULT) == 0 && !bAlwaysShow) @@ -337,46 +337,46 @@ int cliShowHide(bool bAlwaysShow) bShow = TRUE; break; case GWVS_VISIBLE: //This is not needed, but goes for readability. bShow = FALSE; break; - case -1: //We can't get here, both g_CLI.hwndContactList and iStepX and iStepY are right. + case -1: //We can't get here, both g_clistApi.hwndContactList and iStepX and iStepY are right. return 0; } if (bShow || bAlwaysShow) { Sync(CLUIFrames_ActivateSubContainers, TRUE); - CLUI_ShowWindowMod(g_CLI.hwndContactList, SW_RESTORE); + CLUI_ShowWindowMod(g_clistApi.hwndContactList, SW_RESTORE); if (!db_get_b(0, "CList", "OnDesktop", SETTING_ONDESKTOP_DEFAULT)) { Sync(CLUIFrames_OnShowHide, 1); //TO BE PROXIED - SetWindowPos(g_CLI.hwndContactList, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + SetWindowPos(g_clistApi.hwndContactList, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); g_bCalledFromShowHide = 1; if (!db_get_b(0, "CList", "OnTop", SETTING_ONTOP_DEFAULT)) - SetWindowPos(g_CLI.hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + SetWindowPos(g_clistApi.hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); g_bCalledFromShowHide = 0; } else { - SetWindowPos(g_CLI.hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + SetWindowPos(g_clistApi.hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); Sync(CLUIFrames_OnShowHide, 1); - SetForegroundWindow(g_CLI.hwndContactList); + SetForegroundWindow(g_clistApi.hwndContactList); } db_set_b(0, "CList", "State", SETTING_STATE_NORMAL); RECT rcWindow; - GetWindowRect(g_CLI.hwndContactList, &rcWindow); + GetWindowRect(g_clistApi.hwndContactList, &rcWindow); if (Utils_AssertInsideScreen(&rcWindow) == 1) - MoveWindow(g_CLI.hwndContactList, rcWindow.left, rcWindow.top, + MoveWindow(g_clistApi.hwndContactList, rcWindow.left, rcWindow.top, rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, TRUE); } else { // It needs to be hidden - if (GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) { + if (GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) { CListMod_HideWindow(); db_set_b(0, "CList", "State", SETTING_STATE_HIDDEN); } else if (db_get_b(0, "CList", "Min2Tray", SETTING_MIN2TRAY_DEFAULT)) { - CLUI_ShowWindowMod(g_CLI.hwndContactList, SW_HIDE); + CLUI_ShowWindowMod(g_clistApi.hwndContactList, SW_HIDE); db_set_b(0, "CList", "State", SETTING_STATE_HIDDEN); } else { - CLUI_ShowWindowMod(g_CLI.hwndContactList, SW_MINIMIZE); + CLUI_ShowWindowMod(g_clistApi.hwndContactList, SW_MINIMIZE); db_set_b(0, "CList", "State", SETTING_STATE_MINIMIZED); } @@ -387,9 +387,9 @@ int cliShowHide(bool bAlwaysShow) int CListMod_HideWindow() { - KillTimer(g_CLI.hwndContactList, 1); + KillTimer(g_clistApi.hwndContactList, 1); if (!CLUI_HideBehindEdge()) - return CLUI_SmoothAlphaTransition(g_CLI.hwndContactList, 0, 1); + return CLUI_SmoothAlphaTransition(g_clistApi.hwndContactList, 0, 1); return 0; } diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index ccaf1c54d7..26fa401b41 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -95,7 +95,7 @@ int GetContactCachedStatus(MCONTACT hContact) int ContactAdded(WPARAM hContact, LPARAM) { if (!MirandaExiting()) - Clist_ChangeContactIcon(hContact, g_CLI.pfnIconFromStatusMode(GetContactProto(hContact), ID_STATUS_OFFLINE, hContact)); + Clist_ChangeContactIcon(hContact, g_clistApi.pfnIconFromStatusMode(GetContactProto(hContact), ID_STATUS_OFFLINE, hContact)); return 0; } @@ -140,8 +140,8 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) Clist_Broadcast(INTM_STATUSCHANGED, hContact, 0); } else if (!strcmp(cws->szModule, META_PROTO) && !memcmp(cws->szSetting, "Status", 6)) { // Status0..N for metacontacts - if (g_CLI.hwndContactTree && g_flag_bOnModulesLoadedCalled) - Clist_InitAutoRebuild(g_CLI.hwndContactTree); + if (g_clistApi.hwndContactTree && g_flag_bOnModulesLoadedCalled) + Clist_InitAutoRebuild(g_clistApi.hwndContactTree); if ((db_get_w(0, "CList", "SecondLineType", SETTING_SECONDLINE_TYPE_DEFAULT) == TEXT_STATUS_MESSAGE || db_get_w(0, "CList", "ThirdLineType", SETTING_THIRDLINE_TYPE_DEFAULT) == TEXT_STATUS_MESSAGE) && pdnce->hContact && pdnce->szProto) amRequestAwayMsg(hContact); @@ -152,7 +152,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) pdnce->IdleTS = cws->value.dVal; else if (!strcmp(cws->szSetting, "IsSubcontact")) { pdnce->m_bIsSub = (cws->value.type == DBVT_DELETED) ? false : cws->value.bVal != 0; - Clist_InitAutoRebuild(g_CLI.hwndContactTree); + Clist_InitAutoRebuild(g_clistApi.hwndContactTree); } } @@ -170,7 +170,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) else if (!strcmp(cws->szSetting, "Hidden")) { pdnce->bIsHidden = cws->value.bVal; if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0) - Clist_ChangeContactIcon(hContact, g_CLI.pfnIconFromStatusMode(pdnce->szProto, pdnce->getStatus(), hContact)); + Clist_ChangeContactIcon(hContact, g_clistApi.pfnIconFromStatusMode(pdnce->szProto, pdnce->getStatus(), hContact)); Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); } @@ -183,7 +183,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) if (!strcmp(cws->szSetting, "p")) { pdnce->szProto = GetContactProto(hContact); char *szProto = (cws->value.type == DBVT_DELETED) ? nullptr : cws->value.pszVal; - Clist_ChangeContactIcon(hContact, g_CLI.pfnIconFromStatusMode(szProto, pdnce->getStatus(), hContact)); + Clist_ChangeContactIcon(hContact, g_clistApi.pfnIconFromStatusMode(szProto, pdnce->getStatus(), hContact)); } } diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index 450e3462c3..3e4a04ba0d 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -109,7 +109,7 @@ static UINT_PTR autoHideTimerId; static VOID CALLBACK TrayIconAutoHideTimer(HWND hwnd, UINT, UINT_PTR idEvent, DWORD) { KillTimer(hwnd, idEvent); - HWND hwndClui = g_CLI.hwndContactList; + HWND hwndClui = g_clistApi.hwndContactList; HWND ActiveWindow = GetActiveWindow(); if (ActiveWindow == hwndClui) return; if (CLUI_CheckOwnedByClui(ActiveWindow)) return; @@ -121,7 +121,7 @@ static VOID CALLBACK TrayIconAutoHideTimer(HWND hwnd, UINT, UINT_PTR idEvent, DW int cliTrayIconPauseAutoHide(WPARAM, LPARAM) { if (db_get_b(0, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT)) { - if (GetActiveWindow() != g_CLI.hwndContactList && GetWindow(GetParent(GetActiveWindow()), GW_OWNER) != g_CLI.hwndContactList) { + if (GetActiveWindow() != g_clistApi.hwndContactList && GetWindow(GetParent(GetActiveWindow()), GW_OWNER) != g_clistApi.hwndContactList) { KillTimer(nullptr, autoHideTimerId); autoHideTimerId = CLUI_SafeSetTimer(nullptr, 0, 1000 * db_get_w(0, "CList", "HideTime", SETTING_HIDETIME_DEFAULT), TrayIconAutoHideTimer); } @@ -138,8 +138,8 @@ INT_PTR cli_TrayIconProcessMessage(WPARAM wParam, LPARAM lParam) MSG *msg = (MSG*)wParam; switch (msg->message) { case WM_EXITMENULOOP: - if (g_CLI.bTrayMenuOnScreen) - g_CLI.bTrayMenuOnScreen = FALSE; + if (g_clistApi.bTrayMenuOnScreen) + g_clistApi.bTrayMenuOnScreen = FALSE; break; case TIM_CALLBACK: @@ -151,7 +151,7 @@ INT_PTR cli_TrayIconProcessMessage(WPARAM wParam, LPARAM lParam) SetForegroundWindow(msg->hwnd); SetFocus(msg->hwnd); GetCursorPos(&pt); - g_CLI.bTrayMenuOnScreen = TRUE; + g_clistApi.bTrayMenuOnScreen = TRUE; TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, msg->hwnd, nullptr); PostMessage(msg->hwnd, WM_NULL, 0, 0); g_mutex_bOnTrayRightClick = 0; @@ -170,7 +170,7 @@ INT_PTR cli_TrayIconProcessMessage(WPARAM wParam, LPARAM lParam) HWND h1 = (HWND)msg->lParam; HWND h2 = h1 ? GetParent(h1) : nullptr; if (db_get_b(0, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT)) { - if (LOWORD(msg->wParam) == WA_INACTIVE && h2 != g_CLI.hwndContactList) + if (LOWORD(msg->wParam) == WA_INACTIVE && h2 != g_clistApi.hwndContactList) autoHideTimerId = CLUI_SafeSetTimer(nullptr, 0, 1000 * db_get_w(0, "CList", "HideTime", SETTING_HIDETIME_DEFAULT), TrayIconAutoHideTimer); else { KillTimer(nullptr, autoHideTimerId); @@ -192,7 +192,7 @@ INT_PTR cli_TrayIconProcessMessage(WPARAM wParam, LPARAM lParam) VOID CALLBACK cliTrayCycleTimerProc(HWND, UINT, UINT_PTR, DWORD) { - if (!g_CLI.trayIconCount) + if (!g_clistApi.trayIconCount) return; PROTOACCOUNT **acc; @@ -200,14 +200,14 @@ VOID CALLBACK cliTrayCycleTimerProc(HWND, UINT, UINT_PTR, DWORD) Proto_EnumAccounts(&AccNum, &acc); // looking for the appropriate account to show its icon - int t = g_CLI.cycleStep; + int t = g_clistApi.cycleStep; do { - g_CLI.cycleStep = (g_CLI.cycleStep + 1) % AccNum; - if (g_CLI.cycleStep == t) + g_clistApi.cycleStep = (g_clistApi.cycleStep + 1) % AccNum; + if (g_clistApi.cycleStep == t) return; - } while (acc[g_CLI.cycleStep]->bIsVirtual || !acc[g_CLI.cycleStep]->bIsVisible); + } while (acc[g_clistApi.cycleStep]->bIsVirtual || !acc[g_clistApi.cycleStep]->bIsVisible); - cliTrayCalcChanged(acc[g_CLI.cycleStep]->szModuleName, 0, 0); + cliTrayCalcChanged(acc[g_clistApi.cycleStep]->szModuleName, 0, 0); } ///////////////////////////////////////////////////////////////////////////////////////// @@ -294,7 +294,7 @@ UINT_PTR TimerID = 0; int cliTrayIconInit(HWND hwnd) { - if (g_CLI.trayIconCount != 0) + if (g_clistApi.trayIconCount != 0) return 0; if (TimerID) { @@ -308,11 +308,11 @@ int cliTrayIconInit(HWND hwnd) // Нужно узнать количество годных аккаунтов и неодинаковость их статусов. bool bDiffers; - g_CLI.trayIconCount = GetGoodAccNum(&bDiffers); + g_clistApi.trayIconCount = GetGoodAccNum(&bDiffers); // Если таковых аккаунтов не нашлось вообще, то будем показывать основную иконку Миранды. - if (!g_CLI.trayIconCount) { - g_CLI.trayIconCount = 1; - g_CLI.trayIcon = (trayIconInfo_t*)mir_calloc(sizeof(trayIconInfo_t) * g_CLI.trayIconCount); + if (!g_clistApi.trayIconCount) { + g_clistApi.trayIconCount = 1; + g_clistApi.trayIcon = (trayIconInfo_t*)mir_calloc(sizeof(trayIconInfo_t) * g_clistApi.trayIconCount); Clist_TrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0)); OldMode = TRAY_ICON_MODE_GLOBAL; return 0; @@ -326,9 +326,9 @@ int cliTrayIconInit(HWND hwnd) // Некоторые режимы всегда показывают единственную иконку. if (Mode < 8) - g_CLI.trayIconCount = 1; + g_clistApi.trayIconCount = 1; - g_CLI.trayIcon = (trayIconInfo_t*)mir_calloc(sizeof(trayIconInfo_t) * g_CLI.trayIconCount); + g_clistApi.trayIcon = (trayIconInfo_t*)mir_calloc(sizeof(trayIconInfo_t) * g_clistApi.trayIconCount); // Добавляем иконки. switch (Mode) { @@ -352,7 +352,7 @@ int cliTrayIconInit(HWND hwnd) case TRAY_ICON_MODE_CYCLE: Clist_TrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0)); - g_CLI.cycleStep = 0; + g_clistApi.cycleStep = 0; cliTrayCycleTimerProc(nullptr, 0, 0, 0); // force icon update // Не сохраняем ID таймера в pcli, чтобы fnTrayIconUpdateBase не убивала его. @@ -374,7 +374,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) if (!szChangedProto) return -1; - if (!g_CLI.trayIconCount) + if (!g_clistApi.trayIconCount) return -1; if (!Clist_GetProtocolVisibility(szChangedProto)) @@ -395,7 +395,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) switch (Mode) { case TRAY_ICON_MODE_GLOBAL: - hIcon = g_CLI.pfnGetIconFromStatusMode(0, nullptr, CListTray_GetGlobalStatus(0, 0)); + hIcon = g_clistApi.pfnGetIconFromStatusMode(0, nullptr, CListTray_GetGlobalStatus(0, 0)); Clist_TrayIconMakeTooltip(nullptr, nullptr); break; @@ -410,7 +410,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) if (g_StatusBarData.bConnectingIcon && IsStatusConnecting(iStatus)) hIcon = (HICON)CLUI_GetConnectingIconService((WPARAM)szProto, 0); else - hIcon = g_CLI.pfnGetIconFromStatusMode(0, szProto, Proto_GetStatus(szProto)); + hIcon = g_clistApi.pfnGetIconFromStatusMode(0, szProto, Proto_GetStatus(szProto)); Clist_TrayIconMakeTooltip(nullptr, szProto); } @@ -421,39 +421,39 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) if (g_StatusBarData.bConnectingIcon && IsStatusConnecting(iStatus)) hIcon = (HICON)CLUI_GetConnectingIconService((WPARAM)szChangedProto, 0); else if (!bConn) - hIcon = g_CLI.pfnGetIconFromStatusMode(0, szChangedProto, Proto_GetStatus(szChangedProto)); + hIcon = g_clistApi.pfnGetIconFromStatusMode(0, szChangedProto, Proto_GetStatus(szChangedProto)); Clist_TrayIconMakeTooltip(nullptr, nullptr); break; case TRAY_ICON_MODE_ALL: // Какой индекс у аккаунта, который будем апдейтить? - for (; i < g_CLI.trayIconCount; i++) - if (!mir_strcmp(g_CLI.trayIcon[i].szProto, szChangedProto)) + for (; i < g_clistApi.trayIconCount; i++) + if (!mir_strcmp(g_clistApi.trayIcon[i].szProto, szChangedProto)) break; iStatus = Proto_GetStatus(szChangedProto); if (g_StatusBarData.bConnectingIcon && IsStatusConnecting(iStatus)) hIcon = (HICON)CLUI_GetConnectingIconService((WPARAM)szChangedProto, 0); else - hIcon = g_CLI.pfnGetIconFromStatusMode(0, szChangedProto, Proto_GetStatus(szChangedProto)); - Clist_TrayIconMakeTooltip(nullptr, g_CLI.trayIcon[i].szProto); + hIcon = g_clistApi.pfnGetIconFromStatusMode(0, szChangedProto, Proto_GetStatus(szChangedProto)); + Clist_TrayIconMakeTooltip(nullptr, g_clistApi.trayIcon[i].szProto); break; } - trayIconInfo_t &p = g_CLI.trayIcon[i]; + trayIconInfo_t &p = g_clistApi.trayIcon[i]; DestroyIcon(p.hBaseIcon); p.hBaseIcon = hIcon; - replaceStrW(p.ptszToolTip, g_CLI.szTip); + replaceStrW(p.ptszToolTip, g_clistApi.szTip); NOTIFYICONDATA nid = { sizeof(NOTIFYICONDATA) }; - nid.hWnd = g_CLI.hwndContactList; + nid.hWnd = g_clistApi.hwndContactList; nid.uID = p.id; nid.hIcon = p.hBaseIcon; nid.uFlags = NIF_ICON | NIF_TIP; // if Tipper is missing or turned off for tray, use system tooltips if (!ServiceExists("mToolTip/ShowTip") || !db_get_b(0, "Tipper", "TrayTip", 1)) - mir_wstrncpy(nid.szTip, g_CLI.szTip, _countof(nid.szTip)); + mir_wstrncpy(nid.szTip, g_clistApi.szTip, _countof(nid.szTip)); Shell_NotifyIcon(NIM_MODIFY, &nid); diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 745ca9a62b..be0136f7e5 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -161,7 +161,7 @@ int CLUI::OnEvent_ModulesLoaded(WPARAM, LPARAM) SleepEx(0, TRUE); g_flag_bOnModulesLoadedCalled = TRUE; - SendMessage(g_CLI.hwndContactList, UM_CREATECLC, 0, 0); // $$$ + SendMessage(g_clistApi.hwndContactList, UM_CREATECLC, 0, 0); // $$$ InitSkinHotKeys(); g_CluiData.bSTATE = STATE_NORMAL; ske_RedrawCompleteWindow(); @@ -174,7 +174,7 @@ int CLUI::OnEvent_FontReload(WPARAM wParam, LPARAM lParam) g_CluiData.dwKeyColor = db_get_dw(0, "ModernSettings", "KeyColor", (DWORD)SETTING_KEYCOLOR_DEFAULT); - cliInvalidateRect(g_CLI.hwndContactList, nullptr, 0); + cliInvalidateRect(g_clistApi.hwndContactList, nullptr, 0); return 0; } @@ -187,7 +187,7 @@ int CLUI::OnEvent_ContactMenuPreBuild(WPARAM, LPARAM) wchar_t cls[128]; GetClassName(hwndClist, cls, _countof(cls)); if (mir_wstrcmp(CLISTCONTROL_CLASSW, cls)) - hwndClist = g_CLI.hwndContactList; + hwndClist = g_clistApi.hwndContactList; MCONTACT hItem = (MCONTACT)SendMessage(hwndClist, CLM_GETSELECTION, 0, 0); Menu_ShowItem(hRenameMenuItem, hItem != 0); @@ -209,7 +209,7 @@ INT_PTR CLUI::Service_ShowMainMenu(WPARAM, LPARAM) { POINT pt; GetCursorPos(&pt); - TrackPopupMenu(Menu_GetMainMenu(), TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, g_CLI.hwndContactList, nullptr); + TrackPopupMenu(Menu_GetMainMenu(), TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, g_clistApi.hwndContactList, nullptr); return 0; } @@ -217,7 +217,7 @@ INT_PTR CLUI::Service_ShowStatusMenu(WPARAM, LPARAM) { POINT pt; GetCursorPos(&pt); - TrackPopupMenu(Menu_GetStatusMenu(), TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, g_CLI.hwndContactList, nullptr); + TrackPopupMenu(Menu_GetStatusMenu(), TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, g_clistApi.hwndContactList, nullptr); return 0; } @@ -239,7 +239,7 @@ INT_PTR CLUI::Service_Menu_HideContactAvatar(WPARAM hContact, LPARAM) HRESULT CLUI::CreateCluiFrames() { - g_hMenuMain = GetMenu(g_CLI.hwndContactList); + g_hMenuMain = GetMenu(g_clistApi.hwndContactList); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); @@ -250,7 +250,7 @@ HRESULT CLUI::CreateCluiFrames() mii.hSubMenu = Menu_GetStatusMenu(); SetMenuItemInfo(g_hMenuMain, 1, TRUE, &mii); - CreateCLCWindow(g_CLI.hwndContactList); + CreateCLCWindow(g_clistApi.hwndContactList); CLUI_ChangeWindowMode(); @@ -348,7 +348,7 @@ HRESULT CLUI::RegisterAvatarMenu() HRESULT CLUI::CreateCLCWindow(const HWND hwndClui) { - g_CLI.hwndContactTree = CreateWindow(CLISTCONTROL_CLASSW, L"", + g_clistApi.hwndContactTree = CreateWindow(CLISTCONTROL_CLASSW, L"", WS_CHILD | WS_CLIPCHILDREN | CLS_CONTACTLIST | (db_get_b(0, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0) | (db_get_b(0, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? CLS_HIDEOFFLINE : 0) @@ -361,9 +361,9 @@ HRESULT CLUI::CreateCLCWindow(const HWND hwndClui) HRESULT CLUI::CreateUIFrames() { - EventArea_Create(g_CLI.hwndContactList); + EventArea_Create(g_clistApi.hwndContactList); CreateViewModeFrame(); - g_CLI.hwndStatus = StatusBar_Create(g_CLI.hwndContactList); + g_clistApi.hwndStatus = StatusBar_Create(g_clistApi.hwndContactList); return S_OK; } @@ -408,7 +408,7 @@ HRESULT CLUI::FillAlphaChannel(HDC hDC, RECT *prcParent) HRESULT CLUI::CreateCLC() { CLISTFrame Frame = { sizeof(Frame) }; - Frame.hWnd = g_CLI.hwndContactTree; + Frame.hWnd = g_clistApi.hwndContactTree; Frame.align = alClient; Frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME); Frame.Flags = F_VISIBLE | F_SHOWTBTIP | F_NO_SUBCONTAINER | F_UNICODE; @@ -423,7 +423,7 @@ HRESULT CLUI::CreateCLC() nLastRequiredHeight = 0; if (g_CluiData.current_viewmode[0] == '\0') { - g_CLI.pfnSetHideOffline((bOldHideOffline == -1) ? false : bOldHideOffline); + g_clistApi.pfnSetHideOffline((bOldHideOffline == -1) ? false : bOldHideOffline); CallService(MS_CLIST_SETUSEGROUPS, (bOldUseGroups == -1) ? false : bOldUseGroups, 0); } nLastRequiredHeight = 0; @@ -486,7 +486,7 @@ BOOL CLUI_CheckOwnedByClui(HWND hWnd) if (!hWnd) return FALSE; - HWND hWndClui = g_CLI.hwndContactList; + HWND hWndClui = g_clistApi.hwndContactList; HWND hWndMid = GetAncestor(hWnd, GA_ROOTOWNER); if (hWndMid == hWndClui) return TRUE; @@ -501,7 +501,7 @@ BOOL CLUI_CheckOwnedByClui(HWND hWnd) int CLUI_ShowWindowMod(HWND hWnd, int nCmd) { - if (hWnd == g_CLI.hwndContactList) { + if (hWnd == g_clistApi.hwndContactList) { if (nCmd == SW_HIDE || nCmd == SW_MINIMIZE) { AniAva_InvalidateAvatarPositions(0); AniAva_RemoveInvalidatedAvatars(); @@ -553,25 +553,25 @@ void CLUI_UpdateLayeredMode() bool tLayeredFlag = db_get_b(0, "ModernData", "EnableLayering", SETTING_ENABLELAYERING_DEFAULT) != 0 && !g_CluiData.fDisableSkinEngine; if (g_CluiData.fLayered != tLayeredFlag) { - BOOL fWasVisible = IsWindowVisible(g_CLI.hwndContactList); + BOOL fWasVisible = IsWindowVisible(g_clistApi.hwndContactList); if (fWasVisible) - ShowWindow(g_CLI.hwndContactList, SW_HIDE); + ShowWindow(g_clistApi.hwndContactList, SW_HIDE); //change layered mode - LONG_PTR exStyle = GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE); + LONG_PTR exStyle = GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE); if (tLayeredFlag) exStyle |= WS_EX_LAYERED; else exStyle &= ~WS_EX_LAYERED; - SetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE, exStyle&~WS_EX_LAYERED); - SetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE, exStyle); + SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, exStyle&~WS_EX_LAYERED); + SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, exStyle); g_CluiData.fLayered = tLayeredFlag; - Sync(CLUIFrames_SetLayeredMode, tLayeredFlag, g_CLI.hwndContactList); + Sync(CLUIFrames_SetLayeredMode, tLayeredFlag, g_clistApi.hwndContactList); CLUI_ChangeWindowMode(); Sync(CLUIFrames_OnClistResize_mod, 0, 0); if (fWasVisible) - ShowWindow(g_CLI.hwndContactList, SW_SHOW); + ShowWindow(g_clistApi.hwndContactList, SW_SHOW); } } @@ -594,7 +594,7 @@ void CLUI_UpdateAeroGlass() bb.dwFlags |= DWM_BB_BLURREGION; } - g_proc_DWMEnableBlurBehindWindow(g_CLI.hwndContactList, &bb); + g_proc_DWMEnableBlurBehindWindow(g_clistApi.hwndContactList, &bb); g_CluiData.fAeroGlass = tAeroGlass; } } @@ -609,7 +609,7 @@ void CLUI_ChangeWindowMode() LONG_PTR styleMask = WS_CLIPCHILDREN | WS_BORDER | WS_CAPTION | WS_MINIMIZEBOX | WS_POPUPWINDOW | WS_CLIPCHILDREN | WS_THICKFRAME | WS_SYSMENU; LONG_PTR styleMaskEx = WS_EX_TOOLWINDOW | WS_EX_LAYERED; LONG_PTR curStyle, curStyleEx; - if (!g_CLI.hwndContactList) return; + if (!g_clistApi.hwndContactList) return; g_mutex_bChangingMode = TRUE; g_bTransparentFlag = db_get_b(0, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT); @@ -658,40 +658,40 @@ void CLUI_ChangeWindowMode() mir_wstrncpy(titleText, dbv.ptszVal, _countof(titleText)); db_free(&dbv); } - SetWindowText(g_CLI.hwndContactList, titleText); + SetWindowText(g_clistApi.hwndContactList, titleText); // < -> // 1 - If visible store it and hide if (g_CluiData.fLayered && (db_get_b(0, "CList", "OnDesktop", SETTING_ONDESKTOP_DEFAULT))) { - SetParent(g_CLI.hwndContactList, nullptr); + SetParent(g_clistApi.hwndContactList, nullptr); Sync(CLUIFrames_SetParentForContainers, (HWND)nullptr); - UpdateWindow(g_CLI.hwndContactList); + UpdateWindow(g_clistApi.hwndContactList); g_CluiData.fOnDesktop = false; } // 5 - TODO Apply Style - oldStyleEx = curStyleEx = GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE); - oldStyle = curStyle = GetWindowLongPtr(g_CLI.hwndContactList, GWL_STYLE); + oldStyleEx = curStyleEx = GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE); + oldStyle = curStyle = GetWindowLongPtr(g_clistApi.hwndContactList, GWL_STYLE); curStyleEx = (curStyleEx & ~styleMaskEx) | styleEx; curStyle = (curStyle & ~styleMask) | style; if (oldStyleEx != curStyleEx || oldStyle != curStyle) { - if (IsWindowVisible(g_CLI.hwndContactList)) { + if (IsWindowVisible(g_clistApi.hwndContactList)) { storedVisMode = TRUE; mutex_bShowHideCalledFromAnimation = TRUE; - ShowWindow(g_CLI.hwndContactList, SW_HIDE); + ShowWindow(g_clistApi.hwndContactList, SW_HIDE); Sync(CLUIFrames_OnShowHide, 0); } - SetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE, curStyleEx); - SetWindowLongPtr(g_CLI.hwndContactList, GWL_STYLE, curStyle); + SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, curStyleEx); + SetWindowLongPtr(g_clistApi.hwndContactList, GWL_STYLE, curStyle); } CLUI_UpdateAeroGlass(); if (g_CluiData.fLayered || !db_get_b(0, "CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT)) { - SetMenu(g_CLI.hwndContactList, nullptr); + SetMenu(g_clistApi.hwndContactList, nullptr); } - else SetMenu(g_CLI.hwndContactList, g_hMenuMain); + else SetMenu(g_clistApi.hwndContactList, g_hMenuMain); if (g_CluiData.fLayered && (db_get_b(0, "CList", "OnDesktop", SETTING_ONDESKTOP_DEFAULT))) ske_UpdateWindowImage(); @@ -700,20 +700,20 @@ void CLUI_ChangeWindowMode() if (db_get_b(0, "CList", "OnDesktop", SETTING_ONDESKTOP_DEFAULT)) { HWND hProgMan = FindWindow(L"Progman", nullptr); if (IsWindow(hProgMan)) { - SetParent(g_CLI.hwndContactList, hProgMan); + SetParent(g_clistApi.hwndContactList, hProgMan); Sync(CLUIFrames_SetParentForContainers, (HWND)hProgMan); g_CluiData.fOnDesktop = true; } } else { - SetParent(g_CLI.hwndContactList, nullptr); + SetParent(g_clistApi.hwndContactList, nullptr); Sync(CLUIFrames_SetParentForContainers, (HWND)nullptr); g_CluiData.fOnDesktop = false; } // 7 - if it was visible - show if (storedVisMode) { - ShowWindow(g_CLI.hwndContactList, SW_SHOW); + ShowWindow(g_clistApi.hwndContactList, SW_SHOW); Sync(CLUIFrames_OnShowHide, 1); } mutex_bShowHideCalledFromAnimation = FALSE; @@ -723,19 +723,19 @@ void CLUI_ChangeWindowMode() if (!g_CluiData.fLayered) { RECT r; int w = 10; - GetWindowRect(g_CLI.hwndContactList, &r); + GetWindowRect(g_clistApi.hwndContactList, &r); int h = (r.right - r.left) > (w * 2) ? w : (r.right - r.left); int v = (r.bottom - r.top) > (w * 2) ? w : (r.bottom - r.top); h = (h < v) ? h : v; HRGN hRgn1 = CreateRoundRectRgn(0, 0, (r.right - r.left + 1), (r.bottom - r.top + 1), h, h); if (db_get_b(0, "CLC", "RoundCorners", SETTING_ROUNDCORNERS_DEFAULT) && !Clist_IsDocked()) - SetWindowRgn(g_CLI.hwndContactList, hRgn1, 1); + SetWindowRgn(g_clistApi.hwndContactList, hRgn1, 1); else { DeleteObject(hRgn1); - SetWindowRgn(g_CLI.hwndContactList, nullptr, 1); + SetWindowRgn(g_clistApi.hwndContactList, nullptr, 1); } - RedrawWindow(g_CLI.hwndContactList, nullptr, nullptr, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_UPDATENOW | RDW_ALLCHILDREN); + RedrawWindow(g_clistApi.hwndContactList, nullptr, nullptr, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_UPDATENOW | RDW_ALLCHILDREN); } g_mutex_bChangingMode = FALSE; flag_bFirstTimeCall = TRUE; @@ -765,13 +765,13 @@ UINT_PTR CLUI_SafeSetTimer(HWND hwnd, int ID, int Timeout, TIMERPROC proc) int CLUI_UpdateTimer() { if (g_CluiData.nBehindEdgeState == 0) { - KillTimer(g_CLI.hwndContactList, TM_BRINGOUTTIMEOUT); - CLUI_SafeSetTimer(g_CLI.hwndContactList, TM_BRINGOUTTIMEOUT, wBehindEdgeHideDelay * 100, nullptr); + KillTimer(g_clistApi.hwndContactList, TM_BRINGOUTTIMEOUT); + CLUI_SafeSetTimer(g_clistApi.hwndContactList, TM_BRINGOUTTIMEOUT, wBehindEdgeHideDelay * 100, nullptr); } if (bShowEventStarted == 0 && g_CluiData.nBehindEdgeState > 0) { - KillTimer(g_CLI.hwndContactList, TM_BRINGINTIMEOUT); - bShowEventStarted = (BOOL)CLUI_SafeSetTimer(g_CLI.hwndContactList, TM_BRINGINTIMEOUT, wBehindEdgeShowDelay * 100, nullptr); + KillTimer(g_clistApi.hwndContactList, TM_BRINGINTIMEOUT); + bShowEventStarted = (BOOL)CLUI_SafeSetTimer(g_clistApi.hwndContactList, TM_BRINGINTIMEOUT, wBehindEdgeShowDelay * 100, nullptr); } return 0; } @@ -785,11 +785,11 @@ int CLUI_HideBehindEdge() //Need to be moved out of screen bShowEventStarted = 0; //1. get work area rectangle - Docking_GetMonitorRectFromWindow(g_CLI.hwndContactList, &rcScreen); + Docking_GetMonitorRectFromWindow(g_clistApi.hwndContactList, &rcScreen); //SystemParametersInfo(SPI_GETWORKAREA, 0, &rcScreen,FALSE); //2. move out int bordersize = wBehindEdgeBorderSize; - GetWindowRect(g_CLI.hwndContactList, &rcWindow); + GetWindowRect(g_clistApi.hwndContactList, &rcWindow); switch (method) { case 1: // left rcWindow.left = rcScreen.left - (rcWindow.right - rcWindow.left) + bordersize; @@ -799,8 +799,8 @@ int CLUI_HideBehindEdge() break; } g_CluiData.mutexPreventDockMoving = 0; - SetWindowPos(g_CLI.hwndContactList, nullptr, rcWindow.left, rcWindow.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); - Sync(CLUIFrames_OnMoving, g_CLI.hwndContactList, &rcWindow); + SetWindowPos(g_clistApi.hwndContactList, nullptr, rcWindow.left, rcWindow.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); + Sync(CLUIFrames_OnMoving, g_clistApi.hwndContactList, &rcWindow); g_CluiData.mutexPreventDockMoving = 1; //3. store setting @@ -825,11 +825,11 @@ int CLUI_ShowFromBehindEdge() // Need to be moved out of screen // 1. get work area rectangle RECT rcScreen; - Docking_GetMonitorRectFromWindow(g_CLI.hwndContactList, &rcScreen); + Docking_GetMonitorRectFromWindow(g_clistApi.hwndContactList, &rcScreen); // 2. move out RECT rcWindow; - GetWindowRect(g_CLI.hwndContactList, &rcWindow); + GetWindowRect(g_clistApi.hwndContactList, &rcWindow); switch (method) { case 1: // left rcWindow.left = rcScreen.left; @@ -839,8 +839,8 @@ int CLUI_ShowFromBehindEdge() break; } g_CluiData.mutexPreventDockMoving = 0; - SetWindowPos(g_CLI.hwndContactList, nullptr, rcWindow.left, rcWindow.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); - Sync(CLUIFrames_OnMoving, g_CLI.hwndContactList, &rcWindow); + SetWindowPos(g_clistApi.hwndContactList, nullptr, rcWindow.left, rcWindow.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + Sync(CLUIFrames_OnMoving, g_clistApi.hwndContactList, &rcWindow); g_CluiData.mutexPreventDockMoving = 1; // 3. store setting @@ -852,8 +852,8 @@ int CLUI_ShowFromBehindEdge() int CLUI_IsInMainWindow(HWND hwnd) { - if (hwnd == g_CLI.hwndContactList) return 1; - if (GetParent(hwnd) == g_CLI.hwndContactList) return 2; + if (hwnd == g_clistApi.hwndContactList) return 1; + if (GetParent(hwnd) == g_clistApi.hwndContactList) return 2; return 0; } @@ -975,7 +975,7 @@ static bool StartTicksTimer(PROTOTICKS *pt) DestroyIcon(ic); } } - CLUI_SafeSetTimer(g_CLI.hwndContactList, TM_STATUSBARUPDATE + pt->nIndex, nAnimatedIconStep, nullptr); + CLUI_SafeSetTimer(g_clistApi.hwndContactList, TM_STATUSBARUPDATE + pt->nIndex, nAnimatedIconStep, nullptr); pt->bTimerCreated = 1; pt->nCycleStartTick = GetTickCount(); return true; @@ -1021,7 +1021,7 @@ static LRESULT BroadCastMessageToChild(HWND hwnd, int message, WPARAM wParam, LP int CLUI_ReloadCLUIOptions() { - KillTimer(g_CLI.hwndContactList, TM_UPDATEBRINGTIMER); + KillTimer(g_clistApi.hwndContactList, TM_UPDATEBRINGTIMER); g_CluiData.bBehindEdgeSettings = db_get_b(0, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT); wBehindEdgeShowDelay = db_get_w(0, "ModernData", "ShowDelay", SETTING_SHOWDELAY_DEFAULT); wBehindEdgeHideDelay = db_get_w(0, "ModernData", "HideDelay", SETTING_HIDEDELAY_DEFAULT); @@ -1045,7 +1045,7 @@ int CLUI_ReloadCLUIOptions() g_CluiData.TopClientMargin = db_get_b(0, "CLUI", "TopClientMargin", SETTING_TOPCLIENTMARIGN_DEFAULT); g_CluiData.BottomClientMargin = db_get_b(0, "CLUI", "BottomClientMargin", SETTING_BOTTOMCLIENTMARIGN_DEFAULT); } - BroadCastMessageToChild(g_CLI.hwndContactList, WM_THEMECHANGED, 0, 0); + BroadCastMessageToChild(g_clistApi.hwndContactList, WM_THEMECHANGED, 0, 0); NotifyEventHooks(g_CluiData.hEventBkgrChanged, 0, 0); return 0; @@ -1063,7 +1063,7 @@ static int CLUI_DrawMenuBackGround(HWND hwnd, HDC hdc, int item, int state) RECT ra, r1; HRGN treg, treg2; - ClcData *dat = (ClcData*)GetWindowLongPtr(g_CLI.hwndContactTree, 0); + ClcData *dat = (ClcData*)GetWindowLongPtr(g_clistApi.hwndContactTree, 0); if (!dat) return 1; @@ -1101,7 +1101,7 @@ static int CLUI_DrawMenuBackGround(HWND hwnd, HDC hdc, int item, int state) DeleteObject(treg); RECT rc; - GetWindowRect(g_CLI.hwndContactList, &rc); + GetWindowRect(g_clistApi.hwndContactList, &rc); OffsetRect(&rc, -rc.left, -rc.top); FillRect(hdc, &r1, GetSysColorBrush(COLOR_MENU)); ske_SetRectOpaque(hdc, &r1); @@ -1195,7 +1195,7 @@ static int CLUI_DrawMenuBackGround(HWND hwnd, HDC hdc, int item, int state) int CLUI_SizingGetWindowRect(HWND hwnd, RECT *rc) { - if (mutex_bDuringSizing && hwnd == g_CLI.hwndContactList) + if (mutex_bDuringSizing && hwnd == g_clistApi.hwndContactList) *rc = rcSizingRect; else GetWindowRect(hwnd, rc); @@ -1208,7 +1208,7 @@ int CLUI_IconsChanged(WPARAM, LPARAM) if (MirandaExiting()) return 0; - DrawMenuBar(g_CLI.hwndContactList); + DrawMenuBar(g_clistApi.hwndContactList); ExtraIcon_Reload(); ExtraIcon_SetAll(); @@ -1236,7 +1236,7 @@ void CLUI_cli_LoadCluiGlobalOpts() int CLUI_TestCursorOnBorders() { - HWND hwnd = g_CLI.hwndContactList; + HWND hwnd = g_clistApi.hwndContactList; HCURSOR hCurs1 = nullptr; POINT pt; int k = 0, fx, fy; @@ -1307,7 +1307,7 @@ int CLUI_SizingOnBorder(POINT pt, int PerformSize) { if (!(db_get_b(0, "CLUI", "LockSize", SETTING_LOCKSIZE_DEFAULT))) { RECT r; - HWND hwnd = g_CLI.hwndContactList; + HWND hwnd = g_clistApi.hwndContactList; int sizeOnBorderFlag = 0; GetWindowRect(hwnd, &r); @@ -1380,11 +1380,11 @@ static int CLUI_SmoothAlphaThreadTransition() g_CluiData.bCurrentAlpha = 1; ske_JustUpdateWindowImage(); mutex_bShowHideCalledFromAnimation = 1; - CLUI_ShowWindowMod(g_CLI.hwndContactList, 0); + CLUI_ShowWindowMod(g_clistApi.hwndContactList, 0); Sync(CLUIFrames_OnShowHide, 0); mutex_bShowHideCalledFromAnimation = 0; g_CluiData.bCurrentAlpha = 0; - if (!g_CluiData.fLayered) RedrawWindow(g_CLI.hwndContactList, nullptr, nullptr, RDW_ERASE | RDW_FRAME); + if (!g_CluiData.fLayered) RedrawWindow(g_clistApi.hwndContactList, nullptr, nullptr, RDW_ERASE | RDW_FRAME); return 0; } } @@ -1399,7 +1399,7 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam) if (GoalAlpha > 0 && wParam != 2) { if (!IsWindowVisible(hwnd)) { mutex_bShowHideCalledFromAnimation = 1; - CLUI_ShowWindowMod(g_CLI.hwndContactList, SW_RESTORE); + CLUI_ShowWindowMod(g_clistApi.hwndContactList, SW_RESTORE); Sync(CLUIFrames_OnShowHide, 1); mutex_bShowHideCalledFromAnimation = 0; g_CluiData.bCurrentAlpha = GoalAlpha; @@ -1410,7 +1410,7 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam) else if (GoalAlpha == 0 && wParam != 2) { if (IsWindowVisible(hwnd)) { mutex_bShowHideCalledFromAnimation = 1; - CLUI_ShowWindowMod(g_CLI.hwndContactList, 0); + CLUI_ShowWindowMod(g_clistApi.hwndContactList, 0); Sync(CLUIFrames_OnShowHide, 0); g_CluiData.bCurrentAlpha = GoalAlpha; mutex_bShowHideCalledFromAnimation = 0; @@ -1427,7 +1427,7 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam) if (!mutex_bAnimationInProgress) { if ((!IsWindowVisible(hwnd) || g_CluiData.bCurrentAlpha == 0) && bAlphaEnd > 0) { mutex_bShowHideCalledFromAnimation = 1; - CLUI_ShowWindowMod(g_CLI.hwndContactList, SW_SHOWNA); + CLUI_ShowWindowMod(g_clistApi.hwndContactList, SW_SHOWNA); Sync(CLUIFrames_OnShowHide, SW_SHOW); mutex_bShowHideCalledFromAnimation = 0; g_CluiData.bCurrentAlpha = 1; @@ -1436,7 +1436,7 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam) if (IsWindowVisible(hwnd) && !g_hSmoothAnimationThread) { mutex_bAnimationInProgress = 1; if (g_CluiData.fSmoothAnimation) - g_hSmoothAnimationThread = mir_forkthread(CLUI_SmoothAnimationThreadProc, g_CLI.hwndContactList); + g_hSmoothAnimationThread = mir_forkthread(CLUI_SmoothAnimationThreadProc, g_clistApi.hwndContactList); } } } @@ -1450,7 +1450,7 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam) g_CluiData.bCurrentAlpha = 1; ske_UpdateWindowImage(); mutex_bShowHideCalledFromAnimation = 1; - CLUI_ShowWindowMod(g_CLI.hwndContactList, 0); + CLUI_ShowWindowMod(g_clistApi.hwndContactList, 0); Sync(CLUIFrames_OnShowHide, 0); mutex_bShowHideCalledFromAnimation = 0; g_CluiData.bCurrentAlpha = 0; @@ -1645,7 +1645,7 @@ LRESULT CLUI::OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam) } switch (msg) { case WM_DISPLAYCHANGE: - SendMessage(g_CLI.hwndContactTree, WM_SIZE, 0, 0); + SendMessage(g_clistApi.hwndContactTree, WM_SIZE, 0, 0); return TRUE; case WM_EXITSIZEMOVE: @@ -1682,7 +1682,7 @@ LRESULT CLUI::OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam) case WM_SIZE: if (g_mutex_bSizing) return 0; if (wParam != SIZE_MINIMIZED /* && IsWindowVisible(m_hWnd)*/) { - if (g_CLI.hwndContactList == nullptr) + if (g_clistApi.hwndContactList == nullptr) return 0; if (!g_CluiData.fLayered && !g_CluiData.fDisableSkinEngine) @@ -1895,7 +1895,7 @@ LRESULT CLUI::OnCreateClc(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/) CreateCLC(); if (db_get_b(0, "CList", "ShowOnStart", SETTING_SHOWONSTART_DEFAULT)) cliShowHide(true); - Clist_InitAutoRebuild(g_CLI.hwndContactTree); + Clist_InitAutoRebuild(g_clistApi.hwndContactTree); return FALSE; } @@ -1931,7 +1931,7 @@ LRESULT CLUI::OnParentNotify(UINT msg, WPARAM wParam, LPARAM lParam) LRESULT CLUI::OnSetFocus(UINT, WPARAM, LPARAM) { if (hFrameContactTree && (!CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM(FO_FLOATING, hFrameContactTree), 0))) - SetFocus(g_CLI.hwndContactTree); + SetFocus(g_clistApi.hwndContactTree); return FALSE; } @@ -1959,14 +1959,14 @@ LRESULT CLUI::OnStatusBarUpdateTimer(UINT msg, WPARAM wParam, LPARAM lParam) PROTOTICKS *pt = &arTicks[wParam - TM_STATUSBARUPDATE]; - if (IsWindowVisible(g_CLI.hwndStatus)) - g_CLI.pfnInvalidateRect(g_CLI.hwndStatus, nullptr, 0); + if (IsWindowVisible(g_clistApi.hwndStatus)) + g_clistApi.pfnInvalidateRect(g_clistApi.hwndStatus, nullptr, 0); if (pt->bGlobal) Clist_TrayIconUpdateBase(g_szConnectingProto); else Clist_TrayIconUpdateBase(pt->szProto); - g_CLI.pfnInvalidateRect(g_CLI.hwndStatus, nullptr, TRUE); + g_clistApi.pfnInvalidateRect(g_clistApi.hwndStatus, nullptr, TRUE); return DefCluiWndProc(msg, wParam, lParam); } @@ -1984,7 +1984,7 @@ LRESULT CLUI::OnAutoAlphaTimer(UINT, WPARAM, LPARAM) inwnd = CLUI_CheckOwnedByClui(hwndPt); if (!inwnd) - inwnd = (GetCapture() == g_CLI.hwndContactList); + inwnd = (GetCapture() == g_clistApi.hwndContactList); } if (inwnd != bTransparentFocus) { @@ -2063,7 +2063,7 @@ LRESULT CLUI::OnTimer(UINT msg, WPARAM wParam, LPARAM lParam) return FALSE; if (wParam >= TM_STATUSBARUPDATE && wParam <= TM_STATUSBARUPDATE + 64) { - if (!g_CLI.hwndStatus) + if (!g_clistApi.hwndStatus) return FALSE; return OnStatusBarUpdateTimer(msg, wParam, lParam); } @@ -2083,7 +2083,7 @@ LRESULT CLUI::OnTimer(UINT msg, WPARAM wParam, LPARAM lParam) LRESULT CLUI::OnActivate(UINT msg, WPARAM wParam, LPARAM lParam) { SetCursor(LoadCursor(nullptr, IDC_ARROW)); - SendMessage(g_CLI.hwndContactTree, WM_ACTIVATE, wParam, lParam); + SendMessage(g_clistApi.hwndContactTree, WM_ACTIVATE, wParam, lParam); if (db_get_b(0, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT)) { if (wParam == WA_INACTIVE && ((HWND)lParam != m_hWnd) && GetParent((HWND)lParam) != m_hWnd) { if (!g_bCalledFromShowHide) CLUI_UpdateTimer(); @@ -2165,7 +2165,7 @@ LRESULT CLUI::OnNcLButtonDblClk(UINT msg, WPARAM wParam, LPARAM lParam) POINT pt = UNPACK_POINT(lParam); if (pt.x > rc.right - 16 && pt.x < rc.right) - return g_CLI.pfnShowHide(); + return g_clistApi.pfnShowHide(); } return DefCluiWndProc(msg, wParam, lParam); } @@ -2232,7 +2232,7 @@ LRESULT CLUI::OnSysCommand(UINT msg, WPARAM wParam, LPARAM lParam) LRESULT CLUI::OnKeyDown(UINT msg, WPARAM wParam, LPARAM lParam) { if (wParam == VK_F5) - Clist_InitAutoRebuild(g_CLI.hwndContactTree); + Clist_InitAutoRebuild(g_clistApi.hwndContactTree); return DefCluiWndProc(msg, wParam, lParam); } @@ -2267,24 +2267,24 @@ LRESULT CLUI::OnListSizeChangeNotify(NMCLISTCONTROL * pnmc) rcWindow = rcSizingRect; else GetWindowRect(m_hWnd, &rcWindow); - if (!g_CluiData.fAutoSize || g_CLI.hwndContactTree == nullptr || Clist_IsDocked()) + if (!g_CluiData.fAutoSize || g_clistApi.hwndContactTree == nullptr || Clist_IsDocked()) return FALSE; maxHeight = db_get_b(0, "CLUI", "MaxSizeHeight", SETTING_MAXSIZEHEIGHT_DEFAULT); minHeight = db_get_b(0, "CLUI", "MinSizeHeight", SETTING_MINSIZEHEIGHT_DEFAULT); rcOld = rcWindow; - GetWindowRect(g_CLI.hwndContactTree, &rcTree); + GetWindowRect(g_clistApi.hwndContactTree, &rcTree); - FRAMEWND *frm = FindFrameByItsHWND(g_CLI.hwndContactTree); + FRAMEWND *frm = FindFrameByItsHWND(g_clistApi.hwndContactTree); if (frm) rcTree2 = frm->wndSize; else SetRect(&rcTree2, 0, 0, 0, 0); - winstyle = GetWindowLongPtr(g_CLI.hwndContactTree, GWL_STYLE); + winstyle = GetWindowLongPtr(g_clistApi.hwndContactTree, GWL_STYLE); SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, FALSE); - HMONITOR hMon = MonitorFromWindow(g_CLI.hwndContactTree, MONITOR_DEFAULTTONEAREST); + HMONITOR hMon = MonitorFromWindow(g_clistApi.hwndContactTree, MONITOR_DEFAULTTONEAREST); MONITORINFO mi = { 0 }; if (GetMonitorInfo(hMon, &mi)) rcWorkArea = mi.rcWork; @@ -2332,7 +2332,7 @@ LRESULT CLUI::OnListSizeChangeNotify(NMCLISTCONTROL * pnmc) LRESULT CLUI::OnClickNotify(NMCLISTCONTROL * pnmc) { DWORD hitFlags; - HANDLE hItem = (HANDLE)SendMessage(g_CLI.hwndContactTree, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(pnmc->pt.x, pnmc->pt.y)); + HANDLE hItem = (HANDLE)SendMessage(g_clistApi.hwndContactTree, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(pnmc->pt.x, pnmc->pt.y)); if (hItem && !(hitFlags & CLCHT_NOWHERE)) return DefCluiWndProc(WM_NOTIFY, 0, (LPARAM)pnmc); @@ -2343,13 +2343,13 @@ LRESULT CLUI::OnClickNotify(NMCLISTCONTROL * pnmc) POINT pt; int res; pt = pnmc->pt; - ClientToScreen(g_CLI.hwndContactTree, &pt); + ClientToScreen(g_clistApi.hwndContactTree, &pt); res = PostMessage(m_hWnd, WM_SYSCOMMAND, SC_MOVE | HTCAPTION, MAKELPARAM(pt.x, pt.y)); return res; } if (db_get_b(0, "CLUI", "DragToScroll", SETTING_DRAGTOSCROLL_DEFAULT) && !db_get_b(0, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT)) - return ClcEnterDragToScroll(g_CLI.hwndContactTree, pnmc->pt.y); + return ClcEnterDragToScroll(g_clistApi.hwndContactTree, pnmc->pt.y); return 0; } @@ -2357,7 +2357,7 @@ LRESULT CLUI::OnClickNotify(NMCLISTCONTROL * pnmc) LRESULT CLUI::OnNotify(UINT msg, WPARAM wParam, LPARAM lParam) { LPNMHDR pnmhdr = (LPNMHDR)lParam; - if (pnmhdr->hwndFrom != g_CLI.hwndContactTree) + if (pnmhdr->hwndFrom != g_clistApi.hwndContactTree) return DefCluiWndProc(msg, wParam, lParam); switch (pnmhdr->code) { @@ -2372,7 +2372,7 @@ LRESULT CLUI::OnContextMenu(UINT, WPARAM, LPARAM lParam) POINT pt = UNPACK_POINT(lParam); // x/y might be -1 if it was generated by a kb click RECT rc; - GetWindowRect(g_CLI.hwndContactTree, &rc); + GetWindowRect(g_clistApi.hwndContactTree, &rc); if (pt.x == -1 && pt.y == -1) { // all this is done in screen-coords! GetCursorPos(&pt); @@ -2414,7 +2414,7 @@ LRESULT CLUI::OnMeasureItem(UINT, WPARAM, LPARAM lParam) LRESULT CLUI::OnDrawItem(UINT, WPARAM, LPARAM lParam) { - ClcData *dat = (ClcData*)GetWindowLongPtr(g_CLI.hwndContactTree, 0); + ClcData *dat = (ClcData*)GetWindowLongPtr(g_clistApi.hwndContactTree, 0); LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam; if (!dat || dis->CtlType != ODT_MENU) return 0; @@ -2441,7 +2441,7 @@ LRESULT CLUI::OnDrawItem(UINT, WPARAM, LPARAM lParam) } else { nMirMenuState = dis->itemState; - g_CLI.pfnInvalidateRect(m_hWnd, nullptr, 0); + g_clistApi.pfnInvalidateRect(m_hWnd, nullptr, 0); } return TRUE; } @@ -2469,7 +2469,7 @@ LRESULT CLUI::OnDrawItem(UINT, WPARAM, LPARAM lParam) } else { nStatusMenuState = dis->itemState; - g_CLI.pfnInvalidateRect(m_hWnd, nullptr, 0); + g_clistApi.pfnInvalidateRect(m_hWnd, nullptr, 0); } return TRUE; } @@ -2528,12 +2528,12 @@ LRESULT CLUI::OnDestroy(UINT, WPARAM, LPARAM) mutex_bAnimationInProgress = 0; CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)hFrameContactTree, 0); TRACE("CLUI.c: WM_DESTROY - hFrameContactTree removed\n"); - g_CLI.hwndContactTree = nullptr; - g_CLI.hwndStatus = nullptr; + g_clistApi.hwndContactTree = nullptr; + g_clistApi.hwndStatus = nullptr; if (g_CluiData.fAutoSize && !g_CluiData.fDocked) { RECT r; - GetWindowRect(g_CLI.hwndContactList, &r); + GetWindowRect(g_clistApi.hwndContactList, &r); if (db_get_b(0, "CLUI", "AutoSizeUpward", SETTING_AUTOSIZEUPWARD_DEFAULT)) r.top = r.bottom - CLUIFrames_GetTotalHeight(); else @@ -2550,8 +2550,8 @@ LRESULT CLUI::OnDestroy(UINT, WPARAM, LPARAM) delete m_pCLUI; - g_CLI.hwndContactList = nullptr; - g_CLI.hwndStatus = nullptr; + g_clistApi.hwndContactList = nullptr; + g_clistApi.hwndStatus = nullptr; PostQuitMessage(0); return 0; } diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp index ee7f240b9a..2162a9f3fe 100644 --- a/plugins/Clist_modern/src/modern_cluiservices.cpp +++ b/plugins/Clist_modern/src/modern_cluiservices.cpp @@ -34,7 +34,7 @@ int CLUIUnreadEmailCountChanged(WPARAM, LPARAM) void cliCluiProtocolStatusChanged(int, const char * proto) { - CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE, (WPARAM)g_CLI.hwndStatus, 0); + CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE, (WPARAM)g_clistApi.hwndStatus, 0); if (proto) Clist_TrayIconUpdateBase(proto); } diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp index f917ed3470..b44777478a 100644 --- a/plugins/Clist_modern/src/modern_contact.cpp +++ b/plugins/Clist_modern/src/modern_contact.cpp @@ -148,19 +148,19 @@ int cliCompareContacts(const ClcContact *contact1, const ClcContact *contact2) INT_PTR ToggleHideOffline(WPARAM, LPARAM) { - return g_CLI.pfnSetHideOffline(-1); + return g_clistApi.pfnSetHideOffline(-1); } INT_PTR SetUseGroups(WPARAM wParam, LPARAM) { - int newVal = !(GetWindowLongPtr(g_CLI.hwndContactTree, GWL_STYLE)&CLS_USEGROUPS); + int newVal = !(GetWindowLongPtr(g_clistApi.hwndContactTree, GWL_STYLE)&CLS_USEGROUPS); if (wParam != -1) { if (!newVal == (int)wParam) return 0; newVal = wParam; } db_set_b(0, "CList", "UseGroups", (BYTE)newVal); - SendMessage(g_CLI.hwndContactTree, CLM_SETUSEGROUPS, newVal, 0); + SendMessage(g_clistApi.hwndContactTree, CLM_SETUSEGROUPS, newVal, 0); return 0; } diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp index 890609c861..8ec9b2ea0a 100644 --- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp +++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp @@ -61,11 +61,11 @@ int RowHeight_CalcRowHeight(ClcData *dat, ClcContact *contact, int item) if (!RowHeights_Alloc(dat, item + 1)) return -1; - if (!g_CLI.hwndContactTree) + if (!g_clistApi.hwndContactTree) return 0; ClcCacheEntry *pdnce = contact->pce; - if (dat->hWnd != g_CLI.hwndContactTree || !gl_RowRoot || contact->type == CLCIT_GROUP) { + if (dat->hWnd != g_clistApi.hwndContactTree || !gl_RowRoot || contact->type == CLCIT_GROUP) { int tmp = dat->fontModernInfo[g_clcPainter.GetBasicFontID(contact)].fontHeight; if (dat->text_replace_smileys && dat->first_line_draw_smileys && !dat->text_resize_smileys) tmp = max(tmp, contact->ssText.iMaxSmileyHeight); diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp index 77b9eeab7c..6884fbbbe6 100644 --- a/plugins/Clist_modern/src/modern_skinbutton.cpp +++ b/plugins/Clist_modern/src/modern_skinbutton.cpp @@ -588,7 +588,7 @@ static int ModernSkinButtonErase(int l, int t, int r, int b) if (!g_pCachedWindow->hImageDC || !g_pCachedWindow->hBackDC) return 0; if (!(l || r || t || b)) { for (i = 0; i < ButtonsCount; i++) { - if (g_CLI.hwndContactList && Buttons[i].hwnd != nullptr) { + if (g_clistApi.hwndContactList && Buttons[i].hwnd != nullptr) { //TODO: Erase button BitBlt(g_pCachedWindow->hImageDC, Buttons[i].bct->Left, Buttons[i].bct->Top, Buttons[i].bct->Right - Buttons[i].bct->Left, Buttons[i].bct->Bottom - Buttons[i].bct->Top, g_pCachedWindow->hBackDC, Buttons[i].bct->Left, Buttons[i].bct->Top, SRCCOPY); @@ -623,8 +623,8 @@ int ModernSkinButtonRedrawAll() if (!ModernSkinButtonModuleIsLoaded) return 0; g_mutex_bLockUpdating++; for (DWORD i = 0; i < ButtonsCount; i++) { - if (g_CLI.hwndContactList && Buttons[i].hwnd == nullptr) - Buttons[i].hwnd = ModernSkinButtonCreateWindow(Buttons[i].bct, g_CLI.hwndContactList); + if (g_clistApi.hwndContactList && Buttons[i].hwnd == nullptr) + Buttons[i].hwnd = ModernSkinButtonCreateWindow(Buttons[i].bct, g_clistApi.hwndContactList); ModernSkinButtonPaintWorker(Buttons[i].hwnd, nullptr); } g_mutex_bLockUpdating--; diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp index ae772c97eb..f9d925d662 100644 --- a/plugins/Clist_modern/src/modern_skinengine.cpp +++ b/plugins/Clist_modern/src/modern_skinengine.cpp @@ -2708,7 +2708,7 @@ int ske_RedrawCompleteWindow() ske_DrawNonFramedObjects(TRUE, nullptr); CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE, 0, 0); } - else RedrawWindow(g_CLI.hwndContactList, nullptr, nullptr, RDW_ALLCHILDREN | RDW_ERASE | RDW_INVALIDATE | RDW_FRAME); + else RedrawWindow(g_clistApi.hwndContactList, nullptr, nullptr, RDW_ALLCHILDREN | RDW_ERASE | RDW_INVALIDATE | RDW_FRAME); return 0; } @@ -2727,7 +2727,7 @@ static INT_PTR ske_Service_UpdateFrameImage(WPARAM wParam, LPARAM) // bool NoCancelPost = false; bool IsAnyQueued = false; if (!g_CluiData.mutexOnEdgeSizing) - GetWindowRect(g_CLI.hwndContactList, &wnd); + GetWindowRect(g_clistApi.hwndContactList, &wnd); else wnd = g_rcEdgeSizingRect; @@ -2815,7 +2815,7 @@ static INT_PTR ske_Service_InvalidateFrameImage(WPARAM wParam, LPARAM lParam) else Sync(QueueAllFramesUpdating, true); if (!flag_bUpdateQueued || g_flag_bPostWasCanceled) - if (PostMessage(g_CLI.hwndContactList, UM_UPDATE, 0, 0)) { + if (PostMessage(g_clistApi.hwndContactList, UM_UPDATE, 0, 0)) { flag_bUpdateQueued = 1; g_flag_bPostWasCanceled = 0; } @@ -2832,7 +2832,7 @@ static int ske_ValidateSingleFrameImage(FRAMEWND * Frame, BOOL SkipBkgBlitting) RECT ru = { 0 }; int w1, h1, x1, y1; - CLUI_SizingGetWindowRect(g_CLI.hwndContactList, &wnd); + CLUI_SizingGetWindowRect(g_clistApi.hwndContactList, &wnd); rcPaint = Frame->wndSize; { int dx, dy, bx, by; @@ -2984,7 +2984,7 @@ int ske_BltBackImage(HWND destHWND, HDC destDC, RECT *BltClientRect) ptChildWnd.x = w.left; ptChildWnd.y = w.top; ClientToScreen(destHWND, &ptChildWnd); - ClientToScreen(g_CLI.hwndContactList, &ptMainWnd); + ClientToScreen(g_clistApi.hwndContactList, &ptMainWnd); //TODO if main not relative to client area return BitBlt(destDC, w.left, w.top, (w.right - w.left), (w.bottom - w.top), g_pCachedWindow->hBackDC, (ptChildWnd.x - ptMainWnd.x), (ptChildWnd.y - ptMainWnd.y), SRCCOPY); @@ -2995,7 +2995,7 @@ int ske_ReCreateBackImage(BOOL Erase, RECT *w) RECT wnd = { 0 }; BOOL IsNewCache = 0; if (g_CluiData.fDisableSkinEngine) return 0; - GetClientRect(g_CLI.hwndContactList, &wnd); + GetClientRect(g_clistApi.hwndContactList, &wnd); if (w) wnd = *w; //-- Check cached. if (g_pCachedWindow == nullptr) { @@ -3052,7 +3052,7 @@ int ske_DrawNonFramedObjects(BOOL Erase, RECT *r) { RECT w, wnd; if (r) w = *r; - else CLUI_SizingGetWindowRect(g_CLI.hwndContactList, &w); + else CLUI_SizingGetWindowRect(g_clistApi.hwndContactList, &w); if (!g_CluiData.fLayered) return ske_ReCreateBackImage(FALSE, nullptr); if (g_pCachedWindow == nullptr) return ske_ValidateFrameImageProc(&w); @@ -3090,7 +3090,7 @@ int ske_ValidateFrameImageProc(RECT *r) BOOL IsNewCache = 0; BOOL IsForceAllPainting = 0; if (r) wnd = *r; - else GetWindowRect(g_CLI.hwndContactList, &wnd); + else GetWindowRect(g_clistApi.hwndContactList, &wnd); if (wnd.right - wnd.left == 0 || wnd.bottom - wnd.top == 0) return 0; @@ -3163,7 +3163,7 @@ int ske_UpdateWindowImage() if (g_CluiData.fLayered) { RECT r; - GetWindowRect(g_CLI.hwndContactList, &r); + GetWindowRect(g_clistApi.hwndContactList, &r); return ske_UpdateWindowImageRect(&r); } else ske_ReCreateBackImage(FALSE, nullptr); @@ -3191,7 +3191,7 @@ int ske_UpdateWindowImageRect(RECT *r) // Up void ske_ApplyTranslucency() { int IsTransparancy; - HWND hwnd = g_CLI.hwndContactList; + HWND hwnd = g_clistApi.hwndContactList; BOOL layered = (GetWindowLongPtr(hwnd, GWL_EXSTYLE) & WS_EX_LAYERED) ? TRUE : FALSE; IsTransparancy = g_CluiData.fSmoothAnimation || g_bTransparentFlag; @@ -3215,7 +3215,7 @@ int ske_JustUpdateWindowImage() ske_ApplyTranslucency(); return 0; } - GetWindowRect(g_CLI.hwndContactList, &r); + GetWindowRect(g_clistApi.hwndContactList, &r); return ske_JustUpdateWindowImageRect(&r); } @@ -3226,7 +3226,7 @@ int ske_JustUpdateWindowImageRect(RECT *rty) ske_ApplyTranslucency(); return 0; } - if (!g_CLI.hwndContactList) + if (!g_clistApi.hwndContactList) return 0; RECT wnd = *rty; @@ -3236,16 +3236,16 @@ int ske_JustUpdateWindowImageRect(RECT *rty) dest.y = rect.top; SIZE sz = { rect.right - rect.left, rect.bottom - rect.top }; if (g_CluiData.fLayered) { - if (!(GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE)&WS_EX_LAYERED)) - SetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED); + if (!(GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE)&WS_EX_LAYERED)) + SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED); Sync(SetAlpha, g_CluiData.bCurrentAlpha); BLENDFUNCTION bf = { AC_SRC_OVER, 0, g_CluiData.bCurrentAlpha, AC_SRC_ALPHA }; - UpdateLayeredWindow(g_CLI.hwndContactList, g_pCachedWindow->hScreenDC, &dest, &sz, g_pCachedWindow->hImageDC, &src, RGB(1, 1, 1), &bf, ULW_ALPHA); + UpdateLayeredWindow(g_clistApi.hwndContactList, g_pCachedWindow->hScreenDC, &dest, &sz, g_pCachedWindow->hImageDC, &src, RGB(1, 1, 1), &bf, ULW_ALPHA); g_CluiData.fAeroGlass = false; CLUI_UpdateAeroGlass(); } - else InvalidateRect(g_CLI.hwndContactList, nullptr, TRUE); + else InvalidateRect(g_clistApi.hwndContactList, nullptr, TRUE); return 0; } diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index 2d8c4e6e61..bfd20fc48b 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -145,8 +145,8 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara Sync(CLUIFrames_OnClistResize_mod, 0, 0); RECT rc = {}; - GetWindowRect(g_CLI.hwndContactList, &rc); - Sync(CLUIFrames_OnMoving, g_CLI.hwndContactList, &rc); + GetWindowRect(g_clistApi.hwndContactList, &rc); + Sync(CLUIFrames_OnMoving, g_clistApi.hwndContactList, &rc); if (g_hCLUIOptionsWnd) { SendDlgItemMessage(g_hCLUIOptionsWnd, IDC_LEFTMARGINSPIN, UDM_SETPOS, 0, db_get_b(0, "CLUI", "LeftClientMargin", SETTING_LEFTCLIENTMARIGN_DEFAULT)); @@ -226,7 +226,7 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara Clist_Broadcast(INTM_RELOADOPTIONS, 0, 0); NotifyEventHooks(g_CluiData.hEventBkgrChanged, 0, 0); Clist_Broadcast(INTM_INVALIDATE, 0, 0); - RedrawWindow(GetParent(g_CLI.hwndContactTree), nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN); + RedrawWindow(GetParent(g_clistApi.hwndContactTree), nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN); } break; @@ -476,7 +476,7 @@ INT_PTR SvcApplySkin(WPARAM, LPARAM lParam) ske_RedrawCompleteWindow(); Sync(CLUIFrames_OnClistResize_mod, 0, 0); - HWND hwnd = g_CLI.hwndContactList; + HWND hwnd = g_clistApi.hwndContactList; RECT rc = { 0 }; GetWindowRect(hwnd, &rc); Sync(CLUIFrames_OnMoving, hwnd, &rc); @@ -484,7 +484,7 @@ INT_PTR SvcApplySkin(WPARAM, LPARAM lParam) g_mutex_bChangingMode = TRUE; CLUI_UpdateLayeredMode(); CLUI_ChangeWindowMode(); - SendMessage(g_CLI.hwndContactTree, WM_SIZE, 0, 0); //forces it to send a cln_listsizechanged + SendMessage(g_clistApi.hwndContactTree, WM_SIZE, 0, 0); //forces it to send a cln_listsizechanged CLUI_ReloadCLUIOptions(); cliShowHide(true); g_mutex_bChangingMode = FALSE; diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp index 1fb12dc80e..3c167fd430 100644 --- a/plugins/Clist_modern/src/modern_skinselector.cpp +++ b/plugins/Clist_modern/src/modern_skinselector.cpp @@ -469,8 +469,8 @@ int RegisterButtonByParce(char * ObjectName, char * Params) + ((TL[3] == 'C') ? SBF_ALIGN_BR_VCENTER : 0) + ((TL[4] == 'I') ? SBF_CALL_ON_PRESS : 0); if (a) - return ModernSkinButton_AddButton(g_CLI.hwndContactList, ObjectName + 1, pServiceName, pStatusServiceName, "\0", Left, Top, Right, Bottom, alingnto, TranslateW(Hint), Section, Type, MinWidth, MinHeight); - return ModernSkinButton_AddButton(g_CLI.hwndContactList, ObjectName + 1, pServiceName, pStatusServiceName, "\0", Left, Top, Right, Bottom, alingnto, TranslateW(Hint), nullptr, nullptr, MinWidth, MinHeight); + return ModernSkinButton_AddButton(g_clistApi.hwndContactList, ObjectName + 1, pServiceName, pStatusServiceName, "\0", Left, Top, Right, Bottom, alingnto, TranslateW(Hint), Section, Type, MinWidth, MinHeight); + return ModernSkinButton_AddButton(g_clistApi.hwndContactList, ObjectName + 1, pServiceName, pStatusServiceName, "\0", Left, Top, Right, Bottom, alingnto, TranslateW(Hint), nullptr, nullptr, MinWidth, MinHeight); } //Parse DB string and add object diff --git a/plugins/Clist_modern/src/modern_static_cluiframes_service.h b/plugins/Clist_modern/src/modern_static_cluiframes_service.h index 2927dbf7cc..8f74e844d5 100644 --- a/plugins/Clist_modern/src/modern_static_cluiframes_service.h +++ b/plugins/Clist_modern/src/modern_static_cluiframes_service.h @@ -96,112 +96,112 @@ BOOL CALLBACK ProcessCLUIFrameInternalMsg(HWND, UINT msg, WPARAM wParam, LPARAM static INT_PTR CLUIFrames_SetFramePaintProc(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_SETFRAMEPAINTPROC, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_SETFRAMEPAINTPROC, wParam, lParam) : 0; } static INT_PTR CLUIFrames_AddFrame(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_ADDFRAME, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_ADDFRAME, wParam, lParam) : 0; } static INT_PTR CLUIFrames_RemoveFrame(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_REMOVEFRAME, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_REMOVEFRAME, wParam, lParam) : 0; } static INT_PTR CLUIFrames_SetFrameOptions(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_SETFRAMEOPTIONS, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_SETFRAMEOPTIONS, wParam, lParam) : 0; } static INT_PTR CLUIFrames_GetFrameOptions(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_GETFRAMEOPTIONS, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_GETFRAMEOPTIONS, wParam, lParam) : 0; } static INT_PTR CLUIFrames_UpdateFrame(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_UPDATEFRAME, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_UPDATEFRAME, wParam, lParam) : 0; } static INT_PTR CLUIFrames_ShowHideFrameTitle(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_SHOWHIDEFRAMETITLE, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_SHOWHIDEFRAMETITLE, wParam, lParam) : 0; } static INT_PTR CLUIFrames_ShowTitles(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_SHOWTITLES, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_SHOWTITLES, wParam, lParam) : 0; } static INT_PTR CLUIFrames_HideTitles(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_HIDETITLES, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_HIDETITLES, wParam, lParam) : 0; } static INT_PTR CLUIFrames_ShowHideFrame(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_SHOWHIDEFRAME, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_SHOWHIDEFRAME, wParam, lParam) : 0; } static INT_PTR CLUIFrames_ShowAllFrames(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_SHOWALL, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_SHOWALL, wParam, lParam) : 0; } static INT_PTR CLUIFrames_LockFrame(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_LOCKFRAME, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_LOCKFRAME, wParam, lParam) : 0; } static INT_PTR CLUIFrames_CollapseFrame(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_COLLAPSEFRAME, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_COLLAPSEFRAME, wParam, lParam) : 0; } static INT_PTR CLUIFrames_SetFrameBorder(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_SETFRAMEBORDER, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_SETFRAMEBORDER, wParam, lParam) : 0; } static INT_PTR CLUIFrames_SetFrameAlign(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_SETFRAMEALIGN, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_SETFRAMEALIGN, wParam, lParam) : 0; } static INT_PTR CLUIFrames_MoveFrame(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_MOVEFRAME, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_MOVEFRAME, wParam, lParam) : 0; } static INT_PTR CLUIFrames_MoveFrameUp(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_MOVEFRAMEUP, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_MOVEFRAMEUP, wParam, lParam) : 0; } static INT_PTR CLUIFrames_MoveFrameDown(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_MOVEFRAMEDOWN, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_MOVEFRAMEDOWN, wParam, lParam) : 0; } static INT_PTR CLUIFrames_AlignFrameTop(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_ALIGNFRAMETOP, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_ALIGNFRAMETOP, wParam, lParam) : 0; } static INT_PTR CLUIFrames_AlignFrameClient(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_ALIGNFRAMEBOTTOM, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_ALIGNFRAMEBOTTOM, wParam, lParam) : 0; } static INT_PTR CLUIFrames_AlignFrameBottom(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_ALIGNFRAMECLIENT, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_ALIGNFRAMECLIENT, wParam, lParam) : 0; } static INT_PTR CLUIFrames_SetFrameFloat(WPARAM wParam, LPARAM lParam) { - return (g_CLI.hwndContactList) ? SendMessage(g_CLI.hwndContactList, CFM_SETFRAMEFLOAT, wParam, lParam) : 0; + return (g_clistApi.hwndContactList) ? SendMessage(g_clistApi.hwndContactList, CFM_SETFRAMEFLOAT, wParam, lParam) : 0; } static void CreateCluiFramesServices() diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp index 8c710bb358..4d40efc5ad 100644 --- a/plugins/Clist_modern/src/modern_statusbar.cpp +++ b/plugins/Clist_modern/src/modern_statusbar.cpp @@ -114,7 +114,7 @@ int LoadStatusBarData() g_StatusBarData.backgroundBmpUse = db_get_w(0, "StatusBar", "BkBmpUse", CLCDEFAULT_BKBMPUSE); } - SendMessage(g_CLI.hwndContactList, WM_SIZE, 0, 0); + SendMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0); return 1; } @@ -135,7 +135,7 @@ int NewStatusPaintCallbackProc(HWND hWnd, HDC hDC, RECT *, HRGN, DWORD, void *) int ModernDrawStatusBar(HWND hwnd, HDC hDC) { if (hwnd == (HWND)-1) return 0; - if (GetParent(hwnd) == g_CLI.hwndContactList) + if (GetParent(hwnd) == g_clistApi.hwndContactList) return ModernDrawStatusBarWorker(hwnd, hDC); cliInvalidateRect(hwnd, nullptr, FALSE); @@ -586,7 +586,7 @@ LRESULT CALLBACK ModernStatusProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; case WM_SIZE: - if (!g_CluiData.fLayered || GetParent(hwnd) != g_CLI.hwndContactList) + if (!g_CluiData.fLayered || GetParent(hwnd) != g_clistApi.hwndContactList) InvalidateRect(hwnd, nullptr, FALSE); return DefWindowProc(hwnd, msg, wParam, lParam); @@ -594,9 +594,9 @@ LRESULT CALLBACK ModernStatusProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return 1; case WM_PAINT: - if (GetParent(hwnd) == g_CLI.hwndContactList && g_CluiData.fLayered) + if (GetParent(hwnd) == g_clistApi.hwndContactList && g_CluiData.fLayered) CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE, (WPARAM)hwnd, 0); - else if (GetParent(hwnd) == g_CLI.hwndContactList && !g_CluiData.fLayered) { + else if (GetParent(hwnd) == g_clistApi.hwndContactList && !g_CluiData.fLayered) { RECT rc = { 0 }; GetClientRect(hwnd, &rc); rc.right++; @@ -837,7 +837,7 @@ LRESULT CALLBACK ModernStatusProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa ClientToScreen(hwnd, &pt); HWND parent = GetParent(hwnd); - if (parent != g_CLI.hwndContactList) parent = GetParent(parent); + if (parent != g_clistApi.hwndContactList) parent = GetParent(parent); TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, parent, nullptr); return 0; } diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp index c7177719cb..93745e6aa2 100644 --- a/plugins/Clist_modern/src/modern_tbbutton.cpp +++ b/plugins/Clist_modern/src/modern_tbbutton.cpp @@ -433,7 +433,7 @@ static LRESULT CALLBACK ToolbarButtonProc(HWND hwndDlg, UINT msg, WPARAM wParam else bct->hIcon = nullptr; InvalidateRect(hwndDlg, nullptr, TRUE); - g_CLI.pfnInvalidateRect(GetParent(GetParent(hwndDlg)), nullptr, TRUE); + g_clistApi.pfnInvalidateRect(GetParent(GetParent(hwndDlg)), nullptr, TRUE); return 1; case MBM_UPDATETRANSPARENTFLAG: diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index be5af7037b..4baf61d193 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -145,13 +145,13 @@ static int ehhToolBarBackgroundSettingsChanged(WPARAM, LPARAM) tbdat.mtb_useWinColors = db_get_b(0, "ToolBar", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS); tbdat.mtb_backgroundBmpUse = db_get_b(0, "ToolBar", "BkBmpUse", CLCDEFAULT_BKBMPUSE); } - PostMessage(g_CLI.hwndContactList, WM_SIZE, 0, 0); + PostMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0); return 0; } static BOOL sttDrawToolBarBackground(HWND hwnd, HDC hdc, RECT *rect, ModernToolbarCtrl* pMTBInfo) { - BOOL bFloat = (GetParent(hwnd) != g_CLI.hwndContactList); + BOOL bFloat = (GetParent(hwnd) != g_clistApi.hwndContactList); if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat) { HBRUSH hbr; @@ -190,7 +190,7 @@ static void sttDrawNonLayeredSkinedBar(HWND hwnd, HDC hdc) HDC hdc2 = CreateCompatibleDC(hdc); HBITMAP hbmp = ske_CreateDIB32(rc.right, rc.bottom); HBITMAP hbmpo = (HBITMAP)SelectObject(hdc2, hbmp); - if (GetParent(hwnd) != g_CLI.hwndContactList) { + if (GetParent(hwnd) != g_clistApi.hwndContactList) { HBRUSH br = GetSysColorBrush(COLOR_3DFACE); FillRect(hdc2, &rc, br); } @@ -218,7 +218,7 @@ static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case WM_PAINT: { PAINTSTRUCT ps; - BOOL bFloat = (GetParent(hwnd) != g_CLI.hwndContactList); + BOOL bFloat = (GetParent(hwnd) != g_clistApi.hwndContactList); if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat) { BeginPaint(hwnd, &ps); if ((!g_CluiData.fLayered || bFloat) && !g_CluiData.fDisableSkinEngine) @@ -232,7 +232,7 @@ static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case WM_NOTIFY: if (((LPNMHDR)lParam)->code == BUTTONNEEDREDRAW) - g_CLI.pfnInvalidateRect(hwnd, nullptr, FALSE); + g_clistApi.pfnInvalidateRect(hwnd, nullptr, FALSE); return 0; case MTBM_LAYEREDPAINT: diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index 2f3567f6f8..a94709dc67 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -991,10 +991,10 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_NCPAINT: case WM_PAINT: - if (GetParent(hwnd) == g_CLI.hwndContactList && g_CluiData.fLayered) + if (GetParent(hwnd) == g_clistApi.hwndContactList && g_CluiData.fLayered) ValidateRect(hwnd, nullptr); - else if (GetParent(hwnd) != g_CLI.hwndContactList || !g_CluiData.fLayered) { + else if (GetParent(hwnd) != g_clistApi.hwndContactList || !g_CluiData.fLayered) { RECT rc = { 0 }; GetClientRect(hwnd, &rc); rc.right++; @@ -1007,7 +1007,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if (g_CluiData.fDisableSkinEngine) sttDrawViewModeBackground(hwnd, hdc2, &rc); else { - if (GetParent(hwnd) != g_CLI.hwndContactList) { + if (GetParent(hwnd) != g_clistApi.hwndContactList) { HBRUSH br = GetSysColorBrush(COLOR_3DFACE); FillRect(hdc2, &rc, br); } @@ -1041,13 +1041,13 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_NOTIFY: if (((LPNMHDR)lParam)->code == BUTTONNEEDREDRAW) - g_CLI.pfnInvalidateRect(hwnd, nullptr, FALSE); + g_clistApi.pfnInvalidateRect(hwnd, nullptr, FALSE); return 0; case WM_TIMER: if (wParam == TIMERID_VIEWMODEEXPIRE) { RECT rcCLUI; - GetWindowRect(g_CLI.hwndContactList, &rcCLUI); + GetWindowRect(g_clistApi.hwndContactList, &rcCLUI); POINT pt; GetCursorPos(&pt); @@ -1131,7 +1131,7 @@ static view_mode_t view_mode; static BOOL sttDrawViewModeBackground(HWND hwnd, HDC hdc, RECT *rect) { - BOOL bFloat = (GetParent(hwnd) != g_CLI.hwndContactList); + BOOL bFloat = (GetParent(hwnd) != g_clistApi.hwndContactList); if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat) { RECT rc; if (rect) @@ -1166,7 +1166,7 @@ static int ehhViewModeBackgroundSettingsChanged(WPARAM, LPARAM) view_mode.useWinColors = db_get_b(0, "ViewMode", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS); view_mode.backgroundBmpUse = db_get_w(0, "ViewMode", "BkBmpUse", CLCDEFAULT_BKBMPUSE); } - PostMessage(g_CLI.hwndContactList, WM_SIZE, 0, 0); + PostMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0); return 0; } @@ -1196,7 +1196,7 @@ void CreateViewModeFrame() frame.TBtname = TranslateT("View modes"); frame.Flags = F_VISIBLE | F_SHOWTBTIP | F_NOBORDER | F_NO_SUBCONTAINER | F_UNICODE; frame.align = alBottom; - frame.hWnd = CreateWindowEx(0, L"CLVMFrameWindow", _A2W(CLVM_MODULE), WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, g_CLI.hwndContactList, (HMENU)nullptr, g_plugin.getInst(), nullptr); + frame.hWnd = CreateWindowEx(0, L"CLVMFrameWindow", _A2W(CLVM_MODULE), WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, g_clistApi.hwndContactList, (HMENU)nullptr, g_plugin.getInst(), nullptr); g_hwndViewModeFrame = frame.hWnd; hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&frame, 0); CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)hCLVMFrame, FU_FMPOS); @@ -1238,7 +1238,7 @@ void ApplyViewMode(const char *Name, bool onlySelector) KillTimer(g_hwndViewModeFrame, TIMERID_VIEWMODEEXPIRE); SetDlgItemText(g_hwndViewModeFrame, IDC_SELECTMODE, TranslateT("All contacts")); if (g_CluiData.boldHideOffline != (BYTE)-1) - g_CLI.pfnSetHideOffline(g_CluiData.boldHideOffline); + g_clistApi.pfnSetHideOffline(g_CluiData.boldHideOffline); if (g_CluiData.bOldUseGroups != (BYTE)-1) CallService(MS_CLIST_SETUSEGROUPS, (WPARAM)g_CluiData.bOldUseGroups, 0); g_CluiData.boldHideOffline = (BYTE)-1; @@ -1326,10 +1326,10 @@ void ApplyViewMode(const char *Name, bool onlySelector) if (g_CluiData.boldHideOffline == (BYTE)-1) g_CluiData.boldHideOffline = db_get_b(0, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT); - g_CLI.pfnSetHideOffline(false); + g_clistApi.pfnSetHideOffline(false); } else if (g_CluiData.boldHideOffline != (BYTE)-1) { - g_CLI.pfnSetHideOffline(g_CluiData.boldHideOffline); + g_clistApi.pfnSetHideOffline(g_CluiData.boldHideOffline); g_CluiData.boldHideOffline = -1; } @@ -1355,7 +1355,7 @@ void ApplyViewMode(const char *Name, bool onlySelector) SetWindowText(hwndSelector, ptrW(mir_utf8decodeW((Name[0] == 13) ? Name + 1 : Name))); Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); - cliInvalidateRect(g_CLI.hwndStatus, nullptr, FALSE); + cliInvalidateRect(g_clistApi.hwndStatus, nullptr, FALSE); } static int SkinSetViewMode(WPARAM wParam /*char * name*/, LPARAM lParam /*int index*/) -- cgit v1.2.3