summaryrefslogtreecommitdiff
path: root/src/run-metacity.sh
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2001-08-03 04:20:27 +0000
committerrhp <rhp>2001-08-03 04:20:27 +0000
commit204cf63805a17df71a3b7b22c3a113e641ba52a7 (patch)
tree635374ea0f858d68ac6957c905e98eb1a695b69b /src/run-metacity.sh
parent1f1e706aae057597813c12437a463c54789f8f75 (diff)
downloadmetacity-204cf63805a17df71a3b7b22c3a113e641ba52a7.tar.gz
metacity-204cf63805a17df71a3b7b22c3a113e641ba52a7.tar.bz2
push error trap around configure of withdrawn window, fixes a crash caused
2001-08-03 Havoc Pennington <hp@pobox.com> * src/display.c (event_callback): push error trap around configure of withdrawn window, fixes a crash caused by rapidly creating/destroying a window. * src/window.c (recalc_window_features): don't allow shading undecorated windows. * src/wm-tester/main.c: add a program to torture window managers.
Diffstat (limited to 'src/run-metacity.sh')
-rwxr-xr-xsrc/run-metacity.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/run-metacity.sh b/src/run-metacity.sh
index 0919c94..db1be58 100755
--- a/src/run-metacity.sh
+++ b/src/run-metacity.sh
@@ -18,10 +18,18 @@ if test -z "$SM_CLIENTS"; then
SM_CLIENTS=0
fi
+if test -n "$EVIL_TEST"; then
+ TEST_CLIENT='./wm-tester/wm-tester --evil'
+fi
+
if test -z "$ONLY_WM"; then
Xnest -ac :1 -scrns $SCREENS -geometry 640x480 -bw 15 &
usleep 500000
+ if test -n "$TEST_CLIENT"; then
+ DISPLAY=:1 $TEST_CLIENT &
+ fi
+
if test $CLIENTS != 0; then
for I in `seq 1 $CLIENTS`; do
DISPLAY=:1 xterm -geometry 25x15 &
@@ -40,5 +48,5 @@ if test -z "$ONLY_WM"; then
fi
if test -z "$ONLY_SETUP"; then
- METACITY_DISPLAY=:1 exec unst libtool --mode=execute $DEBUG ./metacity $OPTIONS
+ METACITY_DEBUG_BUTTON_GRABS=1 METACITY_DISPLAY=:1 exec unst libtool --mode=execute $DEBUG ./metacity $OPTIONS
fi