From d1dba700b646c8a03d3db5071e5aaf99e3590b58 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Wed, 5 Feb 2014 11:10:36 +0100 Subject: [PATCH] getXenv.inc: Do not work on current console --- X/getXenv.inc | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/X/getXenv.inc b/X/getXenv.inc index 4b1c7e3..c079af9 100644 --- a/X/getXenv.inc +++ b/X/getXenv.inc @@ -1,4 +1,5 @@ -# Extracted from /etc/acpi/powerbtn.sh +# Extracted from /etc/acpi/powerbtn.sh and modified +# shuber@sthu.org # Taken from Debian's 2.0.4-1 diff file. This version handles KDE4. @@ -14,20 +15,20 @@ # XUSER - the name of the user # XAUTHORITY - full pathname of the user's .Xauthority file getXuser() { - user=`pinky -fw | awk '{ if ($2 == ":'$displaynum'" || $(NF) == ":'$displaynum'" ) { print $1; exit; } }'` - if [ x"$user" = x"" ]; then - startx=`pgrep -n startx` - if [ x"$startx" != x"" ]; then - user=`ps -o user --no-headers $startx` - fi - fi - if [ x"$user" != x"" ]; then - userhome=`getent passwd $user | cut -d: -f6` - export XAUTHORITY=$userhome/.Xauthority - else - export XAUTHORITY="" - fi - export XUSER=$user + user=`pinky -fw | awk '{ if ($2 == ":'$displaynum'" || $(NF) == ":'$displaynum'" ) { print $1; exit; } }'` + if [ x"$user" = x"" ]; then + startx=`pgrep -n startx` + if [ x"$startx" != x"" ]; then + user=`ps -o user --no-headers $startx` + fi + fi + if [ x"$user" != x"" ]; then + userhome=`getent passwd $user | cut -d: -f6` + export XAUTHORITY=$userhome/.Xauthority + else + export XAUTHORITY="" + fi + export XUSER=$user } # Gets the X display number for the active virtual terminal. @@ -35,10 +36,12 @@ getXuser() { # DISPLAY - the X display number # See getXuser()'s output. getXconsole() { - console=`fgconsole`; - displaynum=`ps t tty$console | sed -n -re 's,.*/X .*:([0-9]+).*,\1,p'` - if [ x"$displaynum" != x"" ]; then - export DISPLAY=":$displaynum" - getXuser - fi + pid=$(pgrep -x X | head -n 1) + if [ x"$pid" != x"" ]; then + displaynum=`ps -p "$pid" -o args | sed -n -re 's,.*/X .*:([0-9]+).*,\1,p'` + if [ x"$displaynum" != x"" ]; then + export DISPLAY=":$displaynum" + getXuser + fi + fi } -- 2.39.5