From b491b2f131e2d3053783847017afc773ea94671c Mon Sep 17 00:00:00 2001 From: ellson Date: Tue, 18 Oct 2005 18:46:08 +0000 Subject: [PATCH] *** empty log message *** --- lib/common/geom.c | 2 + lib/gvc/Makefile.am | 2 +- lib/gvc/Makefile.old | 5 +- lib/gvc/gvcint.h | 174 -------------------------------------- lib/gvc/gvplugin_render.h | 2 +- lib/gvc/gvrender.c | 1 + 6 files changed, 8 insertions(+), 178 deletions(-) diff --git a/lib/common/geom.c b/lib/common/geom.c index 7cddab5aa..c9d6eff2f 100644 --- a/lib/common/geom.c +++ b/lib/common/geom.c @@ -22,6 +22,8 @@ #include "types.h" #include "graph.h" #include "geomprocs.h" +#include "types.h" +#include "graph.h" point pointof(int x, int y) { diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am index c078d48e0..090016556 100644 --- a/lib/gvc/Makefile.am +++ b/lib/gvc/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = \ LIBS = $(LIBLTDL) $(SOCKET_LIBS) -pkginclude_HEADERS = gvc.h gvcint.h gvcext.h gvplugin.h gvcproc.h \ +pkginclude_HEADERS = gvc.h gvcint.h gvcjob.h gvcext.h gvplugin.h gvcproc.h \ gvplugin_render.h gvplugin_layout.h gvplugin_textlayout.h \ gvplugin_device.h gvplugin_usershape.h pkglib_LTLIBRARIES = libgvc.la diff --git a/lib/gvc/Makefile.old b/lib/gvc/Makefile.old index caef61ae7..c092b0073 100644 --- a/lib/gvc/Makefile.old +++ b/lib/gvc/Makefile.old @@ -13,9 +13,10 @@ INCS = -I. \ DEFINES = -DHAVE_CONFIG_H -DGVLIBDIR=\"$(LIBDIR)\" -HDRS = gvc.h gvcint.h gvcext.h gvcproc.h gvplugin_render.h gvplugin_device.h \ +HDRS = gvc.h gvcint.h gvcjob.h gvcext.h gvcproc.h gvplugin.h \ + gvplugin_render.h gvplugin_device.h \ gvplugin_layout.h gvplugin_textlayout.h \ - gvplugin_usershape.h gvplugin.h + gvplugin_usershape.h OBJS = gvrender.o gvlayout.o gvdevice.o gvcontext.o gvjobs.o \ gvplugin.o gvconfig.o gvevent.o gvtextlayout.o gvusershape.o gvc.o diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h index c376ad155..9ea7f6cb0 100644 --- a/lib/gvc/gvcint.h +++ b/lib/gvc/gvcint.h @@ -25,61 +25,11 @@ extern "C" { #define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0])) - typedef enum { PEN_NONE, PEN_DASHED, PEN_DOTTED, PEN_SOLID } pen_type; - typedef enum { FILL_NONE, FILL_SOLID } fill_type; - typedef enum { FONT_REGULAR, FONT_BOLD, FONT_ITALIC } font_type; -#define PENWIDTH_NORMAL 1. -#define PENWIDTH_BOLD 2. - - typedef struct { - char *fontfam, fontopt; - color_t pencolor, fillcolor; - pen_type pen; - fill_type fill; - double penwidth; - double fontsz; - } gvstyle_t; - -#define EMIT_SORTED (1<<0) -#define EMIT_COLORS (1<<1) -#define EMIT_CLUSTERS_LAST (1<<2) -#define EMIT_PREORDER (1<<3) -#define EMIT_EDGE_SORTED (1<<4) -#define GVRENDER_DOES_ARROWS (1<<5) -#define GVRENDER_DOES_LAYERS (1<<6) -#define GVRENDER_DOES_MULTIGRAPH_OUTPUT_FILES (1<<7) -#define GVRENDER_DOES_TRUECOLOR (1<<8) -#define GVRENDER_Y_GOES_DOWN (1<<9) -#define GVRENDER_X11_EVENTS (1<<10) -#define GVRENDER_DOES_TRANSFORM (1<<11) - - typedef struct { - int flags; - double default_margin; /* graph units */ - int default_dpi; - char **knowncolors; - int sz_knowncolors; - color_type_t color_type; - char *device; - } gvrender_features_t; - - typedef struct { - int flags; - } gvdevice_features_t; - -#define LAYOUT_USES_RANKDIR (1<<0) - typedef struct { int flags; } gvlayout_features_t; /* active plugin headers */ - typedef struct gvplugin_active_device_s { - gvdevice_engine_t *engine; - int id; - gvdevice_features_t *features; - } gvplugin_active_device_t; - typedef struct gvplugin_active_layout_s { gvlayout_engine_t *engine; int id; @@ -87,13 +37,6 @@ extern "C" { char *type; } gvplugin_active_layout_t; - typedef struct gvplugin_active_render_s { - gvrender_engine_t *engine; - int id; - gvrender_features_t *features; - char *type; - } gvplugin_active_render_t; - typedef struct gvplugin_active_textlayout_s { gvtextlayout_engine_t *engine; int id; @@ -106,116 +49,6 @@ extern "C" { char *type; } gvplugin_active_usershape_t; - /* - * gv_matrix_t: (compat with cairo_matrix_t) - * - * A #gv_matrix_t holds an affine transformation, such as a scale, - * rotation, or shear, or a combination of those. - */ - typedef struct gv_matrix_s { - double xx; double yx; - double xy; double yy; - double x0; double y0; - } gv_matrix_t; - - typedef struct gv_argvlist_s { - char **argv; - int argc; - int alloc; - } gv_argvlist_t; - - typedef struct gvdevice_callbacks_s { - void (*refresh) (GVJ_t * job); - void (*button_press) (GVJ_t * job, int button, pointf pointer); - void (*button_release) (GVJ_t * job, int button, pointf pointer); - void (*motion) (GVJ_t * job, pointf pointer); - void (*modify) (GVJ_t * job, char *name, char *value); - } gvdevice_callbacks_t; - - struct GVJ_s { - GVJ_t *next; /* linked list of jobs */ - GVJ_t *next_active; /* linked list of active jobs (e.g. multiple windows) */ - char *output_filename; - char *output_langname; - FILE *output_file; - int output_lang; - - gvplugin_active_render_t render; - gvplugin_active_device_t device; - gvdevice_callbacks_t *callbacks; - -#ifndef DISABLE_CODEGENS - codegen_t *codegen; /* current codegen */ -#endif - - void *surface; /* gd or cairo surface */ - bool external_surface; /* surface belongs to caller */ - - gvstyle_t *style; /* active style from gvc->styles[] */ - - GVC_t *gvc; /* parent gvc */ - graph_t *g; /* parent graph */ - - /* current graph object during rendering - - only valid between gvrender_begin_xxx() and gvrender_end_xxx() */ - graph_t *sg; /* current graph or subgraph/cluster */ - node_t *n; /* current node */ - edge_t *e; /* current edge */ - - int flags; /* emit_graph flags */ - - pointf margin; /* job-specific margin - graph units */ - - int numLayers; /* number of layers */ - int layerNum; /* current layer - 1 based*/ - - boxf pageBox; /* current page in graph coords */ - pointf pageOffset; /* offset for current page in graph coords */ - pointf pageSize; /* page size in graph units */ - point pagesArraySize; /* 2D size of page array */ - point pagesArrayFirst; /* 2D starting corner in */ - point pagesArrayMajor; /* 2D major increment */ - point pagesArrayMinor; /* 2D minor increment */ - point pagesArrayElem; /* 2D coord of current page - 0,0 based */ - int numPages; /* number of pages */ - - unsigned int width; /* device width in device units */ - unsigned int height; /* device height in device units */ - int dpi; /* device resolution device-units-per-inch */ - double zoom; /* viewport zoom factor */ - int rotation; /* viewport rotation 0=portrait, 1=landscape */ - pointf focus; /* viewport focus in graph units */ - box boundingBox; /* drawable region in device units */ - - boxf clip; /* clip region in graph units */ - boxf pageBoxClip; /* intersection of clip and pageBox */ - - gv_matrix_t transform; /* transformation matrix for renderers that can use it */ - pointf compscale; /* composite device scale incl: scale, zoom, dpi, y_goes_down */ - pointf offset; /* composite translation */ - - bool fit_mode, - needs_refresh, - click, - active, - has_grown; - - pointf pointer; /* pointer position in device units */ - pointf oldpointer; /* old pointer position in device units */ - - void *current_obj; /* graph object that pointer is in currently */ - - void *selected_obj; /* graph object that has been selected */ - /* (e.g. button 1 clicked on current obj) */ - char *active_tooltip; /* tooltip of active object - or NULL */ - char *selected_href; /* href of selected object - or NULL */ - gv_argvlist_t selected_obj_type_name; /* (e.g. "edge" "node3" "e" "->" "node5" "") */ - gv_argvlist_t selected_obj_attributes; /* even args are names, odd are values */ - /* e.g. "color" "red" "style" "filled" */ - - void *window; /* display-specific data for gvrender plugin */ - }; - typedef struct gvplugin_available_s gvplugin_available_t; struct gvplugin_available_s { @@ -231,13 +64,6 @@ extern "C" { or NULL if not yet loaded */ }; - typedef int (*gvevent_key_callback_t) (GVJ_t * job); - - typedef struct gvevent_key_binding_s { - char *keystring; - gvevent_key_callback_t callback; - } gvevent_key_binding_t; - #define MAXNEST 4 struct GVC_s { diff --git a/lib/gvc/gvplugin_render.h b/lib/gvc/gvplugin_render.h index 98a36b1ba..059a52ae6 100644 --- a/lib/gvc/gvplugin_render.h +++ b/lib/gvc/gvplugin_render.h @@ -20,7 +20,7 @@ #include "gvplugin.h" #include "geom.h" #include "color.h" -#include "gvcint.h" +#include "gvcjob.h" #ifdef __cplusplus extern "C" { diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c index 0db8388b1..924ea437f 100644 --- a/lib/gvc/gvrender.c +++ b/lib/gvc/gvrender.c @@ -43,6 +43,7 @@ #include "gvplugin_render.h" #include "gvplugin.h" #include "gvcint.h" +#include "gvcjob.h" #include "gvcproc.h" extern int emit_once(char *str); -- 2.40.0