diff options
| -rw-r--r-- | Changes | 8 | ||||
| -rw-r--r-- | lib/App/XScreenSaver/DBus/Saver.pm | 16 | ||||
| -rw-r--r-- | lib/App/XScreenSaver/DBus/SaverProxy.pm | 38 |
3 files changed, 16 insertions, 46 deletions
@@ -1,4 +1,12 @@ {{$NEXT}} + +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 diff --git a/lib/App/XScreenSaver/DBus/Saver.pm b/lib/App/XScreenSaver/DBus/Saver.pm index 6eae4ed..c6df80d 100644 --- a/lib/App/XScreenSaver/DBus/Saver.pm +++ b/lib/App/XScreenSaver/DBus/Saver.pm @@ -95,7 +95,7 @@ a logger 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 { +{} } ); @@ -111,16 +111,12 @@ to be notified when that happens, and release that inhibition. =cut 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->@* ]); @@ -142,13 +138,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( @@ -162,11 +157,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', diff --git a/lib/App/XScreenSaver/DBus/SaverProxy.pm b/lib/App/XScreenSaver/DBus/SaverProxy.pm index 858dcba..69a689c 100644 --- a/lib/App/XScreenSaver/DBus/SaverProxy.pm +++ b/lib/App/XScreenSaver/DBus/SaverProxy.pm @@ -2,45 +2,13 @@ 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'; +use parent 'Net::DBus::ProxyObject'; # VERSION # ABSTRACT: proxy dbus object -=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. - -=cut - -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; |