deblan/remote-i3wm-ws
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add a wrapper to execute shell commands

Browse source
This commit is contained in:
Simon Vieille 2018-02-07 11:43:09 +01:00
parent 17a95daf45
commit ab875dab89
No known key found for this signature in database
GPG key ID: 919533E2B946EA10
2 changed files with 47 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
server/server
View file

@ -9,49 +9,50 @@ use Ratchet\WebSocket\WsServer;
use Ratchet\ConnectionInterface; use Ratchet\ConnectionInterface;
$server = new Server(); $server = new Server();
$shell = new Shell();
$server->addMessageHandler('pointer', function (ConnectionInterface $from, array $data) { $server->addMessageHandler('pointer', function (ConnectionInterface $from, array $data) use ($shell) {
$x = $data['x'] ?? null; $x = $data['x'] ?? null;
$y = $data['y'] ?? null; $y = $data['y'] ?? null;
$click = $data['click'] ?? null; $click = $data['click'] ?? null;
if ($x !== null && $y !== null) { if ($x !== null && $y !== null) {
$mouseLocations = shell_exec('xdotool getmouselocation'); $mouseLocations = $shell->exec('xdotool getmouselocation');
preg_match('/x:(\d+) y:(\d+) /', $mouseLocations, $matches); preg_match('/x:(\d+) y:(\d+) /', $mouseLocations, $matches);
$mouseX = (int) ($matches[1] + $x * 2.5); $mouseX = (int) ($matches[1] + $x * 2.5);
$mouseY = (int) ($matches[2] + $y * 2.5); $mouseY = (int) ($matches[2] + $y * 2.5);
return shell_exec(sprintf('xdotool mousemove %s %s', $mouseX, $mouseY)); return $shell->exec('xdotool mousemove %s %s', $mouseX, $mouseY);
} elseif ($click !== null) { } elseif ($click !== null) {
if ($click === 'left') { if ($click === 'left') {
return shell_exec('xdotool click 1'); return $shell->exec('xdotool click 1');
} elseif ($click === 'middle') { } elseif ($click === 'middle') {
return shell_exec('xdotool click 2'); return $shell->exec('xdotool click 2');
} elseif ($click === 'right') { } elseif ($click === 'right') {
return shell_exec('xdotool click 3'); return $shell->exec('xdotool click 3');
} }
} }
}); });
$server->addMessageHandler('scroll', function (ConnectionInterface $from, array $data) { $server->addMessageHandler('scroll', function (ConnectionInterface $from, array $data) use ($shell) {
$value = $data['value'] ?? null; $value = $data['value'] ?? null;
if ($value === 'down') { if ($value === 'down') {
return shell_exec('xdotool click 5 && xdotool click 5'); return $shell->exec('xdotool click 5 && xdotool click 5');
} elseif ($value === 'up') { } elseif ($value === 'up') {
return shell_exec('xdotool click 4 && xdotool click 4'); return $shell->exec('xdotool click 4 && xdotool click 4');
} }
}); });
$server->addMessageHandler('workspace', function (ConnectionInterface $from, array $data) { $server->addMessageHandler('workspace', function (ConnectionInterface $from, array $data) use ($shell) {
$value = $data['value'] ?? null; $value = $data['value'] ?? null;
if (!empty($value)) { if (!empty($value)) {
return shell_exec(sprintf("i3-msg 'workspace \"%s\"'", $value)); return $shell->exec("i3-msg 'workspace \"%s\"'", $value);
} }
}); });
$server->addMessageHandler('volume', function (ConnectionInterface $from, array $data) { $server->addMessageHandler('volume', function (ConnectionInterface $from, array $data) use ($shell) {
$value = $data['value'] ?? null; $value = $data['value'] ?? null;
if ($value === null) { if ($value === null) {
@ -59,15 +60,15 @@ $server->addMessageHandler('volume', function (ConnectionInterface $from, array
} }
if ($value === 'up') { if ($value === 'up') {
return shell_exec('amixer set Master 2%+'); return $shell->exec('amixer set Master 2%+');
} elseif ($value === 'down') { } elseif ($value === 'down') {
return shell_exec('amixer set Master 2%-'); return $shell->exec('amixer set Master 2%-');
} else { } else {
return shell_exec('amixer set Master '.((int) $value).'%'); return $shell->exec('amixer set Master %d%%', (int) $value);
} }
}); });
$server->addMessageHandler('media', function (ConnectionInterface $from, array $data) { $server->addMessageHandler('media', function (ConnectionInterface $from, array $data) use ($shell) {
$value = $data['value'] ?? null; $value = $data['value'] ?? null;
if ($value === 'playpause') { if ($value === 'playpause') {
@ -79,11 +80,11 @@ $server->addMessageHandler('media', function (ConnectionInterface $from, array $
} }
if (!empty($cmd)) { if (!empty($cmd)) {
return shell_exec('playerctl -p spotify '.$cmd); return $shell->exec('playerctl -p spotify %s', $cmd);
} }
}); });
$server->addMessageHandler('keys', function (ConnectionInterface $from, array $data) { $server->addMessageHandler('keys', function (ConnectionInterface $from, array $data) use ($shell) {
$value = $data['value'] ?? null; $value = $data['value'] ?? null;
if (!empty($value)) { if (!empty($value)) {
@ -101,11 +102,11 @@ $server->addMessageHandler('keys', function (ConnectionInterface $from, array $d
$value = implode('+', $keys); $value = implode('+', $keys);
return shell_exec(sprintf('xdotool key %s', escapeshellarg($value))); return $shell->exec('xdotool key %s', escapeshellarg($value));
} }
}); });
$server->addMessageHandler('key', function (ConnectionInterface $from, array $data) { $server->addMessageHandler('key', function (ConnectionInterface $from, array $data) use ($shell) {
$value = $data['value'] ?? null; $value = $data['value'] ?? null;
$map = [ $map = [
'up' => 'Up', 'up' => 'Up',
@ -120,15 +121,15 @@ $server->addMessageHandler('key', function (ConnectionInterface $from, array $da
]; ];
if (!empty($value) && isset($map[$value])) { if (!empty($value) && isset($map[$value])) {
return shell_exec(sprintf('xdotool key %s', $map[$value])); return $shell->exec('xdotool key %s', $map[$value]);
} }
}); });
$server->addMessageHandler('text', function (ConnectionInterface $from, array $data) { $server->addMessageHandler('text', function (ConnectionInterface $from, array $data) use ($shell) {
$value = $data['value'] ?? null; $value = $data['value'] ?? null;
if (!empty($value)) { if (!empty($value)) {
return shell_exec(sprintf('xdotool type %s', escapeshellarg($value))); return $shell->exec('xdotool type %s', escapeshellarg($value));
} }
}); });

23
server/src/Shell.php Normal file
View file

@ -0,0 +1,23 @@
<?php
/**
* class Shell.
*
* @author Simon Vieille <simon@deblan.fr>
*/
class Shell
{
/*
* Executes the given command and wraps sprintf.
*
* @return mixed
*/
public function exec()
{
if (func_num_args() > 0) {
$command = call_user_func_array('sprintf', func_get_args());
return shell_exec($command);
}
}
}