gEDA-cvs: CVS update: o_basic.nw

[cvspsrv@xxxxxxxx]

  User: werner  
  Date: 06/05/14 06:43:22

  Modified:    .        o_basic.nw o_net.nw x_event.nw
  Log:
  some fixes in x_event_expose()
  
  
  
  
  Revision  Changes    Path
  1.16      +4 -5      eda/geda/devel/gschem/noweb/o_basic.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_basic.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/o_basic.nw,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- o_basic.nw	24 Apr 2006 17:21:12 -0000	1.15
  +++ o_basic.nw	14 May 2006 10:43:22 -0000	1.16
  @@ -138,9 +138,8 @@
   
         case(DRAWCOMP):
         case(ENDCOMP):
  -        o_drawbounding(w_current, w_current->
  -                       page_current->
  -                       complex_place_head->next,
  +        o_drawbounding(w_current, 
  +		       w_current->page_current->complex_place_head->next,
                          NULL,
                          x_get_darkcolor(w_current->bb_color), FALSE);
           break;
  @@ -861,6 +860,7 @@
       /* all states with something on the dc */
       case(COPY): 
       case(DRAWBUS): 
  +    case(DRAWCOMP): 
       case(DRAWNET):   
       case(ENDARC): 
       case(ENDATTRIB):
  @@ -910,7 +910,6 @@
       case(BUSCONT): 
       case(DRAWARC): 
       case(DRAWATTRIB): 
  -    case(DRAWCOMP):
       case(DRAWPICTURE): 
       case(DRAWPIN): 
       case(DRAWTEXT): 
  
  
  
  1.20      +4 -1      eda/geda/devel/gschem/noweb/o_net.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_net.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/o_net.nw,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- o_net.nw	7 Nov 2005 02:43:09 -0000	1.19
  +++ o_net.nw	14 May 2006 10:43:22 -0000	1.20
  @@ -863,7 +863,7 @@
   @end defun
   
   <<o_net.c : o_net_xorrubber()>>=
  -/* used in button cancel code in x_events.c */
  +/* used in x_event_expose() in x_events.c */
   void
   o_net_xorrubber(TOPLEVEL *w_current)
   {
  @@ -887,6 +887,9 @@
     gdk_draw_line(w_current->window, w_current->gc, 
   		w_current->start_x, w_current->start_y, 
   		w_current->last_x, w_current->last_y);
  +  gdk_draw_line(w_current->window, w_current->gc, 
  +		w_current->second_x, w_current->second_y, 
  +		w_current->last_x, w_current->last_y);
   
     if (w_current->net_style == THICK ) {
       gdk_gc_set_line_attributes(w_current->gc, 0,
  
  
  
  1.23      +41 -6     eda/geda/devel/gschem/noweb/x_event.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: x_event.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/x_event.nw,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- x_event.nw	14 Apr 2006 11:49:27 -0000	1.22
  +++ x_event.nw	14 May 2006 10:43:22 -0000	1.23
  @@ -130,19 +130,54 @@
     /* take care of ghosting when you get an expose event */
     if (w_current->inside_action) {
       switch(w_current->event_state) {
  +      case(MOVE):
         case(ENDMOVE):
  +      case(COPY): 
         case(ENDCOPY):
  -        o_drawbounding(
  -                       w_current, NULL,
  +        o_drawbounding(w_current, NULL,
                          w_current->page_current->selection2_head->next,
                          x_get_darkcolor(w_current->bb_color), FALSE);
           break;
  +      case(DRAWCOMP):
  +      case(ENDCOMP):
  +      case(ENDPASTE):
  +        o_drawbounding(w_current, 
  +		       w_current->page_current->complex_place_head->next,
  +                       NULL,
  +                       x_get_darkcolor(w_current->bb_color), FALSE);
  +        break;
   
  +      case(BUSCONT):
  +      case(DRAWBUS):
  +        o_bus_xorrubber(w_current); 
  +        break;
         case(DRAWNET):
         case(NETCONT):
  -      case(DRAWBUS):
  -      case(BUSCONT):
  -        /* do nothing for now */
  +        o_net_xorrubber(w_current);
  +        break;
  +      case(ENDARC): 
  +        o_arc_rubberarc_xor(w_current);
  +        break;
  +      case(ENDATTRIB): /* TODO: how to test ??? */
  +        o_attrib_rubberattrib(w_current);
  +        break;
  +      case(ENDBOX):
  +        o_box_rubberbox_xor(w_current);
  +        break;
  +      case(ENDCIRCLE):
  +        o_circle_rubbercircle_xor(w_current);
  +        break;
  +      case(ENDLINE): 
  +        o_line_rubberline_xor(w_current);
  +        break;
  +      case(ENDPIN): /* TODO (no function in o_pin.nw available) */
  +        break;
  +      case(ENDTEXT): 
  +        o_text_rubberattrib(w_current);
  +        break;
  +      case(GRIPS): /* TODO (larger changes in o_grips.nw necessary) */
  +        break;
  +      case(ZOOMBOXEND): /* TODO (not realy a problem as zoom will redraw) */
           break;
       }
     }