Linux console tools development discussion
 help / color / mirror / Atom feed
* [kbd] [PATCH] Add documentation for loadkeys’s -q option to loadkeys.y
@ 2009-06-01  9:21 Michael Schutte
  2009-06-01  9:21 ` [kbd] [PATCH] dumpkeys: Use U+… in “compose” lines if KDGKBDIACRUC is available Michael Schutte
  2009-06-07 20:50 ` [kbd] [PATCH] Add documentation for loadkeys’s -q option to loadkeys.y Alexey Gladkov
  0 siblings, 2 replies; 4+ messages in thread
From: Michael Schutte @ 2009-06-01  9:21 UTC (permalink / raw)
  To: kbd

86d0ca1 only altered loadkeys.c.  Subsequent modifications to the yacc
source file loadkeys.y made this change disappear again.

Signed-off-by: Michael Schutte <michi@uiae.at>
---
 src/loadkeys.c |    7 ++++---
 src/loadkeys.y |    1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/loadkeys.c b/src/loadkeys.c
index e2c0c7b..b5dfb38 100644
--- a/src/loadkeys.c
+++ b/src/loadkeys.c
@@ -163,7 +163,7 @@ int yylex (void);
 
 
 /* Line 189 of yacc.c  */
-#line 167 "loadkeys.c"
+#line 167 "y.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -275,7 +275,7 @@ typedef int YYSTYPE;
 
 
 /* Line 264 of yacc.c  */
-#line 279 "loadkeys.c"
+#line 279 "y.tab.c"
 
 #ifdef short
 # undef short
@@ -1825,7 +1825,7 @@ yyreduce:
 
 
 /* Line 1455 of yacc.c  */
-#line 1829 "loadkeys.c"
+#line 1829 "y.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2057,6 +2057,7 @@ usage(void) {
 "  -d --default       load \"%s\"\n"
 "  -h --help          display this help text\n"
 "  -m --mktable       output a \"defkeymap.c\" to stdout\n"
+"  -q --quiet         suppress all normal output\n"
 "  -s --clearstrings  clear kernel string table\n"
 "  -u --unicode       force conversion to Unicode\n"
 "  -v --verbose       report the changes\n"), PACKAGE_VERSION, DEFMAP);
diff --git a/src/loadkeys.y b/src/loadkeys.y
index 70b48f9..be3e886 100644
--- a/src/loadkeys.y
+++ b/src/loadkeys.y
@@ -276,6 +276,7 @@ usage(void) {
 "  -d --default       load \"%s\"\n"
 "  -h --help          display this help text\n"
 "  -m --mktable       output a \"defkeymap.c\" to stdout\n"
+"  -q --quiet         suppress all normal output\n"
 "  -s --clearstrings  clear kernel string table\n"
 "  -u --unicode       force conversion to Unicode\n"
 "  -v --verbose       report the changes\n"), PACKAGE_VERSION, DEFMAP);
-- 
1.6.2.4



^ permalink raw reply	[flat|nested] 4+ messages in thread

* [kbd] [PATCH] dumpkeys: Use U+… in “compose” lines if KDGKBDIACRUC is available
  2009-06-01  9:21 [kbd] [PATCH] Add documentation for loadkeys’s -q option to loadkeys.y Michael Schutte
@ 2009-06-01  9:21 ` Michael Schutte
  2009-06-08 10:23   ` Alexey Gladkov
  2009-06-07 20:50 ` [kbd] [PATCH] Add documentation for loadkeys’s -q option to loadkeys.y Alexey Gladkov
  1 sibling, 1 reply; 4+ messages in thread
From: Michael Schutte @ 2009-06-01  9:21 UTC (permalink / raw)
  To: kbd

This makes dumpkeys | loadkeys idempotent even if no “-c charset” option
is used with dumpkeys.

Signed-off-by: Michael Schutte <michi@uiae.at>
---
 src/dumpkeys.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/dumpkeys.c b/src/dumpkeys.c
index 30900a5..326ec37 100644
--- a/src/dumpkeys.c
+++ b/src/dumpkeys.c
@@ -249,9 +249,7 @@ dump_diacs(void) {
 		outchar(kd.kbdiacruc[i].diacr & 0xff);
 		printf(" ");
 		outchar(kd.kbdiacruc[i].base & 0xff);
-		printf(" to ");
-		outchar(convert_code(kd.kbdiacruc[i].result ^ 0xf000, TO_8BIT));
-		printf("\n");
+		printf(" to U+%04x\n", kd.kbdiacruc[i].result);
 	}
 #else
 	for (i = 0; i < kd.kb_cnt; i++) {
-- 
1.6.2.4



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [kbd] [PATCH] Add documentation for loadkeys’s -q option to loadkeys.y
  2009-06-01  9:21 [kbd] [PATCH] Add documentation for loadkeys’s -q option to loadkeys.y Michael Schutte
  2009-06-01  9:21 ` [kbd] [PATCH] dumpkeys: Use U+… in “compose” lines if KDGKBDIACRUC is available Michael Schutte
@ 2009-06-07 20:50 ` Alexey Gladkov
  1 sibling, 0 replies; 4+ messages in thread
From: Alexey Gladkov @ 2009-06-07 20:50 UTC (permalink / raw)
  To: kbd

01.06.2009 13:21, Michael Schutte wrote:
> 86d0ca1 only altered loadkeys.c.  Subsequent modifications to the yacc
> source file loadkeys.y made this change disappear again.

Applied, thanks!

-- 
Rgrds, legion



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [kbd] [PATCH] dumpkeys: Use U+… in “compose” lines if KDGKBDIACRUC is available
  2009-06-01  9:21 ` [kbd] [PATCH] dumpkeys: Use U+… in “compose” lines if KDGKBDIACRUC is available Michael Schutte
@ 2009-06-08 10:23   ` Alexey Gladkov
  0 siblings, 0 replies; 4+ messages in thread
From: Alexey Gladkov @ 2009-06-08 10:23 UTC (permalink / raw)
  To: kbd

01.06.2009 13:21, Michael Schutte wrote:
> This makes dumpkeys | loadkeys idempotent even if no “-c charset” option
> is used with dumpkeys.
> 
> Signed-off-by: Michael Schutte <michi@uiae.at>

Applied, thanks!

-- 
Rgrds, legion



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2009-06-08 10:23 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-01  9:21 [kbd] [PATCH] Add documentation for loadkeys’s -q option to loadkeys.y Michael Schutte
2009-06-01  9:21 ` [kbd] [PATCH] dumpkeys: Use U+… in “compose” lines if KDGKBDIACRUC is available Michael Schutte
2009-06-08 10:23   ` Alexey Gladkov
2009-06-07 20:50 ` [kbd] [PATCH] Add documentation for loadkeys’s -q option to loadkeys.y Alexey Gladkov

Linux console tools development discussion

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/kbd/0 kbd/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 kbd kbd/ http://lore.altlinux.org/kbd \
		kbd@lists.altlinux.org kbd@lists.altlinux.ru kbd@lists.altlinux.com
	public-inbox-index kbd

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.kbd


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git