gEDA-cvs: CVS update: i_callbacks.nw

[cvspsrv@xxxxxxxx]

  User: cnieves 
  Date: 06/05/20 18:17:32

  Modified:    .        i_callbacks.nw x_event.nw
  Log:
  Moved the rotated_inside into the TOPLEVEL structure.
  
  
  
  
  Revision  Changes    Path
  1.51      +2 -3      eda/geda/devel/gschem/noweb/i_callbacks.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: i_callbacks.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/i_callbacks.nw,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -b -r1.50 -r1.51
  --- i_callbacks.nw	17 May 2006 14:20:48 -0000	1.50
  +++ i_callbacks.nw	20 May 2006 22:17:32 -0000	1.51
  @@ -239,7 +239,6 @@
   #include <dmalloc.h>
   #endif
   
  -extern int rotated_inside;
   @
   
   
  @@ -4510,9 +4509,9 @@
     exit_if_null(w_current);
   
     if ( (w_current->inside_action) && 
  -       (rotated_inside != 0)) {
  +       (w_current->rotated_inside != 0)) {
       o_undo_callback(w_current, UNDO_ACTION);	 
  -    rotated_inside = 0;
  +    w_current->rotated_inside = 0;
     }
   
     /* leave this on for now... but it might have to change */
  
  
  
  1.26      +5 -8      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.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- x_event.nw	20 May 2006 18:51:45 -0000	1.25
  +++ x_event.nw	20 May 2006 22:17:32 -0000	1.26
  @@ -87,9 +87,6 @@
   int start_pan_x, start_pan_y;
   int throttle = 0;
   
  -/* Number of times that the selection was rotated inside another command */
  -int rotated_inside = 0;
  -
   @ %def mouse_x mouse_y current_center_x current_center_y start_pan_x start_pan_y throttle
   
   
  @@ -258,7 +255,7 @@
   
         case(STARTCOPY):
           if (o_select_selected(w_current)) {
  -	  rotated_inside = 0;
  +	  w_current->rotated_inside = 0;
             o_copy_start(w_current, 
                          (int) event->x, (int) event->y);
             w_current->event_state = COPY;
  @@ -268,7 +265,7 @@
   
         case(STARTMCOPY):
           if (o_select_selected(w_current)) {
  -	  rotated_inside = 0;
  +	  w_current->rotated_inside = 0;
             o_copy_start(w_current, 
                          (int) event->x, (int) event->y);
             w_current->event_state = MCOPY;
  @@ -278,7 +275,7 @@
   
         case(STARTMOVE):
           if (o_select_selected(w_current)) {
  -	  rotated_inside = 0;
  +	  w_current->rotated_inside = 0;
             o_move_start(w_current,
                          (int) event->x, (int) event->y);
             w_current->event_state = MOVE;
  @@ -895,7 +892,7 @@
   		    fix_x(w_current, w_current->start_x),
   		    fix_y(w_current, w_current->start_y));
   	w_current->DONT_REDRAW = redraw_state;
  -	rotated_inside ++;	
  +	w_current->rotated_inside ++;	
   	w_current->event_state = prev_state;
   
   	o_drawbounding(w_current, NULL,
  @@ -1106,7 +1103,7 @@
       }
       else {
         /* Start the object movement */
  -      rotated_inside = 0;
  +      w_current->rotated_inside = 0;
         o_move_start(w_current,
   		   (int) event->x, (int) event->y);
         w_current->event_state = ENDMOVE;