Changeset a35b458 in mainline for uspace/dist/src/c/demos/tetris/tetris.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/dist/src/c/demos/tetris/tetris.c (modified) (23 diffs)

uspace/dist/src/c/demos/tetris/tetris.c

@@ -98 +98 @@
         int i;
         cell *p = board;
-        
+
         for (i = B_SIZE; i; i--)
                 *p++ = (i <= (2 * B_COLS) || (i % B_COLS) < 2) ? 0x0000ff : 0x000000;
@@ -113 +113 @@
         int base;
         cell *p;
-        
+
         for (i = A_FIRST; i < A_LAST; i++) {
                 base = i * B_COLS + 1;
@@ -122 +122 @@
                                 rows++;
                                 memset(&board[base], 0, sizeof(cell) * (B_COLS - 2));
-                                
+
                                 scr_update();
                                 tsleep();
-                                
+
                                 while (--base != 0)
                                         board[base + B_COLS] = board[base];
-                                
+
                                 scr_update();
                                 tsleep();
-                                
+
                                 break;
                         }
                 }
         }
-        
+
         switch (rows) {
         case 1:
@@ -160 +160 @@
         int i;
         int j = rand() % 4;
-        
+
         for (i = 0; i < j; i++)
                 tmp = &shapes[classic ? tmp->rotc : tmp->rot];
-        
+
         return (tmp);
 }
@@ -170 +170 @@
 {
         struct timeval tv;
-        
+
         gettimeofday(&tv, NULL);
         srand(tv.tv_sec + tv.tv_usec / 100000);
@@ -180 +180 @@
         moveto(5, 10);
         puts("Tetris\n\n");
-        
+
         moveto(8, 10);
         printf("Level = %d (press keys 1 - 9 to change)", level);
@@ -202 +202 @@
         while (1) {
                 int i = getchar();
-                
+
                 switch(i) {
                         case 'p':
@@ -249 +249 @@
         int j;
         int ch;
-        
+
         console = console_init(stdin, stdout);
-        
+
         keys = "jkl pq";
-        
+
         classic = 0;
         showpreview = 1;
-        
+
         while ((ch = getopt(argc, argv, "ck:ps")) != -1)
                 switch(ch) {
@@ -280 +280 @@
                         usage();
                 }
-        
+
         argc -= optind;
         argv += optind;
-        
+
         if (argc)
                 usage();
-        
+
         for (i = 0; i <= 5; i++) {
                 for (j = i + 1; j <= 5; j++) {
@@ -292 +292 @@
                                 errx(1, "%s", "duplicate command keys specified.");
                 }
-                
+
                 if (keys[i] == ' ')
                         str_cpy(key_write[i], sizeof(key_write[i]), "<space>");
@@ -300 +300 @@
                 }
         }
-        
+
         snprintf(key_msg, sizeof(key_msg),
             "%s - left   %s - rotate   %s - right   %s - drop   %s - pause   %s - quit",
             key_write[0], key_write[1], key_write[2], key_write[3],
             key_write[4], key_write[5]);
-        
+
         scr_init();
         if (loadscores() != EOK)
@@ -312 +312 @@
         while (tetris_menu(&level)) {
                 fallrate = 1000000 / level;
-                
+
                 scr_clear();
                 setup_board();
-                
+
                 srandomdev();
                 scr_set();
-                
+
                 pos = A_FIRST * B_COLS + (B_COLS / 2) - 1;
                 nextshape = randshape();
                 curshape = randshape();
-                
+
                 scr_msg(key_msg, 1);
-                
+
                 while (1) {
                         place(curshape, pos, 1);
@@ -338 +338 @@
                                         continue;
                                 }
-                                
+
                                 /*
                                  * Put up the current shape `permanently',
@@ -346 +346 @@
                                 score++;
                                 elide();
-                                
+
                                 /*
                                  * Choose a new shape.  If it does not fit,
@@ -354 +354 @@
                                 nextshape = randshape();
                                 pos = A_FIRST * B_COLS + (B_COLS / 2) - 1;
-                                
+
                                 if (!fits_in(curshape, pos))
                                         break;
-                                
-                                continue;
-                        }
-                        
+
+                                continue;
+                        }
+
                         /*
                          * Handle command keys.
@@ -368 +368 @@
                                 break;
                         }
-                        
+
                         if (c == keys[4]) {
                                 static char msg[] =
                                     "paused - press RETURN to continue";
-                                
+
                                 place(curshape, pos, 1);
                                 do {
@@ -380 +380 @@
                                         console_flush(console);
                                 } while (!twait());
-                                
+
                                 scr_msg(msg, 0);
                                 scr_msg(key_msg, 1);
@@ -386 +386 @@
                                 continue;
                         }
-                        
+
                         if (c == keys[0]) {
                                 /* move left */
@@ -393 +393 @@
                                 continue;
                         }
-                        
+
                         if (c == keys[1]) {
                                 /* turn */
                                 const struct shape *new =
                                     &shapes[classic ? curshape->rotc : curshape->rot];
-                                
+
                                 if (fits_in(new, pos))
                                         curshape = new;
                                 continue;
                         }
-                        
+
                         if (c == keys[2]) {
                                 /* move right */
@@ -410 +410 @@
                                 continue;
                         }
-                        
+
                         if (c == keys[3]) {
                                 /* move to bottom */
@@ -419 +419 @@
                                 continue;
                         }
-                        
+
                         if (c == '\f') {
                                 scr_clear();
@@ -425 +425 @@
                         }
                 }
-                
+
                 scr_clear();
                 loadscores();
@@ -432 +432 @@
                 score = 0;
         }
-        
+
         scr_clear();
         printf("\nGame over.\n");
         scr_end();
-        
+
         return 0;
 }