X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.cpp;h=672dab03844980c640e19c70be70c055ebcb86c3;hb=2b84aa5d33611d0f2f7b8c4395dc352ebf60ea29;hp=29c70a15aaa4cb5fa08e464acfcdcfe7ba1b4a78;hpb=74c2debc328c78a49d5ac779e9a83f3b7459c0a5;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.cpp b/src/wayland.cpp
index 29c70a1..672dab0 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include <utility>
 
 #include "wayland.hpp"
@@ -380,7 +396,7 @@ void controller::layer_source_rectangle(struct layer *l, int32_t x, int32_t y,
                                         int32_t width, int32_t height) {
    logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__,
             this->proxy.get(), x, y, width, height);
-   this->lprops[l->id].src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   this->lprops[l->id].src_rect = rect{width, height, x, y};
 }
 
 void controller::layer_destination_rectangle(struct layer *l, int32_t x,
@@ -388,7 +404,7 @@ void controller::layer_destination_rectangle(struct layer *l, int32_t x,
                                              int32_t height) {
    logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__,
             this->proxy.get(), x, y, width, height);
-   this->lprops[l->id].dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   this->lprops[l->id].dst_rect = rect{width, height, x, y};
 }
 
 void controller::layer_configuration(struct layer *l, int32_t width,
@@ -410,9 +426,9 @@ void controller::layer_screen(struct layer * /*l*/, struct wl_output *screen) {
 
 void controller::layer_destroyed(struct layer *l) {
    logdebug("genivi::layer %s @ %p", __func__, this->proxy.get());
-   add_task("remove layer", [l](struct controller *c) {
-      c->lprops.erase(l->id);
-      c->layers.erase(l->id);
+   this->chooks->add_task("remove layer", [l, this] {
+      this->lprops.erase(l->id);
+      this->layers.erase(l->id);
    });
 }
 
@@ -588,7 +604,7 @@ void controller::surface_source_rectangle(struct surface *s, int32_t x,
                                           int32_t height) {
    logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
             this->proxy.get(), x, y, width, height);
-   this->sprops[s->id].src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   this->sprops[s->id].src_rect = rect{width, height, x, y};
 }
 
 void controller::surface_destination_rectangle(struct surface *s, int32_t x,
@@ -596,7 +612,7 @@ void controller::surface_destination_rectangle(struct surface *s, int32_t x,
                                                int32_t height) {
    logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
             this->proxy.get(), x, y, width, height);
-   this->sprops[s->id].dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+   this->sprops[s->id].dst_rect = rect{width, height, x, y};
 }
 
 void controller::surface_configuration(struct surface *s, int32_t width,
@@ -646,9 +662,9 @@ void controller::surface_content(struct surface *s, int32_t content_state) {
    if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
       // XXX is this the right thing to do?
       this->chooks->surface_removed(s->id);
-      add_task("remove surface", [s](struct controller *c) {
-         c->sprops.erase(s->id);
-         c->surfaces.erase(s->id);
+      this->chooks->add_task("remove surface", [this, s] {
+         this->sprops.erase(s->id);
+         this->surfaces.erase(s->id);
       });
    }
 }
@@ -687,23 +703,6 @@ void controller::remove_proxy_to_id_mapping(struct wl_output *p) {
    this->screen_proxy_to_id.erase(uintptr_t(p));
 }
 
-void controller::add_task(char const *name,
-                          std::function<void(struct controller *)> &&f) {
-   this->pending.emplace_back(std::make_pair(name, f));
-}
-
-void controller::execute_pending() {
-   if (!this->pending.empty()) {
-      for (auto &t : this->pending) {
-         logdebug("executing task '%s'", t.first);
-         t.second(this);
-      }
-      this->pending.clear();
-      ivi_controller_commit_changes(this->proxy.get());
-      // XXX: No flush here...
-   }
-}
-
 //
 //  ___  ___ _ __ ___  ___ _ __
 // / __|/ __| '__/ _ \/ _ \ '_ \