--- data/keymaps/i386/fgGIod/tr_f-latin5.map.orig Sat Oct 12 17:21:12 2002 +++ data/keymaps/i386/fgGIod/tr_f-latin5.map Fri Aug 25 08:31:29 2006 @@ -51,7 +51,7 @@ alt keycode 12 = Meta_minus keycode 13 = minus underscore alt keycode 13 = Meta_equal -keycode 14 = BackSpace Delete +keycode 14 = Delete Delete alt keycode 14 = Meta_Delete keycode 15 = Tab Tab alt keycode 15 = Meta_Tab --- data/keymaps/i386/qwerty/lt.l4.map.orig Sat Oct 12 16:59:51 2002 +++ data/keymaps/i386/qwerty/lt.l4.map Fri Aug 25 08:31:29 2006 @@ -205,7 +205,7 @@ # edit this if you want the key above to delete symbols above # cursor, not before. keycode 14 = \ - BackSpace BackSpace BackSpace BackSpace \ + Delete Delete Delete Delete \ Delete Delete Delete Delete \ Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ Meta_Delete Meta_Delete Meta_Delete Meta_Delete @@ -506,7 +506,7 @@ # Edit this if you want strict VT100 emulation. string F111 = "\033[3$" -keycode 111 = Delete F111 Delete F111 \ +keycode 111 = Remove F111 Remove F111 \ Remove Remove Remove Remove \ Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ Boot Boot Boot Boot --- data/keymaps/i386/qwerty/lt.map.orig Sat Oct 12 17:00:25 2002 +++ data/keymaps/i386/qwerty/lt.map Fri Aug 25 08:31:29 2006 @@ -204,7 +204,7 @@ # edit this if you want the key above to delete symbols above # cursor, not before. keycode 14 = \ - BackSpace BackSpace BackSpace BackSpace \ + Delete Delete Delete Delete \ Delete Delete Delete Delete \ Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ Meta_Delete Meta_Delete Meta_Delete Meta_Delete @@ -505,7 +505,7 @@ # Edit this if you want strict VT100 emulation. string F111 = "\033[3$" -keycode 111 = Delete F111 Delete F111 \ +keycode 111 = Remove F111 Remove F111 \ Remove Remove Remove Remove \ Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ Boot Boot Boot Boot --- data/keymaps/i386/qwerty/no-latin1.map.orig Fri Oct 11 04:08:49 2002 +++ data/keymaps/i386/qwerty/no-latin1.map Fri Aug 25 08:31:29 2006 @@ -3,7 +3,7 @@ # Send comments to Kjetil T. Homme include "linux-with-alt-and-altgr" plain keycode 83 = KP_Comma - plain keycode 111 = Delete # "Remove" originally, weird... + plain keycode 111 = Remove strings as usual keycode 1 = Escape --- data/keymaps/i386/qwerty/ru-ms.map.orig Sat Oct 12 17:07:05 2002 +++ data/keymaps/i386/qwerty/ru-ms.map Fri Aug 25 08:31:29 2006 @@ -89,8 +89,8 @@ altgr alt keycode 13 = Meta_equal shift alt keycode 13 = Meta_plus altgr shift alt keycode 13 = Meta_plus - keycode 14 = BackSpace BackSpace BackSpace BackSpace -# keycode 14 = Delete Delete Delete Delete +# keycode 14 = BackSpace BackSpace BackSpace BackSpace + keycode 14 = Delete Delete Delete Delete alt keycode 14 = Meta_Delete altgr alt keycode 14 = Meta_Delete keycode 15 = Tab Tab Tab Tab --- data/keymaps/i386/qwerty/ru.map.orig Sat Oct 12 17:02:19 2002 +++ data/keymaps/i386/qwerty/ru.map Fri Aug 25 08:31:29 2006 @@ -37,7 +37,7 @@ alt keycode 12 = Meta_minus keycode 13 = equal plus equal plus alt keycode 13 = Meta_equal - keycode 14 = BackSpace BackSpace BackSpace BackSpace + keycode 14 = Delete Delete Delete Delete alt keycode 14 = Meta_Delete keycode 15 = Tab Tab Tab Tab alt keycode 15 = Meta_Tab --- data/keymaps/i386/qwerty/ru1.map.orig Sat Oct 12 17:02:30 2002 +++ data/keymaps/i386/qwerty/ru1.map Fri Aug 25 08:31:29 2006 @@ -143,8 +143,8 @@ # The keycode "0xFF" is too dangerous for many programs (including emacs). # So let it be bracket instead of Hard Sign. -# altgr keycode 27 = +0xDF -# altgr shift keycode 27 = +0xFF +altgr keycode 27 = +0xDF +altgr shift keycode 27 = +0xFF control keycode 27 = Control_bracketright altgr control keycode 27 = Control_bracketright alt keycode 27 = Meta_bracketright --- data/keymaps/i386/qwerty/ru2.map.orig Sat Oct 12 17:05:47 2002 +++ data/keymaps/i386/qwerty/ru2.map Fri Aug 25 08:31:29 2006 @@ -46,7 +46,7 @@ alt keycode 12 = Meta_minus keycode 13 = equal plus equal plus alt keycode 13 = Meta_equal - keycode 14 = BackSpace BackSpace BackSpace BackSpace + keycode 14 = Delete Delete Delete Delete alt keycode 14 = Meta_Delete keycode 15 = Tab Tab Tab Tab alt keycode 15 = Meta_Tab --- data/keymaps/i386/qwerty/se-ir209.map.orig Sat Oct 12 17:12:48 2002 +++ data/keymaps/i386/qwerty/se-ir209.map Fri Aug 25 08:31:29 2006 @@ -345,7 +345,7 @@ keycode 109 = Next Scroll_Forward keycode 110 = Insert - keycode 111 = Delete # "Remove" originally, weird... + keycode 111 = Remove control alt keycode 111 = Boot control altgr keycode 111 = Boot --- data/keymaps/i386/qwerty/se-lat6.map.orig Sat Oct 12 17:13:01 2002 +++ data/keymaps/i386/qwerty/se-lat6.map Fri Aug 25 08:31:29 2006 @@ -374,6 +374,6 @@ keycode 109 = Next Scroll_Forward keycode 110 = Insert - keycode 111 = Delete # "Remove" originally, weird... + keycode 111 = Remove control alt keycode 111 = Boot control altgr keycode 111 = Boot --- data/keymaps/i386/qwerty/tr_q-latin5.map.orig Fri Oct 11 04:08:49 2002 +++ data/keymaps/i386/qwerty/tr_q-latin5.map Fri Aug 25 08:31:29 2006 @@ -49,7 +49,7 @@ alt keycode 12 = Meta_minus keycode 13 = minus underscore alt keycode 13 = Meta_equal -keycode 14 = BackSpace Delete +keycode 14 = Delete Delete alt keycode 14 = Meta_Delete keycode 15 = Tab Tab alt keycode 15 = Meta_Tab --- data/keymaps/i386/qwerty/ua-utf-ws.map.orig Sat Oct 12 17:07:56 2002 +++ data/keymaps/i386/qwerty/ua-utf-ws.map Fri Aug 25 08:31:29 2006 @@ -260,7 +260,7 @@ shift ctrll ctrlr keycode 13 = plus alt ctrll ctrlr keycode 13 = Meta_equal shift alt ctrll ctrlr keycode 13 = Meta_plus -keycode 14 = BackSpace Delete +keycode 14 = Delete Delete control keycode 14 = BackSpace alt keycode 14 = Meta_Delete ctrlr keycode 14 = BackSpace --- data/keymaps/i386/qwerty/ua-utf.map.orig Sat Oct 12 17:08:07 2002 +++ data/keymaps/i386/qwerty/ua-utf.map Fri Aug 25 08:31:29 2006 @@ -250,7 +250,7 @@ shift ctrll ctrlr keycode 13 = plus alt ctrll ctrlr keycode 13 = Meta_equal shift alt ctrll ctrlr keycode 13 = Meta_plus -keycode 14 = BackSpace Delete +keycode 14 = Delete Delete control keycode 14 = BackSpace alt keycode 14 = Meta_Delete ctrlr keycode 14 = BackSpace --- data/keymaps/i386/qwerty/ua-ws.map.orig Sat Oct 12 17:08:19 2002 +++ data/keymaps/i386/qwerty/ua-ws.map Fri Aug 25 08:31:29 2006 @@ -260,7 +260,7 @@ shift ctrll ctrlr keycode 13 = plus alt ctrll ctrlr keycode 13 = Meta_equal shift alt ctrll ctrlr keycode 13 = Meta_plus -keycode 14 = BackSpace Delete +keycode 14 = Delete Delete control keycode 14 = BackSpace alt keycode 14 = Meta_Delete ctrlr keycode 14 = BackSpace --- data/keymaps/i386/qwerty/ua.map.orig Sat Oct 12 17:08:31 2002 +++ data/keymaps/i386/qwerty/ua.map Fri Aug 25 08:31:30 2006 @@ -249,7 +249,7 @@ shift ctrll ctrlr keycode 13 = plus alt ctrll ctrlr keycode 13 = Meta_equal shift alt ctrll ctrlr keycode 13 = Meta_plus -keycode 14 = BackSpace Delete +keycode 14 = Delete Delete control keycode 14 = BackSpace alt keycode 14 = Meta_Delete ctrlr keycode 14 = BackSpace --- data/keymaps/i386/dvorak/dvorak-l.map.orig Fri Oct 11 04:08:51 2002 +++ data/keymaps/i386/dvorak/dvorak-l.map Fri Aug 25 08:31:29 2006 @@ -43,7 +43,7 @@ keycode 11 = three numbersign keycode 12 = two at keycode 13 = one exclam - keycode 14 = BackSpace Delete + keycode 14 = Delete Delete ! -------------------------------------------------------------------------- ! Row 3 ! -------------------------------------------------------------------------- --- data/keymaps/i386/dvorak/dvorak-r.map.orig Fri Oct 11 04:08:51 2002 +++ data/keymaps/i386/dvorak/dvorak-r.map Fri Aug 25 08:31:29 2006 @@ -43,7 +43,7 @@ keycode 11 = slash question keycode 12 = bracketleft braceleft keycode 13 = bracketright braceright - keycode 14 = BackSpace Delete + keycode 14 = Delete Delete ! -------------------------------------------------------------------------- ! Row 3 ! -------------------------------------------------------------------------- --- src/psffontop.c.orig Fri Jan 16 11:45:31 2004 +++ src/psffontop.c Fri Aug 25 08:32:36 2006 @@ -59,7 +59,6 @@ static unsigned int assemble_ucs2(char **inptr, int cnt) { - unsigned char **in = (unsigned char **) inptr; unsigned int u1, u2; if (cnt < 2) { @@ -68,8 +67,8 @@ exit(EX_DATAERR); } - u1 = *(*in)++; - u2 = *(*in)++; + u1 = (unsigned char)*(*inptr)++; + u2 = (unsigned char)*(*inptr)++; return (u1 | (u2 << 8)); } @@ -110,7 +109,6 @@ */ static void get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) { - unsigned char **in = (unsigned char **) inptr; unsigned char uc; unicode unichar; int inseq = 0; @@ -126,14 +124,14 @@ exit(EX_DATAERR); } if (utf8) { - uc = *(*in)++; + uc = *(*inptr)++; if (uc == PSF2_SEPARATOR) break; if (uc == PSF2_STARTSEQ) { inseq = 1; continue; } - --(*in); + --(*inptr); unichar = assemble_utf8(inptr, *endptr - *inptr); } else { unichar = assemble_ucs2(inptr, *endptr - *inptr);