=== removed file 'xpra-skel/homedir/bin/hsl-to-rgb' --- old/xpra-skel/homedir/bin/hsl-to-rgb 2024-07-31 15:04:42 +0000 +++ new/xpra-skel/homedir/bin/hsl-to-rgb 1970-01-01 00:00:00 +0000 @@ -1,112 +0,0 @@ -#!/bin/zsh -setopt no_unset warn_create_global -hsl_to_rgb() { - local Hue=$1 Saturation=$2 Luminance=$3 - local R G B - local temp1 temp2 - local tempR tempG tempB - - if (( Hue < 0 || Hue > 1)); then - printf >&2 '%s\n' "$0: error: Hue out of range: ${(qqq)Hue}" - return 2 - fi - - if (( Saturation < 0 || Saturation > 1)); then - printf >&2 '%s\n' "$0: error: Saturation out of range: ${(qqq)Saturation}" - return 2 - fi - - if (( Luminance < 0 || Luminance > 1)); then - printf >&2 '%s\n' "$0: error: Luminance out of range: ${(qqq)Luminance}" - return 2 - fi - - if ((Saturation == 0)) ; then - R=$Luminance - G=$Luminance - B=$Luminance - printf '#%02x%02x%02x\n' $(( R * 255 )) $(( G * 255 )) $(( B * 255 )) - return 0 - fi - - if ((Luminance < 0.5)) ; then - temp1=$(( Luminance * (1 + Saturation) )) - else - temp1=$(( Luminance + Saturation - Luminance * Saturation )) - fi - - temp2=$(( 2 * Luminance - temp1 )) - - #Hue=$(( Hue / 360 )) - - tempR=$(( Hue + 0.333 )) - tempG=$(( Hue )) - tempB=$(( Hue - 0.333 )) - - if ((tempR < 0)); then - tempR=$(( tempR + 1 )) - fi - if ((tempR > 1)); then - tempR=$(( tempR - 1 )) - fi - if ((tempG < 0)); then - tempG=$(( tempG + 1 )) - fi - if ((tempG > 1)); then - tempG=$(( tempG - 1 )) - fi - if ((tempB < 0)); then - tempB=$(( tempB + 1 )) - fi - if ((tempB > 1)); then - tempB=$(( tempB - 1 )) - fi - - if ((6 * tempR < 1)); then - R=$(( temp2 + (temp1 - temp2) * 6 * tempR )) - else - if ((2 * tempR < 1)); then - R=$(( temp1 )) - else - if ((3 * tempR < 2)); then - R=$(( temp2 + (temp1 - temp2) * (0.666 - tempR) * 6 )) - else - R=$(( temp2 )) - fi - fi - fi - - if ((6 * tempG < 1)); then - G=$(( temp2 + (temp1 - temp2) * 6 * tempG )) - else - if ((2 * tempG < 1)); then - G=$(( temp1 )) - else - if ((3 * tempG < 2)); then - G=$(( temp2 + (temp1 - temp2) * (0.666 - tempG) * 6 )) - else - G=$(( temp2 )) - fi - fi - fi - - - if ((6 * tempB < 1)); then - B=$(( temp2 + (temp1 - temp2) * 6 * tempB )) - else - if ((2 * tempB < 1)); then - B=$(( temp1 )) - else - if ((3 * tempB < 2)); then - B=$(( temp2 + (temp1 - temp2) * (0.666 - tempB) * 6 )) - else - B=$(( temp2 )) - fi - fi - fi - - printf '#%02x%02x%02x\n' $(( R * 255 )) $(( G * 255 )) $(( B * 255 )) -} -#typeset -f -t hsl_to_rgb - -hsl_to_rgb "$@" === removed file 'xpra-skel/homedir/bin/in-xpra' --- old/xpra-skel/homedir/bin/in-xpra 2024-07-31 15:04:42 +0000 +++ new/xpra-skel/homedir/bin/in-xpra 1970-01-01 00:00:00 +0000 @@ -1,15 +0,0 @@ -#!/bin/zsh -setopt no_unset -set -x -disp=${1#:} -shift - -if [[ ! -S /tmp/.X11-unix/X$disp ]]; then - printf '%s\n' >&2 "${0:h}: fatal: incorrect display ${(qqq)disp}, X11 socket not found" - exit 111 -fi - -export DISPLAY=:$disp -export XAUTHORITY=/run/Xauthority.${disp} - -exec "$@" === removed file 'xpra-skel/homedir/bin/in-xpra-all' --- old/xpra-skel/homedir/bin/in-xpra-all 2024-07-31 15:04:42 +0000 +++ new/xpra-skel/homedir/bin/in-xpra-all 1970-01-01 00:00:00 +0000 @@ -1,9 +0,0 @@ -#!/bin/sh -set -x -for sock in /tmp/.X11-unix/X*; do - if test -e "/run/Xauthority.${sock##*/X}"; then - env XAUTHORITY="/run/Xauthority.${sock##*/X}" DISPLAY=":${sock##*/X}" "$@" - else - DISPLAY=":${sock##*/X}" "$@" - fi -done === removed file 'xpra-skel/homedir/bin/in-xpra-container' --- old/xpra-skel/homedir/bin/in-xpra-container 2024-07-31 15:04:42 +0000 +++ new/xpra-skel/homedir/bin/in-xpra-container 1970-01-01 00:00:00 +0000 @@ -1,27 +0,0 @@ -#!/bin/zsh -# vim: sts=2 sw=2 et -setopt no_unset warn_create_global - -typeset -g map=/run/display-container-map - -find_server_display() { - local container=$1 - local -a found - found=( $map/*=$container(N) ) - if ! (($#found)); then - return 1 - else - typeset -g display - display=${${found[1]:t}%%=*} - fi -} - -main() { - local container=$1 - shift - find_server_display $container || exit $? - exec in-xpra $display "$@" -} -typeset -f -t main - -main "$@" === modified file 'xpra-skel/homedir/bin/start-xpra-for-container' --- old/xpra-skel/homedir/bin/start-xpra-for-container 2024-07-31 15:04:42 +0000 +++ new/xpra-skel/homedir/bin/start-xpra-for-container 2024-07-27 01:48:41 +0000 @@ -55,7 +55,7 @@ } ensure_services() { - typeset -ga new_services client_services + typeset -ga new_services typeset -g sv_name_xorg=xpra-xorg.$display typeset -g sv_name_server=xpra-server.$display typeset -g sv_name_client=xpra-client.$display.for.$client_display @@ -237,20 +237,6 @@ - sv_end } -write_sv_xclipring() { - local selection=$1 - local name=xpra-xclipring-$selection.$display - - sv_start $name - - sv_el_script run \ - "if { mkdir -p /run/xpra/$selection-$display }" \ - "in-xpra $display /usr/local/bin/xclipring" \ - "-s ${selection:u}" \ - "-c 32" \ - "-d /run/xpra/$selection-$display" - - sv_end - client_services+=( $name ) -} - write_sv_client() { - sv_start $sv_name_client - sv_el_script run \ @@ -260,15 +246,12 @@ - sv_common_finish - sv_env DISPLAY $DISPLAY - sv_end - client_services+=( $sv_name_client ) } write_sv_definitions() { - write_sv_xorg - write_sv_server - write_sv_client - - write_sv_xclipring primary - - write_sv_xclipring clipboard } @@ -279,10 +262,7 @@ start_services() { - s6-svc -wU -T 5000 -o $scandir/$sv_name_server - local s - for s in $client_services; do - - s6-svc -o $scandir/$s - done + - s6-svc -o $scandir/$sv_name_client } print_cookie() {