Code Review
/
src
/
agl-compositor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
shell: Provide a better explanation for terminating the connection
[src/agl-compositor.git]
/
src
/
shell.c
diff --git
a/src/shell.c
b/src/shell.c
index
f5dc3e3
..
c089bec
100644
(file)
--- a/
src/shell.c
+++ b/
src/shell.c
@@
-1108,8
+1108,8
@@
shell_ready(struct wl_client *client, struct wl_resource *shell_res)
ivi->shell_client.status == BOUND_FAILED) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
ivi->shell_client.status == BOUND_FAILED) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
- "agl_shell
has already been bound.
"
- "Check out bound_fail event");
+ "agl_shell
(ready quest) has already
"
+ "
been bound.
Check out bound_fail event");
return;
}
return;
}
@@
-1165,8
+1165,8
@@
shell_set_background(struct wl_client *client,
ivi->shell_client.resource_ext == shell_res) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
ivi->shell_client.resource_ext == shell_res) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
- "agl_shell
has already been bound.
"
- "Check out bound_fail event");
+ "agl_shell
(set_background) has already
"
+ "
been bound.
Check out bound_fail event");
return;
}
return;
}
@@
-1230,7
+1230,7
@@
shell_set_panel(struct wl_client *client,
ivi->shell_client.resource_ext == shell_res) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
ivi->shell_client.resource_ext == shell_res) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
- "agl_shell has already been bound. "
+ "agl_shell
(set_panel)
has already been bound. "
"Check out bound_fail event");
return;
}
"Check out bound_fail event");
return;
}
@@
-1622,9
+1622,8
@@
shell_set_app_output(struct wl_client *client, struct wl_resource *res,
struct weston_output *woutput = weston_head_get_output(head);
struct ivi_output *ioutput = to_ivi_output(woutput);
struct ivi_surface *surf = ivi_find_app(ivi, app_id);
struct weston_output *woutput = weston_head_get_output(head);
struct ivi_output *ioutput = to_ivi_output(woutput);
struct ivi_surface *surf = ivi_find_app(ivi, app_id);
- struct ivi_output *desktop_last_output = surf->desktop.last_output;
- struct ivi_output *current_completed_output =
- surf->current_completed_output;
+ struct ivi_output *desktop_last_output;
+ struct ivi_output *current_completed_output;
if (!app_id || !ioutput)
return;
if (!app_id || !ioutput)
return;
@@
-1636,6
+1635,9
@@
shell_set_app_output(struct wl_client *client, struct wl_resource *res,
return;
}
return;
}
+ desktop_last_output = surf->desktop.last_output;
+ current_completed_output = surf->current_completed_output;
+
if (surf->remote.output)
surf->hidden_layer_output = surf->remote.output;
else
if (surf->remote.output)
surf->hidden_layer_output = surf->remote.output;
else
@@
-1858,6
+1860,7
@@
unbind_agl_shell(struct wl_resource *resource)
ivi->shell_client.ready = false;
ivi->shell_client.resource = NULL;
ivi->shell_client.ready = false;
ivi->shell_client.resource = NULL;
+ ivi->shell_client.resource_ext = NULL;
ivi->shell_client.client = NULL;
}
ivi->shell_client.client = NULL;
}
@@
-1867,6
+1870,7
@@
unbind_agl_shell_ext(struct wl_resource *resource)
struct ivi_compositor *ivi = wl_resource_get_user_data(resource);
ivi->shell_client_ext.resource = NULL;
struct ivi_compositor *ivi = wl_resource_get_user_data(resource);
ivi->shell_client_ext.resource = NULL;
+ ivi->shell_client.resource_ext = NULL;
}
static void
}
static void