From eb7c1332322c8436cfb2ca8543f106affbd4c39f Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 3 Jan 2018 13:53:49 +0100
Subject: [PATCH] Fix and notifications

---
 bar/src/acpi.php       |  8 ++++----
 bar/src/bandwidth.php  |  1 +
 bar/src/base/block.php | 17 ++++++++++++++++-
 bar/src/ip.php         |  3 ++-
 bar/src/ip_wan.php     |  5 +++++
 bar/src/rss.php        |  2 +-
 bar/src/time.php       |  4 ++++
 7 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/bar/src/acpi.php b/bar/src/acpi.php
index 27fa6a2..0d55cd6 100755
--- a/bar/src/acpi.php
+++ b/bar/src/acpi.php
@@ -26,7 +26,7 @@ if (!preg_match('`Discharging`', $acpi)) {
         $charging .= '↑';
 
         $block = block(
-            'volume',
+            'acpi',
             [
                 'full_text' => $charging,
                 'color' => $color,
@@ -34,7 +34,7 @@ if (!preg_match('`Discharging`', $acpi)) {
         );
     } else {
         $block = block(
-            'volume',
+            'acpi',
             [
                 'full_text' => '??? ↑',
                 'color' => color('info'),
@@ -54,10 +54,10 @@ if (!preg_match('`Discharging`', $acpi)) {
 
     $charging = $values[1].'↓';
     $times = str_replace(':', 'h', $values[2]);
-    $text = implode(' ', array($charging, $times));
+    $text = implode(' ', [$charging, $times]);
 
     $block = block(
-        'volume',
+        'acpi',
         [
             'full_text' => $text,
             'color' => $color,
diff --git a/bar/src/bandwidth.php b/bar/src/bandwidth.php
index 01190db..779d546 100755
--- a/bar/src/bandwidth.php
+++ b/bar/src/bandwidth.php
@@ -31,5 +31,6 @@ echo block(
     [
         'full_text' => $fullText,
         'color' => '#ffffff',
+        'urgent' => 1,
     ]
 );
diff --git a/bar/src/base/block.php b/bar/src/base/block.php
index 1216881..7aaa574 100644
--- a/bar/src/base/block.php
+++ b/bar/src/base/block.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Get the hexa code of a color by its label.
+ *
+ * @param string $label
+ *
+ * @return string
+ */
 function color($label)
 {
     $colors = [
@@ -14,6 +21,14 @@ function color($label)
     return $colors[$label] ?? $colors['info'];
 }
 
+/**
+ * Returns a json of a block.
+ *
+ * @param string $name
+ * @param array $options
+ *
+ * @return string
+ */
 function block(string $name, array $options = [])
 {
     $options = array_merge(
@@ -28,5 +43,5 @@ function block(string $name, array $options = [])
         $options
     );
 
-    echo stripslashes(json_encode($options, JSON_UNESCAPED_UNICODE));
+    return stripslashes(json_encode($options, JSON_UNESCAPED_UNICODE));
 }
diff --git a/bar/src/ip.php b/bar/src/ip.php
index e64166c..e2ccfa5 100755
--- a/bar/src/ip.php
+++ b/bar/src/ip.php
@@ -22,7 +22,8 @@ $fullText = sprintf('[%s] %s', $iface, $ip);
 $shortText = sprintf('%s: %s', $iface, $ip);
 
 if (getenv('BLOCK_BUTTON') === '1') {
-    shell_exec('echo '.escapeshellarg($ip).' | xclip');
+    shell_exec('export DISPLAY=:0; echo '.escapeshellarg($ip).' | xclip');
+    shell_exec('export DISPLAY=:0; echo '.escapeshellarg($ip).' | xclip --selection c');
 }
 
 echo block(
diff --git a/bar/src/ip_wan.php b/bar/src/ip_wan.php
index 8f2e41e..22e80c6 100755
--- a/bar/src/ip_wan.php
+++ b/bar/src/ip_wan.php
@@ -17,6 +17,11 @@ if (empty($ip)) {
     die;
 }
 
+if (getenv('BLOCK_BUTTON') === '1') {
+    shell_exec('export DISPLAY=:0; echo '.escapeshellarg($ip).' | xclip');
+    shell_exec('export DISPLAY=:0; echo '.escapeshellarg($ip).' | xclip -sel c');
+}
+
 $fullText = sprintf('[%s] %s', $iface, $ip);
 $shortText = sprintf('%s: %s', $iface, $ip);
 
diff --git a/bar/src/rss.php b/bar/src/rss.php
index a691770..9285285 100755
--- a/bar/src/rss.php
+++ b/bar/src/rss.php
@@ -23,7 +23,7 @@ $fullText = sprintf('[%s] %s', $title, $count = count($matches));
 $blockButton = (int) getenv('BLOCK_BUTTON');
 
 if ($blockButton === 1) {
-    shell_exec('xdg-open https://tiny.deblan.org/index.php');
+    shell_exec('xdg-open "https://tiny.deblan.org/index.php"');
 }
 
 echo block(
diff --git a/bar/src/time.php b/bar/src/time.php
index 4782ba2..cfdcf90 100755
--- a/bar/src/time.php
+++ b/bar/src/time.php
@@ -11,6 +11,10 @@ if (getenv('BLOCK_BUTTON') === '1') {
     shell_exec('i3-msg \'workspace "3. MAIL"\'');
 }
 
+if (date('H:i:s') === '13:37:00') {
+    shell_exec('notify-send "1337" "Powaaaa" --icon=/home/simon/Images/if_geek_zombie_60815.png');
+}
+
 echo block(
     'time',
     [