tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Detect TTY support and avoid ANSI colors if none 

fixes #5992
This commit is contained in:
Thomas Gelf 2014-04-18 14:36:46 +00:00
parent fa3e7f9fc2
commit a7b5893918
2 changed files with 103 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
library/Icinga/Cli/Screen/AnsiScreen.php → library/Icinga/Cli/AnsiScreen.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Icinga\Cli\Screen; namespace Icinga\Cli;
use Icinga\Cli\Screen; use Icinga\Cli\Screen;
@ -8,8 +8,6 @@ use Icinga\Cli\Screen;
class AnsiScreen extends Screen class AnsiScreen extends Screen
{ {
protected $isUtf8;
protected $fgColors = array( protected $fgColors = array(
'black' => '30', 'black' => '30',
'darkgray' => '1;30', 'darkgray' => '1;30',
@ -40,36 +38,6 @@ class AnsiScreen extends Screen
'lightgray' => '47', 'lightgray' => '47',
); );
public function __construct()
{
}
public function getColumns()
{
$cols = (int) getenv('COLUMNS');
if (! $cols) {
// stty -a ?
$cols = (int) exec('tput cols');
}
if (! $cols) {
$cols = 80;
}
return $cols;
}
public function getRows()
{
$rows = (int) getenv('ROWS');
if (! $rows) {
// stty -a ?
$rows = (int) exec('tput rows');
}
if (! $rows) {
$rows = 25;
}
return $rows;
}
public function strlen($string) public function strlen($string)
{ {
return strlen($this->stripAnsiCodes($string)); return strlen($this->stripAnsiCodes($string));
@ -80,40 +48,6 @@ class AnsiScreen extends Screen
return preg_replace('/\e\[?.*?[\@-~]/', '', $string); return preg_replace('/\e\[?.*?[\@-~]/', '', $string);
} }
public function newlines($count = 1)
{
return str_repeat("\n", $count);
}
public function center($txt)
{
$len = $this->strlen($txt);
$width = floor(($this->getColumns() + $len) / 2) - $len;
return str_repeat(' ', $width) . $txt;
}
public function hasUtf8()
{
if ($this->isUtf8 === null) {
// null should equal 0 here, however seems to equal '' on some systems:
$current = setlocale(LC_ALL, 0);
$parts = preg_split('/;/', $current);
$lc_parts = array();
foreach ($parts as $part) {
if (strpos($part, '=') === false) {
continue;
}
list($key, $val) = preg_split('/=/', $part, 2);
$lc_parts[$key] = $val;
}
$this->isUtf8 = array_key_exists('LC_CTYPE', $lc_parts)
&& preg_match('~\.UTF-8$~i', $lc_parts['LC_CTYPE']);
}
return $this->isUtf8;
}
public function clear() public function clear()
{ {
return "\033[2J" // Clear the whole screen return "\033[2J" // Clear the whole screen
@ -121,6 +55,20 @@ class AnsiScreen extends Screen
. "\033[1S"; // Scroll whole page up by 1 line (why?) . "\033[1S"; // Scroll whole page up by 1 line (why?)
} }
public function underline($text)
{
return "\033[4m"
. $text
. "\033[0m"; // Reset color codes
}
public function colorize($text, $fgColor = null, $bgColor = null)
{
return $this->startColor($fgColor, $bgColor)
. $text
. "\033[0m"; // Reset color codes
}
protected function fgColor($color) protected function fgColor($color)
{ {
if (! array_key_exists($color, $this->fgColors)) { if (! array_key_exists($color, $this->fgColors)) {
@ -163,18 +111,4 @@ class AnsiScreen extends Screen
} }
return "\033[" . implode(';', $parts) . 'm'; return "\033[" . implode(';', $parts) . 'm';
} }
public function underline($text)
{
return "\033[4m"
. $text
. "\033[0m"; // Reset color codes
}
public function colorize($text, $fgColor = null, $bgColor = null)
{
return $this->startColor($fgColor, $bgColor)
. $text
. "\033[0m"; // Reset color codes
}
} }

90
library/Icinga/Cli/Screen.php
View File

@ -2,16 +2,102 @@
namespace Icinga\Cli; namespace Icinga\Cli;
use Icinga\Cli\Screen\AnsiScreen; use Icinga\Cli\AnsiScreen;
class Screen class Screen
{ {
protected static $instance; protected static $instance;
protected $isUtf8;
public function getColumns()
{
$cols = (int) getenv('COLUMNS');
if (! $cols) {
// stty -a ?
$cols = (int) exec('tput cols');
}
if (! $cols) {
$cols = 80;
}
return $cols;
}
public function getRows()
{
$rows = (int) getenv('ROWS');
if (! $rows) {
// stty -a ?
$rows = (int) exec('tput rows');
}
if (! $rows) {
$rows = 25;
}
return $rows;
}
public function strlen($string)
{
return strlen($string);
}
public function newlines($count = 1)
{
return str_repeat("\n", $count);
}
public function center($txt)
{
$len = $this->strlen($txt);
$width = floor(($this->getColumns() + $len) / 2) - $len;
return str_repeat(' ', $width) . $txt;
}
public function hasUtf8()
{
if ($this->isUtf8 === null) {
// null should equal 0 here, however seems to equal '' on some systems:
$current = setlocale(LC_ALL, 0);
$parts = preg_split('/;/', $current);
$lc_parts = array();
foreach ($parts as $part) {
if (strpos($part, '=') === false) {
continue;
}
list($key, $val) = preg_split('/=/', $part, 2);
$lc_parts[$key] = $val;
}
$this->isUtf8 = array_key_exists('LC_CTYPE', $lc_parts)
&& preg_match('~\.UTF-8$~i', $lc_parts['LC_CTYPE']);
}
return $this->isUtf8;
}
public function clear()
{
return "\n";
}
public function underline($text)
{
return $text;
}
public function colorize($text, $fgColor = null, $bgColor = null)
{
return $text;
}
public static function instance() public static function instance()
{ {
if (self::$instance === null) { if (self::$instance === null) {
self::$instance = new AnsiScreen(); if (function_exists('posix_isatty') && posix_isatty(STDOUT)) {
self::$instance = new AnsiScreen();
} else {
self::$instance = new Screen();
}
} }
return self::$instance; return self::$instance;
} }