summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Nascimento Ferreira <lnf07@c3sl.ufpr.br>2008-08-08 10:27:46 -0300
committerLucas Nascimento Ferreira <lnf07@c3sl.ufpr.br>2008-08-08 10:27:46 -0300
commite56597ec12c2e4aa6580fabfe407d0f8ce64d632 (patch)
tree4232494f39ac720d794dfc386ce74570331fc0c1
parent19233b05bb1527d4aecf41b2022086d5a84cadb0 (diff)
Fix xephyr-parent-window to kill the created window
when is necessary
-rwxr-xr-xmdm/src/xephyr-wrapper8
1 files changed, 8 insertions, 0 deletions
diff --git a/mdm/src/xephyr-wrapper b/mdm/src/xephyr-wrapper
index d7e9fd9..3d867a2 100755
--- a/mdm/src/xephyr-wrapper
+++ b/mdm/src/xephyr-wrapper
@@ -20,9 +20,14 @@
MDM_PREFIX=/
MDM_SCRIPTS=${MDM_PREFIX}/usr/sbin
+MDM_INCLUDE=${MDM_SCRIPTS}/mdm-common
+source $MDM_INCLUDE
XEPHYR_PARENT_WINDOW=${MDM_SCRIPTS}/xephyr-parent-window
+kill `cat ${MDM_PIDS}/xephyr-parent-window${DISPLAY}.pid 2> /dev/null`
+rm -f ${MDM_PIDS}/xephyr-parent-window${DISPLAY}.pid 2> /dev/null
+
while (( $# > 0 )); do
case "$1" in
-xauthority)
@@ -35,6 +40,9 @@ while (( $# > 0 )); do
;;
-geometry)
${XEPHYR_PARENT_WINDOW} $2 "xephyr_parent_window${DISPLAY}" &
+ PID=$!
+ echo $PID > ${MDM_PIDS}/xephyr-parent-window${DISPLAY}.pid
+
WINDOW_ID=$(xwininfo -name "xephyr_parent_window${DISPLAY}" | grep "Window id" | cut -d' ' -f4)
XEPHYR_ARGS="$XEPHYR_ARGS -parent $WINDOW_ID"
shift 2