diff options
| author | Havoc Pennington <hp@pobox.com> | 2002-01-07 03:26:09 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-01-07 03:26:09 +0000 |
| commit | f36ba88085160867791f73704fb023a165d29752 (patch) | |
| tree | 4f4f5889c4430f7330c08c4c37858aaf0d8e27a9 /src/run-metacity.sh | |
| parent | ac85e1e225a4f12e7069ca60562a92cef3d37dc6 (diff) | |
| download | metacity-f36ba88085160867791f73704fb023a165d29752.tar.gz | |
put in attempted fix for the GTK 1.2 plug/socket screwup, now that my
2002-01-06 Havoc Pennington <hp@pobox.com>
* src/window.c (meta_window_notify_focus): put in attempted fix
for the GTK 1.2 plug/socket screwup, now that my fixed debug spew
reveals what's actually happening. ;-)
* src/gradient.c (meta_gradient_description_new): object
to store gradient descriptions
* src/window.c (meta_window_notify_focus): fix the debug spew
that was confusing me
* src/wm-tester/focus-window.c: add little program to focus
a window ID
Diffstat (limited to 'src/run-metacity.sh')
| -rwxr-xr-x | src/run-metacity.sh | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/run-metacity.sh b/src/run-metacity.sh index 30d72808..e1485cea 100755 --- a/src/run-metacity.sh +++ b/src/run-metacity.sh @@ -1,5 +1,13 @@ #! /bin/bash +if test -z "$XNEST_DISPLAY"; then + XNEST_DISPLAY=:1 +fi + +if test -z "$CLIENT_DISPLAY"; then + CLIENT_DISPLAY=:1 +fi + if test -z "$SCREENS"; then SCREENS=1 fi @@ -27,33 +35,41 @@ if test -n "$ICON_TEST"; then fi if test -z "$ONLY_WM"; then - Xnest -ac :1 -scrns $SCREENS -geometry 640x480 -bw 15 & + echo "Launching Xnest" + Xnest -ac $XNEST_DISPLAY -scrns $SCREENS -geometry 640x480 -bw 15 & ## usleep 800000 sleep 1 + if test -n "$XMON_DIR"; then + echo "Launching xmond" + $XMON_DIR/xmonui | $XMON_DIR/xmond -server $XNEST_DISPLAY & + sleep 1 + fi + + echo "Launching clients" if test -n "$TEST_CLIENT"; then - DISPLAY=:1 $TEST_CLIENT & + DISPLAY=$CLIENT_DISPLAY $TEST_CLIENT & fi if test $CLIENTS != 0; then for I in `seq 1 $CLIENTS`; do echo "Launching xterm $I" - DISPLAY=:1 xterm -geometry 25x15 & + DISPLAY=$CLIENT_DISPLAY xterm -geometry 25x15 & done fi if test $SM_CLIENTS != 0; then for I in `seq 1 $SM_CLIENTS`; do echo "Launching gnome-terminal $I" - DISPLAY=:1 gnome-terminal --geometry 25x15 & + DISPLAY=$CLIENT_DISPLAY gnome-terminal --geometry 25x15 & done fi usleep 50000 - DISPLAY=:1 xsetroot -solid royalblue3 + DISPLAY=$CLIENT_DISPLAY xsetroot -solid royalblue3 fi if test -z "$ONLY_SETUP"; then - METACITY_DEBUG_BUTTON_GRABS=1 METACITY_DISPLAY=:1 exec libtool --mode=execute $DEBUG ./metacity $OPTIONS + METACITY_DEBUG_BUTTON_GRABS=1 METACITY_DISPLAY=$CLIENT_DISPLAY exec libtool --mode=execute $DEBUG ./metacity $OPTIONS fi |