From: Pasi Kallinen Date: Sun, 6 Aug 2017 17:27:48 +0000 (+0300) Subject: Demangle clang formatted code X-Git-Tag: NetHack-3.6.1_RC01~432 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f671b962c14a98c6bd45a807d38ec233eb55eda;p=nethack Demangle clang formatted code --- diff --git a/include/winprocs.h b/include/winprocs.h index b76d9e1de..c12f2c5d5 100644 --- a/include/winprocs.h +++ b/include/winprocs.h @@ -177,91 +177,70 @@ extern * Window port preference capability bits. * Some day this might be better in its own wincap.h file. */ -#define WC_COLOR 0x01L /* 01 Port can display things in color */ -#define WC_HILITE_PET 0x02L /* 02 supports hilite pet */ -#define WC_ASCII_MAP 0x04L /* 03 supports an ascii map */ -#define WC_TILED_MAP 0x08L /* 04 supports a tiled map */ -#define WC_PRELOAD_TILES 0x10L /* 05 supports pre-loading tiles */ -#define WC_TILE_WIDTH 0x20L /* 06 prefer this width of tile */ -#define WC_TILE_HEIGHT 0x40L /* 07 prefer this height of tile */ -#define WC_TILE_FILE 0x80L /* 08 alternative tile file name */ -#define WC_INVERSE 0x100L /* 09 Port supports inverse video */ -#define WC_ALIGN_MESSAGE \ - 0x200L /* 10 supports message alignmt top|b|l|r */ -#define WC_ALIGN_STATUS 0x400L /* 11 supports status alignmt top|b|l|r */ -#define WC_VARY_MSGCOUNT \ - 0x800L /* 12 supports varying message window */ -#define WC_FONT_MAP 0x1000L /* 13 supports specification of map win font */ -#define WC_FONT_MESSAGE \ - 0x2000L /* 14 supports specification of msg win font */ -#define WC_FONT_STATUS 0x4000L /* 15 supports specification of sts win font \ - */ -#define WC_FONT_MENU 0x8000L /* 16 supports specification of mnu win font */ -#define WC_FONT_TEXT 0x10000L /* 17 supports specification of txt win font \ - */ -#define WC_FONTSIZ_MAP \ - 0x20000L /* 18 supports specification of map win font */ -#define WC_FONTSIZ_MESSAGE \ - 0x40000L /* 19 supports specification of msg win font */ -#define WC_FONTSIZ_STATUS \ - 0x80000L /* 20 supports specification of sts win font */ -#define WC_FONTSIZ_MENU \ - 0x100000L /* 21 supports specification of mnu win font */ -#define WC_FONTSIZ_TEXT \ - 0x200000L /* 22 supports specification of txt win font */ -#define WC_SCROLL_MARGIN \ - 0x400000L /* 23 supports setting scroll margin for map */ -#define WC_SPLASH_SCREEN \ - 0x800000L /* 24 supports display of splash screen */ -#define WC_POPUP_DIALOG \ - 0x1000000L /* 25 supports queries in pop dialogs */ -#define WC_SCROLL_AMOUNT \ - 0x2000000L /* 26 scroll this amount at scroll margin */ -#define WC_EIGHT_BIT_IN \ - 0x4000000L /* 27 8-bit character input */ -#define WC_PERM_INVENT \ - 0x8000000L /* 28 8-bit character input */ -#define WC_MAP_MODE \ - 0x10000000L /* 29 map_mode option */ -#define WC_WINDOWCOLORS \ - 0x20000000L /* 30 background color for message window */ -#define WC_PLAYER_SELECTION \ - 0x40000000L /* 31 background color for message window */ +/* clang-format off */ +#define WC_COLOR 0x01L /* 01 Port can display things in color */ +#define WC_HILITE_PET 0x02L /* 02 supports hilite pet */ +#define WC_ASCII_MAP 0x04L /* 03 supports an ascii map */ +#define WC_TILED_MAP 0x08L /* 04 supports a tiled map */ +#define WC_PRELOAD_TILES 0x10L /* 05 supports pre-loading tiles */ +#define WC_TILE_WIDTH 0x20L /* 06 prefer this width of tile */ +#define WC_TILE_HEIGHT 0x40L /* 07 prefer this height of tile */ +#define WC_TILE_FILE 0x80L /* 08 alternative tile file name */ +#define WC_INVERSE 0x100L /* 09 Port supports inverse video */ +#define WC_ALIGN_MESSAGE 0x200L /* 10 supports message alignmt top|b|l|r */ +#define WC_ALIGN_STATUS 0x400L /* 11 supports status alignmt top|b|l|r */ +#define WC_VARY_MSGCOUNT 0x800L /* 12 supports varying message window */ +#define WC_FONT_MAP 0x1000L /* 13 supports specification of map win font */ +#define WC_FONT_MESSAGE 0x2000L /* 14 supports specification of msg win font */ +#define WC_FONT_STATUS 0x4000L /* 15 supports specification of sts win font */ +#define WC_FONT_MENU 0x8000L /* 16 supports specification of mnu win font */ +#define WC_FONT_TEXT 0x10000L /* 17 supports specification of txt win font */ +#define WC_FONTSIZ_MAP 0x20000L /* 18 supports specification of map win font */ +#define WC_FONTSIZ_MESSAGE 0x40000L /* 19 supports specification of msg win font */ +#define WC_FONTSIZ_STATUS 0x80000L /* 20 supports specification of sts win font */ +#define WC_FONTSIZ_MENU 0x100000L /* 21 supports specification of mnu win font */ +#define WC_FONTSIZ_TEXT 0x200000L /* 22 supports specification of txt win font */ +#define WC_SCROLL_MARGIN 0x400000L /* 23 supports setting scroll margin for map */ +#define WC_SPLASH_SCREEN 0x800000L /* 24 supports display of splash screen */ +#define WC_POPUP_DIALOG 0x1000000L /* 25 supports queries in pop dialogs */ +#define WC_SCROLL_AMOUNT 0x2000000L /* 26 scroll this amount at scroll margin */ +#define WC_EIGHT_BIT_IN 0x4000000L /* 27 8-bit character input */ +#define WC_PERM_INVENT 0x8000000L /* 28 8-bit character input */ +#define WC_MAP_MODE 0x10000000L /* 29 map_mode option */ +#define WC_WINDOWCOLORS 0x20000000L /* 30 background color for message window */ +#define WC_PLAYER_SELECTION 0x40000000L /* 31 background color for message window */ #ifdef NHSTDC -#define WC_MOUSE_SUPPORT \ - 0x80000000UL /* 32 mouse support */ +#define WC_MOUSE_SUPPORT 0x80000000UL /* 32 mouse support */ #else -#define WC_MOUSE_SUPPORT \ - 0x80000000L /* 32 mouse support */ +#define WC_MOUSE_SUPPORT 0x80000000L /* 32 mouse support */ #endif -/* no free bits */ + /* no free bits */ -#define WC2_FULLSCREEN 0x01L /* 01 display full screen */ -#define WC2_SOFTKEYBOARD 0x02L /* 02 software keyboard */ -#define WC2_WRAPTEXT 0x04L /* 03 wrap long lines of text */ -#define WC2_HILITE_STATUS \ - 0x08L /* 04 hilite fields in status */ -#define WC2_SELECTSAVED 0x10L /* 05 saved game selection menu */ -#define WC2_DARKGRAY 0x20L /* 06 use bold black for black glyphs */ - /* 26 free bits */ +#define WC2_FULLSCREEN 0x01L /* 01 display full screen */ +#define WC2_SOFTKEYBOARD 0x02L /* 02 software keyboard */ +#define WC2_WRAPTEXT 0x04L /* 03 wrap long lines of text */ +#define WC2_HILITE_STATUS 0x08L /* 04 hilite fields in status */ +#define WC2_SELECTSAVED 0x10L /* 05 saved game selection menu */ +#define WC2_DARKGRAY 0x20L /* 06 use bold black for black glyphs */ + /* 26 free bits */ -#define ALIGN_LEFT 1 -#define ALIGN_RIGHT 2 -#define ALIGN_TOP 3 +#define ALIGN_LEFT 1 +#define ALIGN_RIGHT 2 +#define ALIGN_TOP 3 #define ALIGN_BOTTOM 4 /* player_selection */ -#define VIA_DIALOG 0 +#define VIA_DIALOG 0 #define VIA_PROMPTS 1 /* map_mode settings - deprecated */ -#define MAP_MODE_TILES 0 -#define MAP_MODE_ASCII4x6 1 -#define MAP_MODE_ASCII6x8 2 -#define MAP_MODE_ASCII8x8 3 -#define MAP_MODE_ASCII16x8 4 -#define MAP_MODE_ASCII7x12 5 -#define MAP_MODE_ASCII8x12 6 +#define MAP_MODE_TILES 0 +#define MAP_MODE_ASCII4x6 1 +#define MAP_MODE_ASCII6x8 2 +#define MAP_MODE_ASCII8x8 3 +#define MAP_MODE_ASCII16x8 4 +#define MAP_MODE_ASCII7x12 5 +#define MAP_MODE_ASCII8x12 6 #define MAP_MODE_ASCII16x12 7 #define MAP_MODE_ASCII12x16 8 #define MAP_MODE_ASCII10x18 9 @@ -269,13 +248,13 @@ extern #define MAP_MODE_TILES_FIT_TO_SCREEN 11 #if 0 -#define WC_SND_SOUND 0x01L /* 01 Port has some sound capabilities */ +#define WC_SND_SOUND 0x01L /* 01 Port has some sound capabilities */ #define WC_SND_SPEAKER 0x02L /* 02 Sound supported via built-in speaker */ -#define WC_SND_STEREO 0x04L /* 03 Stereo sound supported */ -#define WC_SND_RAW 0x08L /* 04 Raw sound supported */ -#define WC_SND_WAVE 0x10L /* 05 Wave support */ -#define WC_SND_MIDI 0x20L /* 06 Midi support */ - /* 26 free bits */ +#define WC_SND_STEREO 0x04L /* 03 Stereo sound supported */ +#define WC_SND_RAW 0x08L /* 04 Raw sound supported */ +#define WC_SND_WAVE 0x10L /* 05 Wave support */ +#define WC_SND_MIDI 0x20L /* 06 Midi support */ + /* 26 free bits */ #endif struct wc_Opt { @@ -284,17 +263,17 @@ struct wc_Opt { }; /* role selection by player_selection(); this ought to be in the core... */ -#define RS_NAME 0 -#define RS_ROLE 1 -#define RS_RACE 2 -#define RS_GENDER 3 +#define RS_NAME 0 +#define RS_ROLE 1 +#define RS_RACE 2 +#define RS_GENDER 3 #define RS_ALGNMNT 4 -#define RS_filter 5 +#define RS_filter 5 #define RS_menu_arg(x) (ROLE_RANDOM - ((x) + 1)) /* 0..5 -> -3..-8 */ /* Choose_windows() may be called multiple times; these constants tell the * init function whether the window system is coming or going. */ -#define WININIT 0 +#define WININIT 0 #define WININIT_UNDO 1 #ifdef WINCHAIN @@ -310,7 +289,9 @@ struct wc_Opt { nextdata is the Xprivate* for the next link in the chain */ #define WINCHAIN_ALLOC 0 -#define WINCHAIN_INIT 1 +#define WINCHAIN_INIT 1 + +/* clang-format on */ #define CARGS void *