Convert all scales to int32_t
The type changed in the protocol, so update weston for this.
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index 279f1b3..3ed6af5 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -114,7 +114,7 @@
int shm_id;
void *buf;
uint8_t depth;
- uint32_t scale;
+ int32_t scale;
};
static struct xkb_keymap *
@@ -777,7 +777,7 @@
x11_compositor_create_output(struct x11_compositor *c, int x, int y,
int width, int height, int fullscreen,
int no_input, char *configured_name,
- uint32_t transform, uint32_t scale)
+ uint32_t transform, int32_t scale)
{
static const char name[] = "Weston Compositor";
static const char class[] = "weston-1\0Weston Compositor";
diff --git a/src/compositor.c b/src/compositor.c
index f9bdb09..cb474d6 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -94,7 +94,7 @@
static void
weston_output_transform_init(struct weston_output *output, uint32_t transform);
static void
-weston_output_scale_init(struct weston_output *output, uint32_t scale);
+weston_output_scale_init(struct weston_output *output, int32_t scale);
WL_EXPORT int
weston_output_switch_mode(struct weston_output *output, struct weston_mode *mode)
@@ -365,7 +365,7 @@
WL_EXPORT void
weston_transformed_coord(int width, int height,
enum wl_output_transform transform,
- uint32_t scale,
+ int32_t scale,
float sx, float sy, float *bx, float *by)
{
switch (transform) {
@@ -411,7 +411,7 @@
WL_EXPORT pixman_box32_t
weston_transformed_rect(int width, int height,
enum wl_output_transform transform,
- uint32_t scale,
+ int32_t scale,
pixman_box32_t rect)
{
float x1, x2, y1, y2;
@@ -1630,7 +1630,7 @@
static void
surface_set_buffer_scale(struct wl_client *client,
struct wl_resource *resource,
- uint32_t scale)
+ int32_t scale)
{
struct weston_surface *surface = resource->data;
@@ -2669,7 +2669,7 @@
}
static void
-weston_output_scale_init(struct weston_output *output, uint32_t scale)
+weston_output_scale_init(struct weston_output *output, int32_t scale)
{
output->scale = scale;
}
@@ -2689,7 +2689,7 @@
WL_EXPORT void
weston_output_init(struct weston_output *output, struct weston_compositor *c,
int x, int y, int width, int height, uint32_t transform,
- uint32_t scale)
+ int32_t scale)
{
output->compositor = c;
output->x = x;
diff --git a/src/compositor.h b/src/compositor.h
index e3a798e..908cc5d 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -183,7 +183,7 @@
char *make, *model, *serial_number;
uint32_t subpixel;
uint32_t transform;
- uint32_t scale;
+ int32_t scale;
struct weston_mode *current;
struct weston_mode *origin;
@@ -612,7 +612,7 @@
uint32_t buffer_transform;
/* wl_surface.set_buffer_scale */
- uint32_t buffer_scale;
+ int32_t buffer_scale;
} cached;
int synchronized;
@@ -716,7 +716,7 @@
struct weston_buffer_reference buffer_ref;
uint32_t buffer_transform;
- uint32_t buffer_scale;
+ int32_t buffer_scale;
int keep_buffer; /* bool for backends to prevent early release */
/* All the pending state, that wl_surface.commit will apply. */
@@ -744,7 +744,7 @@
uint32_t buffer_transform;
/* wl_surface.set_scaling_factor */
- uint32_t buffer_scale;
+ int32_t buffer_scale;
} pending;
/*
@@ -1025,7 +1025,7 @@
weston_output_move(struct weston_output *output, int x, int y);
void
weston_output_init(struct weston_output *output, struct weston_compositor *c,
- int x, int y, int width, int height, uint32_t transform, uint32_t scale);
+ int x, int y, int width, int height, uint32_t transform, int32_t scale);
void
weston_output_destroy(struct weston_output *output);
@@ -1156,12 +1156,12 @@
void
weston_transformed_coord(int width, int height,
enum wl_output_transform transform,
- uint32_t scale,
+ int32_t scale,
float sx, float sy, float *bx, float *by);
pixman_box32_t
weston_transformed_rect(int width, int height,
enum wl_output_transform transform,
- uint32_t scale,
+ int32_t scale,
pixman_box32_t rect);
#ifdef __cplusplus