number_pad:3,4,-1 (trunk only)
[See the cvs log from flag.h for comments pertaining to iflags.num_pad and Cmd.num_pad, Cmd.commands[], Cmd.serialno.]
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// SCCS Id: @(#)qt_win.cpp 3.5 1999/11/19
|
||||
// SCCS Id: @(#)qt_win.cpp 3.5 2005/11/19
|
||||
// Copyright (c) Warwick Allison, 1999.
|
||||
// NetHack may be freely redistributed. See license for details.
|
||||
|
||||
@@ -3995,7 +3995,7 @@ void NetHackQtMainWindow::keyPressEvent(QKeyEvent* event)
|
||||
event->key() >= Key_Left && event->key() <= Key_Down )
|
||||
return;
|
||||
|
||||
const char* d = iflags.num_pad ? ndir : sdir;
|
||||
const char* d = Cmd.dirchars;
|
||||
switch (event->key()) {
|
||||
case Key_Up:
|
||||
if ( dirkey == d[0] )
|
||||
@@ -4141,7 +4141,7 @@ char NetHackQtYnDialog::Exec()
|
||||
}
|
||||
if ( strstr(question, "what direction") ) {
|
||||
// We replace this regardless, since sometimes you get choices.
|
||||
const char* d = iflags.num_pad ? ndir : sdir;
|
||||
const char* d = Cmd.dirchars;
|
||||
enable=ch;
|
||||
ch="";
|
||||
ch.append(d[1]);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* SCCS Id: @(#)gnsignal.c 3.5 2000/07/16 */
|
||||
/* SCCS Id: @(#)gnsignal.c 3.5 2005/11/19 */
|
||||
/* Copyright (C) 1998 by Anthony Taylor <tonyt@ptialaska.net> */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -268,24 +268,24 @@ ghack_handle_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
|
||||
/* First handle the arrow keys -- these always mean move */
|
||||
case GDK_Right:
|
||||
case GDK_rightarrow:
|
||||
if (iflags.num_pad) key='6'; else key='l'; break;
|
||||
key = Cmd.move_E; break;
|
||||
case GDK_Left:
|
||||
case GDK_leftarrow:
|
||||
if (iflags.num_pad) key='4'; else key='h'; break;
|
||||
key = Cmd.move_W; break;
|
||||
case GDK_Up:
|
||||
case GDK_uparrow:
|
||||
if (iflags.num_pad) key='8'; else key='k'; break;
|
||||
key = Cmd.move_N; break;
|
||||
case GDK_Down:
|
||||
case GDK_downarrow:
|
||||
if (iflags.num_pad) key='2'; else key='j'; break;
|
||||
key = Cmd.move_S; break;
|
||||
case GDK_Home:
|
||||
if (iflags.num_pad) key='7'; else key='y'; break;
|
||||
key = Cmd.move_NW; break;
|
||||
case GDK_End:
|
||||
if (iflags.num_pad) key='1'; else key='b'; break;
|
||||
key = Cmd.move_SW; break;
|
||||
case GDK_Page_Down:
|
||||
if (iflags.num_pad) key='3'; else key='n'; break;
|
||||
key = Cmd.move_SE; break;
|
||||
case GDK_Page_Up:
|
||||
if (iflags.num_pad) key='9'; else key='u'; break;
|
||||
key = Cmd.move_NE; break;
|
||||
case ' ': key='.'; break;
|
||||
|
||||
/* Now, handle the numberpad (move or numbers) */
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* SCCS Id: @(#)termcap.c 3.5 2000/07/10 */
|
||||
/* SCCS Id: @(#)termcap.c 3.5 2005/11/19 */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -465,7 +465,7 @@ tty_start_screen()
|
||||
/* set up callback in case option is not set yet but toggled later */
|
||||
decgraphics_mode_callback = tty_decgraphics_termcap_fixup;
|
||||
#endif
|
||||
if (iflags.num_pad) tty_number_pad(1); /* make keypad send digits */
|
||||
if (Cmd.num_pad) tty_number_pad(1); /* make keypad send digits */
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Reference in New Issue
Block a user