summaryrefslogtreecommitdiff
path: root/gui/gui.c
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-08-18 12:41:12 -0300
committerWerner Almesberger <werner@almesberger.net>2016-08-18 12:41:12 -0300
commitc03b6c294cd209703b54cccc236258acfcad60b8 (patch)
treec329c1a87dd49c575812869208f00ad8363a0e07 /gui/gui.c
parentb0ce7932b5bc8ec04120146cac8ca28931b33301 (diff)
downloadeeshow-c03b6c294cd209703b54cccc236258acfcad60b8.tar.gz
eeshow-c03b6c294cd209703b54cccc236258acfcad60b8.tar.bz2
eeshow-c03b6c294cd209703b54cccc236258acfcad60b8.zip
eeshow/gui/gui.c: move rendering to render.c
Diffstat (limited to 'gui/gui.c')
-rw-r--r--gui/gui.c126
1 files changed, 1 insertions, 125 deletions
diff --git a/gui/gui.c b/gui/gui.c
index e02ad52..8135a66 100644
--- a/gui/gui.c
+++ b/gui/gui.c
@@ -22,20 +22,15 @@
#include <stdlib.h>
#include <string.h>
-#include <cairo/cairo.h>
#include <gtk/gtk.h>
#include "misc/util.h"
#include "misc/diag.h"
-#include "gfx/cro.h"
-#include "gfx/gfx.h"
#include "file/git-hist.h"
#include "kicad/lib.h"
#include "kicad/sch.h"
#include "kicad/delta.h"
-#include "gfx/diff.h"
#include "gui/aoi.h"
-#include "gui/over.h"
#include "gui/input.h"
#include "gui/common.h"
#include "gui/gui.h"
@@ -44,12 +39,6 @@
/* ----- Helper functions -------------------------------------------------- */
-void redraw(const struct gui_ctx *ctx)
-{
- gtk_widget_queue_draw(ctx->da);
-}
-
-
struct gui_sheet *find_corresponding_sheet(struct gui_sheet *pick_from,
struct gui_sheet *ref_in, const struct gui_sheet *ref)
{
@@ -78,117 +67,6 @@ struct gui_sheet *find_corresponding_sheet(struct gui_sheet *pick_from,
}
-/* ----- Rendering --------------------------------------------------------- */
-
-
-#define VCS_OVERLAYS_X 5
-#define VCS_OVERLAYS_Y 5
-
-#define SHEET_OVERLAYS_X -10
-#define SHEET_OVERLAYS_Y 10
-
-
-static void hack(const struct gui_ctx *ctx, cairo_t *cr)
-{
- const struct gui_sheet *new = ctx->curr_sheet;
- const struct gui_sheet *old = find_corresponding_sheet(
- ctx->old_hist->sheets, ctx->new_hist->sheets, ctx->curr_sheet);
-
- diff_to_canvas(cr, ctx->x, ctx->y, 1.0 / (1 << ctx->zoom),
- old->gfx_ctx, new->gfx_ctx);
-}
-
-
-static gboolean on_draw_event(GtkWidget *widget, cairo_t *cr,
- gpointer user_data)
-{
- const struct gui_ctx *ctx = user_data;
- const struct gui_sheet *sheet = ctx->curr_sheet;
- GtkAllocation alloc;
- float f = 1.0 / (1 << ctx->zoom);
- int x, y;
-
- gtk_widget_get_allocation(ctx->da, &alloc);
- x = -(sheet->xmin + ctx->x) * f + alloc.width / 2;
- y = -(sheet->ymin + ctx->y) * f + alloc.height / 2;
-
- cro_canvas_prepare(cr);
- if (!ctx->old_hist) {
- cro_canvas_draw(sheet->gfx_ctx, cr, x, y, f);
- } else {
-#if 0
- /* @@@ fix geometry later */
- cro_canvas_draw(ctx->delta_ab.gfx_ctx, cr, x, y, f);
- cro_canvas_draw(ctx->delta_a.gfx_ctx, cr, x, y, f);
- cro_canvas_draw(ctx->delta_b.gfx_ctx, cr, x, y, f);
-#endif
- hack(ctx, cr);
- }
-
- overlay_draw_all(ctx->sheet_overlays, cr,
- SHEET_OVERLAYS_X, SHEET_OVERLAYS_Y);
- overlay_draw_all_d(ctx->hist_overlays, cr,
- VCS_OVERLAYS_X,
- VCS_OVERLAYS_Y + (ctx->showing_history ? ctx->hist_y_offset : 0),
- 0, 1);
- overlay_draw_all(ctx->pop_overlays, cr, ctx->pop_x, ctx->pop_y);
-
- return FALSE;
-}
-
-
-void render_sheet(struct gui_sheet *sheet)
-{
- char *argv[] = { "gui", NULL };
-
- gfx_init(&cro_canvas_ops, 1, argv);
- sch_render(sheet->sch);
- cro_canvas_end(gfx_ctx,
- &sheet->w, &sheet->h, &sheet->xmin, &sheet->ymin);
- sheet->gfx_ctx = gfx_ctx;
- sheet->rendered = 1;
- // gfx_end();
-}
-
-
-void render_delta(struct gui_ctx *ctx)
-{
-#if 0
- /* @@@ needs updating for curr/last vs. new/old */
- struct sheet *sch_a, *sch_b, *sch_ab;
- const struct gui_sheet *a = ctx->curr_sheet;
- const struct gui_sheet *b = find_corresponding_sheet(
- ctx->last_hist->sheets, ctx->curr_hist->sheets, ctx->curr_sheet);
-
- sch_a = alloc_type(struct sheet);
- sch_b = alloc_type(struct sheet);
- sch_ab = alloc_type(struct sheet);
-
- delta(a->sch, b->sch, sch_a, sch_b, sch_ab);
- ctx->delta_a.sch = sch_a,
- ctx->delta_b.sch = sch_b,
- ctx->delta_ab.sch = sch_ab,
-
- render_sheet(&ctx->delta_a);
- render_sheet(&ctx->delta_b);
- render_sheet(&ctx->delta_ab);
-
- cro_color_override(ctx->delta_ab.gfx_ctx, COLOR_LIGHT_GREY);
- cro_color_override(ctx->delta_a.gfx_ctx, COLOR_RED);
- cro_color_override(ctx->delta_b.gfx_ctx, COLOR_GREEN2);
-
- // @@@ clean up when leaving sheet
-#endif
- struct gui_sheet *b = find_corresponding_sheet(
- ctx->old_hist->sheets, ctx->new_hist->sheets, ctx->curr_sheet);
-
- if (!b->rendered) {
- render_sheet(b);
- mark_aois(ctx, b);
- }
-}
-
-
/* ----- AoIs -------------------------------------------------------------- */
@@ -526,13 +404,11 @@ int gui(unsigned n_args, char **args, bool recurse, int limit)
if (!ctx.new_hist)
fatal("no valid sheets\n");
- g_signal_connect(G_OBJECT(ctx.da), "draw",
- G_CALLBACK(on_draw_event), &ctx);
-
g_signal_connect(window, "destroy",
G_CALLBACK(gtk_main_quit), NULL);
sheet_setup(&ctx);
+ render_setup(&ctx);
// gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);