[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: prototype.h
User: pcjc2
Date: 07/04/17 16:19:20
Modified: . prototype.h struct.h
Log:
Merge changes from noscreen branch
Revision Changes Path
1.124 +11 -22 eda/geda/gaf/libgeda/include/prototype.h
(In the diff below, changes in quantity of whitespace are not shown.)
Index: prototype.h
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/include/prototype.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- prototype.h 5 Apr 2007 22:57:49 -0000 1.123
+++ prototype.h 17 Apr 2007 20:19:20 -0000 1.124
@@ -134,7 +134,6 @@
void o_arc_rotate_world(TOPLEVEL *w_current, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_arc_mirror_world(TOPLEVEL *w_current, int world_centerx, int world_centery, OBJECT *object);
void o_arc_recalc(TOPLEVEL *w_current, OBJECT *o_current);
-void get_arc_bounds(TOPLEVEL *w_current, OBJECT *object, int *left, int *top, int *right, int *bottom);
void world_get_arc_bounds(TOPLEVEL *w_current, OBJECT *object, int *left, int *top, int *right, int *bottom);
void o_arc_print(TOPLEVEL *w_current, FILE *fp, OBJECT *o_current, int origin_x, int origin_y);
void o_arc_print_solid(TOPLEVEL *w_current, FILE *fp, int x, int y, int radius, int angle1, int angle2, int color, int arc_width, int length, int space, int origin_x, int origin_y);
@@ -216,8 +215,7 @@
void o_box_rotate_world(TOPLEVEL *w_current, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_box_mirror_world(TOPLEVEL *w_current, int world_centerx, int world_centery, OBJECT *object);
void o_box_recalc(TOPLEVEL *w_current, OBJECT *o_current);
-void get_box_bounds(TOPLEVEL *w_current, BOX *box, int *left, int *top, int *right, int *bottom);
-void world_get_box_bounds(TOPLEVEL *w_current, BOX *box, int *left, int *top, int *right, int *bottom);
+void world_get_box_bounds(TOPLEVEL *w_current, OBJECT *object, int *left, int *top, int *right, int *bottom);
void o_box_print(TOPLEVEL *w_current, FILE *fp, OBJECT *o_current, int origin_x, int origin_y);
void o_box_print_solid(TOPLEVEL *w_current, FILE *fp, int x, int y, int width, int height, int color, int line_width, int length, int space, int origin_x, int origin_y);
void o_box_print_dotted(TOPLEVEL *w_current, FILE *fp, int x, int y, int width, int height, int color, int line_width, int length, int space, int origin_x, int origin_y);
@@ -230,8 +228,7 @@
void o_box_image_write(TOPLEVEL *w_current, OBJECT *o_current, int origin_x, int origin_y, int color_mode);
/* o_bus_basic.c */
-void get_bus_bounds(TOPLEVEL *w_current, LINE *line, int *left, int *top, int *right, int *bottom);
-void world_get_bus_bounds(TOPLEVEL *w_current, LINE *line, int *left, int *top, int *right, int *bottom);
+void world_get_bus_bounds(TOPLEVEL *w_current, OBJECT *object, int *left, int *top, int *right, int *bottom);
OBJECT *o_bus_add(TOPLEVEL *w_current, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2, int bus_ripper_direction);
void o_bus_recalc(TOPLEVEL *w_current, OBJECT *o_current);
OBJECT *o_bus_read(TOPLEVEL *w_current, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
@@ -259,8 +256,7 @@
void o_circle_rotate_world(TOPLEVEL *w_current, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_circle_mirror_world(TOPLEVEL *w_current, int world_centerx, int world_centery, OBJECT *object);
void o_circle_recalc(TOPLEVEL *w_current, OBJECT *o_current);
-void get_circle_bounds(TOPLEVEL *w_current, CIRCLE *circle, int *left, int *top, int *right, int *bottom);
-void world_get_circle_bounds(TOPLEVEL *w_current, CIRCLE *circle, int *left, int *top, int *right, int *bottom);
+void world_get_circle_bounds(TOPLEVEL *w_current, OBJECT *object, int *left, int *top, int *right, int *bottom);
void o_circle_print(TOPLEVEL *w_current, FILE *fp, OBJECT *o_current, int origin_x, int origin_y);
void o_circle_print_solid(TOPLEVEL *w_current, FILE *fp, int x, int y, int radius, int color, int circle_width, int length, int space, int origin_x, int origin_y);
void o_circle_print_dotted(TOPLEVEL *w_current, FILE *fp, int x, int y, int radius, int color, int circle_width, int length, int space, int origin_x, int origin_y);
@@ -273,15 +269,12 @@
void o_circle_image_write(TOPLEVEL *w_current, OBJECT *o_current, int origin_x, int origin_y, int color_mode);
/* o_complex_basic.c */
-void get_single_object_bounds(TOPLEVEL *w_current, OBJECT *complex,
+int world_get_single_object_bounds(TOPLEVEL *w_current, OBJECT *o_current,
int *rleft, int *rtop,
int *rright, int *rbottom);
-void get_object_list_bounds(TOPLEVEL *w_current, OBJECT *complex,
+int world_get_object_list_bounds(TOPLEVEL *w_current, OBJECT *complex,
int *left, int *top, int *right, int *bottom);
-void get_object_glist_bounds(TOPLEVEL *w_current, GList *o_list,
- int *left, int *top,
- int *right, int *bottom);
-void world_get_single_object_bounds(TOPLEVEL *w_current, OBJECT *o_current,
+int world_get_object_glist_bounds(TOPLEVEL *w_current, GList *o_list,
int *left, int *top,
int *right, int *bottom);
void world_get_complex_bounds(TOPLEVEL *w_current, OBJECT *complex, int *left, int *top, int *right, int *bottom);
@@ -336,8 +329,7 @@
void o_line_rotate_world(TOPLEVEL *w_current, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_line_mirror_world(TOPLEVEL *w_current, int world_centerx, int world_centery, OBJECT *object);
void o_line_recalc(TOPLEVEL *w_current, OBJECT *o_current);
-void get_line_bounds(TOPLEVEL *w_current, LINE *line, int *left, int *top, int *right, int *bottom);
-void world_get_line_bounds(TOPLEVEL *w_current, LINE *line, int *left, int *top, int *right, int *bottom);
+void world_get_line_bounds(TOPLEVEL *w_current, OBJECT *object, int *left, int *top, int *right, int *bottom);
void o_line_print(TOPLEVEL *w_current, FILE *fp, OBJECT *o_current, int origin_x, int origin_y);
void o_line_print_solid(TOPLEVEL *w_current, FILE *fp, int x1, int y1, int x2, int y2, int color, int line_width, int length, int space, int origin_x, int origin_y);
void o_line_print_dotted(TOPLEVEL *w_current, FILE *fp, int x1, int y1, int x2, int y2, int color, int line_width, int length, int space, int origin_x, int origin_y);
@@ -358,8 +350,7 @@
void o_list_delete_rest(TOPLEVEL *w_current, OBJECT *list);
/* o_net_basic.c */
-void get_net_bounds(TOPLEVEL *w_current, LINE *line, int *left, int *top, int *right, int *bottom);
-void world_get_net_bounds(TOPLEVEL *w_current, LINE *line, int *left, int *top, int *right, int *bottom);
+void world_get_net_bounds(TOPLEVEL *w_current, OBJECT *object, int *left, int *top, int *right, int *bottom);
OBJECT *o_net_add(TOPLEVEL *w_current, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2);
void o_net_recalc(TOPLEVEL *w_current, OBJECT *o_current);
OBJECT *o_net_read(TOPLEVEL *w_current, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
@@ -388,7 +379,7 @@
int x1, int y1, int x2, int y2, int angle, char mirrored,
char embedded);
void o_picture_recalc(TOPLEVEL *w_current, OBJECT *o_current);
-void get_picture_bounds(TOPLEVEL *w_current, PICTURE *picture, int *left, int *top, int *right, int *bottom);void world_get_picture_bounds(TOPLEVEL *w_current, PICTURE *picture, int *left, int *top, int *right, int *bottom);
+void world_get_picture_bounds(TOPLEVEL *w_current, OBJECT *object, int *left, int *top, int *right, int *bottom);
void o_picture_modify(TOPLEVEL *w_current, OBJECT *object, int x, int y, int whichone);
void o_picture_rotate_world(TOPLEVEL *w_current, int world_centerx, int world_centery, int angle,OBJECT *object);
void o_picture_mirror_world(TOPLEVEL *w_current, int world_centerx, int world_centery, OBJECT *object);
@@ -400,8 +391,7 @@
int origin_x, int origin_y);
/* o_pin_basic.c */
-void get_pin_bounds(TOPLEVEL *w_current, LINE *line, int *left, int *top, int *right, int *bottom);
-void world_get_pin_bounds(TOPLEVEL *w_current, LINE *line, int *left, int *top, int *right, int *bottom);
+void world_get_pin_bounds(TOPLEVEL *w_current, OBJECT *object, int *left, int *top, int *right, int *bottom);
OBJECT *o_pin_add(TOPLEVEL *w_current, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2, int pin_type, int whichend);
void o_pin_recalc(TOPLEVEL *w_current, OBJECT *o_current);
OBJECT *o_pin_read(TOPLEVEL *w_current, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
@@ -424,8 +414,7 @@
void o_selection_unselect_list(TOPLEVEL *w_current, GList **head);
/* o_text_basic.c */
-void get_text_bounds(TOPLEVEL *w_current, OBJECT *o_current, int *left, int *top, int *right, int *bottom);
-void world_get_text_bounds(TOPLEVEL *w_current, OBJECT *o_current, int *left, int *top, int *right, int *bottom);
+int world_get_text_bounds(TOPLEVEL *w_current, OBJECT *o_current, int *left, int *top, int *right, int *bottom);
OBJECT *o_text_add_head(void);
void o_text_init(void);
void o_text_print_set(void);
1.101 +13 -23 eda/geda/gaf/libgeda/include/struct.h
(In the diff below, changes in quantity of whitespace are not shown.)
Index: struct.h
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/include/struct.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- struct.h 24 Feb 2007 10:46:24 -0000 1.100
+++ struct.h 17 Apr 2007 20:19:20 -0000 1.101
@@ -72,8 +72,6 @@
int x[2];
int y[2];
- int screen_x[2];
- int screen_y[2];
};
/* pb20011014 - name the grips */
@@ -82,11 +80,9 @@
struct st_arc {
int x, y; /* world */
- int screen_x, screen_y;
int width;
int height;
- int screen_width, screen_height;
int start_angle;
int end_angle;
@@ -102,8 +98,6 @@
int upper_x, upper_y; /* world */
int lower_x, lower_y;
- int screen_upper_x, screen_upper_y;
- int screen_lower_x, screen_lower_y;
};
/* pb20011014 - name the grips */
#define BOX_UPPER_LEFT 0
@@ -125,8 +119,6 @@
int upper_x, upper_y; /* world */
int lower_x, lower_y;
- int screen_upper_x, screen_upper_y;
- int screen_lower_x, screen_lower_y;
};
#define PICTURE_UPPER_LEFT 0
@@ -137,7 +129,6 @@
struct st_text {
int x, y; /* world origin */
- int screen_x, screen_y;
char *string; /* text stuff */
int length;
@@ -152,7 +143,6 @@
struct st_complex {
int x, y; /* world origin */
- int screen_x, screen_y;
int angle; /* orientation, only multiples
* of 90 degrees allowed */
@@ -168,11 +158,8 @@
int center_x, center_y; /* world */
int radius;
- int screen_x, screen_y;
/* pb20011010 - removed : used only in o_circle_draw_xor() and
meaning unclear */
-/* int screen_left, screen_top; */
- int screen_radius;
};
/* pb20011014 - name the grips */
#define CIRCLE_CENTER 0
@@ -183,10 +170,10 @@
int sid;
char *name;
- int top; /* Bounding box information */
- int left; /* in screen coords */
- int right;
- int bottom;
+ int w_top; /* Bounding box information */
+ int w_left; /* in world coords */
+ int w_right;
+ int w_bottom;
COMPLEX *complex;
LINE *line;
@@ -207,14 +194,14 @@
/* PB : of these fields. If not, value must be ignored. */
OBJECT_END line_end;
OBJECT_TYPE line_type;
- int line_width, screen_line_width;
- int line_space, screen_line_space;
- int line_length, screen_line_length;
+ int line_width;
+ int line_space;
+ int line_length;
OBJECT_FILLING fill_type;
- int fill_width, screen_fill_width;
- int fill_angle1, fill_pitch1, screen_fill_pitch1;
- int fill_angle2, fill_pitch2, screen_fill_pitch2;
+ int fill_width;
+ int fill_angle1, fill_pitch1;
+ int fill_angle2, fill_pitch2;
/* PB : change end */
int visited; /* used in gnetlist for travesal purposes */
@@ -838,6 +825,9 @@
/* The command to send postscript to when printing */
char *print_command;
+ /* Number of pixels around an object we can still select it with */
+ int select_slack_pixels;
+
/* gnetlist specific */
int net_naming_priority;
int hierarchy_traversal;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs