Pd-cvs July 2005

pd-cvs@lists.iem.at

14 participants
187 discussions

externals/grill/flext/source flbase.h, 1.31, 1.32 flbind.cpp, 1.20, 1.21 flclass.h, 1.60, 1.61 flcontainers.h, 1.6, 1.7 fldoxygen.h, 1.10, 1.11 flext.h, 1.25, 1.26 flitem.cpp, 1.20, 1.21 flmap.h, 1.21, 1.22 flprefix.h, 1.33, 1.34 flsupport.h, 1.93, 1.94 flthr.cpp, 1.31, 1.32
by Thomas Grill 06 Jul '05

06 Jul '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21607/source Modified Files: flbase.h flbind.cpp flclass.h flcontainers.h fldoxygen.h flext.h flitem.cpp flmap.h flprefix.h flsupport.h flthr.cpp Log Message: changed initialization functions accordingly FIFO code with mutex lock c++ conformance fix fixes for Codewarrior updates for OSX extracted maps into flmap.h fix for BCC made flext::Forward threadsafe don't install build system yet digest one-element list messages as single atoms updated tutorials fixes for MSVC6 documentation slimmed object data structures simplified message analysis corrected flext version to 0.4.5 added X86-64 code for lockfree fifos preparation of release upgraded version number Index: flmap.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmap.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** flmap.h 23 May 2005 16:52:45 -0000 1.21 --- flmap.h 6 Jul 2005 16:08:19 -0000 1.22 *************** *** 189,193 **** class TablePtrMap : ! #if defined(_MSC_VER) && _MSC_VER < 1300 public // necessary for VC6 #endif --- 189,193 ---- class TablePtrMap : ! #if (defined(_MSC_VER) && _MSC_VER < 1300) || defined(__BORLANDC__) || defined(__MWERKS__) public // necessary for VC6 #endif Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** flsupport.h 8 Jun 2005 14:42:15 -0000 1.93 --- flsupport.h 6 Jul 2005 16:08:20 -0000 1.94 *************** *** 54,59 **** --- 54,61 ---- void operator delete(void *blk); + #ifndef __BORLANDC__ inline void *operator new(size_t,void *p) { return p; } inline void operator delete(void *,void *) {} + #endif #ifdef FLEXT_DEBUGMEM *************** *** 63,73 **** #endif ! #ifndef __MRC__ // doesn't allow new[] overloading?! inline void *operator new[](size_t bytes) { return operator new(bytes); } inline void operator delete[](void *blk) { operator delete(blk); } inline void *operator new[](size_t,void *p) { return p; } inline void operator delete[](void *,void *) {} ! #endif //! Get an aligned memory block --- 65,77 ---- #endif ! #ifndef __MRC__ // doesn't allow new[] overloading?! inline void *operator new[](size_t bytes) { return operator new(bytes); } inline void operator delete[](void *blk) { operator delete(blk); } + #ifndef __BORLANDC__ inline void *operator new[](size_t,void *p) { return p; } inline void operator delete[](void *,void *) {} ! #endif ! #endif //! Get an aligned memory block Index: flcontainers.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flcontainers.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** flcontainers.h 10 May 2005 10:56:47 -0000 1.6 --- flcontainers.h 6 Jul 2005 16:08:19 -0000 1.7 *************** *** 308,313 **** inline size_t Size() const { return oc; } #else ! #error Platform not supported #endif --- 308,354 ---- inline size_t Size() const { return oc; } + #else ! // no lock free code available for this compiler/platform ! ! inline void Push(Cell *c) ! { ! #ifdef FLEXT_THREADS ! mutex.Lock(); ! #endif ! c->link = (Cell *)top; ! top = c; ! ++oc; ! #ifdef FLEXT_THREADS ! mutex.Unlock(); ! #endif ! } ! ! inline Cell *Pop() ! { ! if(top) { ! Cell *r; ! #ifdef FLEXT_THREADS ! mutex.Lock(); ! #endif ! r = (Cell *)top; ! top = r->link; ! --oc; ! #ifdef FLEXT_THREADS ! mutex.Unlock(); ! #endif ! return r; ! } ! else ! return NULL; ! } ! ! inline size_t Size() const { return oc; } ! ! private: ! #ifdef FLEXT_THREADS ! flext::ThrMutex mutex; ! #endif ! #endif Index: flbase.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flbase.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** flbase.h 23 May 2005 16:52:44 -0000 1.31 --- flbase.h 6 Jul 2005 16:08:04 -0000 1.32 *************** *** 95,104 **** public: - /*! \defgroup FLEXT_OBJCLASS Object base class - @{ - */ // --- creation ------------------------------------------------------- ! /*! \defgroup FLEXT_O_CREATION Creation/Destruction functionality @{ */ --- 95,101 ---- public: // --- creation ------------------------------------------------------- ! /*! \defgroup FLEXT_OBJ_CREATION Object creation/destruction functionality @{ */ *************** *** 130,138 **** virtual void Exit(); ! //! @} FLEXT_O_CREATION // --- info ------------------------------------------------------- ! /*! \defgroup FLEXT_O_INFO Get various information @{ */ --- 127,135 ---- virtual void Exit(); ! //! @} FLEXT_OBJ_CREATION // --- info ------------------------------------------------------- ! /*! \defgroup FLEXT_OBJ_INFO Get various information @{ */ *************** *** 162,170 **** bool HasAttributes() const; ! //! @} FLEXT_O_INFO // --- help ------------------------------------------------------- ! /*! \defgroup FLEXT_O_HELP Help/assistance functionality \remark This is still PD only @{ --- 159,167 ---- bool HasAttributes() const; ! //! @} FLEXT_OBJ_INFO // --- help ------------------------------------------------------- ! /*! \defgroup FLEXT_OBJ_HELP Help/assistance functionality \remark This is still PD only @{ *************** *** 179,188 **** void DefineHelp(const char *ref,const char *dir = NULL,bool addtilde = false) { DefineHelp(thisClassId(),ref,dir,addtilde); } ! //! @} // --- internal stuff ------------------------------------------------------- ! /*! \defgroup FLEXT_O_INTERNAL Internal stuff \internal @{ --- 176,185 ---- void DefineHelp(const char *ref,const char *dir = NULL,bool addtilde = false) { DefineHelp(thisClassId(),ref,dir,addtilde); } ! //! @} FLEXT_OBJ_HELP // --- internal stuff ------------------------------------------------------- ! /*! \defgroup FLEXT_OBJ_INTERNAL Internal stuff \internal @{ *************** *** 263,269 **** void CanvasArgs(AtomList &args) const; ! //! @} FLEXT_O_INTERNAL ! ! //! @} FLEXT_OBJCLASS }; --- 260,264 ---- void CanvasArgs(AtomList &args) const; ! //! @} FLEXT_OBJ_INTERNAL }; Index: flbind.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flbind.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** flbind.cpp 16 Apr 2005 21:35:06 -0000 1.20 --- flbind.cpp 6 Jul 2005 16:08:19 -0000 1.21 *************** *** 189,193 **** if(fun) { // check if function matches ! for(; it && static_cast<BindItem *>(it)->fun != fun; it = it->nxt); } item = static_cast<BindItem *>(it); --- 189,193 ---- if(fun) { // check if function matches ! for(; it && static_cast<BindItem *>(it)->fun != fun; it = it->nxt) {} } item = static_cast<BindItem *>(it); Index: flext.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flext.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** flext.h 23 May 2005 16:52:45 -0000 1.25 --- flext.h 6 Jul 2005 16:08:19 -0000 1.26 *************** *** 27,31 **** //! \brief flext version string ! #define FLEXT_VERSTR "0.5.0pre" //! @} --- 27,31 ---- //! \brief flext version string ! #define FLEXT_VERSTR "0.5.0" //! @} Index: flprefix.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flprefix.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** flprefix.h 31 Mar 2005 03:52:38 -0000 1.33 --- flprefix.h 6 Jul 2005 16:08:19 -0000 1.34 *************** *** 365,369 **** Therefore different class names are used so that the correct type of flext function is called. */ ! #if defined(FLEXT_SHARED) #define FLEXT_CLASSDEF(CL) CL##_shared #elif defined(FLEXT_THREADS) --- 365,371 ---- Therefore different class names are used so that the correct type of flext function is called. */ ! #ifdef __DOXYGEN__ ! #define FLEXT_CLASSDEF(CL) CL ! #elif defined(FLEXT_SHARED) #define FLEXT_CLASSDEF(CL) CL##_shared #elif defined(FLEXT_THREADS) Index: fldoxygen.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/fldoxygen.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** fldoxygen.h 26 Jan 2005 05:01:45 -0000 1.10 --- fldoxygen.h 6 Jul 2005 16:08:19 -0000 1.11 *************** *** 15,19 **** Currently there exist two widely used modular systems for real-time audio that can be extended by self-written objects (so called "externals"):<br> ! Max/MSP (http://www.cycling74.com) and Pure Data (http://www.pure-data.org). Both come with APIs that are not very different (as they share their origin), but as well not quite the same. --- 15,19 ---- Currently there exist two widely used modular systems for real-time audio that can be extended by self-written objects (so called "externals"):<br> ! Max/MSP (http://www.cycling74.com) and Pure Data (http://www.pure-data.org) . Both come with APIs that are not very different (as they share their origin), but as well not quite the same. *************** *** 49,53 **** <li>PD on Windows with Microsoft Visual C++, Borland C++ and gcc(cygwin) compilers <li>PD on Linux with gcc ! <li>PD on Mac OSX with gcc (makefile or Project Builder) <li>Max/MSP on Mac OS9 and OSX with Metrowerks CodeWarrior </ul> --- 49,53 ---- <li>PD on Windows with Microsoft Visual C++, Borland C++ and gcc(cygwin) compilers <li>PD on Linux with gcc ! <li>PD on Mac OSX with gcc (makefile or Xcode) <li>Max/MSP on Mac OS9 and OSX with Metrowerks CodeWarrior </ul> *************** *** 79,83 **** \section DOWNLOAD Download ! Download the latest flext version from http://www.parasitaere-kapazitaeten.net/ext/flext .<br> Alternatively, you can check out the cvs version from http://sourceforge.net/projects/pure-data . --- 79,83 ---- \section DOWNLOAD Download ! Download the latest flext version from http://grrrr.org/ext/flext .<br> Alternatively, you can check out the cvs version from http://sourceforge.net/projects/pure-data . Index: flitem.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flitem.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** flitem.cpp 23 May 2005 16:52:45 -0000 1.20 --- flitem.cpp 6 Jul 2005 16:08:19 -0000 1.21 *************** *** 125,127 **** return cont; } ! */ \ No newline at end of file --- 125,127 ---- return cont; } ! */ Index: flthr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flthr.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** flthr.cpp 7 Jun 2005 14:40:19 -0000 1.31 --- flthr.cpp 6 Jul 2005 16:08:20 -0000 1.32 *************** *** 26,30 **** #include <time.h> ! #if FLEXT_OSAPI == FLEXT_OSAPI_UNIX_POSIX || FLEXT_OSAPI == FLEXT_OSAPI_WIN_POSIX #include <sys/time.h> #include <unistd.h> --- 26,30 ---- #include <time.h> ! #if FLEXT_OSAPI == FLEXT_OSAPI_MAC_MACH || FLEXT_OSAPI == FLEXT_OSAPI_UNIX_POSIX || FLEXT_OSAPI == FLEXT_OSAPI_WIN_POSIX #include <sys/time.h> #include <unistd.h> *************** *** 52,56 **** { public: ! void thr_entry::Set(void (*m)(thr_params *),thr_params *p,thrid_t id = GetThreadId()) { th = p?p->cl:NULL; --- 52,56 ---- { public: ! void Set(void (*m)(thr_params *),thr_params *p,thrid_t id = GetThreadId()) { th = p?p->cl:NULL; *************** *** 92,96 **** while((fnd = Pop()) && !fnd->Is(id)) qutmp.Push(fnd); // put back entries ! for(thr_entry *ti; ti = qutmp.Pop(); ) Push(ti); if(fnd && !pop) Push(fnd); return fnd; --- 92,96 ---- while((fnd = Pop()) && !fnd->Is(id)) qutmp.Push(fnd); // put back entries ! for(thr_entry *ti; (ti = qutmp.Pop()) != NULL; ) Push(ti); if(fnd && !pop) Push(fnd); return fnd; *************** *** 181,185 **** // start all inactive threads thr_entry *ti; ! while(ti = thrpending.Pop()) { bool ok; --- 181,185 ---- // start all inactive threads thr_entry *ti; ! while((ti = thrpending.Pop()) != NULL) { bool ok; Index: flclass.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flclass.h,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** flclass.h 7 Jun 2005 14:13:43 -0000 1.60 --- flclass.h 6 Jul 2005 16:08:19 -0000 1.61 *************** *** 507,510 **** --- 507,519 ---- // xxx internal stuff xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + public: // needed by VC++ 6 + + enum xlettype { + xlet_none = 0, + xlet_float,xlet_int,xlet_sym,xlet_list,xlet_any, + xlet_LIST,xlet_ANY, // use AtomList and AtomAnything + xlet_sig + }; + protected: *************** *** 517,527 **** - enum xlettype { - xlet_none = 0, - xlet_float,xlet_int,xlet_sym,xlet_list,xlet_any, - xlet_LIST,xlet_ANY, // use AtomList and AtomAnything - xlet_sig - }; - /*! \defgroup FLEXT_C_ATTR Attribute handling methods (object scope) @{ --- 526,529 ----

1 0

externals/grill/flext/buildsys/win/max gnumake-mingw.inc, 1.2, 1.3
by Thomas Grill 06 Jul '05

06 Jul '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/win/max In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21607/buildsys/win/max Modified Files: gnumake-mingw.inc Log Message: changed initialization functions accordingly FIFO code with mutex lock c++ conformance fix fixes for Codewarrior updates for OSX extracted maps into flmap.h fix for BCC made flext::Forward threadsafe don't install build system yet digest one-element list messages as single atoms updated tutorials fixes for MSVC6 documentation slimmed object data structures simplified message analysis corrected flext version to 0.4.5 added X86-64 code for lockfree fifos preparation of release upgraded version number Index: gnumake-mingw.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/win/max/gnumake-mingw.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gnumake-mingw.inc 23 May 2005 16:52:42 -0000 1.2 --- gnumake-mingw.inc 6 Jul 2005 16:08:03 -0000 1.3 *************** *** 1,4 **** DEFS += -DFLEXT_SYS=1 ! CFLAGS += -fpack-struct=2 -D_WIN32_WINNT=0x501 INCPATH += -I$(MAXSDKPATH)/max-includes -I$(MAXSDKPATH)/msp-includes --- 1,6 ---- DEFS += -DFLEXT_SYS=1 ! ! # fpack-struct should align to 2 bytes... can't specify that... ! CFLAGS += -fpack-struct -D_WIN32_WINNT=0x501 INCPATH += -I$(MAXSDKPATH)/max-includes -I$(MAXSDKPATH)/msp-includes

1 0

externals/grill/flext/buildsys/lnx gnumake-gcc-flext.inc, 1.8, 1.9 gnumake-icc-flext.inc, 1.4, 1.5
by Thomas Grill 06 Jul '05

06 Jul '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/lnx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21607/buildsys/lnx Modified Files: gnumake-gcc-flext.inc gnumake-icc-flext.inc Log Message: changed initialization functions accordingly FIFO code with mutex lock c++ conformance fix fixes for Codewarrior updates for OSX extracted maps into flmap.h fix for BCC made flext::Forward threadsafe don't install build system yet digest one-element list messages as single atoms updated tutorials fixes for MSVC6 documentation slimmed object data structures simplified message analysis corrected flext version to 0.4.5 added X86-64 code for lockfree fifos preparation of release upgraded version number Index: gnumake-icc-flext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gnumake-icc-flext.inc 13 Apr 2005 00:24:18 -0000 1.4 --- gnumake-icc-flext.inc 6 Jul 2005 16:08:03 -0000 1.5 *************** *** 62,70 **** install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) # transfer build system ! cp -rf buildsys $(FLEXTSYS) ! install build.sh $(FLEXTSYS) ! chmod -R a+rx $(FLEXTSYS) # make convenience script ! echo bash $(FLEXTSYS)/build.sh $$\* > $(FLEXTBIN)/flext-build.sh ! chmod a+rx $(FLEXTBIN)/flext-build.sh --- 62,70 ---- install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) # transfer build system ! # cp -rf buildsys $(FLEXTSYS) ! # install build.sh $(FLEXTSYS) ! # chmod -R a+rx $(FLEXTSYS) # make convenience script ! # echo bash $(FLEXTSYS)/build.sh $$\* > $(FLEXTBIN)/flext-build.sh ! # chmod a+rx $(FLEXTBIN)/flext-build.sh Index: gnumake-gcc-flext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gnumake-gcc-flext.inc 13 Apr 2005 00:24:18 -0000 1.8 --- gnumake-gcc-flext.inc 6 Jul 2005 16:08:03 -0000 1.9 *************** *** 62,70 **** install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) # transfer build system ! cp -rf buildsys $(FLEXTSYS) ! install build.sh $(FLEXTSYS) ! chmod -R a+rx $(FLEXTSYS) # make convenience script ! echo bash $(FLEXTSYS)/build.sh $$\* > $(FLEXTBIN)/flext-build.sh ! chmod a+rx $(FLEXTBIN)/flext-build.sh --- 62,70 ---- install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) # transfer build system ! # cp -rf buildsys $(FLEXTSYS) ! # install build.sh $(FLEXTSYS) ! # chmod -R a+rx $(FLEXTSYS) # make convenience script ! # echo bash $(FLEXTSYS)/build.sh $$\* > $(FLEXTBIN)/flext-build.sh ! # chmod a+rx $(FLEXTBIN)/flext-build.sh

1 0

externals/grill/flext/buildsys/mac gnumake-gcc-flext.inc, 1.5, 1.6
by Thomas Grill 06 Jul '05

06 Jul '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21607/buildsys/mac Modified Files: gnumake-gcc-flext.inc Log Message: changed initialization functions accordingly FIFO code with mutex lock c++ conformance fix fixes for Codewarrior updates for OSX extracted maps into flmap.h fix for BCC made flext::Forward threadsafe don't install build system yet digest one-element list messages as single atoms updated tutorials fixes for MSVC6 documentation slimmed object data structures simplified message analysis corrected flext version to 0.4.5 added X86-64 code for lockfree fifos preparation of release upgraded version number Index: gnumake-gcc-flext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gnumake-gcc-flext.inc 13 Apr 2005 00:24:18 -0000 1.5 --- gnumake-gcc-flext.inc 6 Jul 2005 16:08:03 -0000 1.6 *************** *** 94,101 **** endif # transfer build system ! cp -rf buildsys $(FLEXTSYS) ! install build.sh $(FLEXTSYS) ! chmod -R a+rx $(FLEXTSYS) # make convenience script ! echo bash $(FLEXTSYS)/build.sh $$\* > $(FLEXTBIN)/flext-build.sh ! chmod a+rx $(FLEXTBIN)/flext-build.sh --- 94,101 ---- endif # transfer build system ! # cp -rf buildsys $(FLEXTSYS) ! # install build.sh $(FLEXTSYS) ! # chmod -R a+rx $(FLEXTSYS) # make convenience script ! # echo bash $(FLEXTSYS)/build.sh $$\* > $(FLEXTBIN)/flext-build.sh ! # chmod a+rx $(FLEXTBIN)/flext-build.sh

1 0

externals/grill/flext Doxyfile, NONE, 1.1 build.sh, 1.7, 1.8 build.txt, 1.6, 1.7 flext.mcp, 1.2, 1.3 flext.vcproj, 1.46, 1.47 notes.txt, 1.8, 1.9 flext.doxy, 1.13, NONE
by Thomas Grill 06 Jul '05

06 Jul '05

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21607 Modified Files: build.sh build.txt flext.mcp flext.vcproj notes.txt Added Files: Doxyfile Removed Files: flext.doxy Log Message: changed initialization functions accordingly FIFO code with mutex lock c++ conformance fix fixes for Codewarrior updates for OSX extracted maps into flmap.h fix for BCC made flext::Forward threadsafe don't install build system yet digest one-element list messages as single atoms updated tutorials fixes for MSVC6 documentation slimmed object data structures simplified message analysis corrected flext version to 0.4.5 added X86-64 code for lockfree fifos preparation of release upgraded version number Index: notes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/notes.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** notes.txt 25 Apr 2005 12:50:35 -0000 1.8 --- notes.txt 6 Jul 2005 16:07:56 -0000 1.9 *************** *** 43,47 **** - speed up message handling (usage of other containers?) - SIMD for gcc ! - lock-free code for 64-bit architectures - update documentation --- 43,47 ---- - speed up message handling (usage of other containers?) - SIMD for gcc ! - lock-free code for old AMD 64-bit architectures - update documentation Index: flext.mcp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.mcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsI0HtJb and /tmp/cvsAWv09l differ Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** flext.vcproj 23 May 2005 16:52:41 -0000 1.46 --- flext.vcproj 6 Jul 2005 16:07:55 -0000 1.47 *************** *** 795,805 **** Filter=""> <File ! RelativePath="changes.txt"> </File> <File ! RelativePath="source\fldoxygen.h"> </File> <File ! RelativePath="make-files.txt"> </File> <File --- 795,805 ---- Filter=""> <File ! RelativePath=".\build.txt"> </File> <File ! RelativePath="changes.txt"> </File> <File ! RelativePath="source\fldoxygen.h"> </File> <File --- NEW FILE: Doxyfile --- # Doxyfile 1.4.3 #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = flext PROJECT_NUMBER = 0.5.0 OUTPUT_DIRECTORY = ./doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ "The $name widget" \ "The $name file" \ is \ provides \ specifies \ contains \ represents \ a \ an \ the ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = YES STRIP_FROM_PATH = /Applications/util/ STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = NO INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 ALIASES = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO SUBGROUPING = YES #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- EXTRACT_ALL = YES EXTRACT_PRIVATE = YES EXTRACT_STATIC = YES EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = NO HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO HIDE_FRIEND_COMPOUNDS = NO HIDE_IN_BODY_DOCS = NO INTERNAL_DOCS = NO CASE_SENSE_NAMES = NO HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = YES INLINE_INFO = YES SORT_MEMBER_DOCS = YES SORT_BRIEF_DOCS = NO SORT_BY_SCOPE_NAME = NO GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES SHOW_DIRECTORIES = YES FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = \ /Users/thomas/Develop/pdmax/flext/source FILE_PATTERNS = *.c \ *.cc \ *.cxx \ *.cpp \ *.c++ \ *.d \ *.java \ *.ii \ *.ixx \ *.ipp \ *.i++ \ *.inl \ *.h \ *.hh \ *.hxx \ *.hpp \ *.h++ \ *.idl \ *.odl \ *.cs \ *.php \ *.php3 \ *.inc \ *.m \ *.mm \ *.dox \ *.C \ *.CC \ *.C++ \ *.II \ *.I++ \ *.H \ *.HH \ *.H++ \ *.CS \ *.PHP \ *.PHP3 \ *.M \ *.MM RECURSIVE = NO EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = EXAMPLE_PATTERNS = * EXAMPLE_RECURSIVE = NO IMAGE_PATH = INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- SOURCE_BROWSER = NO INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = NO REFERENCES_RELATION = NO USE_HTAGS = NO VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = NO COLS_IN_ALPHA_INDEX = 5 IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = YES CHM_FILE = HHC_LOCATION = GENERATE_CHI = NO BINARY_TOC = NO TOC_EXPAND = NO DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = NO TREEVIEW_WIDTH = 250 #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- GENERATE_LATEX = YES LATEX_OUTPUT = latex LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO PAPER_TYPE = a4wide EXTRA_PACKAGES = LATEX_HEADER = PDF_HYPERLINKS = YES USE_PDFLATEX = YES LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- GENERATE_RTF = NO RTF_OUTPUT = rtf COMPACT_RTF = NO RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- GENERATE_MAN = NO MAN_OUTPUT = man MAN_EXTENSION = .3 MAN_LINKS = NO #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- GENERATE_XML = NO XML_OUTPUT = xml XML_SCHEMA = XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- GENERATE_AUTOGEN_DEF = NO #--------------------------------------------------------------------------- # configuration options related to the Perl module output #--------------------------------------------------------------------------- GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = PREDEFINED = FLEXT_SYS=2 \ FLEXT_SHARED \ __DOXYGEN__ EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES HAVE_DOT = NO CLASS_GRAPH = YES COLLABORATION_GRAPH = YES GROUP_GRAPHS = YES UML_LOOK = NO TEMPLATE_RELATIONS = NO INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO GENERATE_LEGEND = YES DOT_CLEANUP = YES #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = NO Index: build.sh =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/build.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** build.sh 10 Apr 2005 22:22:22 -0000 1.7 --- build.sh 6 Jul 2005 16:07:53 -0000 1.8 *************** *** 42,46 **** [ -n "$platform" -a -n "$rtsys" -a -n "$compiler" -a -f $subbatch ] then ! bash $subbatch $platform $rtsys $target $4 $5 $6 $7 $8 $9 else echo --- 42,46 ---- [ -n "$platform" -a -n "$rtsys" -a -n "$compiler" -a -f $subbatch ] then ! sh $subbatch $platform $rtsys $target $4 $5 $6 $7 $8 $9 else echo Index: build.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/build.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.txt 19 Apr 2005 13:29:51 -0000 1.6 --- build.txt 6 Jul 2005 16:07:53 -0000 1.7 *************** *** 46,50 **** pd msvc, using nmake pd cygwin, using gnumake ! pd mingw, using gnumake max msvc, using nmake pd bcc, using bmake --- 46,50 ---- pd msvc, using nmake pd cygwin, using gnumake ! pd mingw, using gnumake (from the CMD prompt, not msys!) max msvc, using nmake pd bcc, using bmake *************** *** 145,151 **** win-pd-msvc, single/multi/shared win-pd-bcc, single/multi/shared ! win-pd-mingw, single/multi/shared ! win-pd-cygwin, win-max-msvc, single/multi/shared --- 145,152 ---- win-pd-msvc, single/multi/shared win-pd-bcc, single/multi/shared ! win-pd-mingw, single/multi/shared (from CMD prompt, not MSYS) ! win-pd-cygwin, --- NOT WORKING (compiles but crashes) ---- win-max-msvc, single/multi/shared + win-max-mingw, --- NOT WORKING (wrong structure packing) ---- --- flext.doxy DELETED ---

1 0

pd/portaudio configure.in, NONE, 1.3.2.2 configure, NONE, 1.3.2.2
by Tim Blechmann 06 Jul '05

06 Jul '05

Update of /cvsroot/pure-data/pd/portaudio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14415 Added Files: Tag: devel_0_38 configure.in configure Log Message: missing portaudio files --- NEW FILE: configure --- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. # Defaults: ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --with-alsa (default=auto)" ac_help="$ac_help --with-jack (default=auto)" ac_help="$ac_help --with-oss (default=yes)" [...1948 lines suppressed...] s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g s%@top_srcdir@%$top_srcdir%g s%@INSTALL@%$INSTALL%g " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file fi; done rm -f conftest.s* EOF cat >> $CONFIG_STATUS <<EOF EOF cat >> $CONFIG_STATUS <<\EOF exit 0 EOF chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 --- NEW FILE: configure.in --- dnl dnl portaudio V19 configure.in script dnl dnl Dominic Mazzoni dnl dnl Require autoconf >= 2.13 AC_PREREQ(2.13) dnl Init autoconf and make sure configure is being called dnl from the right directory AC_INIT([pa_common/portaudio.h]) dnl Checks for programs. AC_PROG_CC AC_PROG_RANLIB AC_PROG_INSTALL AC_PATH_PROG(AR, ar, no) if [[ $AR = "no" ]] ; then AC_MSG_ERROR("Could not find ar - needed to create a library"); fi dnl This must be one of the first tests we do or it will fail... AC_C_BIGENDIAN dnl extra variables AC_SUBST(OTHER_OBJS) AC_SUBST(PADLL) AC_SUBST(SHARED_FLAGS) AC_SUBST(DLL_LIBS) AC_SUBST(CXXFLAGS) AC_SUBST(NASM) AC_SUBST(NASMOPT) dnl checks for various host APIs and arguments to configure that dnl turn them on or off AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no) dnl Determine the host description for the subsequent test. dnl PKG_CHECK_MODULES seems to check and set the host variable also, but dnl that then requires pkg-config availability which is not standard on dnl MinGW systems and can be a pain to install. AC_CANONICAL_HOST PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no) AC_ARG_WITH(alsa, [ --with-alsa (default=auto)], with_alsa=$withval, with_alsa="yes") AC_ARG_WITH(jack, [ --with-jack (default=auto)], with_jack=$withval, with_jack="yes") AC_ARG_WITH(oss, [ --with-oss (default=yes)], with_oss=$withval, with_oss="yes") AC_ARG_WITH(host_os, [ --with-host_os (no default)], host_os=$withval) AC_ARG_WITH(winapi, [ --with-winapi ((wmme/directx/asio) default=wmme)], with_winapi=$withval, with_winapi="wmme") dnl Mac API added for ASIO, can have other api's listed AC_ARG_WITH(macapi, [ --with-macapi ((asio/core/sm) default=core)], with_macapi=$withval, with_macapi="core") AC_ARG_WITH(asiodir, [ --with-asiodir (default=/usr/local/asiosdk2)], with_asiodir=$withval, with_asiodir="/usr/local/asiosdk2") AC_ARG_WITH(dxdir, [ --with-dxdir (default=/usr/local/dx7sdk)], with_dxdir=$withval, with_dxdir="/usr/local/dx7sdk") CFLAGS="-g -O2 -Wall" if [[ $ac_cv_c_bigendian = "yes" ]] ; then CFLAGS="$CFLAGS -DPA_BIG_ENDIAN" else CFLAGS="$CFLAGS -DPA_LITTLE_ENDIAN" fi dnl sizeof checks: we will need a 16-bit and a 32-bit type AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) case "${host_os}" in darwin* ) dnl Mac OS X configuration AC_DEFINE(PA_USE_COREAUDIO) OTHER_OBJS="pa_mac/pa_mac_hostapis.o pa_unix/pa_unix_util.o pa_mac_core/pa_mac_core.o"; LIBS="-framework CoreAudio -framework AudioToolbox"; PADLL="libportaudio.dylib"; SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -dynamiclib"; if [[ $with_macapi = "asio" ]] ; then if [[ $with_asiodir ]] ; then ASIODIR="$with_asiodir"; else ASIODIR="/usr/local/asiosdk2"; fi echo "ASIODIR: $ASIODIR"; OTHER_OBJS="$CFLAGS pa_asio/iasiothiscallresolver.o $ASIODIR/host/asiodrivers.o $ASIODIR/common/asio.o $ASIODIR/host/mac/asioshlib.o"; CFLAGS="$CFLAGS -Ipa_asio -I$ASIDIR/host/mac -I$ASIODIR/common"; CXXFLAGS="$CFLAGS"; fi ;; mingw* ) dnl MingW configuration echo "WINAPI: $with_winapi" if [[ $with_winapi = "directx" ]] ; then if [[ $with_dxdir ]] ; then DXDIR="$with_dxdir"; else DXDIR="/usr/local/dx7sdk"; fi echo "DXDIR: $DXDIR" OTHER_OBJS="pa_win_ds/pa_win_ds.o pa_win_ds/dsound_wrapper.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o"; LIBS="-lwinmm -lm -ldsound -lole32"; PADLL="portaudio.dll"; SHARED_FLAGS="-shared -mthreads"; DLL_LIBS="-lwinmm -lm -L./dx7sdk/lib -ldsound -lole32"; #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""; #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"; CFLAGS="$CFLAGS -Ipa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS; elif [[ $with_winapi = "asio" ]] ; then if [[ $with_asiodir ]] ; then ASIODIR="$with_asiodir"; else ASIODIR="/usr/local/asiosdk2"; fi echo "ASIODIR: $ASIODIR" OTHER_OBJS="pa_asio/pa_asio.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o pa_asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o"; LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid"; PADLL="portaudio.dll"; SHARED_FLAGS="-shared -mthreads"; DLL_LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid"; CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -Ipa_common -Ipa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS"; CXXFLAGS="$CFLAGS"; elif [[ $with_winapi = "wdmks" ]] ; then if [[ $with_dxdir ]] ; then DXDIR="$with_dxdir"; else DXDIR="/usr/local/dx7sdk"; fi echo "DXDIR: $DXDIR" OTHER_OBJS="pa_win_wdmks/pa_win_wdmks.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o"; LIBS="-lwinmm -lm -luuid -lsetupapi -lole32"; PADLL="portaudio.dll"; SHARED_FLAGS="-shared -mthreads"; DLL_LIBS="-lwinmm -lm -L./dx7sdk/lib -luuid -lsetupapi -lole32"; #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""; #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"; CFLAGS="$CFLAGS -Ipa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO"; else # WMME default OTHER_OBJS="pa_win_wmme/pa_win_wmme.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o"; LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid"; PADLL="portaudio.dll"; SHARED_FLAGS="-shared -mthreads"; DLL_LIBS="-lwinmm"; CFLAGS="$CFLAGS -Ipa_common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS"; fi ;; cygwin* ) dnl Cygwin configuration OTHER_OBJS="pa_win_wmme/pa_win_wmme.o"; LIBS="-lwinmm -lm"; PADLL="portaudio.dll"; SHARED_FLAGS="-shared -mthreads"; DLL_LIBS="-lwinmm"; ;; irix* ) dnl SGI IRIX audio library (AL) configuration (Pieter, oct 2-13, 2003). dnl The 'dmedia' library is needed to read the Unadjusted System Time (UST). dnl AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([IRIX posix thread library not found!])) AC_CHECK_LIB(audio, alOpenPort, , AC_MSG_ERROR([IRIX audio library not found!])) AC_CHECK_LIB(dmedia, dmGetUST, , AC_MSG_ERROR([IRIX digital media library not found!])) dnl See the '#ifdef PA_USE_SGI' in file pa_unix/pa_unix_hostapis.c dnl which selects the appropriate PaXXX_Initialize() function. dnl AC_DEFINE(PA_USE_SGI) dnl The _REENTRANT option for pthread safety. Perhaps not necessary but it 'll do no harm. dnl CFLAGS="$CFLAGS -D_REENTRANT" OTHER_OBJS="pa_sgi/pa_sgi.o pa_unix/pa_unix_hostapis.o pa_unix/pa_unix_util.o"; dnl SGI books say -lpthread should be the last of the libs mentioned. dnl LIBS="-lm -ldmedia -laudio -lpthread"; PADLL="libportaudio.so"; SHARED_FLAGS="-shared"; ;; *) dnl Unix configuration AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([libpthread not found!])) if [[ $have_alsa = "yes" ] && [ $with_alsa != "no" ]] ; then LIBS="$LIBS -lasound" DLL_LIBS="$DLL_LIBS -lasound" OTHER_OBJS="$OTHER_OBJS pa_linux_alsa/pa_linux_alsa.o" AC_DEFINE(PA_USE_ALSA) fi if [[ $have_jack = "yes" ] && [ $with_jack != "no" ]] ; then LIBS="$LIBS $JACK_LIBS" DLL_LIBS="$DLL_LIBS $JACK_LIBS" CFLAGS="$CFLAGS $JACK_CFLAGS" OTHER_OBJS="$OTHER_OBJS pa_jack/pa_jack.o" AC_DEFINE(PA_USE_JACK) fi if [[ $with_oss != "no" ]] ; then OTHER_OBJS="$OTHER_OBJS pa_unix_oss/pa_unix_oss.o" AC_DEFINE(PA_USE_OSS) fi LIBS="$LIBS -lm -lpthread"; PADLL="libportaudio.so"; SHARED_FLAGS="-shared"; OTHER_OBJS="$OTHER_OBJS pa_unix/pa_unix_hostapis.o pa_unix/pa_unix_util.o" esac AC_OUTPUT([Makefile])

1 0

extensions/gui/ix mat.wid,1.15,1.16
by carmen rocco 06 Jul '05

06 Jul '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10062 Modified Files: mat.wid Log Message: daily check-in, this script doesnt do anything yet so dont bother Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mat.wid 5 Jul 2005 11:02:00 -0000 1.15 --- mat.wid 6 Jul 2005 12:27:06 -0000 1.16 *************** *** 2,6 **** namespace eval ::ix { proc rc {} {return [format "\#%06x" [expr "int(floor(rand() * 16777216))"]]} ! proc mat_note {p t item} { variable _ --- 2,20 ---- namespace eval ::ix { proc rc {} {return [format "\#%06x" [expr "int(floor(rand() * 16777216))"]]} ! proc rgb {} {return [list [expr "int(floor(rand() * 256))"] [expr "int(floor(rand() * 256))"] [expr "int(floor(rand() * 256))"]]} ! proc lighten {rgb r} {set l {}; foreach c $rgb {lappend l [expr {(256 - $c) * $r + $c}]}; return $l} ! proc darken {rgb r} {set l {}; foreach c $rgb {lappend l [expr {$c - ($c * $r)}]}; return $l} ! proc color {rgb} {return [format "\#%02x%02x%02x" [expr int([lindex $rgb 0])] [expr int([lindex $rgb 1])] [expr int([lindex $rgb 2])]]} ! proc random_txt {n} { ! set i 0 ! set text "" ! while {$i < $n} { ! set int [expr "int(floor(rand()*62))"] ! if {$int < 10} {incr int 48} elseif {$int < 36} {incr int 55} else {incr int 61} ! set text "$text[format %c $int]" ! incr i ! } ! return $text ! } proc mat_note {p t item} { variable _ *************** *** 41,45 **** variable _ incr _($t:i) ! mat_item_update $p $t $_($t:i) [$p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [list item $_($t:i)] -fill green -fillopacity 0.8] abs 0 0 0 0} proc mat_quant {p t y v} { --- 55,59 ---- variable _ incr _($t:i) ! mat_item_update $p $t $_($t:i) [$p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [list item $_($t:i)] -fill [color [dict get $_($t:g) 0 color]] -stroke [color [darken [dict get $_($t:g) 0 color] 0.5]] -fillopacity 0.8] abs 0 0 0 0} proc mat_quant {p t y v} { *************** *** 57,64 **** if {[set $v] ne "-"} { switch $r { ! abs {dict set _($t) $item $v [mat_quant $p $t $v [set $v]]} ! rel {dict set _($t) $item $v [mat_quant $p $t $v [expr {[dict get $_($t) $item $v] + [set $v]}]]}}}} mat_redraw $p $t [dict get $_($t) $item ci]} proc mat_draw {p t a x y} { variable _ --- 71,86 ---- if {[set $v] ne "-"} { switch $r { ! abs {dict set _($t) $item $v [set $v]} ! rel {dict set _($t) $item $v [expr {[dict get $_($t) $item $v] + [set $v]}]}}}} mat_redraw $p $t [dict get $_($t) $item ci]} + proc mat_item_ua {p t item r u} { + variable _ + foreach a [dict keys $u] { + switch $r { + abs {dict set _($t) $item $a [dict get $u $a]} + rel {dict set _($t) $item $a [expr {[dict get $_($t) $item $a] + [dict get $u $a]}]}}} + mat_redraw $p $t [dict get $_($t) $item ci]} + proc mat_draw {p t a x y} { variable _ *************** *** 90,95 **** set px [mat_tr $p $t x t [dict get $_($t) $id x]] set py [mat_tr $p $t y t [dict get $_($t) $id y]] ! set sx [expr {abs([mat_tr $p $t x id [expr {[dict get $_($t) $id xx] - [dict get $_($t) $id x]}]])}] ! set sy [expr {abs([mat_tr $p $t y id 1])}] # puts "$px $py $sx $sy" $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3]}} --- 112,120 ---- set px [mat_tr $p $t x t [dict get $_($t) $id x]] set py [mat_tr $p $t y t [dict get $_($t) $id y]] ! set w [expr {[dict get $_($t) $id xx] - [dict get $_($t) $id x]}] ! set h [expr {[dict get $_($t) $id yy] - [dict get $_($t) $id y]}] ! if {$h < 0.01} {set h 1} ! set sx [expr {abs([mat_tr $p $t x id $w])}] ! set sy [expr {abs([mat_tr $p $t y id $h])}] # puts "$px $py $sx $sy" $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3]}} *************** *** 122,126 **** set my [mat_tr $p $t y d [expr {$y - $_($t:cy)}]] foreach item $_($t:sel) {mat_item_update $p $t [lindex [$p.m itemcget $item -tags] 1] - rel $mx $my $mx $my} ! mat_info $p $t $_($t:sel) } --- 147,164 ---- set my [mat_tr $p $t y d [expr {$y - $_($t:cy)}]] foreach item $_($t:sel) {mat_item_update $p $t [lindex [$p.m itemcget $item -tags] 1] - rel $mx $my $mx $my} ! mat_item_info $p $t $_($t:sel) ! } ! ! proc mat_resize_left {p t a x y} {mat_resize_object $p $t x $x $y} ! proc mat_resize_right {p t a x y} {mat_resize_object $p $t xx $x $y} ! proc mat_resize_top {p t a x y} {mat_resize_object $p $t y $x $y} ! proc mat_resize_bottom {p t a x y} {mat_resize_object $p $t yy $x $y} ! ! proc mat_resize_object {p t e x y} { ! variable _ ! array set ax {x x xx x y y yy y} ! set m [mat_tr $p $t $ax($e) d [expr $$ax($e) - $_($t:c$ax($e))]] ! foreach item $_($t:sel) {mat_item_ua $p $t [lindex [$p.m itemcget $item -tags] 1] rel [dict create $e $m]} ! mat_item_info $p $t $_($t:sel) } *************** *** 143,146 **** --- 181,193 ---- if {$clicked ne ""} { mat_mode $p $t move_object + set id [lindex [$p.m itemcget [lindex $clicked 0] -tags] 1] + set eX [mat_tr $p $t x t [dict get $_($t) $id x]] + set eXX [mat_tr $p $t x t [dict get $_($t) $id xx]] + set eY [mat_tr $p $t y t [dict get $_($t) $id y]] + set eYY [mat_tr $p $t y t [dict get $_($t) $id yy]] + if {[expr {abs($eX - $x)}] < 5} {mat_mode $p $t resize_left} + if {[expr {abs($eXX - $x)}] < 5} {mat_mode $p $t resize_right} + # if {[expr {abs($eY - $y)}] < 1} {mat_mode $p $t resize_top} + # if {[expr {abs($eYY - $y)}] < 1} {mat_mode $p $t resize_bottom} if {[$p.m find withtag sel] eq "" && [llength $_($t:sel)] > 1} {return} mat_updatesel $p $t $clicked *************** *** 150,154 **** } ! proc mat_info {p t clicked} { variable _ set n 0;$p.m delete hover --- 197,201 ---- } ! proc mat_item_info {p t clicked} { variable _ set n 0;$p.m delete hover *************** *** 165,173 **** foreach item $_($t:sel) { if {[lsearch -integer $clicked $item] < 0} { ! $p.m itemconfigure $item -fill blue}} foreach item $clicked { $p.m itemconfigure $item -fill $_($t:sc) } ! mat_info $p $t $clicked set _($t:sel) $clicked --- 212,220 ---- foreach item $_($t:sel) { if {[lsearch -integer $clicked $item] < 0} { ! $p.m itemconfigure $item -fill [color [dict get $_($t:g) 0 color]]}} foreach item $clicked { $p.m itemconfigure $item -fill $_($t:sc) } ! mat_item_info $p $t $clicked set _($t:sel) $clicked *************** *** 211,215 **** $m add command -label "zoom to fit" -command "::ix::mat_zoom $p $t fit" $m add command -label "reset zoom" -command "::ix::mat_zoom $p $t reset" ! $m add command -label "jupas" -command {} -state disabled $m add command -label "frukas" -command {} -state disabled } else { --- 258,262 ---- $m add command -label "zoom to fit" -command "::ix::mat_zoom $p $t fit" $m add command -label "reset zoom" -command "::ix::mat_zoom $p $t reset" ! $m add command -label "add group" -command "::ix::mat_group_new $p $t -" $m add command -label "frukas" -command {} -state disabled } else { *************** *** 266,270 **** proc mat_mode {p t m} { ! array set cursor {draw pencil move_canvas fleur move_object dotbox object_trans box_spiral resize_canvas bogosity sel cross_reverse} $p.m itemconfigure mode -text $m $p.m configure -cursor $cursor($m) --- 313,317 ---- proc mat_mode {p t m} { ! array set cursor {draw pencil move_canvas fleur move_object dotbox object_trans box_spiral resize_canvas bogosity sel cross_reverse resize_left left_side resize_right right_side resize_top top_side resize_bottom bottom_side} $p.m itemconfigure mode -text $m $p.m configure -cursor $cursor($m) *************** *** 276,285 **** proc mat_group_new {p t grp} { variable _ dict set _($t:g) $_($t:gi) name $grp ! dict set _($t:g) $_($t:gi) color [rc] ! incr _($t:gi) } proc mat_new {p t w h bg ln xa xb ya yb qx qy} { variable _ --- 323,350 ---- proc mat_group_new {p t grp} { variable _ + set color [rgb] + if {$grp eq "-"} {set grp [random_txt [expr "int(floor(rand() * 10 + 2))"]]} dict set _($t:g) $_($t:gi) name $grp ! dict set _($t:g) $_($t:gi) color $color ! $p.m create text [list 8.0 [expr 38.0 + 11 * $_($t:gi).0]] -fill [color $color] -justify left -anchor w -font {{bitstream vera sans mono} 10} -tags group -text $grp incr _($t:gi) } + proc mat_key {p t k b} { + # puts $k + switch $b { + 1 { + switch $k { + 37 {mat_mode $p $t draw} + } + } + 0 { + switch $k { + 37 {mat_mode $p $t {move_canvas}} + } + } + } + } + proc mat_new {p t w h bg ln xa xb ya yb qx qy} { variable _ *************** *** 290,297 **** foreach xy {x y} {foreach ab {a b} {set ${xy}${ab}o [set ${xy}${ab}]}} foreach a {i sc gi hover sel ln xa xb ya yb xao xbo yao ybo qx qy} {set _($t:$a) [set $a]} ! mat_group_new $p $t default if {[winfo exists $p.m] != 1} { canvas $p.m -bg $bg -width $w -height $h pack $p.m -side left bind $p.m <Motion> "::ix::mat_hover $p $t %x %y" bind $p.m <4> "::ix::mat_scroll $p $t 1 x" --- 355,364 ---- foreach xy {x y} {foreach ab {a b} {set ${xy}${ab}o [set ${xy}${ab}]}} foreach a {i sc gi hover sel ln xa xb ya yb xao xbo yao ybo qx qy} {set _($t:$a) [set $a]} ! if {[winfo exists $p.m] != 1} { canvas $p.m -bg $bg -width $w -height $h pack $p.m -side left + bind $p.m <Key> "::ix::mat_key $p $t %k 1" + bind $p.m <KeyRelease> "::ix::mat_key $p $t %k 0" bind $p.m <Motion> "::ix::mat_hover $p $t %x %y" bind $p.m <4> "::ix::mat_scroll $p $t 1 x" *************** *** 309,313 **** $p.m create text [list [expr {$w / 2.}] 5] -fill red -justify center -anchor n -font {{bitstream vera sans} 14} -tags q -text q $p.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill purple -tags loc -text "" ! mat_gridlines $p $t}} proc mat_gridlines {p t} { --- 376,382 ---- $p.m create text [list [expr {$w / 2.}] 5] -fill red -justify center -anchor n -font {{bitstream vera sans} 14} -tags q -text q $p.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill purple -tags loc -text "" ! mat_gridlines $p $t} ! mat_group_new $p $t default ! } proc mat_gridlines {p t} {

1 0

extensions/gui/ix mat.wid,1.14,1.15
by carmen rocco 05 Jul '05

05 Jul '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15897 Modified Files: mat.wid Log Message: root 10786 13.5 4.0 115888 84324 pts/5 S+ 11:00 1:01 Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mat.wid 5 Jul 2005 07:52:23 -0000 1.14 --- mat.wid 5 Jul 2005 11:02:00 -0000 1.15 *************** *** 14,31 **** foreach xy $axis { set mv [expr {($_($t:${xy}b) - $_($t:${xy}a)) / 4.0}] ! foreach ab {a b} {set _($t:${xy}$ab) [expr { $d > 0 ? $_($t:${xy}$ab) + $mv : $_($t:${xy}$ab) - $mv }]}} mat_redraw $p $t all mat_gridlines $p $t} ! proc mat_sel {a p t x y} { variable _ set _($t:sc) [rc] switch $a { ! start { foreach xy {x y} {set _($t:c$xy) [set $xy];set _($t:f$xy) [set $xy]} $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 12 -ry 12] \ -tags sel -stroke $_($t:sc) -strokewidth 12 -strokeopacity 0.3} ! close {$p.m delete sel} motion { if {$x >= $_($t:cx)} {set xa $_($t:fx);set xb $x} else {set xa $x;set xb $_($t:fx)} if {$y >= $_($t:cy)} {set ya $_($t:fy);set yb $y} else {set ya $y;set yb $_($t:fy)} --- 14,34 ---- foreach xy $axis { set mv [expr {($_($t:${xy}b) - $_($t:${xy}a)) / 4.0}] ! foreach ab {a b} {set _($t:${xy}$ab) [expr {$d > 0 ? $_($t:${xy}$ab) + $mv : $_($t:${xy}$ab) - $mv }]}} mat_redraw $p $t all mat_gridlines $p $t} ! proc mat_sel {p t a x y} { variable _ set _($t:sc) [rc] switch $a { ! first { foreach xy {x y} {set _($t:c$xy) [set $xy];set _($t:f$xy) [set $xy]} $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 12 -ry 12] \ -tags sel -stroke $_($t:sc) -strokewidth 12 -strokeopacity 0.3} ! release {$p.m delete sel; set _($t:hover) 0} motion { + if {$_($t:hover) != 1} { + mat_updatesel $p $t [mat_cleansel $p $t [$p.m find overlapping $_($t:fx) $_($t:fy) $x $y]] + } if {$x >= $_($t:cx)} {set xa $_($t:fx);set xb $x} else {set xa $x;set xb $_($t:fx)} if {$y >= $_($t:cy)} {set ya $_($t:fy);set yb $y} else {set ya $y;set yb $_($t:fy)} *************** *** 39,42 **** --- 42,54 ---- incr _($t:i) mat_item_update $p $t $_($t:i) [$p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [list item $_($t:i)] -fill green -fillopacity 0.8] abs 0 0 0 0} + + proc mat_quant {p t y v} { + variable _ + if {$y eq "xx"} {set y x}; if {$y eq "yy"} {set y y} + if {$y eq "x" || $y eq "y"} { + set v [expr {int( ($v + $_($t:q$y) / 2.0 ) / ($_($t:q$y) + 0.0))*$_($t:q$y)}] + } + return $v + } proc mat_item_update {p t item ci r x y xx yy} { *************** *** 45,50 **** if {[set $v] ne "-"} { switch $r { ! abs {dict set _($t) $item $v [set $v]} ! rel {dict set _($t) $item $v [expr {[dict get $_($t) $item $v] + [set $v]}]}}}} mat_redraw $p $t [dict get $_($t) $item ci]} --- 57,62 ---- if {[set $v] ne "-"} { switch $r { ! abs {dict set _($t) $item $v [mat_quant $p $t $v [set $v]]} ! rel {dict set _($t) $item $v [mat_quant $p $t $v [expr {[dict get $_($t) $item $v] + [set $v]}]]}}}} mat_redraw $p $t [dict get $_($t) $item ci]} *************** *** 109,113 **** set mx [mat_tr $p $t x d [expr {$x - $_($t:cx)}]] set my [mat_tr $p $t y d [expr {$y - $_($t:cy)}]] ! foreach item $_($t:sel) {mat_item_update $p $t [lindex [$p.m itemcget $item -tags] 1] - rel $mx $my $mx $my}} proc mat_cleansel {p t sel} { --- 121,127 ---- set mx [mat_tr $p $t x d [expr {$x - $_($t:cx)}]] set my [mat_tr $p $t y d [expr {$y - $_($t:cy)}]] ! foreach item $_($t:sel) {mat_item_update $p $t [lindex [$p.m itemcget $item -tags] 1] - rel $mx $my $mx $my} ! mat_info $p $t $_($t:sel) ! } proc mat_cleansel {p t sel} { *************** *** 120,145 **** mat_loc $p $t $x $y if {[$p.m find withtag sel] ne ""} { set clicked [$p.m find overlapping $_($t:fx) $_($t:fy) $x $y] ! mat_sel motion $p $t $x $y } else { set clicked [$p.m find overlapping $x $y $x $y] } - set n 0 - $p.m delete hover set clicked [mat_cleansel $p $t $clicked] if {$clicked ne ""} { mat_mode $p $t move_object if {[$p.m find withtag sel] eq "" && [llength $_($t:sel)] > 1} {return} ! foreach item $_($t:sel) { ! if {[lsearch -integer $clicked $item] < 0} { ! $p.m itemconfigure $item -fill blue}} ! foreach item $clicked { ! set id [lindex [$p.m itemcget $item -tags] 1] ! $p.m itemconfigure $item -fill $_($t:sc) ! $p.m create text [list [expr [winfo width $p.m] - 8.0] [expr [winfo height $p.m] - 8.0 - 11 * $n.0]] -fill "#ff0022" -justify right -anchor se -font {{bitstream vera sans} 10} -tags hover -text [dict get $_($t) $id] ! incr n ! } ! set _($t:sel) $clicked ! } else { mat_mode $p $t move_canvas --- 134,148 ---- mat_loc $p $t $x $y if {[$p.m find withtag sel] ne ""} { + set _($t:hover) 1 set clicked [$p.m find overlapping $_($t:fx) $_($t:fy) $x $y] ! mat_sel $p $t motion $x $y } else { set clicked [$p.m find overlapping $x $y $x $y] } set clicked [mat_cleansel $p $t $clicked] if {$clicked ne ""} { mat_mode $p $t move_object if {[$p.m find withtag sel] eq "" && [llength $_($t:sel)] > 1} {return} ! mat_updatesel $p $t $clicked } else { mat_mode $p $t move_canvas *************** *** 147,153 **** } proc mat_click {m button action p t x y X Y} { variable _ ! set clicked [$p.m find overlapping $x $y $x $y] set a [$p.m itemcget mode -text] switch $action { --- 150,180 ---- } + proc mat_info {p t clicked} { + variable _ + set n 0;$p.m delete hover + foreach item $clicked { + set info "" + set data [dict get $_($t) [lindex [$p.m itemcget $item -tags] 1]] + foreach d $data {lappend info [string range $d 0 7]} + $p.m create text [list [expr [winfo width $p.m] - 8.0] [expr [winfo height $p.m] - 8.0 - 11 * $n.0]] -fill $_($t:sc) -justify right -anchor se -font {{bitstream vera sans mono} 10} -tags hover -text $info + incr n + }} + + proc mat_updatesel {p t clicked} { + variable _ + foreach item $_($t:sel) { + if {[lsearch -integer $clicked $item] < 0} { + $p.m itemconfigure $item -fill blue}} + foreach item $clicked { + $p.m itemconfigure $item -fill $_($t:sc) + } + mat_info $p $t $clicked + set _($t:sel) $clicked + + } + proc mat_click {m button action p t x y X Y} { variable _ ! set clicked [mat_cleansel $p $t [$p.m find overlapping $x $y $x $y]] set a [$p.m itemcget mode -text] switch $action { *************** *** 157,173 **** 1 {if {$m eq "control"} { mat_mode $p $t draw; mat_draw $p $t $action $x $y ! } elseif {$m eq "double"} { ! mat_sel start $p $t $x $y } elseif {[$p.m find withtag sel] ne ""} { ! mat_sel close $p $t $x $y}} 2 {mat_mode $p $t resize_canvas} ! 3 {if {$clicked ne "" && [lindex [$p.m itemcget [lindex $clicked 0] -tags] 0] eq "item"} { mat_mode $p $t object_trans } else {mat_rmenu $p $t $X $Y}}}} motion {eval mat_$a $p $t $action $x $y} release { switch $button { ! 1 { ! if {$a eq "draw"} {mat_draw $p $t $action $x $y} ! } 2 {mat_mode $p $t move_canvas} 3 {mat_mode $p $t move_canvas} --- 184,201 ---- 1 {if {$m eq "control"} { mat_mode $p $t draw; mat_draw $p $t $action $x $y ! } elseif {$m eq "double" || $m eq "shift"} { ! mat_sel $p $t first $x $y ! mat_mode $p $t sel } elseif {[$p.m find withtag sel] ne ""} { ! mat_sel $p $t release $x $y ! } elseif {[llength $_($t:sel)] > 1 && [llength $clicked] > 0 && [lsearch $_($t:sel) $clicked] == -1} { ! mat_updatesel $p $t $clicked}} 2 {mat_mode $p $t resize_canvas} ! 3 {if {$clicked ne ""} { mat_mode $p $t object_trans } else {mat_rmenu $p $t $X $Y}}}} motion {eval mat_$a $p $t $action $x $y} release { switch $button { ! 1 {if {$a eq "draw" || ($a eq "sel" && [expr {abs($_($t:fx) - $x)}] >13)} {eval mat_$a $p $t $action $x $y}} 2 {mat_mode $p $t move_canvas} 3 {mat_mode $p $t move_canvas} *************** *** 238,242 **** proc mat_mode {p t m} { ! array set cursor {draw pencil move_canvas fleur move_object dotbox object_trans box_spiral resize_canvas bogosity} $p.m itemconfigure mode -text $m $p.m configure -cursor $cursor($m) --- 266,270 ---- proc mat_mode {p t m} { ! array set cursor {draw pencil move_canvas fleur move_object dotbox object_trans box_spiral resize_canvas bogosity sel cross_reverse} $p.m itemconfigure mode -text $m $p.m configure -cursor $cursor($m) *************** *** 246,257 **** } proc mat_new {p t w h bg ln xa xb ya yb qx qy} { variable _ - set i -1 set _($t) {} ! set _($t:sel) -1 ! set _($t:sc) white foreach xy {x y} {foreach ab {a b} {set ${xy}${ab}o [set ${xy}${ab}]}} ! foreach a {i ln xa xb ya yb xao xbo yao ybo qx qy} {set _($t:$a) [set $a]} if {[winfo exists $p.m] != 1} { canvas $p.m -bg $bg -width $w -height $h --- 274,294 ---- } + proc mat_group_new {p t grp} { + variable _ + dict set _($t:g) $_($t:gi) name $grp + dict set _($t:g) $_($t:gi) color [rc] + + incr _($t:gi) + } + proc mat_new {p t w h bg ln xa xb ya yb qx qy} { variable _ set _($t) {} ! set _($t:g) {} ! set i -1;set sel -1;set gi 0;set hover 0 ! set sc white foreach xy {x y} {foreach ab {a b} {set ${xy}${ab}o [set ${xy}${ab}]}} ! foreach a {i sc gi hover sel ln xa xb ya yb xao xbo yao ybo qx qy} {set _($t:$a) [set $a]} ! mat_group_new $p $t default if {[winfo exists $p.m] != 1} { canvas $p.m -bg $bg -width $w -height $h *************** *** 270,273 **** --- 307,311 ---- $p configure -bg gray -width [expr {[winfo width $p.m] + $bd}] -height [expr {[winfo height $p.m] + $bd}] $p.m create text {20 20} -fill blue -justify left -anchor w -font {{bitstream vera sans} 18} -tags mode -text move_canvas + $p.m create text [list [expr {$w / 2.}] 5] -fill red -justify center -anchor n -font {{bitstream vera sans} 14} -tags q -text q $p.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill purple -tags loc -text "" mat_gridlines $p $t}}

1 0

extensions/gui/ix mat.wid,1.13,1.14
by carmen rocco 05 Jul '05

05 Jul '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21213 Modified Files: mat.wid Log Message: wrapping expr args in {} cut down the memory leakage by 90% still pretty bad tho Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mat.wid 4 Jul 2005 22:49:25 -0000 1.13 --- mat.wid 5 Jul 2005 07:52:23 -0000 1.14 *************** *** 6,10 **** variable _ set id [lindex [$p.m itemcget $item -tags] 1] ! set len [expr [dict get $_($t) $id xx] - [dict get $_($t) $id x]] set vel [$p.m itemcget $item -fillopacity] pd [concat $t.rp _cb note [dict get $_($t) $id y] $vel $len \;]} --- 6,10 ---- variable _ set id [lindex [$p.m itemcget $item -tags] 1] ! set len [expr {[dict get $_($t) $id xx] - [dict get $_($t) $id x]}] set vel [$p.m itemcget $item -fillopacity] pd [concat $t.rp _cb note [dict get $_($t) $id y] $vel $len \;]} *************** *** 13,18 **** variable _ foreach xy $axis { ! set mv [expr ($_($t:${xy}b) - $_($t:${xy}a)) / 4.0] ! foreach ab {a b} {set _($t:${xy}$ab) [expr $_($t:${xy}$ab) $d $mv]}} mat_redraw $p $t all mat_gridlines $p $t} --- 13,18 ---- variable _ foreach xy $axis { ! set mv [expr {($_($t:${xy}b) - $_($t:${xy}a)) / 4.0}] ! foreach ab {a b} {set _($t:${xy}$ab) [expr { $d > 0 ? $_($t:${xy}$ab) + $mv : $_($t:${xy}$ab) - $mv }]}} mat_redraw $p $t all mat_gridlines $p $t} *************** *** 30,35 **** if {$x >= $_($t:cx)} {set xa $_($t:fx);set xb $x} else {set xa $x;set xb $_($t:fx)} if {$y >= $_($t:cy)} {set ya $_($t:fy);set yb $y} else {set ya $y;set yb $_($t:fy)} ! set w [expr abs($xb - $xa)] ! set h [expr abs($yb - $ya)] $p.m coords sel [::tkpath::coords rect $xa $ya $w $h -rx 12 -ry 12] $p.m itemconfigure sel -stroke $_($t:sc)}}} --- 30,35 ---- if {$x >= $_($t:cx)} {set xa $_($t:fx);set xb $x} else {set xa $x;set xb $_($t:fx)} if {$y >= $_($t:cy)} {set ya $_($t:fy);set yb $y} else {set ya $y;set yb $_($t:fy)} ! set w [expr {abs($xb - $xa)}] ! set h [expr {abs($yb - $ya)}] $p.m coords sel [::tkpath::coords rect $xa $ya $w $h -rx 12 -ry 12] $p.m itemconfigure sel -stroke $_($t:sc)}}} *************** *** 46,50 **** switch $r { abs {dict set _($t) $item $v [set $v]} ! rel {dict set _($t) $item $v [expr [dict get $_($t) $item $v] + [set $v]]}}}} mat_redraw $p $t [dict get $_($t) $item ci]} --- 46,50 ---- switch $r { abs {dict set _($t) $item $v [set $v]} ! rel {dict set _($t) $item $v [expr {[dict get $_($t) $item $v] + [set $v]}]}}}} mat_redraw $p $t [dict get $_($t) $item ci]} *************** *** 59,68 **** proc mat_resize_canvas {p t a x y} { variable _ ! set mx [expr $x - $_($t:cx)] ! set my [expr $y - $_($t:cy)] foreach xy {x y} { ! set mvt [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] ! set _($t:${xy}a) [expr $_($t:${xy}a) - $mvt] ! set _($t:${xy}b) [expr $_($t:${xy}b) + $mvt]} mat_redraw $p $t all mat_gridlines $p $t} --- 59,69 ---- proc mat_resize_canvas {p t a x y} { variable _ ! set mx [expr {$x - $_($t:cx)}] ! set my [expr {$y - $_($t:cy)}] foreach xy {x y} { ! set pos [set $xy] ! set mvt [mat_tr $p $t $xy d [expr {$pos - $_($t:c$xy)}]] ! set _($t:${xy}a) [expr {$_($t:${xy}a) - $mvt}] ! set _($t:${xy}b) [expr {$_($t:${xy}b) + $mvt}]} mat_redraw $p $t all mat_gridlines $p $t} *************** *** 77,82 **** set px [mat_tr $p $t x t [dict get $_($t) $id x]] set py [mat_tr $p $t y t [dict get $_($t) $id y]] ! set sx [expr abs([mat_tr $p $t x id [expr [dict get $_($t) $id xx] - [dict get $_($t) $id x]]])] ! set sy [expr abs([mat_tr $p $t y id 1])] # puts "$px $py $sx $sy" $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3]}} --- 78,83 ---- set px [mat_tr $p $t x t [dict get $_($t) $id x]] set py [mat_tr $p $t y t [dict get $_($t) $id y]] ! set sx [expr {abs([mat_tr $p $t x id [expr {[dict get $_($t) $id xx] - [dict get $_($t) $id x]}]])}] ! set sy [expr {abs([mat_tr $p $t y id 1])}] # puts "$px $py $sx $sy" $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3]}} *************** *** 84,90 **** proc mat_object_trans {p t a x y} { variable _ ! set velo [expr ($x - $_($t:cx)) / 100.0] foreach item $_($t:sel) { ! set vel [expr $velo + [$p.m itemcget $item -fillopacity]] if {$vel > 1} {set vel 1} if {$vel < 0} {set vel 0} --- 85,91 ---- proc mat_object_trans {p t a x y} { variable _ ! set velo [expr {($x - $_($t:cx)) / 100.0}] foreach item $_($t:sel) { ! set vel [expr {$velo + [$p.m itemcget $item -fillopacity]}] if {$vel > 1} {set vel 1} if {$vel < 0} {set vel 0} *************** *** 95,103 **** proc mat_move_canvas {p t a x y} { variable _ ! set mx [expr $x - $_($t:cx)] ! set my [expr $y - $_($t:cy)] foreach xy {x y} { ! set mvt [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] ! foreach ab {a b} {set _($t:${xy}$ab) [expr $_($t:${xy}$ab) - $mvt]}} mat_redraw $p $t all mat_gridlines $p $t} --- 96,105 ---- proc mat_move_canvas {p t a x y} { variable _ ! set mx [expr {$x - $_($t:cx)}] ! set my [expr {$y - $_($t:cy)}] foreach xy {x y} { ! set pos [set $xy] ! set mvt [mat_tr $p $t $xy d [expr {$pos - $_($t:c$xy)}]] ! foreach ab {a b} {set _($t:${xy}$ab) [expr {$_($t:${xy}$ab) - $mvt}]}} mat_redraw $p $t all mat_gridlines $p $t} *************** *** 105,110 **** proc mat_move_object {p t a x y} { variable _ ! set mx [mat_tr $p $t x d [expr $x - $_($t:cx)]] ! set my [mat_tr $p $t y d [expr $y - $_($t:cy)]] foreach item $_($t:sel) {mat_item_update $p $t [lindex [$p.m itemcget $item -tags] 1] - rel $mx $my $mx $my}} --- 107,112 ---- proc mat_move_object {p t a x y} { variable _ ! set mx [mat_tr $p $t x d [expr {$x - $_($t:cx)}]] ! set my [mat_tr $p $t y d [expr {$y - $_($t:cy)}]] foreach item $_($t:sel) {mat_item_update $p $t [lindex [$p.m itemcget $item -tags] 1] - rel $mx $my $mx $my}} *************** *** 116,124 **** proc mat_hover {p t x y} { variable _ if {[$p.m find withtag sel] ne ""} { set clicked [$p.m find overlapping $_($t:fx) $_($t:fy) $x $y] mat_sel motion $p $t $x $y } else { - # if {[llength $_($t:sel)] > 1} {return} set clicked [$p.m find overlapping $x $y $x $y] } --- 118,126 ---- proc mat_hover {p t x y} { variable _ + mat_loc $p $t $x $y if {[$p.m find withtag sel] ne ""} { set clicked [$p.m find overlapping $_($t:fx) $_($t:fy) $x $y] mat_sel motion $p $t $x $y } else { set clicked [$p.m find overlapping $x $y $x $y] } *************** *** 128,131 **** --- 130,134 ---- if {$clicked ne ""} { mat_mode $p $t move_object + if {[$p.m find withtag sel] eq "" && [llength $_($t:sel)] > 1} {return} foreach item $_($t:sel) { if {[lsearch -integer $clicked $item] < 0} { *************** *** 134,146 **** set id [lindex [$p.m itemcget $item -tags] 1] $p.m itemconfigure $item -fill $_($t:sc) ! # mat_note $p $t $item ! $p.m create text "[expr [winfo width $p.m] - 8.0 ] [expr [winfo height $p.m] - 8.0 - 11 * $n.0]" -fill "#ff0022" -justify right -anchor se -font {{bitstream vera sans} 10} -tags hover -text [dict get $_($t) $id] incr n } set _($t:sel) $clicked } else { mat_mode $p $t move_canvas } - mat_loc $p $t $x $y } --- 137,148 ---- set id [lindex [$p.m itemcget $item -tags] 1] $p.m itemconfigure $item -fill $_($t:sc) ! $p.m create text [list [expr [winfo width $p.m] - 8.0] [expr [winfo height $p.m] - 8.0 - 11 * $n.0]] -fill "#ff0022" -justify right -anchor se -font {{bitstream vera sans} 10} -tags hover -text [dict get $_($t) $id] incr n } set _($t:sel) $clicked + } else { mat_mode $p $t move_canvas } } *************** *** 193,200 **** array set dm {x width y height} switch $inv { ! t {return [expr ($v - $_($t:${d}a)) / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} ! i {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)]} ! d {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)]} ! id {return [expr $v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]}}} proc mat_zoom {p t a} { --- 195,202 ---- array set dm {x width y height} switch $inv { ! t {return [expr {($v - $_($t:${d}a)) / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]}]} ! i {return [expr {($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)}]} ! d {return [expr {($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)}]} ! id {return [expr {$v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]}]}}} proc mat_zoom {p t a} { *************** *** 256,263 **** pack $p.m -side left bind $p.m <Motion> "::ix::mat_hover $p $t %x %y" ! bind $p.m <4> "::ix::mat_scroll $p $t + x" ! bind $p.m <5> "::ix::mat_scroll $p $t - x" ! bind $p.m <Shift-4> "::ix::mat_scroll $p $t - y" ! bind $p.m <Shift-5> "::ix::mat_scroll $p $t + y" foreach m {"Control-" "" "Shift-" "Double-"} { foreach bn {1 2 3} { --- 258,265 ---- pack $p.m -side left bind $p.m <Motion> "::ix::mat_hover $p $t %x %y" ! bind $p.m <4> "::ix::mat_scroll $p $t 1 x" ! bind $p.m <5> "::ix::mat_scroll $p $t -1 x" ! bind $p.m <Shift-4> "::ix::mat_scroll $p $t -1 y" ! bind $p.m <Shift-5> "::ix::mat_scroll $p $t 1 y" foreach m {"Control-" "" "Shift-" "Double-"} { foreach bn {1 2 3} { *************** *** 266,270 **** bind $p.m <$m[lindex [lindex $b $ba] 0]> "::ix::mat_click [list [string tolower [string trimright $m -1]]] $bn [lindex [lindex $b $ba] 1] $p $t %x %y %X %Y"}}} set bd [expr {[$p cget -bd] * 2}] ! $p configure -bg gray -width [expr [winfo width $p.m] + $bd] -height [expr [winfo height $p.m] + $bd] $p.m create text {20 20} -fill blue -justify left -anchor w -font {{bitstream vera sans} 18} -tags mode -text move_canvas $p.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill purple -tags loc -text "" --- 268,272 ---- bind $p.m <$m[lindex [lindex $b $ba] 0]> "::ix::mat_click [list [string tolower [string trimright $m -1]]] $bn [lindex [lindex $b $ba] 1] $p $t %x %y %X %Y"}}} set bd [expr {[$p cget -bd] * 2}] ! $p configure -bg gray -width [expr {[winfo width $p.m] + $bd}] -height [expr {[winfo height $p.m] + $bd}] $p.m create text {20 20} -fill blue -justify left -anchor w -font {{bitstream vera sans} 18} -tags mode -text move_canvas $p.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill purple -tags loc -text "" *************** *** 282,287 **** array set tj {x center y left} array set igx {y width x height} ! if {$_($t:${xy}a) > $_($t:${xy}b)} {set oa ">=";set ob "-"} {set oa "<=";set ob "+"} ! for {set x [expr int($_($t:${xy}a) / ($_($t:q${xy}) + 0.0) + 1)*($_($t:q${xy}) + 0.0)]} {[expr $x $oa $_($t:${xy}b)]} {set x [expr $x $ob $_($t:q${xy})]} { set og [mat_tr $p $t $xy t $x] set invgeo [winfo $igx($xy) $w] --- 284,288 ---- array set tj {x center y left} array set igx {y width x height} ! for {set x [expr {int($_($t:${xy}a) / ($_($t:q${xy}) + 0.0) + 1)*($_($t:q${xy}) + 0.0)}]} {[expr {$_($t:${xy}a) > $_($t:${xy}b) ? $x >= $_($t:${xy}b) : $x <= $_($t:${xy}b)}]} {set x [expr {$_($t:${xy}a) > $_($t:${xy}b) ? $x - $_($t:q${xy}) : $x + $_($t:q${xy})}]} { set og [mat_tr $p $t $xy t $x] set invgeo [winfo $igx($xy) $w]

1 0

extensions/gui/ix mat.wid,1.12,1.13
by carmen rocco 05 Jul '05

05 Jul '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11555 Modified Files: mat.wid Log Message: fu ---------------------------------------------------------------------- Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mat.wid 21 Jun 2005 22:27:54 -0000 1.12 --- mat.wid 4 Jul 2005 22:49:25 -0000 1.13 *************** *** 10,16 **** pd [concat $t.rp _cb note [dict get $_($t) $id y] $vel $len \;]} - proc mat_action {p t a x y} { - } - proc mat_scroll {p t d axis} { variable _ --- 10,13 ---- *************** *** 19,36 **** foreach ab {a b} {set _($t:${xy}$ab) [expr $_($t:${xy}$ab) $d $mv]}} mat_redraw $p $t all ! mat_gridlines $p $t ! } proc mat_sel {a p t x y} { variable _ switch $a { start { foreach xy {x y} {set _($t:c$xy) [set $xy];set _($t:f$xy) [set $xy]} ! $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 12 -ry 12] -tags sel -stroke [rc] -strokewidth 12 -strokeopacity 0.3 ! ! } ! close { ! $p.m delete sel ! } motion { if {$x >= $_($t:cx)} {set xa $_($t:fx);set xb $x} else {set xa $x;set xb $_($t:fx)} --- 16,30 ---- foreach ab {a b} {set _($t:${xy}$ab) [expr $_($t:${xy}$ab) $d $mv]}} mat_redraw $p $t all ! mat_gridlines $p $t} proc mat_sel {a p t x y} { variable _ + set _($t:sc) [rc] switch $a { start { foreach xy {x y} {set _($t:c$xy) [set $xy];set _($t:f$xy) [set $xy]} ! $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 12 -ry 12] \ ! -tags sel -stroke $_($t:sc) -strokewidth 12 -strokeopacity 0.3} ! close {$p.m delete sel} motion { if {$x >= $_($t:cx)} {set xa $_($t:fx);set xb $x} else {set xa $x;set xb $_($t:fx)} *************** *** 39,45 **** set h [expr abs($yb - $ya)] $p.m coords sel [::tkpath::coords rect $xa $ya $w $h -rx 12 -ry 12] ! } ! } ! } proc mat_draw {p t a x y} { --- 33,51 ---- set h [expr abs($yb - $ya)] $p.m coords sel [::tkpath::coords rect $xa $ya $w $h -rx 12 -ry 12] ! $p.m itemconfigure sel -stroke $_($t:sc)}}} ! ! proc mat_item_new {p t} { ! variable _ ! incr _($t:i) ! mat_item_update $p $t $_($t:i) [$p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [list item $_($t:i)] -fill green -fillopacity 0.8] abs 0 0 0 0} ! ! proc mat_item_update {p t item ci r x y xx yy} { ! variable _ ! foreach v {ci x xx y yy} { ! if {[set $v] ne "-"} { ! switch $r { ! abs {dict set _($t) $item $v [set $v]} ! rel {dict set _($t) $item $v [expr [dict get $_($t) $item $v] + [set $v]]}}}} ! mat_redraw $p $t [dict get $_($t) $item ci]} proc mat_draw {p t a x y} { *************** *** 48,66 **** motion { if {$x >= $_($t:cx)} {set xa $_($t:fx);set xb $x} else {set xa $x;set xb $_($t:fx)} ! set w [expr abs($xb - $xa)] ! set h [mat_tr $p $t y id 1] ! $p.m coords drawing [::tkpath::coords rect $xa $y $w $h -rx 3 -ry 3] ! set yi [mat_tr $p $t y i $y] ! dict set _($t) $_($t:i) x [mat_tr $p $t x i $xa] ! dict set _($t) $_($t:i) y $yi ! dict set _($t) $_($t:i) xx [mat_tr $p $t x i $xb] ! dict set _($t) $_($t:i) yy $yi ! pd [concat $t.rp _cb note $yi 0.8 \;]} ! first { ! foreach xy {x y} {set _($t:c$xy) [set $xy]} ! $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 3 -ry 3] -tags drawing -fill green -fillopacity 0.8} ! release { ! $p.m itemconfigure drawing -tags [list item $_($t:i)] -matrix {{1.0 0.0} {0.0 1.0} {0.0 0.0}} ! incr _($t:i)}}} proc mat_resize_canvas {p t a x y} { --- 54,59 ---- motion { if {$x >= $_($t:cx)} {set xa $_($t:fx);set xb $x} else {set xa $x;set xb $_($t:fx)} ! mat_item_update $p $t $_($t:i) - abs [mat_tr $p $t x i $xa] [mat_tr $p $t y i $y] [mat_tr $p $t x i $xb] [mat_tr $p $t y i $y]} ! first {mat_item_new $p $t}}} proc mat_resize_canvas {p t a x y} { *************** *** 71,79 **** set mvt [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] set _($t:${xy}a) [expr $_($t:${xy}a) - $mvt] ! set _($t:${xy}b) [expr $_($t:${xy}b) + $mvt] ! } mat_redraw $p $t all ! mat_gridlines $p $t ! } proc mat_redraw {p t items} { --- 64,70 ---- set mvt [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] set _($t:${xy}a) [expr $_($t:${xy}a) - $mvt] ! set _($t:${xy}b) [expr $_($t:${xy}b) + $mvt]} mat_redraw $p $t all ! mat_gridlines $p $t} proc mat_redraw {p t items} { *************** *** 81,100 **** switch $items { all {set items [$p.m find withtag item]} ! default {} ! } foreach item $items { set id [lindex [$p.m itemcget $item -tags] 1] set px [mat_tr $p $t x t [dict get $_($t) $id x]] set py [mat_tr $p $t y t [dict get $_($t) $id y]] ! set sx [mat_tr $p $t x id [expr [dict get $_($t) $id xx] - [dict get $_($t) $id x]]] ! set sy [mat_tr $p $t y id 1] ! $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3] ! } ! } proc mat_object_trans {p t a x y} { variable _ set velo [expr ($x - $_($t:cx)) / 100.0] ! foreach item $_($t:cl) { set vel [expr $velo + [$p.m itemcget $item -fillopacity]] if {$vel > 1} {set vel 1} --- 72,89 ---- switch $items { all {set items [$p.m find withtag item]} ! default {}} foreach item $items { set id [lindex [$p.m itemcget $item -tags] 1] set px [mat_tr $p $t x t [dict get $_($t) $id x]] set py [mat_tr $p $t y t [dict get $_($t) $id y]] ! set sx [expr abs([mat_tr $p $t x id [expr [dict get $_($t) $id xx] - [dict get $_($t) $id x]]])] ! set sy [expr abs([mat_tr $p $t y id 1])] ! # puts "$px $py $sx $sy" ! $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3]}} proc mat_object_trans {p t a x y} { variable _ set velo [expr ($x - $_($t:cx)) / 100.0] ! foreach item $_($t:sel) { set vel [expr $velo + [$p.m itemcget $item -fillopacity]] if {$vel > 1} {set vel 1} *************** *** 111,150 **** set mvt [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] foreach ab {a b} {set _($t:${xy}$ab) [expr $_($t:${xy}$ab) - $mvt]}} ! foreach item [$p.m find withtag item] { ! set m [$p.m itemcget $item -matrix] ! set m [list [lindex $m 0] [lindex $m 1] [list [expr [lindex [lindex $m 2] 0] + $mx] [expr [lindex [lindex $m 2] 1] + $my]]] ! $p.m itemconfigure $item -matrix $m ! } ! mat_gridlines $p $t ! } proc mat_move_object {p t a x y} { variable _ ! set mx [expr $x - $_($t:cx)] ! set my [expr $y - $_($t:cy)] ! foreach item $_($t:cl) { ! set m [$p.m itemcget $item -matrix] ! set m [list [lindex $m 0] [lindex $m 1] [list [expr [lindex [lindex $m 2] 0] + $mx] [expr [lindex [lindex $m 2] 1] + $my]]] ! $p.m itemconfigure $item -matrix $m ! } ! } proc mat_hover {p t x y} { variable _ if {[$p.m find withtag sel] ne ""} { ! set clicked [$p.m find overlapping $x $y $_($t:fx) $_($t:fy)] mat_sel motion $p $t $x $y } else { set clicked [$p.m find overlapping $x $y $x $y] } set n 0 $p.m delete hover ! foreach item $clicked { ! if {[lindex [$p.m itemcget $item -tags] 0] eq "item"} { set id [lindex [$p.m itemcget $item -tags] 1] ! # mat_note $p $t $item $p.m create text "[expr [winfo width $p.m] - 8.0 ] [expr [winfo height $p.m] - 8.0 - 11 * $n.0]" -fill "#ff0022" -justify right -anchor se -font {{bitstream vera sans} 10} -tags hover -text [dict get $_($t) $id] ! incr n } } mat_loc $p $t $x $y --- 100,144 ---- set mvt [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] foreach ab {a b} {set _($t:${xy}$ab) [expr $_($t:${xy}$ab) - $mvt]}} ! mat_redraw $p $t all ! mat_gridlines $p $t} proc mat_move_object {p t a x y} { variable _ ! set mx [mat_tr $p $t x d [expr $x - $_($t:cx)]] ! set my [mat_tr $p $t y d [expr $y - $_($t:cy)]] ! foreach item $_($t:sel) {mat_item_update $p $t [lindex [$p.m itemcget $item -tags] 1] - rel $mx $my $mx $my}} ! ! proc mat_cleansel {p t sel} { ! set clean {} ! foreach item $sel {if {[lindex [$p.m itemcget $item -tags] 0] eq "item"} { lappend clean $item}} ! return $clean} proc mat_hover {p t x y} { variable _ if {[$p.m find withtag sel] ne ""} { ! set clicked [$p.m find overlapping $_($t:fx) $_($t:fy) $x $y] mat_sel motion $p $t $x $y } else { + # if {[llength $_($t:sel)] > 1} {return} set clicked [$p.m find overlapping $x $y $x $y] } set n 0 $p.m delete hover ! set clicked [mat_cleansel $p $t $clicked] ! if {$clicked ne ""} { ! mat_mode $p $t move_object ! foreach item $_($t:sel) { ! if {[lsearch -integer $clicked $item] < 0} { ! $p.m itemconfigure $item -fill blue}} ! foreach item $clicked { set id [lindex [$p.m itemcget $item -tags] 1] ! $p.m itemconfigure $item -fill $_($t:sc) ! # mat_note $p $t $item $p.m create text "[expr [winfo width $p.m] - 8.0 ] [expr [winfo height $p.m] - 8.0 - 11 * $n.0]" -fill "#ff0022" -justify right -anchor se -font {{bitstream vera sans} 10} -tags hover -text [dict get $_($t) $id] ! incr n } + set _($t:sel) $clicked + } else { + mat_mode $p $t move_canvas } mat_loc $p $t $x $y *************** *** 157,186 **** switch $action { first { - set _($t:cl) $clicked foreach xy {x y} {set _($t:f$xy) [set $xy]} switch $button { ! 1 { ! if {$a eq "draw"} {mat_draw $p $t $action $x $y} elseif {$m eq "double"} { ! mat_sel start $p $t $x $y ! } elseif {[$p.m find withtag sel] ne ""} { ! mat_sel close $p $t $x $y ! } else { ! if {$clicked ne "" && [lindex [$p.m itemcget [lindex $clicked 0] -tags] 0] eq "item"} { ! mat_mode $p $t move_object ! } else { ! mat_mode $p $t move_canvas ! } ! } ! } 2 {mat_mode $p $t resize_canvas} ! 3 { ! if {$clicked ne "" && [lindex [$p.m itemcget [lindex $clicked 0] -tags] 0] eq "item"} { ! mat_mode $p $t object_trans ! } else { ! mat_rmenu $p $t $X $Y ! } ! } ! } ! } motion {eval mat_$a $p $t $action $x $y} release { --- 151,165 ---- switch $action { first { foreach xy {x y} {set _($t:f$xy) [set $xy]} switch $button { ! 1 {if {$m eq "control"} { ! mat_mode $p $t draw; mat_draw $p $t $action $x $y ! } elseif {$m eq "double"} { ! mat_sel start $p $t $x $y ! } elseif {[$p.m find withtag sel] ne ""} { ! mat_sel close $p $t $x $y}} 2 {mat_mode $p $t resize_canvas} ! 3 {if {$clicked ne "" && [lindex [$p.m itemcget [lindex $clicked 0] -tags] 0] eq "item"} { ! mat_mode $p $t object_trans } else {mat_rmenu $p $t $X $Y}}}} motion {eval mat_$a $p $t $action $x $y} release { *************** *** 196,200 **** foreach xy {x y} {set _($t:c$xy) [set $xy]} } ! proc mat_rmenu {p t x y} { if {[winfo exists $p.rmenu] != 1} { --- 175,179 ---- foreach xy {x y} {set _($t:c$xy) [set $xy]} } ! proc mat_rmenu {p t x y} { if {[winfo exists $p.rmenu] != 1} { *************** *** 214,229 **** array set dm {x width y height} switch $inv { - #value->pixels t {return [expr ($v - $_($t:${d}a)) / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} - - #pixels->value i {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)]} - - #pixels->value (distance) d {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)]} ! ! #values->pixel (distance) ! # id {return [expr $v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} ! id {return [expr abs($v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m])]}}} proc mat_zoom {p t a} { --- 193,200 ---- array set dm {x width y height} switch $inv { t {return [expr ($v - $_($t:${d}a)) / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} i {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)]} d {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)]} ! id {return [expr $v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]}}} proc mat_zoom {p t a} { *************** *** 255,259 **** set _($t:ya) $ya set _($t:yb) $yb - puts "new: $_($t:xa) $_($t:xb) $_($t:ya) $_($t:yb)" } reset { --- 226,229 ---- *************** *** 265,286 **** } - proc mat_key {p t k b} { - # puts $k - switch $b { - 1 { - switch $k { - 37 {mat_mode $p $t draw} - } - } - 0 { - switch $k { - 37 {mat_mode $p $t {move_canvas}} - } - } - } - } proc mat_mode {p t m} { $p.m itemconfigure mode -text $m ! } proc mat_loc {p t x y} { $p.m itemconfigure loc -text [list [mat_tr $p $t x i $x] [mat_tr $p $t y i $y]] --- 235,243 ---- } proc mat_mode {p t m} { + array set cursor {draw pencil move_canvas fleur move_object dotbox object_trans box_spiral resize_canvas bogosity} $p.m itemconfigure mode -text $m ! $p.m configure -cursor $cursor($m) ! } proc mat_loc {p t x y} { $p.m itemconfigure loc -text [list [mat_tr $p $t x i $x] [mat_tr $p $t y i $y]] *************** *** 289,294 **** proc mat_new {p t w h bg ln xa xb ya yb qx qy} { variable _ ! set i 0 set _($t) {} foreach xy {x y} {foreach ab {a b} {set ${xy}${ab}o [set ${xy}${ab}]}} foreach a {i ln xa xb ya yb xao xbo yao ybo qx qy} {set _($t:$a) [set $a]} --- 246,253 ---- proc mat_new {p t w h bg ln xa xb ya yb qx qy} { variable _ ! set i -1 set _($t) {} + set _($t:sel) -1 + set _($t:sc) white foreach xy {x y} {foreach ab {a b} {set ${xy}${ab}o [set ${xy}${ab}]}} foreach a {i ln xa xb ya yb xao xbo yao ybo qx qy} {set _($t:$a) [set $a]} *************** *** 296,304 **** canvas $p.m -bg $bg -width $w -height $h pack $p.m -side left - bind $p.m <Key> "::ix::mat_key $p $t %k 1" - bind $p.m <KeyRelease> "::ix::mat_key $p $t %k 0" bind $p.m <Motion> "::ix::mat_hover $p $t %x %y" ! bind $p.m <4> "::ix::mat_scroll $p $t - x" ! bind $p.m <5> "::ix::mat_scroll $p $t + x" bind $p.m <Shift-4> "::ix::mat_scroll $p $t - y" bind $p.m <Shift-5> "::ix::mat_scroll $p $t + y" --- 255,261 ---- canvas $p.m -bg $bg -width $w -height $h pack $p.m -side left bind $p.m <Motion> "::ix::mat_hover $p $t %x %y" ! bind $p.m <4> "::ix::mat_scroll $p $t + x" ! bind $p.m <5> "::ix::mat_scroll $p $t - x" bind $p.m <Shift-4> "::ix::mat_scroll $p $t - y" bind $p.m <Shift-5> "::ix::mat_scroll $p $t + y" *************** *** 310,314 **** set bd [expr {[$p cget -bd] * 2}] $p configure -bg gray -width [expr [winfo width $p.m] + $bd] -height [expr [winfo height $p.m] + $bd] ! $p.m create text {20 20} -fill blue -justify left -anchor w -font {{bitstream vera sans} 18} -tags mode -text action $p.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill purple -tags loc -text "" mat_gridlines $p $t}} --- 267,271 ---- set bd [expr {[$p cget -bd] * 2}] $p configure -bg gray -width [expr [winfo width $p.m] + $bd] -height [expr [winfo height $p.m] + $bd] ! $p.m create text {20 20} -fill blue -justify left -anchor w -font {{bitstream vera sans} 18} -tags mode -text move_canvas $p.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill purple -tags loc -text "" mat_gridlines $p $t}} *************** *** 329,336 **** set og [mat_tr $p $t $xy t $x] set invgeo [winfo $igx($xy) $w] ! switch $xy {y {set coords [concat M 0 $og L $invgeo $og]} ! x {set coords [concat M $og 0 L $og $invgeo]}} ! $w lower [$w create path $coords -stroke $_($t:ln) -strokedasharray 2 -tags gridline -strokewidth 1] ! $w lower [$w create text [lrange $coords 1 2] -font {{Bitstream Vera Sans} 8} \ -fill green -anchor $ta($xy) -text $x -justify $tj($xy) -tags gridline]}}}} --- 286,298 ---- set og [mat_tr $p $t $xy t $x] set invgeo [winfo $igx($xy) $w] ! switch $xy { ! # y {set coords [concat M 0 $og L $invgeo $og]} ! # x {set coords [concat M $og 0 L $og $invgeo]}} ! y {set coords [concat 0 $og $invgeo $og]} ! x {set coords [concat $og 0 $og $invgeo]}} ! # $w lower [$w create path $coords -stroke $_($t:ln) -strokedasharray 2 -tags gridline -strokewidth 1] ! $w lower [$w create line $coords -fill $_($t:ln) -tags gridline -width 1] ! # $w lower [$w create text [lrange $coords 1 2] -font {{Bitstream Vera Sans} 8} \ ! $w lower [$w create text [lrange $coords 0 1] -font {{Bitstream Vera Sans} 8} \ -fill green -anchor $ta($xy) -text $x -justify $tj($xy) -tags gridline]}}}} *************** *** 342,343 **** --- 304,307 ---- puts "mat .- .|" ::ix::mat_new .- .| .#w .#h .#bg .#ln .#Xa .#Xb .#Ya .#Yb .#qx .#qy + #bind .- <Enter> {focus .-} + #bind .- <Leave> {focus .^.c}

1 0

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 July 2005