qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-17 21:46:15 +02:00
Code

eeshow/gui/gui.c: better sectioning; trim includes

Browse Source
This commit is contained in:
Werner Almesberger 2016-08-18 12:16:13 -03:00
parent 7c4ee702e0
commit cb2cdd59e6
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
eeshow/gui/gui.c
View File

@ -17,20 +17,16 @@
* https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html * https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html
*/ */
#define _GNU_SOURCE /* for asprintf */
#include <stddef.h> #include <stddef.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <math.h>
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "misc/util.h" #include "misc/util.h"
#include "misc/diag.h" #include "misc/diag.h"
#include "gfx/style.h"
#include "gfx/cro.h" #include "gfx/cro.h"
#include "gfx/gfx.h" #include "gfx/gfx.h"
#include "file/git-hist.h" #include "file/git-hist.h"
@ -38,10 +34,7 @@
#include "kicad/sch.h" #include "kicad/sch.h"
#include "kicad/delta.h" #include "kicad/delta.h"
#include "gfx/diff.h" #include "gfx/diff.h"
#include "kicad/dwg.h"
#include "gui/fmt-pango.h"
#include "gui/aoi.h" #include "gui/aoi.h"
#include "gui/style.h"
#include "gui/over.h" #include "gui/over.h"
#include "gui/input.h" #include "gui/input.h"
#include "gui/common.h" #include "gui/common.h"
@ -196,7 +189,7 @@ void render_delta(struct gui_ctx *ctx)
} }
/* ----- AoI callbacks ----------------------------------------------------- */ /* ----- AoIs -------------------------------------------------------------- */
struct sheet_aoi_ctx { struct sheet_aoi_ctx {
@ -223,9 +216,6 @@ static void select_subsheet(void *user)
} }
/* ----- Initialization ---------------------------------------------------- */
static void add_sheet_aoi(struct gui_ctx *ctx, struct gui_sheet *parent, static void add_sheet_aoi(struct gui_ctx *ctx, struct gui_sheet *parent,
const struct sch_obj *obj) const struct sch_obj *obj)
{ {
@ -247,6 +237,9 @@ static void add_sheet_aoi(struct gui_ctx *ctx, struct gui_sheet *parent,
} }
/* ----- Load revisions ---------------------------------------------------- */
void mark_aois(struct gui_ctx *ctx, struct gui_sheet *sheet) void mark_aois(struct gui_ctx *ctx, struct gui_sheet *sheet)
{ {
const struct sch_obj *obj; const struct sch_obj *obj;
@ -445,6 +438,27 @@ static void add_hist(void *user, struct hist *h)
} }
static void get_revisions(struct gui_ctx *ctx,
int n_args, char **args, bool recurse, int limit)
{
struct add_hist_ctx add_hist_ctx = {
.ctx = ctx,
.n_args = n_args,
.args = args,
.recurse = recurse,
.limit = limit ? limit < 0 ? -limit : limit : -1,
};
if (ctx->vcs_hist)
hist_iterate(ctx->vcs_hist, add_hist, &add_hist_ctx);
else
add_hist(&add_hist_ctx, NULL);
}
/* ----- Retrieve and count history ---------------------------------------- */
static void count_history(void *user, struct hist *h) static void count_history(void *user, struct hist *h)
{ {
struct gui_ctx *ctx = user; struct gui_ctx *ctx = user;
@ -468,22 +482,7 @@ static void get_history(struct gui_ctx *ctx, const char *sch_name, int limit)
} }
static void get_revisions(struct gui_ctx *ctx, /* ----- Initialization ---------------------------------------------------- */
int n_args, char **args, bool recurse, int limit)
{
struct add_hist_ctx add_hist_ctx = {
.ctx = ctx,
.n_args = n_args,
.args = args,
.recurse = recurse,
.limit = limit ? limit < 0 ? -limit : limit : -1,
};
if (ctx->vcs_hist)
hist_iterate(ctx->vcs_hist, add_hist, &add_hist_ctx);
else
add_hist(&add_hist_ctx, NULL);
}
int gui(unsigned n_args, char **args, bool recurse, int limit) int gui(unsigned n_args, char **args, bool recurse, int limit)