isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 19:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

backends: Remove x/y arguments from MetaCursorTracker::cursor-moved

Browse Source 
Make this signal a hint, the actual coordinates should be queried to the
cursor tracker, the device, the seat... There's enough options.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403
This commit is contained in:
Carlos Garnacho 2020-07-10 00:40:55 +02:00
parent 11c86f9cb3
commit be51a8c18c
6 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backends/meta-cursor-tracker.c
View File

@ -37,7 +37,6 @@
#include "cogl/cogl.h" #include "cogl/cogl.h"
#include "core/display-private.h" #include "core/display-private.h"
#include "clutter/clutter.h" #include "clutter/clutter.h"
#include "meta-marshal.h"
#include "meta/main.h" #include "meta/main.h"
#include "meta/util.h" #include "meta/util.h"
@ -301,14 +300,8 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
0, 0,
NULL, NULL, NULL, NULL, NULL,
meta_marshal_VOID__FLOAT_FLOAT, G_TYPE_NONE, 0);
G_TYPE_NONE, 2,
G_TYPE_FLOAT,
G_TYPE_FLOAT);
g_signal_set_va_marshaller (signals[CURSOR_MOVED],
G_TYPE_FROM_CLASS (klass),
meta_marshal_VOID__FLOAT_FLOATv);
signals[VISIBILITY_CHANGED] = g_signal_new ("visibility-changed", signals[VISIBILITY_CHANGED] = g_signal_new ("visibility-changed",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
@ -459,7 +452,7 @@ meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
meta_cursor_renderer_set_position (cursor_renderer, new_x, new_y); meta_cursor_renderer_set_position (cursor_renderer, new_x, new_y);
if (position_changed) if (position_changed)
g_signal_emit (tracker, signals[CURSOR_MOVED], 0, new_x, new_y); g_signal_emit (tracker, signals[CURSOR_MOVED], 0);
} }
void void

2
src/backends/meta-screen-cast-area-stream-src.c
View File

@ -184,8 +184,6 @@ sync_cursor_state (MetaScreenCastAreaStreamSrc *area_src)
static void static void
cursor_moved (MetaCursorTracker *cursor_tracker, cursor_moved (MetaCursorTracker *cursor_tracker,
float x,
float y,
MetaScreenCastAreaStreamSrc *area_src) MetaScreenCastAreaStreamSrc *area_src)
{ {
sync_cursor_state (area_src); sync_cursor_state (area_src);

2
src/backends/meta-screen-cast-monitor-stream-src.c
View File

@ -221,8 +221,6 @@ sync_cursor_state (MetaScreenCastMonitorStreamSrc *monitor_src)
static void static void
cursor_moved (MetaCursorTracker *cursor_tracker, cursor_moved (MetaCursorTracker *cursor_tracker,
float x,
float y,
MetaScreenCastMonitorStreamSrc *monitor_src) MetaScreenCastMonitorStreamSrc *monitor_src)
{ {
sync_cursor_state (monitor_src); sync_cursor_state (monitor_src);

2
src/backends/meta-screen-cast-window-stream-src.c
View File

@ -394,8 +394,6 @@ sync_cursor_state (MetaScreenCastWindowStreamSrc *window_src)
static void static void
cursor_moved (MetaCursorTracker *cursor_tracker, cursor_moved (MetaCursorTracker *cursor_tracker,
float x,
float y,
MetaScreenCastWindowStreamSrc *window_src) MetaScreenCastWindowStreamSrc *window_src)
{ {
sync_cursor_state (window_src); sync_cursor_state (window_src);

8
src/meson.build
View File

@ -751,14 +751,6 @@ dbus_idle_monitor_built_sources = gnome.gdbus_codegen('meta-dbus-idle-monitor',
) )
mutter_built_sources += dbus_idle_monitor_built_sources mutter_built_sources += dbus_idle_monitor_built_sources
mutter_marshal = gnome.genmarshal('meta-marshal',
sources: ['meta-marshal.list'],
prefix: 'meta_marshal',
internal: true,
valist_marshallers: true,
)
mutter_built_sources += mutter_marshal
if have_profiler if have_profiler
mutter_sources += [ mutter_sources += [
'backends/meta-profiler.c', 'backends/meta-profiler.c',

1
src/meta-marshal.list
View File

@ -1 +0,0 @@
VOID:FLOAT,FLOAT