diff options
| author | Havoc Pennington <hp@pobox.com> | 2002-11-06 16:00:56 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-11-06 16:00:56 +0000 |
| commit | c613fed9ef688d742bfc85fb569b8174938acce0 (patch) | |
| tree | c91ee67478a1001007def6631a01cf63303f206a /src/run-metacity.sh | |
| parent | 6c18374142f9b45ede0fdecef660f503e854ccb0 (diff) | |
| download | metacity-c613fed9ef688d742bfc85fb569b8174938acce0.tar.gz | |
push an error trap around the whole window-key-grab loop
2002-11-06 Havoc Pennington <hp@pobox.com>
* src/keybindings.c (grab_keys): push an error trap around the
whole window-key-grab loop
(ungrab_all_keys): avoid requiring return value from the error
trap, unless in debugging mode
(regrab_window_bindings, regrab_screen_bindings): push traps
around the loops, for efficiency
* src/display.c (event_callback): fix from Padraig O'Briain to
compress extra MappingNotify events to avoid extra work.
Diffstat (limited to 'src/run-metacity.sh')
| -rwxr-xr-x | src/run-metacity.sh | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/run-metacity.sh b/src/run-metacity.sh index e46dae14..a131033a 100755 --- a/src/run-metacity.sh +++ b/src/run-metacity.sh @@ -8,6 +8,10 @@ if test -z "$CLIENT_DISPLAY"; then CLIENT_DISPLAY=:1 fi +if test -z "$METACITY_DISPLAY"; then + export METACITY_DISPLAY=$CLIENT_DISPLAY +fi + if test -z "$SCREENS"; then SCREENS=1 fi @@ -52,7 +56,17 @@ if test -z "$ONLY_WM"; then if test -n "$XMON_DIR"; then echo "Launching xmond" - $XMON_DIR/xmonui | $XMON_DIR/xmond -server $XNEST_DISPLAY & + $XMON_DIR/xmonui | $XMON_DIR/xmond -server localhost:$XNEST_DISPLAY & + sleep 1 + fi + + if test -n "$XSCOPE_DIR"; then + ## xscope doesn't like to die when it should, it backgrounds itself + killall -9 xscope + killall -9 xscope + echo "Launching xscope" + DISPLAY= $XSCOPE_DIR/xscope -o1 -i28 > xscoped-replies.txt & + export METACITY_DISPLAY=localhost:28 sleep 1 fi @@ -89,5 +103,5 @@ if test -z "$ONLY_WM"; then fi if test -z "$ONLY_SETUP"; then - METACITY_VERBOSE=1 METACITY_USE_LOGFILE=1 METACITY_DEBUG_BUTTON_GRABS=1 METACITY_DISPLAY=$CLIENT_DISPLAY exec $DEBUG ./metacity $OPTIONS + METACITY_VERBOSE=1 METACITY_USE_LOGFILE=1 METACITY_DEBUG_BUTTON_GRABS=1 exec $DEBUG ./metacity $OPTIONS fi |