[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: CVS update: prototype.h



  User: cnieves 
  Date: 06/10/21 18:20:35

  Modified:    .        Tag: glist_dev prototype.h struct.h
  Log:
  Convert the SELECTION list into a GList. Added new functions
  
  o_recalc_object_glist and get_object_glist_bounds to handle glists.
  
  
  
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.107.2.3 +15 -15    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.107.2.2
  retrieving revision 1.107.2.3
  diff -u -b -r1.107.2.2 -r1.107.2.3
  --- prototype.h	21 Oct 2006 21:14:42 -0000	1.107.2.2
  +++ prototype.h	21 Oct 2006 22:20:33 -0000	1.107.2.3
  @@ -197,6 +197,7 @@
   void o_redraw_single(TOPLEVEL *w_current, OBJECT *o_current);
   void o_recalc_single_object(TOPLEVEL *w_current, OBJECT *o_current);
   void o_recalc_object_list(TOPLEVEL *w_current, OBJECT *object_list);
  +void o_recalc_object_glist(TOPLEVEL *w_current, GList *object_glist);
   void o_set_line_options(TOPLEVEL *w_current, OBJECT *o_current, OBJECT_END end, OBJECT_TYPE type, int width, int length, int space);
   void o_set_fill_options(TOPLEVEL *w_current, OBJECT *o_current, OBJECT_FILLING type, int width, int pitch1, int angle1, int pitch2, int angle2);
   void o_object_recalc(TOPLEVEL *w_current, OBJECT *o_current);
  @@ -282,12 +283,17 @@
   			      int *rright, int *rbottom);
   void get_object_list_bounds(TOPLEVEL *w_current, OBJECT *complex, 
   			    int *left, int *top, int *right, int *bottom);
  -void get_complex_bounds_selection(TOPLEVEL *w_current, SELECTION *head, 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_complex_bounds(TOPLEVEL *w_current, OBJECT *complex, int *left, int *top, int *right, int *bottom);
   OBJECT *add_head(void);
   int o_complex_is_eligible_attribute(TOPLEVEL *w_current, OBJECT *object, int promote_invisible);
   int o_complex_is_embedded(OBJECT *o_current);
  -OBJECT *o_complex_add(TOPLEVEL *w_current, OBJECT *object_list, char type, int color, int x, int y, int angle, int mirror, char *clib, char *basename, int selectable, int attribute_promotion);
  +OBJECT *o_complex_add(TOPLEVEL *w_current, OBJECT *object_list, 
  +		      GList **object_glist, char type, int color, 
  +		      int x, int y, int angle, int mirror, char *clib, 
  +		      char *basename, int selectable, int attribute_promotion);
   OBJECT *o_complex_add_embedded(TOPLEVEL *w_current, OBJECT *object_list, char type, int color, int x, int y, int angle, char *clib, char *basename, int selectable);
   void o_complex_recalc(TOPLEVEL *w_current, OBJECT *o_current);
   OBJECT *o_complex_read(TOPLEVEL *w_current, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
  @@ -348,7 +354,7 @@
   /* o_list.c */
   OBJECT *o_list_copy_to(TOPLEVEL *w_current, OBJECT *list_head, OBJECT *selected, int flag, OBJECT **return_end);
   OBJECT *o_list_copy_all(TOPLEVEL *w_current, OBJECT *src_list_head, OBJECT *dest_list_head, int flag);
  -OBJECT *o_list_copy_all_selection2(TOPLEVEL *w_current, SELECTION *src_list_head, OBJECT *dest_list_head, int flag);
  +OBJECT *o_list_copy_all_selection2(TOPLEVEL *w_current, GList *src_list_head, OBJECT *dest_list_head, int flag);
   OBJECT *o_list_search(OBJECT *list, OBJECT *current);
   void o_list_delete(TOPLEVEL *w_current, OBJECT *list, OBJECT *delete);
   void o_list_delete_rest(TOPLEVEL *w_current, OBJECT *list);
  @@ -421,20 +427,12 @@
   void o_pin_update_whichend(TOPLEVEL *w_current, OBJECT *object_list, int num_pins);
   
   /* o_selection.c */
  -SELECTION *o_selection_return_tail(SELECTION *head);
  -SELECTION *o_selection_return_head(SELECTION *tail);
  -SELECTION *o_selection_new_head(void);
  -void o_selection_destroy_head(SELECTION *s_head);
  -SELECTION *o_selection_add(SELECTION *head, OBJECT *o_selected);
  -void o_selection_remove(SELECTION *head, OBJECT *o_selected);
  -void o_selection_remove_most(TOPLEVEL *w_current, SELECTION *head);
  -void o_selection_print_all(SELECTION *head);
  -void o_selection_destroy_all(SELECTION *head);
  +GList *o_selection_add(GList *head, OBJECT *o_selected);
  +void o_selection_print_all( GList *head );
   void o_selection_select(OBJECT *object, int color);
   void o_selection_unselect(OBJECT *object);
  -OBJECT *o_selection_return_first_object(SELECTION *head);
  -OBJECT *o_selection_return_nth_object(SELECTION *head, int count);
  -int o_selection_return_num(SELECTION *head);
  +void o_selection_remove(GList **head, OBJECT *o_selected);
  +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);
  @@ -485,8 +483,10 @@
   void print_struct_forw(OBJECT *ptr);
   void print_struct_back(OBJECT *ptr);
   void print_struct(OBJECT *ptr);
  +void s_delete_object(TOPLEVEL *w_current, OBJECT *o_current);
   void s_delete(TOPLEVEL *w_current, OBJECT *o_current);
   void s_delete_list_fromstart(TOPLEVEL *w_current, OBJECT *start);
  +void s_delete_object_glist(TOPLEVEL *w_current, GList *list);
   OBJECT *s_remove(TOPLEVEL *w_current, OBJECT *object);
   void string_toupper(char *in, char *out);
   void string_tolower(char *in, char *out);
  
  
  
  1.93.2.1  +2 -12     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.93
  retrieving revision 1.93.2.1
  diff -u -b -r1.93 -r1.93.2.1
  --- struct.h	4 Oct 2006 19:10:30 -0000	1.93
  +++ struct.h	21 Oct 2006 22:20:33 -0000	1.93.2.1
  @@ -36,7 +36,6 @@
   typedef struct st_page PAGE;
   typedef struct st_toplevel TOPLEVEL;
   typedef struct st_color COLOR;
  -typedef struct st_selection SELECTION;
   typedef struct st_undo UNDO;
   typedef struct st_tile TILE;
   typedef struct st_tile_loc TILE_LOC;
  @@ -293,13 +292,6 @@
     int y[2];
   };
   
  -struct st_selection {
  -  OBJECT *selected_object;
  -
  -  SELECTION *prev;
  -  SELECTION *next;
  -};
  -
   struct st_stretch
   {
     OBJECT *object;
  @@ -350,10 +342,8 @@
     OBJECT *object_head;
     OBJECT *object_tail;
     OBJECT *object_parent;
  -  SELECTION *selection2_head; /* new selection mechanism */
  -  SELECTION *selection2_tail; 
  -  OBJECT *complex_place_head;  /* used to place complex's and text */
  -  OBJECT *complex_place_tail; 
  +  GList *selection_list; /* new selection mechanism */
  +  GList *complex_place_list;
     OBJECT *attrib_place_head;
     OBJECT *attrib_place_tail; 
     OBJECT *object_lastplace;
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs