Pd-cvs December 2006

pd-cvs@lists.iem.at

19 participants
825 discussions

externals/io/hidio hidio.h,1.5,1.6
by Hans-Christoph Steiner 04 Dec '06

04 Dec '06

Update of /cvsroot/pure-data/externals/io/hidio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30747 Modified Files: hidio.h Log Message: minor fix for MinGW compilation Index: hidio.h =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** hidio.h 3 Dec 2006 18:17:36 -0000 1.5 --- hidio.h 4 Dec 2006 05:23:35 -0000 1.6 *************** *** 2,16 **** #define _HIDIO_H ! #include <stdio.h> #ifdef _WINDOWS ! #include "pthread.h" /* needs pthread library */ ! #define LOG_DEBUG 7 ! #define LOG_INFO 6 ! #define LOG_WARNING 4 ! #define vsnprintf _vsnprintf ! #pragma warning (disable: 4305 4244 4761) ! #else #include <sys/syslog.h> ! #include <pthread.h> #endif --- 2,19 ---- #define _HIDIO_H ! #include <stdio.h> #ifdef _WINDOWS ! #include "pthread.h" /* needs pthread library */ ! #define LOG_DEBUG 7 ! #define LOG_INFO 6 ! #define LOG_WARNING 4 ! #define vsnprintf _vsnprintf ! #else #include <sys/syslog.h> ! #include <pthread.h> ! #endif ! ! #ifdef _MSC_VER /* this only applies to Microsoft compilers */ ! #pragma warning (disable: 4305 4244 4761) #endif *************** *** 129,139 **** #endif /* __linux__ */ #ifdef _WIN32 ! /* this should be pointers to the UsagePage and Usage */ #endif /* _WIN32 */ #ifdef __APPLE__ void *pHIDElement; // pRecElement on Mac OS X; ... on Windows #endif /* __APPLE__ */ ! t_symbol *type; // Linux "type"; HID "usagePage" ! t_symbol *name; // Linux "code"; HID "usage" unsigned char polled; // is it polled or queued? (maybe only on Mac OS X?) unsigned char relative; // relative data gets output everytime --- 132,142 ---- #endif /* __linux__ */ #ifdef _WIN32 ! /* this should store the UsagePage and Usage */ #endif /* _WIN32 */ #ifdef __APPLE__ void *pHIDElement; // pRecElement on Mac OS X; ... on Windows #endif /* __APPLE__ */ ! t_symbol *type; // Linux "type"; HID "usagePage", but using the hidio scheme ! t_symbol *name; // Linux "code"; HID "usage", but using the hidio scheme unsigned char polled; // is it polled or queued? (maybe only on Mac OS X?) unsigned char relative; // relative data gets output everytime

1 0

packages/darwin_app Makefile,1.61,1.62
by Hans-Christoph Steiner 04 Dec '06

04 Dec '06

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24270 Modified Files: Makefile Log Message: fixed case typo (from patch 1608063 submitted by kunowoudt); added a little extra info to test_location target Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** Makefile 30 Nov 2006 04:22:05 -0000 1.61 --- Makefile 4 Dec 2006 00:36:48 -0000 1.62 *************** *** 168,172 **** rez_install: install -pv "$(CWD)/mac.r" "$(bindir)" ! cd $(bindir) && /Developer/tools/Rez -t APPL mac.r -o pd --- 168,172 ---- rez_install: install -pv "$(CWD)/mac.r" "$(bindir)" ! cd $(bindir) && /Developer/Tools/Rez -t APPL mac.r -o pd *************** *** 349,351 **** --- 349,352 ---- @echo "MANUALSDIR $(manualsdir)" @echo "EXAMPLESDIR $(examplesdir)" + sw_vers

1 0

externals/io/hidio/HID Utilities Source HID_Utilities.h, 1.1, 1.2
by Hans-Christoph Steiner 04 Dec '06

04 Dec '06

Update of /cvsroot/pure-data/externals/io/hidio/HID Utilities Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23533/io/hidio/HID Utilities Source Modified Files: HID_Utilities.h Log Message: fixed Apple's sloppy use of case in #includes (from patch 1608063 submitted by kunowoudt) Index: HID_Utilities.h =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/HID Utilities Source/HID_Utilities.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HID_Utilities.h 30 Nov 2006 05:47:56 -0000 1.1 --- HID_Utilities.h 4 Dec 2006 00:34:53 -0000 1.2 *************** *** 55,59 **** #include <IOKit/hid/IOHIDUsageTables.h> ! #include <IOKit/HID/IOHIDLib.h> // ================================== --- 55,59 ---- #include <IOKit/hid/IOHIDUsageTables.h> ! #include <IOKit/hid/IOHIDLib.h> // ==================================

1 0

externals/hcs/hid/HID Utilities Source HID_Utilities.h, 1.1.1.1, 1.2
by Hans-Christoph Steiner 04 Dec '06

04 Dec '06

Update of /cvsroot/pure-data/externals/hcs/hid/HID Utilities Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23533/hcs/hid/HID Utilities Source Modified Files: HID_Utilities.h Log Message: fixed Apple's sloppy use of case in #includes (from patch 1608063 submitted by kunowoudt) Index: HID_Utilities.h =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/HID Utilities Source/HID_Utilities.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** HID_Utilities.h 9 Jun 2005 21:42:51 -0000 1.1.1.1 --- HID_Utilities.h 4 Dec 2006 00:34:53 -0000 1.2 *************** *** 55,59 **** #include <IOKit/hid/IOHIDUsageTables.h> ! #include <IOKit/HID/IOHIDLib.h> // ================================== --- 55,59 ---- #include <IOKit/hid/IOHIDUsageTables.h> ! #include <IOKit/hid/IOHIDLib.h> // ==================================

1 0

externals/io/hidio hidio.c,1.8,1.9 hidio.h,1.4,1.5
by Olaf Matthes 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/externals/io/hidio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17736 Modified Files: hidio.c hidio.h Log Message: added some #defines and #ifdefs in order for code to compile in Windows Index: hidio.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** hidio.c 2 Dec 2006 00:24:51 -0000 1.8 --- hidio.c 3 Dec 2006 18:17:36 -0000 1.9 *************** *** 3,6 **** --- 3,7 ---- /* interface to native HID (Human Interface Devices) API */ /* Written by Hans-Christoph Steiner <hans(a)at.or.at> */ + /* Max/MSP port by Olaf Matthes <olaf.matthes(a)gmx.de> */ /* */ /* Copyright (c) 2004-2006 Hans-Christoph Steiner */ *************** *** 23,32 **** /* */ /* --------------------------------------------------------------------------*/ ! #include <unistd.h> ! #include <stdarg.h> ! #include <stdlib.h> ! #include <string.h> ! #include <ctype.h> #include "hidio.h" --- 24,37 ---- /* */ /* --------------------------------------------------------------------------*/ ! ! #ifdef _WINDOWS ! /* any Windows specific includes go in here */ ! #else #include <unistd.h> ! #include <ctype.h> ! #endif ! #include <stdarg.h> ! #include <stdlib.h> ! #include <string.h> #include "hidio.h" *************** *** 84,88 **** { if(message_debug_level <= global_debug_level) ! { char buf[MAXPDSTRING]; va_list ap; --- 89,93 ---- { if(message_debug_level <= global_debug_level) ! { char buf[MAXPDSTRING]; va_list ap; *************** *** 91,95 **** vsnprintf(buf, MAXPDSTRING-1, fmt, ap); post(buf); ! va_end(ap); } } --- 96,101 ---- vsnprintf(buf, MAXPDSTRING-1, fmt, ap); post(buf); ! va_end(ap); ! } } *************** *** 385,390 **** static void hidio_open(t_hidio *x, t_symbol *s, int argc, t_atom *argv) { debug_print(LOG_DEBUG,"hid_%s",s->s_name); - short device_number; pthread_mutex_lock(&x->x_mutex); --- 391,396 ---- static void hidio_open(t_hidio *x, t_symbol *s, int argc, t_atom *argv) { + short device_number; debug_print(LOG_DEBUG,"hid_%s",s->s_name); pthread_mutex_lock(&x->x_mutex); *************** *** 831,835 **** finder_addclass("Devices", "hidio"); ! post("hidio: © 2006 by Olaf Matthes"); /* pre-generate often used symbols */ --- 837,841 ---- finder_addclass("Devices", "hidio"); ! post("hidio: © 2006 by Hans-Christoph Steiner & Olaf Matthes"); /* pre-generate often used symbols */ Index: hidio.h =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** hidio.h 1 Dec 2006 16:27:39 -0000 1.4 --- hidio.h 3 Dec 2006 18:17:36 -0000 1.5 *************** *** 2,8 **** #define _HIDIO_H ! #include <stdio.h> #include <sys/syslog.h> ! #include <pthread.h> #ifdef __linux__ --- 2,17 ---- #define _HIDIO_H ! #include <stdio.h> ! #ifdef _WINDOWS ! #include "pthread.h" /* needs pthread library */ ! #define LOG_DEBUG 7 ! #define LOG_INFO 6 ! #define LOG_WARNING 4 ! #define vsnprintf _vsnprintf ! #pragma warning (disable: 4305 4244 4761) ! #else #include <sys/syslog.h> ! #include <pthread.h> ! #endif #ifdef __linux__

1 0

pd/src configure.in,1.5.4.5.2.16,1.5.4.5.2.16.2.1
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17386 Modified Files: Tag: desiredata configure.in Log Message: added LIBSUFFIX = .so or .dylib Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.16 retrieving revision 1.5.4.5.2.16.2.1 diff -C2 -d -r1.5.4.5.2.16 -r1.5.4.5.2.16.2.1 *** configure.in 23 Nov 2006 19:10:14 -0000 1.5.4.5.2.16 --- configure.in 3 Dec 2006 16:52:48 -0000 1.5.4.5.2.16.2.1 *************** *** 20,23 **** --- 20,24 ---- AC_SUBST(STRIPFLAG) AC_SUBST(EXTERNTARGET) + AC_SUBST(LIBSUFFIX) dnl Checks for features. *************** *** 60,63 **** --- 61,65 ---- LDFLAGS="-Wl,-export-dynamic " EXT=pd_linux + LIBSUFFIX=.so MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" STRIPFLAG=-s *************** *** 67,70 **** --- 69,73 ---- LDFLAGS="-Wl" EXT=pd_darwin + LIBSUFFIX=.dylib MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" STRIPFLAG=""

1 0

pd/src desire.c, 1.1.2.217.2.17, 1.1.2.217.2.18 s_inter.c, 1.5.4.10.2.25.2.9, 1.5.4.10.2.25.2.10 s_main.c, 1.7.4.17.2.22.2.11, 1.7.4.17.2.22.2.12
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14392 Modified Files: Tag: desiredata desire.c s_inter.c s_main.c Log Message: reenabled startup reply Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.25.2.9 retrieving revision 1.5.4.10.2.25.2.10 diff -C2 -d -r1.5.4.10.2.25.2.9 -r1.5.4.10.2.25.2.10 *** s_inter.c 3 Dec 2006 15:08:23 -0000 1.5.4.10.2.25.2.9 --- s_inter.c 3 Dec 2006 16:45:51 -0000 1.5.4.10.2.25.2.10 *************** *** 647,656 **** if (sys_hipriority) sys_setpriority(); setuid(getuid()); ! /* ! char buf[256], buf2[256]; ! sys_get_audio_apis(buf); ! sys_get_midi_apis(buf2); ! sys_vgui("pdtk_pd_startup {%s} %s %s\n", pd_version, buf, buf2); ! */ return 0; } --- 647,651 ---- if (sys_hipriority) sys_setpriority(); setuid(getuid()); ! return 0; } Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.11 retrieving revision 1.7.4.17.2.22.2.12 diff -C2 -d -r1.7.4.17.2.22.2.11 -r1.7.4.17.2.22.2.12 *** s_main.c 3 Dec 2006 15:08:23 -0000 1.7.4.17.2.22.2.11 --- s_main.c 3 Dec 2006 16:45:51 -0000 1.7.4.17.2.22.2.12 *************** *** 64,70 **** char *sys_guicmd; t_symbol *sys_libdir; ! t_namelist *sys_externlist; ! static t_namelist *sys_openlist=NULL; ! static t_namelist *sys_messagelist; static int sys_version; --- 64,70 ---- char *sys_guicmd; t_symbol *sys_libdir; ! t_namelist *sys_externlist =0; ! t_namelist *sys_openlist =0; ! t_namelist *sys_messagelist=0; static int sys_version; *************** *** 118,168 **** /* } jsarlo */ - static void openit(const char *dirname, const char *filename) - { - char dirbuf[MAXPDSTRING], *nameptr; - int fd = open_via_path(dirname, filename, "", dirbuf, &nameptr, - MAXPDSTRING, 0); - if (fd) - { - close (fd); - glob_evalfile(0, gensym(nameptr), gensym(dirbuf)); - } - else - error("%s: can't open", filename); - } - - extern t_text *sys_netreceive; - extern t_socketreceiver *sys_socketreceiver; - t_socketreceiver *netreceive_newest_receiver(t_text *x); - - /* this should be rethought for multi-client */ - void glob_initfromgui(void *dummy, t_symbol *s) - { - char cwd[666]; - t_namelist *nl; - getcwd(cwd,665); - sys_socketreceiver=netreceive_newest_receiver(sys_netreceive); - //fprintf(stderr,"sys_socketreceiver=%p\n",sys_socketreceiver); - - /* load dynamic libraries specified with "-lib" args */ - for (nl = sys_externlist; nl; nl = nl->nl_next) - if (!sys_load_lib(cwd, nl->nl_string, 0)) - post("%s: can't load library", nl->nl_string); - /* open patches specifies with "-open" args */ - for (nl = sys_openlist; nl; nl = nl->nl_next) - openit(cwd, nl->nl_string); - namelist_free(sys_openlist); - sys_openlist = 0; - /* send messages specified with "-send" args */ - for (nl = sys_messagelist; nl; nl = nl->nl_next) { - t_binbuf *b = binbuf_new(); - binbuf_text(b, nl->nl_string, strlen(nl->nl_string)); - binbuf_eval(b, 0, 0, 0); - binbuf_free(b); - } - namelist_free(sys_messagelist); - sys_messagelist = 0; - } - static void sys_afterargparse(void); --- 118,121 ---- Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.17 retrieving revision 1.1.2.217.2.18 diff -C2 -d -r1.1.2.217.2.17 -r1.1.2.217.2.18 *** desire.c 3 Dec 2006 04:04:18 -0000 1.1.2.217.2.17 --- desire.c 3 Dec 2006 16:45:49 -0000 1.1.2.217.2.18 *************** *** 7700,7703 **** --- 7700,7746 ---- } + static void openit(const char *dirname, const char *filename) { + char dirbuf[MAXPDSTRING], *nameptr; + int fd = open_via_path(dirname,filename,"",dirbuf,&nameptr,MAXPDSTRING,0); + if (fd) { + close(fd); + glob_evalfile(0, gensym(nameptr), gensym(dirbuf)); + } else { + error("%s: can't open", filename); + } + } + + extern "C" t_socketreceiver *netreceive_newest_receiver(t_text *x); + + /* this should be rethought for multi-client */ + void glob_initfromgui(void *dummy, t_symbol *s) { + char buf[256], buf2[256]; + char cwd[666]; + t_namelist *nl; + getcwd(cwd,665); + sys_socketreceiver=netreceive_newest_receiver(sys_netreceive); + //fprintf(stderr,"sys_socketreceiver=%p\n",sys_socketreceiver); + /* load dynamic libraries specified with "-lib" args */ + for (nl = sys_externlist; nl; nl = nl->nl_next) + if (!sys_load_lib(cwd, nl->nl_string, 0)) + post("%s: can't load library", nl->nl_string); + /* open patches specified with "-open" args */ + for (nl = sys_openlist; nl; nl = nl->nl_next) openit(cwd, nl->nl_string); + namelist_free(sys_openlist); + sys_openlist = 0; + /* send messages specified with "-send" args */ + for (nl = sys_messagelist; nl; nl = nl->nl_next) { + t_binbuf *b = binbuf_new(); + binbuf_text(b, nl->nl_string, strlen(nl->nl_string)); + binbuf_eval(b, 0, 0, 0); + binbuf_free(b); + } + namelist_free(sys_messagelist); + sys_messagelist = 0; + sys_get_audio_apis(buf); + sys_get_midi_apis(buf2); + sys_vgui("pd_startup {%s} %s %s\n", pd_version, buf, buf2); + } + extern "C" { void glob_watchdog(t_pd *dummy);

1 0

pd/src s_stuff.h,1.5.4.10.2.8.2.2,1.5.4.10.2.8.2.3
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13130 Modified Files: Tag: desiredata s_stuff.h Log Message: new decls so that desire.c can use s_main.c and s_inter.c Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.10.2.8.2.2 retrieving revision 1.5.4.10.2.8.2.3 diff -C2 -d -r1.5.4.10.2.8.2.2 -r1.5.4.10.2.8.2.3 *** s_stuff.h 2 Dec 2006 05:13:10 -0000 1.5.4.10.2.8.2.2 --- s_stuff.h 3 Dec 2006 16:43:44 -0000 1.5.4.10.2.8.2.3 *************** *** 40,48 **** /* s_file.c */ - void sys_loadpreferences( void); - void sys_savepreferences( void); - extern int sys_defeatrt; - extern t_symbol *sys_flags; - /* s_main.c */ extern int sys_debuglevel; --- 40,43 ---- *************** *** 53,56 **** --- 48,54 ---- extern int sys_tooltips; + extern int sys_defeatrt; + extern t_symbol *sys_flags; + EXTERN int sys_nearestfontsize(int fontsize); EXTERN int sys_hostfontsize(int fontsize); *************** *** 189,192 **** --- 187,199 ---- } t_socketreceiver; + EXTERN char pd_version[]; + EXTERN t_text *sys_netreceive; + EXTERN t_socketreceiver *sys_socketreceiver; + //EXTERN t_socketreceiver *netreceive_newest_receiver(t_text *x); + + EXTERN t_namelist *sys_externlist; + EXTERN t_namelist *sys_openlist; + EXTERN t_namelist *sys_messagelist; + EXTERN t_socketreceiver *socketreceiver_new(t_pd *owner, int fd, t_socketnotifier notifier, t_socketreceivefn socketreceivefn, int udp);

1 0

pd/src desire.tk,1.1.2.600.2.7,1.1.2.600.2.8
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21404 Modified Files: Tag: desiredata desire.tk Log Message: class_new Console Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.7 retrieving revision 1.1.2.600.2.8 diff -C2 -d -r1.1.2.600.2.7 -r1.1.2.600.2.8 *** desire.tk 3 Dec 2006 05:35:49 -0000 1.1.2.600.2.7 --- desire.tk 3 Dec 2006 15:40:40 -0000 1.1.2.600.2.8 *************** *** 582,585 **** --- 582,617 ---- ################## set up main window ######################### + class_new Console + + def Console init {c} { + set @c $c + frame $c + text $c.1 -width 72 -height 20 -yscrollcommand "$c.2 set" -font $::look(View:font) + scrollbar $c.2 -command "$c.1 yview" + pack $c.1 -side left -fill both -expand yes + pack $c.2 -side left -fill y -expand no + pack $c -fill both -expand yes + $c.2 set 0.0 1.0 + switch $::OS { osx { + bind $c.1 <MouseWheel> {$c.1 yview scroll [expr -2-abs(%D)/%D] units} + }} + set @lines 0 + } + + def Console widget {} {return $@c} + + def Console post_string {x} { + set oldpos [lindex [$(a)c.2 get] 1] + $(a)c.1 insert end $x + regsub -all "\n" $x "" y + set n [expr [string length $x]-[string length $y]] + incr @lines $n + while {$@lines >= $::cmdline(console)} { + $(a)c.1 delete 1.0 2.0 + incr @lines -1 + } + if {$oldpos > 0.9999} {$(a)c.1 see end} + } + #class_new Client {Menuable View} class_new Client {Menuable Thing} *************** *** 642,646 **** canvas $f.1.clip -width 5 -height 10 -bg #222222 pack $f.1.mtr $f.1.clip -side left ! pack [label $f.2 -text [say $z]:] $f.1 -side left -padx 4 pack $f -side left -pady 0 -padx 0 } --- 674,678 ---- canvas $f.1.clip -width 5 -height 10 -bg #222222 pack $f.1.mtr $f.1.clip -side left ! pack [label $f.2 -text [say $z]:] $f.1 -side left pack $f -side left -pady 0 -padx 0 } *************** *** 657,665 **** frame .debug # pack [label .debug.1 -anchor w -text ""] -side left ! pack [entry .controls.3 -textvariable ::serial -width 10] -side right pack [label .controls.2 -text "obj.serial: " -justify right] -side right pack .debug -side bottom -fill x . configure -menu .mbar wm title . "DesireData" } --- 689,706 ---- frame .debug # pack [label .debug.1 -anchor w -text ""] -side left ! pack [entry .controls.3 -textvariable ::serial -width 5] -side right pack [label .controls.2 -text "obj.serial: " -justify right] -side right + # set @book [Notebook new_as book] + # $@book add_section 1 [say posts] + # $@book add_section 2 [say socket_log] + # pack .book -side top -fill both -expand 1 + if {$::cmdline(console)} { + #set ::console [Console new .book.main.1.log] + set ::console [Console new .log] + } pack .debug -side bottom -fill x . configure -menu .mbar wm title . "DesireData" + post "DesireData 0.39.A, Tcl %s, Tk %s" $::tcl_patchLevel $::tk_patchLevel } *************** *** 678,687 **** set pd_opendir [pwd] ! ############### set up socket & start server socket #################### ! # note: here, it's the client that has the server socket, and the ! # server that has the client socket. Yes, this is messed up. Think of ! # two separate things: client-server at the socket level, and client-server ! # at the getting-stuff-done level. --matju ! set sock {} set sock_lobby {} --- 719,723 ---- set pd_opendir [pwd] ! ############### set up socket ########################################## set sock {} set sock_lobby {} *************** *** 786,791 **** ################ utility functions ######################### - proc pdtk_post {s} {post_to_gui $s} - proc enquote {x} { set foo [string map {"," "" ";" "" "\"" ""} $x] --- 822,825 ---- *************** *** 885,890 **** } - #################### the "File" menu for the Pd window ############## - def Client init_menus {} { $self populate_menu file { --- 919,922 ---- *************** *** 911,915 **** Listener new .pd " Pd Server" pd_eval } ! if {$::cmdline(console)} {make_console} } --- 943,955 ---- Listener new .pd " Pd Server" pd_eval } ! } ! ! proc post {args} { ! set s "[eval [linsert $args 0 format]]\n" ! # set s "[info level -1]: $s" ! if {$::cmdline(console)} {$::console post_string $s} else {puts stderr $s} ! } ! proc pdtk_post {s} { ! if {$::cmdline(console)} {$::console post_string $s} else {puts stderr $s} } *************** *** 5494,5546 **** } - ##################################################################################### - # console - - proc make_console {} { - global cmdline look - set errMsg "" - if {$cmdline(console) == 0} {return} - frame .log - text .log.1 -width 72 -height 20 -yscrollcommand ".log.2 set" -font $look(View:font) - scrollbar .log.2 -command ".log.1 yview" - .log.1 insert end "DesireData 0.39.A, Tcl $::tcl_version, Tk $::tk_version\n" - pack .log.1 -side left -fill both -expand yes - pack .log.2 -side left -fill y -expand no - pack .log -fill both -expand yes - .log.2 set 0.0 1.0 - switch $::OS { osx { - bind .log.1 <MouseWheel> { - .log.1 yview scroll [expr -2-abs(%D)/%D] units - } - }} - } - - set ::console_lines 0 - proc post_to_gui {x} { - global ::console_lines - if {!$::cmdline(console)} {puts -nonewline stderr $x; return} - set oldpos [lindex [.log.2 get] 1] - .log.1 insert end $x - regsub -all "\n" $x "" y - set n [expr [string length $x]-[string length $y]] - incr ::console_lines $n - while {$::console_lines >= $::cmdline(console)} { - .log.1 delete 1.0 2.0 - incr console_lines -1 - } - if {$oldpos > 0.9999} {.log.1 see end} - } - - proc post {args} { - global cmdline - set s "[eval [linsert $args 0 format]]\n" - # set s "[info level -1]: $s" - if {$cmdline(console)} { - post_to_gui $s - } else { - puts stderr $s - } - } - ############ evaluator --- 5534,5537 ----

1 0

pd/src s_inter.c, 1.5.4.10.2.25.2.8, 1.5.4.10.2.25.2.9 s_main.c, 1.7.4.17.2.22.2.10, 1.7.4.17.2.22.2.11
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9683 Modified Files: Tag: desiredata s_inter.c s_main.c Log Message: removed old debug msgs Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.25.2.8 retrieving revision 1.5.4.10.2.25.2.9 diff -C2 -d -r1.5.4.10.2.25.2.8 -r1.5.4.10.2.25.2.9 *** s_inter.c 3 Dec 2006 03:02:25 -0000 1.5.4.10.2.25.2.8 --- s_inter.c 3 Dec 2006 15:08:23 -0000 1.5.4.10.2.25.2.9 *************** *** 630,636 **** sys_setsignals(); - fprintf(stderr,"sys_guisetportnumber=%d\n",sys_guisetportnumber); sys_netreceive = netreceive_new(&s_,sys_guisetportnumber,0); ! fprintf(stderr,"sys_netreceive=%p\n",sys_netreceive); if (!sys_netreceive) return 0; // obj_connect(sys_netreceive,0,(t_text *)pd_new3("print left"),0); --- 630,635 ---- sys_setsignals(); sys_netreceive = netreceive_new(&s_,sys_guisetportnumber,0); ! // fprintf(stderr,"sys_netreceive=%p\n",sys_netreceive); if (!sys_netreceive) return 0; // obj_connect(sys_netreceive,0,(t_text *)pd_new3("print left"),0); Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.10 retrieving revision 1.7.4.17.2.22.2.11 diff -C2 -d -r1.7.4.17.2.22.2.10 -r1.7.4.17.2.22.2.11 *** s_main.c 3 Dec 2006 03:02:25 -0000 1.7.4.17.2.22.2.10 --- s_main.c 3 Dec 2006 15:08:23 -0000 1.7.4.17.2.22.2.11 *************** *** 143,147 **** getcwd(cwd,665); sys_socketreceiver=netreceive_newest_receiver(sys_netreceive); ! fprintf(stderr,"sys_socketreceiver=%p\n",sys_socketreceiver); /* load dynamic libraries specified with "-lib" args */ --- 143,147 ---- getcwd(cwd,665); sys_socketreceiver=netreceive_newest_receiver(sys_netreceive); ! //fprintf(stderr,"sys_socketreceiver=%p\n",sys_socketreceiver); /* load dynamic libraries specified with "-lib" args */

1 0

← Newer
1
...
75
76
77
78
79
80
81
82
83
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 December 2006