Changeset a35b458 in mainline for uspace/dist/src/c/demos/tetris/screen.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/screen.c (modified) (21 diffs)

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

@@ -148 +148 @@
         sysarg_t ccap;
         errno_t rc = console_get_color_cap(console, &ccap);
-        
+
         if (rc != EOK)
                 return false;
-        
+
         return ((ccap & CONSOLE_CAP_RGB) == CONSOLE_CAP_RGB);
 }
@@ -161 +161 @@
 {
         winsize_t ws;
-        
+
         Rows = 0;
         Cols = 0;
-        
+
         if (get_display_size(&ws) == 0) {
                 Rows = ws.ws_row;
@@ -171 +171 @@
 
         use_color = get_display_color_sup();
-        
+
         if ((Rows < MINROWS) || (Cols < MINCOLS)) {
                 char smallscr[55];
-                
+
                 snprintf(smallscr, sizeof(smallscr),
                     "the screen is too small (must be at least %dx%d)",
@@ -181 +181 @@
         }
         isset = 1;
-        
+
         scr_clear();
 }
@@ -197 +197 @@
         if (isset)
                 scr_end();
-        
+
         errx(1, "aborting: %s", why);
 }
@@ -213 +213 @@
         int j;
         int ccol;
-        
+
         /* Always leave cursor after last displayed point */
         curscreen[D_LAST * B_COLS - 1] = -1;
-        
+
         if (score != curscore) {
                 moveto(0, 0);
@@ -222 +222 @@
                 curscore = score;
         }
-        
+
         /* Draw preview of next pattern */
         if ((showpreview) && (nextshape != lastshape)) {
@@ -228 +228 @@
                 static int r = 5, c = 2;
                 int tr, tc, t;
-                
+
                 lastshape = nextshape;
-                
+
                 /* Clean */
                 resume_normal();
@@ -241 +241 @@
                 moveto(r + 2, c - 1);
                 putstr("          ");
-                
+
                 moveto(r - 3, c - 2);
                 putstr("Next shape:");
-                
+
                 /* Draw */
                 start_standout(nextshape->color);
@@ -252 +252 @@
                         t = c + r * B_COLS;
                         t += nextshape->off[i];
-                        
+
                         tr = t / B_COLS;
                         tc = t % B_COLS;
-                        
+
                         moveto(tr, 2*tc);
                         putstr("  ");
@@ -261 +261 @@
                 resume_normal();
         }
-        
+
         bp = &board[D_FIRST * B_COLS];
         sp = &curscreen[D_FIRST * B_COLS];
@@ -269 +269 @@
                         if (*sp == (so = *bp))
                                 continue;
-                        
+
                         *sp = so;
                         if (i != ccol) {
@@ -278 +278 @@
                                 moveto(RTOD(j), CTOD(i));
                         }
-                        
+
                         if (so != cur_so) {
                                 if (so)
@@ -287 +287 @@
                         }
                         putstr("  ");
-                        
+
                         ccol = i + 1;
                         /*
@@ -297 +297 @@
                          * the next cell is a different color.
                          */
-                        
+
                         if ((i > STOP) || (sp[1] != bp[1]) || (so != bp[1]))
                                 continue;
-                        
+
                         if (sp[2] != bp[2])
                                 sp[1] = -1;
@@ -309 +309 @@
                 }
         }
-        
+
         if (cur_so)
                 resume_normal();
-        
+
         console_flush(console);
 }
@@ -323 +323 @@
 {
         int l = str_size(s);
-        
+
         moveto(Rows - 2, ((Cols - l) >> 1) - 1);
-        
+
         if (set)
                 putstr(s);
@@ -341 +341 @@
 {
         suseconds_t timeout = fallrate;
-        
+
         while (timeout > 0) {
                 cons_event_t event;
-                
+
                 if (!console_get_event_timeout(console, &event, &timeout))
                         break;
@@ -359 +359 @@
          * and increase speed.
          */
-        
+
         if (timeleft <= 0) {
                 faster();
                 timeleft = fallrate;
         }
-        
+
         /*
          * Wait to see if there is any input. If so, take it and
@@ -371 +371 @@
          * make timeleft zero and return -1.
          */
-        
+
         wchar_t c = 0;
-        
+
         while (c == 0) {
                 cons_event_t event;
-                
+
                 if (!console_get_event_timeout(console, &event, &timeleft)) {
                         timeleft = 0;
                         return -1;
                 }
-                
+
                 if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
                         c = event.ev.key.c;
         }
-        
+
         return (int) c;
 }
@@ -395 +395 @@
 {
         wchar_t c = 0;
-        
+
         while (c == 0) {
                 cons_event_t event;
-                
+
                 if (!console_get_event(console, &event))
                         return -1;
-                
+
                 if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
                         c = event.ev.key.c;
         }
-        
+
         return (int) c;
 }