30b557f7d5
One of the drivers of this change was that screen coordinates require a
type that can hold values greater than 127. Parameters to the window
port routines require a large type in order to be able to have values
a fair bit larger than COLNO and ROWNO passed to them, particularly for
their use to the right of the map window.
This splits the uses of xchar into 3 different situations, and adjusts
their type and size:
xchar
|
-----------------------
| | |
coordxy xint16 xint8
coordxy: Actual x or y coordinates for various things (moved to 16-bits).
xint16: Same data size as coordxy, but for non-coordinate use (16-bits).
xint8: There are only a few use cases initially, where it was very
plain to see that the variable could remain as 8-bits, rather
than be bumped to 16-bits. There are probably more such cases
that could be changed after additional review.
Note: This first changed all xchar variables to coordxy. Some were
reviewed and got changed to xint16 or xint8 when it became apparent that
their usage was not for coordinates.
This increments EDITLEVEL in patchlevel.h
79 lines
1.9 KiB
C
79 lines
1.9 KiB
C
/* NetHack 3.7 mhmsg.h $NHDT-Date: 1596498356 2020/08/03 23:45:56 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.21 $ */
|
|
/* Copyright (C) 2001 by Alex Kompel */
|
|
/* NetHack may be freely redistributed. See license for details. */
|
|
|
|
#ifndef MHNethackMessages_H
|
|
#define MHNethackMessages_H
|
|
|
|
/* nethack messages */
|
|
#define WM_MSNH_COMMAND (WM_APP + 1)
|
|
|
|
#define MSNH_MSG_ADDWND 100
|
|
#define MSNH_MSG_PUTSTR 101
|
|
#define MSNH_MSG_PRINT_GLYPH 102
|
|
#define MSNH_MSG_CLEAR_WINDOW 103
|
|
#define MSNH_MSG_CLIPAROUND 104
|
|
#define MSNH_MSG_STARTMENU 105
|
|
#define MSNH_MSG_ADDMENU 106
|
|
#define MSNH_MSG_CURSOR 107
|
|
#define MSNH_MSG_ENDMENU 108
|
|
#define MSNH_MSG_DIED 109
|
|
#define MSNH_MSG_CARET 110
|
|
#define MSNH_MSG_GETTEXT 111
|
|
#define MSNH_MSG_UPDATE_STATUS 112
|
|
#define MSNH_MSG_RANDOM_INPUT 113
|
|
|
|
typedef struct mswin_nhmsg_add_wnd {
|
|
winid wid;
|
|
} MSNHMsgAddWnd, *PMSNHMsgAddWnd;
|
|
|
|
typedef struct mswin_nhmsg_putstr {
|
|
int attr;
|
|
const char *text;
|
|
int append;
|
|
} MSNHMsgPutstr, *PMSNHMsgPutstr;
|
|
|
|
typedef struct mswin_nhmsg_print_glyph {
|
|
coordxy x;
|
|
coordxy y;
|
|
glyph_info glyphinfo;
|
|
glyph_info bkglyphinfo;
|
|
} MSNHMsgPrintGlyph, *PMSNHMsgPrintGlyph;
|
|
|
|
typedef struct mswin_nhmsg_cliparound {
|
|
int x;
|
|
int y;
|
|
} MSNHMsgClipAround, *PMSNHMsgClipAround;
|
|
|
|
typedef struct mswin_nhmsg_add_menu {
|
|
glyph_info glyphinfo;
|
|
const ANY_P *identifier;
|
|
char accelerator;
|
|
char group_accel;
|
|
int attr;
|
|
int clr;
|
|
const char *str;
|
|
boolean presel;
|
|
unsigned int itemflags;
|
|
} MSNHMsgAddMenu, *PMSNHMsgAddMenu;
|
|
|
|
typedef struct mswin_nhmsg_cursor {
|
|
int x;
|
|
int y;
|
|
} MSNHMsgCursor, *PMSNHMsgCursor;
|
|
|
|
typedef struct mswin_nhmsg_end_menu {
|
|
const char *text;
|
|
} MSNHMsgEndMenu, *PMSNHMsgEndMenu;
|
|
|
|
typedef struct mswin_nhmsg_get_text {
|
|
size_t max_size;
|
|
char buffer[TEXT_BUFFER_SIZE];
|
|
} MSNHMsgGetText, *PMSNHMsgGetText;
|
|
|
|
typedef struct mswin_nhmsg_update_status {
|
|
struct mswin_status_lines * status_lines;
|
|
} MSNHMsgUpdateStatus, *PMSNHMsgUpdateStatus;
|
|
|
|
#endif
|