Browse code

format chr2img.c, weirdly

Sigrid Solveig Haflínudóttir authored on 23/06/2021 15:33:14
Showing 2 changed files
... ...
@@ -12,6 +12,7 @@ clang-format -i src/devices/mpu.c
12 12
 clang-format -i src/uxnasm.c
13 13
 clang-format -i src/uxnemu.c
14 14
 clang-format -i src/uxncli.c
15
+clang-format -i src/chr2img.c
15 16
 
16 17
 echo "Cleaning.."
17 18
 rm -f ./bin/uxnasm
... ...
@@ -13,36 +13,44 @@ typedef uint8_t u8int;
13 13
 typedef uint32_t u32int;
14 14
 #define nil NULL
15 15
 typedef struct {
16
-}Memimage;
16
+} Memimage;
17 17
 typedef struct {
18 18
 	u32int *base;
19 19
 	u8int *bdata;
20
-}Memdata;
20
+} Memdata;
21 21
 static char *argv0;
22 22
 #define fprint(x, arg...) fprintf(stderr, arg)
23 23
 #define exits(s) exit(s == NULL ? 0 : 1)
24
-#define sysfatal(s) do{ fprintf(stderr, "error\n"); exit(1); }while(0)
25
-#define	ARGBEGIN \
26
-	for(((argv0=*argv)),argv++,argc--; \
27
-		argv[0] && argv[0][0]=='-' && argv[0][1]; \
28
-		argc--, argv++){ \
29
-			char *_args, _argc, *_argt; \
30
-			_args = &argv[0][1]; \
31
-			if(_args[0]=='-' && _args[1]==0){ \
32
-				argc--; argv++; break; \
33
-			} \
34
-			_argc = 0; \
35
-			while(*_args && (_argc = *_args++)) \
24
+#define sysfatal(s) \
25
+	do { \
26
+		fprintf(stderr, "error\n"); \
27
+		exit(1); \
28
+	} while(0)
29
+#define ARGBEGIN \
30
+	for(((argv0 = *argv)), argv++, argc--; \
31
+		argv[0] && argv[0][0] == '-' && argv[0][1]; \
32
+		argc--, argv++) { \
33
+		char *_args, _argc, *_argt; \
34
+		_args = &argv[0][1]; \
35
+		if(_args[0] == '-' && _args[1] == 0) { \
36
+			argc--; \
37
+			argv++; \
38
+			break; \
39
+		} \
40
+		_argc = 0; \
41
+		while(*_args && (_argc = *_args++)) \
36 42
 			switch(_argc)
37
-#define	ARGEND };
38
-#define	EARGF(x)\
39
-	(_argt=_args, _args="",\
40
-				(*_argt? _argt: argv[1]? (argc--, *++argv): ((x), abort(), (char*)0)))
43
+#define ARGEND \
44
+	} \
45
+	;
46
+#define EARGF(x) \
47
+	(_argt = _args, _args = "", (*_argt ? _argt : argv[1] ? (argc--, *++argv) \
48
+														  : ((x), abort(), (char *)0)))
41 49
 #endif
42 50
 
43 51
 static int hor = 44, ver = 26, bpp = 1;
44 52
 
45
-#define xy2n(x, y) ((y & 7) + (x/8 + y/8 * hor)*bpp*8)
53
+#define xy2n(x, y) ((y & 7) + (x / 8 + y / 8 * hor) * bpp * 8)
46 54
 
47 55
 static u8int *
48 56
 readall(int f, int *isz)
... ...
@@ -52,15 +60,15 @@ readall(int f, int *isz)
52 60
 
53 61
 	bufsz = 1023;
54 62
 	s = nil;
55
-	for(sz = 0;; sz += n){
56
-		if(bufsz-sz < 1024){
63
+	for(sz = 0;; sz += n) {
64
+		if(bufsz - sz < 1024) {
57 65
 			bufsz *= 2;
58 66
 			s = realloc(s, bufsz);
59 67
 		}
60
-		if((n = read(f, s+sz, bufsz-sz)) < 1)
68
+		if((n = read(f, s + sz, bufsz - sz)) < 1)
61 69
 			break;
62 70
 	}
63
-	if(n < 0 || sz < 1){
71
+	if(n < 0 || sz < 1) {
64 72
 		free(s);
65 73
 		return nil;
66 74
 	}
... ...
@@ -75,15 +83,16 @@ getcoli(int x, int y, u8int *p)
75 83
 	int ch1, ch2, r;
76 84
 
77 85
 	r = xy2n(x, y);
78
-	ch1 = (p[r+0] >> (7 - (x & 7))) & 1;
79
-	ch2 = bpp < 2 ? 0 : (p[r+8] >> (7 - (x & 7))) & 1;
86
+	ch1 = (p[r + 0] >> (7 - (x & 7))) & 1;
87
+	ch2 = bpp < 2 ? 0 : (p[r + 8] >> (7 - (x & 7))) & 1;
80 88
 
81
-	return ch2<<1 | ch1;
89
+	return ch2 << 1 | ch1;
82 90
 }
83 91
 
84 92
 static int
85 93
 writebmp(int w, int h, u32int *p)
86 94
 {
95
+	/* clang-format off */
87 96
 	u8int hd[14+40+4*4] = {
88 97
 		'B', 'M',
89 98
 		0, 0, 0, 0, /* file size */
... ...
@@ -107,16 +116,17 @@ writebmp(int w, int h, u32int *p)
107 116
 		0xff, 0, 0, 0,
108 117
 	};
109 118
 	int sz;
119
+	/* clang-format on */
110 120
 
111
-	sz = 14+40+4*4 + 4*w*h;
121
+	sz = 14 + 40 + 4 * 4 + 4 * w * h;
112 122
 	hd[2] = sz;
113
-	hd[3] = sz>>8;
114
-	hd[4] = sz>>16;
115
-	hd[5] = sz>>24;
123
+	hd[3] = sz >> 8;
124
+	hd[4] = sz >> 16;
125
+	hd[5] = sz >> 24;
116 126
 
117 127
 	write(1, hd, sizeof(hd));
118 128
 	while(h-- >= 0)
119
-		write(1, p+w*h, 4*w);
129
+		write(1, p + w * h, 4 * w);
120 130
 
121 131
 	return 0;
122 132
 }
... ...
@@ -140,7 +150,8 @@ main(int argc, char **argv)
140 150
 		{0xffffff00, 0xffffffff, 0x72dec2ff, 0x666666ff},
141 151
 	};
142 152
 
143
-	ARGBEGIN{
153
+	ARGBEGIN
154
+	{
144 155
 	case '1':
145 156
 		bpp = 1;
146 157
 		break;
... ...
@@ -152,26 +163,27 @@ main(int argc, char **argv)
152 163
 		break;
153 164
 	default:
154 165
 		usage();
155
-	}ARGEND
166
+	}
167
+	ARGEND
156 168
 
157 169
 	if((p = readall(0, &sz)) == nil)
158 170
 		sysfatal("%r");
159 171
 
160
-	ver = sz / (bpp*8) / hor;
161
-	esz = (hor * ver * (bpp*8));
162
-	w = hor*8;
163
-	h = ver*8;
172
+	ver = sz / (bpp * 8) / hor;
173
+	esz = (hor * ver * (bpp * 8));
174
+	w = hor * 8;
175
+	h = ver * 8;
164 176
 	if(sz != esz)
165 177
 		fprint(2, "warning: size differs (%d vs %d), dimensions must be wrong\n", sz, esz);
166 178
 
167 179
 	memset(&d, 0, sizeof(d));
168
-	if((d.base = malloc(4*w*h)) == nil)
180
+	if((d.base = malloc(4 * w * h)) == nil)
169 181
 		sysfatal("memory");
170
-	d.bdata = (u8int*)d.base;
182
+	d.bdata = (u8int *)d.base;
171 183
 
172
-	for(y = 0; y < h; y++){
184
+	for(y = 0; y < h; y++) {
173 185
 		for(x = 0; x < w; x++)
174
-			d.base[y*w + x] = col[bpp-1][getcoli(x, y, p)];
186
+			d.base[y * w + x] = col[bpp - 1][getcoli(x, y, p)];
175 187
 	}
176 188
 
177 189
 #ifdef __plan9__