From 70ab4b651971ac868c8c461eac30cb5653ae1f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 28 Apr 2022 16:09:11 +0200 Subject: [PATCH 1/7] build: Make each executable/library have their own log domain This helps reading log output during, as it's otherwise often unclear whether a log entry came from a test client or mutter itself. Part-of: --- src/meson.build | 16 +++++++++++---- src/tests/boxes-tests.c | 6 +++--- src/tests/meson.build | 30 ++++++++++++++++++++++------ src/tests/monitor-store-unit-tests.c | 18 ++++++++--------- src/tests/monitor-unit-tests.c | 10 +++++----- src/tests/ref-test-sanity.c | 2 +- src/tests/wayland-unit-tests.c | 6 +++--- 7 files changed, 57 insertions(+), 31 deletions(-) diff --git a/src/meson.build b/src/meson.build index 7b456f524fb..13a69c1a631 100644 --- a/src/meson.build +++ b/src/meson.build @@ -163,7 +163,6 @@ mutter_c_args = [ '-DCOGL_ENABLE_MUTTER_API', '-DCLUTTER_DISABLE_DEPRECATION_WARNINGS', '-DCOGL_DISABLE_DEPRECATION_WARNINGS', - '-DG_LOG_DOMAIN="mutter"', '-DSN_API_NOT_YET_FROZEN=1', '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), ] @@ -1023,7 +1022,10 @@ libmutter = shared_library(libmutter_name, soversion: 0, gnu_symbol_visibility: 'hidden', include_directories: mutter_includes, - c_args: mutter_c_args, + c_args: [ + mutter_c_args, + '-DG_LOG_DOMAIN="libmutter"', + ], dependencies: [ libmutter_cogl_dep, libmutter_clutter_dep, @@ -1049,7 +1051,10 @@ executable('mutter', files('core/mutter.c'), ], include_directories: mutter_includes, - c_args: mutter_c_args, + c_args: [ + mutter_c_args, + '-DG_LOG_DOMAIN="mutter"', + ], dependencies: [libmutter_dep], install_dir: bindir, install: true, @@ -1062,7 +1067,10 @@ executable('mutter-restart-helper', include_directories: [ top_includepath, ], - c_args: mutter_c_args, + c_args: [ + mutter_c_args, + '-DG_LOG_DOMAIN="mutter-restart-helper"', + ], dependencies: [ x11_dep, xcomposite_dep, diff --git a/src/tests/boxes-tests.c b/src/tests/boxes-tests.c index 8886a294cf8..b0cad23626b 100644 --- a/src/tests/boxes-tests.c +++ b/src/tests/boxes-tests.c @@ -653,7 +653,7 @@ test_regions_okay (void) /*************************************************************/ /* Make sure test region 5 has the right spanning rectangles */ /*************************************************************/ - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "Region to merge was empty!*"); region = get_screen_region (5); g_test_assert_expected_messages (); @@ -762,7 +762,7 @@ test_clamping_to_region (void) rect = meta_rect (50, 50, 10000, 10000); min_size.width = 600; min_size.height = 1170; - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "No rect whose size to clamp to found*"); meta_rectangle_clamp_to_fit_into_region (region, fixed_directions, @@ -794,7 +794,7 @@ test_clamping_to_region (void) min_size.width = 100; min_size.height = 200; fixed_directions = FIXED_DIRECTION_Y; - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "No rect whose size to clamp to found*"); meta_rectangle_clamp_to_fit_into_region (region, fixed_directions, diff --git a/src/tests/meson.build b/src/tests/meson.build index 2cb05d9668e..cada89d7220 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -38,7 +38,10 @@ libmutter_test = shared_library(libmutter_test_name, mutter_test_sources, gnu_symbol_visibility: 'hidden', include_directories: tests_includes, - c_args: tests_c_args, + c_args: [ + tests_c_args, + '-DG_LOG_DOMAIN="libmutter-test"', + ], dependencies: tests_deps, install_rpath: pkglibdir, install_dir: libdir, @@ -104,7 +107,10 @@ endforeach test_client = executable('mutter-test-client', sources: ['test-client.c'], include_directories: tests_includes, - c_args: tests_c_args, + c_args: [ + tests_c_args, + '-DG_LOG_DOMAIN="mutter-test-client"', + ], dependencies: [ gtk3_dep, gio_unix_dep, @@ -120,7 +126,10 @@ test_runner = executable('mutter-test-runner', 'test-runner.c', ], include_directories: tests_includes, - c_args: tests_c_args, + c_args: [ + tests_c_args, + '-DG_LOG_DOMAIN="mutter-test-runner"', + ], dependencies: libmutter_test_dep, install: have_installed_tests, install_dir: mutter_installed_tests_libexecdir, @@ -202,7 +211,10 @@ if have_native_tests dbus_screen_cast_built_sources, ], include_directories: tests_includes, - c_args: tests_c_args, + c_args: [ + tests_c_args, + '-DG_LOG_DOMAIN="mutter-screen-cast-client"', + ], dependencies: [ gio_dep, libpipewire_dep, @@ -289,7 +301,10 @@ if have_native_tests test_executable = executable('mutter-' + test_case['name'], sources: test_case['sources'], include_directories: tests_includes, - c_args: tests_c_args, + c_args: [ + tests_c_args, + '-DG_LOG_DOMAIN="mutter-@0@-test"'.format(test_case['name']), + ], dependencies: libmutter_test_dep, install: have_installed_tests, install_dir: mutter_installed_tests_libexecdir, @@ -352,7 +367,10 @@ if have_kvm_tests or have_tty_tests test_executable = executable('mutter-' + test_case['name'], sources: test_case['sources'], include_directories: tests_includes, - c_args: tests_c_args, + c_args: [ + tests_c_args, + '-DG_LOG_DOMAIN="mutter-@0@-test"'.format(test_case['name']), + ], dependencies: libmutter_test_dep, install: have_installed_tests, install_dir: mutter_installed_tests_libexecdir, diff --git a/src/tests/monitor-store-unit-tests.c b/src/tests/monitor-store-unit-tests.c index 004d466c9df..38f4bc52fc3 100644 --- a/src/tests/monitor-store-unit-tests.c +++ b/src/tests/monitor-store-unit-tests.c @@ -876,13 +876,13 @@ meta_test_monitor_store_unknown_elements (void) .n_configurations = 1 }; - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "Unknown element " "under , ignoring"); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "Unknown element " "under , ignoring"); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "Unknown element " "under , ignoring"); meta_set_custom_monitor_config (test_context, "unknown-elements.xml"); @@ -894,7 +894,7 @@ meta_test_monitor_store_unknown_elements (void) static void meta_test_monitor_store_policy_not_allowed (void) { - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter-test", G_LOG_LEVEL_WARNING, "*Policy can only be defined in system level " "configurations*"); meta_set_custom_monitor_config (test_context, "policy.xml"); @@ -923,7 +923,7 @@ meta_test_monitor_store_policy (void) static void meta_test_monitor_store_policy_empty (void) { - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter-test", G_LOG_LEVEL_WARNING, "*Invalid store*"); meta_set_custom_monitor_system_config (test_context, "policy-empty.xml"); g_test_assert_expected_messages (); @@ -932,7 +932,7 @@ meta_test_monitor_store_policy_empty (void) static void meta_test_monitor_store_policy_duplicate (void) { - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter-test", G_LOG_LEVEL_WARNING, "*Multiple identical stores*"); meta_set_custom_monitor_system_config (test_context, "policy-duplicate.xml"); g_test_assert_expected_messages (); @@ -941,7 +941,7 @@ meta_test_monitor_store_policy_duplicate (void) static void meta_test_monitor_store_policy_invalid (void) { - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter-test", G_LOG_LEVEL_WARNING, "*Invalid store*"); meta_set_custom_monitor_system_config (test_context, "policy-invalid.xml"); g_test_assert_expected_messages (); @@ -950,7 +950,7 @@ meta_test_monitor_store_policy_invalid (void) static void meta_test_monitor_store_policy_multiple (void) { - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter-test", G_LOG_LEVEL_WARNING, "*Multiple stores elements under policy*"); meta_set_custom_monitor_system_config (test_context, "policy-multiple.xml"); g_test_assert_expected_messages (); @@ -991,7 +991,7 @@ meta_test_monitor_store_policy_dbus_invalid (void) meta_monitor_config_manager_get_store (config_manager); const MetaMonitorConfigPolicy *policy; - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter-test", G_LOG_LEVEL_WARNING, "*Multiple dbus elements under policy*"); meta_set_custom_monitor_system_config (test_context, "policy-dbus-invalid.xml"); diff --git a/src/tests/monitor-unit-tests.c b/src/tests/monitor-unit-tests.c index 7a19ca11344..6a807c60e38 100644 --- a/src/tests/monitor-unit-tests.c +++ b/src/tests/monitor-unit-tests.c @@ -1852,7 +1852,7 @@ meta_test_monitor_suggested_config_overlapping (void) &test_case.setup, MONITOR_TEST_FLAG_NO_STORED); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "Suggested monitor config has overlapping region, " "rejecting"); emulate_hotplug (test_setup); @@ -2011,7 +2011,7 @@ meta_test_monitor_suggested_config_not_adjacent (void) &test_case.setup, MONITOR_TEST_FLAG_NO_STORED); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "Suggested monitor config has monitors with no " "neighbors, rejecting"); emulate_hotplug (test_setup); @@ -2169,7 +2169,7 @@ meta_test_monitor_suggested_config_multi_dpi (void) &test_case.setup, MONITOR_TEST_FLAG_NO_STORED); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "Suggested monitor config has monitors with no " "neighbors, rejecting"); emulate_hotplug (test_setup); @@ -2298,7 +2298,7 @@ meta_test_monitor_limited_crtcs (void) &test_case.setup, MONITOR_TEST_FLAG_NO_STORED); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "Failed to use linear *"); emulate_hotplug (test_setup); @@ -7992,7 +7992,7 @@ meta_test_monitor_migrated_wiggle_discard (void) &error)) g_error ("Failed to migrate config: %s", error->message); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "Failed to finish monitors config migration: " "Mode not available on monitor"); emulate_hotplug (test_setup); diff --git a/src/tests/ref-test-sanity.c b/src/tests/ref-test-sanity.c index d9dd32c6c84..0776270da98 100644 --- a/src/tests/ref-test-sanity.c +++ b/src/tests/ref-test-sanity.c @@ -106,7 +106,7 @@ meta_test_ref_test_sanity (void) clutter_actor_set_background_color (actor2, CLUTTER_COLOR_SkyBlue); clutter_actor_add_child (stage, actor2); - g_test_expect_message (G_LOG_DOMAIN, + g_test_expect_message ("libmutter-test", G_LOG_LEVEL_CRITICAL, "Pixel difference exceeds limits*"); diff --git a/src/tests/wayland-unit-tests.c b/src/tests/wayland-unit-tests.c index 9c42b163322..116531ba4e8 100644 --- a/src/tests/wayland-unit-tests.c +++ b/src/tests/wayland-unit-tests.c @@ -82,9 +82,9 @@ subsurface_invalid_subsurfaces (void) wayland_test_client = meta_wayland_test_client_new ("invalid-subsurfaces"); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "WL: error in client communication*"); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "WL: error in client communication*"); meta_wayland_test_client_finish (wayland_test_client); g_test_assert_expected_messages (); @@ -97,7 +97,7 @@ subsurface_invalid_xdg_shell_actions (void) wayland_test_client = meta_wayland_test_client_new ("invalid-xdg-shell-actions"); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, "Invalid geometry * set on xdg_surface*"); meta_wayland_test_client_finish (wayland_test_client); g_test_assert_expected_messages (); -- GitLab From dd6afb28ff5ece0b0995340b68a7fb44570d6afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 28 Apr 2022 16:10:13 +0200 Subject: [PATCH 2/7] util: Avoid overriding 'message' in meta_topic() We'd put the message in a variable called `message`. If something passed to meta_topic() was called `message`, it'd end up being `NULL` in the log entry. Avoid this by making the local message variable a bit more "on topic". Part-of: --- src/meta/util.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/meta/util.h b/src/meta/util.h index c44a63fc873..c8628bcf9ce 100644 --- a/src/meta/util.h +++ b/src/meta/util.h @@ -175,10 +175,11 @@ const char * meta_topic_to_string (MetaDebugTopic topic); { \ if (meta_is_topic_enabled (debug_topic)) \ { \ - g_autofree char *message = NULL; \ + g_autofree char *_topic_message = NULL; \ \ - message = g_strdup_printf (__VA_ARGS__); \ - g_message ("%s: %s", meta_topic_to_string (debug_topic), message); \ + _topic_message = g_strdup_printf (__VA_ARGS__); \ + g_message ("%s: %s", meta_topic_to_string (debug_topic), \ + _topic_message); \ } \ } \ G_STMT_END -- GitLab From 36de8baf5540333dab84cad856f85d7d253f1e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Apr 2022 12:12:33 +0200 Subject: [PATCH 3/7] display: Get the backend from the context Part-of: --- .../clutter-input-pointer-a11y-private.h | 3 +- clutter/clutter/clutter-input-pointer-a11y.c | 6 ++-- clutter/clutter/clutter-main.c | 1 - src/core/display.c | 2 +- src/core/events.c | 30 +++++++++++++------ 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/clutter/clutter/clutter-input-pointer-a11y-private.h b/clutter/clutter/clutter-input-pointer-a11y-private.h index a66ddeac9d7..d7f4655012c 100644 --- a/clutter/clutter/clutter-input-pointer-a11y-private.h +++ b/clutter/clutter/clutter-input-pointer-a11y-private.h @@ -43,7 +43,8 @@ CLUTTER_EXPORT gboolean _clutter_is_input_pointer_a11y_enabled (ClutterInputDevice *device); CLUTTER_EXPORT -void _clutter_input_pointer_a11y_maybe_handle_event (ClutterEvent *event); +void clutter_input_pointer_a11y_update (ClutterInputDevice *device, + const ClutterEvent *event); G_END_DECLS diff --git a/clutter/clutter/clutter-input-pointer-a11y.c b/clutter/clutter/clutter-input-pointer-a11y.c index cfee58e55f5..a74aa4cc223 100644 --- a/clutter/clutter/clutter-input-pointer-a11y.c +++ b/clutter/clutter/clutter-input-pointer-a11y.c @@ -730,13 +730,15 @@ _clutter_is_input_pointer_a11y_enabled (ClutterInputDevice *device) } void -_clutter_input_pointer_a11y_maybe_handle_event (ClutterEvent *event) +clutter_input_pointer_a11y_update (ClutterInputDevice *device, + const ClutterEvent *event) { - ClutterInputDevice *device = clutter_event_get_device (event); ClutterMainContext *clutter_context; ClutterBackend *backend; + g_return_if_fail (clutter_event_get_device (event) == device); + if (!_clutter_is_input_pointer_a11y_enabled (device)) return; diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c index a2ee338b66a..5b01783e5e9 100644 --- a/clutter/clutter/clutter-main.c +++ b/clutter/clutter/clutter-main.c @@ -802,7 +802,6 @@ clutter_do_event (ClutterEvent *event) context->current_event = g_slist_prepend (context->current_event, event); - _clutter_input_pointer_a11y_maybe_handle_event (event); if (_clutter_event_process_filters (event, event_actor)) { context->current_event = diff --git a/src/core/display.c b/src/core/display.c index a1c5c2d9121..058d09f2a5e 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -829,12 +829,12 @@ MetaDisplay * meta_display_new (MetaContext *context, GError **error) { + MetaBackend *backend = meta_context_get_backend (context); MetaDisplay *display; MetaDisplayPrivate *priv; int i; guint32 timestamp; Window old_active_xwindow = None; - MetaBackend *backend = meta_get_backend (); MetaMonitorManager *monitor_manager; MetaSettings *settings; diff --git a/src/core/events.c b/src/core/events.c index 0dc3a73222c..d5a9a93da34 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -61,9 +61,10 @@ typedef enum } EventsUnfreezeMethod; static gboolean -stage_has_key_focus (void) +stage_has_key_focus (MetaDisplay *display) { - MetaBackend *backend = meta_get_backend (); + MetaContext *context = meta_display_get_context (display); + MetaBackend *backend = meta_context_get_backend (context); ClutterActor *stage = meta_backend_get_stage (backend); return clutter_stage_get_key_focus (CLUTTER_STAGE (stage)) == stage; @@ -92,7 +93,10 @@ get_window_for_event (MetaDisplay *display, /* Always use the key focused window for key events. */ if (IS_KEY_EVENT (event)) - return stage_has_key_focus () ? display->focus_window : NULL; + { + return stage_has_key_focus (display) ? display->focus_window + : NULL; + } window_actor = meta_window_actor_from_actor (event_actor); if (window_actor) @@ -112,9 +116,11 @@ get_window_for_event (MetaDisplay *display, } static void -handle_idletime_for_event (const ClutterEvent *event) +handle_idletime_for_event (MetaDisplay *display, + const ClutterEvent *event) { - MetaBackend *backend = meta_get_backend (); + MetaContext *context = meta_display_get_context (display); + MetaBackend *backend = meta_context_get_backend (context); MetaIdleManager *idle_manager; if (clutter_event_get_device (event) == NULL) @@ -144,7 +150,8 @@ sequence_is_pointer_emulated (MetaDisplay *display, return TRUE; #ifdef HAVE_NATIVE_BACKEND - MetaBackend *backend = meta_get_backend (); + MetaContext *context = meta_display_get_context (display); + MetaBackend *backend = meta_context_get_backend (context); /* When using Clutter's native input backend there is no concept of * pointer emulating sequence, we still must make up our own to be @@ -213,7 +220,9 @@ meta_display_handle_event (MetaDisplay *display, const ClutterEvent *event, ClutterActor *event_actor) { - MetaBackend *backend = meta_get_backend (); + MetaContext *context = meta_display_get_context (display); + MetaBackend *backend = meta_context_get_backend (context); + ClutterInputDevice *device; MetaWindow *window = NULL; gboolean bypass_clutter = FALSE; G_GNUC_UNUSED gboolean bypass_wayland = FALSE; @@ -251,6 +260,9 @@ meta_display_handle_event (MetaDisplay *display, } } + device = clutter_event_get_device (event); + clutter_input_pointer_a11y_update (device, event); + sequence = clutter_event_get_event_sequence (event); /* Set the pointer emulating sequence on touch begin, if eligible */ @@ -312,7 +324,7 @@ meta_display_handle_event (MetaDisplay *display, if (event->type != CLUTTER_DEVICE_ADDED && event->type != CLUTTER_DEVICE_REMOVED) - handle_idletime_for_event (event); + handle_idletime_for_event (display, event); #ifdef HAVE_WAYLAND if (wayland_compositor && event->type == CLUTTER_MOTION) @@ -398,7 +410,7 @@ meta_display_handle_event (MetaDisplay *display, */ if (display->event_route == META_EVENT_ROUTE_NORMAL) { - if (IS_KEY_EVENT (event) && !stage_has_key_focus ()) + if (IS_KEY_EVENT (event) && !stage_has_key_focus (display)) { bypass_wayland = TRUE; goto out; -- GitLab From 1a5647e00ca690023025c99177e2cba0be2c18d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 11 Mar 2022 11:54:30 +0100 Subject: [PATCH 4/7] barrier: Some coding style cleanup Part-of: --- src/backends/meta-barrier.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/backends/meta-barrier.c b/src/backends/meta-barrier.c index 94a4b7964e8..ca4f9607f1b 100644 --- a/src/backends/meta-barrier.c +++ b/src/backends/meta-barrier.c @@ -227,35 +227,45 @@ meta_barrier_class_init (MetaBarrierClass *klass) "Display", "The display to construct the pointer barrier on", META_TYPE_DISPLAY, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); obj_props[PROP_X1] = g_param_spec_int ("x1", "X1", "The first X coordinate of the barrier", 0, G_MAXSHORT, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); obj_props[PROP_Y1] = g_param_spec_int ("y1", "Y1", "The first Y coordinate of the barrier", 0, G_MAXSHORT, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); obj_props[PROP_X2] = g_param_spec_int ("x2", "X2", "The second X coordinate of the barrier", 0, G_MAXSHORT, G_MAXSHORT, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); obj_props[PROP_Y2] = g_param_spec_int ("y2", "Y2", "The second Y coordinate of the barrier", 0, G_MAXSHORT, G_MAXSHORT, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); obj_props[PROP_DIRECTIONS] = g_param_spec_flags ("directions", @@ -263,7 +273,9 @@ meta_barrier_class_init (MetaBarrierClass *klass) "A set of directions to let the pointer through", META_TYPE_BARRIER_DIRECTION, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, PROP_LAST, obj_props); -- GitLab From 5da8e5a9d58aa8e757532a47cb836a4b26cb43bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 14 Mar 2022 22:41:40 +0100 Subject: [PATCH 5/7] barrier: Remove _ prefix in various places It's not a convention used anywhere else anymore, lets remove the prefixes. Part-of: --- src/backends/meta-barrier-private.h | 6 +++--- src/backends/meta-barrier.c | 8 ++++---- src/backends/native/meta-barrier-native.c | 16 ++++++++-------- src/backends/x11/meta-barrier-x11.c | 18 +++++++++--------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/backends/meta-barrier-private.h b/src/backends/meta-barrier-private.h index d0483e43c6a..dd68c4f1df6 100644 --- a/src/backends/meta-barrier-private.h +++ b/src/backends/meta-barrier-private.h @@ -47,10 +47,10 @@ struct _MetaBarrierImplClass void (*destroy) (MetaBarrierImpl *barrier); }; -void _meta_barrier_emit_hit_signal (MetaBarrier *barrier, +void meta_barrier_emit_hit_signal (MetaBarrier *barrier, + MetaBarrierEvent *event); +void meta_barrier_emit_left_signal (MetaBarrier *barrier, MetaBarrierEvent *event); -void _meta_barrier_emit_left_signal (MetaBarrier *barrier, - MetaBarrierEvent *event); void meta_barrier_event_unref (MetaBarrierEvent *event); diff --git a/src/backends/meta-barrier.c b/src/backends/meta-barrier.c index ca4f9607f1b..2f892f4e3ad 100644 --- a/src/backends/meta-barrier.c +++ b/src/backends/meta-barrier.c @@ -334,15 +334,15 @@ meta_barrier_init (MetaBarrier *barrier) } void -_meta_barrier_emit_hit_signal (MetaBarrier *barrier, - MetaBarrierEvent *event) +meta_barrier_emit_hit_signal (MetaBarrier *barrier, + MetaBarrierEvent *event) { g_signal_emit (barrier, obj_signals[HIT], 0, event); } void -_meta_barrier_emit_left_signal (MetaBarrier *barrier, - MetaBarrierEvent *event) +meta_barrier_emit_left_signal (MetaBarrier *barrier, + MetaBarrierEvent *event) { g_signal_emit (barrier, obj_signals[LEFT], 0, event); } diff --git a/src/backends/native/meta-barrier-native.c b/src/backends/native/meta-barrier-native.c index 2e17c49c73c..47463e4aa06 100644 --- a/src/backends/native/meta-barrier-native.c +++ b/src/backends/native/meta-barrier-native.c @@ -356,9 +356,9 @@ static gboolean emit_event_idle (MetaBarrierIdleData *idle_data) { if (idle_data->state == META_BARRIER_STATE_HELD) - _meta_barrier_emit_hit_signal (idle_data->barrier, idle_data->event); + meta_barrier_emit_hit_signal (idle_data->barrier, idle_data->event); else - _meta_barrier_emit_left_signal (idle_data->barrier, idle_data->event); + meta_barrier_emit_left_signal (idle_data->barrier, idle_data->event); meta_barrier_event_unref (idle_data->event); @@ -573,7 +573,7 @@ meta_barrier_manager_native_process_in_impl (MetaBarrierManagerNative *manager, } static gboolean -_meta_barrier_impl_native_is_active (MetaBarrierImpl *impl) +meta_barrier_impl_native_is_active (MetaBarrierImpl *impl) { MetaBarrierImplNative *self = META_BARRIER_IMPL_NATIVE (impl); @@ -581,7 +581,7 @@ _meta_barrier_impl_native_is_active (MetaBarrierImpl *impl) } static void -_meta_barrier_impl_native_release (MetaBarrierImpl *impl, +meta_barrier_impl_native_release (MetaBarrierImpl *impl, MetaBarrierEvent *event) { MetaBarrierImplNative *self = META_BARRIER_IMPL_NATIVE (impl); @@ -592,7 +592,7 @@ _meta_barrier_impl_native_release (MetaBarrierImpl *impl, } static void -_meta_barrier_impl_native_destroy (MetaBarrierImpl *impl) +meta_barrier_impl_native_destroy (MetaBarrierImpl *impl) { MetaBarrierImplNative *self = META_BARRIER_IMPL_NATIVE (impl); @@ -631,9 +631,9 @@ meta_barrier_impl_native_class_init (MetaBarrierImplNativeClass *klass) { MetaBarrierImplClass *impl_class = META_BARRIER_IMPL_CLASS (klass); - impl_class->is_active = _meta_barrier_impl_native_is_active; - impl_class->release = _meta_barrier_impl_native_release; - impl_class->destroy = _meta_barrier_impl_native_destroy; + impl_class->is_active = meta_barrier_impl_native_is_active; + impl_class->release = meta_barrier_impl_native_release; + impl_class->destroy = meta_barrier_impl_native_destroy; } static void diff --git a/src/backends/x11/meta-barrier-x11.c b/src/backends/x11/meta-barrier-x11.c index 998aefb38f0..ebbf1dabb01 100644 --- a/src/backends/x11/meta-barrier-x11.c +++ b/src/backends/x11/meta-barrier-x11.c @@ -53,7 +53,7 @@ G_DEFINE_TYPE (MetaBarrierImplX11, META_TYPE_BARRIER_IMPL) static gboolean -_meta_barrier_impl_x11_is_active (MetaBarrierImpl *impl) +meta_barrier_impl_x11_is_active (MetaBarrierImpl *impl) { MetaBarrierImplX11 *self = META_BARRIER_IMPL_X11 (impl); @@ -61,8 +61,8 @@ _meta_barrier_impl_x11_is_active (MetaBarrierImpl *impl) } static void -_meta_barrier_impl_x11_release (MetaBarrierImpl *impl, - MetaBarrierEvent *event) +meta_barrier_impl_x11_release (MetaBarrierImpl *impl, + MetaBarrierEvent *event) { MetaBarrierImplX11 *self = META_BARRIER_IMPL_X11 (impl); MetaDisplay *display = self->barrier->priv->display; @@ -77,7 +77,7 @@ _meta_barrier_impl_x11_release (MetaBarrierImpl *impl, } static void -_meta_barrier_impl_x11_destroy (MetaBarrierImpl *impl) +meta_barrier_impl_x11_destroy (MetaBarrierImpl *impl) { MetaBarrierImplX11 *self = META_BARRIER_IMPL_X11 (impl); MetaDisplay *display = self->barrier->priv->display; @@ -154,10 +154,10 @@ meta_barrier_fire_xevent (MetaBarrier *barrier, switch (xevent->evtype) { case XI_BarrierHit: - _meta_barrier_emit_hit_signal (barrier, event); + meta_barrier_emit_hit_signal (barrier, event); break; case XI_BarrierLeave: - _meta_barrier_emit_left_signal (barrier, event); + meta_barrier_emit_left_signal (barrier, event); break; default: g_assert_not_reached (); @@ -201,9 +201,9 @@ meta_barrier_impl_x11_class_init (MetaBarrierImplX11Class *klass) { MetaBarrierImplClass *impl_class = META_BARRIER_IMPL_CLASS (klass); - impl_class->is_active = _meta_barrier_impl_x11_is_active; - impl_class->release = _meta_barrier_impl_x11_release; - impl_class->destroy = _meta_barrier_impl_x11_destroy; + impl_class->is_active = meta_barrier_impl_x11_is_active; + impl_class->release = meta_barrier_impl_x11_release; + impl_class->destroy = meta_barrier_impl_x11_destroy; } static void -- GitLab From b2eec498736a0f5ea5484f81f1c3f86736ecb0f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 11 Mar 2022 00:39:53 +0100 Subject: [PATCH 6/7] screen-cast: Remove stray newline Part-of: --- src/backends/meta-screen-cast.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/backends/meta-screen-cast.c b/src/backends/meta-screen-cast.c index 6162b8d2769..119c8712fc2 100644 --- a/src/backends/meta-screen-cast.c +++ b/src/backends/meta-screen-cast.c @@ -359,7 +359,6 @@ meta_screen_cast_new (MetaBackend *backend, return screen_cast; } - static void meta_screen_cast_init (MetaScreenCast *screen_cast) { -- GitLab From d19700604b89a98350affbfeb644273353b83284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 14 Mar 2022 22:19:19 +0100 Subject: [PATCH 7/7] compositor/dnd: Fix indentation Part-of: --- src/compositor/meta-dnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compositor/meta-dnd.c b/src/compositor/meta-dnd.c index 0edc797e70e..4053ccaeaf9 100644 --- a/src/compositor/meta-dnd.c +++ b/src/compositor/meta-dnd.c @@ -222,7 +222,7 @@ meta_dnd_handle_xdnd_event (MetaBackend *backend, return TRUE; } - return FALSE; + return FALSE; } #ifdef HAVE_WAYLAND -- GitLab