Remove Wayland restriction, work around Chromium text-indent bug (#112)

* Now works with Bookworm/Wayland autostart and kiosk mode.
* Work-around for a Chromium browser bug that broke scrolling of the weather alert marquee.

Author: kshetline

.idea/aw-clock.iml

@@ -1,3 +1,8 @@
+## 3.6.0
+
+* Now works with Bookworm/Wayland autostart.
+* Work-around for a Chromium browser bug that broke scrolling of the weather alert marquee.
+
 ## 3.5.4
 
 * Fix Bookworm installation issues.

.idea/inspectionProfiles/Project_Default.xml

@@ -32,9 +32,7 @@ When viewing the sky map feature you can choose to see a multicolor sky, shaded
 
 The following instructions are primarily aimed at turning a Raspberry Pi into a *dedicated* Astronomy/Weather Clock, meaning serving as a clock will be the Raspberry Pi’s primary, if not sole, function. The Pi will boot up directly into full-screen kiosk mode running the Astronomy/Weather Clock software.
 
-> Note: If you're running Raspbian "Bookworm" or later, ensure that you are using the X11 desktop option (set via raspi-config). Wayfire and Wayland are not yet supported.
-
-> Also note: Temperature/humidity sensors are not yet supported with the Raspberry Pi 5 due to a major change in the way the 5 handles GPIO.
+> Note: Temperature/humidity sensors are not yet supported with the Raspberry Pi 5 due to a major change in the way the 5 handles GPIO.
 
 The first step, if you want GPS support, is to install a GPS device according to the manufacturer’s instructions. This device must provide a PPS (Pulse Per Second) signal for precise time keeping (something USB dongles do not provide), and must be configured to work with `ntpd`. I recommend the [Adafruit Ultimate GPS HAT](https://www.adafruit.com/product/2324), not only because it works well, but because it’s the only GPS hardware I’ve tested. I’ve also provided [notes on the Adafruit GPS HAT installation](#adafruit-gps-hat-installation-notes) at the end of this document.
 

CHANGELOG.md

@@ -10,6 +10,7 @@ import * as path from 'path';
 import { convertPinToGpio } from './server/src/rpi-pin-conversions';
 import { ErrorMode, getSudoUser, getUserHome, monitorProcess, monitorProcessLines, sleep, spawn } from './server/src/process-util';
 import { promisify } from 'util';
+import { existsSync } from 'fs';
 
 const enoughRam = os.totalmem() / 0x40000000 > 1.5;
 
@@ -107,6 +108,7 @@ const fontDst = '/usr/local/share/fonts/';
 let chromium = 'chromium';
 let autostartDst = '.config/lxsession/LXDE';
 const lxdePiCheck = '.config/lxpanel/LXDE-pi';
+const wayfireIni = '.config/wayfire.ini';
 let nodePath = process.env.PATH;
 
 if (process.platform === 'linux') {
@@ -994,6 +996,7 @@ async function doServerBuild(): Promise<void> {
 
 async function doServiceDeployment(): Promise<void> {
   let autostartDir = path.join(userHome, autostartDst);
+  const wayfireIniPath = path.join(userHome, wayfireIni);
   let morePi_ish = false;
 
   if (!autostartDir.endsWith('-pi')) {
@@ -1011,7 +1014,8 @@ async function doServiceDeployment(): Promise<void> {
   await monitorProcess(spawn('chmod', ['+x', serviceDstFull], { shell: true }), spin, ErrorMode.ANY_ERROR);
 
   const settingsText =
-    `# If you edit AWC_PORT below, be sure to update\n# ${userHome}/${autostartDst}/autostart accordingly.\n` +
+    `# If you edit AWC_PORT below, be sure to update\n#   ${userHome}/${autostartDst}/autostart` +
+    (existsSync(wayfireIniPath) ? ` and\n#   ${wayfireIniPath}` : '') + ' accordingly.\n' +
     Object.keys(settings).sort().map(key => key + '=' + settings[key]).join('\n') + '\n';
 
   fs.writeFileSync(settingsPath, settingsText);
@@ -1022,7 +1026,7 @@ async function doServiceDeployment(): Promise<void> {
     spin, ErrorMode.ANY_ERROR);
 
   if (doKiosk)
-    launchChromium = launchChromium.replace(/\s+/, ' --kiosk --autoplay-policy=no-user-gesture-required ');
+    launchChromium = launchChromium.replace(/\s+/, ' --start-fullscreen --start-maximized --autoplay-policy=no-user-gesture-required ');
 
   const autostartPath = autostartDir + '/autostart';
   const autostartLine1 = autostartDir + '/autostart_extra.sh';
@@ -1070,6 +1074,35 @@ async function doServiceDeployment(): Promise<void> {
   if (update)
     fs.writeFileSync(autostartPath, lines.join('\n') + '\n');
 
+  // Extra autostart setup for Wayfire
+  if (existsSync(wayfireIniPath)) {
+    try {
+      lines = asLines(fs.readFileSync(wayfireIniPath).toString()).filter(line => !!line.trimEnd());
+
+      let autoIndex = lines.findIndex(l => l.startsWith('[autostart]'));
+
+      if (autoIndex < 0) {
+        lines.push('');
+        lines.push('[autostart]');
+        autoIndex = lines.length;
+      }
+      else
+        while (lines[++autoIndex] && !/^clock[12] = /.test(lines[autoIndex])) {}
+
+      // Prevent duplicate entries
+      lines = lines.filter((l, i) => i < autoIndex || !/^clock[12] = /.test(l));
+
+      lines.splice(autoIndex, 0,
+        'clock1 = ' + autostartLine1,
+        'clock2 = ' + autostartLine2.substring(1));
+      fs.writeFileSync(wayfireIniPath, lines.join('\n') + '\n');
+    }
+    catch (e) {
+      console.error(chalk.redBright('Error: failed to update .config/wayfire.ini to autostart AW-Clock'));
+      console.error(chalk.redBright('   ' + e.message));
+    }
+  }
+
   await monitorProcess(spawn('chown', 0, [sudoUser, autostartDir + '/autostart*'],
     { shell: true }), spin, ErrorMode.ANY_ERROR);
   await monitorProcess(spawn('chmod', uid, ['+x', autostartDir + '/autostart*'],

README.md

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "3.5.4",
+  "version": "3.6.0",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {

build.js

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-sass",
-  "version": "3.5.4",
+  "version": "3.6.0",
   "description": "SASS builder for aw-clock",
   "keywords": [
     "sass"