diff options
| author | emersion <contact@emersion.fr> | 2018-04-30 10:55:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 10:55:25 +0100 |
| commit | 509d38425c33524c77bfb4aa89676d57c21fcd11 (patch) | |
| tree | 7ee2138da910973fa5a7d8722ec400679d5d5bb2 /include/wlr | |
| parent | a0f490306395ac3705c00ecc85b4a0bba721886e (diff) | |
| parent | 178ac8bffee3c76de39e6c0bf37838b58cb7280f (diff) | |
Merge pull request #930 from emersion/input-device-output-name
Add wlr_input_device.output_name
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/backend/wayland.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_input_device.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/wlr/backend/wayland.h b/include/wlr/backend/wayland.h index e28ffff5..31a14c97 100644 --- a/include/wlr/backend/wayland.h +++ b/include/wlr/backend/wayland.h @@ -37,7 +37,7 @@ bool wlr_backend_is_wl(struct wlr_backend *backend); bool wlr_input_device_is_wl(struct wlr_input_device *device); /** - * True if the given output is a wlr_wl_backend_output. + * True if the given output is a wlr_wl_output. */ bool wlr_output_is_wl(struct wlr_output *output); diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h index d65172c1..5cf26b65 100644 --- a/include/wlr/types/wlr_input_device.h +++ b/include/wlr/types/wlr_input_device.h @@ -11,7 +11,7 @@ enum wlr_input_device_type { WLR_INPUT_DEVICE_POINTER, WLR_INPUT_DEVICE_TOUCH, WLR_INPUT_DEVICE_TABLET_TOOL, - WLR_INPUT_DEVICE_TABLET_PAD + WLR_INPUT_DEVICE_TABLET_PAD, }; /* Note: these are circular dependencies */ @@ -27,10 +27,11 @@ struct wlr_input_device { const struct wlr_input_device_impl *impl; enum wlr_input_device_type type; - int vendor, product; + unsigned int vendor, product; char *name; // Or 0 if not applicable to this device double width_mm, height_mm; + char *output_name; /* wlr_input_device.type determines which of these is valid */ union { |