Mirrors/winamp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

publish changes

Browse source
This commit is contained in:
Archie 2024-09-29 02:04:03 +00:00
parent afc5064a7b
commit ac2c6ac843
1605 changed files with 3354 additions and 3354 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Src/Plugins/General/gen_ff/ff_ipc.cpp
View file

@ -181,7 +181,7 @@ COLORREF getWindowBackground(COLORREF *wb)
windowbackground = b[_w*_y+_x];
WASABI_API_SKIN->imgldr_releaseSkinBitmap(b);
} else {
// no idea... we'll just set the default windows color
// no idea... we'll just set the default arch color
windowbackground = GetSysColor(COLOR_WINDOWFRAME);
}
}

4
Src/Plugins/General/gen_ff/ff_ipc.h
View file

@ -79,8 +79,8 @@ typedef struct {
// -----------------------------------------------------------------------------------------------
#define IPC_FF_ONCOLORTHEMECHANGED IPC_FF_FIRST + 3 // data = name of the new color theme (const char *)
#define IPC_FF_ISMAINWND IPC_FF_FIRST + 4 // data = hwnd, returns 1 if hwnd is main window or any of its windowshade
#define IPC_FF_GETCONTENTWND IPC_FF_FIRST + 5 // data = HWND, returns the wa2 window that is embedded in the window's container (ie if hwnd is the pledit windowshade hwnd, it returns the wa2 pledit hwnd). if no content is found (ie, the window has nothing embedded) it returns the parameter you gave it
#define IPC_FF_ISMAINWND IPC_FF_FIRST + 4 // data = hwnd, returns 1 if hwnd is main window or any of its archhade
#define IPC_FF_GETCONTENTWND IPC_FF_FIRST + 5 // data = HWND, returns the wa2 window that is embedded in the window's container (ie if hwnd is the pledit archhade hwnd, it returns the wa2 pledit hwnd). if no content is found (ie, the window has nothing embedded) it returns the parameter you gave it
#define IPC_FF_NOTIFYHOTKEY IPC_FF_FIRST + 6 // data = const char * to hotkey description
#endif

8
Src/Plugins/General/gen_ff/gen_ff.rc
View file

@ -74,7 +74,7 @@ BEGIN
LTEXT "pixels",IDC_STATIC,225,106,19,8
GROUPBOX "Miscellaneous",IDC_STATIC,4,131,256,86
CONTROL "Enable tooltips",IDC_CHECK_TOOLTIPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,144,65,10
CONTROL "Dock windows at ",IDC_CHECK_DOCKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,156,67,11
CONTROL "Dock arch at ",IDC_CHECK_DOCKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,156,67,11
EDITTEXT IDC_EDIT_DOCKDISTANCE,79,155,30,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_SPIN_DOCKDISTANCE,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,97,154,10,14
LTEXT "pixels",IDC_STATIC,111,157,18,8
@ -182,7 +182,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Scaling",IDC_STATIC,4,3,256,76
CONTROL "Link all windows in all skins:",IDC_CHECK_LINKALLRATIO,
CONTROL "Link all arch in all skins:",IDC_CHECK_LINKALLRATIO,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,15,103,10
CTEXT "100%",IDC_STATIC_SCALE,159,10,51,8
LTEXT "10%",IDC_STATIC_SCALE11,124,17,16,8
@ -193,7 +193,7 @@ BEGIN
GROUPBOX "On Window Close/Reopen",IDC_STATIC,10,41,244,32
COMBOBOX IDC_COMBO_SCALE,16,54,232,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Opacity",IDC_STATIC_OPACITY,4,81,256,138
CONTROL "Link all windows in all skins:",IDC_CHECK_LINKALLALPHA,
CONTROL "Link all arch in all skins:",IDC_CHECK_LINKALLALPHA,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,92,102,10
COMBOBOX IDC_COMBO_OPACITY,11,106,98,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Slider1",IDC_SLIDER_CUSTOMALPHA,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,114,106,140,10
@ -520,7 +520,7 @@ BEGIN
IDS_KHZ "kHz"
IDS_KBPS "kbps"
IDS_USELOCK "Reset window scale to global 'double size' except if it is locked"
IDS_ALLLOCKED "All windows remember their scale, disregard global 'double size'"
IDS_ALLLOCKED "All arch remember their scale, disregard global 'double size'"
IDS_OPAQUE_FOCUS "Auto opaque on focus"
IDS_OPAQUE_HOVER "Auto opaque on hover"
IDS_NO_OPACITY "No auto opacity"

6
Src/Plugins/General/gen_ff/gen_ff.vcxproj
View file

@ -93,19 +93,19 @@
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

50
Src/Plugins/General/gen_ff/main.cpp
View file

@ -1,5 +1,5 @@
#include "precomp__gen_ff.h"
#include <windows.h>
#include <arch.h>
#include <commctrl.h>
#include "main.h"
@ -53,7 +53,7 @@
#include "../nu/AutoWide.h"
#include <shlwapi.h>
#include <windowsx.h>
#include <archx.h>
//wtf?
#define _WAFE_H_
#define ___HOTAMP3_H___
@ -342,11 +342,11 @@ void autoOpacifyFocus();
ifc_window *g_controlMenuTarget = NULL;
HMENU controlmenu = NULL;
void lockScaling(int lock);
int ffwindowsitempos = -1;
int ffarchitempos = -1;
int ffoptionstop = -1;
int ffwoptionstop = -1;
int ffwindowstop = -1;
int ffwindowsitempos2 = -1;
int ffarchtop = -1;
int ffarchitempos2 = -1;
int eqremoved = 0;
void removeEq();
void restoreEq();
@ -422,7 +422,7 @@ __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, L
}
//-----------------------------------------------------------------------------------------------
// core actions implement "play", "stop", etc. wndEmbedded embed wa2 windows into GUID-based wnds
// core actions implement "play", "stop", etc. wndEmbedded embed wa2 arch into GUID-based wnds
//-----------------------------------------------------------------------------------------------
BEGIN_SERVICES(Winamp2_Svcs);
DECLARE_SERVICETSINGLE(svc_action, CoreActions);
@ -1454,7 +1454,7 @@ static LRESULT WINAPI wa_newWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
}
else if (wParam == 2)
{
// embed the windows that are currently visible because at the time the window were originally shown,
// embed the arch that are currently visible because at the time the window were originally shown,
// we hadn't been loaded yet
// but then again, we might if it's only a switch skin and not a app load, so let's check anyway
@ -1548,7 +1548,7 @@ static LRESULT WINAPI wa_newWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
wa2.setIdealVideoSize(HIWORD(wParam), LOWORD(wParam));
break;
}
// this is where we detect that wa2 wants to open one of its windows (thru popup menu, button, whatever)
// this is where we detect that wa2 wants to open one of its arch (thru popup menu, button, whatever)
// when this happens, we create a freeform wndembedder if one doesn't already exist. that embedder will
// reparent and resize the wa2 window on its own. when we return, winamp then shows the HWND inside our frame
// as it would show the HWND as a popup normally.
@ -1616,7 +1616,7 @@ static LRESULT WINAPI wa_newWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
break;
}
break;
// here we do the reverse, we detect that wa2 wants to close one of its windows, so we destroy our window
// here we do the reverse, we detect that wa2 wants to close one of its arch, so we destroy our window
// embedder (it will reparent the wa2 window back to its former parent and resize it back to where it was
// on its own). when we return, winamp then hides the window.
@ -1733,7 +1733,7 @@ static LRESULT WINAPI wa_newWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
// sending us the WM_KEY* directly
if (WASABI_API_WND->isKeyboardLocked()) return 0;
}
else if ((uMsg == WM_COMMAND || uMsg == WM_SYSCOMMAND) && LOWORD(wParam) >= 43000 && LOWORD(wParam) < ffwindowstop)
else if ((uMsg == WM_COMMAND || uMsg == WM_SYSCOMMAND) && LOWORD(wParam) >= 43000 && LOWORD(wParam) < ffarchtop)
{
int id = LOWORD(wParam) - 43000;
@ -2132,7 +2132,7 @@ void init_inst()
if ( DEFERREDCALLBACKMSG > 65536 )
PostMessage( wa2.getMainWindow(), WM_WA_IPC, 2, DEFERREDCALLBACKMSG );
// so if some embedwindows are already visible, they update their look
// so if some embedarch are already visible, they update their look
PostMessage( wa2.getMainWindow(), WM_WA_IPC, 0xf00d, IPC_FF_ONCOLORTHEMECHANGED );
// monitor color theme
@ -2698,7 +2698,7 @@ void restoreEq()
//-----------------------------------------------------------------------------------------------
void unpopulateWindowsMenus()
{
if (ffwindowsitempos == -1) return ;
if (ffarchitempos == -1) return ;
HMENU menuBarMenu = wa2.getMenuBarMenu(Winamp2FrontEnd::WA2_MAINMENUBAR_WINDOWS);
for(int i = GetMenuItemCount(menuBarMenu)-1; i >= 0; i--)
@ -2726,8 +2726,8 @@ void unpopulateWindowsMenus()
}
}
ffwindowsitempos = -1;
ffwindowsitempos2 = -1;
ffarchitempos = -1;
ffarchitempos2 = -1;
MenuActions::removeSkinWindowOptions();
MenuActions::removeSkinOptions();
@ -2736,20 +2736,20 @@ void unpopulateWindowsMenus()
//-----------------------------------------------------------------------------------------------
void populateWindowsMenus()
{
if (ffwindowsitempos != -1) unpopulateWindowsMenus();
if (ffarchitempos != -1) unpopulateWindowsMenus();
MenuActions::installSkinOptions();
MenuActions::installSkinWindowOptions();
ffwindowsitempos = wa2.adjustFFWindowsMenu(0) + NUMSTATICWINDOWS;
ffwindowsitempos2 = wa2.adjustOptionsPopupMenu(0) + 6 + NUMSTATICWINDOWS + 1;
ffarchitempos = wa2.adjustFFWindowsMenu(0) + NUMSTATICWINDOWS;
ffarchitempos2 = wa2.adjustOptionsPopupMenu(0) + 6 + NUMSTATICWINDOWS + 1;
MENUITEMINFOW i = {sizeof(i), };
i.fMask = MIIM_TYPE | MIIM_DATA | MIIM_ID | MIIM_STATE;
i.fType = MFT_STRING;
i.wID = 43000;
i.dwItemData = 0xD01; // use this as a check so we're only removing the correct items!!
int pos = ffwindowsitempos;
int pos2 = ffwindowsitempos2;
int pos = ffarchitempos;
int pos2 = ffarchitempos2;
PtrListQuickSorted<StringW, StringWComparator> items;
HMENU hMenu = wa2.getMenuBarMenu(Winamp2FrontEnd::WA2_MAINMENUBAR_WINDOWS);
@ -2824,7 +2824,7 @@ void populateWindowsMenus()
}
items.deleteAll();
ffwindowstop = i.wID;
ffarchtop = i.wID;
}
//-----------------------------------------------------------------------------------------------
@ -3465,7 +3465,7 @@ void updateParentlessOnTop()
Layout *l = c->enumLayout(j);
if (l != NULL)
{
// skip windows owned by winamp
// skip arch owned by winamp
// skip appbars, they take care of themselves
if (l->getNoParent() && !l->appbar_isDocked())
{
@ -3479,17 +3479,17 @@ void updateParentlessOnTop()
void onGoFullscreen()
{
// hidden windows will not receive APPBAR_CALLBACK, so forward it to winamp's main
// hidden arch will not receive APPBAR_CALLBACK, so forward it to winamp's main
SendMessageW(wa2.getMainWindow(), APPBAR_CALLBACK, ABN_FULLSCREENAPP, 1);
// update ontop flag for windows that are not parented to winamp
// update ontop flag for arch that are not parented to winamp
updateParentlessOnTop();
}
void onCancelFullscreen()
{
// hidden windows will not receive APPBAR_CALLBACK, so forward it to winamp's main
// hidden arch will not receive APPBAR_CALLBACK, so forward it to winamp's main
SendMessageW(wa2.getMainWindow(), APPBAR_CALLBACK, ABN_FULLSCREENAPP, 0);
// update ontop flag for windows that are not owned by winamp
// update ontop flag for arch that are not owned by winamp
updateParentlessOnTop();
}

14
Src/Plugins/General/gen_ff/menuactions.cpp
View file

@ -639,19 +639,19 @@ void MenuActions::installSkinWindowOptions()
mii.wID = 42000;
mii.dwItemData = 0xD02; // use this as a check so we're only removing the correct items!!
if (menu && windowsmenuitems)
if (menu && archmenuitems)
{
int n = MIN(windowsmenuitems->getNumAttributes(), 500);
int n = MIN(archmenuitems->getNumAttributes(), 500);
int cmdoffset = 0;
for (int i = 0;i < n;i++)
{
const wchar_t *attr = windowsmenuitems->enumAttribute(i);
const wchar_t *attr = archmenuitems->enumAttribute(i);
if (attr && *attr)
{
HMENU submenu = NULL;
wchar_t txt[256] = {0};
windowsmenuitems->getData(attr, txt, 256);
archmenuitems->getData(attr, txt, 256);
GUID g = nsGUID::fromCharW(txt);
if (g != INVALID_GUID)
{ // submenu !
@ -659,7 +659,7 @@ void MenuActions::installSkinWindowOptions()
if (submenu)
wmenulist.addItem(submenu);
}
int v = windowsmenuitems->getDataAsInt(attr, 0);
int v = archmenuitems->getDataAsInt(attr, 0);
wa2.adjustFFWindowsMenu(1);
wa2.adjustOptionsPopupMenu(1);
@ -698,7 +698,7 @@ void MenuActions::removeSkinWindowOptions()
HMENU menu = wa2.getMenuBarMenu(Winamp2FrontEnd::WA2_MAINMENUBAR_WINDOWS);
HMENU omenu = wa2.getPopupMenu();
if (menu && windowsmenuitems)
if (menu && archmenuitems)
{
for(int i = GetMenuItemCount(menu)-1; i != 0; i--)
{
@ -758,7 +758,7 @@ int MenuActions::toggleWindowOption(int n, GUID guid, int *cmdoffset)
if (!cmdoffset) cmdoffset = &_cmdoffset;
CfgItem *item = NULL;
if (guid == INVALID_GUID)
item = windowsmenuitems;
item = archmenuitems;
else
item = WASABI_API_CONFIG->config_getCfgItemByGuid(guid);

2
Src/Plugins/General/gen_ff/prefs.cpp
View file

@ -7,7 +7,7 @@
#include "../Agave/Language/api_language.h"
#include "gen.h"
#include <commctrl.h>
#include <windowsx.h>
#include <archx.h>
void turnonoff(HWND wnd, int *t, int n, int v) {
for (int i=0;i<n;i++) {

2
Src/Plugins/General/gen_ff/prefs_colorthemes.cpp
View file

@ -1,6 +1,6 @@
#include "precomp__gen_ff.h"
#include "resource.h"
#include <windowsx.h>
#include <archx.h>
extern int m_are_we_loaded;
extern int toggle_from_wa2;

4
Src/Plugins/General/gen_ff/prefs_font.cpp
View file

@ -1,7 +1,7 @@
#include "precomp__gen_ff.h"
#include <commctrl.h>
#include <windows.h>
#include <windowsx.h>
#include <arch.h>
#include <archx.h>
#include "resource.h"
#include <api/font/font.h>
#include <bfc/parse/paramparser.h>

12
Src/Plugins/General/gen_ff/wa2cfgitems.cpp
View file

@ -121,7 +121,7 @@ void AvsCfg::onVisRandomChanged(BOOL set) {
//---------------------------------------------------------
Options *options;
CustomOptionsMenuItems *optionsmenuitems;
CustomWindowsMenuItems *windowsmenuitems;
CustomWindowsMenuItems *archmenuitems;
SkinTweaks *skintweaks;
Crossfader *crossfader;
AvsCfg *avscfg;
@ -134,8 +134,8 @@ Wa2CfgItems::Wa2CfgItems() {
// set up custom options menu items
WASABI_API_CONFIG->config_registerCfgItem((optionsmenuitems = new CustomOptionsMenuItems()));
// set up custom windows menu items
WASABI_API_CONFIG->config_registerCfgItem((windowsmenuitems = new CustomWindowsMenuItems()));
// set up custom arch menu items
WASABI_API_CONFIG->config_registerCfgItem((archmenuitems = new CustomWindowsMenuItems()));
// set up skintweaks options menu items
WASABI_API_CONFIG->config_registerCfgItem((skintweaks = new SkinTweaks()));
@ -150,7 +150,7 @@ Wa2CfgItems::Wa2CfgItems() {
Wa2CfgItems::~Wa2CfgItems() {
WASABI_API_CONFIG->config_deregisterCfgItem(options);
WASABI_API_CONFIG->config_deregisterCfgItem(optionsmenuitems);
WASABI_API_CONFIG->config_deregisterCfgItem(windowsmenuitems);
WASABI_API_CONFIG->config_deregisterCfgItem(archmenuitems);
WASABI_API_CONFIG->config_deregisterCfgItem(skintweaks);
WASABI_API_CONFIG->config_deregisterCfgItem(crossfader);
WASABI_API_CONFIG->config_deregisterCfgItem(avscfg);
@ -158,8 +158,8 @@ Wa2CfgItems::~Wa2CfgItems() {
options = NULL;
delete optionsmenuitems;
optionsmenuitems = NULL;
delete windowsmenuitems;
windowsmenuitems = NULL;
delete archmenuitems;
archmenuitems = NULL;
delete skintweaks;
skintweaks = NULL;
delete crossfader;

2
Src/Plugins/General/gen_ff/wa2cfgitems.h
View file

@ -127,7 +127,7 @@ extern _int cfg_uioptions_extendautoopacity;
extern _bool cfg_options_usefontmapper;
extern CustomOptionsMenuItems *optionsmenuitems;
extern CustomWindowsMenuItems *windowsmenuitems;
extern CustomWindowsMenuItems *archmenuitems;
extern SkinTweaks *skintweaks;
extern int disable_set_wa2_repeat;
extern StringW eqmenustring;

2
Src/Plugins/General/gen_ff/wa2frontend.h
View file

@ -40,7 +40,7 @@
//-----------------------------------------------------------------------------------------------
#include <windows.h>
#include <arch.h>
#include "../gen_ml/ml.h"
#include "../winamp/wa_ipc.h"
#include "../winamp/ipc_pe.h"

16
Src/Plugins/General/gen_ff/wa2wndembed.cpp
View file

@ -38,7 +38,7 @@ void WaOsWndHost::onBeforeReparent(int host)
#else
embedWindowState* ws = (embedWindowState*)GetWindowLong(getHWND(), GWL_USERDATA);
#endif
// 0x49474541 is related to keeping windows shown on litestep desktops
// 0x49474541 is related to keeping arch shown on litestep desktops
if (ws == NULL || (int)ws == 0x49474541)
{
HWND w = getHWND();
@ -68,7 +68,7 @@ void WaOsWndHost::onAfterReparent(int host)
#else
embedWindowState* ws = (embedWindowState*)GetWindowLong(getHWND(), GWL_USERDATA);
#endif
// 0x49474541 is related to keeping windows shown on litestep desktops
// 0x49474541 is related to keeping arch shown on litestep desktops
if (ws == NULL || (int)ws == 0x49474541)
{
HWND w = getHWND();
@ -432,11 +432,11 @@ int Wa2WndEmbed::destroyWindow(ifc_window *w)
// if you load another skin (ie: NonStep), and you close the pledit, it immediately reappears with the wa2 look since oswndhost_unhost
// reset the flags, region and parent to what they were before the window was embedded
// i think that what we need is to save which windows were visible (and their location) before switching to freeform
// i think that what we need is to save which arch were visible (and their location) before switching to freeform
// and to restore them when we go back to wa2 mode. this will also be more consistant with the freeform behavior of
// remembering visible status and coordinates on a per skin basis (since otherwise freeform dockings get screwed)
// it also makes sense when we consider that we are going to need to remove all windowshade modes from the embedded
// windows when going freeform.
// it also makes sense when we consider that we are going to need to remove all archhade modes from the embedded
// arch when going freeform.
// see new functions: rememberVisibleWindows() and restoreVisibleWindows()
@ -742,7 +742,7 @@ int Wa2WndEmbed::embedRememberProc(embedWindowState *p, embedEnumStruct *parms)
extern int m_loading_at_startup;
//-----------------------------------------------------------------------------------------------
// todo: remember and restore windowshade modes
// todo: remember and restore archhade modes
void Wa2WndEmbed::rememberVisibleWindows()
{
wa2wndstatus.deleteAll();
@ -821,9 +821,9 @@ void Wa2WndEmbed::restoreVisibleWindows()
SetWindowPos(ws->wnd, 0, 0, 0, mlwidth, mlheight, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE);
}
}
// FG> as of oct19, this function only restores state for windows that WERE visible
// FG> as of oct19, this function only restores state for arch that WERE visible
// because there is no reason to hide one, since this function is designed to bring
// back those windows that were here in one mode, but aren't so anymore in another
// back those arch that were here in one mode, but aren't so anymore in another
if (ws->visible)
{
if (ws->wndcode != -1)