[PD-cvs] pd/src g_all_guis.c,1.1.1.4.2.4.2.32,1.1.1.4.2.4.2.33 g_all_guis.h,1.1.1.4.2.2.2.27,1.1.1.4.2.2.2.28 g_hslider.c,1.1.1.3.2.2.2.28,1.1.1.3.2.2.2.29 g_numbox.c,1.1.1.4.2.2.2.23,1.1.1.4.2.2.2.24

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9793

Modified Files:
      Tag: impd_0_37
	g_all_guis.c g_all_guis.h g_hslider.c g_numbox.c 
Log Message:
t_iemgui: removing x_change, x_steady


Index: g_hslider.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v
retrieving revision 1.1.1.3.2.2.2.28
retrieving revision 1.1.1.3.2.2.2.29
diff -C2 -d -r1.1.1.3.2.2.2.28 -r1.1.1.3.2.2.2.29
*** g_hslider.c	12 May 2004 09:13:18 -0000	1.1.1.3.2.2.2.28
--- g_hslider.c	12 May 2004 09:20:26 -0000	1.1.1.3.2.2.2.29
***************
*** 109,113 ****
  static void slider_lin(t_slider *x) {x->x_gui.x_lin0_log1 = 0; x->x_k = (x->x_max-x->x_min)/(double)((isvert(x)?x->x_gui.x_h:x->x_gui.x_w)-1);}
  static void slider_log(t_slider *x) {x->x_gui.x_lin0_log1 = 1; slider_check_minmax(x);}
! static void slider_steady(t_slider *x, t_floatarg f) {x->x_gui.x_steady   = !!f;}
  static void slider_float(t_slider *x, t_floatarg f)
  {slider_set(x, f); if(x->x_gui.x_put_in2out) slider_bang(x);}
--- 109,113 ----
  static void slider_lin(t_slider *x) {x->x_gui.x_lin0_log1 = 0; x->x_k = (x->x_max-x->x_min)/(double)((isvert(x)?x->x_gui.x_h:x->x_gui.x_w)-1);}
  static void slider_log(t_slider *x) {x->x_gui.x_lin0_log1 = 1; slider_check_minmax(x);}
! static void slider_steady(t_slider *x, t_floatarg f) {x->x_steady = !!f;}
  static void slider_float(t_slider *x, t_floatarg f)
  {slider_set(x, f); if(x->x_gui.x_put_in2out) slider_bang(x);}
***************
*** 118,122 ****
  {
      t_iemgui *y = (t_iemgui *)x;
!     int v,steady=1,lilo;
      binbuf_update(y,gensym(isvert(x)?"vsl":"hsl"),argc,argv);
      if(!pd_scanargs(argc,argv,"iiddbiaaaiiiiccci;b",
--- 118,122 ----
  {
      t_iemgui *y = (t_iemgui *)x;
!     int v,lilo;
      binbuf_update(y,gensym(isvert(x)?"vsl":"hsl"),argc,argv);
      if(!pd_scanargs(argc,argv,"iiddbiaaaiiiiccci;b",
***************
*** 124,131 ****
  	&y->x_snd,&y->x_rcv,&y->x_lab,
  	&y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize,
! 	&y->x_bcol,&y->x_fcol,&y->x_lcol,&v,&steady)) return;
      x->x_pos = x->x_val = y->x_isa&1 ? v : 0;
      y->x_lin0_log1 = lilo;
-     y->x_steady = steady;
      iemgui_constrain(y);
      slider_check_minmax(x);
--- 124,130 ----
  	&y->x_snd,&y->x_rcv,&y->x_lab,
  	&y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize,
! 	&y->x_bcol,&y->x_fcol,&y->x_lcol,&v,&x->x_steady)) return;
      x->x_pos = x->x_val = y->x_isa&1 ? v : 0;
      y->x_lin0_log1 = lilo;
      iemgui_constrain(y);
      slider_check_minmax(x);
***************
*** 142,145 ****
--- 141,145 ----
      x->x_flavor=s;
      x->x_min=0.0;
+     x->x_steady=0;
      x->x_max=(double)(IEM_SL_DEFAULTSIZE-1);
      if (isvert(x)) y->x_h=IEM_SL_DEFAULTSIZE; else y->x_w=IEM_SL_DEFAULTSIZE;

Index: g_all_guis.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v
retrieving revision 1.1.1.4.2.2.2.27
retrieving revision 1.1.1.4.2.2.2.28
diff -C2 -d -r1.1.1.4.2.2.2.27 -r1.1.1.4.2.2.2.28
*** g_all_guis.h	12 May 2004 09:13:17 -0000	1.1.1.4.2.2.2.27
--- g_all_guis.h	12 May 2004 09:20:26 -0000	1.1.1.4.2.2.2.28
***************
*** 22,26 ****
      int x_ldx, x_ldy;
      int x_isa; /* bit 0: loadinit; bit 20: scale */
!     unsigned x_selected:1,x_put_in2out:1,x_change:1,x_lin0_log1:1,x_steady:1;
      int x_font_style, x_fontsize;
      int x_fcol, x_bcol, x_lcol; /* foreground, background, label colors */
--- 22,26 ----
      int x_ldx, x_ldy;
      int x_isa; /* bit 0: loadinit; bit 20: scale */
!     unsigned x_selected:1,x_put_in2out:1,x_lin0_log1:1;
      int x_font_style, x_fontsize;
      int x_fcol, x_bcol, x_lcol; /* foreground, background, label colors */
***************
*** 43,46 ****
--- 43,47 ----
  {
      t_iemgui x_gui;
+     t_symbol *x_flavor;
      int      x_pos;
      int      x_val;
***************
*** 48,52 ****
      double   x_max;
      double   x_k;
!     t_symbol *x_flavor;
  } t_slider;
  
--- 49,53 ----
      double   x_max;
      double   x_k;
!     int      x_steady;
  } t_slider;
  
***************
*** 54,57 ****
--- 55,59 ----
  {
      t_iemgui x_gui;
+     t_symbol *x_flavor;
      int      x_on;
      int      x_on_old;
***************
*** 59,63 ****
      int      x_number;
      t_atom   x_at[2];
-     t_symbol *x_flavor;
  } t_radio;
  
--- 61,64 ----
***************
*** 110,113 ****
--- 111,115 ----
      int      x_log_height;
      int      x_finemoved;
+     int      x_change;
  } t_my_numbox;
  

Index: g_numbox.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v
retrieving revision 1.1.1.4.2.2.2.23
retrieving revision 1.1.1.4.2.2.2.24
diff -C2 -d -r1.1.1.4.2.2.2.23 -r1.1.1.4.2.2.2.24
*** g_numbox.c	12 May 2004 09:13:18 -0000	1.1.1.4.2.2.2.23
--- g_numbox.c	12 May 2004 09:20:26 -0000	1.1.1.4.2.2.2.24
***************
*** 13,17 ****
  #include "g_all_guis.h"
  #include <math.h>
! #define CH post("%d: change=%d", __LINE__, (int)x->x_gui.x_change);
   
  static t_class *my_numbox_class;
--- 13,17 ----
  #include "g_all_guis.h"
  #include <math.h>
! #define CH post("%d: change=%d", __LINE__, (int)x->x_change);
   
  static t_class *my_numbox_class;
***************
*** 21,26 ****
  static void my_numbox_tick_reset(t_my_numbox *x)
  {
!     if(!x->x_gui.x_change) return;
!     x->x_gui.x_change = 0; CH
      glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0);
      iemgui_dodraw((t_iemgui *)x);
--- 21,26 ----
  static void my_numbox_tick_reset(t_my_numbox *x)
  {
!     if(!x->x_change) return;
!     x->x_change = 0; CH
      glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0);
      iemgui_dodraw((t_iemgui *)x);
***************
*** 156,160 ****
      x->x_clock_reset = clock_new(x, (t_method)my_numbox_tick_reset);
      x->x_clock_wait  = clock_new(x, (t_method)my_numbox_tick_wait);
!     y->x_change = 0; CH
      outlet_new((t_text *)x, &s_float);
      my_numbox_reload(x,0,argc,argv);
--- 156,160 ----
      x->x_clock_reset = clock_new(x, (t_method)my_numbox_tick_reset);
      x->x_clock_wait  = clock_new(x, (t_method)my_numbox_tick_wait);
!     x->x_change = 0; CH
      outlet_new((t_text *)x, &s_float);
      my_numbox_reload(x,0,argc,argv);

Index: g_all_guis.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v
retrieving revision 1.1.1.4.2.4.2.32
retrieving revision 1.1.1.4.2.4.2.33
diff -C2 -d -r1.1.1.4.2.4.2.32 -r1.1.1.4.2.4.2.33
*** g_all_guis.c	12 May 2004 09:13:16 -0000	1.1.1.4.2.4.2.32
--- g_all_guis.c	12 May 2004 09:20:25 -0000	1.1.1.4.2.4.2.33
***************
*** 351,355 ****
  	x->x_fontsize = 8;
  	x->x_put_in2out = 1;
! 	x->x_selected = x->x_change = x->x_lin0_log1 = x->x_steady = 0;
  	x->x_snd = 0;
  	x->x_rcv = 0;
--- 351,355 ----
  	x->x_fontsize = 8;
  	x->x_put_in2out = 1;
! 	x->x_selected = x->x_lin0_log1 = 0;
  	x->x_snd = 0;
  	x->x_rcv = 0;
***************
*** 359,363 ****
  	x->x_lcol = 0x000000;
  	x->x_lin0_log1 = 0;
- 	x->x_steady = 1;
  	return x;
  }
--- 359,362 ----