diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-11-10 08:21:50 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-11-10 08:21:50 -0500 |
| commit | 425713b83730a7b707ac5b0a325b8e37464a982c (patch) | |
| tree | ef504e85918a36d1abc4e9b659abf000d453a164 /backend | |
| parent | ca3c373c18fa2c4edb2e3f46c74d50f1f571e72c (diff) | |
| parent | aafb00a15fd84b6d40f2efa52333eea5633b14e5 (diff) | |
Merge branch 'hidpi'
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/libinput/tablet_tool.c | 2 | ||||
| -rw-r--r-- | backend/wayland/output.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c index 3caaf3f7..3d5fafc3 100644 --- a/backend/libinput/tablet_tool.c +++ b/backend/libinput/tablet_tool.c @@ -70,6 +70,8 @@ void handle_tablet_tool_axis(struct libinput_event *event, wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_WHEEL; wlr_event.wheel_delta = libinput_event_tablet_tool_get_wheel_delta(tevent); } + wlr_log(L_DEBUG, "Tablet tool axis event %d @ %f,%f", + wlr_event.updated_axes, wlr_event.x_mm, wlr_event.y_mm); wl_signal_emit(&wlr_dev->tablet_tool->events.axis, &wlr_event); } diff --git a/backend/wayland/output.c b/backend/wayland/output.c index 90f8b39a..c4301617 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -249,7 +249,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) { wlr_output_init(&output->wlr_output, &backend->backend, &output_impl); struct wlr_output *wlr_output = &output->wlr_output; - wlr_output_update_size(wlr_output, 640, 480); + wlr_output_update_size(wlr_output, 1280, 720); strncpy(wlr_output->make, "wayland", sizeof(wlr_output->make)); strncpy(wlr_output->model, "wayland", sizeof(wlr_output->model)); snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%d", |