mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename 'state' in axis (or ambiguous) bindings to 'value' 

Since it's usually an axis value rather than a boolean, be slightly more
explicit about it.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone 2012-05-04 11:21:57 +01:00 committed by Kristian Høgsberg
parent 5d66371743
commit e5a0120757
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compositor.h
View File

@ -468,10 +468,11 @@ typedef void (*weston_binding_handler_t)(struct wl_input_device *device,
uint32_t time, uint32_t key,
uint32_t button,
uint32_t axis,
int32_t state, void *data);
int32_t value, void *data);
struct weston_binding *
weston_compositor_add_binding(struct weston_compositor *compositor,
uint32_t key, uint32_t button, uint32_t axis, uint32_t modifier,
uint32_t key, uint32_t button, uint32_t axis,
uint32_t modifier,
weston_binding_handler_t binding, void *data);
void
weston_binding_destroy(struct weston_binding *binding);
@ -483,7 +484,8 @@ void
weston_compositor_run_binding(struct weston_compositor *compositor,
struct weston_input_device *device,
uint32_t time,
uint32_t key, uint32_t button, uint32_t axis, int32_t state);
uint32_t key, uint32_t button, uint32_t axis,
int32_t value);
int
weston_environment_get_fd(const char *env);

20
src/shell.c
View File

@ -1499,7 +1499,8 @@ get_shell_surface_type(struct weston_surface *surface)
static void
move_binding(struct wl_input_device *device, uint32_t time,
uint32_t key, uint32_t button, uint32_t axis, int32_t state, void *data)
uint32_t key, uint32_t button, uint32_t axis, int32_t value,
void *data)
{
struct weston_surface *surface =
(struct weston_surface *) device->pointer_focus;
@ -1522,7 +1523,8 @@ move_binding(struct wl_input_device *device, uint32_t time,
static void
resize_binding(struct wl_input_device *device, uint32_t time,
uint32_t key, uint32_t button, uint32_t axis, int32_t state, void *data)
uint32_t key, uint32_t button, uint32_t axis, int32_t value,
void *data)
{
struct weston_surface *surface =
(struct weston_surface *) device->pointer_focus;
@ -1570,7 +1572,8 @@ resize_binding(struct wl_input_device *device, uint32_t time,
static void
surface_opacity_binding(struct wl_input_device *device, uint32_t time,
uint32_t key, uint32_t button, uint32_t axis, int32_t value, void *data)
uint32_t key, uint32_t button, uint32_t axis,
int32_t value, void *data)
{
uint32_t step = 15;
struct shell_surface *shsurf;
@ -1605,7 +1608,8 @@ surface_opacity_binding(struct wl_input_device *device, uint32_t time,
static void
zoom_binding(struct wl_input_device *device, uint32_t time,
uint32_t key, uint32_t button, uint32_t axis, int32_t value, void *data)
uint32_t key, uint32_t button, uint32_t axis, int32_t value,
void *data)
{
struct weston_input_device *wd = (struct weston_input_device *) device;
struct weston_compositor *compositor = wd->compositor;
@ -1736,7 +1740,8 @@ static const struct wl_pointer_grab_interface rotate_grab_interface = {
static void
rotate_binding(struct wl_input_device *device, uint32_t time,
uint32_t key, uint32_t button, uint32_t axis, int32_t state, void *data)
uint32_t key, uint32_t button, uint32_t axis, int32_t value,
void *data)
{
struct weston_surface *base_surface =
(struct weston_surface *) device->pointer_focus;
@ -2423,7 +2428,7 @@ static const struct wl_keyboard_grab_interface switcher_grab = {
static void
switcher_binding(struct wl_input_device *device, uint32_t time,
uint32_t key, uint32_t button, uint32_t axis,
int32_t state, void *data)
int32_t value, void *data)
{
struct desktop_shell *shell = data;
struct switcher *switcher;
@ -2475,7 +2480,8 @@ backlight_binding(struct wl_input_device *device, uint32_t time,
static void
debug_repaint_binding(struct wl_input_device *device, uint32_t time,
uint32_t key, uint32_t button, uint32_t axis, int32_t state, void *data)
uint32_t key, uint32_t button, uint32_t axis,
int32_t value, void *data)
{
struct desktop_shell *shell = data;
struct weston_compositor *compositor = shell->compositor;

6
src/util.c
View File

@ -290,15 +290,15 @@ WL_EXPORT void
weston_compositor_run_binding(struct weston_compositor *compositor,
struct weston_input_device *device,
uint32_t time, uint32_t key,
uint32_t button, uint32_t axis, int32_t state)
uint32_t button, uint32_t axis, int32_t value)
{
struct weston_binding *b;
wl_list_for_each(b, &compositor->binding_list, link) {
if (b->key == key && b->button == button && b->axis == axis &&
b->modifier == device->modifier_state && state) {
b->modifier == device->modifier_state && value) {
b->handler(&device->input_device,
time, key, button, axis, state, b->data);
time, key, button, axis, value, b->data);
/* If this was a key binding and it didn't
* install a keyboard grab, install one now to