| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 description "Run the window manager for the given logged in user" | 5 description "Run the window manager for the given logged in user" |
| 6 author "chromium-os-dev@chromium.org" | 6 author "chromium-os-dev@chromium.org" |
| 7 | 7 |
| 8 # start-user-session is only emitted from the new session_manager code. | 8 # start-user-session is only emitted from the new session_manager code. |
| 9 # chromeos-xsession (the old way of starting the WM) is not run on that | 9 # chromeos-xsession (the old way of starting the WM) is not run on that |
| 10 # code pathway. | 10 # code pathway. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 | 24 |
| 25 respawn | 25 respawn |
| 26 script | 26 script |
| 27 | 27 |
| 28 WM="/usr/bin/chromeos-wm" | 28 WM="/usr/bin/chromeos-wm" |
| 29 IMAGES="/usr/share/chromeos-assets/images" | 29 IMAGES="/usr/share/chromeos-assets/images" |
| 30 BACKGROUND_FILE="background_1024x600.png" | 30 BACKGROUND_FILE="background_1024x600.png" |
| 31 BACKGROUND="${IMAGES}/${BACKGROUND_FILE}" | 31 BACKGROUND="${IMAGES}/${BACKGROUND_FILE}" |
| 32 INITIAL_CHROME_FILE="/var/run/state/windowmanager/initial-chrome-window-mapped" | 32 INITIAL_CHROME_FILE="/var/run/state/windowmanager/initial-chrome-window-mapped" |
| 33 LOG_DIR="${HOME}/log" | 33 LOG_DIR="${HOME}/log" |
| 34 XTERM_COMMAND="/usr/bin/xterm -bg black -fg grey +sb" | 34 XTERM_COMMAND="/usr/local/bin/xterm -bg black -fg grey +sb" |
| 35 SCREENSHOT_DIR="${HOME}/Downloads/Screenshots" | 35 SCREENSHOT_DIR="${HOME}/Downloads/Screenshots" |
| 36 | 36 |
| 37 cd ${HOME} | 37 cd ${HOME} |
| 38 exec /sbin/minijail --uid=${USER_ID} -- \ | 38 exec /sbin/minijail --uid=${USER_ID} -- \ |
| 39 "${WM}" \ | 39 "${WM}" \ |
| 40 --hotkey_overlay_image_dir="${IMAGES}" \ | 40 --hotkey_overlay_image_dir="${IMAGES}" \ |
| 41 --log_dir="${LOG_DIR}" \ | 41 --log_dir="${LOG_DIR}" \ |
| 42 --panel_anchor_image="${IMAGES}/panel_anchor.png" \ | 42 --panel_anchor_image="${IMAGES}/panel_anchor.png" \ |
| 43 --panel_dock_background_image="${IMAGES}/panel_dock_bg.png" \ | 43 --panel_dock_background_image="${IMAGES}/panel_dock_bg.png" \ |
| 44 --shadow_image_dir="${IMAGES}" \ | 44 --shadow_image_dir="${IMAGES}" \ |
| 45 --wm_background_image="${BACKGROUND}" \ | 45 --wm_background_image="${BACKGROUND}" \ |
| 46 --wm_initial_chrome_window_mapped_file="${INITIAL_CHROME_FILE}" \ | 46 --wm_initial_chrome_window_mapped_file="${INITIAL_CHROME_FILE}" \ |
| 47 --wm_separator_image="${IMAGES}/separator.png" \ | 47 --wm_separator_image="${IMAGES}/separator.png" \ |
| 48 --wm_screenshot_output_dir="${SCREENSHOT_DIR}" \ | 48 --wm_screenshot_output_dir="${SCREENSHOT_DIR}" \ |
| 49 --wm_xterm_command="${XTERM_COMMAND}" | 49 --wm_xterm_command="${XTERM_COMMAND}" |
| 50 end script | 50 end script |
| OLD | NEW |