[PATCH weston 1/4] compositor-wayland: Change focus to a bool instead of an int

Derek Foreman derekf at osg.samsung.com
Fri Oct 9 09:28:43 PDT 2015


Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
---
 src/compositor-wayland.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 7b11ae4..dbbc1ad 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -177,7 +177,7 @@ struct wayland_input {
 	enum weston_key_state_update keyboard_state_update;
 	uint32_t key_serial;
 	uint32_t enter_serial;
-	int focus;
+	bool focus;
 	struct wayland_output *output;
 	struct wayland_output *keyboard_focus;
 };
@@ -1296,12 +1296,12 @@ input_handle_pointer_enter(void *data, struct wl_pointer *pointer,
 	weston_output_transform_coordinate(&input->output->base, x, y, &x, &y);
 
 	if (location == THEME_LOCATION_CLIENT_AREA) {
-		input->focus = 1;
+		input->focus = true;
 		notify_pointer_focus(&input->base, &input->output->base, x, y);
 		wl_pointer_set_cursor(input->parent.pointer,
 				      input->enter_serial, NULL, 0, 0);
 	} else {
-		input->focus = 0;
+		input->focus = false;
 		notify_pointer_focus(&input->base, NULL, 0, 0);
 		input_set_cursor(input);
 	}
@@ -1325,7 +1325,7 @@ input_handle_pointer_leave(void *data, struct wl_pointer *pointer,
 
 	notify_pointer_focus(&input->base, NULL, 0, 0);
 	input->output = NULL;
-	input->focus = 0;
+	input->focus = false;
 }
 
 static void
@@ -1358,12 +1358,12 @@ input_handle_motion(void *data, struct wl_pointer *pointer,
 	if (input->focus && location != THEME_LOCATION_CLIENT_AREA) {
 		input_set_cursor(input);
 		notify_pointer_focus(&input->base, NULL, 0, 0);
-		input->focus = 0;
+		input->focus = false;
 	} else if (!input->focus && location == THEME_LOCATION_CLIENT_AREA) {
 		wl_pointer_set_cursor(input->parent.pointer,
 				      input->enter_serial, NULL, 0, 0);
 		notify_pointer_focus(&input->base, &input->output->base, x, y);
-		input->focus = 1;
+		input->focus = true;
 	}
 
 	if (location == THEME_LOCATION_CLIENT_AREA)
-- 
2.5.3



More information about the wayland-devel mailing list