From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 15/17] setterm: various visual terminal effects are not console specific
Date: Sun, 18 May 2014 15:05:39 +0100 [thread overview]
Message-ID: <1400421941-14244-16-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1400421941-14244-1-git-send-email-kerolasa@iki.fi>
Setting colors, making line not to wrap, and so on can be attempted in
other than consoles.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
term-utils/setterm.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 2b1901f..10ca021 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -824,7 +824,7 @@ static void perform_sequence(struct setterm_control *ctl)
}
/* -linewrap [on|off]. */
- if (ctl->opt_linewrap && vc_only(ctl, "-linewrap"))
+ if (ctl->opt_linewrap)
fputs(ctl->opt_li_on ? "\033[?7h" : "\033[?7l", stdout);
/* -repeat [on|off]. */
@@ -845,11 +845,11 @@ static void perform_sequence(struct setterm_control *ctl)
}
/* -foreground black|red|green|yellow|blue|magenta|cyan|white|default. */
- if (ctl->opt_foreground && vc_only(ctl, "-foreground"))
+ if (ctl->opt_foreground)
printf("\033[3%c%s", '0' + ctl->opt_fo_color, "m");
/* -background black|red|green|yellow|blue|magenta|cyan|white|default. */
- if (ctl->opt_background && vc_only(ctl, "-background"))
+ if (ctl->opt_background)
printf("\033[4%c%s", '0' + ctl->opt_ba_color, "m");
/* -ulcolor black|red|green|yellow|blue|magenta|cyan|white|default. */
@@ -857,11 +857,11 @@ static void perform_sequence(struct setterm_control *ctl)
printf("\033[1;%d]", ctl->opt_ul_color);
/* -hbcolor black|red|green|yellow|blue|magenta|cyan|white|default. */
- if (ctl->opt_hbcolor && vc_only(ctl, "-hbcolor"))
+ if (ctl->opt_hbcolor)
printf("\033[2;%d]", ctl->opt_hb_color);
/* -inversescreen [on|off]. */
- if (ctl->opt_inversescreen && vc_only(ctl, "-inversescreen"))
+ if (ctl->opt_inversescreen)
fputs(ctl->opt_invsc_on ? "\033[?5h" : "\033[?5l", stdout);
/* -bold [on|off]. Vc behaves as expected, otherwise off turns off
@@ -929,12 +929,12 @@ static void perform_sequence(struct setterm_control *ctl)
putp(ti_entry(ctl->opt_cl_all ? "clear" : "ed"));
/* -tabs. */
- if (ctl->opt_tabs && vc_only(ctl, "-tabs")) {
- int i;
-
+ if (ctl->opt_tabs) {
if (ctl->opt_tb_array[0] == -1)
show_tabs();
else {
+ int i;
+
for (i = 0; ctl->opt_tb_array[i] > 0; i++)
printf("\033[%dG\033H", ctl->opt_tb_array[i]);
putchar('\r');
--
1.9.2
next prev parent reply other threads:[~2014-05-18 14:06 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-18 14:05 [PATCH 00/17] pull: almost complete setterm refactoring Sami Kerola
2014-05-18 14:05 ` [PATCH 01/17] setterm: clean up includes Sami Kerola
2014-05-18 14:05 ` [PATCH 02/17] setterm: use getopt_long_only() for option parsing Sami Kerola
2014-05-19 9:29 ` Karel Zak
2014-05-18 14:05 ` [PATCH 03/17] setterm: use string utils to numeric parsing Sami Kerola
2014-05-19 9:24 ` Karel Zak
2014-05-18 14:05 ` [PATCH 04/17] setterm: move show_tabs() and screendump() functions Sami Kerola
2014-05-18 14:05 ` [PATCH 05/17] setterm: remove usage comment segment Sami Kerola
2014-05-18 14:05 ` [PATCH 06/17] setterm: add option control structure Sami Kerola
2014-05-19 9:38 ` Karel Zak
2014-05-19 9:48 ` Karel Zak
2014-05-18 14:05 ` [PATCH 07/17] setterm: add init_terminal() to make main() shorter Sami Kerola
2014-05-18 14:05 ` [PATCH 08/17] setterm: clean up screendump() Sami Kerola
2014-05-18 14:05 ` [PATCH 09/17] setterm: remove devfs and /dev/vcsa0 support Sami Kerola
2014-05-19 9:52 ` Karel Zak
2014-05-18 14:05 ` [PATCH 10/17] setterm: make -msglevel 0 to work as is did earlier Sami Kerola
2014-05-18 14:05 ` [PATCH 11/17] setterm: correct usage() bright color argument Sami Kerola
2014-05-19 9:57 ` Karel Zak
2014-05-18 14:05 ` [PATCH 12/17] setterm: improve perform_sequence() coding style Sami Kerola
2014-05-18 14:05 ` [PATCH 13/17] setterm: tell user when options does not effect Sami Kerola
2014-05-19 10:02 ` Karel Zak
2014-05-18 14:05 ` [PATCH 14/17] setterm: improve error messages Sami Kerola
2014-05-18 14:05 ` Sami Kerola [this message]
2014-05-18 14:05 ` [PATCH 16/17] setterm: mark some options to be exclusive with each other Sami Kerola
2014-05-18 14:05 ` [PATCH 17/17] setterm: add set_blanking() action Sami Kerola
2014-05-19 21:51 ` [PATCH 00/17] pull: almost complete setterm refactoring Sami Kerola
2014-05-20 8:11 ` Benno Schulenberg
2014-05-20 10:02 ` Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400421941-14244-16-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox