Hello community,
here is the log from the commit of package cinnamon-screensaver for
openSUSE:Factory checked in at 2020-03-17 13:10:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-screensaver (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-screensaver"
Tue Mar 17 13:10:58 2020 rev:18 rq:785766 version:4.4.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-screensaver/cinnamon-screensaver.changes
2019-07-18 15:19:37.028152663 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.3160/cinnamon-screensaver.changes
2020-03-17 13:11:11.581847235 +0100
@@ -1,0 +2,12 @@
+Mon Mar 16 15:03:25 UTC 2020 - Marguerite Su <i...@marguerite.su>
+
+- update version 4.4.1
+ * Update cinnamon-screensaver to fix #326
+ * Fixed wrong font being applied in custom text
+- changes in 4.4.0
+ * cs-screen, stage.py: Move the pointer to the
+ primary monitor
+ * passwordEntry.py: Render keyboard layout flags
+ properly in hidpi
+
+-------------------------------------------------------------------
Old:
----
cinnamon-screensaver-4.2.0.tar.gz
New:
----
cinnamon-screensaver-4.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.njqgrj/_old 2020-03-17 13:11:12.249847748 +0100
+++ /var/tmp/diff_new_pack.njqgrj/_new 2020-03-17 13:11:12.253847751 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cinnamon-screensaver
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cinnamon-screensaver
-Version: 4.2.0
+Version: 4.4.1
Release: 0
Summary: Cinnamon screensaver and locker
License: GPL-2.0-or-later
++++++ cinnamon-screensaver-4.2.0.tar.gz -> cinnamon-screensaver-4.4.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.2.0/configure.ac
new/cinnamon-screensaver-4.4.1/configure.ac
--- old/cinnamon-screensaver-4.2.0/configure.ac 2019-06-23 15:42:41.000000000
+0200
+++ new/cinnamon-screensaver-4.4.1/configure.ac 2019-12-10 10:58:25.000000000
+0100
@@ -2,7 +2,7 @@
AC_PREREQ(2.60)
AC_INIT([cinnamon-screensaver],
- [4.2.0],
+ [4.4.1],
[https://github.com/linuxmint/cinnamon-screensaver/issues])
PKG_PROG_PKG_CONFIG([0.26])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.2.0/debian/changelog
new/cinnamon-screensaver-4.4.1/debian/changelog
--- old/cinnamon-screensaver-4.2.0/debian/changelog 2019-06-23
15:42:41.000000000 +0200
+++ new/cinnamon-screensaver-4.4.1/debian/changelog 2019-12-10
10:58:25.000000000 +0100
@@ -1,3 +1,21 @@
+cinnamon-screensaver (4.4.1) tricia; urgency=medium
+
+ [ GeorchW ]
+ * Fixed wrong font being applied in custom text (#328)
+
+ [ claudiux ]
+ * Update cinnamon-screensaver to fix #326 (#327)
+
+ -- Clement Lefebvre <r...@linuxmint.com> Tue, 10 Dec 2019 09:58:06 +0000
+
+cinnamon-screensaver (4.4.0) tricia; urgency=medium
+
+ [ Michael Webster ]
+ * passwordEntry.py: Render keyboard layout flags properly in hidpi.
+ * cs-screen, stage.py: Move the pointer to the primary monitor (and, as a
result, the unlock dialog as well) when initially waking.
+
+ -- Clement Lefebvre <r...@linuxmint.com> Sat, 16 Nov 2019 12:24:53 +0100
+
cinnamon-screensaver (4.2.0) tina; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-4.2.0/libcscreensaver/cs-screen-x11.c
new/cinnamon-screensaver-4.4.1/libcscreensaver/cs-screen-x11.c
--- old/cinnamon-screensaver-4.2.0/libcscreensaver/cs-screen-x11.c
2019-06-23 15:42:41.000000000 +0200
+++ new/cinnamon-screensaver-4.4.1/libcscreensaver/cs-screen-x11.c
2019-12-10 10:58:25.000000000 +0100
@@ -757,6 +757,39 @@
}
/**
+ * cs_screen_center_pointer_in_primary_monitor:
+ * @screen: The #CsScreen
+ *
+ * Warps the mouse pointer to the center in x, and half again below center
+ * in y, of the primary monitor. This is used during waking to have the
+ * unlock dialog appear on the primary monitor (at least, initially).
+ */
+void
+cs_screen_place_pointer_in_primary_monitor (CsScreen *screen)
+{
+ GdkDisplay *display;
+ GdkRectangle rect;
+ GdkSeat *seat;
+ GdkDevice *pointer;
+
+ g_return_if_fail (CS_IS_SCREEN (screen));
+
+ cs_screen_get_monitor_geometry (screen,
+ screen->primary_monitor_index,
+ &rect);
+
+ display = gdk_screen_get_display (screen->gdk_screen);
+ seat = gdk_display_get_default_seat (display);
+
+ pointer = gdk_seat_get_pointer (seat);
+
+ gdk_device_warp (pointer,
+ screen->gdk_screen,
+ rect.x + (rect.width * .5),
+ rect.y + (rect.height * .75));
+}
+
+/**
* cs_screen_reset_screensaver:
*
* Resets the screensaver idle timer. If called when the screensaver is active
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-4.2.0/libcscreensaver/cs-screen.h
new/cinnamon-screensaver-4.4.1/libcscreensaver/cs-screen.h
--- old/cinnamon-screensaver-4.2.0/libcscreensaver/cs-screen.h 2019-06-23
15:42:41.000000000 +0200
+++ new/cinnamon-screensaver-4.4.1/libcscreensaver/cs-screen.h 2019-12-10
10:58:25.000000000 +0100
@@ -75,6 +75,8 @@
gint
*width,
gint
*height);
+void cs_screen_place_pointer_in_primary_monitor
(CsScreen *screen);
+
void cs_screen_reset_screensaver (void);
void cs_screen_nuke_focus (void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-4.2.0/src/cinnamon-screensaver-main.py
new/cinnamon-screensaver-4.4.1/src/cinnamon-screensaver-main.py
--- old/cinnamon-screensaver-4.2.0/src/cinnamon-screensaver-main.py
2019-06-23 15:42:41.000000000 +0200
+++ new/cinnamon-screensaver-4.4.1/src/cinnamon-screensaver-main.py
2019-12-10 10:58:25.000000000 +0100
@@ -58,8 +58,6 @@
# This is here mainly to allow the notification watcher to have a
valid status.Debug value
import singletons
- Gtk.icon_size_register("audio-button", 20, 20)
-
Gtk.Settings.get_default().connect("notify::gtk-theme-name",
self.on_theme_changed)
self.do_style_overrides()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.2.0/src/clock.py
new/cinnamon-screensaver-4.4.1/src/clock.py
--- old/cinnamon-screensaver-4.2.0/src/clock.py 2019-06-23 15:42:41.000000000
+0200
+++ new/cinnamon-screensaver-4.4.1/src/clock.py 2019-12-10 10:58:25.000000000
+0100
@@ -124,9 +124,11 @@
if self.away_message and self.away_message != "":
user_name = utils.get_user_display_name()
- markup = ('<b><span font_desc=\"Ubuntu 14\"
foreground=\"#CCCCCC\">%s</span></b>' +\
- '\n<b><span font_desc=\"Ubuntu 10\"
foreground=\"#ACACAC\"> ~ %s</span></b>\n ') %\
- (self.away_message, user_name)
+ markup = ('<span font_desc=\"{0}\">'
+ + '<b><span foreground=\"#CCCCCC\">{1}</span></b>'
+ + '\n<b><span font_size=\"smaller\" foreground=\"#ACACAC\"> ~
{2}</span></b>'
+ + '</span>\n ').format(
+ font_message.to_string(), self.away_message, user_name)
else:
markup = '<b><span font_desc=\"%s\"
foreground=\"#CCCCCC\">%s</span></b>\n ' %\
(font_message.to_string(), default_message)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.2.0/src/passwordEntry.py
new/cinnamon-screensaver-4.4.1/src/passwordEntry.py
--- old/cinnamon-screensaver-4.2.0/src/passwordEntry.py 2019-06-23
15:42:41.000000000 +0200
+++ new/cinnamon-screensaver-4.4.1/src/passwordEntry.py 2019-12-10
10:58:25.000000000 +0100
@@ -70,27 +70,36 @@
if settings.get_show_flags():
name = self.keyboard_controller.get_current_icon_name()
+ ui_scale = self.get_scale_factor()
+
if name:
filename = "/usr/share/iso-flag-png/%s.png" % name
try:
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(filename,
-1, height)
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(filename,
-1, height * ui_scale)
+
+ logical_width = pixbuf.get_width() / ui_scale
+ logical_height = pixbuf.get_height() / ui_scale
- render_x = (x + (width / 2) - (pixbuf.get_width() / 2))
- render_y = (y + (height / 2) - (pixbuf.get_height() / 2))
+ render_x = (x + (width / 2) - (logical_width / 2))
+ render_y = (y + (height / 2) - (logical_height / 2))
- Gdk.cairo_set_source_pixbuf(cr,
- pixbuf,
- render_x,
- render_y)
+ if pixbuf:
+ surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf,
+
ui_scale,
+
self.get_window())
+
+ cr.set_source_surface(surface,
+ render_x,
+ render_y)
cr.paint()
self.keyboard_controller.render_cairo_subscript(cr,
- render_x +
(pixbuf.get_width() / 2),
- render_y +
(pixbuf.get_height() / 2),
-
pixbuf.get_width() / 2,
-
pixbuf.get_height() / 2,
+ render_x +
(logical_width / 2),
+ render_y +
(logical_height / 2),
+
logical_width / 2,
+
logical_height / 2,
self.keyboard_controller.get_current_flag_id())
handled = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.2.0/src/playerControl.py
new/cinnamon-screensaver-4.4.1/src/playerControl.py
--- old/cinnamon-screensaver-4.2.0/src/playerControl.py 2019-06-23
15:42:41.000000000 +0200
+++ new/cinnamon-screensaver-4.4.1/src/playerControl.py 2019-12-10
10:58:25.000000000 +0100
@@ -29,8 +29,6 @@
self.build_layout()
def build_layout(self):
- size = Gtk.IconSize.from_name("audio-button")
-
player_status = self.player.get_playback_status()
# Player buttons
@@ -42,7 +40,7 @@
vbox.pack_start(button_box, True, True, 0)
vbox.set_valign(Gtk.Align.CENTER)
- self.previous_button =
TransparentButton("media-skip-backward-symbolic", size)
+ self.previous_button =
TransparentButton("media-skip-backward-symbolic", Gtk.IconSize.BUTTON)
self.previous_button.show()
trackers.con_tracker_get().connect(self.previous_button,
"clicked",
@@ -50,14 +48,14 @@
button_box.pack_start(self.previous_button, True, True, 2)
- self.play_pause_button =
TransparentButton(self.get_play_pause_icon_name(player_status), size)
+ self.play_pause_button =
TransparentButton(self.get_play_pause_icon_name(player_status),
Gtk.IconSize.BUTTON)
self.play_pause_button.show()
trackers.con_tracker_get().connect(self.play_pause_button,
"clicked",
self.on_play_pause_clicked)
button_box.pack_start(self.play_pause_button, True, True, 2)
- self.next_button = TransparentButton("media-skip-forward-symbolic",
size)
+ self.next_button = TransparentButton("media-skip-forward-symbolic",
Gtk.IconSize.BUTTON)
self.next_button.show()
trackers.con_tracker_get().connect(self.next_button,
"clicked",
@@ -156,9 +154,7 @@
icon_name = self.get_play_pause_icon_name(status)
- size = Gtk.IconSize.from_name("audio-button")
-
- image = Gtk.Image.new_from_icon_name(icon_name, size)
+ image = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.BUTTON)
self.play_pause_button.set_image(image)
def on_widget_destroy(self, widget, data=None):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.2.0/src/stage.py
new/cinnamon-screensaver-4.4.1/src/stage.py
--- old/cinnamon-screensaver-4.2.0/src/stage.py 2019-06-23 15:42:41.000000000
+0200
+++ new/cinnamon-screensaver-4.4.1/src/stage.py 2019-12-10 10:58:25.000000000
+0100
@@ -648,6 +648,8 @@
if status.Awake:
return
+ status.screen.place_pointer_in_primary_monitor ()
+
utils.clear_clipboards(self.unlock_dialog)
if self.clock_widget != None:
