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

share/cairo-util: Use wl_pointer_button_state enum directly

Browse Source 
This silences two warnings:

clients/window.c:2450:20: warning: implicit conversion from enumeration
type 'enum wl_pointer_button_state' to different enumeration type 'enum
frame_button_state' [-Wenum-conversion]
                                              button, state);
                                                      ^~~~~

clients/window.c:2453:15: warning: implicit conversion from enumeration
type 'enum wl_pointer_button_state' to different enumeration type 'enum
frame_button_state' [-Wenum-conversion]
                                                button, state);
                                                        ^~~~~

Warning produced by Clang 3.8.

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
This commit is contained in:
Quentin Glidic
2016-07-10 11:00:55 +02:00
parent 9c36eb912e
commit d8b17bc452
4 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-wayland.c
+2 -7
View File
@@ -1363,22 +1363,17 @@ input_handle_motion(void *data, struct wl_pointer *pointer,
static void static void
input_handle_button(void *data, struct wl_pointer *pointer, input_handle_button(void *data, struct wl_pointer *pointer,
uint32_t serial, uint32_t time, uint32_t button, uint32_t serial, uint32_t time, uint32_t button,
uint32_t state_w) enum wl_pointer_button_state state)
{ {
struct wayland_input *input = data; struct wayland_input *input = data;
enum wl_pointer_button_state state = state_w;
enum frame_button_state fstate;
enum theme_location location; enum theme_location location;
if (!input->output) if (!input->output)
return; return;
if (input->output->frame) { if (input->output->frame) {
fstate = state == WL_POINTER_BUTTON_STATE_PRESSED ?
FRAME_BUTTON_PRESSED : FRAME_BUTTON_RELEASED;
location = frame_pointer_button(input->output->frame, input, location = frame_pointer_button(input->output->frame, input,
button, fstate); button, state);
if (frame_status(input->output->frame) & FRAME_STATUS_MOVE) { if (frame_status(input->output->frame) & FRAME_STATUS_MOVE) {
shared/cairo-util.h
+3 -7
View File
@@ -29,6 +29,7 @@
#include <stdint.h> #include <stdint.h>
#include <cairo.h> #include <cairo.h>
#include <wayland-client.h>
#include <wayland-util.h> #include <wayland-util.h>
void void
@@ -123,11 +124,6 @@ enum {
FRAME_BUTTON_ALL = 0x7 FRAME_BUTTON_ALL = 0x7
}; };
enum frame_button_state {
FRAME_BUTTON_RELEASED = 0,
FRAME_BUTTON_PRESSED = 1
};
struct frame * struct frame *
frame_create(struct theme *t, int32_t width, int32_t height, uint32_t buttons, frame_create(struct theme *t, int32_t width, int32_t height, uint32_t buttons,
const char *title); const char *title);
@@ -208,7 +204,7 @@ frame_pointer_leave(struct frame *frame, void *pointer);
*/ */
enum theme_location enum theme_location
frame_pointer_button(struct frame *frame, void *pointer, frame_pointer_button(struct frame *frame, void *pointer,
uint32_t button, enum frame_button_state state); uint32_t button, enum wl_pointer_button_state state);
enum theme_location enum theme_location
frame_touch_down(struct frame *frame, void *data, int32_t id, int x, int y); frame_touch_down(struct frame *frame, void *data, int32_t id, int x, int y);
@@ -218,7 +214,7 @@ frame_touch_up(struct frame *frame, void *data, int32_t id);
enum theme_location enum theme_location
frame_double_click(struct frame *frame, void *pointer, frame_double_click(struct frame *frame, void *pointer,
uint32_t button, enum frame_button_state state); uint32_t button, enum wl_pointer_button_state state);
void void
frame_double_touch_down(struct frame *frame, void *data, int32_t id, frame_double_touch_down(struct frame *frame, void *data, int32_t id,
shared/frame.c
+6 -6
View File
@@ -745,7 +745,7 @@ frame_pointer_leave(struct frame *frame, void *data)
enum theme_location enum theme_location
frame_pointer_button(struct frame *frame, void *data, frame_pointer_button(struct frame *frame, void *data,
uint32_t btn, enum frame_button_state state) uint32_t btn, enum wl_pointer_button_state state)
{ {
struct frame_pointer *pointer = frame_pointer_get(frame, data); struct frame_pointer *pointer = frame_pointer_get(frame, data);
struct frame_pointer_button *button; struct frame_pointer_button *button;
@@ -759,7 +759,7 @@ frame_pointer_button(struct frame *frame, void *data,
frame->flags & FRAME_FLAG_MAXIMIZED ? frame->flags & FRAME_FLAG_MAXIMIZED ?
THEME_FRAME_MAXIMIZED : 0); THEME_FRAME_MAXIMIZED : 0);
if (state == FRAME_BUTTON_PRESSED) { if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
button = malloc(sizeof *button); button = malloc(sizeof *button);
if (!button) if (!button)
return location; return location;
@@ -770,7 +770,7 @@ frame_pointer_button(struct frame *frame, void *data,
wl_list_insert(&pointer->down_buttons, &button->link); wl_list_insert(&pointer->down_buttons, &button->link);
frame_pointer_button_press(frame, pointer, button); frame_pointer_button_press(frame, pointer, button);
} else if (state == FRAME_BUTTON_RELEASED) { } else if (state == WL_POINTER_BUTTON_STATE_RELEASED) {
button = NULL; button = NULL;
wl_list_for_each(button, &pointer->down_buttons, link) wl_list_for_each(button, &pointer->down_buttons, link)
if (button->button == btn) if (button->button == btn)
@@ -844,7 +844,7 @@ frame_touch_up(struct frame *frame, void *data, int32_t id)
enum theme_location enum theme_location
frame_double_click(struct frame *frame, void *data, frame_double_click(struct frame *frame, void *data,
uint32_t btn, enum frame_button_state state) uint32_t btn, enum wl_pointer_button_state state)
{ {
struct frame_pointer *pointer = frame_pointer_get(frame, data); struct frame_pointer *pointer = frame_pointer_get(frame, data);
struct frame_button *button; struct frame_button *button;
@@ -860,12 +860,12 @@ frame_double_click(struct frame *frame, void *data,
if (location != THEME_LOCATION_TITLEBAR || btn != BTN_LEFT) if (location != THEME_LOCATION_TITLEBAR || btn != BTN_LEFT)
return location; return location;
if (state == FRAME_BUTTON_PRESSED) { if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
if (button) if (button)
frame_button_press(button); frame_button_press(button);
else else
frame->status |= FRAME_STATUS_MAXIMIZE; frame->status |= FRAME_STATUS_MAXIMIZE;
} else if (state == FRAME_BUTTON_RELEASED) { } else if (state == WL_POINTER_BUTTON_STATE_RELEASED) {
if (button) if (button)
frame_button_release(button); frame_button_release(button);
} }
xwayland/window-manager.c
+3 -2
View File
@@ -1759,7 +1759,7 @@ weston_wm_handle_button(struct weston_wm *wm, xcb_generic_event_t *event)
struct weston_pointer *pointer; struct weston_pointer *pointer;
struct weston_wm_window *window; struct weston_wm_window *window;
enum theme_location location; enum theme_location location;
enum frame_button_state button_state; enum wl_pointer_button_state button_state;
uint32_t button_id; uint32_t button_id;
wm_log("XCB_BUTTON_%s (detail %d)\n", wm_log("XCB_BUTTON_%s (detail %d)\n",
@@ -1777,7 +1777,8 @@ weston_wm_handle_button(struct weston_wm *wm, xcb_generic_event_t *event)
pointer = weston_seat_get_pointer(seat); pointer = weston_seat_get_pointer(seat);
button_state = button->response_type == XCB_BUTTON_PRESS ? button_state = button->response_type == XCB_BUTTON_PRESS ?
FRAME_BUTTON_PRESSED : FRAME_BUTTON_RELEASED; WL_POINTER_BUTTON_STATE_PRESSED :
WL_POINTER_BUTTON_STATE_RELEASED;
button_id = button->detail == 1 ? BTN_LEFT : BTN_RIGHT; button_id = button->detail == 1 ? BTN_LEFT : BTN_RIGHT;
/* Make sure we're looking at the right location. The frame /* Make sure we're looking at the right location. The frame