Attachment 20465 Details for Bug 52104

[patch] Patch for kbd-1.12 to be able to load UTF dead keys into kernel

kbd-dead-utf8 (text/plain), 4.15 KB, created by Vojtech Pavlik on 2004-05-29 22:57:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vojtech Pavlik

Created: 2004-05-29 22:57:05 UTC

Size: 4.15 KB

patch

obsolete

>diff -urN kbd-1.12/src/dumpkeys.c kbd-1.12-uc/src/dumpkeys.c
>--- kbd-1.12/src/dumpkeys.c	2004-01-16 20:45:31.000000000 +0100
>+++ kbd-1.12-uc/src/dumpkeys.c	2004-05-29 16:54:30.310200233 +0200
>@@ -28,6 +28,19 @@
> #define MAX_NR_KEYMAPS NR_KEYMAPS
> #endif
> 
>+#ifndef KDGKBDIACRUC
>+struct kbdiacruc {
>+unsigned char diacr, base;
>+unsigned int result;
>+};
>+struct kbdiacrsuc {
>+	unsigned int kb_cnt;
>+	struct kbdiacruc kbdiacruc[256];
>+};
>+#define KDGKBDIACRUC    0x4BFA
>+#define KDSKBDIACRUC    0x4BFB 
>+#endif
>+
> static int fd;
> static int verbose;
> static int nr_keys = 0;			/* probably 112, 128, 256 or 512 */
>@@ -202,15 +215,29 @@
> 	printf("'");
> }
> 
>-static struct kbdiacrs kd;
>+static struct kbdiacrsuc kduc;
> 
> static void
> get_diacs(void) {
>+	struct kbdiacrs kd;
> 	static int got_diacs = 0;
>+	int i;
> 
>-	if(!got_diacs && ioctl(fd, KDGKBDIACR, (unsigned long)&kd)) {
>-	    perror("KDGKBDIACR");
>-	    exit(1);
>+	if (got_diacs)
>+		return;
>+
>+	if(ioctl(fd, KDGKBDIACRUC, (unsigned long)&kduc)) {
>+		if(ioctl(fd, KDGKBDIACR, (unsigned long)&kd)) {
>+			perror("KDGKBDIACR");
>+	    		exit(1);
>+		} else {
>+			kduc.kb_cnt = kd.kb_cnt;
>+			for (i = 0; i < kd.kb_cnt; i++) {
>+				kduc.kbdiacruc[i].diacr = kd.kbdiacr[i].diacr;
>+				kduc.kbdiacruc[i].base = kd.kbdiacr[i].base;
>+				kduc.kbdiacruc[i].result = kd.kbdiacr[i].result;
>+			}
>+		}
> 	}
> 	got_diacs = 1;
> }
>@@ -218,7 +245,7 @@
> static int
> nr_of_diacs(void) {
> 	get_diacs();
>-	return kd.kb_cnt;
>+	return kduc.kb_cnt;
> }
> 
> static void
>@@ -226,13 +253,13 @@
> 	int i;
> 
> 	get_diacs();
>-	for (i = 0; i < kd.kb_cnt; i++) {
>+	for (i = 0; i < kduc.kb_cnt; i++) {
> 		printf("compose ");
>-		outchar(kd.kbdiacr[i].diacr);
>+		outchar(kduc.kbdiacruc[i].diacr);
> 		printf(" ");
>-		outchar(kd.kbdiacr[i].base);
>+		outchar(kduc.kbdiacruc[i].base);
> 		printf(" to ");
>-		outchar(kd.kbdiacr[i].result);
>+		outchar(kduc.kbdiacruc[i].result);
> 		printf("\n");
> 	}
> }
>diff -urN kbd-1.12/src/loadkeys.y kbd-1.12-uc/src/loadkeys.y
>--- kbd-1.12/src/loadkeys.y	2004-01-16 22:51:25.000000000 +0100
>+++ kbd-1.12-uc/src/loadkeys.y	2004-05-29 16:55:35.329659165 +0200
>@@ -31,6 +31,19 @@
> #define KT_LETTER KT_LATIN
> #endif
> 
>+#ifndef KDGKBDIACRUC
>+struct kbdiacruc {
>+unsigned char diacr, base;
>+unsigned int result;
>+};
>+struct kbdiacrsuc {
>+	unsigned int kb_cnt;
>+	struct kbdiacruc kbdiacruc[256];
>+};
>+#define KDGKBDIACRUC    0x4BFA
>+#define KDSKBDIACRUC    0x4BFB 
>+#endif
>+
> #undef NR_KEYS
> #define NR_KEYS 256
> 
>@@ -43,7 +56,7 @@
> /* the kernel structures we want to set or print */
> u_short *key_map[MAX_NR_KEYMAPS];
> char *func_table[MAX_NR_FUNC];
>-struct kbdiacr accent_table[MAX_DIACR];
>+struct kbdiacruc accent_table[MAX_DIACR];
> unsigned int accent_table_size = 0;
> 
> char key_is_constant[NR_KEYS];
>@@ -748,7 +761,7 @@
> 
> static void
> compose(int diacr, int base, int res) {
>-        struct kbdiacr *p;
>+        struct kbdiacruc *p;
>         if (accent_table_size == MAX_DIACR) {
> 	        fprintf(stderr, _("compose table overflow\n"));
> 		exit(1);
>@@ -907,20 +920,30 @@
> 
> static int
> defdiacs(int fd){
>-        struct kbdiacrs kd;
>+	struct kbdiacrs kd;
>+        struct kbdiacrsuc kduc;
> 	int i;
> 
> 	kd.kb_cnt = accent_table_size;
>+	kduc.kb_cnt = accent_table_size;
> 	if (kd.kb_cnt > MAX_DIACR) {
> 	    kd.kb_cnt = MAX_DIACR;
>+	    kduc.kb_cnt = MAX_DIACR;
> 	    fprintf(stderr, _("too many compose definitions\n"));
> 	}
>-	for (i = 0; i < kd.kb_cnt; i++)
>-	    kd.kbdiacr[i] = accent_table[i];
> 
>-	if(ioctl(fd, KDSKBDIACR, (unsigned long) &kd)) {
>-	    perror("KDSKBDIACR");
>-	    exit(1);
>+	for (i = 0; i < kd.kb_cnt; i++) {
>+	    kduc.kbdiacruc[i] = accent_table[i];
>+	    kd.kbdiacr[i].diacr = accent_table[i].diacr;
>+	    kd.kbdiacr[i].base = accent_table[i].base;
>+	    kd.kbdiacr[i].result = accent_table[i].result;
>+	}
>+
>+	if(ioctl(fd, KDSKBDIACRUC, (unsigned long) &kduc)) {
>+		if(ioctl(fd, KDSKBDIACR, (unsigned long) &kd)) {
>+		    perror("KDSKBDIACR");
>+		    exit(1);
>+		}
> 	}
> 	return kd.kb_cnt;
> }
>@@ -1204,7 +1227,7 @@
> 	  printf("\t0,\n");
> 	printf("};\n");
> 
>-	printf("\nstruct kbdiacr accent_table[MAX_DIACR] = {\n");
>+	printf("\nstruct kbdiacruc accent_table[MAX_DIACR] = {\n");
> 	for (i = 0; i < accent_table_size; i++) {
> 	        printf("\t{");
> 	        outchar(accent_table[i].diacr, 1);

Actions: View | Diff

Attachments on bug 52104: 18921 | 20465 | 25923 | 25924 | 25926