Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package muffin for openSUSE:Factory checked in at 2024-05-14 13:39:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/muffin (Old) and /work/SRC/openSUSE:Factory/.muffin.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "muffin" Tue May 14 13:39:01 2024 rev:31 rq:1173676 version:6.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/muffin/muffin.changes 2023-12-03 20:49:02.042262546 +0100 +++ /work/SRC/openSUSE:Factory/.muffin.new.1880/muffin.changes 2024-05-14 13:40:52.272077559 +0200 @@ -1,0 +2,7 @@ +Mon May 13 13:41:43 UTC 2024 - Dirk Müller <[email protected]> + +- update to 6.0.1: + * meta-compositor-x11.c: Don't disable fractional scaling when + unredirecting a fullscreen window. + +------------------------------------------------------------------- Old: ---- muffin-6.0.0.tar.gz New: ---- muffin-6.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ muffin.spec ++++++ --- /var/tmp/diff_new_pack.NOqdT1/_old 2024-05-14 13:40:53.080107024 +0200 +++ /var/tmp/diff_new_pack.NOqdT1/_new 2024-05-14 13:40:53.080107024 +0200 @@ -1,7 +1,7 @@ # # spec file for package muffin # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,41 +21,41 @@ %define typelib typelib-1_0-Muffin-0_0 %define _lto_cflags %{nil} Name: muffin -Version: 6.0.0 +Version: 6.0.1 Release: 0 Summary: Cinnamon Desktop default window manager License: GPL-2.0-or-later AND MIT Group: System/GUI/Other URL: https://github.com/linuxmint/muffin Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: meson +BuildRequires: Mesa-libGLESv3-devel BuildRequires: fdupes +BuildRequires: libxcvt +BuildRequires: meson BuildRequires: mutter-devel BuildRequires: update-desktop-files BuildRequires: zenity -BuildRequires: Mesa-libGLESv3-devel BuildRequires: pkgconfig(cinnamon-desktop) >= 4.0.0 BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gnome-doc-utils) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk-doc) +BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libcanberra) +BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libinput) +BuildRequires: pkgconfig(libpipewire-0.3) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libwacom) +BuildRequires: pkgconfig(libxcvt) BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(xkbcommon-x11) BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(libwacom) -BuildRequires: pkgconfig(libpipewire-0.3) -BuildRequires: pkgconfig(wayland-protocols) -BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(xwayland) -BuildRequires: pkgconfig(libxcvt) -BuildRequires: libxcvt Requires: cinnamon-gschemas Requires: zenity Recommends: %{name}-lang ++++++ muffin-6.0.0.tar.gz -> muffin-6.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.0/debian/changelog new/muffin-6.0.1/debian/changelog --- old/muffin-6.0.0/debian/changelog 2023-11-19 14:50:08.000000000 +0100 +++ new/muffin-6.0.1/debian/changelog 2023-12-28 12:53:15.000000000 +0100 @@ -1,3 +1,10 @@ +muffin (6.0.1) virginia; urgency=medium + + [ Michael Webster ] + * meta-compositor-x11.c: Don't disable fractional scaling when unredirecting a fullscreen window. + + -- Clement Lefebvre <[email protected]> Thu, 28 Dec 2023 11:53:02 +0000 + muffin (6.0.0) virginia; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.0/meson.build new/muffin-6.0.1/meson.build --- old/muffin-6.0.0/meson.build 2023-11-19 14:50:08.000000000 +0100 +++ new/muffin-6.0.1/meson.build 2023-12-28 12:53:15.000000000 +0100 @@ -1,5 +1,5 @@ project('muffin', 'c', - version: '6.0.0', + version: '6.0.1', meson_version: '>=0.56.0', license: 'GPLv2+' ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.0/src/backends/meta-monitor-manager-private.h new/muffin-6.0.1/src/backends/meta-monitor-manager-private.h --- old/muffin-6.0.0/src/backends/meta-monitor-manager-private.h 2023-11-19 14:50:08.000000000 +0100 +++ new/muffin-6.0.1/src/backends/meta-monitor-manager-private.h 2023-12-28 12:53:15.000000000 +0100 @@ -125,7 +125,6 @@ int screen_height; GList *monitors; - GList *scale_override_monitors; GList *logical_monitors; MetaLogicalMonitor *primary_logical_monitor; @@ -378,9 +377,6 @@ float meta_monitor_manager_get_maximum_crtc_scale (MetaMonitorManager *manager); -gboolean meta_monitor_manager_disable_scale_for_monitor (MetaMonitorManager *manager, - MetaLogicalMonitor *monitor); - MetaMonitorManagerCapability meta_monitor_manager_get_capabilities (MetaMonitorManager *manager); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.0/src/backends/meta-monitor-manager.c new/muffin-6.0.1/src/backends/meta-monitor-manager.c --- old/muffin-6.0.0/src/backends/meta-monitor-manager.c 2023-11-19 14:50:08.000000000 +0100 +++ new/muffin-6.0.1/src/backends/meta-monitor-manager.c 2023-12-28 12:53:15.000000000 +0100 @@ -561,9 +561,6 @@ monitor, monitor_mode); - if (g_list_find (manager->scale_override_monitors, monitor)) - return ceilf (scale); - return scale; } @@ -678,8 +675,7 @@ should_use_stored_config (MetaMonitorManager *manager) { return (manager->in_init || - (!manager->scale_override_monitors && - !meta_monitor_manager_has_hotplug_mode_update (manager))); + !meta_monitor_manager_has_hotplug_mode_update (manager)); } MetaMonitorsConfig * @@ -1537,41 +1533,6 @@ g_signal_emit (manager, signals[CONFIRM_DISPLAY_CHANGE], 0); } -gboolean -meta_monitor_manager_disable_scale_for_monitor (MetaMonitorManager *manager, - MetaLogicalMonitor *monitor) -{ - switch (manager->layout_mode) - { - case META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL: - case META_LOGICAL_MONITOR_LAYOUT_MODE_GLOBAL_UI_LOGICAL: - break; - default: - return FALSE; - } - - if (monitor && fmodf (monitor->scale, 1.0) != 0.0f) - { - if (manager->scale_override_monitors) - { - g_clear_pointer (&manager->scale_override_monitors, g_list_free); - g_object_unref (meta_monitor_config_manager_pop_previous (manager->config_manager)); - } - - manager->scale_override_monitors = g_list_copy (monitor->monitors); - meta_monitor_manager_ensure_configured (manager); - return TRUE; - } - - if (manager->scale_override_monitors) - { - g_clear_pointer (&manager->scale_override_monitors, g_list_free); - restore_previous_config (manager); - } - - return FALSE; -} - #define META_DISPLAY_CONFIG_MODE_FLAGS_PREFERRED (1 << 0) #define META_DISPLAY_CONFIG_MODE_FLAGS_CURRENT (1 << 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-6.0.0/src/compositor/meta-compositor-x11.c new/muffin-6.0.1/src/compositor/meta-compositor-x11.c --- old/muffin-6.0.0/src/compositor/meta-compositor-x11.c 2023-11-19 14:50:08.000000000 +0100 +++ new/muffin-6.0.1/src/compositor/meta-compositor-x11.c 2023-12-28 12:53:15.000000000 +0100 @@ -272,90 +272,19 @@ } static void -on_redirected_monitor_changed (MetaWindow *window, - int old_monitor, - MetaCompositorX11 *compositor_x11) -{ - MetaBackend *backend = meta_get_backend (); - MetaMonitorManager *monitor_manager = - meta_backend_get_monitor_manager (backend); - - if (old_monitor >= 0 && window->monitor && - window->monitor->number != old_monitor) - { - g_signal_handlers_block_by_func (window, - on_redirected_monitor_changed, - compositor_x11); - - if (!compositor_x11->randr_scale_disabled) - { - compositor_x11->randr_scale_disabled = - meta_monitor_manager_disable_scale_for_monitor (monitor_manager, - window->monitor); - } - - g_signal_handlers_unblock_by_func (window, - on_redirected_monitor_changed, - compositor_x11); - } - else - shape_cow_for_window (META_COMPOSITOR_X11 (compositor_x11), window); -} - -static MetaWindow * -get_unredirectable_window (MetaCompositorX11 *compositor_x11) -{ - MetaCompositor *compositor = META_COMPOSITOR (compositor_x11); - MetaWindowActor *window_actor; - MetaWindowActorX11 *window_actor_x11; - - window_actor = meta_compositor_get_top_window_actor (compositor); - if (!window_actor) - return NULL; - - window_actor_x11 = META_WINDOW_ACTOR_X11 (window_actor); - if (!meta_window_actor_x11_should_unredirect (window_actor_x11)) - return NULL; - - return meta_window_actor_get_meta_window (window_actor); -} - -static void set_unredirected_window (MetaCompositorX11 *compositor_x11, MetaWindow *window) { - MetaBackend *backend; - MetaMonitorManager *monitor_manager; MetaWindow *prev_unredirected_window = compositor_x11->unredirected_window; if (prev_unredirected_window == window) - { - if (!window && compositor_x11->randr_scale_disabled && - !get_unredirectable_window (compositor_x11)) - { - backend = meta_get_backend (); - monitor_manager = meta_backend_get_monitor_manager (backend); - - compositor_x11->randr_scale_disabled = - meta_monitor_manager_disable_scale_for_monitor (monitor_manager, - NULL); - } - - return; - } - - backend = meta_get_backend (); - monitor_manager = meta_backend_get_monitor_manager (backend); + return; if (prev_unredirected_window) { MetaWindowActor *window_actor; MetaWindowActorX11 *window_actor_x11; - g_signal_handlers_disconnect_by_func (prev_unredirected_window, - on_redirected_monitor_changed, - compositor_x11); - window_actor = meta_window_actor_from_window (prev_unredirected_window); window_actor_x11 = META_WINDOW_ACTOR_X11 (window_actor); meta_window_actor_x11_set_unredirected (window_actor_x11, FALSE); @@ -369,17 +298,6 @@ MetaWindowActor *window_actor; MetaWindowActorX11 *window_actor_x11; - if (!compositor_x11->randr_scale_disabled) - { - compositor_x11->randr_scale_disabled = - meta_monitor_manager_disable_scale_for_monitor (monitor_manager, - window->monitor); - } - - g_signal_connect_object (window, "monitor-changed", - G_CALLBACK (on_redirected_monitor_changed), - compositor_x11, 0); - window_actor = meta_window_actor_from_window (window); window_actor_x11 = META_WINDOW_ACTOR_X11 (window_actor); meta_window_actor_x11_set_unredirected (window_actor_x11, TRUE); @@ -391,11 +309,21 @@ { MetaCompositor *compositor = META_COMPOSITOR (compositor_x11); MetaWindow *window_to_unredirect = NULL; + MetaWindowActor *window_actor; + MetaWindowActorX11 *window_actor_x11; if (meta_compositor_is_unredirect_inhibited (compositor)) goto out; - window_to_unredirect = get_unredirectable_window (compositor_x11); + window_actor = meta_compositor_get_top_window_actor (compositor); + if (!window_actor) + goto out; + + window_actor_x11 = META_WINDOW_ACTOR_X11 (window_actor); + if (!meta_window_actor_x11_should_unredirect (window_actor_x11)) + goto out; + + window_to_unredirect = meta_window_actor_get_meta_window (window_actor); out: set_unredirected_window (compositor_x11, window_to_unredirect);
