--- Begin Message ---
Author: werner
Date: 2009-08-08 21:44:17 +0200 (Sat, 08 Aug 2009)
New Revision: 5410
Added:
trunk/eda/fped/gui_tool.c
trunk/eda/fped/gui_tool.h
Removed:
trunk/eda/fped/gui_tools.c
trunk/eda/fped/gui_tools.h
Modified:
trunk/eda/fped/Makefile
trunk/eda/fped/gui.c
trunk/eda/fped/gui_canvas.c
trunk/eda/fped/gui_frame.c
trunk/eda/fped/gui_meas.c
trunk/eda/fped/inst.c
Log:
- for consistency, renamed gui_tools to gui_tool
Modified: trunk/eda/fped/Makefile
===================================================================
--- trunk/eda/fped/Makefile 2009-08-08 19:35:16 UTC (rev 5409)
+++ trunk/eda/fped/Makefile 2009-08-08 19:44:17 UTC (rev 5410)
@@ -14,7 +14,7 @@
unparse.o dump.o meas.o \
cpp.o lex.yy.o y.tab.o \
gui.o gui_util.o gui_style.o gui_inst.o gui_status.o gui_canvas.o \
- gui_tools.o gui_over.o gui_meas.o gui_frame.o
+ gui_tool.o gui_over.o gui_meas.o gui_frame.o
XPMS = point.xpm delete.xpm vec.xpm frame.xpm frame_locked.xpm frame_ready.xpm
\
line.xpm rect.xpm pad.xpm circ.xpm meas.xpm meas_x.xpm meas_y.xpm
@@ -95,7 +95,7 @@
y.tab.o: y.tab.c
$(CC) -c $(CFLAGS) $(SLOPPY) y.tab.c
-gui_tools.o: $(XPMS:%=icons/%)
+gui_tool.o: $(XPMS:%=icons/%)
# ----- Dependencies ----------------------------------------------------------
Modified: trunk/eda/fped/gui.c
===================================================================
--- trunk/eda/fped/gui.c 2009-08-08 19:35:16 UTC (rev 5409)
+++ trunk/eda/fped/gui.c 2009-08-08 19:44:17 UTC (rev 5410)
@@ -20,7 +20,7 @@
#include "gui_style.h"
#include "gui_status.h"
#include "gui_canvas.h"
-#include "gui_tools.h"
+#include "gui_tool.h"
#include "gui_frame.h"
#include "gui.h"
Modified: trunk/eda/fped/gui_canvas.c
===================================================================
--- trunk/eda/fped/gui_canvas.c 2009-08-08 19:35:16 UTC (rev 5409)
+++ trunk/eda/fped/gui_canvas.c 2009-08-08 19:44:17 UTC (rev 5410)
@@ -22,7 +22,7 @@
#include "gui_inst.h"
#include "gui_style.h"
#include "gui_status.h"
-#include "gui_tools.h"
+#include "gui_tool.h"
#include "gui.h"
#include "gui_canvas.h"
Modified: trunk/eda/fped/gui_frame.c
===================================================================
--- trunk/eda/fped/gui_frame.c 2009-08-08 19:35:16 UTC (rev 5409)
+++ trunk/eda/fped/gui_frame.c 2009-08-08 19:44:17 UTC (rev 5410)
@@ -23,7 +23,7 @@
#include "gui_util.h"
#include "gui_style.h"
#include "gui_status.h"
-#include "gui_tools.h"
+#include "gui_tool.h"
#include "gui.h"
#include "gui_frame.h"
Modified: trunk/eda/fped/gui_meas.c
===================================================================
--- trunk/eda/fped/gui_meas.c 2009-08-08 19:35:16 UTC (rev 5409)
+++ trunk/eda/fped/gui_meas.c 2009-08-08 19:44:17 UTC (rev 5410)
@@ -14,7 +14,7 @@
#include "util.h"
#include "meas.h"
#include "gui_canvas.h"
-#include "gui_tools.h"
+#include "gui_tool.h"
#include "gui_meas.h"
Copied: trunk/eda/fped/gui_tool.c (from rev 5407, trunk/eda/fped/gui_tools.c)
===================================================================
--- trunk/eda/fped/gui_tool.c (rev 0)
+++ trunk/eda/fped/gui_tool.c 2009-08-08 19:44:17 UTC (rev 5410)
@@ -0,0 +1,959 @@
+/*
+ * gui_tool.c - GUI, tool bar
+ *
+ * Written 2009 by Werner Almesberger
+ * Copyright 2009 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.
+ */
+
+
+#include <stdlib.h>
+#include <math.h>
+#include <assert.h>
+#include <gtk/gtk.h>
+
+#include "util.h"
+#include "inst.h"
+#include "obj.h"
+#include "gui_util.h"
+#include "gui_style.h"
+#include "gui_inst.h"
+#include "gui_over.h"
+#include "gui_canvas.h"
+#include "gui_status.h"
+#include "gui.h"
+#include "gui_meas.h"
+#include "gui_tool.h"
+
+
+#include "icons/circ.xpm"
+#include "icons/frame.xpm"
+#include "icons/frame_locked.xpm"
+#include "icons/frame_ready.xpm"
+#include "icons/line.xpm"
+#include "icons/meas.xpm"
+#include "icons/meas_x.xpm"
+#include "icons/meas_y.xpm"
+#include "icons/pad.xpm"
+#include "icons/point.xpm"
+#include "icons/delete.xpm"
+#include "icons/rect.xpm"
+#include "icons/vec.xpm"
+
+
+static GtkWidget *ev_point, *ev_frame;
+static GtkWidget *active_tool;
+static struct tool_ops *active_ops = NULL;
+static struct inst *hover_inst = NULL;
+static GtkWidget *frame_image, *frame_image_locked, *frame_image_ready;
+
+static struct drag_state {
+ struct inst *inst; /* non-NULL if dragging an existing object */
+ struct inst *new; /* non-NULL if dragging a new object */
+ int anchors_n; /* number of anchors, 0 if no moving */
+ int anchor_i; /* current anchor */
+ struct vec **anchors[3];
+} drag = {
+ .new = NULL,
+ .anchors_n = 0,
+};
+
+static struct coord last_canvas_pos;
+
+
+static struct vec *new_vec(struct inst *base)
+{
+ struct vec *vec, **walk;
+
+ vec = alloc_type(struct vec);
+ vec->name = NULL;
+ vec->base = inst_get_vec(base);
+ vec->next = NULL;
+ vec->frame = active_frame;
+ vec->samples = NULL;
+ for (walk = &active_frame->vecs; *walk; walk = &(*walk)->next);
+ *walk = vec;
+ return vec;
+}
+
+
+static struct obj *new_obj(enum obj_type type, struct inst *base)
+{
+ struct obj *obj, **walk;
+
+ obj = alloc_type(struct obj);
+ obj->type = type;
+ obj->frame = active_frame;
+ obj->base = inst_get_vec(base);
+ obj->next = NULL;
+ obj->lineno = 0;
+ for (walk = &active_frame->objs; *walk; walk = &(*walk)->next);
+ *walk = obj;
+ return obj;
+}
+
+
+/* ----- shared functions -------------------------------------------------- */
+
+
+struct pix_buf *draw_move_line_common(struct inst *inst,
+ struct coord end, struct coord pos, int i)
+{
+ struct coord from, to;
+ struct pix_buf *buf;
+
+ from = translate(inst->base);
+ to = translate(end);
+ pos = translate(pos);
+ switch (i) {
+ case 0:
+ from = pos;
+ break;
+ case 1:
+ to = pos;
+ break;
+ default:
+ abort();
+ }
+ buf = save_pix_buf(DA, from.x, from.y, to.x, to.y, 1);
+ gdk_draw_line(DA, gc_drag, from.x, from.y, to.x, to.y);
+ return buf;
+}
+
+
+static struct pix_buf *draw_move_rect_common(struct inst *inst,
+ struct coord other, struct coord pos, int i)
+{
+ struct coord min, max;
+ struct pix_buf *buf;
+
+ min = translate(inst->base);
+ max = translate(other);
+ pos = translate(pos);
+ switch (i) {
+ case 0:
+ min = pos;
+ break;
+ case 1:
+ max = pos;
+ break;
+ default:
+ abort();
+ }
+ sort_coord(&min, &max);
+ buf = save_pix_buf(DA, min.x, min.y, max.x, max.y, 1);
+ gdk_draw_rectangle(DA, gc_drag, FALSE,
+ min.x, min.y, max.x-min.x, max.y-min.y);
+ return buf;
+}
+
+
+static struct pix_buf *hover_common(GdkGC *gc, struct coord center, unit_type
r)
+{
+ struct pix_buf *buf;
+
+ center = translate(center);
+ buf = save_pix_buf(DA,
+ center.x-r, center.y-r, center.x+r, center.y+r, 2);
+ draw_circle(DA, gc, FALSE, center.x, center.y, VEC_EYE_R);
+ return buf;
+}
+
+
+/* ----- delete ------------------------------------------------------------ */
+
+
+static void click_delete(struct coord pos)
+{
+ inst_deselect();
+ inst_select(pos);
+ if (selected_inst) {
+ tool_dehover();
+ inst_delete(selected_inst);
+ }
+ change_world();
+ tool_reset();
+}
+
+
+static struct tool_ops delete_ops = {
+ .click = click_delete,
+};
+
+
+/* ----- vec --------------------------------------------------------------- */
+
+
+static struct coord gridify(struct coord base, struct coord pos)
+{
+ struct coord new;
+ unit_type unit = mm_to_units(0.1);
+
+ new.x = pos.x-((pos.x-base.x) % unit);
+ new.y = pos.y-((pos.y-base.y) % unit);
+ if (new.x != base.x || new.y != base.y)
+ return new;
+ if (fabs(pos.x-base.x) > fabs(pos.y-base.y))
+ new.x += pos.x > base.x ? unit : -unit;
+ else
+ new.y += pos.y > base.y ? unit : -unit;
+ return new;
+}
+
+
+static struct pix_buf *drag_new_vec(struct inst *from, struct coord to)
+{
+ struct coord pos;
+ struct pix_buf *buf;
+
+ pos = inst_get_point(from);
+ to = gridify(pos, to);
+ status_set_type_x("dX =");
+ status_set_type_y("dX =");
+ status_set_x("%lg mm", units_to_mm(to.x-pos.x));
+ status_set_y("%lg mm", units_to_mm(to.y-pos.y));
+ pos = translate(pos);
+ to = translate(to);
+ buf = save_pix_buf(DA, pos.x, pos.y, to.x, to.y, 1);
+ gdk_draw_line(DA, gc_drag, pos.x, pos.y, to.x, to.y);
+ return buf;
+}
+
+
+struct pix_buf *draw_move_vec(struct inst *inst, struct coord pos, int i)
+{
+ return draw_move_line_common(inst,
+ add_vec(sub_vec(inst->u.rect.end, inst->base), pos), pos, i);
+}
+
+
+struct pix_buf *gui_hover_vec(struct inst *self)
+{
+ return hover_common(gc_vec[mode_hover],
+ self->u.rect.end, VEC_EYE_R);
+}
+
+
+static int end_new_raw_vec(struct inst *from, struct coord to)
+{
+ struct vec *vec;
+ struct coord pos;
+
+ vec = new_vec(from);
+ pos = inst_get_point(from);
+ to = gridify(pos, to);
+ vec->x = new_num(make_mm(units_to_mm(to.x-pos.x)));
+ vec->y = new_num(make_mm(units_to_mm(to.y-pos.y)));
+ return 1;
+}
+
+
+static struct tool_ops vec_ops = {
+ .drag_new = drag_new_vec,
+ .end_new_raw = end_new_raw_vec,
+};
+
+
+/* ----- line -------------------------------------------------------------- */
+
+
+struct pix_buf *drag_new_line(struct inst *from, struct coord to)
+{
+ struct coord pos;
+ struct pix_buf *buf;
+
+ pos = translate(inst_get_point(from));
+ to = translate(to);
+ buf = save_pix_buf(DA, pos.x, pos.y, to.x, to.y, 1);
+ gdk_draw_line(DA, gc_drag, pos.x, pos.y, to.x, to.y);
+ return buf;
+}
+
+
+struct pix_buf *draw_move_line(struct inst *inst, struct coord pos, int i)
+{
+ return draw_move_line_common(inst, inst->u.rect.end, pos, i);
+}
+
+
+static int end_new_line(struct inst *from, struct inst *to)
+{
+ struct obj *obj;
+
+ if (from == to)
+ return 0;
+ obj = new_obj(ot_line, from);
+ obj->u.line.other = inst_get_vec(to);
+ obj->u.line.width = NULL;
+ return 1;
+}
+
+
+static struct tool_ops line_ops = {
+ .drag_new = drag_new_line,
+ .end_new = end_new_line,
+};
+
+
+/* ----- rect -------------------------------------------------------------- */
+
+
+static struct pix_buf *drag_new_rect(struct inst *from, struct coord to)
+{
+ struct coord pos;
+ struct pix_buf *buf;
+
+ pos = translate(inst_get_point(from));
+ to = translate(to);
+ sort_coord(&pos, &to);
+ buf = save_pix_buf(DA, pos.x, pos.y, to.x, to.y, 1);
+ gdk_draw_rectangle(DA, gc_drag, FALSE,
+ pos.x, pos.y, to.x-pos.x, to.y-pos.y);
+ return buf;
+}
+
+
+struct pix_buf *draw_move_rect(struct inst *inst, struct coord pos, int i)
+{
+ return draw_move_rect_common(inst, inst->u.rect.end, pos, i);
+}
+
+
+static int end_new_rect(struct inst *from, struct inst *to)
+{
+ struct obj *obj;
+
+ if (from == to)
+ return 0;
+ obj = new_obj(ot_rect, from);
+ obj->u.rect.other = inst_get_vec(to);
+ obj->u.rect.width = NULL;
+ return 1;
+}
+
+
+static struct tool_ops rect_ops = {
+ .drag_new = drag_new_rect,
+ .end_new = end_new_rect,
+};
+
+
+/* ----- pad --------------------------------------------------------------- */
+
+
+static int end_new_pad(struct inst *from, struct inst *to)
+{
+ struct obj *obj;
+
+ if (from == to)
+ return 0;
+ obj = new_obj(ot_pad, from);
+ obj->u.pad.other = inst_get_vec(to);
+ obj->u.pad.name = stralloc("?");
+ return 1;
+}
+
+
+struct pix_buf *draw_move_pad(struct inst *inst, struct coord pos, int i)
+{
+ return draw_move_rect_common(inst, inst->u.pad.other, pos, i);
+}
+
+
+static struct tool_ops pad_ops = {
+ .drag_new = drag_new_rect,
+ .end_new = end_new_pad,
+};
+
+
+/* ----- circ -------------------------------------------------------------- */
+
+
+static struct pix_buf *drag_new_circ(struct inst *from, struct coord to)
+{
+ struct coord pos;
+ struct pix_buf *buf;
+ double r;
+
+ pos = translate(inst_get_point(from));
+ to = translate(to);
+ r = hypot(to.x-pos.x, to.y-pos.y);
+ buf = save_pix_buf(DA, pos.x-r, pos.y-r, pos.x+r, pos.y+r, 1);
+ draw_circle(DA, gc_drag, FALSE, pos.x, pos.y, r);
+ return buf;
+}
+
+
+static int end_new_circ(struct inst *from, struct inst *to)
+{
+ struct obj *obj;
+
+ if (from == to)
+ return 0;
+ obj = new_obj(ot_arc, from);
+ obj->u.arc.start = inst_get_vec(to);
+ obj->u.arc.end = inst_get_vec(to);
+ obj->u.arc.width = NULL;
+ return 1;
+}
+
+
+struct pix_buf *draw_move_arc(struct inst *inst, struct coord pos, int i)
+{
+ struct coord c, from, to, end;
+ double r, r_save, a1, a2;
+ struct pix_buf *buf;
+
+ c = translate(inst->base);
+ from =
+ translate(rotate_r(inst->base, inst->u.arc.r, inst->u.arc.a1));
+ to =
+ translate(rotate_r(inst->base, inst->u.arc.r, inst->u.arc.a2));
+ pos = translate(pos);
+ switch (i) {
+ case 0:
+ c = pos;
+ break;
+ case 1:
+ from = pos;
+ if (inst->obj->u.arc.start != inst->obj->u.arc.end)
+ break;
+ /* fall through */
+ case 2:
+ to = pos;
+ break;
+ default:
+ abort();
+ }
+ r = hypot(from.x-c.x, from.y-c.y);
+ /*
+ * the screen coordinate system is reversed with y growing downward,
+ * so we have to negate the angles.
+ */
+ a1 = -theta(c, from);
+ a2 = -theta(c, to);
+ if (a2 < a1)
+ a2 += 360.0;
+
+ if (i != 2)
+ r_save = r;
+ else {
+ r_save = hypot(to.x-c.x, to.y-c.y);
+ if (r > r_save)
+ r_save = r;
+ }
+ buf = save_pix_buf(DA,
+ c.x-r_save, c.y-r_save, c.x+r_save, c.y+r_save, 1);
+ draw_arc(DA, gc_drag, FALSE, c.x, c.y, r, a1, a2);
+ if (i == 2) {
+ end = rotate_r(c, r_save, -a2);
+ gdk_draw_line(DA, gc_drag, c.x, c.y, end.x, end.y);
+ }
+ return buf;
+}
+
+
+void do_move_to_arc(struct inst *inst, struct vec *vec, int i)
+{
+ struct obj *obj = inst->obj;
+ int is_circle;
+
+ is_circle = obj->u.arc.start == obj->u.arc.end;
+ switch (i) {
+ case 0:
+ obj->base = vec;
+ break;
+ case 1:
+ obj->u.arc.start = vec;
+ if (!is_circle)
+ break;
+ /* fall through */
+ case 2:
+ obj->u.arc.end = vec;
+ break;
+ default:
+ abort();
+ }
+}
+
+
+static struct tool_ops circ_ops = {
+ .drag_new = drag_new_circ,
+ .end_new = end_new_circ,
+};
+
+
+/* ----- frame helper ------------------------------------------------------ */
+
+
+static int is_parent_of(const struct frame *p, const struct frame *c)
+{
+ const struct obj *obj;
+
+ if (p == c)
+ return 1;
+ for (obj = p->objs; obj; obj = obj->next)
+ if (obj->type == ot_frame)
+ if (is_parent_of(obj->u.frame.ref, c))
+ return 1;
+ return 0;
+}
+
+
+/* ----- frame cache ------------------------------------------------------- */
+
+
+static struct frame *locked_frame = NULL;
+
+
+static void remove_child(GtkWidget *widget, gpointer data)
+{
+ gtk_container_remove(GTK_CONTAINER(data), widget);
+}
+
+
+static void set_frame_image(GtkWidget *image)
+{
+ gtk_container_foreach(GTK_CONTAINER(ev_frame), remove_child, ev_frame);
+ gtk_container_add(GTK_CONTAINER(ev_frame), image);
+ gtk_widget_show_all(ev_frame);
+}
+
+
+void tool_frame_update(void)
+{
+ set_frame_image(!locked_frame ? frame_image :
+ is_parent_of(locked_frame, active_frame) ?
+ frame_image_locked : frame_image_ready);
+}
+
+
+void tool_frame_deleted(const struct frame *frame)
+{
+ if (frame == locked_frame) {
+ locked_frame = NULL;
+ set_frame_image(frame_image);
+ }
+}
+
+
+static void tool_selected_frame(void)
+{
+ if (active_frame != root_frame) {
+ locked_frame = active_frame;
+ set_frame_image(frame_image_locked);
+ }
+}
+
+
+/* ----- frame ------------------------------------------------------------- */
+
+
+struct pix_buf *draw_move_frame(struct inst *inst, struct coord pos, int i)
+{
+ struct pix_buf *buf;
+ int r = FRAME_EYE_R2;
+
+ pos = translate(pos);
+ buf = save_pix_buf(DA, pos.x-r, pos.y-r, pos.x+r, pos.y+r, 1);
+ draw_arc(DA, gc_drag, FALSE, pos.x, pos.y, r, 0, 360);
+ return buf;
+}
+
+
+struct pix_buf *gui_hover_frame(struct inst *self)
+{
+ return hover_common(gc_frame[mode_hover],
+ self->base, FRAME_EYE_R2);
+}
+
+
+static int end_new_frame(struct inst *from, struct inst *to)
+{
+ struct obj *obj;
+
+ if (!locked_frame || is_parent_of(locked_frame, active_frame))
+ return 0;
+ obj = new_obj(ot_frame, from);
+ obj->u.frame.ref = locked_frame;
+ obj->u.frame.lineno = 0;
+ if (!locked_frame->active_ref)
+ locked_frame->active_ref = obj;
+ locked_frame = NULL;
+ tool_frame_update();
+ return 1;
+}
+
+
+static struct tool_ops frame_ops = {
+ .tool_selected = tool_selected_frame,
+ .drag_new = NULL,
+ .end_new = end_new_frame,
+};
+
+
+/* ----- moving references ------------------------------------------------- */
+
+
+static int may_move(struct inst *curr)
+{
+ if (!selected_inst)
+ return 0;
+ if (drag.anchors_n)
+ return 0; /* already moving something else */
+ drag.anchors_n = inst_anchors(selected_inst, drag.anchors);
+ for (drag.anchor_i = 0; drag.anchor_i != drag.anchors_n;
+ drag.anchor_i++)
+ if (*drag.anchors[drag.anchor_i] == inst_get_vec(curr))
+ return 1;
+ drag.anchors_n = 0;
+ return 0;
+}
+
+
+static int would_be_equal(const struct drag_state *state,
+ int a, int b, struct inst *curr)
+{
+ const struct vec *va;
+ const struct vec *vb;
+
+ va = a == state->anchor_i ? inst_get_vec(curr) : *state->anchors[a];
+ vb = b == state->anchor_i ? inst_get_vec(curr) : *state->anchors[b];
+ return va == vb;
+}
+
+
+static int may_move_to(const struct drag_state *state, struct inst *curr)
+{
+ assert(drag.inst);
+ assert(state->anchors_n);
+ switch (state->anchors_n) {
+ case 3:
+ if (would_be_equal(state, 0, 2, curr))
+ return 0;
+ /* fall through */
+ case 2:
+ if (would_be_equal(state, 0, 1, curr))
+ return 0;
+ /* fall through */
+ case 1:
+ return 1;
+ default:
+ abort();
+ }
+}
+
+
+static void do_move_to(struct drag_state *state, struct inst *curr)
+{
+ assert(may_move_to(state, curr));
+ *state->anchors[state->anchor_i] = inst_get_vec(curr);
+}
+
+
+/* ----- hover ------------------------------------------------------------- */
+
+
+static struct pix_buf *hover_save_and_draw(void *user)
+{
+ return inst_hover(hover_inst);
+}
+
+
+void tool_dehover(void)
+{
+ if (!hover_inst)
+ return;
+ over_leave();
+ hover_inst = NULL;
+}
+
+
+void tool_hover(struct coord pos)
+{
+ struct inst *curr;
+
+ if (active_ops && active_ops->find_point)
+ curr = active_ops->find_point(pos);
+ else
+ curr = inst_find_point(pos);
+ if ((drag.new && curr == drag.new) || (drag.inst && curr == drag.inst))
+ return;
+ if (curr && !active_ops) {
+ if (drag.anchors_n) {
+ if (!may_move_to(&drag, curr))
+ curr = NULL;
+ } else {
+ if (!may_move(curr))
+ curr = NULL;
+ drag.anchors_n = 0;
+ }
+ }
+ if (curr == hover_inst)
+ return;
+ if (hover_inst) {
+ over_leave();
+ hover_inst = NULL;
+ }
+ if (!curr)
+ return;
+ hover_inst = curr;
+ over_enter(hover_save_and_draw, NULL);
+}
+
+
+/* ----- mouse actions ----------------------------------------------------- */
+
+
+static struct pix_buf *drag_save_and_draw(void *user, struct coord to)
+{
+ if (drag.new) {
+ assert(active_ops);
+ return active_ops->drag_new(drag.new, to);
+ } else {
+ return inst_draw_move(drag.inst, to, drag.anchor_i);
+ }
+}
+
+
+int tool_consider_drag(struct coord pos)
+{
+ struct inst *curr;
+
+ assert(!drag.new);
+ assert(!drag.anchors_n);
+ last_canvas_pos = translate(pos);
+ if (active_ops && active_ops->click) {
+ active_ops->click(pos);
+ return 0;
+ }
+ if (active_ops && active_ops->find_point)
+ curr = active_ops->find_point(pos);
+ else
+ curr = inst_find_point(pos);
+ if (!curr)
+ return 0;
+ tool_dehover();
+ if (active_ops) {
+ if (active_ops->drag_new) {
+ if (active_ops->begin_drag_new)
+ active_ops->begin_drag_new(curr);
+ drag.inst = NULL;
+ drag.new = curr;
+ over_begin(drag_save_and_draw, NULL, pos);
+ return 1;
+ } else {
+ /* object is created without dragging */
+ if (active_ops->end_new(curr, NULL)) {
+ tool_cancel_drag();
+ return -1;
+ }
+ return 0;
+ }
+ }
+ if (!may_move(curr))
+ return 0;
+ drag.inst = selected_inst;
+ drag.new = NULL;
+ over_begin(drag_save_and_draw, NULL, pos);
+ return 1;
+}
+
+
+void tool_drag(struct coord to)
+{
+ last_canvas_pos = translate(to);
+ over_move(to);
+}
+
+
+void tool_cancel_drag(void)
+{
+ over_end();
+ tool_dehover();
+ tool_reset();
+ drag.new = NULL;
+ active_ops = NULL;
+ drag.anchors_n = 0;
+}
+
+
+int tool_end_drag(struct coord to)
+{
+ struct drag_state state = drag;
+ struct inst *end;
+ struct tool_ops *ops = active_ops;
+
+ tool_cancel_drag();
+ if (state.new && ops->end_new_raw)
+ return ops->end_new_raw(state.new, to);
+ if (ops->find_point)
+ end = ops->find_point(to);
+ else
+ end = inst_find_point(to);
+ if (!end)
+ return 0;
+ if (state.new)
+ return ops->end_new(state.new, end);
+ if (!may_move_to(&state, end))
+ return 0;
+ if (!inst_do_move_to(drag.inst, inst_get_vec(end), state.anchor_i))
+ do_move_to(&state, end);
+ return 1;
+}
+
+
+void tool_redraw(void)
+{
+ over_reset();
+ if (!drag.new && !drag.anchors_n)
+ return;
+ tool_hover(last_canvas_pos);
+ over_begin(drag_save_and_draw, NULL,
+ canvas_to_coord(last_canvas_pos.x, last_canvas_pos.y));
+}
+
+
+/* ----- tool bar creation ------------------------------------------------- */
+
+
+static void tool_select(GtkWidget *evbox, struct tool_ops *ops)
+{
+ GdkColor col;
+
+ if (active_tool) {
+ if (active_ops && active_ops->tool_deselected)
+ active_ops->tool_deselected();
+ col = get_color(TOOL_UNSELECTED);
+ gtk_widget_modify_bg(active_tool, GTK_STATE_NORMAL, &col);
+ active_tool = NULL;
+ }
+ col = get_color(TOOL_SELECTED);
+ gtk_widget_modify_bg(evbox, GTK_STATE_NORMAL, &col);
+ active_tool = evbox;
+ active_ops = ops;
+ if (ops && ops->tool_selected)
+ ops->tool_selected();
+}
+
+
+void tool_reset(void)
+{
+ over_reset();
+ tool_select(ev_point, NULL);
+}
+
+
+static gboolean tool_button_press_event(GtkWidget *widget,
+ GdkEventButton *event, gpointer data)
+{
+ tool_select(widget, data);
+ return TRUE;
+}
+
+
+static GtkWidget *make_image(GdkDrawable *drawable, char **xpm)
+{
+ GdkPixmap *pixmap;
+ GtkWidget *image;
+
+ pixmap = gdk_pixmap_create_from_xpm_d(drawable, NULL, NULL, xpm);
+ image = gtk_image_new_from_pixmap(pixmap, NULL);
+ gtk_misc_set_padding(GTK_MISC(image), 1, 1);
+ return image;
+}
+
+
+static GtkWidget *tool_button(GtkWidget *bar, GdkDrawable *drawable,
+ char **xpm, GtkWidget *last_evbox, struct tool_ops *ops)
+{
+ GtkWidget *image, *evbox;
+ GtkToolItem *item;
+ GtkToolItem *last = NULL;
+
+ if (last_evbox)
+ last = GTK_TOOL_ITEM(gtk_widget_get_ancestor(last_evbox,
+ GTK_TYPE_TOOL_ITEM));
+
+/*
+ * gtk_radio_tool_button_new_from_widget is *huge*. we try to do things in a
+ * more compact way.
+ */
+#if 0
+ if (last)
+ item = gtk_radio_tool_button_new_from_widget(
+ GTK_RADIO_TOOL_BUTTON(last));
+ else
+ item = gtk_radio_tool_button_new(NULL);
+ gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(item), image);
+#else
+ evbox = gtk_event_box_new();
+ if (xpm) {
+ image = make_image(drawable, xpm);
+ gtk_container_add(GTK_CONTAINER(evbox), image);
+ }
+ g_signal_connect(G_OBJECT(evbox), "button_press_event",
+ G_CALLBACK(tool_button_press_event), ops);
+
+ item = gtk_tool_item_new();
+ gtk_container_add(GTK_CONTAINER(item), evbox);
+
+ gtk_container_set_border_width(GTK_CONTAINER(item), 0);
+#endif
+
+ gtk_toolbar_insert(GTK_TOOLBAR(bar), item, -1);
+
+ return evbox;
+}
+
+
+static void tool_separator(GtkWidget *bar)
+{
+ GtkToolItem *item;
+
+ item = gtk_separator_tool_item_new();
+ gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(item), FALSE);
+ gtk_toolbar_insert(GTK_TOOLBAR(bar), item, -1);
+}
+
+
+GtkWidget *gui_setup_tools(GdkDrawable *drawable)
+{
+ GtkWidget *bar;
+ GtkWidget *last;
+
+ bar = gtk_toolbar_new();
+ gtk_toolbar_set_style(GTK_TOOLBAR(bar), GTK_TOOLBAR_ICONS);
+ gtk_toolbar_set_orientation(GTK_TOOLBAR(bar),
+ GTK_ORIENTATION_VERTICAL);
+
+ ev_point = tool_button(bar, drawable, xpm_point, NULL, NULL);
+ last = tool_button(bar, drawable, xpm_delete, ev_point, &delete_ops);
+ tool_separator(bar);
+ last = tool_button(bar, drawable, xpm_vec, last, &vec_ops);
+ ev_frame = tool_button(bar, drawable, NULL, last, &frame_ops);
+ last = ev_frame;
+ last = tool_button(bar, drawable, xpm_pad, last, &pad_ops);
+ last = tool_button(bar, drawable, xpm_line, last, &line_ops);
+ last = tool_button(bar, drawable, xpm_rect, last, &rect_ops);
+ last = tool_button(bar, drawable, xpm_circ, last, &circ_ops);
+ tool_separator(bar);
+ last = tool_button(bar, drawable, xpm_meas, last, &meas_ops);
+ last = tool_button(bar, drawable, xpm_meas_x, last, &meas_ops_x);
+ last = tool_button(bar, drawable, xpm_meas_y, last, &meas_ops_y);
+
+ frame_image = gtk_widget_ref(make_image(drawable, xpm_frame));
+ frame_image_locked =
+ gtk_widget_ref(make_image(drawable, xpm_frame_locked));
+ frame_image_ready =
+ gtk_widget_ref(make_image(drawable, xpm_frame_ready));
+ set_frame_image(frame_image);
+
+ tool_reset();
+
+ return bar;
+}
Copied: trunk/eda/fped/gui_tool.h (from rev 5407, trunk/eda/fped/gui_tools.h)
===================================================================
--- trunk/eda/fped/gui_tool.h (rev 0)
+++ trunk/eda/fped/gui_tool.h 2009-08-08 19:44:17 UTC (rev 5410)
@@ -0,0 +1,78 @@
+/*
+ * gui_tool.h - GUI, tool bar
+ *
+ * Written 2009 by Werner Almesberger
+ * Copyright 2009 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_TOOL_H
+#define GUI_TOOL_H
+
+#include <gtk/gtk.h>
+
+#include "inst.h"
+
+
+struct tool_ops {
+ void (*tool_selected)(void);
+ void (*tool_deselected)(void);
+ struct inst *(*find_point)(struct coord pos);
+ void (*click)(struct coord pos);
+ void (*begin_drag_new)(struct inst *from);
+// in inst
+// void (*begin_drag_move)struct inst *from, int anchor_i);
+ struct pix_buf *(*drag_new)(struct inst *from, struct coord to);
+ int (*end_new_raw)(struct inst *from, struct coord to);
+ int (*end_new)(struct inst *from, struct inst *to);
+};
+
+
+struct pix_buf *draw_move_vec(struct inst *inst, struct coord pos, int i);
+struct pix_buf *draw_move_line(struct inst *inst, struct coord pos, int i);
+struct pix_buf *draw_move_rect(struct inst *inst, struct coord pos, int i);
+struct pix_buf *draw_move_pad(struct inst *inst, struct coord pos, int i);
+struct pix_buf *draw_move_arc(struct inst *inst, struct coord pos, int i);
+struct pix_buf *draw_move_meas(struct inst *inst, struct coord pos, int i);
+struct pix_buf *draw_move_frame(struct inst *inst, struct coord pos, int i);
+
+struct pix_buf *gui_hover_vec(struct inst *self);
+struct pix_buf *gui_hover_frame(struct inst *self);
+
+void do_move_to_arc(struct inst *inst, struct vec *vec, int i);
+
+void tool_dehover(void);
+void tool_hover(struct coord pos);
+int tool_consider_drag(struct coord pos);
+void tool_drag(struct coord to);
+void tool_cancel_drag(void);
+int tool_end_drag(struct coord to);
+void tool_redraw(void);
+
+/*
+ * The following functions are for measurements which are now in a separate
+ * compilation unit.
+ */
+
+struct pix_buf *draw_move_line_common(struct inst *inst,
+ struct coord end, struct coord pos, int i);
+struct pix_buf *drag_new_line(struct inst *from, struct coord to);
+
+
+/*
+ * Cache the frame and track it.
+ */
+
+void tool_frame_update(void);
+void tool_frame_deleted(const struct frame *frame);
+
+void tool_reset(void);
+
+GtkWidget *gui_setup_tools(GdkDrawable *drawable);
+
+#endif /* !GUI_TOOL_H */
Deleted: trunk/eda/fped/gui_tools.c
===================================================================
--- trunk/eda/fped/gui_tools.c 2009-08-08 19:35:16 UTC (rev 5409)
+++ trunk/eda/fped/gui_tools.c 2009-08-08 19:44:17 UTC (rev 5410)
@@ -1,959 +0,0 @@
-/*
- * gui_tools.c - GUI, tool bar
- *
- * Written 2009 by Werner Almesberger
- * Copyright 2009 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.
- */
-
-
-#include <stdlib.h>
-#include <math.h>
-#include <assert.h>
-#include <gtk/gtk.h>
-
-#include "util.h"
-#include "inst.h"
-#include "obj.h"
-#include "gui_util.h"
-#include "gui_style.h"
-#include "gui_inst.h"
-#include "gui_over.h"
-#include "gui_canvas.h"
-#include "gui_status.h"
-#include "gui.h"
-#include "gui_meas.h"
-#include "gui_tools.h"
-
-
-#include "icons/circ.xpm"
-#include "icons/frame.xpm"
-#include "icons/frame_locked.xpm"
-#include "icons/frame_ready.xpm"
-#include "icons/line.xpm"
-#include "icons/meas.xpm"
-#include "icons/meas_x.xpm"
-#include "icons/meas_y.xpm"
-#include "icons/pad.xpm"
-#include "icons/point.xpm"
-#include "icons/delete.xpm"
-#include "icons/rect.xpm"
-#include "icons/vec.xpm"
-
-
-static GtkWidget *ev_point, *ev_frame;
-static GtkWidget *active_tool;
-static struct tool_ops *active_ops = NULL;
-static struct inst *hover_inst = NULL;
-static GtkWidget *frame_image, *frame_image_locked, *frame_image_ready;
-
-static struct drag_state {
- struct inst *inst; /* non-NULL if dragging an existing object */
- struct inst *new; /* non-NULL if dragging a new object */
- int anchors_n; /* number of anchors, 0 if no moving */
- int anchor_i; /* current anchor */
- struct vec **anchors[3];
-} drag = {
- .new = NULL,
- .anchors_n = 0,
-};
-
-static struct coord last_canvas_pos;
-
-
-static struct vec *new_vec(struct inst *base)
-{
- struct vec *vec, **walk;
-
- vec = alloc_type(struct vec);
- vec->name = NULL;
- vec->base = inst_get_vec(base);
- vec->next = NULL;
- vec->frame = active_frame;
- vec->samples = NULL;
- for (walk = &active_frame->vecs; *walk; walk = &(*walk)->next);
- *walk = vec;
- return vec;
-}
-
-
-static struct obj *new_obj(enum obj_type type, struct inst *base)
-{
- struct obj *obj, **walk;
-
- obj = alloc_type(struct obj);
- obj->type = type;
- obj->frame = active_frame;
- obj->base = inst_get_vec(base);
- obj->next = NULL;
- obj->lineno = 0;
- for (walk = &active_frame->objs; *walk; walk = &(*walk)->next);
- *walk = obj;
- return obj;
-}
-
-
-/* ----- shared functions -------------------------------------------------- */
-
-
-struct pix_buf *draw_move_line_common(struct inst *inst,
- struct coord end, struct coord pos, int i)
-{
- struct coord from, to;
- struct pix_buf *buf;
-
- from = translate(inst->base);
- to = translate(end);
- pos = translate(pos);
- switch (i) {
- case 0:
- from = pos;
- break;
- case 1:
- to = pos;
- break;
- default:
- abort();
- }
- buf = save_pix_buf(DA, from.x, from.y, to.x, to.y, 1);
- gdk_draw_line(DA, gc_drag, from.x, from.y, to.x, to.y);
- return buf;
-}
-
-
-static struct pix_buf *draw_move_rect_common(struct inst *inst,
- struct coord other, struct coord pos, int i)
-{
- struct coord min, max;
- struct pix_buf *buf;
-
- min = translate(inst->base);
- max = translate(other);
- pos = translate(pos);
- switch (i) {
- case 0:
- min = pos;
- break;
- case 1:
- max = pos;
- break;
- default:
- abort();
- }
- sort_coord(&min, &max);
- buf = save_pix_buf(DA, min.x, min.y, max.x, max.y, 1);
- gdk_draw_rectangle(DA, gc_drag, FALSE,
- min.x, min.y, max.x-min.x, max.y-min.y);
- return buf;
-}
-
-
-static struct pix_buf *hover_common(GdkGC *gc, struct coord center, unit_type
r)
-{
- struct pix_buf *buf;
-
- center = translate(center);
- buf = save_pix_buf(DA,
- center.x-r, center.y-r, center.x+r, center.y+r, 2);
- draw_circle(DA, gc, FALSE, center.x, center.y, VEC_EYE_R);
- return buf;
-}
-
-
-/* ----- delete ------------------------------------------------------------ */
-
-
-static void click_delete(struct coord pos)
-{
- inst_deselect();
- inst_select(pos);
- if (selected_inst) {
- tool_dehover();
- inst_delete(selected_inst);
- }
- change_world();
- tool_reset();
-}
-
-
-static struct tool_ops delete_ops = {
- .click = click_delete,
-};
-
-
-/* ----- vec --------------------------------------------------------------- */
-
-
-static struct coord gridify(struct coord base, struct coord pos)
-{
- struct coord new;
- unit_type unit = mm_to_units(0.1);
-
- new.x = pos.x-((pos.x-base.x) % unit);
- new.y = pos.y-((pos.y-base.y) % unit);
- if (new.x != base.x || new.y != base.y)
- return new;
- if (fabs(pos.x-base.x) > fabs(pos.y-base.y))
- new.x += pos.x > base.x ? unit : -unit;
- else
- new.y += pos.y > base.y ? unit : -unit;
- return new;
-}
-
-
-static struct pix_buf *drag_new_vec(struct inst *from, struct coord to)
-{
- struct coord pos;
- struct pix_buf *buf;
-
- pos = inst_get_point(from);
- to = gridify(pos, to);
- status_set_type_x("dX =");
- status_set_type_y("dX =");
- status_set_x("%lg mm", units_to_mm(to.x-pos.x));
- status_set_y("%lg mm", units_to_mm(to.y-pos.y));
- pos = translate(pos);
- to = translate(to);
- buf = save_pix_buf(DA, pos.x, pos.y, to.x, to.y, 1);
- gdk_draw_line(DA, gc_drag, pos.x, pos.y, to.x, to.y);
- return buf;
-}
-
-
-struct pix_buf *draw_move_vec(struct inst *inst, struct coord pos, int i)
-{
- return draw_move_line_common(inst,
- add_vec(sub_vec(inst->u.rect.end, inst->base), pos), pos, i);
-}
-
-
-struct pix_buf *gui_hover_vec(struct inst *self)
-{
- return hover_common(gc_vec[mode_hover],
- self->u.rect.end, VEC_EYE_R);
-}
-
-
-static int end_new_raw_vec(struct inst *from, struct coord to)
-{
- struct vec *vec;
- struct coord pos;
-
- vec = new_vec(from);
- pos = inst_get_point(from);
- to = gridify(pos, to);
- vec->x = new_num(make_mm(units_to_mm(to.x-pos.x)));
- vec->y = new_num(make_mm(units_to_mm(to.y-pos.y)));
- return 1;
-}
-
-
-static struct tool_ops vec_ops = {
- .drag_new = drag_new_vec,
- .end_new_raw = end_new_raw_vec,
-};
-
-
-/* ----- line -------------------------------------------------------------- */
-
-
-struct pix_buf *drag_new_line(struct inst *from, struct coord to)
-{
- struct coord pos;
- struct pix_buf *buf;
-
- pos = translate(inst_get_point(from));
- to = translate(to);
- buf = save_pix_buf(DA, pos.x, pos.y, to.x, to.y, 1);
- gdk_draw_line(DA, gc_drag, pos.x, pos.y, to.x, to.y);
- return buf;
-}
-
-
-struct pix_buf *draw_move_line(struct inst *inst, struct coord pos, int i)
-{
- return draw_move_line_common(inst, inst->u.rect.end, pos, i);
-}
-
-
-static int end_new_line(struct inst *from, struct inst *to)
-{
- struct obj *obj;
-
- if (from == to)
- return 0;
- obj = new_obj(ot_line, from);
- obj->u.line.other = inst_get_vec(to);
- obj->u.line.width = NULL;
- return 1;
-}
-
-
-static struct tool_ops line_ops = {
- .drag_new = drag_new_line,
- .end_new = end_new_line,
-};
-
-
-/* ----- rect -------------------------------------------------------------- */
-
-
-static struct pix_buf *drag_new_rect(struct inst *from, struct coord to)
-{
- struct coord pos;
- struct pix_buf *buf;
-
- pos = translate(inst_get_point(from));
- to = translate(to);
- sort_coord(&pos, &to);
- buf = save_pix_buf(DA, pos.x, pos.y, to.x, to.y, 1);
- gdk_draw_rectangle(DA, gc_drag, FALSE,
- pos.x, pos.y, to.x-pos.x, to.y-pos.y);
- return buf;
-}
-
-
-struct pix_buf *draw_move_rect(struct inst *inst, struct coord pos, int i)
-{
- return draw_move_rect_common(inst, inst->u.rect.end, pos, i);
-}
-
-
-static int end_new_rect(struct inst *from, struct inst *to)
-{
- struct obj *obj;
-
- if (from == to)
- return 0;
- obj = new_obj(ot_rect, from);
- obj->u.rect.other = inst_get_vec(to);
- obj->u.rect.width = NULL;
- return 1;
-}
-
-
-static struct tool_ops rect_ops = {
- .drag_new = drag_new_rect,
- .end_new = end_new_rect,
-};
-
-
-/* ----- pad --------------------------------------------------------------- */
-
-
-static int end_new_pad(struct inst *from, struct inst *to)
-{
- struct obj *obj;
-
- if (from == to)
- return 0;
- obj = new_obj(ot_pad, from);
- obj->u.pad.other = inst_get_vec(to);
- obj->u.pad.name = stralloc("?");
- return 1;
-}
-
-
-struct pix_buf *draw_move_pad(struct inst *inst, struct coord pos, int i)
-{
- return draw_move_rect_common(inst, inst->u.pad.other, pos, i);
-}
-
-
-static struct tool_ops pad_ops = {
- .drag_new = drag_new_rect,
- .end_new = end_new_pad,
-};
-
-
-/* ----- circ -------------------------------------------------------------- */
-
-
-static struct pix_buf *drag_new_circ(struct inst *from, struct coord to)
-{
- struct coord pos;
- struct pix_buf *buf;
- double r;
-
- pos = translate(inst_get_point(from));
- to = translate(to);
- r = hypot(to.x-pos.x, to.y-pos.y);
- buf = save_pix_buf(DA, pos.x-r, pos.y-r, pos.x+r, pos.y+r, 1);
- draw_circle(DA, gc_drag, FALSE, pos.x, pos.y, r);
- return buf;
-}
-
-
-static int end_new_circ(struct inst *from, struct inst *to)
-{
- struct obj *obj;
-
- if (from == to)
- return 0;
- obj = new_obj(ot_arc, from);
- obj->u.arc.start = inst_get_vec(to);
- obj->u.arc.end = inst_get_vec(to);
- obj->u.arc.width = NULL;
- return 1;
-}
-
-
-struct pix_buf *draw_move_arc(struct inst *inst, struct coord pos, int i)
-{
- struct coord c, from, to, end;
- double r, r_save, a1, a2;
- struct pix_buf *buf;
-
- c = translate(inst->base);
- from =
- translate(rotate_r(inst->base, inst->u.arc.r, inst->u.arc.a1));
- to =
- translate(rotate_r(inst->base, inst->u.arc.r, inst->u.arc.a2));
- pos = translate(pos);
- switch (i) {
- case 0:
- c = pos;
- break;
- case 1:
- from = pos;
- if (inst->obj->u.arc.start != inst->obj->u.arc.end)
- break;
- /* fall through */
- case 2:
- to = pos;
- break;
- default:
- abort();
- }
- r = hypot(from.x-c.x, from.y-c.y);
- /*
- * the screen coordinate system is reversed with y growing downward,
- * so we have to negate the angles.
- */
- a1 = -theta(c, from);
- a2 = -theta(c, to);
- if (a2 < a1)
- a2 += 360.0;
-
- if (i != 2)
- r_save = r;
- else {
- r_save = hypot(to.x-c.x, to.y-c.y);
- if (r > r_save)
- r_save = r;
- }
- buf = save_pix_buf(DA,
- c.x-r_save, c.y-r_save, c.x+r_save, c.y+r_save, 1);
- draw_arc(DA, gc_drag, FALSE, c.x, c.y, r, a1, a2);
- if (i == 2) {
- end = rotate_r(c, r_save, -a2);
- gdk_draw_line(DA, gc_drag, c.x, c.y, end.x, end.y);
- }
- return buf;
-}
-
-
-void do_move_to_arc(struct inst *inst, struct vec *vec, int i)
-{
- struct obj *obj = inst->obj;
- int is_circle;
-
- is_circle = obj->u.arc.start == obj->u.arc.end;
- switch (i) {
- case 0:
- obj->base = vec;
- break;
- case 1:
- obj->u.arc.start = vec;
- if (!is_circle)
- break;
- /* fall through */
- case 2:
- obj->u.arc.end = vec;
- break;
- default:
- abort();
- }
-}
-
-
-static struct tool_ops circ_ops = {
- .drag_new = drag_new_circ,
- .end_new = end_new_circ,
-};
-
-
-/* ----- frame helper ------------------------------------------------------ */
-
-
-static int is_parent_of(const struct frame *p, const struct frame *c)
-{
- const struct obj *obj;
-
- if (p == c)
- return 1;
- for (obj = p->objs; obj; obj = obj->next)
- if (obj->type == ot_frame)
- if (is_parent_of(obj->u.frame.ref, c))
- return 1;
- return 0;
-}
-
-
-/* ----- frame cache ------------------------------------------------------- */
-
-
-static struct frame *locked_frame = NULL;
-
-
-static void remove_child(GtkWidget *widget, gpointer data)
-{
- gtk_container_remove(GTK_CONTAINER(data), widget);
-}
-
-
-static void set_frame_image(GtkWidget *image)
-{
- gtk_container_foreach(GTK_CONTAINER(ev_frame), remove_child, ev_frame);
- gtk_container_add(GTK_CONTAINER(ev_frame), image);
- gtk_widget_show_all(ev_frame);
-}
-
-
-void tool_frame_update(void)
-{
- set_frame_image(!locked_frame ? frame_image :
- is_parent_of(locked_frame, active_frame) ?
- frame_image_locked : frame_image_ready);
-}
-
-
-void tool_frame_deleted(const struct frame *frame)
-{
- if (frame == locked_frame) {
- locked_frame = NULL;
- set_frame_image(frame_image);
- }
-}
-
-
-static void tool_selected_frame(void)
-{
- if (active_frame != root_frame) {
- locked_frame = active_frame;
- set_frame_image(frame_image_locked);
- }
-}
-
-
-/* ----- frame ------------------------------------------------------------- */
-
-
-struct pix_buf *draw_move_frame(struct inst *inst, struct coord pos, int i)
-{
- struct pix_buf *buf;
- int r = FRAME_EYE_R2;
-
- pos = translate(pos);
- buf = save_pix_buf(DA, pos.x-r, pos.y-r, pos.x+r, pos.y+r, 1);
- draw_arc(DA, gc_drag, FALSE, pos.x, pos.y, r, 0, 360);
- return buf;
-}
-
-
-struct pix_buf *gui_hover_frame(struct inst *self)
-{
- return hover_common(gc_frame[mode_hover],
- self->base, FRAME_EYE_R2);
-}
-
-
-static int end_new_frame(struct inst *from, struct inst *to)
-{
- struct obj *obj;
-
- if (!locked_frame || is_parent_of(locked_frame, active_frame))
- return 0;
- obj = new_obj(ot_frame, from);
- obj->u.frame.ref = locked_frame;
- obj->u.frame.lineno = 0;
- if (!locked_frame->active_ref)
- locked_frame->active_ref = obj;
- locked_frame = NULL;
- tool_frame_update();
- return 1;
-}
-
-
-static struct tool_ops frame_ops = {
- .tool_selected = tool_selected_frame,
- .drag_new = NULL,
- .end_new = end_new_frame,
-};
-
-
-/* ----- moving references ------------------------------------------------- */
-
-
-static int may_move(struct inst *curr)
-{
- if (!selected_inst)
- return 0;
- if (drag.anchors_n)
- return 0; /* already moving something else */
- drag.anchors_n = inst_anchors(selected_inst, drag.anchors);
- for (drag.anchor_i = 0; drag.anchor_i != drag.anchors_n;
- drag.anchor_i++)
- if (*drag.anchors[drag.anchor_i] == inst_get_vec(curr))
- return 1;
- drag.anchors_n = 0;
- return 0;
-}
-
-
-static int would_be_equal(const struct drag_state *state,
- int a, int b, struct inst *curr)
-{
- const struct vec *va;
- const struct vec *vb;
-
- va = a == state->anchor_i ? inst_get_vec(curr) : *state->anchors[a];
- vb = b == state->anchor_i ? inst_get_vec(curr) : *state->anchors[b];
- return va == vb;
-}
-
-
-static int may_move_to(const struct drag_state *state, struct inst *curr)
-{
- assert(drag.inst);
- assert(state->anchors_n);
- switch (state->anchors_n) {
- case 3:
- if (would_be_equal(state, 0, 2, curr))
- return 0;
- /* fall through */
- case 2:
- if (would_be_equal(state, 0, 1, curr))
- return 0;
- /* fall through */
- case 1:
- return 1;
- default:
- abort();
- }
-}
-
-
-static void do_move_to(struct drag_state *state, struct inst *curr)
-{
- assert(may_move_to(state, curr));
- *state->anchors[state->anchor_i] = inst_get_vec(curr);
-}
-
-
-/* ----- hover ------------------------------------------------------------- */
-
-
-static struct pix_buf *hover_save_and_draw(void *user)
-{
- return inst_hover(hover_inst);
-}
-
-
-void tool_dehover(void)
-{
- if (!hover_inst)
- return;
- over_leave();
- hover_inst = NULL;
-}
-
-
-void tool_hover(struct coord pos)
-{
- struct inst *curr;
-
- if (active_ops && active_ops->find_point)
- curr = active_ops->find_point(pos);
- else
- curr = inst_find_point(pos);
- if ((drag.new && curr == drag.new) || (drag.inst && curr == drag.inst))
- return;
- if (curr && !active_ops) {
- if (drag.anchors_n) {
- if (!may_move_to(&drag, curr))
- curr = NULL;
- } else {
- if (!may_move(curr))
- curr = NULL;
- drag.anchors_n = 0;
- }
- }
- if (curr == hover_inst)
- return;
- if (hover_inst) {
- over_leave();
- hover_inst = NULL;
- }
- if (!curr)
- return;
- hover_inst = curr;
- over_enter(hover_save_and_draw, NULL);
-}
-
-
-/* ----- mouse actions ----------------------------------------------------- */
-
-
-static struct pix_buf *drag_save_and_draw(void *user, struct coord to)
-{
- if (drag.new) {
- assert(active_ops);
- return active_ops->drag_new(drag.new, to);
- } else {
- return inst_draw_move(drag.inst, to, drag.anchor_i);
- }
-}
-
-
-int tool_consider_drag(struct coord pos)
-{
- struct inst *curr;
-
- assert(!drag.new);
- assert(!drag.anchors_n);
- last_canvas_pos = translate(pos);
- if (active_ops && active_ops->click) {
- active_ops->click(pos);
- return 0;
- }
- if (active_ops && active_ops->find_point)
- curr = active_ops->find_point(pos);
- else
- curr = inst_find_point(pos);
- if (!curr)
- return 0;
- tool_dehover();
- if (active_ops) {
- if (active_ops->drag_new) {
- if (active_ops->begin_drag_new)
- active_ops->begin_drag_new(curr);
- drag.inst = NULL;
- drag.new = curr;
- over_begin(drag_save_and_draw, NULL, pos);
- return 1;
- } else {
- /* object is created without dragging */
- if (active_ops->end_new(curr, NULL)) {
- tool_cancel_drag();
- return -1;
- }
- return 0;
- }
- }
- if (!may_move(curr))
- return 0;
- drag.inst = selected_inst;
- drag.new = NULL;
- over_begin(drag_save_and_draw, NULL, pos);
- return 1;
-}
-
-
-void tool_drag(struct coord to)
-{
- last_canvas_pos = translate(to);
- over_move(to);
-}
-
-
-void tool_cancel_drag(void)
-{
- over_end();
- tool_dehover();
- tool_reset();
- drag.new = NULL;
- active_ops = NULL;
- drag.anchors_n = 0;
-}
-
-
-int tool_end_drag(struct coord to)
-{
- struct drag_state state = drag;
- struct inst *end;
- struct tool_ops *ops = active_ops;
-
- tool_cancel_drag();
- if (state.new && ops->end_new_raw)
- return ops->end_new_raw(state.new, to);
- if (ops->find_point)
- end = ops->find_point(to);
- else
- end = inst_find_point(to);
- if (!end)
- return 0;
- if (state.new)
- return ops->end_new(state.new, end);
- if (!may_move_to(&state, end))
- return 0;
- if (!inst_do_move_to(drag.inst, inst_get_vec(end), state.anchor_i))
- do_move_to(&state, end);
- return 1;
-}
-
-
-void tool_redraw(void)
-{
- over_reset();
- if (!drag.new && !drag.anchors_n)
- return;
- tool_hover(last_canvas_pos);
- over_begin(drag_save_and_draw, NULL,
- canvas_to_coord(last_canvas_pos.x, last_canvas_pos.y));
-}
-
-
-/* ----- tool bar creation ------------------------------------------------- */
-
-
-static void tool_select(GtkWidget *evbox, struct tool_ops *ops)
-{
- GdkColor col;
-
- if (active_tool) {
- if (active_ops && active_ops->tool_deselected)
- active_ops->tool_deselected();
- col = get_color(TOOL_UNSELECTED);
- gtk_widget_modify_bg(active_tool, GTK_STATE_NORMAL, &col);
- active_tool = NULL;
- }
- col = get_color(TOOL_SELECTED);
- gtk_widget_modify_bg(evbox, GTK_STATE_NORMAL, &col);
- active_tool = evbox;
- active_ops = ops;
- if (ops && ops->tool_selected)
- ops->tool_selected();
-}
-
-
-void tool_reset(void)
-{
- over_reset();
- tool_select(ev_point, NULL);
-}
-
-
-static gboolean tool_button_press_event(GtkWidget *widget,
- GdkEventButton *event, gpointer data)
-{
- tool_select(widget, data);
- return TRUE;
-}
-
-
-static GtkWidget *make_image(GdkDrawable *drawable, char **xpm)
-{
- GdkPixmap *pixmap;
- GtkWidget *image;
-
- pixmap = gdk_pixmap_create_from_xpm_d(drawable, NULL, NULL, xpm);
- image = gtk_image_new_from_pixmap(pixmap, NULL);
- gtk_misc_set_padding(GTK_MISC(image), 1, 1);
- return image;
-}
-
-
-static GtkWidget *tool_button(GtkWidget *bar, GdkDrawable *drawable,
- char **xpm, GtkWidget *last_evbox, struct tool_ops *ops)
-{
- GtkWidget *image, *evbox;
- GtkToolItem *item;
- GtkToolItem *last = NULL;
-
- if (last_evbox)
- last = GTK_TOOL_ITEM(gtk_widget_get_ancestor(last_evbox,
- GTK_TYPE_TOOL_ITEM));
-
-/*
- * gtk_radio_tool_button_new_from_widget is *huge*. we try to do things in a
- * more compact way.
- */
-#if 0
- if (last)
- item = gtk_radio_tool_button_new_from_widget(
- GTK_RADIO_TOOL_BUTTON(last));
- else
- item = gtk_radio_tool_button_new(NULL);
- gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(item), image);
-#else
- evbox = gtk_event_box_new();
- if (xpm) {
- image = make_image(drawable, xpm);
- gtk_container_add(GTK_CONTAINER(evbox), image);
- }
- g_signal_connect(G_OBJECT(evbox), "button_press_event",
- G_CALLBACK(tool_button_press_event), ops);
-
- item = gtk_tool_item_new();
- gtk_container_add(GTK_CONTAINER(item), evbox);
-
- gtk_container_set_border_width(GTK_CONTAINER(item), 0);
-#endif
-
- gtk_toolbar_insert(GTK_TOOLBAR(bar), item, -1);
-
- return evbox;
-}
-
-
-static void tool_separator(GtkWidget *bar)
-{
- GtkToolItem *item;
-
- item = gtk_separator_tool_item_new();
- gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(item), FALSE);
- gtk_toolbar_insert(GTK_TOOLBAR(bar), item, -1);
-}
-
-
-GtkWidget *gui_setup_tools(GdkDrawable *drawable)
-{
- GtkWidget *bar;
- GtkWidget *last;
-
- bar = gtk_toolbar_new();
- gtk_toolbar_set_style(GTK_TOOLBAR(bar), GTK_TOOLBAR_ICONS);
- gtk_toolbar_set_orientation(GTK_TOOLBAR(bar),
- GTK_ORIENTATION_VERTICAL);
-
- ev_point = tool_button(bar, drawable, xpm_point, NULL, NULL);
- last = tool_button(bar, drawable, xpm_delete, ev_point, &delete_ops);
- tool_separator(bar);
- last = tool_button(bar, drawable, xpm_vec, last, &vec_ops);
- ev_frame = tool_button(bar, drawable, NULL, last, &frame_ops);
- last = ev_frame;
- last = tool_button(bar, drawable, xpm_pad, last, &pad_ops);
- last = tool_button(bar, drawable, xpm_line, last, &line_ops);
- last = tool_button(bar, drawable, xpm_rect, last, &rect_ops);
- last = tool_button(bar, drawable, xpm_circ, last, &circ_ops);
- tool_separator(bar);
- last = tool_button(bar, drawable, xpm_meas, last, &meas_ops);
- last = tool_button(bar, drawable, xpm_meas_x, last, &meas_ops_x);
- last = tool_button(bar, drawable, xpm_meas_y, last, &meas_ops_y);
-
- frame_image = gtk_widget_ref(make_image(drawable, xpm_frame));
- frame_image_locked =
- gtk_widget_ref(make_image(drawable, xpm_frame_locked));
- frame_image_ready =
- gtk_widget_ref(make_image(drawable, xpm_frame_ready));
- set_frame_image(frame_image);
-
- tool_reset();
-
- return bar;
-}
Deleted: trunk/eda/fped/gui_tools.h
===================================================================
--- trunk/eda/fped/gui_tools.h 2009-08-08 19:35:16 UTC (rev 5409)
+++ trunk/eda/fped/gui_tools.h 2009-08-08 19:44:17 UTC (rev 5410)
@@ -1,78 +0,0 @@
-/*
- * gui_tools.h - GUI, tool bar
- *
- * Written 2009 by Werner Almesberger
- * Copyright 2009 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_TOOLS_H
-#define GUI_TOOLS_H
-
-#include <gtk/gtk.h>
-
-#include "inst.h"
-
-
-struct tool_ops {
- void (*tool_selected)(void);
- void (*tool_deselected)(void);
- struct inst *(*find_point)(struct coord pos);
- void (*click)(struct coord pos);
- void (*begin_drag_new)(struct inst *from);
-// in inst
-// void (*begin_drag_move)struct inst *from, int anchor_i);
- struct pix_buf *(*drag_new)(struct inst *from, struct coord to);
- int (*end_new_raw)(struct inst *from, struct coord to);
- int (*end_new)(struct inst *from, struct inst *to);
-};
-
-
-struct pix_buf *draw_move_vec(struct inst *inst, struct coord pos, int i);
-struct pix_buf *draw_move_line(struct inst *inst, struct coord pos, int i);
-struct pix_buf *draw_move_rect(struct inst *inst, struct coord pos, int i);
-struct pix_buf *draw_move_pad(struct inst *inst, struct coord pos, int i);
-struct pix_buf *draw_move_arc(struct inst *inst, struct coord pos, int i);
-struct pix_buf *draw_move_meas(struct inst *inst, struct coord pos, int i);
-struct pix_buf *draw_move_frame(struct inst *inst, struct coord pos, int i);
-
-struct pix_buf *gui_hover_vec(struct inst *self);
-struct pix_buf *gui_hover_frame(struct inst *self);
-
-void do_move_to_arc(struct inst *inst, struct vec *vec, int i);
-
-void tool_dehover(void);
-void tool_hover(struct coord pos);
-int tool_consider_drag(struct coord pos);
-void tool_drag(struct coord to);
-void tool_cancel_drag(void);
-int tool_end_drag(struct coord to);
-void tool_redraw(void);
-
-/*
- * The following functions are for measurements which are now in a separate
- * compilation unit.
- */
-
-struct pix_buf *draw_move_line_common(struct inst *inst,
- struct coord end, struct coord pos, int i);
-struct pix_buf *drag_new_line(struct inst *from, struct coord to);
-
-
-/*
- * Cache the frame and track it.
- */
-
-void tool_frame_update(void);
-void tool_frame_deleted(const struct frame *frame);
-
-void tool_reset(void);
-
-GtkWidget *gui_setup_tools(GdkDrawable *drawable);
-
-#endif /* !GUI_TOOLS_H */
Modified: trunk/eda/fped/inst.c
===================================================================
--- trunk/eda/fped/inst.c 2009-08-08 19:35:16 UTC (rev 5409)
+++ trunk/eda/fped/inst.c 2009-08-08 19:44:17 UTC (rev 5410)
@@ -22,7 +22,7 @@
#include "delete.h"
#include "gui_util.h"
#include "gui_status.h"
-#include "gui_tools.h"
+#include "gui_tool.h"
#include "gui_inst.h"
#include "inst.h"
--- End Message ---
