Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 20:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BROWSEUI] Implement ShellBrowser F11 fullscreen mode

Browse source
This commit is contained in:
Whindmar Saksit 2025-03-29 21:31:50 +01:00
parent 467dec4d16
commit a113d6d547
3 changed files with 164 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dll/win32/browseui/lang/en-US.rc
View file

@ -192,6 +192,7 @@ BEGIN
"E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT
"I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT
"H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT
VK_F11, IDM_TOGGLEFULLSCREEN, VIRTKEY, NOINVERT
END
/* Strings */

1
dll/win32/browseui/resource.h
View file

@ -73,6 +73,7 @@
/* Random id for band close button, feel free to change it */
#define IDM_BASEBAR_CLOSE 0xA200
#define IDM_TOGGLEFULLSCREEN 0xA238 /* Arbitrary id */
#define IDM_NOTIFYITBARDIRTY 0xA239 /* Arbitrary id */
/* User-installed explorer band IDs according to API Monitor traces */

188
dll/win32/browseui/shellbrowser.cpp
View file

@ -129,6 +129,19 @@ BOOL createNewStuff = false;
// this class is private to browseui.dll and is not registered externally?
//DEFINE_GUID(CLSID_ShellFldSetExt, 0x6D5313C0, 0x8C62, 0x11D1, 0xB2, 0xCD, 0x00, 0x60, 0x97, 0xDF, 0x8C, 0x11);
static void GetWindowMonitorInfo(HWND hWnd, MONITORINFO &mi)
{
HMONITOR hMon = MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
mi.cbSize = sizeof(mi);
if (!hMon || !GetMonitorInfo(hMon, &mi))
{
mi.rcMonitor.left = mi.rcMonitor.top = 0;
mi.rcMonitor.right = GetSystemMetrics(SM_CXFULLSCREEN);
mi.rcMonitor.bottom = GetSystemMetrics(SM_CYFULLSCREEN);
SystemParametersInfo(SPI_GETWORKAREA, 0, &mi.rcWork, 0);
}
}
void DeleteMenuItems(HMENU theMenu, unsigned int firstIDToDelete, unsigned int lastIDToDelete)
{
MENUITEMINFO menuItemInfo;
@ -272,6 +285,7 @@ class CShellBrowser :
public MyIConnectionPointImpl<CShellBrowser, &DIID_DWebBrowserEvents>
{
private:
enum { BSF_ROS_REGBROWSER = 0x04, BSF_ROS_KIOSK = 0x08 }; // Custom values
class barInfo
{
public:
@ -310,6 +324,7 @@ private:
SBFOLDERSETTINGS m_deffoldersettings;
DWORD m_BrowserSvcFlags;
bool m_Destroyed;
BYTE m_NonFullscreenState;
public:
#if 0
ULONG InternalAddRef()
@ -341,7 +356,7 @@ public:
HRESULT ShowBand(const CLSID &classID, bool vertical);
HRESULT NavigateToParent();
HRESULT DoFolderOptions();
HRESULT ApplyBrowserDefaultFolderSettings(IShellView *pvs);
HRESULT ApplyBrowserDefaultFolderSettings(IShellView *pSV);
static LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
void RepositionBars();
HRESULT BuildExplorerBandMenu();
@ -355,6 +370,7 @@ public:
HRESULT FireNavigateComplete(const wchar_t *newDirectory);
HRESULT FireCommandStateChange(bool newState, int commandID);
HRESULT FireCommandStateChangeAll();
HRESULT FireEvent_VBOOL(DISPID dispIdMember, VARIANT_BOOL Param1);
HRESULT UpdateForwardBackState();
HRESULT UpdateUpState();
void UpdateGotoMenu(HMENU theMenu);
@ -364,6 +380,8 @@ public:
void UpdateWindowTitle();
void SaveITBarLayout();
inline HWND GetTopLevelBrowserWindow() { return m_hWnd; }
/* // *** IDockingWindowFrame methods ***
STDMETHOD(AddToolbar)(IUnknown *punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags) override;
STDMETHOD(RemoveToolbar)(IUnknown *punkSrc, DWORD dwRemoveFlags) override;
@ -627,6 +645,7 @@ public:
LRESULT OnGoHome(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled);
LRESULT OnAddToFavorites(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled);
LRESULT OnOrganizeFavorites(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled);
LRESULT OnToggleFullscreen(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled);
LRESULT OnToggleStatusBarVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled);
LRESULT OnToggleToolbarLock(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled);
LRESULT OnToggleToolbarBandVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled);
@ -680,6 +699,7 @@ public:
COMMAND_ID_HANDLER(IDM_FAVORITES_ORGANIZEFAVORITES, OnOrganizeFavorites)
COMMAND_ID_HANDLER(IDM_VIEW_STATUSBAR, OnToggleStatusBarVisible)
COMMAND_ID_HANDLER(IDM_VIEW_REFRESH, OnRefresh)
COMMAND_ID_HANDLER(IDM_TOGGLEFULLSCREEN, OnToggleFullscreen)
COMMAND_ID_HANDLER(IDM_TOOLBARS_LOCKTOOLBARS, OnToggleToolbarLock)
COMMAND_ID_HANDLER(IDM_TOOLBARS_STANDARDBUTTONS, OnToggleToolbarBandVisible)
COMMAND_ID_HANDLER(IDM_TOOLBARS_ADDRESSBAR, OnToggleAddressBandVisible)
@ -814,14 +834,14 @@ HRESULT CShellBrowser::Initialize()
return S_OK;
}
HRESULT CShellBrowser::ApplyBrowserDefaultFolderSettings(IShellView *pvs)
HRESULT CShellBrowser::ApplyBrowserDefaultFolderSettings(IShellView *pSV)
{
HRESULT hr;
if (pvs)
if (pSV)
{
m_settings.Save();
SBFOLDERSETTINGS &sbfs = m_deffoldersettings, defsbfs;
if (FAILED(pvs->GetCurrentInfo(&sbfs.FolderSettings)))
if (FAILED(pSV->GetCurrentInfo(&sbfs.FolderSettings)))
{
defsbfs.InitializeDefaults();
sbfs = defsbfs;
@ -1676,6 +1696,14 @@ HRESULT CShellBrowser::FireCommandStateChangeAll()
return FireCommandStateChange(false, -1);
}
HRESULT CShellBrowser::FireEvent_VBOOL(DISPID dispIdMember, VARIANT_BOOL Param1)
{
VARIANT vArgs[1];
V_VT(&vArgs[0]) = VT_BOOL;
V_BOOL(&vArgs[0]) = Param1 ? VARIANT_TRUE : VARIANT_FALSE;
return FireEvent(dispIdMember, 1, vArgs);
}
HRESULT CShellBrowser::UpdateForwardBackState()
{
CComPtr<ITravelLog> travelLog;
@ -2893,7 +2921,7 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::InitializeTravelLog(ITravelLog *ptl, DW
HRESULT STDMETHODCALLTYPE CShellBrowser::SetTopBrowser()
{
m_BrowserSvcFlags |= BSF_TOPBROWSER;
SetFlags(BSF_TOPBROWSER, BSF_TOPBROWSER);
return S_OK;
}
@ -3294,7 +3322,8 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::get_Busy(VARIANT_BOOL *pBool)
HRESULT STDMETHODCALLTYPE CShellBrowser::Quit()
{
return E_NOTIMPL;
::PostMessageW(GetTopLevelBrowserWindow(), WM_CLOSE, 0, 0);
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::ClientToWindow(int *pcx, int *pcy)
@ -3319,7 +3348,8 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::get_Name(BSTR *Name)
HRESULT STDMETHODCALLTYPE CShellBrowser::get_HWND(SHANDLE_PTR *pHWND)
{
return E_NOTIMPL;
*pHWND = HandleToLong(GetTopLevelBrowserWindow());
return *pHWND ? S_OK : E_UNEXPECTED;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::get_FullName(BSTR *FullName)
@ -3334,22 +3364,35 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::get_Path(BSTR *Path)
HRESULT STDMETHODCALLTYPE CShellBrowser::get_Visible(VARIANT_BOOL *pBool)
{
return E_NOTIMPL;
HWND hWnd = GetTopLevelBrowserWindow();
*pBool = hWnd && ::IsWindowVisible(hWnd) ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::put_Visible(VARIANT_BOOL Value)
{
return E_NOTIMPL;
if (HWND hWnd = GetTopLevelBrowserWindow())
{
::ShowWindow(hWnd, Value? SW_SHOW : SW_HIDE);
if (Value)
::SetForegroundWindow(hWnd);
FireEvent_VBOOL(DISPID_ONVISIBLE, Value);
}
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::get_StatusBar(VARIANT_BOOL *pBool)
{
return E_NOTIMPL;
*pBool = IsControlWindowShown(FCW_STATUS, NULL) == S_OK ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::put_StatusBar(VARIANT_BOOL Value)
{
return E_NOTIMPL;
SetFlags(BSF_UISETBYAUTOMATION, BSF_UISETBYAUTOMATION);
HRESULT hr = ShowControlWindow(FCW_STATUS, Value != VARIANT_FALSE);
FireEvent_VBOOL(DISPID_ONSTATUSBAR, Value);
return hr;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::get_StatusText(BSTR *StatusText)
@ -3359,37 +3402,62 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::get_StatusText(BSTR *StatusText)
HRESULT STDMETHODCALLTYPE CShellBrowser::put_StatusText(BSTR StatusText)
{
return E_NOTIMPL;
SendControlMsg(FCW_STATUS, SB_SETTEXTW, 0, (LPARAM)StatusText, NULL);
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::get_ToolBar(int *Value)
{
return E_NOTIMPL;
*Value = IsControlWindowShown(FCW_INTERNETBAR, NULL) == S_OK;
if (!*Value && IsControlWindowShown(FCW_TOOLBAR, NULL) == S_OK)
*Value = FCW_TOOLBAR;
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::put_ToolBar(int Value)
{
return E_NOTIMPL;
SetFlags(BSF_UISETBYAUTOMATION, BSF_UISETBYAUTOMATION);
ShowControlWindow(FCW_INTERNETBAR, Value != VARIANT_FALSE && Value != FCW_TOOLBAR);
ShowControlWindow(FCW_TOOLBAR, Value == FCW_TOOLBAR);
FireEvent_VBOOL(DISPID_ONTOOLBAR, Value);
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::get_MenuBar(VARIANT_BOOL *Value)
{
#ifdef FCW_MENU
*Value = IsControlWindowShown(FCW_MENU) == S_OK ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
#else
return E_NOTIMPL;
#endif
}
HRESULT STDMETHODCALLTYPE CShellBrowser::put_MenuBar(VARIANT_BOOL Value)
{
#ifdef FCW_MENU
SetFlags(BSF_UISETBYAUTOMATION, BSF_UISETBYAUTOMATION);
HRESULT hr = ShowControlWindow(FCW_MENU, Value != VARIANT_FALSE);
FireEvent_VBOOL(DISPID_ONMENUBAR, Value);
return hr;
#else
return E_NOTIMPL;
#endif
}
HRESULT STDMETHODCALLTYPE CShellBrowser::get_FullScreen(VARIANT_BOOL *pbFullScreen)
{
*pbFullScreen = (m_BrowserSvcFlags & BSF_ROS_KIOSK) ? VARIANT_TRUE : VARIANT_FALSE;
return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::put_FullScreen(VARIANT_BOOL bFullScreen)
{
return E_NOTIMPL;
SetFlags(BSF_UISETBYAUTOMATION, BSF_UISETBYAUTOMATION);
SetFlags(bFullScreen ? BSF_ROS_KIOSK : 0, BSF_ROS_KIOSK);
put_TheaterMode(bFullScreen);
FireEvent_VBOOL(DISPID_ONFULLSCREEN, bFullScreen);
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::Navigate2(VARIANT *URL, VARIANT *Flags,
@ -3419,13 +3487,21 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::Navigate2(VARIANT *URL, VARIANT *Flags,
HRESULT STDMETHODCALLTYPE CShellBrowser::QueryStatusWB(OLECMDID cmdID, OLECMDF *pcmdf)
{
return E_NOTIMPL;
OLECMD cmd = { cmdID, *pcmdf };
HRESULT hr = QueryStatus(NULL, 1, &cmd, NULL);
*pcmdf = (OLECMDF)cmd.cmdf;
return hr;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::ExecWB(OLECMDID cmdID, OLECMDEXECOPT cmdexecopt,
VARIANT *pvaIn, VARIANT *pvaOut)
{
return E_NOTIMPL;
CComPtr<IOleCommandTarget> pOCT;
IShellView *pSV = fCurrentShellView;
HRESULT hr = pSV ? pSV->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)) : E_FAIL;
if (SUCCEEDED(hr))
hr = pOCT->Exec(NULL, cmdID, cmdexecopt, pvaIn, pvaOut);
return hr;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::ShowBrowserBar(VARIANT *pvaClsid, VARIANT *pvarShow, VARIANT *pvarSize)
@ -3469,52 +3545,67 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::put_Silent(VARIANT_BOOL bSilent)
HRESULT STDMETHODCALLTYPE CShellBrowser::get_RegisterAsBrowser(VARIANT_BOOL *pbRegister)
{
return E_NOTIMPL;
*pbRegister = (m_BrowserSvcFlags & BSF_ROS_REGBROWSER) ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::put_RegisterAsBrowser(VARIANT_BOOL bRegister)
{
return E_NOTIMPL;
if (!bRegister)
return E_UNEXPECTED;
SetFlags(BSF_ROS_REGBROWSER, BSF_ROS_REGBROWSER);
return RegisterWindow(TRUE, SWC_3RDPARTY);
}
HRESULT STDMETHODCALLTYPE CShellBrowser::get_RegisterAsDropTarget(VARIANT_BOOL *pbRegister)
{
return E_NOTIMPL;
*pbRegister = (m_BrowserSvcFlags & BSF_REGISTERASDROPTARGET) ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::put_RegisterAsDropTarget(VARIANT_BOOL bRegister)
{
return E_NOTIMPL;
SetFlags(bRegister ? BSF_REGISTERASDROPTARGET : 0, BSF_REGISTERASDROPTARGET);
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::get_TheaterMode(VARIANT_BOOL *pbRegister)
{
return E_NOTIMPL;
*pbRegister = (m_BrowserSvcFlags & BSF_THEATERMODE) ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::put_TheaterMode(VARIANT_BOOL bRegister)
{
return E_NOTIMPL;
BOOL handled;
OnToggleFullscreen(bRegister, 0, NULL, handled);
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::get_AddressBar(VARIANT_BOOL *Value)
{
return E_NOTIMPL;
*Value = IsControlWindowShown(FCW_ADDRESSBAR, NULL) == S_OK ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::put_AddressBar(VARIANT_BOOL Value)
{
return E_NOTIMPL;
SetFlags(BSF_UISETBYAUTOMATION, BSF_UISETBYAUTOMATION);
HRESULT hr = ShowControlWindow(FCW_ADDRESSBAR, Value != VARIANT_FALSE);
FireEvent_VBOOL(DISPID_ONADDRESSBAR, Value);
return hr;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::get_Resizable(VARIANT_BOOL *Value)
{
*Value = (m_BrowserSvcFlags & BSF_RESIZABLE) ? VARIANT_TRUE : VARIANT_FALSE;
return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::put_Resizable(VARIANT_BOOL Value)
{
return E_NOTIMPL;
SetFlags(Value ? (BSF_RESIZABLE | BSF_CANMAXIMIZE) : 0, (BSF_RESIZABLE | BSF_CANMAXIMIZE));
return S_OK;
}
HRESULT STDMETHODCALLTYPE CShellBrowser::FindWindowByIndex(DWORD dwID, IUnknown **ppunk)
@ -4086,6 +4177,51 @@ LRESULT CShellBrowser::OnAppCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
return 0;
}
LRESULT CShellBrowser::OnToggleFullscreen(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled)
{
enum { SF_MBAR = 0x1, SF_SBAR = 0x2, SF_RESIZE = 0x4, SF_MAXIMIZED = 0x8 };
const UINT OrgUiSetAuto = m_BrowserSvcFlags & BSF_UISETBYAUTOMATION;
const BOOL fCurrentlyFullscreen = (m_BrowserSvcFlags & BSF_THEATERMODE);
const BOOL fEnter = wID ? !fCurrentlyFullscreen : wNotifyCode;
const HWND hWnd = GetTopLevelBrowserWindow();
if (fEnter)
{
VARIANT_BOOL varb;
m_NonFullscreenState = (m_BrowserSvcFlags & BSF_RESIZABLE) ? SF_RESIZE : 0;
m_NonFullscreenState |= (FAILED(get_MenuBar(&varb)) || varb) ? SF_MBAR : 0;
m_NonFullscreenState |= (FAILED(get_StatusBar(&varb)) || varb) ? SF_SBAR : 0;
m_NonFullscreenState |= (SHSetWindowBits(hWnd, GWL_STYLE, 0, 0) & WS_MAXIMIZE) ? SF_MAXIMIZED : 0;
SetFlags(BSF_THEATERMODE, BSF_THEATERMODE);
put_MenuBar(VARIANT_FALSE);
put_StatusBar(VARIANT_FALSE);
SHSetWindowBits(hWnd, GWL_STYLE, WS_CAPTION | WS_BORDER | WS_DLGFRAME | WS_THICKFRAME, 0);
SHSetWindowBits(hWnd, GWL_EXSTYLE, WS_EX_WINDOWEDGE, 0);
::ShowWindow(hWnd, SW_SHOWMAXIMIZED);
MONITORINFO mi;
GetWindowMonitorInfo(hWnd, mi);
int x = mi.rcMonitor.left, w = mi.rcMonitor.right - x;
int y = mi.rcMonitor.top, h = mi.rcMonitor.bottom - y;
::SetWindowPos(hWnd, HWND_TOPMOST, x, y, w, h, SWP_FRAMECHANGED);
::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN);
}
else
{
SetFlags(0, BSF_THEATERMODE);
put_MenuBar((m_NonFullscreenState & SF_MBAR) ? VARIANT_TRUE : VARIANT_FALSE);
put_StatusBar((m_NonFullscreenState & SF_SBAR) ? VARIANT_TRUE : VARIANT_FALSE);
SHSetWindowBits(hWnd, GWL_EXSTYLE, WS_EX_WINDOWEDGE, WS_EX_WINDOWEDGE);
UINT styles = WS_CAPTION | WS_BORDER | WS_DLGFRAME | ((m_NonFullscreenState & SF_RESIZE) ? WS_THICKFRAME : 0);
SHSetWindowBits(hWnd, GWL_STYLE, styles | WS_THICKFRAME, styles);
::SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE);
::ShowWindow(hWnd, SW_SHOWNOACTIVATE);
if (m_NonFullscreenState & SF_MAXIMIZED)
::ShowWindow(hWnd, SW_SHOWMAXIMIZED);
::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN);
}
SetFlags(OrgUiSetAuto, BSF_UISETBYAUTOMATION);
return 0;
}
HRESULT CShellBrowser_CreateInstance(REFIID riid, void **ppv)
{
return ShellObjectCreatorInit<CShellBrowser>(riid, ppv);