mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: Don't call drop/set master anymore

Browse Source 
This is done by either laucnher-util.c directly, weston-launch or
logind, depending on how we're launched.
This commit is contained in:
Kristian Høgsberg
2013-10-22 12:27:46 -07:00
parent 1edf44ce26
commit 2e611264a3
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
-7
View File
@@ -2365,10 +2365,6 @@ session_notify(struct wl_listener *listener, void *data)
if (ec->base.session_active) { if (ec->base.session_active) {
weston_log("activating session\n"); weston_log("activating session\n");
compositor->focus = 1; compositor->focus = 1;
if (ec->base.launcher == NULL && drmSetMaster(ec->drm.fd)) {
weston_log("failed to set master: %m\n");
wl_display_terminate(compositor->wl_display);
}
compositor->state = ec->prev_state; compositor->state = ec->prev_state;
drm_compositor_set_modes(ec); drm_compositor_set_modes(ec);
weston_compositor_damage_all(compositor); weston_compositor_damage_all(compositor);
@@ -2402,9 +2398,6 @@ session_notify(struct wl_listener *listener, void *data)
sprite->plane_id, sprite->plane_id,
output->crtc_id, 0, 0, output->crtc_id, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0); 0, 0, 0, 0, 0, 0, 0, 0);
if (ec->base.launcher == NULL && drmDropMaster(ec->drm.fd) < 0)
weston_log("failed to drop master: %m\n");
}; };
} }