AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity
7aae92656d
gtk2/gdk/x11/gdkdevice-xi2.c

879 lines
27 KiB
C
Raw Normal View History

Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
/* GDK - The GIMP Drawing Kit
* Copyright (C) 2009 Carlos Garnacho <carlosg@gnome.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
Change FSF Address
2012-02-27 13:01:10 +00:00
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
*/
#include "config.h"
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
#include "gdkx11device-xi2.h"
Detangle includes for device subclasses
2010-12-21 15:37:21 +00:00
#include "gdkdeviceprivate.h"
Inclusion cleanups in sources Try to do inclusions in the same sequence, more or less.
2010-10-15 02:05:51 +00:00
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
#include "gdkintl.h"
Make GdkDevice parallel-implementable Use the grab and ungrab vfuncs from the frontend instead of the _gdk_windowing wrappers, and move some things around accordingly. Again, only the X11 backend has been updated, other backends need to be updated to match.
2010-12-10 17:13:25 +00:00
#include "gdkasync.h"
Clean up gdkx.h a bit Moving the direct-access redefinitions of various macros to gdkprivate-x11.h and use that header throughout in x11/. Also remove a workaround for a long-fixed X server bug.
2010-12-16 03:09:35 +00:00
#include "gdkprivate-x11.h"
Remove gdk_window_add_filter Drop the public filtering API. The x11 backend already has the ::xevent signal as replacement. The win32 backend needs a similar signal to replace filtering. Reshuffle header inclusions in the x11 backend a little bit to avoid a cyclic inclusion between gdkprivate-x11.h and gdkdisplay-x11.h that is otherwise causing problems.
2018-02-07 05:00:01 +00:00
#include "gdkdisplay-x11.h"
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Use free() to free XIButtonState.mask XIQueryPointer() allocates it using malloc() (without any mention in the documentation...).
2011-01-30 04:26:34 +00:00
#include <stdlib.h>
More include shuffling; keep X extension headers to ourselves
2010-12-21 19:17:02 +00:00
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/extensions/XInput2.h>
gdk: Convert mouse position to doubles, add new getters 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.
2013-07-03 09:52:58 +00:00
#include <math.h>
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
typedef struct _ScrollValuator ScrollValuator;
struct _ScrollValuator
{
guint n_valuator : 4;
guint direction : 4;
Revert "x11: Query pointer devices' scroll valuators on toplevel enter events" This reverts commit 77b8495bc4e51826afa451914d6a3b0df1b62a24. The commit broke more scenarios than fixed, better to go back to square one.
2015-07-15 19:19:25 +00:00
guint last_value_valid : 1;
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
gdouble last_value;
xi2: Normalize scroll deltas XI2 provides us with an increment for each scroll valuator, and by dividing the delta by the increment, we obtain normalized values in some abstract 'scroll unit'. For mouse wheels, the evdev driver reports an increment of -1, so doing this division fixes the inverted scrolling with wheels that we've seen recently.
2012-03-05 00:12:27 +00:00
gdouble increment;
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
};
Detangle includes for device subclasses
2010-12-21 15:37:21 +00:00
struct _GdkX11DeviceXI2
{
GdkDevice parent_instance;
gint device_id;
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
GArray *scroll_valuators;
x11: Store last axes from device And use these for the missing axes if the valuator mask is incomplete. This used to work fine on tablets because the Wacom driver ensures all valuators are sent, which is not true if using the evdev driver. https://bugzilla.gnome.org/show_bug.cgi?id=703610
2015-03-02 17:19:16 +00:00
gdouble *last_axes;
Detangle includes for device subclasses
2010-12-21 15:37:21 +00:00
};
struct _GdkX11DeviceXI2Class
{
GdkDeviceClass parent_class;
};
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
x11: Make headers identical no matter if we run with or without XI2 Previously we weren't installing the device headers when compiling without XINPUT support. But we would include them from gdkx.h, so essentially the build was broken. With this patch the types will exist but not do anything.
2011-02-12 00:27:40 +00:00
G_DEFINE_TYPE (GdkX11DeviceXI2, gdk_x11_device_xi2, GDK_TYPE_DEVICE)
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
static void gdk_x11_device_xi2_finalize (GObject *object);
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
static void gdk_x11_device_xi2_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
static void gdk_x11_device_xi2_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec);
static void gdk_x11_device_xi2_get_state (GdkDevice *device,
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GdkSurface *surface,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gdouble *axes,
GdkModifierType *mask);
GdkSurface: Rename various functions and variables This is an automatic rename of various things related to the window->surface rename. Public symbols changed by this is: GDK_MODE_WINDOW gdk_device_get_window_at_position gdk_device_get_window_at_position_double gdk_device_get_last_event_window gdk_display_get_monitor_at_window gdk_drag_context_get_source_window gdk_drag_context_get_dest_window gdk_drag_context_get_drag_window gdk_draw_context_get_window gdk_drawing_context_get_window gdk_gl_context_get_window gdk_synthesize_window_state gdk_surface_get_window_type gdk_x11_display_set_window_scale gsk_renderer_new_for_window gsk_renderer_get_window gtk_text_view_buffer_to_window_coords gtk_tree_view_convert_widget_to_bin_window_coords gtk_tree_view_convert_tree_to_bin_window_coords The commands that generated this are: git sed -f g "GDK window" "GDK surface" git sed -f g window_impl surface_impl (cd gdk; git sed -f g impl_window impl_surface) git sed -f g WINDOW_IMPL SURFACE_IMPL git sed -f g GDK_MODE_WINDOW GDK_MODE_SURFACE git sed -f g gdk_draw_context_get_window gdk_draw_context_get_surface git sed -f g gdk_drawing_context_get_window gdk_drawing_context_get_surface git sed -f g gdk_gl_context_get_window gdk_gl_context_get_surface git sed -f g gsk_renderer_get_window gsk_renderer_get_surface git sed -f g gsk_renderer_new_for_window gsk_renderer_new_for_surface (cd gdk; git sed -f g window_type surface_type) git sed -f g gdk_surface_get_window_type gdk_surface_get_surface_type git sed -f g window_at_position surface_at_position git sed -f g event_window event_surface git sed -f g window_coord surface_coord git sed -f g window_state surface_state git sed -f g window_cursor surface_cursor git sed -f g window_scale surface_scale git sed -f g window_events surface_events git sed -f g monitor_at_window monitor_at_surface git sed -f g window_under_pointer surface_under_pointer (cd gdk; git sed -f g for_window for_surface) git sed -f g window_anchor surface_anchor git sed -f g WINDOW_IS_TOPLEVEL SURFACE_IS_TOPLEVEL git sed -f g native_window native_surface git sed -f g source_window source_surface git sed -f g dest_window dest_surface git sed -f g drag_window drag_surface git sed -f g input_window input_surface git checkout NEWS* po-properties po docs/reference/gtk/migrating-3to4.xml
2018-03-20 11:05:26 +00:00
static void gdk_x11_device_xi2_set_surface_cursor (GdkDevice *device,
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GdkSurface *surface,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkCursor *cursor);
gdk: Make query_state() vfunc a void vfunc ... and make sure the backends implement it that way. query_state() return value was ignored in all of GDK and caused crashes when it failed.
2012-03-09 12:20:41 +00:00
static void gdk_x11_device_xi2_query_state (GdkDevice *device,
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GdkSurface *surface,
GdkSurface **child_surface,
gdk: Convert mouse position to doubles, add new getters 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.
2013-07-03 09:52:58 +00:00
gdouble *root_x,
gdouble *root_y,
gdouble *win_x,
gdouble *win_y,
gdk: Make query_state() vfunc a void vfunc ... and make sure the backends implement it that way. query_state() return value was ignored in all of GDK and caused crashes when it failed.
2012-03-09 12:20:41 +00:00
GdkModifierType *mask);
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
static GdkGrabStatus gdk_x11_device_xi2_grab (GdkDevice *device,
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GdkSurface *surface,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gboolean owner_events,
GdkEventMask event_mask,
GdkWindow -> GdkSurface initial type rename This renames the GdkWindow class and related classes (impl, backend subclasses) to surface. Additionally it renames related types: GdkWindowAttr, GdkWindowPaint, GdkWindowWindowClass, GdkWindowType, GdkWindowTypeHint, GdkWindowHints, GdkWindowState, GdkWindowEdge This is an automatic conversion using the below commands: git sed -f g GdkWindowWindowClass GdkSurfaceSurfaceClass git sed -f g GdkWindow GdkSurface git sed -f g "gdk_window\([ _\(\),;]\|$\)" "gdk_surface\1" # Avoid hitting gdk_windowing git sed -f g "GDK_WINDOW\([ _\(]\|$\)" "GDK_SURFACE\1" # Avoid hitting GDK_WINDOWING git sed "GDK_\([A-Z]*\)IS_WINDOW\([_ (]\|$\)" "GDK_\1IS_SURFACE\2" git sed GDK_TYPE_WINDOW GDK_TYPE_SURFACE git sed -f g GdkPointerWindowInfo GdkPointerSurfaceInfo git sed -f g "BROADWAY_WINDOW" "BROADWAY_SURFACE" git sed -f g "broadway_window" "broadway_surface" git sed -f g "BroadwayWindow" "BroadwaySurface" git sed -f g "WAYLAND_WINDOW" "WAYLAND_SURFACE" git sed -f g "wayland_window" "wayland_surface" git sed -f g "WaylandWindow" "WaylandSurface" git sed -f g "X11_WINDOW" "X11_SURFACE" git sed -f g "x11_window" "x11_surface" git sed -f g "X11Window" "X11Surface" git sed -f g "WIN32_WINDOW" "WIN32_SURFACE" git sed -f g "win32_window" "win32_surface" git sed -f g "Win32Window" "Win32Surface" git sed -f g "QUARTZ_WINDOW" "QUARTZ_SURFACE" git sed -f g "quartz_window" "quartz_surface" git sed -f g "QuartzWindow" "QuartzSurface" git checkout NEWS* po-properties
2018-03-20 10:40:08 +00:00
GdkSurface *confine_to,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkCursor *cursor,
guint32 time_);
static void gdk_x11_device_xi2_ungrab (GdkDevice *device,
guint32 time_);
GdkSurface: Rename various functions and variables This is an automatic rename of various things related to the window->surface rename. Public symbols changed by this is: GDK_MODE_WINDOW gdk_device_get_window_at_position gdk_device_get_window_at_position_double gdk_device_get_last_event_window gdk_display_get_monitor_at_window gdk_drag_context_get_source_window gdk_drag_context_get_dest_window gdk_drag_context_get_drag_window gdk_draw_context_get_window gdk_drawing_context_get_window gdk_gl_context_get_window gdk_synthesize_window_state gdk_surface_get_window_type gdk_x11_display_set_window_scale gsk_renderer_new_for_window gsk_renderer_get_window gtk_text_view_buffer_to_window_coords gtk_tree_view_convert_widget_to_bin_window_coords gtk_tree_view_convert_tree_to_bin_window_coords The commands that generated this are: git sed -f g "GDK window" "GDK surface" git sed -f g window_impl surface_impl (cd gdk; git sed -f g impl_window impl_surface) git sed -f g WINDOW_IMPL SURFACE_IMPL git sed -f g GDK_MODE_WINDOW GDK_MODE_SURFACE git sed -f g gdk_draw_context_get_window gdk_draw_context_get_surface git sed -f g gdk_drawing_context_get_window gdk_drawing_context_get_surface git sed -f g gdk_gl_context_get_window gdk_gl_context_get_surface git sed -f g gsk_renderer_get_window gsk_renderer_get_surface git sed -f g gsk_renderer_new_for_window gsk_renderer_new_for_surface (cd gdk; git sed -f g window_type surface_type) git sed -f g gdk_surface_get_window_type gdk_surface_get_surface_type git sed -f g window_at_position surface_at_position git sed -f g event_window event_surface git sed -f g window_coord surface_coord git sed -f g window_state surface_state git sed -f g window_cursor surface_cursor git sed -f g window_scale surface_scale git sed -f g window_events surface_events git sed -f g monitor_at_window monitor_at_surface git sed -f g window_under_pointer surface_under_pointer (cd gdk; git sed -f g for_window for_surface) git sed -f g window_anchor surface_anchor git sed -f g WINDOW_IS_TOPLEVEL SURFACE_IS_TOPLEVEL git sed -f g native_window native_surface git sed -f g source_window source_surface git sed -f g dest_window dest_surface git sed -f g drag_window drag_surface git sed -f g input_window input_surface git checkout NEWS* po-properties po docs/reference/gtk/migrating-3to4.xml
2018-03-20 11:05:26 +00:00
static GdkSurface * gdk_x11_device_xi2_surface_at_position (GdkDevice *device,
gdk: Convert mouse position to doubles, add new getters 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.
2013-07-03 09:52:58 +00:00
gdouble *win_x,
gdouble *win_y,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkModifierType *mask,
gboolean get_toplevel);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
enum {
PROP_0,
PROP_DEVICE_ID
};
static void
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gdk_x11_device_xi2_class_init (GdkX11DeviceXI2Class *klass)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
object_class->finalize = gdk_x11_device_xi2_finalize;
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
object_class->get_property = gdk_x11_device_xi2_get_property;
object_class->set_property = gdk_x11_device_xi2_set_property;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
device_class->get_state = gdk_x11_device_xi2_get_state;
GdkSurface: Rename various functions and variables This is an automatic rename of various things related to the window->surface rename. Public symbols changed by this is: GDK_MODE_WINDOW gdk_device_get_window_at_position gdk_device_get_window_at_position_double gdk_device_get_last_event_window gdk_display_get_monitor_at_window gdk_drag_context_get_source_window gdk_drag_context_get_dest_window gdk_drag_context_get_drag_window gdk_draw_context_get_window gdk_drawing_context_get_window gdk_gl_context_get_window gdk_synthesize_window_state gdk_surface_get_window_type gdk_x11_display_set_window_scale gsk_renderer_new_for_window gsk_renderer_get_window gtk_text_view_buffer_to_window_coords gtk_tree_view_convert_widget_to_bin_window_coords gtk_tree_view_convert_tree_to_bin_window_coords The commands that generated this are: git sed -f g "GDK window" "GDK surface" git sed -f g window_impl surface_impl (cd gdk; git sed -f g impl_window impl_surface) git sed -f g WINDOW_IMPL SURFACE_IMPL git sed -f g GDK_MODE_WINDOW GDK_MODE_SURFACE git sed -f g gdk_draw_context_get_window gdk_draw_context_get_surface git sed -f g gdk_drawing_context_get_window gdk_drawing_context_get_surface git sed -f g gdk_gl_context_get_window gdk_gl_context_get_surface git sed -f g gsk_renderer_get_window gsk_renderer_get_surface git sed -f g gsk_renderer_new_for_window gsk_renderer_new_for_surface (cd gdk; git sed -f g window_type surface_type) git sed -f g gdk_surface_get_window_type gdk_surface_get_surface_type git sed -f g window_at_position surface_at_position git sed -f g event_window event_surface git sed -f g window_coord surface_coord git sed -f g window_state surface_state git sed -f g window_cursor surface_cursor git sed -f g window_scale surface_scale git sed -f g window_events surface_events git sed -f g monitor_at_window monitor_at_surface git sed -f g window_under_pointer surface_under_pointer (cd gdk; git sed -f g for_window for_surface) git sed -f g window_anchor surface_anchor git sed -f g WINDOW_IS_TOPLEVEL SURFACE_IS_TOPLEVEL git sed -f g native_window native_surface git sed -f g source_window source_surface git sed -f g dest_window dest_surface git sed -f g drag_window drag_surface git sed -f g input_window input_surface git checkout NEWS* po-properties po docs/reference/gtk/migrating-3to4.xml
2018-03-20 11:05:26 +00:00
device_class->set_surface_cursor = gdk_x11_device_xi2_set_surface_cursor;
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
device_class->query_state = gdk_x11_device_xi2_query_state;
device_class->grab = gdk_x11_device_xi2_grab;
device_class->ungrab = gdk_x11_device_xi2_ungrab;
GdkSurface: Rename various functions and variables This is an automatic rename of various things related to the window->surface rename. Public symbols changed by this is: GDK_MODE_WINDOW gdk_device_get_window_at_position gdk_device_get_window_at_position_double gdk_device_get_last_event_window gdk_display_get_monitor_at_window gdk_drag_context_get_source_window gdk_drag_context_get_dest_window gdk_drag_context_get_drag_window gdk_draw_context_get_window gdk_drawing_context_get_window gdk_gl_context_get_window gdk_synthesize_window_state gdk_surface_get_window_type gdk_x11_display_set_window_scale gsk_renderer_new_for_window gsk_renderer_get_window gtk_text_view_buffer_to_window_coords gtk_tree_view_convert_widget_to_bin_window_coords gtk_tree_view_convert_tree_to_bin_window_coords The commands that generated this are: git sed -f g "GDK window" "GDK surface" git sed -f g window_impl surface_impl (cd gdk; git sed -f g impl_window impl_surface) git sed -f g WINDOW_IMPL SURFACE_IMPL git sed -f g GDK_MODE_WINDOW GDK_MODE_SURFACE git sed -f g gdk_draw_context_get_window gdk_draw_context_get_surface git sed -f g gdk_drawing_context_get_window gdk_drawing_context_get_surface git sed -f g gdk_gl_context_get_window gdk_gl_context_get_surface git sed -f g gsk_renderer_get_window gsk_renderer_get_surface git sed -f g gsk_renderer_new_for_window gsk_renderer_new_for_surface (cd gdk; git sed -f g window_type surface_type) git sed -f g gdk_surface_get_window_type gdk_surface_get_surface_type git sed -f g window_at_position surface_at_position git sed -f g event_window event_surface git sed -f g window_coord surface_coord git sed -f g window_state surface_state git sed -f g window_cursor surface_cursor git sed -f g window_scale surface_scale git sed -f g window_events surface_events git sed -f g monitor_at_window monitor_at_surface git sed -f g window_under_pointer surface_under_pointer (cd gdk; git sed -f g for_window for_surface) git sed -f g window_anchor surface_anchor git sed -f g WINDOW_IS_TOPLEVEL SURFACE_IS_TOPLEVEL git sed -f g native_window native_surface git sed -f g source_window source_surface git sed -f g dest_window dest_surface git sed -f g drag_window drag_surface git sed -f g input_window input_surface git checkout NEWS* po-properties po docs/reference/gtk/migrating-3to4.xml
2018-03-20 11:05:26 +00:00
device_class->surface_at_position = gdk_x11_device_xi2_surface_at_position;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
g_object_class_install_property (object_class,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
PROP_DEVICE_ID,
g_param_spec_int ("device-id",
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
P_("Device ID"),
P_("Device identifier"),
0, G_MAXINT, 0,
gdk: Use G_PARAM_SPEC_STATIC_STRINGS throughout This avoids some string copies at startup.
2017-11-18 02:38:08 +00:00
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
static void
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gdk_x11_device_xi2_init (GdkX11DeviceXI2 *device)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
device->scroll_valuators = g_array_new (FALSE, FALSE, sizeof (ScrollValuator));
}
static void
gdk_x11_device_xi2_finalize (GObject *object)
{
GdkX11DeviceXI2 *device = GDK_X11_DEVICE_XI2 (object);
g_array_free (device->scroll_valuators, TRUE);
x11: Store last axes from device And use these for the missing axes if the valuator mask is incomplete. This used to work fine on tablets because the Wacom driver ensures all valuators are sent, which is not true if using the evdev driver. https://bugzilla.gnome.org/show_bug.cgi?id=703610
2015-03-02 17:19:16 +00:00
g_free (device->last_axes);
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
G_OBJECT_CLASS (gdk_x11_device_xi2_parent_class)->finalize (object);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
static void
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gdk_x11_device_xi2_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (object);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
switch (prop_id)
{
case PROP_DEVICE_ID:
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
g_value_set_int (value, device_xi2->device_id);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gdk_x11_device_xi2_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (object);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
switch (prop_id)
{
case PROP_DEVICE_ID:
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
device_xi2->device_id = g_value_get_int (value);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gdk_x11_device_xi2_get_state (GdkDevice *device,
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GdkSurface *surface,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gdouble *axes,
GdkModifierType *mask)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (axes)
{
gdk: gdk_x11_device_xi2_get_state(): move stuff to local scope
2011-02-27 14:06:41 +00:00
GdkDisplay *display;
XIDeviceInfo *info;
gint i, j, ndevices;
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
Screen *xscreen;
gdk: gdk_x11_device_xi2_get_state(): move stuff to local scope
2011-02-27 14:06:41 +00:00
display = gdk_device_get_display (device);
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
xscreen = GDK_X11_SCREEN (GDK_X11_DISPLAY (display)->screen)->xscreen;
gdk: gdk_x11_device_xi2_get_state(): move stuff to local scope
2011-02-27 14:06:41 +00:00
XI2: Push error traps around XIQueryDevice calls This may help against the crashes at resume time that some people have been hitting when input devices mysteriously disappear.
2011-11-30 05:16:43 +00:00
gdk_x11_display_error_trap_push (display);
gdk: gdk_x11_device_xi2_get_state(): move stuff to local scope
2011-02-27 14:06:41 +00:00
info = XIQueryDevice (GDK_DISPLAY_XDISPLAY (display),
device_xi2->device_id, &ndevices);
XI2: Push error traps around XIQueryDevice calls This may help against the crashes at resume time that some people have been hitting when input devices mysteriously disappear.
2011-11-30 05:16:43 +00:00
gdk_x11_display_error_trap_pop_ignored (display);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
XI2: Push error traps around XIQueryDevice calls This may help against the crashes at resume time that some people have been hitting when input devices mysteriously disappear.
2011-11-30 05:16:43 +00:00
for (i = 0, j = 0; info && i < info->num_classes; i++)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
XIAnyClassInfo *class_info = info->classes[i];
GdkAxisUse use;
gdouble value;
if (class_info->type != XIValuatorClass)
continue;
value = ((XIValuatorClassInfo *) class_info)->value;
GdkDevice: Remove duplicate private function _gdk_device_get_axis_use() dates back to pre-sealing, when the xi2 work began, this remaining can be gone with a public gdk_device_get_axis_use() function already in place.
2011-04-08 14:23:39 +00:00
use = gdk_device_get_axis_use (device, j);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
build: Enable -Wswitch-enum and -Wswitch-default This patch makes that work using 1 of 2 options: 1. Add all missing enums to the switch statement or 2. Cast the switch argument to a uint to avoid having to do that (mostly for GdkEventType). I even found a bug while doing that: clearing a GtkImage with a surface did not notify thae surface property. The reason for enabling this flag even though it is tedious at times is that it is very useful when adding values to an enum, because it makes GTK immediately warn about all the switch statements where this enum is relevant. And I expect changes to enums to be frequent during the GTK4 development cycle.
2017-10-06 19:19:42 +00:00
switch ((guint) use)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
case GDK_AXIS_X:
case GDK_AXIS_Y:
case GDK_AXIS_IGNORE:
GdkSurface: Rename various functions and variables This is an automatic rename of various things related to the window->surface rename. Public symbols changed by this is: GDK_MODE_WINDOW gdk_device_get_window_at_position gdk_device_get_window_at_position_double gdk_device_get_last_event_window gdk_display_get_monitor_at_window gdk_drag_context_get_source_window gdk_drag_context_get_dest_window gdk_drag_context_get_drag_window gdk_draw_context_get_window gdk_drawing_context_get_window gdk_gl_context_get_window gdk_synthesize_window_state gdk_surface_get_window_type gdk_x11_display_set_window_scale gsk_renderer_new_for_window gsk_renderer_get_window gtk_text_view_buffer_to_window_coords gtk_tree_view_convert_widget_to_bin_window_coords gtk_tree_view_convert_tree_to_bin_window_coords The commands that generated this are: git sed -f g "GDK window" "GDK surface" git sed -f g window_impl surface_impl (cd gdk; git sed -f g impl_window impl_surface) git sed -f g WINDOW_IMPL SURFACE_IMPL git sed -f g GDK_MODE_WINDOW GDK_MODE_SURFACE git sed -f g gdk_draw_context_get_window gdk_draw_context_get_surface git sed -f g gdk_drawing_context_get_window gdk_drawing_context_get_surface git sed -f g gdk_gl_context_get_window gdk_gl_context_get_surface git sed -f g gsk_renderer_get_window gsk_renderer_get_surface git sed -f g gsk_renderer_new_for_window gsk_renderer_new_for_surface (cd gdk; git sed -f g window_type surface_type) git sed -f g gdk_surface_get_window_type gdk_surface_get_surface_type git sed -f g window_at_position surface_at_position git sed -f g event_window event_surface git sed -f g window_coord surface_coord git sed -f g window_state surface_state git sed -f g window_cursor surface_cursor git sed -f g window_scale surface_scale git sed -f g window_events surface_events git sed -f g monitor_at_window monitor_at_surface git sed -f g window_under_pointer surface_under_pointer (cd gdk; git sed -f g for_window for_surface) git sed -f g window_anchor surface_anchor git sed -f g WINDOW_IS_TOPLEVEL SURFACE_IS_TOPLEVEL git sed -f g native_window native_surface git sed -f g source_window source_surface git sed -f g dest_window dest_surface git sed -f g drag_window drag_surface git sed -f g input_window input_surface git checkout NEWS* po-properties po docs/reference/gtk/migrating-3to4.xml
2018-03-20 11:05:26 +00:00
if (gdk_device_get_mode (device) == GDK_MODE_SURFACE)
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
_gdk_device_translate_surface_coord (device, surface, j, value, &axes[j]);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
else
{
gint root_x, root_y;
/* FIXME: Maybe root coords chaching should happen here */
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
gdk_surface_get_origin (surface, &root_x, &root_y);
_gdk_device_translate_screen_coord (device, surface,
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
root_x, root_y,
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
WidthOfScreen (xscreen),
HeightOfScreen (xscreen),
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
j, value,
&axes[j]);
}
break;
default:
_gdk_device_translate_axis (device, j, value, &axes[j]);
break;
}
j++;
}
XI2: Push error traps around XIQueryDevice calls This may help against the crashes at resume time that some people have been hitting when input devices mysteriously disappear.
2011-11-30 05:16:43 +00:00
if (info)
XIFreeDeviceInfo (info);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
if (mask)
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
gdk_x11_device_xi2_query_state (device, surface,
Drop root windows from some internal apis _gdk_device_query_state was needlessly shuffling root windows around.
2017-08-08 19:43:03 +00:00
NULL,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
NULL, NULL,
NULL, NULL,
mask);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
static void
GdkSurface: Rename various functions and variables This is an automatic rename of various things related to the window->surface rename. Public symbols changed by this is: GDK_MODE_WINDOW gdk_device_get_window_at_position gdk_device_get_window_at_position_double gdk_device_get_last_event_window gdk_display_get_monitor_at_window gdk_drag_context_get_source_window gdk_drag_context_get_dest_window gdk_drag_context_get_drag_window gdk_draw_context_get_window gdk_drawing_context_get_window gdk_gl_context_get_window gdk_synthesize_window_state gdk_surface_get_window_type gdk_x11_display_set_window_scale gsk_renderer_new_for_window gsk_renderer_get_window gtk_text_view_buffer_to_window_coords gtk_tree_view_convert_widget_to_bin_window_coords gtk_tree_view_convert_tree_to_bin_window_coords The commands that generated this are: git sed -f g "GDK window" "GDK surface" git sed -f g window_impl surface_impl (cd gdk; git sed -f g impl_window impl_surface) git sed -f g WINDOW_IMPL SURFACE_IMPL git sed -f g GDK_MODE_WINDOW GDK_MODE_SURFACE git sed -f g gdk_draw_context_get_window gdk_draw_context_get_surface git sed -f g gdk_drawing_context_get_window gdk_drawing_context_get_surface git sed -f g gdk_gl_context_get_window gdk_gl_context_get_surface git sed -f g gsk_renderer_get_window gsk_renderer_get_surface git sed -f g gsk_renderer_new_for_window gsk_renderer_new_for_surface (cd gdk; git sed -f g window_type surface_type) git sed -f g gdk_surface_get_window_type gdk_surface_get_surface_type git sed -f g window_at_position surface_at_position git sed -f g event_window event_surface git sed -f g window_coord surface_coord git sed -f g window_state surface_state git sed -f g window_cursor surface_cursor git sed -f g window_scale surface_scale git sed -f g window_events surface_events git sed -f g monitor_at_window monitor_at_surface git sed -f g window_under_pointer surface_under_pointer (cd gdk; git sed -f g for_window for_surface) git sed -f g window_anchor surface_anchor git sed -f g WINDOW_IS_TOPLEVEL SURFACE_IS_TOPLEVEL git sed -f g native_window native_surface git sed -f g source_window source_surface git sed -f g dest_window dest_surface git sed -f g drag_window drag_surface git sed -f g input_window input_surface git checkout NEWS* po-properties po docs/reference/gtk/migrating-3to4.xml
2018-03-20 11:05:26 +00:00
gdk_x11_device_xi2_set_surface_cursor (GdkDevice *device,
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GdkSurface *surface,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkCursor *cursor)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
/* Non-master devices don't have a cursor */
if (gdk_device_get_device_type (device) != GDK_DEVICE_TYPE_MASTER)
return;
if (cursor)
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
XIDefineCursor (GDK_SURFACE_XDISPLAY (surface),
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
device_xi2->device_id,
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GDK_SURFACE_XID (surface),
gdk_x11_display_get_xcursor (GDK_SURFACE_DISPLAY (surface), cursor));
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
else
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
XIUndefineCursor (GDK_SURFACE_XDISPLAY (surface),
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
device_xi2->device_id,
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GDK_SURFACE_XID (surface));
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
gdk: Make query_state() vfunc a void vfunc ... and make sure the backends implement it that way. query_state() return value was ignored in all of GDK and caused crashes when it failed.
2012-03-09 12:20:41 +00:00
static void
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gdk_x11_device_xi2_query_state (GdkDevice *device,
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GdkSurface *surface,
GdkSurface **child_surface,
gdk: Convert mouse position to doubles, add new getters 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.
2013-07-03 09:52:58 +00:00
gdouble *root_x,
gdouble *root_y,
gdouble *win_x,
gdouble *win_y,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkModifierType *mask)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
GdkDisplay *display;
x11: Stop using GdkScreen altogether Derive GdkX11Screen directly from GObject, and remove the last remaining uses of GdkScreen.
2017-11-17 15:37:52 +00:00
GdkX11Screen *default_screen;
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
Window xroot_window, xchild_window, xwindow;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
gdouble xroot_x, xroot_y, xwin_x, xwin_y;
XIButtonState button_state;
XIModifierState mod_state;
XIGroupState group_state;
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
int scale;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Allow passing a NULL window to gdk_device_query_state Interpret NULL as "root window" here - we only have one screen nowadays, so there is no choice involved, and this will let us avoid dealing with the root window in the fontend code.
2017-08-08 23:45:09 +00:00
display = gdk_device_get_display (device);
x11: Stop using gdk_display_get_default_screen There's no point in using this api here, we can directly get the screen member from the GdkX11Display struct.
2017-11-01 22:06:24 +00:00
default_screen = GDK_X11_DISPLAY (display)->screen;
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
if (surface == NULL)
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
{
xwindow = GDK_DISPLAY_XROOTWIN (display);
GdkSurface: Rename various functions and variables This is an automatic rename of various things related to the window->surface rename. Public symbols changed by this is: GDK_MODE_WINDOW gdk_device_get_window_at_position gdk_device_get_window_at_position_double gdk_device_get_last_event_window gdk_display_get_monitor_at_window gdk_drag_context_get_source_window gdk_drag_context_get_dest_window gdk_drag_context_get_drag_window gdk_draw_context_get_window gdk_drawing_context_get_window gdk_gl_context_get_window gdk_synthesize_window_state gdk_surface_get_window_type gdk_x11_display_set_window_scale gsk_renderer_new_for_window gsk_renderer_get_window gtk_text_view_buffer_to_window_coords gtk_tree_view_convert_widget_to_bin_window_coords gtk_tree_view_convert_tree_to_bin_window_coords The commands that generated this are: git sed -f g "GDK window" "GDK surface" git sed -f g window_impl surface_impl (cd gdk; git sed -f g impl_window impl_surface) git sed -f g WINDOW_IMPL SURFACE_IMPL git sed -f g GDK_MODE_WINDOW GDK_MODE_SURFACE git sed -f g gdk_draw_context_get_window gdk_draw_context_get_surface git sed -f g gdk_drawing_context_get_window gdk_drawing_context_get_surface git sed -f g gdk_gl_context_get_window gdk_gl_context_get_surface git sed -f g gsk_renderer_get_window gsk_renderer_get_surface git sed -f g gsk_renderer_new_for_window gsk_renderer_new_for_surface (cd gdk; git sed -f g window_type surface_type) git sed -f g gdk_surface_get_window_type gdk_surface_get_surface_type git sed -f g window_at_position surface_at_position git sed -f g event_window event_surface git sed -f g window_coord surface_coord git sed -f g window_state surface_state git sed -f g window_cursor surface_cursor git sed -f g window_scale surface_scale git sed -f g window_events surface_events git sed -f g monitor_at_window monitor_at_surface git sed -f g window_under_pointer surface_under_pointer (cd gdk; git sed -f g for_window for_surface) git sed -f g window_anchor surface_anchor git sed -f g WINDOW_IS_TOPLEVEL SURFACE_IS_TOPLEVEL git sed -f g native_window native_surface git sed -f g source_window source_surface git sed -f g dest_window dest_surface git sed -f g drag_window drag_surface git sed -f g input_window input_surface git checkout NEWS* po-properties po docs/reference/gtk/migrating-3to4.xml
2018-03-20 11:05:26 +00:00
scale = default_screen->surface_scale;
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
}
else
{
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
xwindow = GDK_SURFACE_XID (surface);
scale = GDK_SURFACE_IMPL_X11 (surface->impl)->surface_scale;
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
}
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
x11: make _gdk_device_query_state report the master's device state Calling XIQueryPointer() on a slave device is going to trigger a BadDevice X error. So in case we query a slave device state, ask the master device instead. https://bugzilla.gnome.org/show_bug.cgi?id=700233
2013-05-17 12:28:04 +00:00
if (gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_SLAVE)
{
GdkDevice *master = gdk_device_get_associated_device (device);
if (master)
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
_gdk_device_query_state (master, surface, child_surface,
x11: make _gdk_device_query_state report the master's device state Calling XIQueryPointer() on a slave device is going to trigger a BadDevice X error. So in case we query a slave device state, ask the master device instead. https://bugzilla.gnome.org/show_bug.cgi?id=700233
2013-05-17 12:28:04 +00:00
root_x, root_y, win_x, win_y, mask);
return;
}
gdk: clean up logic error Fallout from previous query_state() cleanups.
2012-03-09 17:36:11 +00:00
if (!GDK_X11_DISPLAY (display)->trusted_client ||
x11: Fix a crash This was crashing the moment a second window is opened.
2017-11-11 17:07:11 +00:00
!XIQueryPointer (GDK_DISPLAY_XDISPLAY (display),
gdk: clean up logic error Fallout from previous query_state() cleanups.
2012-03-09 17:36:11 +00:00
device_xi2->device_id,
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
xwindow,
gdk: clean up logic error Fallout from previous query_state() cleanups.
2012-03-09 17:36:11 +00:00
&xroot_window,
&xchild_window,
&xroot_x, &xroot_y,
&xwin_x, &xwin_y,
&button_state,
&mod_state,
&group_state))
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
{
XSetWindowAttributes attributes;
Display *xdisplay;
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
Window w;
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
/* FIXME: untrusted clients not multidevice-safe */
xdisplay = GDK_SCREEN_XDISPLAY (default_screen);
xwindow = GDK_SCREEN_XROOTWIN (default_screen);
w = XCreateWindow (xdisplay, xwindow, 0, 0, 1, 1, 0,
CopyFromParent, InputOnly, CopyFromParent,
0, &attributes);
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
XIQueryPointer (xdisplay, device_xi2->device_id,
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
w,
&xroot_window,
&xchild_window,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
&xroot_x, &xroot_y,
&xwin_x, &xwin_y,
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
&button_state,
&mod_state,
&group_state);
XDestroyWindow (xdisplay, w);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
if (child_surface)
*child_surface = gdk_x11_surface_lookup_for_display (display, xchild_window);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (root_x)
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
*root_x = xroot_x / scale;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (root_y)
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
*root_y = xroot_y / scale;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (win_x)
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
*win_x = xwin_x / scale;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (win_y)
x11: Reduce uses of the root window Avoid calling the get_root_window api that returns a GdkWindow in some places, and instead use the X root window directly.
2017-11-09 23:40:16 +00:00
*win_y = xwin_y / scale;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (mask)
Pass group state to _gdk_x11_device_xi2_translate_state This will be necessary to make groups work with XI2.
2011-02-05 02:01:52 +00:00
*mask = _gdk_x11_device_xi2_translate_state (&mod_state, &button_state, &group_state);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Use free() to free XIButtonState.mask XIQueryPointer() allocates it using malloc() (without any mention in the documentation...).
2011-01-30 04:26:34 +00:00
free (button_state.mask);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
static GdkGrabStatus
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gdk_x11_device_xi2_grab (GdkDevice *device,
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GdkSurface *surface,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gboolean owner_events,
GdkEventMask event_mask,
GdkWindow -> GdkSurface initial type rename This renames the GdkWindow class and related classes (impl, backend subclasses) to surface. Additionally it renames related types: GdkWindowAttr, GdkWindowPaint, GdkWindowWindowClass, GdkWindowType, GdkWindowTypeHint, GdkWindowHints, GdkWindowState, GdkWindowEdge This is an automatic conversion using the below commands: git sed -f g GdkWindowWindowClass GdkSurfaceSurfaceClass git sed -f g GdkWindow GdkSurface git sed -f g "gdk_window\([ _\(\),;]\|$\)" "gdk_surface\1" # Avoid hitting gdk_windowing git sed -f g "GDK_WINDOW\([ _\(]\|$\)" "GDK_SURFACE\1" # Avoid hitting GDK_WINDOWING git sed "GDK_\([A-Z]*\)IS_WINDOW\([_ (]\|$\)" "GDK_\1IS_SURFACE\2" git sed GDK_TYPE_WINDOW GDK_TYPE_SURFACE git sed -f g GdkPointerWindowInfo GdkPointerSurfaceInfo git sed -f g "BROADWAY_WINDOW" "BROADWAY_SURFACE" git sed -f g "broadway_window" "broadway_surface" git sed -f g "BroadwayWindow" "BroadwaySurface" git sed -f g "WAYLAND_WINDOW" "WAYLAND_SURFACE" git sed -f g "wayland_window" "wayland_surface" git sed -f g "WaylandWindow" "WaylandSurface" git sed -f g "X11_WINDOW" "X11_SURFACE" git sed -f g "x11_window" "x11_surface" git sed -f g "X11Window" "X11Surface" git sed -f g "WIN32_WINDOW" "WIN32_SURFACE" git sed -f g "win32_window" "win32_surface" git sed -f g "Win32Window" "Win32Surface" git sed -f g "QUARTZ_WINDOW" "QUARTZ_SURFACE" git sed -f g "quartz_window" "quartz_surface" git sed -f g "QuartzWindow" "QuartzSurface" git checkout NEWS* po-properties
2018-03-20 10:40:08 +00:00
GdkSurface *confine_to,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkCursor *cursor,
guint32 time_)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device);
xi2: Translate touch events Translate XI_TouchBegin/Update/End to GDK_TOUCH_BEGIN/UPDATE/END events. At the same time, set pointer-emulated flags on button events with XIPointerEmulated and on touch events emulating the pointer.
2012-03-01 05:56:51 +00:00
GdkX11DeviceManagerXI2 *device_manager_xi2;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
GdkDisplay *display;
XIEventMask mask;
Window xwindow;
Cursor xcursor;
Make GdkDevice parallel-implementable Use the grab and ungrab vfuncs from the frontend instead of the _gdk_windowing wrappers, and move some things around accordingly. Again, only the X11 backend has been updated, other backends need to be updated to match.
2010-12-10 17:13:25 +00:00
gint status;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
display = gdk_device_get_display (device);
x11: Stop using gdk_display_get_device_manager We can keep the displaymanager in the backend.
2017-11-24 14:14:17 +00:00
device_manager_xi2 = GDK_X11_DEVICE_MANAGER_XI2 (GDK_X11_DISPLAY (display)->device_manager);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
/* FIXME: confine_to is actually unused */
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
xwindow = GDK_SURFACE_XID (surface);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (!cursor)
xcursor = None;
else
{
x11: Redo cursor handling completely Instead of creating a GdkX11Cursor, create GdkCursors. Cache the XCursor in a hash table instead. Also, make use of the new fallback mechanism for fallback code: Make sure to provide cursors for the names that are guaranteed to exist, but do not do bad attempts at displaying texture surfaces. Black/White/transparent is not a replacement for those.
2017-11-03 05:01:56 +00:00
xcursor = gdk_x11_display_get_xcursor (display, cursor);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
mask.deviceid = device_xi2->device_id;
xi2: Translate touch events Translate XI_TouchBegin/Update/End to GDK_TOUCH_BEGIN/UPDATE/END events. At the same time, set pointer-emulated flags on button events with XIPointerEmulated and on touch events emulating the pointer.
2012-03-01 05:56:51 +00:00
mask.mask = _gdk_x11_device_xi2_translate_event_mask (device_manager_xi2,
event_mask,
&mask.mask_len);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Always use #ifdef for G_ENABLE_DEBUG Release builds don't define it to 0, they just don't define it. Avoid the compilation warning we get otherwise.
2018-04-21 17:18:20 +00:00
#ifdef G_ENABLE_DEBUG
Make gdk logging per-display As far as possible, use per-display debug flags. This will minimize the debug spew that we get from the inspector if it is running on a separate display.
2018-01-12 00:48:27 +00:00
if (GDK_DISPLAY_DEBUG_CHECK (display, NOGRABS))
Make GdkDevice parallel-implementable Use the grab and ungrab vfuncs from the frontend instead of the _gdk_windowing wrappers, and move some things around accordingly. Again, only the X11 backend has been updated, other backends need to be updated to match.
2010-12-10 17:13:25 +00:00
status = GrabSuccess;
else
#endif
Make gdk logging per-display As far as possible, use per-display debug flags. This will minimize the debug spew that we get from the inspector if it is running on a separate display.
2018-01-12 00:48:27 +00:00
status = XIGrabDevice (GDK_DISPLAY_XDISPLAY (display),
device_xi2->device_id,
xwindow,
time_,
xcursor,
GrabModeAsync, GrabModeAsync,
owner_events,
&mask);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
g_free (mask.mask);
Make GdkDevice parallel-implementable Use the grab and ungrab vfuncs from the frontend instead of the _gdk_windowing wrappers, and move some things around accordingly. Again, only the X11 backend has been updated, other backends need to be updated to match.
2010-12-10 17:13:25 +00:00
_gdk_x11_display_update_grab_info (display, device, status);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
return _gdk_x11_convert_grab_status (status);
}
static void
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
gdk_x11_device_xi2_ungrab (GdkDevice *device,
guint32 time_)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
GdkDisplay *display;
Make GdkDevice parallel-implementable Use the grab and ungrab vfuncs from the frontend instead of the _gdk_windowing wrappers, and move some things around accordingly. Again, only the X11 backend has been updated, other backends need to be updated to match.
2010-12-10 17:13:25 +00:00
gulong serial;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
display = gdk_device_get_display (device);
Make GdkDevice parallel-implementable Use the grab and ungrab vfuncs from the frontend instead of the _gdk_windowing wrappers, and move some things around accordingly. Again, only the X11 backend has been updated, other backends need to be updated to match.
2010-12-10 17:13:25 +00:00
serial = NextRequest (GDK_DISPLAY_XDISPLAY (display));
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
XIUngrabDevice (GDK_DISPLAY_XDISPLAY (display), device_xi2->device_id, time_);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Make GdkDevice parallel-implementable Use the grab and ungrab vfuncs from the frontend instead of the _gdk_windowing wrappers, and move some things around accordingly. Again, only the X11 backend has been updated, other backends need to be updated to match.
2010-12-10 17:13:25 +00:00
_gdk_x11_display_update_grab_info_ungrab (display, device, time_, serial);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
GdkWindow -> GdkSurface initial type rename This renames the GdkWindow class and related classes (impl, backend subclasses) to surface. Additionally it renames related types: GdkWindowAttr, GdkWindowPaint, GdkWindowWindowClass, GdkWindowType, GdkWindowTypeHint, GdkWindowHints, GdkWindowState, GdkWindowEdge This is an automatic conversion using the below commands: git sed -f g GdkWindowWindowClass GdkSurfaceSurfaceClass git sed -f g GdkWindow GdkSurface git sed -f g "gdk_window\([ _\(\),;]\|$\)" "gdk_surface\1" # Avoid hitting gdk_windowing git sed -f g "GDK_WINDOW\([ _\(]\|$\)" "GDK_SURFACE\1" # Avoid hitting GDK_WINDOWING git sed "GDK_\([A-Z]*\)IS_WINDOW\([_ (]\|$\)" "GDK_\1IS_SURFACE\2" git sed GDK_TYPE_WINDOW GDK_TYPE_SURFACE git sed -f g GdkPointerWindowInfo GdkPointerSurfaceInfo git sed -f g "BROADWAY_WINDOW" "BROADWAY_SURFACE" git sed -f g "broadway_window" "broadway_surface" git sed -f g "BroadwayWindow" "BroadwaySurface" git sed -f g "WAYLAND_WINDOW" "WAYLAND_SURFACE" git sed -f g "wayland_window" "wayland_surface" git sed -f g "WaylandWindow" "WaylandSurface" git sed -f g "X11_WINDOW" "X11_SURFACE" git sed -f g "x11_window" "x11_surface" git sed -f g "X11Window" "X11Surface" git sed -f g "WIN32_WINDOW" "WIN32_SURFACE" git sed -f g "win32_window" "win32_surface" git sed -f g "Win32Window" "Win32Surface" git sed -f g "QUARTZ_WINDOW" "QUARTZ_SURFACE" git sed -f g "quartz_window" "quartz_surface" git sed -f g "QuartzWindow" "QuartzSurface" git checkout NEWS* po-properties
2018-03-20 10:40:08 +00:00
static GdkSurface *
GdkSurface: Rename various functions and variables This is an automatic rename of various things related to the window->surface rename. Public symbols changed by this is: GDK_MODE_WINDOW gdk_device_get_window_at_position gdk_device_get_window_at_position_double gdk_device_get_last_event_window gdk_display_get_monitor_at_window gdk_drag_context_get_source_window gdk_drag_context_get_dest_window gdk_drag_context_get_drag_window gdk_draw_context_get_window gdk_drawing_context_get_window gdk_gl_context_get_window gdk_synthesize_window_state gdk_surface_get_window_type gdk_x11_display_set_window_scale gsk_renderer_new_for_window gsk_renderer_get_window gtk_text_view_buffer_to_window_coords gtk_tree_view_convert_widget_to_bin_window_coords gtk_tree_view_convert_tree_to_bin_window_coords The commands that generated this are: git sed -f g "GDK window" "GDK surface" git sed -f g window_impl surface_impl (cd gdk; git sed -f g impl_window impl_surface) git sed -f g WINDOW_IMPL SURFACE_IMPL git sed -f g GDK_MODE_WINDOW GDK_MODE_SURFACE git sed -f g gdk_draw_context_get_window gdk_draw_context_get_surface git sed -f g gdk_drawing_context_get_window gdk_drawing_context_get_surface git sed -f g gdk_gl_context_get_window gdk_gl_context_get_surface git sed -f g gsk_renderer_get_window gsk_renderer_get_surface git sed -f g gsk_renderer_new_for_window gsk_renderer_new_for_surface (cd gdk; git sed -f g window_type surface_type) git sed -f g gdk_surface_get_window_type gdk_surface_get_surface_type git sed -f g window_at_position surface_at_position git sed -f g event_window event_surface git sed -f g window_coord surface_coord git sed -f g window_state surface_state git sed -f g window_cursor surface_cursor git sed -f g window_scale surface_scale git sed -f g window_events surface_events git sed -f g monitor_at_window monitor_at_surface git sed -f g window_under_pointer surface_under_pointer (cd gdk; git sed -f g for_window for_surface) git sed -f g window_anchor surface_anchor git sed -f g WINDOW_IS_TOPLEVEL SURFACE_IS_TOPLEVEL git sed -f g native_window native_surface git sed -f g source_window source_surface git sed -f g dest_window dest_surface git sed -f g drag_window drag_surface git sed -f g input_window input_surface git checkout NEWS* po-properties po docs/reference/gtk/migrating-3to4.xml
2018-03-20 11:05:26 +00:00
gdk_x11_device_xi2_surface_at_position (GdkDevice *device,
gdk: Convert mouse position to doubles, add new getters 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.
2013-07-03 09:52:58 +00:00
gdouble *win_x,
gdouble *win_y,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkModifierType *mask,
gboolean get_toplevel)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
GdkWindow -> GdkSurface initial type rename This renames the GdkWindow class and related classes (impl, backend subclasses) to surface. Additionally it renames related types: GdkWindowAttr, GdkWindowPaint, GdkWindowWindowClass, GdkWindowType, GdkWindowTypeHint, GdkWindowHints, GdkWindowState, GdkWindowEdge This is an automatic conversion using the below commands: git sed -f g GdkWindowWindowClass GdkSurfaceSurfaceClass git sed -f g GdkWindow GdkSurface git sed -f g "gdk_window\([ _\(\),;]\|$\)" "gdk_surface\1" # Avoid hitting gdk_windowing git sed -f g "GDK_WINDOW\([ _\(]\|$\)" "GDK_SURFACE\1" # Avoid hitting GDK_WINDOWING git sed "GDK_\([A-Z]*\)IS_WINDOW\([_ (]\|$\)" "GDK_\1IS_SURFACE\2" git sed GDK_TYPE_WINDOW GDK_TYPE_SURFACE git sed -f g GdkPointerWindowInfo GdkPointerSurfaceInfo git sed -f g "BROADWAY_WINDOW" "BROADWAY_SURFACE" git sed -f g "broadway_window" "broadway_surface" git sed -f g "BroadwayWindow" "BroadwaySurface" git sed -f g "WAYLAND_WINDOW" "WAYLAND_SURFACE" git sed -f g "wayland_window" "wayland_surface" git sed -f g "WaylandWindow" "WaylandSurface" git sed -f g "X11_WINDOW" "X11_SURFACE" git sed -f g "x11_window" "x11_surface" git sed -f g "X11Window" "X11Surface" git sed -f g "WIN32_WINDOW" "WIN32_SURFACE" git sed -f g "win32_window" "win32_surface" git sed -f g "Win32Window" "Win32Surface" git sed -f g "QUARTZ_WINDOW" "QUARTZ_SURFACE" git sed -f g "quartz_window" "quartz_surface" git sed -f g "QuartzWindow" "QuartzSurface" git checkout NEWS* po-properties
2018-03-20 10:40:08 +00:00
GdkSurfaceImplX11 *impl;
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
GdkDisplay *display;
x11: Stop using GdkScreen altogether Derive GdkX11Screen directly from GObject, and remove the last remaining uses of GdkScreen.
2017-11-17 15:37:52 +00:00
GdkX11Screen *screen;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Display *xdisplay;
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
GdkSurface *surface;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Window xwindow, root, child, last = None;
gdouble xroot_x, xroot_y, xwin_x, xwin_y;
Free button_state.mask after XIQueryPointer() This function allocates the button mask, so free it after use, or right before the next XIQueryPointer() call, as done in gdk_x11_device_xi2_window_at_position().
2011-01-23 22:19:30 +00:00
XIButtonState button_state = { 0 };
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
XIModifierState mod_state;
XIGroupState group_state;
x11: Avoid X error traps within server grabs gdk_x11_device_xi2_window_at_position() may attempt to push/pop a few error trap pairs while traversing the window tree. Move it outside the server grab, and around the multiple XIQueryPointer calls we may do here. https://bugzilla.gnome.org/show_bug.cgi?id=751739
2015-06-30 17:04:13 +00:00
Bool retval;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
display = gdk_device_get_display (device);
x11: Stop using gdk_display_get_default_screen There's no point in using this api here, we can directly get the screen member from the GdkX11Display struct.
2017-11-01 22:06:24 +00:00
screen = GDK_X11_DISPLAY (display)->screen;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
x11: Avoid X error traps within server grabs gdk_x11_device_xi2_window_at_position() may attempt to push/pop a few error trap pairs while traversing the window tree. Move it outside the server grab, and around the multiple XIQueryPointer calls we may do here. https://bugzilla.gnome.org/show_bug.cgi?id=751739
2015-06-30 17:04:13 +00:00
gdk_x11_display_error_trap_push (display);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
/* This function really only works if the mouse pointer is held still
* during its operation. If it moves from one leaf window to another
* than we'll end up with inaccurate values for win_x, win_y
* and the result.
*/
gdk_x11_display_grab (display);
xdisplay = GDK_SCREEN_XDISPLAY (screen);
xwindow = GDK_SCREEN_XROOTWIN (screen);
x11: Rename GdkDisplayX11 to GdkX11Display Also rename all the macros etc.
2010-12-20 18:20:10 +00:00
if (G_LIKELY (GDK_X11_DISPLAY (display)->trusted_client))
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
{
XIQueryPointer (xdisplay,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
device_xi2->device_id,
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
xwindow,
&root, &child,
&xroot_x, &xroot_y,
&xwin_x, &xwin_y,
&button_state,
&mod_state,
&group_state);
if (root == xwindow)
xwindow = child;
else
xwindow = root;
}
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
else
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
{
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
gint width, height;
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
GList *toplevels, *list;
x11: Fix compiler warnings Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
2015-05-31 01:17:45 +00:00
Window pointer_window;
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
/* FIXME: untrusted clients case not multidevice-safe */
pointer_window = None;
x11: Drop use of gdk_display_get_toplevel_windows Use the newly introduced helper for this task.
2017-11-05 23:36:49 +00:00
toplevels = gdk_x11_display_get_toplevel_windows (display);
Don't use g_slist_next in the x11 backend We generally use ->next directly.
2015-10-20 00:31:57 +00:00
for (list = toplevels; list != NULL; list = list->next)
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
{
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
surface = GDK_SURFACE (list->data);
xwindow = GDK_SURFACE_XID (surface);
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
/* Free previous button mask, if any */
g_free (button_state.mask);
x11: Avoid X error traps within server grabs gdk_x11_device_xi2_window_at_position() may attempt to push/pop a few error trap pairs while traversing the window tree. Move it outside the server grab, and around the multiple XIQueryPointer calls we may do here. https://bugzilla.gnome.org/show_bug.cgi?id=751739
2015-06-30 17:04:13 +00:00
retval = XIQueryPointer (xdisplay,
device_xi2->device_id,
xwindow,
&root, &child,
&xroot_x, &xroot_y,
&xwin_x, &xwin_y,
&button_state,
&mod_state,
&group_state);
if (!retval)
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
continue;
x11: Avoid X error traps within server grabs gdk_x11_device_xi2_window_at_position() may attempt to push/pop a few error trap pairs while traversing the window tree. Move it outside the server grab, and around the multiple XIQueryPointer calls we may do here. https://bugzilla.gnome.org/show_bug.cgi?id=751739
2015-06-30 17:04:13 +00:00
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
if (child != None)
{
pointer_window = child;
break;
}
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
gdk_surface_get_geometry (surface, NULL, NULL, &width, &height);
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
if (xwin_x >= 0 && xwin_y >= 0 && xwin_x < width && xwin_y < height)
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
{
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
/* A childless toplevel, or below another window? */
XSetWindowAttributes attributes;
Window w;
Free button_state.mask after XIQueryPointer() This function allocates the button mask, so free it after use, or right before the next XIQueryPointer() call, as done in gdk_x11_device_xi2_window_at_position().
2011-01-23 22:19:30 +00:00
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
free (button_state.mask);
Free button_state.mask after XIQueryPointer() This function allocates the button mask, so free it after use, or right before the next XIQueryPointer() call, as done in gdk_x11_device_xi2_window_at_position().
2011-01-23 22:19:30 +00:00
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
w = XCreateWindow (xdisplay, xwindow, (int)xwin_x, (int)xwin_y, 1, 1, 0,
CopyFromParent, InputOnly, CopyFromParent,
0, &attributes);
XMapWindow (xdisplay, w);
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
XIQueryPointer (xdisplay,
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
device_xi2->device_id,
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
xwindow,
&root, &child,
&xroot_x, &xroot_y,
&xwin_x, &xwin_y,
&button_state,
&mod_state,
&group_state);
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
XDestroyWindow (xdisplay, w);
if (child == w)
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
{
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
pointer_window = xwindow;
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
break;
}
}
if (pointer_window != None)
break;
}
xwindow = pointer_window;
}
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
while (xwindow)
{
last = xwindow;
Use free() to free XIButtonState.mask XIQueryPointer() allocates it using malloc() (without any mention in the documentation...).
2011-01-30 04:26:34 +00:00
free (button_state.mask);
Free button_state.mask after XIQueryPointer() This function allocates the button mask, so free it after use, or right before the next XIQueryPointer() call, as done in gdk_x11_device_xi2_window_at_position().
2011-01-23 22:19:30 +00:00
x11: Avoid X error traps within server grabs gdk_x11_device_xi2_window_at_position() may attempt to push/pop a few error trap pairs while traversing the window tree. Move it outside the server grab, and around the multiple XIQueryPointer calls we may do here. https://bugzilla.gnome.org/show_bug.cgi?id=751739
2015-06-30 17:04:13 +00:00
retval = XIQueryPointer (xdisplay,
device_xi2->device_id,
xwindow,
&root, &xwindow,
&xroot_x, &xroot_y,
&xwin_x, &xwin_y,
&button_state,
&mod_state,
&group_state);
if (!retval)
Remove gdk_windowing_{get_device_state,window_at_device_position} The !trusted workaround code is pushed down into the GdkDevice subclasses, and we use the device vfuncs directly in gdkdisplay.c
2010-12-13 22:43:10 +00:00
break;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (get_toplevel && last != root &&
gdk: Remove GDK_SURFACE_FOREIGN We don't create surfaces of that type anymore.
2018-06-25 22:47:40 +00:00
(surface = gdk_x11_surface_lookup_for_display (display, last)) != NULL)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
xwindow = last;
break;
}
}
gdk_x11_display_ungrab (display);
x11: Avoid X error traps within server grabs gdk_x11_device_xi2_window_at_position() may attempt to push/pop a few error trap pairs while traversing the window tree. Move it outside the server grab, and around the multiple XIQueryPointer calls we may do here. https://bugzilla.gnome.org/show_bug.cgi?id=751739
2015-06-30 17:04:13 +00:00
if (gdk_x11_display_error_trap_pop (display) == 0)
{
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
surface = gdk_x11_surface_lookup_for_display (display, last);
x11: Avoid X error traps within server grabs gdk_x11_device_xi2_window_at_position() may attempt to push/pop a few error trap pairs while traversing the window tree. Move it outside the server grab, and around the multiple XIQueryPointer calls we may do here. https://bugzilla.gnome.org/show_bug.cgi?id=751739
2015-06-30 17:04:13 +00:00
impl = NULL;
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
if (surface)
impl = GDK_SURFACE_IMPL_X11 (surface->impl);
x11: Avoid X error traps within server grabs gdk_x11_device_xi2_window_at_position() may attempt to push/pop a few error trap pairs while traversing the window tree. Move it outside the server grab, and around the multiple XIQueryPointer calls we may do here. https://bugzilla.gnome.org/show_bug.cgi?id=751739
2015-06-30 17:04:13 +00:00
if (mask)
*mask = _gdk_x11_device_xi2_translate_state (&mod_state, &button_state, &group_state);
free (button_state.mask);
}
else
{
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
surface = NULL;
x11: Avoid X error traps within server grabs gdk_x11_device_xi2_window_at_position() may attempt to push/pop a few error trap pairs while traversing the window tree. Move it outside the server grab, and around the multiple XIQueryPointer calls we may do here. https://bugzilla.gnome.org/show_bug.cgi?id=751739
2015-06-30 17:04:13 +00:00
if (mask)
*mask = 0;
}
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (win_x)
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
*win_x = (surface) ? (xwin_x / impl->surface_scale) : -1;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (win_y)
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
*win_y = (surface) ? (xwin_y / impl->surface_scale) : -1;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Free button_state.mask after XIQueryPointer() This function allocates the button mask, so free it after use, or right before the next XIQueryPointer() call, as done in gdk_x11_device_xi2_window_at_position().
2011-01-23 22:19:30 +00:00
GdkSurface: Rename lots of stuff from window->surface Mostly these are internal things, but the major public change is that event.window is now event.surface.
2018-03-20 14:14:10 +00:00
return surface;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
guchar *
xi2: Translate touch events Translate XI_TouchBegin/Update/End to GDK_TOUCH_BEGIN/UPDATE/END events. At the same time, set pointer-emulated flags on button events with XIPointerEmulated and on touch events emulating the pointer.
2012-03-01 05:56:51 +00:00
_gdk_x11_device_xi2_translate_event_mask (GdkX11DeviceManagerXI2 *device_manager_xi2,
GdkEventMask event_mask,
gint *len)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
guchar *mask;
xi2: Translate touch events Translate XI_TouchBegin/Update/End to GDK_TOUCH_BEGIN/UPDATE/END events. At the same time, set pointer-emulated flags on button events with XIPointerEmulated and on touch events emulating the pointer.
2012-03-01 05:56:51 +00:00
gint minor;
g_object_get (device_manager_xi2, "minor", &minor, NULL);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
*len = XIMaskLen (XI_LASTEVENT);
mask = g_new0 (guchar, *len);
gdk: Remove motion hints Motion hints are now literally a thing of the past. Everything should be using the full motion event stream.
2017-09-15 16:58:50 +00:00
if (event_mask & GDK_POINTER_MOTION_MASK)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
XISetMask (mask, XI_Motion);
if (event_mask & GDK_BUTTON_MOTION_MASK ||
event_mask & GDK_BUTTON1_MOTION_MASK ||
event_mask & GDK_BUTTON2_MOTION_MASK ||
event_mask & GDK_BUTTON3_MOTION_MASK)
{
XISetMask (mask, XI_ButtonPress);
XISetMask (mask, XI_ButtonRelease);
XISetMask (mask, XI_Motion);
}
if (event_mask & GDK_SCROLL_MASK)
{
XISetMask (mask, XI_ButtonPress);
XISetMask (mask, XI_ButtonRelease);
}
if (event_mask & GDK_BUTTON_PRESS_MASK)
XISetMask (mask, XI_ButtonPress);
if (event_mask & GDK_BUTTON_RELEASE_MASK)
XISetMask (mask, XI_ButtonRelease);
if (event_mask & GDK_KEY_PRESS_MASK)
XISetMask (mask, XI_KeyPress);
if (event_mask & GDK_KEY_RELEASE_MASK)
XISetMask (mask, XI_KeyRelease);
if (event_mask & GDK_ENTER_NOTIFY_MASK)
XISetMask (mask, XI_Enter);
if (event_mask & GDK_LEAVE_NOTIFY_MASK)
XISetMask (mask, XI_Leave);
if (event_mask & GDK_FOCUS_CHANGE_MASK)
{
XISetMask (mask, XI_FocusIn);
XISetMask (mask, XI_FocusOut);
}
xi2: Translate touch events Translate XI_TouchBegin/Update/End to GDK_TOUCH_BEGIN/UPDATE/END events. At the same time, set pointer-emulated flags on button events with XIPointerEmulated and on touch events emulating the pointer.
2012-03-01 05:56:51 +00:00
#ifdef XINPUT_2_2
/* XInput 2.2 includes multitouch support */
if (minor >= 2 &&
event_mask & GDK_TOUCH_MASK)
{
XISetMask (mask, XI_TouchBegin);
XISetMask (mask, XI_TouchUpdate);
XISetMask (mask, XI_TouchEnd);
}
#endif /* XINPUT_2_2 */
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
return mask;
}
guint
Rename x11-specific GdkDevice[Manager] implementations Make them all fit in the gdk_x11_ prefix, and make the get_type functions and standard macros available in headers.
2010-12-21 06:32:01 +00:00
_gdk_x11_device_xi2_translate_state (XIModifierState *mods_state,
Pass group state to _gdk_x11_device_xi2_translate_state This will be necessary to make groups work with XI2.
2011-02-05 02:01:52 +00:00
XIButtonState *buttons_state,
XIGroupState *group_state)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
guint state = 0;
if (mods_state)
x11: Simplify XI2 mods state https://bugzilla.gnome.org/show_bug.cgi?id=671070
2012-02-29 16:18:57 +00:00
state = mods_state->effective;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (buttons_state)
{
gint len, i;
xi2: Don't set button mask 4 and 5 We interpret buttons 4-7 as old-school scroll events, so it does not make sense to add these to the mask. Also fix an off-by-one in the loop here, buttons_mask is 1-based.
2015-05-02 15:51:38 +00:00
/* We're only interested in the first 3 buttons */
len = MIN (3, buttons_state->mask_len * 8);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
xi2: Don't set button mask 4 and 5 We interpret buttons 4-7 as old-school scroll events, so it does not make sense to add these to the mask. Also fix an off-by-one in the loop here, buttons_mask is 1-based.
2015-05-02 15:51:38 +00:00
for (i = 1; i <= len; i++)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
if (!XIMaskIsSet (buttons_state->mask, i))
continue;
switch (i)
{
case 1:
state |= GDK_BUTTON1_MASK;
break;
case 2:
state |= GDK_BUTTON2_MASK;
break;
case 3:
state |= GDK_BUTTON3_MASK;
break;
default:
break;
}
}
}
XI2: translate group state back into core state This is necessary to make the key event translation work as expected. https://bugzilla.gnome.org/show_bug.cgi?id=641367
2011-02-05 02:08:41 +00:00
if (group_state)
x11: Correct GroupSwitch mask base | latched | locked is incorrect for the group mask, and the clamping has already been applied. https://bugzilla.gnome.org/show_bug.cgi?id=671070
2012-02-29 16:15:10 +00:00
state |= (group_state->effective) << 13;
XI2: translate group state back into core state This is necessary to make the key event translation work as expected. https://bugzilla.gnome.org/show_bug.cgi?id=641367
2011-02-05 02:08:41 +00:00
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
return state;
}
x11: Make headers identical no matter if we run with or without XI2 Previously we weren't installing the device headers when compiling without XINPUT support. But we would include them from gdkx.h, so essentially the build was broken. With this patch the types will exist but not do anything.
2011-02-12 00:27:40 +00:00
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
void
_gdk_x11_device_xi2_add_scroll_valuator (GdkX11DeviceXI2 *device,
guint n_valuator,
xi2: Normalize scroll deltas XI2 provides us with an increment for each scroll valuator, and by dividing the delta by the increment, we obtain normalized values in some abstract 'scroll unit'. For mouse wheels, the evdev driver reports an increment of -1, so doing this division fixes the inverted scrolling with wheels that we've seen recently.
2012-03-05 00:12:27 +00:00
GdkScrollDirection direction,
gdouble increment)
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
{
ScrollValuator scroll;
g_return_if_fail (GDK_IS_X11_DEVICE_XI2 (device));
g_return_if_fail (n_valuator < gdk_device_get_n_axes (GDK_DEVICE (device)));
scroll.n_valuator = n_valuator;
scroll.direction = direction;
Revert "x11: Query pointer devices' scroll valuators on toplevel enter events" This reverts commit 77b8495bc4e51826afa451914d6a3b0df1b62a24. The commit broke more scenarios than fixed, better to go back to square one.
2015-07-15 19:19:25 +00:00
scroll.last_value_valid = FALSE;
xi2: Normalize scroll deltas XI2 provides us with an increment for each scroll valuator, and by dividing the delta by the increment, we obtain normalized values in some abstract 'scroll unit'. For mouse wheels, the evdev driver reports an increment of -1, so doing this division fixes the inverted scrolling with wheels that we've seen recently.
2012-03-05 00:12:27 +00:00
scroll.increment = increment;
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
g_array_append_val (device->scroll_valuators, scroll);
}
gboolean
_gdk_x11_device_xi2_get_scroll_delta (GdkX11DeviceXI2 *device,
guint n_valuator,
gdouble valuator_value,
GdkScrollDirection *direction_ret,
gdouble *delta_ret)
{
guint i;
g_return_val_if_fail (GDK_IS_X11_DEVICE_XI2 (device), FALSE);
g_return_val_if_fail (n_valuator < gdk_device_get_n_axes (GDK_DEVICE (device)), FALSE);
for (i = 0; i < device->scroll_valuators->len; i++)
{
ScrollValuator *scroll;
scroll = &g_array_index (device->scroll_valuators, ScrollValuator, i);
if (scroll->n_valuator == n_valuator)
{
if (direction_ret)
*direction_ret = scroll->direction;
if (delta_ret)
*delta_ret = 0;
Revert "x11: Query pointer devices' scroll valuators on toplevel enter events" This reverts commit 77b8495bc4e51826afa451914d6a3b0df1b62a24. The commit broke more scenarios than fixed, better to go back to square one.
2015-07-15 19:19:25 +00:00
if (scroll->last_value_valid)
{
if (delta_ret)
*delta_ret = (valuator_value - scroll->last_value) / scroll->increment;
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
Revert "x11: Query pointer devices' scroll valuators on toplevel enter events" This reverts commit 77b8495bc4e51826afa451914d6a3b0df1b62a24. The commit broke more scenarios than fixed, better to go back to square one.
2015-07-15 19:19:25 +00:00
scroll->last_value = valuator_value;
}
else
{
scroll->last_value = valuator_value;
scroll->last_value_valid = TRUE;
}
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
return TRUE;
}
}
return FALSE;
}
void
Revert "x11: Query pointer devices' scroll valuators on toplevel enter events" This reverts commit 77b8495bc4e51826afa451914d6a3b0df1b62a24. The commit broke more scenarios than fixed, better to go back to square one.
2015-07-15 19:19:25 +00:00
_gdk_device_xi2_reset_scroll_valuators (GdkX11DeviceXI2 *device)
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
{
Revert "x11: Query pointer devices' scroll valuators on toplevel enter events" This reverts commit 77b8495bc4e51826afa451914d6a3b0df1b62a24. The commit broke more scenarios than fixed, better to go back to square one.
2015-07-15 19:19:25 +00:00
guint i;
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
for (i = 0; i < device->scroll_valuators->len; i++)
{
ScrollValuator *scroll;
scroll = &g_array_index (device->scroll_valuators, ScrollValuator, i);
Revert "x11: Query pointer devices' scroll valuators on toplevel enter events" This reverts commit 77b8495bc4e51826afa451914d6a3b0df1b62a24. The commit broke more scenarios than fixed, better to go back to square one.
2015-07-15 19:19:25 +00:00
scroll->last_value_valid = FALSE;
devicemanager,xi2: Implement smooth scrolling XInput >= 2.1 allows for implementing smooth scrolling, reporting the different scrolling axes as valuators. Any change in those will be reported as GdkEventScroll events with delta_x/y information. the older kind of scroll events is still handled, and emulated in devices able to provide smooth scrolling, setting _gdk_event_set_pointer_emulated() in that case.
2012-01-23 23:49:52 +00:00
}
}
x11: Unset GdkX11DeviceXI2 scroll valuators on device change Scroll valuators were being just appended again and again, leading to 1) a growing memory issue anytime a device changed 2) the first scroll valuators to stay permanent on the application lifetime, as the first stored valuators would always match. https://bugzilla.gnome.org/show_bug.cgi?id=705203
2013-09-27 17:32:54 +00:00
void
_gdk_device_xi2_unset_scroll_valuators (GdkX11DeviceXI2 *device)
{
if (device->scroll_valuators->len > 0)
g_array_remove_range (device->scroll_valuators, 0,
device->scroll_valuators->len);
}
gdk/x11: Add gdk_x11_device_get_id() This function can be used to find out the XInput2 device ID behind a GdkDevice, mostly useful when you need to interact with say Clutter, or raw libXi calls.
2011-07-14 15:43:59 +00:00
gint
_gdk_x11_device_xi2_get_id (GdkX11DeviceXI2 *device)
{
g_return_val_if_fail (GDK_IS_X11_DEVICE_XI2 (device), 0);
return device->device_id;
}
x11: Store last axes from device And use these for the missing axes if the valuator mask is incomplete. This used to work fine on tablets because the Wacom driver ensures all valuators are sent, which is not true if using the evdev driver. https://bugzilla.gnome.org/show_bug.cgi?id=703610
2015-03-02 17:19:16 +00:00
gdouble
gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device,
gint n_axis)
{
if (n_axis >= gdk_device_get_n_axes (GDK_DEVICE (device)))
return 0;
if (!device->last_axes)
return 0;
return device->last_axes[n_axis];
}
void
gdk_x11_device_xi2_store_axes (GdkX11DeviceXI2 *device,
gdouble *axes,
gint n_axes)
{
g_free (device->last_axes);
if (axes && n_axes)
device->last_axes = g_memdup (axes, sizeof (gdouble) * n_axes);
else
device->last_axes = NULL;
}
Reference in New Issue Copy Permalink