Changeset a35b458 in mainline for uspace/app/fontviewer/fontviewer.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/app/fontviewer/fontviewer.c (modified) (20 diffs)

uspace/app/fontviewer/fontviewer.c

@@ -68 +68 @@
 {
         kbd_event_t *event = (kbd_event_t *) data;
-        
+
         if (event->type == KEY_PRESS) {
                 if (event->c == 'q')
                         exit(0);
-                
+
                 if (event->key == KC_UP || event->key == KC_DOWN) {
                         uint16_t increment = (event->mods & KM_SHIFT) ? 10 : 1;
@@ -78 +78 @@
                         if (event->key == KC_UP)
                                 points += increment;
-                
+
                         if (event->key == KC_DOWN) {
                                 if (points <= increment) {
@@ -87 +87 @@
                                 }
                         }
-                        
+
                         if (points < 1)
                                 points = 1;
                 }
-                
+
                 if (event->c == 'm')
                         show_metrics = !show_metrics;
         }
-        
+
         errno_t rc = draw();
         if (rc != EOK) {
@@ -109 +109 @@
                 return embedded_font_create(font, points);
         }
-        
+
         return pcf_font_create(font, font_path, points);
 }
@@ -127 +127 @@
         if (y2 < y1)
                 return;
-        
+
         drawctx_set_source(drawctx, source);
         drawctx_transfer(drawctx, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
@@ -148 +148 @@
         int ret = vasprintf(&str, fmt, args);
         va_end(args);
-        
+
         if (ret >= 0) {
                 drawctx_set_source(drawctx, source);
@@ -156 +156 @@
                 free(str);
         }
-        
+
         return ret;
 }
@@ -172 +172 @@
         source_t leading_bg = rgb(170, 238, 255);
         source_t leading_fg = rgb(0, 170, 212);
-        
+
         font_t *font;
         errno_t rc = create_font(&font, points);
@@ -179 +179 @@
                 return rc;
         }
-        
+
         font_t *info_font;
         rc = embedded_font_create(&info_font, 16);
@@ -186 +186 @@
                 return rc;
         }
-        
+
         font_metrics_t font_metrics;
         rc = font_get_metrics(font, &font_metrics);
         if (rc != EOK)
                 return rc;
-        
+
         surface_coord_t top = 50;
         metric_t ascender_top = top;
@@ -200 +200 @@
         drawctx_t drawctx;
         drawctx_init(&drawctx, surface);
-        
+
         drawctx_set_source(&drawctx, &background);
         drawctx_transfer(&drawctx, 0, 0,
             width, height);
-        
+
         if (show_metrics) {
                 horizontal_rectangle(&drawctx, 0, ascender_top, width,
@@ -210 +210 @@
                 horizontal_line(&drawctx, ascender_top, 0, width,
                     &ascender_fg);
-                
+
                 horizontal_rectangle(&drawctx, 0, descender_top, width,
                     leading_top - 1, &descender_bg);
                 horizontal_line(&drawctx, descender_top, 0, width,
                     &descender_fg);
-                
+
                 horizontal_rectangle(&drawctx, 0, leading_top,
                     width, line_bottom - 1, &leading_bg);
@@ -221 +221 @@
                     &leading_fg);
         }
-        
+
         drawctx_set_source(&drawctx, &glyphs);
         drawctx_set_font(&drawctx, font);
         drawctx_print(&drawctx, "Čaj'_", 0, top);
-        
+
         if (show_metrics) {
                 surface_coord_t infos_top = line_bottom + 10;
@@ -239 +239 @@
 
         }
-        
+
         font_release(font);
         return EOK;
@@ -250 +250 @@
                 return 1;
         }
-        
+
         if (argc < 3) {
                 font_path = NULL;
@@ -257 +257 @@
                 font_path = argv[2];
         }
-        
+
         main_window = window_open(argv[1], NULL, WINDOW_MAIN, "fontviewer");
         if (!main_window) {
@@ -263 +263 @@
                 return 2;
         }
-        
+
         surface = surface_create(WINDOW_WIDTH, WINDOW_HEIGHT, NULL,
             SURFACE_FLAG_NONE);
@@ -270 +270 @@
                 return 2;
         }
-        
+
         width = WINDOW_WIDTH;
         height = WINDOW_HEIGHT;
-        
+
         errno_t rc = draw();
         if (rc != EOK) {
@@ -279 +279 @@
                 return 2;
         }
-        
+
         canvas = create_canvas(window_root(main_window), NULL,
             WINDOW_WIDTH, WINDOW_HEIGHT, surface);
@@ -287 +287 @@
         }
         sig_connect(&canvas->keyboard_event, NULL, on_keyboard_event);
-        
+
         window_resize(main_window, 200, 200, WINDOW_WIDTH, WINDOW_HEIGHT,
             WINDOW_PLACEMENT_ABSOLUTE);
         window_exec(main_window);
-        
+
         task_retval(0);
         async_manager();
-        
+
         return 0;
 }