Pd-cvs October 2006

pd-cvs@lists.iem.at

13 participants
248 discussions

pd/src desire.tk,1.1.2.521,1.1.2.522
by chunlee 21 Oct '06

21 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5407 Modified Files: Tag: devel_0_39 desire.tk Log Message: fix to completionbox Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.521 retrieving revision 1.1.2.522 diff -C2 -d -r1.1.2.521 -r1.1.2.522 *** desire.tk 20 Oct 2006 00:37:01 -0000 1.1.2.521 --- desire.tk 21 Oct 2006 00:52:09 -0000 1.1.2.522 *************** *** 1907,1910 **** --- 1907,1914 ---- } + def TextBox text {} { + return $@text + } + def TextBox update_size {} { global font *************** *** 1921,1928 **** #set width [$self look fontwidth];set height [$self look fontheight] if {[winfo exists $c.${self}text]} { ! set height [expr [lindex [$t configure -height] 4] * \ ! [font metrics [$self look font] -linespace]] ! } else { ! set height [expr [font metrics [$self look font] -linespace] * $nl] } #set height [expr [font metrics [$self look font] -linespace] * $nl] --- 1925,1932 ---- #set width [$self look fontwidth];set height [$self look fontheight] if {[winfo exists $c.${self}text]} { ! set height [expr [lindex [$t configure -height] 4] * \ ! [font metrics [$self look font] -linespace]] ! } else { ! set height [expr [font metrics [$self look font] -linespace] * $nl] } #set height [expr [font metrics [$self look font] -linespace] * $nl] *************** *** 1932,1946 **** set textwidth [expr (($x2 - $x1)/[$@canvas zoom])+$padx] } - #if {[llength [$c gettags ${self}text]]} { catch { - #set n [expr [string length [$c.${self}text get 1.0 1.end]] -1] set n [expr [string length [$c.${self}text get $(a)longline.0 $(a)longline.end]] -1] - #mset {x1 y1 w h} [$c.${self}text bbox 1.$n] mset {x1 y1 w h} [$c.${self}text bbox $(a)longline.$n] set textwidth [expr ($padx + $x1 + ($w * 2)+$padx+2) / [$@canvas zoom]] ! } - #} - #set textwidth [expr $font(padx)+$font(width)*($n+$@edit)] set iowidth [$self look iowidth] set topwidth [expr (2* $@ninlets-1) * $iowidth] --- 1936,1947 ---- set textwidth [expr (($x2 - $x1)/[$@canvas zoom])+$padx] } catch { set n [expr [string length [$c.${self}text get $(a)longline.0 $(a)longline.end]] -1] mset {x1 y1 w h} [$c.${self}text bbox $(a)longline.$n] set textwidth [expr ($padx + $x1 + ($w * 2)+$padx+2) / [$@canvas zoom]] ! # this might work better...... ! #set textwidth [expr [string length [$c.${self}text get $(a)longline.0 $(a)longline.end]] * $w \ ! # + $padx*2] } set iowidth [$self look iowidth] set topwidth [expr (2* $@ninlets-1) * $iowidth] *************** *** 5483,5488 **** set @height [$canvas look showcomp]} else {set @height 20} listbox $f -width $@width -height $@height -relief flat \ ! -bg [$canvas look compbg] -selectbackground [$canvas look compselectbg] \ ! -activestyle dotbox -selectforeground [$canvas look compselectfg] -fg [$canvas look compfg] \ -font $look(View:font) $self adjust_box --- 5484,5489 ---- set @height [$canvas look showcomp]} else {set @height 20} listbox $f -width $@width -height $@height -relief flat \ ! -bg [$canvas look bgedit] -selectbackground [$canvas look fg] \ ! -activestyle dotbox -selectforeground [$canvas look bgedit] -fg [$canvas look fg] \ -font $look(View:font) $self adjust_box *************** *** 5575,5579 **** switch $self { browser {$self fill_box [$@textbox get]} ! completion {$self adjust_box} } } --- 5576,5580 ---- switch $self { browser {$self fill_box [$@textbox get]} ! completion {$self adjust_box; $@textself resize; $@textself changed} } } *************** *** 5605,5608 **** --- 5606,5610 ---- if {[focus] == $@textbox & $key != "Tab"} { $self adjust_box + $@textself resize #hum, no idea why i need after 1 for it to work... after 1 $@textself after_key $@textbox

1 0

autobuild: pd-main macosx104-powerpc 2006-10-20 03.15.02
by pd＠macosx104-powerpc.idmi.poly.edu 20 Oct '06

20 Oct '06

cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/pm_mac/pmmacosxcm.o ../portmidi/pm_mac/pmmacosxcm.c ../portmidi/pm_mac/pmmacosxcm.c: In function 'pm_macosxcm_init': ../portmidi/pm_mac/pmmacosxcm.c:657: warning: comparison between signed and unsigned ../portmidi/pm_mac/pmmacosxcm.c:673: warning: comparison between signed and unsigned ../portmidi/pm_mac/pmmacosxcm.c: In function 'pm_macosxcm_init': ../portmidi/pm_mac/pmmacosxcm.c:657: warning: comparison between signed and unsigned ../portmidi/pm_mac/pmmacosxcm.c:673: warning: comparison between signed and unsigned cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/pm_common/pmutil.o ../portmidi/pm_common/pmutil.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/pm_common/portmidi.o ../portmidi/pm_common/portmidi.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/porttime/ptmacosx_cf.o ../portmidi/porttime/ptmacosx_cf.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/d_fft_mayer.o d_fft_mayer.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/d_fftroutine.o d_fftroutine.c cd ../obj; cc -Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI -arch i386 -arch ppc -o ../bin/pd g_canvas.o g_graph.o g_text.o g_rtext.o g_array.o g_template.o g_io.o g_scalar.o g_traversal.o g_guiconnect.o g_readwrite.o g_editor.o g_all_guis.o g_bang.o g_hdial.o g_hslider.o g_mycanvas.o g_numbox.o g_toggle.o g_vdial.o g_vslider.o g_vumeter.o m_pd.o m_class.o m_obj.o m_atom.o m_memory.o m_binbuf.o m_conf.o m_glob.o m_sched.o s_main.o s_inter.o s_file.o s_print.o s_loader.o s_path.o s_entry.o s_audio.o s_midi.o d_ugen.o d_ctl.o d_arithmetic.o d_osc.o d_filter.o d_dac.o d_misc.o d_math.o d_fft.o d_array.o d_global.o d_delay.o d_resample.o x_arithmetic.o x_connective.o x_interface.o x_midi.o x_misc.o x_time.o x_acoustics.o x_net.o x_qlist.o x_gui.o x_list.o d_soundfile.o s_midi_pm.o s_audio_pa.o s_audio_pablio.o s_audio_paring.o ../portaudio/pa_common/pa_allocation.o ../portaudio/pa_com mon/pa_converters.o ../portaudio/pa_common/pa_cpuload.o ../portaudio/pa_common/pa_dither.o ../portaudio/pa_common/pa_front.o ../portaudio/pa_common/pa_process.o ../portaudio/pa_common/pa_skeleton.o ../portaudio/pa_common/pa_stream.o ../portaudio/pa_common/pa_trace.o ../portaudio/pa_unix/pa_unix_util.o ../portaudio/pa_mac_core/pa_mac_core.o ../portaudio/pa_mac/pa_mac_hostapis.o ../portmidi/pm_mac/pmmac.o ../portmidi/pm_mac/pmmacosxcm.o ../portmidi/pm_common/pmutil.o ../portmidi/pm_common/portmidi.o ../portmidi/porttime/ptmacosx_cf.o d_fft_mayer.o d_fftroutine.o \ -ldl -lm -lpthread /usr/bin/ld: for architecture i386 /usr/bin/ld: warning /System/Library/Frameworks/CoreAudio.framework/CoreAudio cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/AudioUnit.framework/AudioUnit cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/AudioToolbox.framework/AudioToolbox cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/Carbon.framework/Carbon cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/CoreMIDI.framework/CoreMIDI cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libdl.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libm.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libpthread.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libSystem.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: Undefined symbols: ___keymgr_dwarf2_register_sections __cthread_init_routine _atexit _errno _exit _mach_init_routine _atoi _memset _sprintf _sscanf _strcat _strchr _strncat _strncpy _atof _floor __DefaultRuneLocale ___maskrune _cos _fclose _fdopen _fopen _fprintf _fscanf _memmove _sin _strcpy _strcmp _exp _log _pow _close _calloc _free _memcpy _realloc ___sF _atol _fwrite _lseek _open _perror _read _pthread_mutex_lock _pthread_mutex_trylock _pthread_mutex_unlock _fputs _malloc _stat _strrchr _strtol ___error __exit _accept _bind _connect _execl _fork _getcwd _getenv _gethostbyname _gettimeofday _getuid _listen _pthread_self _pthread_setschedparam _recv _select _send _seteuid _setitimer _setsockopt _sigaction _signal _socket _strerror _vsnprintf _write _fread _pclose _popen _snprintf _system _dlerror _dlopen _dlsym _fstat _cosf _atan2 _atanf _expf _sinf _times _pthread_cond_destroy _pthread_cond_init _pthread_cond_signal _pthread_cond_wait _pthread_create _pthread_join _pthread_mutex_destroy _pthread_mutex_init _fputc _fflush _vfprintf _pthread_cancel _usleep _AudioConverterDispose _AudioConverterFillBuffer _AudioConverterNew _AudioConverterReset _AudioConverterSetProperty _AudioDeviceAddPropertyListener _AudioDeviceGetCurrentTime _AudioDeviceGetProperty _AudioDeviceGetPropertyInfo _AudioDeviceRemovePropertyListener _AudioDeviceSetProperty _AudioHardwareGetProperty _AudioHardwareGetPropertyInfo _AudioOutputUnitStart _AudioOutputUnitStop _AudioUnitGetProperty _AudioUnitInitialize _AudioUnitRender _AudioUnitReset _AudioUnitSetProperty _AudioUnitUninitialize _CloseComponent _FindNextComponent _OpenAComponent _printf _puts _AudioConvertHostTimeToNanos _AudioConvertNanosToHostTime _AudioGetCurrentHostTime _CFRelease _CFStringCreateWithFormat _CFStringGetCString _CFStringGetLength _CFStringGetSystemEncoding _MIDIClientCreate _MIDIClientDispose _MIDIEndpointGetEntity _MIDIEntityGetDevice _MIDIGetDestination _MIDIGetNumberOfDestinations _MIDIGetNumberOfDevices _MIDIGetNumberOfSources _MIDIGetSource _MIDIInputPortCreate _MIDIObjectGetStringProperty _MIDIOutputPortCreate _MIDIPacketListAdd _MIDIPacketListInit _MIDIPortConnectSource _MIDIPortDisconnectSource _MIDIPortDispose _MIDISend ___CFConstantStringClassReference _kMIDIPropertyName _CFAbsoluteTimeGetCurrent _CFRunLoopAddTimer _CFRunLoopGetCurrent _CFRunLoopRemoveTimer _CFRunLoopRunInMode _CFRunLoopStop _CFRunLoopTimerCreate _mach_error _mach_thread_self _thread_policy_set _log10 _abort collect2: ld returned 1 exit status lipo: can't open input file: /var/tmp//ccRkNOcU.out (No such file or directory) make: *** [../bin/pd] Error 1

1 0

pd/src desire.tk,1.1.2.520,1.1.2.521
by chunlee 20 Oct '06

20 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29061 Modified Files: Tag: devel_0_39 desire.tk Log Message: cleaned up ClassBrowser key a bit, hope nothing got brok... Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.520 retrieving revision 1.1.2.521 diff -C2 -d -r1.1.2.520 -r1.1.2.521 *** desire.tk 19 Oct 2006 23:50:04 -0000 1.1.2.520 --- desire.tk 20 Oct 2006 00:37:01 -0000 1.1.2.521 *************** *** 5548,5555 **** def ClassBrowser key {key {shift 0}} { - if {[regexp {x([0-9a-z]{6,8})text$} $@textbox textself]} { - set cut [string first "text" $textself] - set textself [string range $textself 0 [expr $cut -1]] - } switch -regexp -- $key { Up|Down { --- 5548,5551 ---- *************** *** 5579,5626 **** switch $self { browser {$self fill_box [$@textbox get]} ! completion { ! $self adjust_box ! #$self fill_box [$@textbox get 1.0 1.end] ! #.$self.comp configure -width $@width ! } } } default { ! if {[focus] == $@listbox} { ! if {[regexp {^[a-zA-Z0-9~/\._]{1}$} $key]} { ! switch $self { ! browser { ! .$self.butt.2 insert end $key ! $self fill_box [$@textbox get] ! } ! completion { ! $@textbox insert 1.end $key ! $textself after_key $@textbox ! #$self fill_box [$@textbox get 1.0 1.end] ! #.$self.comp configure -width $@width ! $self adjust_box ! focus $@textbox ! } ! } ! } ! } ! switch $self { ! browser { ! if {[focus] == $@listbox} {return} else {$self fill_box [$@textbox get]} ! } ! completion { ! if {[focus] == $@textbox & $key != "Tab"} { ! if {[winfo exists .$self]} { ! #$self fill_box [$@textbox get 1.0 1.end] ! #.$self.comp configure -width $@width ! $self adjust_box ! } ! #hum, no idea why i need after 1 for it to work... ! after 1 $textself after_key $@textbox ! } ! } ! } } } } --- 5575,5611 ---- switch $self { browser {$self fill_box [$@textbox get]} ! completion {$self adjust_box} } } default { ! $self key_default $key ! } ! } ! } ! ! def Browser key_default {key} { ! if {[focus] == $@listbox} { ! if {[regexp {^[a-zA-Z0-9~/\._]{1}$} $key]} { ! .$self.butt.2 insert end $key ! $self fill_box [$@textbox get] } } + if {[focus] == $@listbox} {return} else {$self fill_box [$@textbox get]} + } + + def Completion key_default {key} { + if {[focus] == $@listbox} { + if {[regexp {^[a-zA-Z0-9~/\._]{1}$} $key]} { + $@textbox insert 1.end $key + $@textself after_key $@textbox + $self adjust_box + focus $@textbox + } + } + if {[focus] == $@textbox & $key != "Tab"} { + $self adjust_box + #hum, no idea why i need after 1 for it to work... + after 1 $@textself after_key $@textbox + } }

1 0

pd/src desire.tk,1.1.2.519,1.1.2.520
by chunlee 20 Oct '06

20 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12232 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed a few things in the completion box code. next: tidy up ClassBrowser key.... Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.519 retrieving revision 1.1.2.520 diff -C2 -d -r1.1.2.519 -r1.1.2.520 *** desire.tk 19 Oct 2006 18:01:08 -0000 1.1.2.519 --- desire.tk 19 Oct 2006 23:50:04 -0000 1.1.2.520 *************** *** 5373,5379 **** if {[can_say $class]} {append t " [say $class]"} $@listbox insert end $t ! if {[string length $t] > [string length $@width]} {set @width [string length $t]} } } $@listbox selection set 0 0 } --- 5373,5382 ---- if {[can_say $class]} {append t " [say $class]"} $@listbox insert end $t ! #if {[string length $t] > [string length $@width]} {set @width [string length $t]} ! if {[string length $t] > $@width} {set @width [string length $t]} } } + set none " no matches " + if {![$@listbox size]} {$@listbox insert 0 $none; set @width [string length $none]} $@listbox selection set 0 0 } *************** *** 5467,5473 **** set f .$self.comp set @listbox $f ! set rootx [winfo rootx .$(a)name.c] ! set rooty [winfo rooty .$(a)name.c] ! set max [wm maxsize .$self] if {[regexp {x([0-9a-z]{6,8})text$} $@textbox textself]} { set cut [string first "text" $textself] --- 5470,5477 ---- set f .$self.comp set @listbox $f ! set @rootx [winfo rootx .$(a)name.c] ! set @rooty [winfo rooty .$(a)name.c] ! set @max [wm maxsize .$self] ! if {[regexp {x([0-9a-z]{6,8})text$} $@textbox textself]} { set cut [string first "text" $textself] *************** *** 5475,5482 **** set @textself [string range $textself 0 [expr $cut -1]] } - #mset {x1 y1 x2 y2} [$textself bbox] - mset {x1 y1 x2 y2} [lmap * [$textself bbox] [$@name zoom]] - set x1 [format %0.f $x1];set y1 [format %0.f $y1] - set x2 [format %0.f $x2];set y2 [format %0.f $y2] puts " --> [$canvas look showcomp] <--" if {[$canvas look showcomp] <= 20} { --- 5479,5482 ---- *************** *** 5486,5490 **** --- 5486,5506 ---- -activestyle dotbox -selectforeground [$canvas look compselectfg] -fg [$canvas look compfg] \ -font $look(View:font) + $self adjust_box + + bind $f <Button-1> "after 1 \"$self complete\"" + bind $f <Return> "after 1 \"$self complete\"" + bind $f <KeyPress> "$self key %K 0" + bind $f <Shift-KeyPress> "$self key %K 1" + bind $@textbox <Tab> "$self key %K ; break" + bind $@textbox <KeyPress> "$self key %K " + focus .$self.comp + } + + def Completion adjust_box {} { + mset {x1 y1 x2 y2} [lmap * [$@textself bbox] [$@name zoom]] + set x1 [format %0.f $x1];set y1 [format %0.f $y1] + set x2 [format %0.f $x2];set y2 [format %0.f $y2] $self fill_box [$@textbox get 1.0 1.end] + set f .$self.comp $f configure -width $@width set box_width [winfo reqwidth $f] *************** *** 5496,5521 **** #test the right edge of the screen, assuming the left edge has enough space ! if {[expr $x1+$rootx+$box_width] < [lindex $max 0]} { ! set box_x [expr $x1+$rootx] } else { ! set box_x [expr $x2 - $box_width + $rootx] } #test the lower edge of the screen, assuming the upper edge has enough space ! if {[expr $y2+$rooty+$box_height] < [lindex $max 1]} { ! set box_y [expr $y2 + 5 + $rooty] } else { ! set box_y [expr $y1 - $box_height - 2 + $rooty] } wm geometry .$self [winfo reqwidth .$self]x[winfo reqheight .$self]+$box_x+$box_y ! ! bind $f <Button-1> "after 1 \"$self complete\"" ! bind $f <Return> "after 1 \"$self complete\"" ! bind $f <KeyPress> "$self key %K 0" ! bind $f <Shift-KeyPress> "$self key %K 1" ! bind $@textbox <Tab> "$self key %K ; break" ! bind $@textbox <KeyPress> "$self key %K " ! focus .$self.comp ! } def ClassBrowser current_class {} { --- 5512,5530 ---- #test the right edge of the screen, assuming the left edge has enough space ! if {[expr $x1+$@rootx+$box_width] < [lindex $@max 0]} { ! set box_x [expr $x1+$@rootx] } else { ! set box_x [expr $x2 - $box_width + $@rootx] } #test the lower edge of the screen, assuming the upper edge has enough space ! if {[expr $y2+$@rooty+$box_height] < [lindex $@max 1]} { ! set box_y [expr $y2 + 5 + $@rooty] } else { ! set box_y [expr $y1 - $box_height - 2 + $@rooty] } wm geometry .$self [winfo reqwidth .$self]x[winfo reqheight .$self]+$box_x+$box_y ! ! } def ClassBrowser current_class {} { *************** *** 5570,5574 **** switch $self { browser {$self fill_box [$@textbox get]} ! completion {$self fill_box [$@textbox get 1.0 1.end]} } } --- 5579,5587 ---- switch $self { browser {$self fill_box [$@textbox get]} ! completion { ! $self adjust_box ! #$self fill_box [$@textbox get 1.0 1.end] ! #.$self.comp configure -width $@width ! } } } *************** *** 5584,5588 **** $@textbox insert 1.end $key $textself after_key $@textbox ! $self fill_box [$@textbox get 1.0 1.end] focus $@textbox } --- 5597,5603 ---- $@textbox insert 1.end $key $textself after_key $@textbox ! #$self fill_box [$@textbox get 1.0 1.end] ! #.$self.comp configure -width $@width ! $self adjust_box focus $@textbox } *************** *** 5596,5600 **** completion { if {[focus] == $@textbox & $key != "Tab"} { ! if {[winfo exists .$self]} {$self fill_box [$@textbox get 1.0 1.end]} #hum, no idea why i need after 1 for it to work... after 1 $textself after_key $@textbox --- 5611,5619 ---- completion { if {[focus] == $@textbox & $key != "Tab"} { ! if {[winfo exists .$self]} { ! #$self fill_box [$@textbox get 1.0 1.end] ! #.$self.comp configure -width $@width ! $self adjust_box ! } #hum, no idea why i need after 1 for it to work... after 1 $textself after_key $@textbox

1 0

pd/src desire.tk,1.1.2.518,1.1.2.519
by chunlee 19 Oct '06

19 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261 Modified Files: Tag: devel_0_39 desire.tk Log Message: stupid bug fix... Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.518 retrieving revision 1.1.2.519 diff -C2 -d -r1.1.2.518 -r1.1.2.519 *** desire.tk 19 Oct 2006 17:09:16 -0000 1.1.2.518 --- desire.tk 19 Oct 2006 18:01:08 -0000 1.1.2.519 *************** *** 2348,2356 **** set obj2_idx [$self children_idx $obj2] set obj3_idx [$self children_idx $obj] ! $self connect [list $obj1_idx $outlet $obj3_idx 0] ! $self connect [list $obj3_idx 0 $obj2_idx $inlet] } - # puts " target:::: $target" $obj move [expr $x-$ox] [expr $y-$oy] } else { --- 2348,2360 ---- set obj2_idx [$self children_idx $obj2] set obj3_idx [$self children_idx $obj] ! set w1 [list $obj1_idx $outlet $obj3_idx 0] ! set w2 [list $obj3_idx 0 $obj2_idx $inlet] ! if {[lsearch $@wires $w1] == -1} {$self connect $w1} ! if {[lsearch $@wires $w2] == -1} {$self connect $w2} ! #$self connect [list $obj1_idx $outlet $obj3_idx 0] ! #$self connect [list $obj3_idx 0 $obj2_idx $inlet] ! set @action move } $obj move [expr $x-$ox] [expr $y-$oy] } else {

1 0

pd/src desire.tk,1.1.2.517,1.1.2.518
by chunlee 19 Oct '06

19 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29128 Modified Files: Tag: devel_0_39 desire.tk Log Message: object insertion also work with drag while holding ctrl Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.517 retrieving revision 1.1.2.518 diff -C2 -d -r1.1.2.517 -r1.1.2.518 *** desire.tk 19 Oct 2006 12:01:49 -0000 1.1.2.517 --- desire.tk 19 Oct 2006 17:09:16 -0000 1.1.2.518 *************** *** 1574,1577 **** --- 1574,1578 ---- $self bind <Motion> motion_wrap %x %y 0 $self bind <Alt-Motion> motion_wrap %x %y 4 + $self bind <Control-Motion> motion_wrap %x %y 9 $self bind <Map> map $self bind <Unmap> unmap *************** *** 2311,2317 **** switch $@action { move {$self motion_move $oldpos $x $y; return} ! edit {$self motion_edit $x $y} insert {} chain_obj {} none {} default {$@action motion $x $y $f $target} --- 2312,2319 ---- switch $@action { move {$self motion_move $oldpos $x $y; return} ! edit {$self motion_edit $x $y $f} insert {} chain_obj {} + imove {$self motion_imove $oldpos $x $y; return} none {} default {$@action motion $x $y $f $target} *************** *** 2332,2336 **** } ! def Canvas motion_edit {x y} { if {[distance [list $x $y] $@click_at] > 5} { foreach obj $@selection { --- 2334,2363 ---- } ! def Canvas motion_imove {oldpos x y} { ! mset {ox oy} $oldpos ! if {[llength $@selection] == 1} {set obj $@selection} else {return} ! if {[[$obj class] <= Box]} { ! [$self widget] raise $obj ! mset {type id detail} [$self identify_target $x $y 0] ! if {$type == "wire"} { ! #$self selection_wire= $id ! set wire2 [$self get_wire $id] ! mset {obj1 outlet obj2 inlet} [$id report] ! $self disconnect $wire2 ! set obj1_idx [$self children_idx $obj1] ! set obj2_idx [$self children_idx $obj2] ! set obj3_idx [$self children_idx $obj] ! $self connect [list $obj1_idx $outlet $obj3_idx 0] ! $self connect [list $obj3_idx 0 $obj2_idx $inlet] ! ! } ! # puts " target:::: $target" ! $obj move [expr $x-$ox] [expr $y-$oy] ! } else { ! puts "Canvas motion warning: trying to move non-Box explicitly" ! } ! } ! ! def Canvas motion_edit {x y f} { if {[distance [list $x $y] $@click_at] > 5} { foreach obj $@selection { *************** *** 2341,2345 **** } } ! set @action move mset {ox oy} $@click_at } --- 2368,2372 ---- } } ! if {$f == 9} {set @action imove} else {set @action move} mset {ox oy} $@click_at } *************** *** 2398,2401 **** --- 2425,2429 ---- foreach tag $stack { set tags [$c gettags $tag] + # puts " tags::::: $tags" if {[regexp {^[xo][0-9a-f]{6,8}} $tags id]} { # prior to Aug 15th, Wires had lower priority as all objects together *************** *** 2403,2408 **** set class [$id class] if {[$self == $id]} {continue} ! if {[$class <= Wire]} {return [list "wire" $id]} if {[$class <= Box]} { mset {x1 y1 x2 y2} [$id bbox] set outs [$id noutlets] --- 2431,2445 ---- set class [$id class] if {[$self == $id]} {continue} ! if {[$class <= Wire]} {if {$@action != "imove"} {return [list "wire" $id]}} if {[$class <= Box]} { + if {$@action == "imove"} { + foreach tag $stack { + set tags2 [$c gettags $tag] + if {[regexp {^[xo][0-9a-f]{6,8}} $tags2 id]} { + set class [$id class] + if {[$class <= Wire]} {return [list "wire" $id]} + } + } + } mset {x1 y1 x2 y2} [$id bbox] set outs [$id noutlets] *************** *** 2842,2849 **** $self selection+= $id; set @action edit switch [expr $f&255] { ! 2 {$self auto_wire} } } - def Canvas click_on_wire {id f x y} { set obj_selection [$self selection] --- 2879,2885 ---- $self selection+= $id; set @action edit switch [expr $f&255] { ! 2 {if {![llength [$id wires]]} {return}; $self auto_wire} } } def Canvas click_on_wire {id f x y} { set obj_selection [$self selection] *************** *** 2887,2890 **** --- 2923,2927 ---- insert {} chain_obj {} + imove {} default {$@action unclick $x $y $f $target} } *************** *** 2909,2912 **** --- 2946,2950 ---- insert {} chain_obj {} + imove {$self unclick_move} default {$@action unclick $x $y $f $target} } *************** *** 3435,3438 **** --- 3473,3478 ---- } + def Box wires {} {return $@wires} + def Box changed_wires {} {foreach wire $@wires {$wire changed}}

1 0

pd/src desire.tk,1.1.2.516,1.1.2.517
by chunlee 19 Oct '06

19 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15701 Modified Files: Tag: devel_0_39 desire.tk Log Message: also tidied up Canvas motion and unclick brok them down to smaller defs Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.516 retrieving revision 1.1.2.517 diff -C2 -d -r1.1.2.516 -r1.1.2.517 *** desire.tk 19 Oct 2006 02:08:25 -0000 1.1.2.516 --- desire.tk 19 Oct 2006 12:01:49 -0000 1.1.2.517 *************** *** 2299,2313 **** global font canvas tooltip crosshair set c [$self widget] ! if {[$self look hairstate] && $@editmode} { ! $@crosshair data= $x $y $target ! $@crosshair draw ! } else { ! $@crosshair erase ! } ! if {[$self look tooltip]} { ! if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { ! $self hide_tooltip ! } ! } eval $@dehighlight set @dehighlight {} --- 2299,2303 ---- global font canvas tooltip crosshair set c [$self widget] ! $self motion_checkhairtip $target $x $y eval $@dehighlight set @dehighlight {} *************** *** 2320,2347 **** mset {type id detail} $target switch $@action { ! move { ! mset {ox oy} $oldpos ! foreach obj $@selection { ! if {[[$obj class] <= Box]} { ! $obj move [expr $x-$ox] [expr $y-$oy] ! } else { ! puts "Canvas motion warning: trying to move non-Box explicitly" ! } ! } ! return ! } ! edit { ! if {[distance [list $x $y] $@click_at] > 5} { ! foreach obj $@selection { ! if {[[$obj class] <= Box]} { ! $obj backupxy= [$obj xy] ! } else { ! puts "Canvas motion warning: trying to backup coordinates of non-Box" ! } ! } ! set @action move ! mset {ox oy} $@click_at ! } ! } insert {} chain_obj {} --- 2310,2315 ---- mset {type id detail} $target switch $@action { ! move {$self motion_move $oldpos $x $y; return} ! edit {$self motion_edit $x $y} insert {} chain_obj {} *************** *** 2350,2353 **** --- 2318,2367 ---- } if {$id == ""} {return} + $self motion_iohilite $target $x $y + } + + def Canvas motion_move {oldpos x y} { + mset {ox oy} $oldpos + foreach obj $@selection { + if {[[$obj class] <= Box]} { + $obj move [expr $x-$ox] [expr $y-$oy] + } else { + puts "Canvas motion warning: trying to move non-Box explicitly" + } + } + } + + def Canvas motion_edit {x y} { + if {[distance [list $x $y] $@click_at] > 5} { + foreach obj $@selection { + if {[[$obj class] <= Box]} { + $obj backupxy= [$obj xy] + } else { + puts "Canvas motion warning: trying to backup coordinates of non-Box" + } + } + set @action move + mset {ox oy} $@click_at + } + } + + def Canvas motion_checkhairtip {target x y} { + global crosshair tooltip + if {[$self look hairstate] && $@editmode} { + $@crosshair data= $x $y $target + $@crosshair draw + } else { + $@crosshair erase + } + if {[$self look tooltip]} { + if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { + $self hide_tooltip + } + } + } + + def Canvas motion_iohilite {target x y} { + set c [$self widget] + mset {type id detail} $target if {$@editmode && [$id canvas] == $self} { switch $type { *************** *** 2581,2587 **** set @selection {} set @selection_wire {} - #if {$@selection_wire != ""} { - #foreach wire $@selection_wire {$wire selected?= 0} - #} } --- 2595,2598 ---- *************** *** 2647,2653 **** def Canvas auto_wire {} { $self clear_wires - #set obj1_idx [$self children_idx $@auto_wire_obj1] - #set obj2_idx [$self children_idx $@auto_wire_obj2] - #$self connect [list $obj1_idx 0 $obj2_idx 0] foreach obj1 $@auto_wire_obj1 { set idx1 [$self children_idx $obj1] --- 2658,2661 ---- *************** *** 2686,2693 **** set @canvas $canvas mset {type from port} $target - #set @from $from - #set @outlet $port - #set @to "" - #set @inlet "" switch $type { outlet { --- 2694,2697 ---- *************** *** 2901,2917 **** switch $@action { edit {set @obj_in_edit $id; $id edit; set @action none; $id changed} ! move { ! foreach obj $@selection { ! if {![[$obj class] <= Box]} { ! puts "Canvas unclick warning: trying to move non-Box explicitly" ! continue ! } ! mset {x1 y1} [$obj xy] ! $obj position= [$obj backupxy] ! $obj moveto $x1 $y1 ! } ! set objs $@selection ! set @action none ! } none {} insert {} --- 2905,2909 ---- switch $@action { edit {set @obj_in_edit $id; $id edit; set @action none; $id changed} ! move {$self unclick_move} none {} insert {} *************** *** 2919,2931 **** default {$@action unclick $x $y $f $target} } ! } else { ! if {[$self focus] != ""} {[$self focus] unclick $x $y $f $target} ! mset {type id detail} $target ! if {$id != ""} {if {[$id class] == "Array"} {$id unclick $x $y $f $target; return}} ! } $self adjust_scrollbars $self checkgeometry } def Canvas adjust_scrollbars {} { set c [$self widget] --- 2911,2941 ---- default {$@action unclick $x $y $f $target} } ! } else {$self unclick_runmode $target $f $x $y} $self adjust_scrollbars $self checkgeometry } + def Canvas unclick_move {} { + foreach obj $@selection { + if {![[$obj class] <= Box]} { + puts "Canvas unclick warning: trying to move non-Box explicitly" + continue + } + mset {x1 y1} [$obj xy] + $obj position= [$obj backupxy] + $obj moveto $x1 $y1 + } + set objs $@selection + set @action none + } + + def Canvas unclick_runmode {target f x y} { + if {[$self focus] != ""} {[$self focus] unclick $x $y $f $target} + mset {type id detail} $target + if {$id != ""} { + if {[$id class] == "Array"} {$id unclick $x $y $f $target; return} + } + } + def Canvas adjust_scrollbars {} { set c [$self widget]

1 0

externals/zexy/src zexy.h,1.20,1.21 zexyconf.h.in,1.2,1.3
by IOhannes m zmölnig 19 Oct '06

19 Oct '06

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31107 Modified Files: zexy.h zexyconf.h.in Log Message: protect zexyconf.h against re-inclusion; use the protection in zexy.h (so we can force zexyconf.h to not be included) Index: zexyconf.h.in =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/zexyconf.h.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zexyconf.h.in 14 Dec 2005 19:03:28 -0000 1.2 --- zexyconf.h.in 19 Oct 2006 09:48:37 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + #ifndef _ZEXYCONF_H_ + #define _ZEXYCONF_H_ /* Define if you have the <regex.h> header file. */ *************** *** 15,17 **** --- 17,20 ---- #undef HAVE_LINUX_PPDEV_H + #endif /* _ZEXYCONF_H_ */ Index: zexy.h =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/zexy.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** zexy.h 17 Oct 2006 07:49:46 -0000 1.20 --- zexy.h 19 Oct 2006 09:48:37 -0000 1.21 *************** *** 40,44 **** #endif ! #include "zexyconf.h" #include "m_pd.h" --- 40,50 ---- #endif ! /* usually the re-inclusion magic is done in the header-file itself ! * however, we do it outside, so we can force zexyconf.h to not be used ! * (e.g. from by definig the INCLUDE_SH1T in externals/build/src/* ! */ ! #ifndef INCLUDE_ZEXYCONF_H__ ! # include "zexyconf.h" ! #endif /* INCLUDE_ZEXYCONF_H__ */ #include "m_pd.h"

1 0

autobuild: pd-main macosx104-powerpc 2006-10-19 03.15.02
by pd＠macosx104-powerpc.idmi.poly.edu 19 Oct '06

19 Oct '06

cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/pm_mac/pmmacosxcm.o ../portmidi/pm_mac/pmmacosxcm.c ../portmidi/pm_mac/pmmacosxcm.c: In function 'pm_macosxcm_init': ../portmidi/pm_mac/pmmacosxcm.c:657: warning: comparison between signed and unsigned ../portmidi/pm_mac/pmmacosxcm.c:673: warning: comparison between signed and unsigned ../portmidi/pm_mac/pmmacosxcm.c: In function 'pm_macosxcm_init': ../portmidi/pm_mac/pmmacosxcm.c:657: warning: comparison between signed and unsigned ../portmidi/pm_mac/pmmacosxcm.c:673: warning: comparison between signed and unsigned cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/pm_common/pmutil.o ../portmidi/pm_common/pmutil.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/pm_common/portmidi.o ../portmidi/pm_common/portmidi.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/porttime/ptmacosx_cf.o ../portmidi/porttime/ptmacosx_cf.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/d_fft_mayer.o d_fft_mayer.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/d_fftroutine.o d_fftroutine.c cd ../obj; cc -Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI -arch i386 -arch ppc -o ../bin/pd g_canvas.o g_graph.o g_text.o g_rtext.o g_array.o g_template.o g_io.o g_scalar.o g_traversal.o g_guiconnect.o g_readwrite.o g_editor.o g_all_guis.o g_bang.o g_hdial.o g_hslider.o g_mycanvas.o g_numbox.o g_toggle.o g_vdial.o g_vslider.o g_vumeter.o m_pd.o m_class.o m_obj.o m_atom.o m_memory.o m_binbuf.o m_conf.o m_glob.o m_sched.o s_main.o s_inter.o s_file.o s_print.o s_loader.o s_path.o s_entry.o s_audio.o s_midi.o d_ugen.o d_ctl.o d_arithmetic.o d_osc.o d_filter.o d_dac.o d_misc.o d_math.o d_fft.o d_array.o d_global.o d_delay.o d_resample.o x_arithmetic.o x_connective.o x_interface.o x_midi.o x_misc.o x_time.o x_acoustics.o x_net.o x_qlist.o x_gui.o x_list.o d_soundfile.o s_midi_pm.o s_audio_pa.o s_audio_pablio.o s_audio_paring.o ../portaudio/pa_common/pa_allocation.o ../portaudio/pa_com mon/pa_converters.o ../portaudio/pa_common/pa_cpuload.o ../portaudio/pa_common/pa_dither.o ../portaudio/pa_common/pa_front.o ../portaudio/pa_common/pa_process.o ../portaudio/pa_common/pa_skeleton.o ../portaudio/pa_common/pa_stream.o ../portaudio/pa_common/pa_trace.o ../portaudio/pa_unix/pa_unix_util.o ../portaudio/pa_mac_core/pa_mac_core.o ../portaudio/pa_mac/pa_mac_hostapis.o ../portmidi/pm_mac/pmmac.o ../portmidi/pm_mac/pmmacosxcm.o ../portmidi/pm_common/pmutil.o ../portmidi/pm_common/portmidi.o ../portmidi/porttime/ptmacosx_cf.o d_fft_mayer.o d_fftroutine.o \ -ldl -lm -lpthread /usr/bin/ld: for architecture i386 /usr/bin/ld: warning /System/Library/Frameworks/CoreAudio.framework/CoreAudio cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/AudioUnit.framework/AudioUnit cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/AudioToolbox.framework/AudioToolbox cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/Carbon.framework/Carbon cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/CoreMIDI.framework/CoreMIDI cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libdl.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libm.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libpthread.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libSystem.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: Undefined symbols: ___keymgr_dwarf2_register_sections __cthread_init_routine _atexit _errno _exit _mach_init_routine _atoi _memset _sprintf _sscanf _strcat _strchr _strncat _strncpy _atof _floor __DefaultRuneLocale ___maskrune _cos _fclose _fdopen _fopen _fprintf _fscanf _memmove _sin _strcpy _strcmp _exp _log _pow _close _calloc _free _memcpy _realloc ___sF _atol _fwrite _lseek _open _perror _read _pthread_mutex_lock _pthread_mutex_trylock _pthread_mutex_unlock _fputs _malloc _stat _strrchr _strtol ___error __exit _accept _bind _connect _execl _fork _getcwd _getenv _gethostbyname _gettimeofday _getuid _listen _pthread_self _pthread_setschedparam _recv _select _send _seteuid _setitimer _setsockopt _sigaction _signal _socket _strerror _vsnprintf _write _fread _pclose _popen _snprintf _system _dlerror _dlopen _dlsym _fstat _cosf _atan2 _atanf _expf _sinf _times _pthread_cond_destroy _pthread_cond_init _pthread_cond_signal _pthread_cond_wait _pthread_create _pthread_join _pthread_mutex_destroy _pthread_mutex_init _fputc _fflush _vfprintf _pthread_cancel _usleep _AudioConverterDispose _AudioConverterFillBuffer _AudioConverterNew _AudioConverterReset _AudioConverterSetProperty _AudioDeviceAddPropertyListener _AudioDeviceGetCurrentTime _AudioDeviceGetProperty _AudioDeviceGetPropertyInfo _AudioDeviceRemovePropertyListener _AudioDeviceSetProperty _AudioHardwareGetProperty _AudioHardwareGetPropertyInfo _AudioOutputUnitStart _AudioOutputUnitStop _AudioUnitGetProperty _AudioUnitInitialize _AudioUnitRender _AudioUnitReset _AudioUnitSetProperty _AudioUnitUninitialize _CloseComponent _FindNextComponent _OpenAComponent _printf _puts _AudioConvertHostTimeToNanos _AudioConvertNanosToHostTime _AudioGetCurrentHostTime _CFRelease _CFStringCreateWithFormat _CFStringGetCString _CFStringGetLength _CFStringGetSystemEncoding _MIDIClientCreate _MIDIClientDispose _MIDIEndpointGetEntity _MIDIEntityGetDevice _MIDIGetDestination _MIDIGetNumberOfDestinations _MIDIGetNumberOfDevices _MIDIGetNumberOfSources _MIDIGetSource _MIDIInputPortCreate _MIDIObjectGetStringProperty _MIDIOutputPortCreate _MIDIPacketListAdd _MIDIPacketListInit _MIDIPortConnectSource _MIDIPortDisconnectSource _MIDIPortDispose _MIDISend ___CFConstantStringClassReference _kMIDIPropertyName _CFAbsoluteTimeGetCurrent _CFRunLoopAddTimer _CFRunLoopGetCurrent _CFRunLoopRemoveTimer _CFRunLoopRunInMode _CFRunLoopStop _CFRunLoopTimerCreate _mach_error _mach_thread_self _thread_policy_set _log10 _abort collect2: ld returned 1 exit status lipo: can't open input file: /var/tmp//ccZhDsQ9.out (No such file or directory) make: *** [../bin/pd] Error 1

1 0

externals/OSCx/src OSC-common.h, 1.5, 1.6 OSC.c, 1.6, 1.7 OSCroute.c, 1.6, 1.7 dumpOSC.c, 1.6, 1.7 sendOSC.c, 1.6, 1.7
by Hans-Christoph Steiner 19 Oct '06

19 Oct '06

Update of /cvsroot/pure-data/externals/OSCx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972 Modified Files: OSC-common.h OSC.c OSCroute.c dumpOSC.c sendOSC.c Log Message: fixed up to hopefully build on MinGW gcc 3.4.5 since currently it crashes gcc. I have to say this code is ugly, so its hard to blame gcc. Too many peole just doing quick fixes, and no one caring... I am also guilty as charged. But I did take a moment to remove some warnings Index: OSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** OSC.c 30 Aug 2005 20:54:05 -0000 1.6 --- OSC.c 19 Oct 2006 04:13:27 -0000 1.7 *************** *** 18,21 **** --- 18,22 ---- #define VERSION "0.3" + /* this is for when building with non-Microsoft compilers */ #ifndef OSC_API #define OSC_API Index: OSCroute.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSCroute.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** OSCroute.c 30 Aug 2005 20:54:05 -0000 1.6 --- OSCroute.c 19 Oct 2006 04:13:27 -0000 1.7 *************** *** 54,58 **** #include "OSC-pattern-match.h" ! #ifdef WIN32 #include <stdlib.h> #include <string.h> --- 54,58 ---- #include "OSC-pattern-match.h" ! #ifdef _WIN32 #include <stdlib.h> #include <string.h> *************** *** 112,115 **** --- 112,120 ---- /* char *dstString); */ void OSCroute_allmessages(t_OSCroute *x, t_symbol *s, int argc, t_atom *argv); + #ifdef _MSC_VER + OSC_API void OSCroute_setup(void); + #else + void OSCroute_setup(void); + #endif /* _MSC_VER */ static char *NextSlashOrNull(char *p); *************** *** 126,130 **** // setup ! #ifdef WIN32 OSC_API void OSCroute_setup(void) { #else --- 131,135 ---- // setup ! #ifdef _MSC_VER OSC_API void OSCroute_setup(void) { #else Index: dumpOSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/dumpOSC.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dumpOSC.c 19 Dec 2005 04:11:47 -0000 1.6 --- dumpOSC.c 19 Oct 2006 04:13:27 -0000 1.7 *************** *** 144,152 **** /* Declarations */ ! #ifndef WIN32 static int unixinitudp(int chan); #endif ! #ifdef WIN32 typedef unsigned __int64 osc_time_t; #else --- 144,152 ---- /* Declarations */ ! #ifndef _WIN32 static int unixinitudp(int chan); #endif ! #ifdef _WIN32 typedef unsigned __int64 osc_time_t; #else *************** *** 223,227 **** // while(( ! #ifdef WIN32 if ((n = recvfrom(sockfd, mbuf, MAXMESG, 0, (SOCKADDR*)&x->x_server, &clilen)) >0) #else --- 223,227 ---- // while(( ! #ifdef _WIN32 if ((n = recvfrom(sockfd, mbuf, MAXMESG, 0, (SOCKADDR*)&x->x_server, &clilen)) >0) #else *************** *** 346,350 **** ! #ifndef WIN32 #define UNIXDG_PATH "/tmp/htm" #define UNIXDG_TMP "/tmp/htm.XXXXXX" --- 346,350 ---- ! #ifndef _WIN32 #define UNIXDG_PATH "/tmp/htm" #define UNIXDG_TMP "/tmp/htm.XXXXXX" *************** *** 371,375 **** return sockfd; } ! #endif // #ifndef WIN32 --- 371,375 ---- return sockfd; } ! #endif // #ifndef _WIN32 *************** *** 378,382 **** { ! #ifdef WIN32 struct sockaddr_in serv_addr; unsigned int sockfd; --- 378,382 ---- { ! #ifdef _WIN32 struct sockaddr_in serv_addr; unsigned int sockfd; *************** *** 421,433 **** } - - - - - - - static void closeudp(int sockfd) { ! #ifdef WIN32 closesocket(sockfd); #else --- 421,426 ---- } static void closeudp(int sockfd) { ! #ifdef _WIN32 closesocket(sockfd); #else *************** *** 695,704 **** static void dumpOSC_Smessage(t_dumpOSC *x, char *address, void *v, int n, ClientAddr returnAddr) { char *chars = v; ! t_atom at; //t_atom myargv[50]; ! int myargc = x->x_outatc; ! t_atom* mya = x->x_outat; ! int myi; #ifdef DEBUG --- 688,697 ---- static void dumpOSC_Smessage(t_dumpOSC *x, char *address, void *v, int n, ClientAddr returnAddr) { char *chars = v; ! //t_atom at; //t_atom myargv[50]; ! //int myargc = x->x_outatc; ! //t_atom* mya = x->x_outat; ! //int myi; #ifdef DEBUG *************** *** 742,746 **** int myargc = x->x_outatc; t_atom* mya = x->x_outat; ! int myi; typeTags = v; --- 735,739 ---- int myargc = x->x_outatc; t_atom* mya = x->x_outat; ! //int myi; typeTags = v; *************** *** 864,868 **** int myargc= x->x_outatc; t_atom* mya = x->x_outat; ! int myi; --- 857,861 ---- int myargc= x->x_outatc; t_atom* mya = x->x_outat; ! //int myi; *************** *** 1011,1013 **** } ! #endif /* __sgi or LINUX or WIN32 */ --- 1004,1006 ---- } ! #endif /* __sgi or LINUX or _WIN32 */ Index: OSC-common.h =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC-common.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OSC-common.h 19 Dec 2005 04:11:47 -0000 1.5 --- OSC-common.h 19 Oct 2006 04:13:27 -0000 1.6 *************** *** 49,52 **** --- 49,59 ---- #ifdef _WIN32 #include <stdio.h> + #ifdef _DEBUG + #define DEBUG + #endif + #endif /* _WIN32 */ + + /* only needed on Microsoft compilers */ + #ifdef _MSC_VER #ifdef OSC_EXPORTS #define OSC_API __declspec(dllexport) *************** *** 54,61 **** #define OSC_API __declspec(dllimport) #endif ! #ifdef _DEBUG ! #define DEBUG ! #endif ! #endif //#define int32_t t_int --- 61,65 ---- #define OSC_API __declspec(dllimport) #endif ! #endif /* _MSC_VER */ //#define int32_t t_int Index: sendOSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/sendOSC.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sendOSC.c 12 Apr 2006 14:21:34 -0000 1.6 --- sendOSC.c 19 Oct 2006 04:13:27 -0000 1.7 *************** *** 88,92 **** ! static int exitStatus = 0; static int useTypeTags = 0; --- 88,92 ---- ! //static int exitStatus = 0; static int useTypeTags = 0; *************** *** 246,250 **** { char messageName[MAXPDSTRING]; ! char *token; typedArg args[MAX_ARGS]; int i; --- 246,250 ---- { char messageName[MAXPDSTRING]; ! // char *token; typedArg args[MAX_ARGS]; int i; *************** *** 418,422 **** { int j, returnVal; - const int wmERROR = -1; returnVal = 0; --- 418,421 ----

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs October 2006