summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-01 11:47:46 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-08 17:24:00 +0200
commitca53e70e58714286798a071fbe2316295334ac7b (patch)
treee31d7904f838782b1739989283e8f81a8ecc9131
parent92c8b647e4e164479c10a84021564533e73cbd69 (diff)
wayland: make genivi::rect::width and height int32
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r--src/app.cpp2
-rw-r--r--src/wayland.cpp8
-rw-r--r--src/wayland.hpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/app.cpp b/src/app.cpp
index 58a62ee..c9abd2d 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -33,7 +33,7 @@ struct wm::area area_from_json(json const &j) {
return wm::area{
j["name"].get<std::string>(),
{
- get<uint32_t>(j["width"]), get<uint32_t>(j["height"]),
+ get<int32_t>(j["width"]), get<int32_t>(j["height"]),
get<int32_t>(j["x"]), get<int32_t>(j["y"]),
},
get<uint32_t>(j["zorder"]),
diff --git a/src/wayland.cpp b/src/wayland.cpp
index 29c70a1..8ad2544 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -380,7 +380,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 +388,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,
@@ -588,7 +588,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 +596,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,
diff --git a/src/wayland.hpp b/src/wayland.hpp
index 4ab4709..b5e2d51 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -125,7 +125,7 @@ struct size {
};
struct rect {
- uint32_t w, h;
+ int32_t w, h;
int32_t x, y;
};