1
0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-22 14:55:55 +02:00

eeshow/gui/gui.c: move common data structures to common.h

Preparing for splitting gui.c into more manageable parts.
This commit is contained in:
Werner Almesberger 2016-08-18 02:48:57 -03:00
parent ab1948a62c
commit f981ec1a63
2 changed files with 103 additions and 75 deletions

102
eeshow/gui/common.h Normal file
View File

@ -0,0 +1,102 @@
/*
* gui/common.h - Common data structures and declarations
*
* Written 2016 by Werner Almesberger
* Copyright 2016 by Werner Almesberger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
#ifndef GUI_COMMON_H
#define GUI_COMMON_H
#include <stdbool.h>
#include <gtk/gtk.h>
#include "gfx/cro.h"
#include "file/git-hist.h"
#include "kicad/lib.h"
#include "kicad/sch.h"
#include "gui/aoi.h"
#include "gui/over.h"
struct gui_ctx;
struct gui_sheet {
const struct sheet *sch;
struct gui_ctx *ctx; /* back link */
struct cro_ctx *gfx_ctx;
int w, h; /* in eeschema coordinates */
int xmin, ymin;
bool rendered; /* 0 if still have to render it */
struct overlay *over; /* current overlay */
struct aoi *aois; /* areas of interest; in schematics coord */
struct gui_sheet *next;
};
struct gui_hist {
struct gui_ctx *ctx; /* back link */
struct hist *vcs_hist; /* NULL if not from repo */
struct overlay *over; /* current overlay */
struct gui_sheet *sheets; /* NULL if failed */
unsigned age; /* 0-based; uncommitted or HEAD = 0 */
/* caching support */
void **oids; /* file object IDs */
int libs_open;
struct sch_ctx sch_ctx;
struct lib lib; /* combined library */
bool identical; /* identical with previous entry */
struct gui_hist *next;
};
struct gui_ctx {
GtkWidget *da;
unsigned zoom; /* scale by 1.0 / (1 << zoom) */
int x, y; /* center, in eeschema coordinates */
struct gui_hist *hist; /* revision history; NULL if none */
struct hist *vcs_hist; /* underlying VCS data; NULL if none */
bool showing_history;
enum selecting {
sel_only, /* select the only revision we show */
sel_new, /* select the new revision */
sel_old, /* select the old revision */
} selecting;
struct overlay *sheet_overlays;
struct overlay *hist_overlays;
struct overlay *pop_overlays; /* pop-up dialogs */
int pop_x, pop_y;
struct aoi *aois; /* areas of interest; in canvas coord */
struct gui_sheet delta_a;
struct gui_sheet delta_b;
struct gui_sheet delta_ab;
struct gui_sheet *curr_sheet;
/* current sheet, always on new_hist */
struct gui_hist *new_hist;
struct gui_hist *old_hist; /* NULL if not comparing */
int hist_y_offset; /* history list y offset */
/* progress bar */
int hist_size; /* total number of revisions */
unsigned progress; /* progress counter */
unsigned progress_scale;/* right-shift by this value */
};
#endif /* !GUI_COMMON_H */

View File

@ -44,84 +44,10 @@
#include "gui/style.h"
#include "gui/over.h"
#include "gui/input.h"
#include "gui/common.h"
#include "gui/gui.h"
struct gui_ctx;
struct gui_sheet {
const struct sheet *sch;
struct gui_ctx *ctx; /* back link */
struct cro_ctx *gfx_ctx;
int w, h; /* in eeschema coordinates */
int xmin, ymin;
bool rendered; /* 0 if still have to render it */
struct overlay *over; /* current overlay */
struct aoi *aois; /* areas of interest; in schematics coord */
struct gui_sheet *next;
};
struct gui_hist {
struct gui_ctx *ctx; /* back link */
struct hist *vcs_hist; /* NULL if not from repo */
struct overlay *over; /* current overlay */
struct gui_sheet *sheets; /* NULL if failed */
unsigned age; /* 0-based; uncommitted or HEAD = 0 */
/* caching support */
void **oids; /* file object IDs */
int libs_open;
struct sch_ctx sch_ctx;
struct lib lib; /* combined library */
bool identical; /* identical with previous entry */
struct gui_hist *next;
};
struct gui_ctx {
GtkWidget *da;
unsigned zoom; /* scale by 1.0 / (1 << zoom) */
int x, y; /* center, in eeschema coordinates */
struct gui_hist *hist; /* revision history; NULL if none */
struct hist *vcs_hist; /* underlying VCS data; NULL if none */
bool showing_history;
enum selecting {
sel_only, /* select the only revision we show */
sel_new, /* select the new revision */
sel_old, /* select the old revision */
} selecting;
struct overlay *sheet_overlays;
struct overlay *hist_overlays;
struct overlay *pop_overlays; /* pop-up dialogs */
int pop_x, pop_y;
struct aoi *aois; /* areas of interest; in canvas coord */
struct gui_sheet delta_a;
struct gui_sheet delta_b;
struct gui_sheet delta_ab;
struct gui_sheet *curr_sheet;
/* current sheet, always on new_hist */
struct gui_hist *new_hist;
struct gui_hist *old_hist; /* NULL if not comparing */
int hist_y_offset; /* history list y offset */
/* progress bar */
int hist_size; /* total number of revisions */
unsigned progress; /* progress counter */
unsigned progress_scale;/* right-shift by this value */
};
/* ----- Helper functions -------------------------------------------------- */