X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fterminal-util.h;h=84ba3a7f70f925005c70577c49d7db6d61af3b6a;hp=36fc5d1739273400409658296e1b5e7792d7061b;hb=9b00a533195b7fec54a791ca02090e0799214770;hpb=bccdfb431a266e7671d518fd5a42362a5ce724c9
diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index 36fc5d173..84ba3a7f7 100644
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -19,9 +19,10 @@
along with systemd; If not, see .
***/
-#include
#include
+#include
#include
+#include
#include "macro.h"
#include "time-util.h"
@@ -35,6 +36,10 @@
#define ANSI_HIGHLIGHT_YELLOW "\x1B[0;1;33m"
#define ANSI_HIGHLIGHT_BLUE "\x1B[0;1;34m"
#define ANSI_HIGHLIGHT_UNDERLINE "\x1B[0;1;4m"
+#define ANSI_HIGHLIGHT_RED_UNDERLINE "\x1B[0;1;4;31m"
+#define ANSI_HIGHLIGHT_GREEN_UNDERLINE "\x1B[0;1;4;32m"
+#define ANSI_HIGHLIGHT_YELLOW_UNDERLINE "\x1B[0;1;4;33m"
+#define ANSI_HIGHLIGHT_BLUE_UNDERLINE "\x1B[0;1;4;34m"
#define ANSI_NORMAL "\x1B[0m"
#define ANSI_ERASE_TO_END_OF_LINE "\x1B[K"
@@ -42,83 +47,89 @@
/* Set cursor to top left corner and clear screen */
#define ANSI_HOME_CLEAR "\x1B[H\x1B[2J"
-// UNNEEDED int reset_terminal_fd(int fd, bool switch_to_text);
-// UNNEEDED int reset_terminal(const char *name);
+#if 0 /// UNNEEDED by elogind
+int reset_terminal_fd(int fd, bool switch_to_text);
+int reset_terminal(const char *name);
+#endif // 0
int open_terminal(const char *name, int mode);
-// UNNEEDED int acquire_terminal(const char *name, bool fail, bool force, bool ignore_tiocstty_eperm, usec_t timeout);
-// UNNEEDED int release_terminal(void);
+#if 0 /// UNNEEDED by elogind
+int acquire_terminal(const char *name, bool fail, bool force, bool ignore_tiocstty_eperm, usec_t timeout);
+int release_terminal(void);
-// UNNEEDED int terminal_vhangup_fd(int fd);
-// UNNEEDED int terminal_vhangup(const char *name);
+int terminal_vhangup_fd(int fd);
+int terminal_vhangup(const char *name);
+#endif // 0
int chvt(int vt);
-// UNNEEDED int read_one_char(FILE *f, char *ret, usec_t timeout, bool *need_nl);
-// UNNEEDED int ask_char(char *ret, const char *replies, const char *text, ...) _printf_(3, 4);
-// UNNEEDED int ask_string(char **ret, const char *text, ...) _printf_(2, 3);
+#if 0 /// UNNEEDED by elogind
+int read_one_char(FILE *f, char *ret, usec_t timeout, bool *need_nl);
+int ask_char(char *ret, const char *replies, const char *text, ...) _printf_(3, 4);
+int ask_string(char **ret, const char *text, ...) _printf_(2, 3);
-// UNNEEDED int vt_disallocate(const char *name);
+int vt_disallocate(const char *name);
-// UNNEEDED char *resolve_dev_console(char **active);
+char *resolve_dev_console(char **active);
+#endif // 0
+int get_kernel_consoles(char ***consoles);
bool tty_is_vc(const char *tty);
-// UNNEEDED bool tty_is_vc_resolve(const char *tty);
+#if 0 /// UNNEEDED by elogind
+bool tty_is_vc_resolve(const char *tty);
+#endif // 0
bool tty_is_console(const char *tty) _pure_;
int vtnr_from_tty(const char *tty);
-// UNNEEDED const char *default_term_for_tty(const char *tty);
+#if 0 /// UNNEEDED by elogind
+const char *default_term_for_tty(const char *tty);
+#endif // 0
int make_stdio(int fd);
int make_null_stdio(void);
-// UNNEEDED int make_console_stdio(void);
+#if 0 /// UNNEEDED by elogind
+int make_console_stdio(void);
+#endif // 0
int fd_columns(int fd);
unsigned columns(void);
int fd_lines(int fd);
unsigned lines(void);
-// UNNEEDED void columns_lines_cache_reset(int _unused_ signum);
+#if 0 /// UNNEEDED by elogind
+void columns_lines_cache_reset(int _unused_ signum);
+#endif // 0
bool on_tty(void);
-
-static inline const char *ansi_underline(void) {
- return on_tty() ? ANSI_UNDERLINE : "";
-}
-
-static inline const char *ansi_highlight(void) {
- return on_tty() ? ANSI_HIGHLIGHT : "";
-}
-
-static inline const char *ansi_highlight_underline(void) {
- return on_tty() ? ANSI_HIGHLIGHT_UNDERLINE : "";
-}
-
-static inline const char *ansi_highlight_red(void) {
- return on_tty() ? ANSI_HIGHLIGHT_RED : "";
-}
-
-static inline const char *ansi_highlight_green(void) {
- return on_tty() ? ANSI_HIGHLIGHT_GREEN : "";
-}
-
-static inline const char *ansi_highlight_yellow(void) {
- return on_tty() ? ANSI_HIGHLIGHT_YELLOW : "";
-}
-
-static inline const char *ansi_highlight_blue(void) {
- return on_tty() ? ANSI_HIGHLIGHT_BLUE : "";
-}
-
-static inline const char *ansi_normal(void) {
- return on_tty() ? ANSI_NORMAL : "";
-}
+bool terminal_is_dumb(void);
+bool colors_enabled(void);
+
+#define DEFINE_ANSI_FUNC(name, NAME) \
+ static inline const char *ansi_##name(void) { \
+ return colors_enabled() ? ANSI_##NAME : ""; \
+ } \
+ struct __useless_struct_to_allow_trailing_semicolon__
+
+DEFINE_ANSI_FUNC(underline, UNDERLINE);
+DEFINE_ANSI_FUNC(highlight, HIGHLIGHT);
+DEFINE_ANSI_FUNC(highlight_underline, HIGHLIGHT_UNDERLINE);
+DEFINE_ANSI_FUNC(highlight_red, HIGHLIGHT_RED);
+DEFINE_ANSI_FUNC(highlight_green, HIGHLIGHT_GREEN);
+DEFINE_ANSI_FUNC(highlight_yellow, HIGHLIGHT_YELLOW);
+DEFINE_ANSI_FUNC(highlight_blue, HIGHLIGHT_BLUE);
+DEFINE_ANSI_FUNC(highlight_red_underline, HIGHLIGHT_RED_UNDERLINE);
+DEFINE_ANSI_FUNC(highlight_green_underline, HIGHLIGHT_GREEN_UNDERLINE);
+DEFINE_ANSI_FUNC(highlight_yellow_underline, HIGHLIGHT_YELLOW_UNDERLINE);
+DEFINE_ANSI_FUNC(highlight_blue_underline, HIGHLIGHT_BLUE_UNDERLINE);
+DEFINE_ANSI_FUNC(normal, NORMAL);
int get_ctty_devnr(pid_t pid, dev_t *d);
int get_ctty(pid_t, dev_t *_devnr, char **r);
-// UNNEEDED int getttyname_malloc(int fd, char **r);
-// UNNEEDED int getttyname_harder(int fd, char **r);
+int getttyname_malloc(int fd, char **r);
+int getttyname_harder(int fd, char **r);
-// UNNEEDED int ptsname_malloc(int fd, char **ret);
-// UNNEEDED int ptsname_namespace(int pty, char **ret);
+#if 0 /// UNNEEDED by elogind
+int ptsname_malloc(int fd, char **ret);
+int ptsname_namespace(int pty, char **ret);
-// UNNEEDED int openpt_in_namespace(pid_t pid, int flags);
-// UNNEEDED int open_terminal_in_namespace(pid_t pid, const char *name, int mode);
+int openpt_in_namespace(pid_t pid, int flags);
+int open_terminal_in_namespace(pid_t pid, const char *name, int mode);
+#endif // 0