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

615 lines
20 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"
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
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
#include "gdkx11device-core.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
gdk: Rename GdkWindowObject to GdkWindow ... and remove most of the casting that used to be necessary.
2010-11-22 23:55:39 +00:00
#include "gdkinternals.h"
GdkWindow -> GdkSurface: File renames Rename all *window.[ch] source files. This is an automatic operation, done by the following commands: for i in $(git ls-files gdk | grep window); do git mv $i $(echo $i | sed s/window/surface/); git sed -f g $(basename $i) $(basename $i | sed s/window/surface/) ; done git checkout NEWS* po-properties po
2018-03-20 10:46:11 +00:00
#include "gdksurface.h"
Merge the xi2-for-master branch
2010-05-25 22:38:44 +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"
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"
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
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>
Detangle includes for device subclasses
2010-12-21 15:37:21 +00:00
struct _GdkX11DeviceCore
{
GdkDevice parent_instance;
};
struct _GdkX11DeviceCoreClass
{
GdkDeviceClass parent_class;
};
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
static gboolean gdk_x11_device_core_get_history (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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
gint *n_events);
static void gdk_x11_device_core_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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +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_core_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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
GdkCursor *cursor);
static void gdk_x11_device_core_warp (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 x,
gdouble 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
static void gdk_x11_device_core_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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
static GdkGrabStatus gdk_x11_device_core_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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
GdkCursor *cursor,
guint32 time_);
static void gdk_x11_device_core_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_core_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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
GdkModifierType *mask,
gboolean get_toplevel);
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_core_select_surface_events (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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
GdkEventMask event_mask);
G_DEFINE_TYPE (GdkX11DeviceCore, gdk_x11_device_core, GDK_TYPE_DEVICE)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
static void
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
gdk_x11_device_core_class_init (GdkX11DeviceCoreClass *klass)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
device_class->get_history = gdk_x11_device_core_get_history;
device_class->get_state = gdk_x11_device_core_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_core_set_surface_cursor;
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
device_class->warp = gdk_x11_device_core_warp;
device_class->query_state = gdk_x11_device_core_query_state;
device_class->grab = gdk_x11_device_core_grab;
device_class->ungrab = gdk_x11_device_core_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_core_surface_at_position;
device_class->select_surface_events = gdk_x11_device_core_select_surface_events;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
static void
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
gdk_x11_device_core_init (GdkX11DeviceCore *device_core)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
GdkDevice *device;
device = GDK_DEVICE (device_core);
gdk: Replace GDK_NONE with NULL
2017-11-15 17:13:31 +00:00
_gdk_device_add_axis (device, NULL, GDK_AXIS_X, 0, 0, 1);
_gdk_device_add_axis (device, NULL, GDK_AXIS_Y, 0, 0, 1);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
static gboolean
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
impl_coord_in_surface (GdkSurface *surface,
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
int impl_x,
int impl_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
if (impl_x < surface->abs_x ||
impl_x >= surface->abs_x + surface->width)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
return FALSE;
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 (impl_y < surface->abs_y ||
impl_y >= surface->abs_y + surface->height)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
return FALSE;
return TRUE;
}
static gboolean
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
gdk_x11_device_core_get_history (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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
gint *n_events)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
XTimeCoord *xcoords;
GdkTimeCoord **coords;
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
GdkSurface *impl_surface;
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;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
int tmp_n_events;
int i, j;
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
impl_surface = _gdk_surface_get_impl_surface (surface);
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
impl = GDK_SURFACE_IMPL_X11 (impl_surface->impl);
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
xcoords = XGetMotionEvents (GDK_SURFACE_XDISPLAY (surface),
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_SURFACE_XID (impl_surface),
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
start, stop, &tmp_n_events);
if (!xcoords)
return FALSE;
coords = _gdk_device_allocate_history (device, tmp_n_events);
for (i = 0, j = 0; i < tmp_n_events; i++)
{
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 (impl_coord_in_surface (surface,
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
xcoords[i].x / impl->surface_scale,
xcoords[i].y / impl->surface_scale))
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
coords[j]->time = xcoords[i].time;
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
coords[j]->axes[0] = (double)xcoords[i].x / impl->surface_scale - surface->abs_x;
coords[j]->axes[1] = (double)xcoords[i].y / impl->surface_scale - surface->abs_y;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
j++;
}
}
XFree (xcoords);
/* free the events we allocated too much */
for (i = j; i < tmp_n_events; i++)
{
g_free (coords[i]);
coords[i] = NULL;
}
tmp_n_events = j;
if (tmp_n_events == 0)
{
gdk_device_free_history (coords, tmp_n_events);
return FALSE;
}
if (n_events)
*n_events = tmp_n_events;
if (events)
*events = coords;
else if (coords)
gdk_device_free_history (coords, tmp_n_events);
return TRUE;
}
static void
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
gdk_x11_device_core_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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
gdouble *axes,
GdkModifierType *mask)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
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 x, y;
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
gdk_surface_get_device_position_double (surface, device, &x, &y, mask);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (axes)
{
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
axes[0] = x;
axes[1] = y;
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_core_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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
GdkCursor *cursor)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
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
GdkDisplay *display = gdk_device_get_display (device);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Cursor xcursor;
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
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
XDefineCursor (GDK_DISPLAY_XDISPLAY (display),
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
xcursor);
}
static void
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
gdk_x11_device_core_warp (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 x,
gdouble y)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
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
GdkDisplay *display;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Display *xdisplay;
Window dest;
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
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
display = gdk_device_get_display (device);
xdisplay = GDK_DISPLAY_XDISPLAY (display);
screen = GDK_X11_DISPLAY (display)->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
dest = GDK_SCREEN_XROOTWIN (screen);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
x11: Initial cut at supporting window scaling for X11 If you set GDK_SCALE=2 in the environment then all windows will be scaled by 2. Its not an ideal solution as it doesn't handle multi-monitors at different scales, and only affects gtk apps. But it is a good starting points and will help a lot on HiDPI laptops.
2013-06-20 09:40:07 +00:00
XWarpPointer (xdisplay, None, dest, 0, 0, 0, 0,
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
round (x * screen->surface_scale),
round (y * screen->surface_scale));
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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
gdk_x11_device_core_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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
GdkModifierType *mask)
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;
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 xwindow, w;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Window xroot_window, xchild_window;
int xroot_x, xroot_y, xwin_x, xwin_y;
unsigned int xmask;
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
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_SCREEN_XROOTWIN (screen);
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 = 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
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 ||
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
!XQueryPointer (GDK_SURFACE_XDISPLAY (surface),
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,
&xmask))
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;
/* FIXME: untrusted clients not multidevice-safe */
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
xdisplay = GDK_SCREEN_XDISPLAY (screen);
xwindow = GDK_SCREEN_XROOTWIN (screen);
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 = XCreateWindow (xdisplay, xwindow, 0, 0, 1, 1, 0,
CopyFromParent, InputOnly, CopyFromParent,
0, &attributes);
XQueryPointer (xdisplay, w,
&xroot_window,
&xchild_window,
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +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
&xmask);
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 = (double)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 = (double)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 = (double)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 = (double)xwin_y / scale;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (mask)
*mask = xmask;
}
static GdkGrabStatus
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
gdk_x11_device_core_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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
GdkCursor *cursor,
guint32 time_)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
GdkDisplay *display;
Window xwindow, xconfine_to;
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);
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 (confine_to)
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
confine_to = _gdk_surface_get_impl_surface (confine_to);
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
if (!confine_to || GDK_SURFACE_DESTROYED (confine_to))
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
xconfine_to = None;
else
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
xconfine_to = GDK_SURFACE_XID (confine_to);
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
#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
Move all GdkDevice members to private and add one missing accessor
2010-11-23 19:25:13 +00:00
if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
/* Device is a keyboard */
status = XGrabKeyboard (GDK_DISPLAY_XDISPLAY (display),
xwindow,
owner_events,
GrabModeAsync, GrabModeAsync,
time_);
}
else
{
Cursor xcursor;
guint xevent_mask;
gint i;
/* Device is a pointer */
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
}
xevent_mask = 0;
Rename _gdk_event_mask_table to _gdk_x11_event_mask_table
2010-12-15 22:32:29 +00:00
for (i = 0; i < _gdk_x11_event_mask_table_size; i++)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
if (event_mask & (1 << (i + 1)))
Rename _gdk_event_mask_table to _gdk_x11_event_mask_table
2010-12-15 22:32:29 +00:00
xevent_mask |= _gdk_x11_event_mask_table[i];
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
}
/* We don't want to set a native motion hint mask, as we're emulating motion
* hints. If we set a native one we just wouldn't get any events.
*/
xevent_mask &= ~PointerMotionHintMask;
status = XGrabPointer (GDK_DISPLAY_XDISPLAY (display),
xwindow,
owner_events,
xevent_mask,
GrabModeAsync, GrabModeAsync,
xconfine_to,
xcursor,
time_);
}
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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
gdk_x11_device_core_ungrab (GdkDevice *device,
guint32 time_)
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));
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Move all GdkDevice members to private and add one missing accessor
2010-11-23 19:25:13 +00:00
if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
XUngrabKeyboard (GDK_DISPLAY_XDISPLAY (display), time_);
else
XUngrabPointer (GDK_DISPLAY_XDISPLAY (display), time_);
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_core_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 GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +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;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
GdkDisplay *display;
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;
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
Window xwindow, root, child, last;
int xroot_x, xroot_y, xwin_x, xwin_y;
unsigned int xmask;
last = None;
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
/* 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
{
XQueryPointer (xdisplay, xwindow,
&root, &child,
&xroot_x, &xroot_y,
&xwin_x, &xwin_y,
&xmask);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
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
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
int rootx = -1, rooty = -1;
int winx, winy;
/* 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);
impl = GDK_SURFACE_IMPL_X11 (surface->impl);
xwindow = GDK_SURFACE_XID (surface);
x11: Simplify code for single-screen case
2013-04-04 14:22:12 +00:00
gdk_x11_display_error_trap_push (display);
XQueryPointer (xdisplay, xwindow,
&root, &child,
&rootx, &rooty,
&winx, &winy,
&xmask);
if (gdk_x11_display_error_trap_pop (display))
continue;
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);
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 (winx >= 0 && winy >= 0 && winx < width * impl->surface_scale && winy < height * impl->surface_scale)
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;
w = XCreateWindow (xdisplay, xwindow, winx, winy, 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
XQueryPointer (xdisplay, xwindow,
Rename GdkDevice[Manager]Core to GdkX11Device[Manager]Core This is mainly to avoid clash with the classes of the same name in the quartz backend.
2010-12-21 04:59:07 +00:00
&root, &child,
&rootx, &rooty,
&winx, &winy,
&xmask);
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;
}
}
}
xwindow = pointer_window;
}
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
while (xwindow)
{
last = 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
gdk_x11_display_error_trap_push (display);
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
XQueryPointer (xdisplay, xwindow,
&root, &xwindow,
&xroot_x, &xroot_y,
&xwin_x, &xwin_y,
&xmask);
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
if (gdk_x11_display_error_trap_pop (display))
break;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (get_toplevel && last != root &&
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)) != NULL &&
surface->surface_type != GDK_SURFACE_FOREIGN)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
xwindow = last;
break;
}
}
gdk_x11_display_ungrab (display);
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: Initial cut at supporting window scaling for X11 If you set GDK_SCALE=2 in the environment then all windows will be scaled by 2. Its not an ideal solution as it doesn't handle multi-monitors at different scales, and only affects gtk apps. But it is a good starting points and will help a lot on HiDPI laptops.
2013-06-20 09:40:07 +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);
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) ? (double)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) ? (double)xwin_y / impl->surface_scale : -1;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
if (mask)
*mask = xmask;
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
}
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_core_select_surface_events (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,
Fix a thinko in creating event masks &-ing together all the device event types yields zero, which is clearly not the intention here. Use | instead, to create the intended mask. https://bugzilla.gnome.org/show_bug.cgi?id=734641
2014-08-14 04:10:23 +00:00
GdkEventMask event_mask)
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
GdkEventMask filter_mask, surface_mask;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
guint xmask = 0;
gint i;
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_mask = gdk_surface_get_events (surface);
Fix a thinko in creating event masks &-ing together all the device event types yields zero, which is clearly not the intention here. Use | instead, to create the intended mask. https://bugzilla.gnome.org/show_bug.cgi?id=734641
2014-08-14 04:10:23 +00:00
filter_mask = GDK_POINTER_MOTION_MASK
| GDK_BUTTON_MOTION_MASK
| GDK_BUTTON1_MOTION_MASK
| GDK_BUTTON2_MOTION_MASK
| GDK_BUTTON3_MOTION_MASK
| GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK
| GDK_KEY_PRESS_MASK
| GDK_KEY_RELEASE_MASK
| GDK_ENTER_NOTIFY_MASK
| GDK_LEAVE_NOTIFY_MASK
| GDK_FOCUS_CHANGE_MASK
| GDK_PROXIMITY_IN_MASK
| GDK_PROXIMITY_OUT_MASK
| GDK_SCROLL_MASK;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
/* Filter out non-device events */
event_mask &= filter_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
/* Unset device events on surface mask */
surface_mask &= ~filter_mask;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
/* Combine masks */
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
event_mask |= surface_mask;
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
Rename _gdk_event_mask_table to _gdk_x11_event_mask_table
2010-12-15 22:32:29 +00:00
for (i = 0; i < _gdk_x11_event_mask_table_size; i++)
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
{
if (event_mask & (1 << (i + 1)))
Rename _gdk_event_mask_table to _gdk_x11_event_mask_table
2010-12-15 22:32:29 +00:00
xmask |= _gdk_x11_event_mask_table[i];
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 (GDK_SURFACE_XID (surface) != GDK_SURFACE_XROOTWIN (surface))
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
xmask |= StructureNotifyMask | PropertyChangeMask;
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
XSelectInput (GDK_SURFACE_XDISPLAY (surface),
GDK_SURFACE_XID (surface),
Merge the xi2-for-master branch
2010-05-25 22:38:44 +00:00
xmask);
}
Reference in New Issue Copy Permalink