Skip to content

Adding new options and actions. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NSTechBytes merged 17 commits into from
Dec 12, 2025
Merged

Adding new options and actions. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9388022
Add new member variables for action handling
RicardoTM05 Dec 8, 2025
aa35a93
Add OnFinishAction and OnPageLoadAction handling
RicardoTM05 Dec 8, 2025
67d7812
Prevent multiple creation of WebView2 environment
RicardoTM05 Dec 8, 2025
c3643f7
Refactor WebView2 creation logic for better validation
RicardoTM05 Dec 8, 2025
8e1c7f2
Remove unnecessary Rainmeter redraw triggers
RicardoTM05 Dec 8, 2025
e0111e1
Implement synchronous script execution in WebView2
RicardoTM05 Dec 9, 2025
3899200
Restore to previous working version.
RicardoTM05 Dec 9, 2025
fcfc077
Add new properties and UpdateRaincontext function
RicardoTM05 Dec 10, 2025
b48bf00
Add raincontext management to Measure class
RicardoTM05 Dec 10, 2025
edb5084
Added handling of new actions and raincontext.
RicardoTM05 Dec 10, 2025
8e397a9
Refactor for dual control handling
RicardoTM05 Dec 11, 2025
90c430d
Implement AllowDualControl feature
RicardoTM05 Dec 11, 2025
38144bc
Add currentUrl member to Plugin class
RicardoTM05 Dec 11, 2025
899ddf8
Update WebView2.cpp
RicardoTM05 Dec 11, 2025
24ce69e
added zoomFactor double
RicardoTM05 Dec 11, 2025
3de406e
added zoomFactor
RicardoTM05 Dec 11, 2025
2834a3a
Added ZoomFactor
RicardoTM05 Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 148 additions & 15 deletions WebView2/Plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
// Measure constructor
Measure::Measure() : rm(nullptr), skin(nullptr), skinWindow(nullptr),
measureName(nullptr),
width(800), height(600), x(0), y(0),
visible(true), initialized(false), clickthrough(false), webMessageToken{}
width(800), height(600), x(0), y(0), zoomFactor(1.0),
visible(true), initialized(false), clickthrough(false), allowDualControl(true), webMessageToken{}
{
// Initialize COM for this thread if not already done
if (!g_comInitialized)
Expand Down Expand Up @@ -129,6 +129,54 @@ void UpdateClickthrough(Measure* measure)
}
}

// Inject AllowDualControl script into the WebView
void InjectAllowDualControl(Measure* measure)
{
if (!measure->webView) return;
// Inject script to capture page load events for drag/move and context menu
measure->webView->ExecuteScript(
L"let rm_AllowDualControl=false,rm_AllowDualControlOn=false,rm_AllowDualControlClientX=0,rm_AllowDualControlClientY=0;function rm_SetAllowDualControl(v){rm_AllowDualControl=!!v;if(!rm_AllowDualControl)rm_AllowDualControlOn=false;}document.body.onpointerdown=e=>{if(!rm_AllowDualControl)return;if(e.button===0&&e.ctrlKey){e.preventDefault();e.stopImmediatePropagation();rm_AllowDualControlOn=true;rm_AllowDualControlClientX=e.clientX;rm_AllowDualControlClientY=e.clientY;try{document.body.setPointerCapture(e.pointerId);}catch{}}};document.body.onpointermove=e=>{if(!rm_AllowDualControl||!rm_AllowDualControlOn)return;e.preventDefault();RainmeterAPI.Bang('[!Move '+(e.screenX-RainmeterAPI.ReadFormula('X',0)-rm_AllowDualControlClientX)+' '+(e.screenY-RainmeterAPI.ReadFormula('Y',0)-rm_AllowDualControlClientY)+']');};document.body.onpointerup=e=>{if(!rm_AllowDualControl)return;if(e.button===0){e.preventDefault();rm_AllowDualControlOn=false;try{document.body.releasePointerCapture(e.pointerId);}catch{}}};document.body.oncontextmenu=e=>{if(!rm_AllowDualControl)return;if(e.button===2&&e.ctrlKey){e.preventDefault();RainmeterAPI.Bang('[!SkinMenu]');}};",
Callback<ICoreWebView2ExecuteScriptCompletedHandler>(
[measure](HRESULT errorCode, LPCWSTR resultObjectAsJson) -> HRESULT
{
return S_OK;
}
).Get()
);
measure->isAllowDualControlInjected = true;
UpdateAllowDualControl(measure);
}

// Update AllowDualControl state in the WebView
void UpdateAllowDualControl(Measure* measure)
{
if (!measure->webView) return;

if (measure->allowDualControl)
{
measure->webView->ExecuteScript(
L"rm_SetAllowDualControl(true);",
Callback<ICoreWebView2ExecuteScriptCompletedHandler>(
[measure](HRESULT errorCode, LPCWSTR resultObjectAsJson) -> HRESULT
{
return S_OK;
}
).Get()
);
}
else {
measure->webView->ExecuteScript(
L"rm_SetAllowDualControl(false);",
Callback<ICoreWebView2ExecuteScriptCompletedHandler>(
[measure](HRESULT errorCode, LPCWSTR resultObjectAsJson) -> HRESULT
{
return S_OK;
}
).Get()
);
}
}

PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
{
Measure* measure = (Measure*)data;
Expand Down Expand Up @@ -182,12 +230,72 @@ PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
int newHeight = RmReadInt(rm, L"H", 600);
int newX = RmReadInt(rm, L"X", 0);
int newY = RmReadInt(rm, L"Y", 0);
bool newVisible = RmReadInt(rm, L"Hidden", 0) == 0;
bool newClickthrough = RmReadInt(rm, L"Clickthrough", 0) != 0;

double newZoomFactor = RmReadFormula(rm, L"ZoomFactor", 1.0);
bool newVisible = RmReadInt(rm, L"Hidden", 0) <= 0;
bool newClickthrough = RmReadInt(rm, L"Clickthrough", 0) >= 1;

// Read AllowDualControl for Yincognito's script injection
bool newAllowDualControl = RmReadInt(rm, L"AllowDualControl", 1) >= 1;

// Read OnWebViewLoadAction
std::wstring newOnWebViewLoadAction;
LPCWSTR onWebViewLoadOption = RmReadString(rm, L"OnWebViewLoadAction", L"", FALSE);
if (onWebViewLoadOption && wcslen(onWebViewLoadOption) > 0)
{
newOnWebViewLoadAction = onWebViewLoadOption;
}

// Read OnWebViewFailAction
std::wstring newOnWebViewFailAction;
LPCWSTR onWebViewFailOption = RmReadString(rm, L"OnWebViewFailAction", L"", FALSE);
if (onWebViewFailOption && wcslen(onWebViewFailOption) > 0)
{
newOnWebViewFailAction = onWebViewFailOption;
}

// Read OnPageLoadStartAction
std::wstring newOnPageLoadStartAction;
LPCWSTR onPageLoadStartOption = RmReadString(rm, L"OnPageLoadStartAction", L"", FALSE);
if (onPageLoadStartOption && wcslen(onPageLoadStartOption) > 0)
{
newOnPageLoadStartAction = onPageLoadStartOption;
}

// Read OnPageLoadingAction
std::wstring newOnPageLoadingAction;
LPCWSTR onPageLoadingOption = RmReadString(rm, L"OnPageLoadingAction", L"", FALSE);
if (onPageLoadingOption && wcslen(onPageLoadingOption) > 0)
{
newOnPageLoadingAction = onPageLoadingOption;
}

// Read OnPageLoadFinishAction
std::wstring newOnPageLoadFinishAction;
LPCWSTR onPageLoadFinishOption = RmReadString(rm, L"OnPageLoadFinishAction", L"", FALSE);
if (onPageLoadFinishOption && wcslen(onPageLoadFinishOption) > 0)
{
newOnPageLoadFinishAction = onPageLoadFinishOption;
}

// Read OnPageFirstLoadAction
std::wstring newOnPageFirstLoadAction;
LPCWSTR onPageFirstLoadOption = RmReadString(rm, L"OnPageFirstLoadAction", L"", FALSE);
if (onPageFirstLoadOption && wcslen(onPageFirstLoadOption) > 0)
{
newOnPageFirstLoadAction = onPageFirstLoadOption;
}

// Read OnPageReloadAction
std::wstring newOnPageReloadAction;
LPCWSTR onPageReloadOption = RmReadString(rm, L"OnPageReloadAction", L"", FALSE);
if (onPageReloadOption && wcslen(onPageReloadOption) > 0)
{
newOnPageReloadAction = onPageReloadOption;
}

// Check if URL has changed (requires recreation)
bool urlChanged = (newUrl != measure->url);

// Check if dimensions or position changed (can be updated dynamically)
bool dimensionsChanged = (newWidth != measure->width ||
newHeight != measure->height ||
Expand All @@ -196,16 +304,27 @@ PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)

bool visibilityChanged = (newVisible != measure->visible);
bool clickthroughChanged = (newClickthrough != measure->clickthrough);

bool allowDualControlChanged = (newAllowDualControl != measure->allowDualControl);
bool zoomFactorChanged = (newZoomFactor != measure->zoomFactor);

// Update stored values
measure->url = newUrl;
measure->width = newWidth;
measure->height = newHeight;
measure->x = newX;
measure->y = newY;
measure->zoomFactor = newZoomFactor;
measure->visible = newVisible;
measure->clickthrough = newClickthrough;

measure->allowDualControl = newAllowDualControl;
measure->onWebViewLoadAction = newOnWebViewLoadAction;
measure->onWebViewFailAction = newOnWebViewFailAction;
measure->onPageLoadStartAction = newOnPageLoadStartAction;
measure->onPageLoadingAction = newOnPageLoadingAction;
measure->onPageLoadFinishAction = newOnPageLoadFinishAction;
measure->onPageFirstLoadAction = newOnPageFirstLoadAction;
measure->onPageReloadAction = newOnPageReloadAction;

// Only create WebView2 if not initialized OR if URL changed
if (!measure->initialized || urlChanged)
{
Expand All @@ -220,6 +339,11 @@ PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
else
{
// First initialization - create WebView2
if (measure->isCreationInProgress)
{
// Avoid re-entrancy if creation is already in progress
return;
}
CreateWebView2(measure);
}
}
Expand All @@ -241,11 +365,26 @@ PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
{
measure->webViewController->put_IsVisible(measure->visible ? TRUE : FALSE);
}

if (zoomFactorChanged && measure->webViewController)
{
measure->webViewController->put_ZoomFactor(measure->zoomFactor);
}

if (clickthroughChanged)
{
UpdateClickthrough(measure);
}

if (allowDualControlChanged)
{
if (!measure->isAllowDualControlInjected)
{
InjectAllowDualControl(measure);
}
else
UpdateAllowDualControl(measure);
}
}
}

Expand Down Expand Up @@ -275,13 +414,6 @@ PLUGIN_EXPORT double Update(void* data)
{
measure->callbackResult = result;
}

// Trigger Rainmeter redraw after callback completes
if (measure->skin)
{
RmExecute(measure->skin, L"!UpdateMeter *");
RmExecute(measure->skin, L"!Redraw");
}
Copy link
Contributor Author

@RicardoTM05 RicardoTM05 Dec 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, we need to avoid these unnecessary global updates.
This was causing CallJS to execute twice when called. See JSInteraction.ini, it's being logged twice. Removing this fixed it.

Note: The 1 update delay on the result on that demo skin may be unavoidable. Other ways to fix that may be investigated anyway. However, I find it unlikely due to the calls being async, so we may have to live with it (not a big deal anyways).

We could try doing it synchronously instead, unfortunately WebView2 doesn't offer a synchronous ExecuteScript function, however, someone offered a solution that we could try. Yep, we would risk blocking rainmeter for heavy scripts, but I think lua does block rainmeter too when scripts are heavy, so it may not be such a big deal. We would do it synchronously only for ExecuteScript calls by the way.

Here’s another, pretty long conversation about the same topic.

}
return S_OK;
}
Expand All @@ -304,6 +436,7 @@ PLUGIN_EXPORT LPCWSTR GetString(void* data)

return L"0";
}

PLUGIN_EXPORT void ExecuteBang(void* data, LPCWSTR args)
{
Measure* measure = (Measure*)data;
Expand Down
27 changes: 22 additions & 5 deletions WebView2/Plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,41 @@ struct Measure
void* skin;
HWND skinWindow;
LPCWSTR measureName;

std::wstring url;
std::wstring currentUrl;
int width;
int height;
int x;
int y;
double zoomFactor;
bool visible;
bool initialized;
bool clickthrough;

bool isCreationInProgress = false;
bool isFirstLoad = true;
bool allowDualControl;
bool isAllowDualControlInjected = false;

std::wstring onWebViewLoadAction;
std::wstring onWebViewFailAction;
std::wstring onPageFirstLoadAction;
std::wstring onPageLoadStartAction;
std::wstring onPageLoadingAction;
std::wstring onPageLoadFinishAction;
std::wstring onPageReloadAction;

wil::com_ptr<ICoreWebView2Controller> webViewController;
wil::com_ptr<ICoreWebView2> webView;
EventRegistrationToken webMessageToken;

std::wstring buffer; // Buffer for section variable return values
std::wstring callbackResult; // Stores return value from OnInitialize/OnUpdate callbacks
std::map<std::wstring, std::wstring> jsResults; // Cache for CallJS results

Measure();
~Measure();

// Member callback functions for WebView2 creation
HRESULT CreateEnvironmentHandler(HRESULT result, ICoreWebView2Environment* env);
HRESULT CreateControllerHandler(HRESULT result, ICoreWebView2Controller* controller);
Expand All @@ -49,4 +63,7 @@ struct Measure
// WebView2 functions
void CreateWebView2(Measure* measure);
void UpdateClickthrough(Measure* measure);
void InjectAllowDualControl(Measure* measure);
void UpdateAllowDualControl(Measure* measure);


Loading