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

Merge pull request #3550 from tlercher/3535-display-check 

Fix #3535 - Check for DISPLAY when requesting version information
This commit is contained in:
Ingo Bürk 2018-12-09 18:10:42 +01:00 committed by GitHub
parent b192bf4bd2 b479dc1a0f
commit b35c56687d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/display_version.c
View File

@ -55,6 +55,13 @@ static yajl_callbacks version_callbacks = {
* *
*/ */
void display_running_version(void) { void display_running_version(void) {
if (getenv("DISPLAY") == NULL) {
fprintf(stderr, "\nYour DISPLAY environment variable is not set.\n");
fprintf(stderr, "Are you running i3 via SSH or on a virtual console?\n");
fprintf(stderr, "Try DISPLAY=:0 i3 --moreversion\n");
exit(EXIT_FAILURE);
}
char *pid_from_atom = root_atom_contents("I3_PID", conn, conn_screen); char *pid_from_atom = root_atom_contents("I3_PID", conn, conn_screen);
if (pid_from_atom == NULL) { if (pid_from_atom == NULL) {
/* If I3_PID is not set, the running version is older than 4.2-200. */ /* If I3_PID is not set, the running version is older than 4.2-200. */