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

ivi-shell: remove id_screen

Browse Source 
use output id instead

Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Wataru Natsume <wnatsume@jp.adit-jv.com>
This commit is contained in:
Ucan, Emre (ADITG/SW1)
2016-03-17 15:30:27 +00:00
committed by Pekka Paalanen
parent 90a6fc659f
commit 1e344dc2c4
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivi-shell/ivi-layout.c
+2 -7
View File
@@ -80,7 +80,6 @@ struct ivi_layout;
struct ivi_layout_screen { struct ivi_layout_screen {
struct wl_list link; struct wl_list link;
uint32_t id_screen;
struct ivi_layout *layout; struct ivi_layout *layout;
struct weston_output *output; struct weston_output *output;
@@ -249,7 +248,6 @@ create_screen(struct weston_compositor *ec)
struct ivi_layout *layout = get_instance(); struct ivi_layout *layout = get_instance();
struct ivi_layout_screen *iviscrn = NULL; struct ivi_layout_screen *iviscrn = NULL;
struct weston_output *output = NULL; struct weston_output *output = NULL;
int32_t count = 0;
wl_list_for_each(output, &ec->output_list, link) { wl_list_for_each(output, &ec->output_list, link) {
iviscrn = calloc(1, sizeof *iviscrn); iviscrn = calloc(1, sizeof *iviscrn);
@@ -260,9 +258,6 @@ create_screen(struct weston_compositor *ec)
iviscrn->layout = layout; iviscrn->layout = layout;
iviscrn->id_screen = count;
count++;
iviscrn->output = output; iviscrn->output = output;
wl_list_init(&iviscrn->pending.layer_list); wl_list_init(&iviscrn->pending.layer_list);
@@ -1325,7 +1320,7 @@ ivi_layout_get_id_of_layer(struct ivi_layout_layer *ivilayer)
static uint32_t static uint32_t
ivi_layout_get_id_of_screen(struct ivi_layout_screen *iviscrn) ivi_layout_get_id_of_screen(struct ivi_layout_screen *iviscrn)
{ {
return iviscrn->id_screen; return iviscrn->output->id;
} }
static struct ivi_layout_layer * static struct ivi_layout_layer *
@@ -1365,7 +1360,7 @@ ivi_layout_get_screen_from_id(uint32_t id_screen)
struct ivi_layout_screen *iviscrn = NULL; struct ivi_layout_screen *iviscrn = NULL;
wl_list_for_each(iviscrn, &layout->screen_list, link) { wl_list_for_each(iviscrn, &layout->screen_list, link) {
if (iviscrn->id_screen == id_screen) if (iviscrn->output->id == id_screen)
return iviscrn; return iviscrn;
} }