summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-09-07 22:26:44 -0300
committerWerner Almesberger <werner@almesberger.net>2016-09-07 22:31:18 -0300
commit2a64264e445dd46121c1e966bbe1d2b44b29d33f (patch)
tree76dd5225c653bdb983a1c7b7a241fff5570086c7 /gui
parentdafe079f9bd26ee63e685db638d578236abd6eb3 (diff)
downloadeeshow-2a64264e445dd46121c1e966bbe1d2b44b29d33f.tar.gz
eeshow-2a64264e445dd46121c1e966bbe1d2b44b29d33f.tar.bz2
eeshow-2a64264e445dd46121c1e966bbe1d2b44b29d33f.zip
fix numerous whitespace atrocities
- trailing spaces - trailing tabs - space before tab - more than four spaces ... - at the beginning of a line - after tab - in general (okay in many cases, but not all) - caught a stray blank line as well
Diffstat (limited to 'gui')
-rw-r--r--gui/common.h2
-rw-r--r--gui/fmt-pango.c2
-rw-r--r--gui/gui.c12
-rw-r--r--gui/help.c2
-rw-r--r--gui/history.c2
-rw-r--r--gui/input.c4
-rw-r--r--gui/over.c1
-rw-r--r--gui/render.c2
-rw-r--r--gui/sheet.c2
9 files changed, 14 insertions, 15 deletions
diff --git a/gui/common.h b/gui/common.h
index a801aae..9808e31 100644
--- a/gui/common.h
+++ b/gui/common.h
@@ -184,7 +184,7 @@ void show_index(struct gui *gui);
/* gui.c */
struct gui_sheet *find_corresponding_sheet(struct gui_sheet *pick_from,
- struct gui_sheet *ref_in, const struct gui_sheet *ref);
+ struct gui_sheet *ref_in, const struct gui_sheet *ref);
void mark_aois(struct gui *gui, struct gui_sheet *sheet);
#endif /* !GUI_COMMON_H */
diff --git a/gui/fmt-pango.c b/gui/fmt-pango.c
index 48b8516..6305f82 100644
--- a/gui/fmt-pango.c
+++ b/gui/fmt-pango.c
@@ -62,7 +62,7 @@ unsigned vsfmt_pango(char *buf, const char *fmt, va_list ap)
default:
break;
}
-
+
if (extra) {
tmp2 = u = alloca(len + extra + 1);
for (t = tmp; *t; t++) {
diff --git a/gui/gui.c b/gui/gui.c
index 5cd2a75..b5668c9 100644
--- a/gui/gui.c
+++ b/gui/gui.c
@@ -47,7 +47,7 @@
struct gui_sheet *find_corresponding_sheet(struct gui_sheet *pick_from,
- struct gui_sheet *ref_in, const struct gui_sheet *ref)
+ struct gui_sheet *ref_in, const struct gui_sheet *ref)
{
struct gui_sheet *sheet, *plan_b;
const char *title = ref->sch->title;
@@ -109,7 +109,7 @@ static void select_subsheet(void *user)
found:
sheet = find_corresponding_sheet(gui->new_hist->sheets,
- gui->old_hist->sheets, sheet);
+ gui->old_hist->sheets, sheet);
go_to_sheet(gui, sheet);
}
@@ -274,7 +274,7 @@ static const struct sheet *parse_files(struct gui_hist *hist,
if (fn->pl) {
if (!file_open(&pl_file, fn->pl, leader))
goto fail;
- hist->pl = pl_parse(&pl_file);
+ hist->pl = pl_parse(&pl_file);
file_close(&pl_file);
/*
* We treat failing to parse the page layout as a "minor"
@@ -421,8 +421,8 @@ static void get_history(struct gui *gui, const char *name, int limit)
if (!vcs_git_try(name)) {
gui->vcs_history = NULL;
return;
- }
-
+ }
+
gui->vcs_history = vcs_git_history(name);
if (limit)
gui->hist_size = limit > 0 ? limit : -limit;
@@ -468,7 +468,7 @@ int run_gui(const struct file_names *fn, bool recurse, int limit,
.aois = NULL,
.diff_mode = diff_delta,
.old_hist = NULL,
- .hist_y_offset = 0,
+ .hist_y_offset = 0,
.hist_size = 0,
};
diff --git a/gui/help.c b/gui/help.c
index 4a2537e..22a2973 100644
--- a/gui/help.c
+++ b/gui/help.c
@@ -77,7 +77,7 @@ static GtkWidget *help_content(void)
label = gtk_label_new(NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_label_set_markup(GTK_LABEL(label),
diff --git a/gui/history.c b/gui/history.c
index 6b3c9fe..13a7686 100644
--- a/gui/history.c
+++ b/gui/history.c
@@ -129,7 +129,7 @@ static void render_commit(void *user, void *user_over, int x, int y,
for (walk = hist; walk && walk->skipped; walk = walk->next)
do_render_commit(walk->gui, walk, cr,
VCS_OVERLAYS_X + COMMIT_R,
- y + h / 2, THREAD_DX, h / 2, dy - h / 2,
+ y + h / 2, THREAD_DX, h / 2, dy - h / 2,
&skipped_rgb, &skipped_rgb,
walk == hist, walk->next && !walk->next->skipped);
return;
diff --git a/gui/input.c b/gui/input.c
index 49e310c..1b116ab 100644
--- a/gui/input.c
+++ b/gui/input.c
@@ -207,8 +207,8 @@ static gboolean motion_notify_event(GtkWidget *widget, GdkEventMotion *event,
break;
case input_dragging:
if (sp->ops->drag_move)
- sp->ops->drag_move(sp->user,
- event->x - clicked_x, event->y - clicked_y);
+ sp->ops->drag_move(sp->user,
+ event->x - clicked_x, event->y - clicked_y);
clicked_x = event->x;
clicked_y = event->y;
break;
diff --git a/gui/over.c b/gui/over.c
index f86b05d..b779aee 100644
--- a/gui/over.c
+++ b/gui/over.c
@@ -281,7 +281,6 @@ void overlay_draw_all_d(struct overlay *overlays, cairo_t *cr,
over = over->next;
else
over = over->prev;
-
}
}
diff --git a/gui/render.c b/gui/render.c
index 5abf364..1686042 100644
--- a/gui/render.c
+++ b/gui/render.c
@@ -142,7 +142,7 @@ static struct area *changed_sheets(const struct gui *gui,
if (!sheet_eq(new_sub->sch, old_sub->sch, 1))
add_area(&areas, cx(obj->x, xo, f), cy(obj->y, yo, f),
- cx(obj->x + obj->u.sheet.w, xo, f),
+ cx(obj->x + obj->u.sheet.w, xo, f),
cy(obj->y + obj->u.sheet.h, yo, f), 0xffff00);
}
return areas;
diff --git a/gui/sheet.c b/gui/sheet.c
index d7e6fe6..a09efec 100644
--- a/gui/sheet.c
+++ b/gui/sheet.c
@@ -130,7 +130,7 @@ void zoom_to_extents(struct gui *gui)
gui->y = h / 2;
gtk_widget_get_allocation(gui->da, &alloc);
-
+
sw = w ? (float) ZOOM_MARGIN * alloc.width / w : 1;
sh = h ? (float) ZOOM_MARGIN * alloc.height / h : 1;
gui->scale = sw < sh ? sw : sh;