- fix update issues with resize/rename/creation

- allow to resize patterns by any dimension
- add license docs
- makefile fixes

svn path=/trunk/externals/ffext/; revision=12466

13 files changed, 380 insertions, 62 deletions

diff --git a/composer/AUTHORS b/composer/AUTHORS
new file mode 100644
index 0000000..cecde9a
--- /dev/null
+++ b/composer/AUTHORS
@@ -0,0 +1,4 @@
+Authors of composer.
+
+Federico Ferri <mescalinum@gmail.com>
+
diff --git a/composer/COPYING b/composer/COPYING
new file mode 100644
index 0000000..f47bd6d
--- /dev/null
+++ b/composer/COPYING
@@ -0,0 +1,280 @@
+		    GNU GENERAL PUBLIC LICENSE

+		       Version 2, June 1991

+

+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.

+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ Everyone is permitted to copy and distribute verbatim copies

+ of this license document, but changing it is not allowed.

+

+			    Preamble

+

+  The licenses for most software are designed to take away your

+freedom to share and change it.  By contrast, the GNU General Public

+License is intended to guarantee your freedom to share and change free

+software--to make sure the software is free for all its users.  This

+General Public License applies to most of the Free Software

+Foundation's software and to any other program whose authors commit to

+using it.  (Some other Free Software Foundation software is covered by

+the GNU Library General Public License instead.)  You can apply it to

+your programs, too.

+

+  When we speak of free software, we are referring to freedom, not

+price.  Our General Public Licenses are designed to make sure that you

+have the freedom to distribute copies of free software (and charge for

+this service if you wish), that you receive source code or can get it

+if you want it, that you can change the software or use pieces of it

+in new free programs; and that you know you can do these things.

+

+  To protect your rights, we need to make restrictions that forbid

+anyone to deny you these rights or to ask you to surrender the rights.

+These restrictions translate to certain responsibilities for you if you

+distribute copies of the software, or if you modify it.

+

+  For example, if you distribute copies of such a program, whether

+gratis or for a fee, you must give the recipients all the rights that

+you have.  You must make sure that they, too, receive or can get the

+source code.  And you must show them these terms so they know their

+rights.

+

+  We protect your rights with two steps: (1) copyright the software, and

+(2) offer you this license which gives you legal permission to copy,

+distribute and/or modify the software.

+

+  Also, for each author's protection and ours, we want to make certain

+that everyone understands that there is no warranty for this free

+software.  If the software is modified by someone else and passed on, we

+want its recipients to know that what they have is not the original, so

+that any problems introduced by others will not reflect on the original

+authors' reputations.

+

+  Finally, any free program is threatened constantly by software

+patents.  We wish to avoid the danger that redistributors of a free

+program will individually obtain patent licenses, in effect making the

+program proprietary.  To prevent this, we have made it clear that any

+patent must be licensed for everyone's free use or not licensed at all.

+

+  The precise terms and conditions for copying, distribution and

+modification follow.

+

+		    GNU GENERAL PUBLIC LICENSE

+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

+

+  0. This License applies to any program or other work which contains

+a notice placed by the copyright holder saying it may be distributed

+under the terms of this General Public License.  The "Program", below,

+refers to any such program or work, and a "work based on the Program"

+means either the Program or any derivative work under copyright law:

+that is to say, a work containing the Program or a portion of it,

+either verbatim or with modifications and/or translated into another

+language.  (Hereinafter, translation is included without limitation in

+the term "modification".)  Each licensee is addressed as "you".

+

+Activities other than copying, distribution and modification are not

+covered by this License; they are outside its scope.  The act of

+running the Program is not restricted, and the output from the Program

+is covered only if its contents constitute a work based on the

+Program (independent of having been made by running the Program).

+Whether that is true depends on what the Program does.

+

+  1. You may copy and distribute verbatim copies of the Program's

+source code as you receive it, in any medium, provided that you

+conspicuously and appropriately publish on each copy an appropriate

+copyright notice and disclaimer of warranty; keep intact all the

+notices that refer to this License and to the absence of any warranty;

+and give any other recipients of the Program a copy of this License

+along with the Program.

+

+You may charge a fee for the physical act of transferring a copy, and

+you may at your option offer warranty protection in exchange for a fee.

+

+  2. You may modify your copy or copies of the Program or any portion

+of it, thus forming a work based on the Program, and copy and

+distribute such modifications or work under the terms of Section 1

+above, provided that you also meet all of these conditions:

+

+    a) You must cause the modified files to carry prominent notices

+    stating that you changed the files and the date of any change.

+

+    b) You must cause any work that you distribute or publish, that in

+    whole or in part contains or is derived from the Program or any

+    part thereof, to be licensed as a whole at no charge to all third

+    parties under the terms of this License.

+

+    c) If the modified program normally reads commands interactively

+    when run, you must cause it, when started running for such

+    interactive use in the most ordinary way, to print or display an

+    announcement including an appropriate copyright notice and a

+    notice that there is no warranty (or else, saying that you provide

+    a warranty) and that users may redistribute the program under

+    these conditions, and telling the user how to view a copy of this

+    License.  (Exception: if the Program itself is interactive but

+    does not normally print such an announcement, your work based on

+    the Program is not required to print an announcement.)

+

+These requirements apply to the modified work as a whole.  If

+identifiable sections of that work are not derived from the Program,

+and can be reasonably considered independent and separate works in

+themselves, then this License, and its terms, do not apply to those

+sections when you distribute them as separate works.  But when you

+distribute the same sections as part of a whole which is a work based

+on the Program, the distribution of the whole must be on the terms of

+this License, whose permissions for other licensees extend to the

+entire whole, and thus to each and every part regardless of who wrote it.

+

+Thus, it is not the intent of this section to claim rights or contest

+your rights to work written entirely by you; rather, the intent is to

+exercise the right to control the distribution of derivative or

+collective works based on the Program.

+

+In addition, mere aggregation of another work not based on the Program

+with the Program (or with a work based on the Program) on a volume of

+a storage or distribution medium does not bring the other work under

+the scope of this License.

+

+  3. You may copy and distribute the Program (or a work based on it,

+under Section 2) in object code or executable form under the terms of

+Sections 1 and 2 above provided that you also do one of the following:

+

+    a) Accompany it with the complete corresponding machine-readable

+    source code, which must be distributed under the terms of Sections

+    1 and 2 above on a medium customarily used for software interchange; or,

+

+    b) Accompany it with a written offer, valid for at least three

+    years, to give any third party, for a charge no more than your

+    cost of physically performing source distribution, a complete

+    machine-readable copy of the corresponding source code, to be

+    distributed under the terms of Sections 1 and 2 above on a medium

+    customarily used for software interchange; or,

+

+    c) Accompany it with the information you received as to the offer

+    to distribute corresponding source code.  (This alternative is

+    allowed only for noncommercial distribution and only if you

+    received the program in object code or executable form with such

+    an offer, in accord with Subsection b above.)

+

+The source code for a work means the preferred form of the work for

+making modifications to it.  For an executable work, complete source

+code means all the source code for all modules it contains, plus any

+associated interface definition files, plus the scripts used to

+control compilation and installation of the executable.  However, as a

+special exception, the source code distributed need not include

+anything that is normally distributed (in either source or binary

+form) with the major components (compiler, kernel, and so on) of the

+operating system on which the executable runs, unless that component

+itself accompanies the executable.

+

+If distribution of executable or object code is made by offering

+access to copy from a designated place, then offering equivalent

+access to copy the source code from the same place counts as

+distribution of the source code, even though third parties are not

+compelled to copy the source along with the object code.

+

+  4. You may not copy, modify, sublicense, or distribute the Program

+except as expressly provided under this License.  Any attempt

+otherwise to copy, modify, sublicense or distribute the Program is

+void, and will automatically terminate your rights under this License.

+However, parties who have received copies, or rights, from you under

+this License will not have their licenses terminated so long as such

+parties remain in full compliance.

+

+  5. You are not required to accept this License, since you have not

+signed it.  However, nothing else grants you permission to modify or

+distribute the Program or its derivative works.  These actions are

+prohibited by law if you do not accept this License.  Therefore, by

+modifying or distributing the Program (or any work based on the

+Program), you indicate your acceptance of this License to do so, and

+all its terms and conditions for copying, distributing or modifying

+the Program or works based on it.

+

+  6. Each time you redistribute the Program (or any work based on the

+Program), the recipient automatically receives a license from the

+original licensor to copy, distribute or modify the Program subject to

+these terms and conditions.  You may not impose any further

+restrictions on the recipients' exercise of the rights granted herein.

+You are not responsible for enforcing compliance by third parties to

+this License.

+

+  7. If, as a consequence of a court judgment or allegation of patent

+infringement or for any other reason (not limited to patent issues),

+conditions are imposed on you (whether by court order, agreement or

+otherwise) that contradict the conditions of this License, they do not

+excuse you from the conditions of this License.  If you cannot

+distribute so as to satisfy simultaneously your obligations under this

+License and any other pertinent obligations, then as a consequence you

+may not distribute the Program at all.  For example, if a patent

+license would not permit royalty-free redistribution of the Program by

+all those who receive copies directly or indirectly through you, then

+the only way you could satisfy both it and this License would be to

+refrain entirely from distribution of the Program.

+

+If any portion of this section is held invalid or unenforceable under

+any particular circumstance, the balance of the section is intended to

+apply and the section as a whole is intended to apply in other

+circumstances.

+

+It is not the purpose of this section to induce you to infringe any

+patents or other property right claims or to contest validity of any

+such claims; this section has the sole purpose of protecting the

+integrity of the free software distribution system, which is

+implemented by public license practices.  Many people have made

+generous contributions to the wide range of software distributed

+through that system in reliance on consistent application of that

+system; it is up to the author/donor to decide if he or she is willing

+to distribute software through any other system and a licensee cannot

+impose that choice.

+

+This section is intended to make thoroughly clear what is believed to

+be a consequence of the rest of this License.

+

+  8. If the distribution and/or use of the Program is restricted in

+certain countries either by patents or by copyrighted interfaces, the

+original copyright holder who places the Program under this License

+may add an explicit geographical distribution limitation excluding

+those countries, so that distribution is permitted only in or among

+countries not thus excluded.  In such case, this License incorporates

+the limitation as if written in the body of this License.

+

+  9. The Free Software Foundation may publish revised and/or new versions

+of the General Public License from time to time.  Such new versions will

+be similar in spirit to the present version, but may differ in detail to

+address new problems or concerns.

+

+Each version is given a distinguishing version number.  If the Program

+specifies a version number of this License which applies to it and "any

+later version", you have the option of following the terms and conditions

+either of that version or of any later version published by the Free

+Software Foundation.  If the Program does not specify a version number of

+this License, you may choose any version ever published by the Free Software

+Foundation.

+

+  10. If you wish to incorporate parts of the Program into other free

+programs whose distribution conditions are different, write to the author

+to ask for permission.  For software which is copyrighted by the Free

+Software Foundation, write to the Free Software Foundation; we sometimes

+make exceptions for this.  Our decision will be guided by the two goals

+of preserving the free status of all derivatives of our free software and

+of promoting the sharing and reuse of software generally.

+

+			    NO WARRANTY

+

+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY

+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN

+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES

+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED

+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS

+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE

+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,

+REPAIR OR CORRECTION.

+

+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING

+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR

+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,

+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING

+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED

+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY

+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER

+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGES.

+

+		     END OF TERMS AND CONDITIONS

diff --git a/composer/Common.hpp b/composer/Common.hpp
new file mode 100644
index 0000000..f5d1e30
--- /dev/null
+++ b/composer/Common.hpp
@@ -0,0 +1,14 @@
+#ifndef COMPOSER_COMMON_H_INCLUDED
+#define COMPOSER_COMMON_H_INCLUDED
+
+#define IS_A_FLOAT(atom,index) ((atom+index)->a_type == A_FLOAT)
+#define IS_A_SYMBOL(atom,index) ((atom+index)->a_type == A_SYMBOL)
+
+//get rid of the "deprecated conversion from string constant to char*'" warning
+#define sys_gui(x) sys_gui(const_cast<char*>(x))
+#define sys_vgui(format, args...) sys_vgui(const_cast<char*>(format), ## args)
+#define gensym(x) gensym(const_cast<char*>(x))
+#define binbuf_addv(b, format, args...) binbuf_addv(b, const_cast<char*>(format), ## args)
+#define WRAP(v,w) (((v)<0)?(((w)-1)-((-(v)-1)%(w))):((v)%(w)))
+
+#endif // COMPOSER_COMMON_H_INCLUDED
diff --git a/composer/Editor.cpp b/composer/Editor.cpp
index 1b62b55..6a89181 100644
--- a/composer/Editor.cpp
+++ b/composer/Editor.cpp
@@ -7,8 +7,10 @@
 
 #include <m_pd.h>
 
+#include "Common.hpp"
+
 #include "editor_tk.cpp"
-static const int editor_tk_len = sizeof(editor_tk) / sizeof(editor_tk[0]);
+static const unsigned int editor_tk_len = sizeof(editor_tk) / sizeof(editor_tk[0]);
 
 using std::cerr;
 using std::endl;
@@ -34,11 +36,11 @@ void Editor::uploadCode()
 {
     sys_gui("proc Xeval {c {d {}}} {switch $c {begin {set ::Xeval_map {}; for {set i 0} {$i < 256} {incr i} {lappend ::Xeval_map \%[format \%02x $i] [format \%c $i]}; set ::Xeval_data {}} data {append ::Xeval_data [string map $::Xeval_map $d]\\n} end {uplevel #0 $::Xeval_data; unset ::Xeval_map; unset ::Xeval_data}}}\n"); 
     sys_gui("Xeval begin\n");
-    for(int i = 0; i < editor_tk_len; i++)
+    for(unsigned int i = 0; i < editor_tk_len; i++)
     {
         string s = "Xeval data {";
         string l = editor_tk[i];
-        for(int j = 0; j < l.length(); j++)
+        for(unsigned int j = 0; j < l.length(); j++)
         {
             if(isalnum(l[j])) s.append(1, l[j]);
             else s += string(urlencode(l[j]));
@@ -52,11 +54,10 @@ void Editor::uploadCode()
 void Editor::init(t_track_proxy *x)
 {
     uploadCode();
-    sys_vgui("pd::composer::init %s %s %s %d %s %d\n",
+    sys_vgui("pd::composer::init %s %s %s %s %d\n",
         x->editor_recv->s_name,
         x->track->getSong()->getName().c_str(),
         x->track->getName().c_str(),
-        16,
         "NULL",
 #ifdef DEBUG
         1
diff --git a/composer/Editor.hpp b/composer/Editor.hpp
index 94c30a9..620aab5 100644
--- a/composer/Editor.hpp
+++ b/composer/Editor.hpp
@@ -1,3 +1,6 @@
+#ifndef COMPOSER_EDITOR_H_INCLUDED
+#define COMPOSER_EDITOR_H_INCLUDED
+
 #include "PdClasses.hpp"
 #include <m_pd.h>
 
@@ -10,3 +13,5 @@ public:
     static void openWindow(t_track_proxy *x);
     static void closeWindow(t_track_proxy *x);
 };
+
+#endif // COMPOSER_EDITOR_H_INCLUDED
diff --git a/composer/Makefile b/composer/Makefile
index ce630d5..7074c49 100644
--- a/composer/Makefile
+++ b/composer/Makefile
@@ -28,7 +28,7 @@ endif
 
 LIBNAME = composer
 INCLUDES =  -I../../pd/src -I/usr/include #-I/usr/include/tcl$(TCL_VERSION)
-CFLAGS += -funroll-loops -fno-operator-names -fno-omit-frame-pointer -falign-functions=16 -Wno-deprecated -fPIC
+CFLAGS += -funroll-loops -fno-operator-names -fno-omit-frame-pointer -falign-functions=16 -Wall -fPIC
 CFLAGS += -DPDSUF=\"$(PDSUF)\"
 LDSHARED = $(CXX) $(PDBUNDLEFLAGS)
 
@@ -61,12 +61,14 @@ $(LIBNAME)$(PDSUF): Makefile $(OBJS)
 	$(LDSHARED) $(LDSOFLAGS) $(CFLAGS) -xnone $(OBJS) -o $(LIBNAME)$(PDSUF)
 
 editor_tk.cpp: editor.tk
-	( echo 'static const char* editor_tk[] = {'; sed -e 's/\(["\\]\)/\\\1/g' -e 's/^/"/' -e 's/$$/",/' editor.tk; echo '"" };' ) > editor_tk.cpp
+	@echo "Generating $@..."
+	@( echo 'static const char* editor_tk[] = {'; sed -e 's/\(["\\]\)/\\\1/g' -e 's/^/"/' -e 's/$$/",/' editor.tk; echo '"" };' ) > editor_tk.cpp
 
 autogen_sources: $(AUTOGENERATED_SOURCES)
 
 methods.hpp: PdClasses.hpp
-	awk ' \
+	@echo "Generating $@..."
+	@awk ' \
 		/^\/\*#end methods\*\/$$/{M=0} \
 		{if(M==1) print $$0} \
 		/^\/\*#begin methods\*\/$$/{M=1}' \
@@ -90,13 +92,16 @@ methods.hpp: PdClasses.hpp
 	> methods.hpp
 
 methods_pd.hpp: methods.hpp
-	sed -e 's/\<track_proxy_\w\+\>/\0P/' methods.hpp > methods_pd.hpp
+	@echo "Generating $@..."
+	@sed -e 's/\<track_proxy_\w\+\>/\0P/' methods.hpp > methods_pd.hpp
 
 methods_ed.hpp: methods.hpp
-	sed -e 's/\<track_proxy_\w\+\>/\0E/' methods.hpp > methods_ed.hpp
+	@echo "Generating $@..."
+	@sed -e 's/\<track_proxy_\w\+\>/\0E/' methods.hpp > methods_ed.hpp
 
 classsetup.cpp: methods.hpp
-	sed \
+	@echo "Generating $@..."
+	@sed \
 		-e 's/\<track_proxy_\(\w\+\)\>/\0 \1/' \
 		-e 's/);$$/, /' \
 		-e 's/(t_track_proxy\* arg0,\?//' \
@@ -117,9 +122,10 @@ classsetup.cpp: methods.hpp
 	> classsetup.cpp
 
 callwrappers_pd.cpp: methods.hpp
-	sed \
+	@echo "Generating $@..."
+	@sed \
 		-e 's/;$$//' \
-		-e 's/^\(.*\)\(\<track_proxy_\w\+\>\)\((.*)\)$$/\1\2P\3 {\n    \2\3;\/\/real call\n    track_proxy_send_result(arg0, 1, 0);\n}/' \
+		-e 's/^\(.*\)\(\<track_proxy_\w\+\>\)\((.*)\)$$/\1\2P\3 {\n    \2\3;\/\/real call\n    track_proxy_send_result(arg0, 1, 0);\n    return 0;\n}/' \
 		methods.hpp \
 	| sed \
 		-e '/\/\/real call/s/(t_track_proxy\* arg0/(arg0/' \
@@ -128,9 +134,10 @@ callwrappers_pd.cpp: methods.hpp
 	> callwrappers_pd.cpp
 
 callwrappers_ed.cpp: methods.hpp
-	sed \
+	@echo "Generating $@..."
+	@sed \
 		-e 's/;$$//' \
-		-e 's/^\(.*\)\(\<track_proxy_\w\+\>\)\((.*)\)$$/\1\2E\3 {\n    \2\3;\/\/real call\n    track_proxy_send_result(arg0, 0, 1);\n}/' \
+		-e 's/^\(.*\)\(\<track_proxy_\w\+\>\)\((.*)\)$$/\1\2E\3 {\n    \2\3;\/\/real call\n    track_proxy_send_result(arg0, 0, 1);\n    return 0;\n}/' \
 		methods.hpp \
 	| sed \
 		-e '/\/\/real call/s/(t_track_proxy\* arg0/(arg0/' \
diff --git a/composer/Pattern.cpp b/composer/Pattern.cpp
index 8335b28..070838a 100644
--- a/composer/Pattern.cpp
+++ b/composer/Pattern.cpp
@@ -2,12 +2,12 @@
 
 #include <iostream>
 
+#include "Common.hpp"
+
 using std::cout;
 using std::cerr;
 using std::endl;
 
-#define WRAP(v,w) (((v)<0)?(((w)-1)-((-(v)-1)%(w))):((v)%(w)))
-
 Pattern::Pattern(int numRows, int numCols, string patternName)
 : name(patternName)
 {
diff --git a/composer/Pattern.hpp b/composer/Pattern.hpp
index 1607414..fbafcec 100644
--- a/composer/Pattern.hpp
+++ b/composer/Pattern.hpp
@@ -26,6 +26,7 @@ public:
 	void setCell(int row, int col, Cell cell);
 	Cell getCell(int row, int col);
 	inline const string &getName() {return name;}
+    inline void setName(const string &newName) {name = newName;}
 	inline unsigned int getRows() {return rows.size();}
 	inline unsigned int getColumns() {return columns;}
 };
diff --git a/composer/PdClasses.cpp b/composer/PdClasses.cpp
index 0ca07c1..75f05a0 100644
--- a/composer/PdClasses.cpp
+++ b/composer/PdClasses.cpp
@@ -9,13 +9,12 @@
 
 #include <iostream>
 
+#include "Common.hpp"
+
 using std::cout;
 using std::cerr;
 using std::endl;
 
-#define IS_A_FLOAT(atom,index) ((atom+index)->a_type == A_FLOAT)
-#define IS_A_SYMBOL(atom,index) ((atom+index)->a_type == A_SYMBOL)
-
 t_atom result_argv[MAX_RESULT_SIZE];
 int result_argc;
 
@@ -196,6 +195,7 @@ int track_proxy_editor(t_track_proxy *x, t_floatarg arg)
         else Editor::closeWindow(x);
     }
     result_argc = 0;
+    return 0;
 }
 
 int track_proxy_getpatterns(t_track_proxy *x)
@@ -249,14 +249,15 @@ int track_proxy_setrow(t_track_proxy *x, t_symbol *sel, int argc, t_atom *argv)
         pd_error(x, "setrow: no such pattern: %s", pat->s_name);
         return -2;
     }
-    if((argc - 2) != pattern->getColumns())
+    unsigned int argc2 = argc - 2;
+    if(argc2 != pattern->getColumns())
     {
         pd_error(x, "setrow: input error: must provide exactly %d elements for a row", pattern->getColumns());
         return -3;
     }
-    for(unsigned int i = 2; i < argc; i++)
+    for(unsigned int i = 0; i < argc2; i++)
     {
-        pattern->setCell(r, i - 2, argv[i]);
+        pattern->setCell(r, i, argv[i + 2]);
     }
     return 0;
 }
@@ -365,6 +366,19 @@ int track_proxy_resizepattern(t_track_proxy *x, t_symbol *pat, t_floatarg rows,
     return 0;
 }
 
+int track_proxy_renamepattern(t_track_proxy *x, t_symbol *oldName, t_symbol *newName)
+{
+    result_argc = 0;
+    Pattern *pattern = x->track->getPattern(oldName->s_name);
+    if(!pattern)
+    {
+        pd_error(x, "resizepattern: no such pattern: %s", oldName->s_name);
+        return -2;
+    }
+    x->track->renamePattern(oldName->s_name, newName->s_name);
+    return 0;
+}
+
 int track_proxy_copypattern(t_track_proxy *x, t_symbol *src, t_symbol *dst)
 {
     result_argc = 0;
diff --git a/composer/PdClasses.hpp b/composer/PdClasses.hpp
index da3c7bd..122325f 100644
--- a/composer/PdClasses.hpp
+++ b/composer/PdClasses.hpp
@@ -40,6 +40,7 @@ int track_proxy_getcell(t_track_proxy *x, t_symbol *pat, t_floatarg rownum, t_fl
 int track_proxy_addpattern(t_track_proxy *x, t_symbol *name, t_floatarg rows, t_floatarg cols);
 int track_proxy_removepattern(t_track_proxy *x, t_symbol *pat);
 int track_proxy_resizepattern(t_track_proxy *x, t_symbol *pat, t_floatarg rows, t_floatarg cols);
+int track_proxy_renamepattern(t_track_proxy *x, t_symbol *oldName, t_symbol *newName);
 int track_proxy_copypattern(t_track_proxy *x, t_symbol *src, t_symbol *dst);
 /*#end methods*/
 
diff --git a/composer/Track.cpp b/composer/Track.cpp
index 2154ecf..ae02ed5 100644
--- a/composer/Track.cpp
+++ b/composer/Track.cpp
@@ -27,10 +27,6 @@ void Track::print()
 {
 	cerr << "---- Track: " << name << " ----" << endl;
 
-	/*for(unsigned int i = 0; i < patterns.size(); i++)
-	{
-		cerr << "  Pattern[" << patterns[i]->getName() << "]: " << patterns[i]->getName() << endl;
-	}*/
     for(map<string,Pattern *>::iterator i = patterns.begin(); i != patterns.end(); i++)
     {
 		cerr << "  Pattern[" << i->first << "]: " << i->second->getName() << endl;
@@ -42,18 +38,9 @@ void Track::print()
 void Track::addPattern(int rows, int cols, string name)
 {
     Pattern *pattern = new Pattern(rows, cols, name);
-	//patterns.push_back(pattern);
     patterns[name] = pattern;
 }
 
-/*Pattern *Track::getPattern(int n)
-{
-    if(n < 0 || n >= patterns.size())
-        return 0;
-    else
-        return patterns[n];
-}*/
-
 Pattern *Track::getPattern(const string &p)
 {
     if(patterns.find(p) != patterns.end())
@@ -61,3 +48,12 @@ Pattern *Track::getPattern(const string &p)
     else
         return 0;
 }
+
+void Track::renamePattern(const string &oldName, const string &newName)
+{
+    Pattern *pattern = getPattern(oldName);
+    if(!pattern) return;
+    pattern->setName(newName);
+    patterns[newName] = patterns[oldName];
+    patterns.erase(oldName);
+}
diff --git a/composer/Track.hpp b/composer/Track.hpp
index 0d6c2cb..a4e7fbc 100644
--- a/composer/Track.hpp
+++ b/composer/Track.hpp
@@ -3,12 +3,10 @@
 
 #include <map>
 #include <string>
-//#include <vector>
 
 #include <m_pd.h>
 
 using std::string;
-//using std::vector;
 using std::map;
 
 class Song;
@@ -20,7 +18,6 @@ public:
 	static Track *byName(string songName, string trackName);
 private:
 	string name;
-	//vector<Pattern *> patterns;
     map<string,Pattern *> patterns;
 	Song *song;
 protected:
@@ -28,8 +25,8 @@ protected:
 public:
 	void print();
 	void addPattern(int rows, int cols, string name);
-	//Pattern *getPattern(int n);
     Pattern *getPattern(const string &p);
+    void renamePattern(const string &oldName, const string &newName);
 	inline unsigned int getPatternCount() {return patterns.size();}
     inline map<string,Pattern *>::iterator patternsBegin() {return patterns.begin();}
     inline map<string,Pattern *>::iterator patternsEnd() {return patterns.end();}
diff --git a/composer/editor.tk b/composer/editor.tk
index 9b2fcd6..eca176a 100644
--- a/composer/editor.tk
+++ b/composer/editor.tk
@@ -40,8 +40,6 @@ namespace eval pd::composer {
     array set currentpattern {}
     variable size
     array set size {}
-    variable columns
-    array set columns {}
     variable patterns
     array set patterns {}
     variable tracks
@@ -88,16 +86,19 @@ namespace eval pd::composer {
         }
 
         sendGui [editCommand addpattern $name $rows $cols]
+        sendGui [editCommand getpatterns]
     }
 
     proc removePattern {id name} {
         debugPrint [info level 0]
         sendGui [editCommand removepattern $name]
+        sendGui [editCommand getpatterns]
     }
 
     proc copyPattern {id src dst} {
         debugPrint [info level 0]
         sendGui [editCommand copypattern $src $dst]
+        sendGui [editCommand getpatterns]
     }
 
     proc resizePattern {id name rows cols} {
@@ -105,7 +106,9 @@ namespace eval pd::composer {
         variable currentpattern;
         variable size;
 
-        if {[list $rows $cols] == [dict get $size($id) $name]} return
+        if {[dict exists $size($id) $name]} {
+            if {[list $rows $cols] == [dict get $size($id) $name]} return
+        }
 
         set rows [expr {int($rows)}]
         set cols [expr {int($cols)}]
@@ -114,10 +117,14 @@ namespace eval pd::composer {
         }
 
         sendGui [editCommand resizepattern $name $rows $cols]
+        if {$currentpattern($id) == $name} {
+            displayPattern $id $name
+        }
     }
 
     proc renamePattern {id name newName} {
         debugPrint [info level 0]
+        variable currentpattern;
         variable patterns;
 
         if {$name == $newName} return
@@ -130,6 +137,10 @@ namespace eval pd::composer {
         }
 
         sendGui [editCommand renamepattern $name $newName]
+        if {$currentpattern($id) == $name} {
+            set currentpattern($id) $newName
+        }
+        sendGui [editCommand getpatterns]
     }
 
     proc generateNewPatternName {id} {
@@ -171,7 +182,6 @@ namespace eval pd::composer {
         variable currentpattern
         variable patterns
         variable size
-        variable columns
         variable w
         variable songname
         variable trackname
@@ -185,7 +195,6 @@ namespace eval pd::composer {
             return
         }
 
-        #set cols $columns($id)
         lassign [dict get $size($id) $name] rows cols
         grid $w($id).t -row 10 -column 0 -sticky news
         debugPrint "resizing tktable widget to ${rows}x${cols}"
@@ -397,7 +406,7 @@ namespace eval pd::composer {
         variable w
         set bname 1
         set brows 1
-        set bcols 0
+        set bcols 1
         set old_name {}
         catch {set old_name $currentpattern($id)}
         set vname {}
@@ -449,8 +458,8 @@ namespace eval pd::composer {
         variable size;
 
         dict set options action_ok {
-            %ns::resizePattern %id %old_name [%w.erows get] [%w.ecols get]
             %ns::renamePattern %id %old_name [%w.ename get]
+            %ns::resizePattern %id [%w.ename get] [%w.erows get] [%w.ecols get]
             destroy %w
         }
         dict set options vname $currentpattern($id)
@@ -464,7 +473,7 @@ namespace eval pd::composer {
         debugPrint [info level 0]
         variable w;
         variable size;
-
+        variable currentpattern;
         dict set options brows 0
         dict set options bcols 0
         dict set options vname [generateNewPatternName $id]
@@ -480,13 +489,14 @@ namespace eval pd::composer {
 
     proc removePatternConfirm {id} {
         debugPrint [info level 0]
+        variable w;
         variable currentpattern;
         if {[tk_messageBox \
             -type yesno -default no \
             -title "Question" \
             -icon question -message "Do you confirm pattern delete?" \
             -detail "The operation cannot be undone" \
-            -parent $w] == {yes}} {
+            -parent $w($id)] == {yes}} {
             removePattern $id $currentpattern($id)
         }
     }
@@ -504,7 +514,7 @@ namespace eval pd::composer {
     }
 
     #entrypoint
-    proc init {id song_name track_name cols set_current_pattern debug_flag} {
+    proc init {id song_name track_name set_current_pattern debug_flag} {
         debugPrint [info level 0]
         variable debug
         set debug [expr {$debug_flag != 0}]
@@ -513,7 +523,6 @@ namespace eval pd::composer {
         variable trackname
         variable size
         variable currentpattern
-        variable columns
         set w($id) .w_${song_name}_${track_name}
         set songname($id) $song_name
         set trackname($id) $track_name
@@ -523,7 +532,6 @@ namespace eval pd::composer {
             set currentpattern($id) $set_current_pattern
         }
         set size($id) {}
-        set columns($id) $cols
     }
 
     proc openWindow {id} {
@@ -551,7 +559,6 @@ namespace eval pd::composer {
         variable currentpattern
         variable startup
         variable showpattern
-        variable columns
         variable quirks_fix_int_floats
         switch -exact [lindex $args 0] {
             patternnames {
@@ -566,15 +573,6 @@ namespace eval pd::composer {
                     }
                 }
             }
-            tracks {
-                # for song mode
-                set tracks($id) [lrange $args 1 end]
-                debugPrint "tracks <- $tracks($id)"
-                set cols [llength $tracks($id)]
-                #debugPrint "resizing tktable widget to ${cols} cols"
-                #$w($id).t configure -state normal -cols $cols 
-                set columns($id) $cols
-            }
             patternsize {
                 set pat_name [lindex $args 1]
                 set pat_rows [lindex $args 2]