diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2014-12-03 14:29:02 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2014-12-03 14:29:02 +0000 |
| commit | 9f938c4cdfd511e2f6c783cbb1226573760d2dc7 (patch) | |
| tree | df97cd8295786f19fca56299447dc87008f2dd47 /w3mimg/fb/fb_w3mimg.c | |
| parent | Merge branch 'bug/gdk-pixbuf' (diff) | |
| parent | Support FreeBSD framebuffer (diff) | |
| download | w3m-9f938c4cdfd511e2f6c783cbb1226573760d2dc7.tar.gz w3m-9f938c4cdfd511e2f6c783cbb1226573760d2dc7.zip | |
Merge branch 'feature/w3m-img-freebsd'
Diffstat (limited to 'w3mimg/fb/fb_w3mimg.c')
| -rw-r--r-- | w3mimg/fb/fb_w3mimg.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/w3mimg/fb/fb_w3mimg.c b/w3mimg/fb/fb_w3mimg.c index d3ae5a9..fb323f5 100644 --- a/w3mimg/fb/fb_w3mimg.c +++ b/w3mimg/fb/fb_w3mimg.c @@ -153,10 +153,15 @@ check_tty_console(char *tty) return 0; if (strncmp(tty, "/dev/", 5) == 0) tty += 5; +#if defined(__linux__) if (strncmp(tty, "tty", 3) == 0 && isdigit(*(tty + 3))) return 1; if (strncmp(tty, "vc/", 3) == 0 && isdigit(*(tty + 3))) return 1; +#elif defined(__FreeBSD__) + if (strncmp(tty, "ttyv", 4) == 0 && isxdigit(*(tty + 4))) + return 1; +#endif return 0; } #else @@ -172,7 +177,9 @@ w3mimg_fbopen() return NULL; memset(wop, 0, sizeof(w3mimg_op)); - if (!check_tty_console(getenv("W3M_TTY")) && strcmp("jfbterm", getenv("TERM")) != 0) { + if (!check_tty_console(getenv("W3M_TTY")) && + strcmp("jfbterm", getenv("TERM")) != 0 && + strncmp("jfbterm-", getenv("TERM"), 8) != 0) { fprintf(stderr, "w3mimgdisplay/fb: tty is not console\n"); goto error; } |