[PD-cvs] pd/src desire.c, 1.1.2.101, 1.1.2.102 desire.tk, 1.1.2.320, 1.1.2.321

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.c desire.tk 
Log Message:
fixed Ctrl+/ Ctrl+.


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.320
retrieving revision 1.1.2.321
diff -C2 -d -r1.1.2.320 -r1.1.2.321
*** desire.tk	13 Aug 2006 04:47:26 -0000	1.1.2.320
--- desire.tk	13 Aug 2006 05:00:35 -0000	1.1.2.321
***************
*** 503,508 ****
  set key(find_again) "Ctrl+g"
  set key(find_last_error) ""
! set key(audio_on) "Ctrl+/"
! set key(audio_off) "Ctrl+."
  set key(audio_settings) ""
  set key(midi_settings) ""
--- 503,508 ----
  set key(find_again) "Ctrl+g"
  set key(find_last_error) ""
! set key(audio_on) "Ctrl+slash"
! set key(audio_off) "Ctrl+period"
  set key(audio_settings) ""
  set key(midi_settings) ""
***************
*** 626,630 ****
  proc pdtk_pd_dsp {value} {
      global ctrls_audio_on
!     set ctrls_audio_on [expr $value == "ON"]
  }
  
--- 626,630 ----
  proc pdtk_pd_dsp {value} {
      global ctrls_audio_on
!     set ctrls_audio_on $value
  }
  
***************
*** 868,877 ****
  set main [Client new]
  
! def* Menuable eval% {code} {
  	regsub -all %W $code $self code
  	uplevel [info level] $code
  }
  
! def* Menuable ctrlkey {key shift} {
      global accels
      set key [if {$shift} {string toupper $key} {string tolower $key}]
--- 868,877 ----
  set main [Client new]
  
! def Menuable eval% {code} {
  	regsub -all %W $code $self code
  	uplevel [info level] $code
  }
  
! def Menuable ctrlkey {key shift} {
      global accels
      set key [if {$shift} {string toupper $key} {string tolower $key}]
***************
*** 883,887 ****
  }
  
! def* Menuable altkey {key iso shift} {
      global accels
      set key [if {$shift} {string toupper $key} {string tolower $key}]
--- 883,887 ----
  }
  
! def Menuable altkey {key iso shift} {
      global accels
      set key [if {$shift} {string toupper $key} {string tolower $key}]
***************
*** 1150,1153 ****
--- 1150,1155 ----
  def Client about {} {AboutDialog new}
  def Client class_browser {} {Browser new_as browser browser 0 0 ""}
+ def Client audio_on  {} {pd pd dsp 1}
+ def Client audio_off {} {pd pd dsp 0}
  
  def Client menu_addstd {} {
***************
*** 5404,5408 ****
  		if {[string length $op]==0} {break}
  		if {![info exists pdrc_options_h($op)]} {
! 			error "unknown option: $op"
  		}
  		mset {type name} $pdrc_options_h($op)
--- 5406,5410 ----
  		if {[string length $op]==0} {break}
  		if {![info exists pdrc_options_h($op)]} {
! 			post "unknown option: %s" $op
  		}
  		mset {type name} $pdrc_options_h($op)
***************
*** 5568,5572 ****
  		foreach {type item value} $line {
  		if {![info exists ddrc_options_h($item)]} {
! 			error "unknown option: $item"
  		}
  		switch $type {
--- 5570,5574 ----
  		foreach {type item value} $line {
  		if {![info exists ddrc_options_h($item)]} {
! 			post "unknown option: %s" $item
  		}
  		switch $type {

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.101
retrieving revision 1.1.2.102
diff -C2 -d -r1.1.2.101 -r1.1.2.102
*** desire.c	11 Aug 2006 03:54:23 -0000	1.1.2.101
--- desire.c	13 Aug 2006 05:00:34 -0000	1.1.2.102
***************
*** 1313,1317 ****
      t_canvas *x;
      if (canvas_dspstate) ugen_stop();
!     else sys_gui("pdtk_pd_dsp ON\n");
      ugen_start();
      
--- 1313,1317 ----
      t_canvas *x;
      if (canvas_dspstate) ugen_stop();
!     else sys_gui("pdtk_pd_dsp 1\n");
      ugen_start();
      
***************
*** 1327,1331 ****
      {
          ugen_stop();
!         sys_gui("pdtk_pd_dsp OFF\n");
          canvas_dspstate = 0;
      }
--- 1327,1331 ----
      {
          ugen_stop();
!         sys_gui("pdtk_pd_dsp 0\n");
          canvas_dspstate = 0;
      }
***************
*** 11291,11294 ****
--- 11291,11306 ----
  }
  
+ /*
+ static void canvas_object_insert(t_canvas *x, int argc, t_atom *argv) {
+ 	t_text *o;
+ 	t_symbol *name;
+ 	if (argc<1 || argv[0]->a_type != T_SYMBOL) {error("$1 must be symbol"); return;}
+ 	name = atom_getsymbol(argv[0]);
+ 	if (sscanf(name->s_name,"!x%lx",(long*)&o)<1) {error("gargamel was here"); return;}
+ 	glist_delete(x,(t_gobj *)o);
+ 	gobj_changed(x,0);
+ }
+ */
+ 
  void g_text_setup(void) {
  	t_class *c;
***************
*** 12688,12691 ****
--- 12700,12704 ----
      class_addmethod3(c,canvas_object_moveto,"object_moveto","sff");
      class_addmethod3(c,canvas_object_delete,"object_delete","s");
+     class_addmethod3(c,canvas_object_delete,"object_insert","*");
      class_addmethod3(c,canvas_text_setto,"text_setto","*");
      class_setnotice(c, canvas_notice);