From ca91822bb6d9b15ffb9bfb6bc9c7d66cc59fbe03 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Mon, 11 Nov 2002 15:22:37 +0000 Subject: [w3m-dev 03407] char GlobalKeymap -> unsigned char GlobalKeymap * fm.h (GlobalKeymap): char->unsigned char (EscKeymap): ditto (EscBKeymap): ditto (EscDKeymap): ditto (PcKeymap): ditto * keybind.c: ditto * keybind_lynx.c: ditto From: Hironori SAKAMOTO --- ChangeLog | 13 ++++++++++++- fm.h | 12 ++++++------ keybind.c | 12 ++++++------ keybind_lynx.c | 10 +++++----- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 233d152..f83cb2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2002-11-12 Hironori SAKAMOTO + + * [w3m-dev 03407] char GlobalKeymap -> unsigned char GlobalKeymap + * fm.h (GlobalKeymap): char->unsigned char + (EscKeymap): ditto + (EscBKeymap): ditto + (EscDKeymap): ditto + (PcKeymap): ditto + * keybind.c: ditto + * keybind_lynx.c: ditto + 2002-11-12 Hironori SAKAMOTO * [w3m-dev 03406] @@ -4505,4 +4516,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.495 2002/11/11 15:19:49 ukai Exp $ +$Id: ChangeLog,v 1.496 2002/11/11 15:22:37 ukai Exp $ diff --git a/fm.h b/fm.h index 0bf6bde..cf70343 100644 --- a/fm.h +++ b/fm.h @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.73 2002/11/08 16:01:20 ukai Exp $ */ +/* $Id: fm.h,v 1.74 2002/11/11 15:22:39 ukai Exp $ */ /* * w3m: WWW wo Miru utility * @@ -735,12 +735,12 @@ global char MetaRefresh init(FALSE); global char fmInitialized init(FALSE); global char QuietMessage init(FALSE); -extern char GlobalKeymap[]; -extern char EscKeymap[]; -extern char EscBKeymap[]; -extern char EscDKeymap[]; +extern unsigned char GlobalKeymap[]; +extern unsigned char EscKeymap[]; +extern unsigned char EscBKeymap[]; +extern unsigned char EscDKeymap[]; #ifdef __EMX__ -extern char PcKeymap[]; +extern unsigned char PcKeymap[]; #endif extern FuncList w3mFuncList[]; diff --git a/keybind.c b/keybind.c index 651ae09..275dd8d 100644 --- a/keybind.c +++ b/keybind.c @@ -1,7 +1,7 @@ -/* $Id: keybind.c,v 1.7 2002/09/05 15:43:21 ukai Exp $ */ +/* $Id: keybind.c,v 1.8 2002/11/11 15:22:40 ukai Exp $ */ #include "funcname2.h" -char GlobalKeymap[128] = { +unsigned char GlobalKeymap[128] = { /* C-@ C-a C-b C-c C-d C-e C-f C-g */ #ifdef __EMX__ pcmap, linbeg, movL, nulcmd, nulcmd, linend, movR, curlno, @@ -40,7 +40,7 @@ char GlobalKeymap[128] = { nulcmd, nulcmd, ctrCsrV, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, }; -char EscKeymap[128] = { +unsigned char EscKeymap[128] = { /* C-@ C-a C-b C-c C-d C-e C-f C-g */ nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, /* C-h C-i C-j C-k C-l C-m C-n C-o */ @@ -75,7 +75,7 @@ char EscKeymap[128] = { nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, }; -char EscBKeymap[128] = { +unsigned char EscBKeymap[128] = { /* C-@ C-a C-b C-c C-d C-e C-f C-g */ nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, /* C-h C-i C-j C-k C-l C-m C-n C-o */ @@ -110,7 +110,7 @@ char EscBKeymap[128] = { nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, }; -char EscDKeymap[128] = { +unsigned char EscDKeymap[128] = { /* 0 1 INS 3 4 PgUp, PgDn 7 */ nulcmd, goLineF, mainMn, nulcmd, goLineL, pgBack, pgFore, nulcmd, /* 8 9 10 F1 F2 F3 F4 F5 */ @@ -137,7 +137,7 @@ char EscDKeymap[128] = { }; #ifdef __EMX__ -char PcKeymap[256] = { +unsigned char PcKeymap[256] = { // Null nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, // 0 // S-Tab diff --git a/keybind_lynx.c b/keybind_lynx.c index 8e8bc4e..f76b171 100644 --- a/keybind_lynx.c +++ b/keybind_lynx.c @@ -1,4 +1,4 @@ -/* $Id: keybind_lynx.c,v 1.5 2002/01/23 17:19:47 ukai Exp $ */ +/* $Id: keybind_lynx.c,v 1.6 2002/11/11 15:22:40 ukai Exp $ */ /* * Lynx-like key binding. * @@ -13,7 +13,7 @@ #include "funcname2.h" -char GlobalKeymap[128] = { +unsigned char GlobalKeymap[128] = { /* C-@ C-a C-b C-c C-d C-e C-f C-g */ _mark, goLineF, backBf, nulcmd, nulcmd, goLineL, followA, curlno, /* C-h C-i C-j C-k C-l C-m C-n C-o */ @@ -48,7 +48,7 @@ char GlobalKeymap[128] = { nulcmd, nulcmd, ctrCsrV, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, }; -char EscKeymap[128] = { +unsigned char EscKeymap[128] = { /* C-@ C-a C-b C-c C-d C-e C-f C-g */ nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, /* C-h C-i C-j C-k C-l C-m C-n C-o */ @@ -83,7 +83,7 @@ char EscKeymap[128] = { nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, }; -char EscBKeymap[128] = { +unsigned char EscBKeymap[128] = { /* C-@ C-a C-b C-c C-d C-e C-f C-g */ nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, /* C-h C-i C-j C-k C-l C-m C-n C-o */ @@ -118,7 +118,7 @@ char EscBKeymap[128] = { nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, }; -char EscDKeymap[128] = { +unsigned char EscDKeymap[128] = { /* 0 1 INS 3 4 PgUp, PgDn 7 */ nulcmd, goLineF, mainMn, nulcmd, goLineL, pgBack, pgFore, nulcmd, /* 8 9 10 F1 F2 F3 F4 F5 */ -- cgit v1.2.3