From 111faa2a586338771d8193bcc9f4f109f9ba8adf Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <netris@shiar.org>
Date: Sun, 11 Mar 2007 15:52:25 +0100
Subject: [PATCH] code cosmetics: use hex notation where applicable

---
 curses.c | 62 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/curses.c b/curses.c
index 4571bc2..d24a110 100644
--- a/curses.c
+++ b/curses.c
@@ -407,39 +407,39 @@ static void block_draw_2(int y, int x, unsigned char type)
 		}
 #endif
 		switch (Sets.drawstyle) {
-		case 2:
-			switch (type & 192) {
-			case 64:  //right neighbour
+		case 2: // ascii horizontally grouped
+			switch (type & 0xC0) {
+			case 0x40:  // right neighbour
 				addstr("[["); break;
-			case 128: //left
+			case 0x80: // left
 				addstr("]]"); break;
-			default:  //both/none
+			default:  // both/none
 				addstr("[]"); break;
-			} //horizontal stickiness
-			break; //ascii horizontally grouped
-		case 3:
-			switch (type & 240) {
-			case  16: addch(ACS_ULCORNER); addch(ACS_URCORNER); break;//top end
-			case  32: addch(ACS_LLCORNER); addch(ACS_LRCORNER); break;//bottom end
-			case  48: addch(ACS_VLINE); addch(ACS_VLINE); break;	//vertical middle
-			case  64: addch('['); addch(ACS_HLINE); break;		//left end
-			case  80: addch(ACS_ULCORNER); addch(ACS_TTEE); break;	//top left corner
-			case  96: addch(ACS_LLCORNER); addch(ACS_BTEE); break;	//bottom left corner
-			case 112: addch(ACS_LTEE); addch(ACS_PLUS); break;	//vertical+right
-			case 128: addch(ACS_HLINE); addch(']'); break;		//right end
-			case 144: addch(ACS_TTEE); addch(ACS_URCORNER); break;	//top right corner
-			case 160: addch(ACS_BTEE); addch(ACS_LRCORNER); break;	//bottom right corner
-			case 176: addch(ACS_PLUS); addch(ACS_RTEE); break;	//vertical+left
-			case 192: addch(ACS_HLINE); addch(ACS_HLINE); break;	//horizontal middle
-			case 208: addch(ACS_TTEE); addch(ACS_TTEE); break;	//horizontal+down
-			case 224: addch(ACS_BTEE); addch(ACS_BTEE); break;	//horizontal+up
-			default:  addstr("[]"); break;
-			} //neighbours
-			break; //curses grouped
-		default:
+			} // horizontal stickiness
+			break;
+		case 3: // curses grouped
+			switch (type & 0xF0) {
+			case 0x10: addch(ACS_ULCORNER); addch(ACS_URCORNER); break; // top end
+			case 0x20: addch(ACS_LLCORNER); addch(ACS_LRCORNER); break; // bottom end
+			case 0x30: addch(ACS_VLINE);    addch(ACS_VLINE);    break; // vertical middle
+			case 0x40: addch('[');          addch(ACS_HLINE);    break; // left end
+			case 0x50: addch(ACS_ULCORNER); addch(ACS_TTEE);     break; // top left corner
+			case 0x60: addch(ACS_LLCORNER); addch(ACS_BTEE);     break; // bottom left corner
+			case 0x70: addch(ACS_LTEE);     addch(ACS_PLUS);     break; // vertical+right
+			case 0x80: addch(ACS_HLINE);    addch(']');          break; // right end
+			case 0x90: addch(ACS_TTEE);     addch(ACS_URCORNER); break; // top right corner
+			case 0xA0: addch(ACS_BTEE);     addch(ACS_LRCORNER); break; // bottom right corner
+			case 0xB0: addch(ACS_PLUS);     addch(ACS_RTEE);     break; // vertical+left
+			case 0xC0: addch(ACS_HLINE);    addch(ACS_HLINE);    break; // horizontal middle
+			case 0xD0: addch(ACS_TTEE);     addch(ACS_TTEE);     break; // horizontal+down
+			case 0xE0: addch(ACS_BTEE);     addch(ACS_BTEE);     break; // horizontal+up
+			default:   addstr("[]");                             break; // all/none
+			} // neighbours
+			break;
+		default: // non-grouped
 			addstr("[]");
-			break; //ascii non-grouped
-		} //draw block
+			break;
+		}
 #ifdef HAVE_NCURSES
 		if (Sets.standout) standend();
 #endif
@@ -457,9 +457,9 @@ static void block_draw_1(int y, int x, unsigned char type)
 			attrset(haveColor ? COLOR_PAIR(type & 15) : A_REVERSE);
 		}
 #endif
-		if ((type & 192) == 64)
+		if ((type & 0xC0) == 0x40)
 			addch('[');
-		else if ((type & 192) == 128)
+		else if ((type & 0xC0) == 0x80)
 			addch(']');
 		else
 			addch('|');
-- 
2.30.0