From 735fed15b5a225dbf8670312acd7be350a20c1b8 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Thu, 26 Jan 1995 10:32:55 +0000 Subject: [PATCH] DOn't use hardcode values for L_FN & L_SCR --- sys/alpha/include/console.h | 8 +++++--- sys/i386/include/console.h | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/alpha/include/console.h b/sys/alpha/include/console.h index 17195ed395f0..faf6d986c24c 100644 --- a/sys/alpha/include/console.h +++ b/sys/alpha/include/console.h @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: console.h,v 1.15 1995/01/20 08:35:18 sos Exp $ + * $Id: console.h,v 1.16 1995/01/26 10:13:38 ache Exp $ */ #ifndef _CONSOLE_H_ @@ -161,6 +161,7 @@ struct keymap { #define MAXFK 16 #define NUM_FKEYS 65 +#define NUM_SCRNS 16 struct fkeytab { u_char str[MAXFK]; @@ -222,9 +223,7 @@ typedef struct ssaver ssaver_t; #define LCTR 0x09 /* left control key */ #define NEXT 0x0a /* switch to next screen */ #define F_SCR 0x0b /* switch to first screen */ -#define L_SCR 0x1a /* switch to last screen */ #define F_FN 0x1b /* first function key */ -#define L_FN 0x7a /* last function key */ #define RCTR 0x7b /* right control key */ #define RALT 0x7c /* right alt (altgr) key */ #define ALK 0x7d /* alt lock key */ @@ -235,7 +234,10 @@ typedef struct ssaver ssaver_t; #define SUSP 0x82 /* suspend power (APM BIOS) */ #define F(x) ((x)+F_FN-1) +#define L_FN F(NUM_FKEYS) /* last function key */ #define S(x) ((x)+F_SCR-1) +#define L_SCR S(NUM_SCRNS) /* switch to last screen */ + #define NOKEY 0x100 /* no key pressed marker */ #define FKEY 0x200 /* funtion key marker */ #define MKEY 0x400 /* meta key marker (prepend ESC)*/ diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h index 17195ed395f0..faf6d986c24c 100644 --- a/sys/i386/include/console.h +++ b/sys/i386/include/console.h @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: console.h,v 1.15 1995/01/20 08:35:18 sos Exp $ + * $Id: console.h,v 1.16 1995/01/26 10:13:38 ache Exp $ */ #ifndef _CONSOLE_H_ @@ -161,6 +161,7 @@ struct keymap { #define MAXFK 16 #define NUM_FKEYS 65 +#define NUM_SCRNS 16 struct fkeytab { u_char str[MAXFK]; @@ -222,9 +223,7 @@ typedef struct ssaver ssaver_t; #define LCTR 0x09 /* left control key */ #define NEXT 0x0a /* switch to next screen */ #define F_SCR 0x0b /* switch to first screen */ -#define L_SCR 0x1a /* switch to last screen */ #define F_FN 0x1b /* first function key */ -#define L_FN 0x7a /* last function key */ #define RCTR 0x7b /* right control key */ #define RALT 0x7c /* right alt (altgr) key */ #define ALK 0x7d /* alt lock key */ @@ -235,7 +234,10 @@ typedef struct ssaver ssaver_t; #define SUSP 0x82 /* suspend power (APM BIOS) */ #define F(x) ((x)+F_FN-1) +#define L_FN F(NUM_FKEYS) /* last function key */ #define S(x) ((x)+F_SCR-1) +#define L_SCR S(NUM_SCRNS) /* switch to last screen */ + #define NOKEY 0x100 /* no key pressed marker */ #define FKEY 0x200 /* funtion key marker */ #define MKEY 0x400 /* meta key marker (prepend ESC)*/