nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use i3 --get-socketpath by default for determining the socket path 

This was introduced in i3 v4.1 (released 2011-11-11, so should be
widespread enough by now).
This commit is contained in:
Michael Stapelberg 2012-07-09 15:49:16 +02:00
parent 7021bb4315
commit 476e41ddc3
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/AnyEvent/I3.pm
View File

@ -29,7 +29,7 @@ then subscribe to events or send messages and receive their replies.
use AnyEvent::I3 qw(:all); use AnyEvent::I3 qw(:all);
my $i3 = i3("~/.i3/ipc.sock"); my $i3 = i3();
$i3->connect->recv or die "Error connecting"; $i3->connect->recv or die "Error connecting";
say "Connected to i3"; say "Connected to i3";
@ -48,8 +48,12 @@ then subscribe to events or send messages and receive their replies.
=head2 $i3 = i3([ $path ]); =head2 $i3 = i3([ $path ]);
Creates a new C<AnyEvent::I3> object and returns it. C<path> is the path of Creates a new C<AnyEvent::I3> object and returns it.
the UNIX socket to connect to.
C<path> is an optional path of the UNIX socket to connect to. It is strongly
advised to NOT specify this unless you're absolutely sure you need it.
C<AnyEvent::I3> will automatically figure it out by querying the running i3
instance on the current DISPLAY which is almost always what you want.
=head1 SUBROUTINES/METHODS =head1 SUBROUTINES/METHODS
@ -91,13 +95,37 @@ sub i3 {
=head2 $i3 = AnyEvent::I3->new([ $path ]) =head2 $i3 = AnyEvent::I3->new([ $path ])
Creates a new C<AnyEvent::I3> object and returns it. C<path> is the path of Creates a new C<AnyEvent::I3> object and returns it.
the UNIX socket to connect to.
C<path> is an optional path of the UNIX socket to connect to. It is strongly
advised to NOT specify this unless you're absolutely sure you need it.
C<AnyEvent::I3> will automatically figure it out by querying the running i3
instance on the current DISPLAY which is almost always what you want.
=cut =cut
sub new { sub new {
my ($class, $path) = @_; my ($class, $path) = @_;
if (!$path) {
# This effectively circumvents taint mode checking for $ENV{PATH}. We
# do this because users might specify PATH explicitly to call i3 in a
# custom location (think ~/.bin/).
my $paths = $ENV{PATH};
if ($paths =~ /^(.*)$/) {
$ENV{PATH} = $1;
}
chomp($path = qx(i3 --get-socketpath));
# Circumventing taint mode again: the socket can be anywhere on the
# system and that’s okay.
if ($path =~ /^([^\0]+)$/) {
$path = $1;
} else {
warn "Asking i3 for the socket path failed. Is DISPLAY set and is i3 in your PATH?";
}
}
# This is the old default path (v3.*). This fallback line can be removed in
# a year from now. -- Michael, 2012-07-09
$path ||= '~/.i3/ipc.sock'; $path ||= '~/.i3/ipc.sock';
# Check if we need to resolve ~ # Check if we need to resolve ~
@ -292,7 +320,7 @@ sub _ensure_connection {
return if defined($self->{ipchdl}); return if defined($self->{ipchdl});
$self->connect->recv or die "Unable to connect to i3" $self->connect->recv or die "Unable to connect to i3 (socket path " . $self->{path} . ")";
} }
=head2 get_workspaces =head2 get_workspaces