root/ubuntu-based-kiosk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #70 from outis1one/claude/fix-kiosk-issues-qlxTc

Browse Source 
Claude/fix kiosk issues qlx tc
This commit is contained in:
outis1one
2025-12-27 20:45:50 -05:00
committed by GitHub
parent 4332ad1b26 7ed5faa2dc
commit b926d00cf4
1 changed files with 79 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install_kiosk_v0.9.9.1.sh
+79 -156
View File
@@ -5473,6 +5473,9 @@ function createWindow(){
} }
})(); })();
`).catch(()=>{}); `).catch(()=>{});
}else if(key==='Control'||key==='Alt'){
// Ignore modifier keys - they don't work as standalone keys
return;
}else{ }else{
view.webContents.executeJavaScript(` view.webContents.executeJavaScript(`
(function(){ (function(){
@@ -7192,87 +7195,36 @@ sudo apt install -y evtest 2>/dev/null || true
# Get kiosk UID # Get kiosk UID
local kiosk_uid=$(id -u "$KIOSK_USER") local kiosk_uid=$(id -u "$KIOSK_USER")
# Create enhanced trigger script with multiple methods # Create simple, reliable power button trigger script (runs as root from ACPI)
sudo -u "$KIOSK_USER" tee "$KIOSK_HOME/trigger-power-menu.sh" > /dev/null <<PWREOF sudo tee /usr/local/bin/kiosk-power-button.sh > /dev/null <<'PWREOF'
#!/bin/bash #!/bin/bash
export DISPLAY=:0 # Power button handler - sends SIGUSR1 to Electron to show power menu
export XAUTHORITY=/home/kiosk/.Xauthority # This runs as ROOT from acpid, so it can signal any process
export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$kiosk_uid/bus
logger "KIOSK: Power button pressed - triggering menu" logger "KIOSK POWER: Button pressed"
# Give display time to be ready # Find the Electron main process (runs as kiosk user)
sleep 0.3 PIDS=$(pgrep -u kiosk -f "electron" 2>/dev/null)
# Find the Electron main process (the one running main.js) if [ -z "$PIDS" ]; then
ELECTRON_PID=\$(pgrep -f "electron.*main\.js" 2>/dev/null | head -1) logger "KIOSK POWER: No Electron process found"
if [ -z "\$ELECTRON_PID" ]; then exit 1
ELECTRON_PID=\$(pgrep -f "/kiosk/node_modules/.bin/electron" 2>/dev/null | head -1)
fi
if [ -z "\$ELECTRON_PID" ]; then
ELECTRON_PID=\$(pgrep -u kiosk -f "electron" 2>/dev/null | head -1)
fi fi
logger "KIOSK: Found Electron PID: \$ELECTRON_PID" # Send SIGUSR1 to all Electron processes (the main one will handle it)
for PID in $PIDS; do
# Method 1: Send SIGUSR1 directly to Electron main process (most reliable) logger "KIOSK POWER: Sending SIGUSR1 to PID $PID"
if [ -n "\$ELECTRON_PID" ]; then kill -USR1 $PID 2>/dev/null
logger "KIOSK: Sending SIGUSR1 to Electron PID \$ELECTRON_PID"
kill -USR1 \$ELECTRON_PID 2>/dev/null
if [ \$? -eq 0 ]; then
logger "KIOSK: Power menu triggered via SIGUSR1"
exit 0
fi
fi
# Method 2: Find window by multiple search patterns
for pattern in "electron" "Electron" "kiosk"; do
WINDOW=\$(xdotool search --class "\$pattern" 2>/dev/null | head -1)
if [ -n "\$WINDOW" ]; then
logger "KIOSK: Found window \$WINDOW via pattern '\$pattern'"
xdotool windowactivate --sync \$WINDOW 2>/dev/null
sleep 0.2
xdotool key --window \$WINDOW --clearmodifiers ctrl+alt+Delete 2>/dev/null
if [ \$? -eq 0 ]; then
logger "KIOSK: Power menu triggered via xdotool (pattern: \$pattern)"
exit 0
fi
fi
done done
# Method 3: Find window by PID logger "KIOSK POWER: Signal sent"
if [ -n "\$ELECTRON_PID" ]; then
WINDOW_BY_PID=\$(xdotool search --pid \$ELECTRON_PID 2>/dev/null | head -1)
if [ -n "\$WINDOW_BY_PID" ]; then
logger "KIOSK: Found window by PID: \$WINDOW_BY_PID"
xdotool windowactivate --sync \$WINDOW_BY_PID 2>/dev/null
sleep 0.2
xdotool key --window \$WINDOW_BY_PID --clearmodifiers ctrl+alt+Delete 2>/dev/null
if [ \$? -eq 0 ]; then
logger "KIOSK: Power menu triggered via PID window"
exit 0
fi
fi
fi
# Method 4: Direct key injection to focused window
logger "KIOSK: Trying direct key injection"
xdotool key --clearmodifiers ctrl+alt+Delete 2>/dev/null
if [ \$? -eq 0 ]; then
logger "KIOSK: Power menu triggered via direct injection"
exit 0
fi
# Method 5: Use ydotool if available (for Wayland compatibility)
if command -v ydotool &>/dev/null; then
logger "KIOSK: Trying ydotool"
ydotool key 29:1 56:1 111:1 111:0 56:0 29:0 2>/dev/null # Ctrl+Alt+Del
fi
logger "KIOSK: All power button trigger methods completed"
PWREOF PWREOF
sudo chmod +x "$KIOSK_HOME/trigger-power-menu.sh" sudo chmod +x /usr/local/bin/kiosk-power-button.sh
# Also create the old location for backwards compatibility
sudo cp /usr/local/bin/kiosk-power-button.sh "$KIOSK_HOME/trigger-power-menu.sh"
sudo chown "$KIOSK_USER:$KIOSK_USER" "$KIOSK_HOME/trigger-power-menu.sh"
# Create test script for debugging # Create test script for debugging
sudo tee /usr/local/bin/test-power-button > /dev/null <<'TESTEOF' sudo tee /usr/local/bin/test-power-button > /dev/null <<'TESTEOF'
@@ -7285,40 +7237,48 @@ if systemctl is-active --quiet acpid; then
echo " ✓ acpid is running" echo " ✓ acpid is running"
else else
echo " ✗ acpid is NOT running" echo " ✗ acpid is NOT running"
echo " Fix: sudo systemctl start acpid" echo " Fix: sudo systemctl enable --now acpid"
fi fi
echo echo
echo "2. Checking acpi events..." echo "2. Checking ACPI event handler..."
if [ -d /etc/acpi/events ]; then if [ -f /etc/acpi/events/kiosk-power-button ]; then
echo " Event files found:" echo " ✓ Event handler exists"
ls -la /etc/acpi/events/kiosk-* 2>/dev/null || echo " ✗ No kiosk event files" cat /etc/acpi/events/kiosk-power-button
else else
echo " ✗ /etc/acpi/events not found" echo " ✗ Event handler not found"
fi fi
echo echo
echo "3. Testing Electron window detection..." echo "3. Checking power button script..."
ELECTRON_WINDOW=$(DISPLAY=:0 xdotool search --class "electron" 2>/dev/null | head -1) if [ -x /usr/local/bin/kiosk-power-button.sh ]; then
if [ -n "$ELECTRON_WINDOW" ]; then echo " ✓ Script exists and is executable"
echo " ✓ Found Electron window: $ELECTRON_WINDOW"
else else
echo " ✗ Electron window not found" echo " ✗ Script not found or not executable"
echo " Is the kiosk running?"
fi fi
echo echo
echo "4. Manual trigger test (run as kiosk user)..." echo "4. Checking Electron process..."
echo " sudo -u kiosk /home/kiosk/trigger-power-menu.sh" PIDS=$(pgrep -u kiosk -f "electron" 2>/dev/null)
if [ -n "$PIDS" ]; then
echo " ✓ Found Electron PIDs: $PIDS"
else
echo " ✗ No Electron process found"
fi
echo echo
echo "5. Watch acpi events (press Ctrl+C to stop)..." echo "5. Testing power button trigger NOW..."
echo " sudo acpi_listen" if [ -x /usr/local/bin/kiosk-power-button.sh ]; then
echo " Running: /usr/local/bin/kiosk-power-button.sh"
/usr/local/bin/kiosk-power-button.sh
echo " Check if power menu appeared!"
else
echo " Script not found"
fi
echo echo
echo "6. Test hardware button (install evtest first: sudo apt install evtest)..." echo "6. To watch ACPI events: sudo acpi_listen"
echo " sudo evtest" echo " Then press power button and look for 'button/power' events"
echo " Then press power button and look for button/power events"
TESTEOF TESTEOF
sudo chmod +x /usr/local/bin/test-power-button sudo chmod +x /usr/local/bin/test-power-button
@@ -7326,29 +7286,22 @@ sudo chmod +x /usr/local/bin/test-power-button
# Remove old configs # Remove old configs
sudo rm -f /etc/acpi/events/powerbtn* /etc/acpi/events/power* 2>/dev/null sudo rm -f /etc/acpi/events/powerbtn* /etc/acpi/events/power* 2>/dev/null
# Create MULTIPLE event handlers for different power button formats # Create ACPI event handler for power button
# Format 1: Standard power button # The script runs as root (from acpid) and sends SIGUSR1 to Electron
sudo tee /etc/acpi/events/kiosk-power-button > /dev/null <<EOF sudo tee /etc/acpi/events/kiosk-power-button > /dev/null <<'EOF'
event=button/power.* event=button/power.*
action=sudo -u $KIOSK_USER $KIOSK_HOME/trigger-power-menu.sh action=/usr/local/bin/kiosk-power-button.sh
EOF EOF
# Format 2: PBTN variant # Also catch specific variants
sudo tee /etc/acpi/events/kiosk-power-pbtn > /dev/null <<EOF sudo tee /etc/acpi/events/kiosk-power-pbtn > /dev/null <<'EOF'
event=button/power PBTN event=button/power PBTN
action=sudo -u $KIOSK_USER $KIOSK_HOME/trigger-power-menu.sh action=/usr/local/bin/kiosk-power-button.sh
EOF EOF
# Format 3: PWR variant sudo tee /etc/acpi/events/kiosk-power-pwr > /dev/null <<'EOF'
sudo tee /etc/acpi/events/kiosk-power-pwr > /dev/null <<EOF event=button/power PWRF
event=button/power PWR action=/usr/local/bin/kiosk-power-button.sh
action=sudo -u $KIOSK_USER $KIOSK_HOME/trigger-power-menu.sh
EOF
# Format 4: Catch-all
sudo tee /etc/acpi/events/kiosk-power-any > /dev/null <<EOF
event=button/power
action=sudo -u $KIOSK_USER $KIOSK_HOME/trigger-power-menu.sh
EOF EOF
# Configure systemd to ignore power button (let acpid handle it) # Configure systemd to ignore power button (let acpid handle it)
@@ -10625,60 +10578,30 @@ upgrade_kiosk() {
rm -f "$config_backup" rm -f "$config_backup"
fi fi
# Regenerate power button trigger script with latest fixes # Install simplified power button handler
echo " Updating power button handler..." echo " Updating power button handler..."
local kiosk_uid sudo tee /usr/local/bin/kiosk-power-button.sh > /dev/null <<'PWREOF'
kiosk_uid=$(id -u "$KIOSK_USER")
sudo -u "$KIOSK_USER" tee "$KIOSK_HOME/trigger-power-menu.sh" > /dev/null <<PWREOF
#!/bin/bash #!/bin/bash
export DISPLAY=:0 # Power button handler - sends SIGUSR1 to Electron to show power menu
export XAUTHORITY=/home/kiosk/.Xauthority logger "KIOSK POWER: Button pressed"
export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$kiosk_uid/bus PIDS=$(pgrep -u kiosk -f "electron" 2>/dev/null)
if [ -z "$PIDS" ]; then
logger "KIOSK: Power button pressed - triggering menu" logger "KIOSK POWER: No Electron process found"
sleep 0.3 exit 1
# Find the Electron main process
ELECTRON_PID=\$(pgrep -f "electron.*main\.js" 2>/dev/null | head -1)
if [ -z "\$ELECTRON_PID" ]; then
ELECTRON_PID=\$(pgrep -f "/kiosk/node_modules/.bin/electron" 2>/dev/null | head -1)
fi fi
if [ -z "\$ELECTRON_PID" ]; then for PID in $PIDS; do
ELECTRON_PID=\$(pgrep -u kiosk -f "electron" 2>/dev/null | head -1) logger "KIOSK POWER: Sending SIGUSR1 to PID $PID"
fi kill -USR1 $PID 2>/dev/null
logger "KIOSK: Found Electron PID: \$ELECTRON_PID"
# Method 1: Send SIGUSR1 directly to Electron main process (most reliable)
if [ -n "\$ELECTRON_PID" ]; then
logger "KIOSK: Sending SIGUSR1 to Electron PID \$ELECTRON_PID"
kill -USR1 \$ELECTRON_PID 2>/dev/null
if [ \$? -eq 0 ]; then
logger "KIOSK: Power menu triggered via SIGUSR1"
exit 0
fi
fi
# Method 2: Find window by multiple search patterns
for pattern in "electron" "Electron" "kiosk"; do
WINDOW=\$(xdotool search --class "\$pattern" 2>/dev/null | head -1)
if [ -n "\$WINDOW" ]; then
logger "KIOSK: Found window \$WINDOW via pattern '\$pattern'"
xdotool windowactivate --sync \$WINDOW 2>/dev/null
sleep 0.2
xdotool key --window \$WINDOW --clearmodifiers ctrl+alt+Delete 2>/dev/null
if [ \$? -eq 0 ]; then
logger "KIOSK: Power menu triggered via xdotool"
exit 0
fi
fi
done done
logger "KIOSK POWER: Signal sent"
# Method 3: Direct key injection
xdotool key --clearmodifiers ctrl+alt+Delete 2>/dev/null
logger "KIOSK: All power button trigger methods completed"
PWREOF PWREOF
sudo chmod +x "$KIOSK_HOME/trigger-power-menu.sh" sudo chmod +x /usr/local/bin/kiosk-power-button.sh
# Update ACPI event handler
sudo tee /etc/acpi/events/kiosk-power-button > /dev/null <<'EOF'
event=button/power.*
action=/usr/local/bin/kiosk-power-button.sh
EOF
sudo systemctl restart acpid 2>/dev/null || true sudo systemctl restart acpid 2>/dev/null || true
echo "[6/6] Starting kiosk..." echo "[6/6] Starting kiosk..."