callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk: Convert mouse position to doubles, add new getters

Browse Source 
We've long had double precision mouse coordinates on wayland (e.g.
when rotating a window) but with the new scaling we even have it on
X (and, its also in Xinput2), so convert all the internal mouse/device
position getters to use doubles and add new accessors for the
public APIs that take doubles instead of ints.
This commit is contained in:
Alexander Larsson
2013-07-03 11:52:58 +02:00
parent 867ba1df27
commit e8b38fedbd
23 changed files with 387 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
gdk/x11/gdkdevice-core-x11.c
View File

@ -17,6 +17,7 @@
#include "config.h"
#include "gdkx11device-core.h"
#include "gdkdeviceprivate.h"
@ -25,6 +26,11 @@
#include "gdkprivate-x11.h"
#include "gdkasync.h"
#include <math.h>
/* for the use of round() */
#include "fallback-c89.c"
struct _GdkX11DeviceCore
{
GdkDevice parent_instance;
@ -50,16 +56,16 @@ static void gdk_x11_device_core_set_window_cursor (GdkDevice *device,
GdkCursor *cursor);
static void gdk_x11_device_core_warp (GdkDevice *device,
GdkScreen *screen,
gint x,
gint y);
gdouble x,
gdouble y);
static void gdk_x11_device_core_query_state (GdkDevice *device,
GdkWindow *window,
GdkWindow **root_window,
GdkWindow **child_window,
gint *root_x,
gint *root_y,
gint *win_x,
gint *win_y,
gdouble *root_x,
gdouble *root_y,
gdouble *win_x,
gdouble *win_y,
GdkModifierType *mask);
static GdkGrabStatus gdk_x11_device_core_grab (GdkDevice *device,
GdkWindow *window,
@ -71,8 +77,8 @@ static GdkGrabStatus gdk_x11_device_core_grab (GdkDevice *device,
static void gdk_x11_device_core_ungrab (GdkDevice *device,
guint32 time_);
static GdkWindow * gdk_x11_device_core_window_at_position (GdkDevice *device,
gint *win_x,
gint *win_y,
gdouble *win_x,
gdouble *win_y,
GdkModifierType *mask,
gboolean get_toplevel);
static void gdk_x11_device_core_select_window_events (GdkDevice *device,
@ -196,15 +202,14 @@ gdk_x11_device_core_get_state (GdkDevice *device,
gdouble *axes,
GdkModifierType *mask)
{
gint x_int, y_int;
gdouble x, y;
/* TODO: This rounds the coords, should use double */
gdk_window_get_device_position (window, device, &x_int, &y_int, mask);
gdk_window_get_device_position_double (window, device, &x, &y, mask);
if (axes)
{
axes[0] = x_int;
axes[1] = y_int;
axes[0] = x;
axes[1] = y;
}
}
@ -228,8 +233,8 @@ gdk_x11_device_core_set_window_cursor (GdkDevice *device,
static void
gdk_x11_device_core_warp (GdkDevice *device,
GdkScreen *screen,
gint x,
gint y)
gdouble x,
gdouble y)
{
Display *xdisplay;
Window dest;
@ -238,8 +243,8 @@ gdk_x11_device_core_warp (GdkDevice *device,
dest = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));
XWarpPointer (xdisplay, None, dest, 0, 0, 0, 0,
x * GDK_X11_SCREEN (screen)->window_scale,
y * GDK_X11_SCREEN (screen)->window_scale);
round (x * GDK_X11_SCREEN (screen)->window_scale),
round (y * GDK_X11_SCREEN (screen)->window_scale));
}
static void
@ -247,10 +252,10 @@ gdk_x11_device_core_query_state (GdkDevice *device,
GdkWindow *window,
GdkWindow **root_window,
GdkWindow **child_window,
gint *root_x,
gint *root_y,
gint *win_x,
gint *win_y,
gdouble *root_x,
gdouble *root_y,
gdouble *win_x,
gdouble *win_y,
GdkModifierType *mask)
{
GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
@ -299,16 +304,16 @@ gdk_x11_device_core_query_state (GdkDevice *device,
*child_window = gdk_x11_window_lookup_for_display (display, xchild_window);
if (root_x)
*root_x = xroot_x / impl->window_scale;
*root_x = (double)xroot_x / impl->window_scale;
if (root_y)
*root_y = xroot_y / impl->window_scale;
*root_y = (double)xroot_y / impl->window_scale;
if (win_x)
*win_x = xwin_x / impl->window_scale;
*win_x = (double)xwin_x / impl->window_scale;
if (win_y)
*win_y = xwin_y / impl->window_scale;
*win_y = (double)xwin_y / impl->window_scale;
if (mask)
*mask = xmask;
@ -416,8 +421,8 @@ gdk_x11_device_core_ungrab (GdkDevice *device,
static GdkWindow *
gdk_x11_device_core_window_at_position (GdkDevice *device,
gint *win_x,
gint *win_y,
gdouble *win_x,
gdouble *win_y,
GdkModifierType *mask,
gboolean get_toplevel)
{
@ -547,10 +552,10 @@ gdk_x11_device_core_window_at_position (GdkDevice *device,
impl = GDK_WINDOW_IMPL_X11 (window->impl);
if (win_x)
*win_x = (window) ? xwin_x / impl->window_scale : -1;
*win_x = (window) ? (double)xwin_x / impl->window_scale : -1;
if (win_y)
*win_y = (window) ? xwin_y / impl->window_scale : -1;
*win_y = (window) ? (double)xwin_y / impl->window_scale : -1;
if (mask)
*mask = xmask;

52
gdk/x11/gdkdevice-xi2.c
View File

@ -29,6 +29,10 @@
#include <X11/Xutil.h>
#include <X11/extensions/XInput2.h>
#include <math.h>
/* for the use of round() */
#include "fallback-c89.c"
typedef struct _ScrollValuator ScrollValuator;
@ -76,16 +80,16 @@ static void gdk_x11_device_xi2_set_window_cursor (GdkDevice *device,
GdkCursor *cursor);
static void gdk_x11_device_xi2_warp (GdkDevice *device,
GdkScreen *screen,
gint x,
gint y);
gdouble x,
gdouble y);
static void gdk_x11_device_xi2_query_state (GdkDevice *device,
GdkWindow *window,
GdkWindow **root_window,
GdkWindow **child_window,
gint *root_x,
gint *root_y,
gint *win_x,
gint *win_y,
gdouble *root_x,
gdouble *root_y,
gdouble *win_x,
gdouble *win_y,
GdkModifierType *mask);
static GdkGrabStatus gdk_x11_device_xi2_grab (GdkDevice *device,
@ -99,8 +103,8 @@ static void gdk_x11_device_xi2_ungrab (GdkDevice *device,
guint32 time_);
static GdkWindow * gdk_x11_device_xi2_window_at_position (GdkDevice *device,
gint *win_x,
gint *win_y,
gdouble *win_x,
gdouble *win_y,
GdkModifierType *mask,
gboolean get_toplevel);
static void gdk_x11_device_xi2_select_window_events (GdkDevice *device,
@ -292,8 +296,8 @@ gdk_x11_device_xi2_set_window_cursor (GdkDevice *device,
static void
gdk_x11_device_xi2_warp (GdkDevice *device,
GdkScreen *screen,
gint x,
gint y)
gdouble x,
gdouble y)
{
GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device);
Window dest;
@ -304,8 +308,8 @@ gdk_x11_device_xi2_warp (GdkDevice *device,
device_xi2->device_id,
None, dest,
0, 0, 0, 0,
x * GDK_X11_SCREEN(screen)->window_scale,
y * GDK_X11_SCREEN(screen)->window_scale);
round (x * GDK_X11_SCREEN(screen)->window_scale),
round (y * GDK_X11_SCREEN(screen)->window_scale));
}
static void
@ -313,10 +317,10 @@ gdk_x11_device_xi2_query_state (GdkDevice *device,
GdkWindow *window,
GdkWindow **root_window,
GdkWindow **child_window,
gint *root_x,
gint *root_y,
gint *win_x,
gint *win_y,
gdouble *root_x,
gdouble *root_y,
gdouble *win_x,
gdouble *win_y,
GdkModifierType *mask)
{
GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
@ -384,16 +388,16 @@ gdk_x11_device_xi2_query_state (GdkDevice *device,
*child_window = gdk_x11_window_lookup_for_display (display, xchild_window);
if (root_x)
*root_x = (gint) (xroot_x / impl->window_scale);
*root_x = xroot_x / impl->window_scale;
if (root_y)
*root_y = (gint) (xroot_y / impl->window_scale);
*root_y = xroot_y / impl->window_scale;
if (win_x)
*win_x = (gint) (xwin_x / impl->window_scale);
*win_x = xwin_x / impl->window_scale;
if (win_y)
*win_y = (gint) (xwin_y / impl->window_scale);
*win_y = xwin_y / impl->window_scale;
if (mask)
*mask = _gdk_x11_device_xi2_translate_state (&mod_state, &button_state, &group_state);
@ -477,8 +481,8 @@ gdk_x11_device_xi2_ungrab (GdkDevice *device,
static GdkWindow *
gdk_x11_device_xi2_window_at_position (GdkDevice *device,
gint *win_x,
gint *win_y,
gdouble *win_x,
gdouble *win_y,
GdkModifierType *mask,
gboolean get_toplevel)
{
@ -633,10 +637,10 @@ gdk_x11_device_xi2_window_at_position (GdkDevice *device,
impl = GDK_WINDOW_IMPL_X11 (window->impl);
if (win_x)
*win_x = (window) ? (gint) (xwin_x / impl->window_scale) : -1;
*win_x = (window) ? (xwin_x / impl->window_scale) : -1;
if (win_y)
*win_y = (window) ? (gint) (xwin_y / impl->window_scale) : -1;
*win_y = (window) ? (xwin_y / impl->window_scale) : -1;
if (mask)
*mask = _gdk_x11_device_xi2_translate_state (&mod_state, &button_state, &group_state);

4
gdk/x11/gdkwindow-x11.c
View File

@ -3240,8 +3240,8 @@ gdk_x11_window_get_frame_extents (GdkWindow *window,
static gboolean
gdk_window_x11_get_device_state (GdkWindow *window,
GdkDevice *device,
gint *x,
gint *y,
gdouble *x,
gdouble *y,
GdkModifierType *mask)
{
GdkWindow *child;