eleksir/wm-helpers
1
Fork 0
Code Activity

Refactor, modernize i3status-timers.json-io

Browse Source
This commit is contained in:
eleksir
2021-02-13 19:44:12 +03:00
parent 96fc306ef7
commit 949ce2f0c7
1 changed files with 103 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
i3status-timers.json-io
View File

@@ -1,22 +1,26 @@
#!/usr/bin/perl #!/usr/bin/perl
# vim: set ai noet ts=4 sw=4 sts=4 ft=perl : # vim: set ai noet ts=4 sw=4 sts=4 ft=perl :
use strict;
use warnings "all";
use Fcntl qw(:seek :mode :DEFAULT);
use 5.10.0;
use utf8; use utf8;
use open qw (:std :utf8);
use strict;
use warnings;
use Carp qw (confess);
use Data::Dumper;
use Fcntl qw(:seek :mode :DEFAULT);
use 5.22.2;
use JSON::XS; use JSON::XS;
use Net::DBus;
use POSIX qw (setsid);
use threads; use threads;
binmode STDOUT;
binmode STDERR;
sub input_thread(); sub input_thread();
sub readconf(); sub readconf();
sub gettimestr(); sub gettimestr();
sub getlastr(); sub getlastr();
sub getbatterychargestr2(); sub getbatterychargestr2();
sub getbatterychargestr3();
sub to_hours ($);
sub meminfo(); sub meminfo();
sub ifaces(); sub ifaces();
sub cpuspeed(); sub cpuspeed();
@@ -26,9 +30,18 @@ sub caps_find();
sub spawn(@); sub spawn(@);
binmode STDIN;
binmode STDERR;
binmode STDOUT;
my $read = 0; my $read = 0;
$SIG{__DIE__} = \&Carp::confess;;
$SIG{"CONT"} = sub { $read = 1 }; $SIG{"CONT"} = sub { $read = 1 };
$SIG{"STOP"} = sub { $read = 0 }; $SIG{"STOP"} = sub { $read = 0 };
$SIG{"PIPE"} = sub { warn "SIGPIPE" };
$SIG{"HUP"} = sub { warn "SIGHUP" };
$SIG{"USR1"} = sub { warn "SIGUSR1" };
$SIG{"WINCH"} = sub { warn "SIGWINCH" };
my $slow_timer = 360; # 0.333 * 360 ~= 2 min my $slow_timer = 360; # 0.333 * 360 ~= 2 min
my $onesec_timer = 3; # 0.333 * 3 ~= 1 sec my $onesec_timer = 3; # 0.333 * 3 ~= 1 sec
@@ -83,14 +96,20 @@ if ( -f "/sys/class/power_supply/ADP1/online") {
$ACFILE = "/sys/class/power_supply/AC/online"; $ACFILE = "/sys/class/power_supply/AC/online";
} }
# prep dee-boos connection
my $bus = Net::DBus->system;
my $upower = $bus->get_service("org.freedesktop.UPower");
my $properties = $upower->get_object("/org/freedesktop/UPower/devices/battery_BAT0", "org.freedesktop.DBus.Properties");
threads->create('input_thread')->detach(); threads->create('input_thread')->detach();
sleep 1; # capture click events and do not override sigstop and sigcont numbers
syswrite STDOUT, '{"version": 1, "click_events": true}
syswrite STDOUT, '{"version": 1, "stop_signal": 10, "cont_signal": 12, "click_events": true}
[ [], [ [],
'; ';
sleep 1;
while (1) { while (1) {
# json message that will be spewed to i3bar # json message that will be spewed to i3bar
my $je; my $je;
@@ -126,7 +145,7 @@ while (1) {
} }
if ($slow_timer >= 360) { if ($slow_timer >= 360) {
$tmp = getbatterychargestr2(); $tmp = getbatterychargestr3();
if ($charge ne $tmp) { if ($charge ne $tmp) {
$jf = 1; $jf = 1;
$charge = $tmp; $charge = $tmp;
@@ -166,8 +185,10 @@ while (1) {
@{$je} = (@{$jo}, @{$C}); @{$je} = (@{$jo}, @{$C});
@{$je} = reverse(@{$je}); @{$je} = reverse(@{$je});
if (my $output = encode_json($je)) { my $output = eval { encode_json($je); };
syswrite STDOUT, encode_json($je) . ",\n";
if ($output) {
syswrite STDOUT, $output . ",\n";
} }
$jf = 0; $jf = 0;
@@ -181,13 +202,18 @@ while (1) {
} }
sub readconf() { sub readconf() {
open (CONF, "$ENV{HOME}/.i3/config.json") or die "Unable to open $ENV{HOME}/.i3/config.json: $!\n"; open (my $CONF, '<:encoding(UTF-8)', "$ENV{HOME}/.i3/config.json") or die "Unable to open $ENV{HOME}/.i3/config.json: $!\n";
my $sep = $/; my $len = (stat "$ENV{HOME}/.i3/config.json")[7];
$/ = ''; use bytes;
my $c = readline(*CONF); read ($CONF, my $c, $len) or die "unable to read $ENV{HOME}/.i3/config.json";
close CONF; no bytes;
$/ = $sep; close $CONF;
$c = decode_json($c) or die "Unable to decode $ENV{HOME}/.i3/config.json: $!\n"; $c = eval { decode_json ($c); };
if ($@) {
die "Unable to decode $ENV{HOME}/.i3/config.json: $@\n";
}
my ($j, %cmd); my ($j, %cmd);
my $cnt = 0; my $cnt = 0;
@@ -210,11 +236,12 @@ sub input_thread() {
# elements as independed json messages, but we have to strip leading "," # elements as independed json messages, but we have to strip leading ","
readline(*STDIN); # throw away leading "[\n" readline(*STDIN); # throw away leading "[\n"
my $char;
while (1) { while (1) {
next if (eof(STDIN)); my $msg = eval { readline(*STDIN) };
my $msg = readline(*STDIN); next unless ($msg);
$msg = substr($msg, 1, -1) if (substr($msg, 0, 1) eq ','); # drop leading ',' if present $msg = substr($msg, 1) if (substr($msg, 0, 1) eq ','); # drop leading ',' if present
my $j = decode_json($msg); my $j = decode_json($msg);
if (defined($CMD{$j->{name}})) { if (defined($CMD{$j->{name}})) {
@@ -276,6 +303,42 @@ sub getbatterychargestr2() {
return $str; return $str;
} }
sub getbatterychargestr3() {
my $capacity = $properties->Get('org.freedesktop.UPower.Device', 'Percentage');
my $state = $properties->Get('org.freedesktop.UPower.Device', 'State');
my $time = "?";
if ($state == 2) {
# discharging
$time = $properties->Get('org.freedesktop.UPower.Device', 'TimeToEmpty');
# time in seconds, let's translate it to hours:minutes
$state = '▼';
} elsif ($state == 1) {
# charging
$time = $properties->Get('org.freedesktop.UPower.Device', 'TimeToFull');
$state = '▲';
} else {
# already charged
$time = 0;
$state = '•';
}
$time = to_hours ($time) unless ($time eq '?');
return sprintf("⚡ %s%% %s %s", $capacity, $state, $time);
}
sub to_hours ($) {
my $sec = shift;
my $hrs = $sec / (60 * 60);
$hrs = 0 if ( $hrs < 1 );
my $min = ($sec - ($hrs * 60 * 60)) / 60;
$min = 0 if ( $min < 1 );
return sprintf("%02d:%02d", $hrs, $min);
}
sub meminfo() { sub meminfo() {
if (defined($MEMINFOHANDLE)) { if (defined($MEMINFOHANDLE)) {
open ($MEMINFOHANDLE, "/proc/meminfo") if (tell($MEMINFOHANDLE) == -1); open ($MEMINFOHANDLE, "/proc/meminfo") if (tell($MEMINFOHANDLE) == -1);
@@ -507,19 +570,29 @@ sub spawn (@) {
if ($pid) { # Parent if ($pid) { # Parent
return; return;
} elsif ($pid == 0) { # Child } elsif ($pid == 0) { # Child
POSIX::setsid ();
# we need no io streams here, right? # we need no io streams here, right?
# it seems that at least vscode creashes if we close stdio handles # it seems that at least vscode creashes if we close stdio handles
open(STDOUT, ">", "/dev/null"); open(STDOUT, ">", "/dev/null");
open(STDERR, ">", "/dev/null"); open(STDERR, ">", "/dev/null");
open(STDIN, "<", "/dev/null"); open(STDIN, "<", "/dev/null");
my $prg = shift(@args); $pid = fork ();
# weird situation, silently quit here :)
exit 0 unless(defined($prg));
if (@args > 0) { if ($pid) { # Parent
exec $prg @args; # in this place parent quits
} else { exit 0;
exec $prg; } elsif ($pid == 0) { # Child
my $prg = shift(@args);
# weird situation, silently quit here :)
exit 0 unless(defined($prg));
if (@args > 0) {
exec $prg @args;
} else {
exec $prg;
}
} else { # Unable to fork()
syswrite STDERR, "[{\"full_text\":\"ERROR: Could not fork new process: $!\",\"color\":\"#ff0000\"}],\n";
} }
} else { # Unable to fork() } else { # Unable to fork()
syswrite STDERR, "[{\"full_text\":\"ERROR: Could not fork new process: $!\",\"color\":\"#ff0000\"}],\n"; syswrite STDERR, "[{\"full_text\":\"ERROR: Could not fork new process: $!\",\"color\":\"#ff0000\"}],\n";