From 433ab4e97181d886812231de754db37d3ff933c7 Mon Sep 17 00:00:00 2001 From: mogami Date: Mon, 20 Oct 2003 12:54:03 +0000 Subject: [PATCH] =?utf8?q?inkey=5Fspecial()=E3=81=A7=E3=83=86=E3=83=B3?= =?utf8?q?=E3=82=AD=E3=83=BC=E3=81=AF=E7=89=B9=E5=88=A5=E6=89=B1=E3=81=84?= =?utf8?q?=E3=81=97=E3=81=AA=E3=81=84(=E6=95=B0=E5=80=A4=E5=85=A5=E5=8A=9B?= =?utf8?q?=E3=81=A7=E5=9B=BA=E5=AE=9A=E3=81=99=E3=82=8B)=E3=82=88=E3=81=86?= =?utf8?q?=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/autopick.c | 4 ++-- src/birth.c | 2 +- src/cmd4.c | 2 +- src/externs.h | 2 +- src/files.c | 2 +- src/util.c | 40 ++-------------------------------------- 6 files changed, 8 insertions(+), 44 deletions(-) diff --git a/src/autopick.c b/src/autopick.c index 38c63bc1d..f41d43414 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -3156,7 +3156,7 @@ static byte get_string_for_search(object_type **o_handle, cptr *search_strp) Term_gotoxy(col + pos, 0); /* Get a special key code */ - skey = inkey_special(FALSE); + skey = inkey_special(); /* Analyze the key */ switch (skey) @@ -5676,7 +5676,7 @@ void do_cmd_edit_autopick(void) tb->old_hgt = tb->hgt; /* Get a command */ - key = inkey_special(TRUE); + key = inkey_special(); /* Special keys */ if (key & SKEY_MASK) diff --git a/src/birth.c b/src/birth.c index aeee479c4..a3829f9da 100644 --- a/src/birth.c +++ b/src/birth.c @@ -5412,7 +5412,7 @@ static void edit_history(void) Term_gotoxy(x + 10, y + 12); /* Get special key code */ - skey = inkey_special(TRUE); + skey = inkey_special(); /* Get a character code */ if (!(skey & SKEY_MASK)) c = (char)skey; diff --git a/src/cmd4.c b/src/cmd4.c index c4b4c75d6..a529d9075 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -1382,7 +1382,7 @@ void do_cmd_messages(int num_now) /* Get a command */ - skey = inkey_special(TRUE); + skey = inkey_special(); /* Exit on Escape */ if (skey == ESCAPE) break; diff --git a/src/externs.h b/src/externs.h index f3e5d8320..5f95b99ae 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1228,7 +1228,7 @@ extern void build_gamma_table(int gamma); extern size_t my_strcpy(char *buf, const char *src, size_t bufsize); extern size_t my_strcat(char *buf, const char *src, size_t bufsize); -extern int inkey_special(bool use_numkey_as_special); +extern int inkey_special(void); /* xtra1.c */ diff --git a/src/files.c b/src/files.c index e8ee38747..f9124d132 100644 --- a/src/files.c +++ b/src/files.c @@ -5315,7 +5315,7 @@ prt("[ } /* Get a special key code */ - skey = inkey_special(TRUE); + skey = inkey_special(); /* Show the help for the help */ if (skey == '?') diff --git a/src/util.c b/src/util.c index d1107f6f7..ae58ec462 100644 --- a/src/util.c +++ b/src/util.c @@ -3194,7 +3194,7 @@ bool askfor_aux(char *buf, int len) Term_gotoxy(x + pos, y); /* Get a special key code */ - skey = inkey_special(FALSE); + skey = inkey_special(); /* Analyze the key */ switch (skey) @@ -5223,7 +5223,7 @@ size_t my_strcat(char *buf, const char *src, size_t bufsize) * This function is a Mega-Hack and depend on pref-xxx.prf's. * Currently works on Linux(UNIX), Windows, and Macintosh only. */ -int inkey_special(bool use_numkey_as_special) +int inkey_special(void) { static const struct { cptr keyname; @@ -5246,29 +5246,6 @@ int inkey_special(bool use_numkey_as_special) {"Page_Down]", SKEY_PGDOWN}, {"Home]", SKEY_TOP}, {"End]", SKEY_BOTTOM}, - {"KP_Down]", SKEY_DOWN}, - {"KP_Left]", SKEY_LEFT}, - {"KP_Right]", SKEY_RIGHT}, - {"KP_Up]", SKEY_UP}, - {"KP_Page_Up]", SKEY_PGUP}, - {"KP_Page_Down]", SKEY_PGDOWN}, - {"KP_Home]", SKEY_TOP}, - {"KP_End]", SKEY_BOTTOM}, - {NULL, 0}, - }; - - static const struct { - cptr keyname; - int keycode; - } numkey_list[] = { - {"KP_2]", SKEY_DOWN}, - {"KP_4]", SKEY_LEFT}, - {"KP_6]", SKEY_RIGHT}, - {"KP_8]", SKEY_UP}, - {"KP_9]", SKEY_PGUP}, - {"KP_3]", SKEY_PGDOWN}, - {"KP_7]", SKEY_TOP}, - {"KP_1]", SKEY_BOTTOM}, {NULL, 0}, }; char buf[1024]; @@ -5346,19 +5323,6 @@ int inkey_special(bool use_numkey_as_special) } } - if (!skey && use_numkey_as_special) - { - /* Get a numkey code */ - for (i = 0; numkey_list[i].keyname; i++) - { - if (streq(str, numkey_list[i].keyname)) - { - skey = numkey_list[i].keycode; - break; - } - } - } - /* No special key found? */ if (!skey) { -- 2.11.0