summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changes9
-rw-r--r--MANIFEST2
-rw-r--r--META.json10
-rw-r--r--META.yml8
-rw-r--r--Makefile.PL6
-rw-r--r--lib/App/XScreenSaver/DBus.pm20
-rw-r--r--lib/App/XScreenSaver/DBus/Logind.pm (renamed from lib/App/XScreenSaver/DBus/InhibitSleep.pm)45
-rw-r--r--lib/App/XScreenSaver/DBus/Saver.pm22
-rw-r--r--lib/App/XScreenSaver/DBus/SaverProxy.pm41
-rwxr-xr-xscripts/xscreensaver-dbus6
-rw-r--r--t/00-compile.t2
-rw-r--r--t/author-pod-spell.t2
12 files changed, 88 insertions, 85 deletions
diff --git a/Changes b/Changes
index f8c6ca3..3590f92 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,12 @@
+1.0.5 2023-12-10 16:12:36+00:00 Europe/London
+ - fix typo that broke un-inhibiting the screensaver
+
+1.0.4 2023-10-22 21:03:17+01:00 Europe/London
+ - simpler proxy object
+
+1.0.3 2021-05-06 15:16:13+01:00 Europe/London
+ - lock the screen when (e)logind says so
+
1.0.2 2021-05-01 11:47:33+01:00 Europe/London
- fix repository URL
diff --git a/MANIFEST b/MANIFEST
index 114e64c..ddfb4e9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -7,7 +7,7 @@ META.yml
Makefile.PL
cpanfile
lib/App/XScreenSaver/DBus.pm
-lib/App/XScreenSaver/DBus/InhibitSleep.pm
+lib/App/XScreenSaver/DBus/Logind.pm
lib/App/XScreenSaver/DBus/Saver.pm
lib/App/XScreenSaver/DBus/SaverProxy.pm
perlcritic.rc
diff --git a/META.json b/META.json
index 59a3dbe..065b65d 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
"Gianni Ceccarelli <dakkar@thenautilus.net>"
],
"dynamic_config" : 0,
- "generated_by" : "Dist::Zilla version 6.017, CPAN::Meta::Converter version 2.150005",
+ "generated_by" : "Dist::Zilla version 6.017, CPAN::Meta::Converter version 2.150010",
"license" : [
"agpl_3"
],
@@ -38,7 +38,7 @@
"Moo" : "0",
"Net::DBus" : "0",
"Net::DBus::Exporter" : "0",
- "Net::DBus::Object" : "0",
+ "Net::DBus::ProxyObject" : "0",
"Net::DBus::Reactor" : "0",
"Try::Tiny" : "0",
"curry" : "0",
@@ -66,9 +66,9 @@
"web" : "https://www.thenautilus.net/cgit/xscreensaver-dbus/"
}
},
- "version" : "1.0.2",
- "x_generated_by_perl" : "v5.24.0",
- "x_serialization_backend" : "Cpanel::JSON::XS version 4.26",
+ "version" : "1.0.5",
+ "x_generated_by_perl" : "v5.32.0",
+ "x_serialization_backend" : "Cpanel::JSON::XS version 4.23",
"x_spdx_expression" : "AGPL-3.0"
}
diff --git a/META.yml b/META.yml
index 71bc53f..60d23d2 100644
--- a/META.yml
+++ b/META.yml
@@ -10,7 +10,7 @@ build_requires:
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 0
-generated_by: 'Dist::Zilla version 6.017, CPAN::Meta::Converter version 2.150005'
+generated_by: 'Dist::Zilla version 6.017, CPAN::Meta::Converter version 2.150010'
license: open_source
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -26,7 +26,7 @@ requires:
Moo: '0'
Net::DBus: '0'
Net::DBus::Exporter: '0'
- Net::DBus::Object: '0'
+ Net::DBus::ProxyObject: '0'
Net::DBus::Reactor: '0'
Try::Tiny: '0'
curry: '0'
@@ -37,7 +37,7 @@ requires:
warnings: '0'
resources:
repository: https://www.thenautilus.net/cgit/xscreensaver-dbus/
-version: 1.0.2
-x_generated_by_perl: v5.24.0
+version: 1.0.5
+x_generated_by_perl: v5.32.0
x_serialization_backend: 'YAML::Tiny version 1.73'
x_spdx_expression: AGPL-3.0
diff --git a/Makefile.PL b/Makefile.PL
index 688a711..16e0d2c 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -26,7 +26,7 @@ my %WriteMakefileArgs = (
"Moo" => 0,
"Net::DBus" => 0,
"Net::DBus::Exporter" => 0,
- "Net::DBus::Object" => 0,
+ "Net::DBus::ProxyObject" => 0,
"Net::DBus::Reactor" => 0,
"Try::Tiny" => 0,
"curry" => 0,
@@ -41,7 +41,7 @@ my %WriteMakefileArgs = (
"IPC::Open3" => 0,
"Test::More" => 0
},
- "VERSION" => "1.0.2",
+ "VERSION" => "1.0.5",
"test" => {
"TESTS" => "t/*.t"
}
@@ -58,7 +58,7 @@ my %FallbackPrereqs = (
"Moo" => 0,
"Net::DBus" => 0,
"Net::DBus::Exporter" => 0,
- "Net::DBus::Object" => 0,
+ "Net::DBus::ProxyObject" => 0,
"Net::DBus::Reactor" => 0,
"Test::More" => 0,
"Try::Tiny" => 0,
diff --git a/lib/App/XScreenSaver/DBus.pm b/lib/App/XScreenSaver/DBus.pm
index 86a6368..907739f 100644
--- a/lib/App/XScreenSaver/DBus.pm
+++ b/lib/App/XScreenSaver/DBus.pm
@@ -4,10 +4,10 @@ use Moo;
use experimental qw(signatures postderef);
use Net::DBus::Reactor;
use Log::Any;
-use App::XScreenSaver::DBus::InhibitSleep;
+use App::XScreenSaver::DBus::Logind;
use App::XScreenSaver::DBus::Saver;
-our $VERSION = '1.0.2'; # VERSION
-# ABSTRACT: main application class
+our $VERSION = '1.0.5'; # VERSION
+# ABSTRACT: tie xscreensaver into dbus
has reactor => (
@@ -16,9 +16,9 @@ has reactor => (
);
-has inhibit_sleep => (
+has logind => (
is => 'lazy',
- builder => sub { App::XScreenSaver::DBus::InhibitSleep->new() },
+ builder => sub { App::XScreenSaver::DBus::Logind->new() },
);
@@ -34,7 +34,7 @@ has log => ( is => 'lazy', builder => sub { Log::Any->get_logger } );
sub run($self) {
- $self->inhibit_sleep->start();
+ $self->logind->start();
$self->saver->start();
$self->reactor->run;
}
@@ -49,11 +49,11 @@ __END__
=head1 NAME
-App::XScreenSaver::DBus - main application class
+App::XScreenSaver::DBus - tie xscreensaver into dbus
=head1 VERSION
-version 1.0.2
+version 1.0.5
=head1 SYNOPSIS
@@ -66,9 +66,9 @@ version 1.0.2
the event loop
-=head2 C<inhibit_sleep>
+=head2 C<logind>
-instance of L<< C<App::XScreenSaver::DBus::InhibitSleep> >>.
+instance of L<< C<App::XScreenSaver::DBus::Logind> >>.
=head2 C<saver>
diff --git a/lib/App/XScreenSaver/DBus/InhibitSleep.pm b/lib/App/XScreenSaver/DBus/Logind.pm
index 284ff47..45de75f 100644
--- a/lib/App/XScreenSaver/DBus/InhibitSleep.pm
+++ b/lib/App/XScreenSaver/DBus/Logind.pm
@@ -1,4 +1,4 @@
-package App::XScreenSaver::DBus::InhibitSleep;
+package App::XScreenSaver::DBus::Logind;
use v5.20;
use Moo;
use experimental qw(signatures postderef);
@@ -6,8 +6,8 @@ use curry;
use Net::DBus;
use IPC::Run;
use Log::Any;
-our $VERSION = '1.0.2'; # VERSION
-# ABSTRACT: implements the logind "inhibitor locks" protocol
+our $VERSION = '1.0.5'; # VERSION
+# ABSTRACT: implements the logind "inhibitor locks" and "session lock" protocols
has bus => ( is => 'lazy', builder => sub { Net::DBus->system() } );
@@ -25,6 +25,15 @@ has logind_obj => (
);
+has session_obj => (
+ is => 'lazy',
+ builder => sub($self) {
+ my $session_path = $self->logind_obj->GetSessionByPID($$);
+ return $self->logind_srv->get_object($session_path);
+ },
+);
+
+
has inhibit_fd => ( is => 'rwp' );
@@ -36,6 +45,14 @@ sub start($self) {
'PrepareForSleep',
$self->curry::weak::_going_to_sleep,
);
+ $self->session_obj->connect_to_signal(
+ 'Lock',
+ $self->curry::weak::_lock,
+ );
+ $self->session_obj->connect_to_signal(
+ 'Unlock',
+ $self->curry::weak::_unlock,
+ );
$self->_inhibit();
return;
}
@@ -68,6 +85,16 @@ sub _going_to_sleep($self,$before) {
return;
}
+sub _lock($self) {
+ $self->log->debugf('locking the screen');
+ $self->_xscreensaver_command('-lock');
+}
+
+sub _unlock($self) {
+ $self->log->debugf('unlocking the screen');
+ $self->_xscreensaver_command('-deactivate');
+}
+
sub _xscreensaver_command($self,$command) {
my ($out, $err);
IPC::Run::run(
@@ -89,17 +116,17 @@ __END__
=head1 NAME
-App::XScreenSaver::DBus::InhibitSleep - implements the logind "inhibitor locks" protocol
+App::XScreenSaver::DBus::Logind - implements the logind "inhibitor locks" and "session lock" protocols
=head1 VERSION
-version 1.0.2
+version 1.0.5
=head1 SYNOPSIS
use Net::DBus::Reactor;
- use App::XScreenSaver::DBus::InhibitSleep;
- my $is = App::XScreenSaver::DBus::InhibitSleep->new;
+ use App::XScreenSaver::DBus::Logind;
+ my $is = App::XScreenSaver::DBus::Logind->new;
$is->start;
Net::DBus::Reactor->new->run;
@@ -118,6 +145,10 @@ the (e)logind DBus service
the (e)logind DBus object
+=head2 C<session_obj>
+
+the (e)logind session DBus object
+
=head2 C<inhibit_fd>
the file descriptor that logind gives us when we ask for a lock; we
diff --git a/lib/App/XScreenSaver/DBus/Saver.pm b/lib/App/XScreenSaver/DBus/Saver.pm
index 196c418..c36bece 100644
--- a/lib/App/XScreenSaver/DBus/Saver.pm
+++ b/lib/App/XScreenSaver/DBus/Saver.pm
@@ -7,7 +7,7 @@ use Log::Any;
use Try::Tiny;
use IPC::Run;
use App::XScreenSaver::DBus::SaverProxy;
-our $VERSION = '1.0.2'; # VERSION
+our $VERSION = '1.0.5'; # VERSION
# ABSTRACT: implements the "idle inhibition" protocol
@@ -46,28 +46,24 @@ has paths => (
has log => ( is => 'lazy', builder => sub { Log::Any->get_logger } );
-has _impls => ( is => 'rw' );
+has _proxies => ( is => 'rw' );
has _prod_id => ( is => 'rw' );
has _inhibits => ( is => 'rw', default => sub { +{} } );
sub start($self) {
- my $inhibit_cb = $self->curry::weak::_inhibit;
- my $uninhibit_cb = $self->curry::weak::_uninhibit;
-
# export to dbus
- $self->_impls([ map {
+ $self->_proxies([ map {
App::XScreenSaver::DBus::SaverProxy->new(
$self->service,
$_,
- $inhibit_cb,
- $uninhibit_cb,
+ $self,
)
} $self->paths->@* ]);
$self->_prod_id(
$self->reactor->add_timeout(
- 5_000,
+ 60_000,
Net::DBus::Callback->new(
method => $self->curry::weak::_prod_screensaver
),
@@ -83,13 +79,12 @@ sub start($self) {
return;
}
-sub _inhibit($self,$name,$reason,$message) {
+sub Inhibit($self,$name,$reason,$sender) {
my $cookie;
do {
$cookie = int(rand(2**31))
} until !exists $self->_inhibits->{$cookie};
- my $sender = $message->get_sender;
$self->_inhibits->{$cookie} = [ $name, $reason, $sender ];
$self->log->debugf(
@@ -103,11 +98,10 @@ sub _inhibit($self,$name,$reason,$message) {
return $cookie;
}
-sub _uninhibit($self,$cookie,$message) {
+sub UnInhibit($self,$cookie,$this_sender) {
my $inhibit = delete $self->_inhibits->{$cookie}
or return;
my ($name, $reason, $sender) = @$inhibit;
- my $this_sender = $message->get_sender;
$self->log->debugf(
'<%s> (was %s, is %s) resumed screensaver for <%s> (cookie %d) - %d left',
@@ -172,7 +166,7 @@ App::XScreenSaver::DBus::Saver - implements the "idle inhibition" protocol
=head1 VERSION
-version 1.0.2
+version 1.0.5
=head1 SYNOPSIS
diff --git a/lib/App/XScreenSaver/DBus/SaverProxy.pm b/lib/App/XScreenSaver/DBus/SaverProxy.pm
index 10fbb99..af4ec17 100644
--- a/lib/App/XScreenSaver/DBus/SaverProxy.pm
+++ b/lib/App/XScreenSaver/DBus/SaverProxy.pm
@@ -2,38 +2,14 @@ package App::XScreenSaver::DBus::SaverProxy;
use v5.20;
use strict;
use warnings;
-use experimental qw(signatures postderef);
# this is the interface name
use Net::DBus::Exporter qw(org.freedesktop.ScreenSaver);
-use parent 'Net::DBus::Object';
-our $VERSION = '1.0.2'; # VERSION
+use parent 'Net::DBus::ProxyObject';
+our $VERSION = '1.0.5'; # VERSION
# ABSTRACT: proxy dbus object
-
-dbus_method('Inhibit',['string','string'],['uint32']);
-dbus_method('UnInhibit',['uint32'],[]);
-
-sub new($class,$service,$path,$inhibit_cb,$uninhibit_cb) {
- my $self = $class->SUPER::new($service, $path);
- bless $self, $class;
- $self->{__inhibit_cb} = $inhibit_cb;
- $self->{__uninhibit_cb} = $uninhibit_cb;
- return $self;
-}
-
-our $_message;
-sub _dispatch_object($self,$connection,$message,@etc) {
- local $_message = $message;
- return $self->SUPER::_dispatch_object($connection,$message,@etc);
-}
-
-sub Inhibit($self,$name,$reason) {
- return $self->{__inhibit_cb}->($name,$reason,$_message);
-}
-
-sub UnInhibit($self,$cookie) {
- return $self->{__uninhibit_cb}->($cookie,$_message);
-}
+dbus_method('Inhibit',['string','string','caller'],['uint32']);
+dbus_method('UnInhibit',['uint32','caller'],[]);
1;
@@ -49,14 +25,7 @@ App::XScreenSaver::DBus::SaverProxy - proxy dbus object
=head1 VERSION
-version 1.0.2
-
-=head1 DESCRIPTION
-
-This is functionally the same as L<< C<Net::DBus::ObjectProxy> >>, but
-specialised for this application, and with a hack to allow L<<
-C<App::XScreenSaver::DBus::Saver> >> to access the sender of the
-message.
+version 1.0.5
=head1 AUTHOR
diff --git a/scripts/xscreensaver-dbus b/scripts/xscreensaver-dbus
index 92ef192..350a803 100755
--- a/scripts/xscreensaver-dbus
+++ b/scripts/xscreensaver-dbus
@@ -1,10 +1,10 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
use strict;
use warnings;
use v5.20;
use Log::Any::Adapter Stdout => ( log_level => 'debug' );
use App::XScreenSaver::DBus;
-our $VERSION = '1.0.2'; # VERSION
+our $VERSION = '1.0.5'; # VERSION
# PODNAME: xscreensaver-dbus
# ABSTRACT: tie xscreensaver into dbus
@@ -23,7 +23,7 @@ xscreensaver-dbus - tie xscreensaver into dbus
=head1 VERSION
-version 1.0.2
+version 1.0.5
=head1 SYNOPSIS
diff --git a/t/00-compile.t b/t/00-compile.t
index 7421167..e810134 100644
--- a/t/00-compile.t
+++ b/t/00-compile.t
@@ -10,7 +10,7 @@ plan tests => 5 + ($ENV{AUTHOR_TESTING} ? 1 : 0);
my @module_files = (
'App/XScreenSaver/DBus.pm',
- 'App/XScreenSaver/DBus/InhibitSleep.pm',
+ 'App/XScreenSaver/DBus/Logind.pm',
'App/XScreenSaver/DBus/Saver.pm',
'App/XScreenSaver/DBus/SaverProxy.pm'
);
diff --git a/t/author-pod-spell.t b/t/author-pod-spell.t
index e3d5969..0da45ac 100644
--- a/t/author-pod-spell.t
+++ b/t/author-pod-spell.t
@@ -22,7 +22,7 @@ App
Ceccarelli
DBus
Gianni
-InhibitSleep
+Logind
Saver
SaverProxy
XScreenSaver
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 06:30:35 +0000