blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Silent conversion from double to int should be illegal

This commit is contained in:
Markus Ongyerth 2018-05-19 12:16:11 +02:00
parent dc525a9c5f
commit 2bc09d91c3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wlr/types/wlr_tablet_v2.h
View File

@ -123,10 +123,10 @@ void wlr_send_tablet_v2_tablet_tool_motion(
struct wlr_tablet_v2_tablet_tool *tool, double x, double y); struct wlr_tablet_v2_tablet_tool *tool, double x, double y);
void wlr_send_tablet_v2_tablet_tool_pressure( void wlr_send_tablet_v2_tablet_tool_pressure(
struct wlr_tablet_v2_tablet_tool *tool, uint32_t pressure); struct wlr_tablet_v2_tablet_tool *tool, double pressure);
void wlr_send_tablet_v2_tablet_tool_distance( void wlr_send_tablet_v2_tablet_tool_distance(
struct wlr_tablet_v2_tablet_tool *tool, uint32_t distance); struct wlr_tablet_v2_tablet_tool *tool, double distance);
void wlr_send_tablet_v2_tablet_tool_tilt( void wlr_send_tablet_v2_tablet_tool_tilt(
struct wlr_tablet_v2_tablet_tool *tool, double x, double y); struct wlr_tablet_v2_tablet_tool *tool, double x, double y);
@ -135,7 +135,7 @@ void wlr_send_tablet_v2_tablet_tool_rotation(
struct wlr_tablet_v2_tablet_tool *tool, double degrees); struct wlr_tablet_v2_tablet_tool *tool, double degrees);
void wlr_send_tablet_v2_tablet_tool_slider( void wlr_send_tablet_v2_tablet_tool_slider(
struct wlr_tablet_v2_tablet_tool *tool, int32_t position); struct wlr_tablet_v2_tablet_tool *tool, double position);
void wlr_send_tablet_v2_tablet_tool_wheel( void wlr_send_tablet_v2_tablet_tool_wheel(
struct wlr_tablet_v2_tablet_tool *tool, double delta, int32_t clicks); struct wlr_tablet_v2_tablet_tool *tool, double delta, int32_t clicks);

12
types/tablet_v2/wlr_tablet_v2_tool.c
View File

@ -401,20 +401,20 @@ void wlr_send_tablet_v2_tablet_tool_proximity_out(
} }
void wlr_send_tablet_v2_tablet_tool_pressure( void wlr_send_tablet_v2_tablet_tool_pressure(
struct wlr_tablet_v2_tablet_tool *tool, uint32_t pressure) { struct wlr_tablet_v2_tablet_tool *tool, double pressure) {
if (tool->current_client) { if (tool->current_client) {
zwp_tablet_tool_v2_send_pressure(tool->current_client->resource, zwp_tablet_tool_v2_send_pressure(tool->current_client->resource,
pressure); pressure * 65535);
queue_tool_frame(tool->current_client); queue_tool_frame(tool->current_client);
} }
} }
void wlr_send_tablet_v2_tablet_tool_distance( void wlr_send_tablet_v2_tablet_tool_distance(
struct wlr_tablet_v2_tablet_tool *tool, uint32_t distance) { struct wlr_tablet_v2_tablet_tool *tool, double distance) {
if (tool->current_client) { if (tool->current_client) {
zwp_tablet_tool_v2_send_distance(tool->current_client->resource, zwp_tablet_tool_v2_send_distance(tool->current_client->resource,
distance); distance * 65535);
queue_tool_frame(tool->current_client); queue_tool_frame(tool->current_client);
} }
@ -445,13 +445,13 @@ void wlr_send_tablet_v2_tablet_tool_rotation(
} }
void wlr_send_tablet_v2_tablet_tool_slider( void wlr_send_tablet_v2_tablet_tool_slider(
struct wlr_tablet_v2_tablet_tool *tool, int32_t position) { struct wlr_tablet_v2_tablet_tool *tool, double position) {
if (!tool->current_client) { if (!tool->current_client) {
return; return;
} }
zwp_tablet_tool_v2_send_slider(tool->current_client->resource, zwp_tablet_tool_v2_send_slider(tool->current_client->resource,
position); position * 65535);
queue_tool_frame(tool->current_client); queue_tool_frame(tool->current_client);
} }