rereformat winprocs.h

Overriding clang-format was justified, but the result was too wide. Make the lines less that 80 characters. Also, WC_PERM_INVENT and WC_PLAYER_SELECTION had comments cloned from the preceding line.
farmaazon · Aug 7, 2017 · 1e15fdc · 1e15fdc
1 parent 152ddf4
commit 1e15fdc
Showing 1 changed file with 51 additions and 53 deletions.
diff --git a/include/winprocs.h b/include/winprocs.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6	winprocs.h	$NHDT-Date: 1433806582 2015/06/08 23:36:22 $  $NHDT-Branch: master $:$NHDT-Revision: 1.36 $ */
+/* NetHack 3.6	winprocs.h	$NHDT-Date: 1502141230 2017/08/07 21:27:10 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.38 $ */
 /* Copyright (c) David Cohrs, 1992				  */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -13,8 +13,7 @@ struct window_procs {
                            * not start with '-'.  Names starting with
                            * '+' are reserved for processors. */
     unsigned long wincap; /* window port capability options supported */
-    unsigned long
-        wincap2; /* additional window port capability options supported */
+    unsigned long wincap2; /* additional window port capability options */
     void FDECL((*win_init_nhwindows), (int *, char **));
     void NDECL((*win_player_selection));
     void NDECL((*win_askname));
@@ -178,51 +177,51 @@ extern
  * Some day this might be better in its own wincap.h file.
  */
 /* 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   */
+#define WC_COLOR         0x00000001L /* 01 Port can display things in color  */
+#define WC_HILITE_PET    0x00000002L /* 02 supports hilite pet               */
+#define WC_ASCII_MAP     0x00000004L /* 03 supports an ascii map             */
+#define WC_TILED_MAP     0x00000008L /* 04 supports a tiled map              */
+#define WC_PRELOAD_TILES 0x00000010L /* 05 supports pre-loading tiles        */
+#define WC_TILE_WIDTH    0x00000020L /* 06 prefer this width of tile         */
+#define WC_TILE_HEIGHT   0x00000040L /* 07 prefer this height of tile        */
+#define WC_TILE_FILE     0x00000080L /* 08 alternative tile file name        */
+#define WC_INVERSE       0x00000100L /* 09 Port supports inverse video       */
+#define WC_ALIGN_MESSAGE 0x00000200L /* 10 supports mesg alignment top|b|l|r */
+#define WC_ALIGN_STATUS  0x00000400L /* 11 supports status alignmt top|b|l|r */
+#define WC_VARY_MSGCOUNT 0x00000800L /* 12 supports varying message window   */
+#define WC_FONT_MAP      0x00001000L /* 13 supports spec of map window font  */
+#define WC_FONT_MESSAGE  0x00002000L /* 14 supports spec of message font     */
+#define WC_FONT_STATUS   0x00004000L /* 15 supports spec of status font      */
+#define WC_FONT_MENU     0x00008000L /* 16 supports spec of menu font        */
+#define WC_FONT_TEXT     0x00010000L /* 17 supports spec of text window font */
+#define WC_FONTSIZ_MAP   0x00020000L /* 18 supports spec of map font size    */
+#define WC_FONTSIZ_MESSAGE 0x040000L /* 19 supports spec of mesg font size   */
+#define WC_FONTSIZ_STATUS 0x0080000L /* 20 supports spec of status font size */
+#define WC_FONTSIZ_MENU  0x00100000L /* 21 supports spec of menu font size   */
+#define WC_FONTSIZ_TEXT  0x00200000L /* 22 supports spec of text font size   */
+#define WC_SCROLL_MARGIN 0x00400000L /* 23 supports setting map scroll marg  */
+#define WC_SPLASH_SCREEN 0x00800000L /* 24 supports display of splash screen */
+#define WC_POPUP_DIALOG  0x01000000L /* 25 supports queries in popup dialogs */
+#define WC_SCROLL_AMOUNT 0x02000000L /* 26 scroll this amount at scroll marg */
+#define WC_EIGHT_BIT_IN  0x04000000L /* 27 8-bit character input             */
+#define WC_PERM_INVENT   0x08000000L /* 28 supports persistent inventory win */
+#define WC_MAP_MODE      0x10000000L /* 29 map_mode option                   */
+#define WC_WINDOWCOLORS  0x20000000L /* 30 background color for mesg window  */
+#define WC_PLAYER_SELECTION 0x40000000L /* 31 supports player selection      */
 #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    0x0001L /* 01 display full screen             */
+#define WC2_SOFTKEYBOARD  0x0002L /* 02 software keyboard               */
+#define WC2_WRAPTEXT      0x0004L /* 03 wrap long lines of text         */
+#define WC2_HILITE_STATUS 0x0008L /* 04 hilite fields in status         */
+#define WC2_SELECTSAVED   0x0010L /* 05 saved game selection menu       */
+#define WC2_DARKGRAY      0x0020L /* 06 use bold black for black glyphs */
+                                  /* 26 free bits */
 
 #define ALIGN_LEFT   1
 #define ALIGN_RIGHT  2
@@ -248,13 +247,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_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_SOUND   0x0001L /* 01 Port has some sound capabilities     */
+#define WC_SND_SPEAKER 0x0002L /* 02 Sound supported via built-in speaker */
+#define WC_SND_STEREO  0x0004L /* 03 Stereo sound supported               */
+#define WC_SND_RAW     0x0008L /* 04 Raw sound supported                  */
+#define WC_SND_WAVE    0x0010L /* 05 Wave support                         */
+#define WC_SND_MIDI    0x0020L /* 06 Midi support                         */
+                               /* 26 free bits */
 #endif
 
 struct wc_Opt {
@@ -302,8 +301,7 @@ struct chain_procs {
                            * not start with '-'.  Names starting with
                            * '+' are reserved for processors. */
     unsigned long wincap; /* window port capability options supported */
-    unsigned long
-        wincap2; /* additional window port capability options supported */
+    unsigned long wincap2; /* additional window port capability options */
     void FDECL((*win_init_nhwindows), (CARGS, int *, char **));
     void FDECL((*win_player_selection), (CARGS));
     void FDECL((*win_askname), (CARGS));