Skip to content

Add proper window state handling #6

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

Open
pbaykalov wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Add proper window state handling #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e23076
add proper window state handling, wip. did not touch the actual toggl…
pbaykalov Sep 21, 2022
e6c2ee8
store current windowId for popup
pbaykalov Sep 24, 2022
ced7b71
button status updated on each focus change
pbaykalov Sep 24, 2022
1ed798b
all "background" code now uses per-window toggle handling. Default st…
pbaykalov Sep 24, 2022
dd764b3
using state maintained by background script
pbaykalov Sep 24, 2022
e1601b6
first window after browser start defaults to "off"
pbaykalov Sep 24, 2022
2e87afb
debugged
pbaykalov Oct 10, 2022
ef0a3e4
fixed entanglement :3
pbaykalov Oct 10, 2022
ee00ebe
runtime state stored outside of settings
pbaykalov Oct 10, 2022
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
7 changes: 7 additions & 0 deletions options/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@ async function saveChanges(prefixId) {
console.log('Save', prefixId, settings);
await browser.storage.local.set(settings);

browser.extension.getBackgroundPage().per_window_toggles.forEach( (toggs,key) => {
toggs[prefixId].enabled = settings.toggles[prefixId - 1].enabled;
if(!settings.toggles[prefixId - 1].enabled){
toggs[prefixId].state = false;
}
});

// Let the toolbar button reflect the changes
browser.extension.getBackgroundPage().updateButtonStatus();

Expand Down
6 changes: 3 additions & 3 deletions popup/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ async function documentLoaded() {
})


const settings = await browser.storage.local.get(['toggles', 'general']);
const toggles = settings.toggles;
const settings = await browser.storage.local.get();
const toggles = browser.extension.getBackgroundPage().per_window_toggles.get((await browser.windows.getLastFocused()).id);
const type = settings.general.allowMultiple ? 'checkbox' : 'radio';

for (let i = 0; i < toggles.length; i++) {
Expand Down Expand Up @@ -44,4 +44,4 @@ function addSelectRow(type, styleId, name) {
document.getElementById('content').appendChild(container);

}
document.addEventListener('DOMContentLoaded', documentLoaded);
document.addEventListener('DOMContentLoaded', documentLoaded);
137 changes: 92 additions & 45 deletions uct-background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,48 @@ this.defaultSettings = {
}
}

this.per_window_toggles=new Map();
this.lastWindowId=undefined;
this.secondToLastWindowId=undefined;

async function windowCreated(window){
console.log(`Created: ${window.id}, last: ${lastWindowId}, secondLast: ${secondToLastWindowId}, current: ${(await browser.windows.getCurrent()).id}`);
let lastId=lastWindowId;
if(lastId===window.id){
lastId=secondToLastWindowId;
}
let pwt;
if(lastId!==undefined){
pwt=structuredClone(per_window_toggles.get(lastId));
} else {
pwt=structuredClone(defaultSettings.toggles);
}
per_window_toggles.set(window.id,pwt);
await updateTitlePrefixes();
}

async function windowDestroyed(windowId){
per_window_toggles.delete(windowId);
}

async function windowFocusChanged(windowId){
if(windowId===browser.windows.WINDOW_ID_NONE) return;

let toggles=per_window_toggles.get(windowId);

if(toggles===undefined){
//if extension was just loaded for example
per_window_toggles.set(windowId,structuredClone(defaultSettings.toggles));
}

secondToLastWindowId=lastWindowId;
lastWindowId=windowId;
await updateButtonStatus();
}


async function main() {
await initializeSettings();
await updateButtonStatus();
await updateTitlePrefixes();

// Always toggle style 1 on button click
Expand All @@ -41,6 +79,11 @@ async function main() {

// Trigger on registered hotkeys
browser.commands.onCommand.addListener(userToggle);

// Proper window state handling
browser.windows.onCreated.addListener(windowCreated);
browser.windows.onRemoved.addListener(windowDestroyed);
browser.windows.onFocusChanged.addListener(windowFocusChanged);
console.log('Init complete');
}

Expand All @@ -52,20 +95,18 @@ async function updateSettings(settings) {
}

settings.general.settingsVersion < defaultSettings.general.settingsVersion
await browser.storage.local.set(settings);
}

return settings;
}

async function updateButtonStatus() {
let settings = await browser.storage.local.get('toggles');

// Use reduce function on array to count all enabled toggles
let togglesEnabled = settings.toggles.reduce((count, toggle) => toggle.enabled ? count + 1 : count, 0);
let togglesEnabled = per_window_toggles.get((await browser.windows.getCurrent()).id)
.reduce((count, toggle) => toggle.enabled ? count + 1 : count, 0);

if (togglesEnabled < 2) {
let toggle = settings.toggles[0];
let toggle = (per_window_toggles.get((await browser.windows.getCurrent()).id))[0];
browser.browserAction.setTitle({
title: `Turn ${toggle.name} ` + (toggle.state ? 'off' : 'on')
});
Expand All @@ -85,24 +126,22 @@ async function updateButtonStatus() {
}

async function getStyleSettings(styleId) {
let settings = await browser.storage.local.get('toggles');
return settings.toggles[styleId - 1].prefix;
return (per_window_toggles.get((await browser.windows.getCurrent()).id))[styleId - 1].prefix;
}

async function initializeSettings() {
let settings = await browser.storage.local.get();
if (settings.toggles) {
console.log('Loading user settings', settings);
settings = await updateSettings(settings);
await updateSettings(settings);
} else {
console.log('Initializing default settings', defaultSettings);

await browser.storage.local.set(defaultSettings);

// Open settings page for the user
browser.runtime.openOptionsPage();
}

await browser.storage.local.set(settings);
}

// Detect current window title prefix to allow toggling
Expand All @@ -117,61 +156,71 @@ async function toggleTitlePrefix(windowId, titlePrefix) {

// Update prefix for specified window
async function updateTitlePrefixes() {
// Only change current window
const windowId = await browser.windows.getCurrent();
const settings = await browser.storage.local.get(['toggles', 'general']);
const toggles = settings.toggles;
let titlePrefix = '';

// Loop through all toggles
for (let i = 0; i < toggles.length; i++) {
if (toggles[i].state) {
titlePrefix += String(toggles[i].prefix);

// When only one toggle may be active at once, stop after the first
if (!settings.general.allowMultiple)
break;
}
}

browser.windows.update(windowId.id, {
titlePreface: titlePrefix
});
let settings = await browser.storage.local.get();
per_window_toggles.forEach((toggles,windowId) => {
console.log(`updating: ${windowId} ${toggles}`);
let titlePrefix = '';

// Loop through all toggles
for (let i = 0; i < toggles.length; i++) {
if (toggles[i].state) {
titlePrefix += String(toggles[i].prefix);

// When only one toggle may be active at once, stop after the first
if (!settings.general.allowMultiple){
break;
}
}
}

browser.windows.update(windowId, {
titlePreface: titlePrefix
});
});
await browser.storage.local.set(settings);
}

// Respond to button clicks and registered hotkeys
async function userToggle(styleId, newState) {
// Extract style number from end of string
styleId = String(styleId).match(/[0-9]+$/);

let settings = await browser.storage.local.get(['toggles', 'general']);
let windowId = (await browser.windows.getCurrent()).id;
let settings = await browser.storage.local.get();
let hrState = 'off';
let toggle = { name: 'all styles' }

if (styleId && !settings.toggles[styleId[0] - 1].enabled) {
console.log('Style is disabled', settings.toggles[styleId[0] - 1]);
if (
styleId
&& !(
per_window_toggles.get(
windowId
)
)[styleId[0] - 1].enabled
) {
console.log('Style is disabled', (per_window_toggles.get(windowId))[styleId[0] - 1]);
return
}

// When only one option allowed or no valid style is selected, reset all others
// Also do this when no valid style has been found
if (!settings.general.allowMultiple || !styleId) {
for (let i = 0; i < settings.toggles.length; i++) {
if (!styleId || styleId[0] - 1 != i)
settings.toggles[i].state = false;
for (let i = 0; i < (per_window_toggles.get(windowId)).length; i++) {
if (!styleId || styleId[0] - 1 != i){
(per_window_toggles.get(windowId))[i].state = false;
}
}
}

// When valid style has been selected
if (styleId) {
styleId = styleId[0];
// Invert toggle state or set requested state and save in settings
toggle = settings.toggles[styleId - 1];
toggle = (per_window_toggles.get(windowId))[styleId - 1];

if (typeof(newState) == 'undefined')
newState = !toggle.state;

settings.toggles[styleId - 1].state = newState;
(per_window_toggles.get(windowId))[styleId - 1].state = newState;

if (newState)
hrState = 'on';
Expand All @@ -187,12 +236,10 @@ async function userToggle(styleId, newState) {
});
}

await browser.storage.local.set(settings);

// Update title to reflect new truth
updateTitlePrefixes();
updateButtonStatus();
await updateTitlePrefixes();
await updateButtonStatus();
}


main();
main();