Pd-cvs March 2004

pd-cvs@lists.iem.at

11 participants
225 discussions

externals/grill/flext/source flattr.cpp,1.20,1.21 flattr_ed.cpp,1.19,1.20 flbind.cpp,1.12,1.13 flclass.h,1.41,1.42 flitem.cpp,1.10,1.11 fllib.cpp,1.21,1.22 flmeth.cpp,1.8,1.9 flmsg.cpp,1.10,1.11 flsupport.cpp,1.31,1.32 flsupport.h,1.64,1.65
by xovo＠users.sourceforge.net 06 Mar '04

06 Mar '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1597/source Modified Files: flattr.cpp flattr_ed.cpp flbind.cpp flclass.h flitem.cpp fllib.cpp flmeth.cpp flmsg.cpp flsupport.cpp flsupport.h Log Message: "" Index: flattr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** flattr.cpp 22 Feb 2004 03:33:59 -0000 1.20 --- flattr.cpp 6 Mar 2004 03:25:48 -0000 1.21 *************** *** 33,39 **** {} ! flext_base::AttrItem::~AttrItem() { ! // if(nxt) delete nxt; } --- 33,43 ---- {} ! ! flext_base::AttrDataCont::AttrDataCont() {} ! ! flext_base::AttrDataCont::~AttrDataCont() { ! for(iterator it = begin(); it != end(); ++it) ! if(it.data()) delete it.data(); } *************** *** 97,101 **** void flext_base::ListAttrib(AtomList &la) const { ! typedef std::map<int,const t_symbol *> AttrList; AttrList list[2]; --- 101,105 ---- void flext_base::ListAttrib(AtomList &la) const { ! typedef DataMap<int,const t_symbol *> AttrList; AttrList list[2]; *************** *** 106,112 **** ItemSet &ai = a->GetInlet(); for(ItemSet::iterator as = ai.begin(); as != ai.end(); ++as) { ! for(ItemList::iterator al = as->second.begin(); al != as->second.end(); ++al) { ! AttrItem *aa = (AttrItem *)*al; ! list[i][aa->index] = as->first; break; } --- 110,116 ---- ItemSet &ai = a->GetInlet(); for(ItemSet::iterator as = ai.begin(); as != ai.end(); ++as) { ! for(Item *al = as.data(); al; al = al->nxt) { ! AttrItem *aa = (AttrItem *)al; ! list[i][aa->index] = as.key(); break; } *************** *** 120,124 **** for(i = 0; i <= 1; ++i) for(it = list[i].begin(); it != list[i].end(); ++it) ! SetSymbol(la[ix++],it->second); } --- 124,128 ---- for(i = 0; i <= 1; ++i) for(it = list[i].begin(); it != list[i].end(); ++it) ! SetSymbol(la[ix++],it.data()); } *************** *** 145,149 **** if(attr) { // make an entry (there are none beforehand...) ! AttrData &a = (*attrdata)[tag]; a.SetInit(true); a.SetInitValue(nxt-cur-1,argv+cur+1); --- 149,161 ---- if(attr) { // make an entry (there are none beforehand...) ! AttrDataCont::iterator it = attrdata->find(tag); ! if(it == attrdata->end()) { ! AttrDataCont::pair pair; ! pair.key() = tag; ! pair.data() = new AttrData; ! it = attrdata->insert(attrdata->begin(),pair); ! } ! ! AttrData &a = *it.data(); a.SetInit(true); a.SetInitValue(nxt-cur-1,argv+cur+1); *************** *** 173,182 **** AttrItem *a = NULL; { ! ItemList *lst = attrhead->FindList(tag); ! if(lst) { ! for(ItemList::iterator it = lst->begin(); it != lst->end(); ++it) { ! AttrItem *b = (AttrItem *)*it; ! if(get?b->IsGet():b->IsSet()) { a = b; break; } ! } } } --- 185,191 ---- AttrItem *a = NULL; { ! for(Item *lst = attrhead->FindList(tag); lst; lst = lst->nxt) { ! AttrItem *b = (AttrItem *)lst; ! if(get?b->IsGet():b->IsSet()) { a = b; break; } } } *************** *** 184,193 **** // then (if nothing found) search within class scope if(!a) { ! ItemList *lst = clattrhead->FindList(tag); ! if(lst) { ! for(ItemList::iterator it = lst->begin(); it != lst->end(); ++it) { ! AttrItem *b = (AttrItem *)*it; ! if(get?b->IsGet():b->IsSet()) { a = b; break; } ! } } } --- 193,199 ---- // then (if nothing found) search within class scope if(!a) { ! for(Item *lst = clattrhead->FindList(tag); lst; lst = lst->nxt) { ! AttrItem *b = (AttrItem *)lst; ! if(get?b->IsGet():b->IsSet()) { a = b; break; } } } *************** *** 371,377 **** ItemSet &ai = a->GetInlet(); // \todo need to check for presence of inlet 0? for(ItemSet::iterator as = ai.begin(); as != ai.end(); ++as) { ! for(ItemList::iterator al = as->second.begin(); al != as->second.end(); ++al) { ! AttrItem *a = (AttrItem *)*al; ! if(a->IsGet() && a->BothExist()) BangAttrib(as->first,a); } } --- 377,383 ---- ItemSet &ai = a->GetInlet(); // \todo need to check for presence of inlet 0? for(ItemSet::iterator as = ai.begin(); as != ai.end(); ++as) { ! for(Item *al = as.data(); al; al = al->nxt) { ! AttrItem *a = (AttrItem *)al; ! if(a->IsGet() && a->BothExist()) BangAttrib(as.key(),a); } } Index: flattr_ed.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr_ed.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** flattr_ed.cpp 22 Feb 2004 03:33:59 -0000 1.19 --- flattr_ed.cpp 6 Mar 2004 03:25:48 -0000 1.20 *************** *** 437,441 **** sv = 0,initdata = NULL; else { ! const AttrData &a = it->second; if(a.IsSaved()) sv = 2; --- 437,441 ---- sv = 0,initdata = NULL; else { ! const AttrData &a = *it.data(); if(a.IsSaved()) sv = 2; *************** *** 574,578 **** if(it != th->attrdata->end()) { ! const AttrData &a = it->second; if(a.IsInit() && a.IsInitValue()) { lref = &a.GetInitValue(); --- 574,578 ---- if(it != th->attrdata->end()) { ! const AttrData &a = *it.data(); if(a.IsInit() && a.IsInitValue()) { lref = &a.GetInitValue(); *************** *** 671,679 **** // if data not present create it if(it == th->attrdata->end()) { ! AttrDataPair pair; pair.first = aname; it = th->attrdata->insert(th->attrdata->begin(),pair); } ! AttrData &a = it->second; a.SetSave(sv == 2); a.SetInit(true); --- 671,681 ---- // if data not present create it if(it == th->attrdata->end()) { ! AttrDataCont::pair pair; ! pair.key() = aname; ! pair.data() = new AttrData; it = th->attrdata->insert(th->attrdata->begin(),pair); } ! AttrData &a = *it.data(); a.SetSave(sv == 2); a.SetInit(true); *************** *** 682,686 **** else { if(it != th->attrdata->end()) { ! AttrData &a = it->second; // if data is present reset flags a.SetSave(false); --- 684,688 ---- else { if(it != th->attrdata->end()) { ! AttrData &a = *it.data(); // if data is present reset flags a.SetSave(false); Index: flbind.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flbind.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** flbind.cpp 22 Feb 2004 03:34:00 -0000 1.12 --- flbind.cpp 6 Mar 2004 03:25:48 -0000 1.13 *************** *** 100,116 **** else { // Search for symbol ! ItemList *lst = bindhead->FindList(sym); ! ! if(lst) ! for(ItemList::iterator it = lst->begin(); it != lst->end(); ++it) { ! BindItem *item = (BindItem *)*it; ! // go through all items with matching tag ! if(item->fun == fun) { ! // function already registered -> bail out! ! post("%s - Symbol already bound with this method",thisName()); ! return false; ! } } } --- 100,113 ---- else { // Search for symbol ! for(Item *it = bindhead->FindList(sym); it; it = it->nxt) { ! BindItem *item = (BindItem *)it; ! // go through all items with matching tag ! if(item->fun == fun) { ! // function already registered -> bail out! ! post("%s - Symbol already bound with this method",thisName()); ! return false; } + } } *************** *** 167,172 **** BindItem *it = NULL; for(ItemSet::iterator si = it1; si != it2 && !it; ++si) { ! for(ItemList::iterator i = si->second.begin(); i != si->second.end(); ++i) { ! BindItem *item = (BindItem *)*i; if(!fun || item->fun == fun) { it = item; break; } } --- 164,169 ---- BindItem *it = NULL; for(ItemSet::iterator si = it1; si != it2 && !it; ++si) { ! for(Item *i = si.data(); i; i = i->nxt) { ! BindItem *item = (BindItem *)i; if(!fun || item->fun == fun) { it = item; break; } } *************** *** 189,204 **** if(bindhead) { // Search for symbol ! ItemList *lst = bindhead->FindList(sym); ! ! if(lst) ! for(ItemList::iterator it = lst->begin(); it != lst->end(); ++it) { ! BindItem *item = (BindItem *)*it; ! // go through all items with matching tag ! if(item->fun == fun) { ! data = item->px->data; ! return true; ! } } } return false; --- 186,198 ---- if(bindhead) { // Search for symbol ! for(Item *it = bindhead->FindList(sym); it; it = it->nxt) { ! BindItem *item = (BindItem *)it; ! // go through all items with matching tag ! if(item->fun == fun) { ! data = item->px->data; ! return true; } + } } return false; *************** *** 210,220 **** ItemSet &set = bindhead->GetInlet(); for(ItemSet::iterator si = set.begin(); si != set.end(); ++si) { ! ItemList &lst = si->second; ! while(!lst.empty()) { ! // eventual allocated data in item is not freed! ! BindItem *it = (BindItem *)lst.front(); ! it->Unbind(si->first); delete it; ! lst.pop_front(); } } --- 204,214 ---- ItemSet &set = bindhead->GetInlet(); for(ItemSet::iterator si = set.begin(); si != set.end(); ++si) { ! Item *lst = si.data(); ! while(lst) { ! Item *nxt = lst->nxt; ! BindItem *it = (BindItem *)lst; ! it->Unbind(si.key()); delete it; ! lst = nxt; } } Index: flclass.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flclass.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** flclass.h 22 Feb 2004 03:34:00 -0000 1.41 --- flclass.h 6 Mar 2004 03:25:48 -0000 1.42 *************** *** 21,29 **** #include "flsupport.h" - #include <map> - #include <set> - #include <list> - #include <vector> - #ifdef _MSC_VER #pragma warning(disable: 4786) --- 21,24 ---- *************** *** 605,632 **** { public: ! Item(AttrItem *a): attr(a) {} ! virtual ~Item() {} bool IsAttr() const { return attr != NULL; } AttrItem *attr; }; ! typedef std::list<Item *> ItemList; ! ! typedef std::map<const t_symbol *,ItemList> ItemSet; ! typedef std::vector<ItemSet> ItemVec; ! //! This class holds hashed item entries ! class ItemCont: ! private ItemVec { public: ! typedef ItemVec::iterator iterator; ! typedef ItemVec::const_iterator const_iterator; ! ItemCont(): members(0) {} ! bool Contained(int i) const { return i+1 < (int)size(); } //! Add an entry --- 600,633 ---- { public: ! Item(AttrItem *a): attr(a),nxt(NULL) {} ! virtual ~Item(); bool IsAttr() const { return attr != NULL; } AttrItem *attr; + Item *nxt; }; ! class ItemSet: ! public DataMap<const t_symbol *,Item *> ! { ! public: ! ItemSet(); ! ~ItemSet(); ! }; ! /*! This class holds hashed item entries ! \note not thread-safe! ! */ ! class ItemCont { public: ! ItemCont(); ! ~ItemCont(); ! int Min() const { return -1; } ! int Max() const { return size-2; } ! bool Contained(int i) const { return i+1 < size; } //! Add an entry *************** *** 635,641 **** bool Remove(Item *it,const t_symbol *tag,int inlet = 0); //! Find an entry list in the Item array ! ItemList *FindList(const t_symbol *tag,int inlet = 0); //! Get list for an inlet ! ItemSet &GetInlet(int inlet = 0) { return (*this)[inlet+1]; } //! Get counter for total members (for index of new item) --- 636,647 ---- bool Remove(Item *it,const t_symbol *tag,int inlet = 0); //! Find an entry list in the Item array ! Item *FindList(const t_symbol *tag,int inlet = 0); ! //! Get list for an inlet ! ItemSet &GetInlet(int inlet = 0) ! { ! FLEXT_ASSERT(inlet >= Min() && inlet <= Max()); ! return *cont[inlet+1]; ! } //! Get counter for total members (for index of new item) *************** *** 643,647 **** --- 649,658 ---- protected: + + void Resize(int nsz); + int members; + int memsize,size; + ItemSet **cont; }; *************** *** 668,672 **** public: AttrItem(metharg tp,methfun fun,int flags); - virtual ~AttrItem(); enum { --- 679,682 ---- *************** *** 711,717 **** }; ! typedef std::map<const t_symbol *,AttrData> AttrDataCont; ! typedef std::pair<const t_symbol *,AttrData> AttrDataPair; ! // these outlet functions don't check for thread but send directly to the real-time system --- 721,731 ---- }; ! class AttrDataCont: ! public DataMap<const t_symbol *,AttrData *> ! { ! public: ! AttrDataCont(); ! ~AttrDataCont(); ! }; // these outlet functions don't check for thread but send directly to the real-time system *************** *** 735,738 **** --- 749,753 ---- BindItem(bool (*f)(flext_base *,t_symbol *s,int,t_atom *,void *),pxbnd_object *px); virtual ~BindItem(); + void Unbind(const t_symbol *s); *************** *** 797,803 **** bool CallMeth(const MethItem &m,int argc,const t_atom *argv); bool FindMeth(int inlet,const t_symbol *s,int argc,const t_atom *argv); ! bool TryMethTag(ItemList &lst,const t_symbol *tag,int argc,const t_atom *argv); ! bool TryMethSym(ItemList &lst,const t_symbol *s); ! bool TryMethAny(ItemList &lst,const t_symbol *s,int argc,const t_atom *argv); mutable ItemCont *attrhead,*clattrhead; --- 812,818 ---- bool CallMeth(const MethItem &m,int argc,const t_atom *argv); bool FindMeth(int inlet,const t_symbol *s,int argc,const t_atom *argv); ! bool TryMethTag(Item *lst,const t_symbol *tag,int argc,const t_atom *argv); ! bool TryMethSym(Item *lst,const t_symbol *s); ! bool TryMethAny(Item *lst,const t_symbol *s,int argc,const t_atom *argv); mutable ItemCont *attrhead,*clattrhead; Index: flitem.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flitem.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** flitem.cpp 22 Feb 2004 03:34:00 -0000 1.10 --- flitem.cpp 6 Mar 2004 03:25:48 -0000 1.11 *************** *** 16,25 **** #include <string.h> void flext_base::ItemCont::Add(Item *item,const t_symbol *tag,int inlet) { ! FLEXT_ASSERT(inlet >= -1); ! if(!Contained(inlet)) resize(inlet+2); ItemSet &set = GetInlet(inlet); ! set[tag].push_back(item); members++; } --- 16,73 ---- #include <string.h> + + flext_base::Item::~Item() + { + if(nxt) delete nxt; + } + + flext_base::ItemSet::ItemSet() {} + + flext_base::ItemSet::~ItemSet() + { + for(iterator it = begin(); it != end(); ++it) + if(it.data()) delete it.data(); + } + + flext_base::ItemCont::ItemCont(): + memsize(0),size(0),members(0),cont(NULL) + {} + + flext_base::ItemCont::~ItemCont() + { + if(cont) { + for(int i = 0; i < size; ++i) delete cont[i]; + delete[] cont; + } + } + + void flext_base::ItemCont::Resize(int nsz) + { + if(nsz > memsize) { + int nmemsz = nsz+10; // increment maximum allocation size + ItemSet **ncont = new ItemSet *[nmemsz]; // make new array + if(cont) { + memcpy(ncont,cont,size*sizeof(*cont)); // copy existing entries + delete[] cont; + } + cont = ncont; // set current array + memsize = nmemsz; // set new allocation size + } + + // make new items + while(size < nsz) cont[size++] = new ItemSet; + } + void flext_base::ItemCont::Add(Item *item,const t_symbol *tag,int inlet) { ! if(!Contained(inlet)) Resize(inlet+2); ItemSet &set = GetInlet(inlet); ! Item *&lst = set[tag]; ! if(!lst) ! lst = item; ! else ! for(;;) ! if(!lst->nxt) { lst->nxt = item; break; } ! else lst = lst->nxt; members++; } *************** *** 27,40 **** bool flext_base::ItemCont::Remove(Item *item,const t_symbol *tag,int inlet) { - FLEXT_ASSERT(inlet >= -1); if(Contained(inlet)) { ItemSet &set = GetInlet(inlet); ItemSet::iterator it = set.find(tag); if(it != set.end()) { ! ItemList &lst = it->second; ! for(ItemList::iterator lit = lst.begin(); lit != lst.end(); ++lit) { ! if(*lit == item) { ! delete *lit; ! lst.erase(lit); return true; } --- 75,88 ---- bool flext_base::ItemCont::Remove(Item *item,const t_symbol *tag,int inlet) { if(Contained(inlet)) { ItemSet &set = GetInlet(inlet); ItemSet::iterator it = set.find(tag); if(it != set.end()) { ! for(Item *lit = it.data(),*prv = NULL; lit; prv = lit,lit = lit->nxt) { ! if(lit == item) { ! if(prv) prv->nxt = lit->nxt; ! else it.data() = lit->nxt; ! ! lit->nxt = NULL; delete lit; return true; } *************** *** 45,55 **** } ! flext_base::ItemList *flext_base::ItemCont::FindList(const t_symbol *tag,int inlet) { - FLEXT_ASSERT(inlet >= -1); if(Contained(inlet)) { ItemSet &ai = GetInlet(inlet); ItemSet::iterator as = ai.find(tag); ! if(as != ai.end()) return &as->second; } return NULL; --- 93,102 ---- } ! flext_base::Item *flext_base::ItemCont::FindList(const t_symbol *tag,int inlet) { if(Contained(inlet)) { ItemSet &ai = GetInlet(inlet); ItemSet::iterator as = ai.find(tag); ! if(as != ai.end()) return as.data(); } return NULL; *************** *** 58,69 **** // --- class item lists (methods and attributes) ---------------- ! typedef std::map<flext_base::t_classid,flext_base::ItemCont *> ClassMap; ! typedef std::vector<ClassMap> ClassArr; ! static ClassArr classarr; flext_base::ItemCont *flext_base::GetClassArr(t_classid c,int ix) { - if(ix >= (int)classarr.size()) classarr.resize(ix+1); ClassMap &map = classarr[ix]; ClassMap::iterator it = map.find(c); --- 105,114 ---- // --- class item lists (methods and attributes) ---------------- ! typedef DataMap<flext_base::t_classid,flext_base::ItemCont *> ClassMap; ! static ClassMap classarr[2]; flext_base::ItemCont *flext_base::GetClassArr(t_classid c,int ix) { ClassMap &map = classarr[ix]; ClassMap::iterator it = map.find(c); *************** *** 74,77 **** } else ! return it->second; } --- 119,122 ---- } else ! return it.data(); } Index: fllib.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/fllib.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** fllib.cpp 22 Feb 2004 03:34:00 -0000 1.21 --- fllib.cpp 6 Mar 2004 03:25:48 -0000 1.22 *************** *** 125,136 **** argc(0),argv(NULL) {} ! //! Store or retrieve registered classes static libclass *FindName(const t_symbol *s,libclass *o = NULL) { ! typedef std::map<const t_symbol *,libclass *> LibMap; ! ! static LibMap libnames; ! LibMap::iterator it = libnames.find(s); if(it == libnames.end()) { --- 125,138 ---- argc(0),argv(NULL) {} ! ! ! typedef DataMap<const t_symbol *,libclass *> LibMap; ! ! static LibMap libnames; ! //! Store or retrieve registered classes static libclass *FindName(const t_symbol *s,libclass *o = NULL) { ! // typedef std::map<const t_symbol *,libclass *> LibMap; LibMap::iterator it = libnames.find(s); if(it == libnames.end()) { *************** *** 139,143 **** } else ! return it->second; } --- 141,145 ---- } else ! return it.data(); } Index: flmeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmeth.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** flmeth.cpp 22 Feb 2004 03:34:00 -0000 1.8 --- flmeth.cpp 6 Mar 2004 03:25:48 -0000 1.9 *************** *** 94,98 **** void flext_base::ListMethods(AtomList &la,int inlet) const { ! typedef std::map<int,const t_symbol *> MethList; MethList list[2]; --- 94,98 ---- void flext_base::ListMethods(AtomList &la,int inlet) const { ! typedef DataMap<int,const t_symbol *> MethList; MethList list[2]; *************** *** 103,112 **** ItemSet &ai = a->GetInlet(inlet); for(ItemSet::iterator as = ai.begin(); as != ai.end(); ++as) { ! for(ItemList::iterator al = as->second.begin(); al != as->second.end(); ++al) { ! MethItem *aa = (MethItem *)*al; // check it's not related to an attribute if(!aa->IsAttr()) { ! list[i][aa->index] = as->first; break; } --- 103,112 ---- ItemSet &ai = a->GetInlet(inlet); for(ItemSet::iterator as = ai.begin(); as != ai.end(); ++as) { ! for(Item *al = as.data(); al; al = al->nxt) { ! MethItem *aa = (MethItem *)al; // check it's not related to an attribute if(!aa->IsAttr()) { ! list[i][aa->index] = as.key(); break; } *************** *** 121,125 **** for(i = 0; i <= 1; ++i) for(it = list[i].begin(); it != list[i].end(); ++it) ! SetSymbol(la[ix++],it->second); } --- 121,125 ---- for(i = 0; i <= 1; ++i) for(it = list[i].begin(); it != list[i].end(); ++it) ! SetSymbol(la[ix++],it.data()); } Index: flmsg.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmsg.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** flmsg.cpp 22 Feb 2004 03:34:00 -0000 1.10 --- flmsg.cpp 6 Mar 2004 03:25:48 -0000 1.11 *************** *** 73,80 **** } ! bool flext_base::TryMethTag(ItemList &lst,const t_symbol *tag,int argc,const t_atom *argv) { ! for(ItemList::iterator it = lst.begin(); it != lst.end(); ++it) { ! MethItem *m = (MethItem *)*it; // FLEXT_LOG3("found method tag %s: inlet=%i, argc=%i",GetString(tag),m->inlet,argc); --- 73,80 ---- } ! bool flext_base::TryMethTag(Item *lst,const t_symbol *tag,int argc,const t_atom *argv) { ! for(; lst; lst = lst->nxt) { ! MethItem *m = (MethItem *)lst; // FLEXT_LOG3("found method tag %s: inlet=%i, argc=%i",GetString(tag),m->inlet,argc); *************** *** 104,111 **** } ! bool flext_base::TryMethSym(ItemList &lst,const t_symbol *s) { ! for(ItemList::iterator it = lst.begin(); it != lst.end(); ++it) { ! MethItem *m = (MethItem *)*it; if(!m->IsAttr()) { --- 104,111 ---- } ! bool flext_base::TryMethSym(Item *lst,const t_symbol *s) { ! for(; lst; lst = lst->nxt) { ! MethItem *m = (MethItem *)lst; if(!m->IsAttr()) { *************** *** 119,126 **** } ! bool flext_base::TryMethAny(ItemList &lst,const t_symbol *s,int argc,const t_atom *argv) { ! for(ItemList::iterator it = lst.begin(); it != lst.end(); ++it) { ! MethItem *m = (MethItem *)*it; if(!m->IsAttr() && m->argc == 1 && m->args[0] == a_any) { --- 119,126 ---- } ! bool flext_base::TryMethAny(Item *lst,const t_symbol *s,int argc,const t_atom *argv) { ! for(; lst; lst = lst->nxt) { ! MethItem *m = (MethItem *)lst; if(!m->IsAttr() && m->argc == 1 && m->args[0] == a_any) { *************** *** 138,156 **** bool flext_base::FindMeth(int inlet,const t_symbol *s,int argc,const t_atom *argv) { ! ItemList *lst; // search for exactly matching tag ! if((lst = methhead->FindList(s,inlet)) != NULL && TryMethTag(*lst,s,argc,argv)) return true; ! if((lst = clmethhead->FindList(s,inlet)) != NULL && TryMethTag(*lst,s,argc,argv)) return true; // if no list args, then search for pure symbol if(!argc) { ! if((lst = methhead->FindList(sym_symbol,inlet)) != NULL && TryMethSym(*lst,s)) return true; ! if((lst = clmethhead->FindList(sym_symbol,inlet)) != NULL && TryMethSym(*lst,s)) return true; } // otherwise search for anything ! if((lst = methhead->FindList(sym_anything,inlet)) != NULL && TryMethAny(*lst,s,argc,argv)) return true; ! if((lst = clmethhead->FindList(sym_anything,inlet)) != NULL && TryMethAny(*lst,s,argc,argv)) return true; // if nothing found try any inlet --- 138,156 ---- bool flext_base::FindMeth(int inlet,const t_symbol *s,int argc,const t_atom *argv) { ! Item *lst; // search for exactly matching tag ! if((lst = methhead->FindList(s,inlet)) != NULL && TryMethTag(lst,s,argc,argv)) return true; ! if((lst = clmethhead->FindList(s,inlet)) != NULL && TryMethTag(lst,s,argc,argv)) return true; // if no list args, then search for pure symbol if(!argc) { ! if((lst = methhead->FindList(sym_symbol,inlet)) != NULL && TryMethSym(lst,s)) return true; ! if((lst = clmethhead->FindList(sym_symbol,inlet)) != NULL && TryMethSym(lst,s)) return true; } // otherwise search for anything ! if((lst = methhead->FindList(sym_anything,inlet)) != NULL && TryMethAny(lst,s,argc,argv)) return true; ! if((lst = clmethhead->FindList(sym_anything,inlet)) != NULL && TryMethAny(lst,s,argc,argv)) return true; // if nothing found try any inlet Index: flsupport.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** flsupport.cpp 22 Feb 2004 03:34:00 -0000 1.31 --- flsupport.cpp 6 Mar 2004 03:25:48 -0000 1.32 *************** *** 299,300 **** --- 299,306 ---- va_end(ap); } + + + AnyMap::AnyMap() {} + AnyMap::~AnyMap() {} + AnyMap::iterator AnyMap::find(unsigned int k) { return Parent::find(k); } + unsigned int &AnyMap::operator [](unsigned int k) { return Parent::operator [](k); } Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** flsupport.h 22 Feb 2004 03:34:00 -0000 1.64 --- flsupport.h 6 Mar 2004 03:25:48 -0000 1.65 *************** *** 18,21 **** --- 18,22 ---- #include "flstdc.h" #include <new> + #include <map> /*! \defgroup FLEXT_SUPPORT Flext support classes *************** *** 1147,1150 **** --- 1148,1195 ---- inline bool operator >=(const t_atom &a,const t_atom &b) { return FLEXT_CLASSDEF(flext)::CmpAtom(a,b) >= 0; } + + class AnyMap: + public std::map<unsigned int,unsigned int> + { + typedef std::map<unsigned int,unsigned int> Parent; + public: + AnyMap(); + ~AnyMap(); + iterator find(unsigned int k); + unsigned int &operator [](unsigned int k); + + typedef std::pair<unsigned int,unsigned int> pair; + }; + + template <class K,class T> + class DataMap: + public AnyMap + { + public: + class iterator: + public AnyMap::iterator + { + public: + iterator() {} + iterator(AnyMap::iterator it): AnyMap::iterator(it) {} + + inline K &key() const { return *(K *)&((*this)->first); } + inline T &data() const { return *(T *)&((*this)->second); } + }; + + class pair: + public AnyMap::pair + { + public: + inline K &key() const { return *(K *)&first; } + inline T &data() const { return *(T *)&second; } + }; + + inline iterator find(K k) { return AnyMap::find(*(unsigned int *)&k); } + inline T &operator [](K k) { return *(T *)&(AnyMap::operator [](*(unsigned int *)&k)); } + inline void erase(K k) { AnyMap::erase(*(unsigned int *)&k); } + }; + + //! @} // FLEXT_SUPPORT

1 0

externals/grill/flext changes.txt,1.37,1.38 flext.vcproj,1.25,1.26
by xovo＠users.sourceforge.net 06 Mar '04

06 Mar '04

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1597 Modified Files: changes.txt flext.vcproj Log Message: "" Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** changes.txt 22 Feb 2004 03:33:59 -0000 1.37 --- changes.txt 6 Mar 2004 03:25:47 -0000 1.38 *************** *** 16,24 **** 0.4.6: - added a text edit window for list attributes ! - finally use global allocator operators (MFC doesn't like but who cares) - fixed entry of local variables with attribute editor - help window for attribute editor - appended lacking ~ for tilde object help patches ! - STL containers for all kinds of attribute, method, class handling - support for MinGW --- 16,24 ---- 0.4.6: - added a text edit window for list attributes ! - finally use global allocator operators (MFC doesn't like it but who cares) - fixed entry of local variables with attribute editor - help window for attribute editor - appended lacking ~ for tilde object help patches ! - uniform STL container for all kinds of attribute, method, class handling - support for MinGW Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** flext.vcproj 22 Feb 2004 03:33:59 -0000 1.25 --- flext.vcproj 6 Mar 2004 03:25:47 -0000 1.26 *************** *** 177,180 **** --- 177,181 ---- AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS=2;FLEXT_USE_SIMD" + StringPooling="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" *************** *** 185,189 **** WarningLevel="3" SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" CompileAs="0"/> <Tool --- 186,190 ---- WarningLevel="3" SuppressStartupBanner="TRUE" ! DebugInformationFormat="3" CompileAs="0"/> <Tool

1 0

pd/src d_fft.c,1.1.1.1.16.1,1.1.1.1.16.2
by timblech＠users.sourceforge.net 05 Mar '04

05 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1688 Modified Files: Tag: devel_0_37 d_fft.c Log Message: fftw-interface changed from basic to guru Index: d_fft.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_fft.c,v retrieving revision 1.1.1.1.16.1 retrieving revision 1.1.1.1.16.2 diff -C2 -d -r1.1.1.1.16.1 -r1.1.1.1.16.2 *** d_fft.c 2 Mar 2004 11:04:50 -0000 1.1.1.1.16.1 --- d_fft.c 5 Mar 2004 21:19:37 -0000 1.1.1.1.16.2 *************** *** 270,276 **** fftwf_plan plan; t_int bins; ! fftwf_complex * incomplex; ! fftwf_complex * outcomplex; ! } t_sigfftw; --- 270,278 ---- fftwf_plan plan; t_int bins; ! fftwf_iodim dim; ! t_sample * inreal; ! t_sample * inimag; ! t_sample * outreal; ! t_sample * outimag; } t_sigfftw; *************** *** 285,293 **** //get ready for the default blocksize x->bins=64; ! x->incomplex = fftwf_malloc(sizeof(fftw_complex) * x->bins); ! x->outcomplex = fftwf_malloc(sizeof(fftw_complex) * x->bins); ! x->plan = fftwf_plan_dft_1d(x->bins,x->incomplex,x->outcomplex, ! FFTW_FORWARD,FFTW_MEASURE); ! return (x); } --- 287,300 ---- //get ready for the default blocksize x->bins=64; ! x->inreal = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->inimag = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outreal = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outimag = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->dim.n=64; ! x->dim.is=1; ! x->dim.os=1; ! x->plan = fftwf_plan_guru_split_dft(1, &(x->dim), 0, NULL, x->inreal, ! x->inimag, x->outreal, x->outimag, ! FFTW_MEASURE); return (x); } *************** *** 303,310 **** //get ready for the default blocksize x->bins=64; ! x->incomplex = fftwf_malloc(sizeof(fftw_complex) * x->bins); ! x->outcomplex = fftwf_malloc(sizeof(fftw_complex) * x->bins); ! x->plan = fftwf_plan_dft_1d(x->bins,x->incomplex,x->outcomplex, ! FFTW_BACKWARD,FFTW_MEASURE); return (x); } --- 310,323 ---- //get ready for the default blocksize x->bins=64; ! x->inreal = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->inimag = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outreal = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outimag = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->dim.n=64; ! x->dim.is=1; ! x->dim.os=1; ! x->plan = fftwf_plan_guru_split_dft(1, &(x->dim), 0, NULL, x->inimag, ! x->inreal, x->outimag, x->outreal, ! FFTW_MEASURE); return (x); } *************** *** 312,325 **** static void sigfftw_free(t_sigfftw * x) { ! fftwf_free(x->incomplex); ! fftwf_free(x->outcomplex); fftwf_destroy_plan(x->plan); - } static void sigifftw_free(t_sigfftw * x) { ! fftwf_free(x->incomplex); ! fftwf_free(x->outcomplex); fftwf_destroy_plan(x->plan); } --- 325,341 ---- static void sigfftw_free(t_sigfftw * x) { ! fftwf_free(x->inreal); ! fftwf_free(x->inimag); ! fftwf_free(x->outreal); ! fftwf_free(x->outimag); fftwf_destroy_plan(x->plan); } static void sigifftw_free(t_sigfftw * x) { ! fftwf_free(x->inreal); ! fftwf_free(x->inimag); ! fftwf_free(x->outreal); ! fftwf_free(x->outimag); fftwf_destroy_plan(x->plan); } *************** *** 337,370 **** { x->bins=n; ! //re-allocate fft buffers ! fftwf_free(x->incomplex); ! x->incomplex = fftwf_malloc(sizeof(fftwf_complex) * x->bins); ! fftwf_free(x->outcomplex); ! x->outcomplex = fftwf_malloc(sizeof(fftwf_complex) * x->bins); ! //set plan, this might take a few seconds //but you don't have to do that on the fly... fftwf_destroy_plan(x->plan); ! x->plan = fftwf_plan_dft_1d(x->bins,x->incomplex,x->outcomplex, ! FFTW_FORWARD,FFTW_MEASURE); ! } ! ! t_int i=n; ! while(i!=0) ! { ! --i; ! x->incomplex[i][0]=*(in1+i); ! x->incomplex[i][1]=*(in2+i); } - fftwf_execute(x->plan); ! i=n; ! while(i!=0) ! { ! --i; ! *(out1+i)=x->outcomplex[i][0]; ! *(out2+i)=x->outcomplex[i][1]; ! } return (w+7); --- 353,382 ---- { x->bins=n; ! x->dim.n=n; ! //re-allocate fft buffers ! fftwf_free(x->inreal); ! fftwf_free(x->inimag); ! fftwf_free(x->outreal); ! fftwf_free(x->outimag); ! x->inreal = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->inimag = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outreal = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outimag = fftwf_malloc(sizeof(t_sample) * x->bins); ! //set plan, this might take a few seconds //but you don't have to do that on the fly... fftwf_destroy_plan(x->plan); ! x->plan = fftwf_plan_guru_split_dft(1, &(x->dim), 0, NULL, x->inreal, ! x->inimag, x->outreal, x->outimag, ! FFTW_MEASURE); } ! //prepare, execute and output results ! memcpy(x->inreal,in1,(sizeof(t_sample) * x->bins)); ! memcpy(x->inimag,in2,(sizeof(t_sample) * x->bins)); ! fftwf_execute(x->plan); ! memcpy(out1,x->outreal,(sizeof(t_sample) * x->bins)); ! memcpy(out2,x->outimag,(sizeof(t_sample) * x->bins)); return (w+7); *************** *** 383,419 **** { x->bins=n; ! //re-allocate fft buffers ! fftwf_free(x->incomplex); ! x->incomplex = fftwf_malloc(sizeof(fftwf_complex) * x->bins); ! fftwf_free(x->outcomplex); ! x->outcomplex = fftwf_malloc(sizeof(fftwf_complex) * x->bins); ! //set plan, this might take a few seconds //but you don't have to do that on the fly... fftwf_destroy_plan(x->plan); ! x->plan = fftwf_plan_dft_1d(x->bins,x->incomplex,x->outcomplex, ! FFTW_BACKWARD,FFTW_MEASURE); ! } ! ! t_int i=n; ! while(i!=0) ! { ! --i; ! x->incomplex[i][0]=*(in1+i); ! x->incomplex[i][1]=*(in2+i); } - fftwf_execute(x->plan); ! i=n; ! while(i!=0) ! { ! --i; ! *(out1+i)=x->outcomplex[i][0]; ! *(out2+i)=x->outcomplex[i][1]; ! } return (w+7); - } --- 395,426 ---- { x->bins=n; ! x->dim.n=n; ! //re-allocate fft buffers ! fftwf_free(x->inreal); ! fftwf_free(x->inimag); ! fftwf_free(x->outreal); ! fftwf_free(x->outimag); ! x->inreal = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->inimag = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outreal = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outimag = fftwf_malloc(sizeof(t_sample) * x->bins); ! //set plan, this might take a few seconds //but you don't have to do that on the fly... fftwf_destroy_plan(x->plan); ! x->plan = fftwf_plan_guru_split_dft(1, &(x->dim), 0, NULL, x->inimag, ! x->inreal, x->outimag, x->outreal, ! FFTW_MEASURE); } ! //prepare, execute and output results ! memcpy(x->inreal,in1,(sizeof(t_sample) * x->bins)); ! memcpy(x->inimag,in2,(sizeof(t_sample) * x->bins)); ! fftwf_execute(x->plan); ! memcpy(out1,x->outreal,(sizeof(t_sample) * x->bins)); ! memcpy(out2,x->outimag,(sizeof(t_sample) * x->bins)); return (w+7); } *************** *** 454,457 **** --- 461,465 ---- gensym("dsp"), 0); class_sethelpsymbol(sigifftw_class, gensym("fft~")); + } *************** *** 463,475 **** typedef struct rfftw { ! t_object x_obj; //me ! ! fftwf_plan plan; //fftw plan ! t_int bins; //number of bins ! t_sample * infft; //array fftw is working on ! t_sample * outfft; //array fftw uses to output it's values ! float x_f; } t_sigrfftw; --- 471,483 ---- typedef struct rfftw { ! t_object x_obj; float x_f; + fftwf_plan plan; + t_int bins; + fftwf_iodim dim; + t_sample * infft; + t_sample * outreal; + t_sample * outimag; } t_sigrfftw; *************** *** 485,493 **** x->bins=64; x->infft = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outfft = fftwf_malloc(sizeof(t_sample) * x->bins); ! //it seems that the halfcomplex transformation is a bit faster ! x->plan = fftwf_plan_r2r_1d(x->bins,x->infft,x->outfft, ! FFTW_FORWARD,FFTW_MEASURE); ! return (x); } --- 493,504 ---- x->bins=64; x->infft = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outreal = fftwf_malloc(sizeof(t_sample) * (x->bins)/2); ! x->outimag = fftwf_malloc(sizeof(t_sample) * (x->bins)/2); ! x->dim.n=64; ! x->dim.is=1; ! x->dim.os=1; ! x->plan = fftwf_plan_guru_split_dft_r2c(1, &(x->dim), 0, NULL, x->infft, ! x->outreal, x->outimag, ! FFTW_MEASURE); return (x); } *************** *** 497,504 **** { fftwf_free(x->infft); ! fftwf_free(x->outfft); fftwf_destroy_plan(x->plan); } static t_int *sigrfftw_perform(t_int *w) { --- 508,526 ---- { fftwf_free(x->infft); ! fftwf_free(x->outreal); ! fftwf_free(x->outimag); fftwf_destroy_plan(x->plan); } + //we don't want to return the complex conjugated result of the fft + static void sigrfftw_invert(t_sample * s, t_int n) + { + while (n!=0) + { + --n; + s[n]=-s[n]; + } + } + static t_int *sigrfftw_perform(t_int *w) { *************** *** 512,539 **** { x->bins=n; //re-allocate fft buffers fftwf_free(x->infft); ! x->infft = fftwf_malloc(sizeof(float) * x->bins); ! fftwf_free(x->outfft); ! x->outfft = fftwf_malloc(sizeof(float) * x->bins); ! //set plan, this might take a few seconds //but you don't have to do that on the fly... fftwf_destroy_plan(x->plan); ! x->plan = fftwf_plan_r2r_1d(x->bins,x->infft,x->outfft, ! FFTW_FORWARD,FFTW_MEASURE); } memcpy(x->infft,in1,n*sizeof(t_sample)); fftwf_execute(x->plan); ! memcpy(out1,x->outfft,n/2*(sizeof(t_sample))); ! ! t_int i = n/2; ! while (i) ! { ! out2[i] = -(x->outfft[n-i]); ! --i; ! } return (w+6); } --- 534,562 ---- { x->bins=n; + x->dim.n=n; //re-allocate fft buffers fftwf_free(x->infft); ! fftwf_free(x->outreal); ! fftwf_free(x->outimag); ! x->infft = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->outreal = fftwf_malloc(sizeof(t_sample) * (x->bins)/2); ! x->outimag = fftwf_malloc(sizeof(t_sample) * (x->bins)/2); ! //set plan, this might take a few seconds //but you don't have to do that on the fly... fftwf_destroy_plan(x->plan); ! x->plan = fftwf_plan_guru_split_dft_r2c(1, &(x->dim), 0, NULL, ! x->infft, x->outreal, ! x->outimag, FFTW_MEASURE); } + //prepare, execute and output results memcpy(x->infft,in1,n*sizeof(t_sample)); fftwf_execute(x->plan); ! memcpy(out1,x->outreal,n/2*(sizeof(t_sample))); ! sigrfftw_invert(x->outimag,n/2); ! memcpy(out2,x->outimag,n/2*(sizeof(t_sample))); ! return (w+6); } *************** *** 576,591 **** typedef struct rifftw { ! t_object x_obj; //me ! ! fftwf_iodim iodim; ! fftwf_plan plan; //fftw plan ! t_int bins; //number of bins ! t_sample * infft; t_sample * inimag; t_sample * outfft; - - float x_f; - } t_sigrifftw; --- 599,611 ---- typedef struct rifftw { ! t_object x_obj; ! float x_f; ! fftwf_plan plan; ! t_int bins; ! fftwf_iodim dim; ! t_sample * inreal; t_sample * inimag; t_sample * outfft; } t_sigrifftw; *************** *** 600,613 **** //get ready for the default blocksize x->bins=64; ! x->infft = fftwf_malloc(sizeof(t_sample) * (x->bins)); ! //x->inimag = fftwf_malloc(sizeof(t_sample) * (x->bins)/2); x->outfft = fftwf_malloc(sizeof(t_sample) * x->bins); ! ! // x->iodim->1; ! ! x->plan = fftwf_plan_r2r_1d(x->bins,x->infft,x->outfft, ! FFTW_BACKWARD,FFTW_MEASURE); ! ! return (x); } --- 620,632 ---- //get ready for the default blocksize x->bins=64; ! x->inreal = fftwf_malloc(sizeof(t_sample) * (x->bins)/2); ! x->inimag = fftwf_malloc(sizeof(t_sample) * (x->bins)/2); x->outfft = fftwf_malloc(sizeof(t_sample) * x->bins); ! x->dim.n=64; ! x->dim.is=1; ! x->dim.os=1; ! x->plan = fftwf_plan_guru_split_dft_c2r(1, &(x->dim), 0, NULL, x->inreal, ! x->inimag, x->outfft, ! FFTW_MEASURE); return (x); } *************** *** 616,620 **** static void sigrifftw_free(t_sigrifftw *x) { ! fftwf_free(x->infft); fftwf_free(x->inimag); fftwf_free(x->outfft); --- 635,639 ---- static void sigrifftw_free(t_sigrifftw *x) { ! fftwf_free(x->inreal); fftwf_free(x->inimag); fftwf_free(x->outfft); *************** *** 633,663 **** { x->bins=n; ! //re-allocate fft buffers ! fftwf_free(x->infft); ! x->infft = fftwf_malloc(sizeof(float) * (x->bins)); ! //fftwf_free(x->inimag); ! //x->inimag = fftwf_malloc(sizeof(float) * (x->bins)/2); fftwf_free(x->outfft); ! x->outfft = fftwf_malloc(sizeof(float) * x->bins); //set plan, this might take a few seconds //but you don't have to do that on the fly... fftwf_destroy_plan(x->plan); ! x->plan = fftwf_plan_r2r_1d(x->bins,x->infft,x->outfft, ! FFTW_BACKWARD,FFTW_MEASURE); ! ! //x->plan = fftwf_plan_guru_split_dft_c2r(1,iodim ,x->bins,x->infft,x->outfft,FFTW_BACKWARD,FFTW_MEASURE); ! } ! ! memcpy(x->infft,in1,n/2*sizeof(t_sample)); ! ! t_int i = n/2; ! while (i!=n) ! { ! x->infft[i]=-in2[n-i]; ! ++i; } fftwf_execute(x->plan); memcpy(out1,x->outfft,n*(sizeof(t_sample))); --- 652,677 ---- { x->bins=n; ! x->dim.n=n; ! //re-allocate fft buffers ! fftwf_free(x->inreal); ! fftwf_free(x->inimag); fftwf_free(x->outfft); ! x->inreal = fftwf_malloc(sizeof(t_sample) * (x->bins)/2); ! x->inimag = fftwf_malloc(sizeof(t_sample) * (x->bins)/2); ! x->outfft = fftwf_malloc(sizeof(t_sample) * x->bins); //set plan, this might take a few seconds //but you don't have to do that on the fly... fftwf_destroy_plan(x->plan); ! x->plan = fftwf_plan_guru_split_dft_c2r(1, &(x->dim), 0, NULL, ! x->inreal, x->inimag, ! x->outfft, FFTW_MEASURE); } + //prepare, execute and output results + memcpy(x->inreal,in1,n/2*sizeof(t_sample)); + memcpy(x->inimag,in2,n/2*sizeof(t_sample)); + sigrfftw_invert(x->inimag,n/2); fftwf_execute(x->plan); memcpy(out1,x->outfft,n*(sizeof(t_sample))); *************** *** 681,685 **** else dsp_add(sigrifftw_perform,5,x,in1,in2,out1,n); - } --- 695,698 ----

1 0

pd/src s_path.c,1.1.1.2.2.2,1.1.1.2.2.3
by timblech＠users.sourceforge.net 05 Mar '04

05 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29992 Modified Files: Tag: devel_0_37 s_path.c Log Message: added feature of writing comments to the .pdrc file Index: s_path.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_path.c,v retrieving revision 1.1.1.2.2.2 retrieving revision 1.1.1.2.2.3 diff -C2 -d -r1.1.1.2.2.2 -r1.1.1.2.2.3 *** s_path.c 23 Sep 2003 00:58:23 -0000 1.1.1.2.2.2 --- s_path.c 5 Mar 2004 20:58:09 -0000 1.1.1.2.2.3 *************** *** 340,352 **** rcargv[0] = "."; /* this no longer matters to sys_argparse() */ ! for (i = 1; i < NUMARGS-1; i++) { ! if (fscanf(file, "%999s", buf) < 0) ! break; ! buf[1000] = 0; ! if (!(rcargv[i] = malloc(strlen(buf) + 1))) ! return (1); ! strcpy(rcargv[i], buf); } if (i >= NUMARGS-1) fprintf(stderr, "startup file too long; extra args dropped\n"); --- 340,372 ---- rcargv[0] = "."; /* this no longer matters to sys_argparse() */ ! //support for comments added by Tim Blechmann ! i=1; ! char c[MAXPDSTRING]; ! while ( (fgets(c,MAXPDSTRING,file)) != 0) { ! if ( c[strlen(c)-1] !='\n') ! { ! //it is unlikely that this is ever the case ! fprintf(stderr, "startup file contains a line that's too long\n"); ! while ( fgetc(file) != '\n'); ! } ! ! if (c[0] != '#') ! { ! while (sscanf(c,"%999s",buf) != EOF) ! { ! buf[1000] = 0; ! if (!(rcargv[i] = malloc(strlen(buf) + 1))) ! return (1); ! strcpy(rcargv[i], buf); ! strcpy(buf,c+strlen(buf)+1); ! strcpy(c,buf); ! ++i; ! } ! } } + //end of support for comments added by Tim Blechmann + + if (i >= NUMARGS-1) fprintf(stderr, "startup file too long; extra args dropped\n");

1 0

pd/src g_all_guis.c,1.1.1.4.2.4,1.1.1.4.2.4.2.1 g_all_guis.h,1.1.1.4.2.2,1.1.1.4.2.2.2.1 g_bang.c,1.1.1.3.2.2,1.1.1.3.2.2.2.1 g_canvas.c,1.1.1.4.2.7,1.1.1.4.2.7.2.1 g_editor.c,1.1.1.4.2.3,1.1.1.4.2.3.2.1 g_hdial.c,1.1.1.4.2.2,1.1.1.4.2.2.2.1 g_hslider.c,1.1.1.3.2.2,1.1.1.3.2.2.2.1 g_numbox.c,1.1.1.4.2.2,1.1.1.4.2.2.2.1 g_rtext.c,1.1.1.2.2.6,1.1.1.2.2.6.2.1 g_text.c,1.1.1.4.2.2,1.1.1.4.2.2.2.1 g_toggle.c,1.1.1.3.2.2,1.1.1.3.2.2.2.1 g_vdial.c,1.1.1.4.2.2,1.1.1.4.2.2.2.1 g_vslider.c,1.1.1.3.2.2,1.1.1.
by matju＠users.sourceforge.net 05 Mar '04

05 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11201 Modified Files: Tag: impd_0_37 g_all_guis.c g_all_guis.h g_bang.c g_canvas.c g_editor.c g_hdial.c g_hslider.c g_numbox.c g_rtext.c g_text.c g_toggle.c g_vdial.c g_vslider.c g_vumeter.c Log Message: initial attempt at MatjuGUI. ;-) Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4 retrieving revision 1.1.1.4.2.4.2.1 diff -C2 -d -r1.1.1.4.2.4 -r1.1.1.4.2.4.2.1 *** g_all_guis.c 14 Jan 2004 15:50:28 -0000 1.1.1.4.2.4 --- g_all_guis.c 5 Mar 2004 19:27:51 -0000 1.1.1.4.2.4.2.1 *************** *** 124,127 **** --- 124,145 ---- /*------------------ global functions -------------------------*/ + /*!@#$ should move that to Tcl */ + int pd_bluify(int colour) { + int r = (colour>>16) & 0xff; + int g = (colour>>8) & 0xff; + int b = (colour>>0) & 0xff; + r=(r*0xbb)>>8; + g=(g*0xe4)>>8; + return (r<<16)|(g<<8)|(b<<0); + } + + /*!@#$ should move that to Tcl */ + int pd_darker(int colour) { + int r = (colour>>16) & 0xff; + int g = (colour>>8) & 0xff; + int b = (colour>>0) & 0xff; + r=r*3/4; g=g*3/4; b=b*3/4; + return (r<<16)|(g<<8)|(b<<0); + } int iemgui_clip_size(int size) Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2 retrieving revision 1.1.1.4.2.2.2.1 diff -C2 -d -r1.1.1.4.2.2 -r1.1.1.4.2.2.2.1 *** g_all_guis.h 18 Nov 2003 10:34:10 -0000 1.1.1.4.2.2 --- g_all_guis.h 5 Mar 2004 19:27:51 -0000 1.1.1.4.2.2.2.1 *************** *** 279,282 **** --- 279,284 ---- extern char *iemgui_vu_scale_str[]; + EXTERN int pd_bluify(int colour); + EXTERN int pd_darker(int colour); EXTERN int iemgui_clip_size(int size); EXTERN int iemgui_clip_font(int size); Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.2.2.1 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.2.2.1 *** g_bang.c 18 Nov 2003 10:34:10 -0000 1.1.1.3.2.2 --- g_bang.c 5 Mar 2004 19:27:51 -0000 1.1.1.3.2.2.2.1 *************** *** 37,41 **** { sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", glist_getcanvas(glist), x, ! x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol); } } --- 37,41 ---- { sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", glist_getcanvas(glist), x, ! pd_bluify(x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol)); } } *************** *** 47,58 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -tags %xBASE\n", ! canvas, xpos, ypos, ! xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, ! x->x_gui.x_bcol, x); sys_vgui(".x%x.c create oval %d %d %d %d -fill #%6.6x -tags %xBUT\n", ! canvas, xpos+1, ypos+1, ! xpos + x->x_gui.x_w-1, ypos + x->x_gui.x_h-1, ! x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol, x); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", --- 47,57 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol); sys_vgui(".x%x.c create oval %d %d %d %d -fill #%6.6x -tags %xBUT\n", ! canvas, xpos+2, ypos+2, ! xpos + x->x_gui.x_w-2, ypos + x->x_gui.x_h-2, ! pd_bluify(x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol), x); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", *************** *** 61,73 **** strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, xpos, - ypos + x->x_gui.x_h-1, xpos + IOWIDTH, - ypos + x->x_gui.x_h, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, xpos, ypos, - xpos + IOWIDTH, ypos+1, x, 0); } --- 60,63 ---- *************** *** 78,100 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", ! canvas, x, xpos, ypos, ! xpos + x->x_gui.x_w, ypos + x->x_gui.x_h); sys_vgui(".x%x.c coords %xBUT %d %d %d %d\n", ! canvas, x, xpos+1,ypos+1, ! xpos + x->x_gui.x_w-1, ypos + x->x_gui.x_h-1); sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", canvas, x, ! x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol); sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", - canvas, x, 0, xpos, - ypos + x->x_gui.x_h-1, xpos + IOWIDTH, - ypos + x->x_gui.x_h); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", - canvas, x, 0, xpos, ypos, - xpos + IOWIDTH, ypos+1); } --- 68,81 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol); sys_vgui(".x%x.c coords %xBUT %d %d %d %d\n", ! canvas, x, xpos+2,ypos+2, ! xpos + x->x_gui.x_w-2, ypos + x->x_gui.x_h-2); sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", canvas, x, ! pd_bluify(x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol)); sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); } *************** *** 103,113 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c delete %xBASE\n", canvas, x); sys_vgui(".x%x.c delete %xBUT\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); } --- 84,90 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_erase .x%x.c %xBASE\n", canvas, x); sys_vgui(".x%x.c delete %xBUT\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } *************** *** 120,147 **** x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", canvas, x, ! x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol); ! } ! ! void bng_draw_io(t_bng* x, t_glist* glist, int old_snd_rcv_flags) ! { ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! t_canvas *canvas=glist_getcanvas(glist); ! ! if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", ! canvas, xpos, ! ypos + x->x_gui.x_h-1, xpos + IOWIDTH, ! ypos + x->x_gui.x_h, x, 0); ! if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able) ! sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); ! if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", ! canvas, xpos, ypos, ! xpos + IOWIDTH, ypos+1, x, 0); ! if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) ! sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); } --- 97,103 ---- x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, pd_bluify(x->x_gui.x_bcol)); sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", canvas, x, ! pd_bluify(x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol)); } *************** *** 166,183 **** void bng_draw(t_bng *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) ! bng_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) ! bng_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) ! bng_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) ! bng_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) ! bng_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) ! bng_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) ! bng_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } --- 122,132 ---- void bng_draw(t_bng *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) bng_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) bng_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) bng_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) bng_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) bng_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) bng_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) bng_draw_move(x, glist); } Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.1.1.4.2.7 retrieving revision 1.1.1.4.2.7.2.1 diff -C2 -d -r1.1.1.4.2.7 -r1.1.1.4.2.7.2.1 *** g_canvas.c 14 Jan 2004 15:50:28 -0000 1.1.1.4.2.7 --- g_canvas.c 5 Mar 2004 19:27:51 -0000 1.1.1.4.2.7.2.1 *************** *** 857,873 **** /* ----------------- lines ---------- */ ! static void canvas_drawlines(t_canvas *x) { t_linetraverser t; t_outconnect *oc; { linetraverser_start(&t, x); ! while (oc = linetraverser_next(&t)) ! sys_vgui(".x%x.c create line %d %d %d %d -width %d -tags l%x\n", ! glist_getcanvas(x), ! t.tr_lx1, t.tr_ly1, t.tr_lx2, t.tr_ly2, ! (outlet_getsymbol(t.tr_outlet) == &s_signal ? 2:1), ! oc); } } --- 857,874 ---- /* ----------------- lines ---------- */ ! #include<math.h> static void canvas_drawlines(t_canvas *x) { t_linetraverser t; t_outconnect *oc; + // fprintf(stderr,".x%x.c\n",glist_getcanvas(x)); { linetraverser_start(&t, x); ! while (oc = linetraverser_next(&t)) { ! int x1=t.tr_lx1, y1=t.tr_ly1; ! int x2=t.tr_lx2, y2=t.tr_ly2; ! sys_vgui("wire_draw .x%x.c l%x %d %d %d %d %d\n", ! glist_getcanvas(x), oc, (outlet_getsymbol(t.tr_outlet) == &s_signal ? 2:1), x1, y1, x2, y2); ! } } } *************** *** 881,889 **** while (oc = linetraverser_next(&t)) { ! if (t.tr_ob == text || t.tr_ob2 == text) ! { ! sys_vgui(".x%x.c coords l%x %d %d %d %d\n", ! glist_getcanvas(x), oc, ! t.tr_lx1, t.tr_ly1, t.tr_lx2, t.tr_ly2); } } --- 882,890 ---- while (oc = linetraverser_next(&t)) { ! if (t.tr_ob == text || t.tr_ob2 == text) { ! int x1=t.tr_lx1, y1=t.tr_ly1; ! int x2=t.tr_lx2, y2=t.tr_ly2; ! sys_vgui("wire_draw .x%x.c l%x %d %d %d %d %d\n", ! glist_getcanvas(x), oc, (outlet_getsymbol(t.tr_outlet) == &s_signal ? 2:1), x1, y1, x2, y2); } } *************** *** 902,907 **** if (x->gl_editor) { ! sys_vgui(".x%x.c delete l%x\n", ! glist_getcanvas(x), oc); } obj_disconnect(t.tr_ob, t.tr_outno, t.tr_ob2, t.tr_inno); --- 903,907 ---- if (x->gl_editor) { ! sys_vgui("wire_erase .x%x.c l%x\n", glist_getcanvas(x), oc); } obj_disconnect(t.tr_ob, t.tr_outno, t.tr_ob2, t.tr_inno); *************** *** 924,929 **** if (x->gl_editor) { ! sys_vgui(".x%x.c delete l%x\n", ! glist_getcanvas(x), oc); } obj_disconnect(t.tr_ob, t.tr_outno, t.tr_ob2, t.tr_inno); --- 924,928 ---- if (x->gl_editor) { ! sys_vgui("wire_erase .x%x.c l%x\n", glist_getcanvas(x), oc); } obj_disconnect(t.tr_ob, t.tr_outno, t.tr_ob2, t.tr_inno); *************** *** 1375,1378 **** --- 1374,1379 ---- extern void glist_scalar(t_glist *canvas, t_symbol *s, int argc, t_atom *argv); + void canvas_guiext(t_glist *gl, t_symbol *guiobjname, int argc, t_atom *argv); + void g_graph_setup(void); void g_editor_setup(void); *************** *** 1435,1439 **** class_addmethod(canvas_class, (t_method)canvas_numbox, gensym("numbox"), A_GIMME, A_NULL); ! /* ------------------------ gui stuff --------------------------- */ class_addmethod(canvas_class, (t_method)canvas_pop, gensym("pop"), --- 1436,1442 ---- class_addmethod(canvas_class, (t_method)canvas_numbox, gensym("numbox"), A_GIMME, A_NULL); ! class_addmethod(canvas_class, (t_method)canvas_guiext, gensym("guiext"), ! A_GIMME, A_NULL); ! /* ------------------------ gui stuff --------------------------- */ class_addmethod(canvas_class, (t_method)canvas_pop, gensym("pop"), *************** *** 1449,1452 **** --- 1452,1457 ---- class_addmethod(canvas_class, (t_method)canvas_map, gensym("map"), A_FLOAT, A_NULL); + // class_addmethod(canvas_class, (t_method)canvas_redraw, + // gensym("redraw"), A_NULL); class_setpropertiesfn(canvas_class, graph_properties); Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.1.1.4.2.3 retrieving revision 1.1.1.4.2.3.2.1 diff -C2 -d -r1.1.1.4.2.3 -r1.1.1.4.2.3.2.1 *** g_editor.c 25 Nov 2003 19:19:57 -0000 1.1.1.4.2.3 --- g_editor.c 5 Mar 2004 19:27:51 -0000 1.1.1.4.2.3.2.1 *************** *** 90,94 **** x->gl_editor->e_selectline_inno = inno; x->gl_editor->e_selectline_tag = oc; ! sys_vgui(".x%x.c itemconfigure l%x -fill blue\n", x, x->gl_editor->e_selectline_tag); } --- 90,94 ---- x->gl_editor->e_selectline_inno = inno; x->gl_editor->e_selectline_tag = oc; ! sys_vgui("wire_select .x%x.c l%x 1\n", x, x->gl_editor->e_selectline_tag); } *************** *** 100,105 **** { x->gl_editor->e_selectedline = 0; ! sys_vgui(".x%x.c itemconfigure l%x -fill black\n", ! x, x->gl_editor->e_selectline_tag); } } --- 100,104 ---- { x->gl_editor->e_selectedline = 0; ! sys_vgui("wire_select .x%x.c l%x 0\n", x, x->gl_editor->e_selectline_tag); } } *************** *** 1095,1101 **** x->gl_editor->e_ywas = ypos; sys_vgui( ! ".x%x.c create line %d %d %d %d -width %d -tags x\n", ! x, xpos, ypos, xpos, ypos, ! (issignal ? 2 : 1)); } else canvas_setcursor(x, CURSOR_EDITMODE_CONNECT); --- 1094,1099 ---- x->gl_editor->e_ywas = ypos; sys_vgui( ! "wire_draw .x%x.c x %d %d %d %d %d\n", ! x, (issignal ? 2 : 1), xpos, ypos, xpos, ypos); } else canvas_setcursor(x, CURSOR_EDITMODE_CONNECT); *************** *** 1229,1235 **** ywas = x->gl_editor->e_ywas; if (doit) sys_vgui(".x%x.c delete x\n", x); ! else sys_vgui(".x%x.c coords x %d %d %d %d\n", ! x, x->gl_editor->e_xwas, ! x->gl_editor->e_ywas, xpos, ypos); if ((y1 = canvas_findhitbox(x, xwas, ywas, &x11, &y11, &x12, &y12)) --- 1227,1232 ---- ywas = x->gl_editor->e_ywas; if (doit) sys_vgui(".x%x.c delete x\n", x); ! else sys_vgui("wire_draw .x%x.c x 1 %d %d %d %d\n", ! x, x->gl_editor->e_xwas, x->gl_editor->e_ywas, xpos, ypos); if ((y1 = canvas_findhitbox(x, xwas, ywas, &x11, &y11, &x12, &y12)) *************** *** 1293,1300 **** + IOMIDDLE; ly2 = y21; ! sys_vgui(".x%x.c create line %d %d %d %d -width %d -tags l%x\n", ! glist_getcanvas(x), ! lx1, ly1, lx2, ly2, ! (obj_issignaloutlet(ob1, closest1) ? 2 : 1), oc); canvas_setundo(x, canvas_undo_connect, canvas_undo_set_connect(x, --- 1290,1296 ---- + IOMIDDLE; ly2 = y21; ! sys_vgui("wire_draw .x%x.c l%x %d %d %d %d %d\n", ! glist_getcanvas(x), oc, (obj_issignaloutlet(ob1, closest1) ? 2 : 1), ! lx1, ly1, lx2, ly2); canvas_setundo(x, canvas_undo_connect, canvas_undo_set_connect(x, Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2 retrieving revision 1.1.1.4.2.2.2.1 diff -C2 -d -r1.1.1.4.2.2 -r1.1.1.4.2.2.2.1 *** g_hdial.c 18 Nov 2003 10:34:10 -0000 1.1.1.4.2.2 --- g_hdial.c 5 Mar 2004 19:27:51 -0000 1.1.1.4.2.2.2.1 *************** *** 55,74 **** int xx11b=text_xpix(&x->x_gui.x_obj, glist), xx11=xx11b, xx21=xx11b+s4; int xx22=xx11b+dx-s4; ! ! for(i=0; i<n; i++) ! { ! sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -tags %xBASE%d\n", ! canvas, xx11, yy11, xx11+dx, yy12, ! x->x_gui.x_bcol, x, i); ! sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xBUT%d\n", ! canvas, xx21, yy21, xx22, yy22, ! (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol, ! (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol, x, i); ! xx11 += dx; ! xx21 += dx; ! xx22 += dx; ! } ! sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", canvas, xx11b+x->x_gui.x_ldx, yy11+x->x_gui.x_ldy, --- 55,67 ---- int xx11b=text_xpix(&x->x_gui.x_obj, glist), xx11=xx11b, xx21=xx11b+s4; int xx22=xx11b+dx-s4; + int xpos=text_xpix(&x->x_gui.x_obj, glist); + int ypos=text_ypix(&x->x_gui.x_obj, glist); ! sys_vgui("radio_draw .x%x.c %xBASE %d %d %d %d %d %d 0 %d #%6.6x\n", ! canvas, x, xx11, yy11, xx11+dx*x->x_number, yy12, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, ! x->x_number,x->x_gui.x_bcol); ! sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); ! sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", canvas, xx11b+x->x_gui.x_ldx, yy11+x->x_gui.x_ldy, *************** *** 76,86 **** x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, xx11b, yy12-1, xx11b + IOWIDTH, yy12, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, xx11b, yy11, xx11b + IOWIDTH, yy11+1, x, 0); - } --- 69,72 ---- *************** *** 93,118 **** int xx11b=text_xpix(&x->x_gui.x_obj, glist), xx11=xx11b, xx21=xx11b+s4; int xx22=xx11b+dx-s4; xx11 = xx11b; xx21=xx11b+s4; xx22=xx11b+dx-s4; - for(i=0; i<n; i++) - { - sys_vgui(".x%x.c coords %xBASE%d %d %d %d %d\n", - canvas, x, i, xx11, yy11, xx11+dx, yy12); - sys_vgui(".x%x.c coords %xBUT%d %d %d %d %d\n", - canvas, x, i, xx21, yy21, xx22, yy22); - xx11 += dx; - xx21 += dx; - xx22 += dx; - } sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xx11b+x->x_gui.x_ldx, yy11+x->x_gui.x_ldy); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", - canvas, x, 0, xx11b, yy12-1, xx11b + IOWIDTH, yy12); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", - canvas, x, 0, xx11b, yy11, xx11b + IOWIDTH, yy11+1); } --- 79,94 ---- int xx11b=text_xpix(&x->x_gui.x_obj, glist), xx11=xx11b, xx21=xx11b+s4; int xx22=xx11b+dx-s4; + int xpos=text_xpix(&x->x_gui.x_obj, glist); + int ypos=text_ypix(&x->x_gui.x_obj, glist); + sys_vgui("radio_draw .x%x.c %xBASE %d %d %d %d %d %d 0 %d #%6.6x\n", + canvas, x, xx11, yy11, xx11+dx*x->x_number, yy12, + !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, + x->x_number,x->x_gui.x_bcol); xx11 = xx11b; xx21=xx11b+s4; xx22=xx11b+dx-s4; sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xx11b+x->x_gui.x_ldx, yy11+x->x_gui.x_ldy); } *************** *** 124,135 **** for(i=0; i<n; i++) { ! sys_vgui(".x%x.c delete %xBASE%d\n", canvas, x, i); sys_vgui(".x%x.c delete %xBUT%d\n", canvas, x, i); } sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); } --- 100,107 ---- for(i=0; i<n; i++) { ! sys_vgui("bluebox_erase .x%x.c %xBASE%d\n", canvas, x, i); sys_vgui(".x%x.c delete %xBUT%d\n", canvas, x, i); } sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } *************** *** 153,179 **** } - void hradio_draw_io(t_hradio* x, t_glist* glist, int old_snd_rcv_flags) - { - t_canvas *canvas=glist_getcanvas(glist); - int xpos=text_xpix(&x->x_gui.x_obj, glist); - int ypos=text_ypix(&x->x_gui.x_obj, glist); - - if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, - xpos, ypos + x->x_gui.x_w-1, - xpos + IOWIDTH, ypos + x->x_gui.x_w, - x, 0); - if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, - xpos, ypos, - xpos + IOWIDTH, ypos+1, x, 0); - if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); - } - void hradio_draw_select(t_hradio* x, t_glist* glist) { --- 125,128 ---- *************** *** 204,221 **** void hradio_draw(t_hradio *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) ! hradio_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) ! hradio_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) ! hradio_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) ! hradio_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) ! hradio_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) ! hradio_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) ! hradio_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } --- 153,163 ---- void hradio_draw(t_hradio *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) hradio_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) hradio_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) hradio_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) hradio_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) hradio_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) hradio_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) hradio_draw_move(x, glist); } Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.2.2.1 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.2.2.1 *** g_hslider.c 18 Nov 2003 10:34:10 -0000 1.1.1.3.2.2 --- g_hslider.c 5 Mar 2004 19:27:52 -0000 1.1.1.3.2.2.2.1 *************** *** 68,75 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -tags %xBASE\n", ! canvas, xpos-3, ypos, ! xpos + x->x_gui.x_w+2, ypos + x->x_gui.x_h, ! x->x_gui.x_bcol, x); sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xKNOB\n", canvas, r, ypos+1, r, --- 68,74 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xKNOB\n", canvas, r, ypos+1, r, *************** *** 81,92 **** strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, xpos-3, ypos + x->x_gui.x_h-1, - xpos+4, ypos + x->x_gui.x_h, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, xpos-3, ypos, - xpos+4, ypos+1, x, 0); } --- 80,83 ---- *************** *** 98,105 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", ! canvas, x, ! xpos-3, ypos, ! xpos + x->x_gui.x_w+2, ypos + x->x_gui.x_h); sys_vgui(".x%x.c coords %xKNOB %d %d %d %d\n", canvas, x, r, ypos+1, --- 89,95 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui(".x%x.c coords %xKNOB %d %d %d %d\n", canvas, x, r, ypos+1, *************** *** 107,120 **** sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", - canvas, x, 0, - xpos-3, ypos + x->x_gui.x_h-1, - xpos+4, ypos + x->x_gui.x_h); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", - canvas, x, 0, - xpos-3, ypos, - xpos+4, ypos+1); } --- 97,100 ---- *************** *** 123,133 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c delete %xBASE\n", canvas, x); sys_vgui(".x%x.c delete %xKNOB\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); } --- 103,109 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_erase .x%x.c %xBASE\n", canvas, x); sys_vgui(".x%x.c delete %xKNOB\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } *************** *** 141,165 **** strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); sys_vgui(".x%x.c itemconfigure %xKNOB -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); ! sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); ! } ! ! static void hslider_draw_io(t_hslider* x,t_glist* glist, int old_snd_rcv_flags) ! { ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! t_canvas *canvas=glist_getcanvas(glist); ! ! if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", ! canvas, xpos-3, ypos + x->x_gui.x_h-1, ! xpos+4, ypos + x->x_gui.x_h, x, 0); ! if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able) ! sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); ! if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", ! canvas, xpos-3, ypos, ! xpos+4, ypos+1, x, 0); ! if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) ! sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); } --- 117,121 ---- strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); sys_vgui(".x%x.c itemconfigure %xKNOB -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); ! sys_vgui("slider_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); } *************** *** 170,179 **** if(x->x_gui.x_fsf.x_selected) { ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); } else { ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); } --- 126,135 ---- if(x->x_gui.x_fsf.x_selected) { ! sys_vgui("slider_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); } else { ! sys_vgui("slider_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); } *************** *** 182,204 **** void hslider_draw(t_hslider *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) ! hslider_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) ! hslider_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) ! hslider_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) ! hslider_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) ! hslider_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) ! hslider_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) ! hslider_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } /* ------------------------ hsl widgetbehaviour----------------------------- */ - static void hslider_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) --- 138,152 ---- void hslider_draw(t_hslider *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) hslider_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) hslider_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) hslider_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) hslider_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) hslider_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) hslider_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) hslider_draw_move(x, glist); } /* ------------------------ hsl widgetbehaviour----------------------------- */ static void hslider_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2 retrieving revision 1.1.1.4.2.2.2.1 diff -C2 -d -r1.1.1.4.2.2 -r1.1.1.4.2.2.2.1 *** g_numbox.c 18 Nov 2003 10:34:10 -0000 1.1.1.4.2.2 --- g_numbox.c 5 Mar 2004 19:27:52 -0000 1.1.1.4.2.2.2.1 *************** *** 21,27 **** #endif - /*------------------ global varaibles -------------------------*/ - - /*------------------ global functions -------------------------*/ --- 21,24 ---- *************** *** 179,191 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui( ! ".x%x.c create polygon %d %d %d %d %d %d %d %d %d %d -outline #%6.6x \ ! -fill #%6.6x -tags %xBASE1\n", ! canvas, xpos, ypos, ! xpos + x->x_numwidth-4, ypos, ! xpos + x->x_numwidth, ypos+4, ! xpos + x->x_numwidth, ypos + x->x_gui.x_h, ! xpos, ypos + x->x_gui.x_h, ! IEM_GUI_COLOR_NORMAL, x->x_gui.x_bcol, x); sys_vgui( ".x%x.c create line %d %d %d %d %d %d -fill #%6.6x -tags %xBASE2\n", --- 176,183 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("numbox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_numwidth, ypos + x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, ! IEM_GUI_COLOR_NORMAL, x->x_gui.x_bcol); sys_vgui( ".x%x.c create line %d %d %d %d %d %d -fill #%6.6x -tags %xBASE2\n", *************** *** 204,219 **** canvas, xpos+half+2, ypos+half+d, x->x_buf, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fcol, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, - xpos, ypos + x->x_gui.x_h-1, - xpos+IOWIDTH, ypos + x->x_gui.x_h, - x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, - xpos, ypos, - xpos+IOWIDTH, ypos+1, - x, 0); } --- 196,199 ---- *************** *** 225,234 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c coords %xBASE1 %d %d %d %d %d %d %d %d %d %d\n", ! canvas, x, xpos, ypos, ! xpos + x->x_numwidth-4, ypos, ! xpos + x->x_numwidth, ypos+4, ! xpos + x->x_numwidth, ypos + x->x_gui.x_h, ! xpos, ypos + x->x_gui.x_h); sys_vgui(".x%x.c coords %xBASE2 %d %d %d %d %d %d\n", canvas, x, xpos, ypos, --- 205,212 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("numbox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_numwidth, ypos + x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, ! IEM_GUI_COLOR_NORMAL, x->x_gui.x_bcol); sys_vgui(".x%x.c coords %xBASE2 %d %d %d %d %d %d\n", canvas, x, xpos, ypos, *************** *** 239,252 **** sys_vgui(".x%x.c coords %xNUMBER %d %d\n", canvas, x, xpos+half+2, ypos+half+d); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", - canvas, x, 0, - xpos, ypos + x->x_gui.x_h-1, - xpos+IOWIDTH, ypos + x->x_gui.x_h); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", - canvas, x, 0, - xpos, ypos, - xpos+IOWIDTH, ypos+1); } --- 217,220 ---- *************** *** 255,266 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c delete %xBASE1\n", canvas, x); sys_vgui(".x%x.c delete %xBASE2\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); sys_vgui(".x%x.c delete %xNUMBER\n", canvas, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); } --- 223,230 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("numbox_erase .x%x.c %xBASE\n", canvas, x); sys_vgui(".x%x.c delete %xBASE2\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); sys_vgui(".x%x.c delete %xNUMBER\n", canvas, x); } *************** *** 276,280 **** canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol); ! sys_vgui(".x%x.c itemconfigure %xBASE1 -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); sys_vgui(".x%x.c itemconfigure %xBASE2 -fill #%6.6x\n", canvas, --- 240,244 ---- canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_fcol); ! sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); sys_vgui(".x%x.c itemconfigure %xBASE2 -fill #%6.6x\n", canvas, *************** *** 282,309 **** } - static void my_numbox_draw_io(t_my_numbox* x,t_glist* glist, int old_snd_rcv_flags) - { - int xpos=text_xpix(&x->x_gui.x_obj, glist); - int ypos=text_ypix(&x->x_gui.x_obj, glist); - t_canvas *canvas=glist_getcanvas(glist); - - if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, - xpos, ypos + x->x_gui.x_h-1, - xpos+IOWIDTH, ypos + x->x_gui.x_h, - x, 0); - if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, - xpos, ypos, - xpos+IOWIDTH, ypos+1, - x, 0); - if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); - } - static void my_numbox_draw_select(t_my_numbox *x, t_glist *glist) { --- 246,249 ---- *************** *** 319,323 **** (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); } ! sys_vgui(".x%x.c itemconfigure %xBASE1 -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); sys_vgui(".x%x.c itemconfigure %xBASE2 -fill #%6.6x\n", --- 259,263 ---- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); } ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); sys_vgui(".x%x.c itemconfigure %xBASE2 -fill #%6.6x\n", *************** *** 330,334 **** else { ! sys_vgui(".x%x.c itemconfigure %xBASE1 -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); sys_vgui(".x%x.c itemconfigure %xBASE2 -fill #%6.6x\n", --- 270,274 ---- else { ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); sys_vgui(".x%x.c itemconfigure %xBASE2 -fill #%6.6x\n", *************** *** 343,360 **** void my_numbox_draw(t_my_numbox *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) ! my_numbox_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) ! my_numbox_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) ! my_numbox_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) ! my_numbox_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) ! my_numbox_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) ! my_numbox_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) ! my_numbox_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } --- 283,293 ---- void my_numbox_draw(t_my_numbox *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) my_numbox_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) my_numbox_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) my_numbox_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) my_numbox_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) my_numbox_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) my_numbox_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) my_numbox_draw_move(x, glist); } *************** *** 407,435 **** if(x->x_lin0_log1) { ! if((min == 0.0)&&(max == 0.0)) ! max = 1.0; ! if(max > 0.0) ! { ! if(min <= 0.0) ! min = 0.01*max; ! } ! else ! { ! if(min > 0.0) ! max = 0.01*min; } } x->x_min = min; x->x_max = max; ! if(x->x_val < x->x_min) ! { ! x->x_val = x->x_min; ! ret = 1; ! } ! if(x->x_val > x->x_max) ! { ! x->x_val = x->x_max; ! ret = 1; ! } if(x->x_lin0_log1) x->x_k = exp(log(x->x_max/x->x_min)/(double)(x->x_log_height)); --- 340,354 ---- if(x->x_lin0_log1) { ! if((min == 0.0)&&(max == 0.0)) max = 1.0; ! if(max > 0.0) { ! if(min <= 0.0) min = 0.01*max; ! } else { ! if(min > 0.0) max = 0.01*min; } } x->x_min = min; x->x_max = max; ! if(x->x_val < x->x_min) { x->x_val = x->x_min; ret = 1; } ! if(x->x_val > x->x_max) { x->x_val = x->x_max; ret = 1; } if(x->x_lin0_log1) x->x_k = exp(log(x->x_max/x->x_min)/(double)(x->x_log_height)); Index: g_rtext.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v retrieving revision 1.1.1.2.2.6 retrieving revision 1.1.1.2.2.6.2.1 diff -C2 -d -r1.1.1.2.2.6 -r1.1.1.2.2.6.2.1 *** g_rtext.c 18 Nov 2003 10:34:10 -0000 1.1.1.2.2.6 --- g_rtext.c 5 Mar 2004 19:27:52 -0000 1.1.1.2.2.6.2.1 *************** *** 215,224 **** if (action == SEND_FIRST) ! sys_vgui("pdtk_text_new .x%x.c %s %f %f {%.*s} %d %s\n", canvas, x->x_tag, dispx + LMARGIN, dispy + TMARGIN, outchars, tempbuf, sys_hostfontsize(font), (glist_isselected(x->x_glist, ! &x->x_glist->gl_gobj)? "blue" : "black")); else if (action == SEND_UPDATE) { --- 215,224 ---- if (action == SEND_FIRST) ! sys_vgui("global look; pdtk_text_new .x%x.c %s %f %f {%.*s} %d %s\n", canvas, x->x_tag, dispx + LMARGIN, dispy + TMARGIN, outchars, tempbuf, sys_hostfontsize(font), (glist_isselected(x->x_glist, ! &x->x_glist->gl_gobj)? "$look(objectfgsel)" : "$look(objectfg)")); else if (action == SEND_UPDATE) { Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.1.1.4.2.2 retrieving revision 1.1.1.4.2.2.2.1 diff -C2 -d -r1.1.1.4.2.2 -r1.1.1.4.2.2.2.1 *** g_text.c 12 Sep 2003 20:55:31 -0000 1.1.1.4.2.2 --- g_text.c 5 Mar 2004 19:27:52 -0000 1.1.1.4.2.2.2.1 *************** *** 88,91 **** --- 88,92 ---- t_text *x; int argc; + int broken = 0; t_atom *argv; newest = 0; *************** *** 110,114 **** if (!x) { - /* LATER make the color reflect this */ x = (t_text *)pd_new(text_class); --- 111,114 ---- *************** *** 177,180 **** --- 177,187 ---- } + void canvas_guiext(t_glist *gl, t_symbol *guiobjname, int argc, t_atom *argv) + { + if (argc<1) {post("canvas_guiext: argc<1 -> SHOO"); return;} + if (argv[0].a_type!=A_SYMBOL) {post("canvas_guiext: arg is not a symbol"); return;} + canvas_iemguis(gl, atom_getsymbol(&argv[0])); + } + void canvas_bng(t_glist *gl, t_symbol *s, int argc, t_atom *argv) { *************** *** 744,753 **** int x1, y1; gatom_getwherelabel(x, glist, &x1, &y1); ! sys_vgui("pdtk_text_new .x%x.c %x.l %f %f {%s} %d %s\n", glist_getcanvas(glist), x, (double)x1, (double)y1, canvas_realizedollar(x->a_glist, x->a_label)->s_name, sys_hostfontsize(glist_getfont(glist)), ! "black"); } else sys_vgui(".x%x.c delete %x.l\n", glist_getcanvas(glist), x); --- 751,760 ---- int x1, y1; gatom_getwherelabel(x, glist, &x1, &y1); ! sys_vgui("global look; pdtk_text_new .x%x.c %x.l %f %f {%s} %d %s\n", glist_getcanvas(glist), x, (double)x1, (double)y1, canvas_realizedollar(x->a_glist, x->a_label)->s_name, sys_hostfontsize(glist_getfont(glist)), ! "$look(objectfg)"); } else sys_vgui(".x%x.c delete %x.l\n", glist_getcanvas(glist), x); *************** *** 865,868 **** --- 872,892 ---- /* -------------------- widget behavior for text objects ------------ */ + static const char *text_classname(t_text *x) { + switch (x->te_type) { + case T_TEXT: return "comment"; + case T_OBJECT: + /* if (x->te_g.g_pd==text_class && glist_findrtext(glist, x)->x_active) { */ + if (x->te_g.g_pd==text_class) { + return "brokenbox"; + } else { + return "objectbox"; + } + // case T_OBJECT: return "objectbox"; + case T_MESSAGE: return "message"; + case T_ATOM: return "atom"; + default: return "platypus"; /*???*/ + } + } + static void text_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) *************** *** 929,935 **** t_rtext *y = glist_findrtext(glist, x); rtext_select(y, state); ! if (glist_isvisible(glist) && text_shouldvis(x, glist)) ! sys_vgui(".x%x.c itemconfigure %sR -fill %s\n", glist, ! rtext_gettag(y), (state? "blue" : "black")); } --- 953,959 ---- t_rtext *y = glist_findrtext(glist, x); rtext_select(y, state); ! if (glist_isvisible(glist) && text_shouldvis(x, glist)) { ! sys_vgui("%s_select .x%x.c %sR %d\n", text_classname(x), glist, rtext_gettag(y), state); ! } } *************** *** 1107,1144 **** char *tag, int x1, int y1, int x2, int y2) { ! int n = obj_noutlets(ob), nplus = (n == 1 ? 1 : n-1), i; ! int width = x2 - x1; ! for (i = 0; i < n; i++) ! { ! int onset = x1 + (width - IOWIDTH) * i / nplus; ! if (firsttime) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %so%d\n", ! glist_getcanvas(glist), ! onset, y2 - 1, ! onset + IOWIDTH, y2, ! tag, i); ! else ! sys_vgui(".x%x.c coords %so%d %d %d %d %d\n", ! glist_getcanvas(glist), tag, i, ! onset, y2 - 1, ! onset + IOWIDTH, y2); ! } ! n = obj_ninlets(ob); ! nplus = (n == 1 ? 1 : n-1); ! for (i = 0; i < n; i++) ! { ! int onset = x1 + (width - IOWIDTH) * i / nplus; ! if (firsttime) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %si%d\n", ! glist_getcanvas(glist), ! onset, y1, ! onset + IOWIDTH, y1 + EXTRAPIX, ! tag, i); ! else ! sys_vgui(".x%x.c coords %si%d %d %d %d %d\n", ! glist_getcanvas(glist), tag, i, ! onset, y1, ! onset + IOWIDTH, y1 + EXTRAPIX); ! } } --- 1131,1137 ---- char *tag, int x1, int y1, int x2, int y2) { ! sys_vgui("io_draw .x%x.cBASE %s %d %d %d %d %d %d\n", ! glist_getcanvas(glist), tag, x1, y1, x2, y2, ! obj_ninlets(ob), obj_noutlets(ob)); } *************** *** 1151,1221 **** width = x2 - x1; height = y2 - y1; ! if (x->te_type == T_OBJECT) ! { ! if (firsttime) ! sys_vgui(".x%x.c create line\ ! %d %d %d %d %d %d %d %d %d %d -tags %sR\n", ! glist_getcanvas(glist), ! x1, y1, x2, y1, x2, y2, x1, y2, x1, y1, tag); ! else ! sys_vgui(".x%x.c coords %sR\ ! %d %d %d %d %d %d %d %d %d %d\n", ! glist_getcanvas(glist), tag, ! x1, y1, x2, y1, x2, y2, x1, y2, x1, y1); ! } ! else if (x->te_type == T_MESSAGE) ! { ! if (firsttime) ! sys_vgui(".x%x.c create line\ ! %d %d %d %d %d %d %d %d %d %d %d %d %d %d -tags %sR\n", ! glist_getcanvas(glist), ! x1, y1, x2+4, y1, x2, y1+4, x2, y2-4, x2+4, y2, ! x1, y2, x1, y1, ! tag); ! else ! sys_vgui(".x%x.c coords %sR\ ! %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n", ! glist_getcanvas(glist), tag, ! x1, y1, x2+4, y1, x2, y1+4, x2, y2-4, x2+4, y2, ! x1, y2, x1, y1); ! } ! else if (x->te_type == T_ATOM) ! { ! if (firsttime) ! sys_vgui(".x%x.c create line\ ! %d %d %d %d %d %d %d %d %d %d %d %d -tags %sR\n", ! glist_getcanvas(glist), ! x1, y1, x2-4, y1, x2, y1+4, x2, y2, x1, y2, x1, y1, ! tag); ! else ! sys_vgui(".x%x.c coords %sR\ ! %d %d %d %d %d %d %d %d %d %d %d %d\n", ! glist_getcanvas(glist), tag, ! x1, y1, x2-4, y1, x2, y1+4, x2, y2, x1, y2, x1, y1); ! } ! /* draw inlets/outlets */ ! ! if (ob = pd_checkobject(&x->te_pd)) ! glist_drawiofor(glist, ob, firsttime, tag, x1, y1, x2, y2); } void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag) { ! int i, n; ! n = obj_noutlets(ob); ! for (i = 0; i < n; i++) ! sys_vgui(".x%x.c delete %so%d\n", ! glist_getcanvas(glist), tag, i); ! n = obj_ninlets(ob); ! for (i = 0; i < n; i++) ! sys_vgui(".x%x.c delete %si%d\n", ! glist_getcanvas(glist), tag, i); } void text_eraseborder(t_text *x, t_glist *glist, char *tag) { ! if (x->te_type == T_TEXT) return; ! sys_vgui(".x%x.c delete %sR\n", ! glist_getcanvas(glist), tag); glist_eraseiofor(glist, x, tag); } --- 1144,1161 ---- width = x2 - x1; height = y2 - y1; ! ob = pd_checkobject(&x->te_pd); ! sys_vgui("%s_draw .x%x.c %sR %d %d %d %d %d %d\n", ! text_classname(x),glist,tag,x1,y1,x2,y2, ! ob?obj_ninlets(ob):0, ob?obj_noutlets(ob):0); } void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag) { ! sys_vgui("io_erase .x%x.c %sBASE\n",glist_getcanvas(glist),tag); } void text_eraseborder(t_text *x, t_glist *glist, char *tag) { ! sys_vgui("%s_erase .x%x.c %sR\n", text_classname(x), glist_getcanvas(glist), tag); glist_eraseiofor(glist, x, tag); } Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.2.2.1 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.2.2.1 *** g_toggle.c 18 Nov 2003 10:34:10 -0000 1.1.1.3.2.2 --- g_toggle.c 5 Mar 2004 19:27:52 -0000 1.1.1.3.2.2.2.1 *************** *** 37,43 **** sys_vgui(".x%x.c itemconfigure %xX1 -fill #%6.6x\n", canvas, x, ! (x->x_on!=0.0)?x->x_gui.x_fcol:x->x_gui.x_bcol); sys_vgui(".x%x.c itemconfigure %xX2 -fill #%6.6x\n", canvas, x, ! (x->x_on!=0.0)?x->x_gui.x_fcol:x->x_gui.x_bcol); } } --- 37,43 ---- sys_vgui(".x%x.c itemconfigure %xX1 -fill #%6.6x\n", canvas, x, ! (x->x_on!=0.0)?x->x_gui.x_fcol:pd_bluify(x->x_gui.x_bcol)); sys_vgui(".x%x.c itemconfigure %xX2 -fill #%6.6x\n", canvas, x, ! (x->x_on!=0.0)?x->x_gui.x_fcol:pd_bluify(x->x_gui.x_bcol)); } } *************** *** 47,64 **** t_canvas *canvas=glist_getcanvas(glist); int w=1, xx=text_xpix(&x->x_gui.x_obj, glist), yy=text_ypix(&x->x_gui.x_obj, glist); ! if(x->x_gui.x_w >= 30) w = 2; if(x->x_gui.x_w >= 60) w = 3; ! sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -tags %xBASE\n", ! canvas, xx, yy, xx + x->x_gui.x_w, yy + x->x_gui.x_h, ! x->x_gui.x_bcol, x); sys_vgui(".x%x.c create line %d %d %d %d -width %d -fill #%6.6x -tags %xX1\n", ! canvas, xx+w+1, yy+w+1, xx + x->x_gui.x_w-w, yy + x->x_gui.x_h-w, w, ! (x->x_on!=0.0)?x->x_gui.x_fcol:x->x_gui.x_bcol, x); sys_vgui(".x%x.c create line %d %d %d %d -width %d -fill #%6.6x -tags %xX2\n", ! canvas, xx+w+1, yy + x->x_gui.x_h-w-1, xx + x->x_gui.x_w-w, yy+w, w, ! (x->x_on!=0.0)?x->x_gui.x_fcol:x->x_gui.x_bcol, x); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", --- 47,64 ---- t_canvas *canvas=glist_getcanvas(glist); int w=1, xx=text_xpix(&x->x_gui.x_obj, glist), yy=text_ypix(&x->x_gui.x_obj, glist); ! int x1=xx,y1=yy,x2=xx+x->x_gui.x_w,y2=yy+x->x_gui.x_h; if(x->x_gui.x_w >= 30) w = 2; if(x->x_gui.x_w >= 60) w = 3; ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas,x, x1,y1,x2,y2, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui(".x%x.c create line %d %d %d %d -width %d -fill #%6.6x -tags %xX1\n", ! canvas, xx+w+3, yy+w+3, xx + x->x_gui.x_w-w-1, yy + x->x_gui.x_h-w-1, w, ! (x->x_on!=0.0)?x->x_gui.x_fcol:pd_bluify(x->x_gui.x_bcol), x); sys_vgui(".x%x.c create line %d %d %d %d -width %d -fill #%6.6x -tags %xX2\n", ! canvas, xx+w+3, yy + x->x_gui.x_h-w-2, xx + x->x_gui.x_w-w-1, yy+w+2, w, ! (x->x_on!=0.0)?x->x_gui.x_fcol:pd_bluify(x->x_gui.x_bcol), x); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", *************** *** 67,76 **** strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, xx, yy + x->x_gui.x_h-1, xx + IOWIDTH, yy + x->x_gui.x_h, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, xx, yy, xx + IOWIDTH, yy+1, x, 0); } --- 67,70 ---- *************** *** 79,82 **** --- 73,77 ---- t_canvas *canvas=glist_getcanvas(glist); int w=1, xx=text_xpix(&x->x_gui.x_obj, glist), yy=text_ypix(&x->x_gui.x_obj, glist); + int x1=xx,y1=yy,x2=xx+x->x_gui.x_w,y2=yy+x->x_gui.x_h; if(x->x_gui.x_w >= 30) *************** *** 85,90 **** if(x->x_gui.x_w >= 60) w = 3; ! sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", ! canvas, x, xx, yy, xx + x->x_gui.x_w, yy + x->x_gui.x_h); sys_vgui(".x%x.c itemconfigure %xX1 -width %d\n", canvas, x, w); sys_vgui(".x%x.c coords %xX1 %d %d %d %d\n", --- 80,86 ---- if(x->x_gui.x_w >= 60) w = 3; ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas,x, x1,y1,x2,y2, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui(".x%x.c itemconfigure %xX1 -width %d\n", canvas, x, w); sys_vgui(".x%x.c coords %xX1 %d %d %d %d\n", *************** *** 95,104 **** sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xx+x->x_gui.x_ldx, yy+x->x_gui.x_ldy); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", - canvas, x, 0, xx, yy + x->x_gui.x_h-1, xx + IOWIDTH, yy + x->x_gui.x_h); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", - canvas, x, 0, xx, yy, xx + IOWIDTH, yy+1); } --- 91,94 ---- *************** *** 107,118 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c delete %xBASE\n", canvas, x); sys_vgui(".x%x.c delete %xX1\n", canvas, x); sys_vgui(".x%x.c delete %xX2\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); } --- 97,104 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_erase .x%x.c %xBASE\n", canvas, x); sys_vgui(".x%x.c delete %xX1\n", canvas, x); sys_vgui(".x%x.c delete %xX2\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } Index: g_vdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vdial.c,v retrieving revision 1.1.1.4.2.2 retrieving revision 1.1.1.4.2.2.2.1 diff -C2 -d -r1.1.1.4.2.2 -r1.1.1.4.2.2.2.1 *** g_vdial.c 18 Nov 2003 10:34:10 -0000 1.1.1.4.2.2 --- g_vdial.c 5 Mar 2004 19:27:52 -0000 1.1.1.4.2.2.2.1 *************** *** 18,29 **** #include <math.h> - /*------------------ global variables -------------------------*/ - - - /*------------------ global functions -------------------------*/ - - - - /* ------------- vdl gui-vertical radio button ---------------------- */ --- 18,21 ---- *************** *** 57,66 **** int xx11=text_xpix(&x->x_gui.x_obj, glist), xx12=xx11+dy; int xx21=xx11+s4, xx22=xx12-s4; ! for(i=0; i<n; i++) { - sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -tags %xBASE%d\n", - canvas, xx11, yy11, xx12, yy12, - x->x_gui.x_bcol, x, i); sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xBUT%d\n", canvas, xx21, yy21, xx22, yy22, --- 49,63 ---- int xx11=text_xpix(&x->x_gui.x_obj, glist), xx12=xx11+dy; int xx21=xx11+s4, xx22=xx12-s4; + int xpos=text_xpix(&x->x_gui.x_obj, glist); + int ypos=text_ypix(&x->x_gui.x_obj, glist); ! sys_vgui("radio_draw .x%x.c %xBASE %d %d %d %d %d %d 0 %d #%6.6x\n", ! canvas, x, xx11, yy11, xx12, yy11+dy*x->x_number, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, ! x->x_number,x->x_gui.x_bcol); ! sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); ! /* ! for(i=0; i<n; i++) { sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xBUT%d\n", canvas, xx21, yy21, xx22, yy22, *************** *** 72,75 **** --- 69,74 ---- yy22 += dy; } + */ + //sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", *************** *** 78,87 **** x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, xx11, yy11-1, xx11 + IOWIDTH, yy11, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, xx11, yy11b, xx11 + IOWIDTH, yy11b+1, x, 0); } --- 77,80 ---- *************** *** 95,118 **** int xx11=text_xpix(&x->x_gui.x_obj, glist), xx12=xx11+dy; int xx21=xx11+s4, xx22=xx12-s4; ! for(i=0; i<n; i++) ! { ! sys_vgui(".x%x.c coords %xBASE%d %d %d %d %d\n", ! canvas, x, i, xx11, yy11, xx12, yy12); ! sys_vgui(".x%x.c coords %xBUT%d %d %d %d %d\n", ! canvas, x, i, xx21, yy21, xx22, yy22); ! yy11 += dy; ! yy12 += dy; ! yy21 += dy; ! yy22 += dy; ! } sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", - canvas, x, 0, xx11, yy11-1, xx11 + IOWIDTH, yy11); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", - canvas, x, 0, xx11, yy11b, xx11 + IOWIDTH, yy11b+1); } --- 88,101 ---- int xx11=text_xpix(&x->x_gui.x_obj, glist), xx12=xx11+dy; int xx21=xx11+s4, xx22=xx12-s4; + int xpos=text_xpix(&x->x_gui.x_obj, glist); + int ypos=text_ypix(&x->x_gui.x_obj, glist); ! sys_vgui("radio_draw .x%x.c %xBASE %d %d %d %d %d %d 0 %d #%6.6x\n", ! canvas, x, xx11, yy11, xx12, yy12+dy*x->x_number, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, ! x->x_number,x->x_gui.x_bcol); ! sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy); } *************** *** 124,135 **** for(i=0; i<n; i++) { ! sys_vgui(".x%x.c delete %xBASE%d\n", canvas, x, i); sys_vgui(".x%x.c delete %xBUT%d\n", canvas, x, i); } sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); } --- 107,114 ---- for(i=0; i<n; i++) { ! sys_vgui("bluebox_erase .x%x.c %xBASE%d\n", canvas, x, i); sys_vgui(".x%x.c delete %xBUT%d\n", canvas, x, i); } sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } *************** *** 153,179 **** } - void vradio_draw_io(t_vradio* x, t_glist* glist, int old_snd_rcv_flags) - { - t_canvas *canvas=glist_getcanvas(glist); - int xpos=text_xpix(&x->x_gui.x_obj, glist); - int ypos=text_ypix(&x->x_gui.x_obj, glist); - - if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, xpos, - ypos+(x->x_number*x->x_gui.x_h)-1, - xpos+ IOWIDTH, - ypos+(x->x_number*x->x_gui.x_h), x, 0); - if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, xpos, ypos, - xpos+ IOWIDTH, ypos+1, - x, 0); - if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); - } - void vradio_draw_select(t_vradio* x, t_glist* glist) { --- 132,135 ---- *************** *** 204,221 **** void vradio_draw(t_vradio *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) ! vradio_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) ! vradio_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) ! vradio_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) ! vradio_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) ! vradio_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) ! vradio_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) ! vradio_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } --- 160,170 ---- void vradio_draw(t_vradio *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) vradio_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) vradio_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) vradio_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) vradio_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) vradio_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) vradio_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) vradio_draw_move(x, glist); } Index: g_vslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.2.2.1 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.2.2.1 *** g_vslider.c 18 Nov 2003 10:34:10 -0000 1.1.1.3.2.2 --- g_vslider.c 5 Mar 2004 19:27:52 -0000 1.1.1.3.2.2.2.1 *************** *** 49,58 **** int ypos=text_ypix(&x->x_gui.x_obj, glist); int r = ypos + x->x_gui.x_h - (x->x_val + 50)/100; t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -tags %xBASE\n", ! canvas, xpos, ypos-2, ! xpos + x->x_gui.x_w, ypos + x->x_gui.x_h+3, ! x->x_gui.x_bcol, x); sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xKNOB\n", canvas, xpos+1, r, --- 49,59 ---- int ypos=text_ypix(&x->x_gui.x_obj, glist); int r = ypos + x->x_gui.x_h - (x->x_val + 50)/100; + int x1=xpos,y1=ypos,x2=xpos+x->x_gui.x_w, y2=ypos+x->x_gui.x_h+2; t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xKNOB\n", canvas, xpos+1, r, *************** *** 63,78 **** strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, - xpos, ypos + x->x_gui.x_h+2, - xpos+7, ypos + x->x_gui.x_h+3, - x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, - xpos, ypos-2, - xpos+7, ypos-1, - x, 0); } --- 64,67 ---- *************** *** 83,91 **** int r = ypos + x->x_gui.x_h - (x->x_val + 50)/100; t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n", ! canvas, x, ! xpos, ypos-2, ! xpos + x->x_gui.x_w, ypos + x->x_gui.x_h+3); sys_vgui(".x%x.c coords %xKNOB %d %d %d %d\n", canvas, x, xpos+1, r, --- 72,78 ---- int r = ypos + x->x_gui.x_h - (x->x_val + 50)/100; t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui(".x%x.c coords %xKNOB %d %d %d %d\n", canvas, x, xpos+1, r, *************** *** 93,106 **** sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", - canvas, x, 0, - xpos, ypos + x->x_gui.x_h+2, - xpos+7, ypos + x->x_gui.x_h+3); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", - canvas, x, 0, - xpos, ypos-2, - xpos+7, ypos-1); } --- 80,83 ---- *************** *** 109,119 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c delete %xBASE\n", canvas, x); sys_vgui(".x%x.c delete %xKNOB\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); - if(!x->x_gui.x_fsf.x_snd_able) - sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); - if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); } --- 86,92 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_erase .x%x.c %xBASE\n", canvas, x); sys_vgui(".x%x.c delete %xKNOB\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } *************** *** 121,124 **** --- 94,99 ---- { t_canvas *canvas=glist_getcanvas(glist); + int xpos=text_xpix(&x->x_gui.x_obj, glist); + int ypos=text_ypix(&x->x_gui.x_obj, glist); sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", *************** *** 128,157 **** sys_vgui(".x%x.c itemconfigure %xKNOB -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); ! sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, ! x, x->x_gui.x_bcol); ! } ! ! static void vslider_draw_io(t_vslider* x,t_glist* glist, int old_snd_rcv_flags) ! { ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! t_canvas *canvas=glist_getcanvas(glist); ! ! if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", ! canvas, ! xpos, ypos + x->x_gui.x_h+2, ! xpos+7, ypos + x->x_gui.x_h+3, ! x, 0); ! if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able) ! sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); ! if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", ! canvas, ! xpos, ypos-2, ! xpos+7, ypos-1, ! x, 0); ! if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) ! sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); } --- 103,109 ---- sys_vgui(".x%x.c itemconfigure %xKNOB -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); } *************** *** 174,191 **** void vslider_draw(t_vslider *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) ! vslider_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) ! vslider_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) ! vslider_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) ! vslider_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) ! vslider_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) ! vslider_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) ! vslider_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } --- 126,136 ---- void vslider_draw(t_vslider *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) vslider_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) vslider_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) vslider_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) vslider_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) vslider_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) vslider_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) vslider_draw_move(x, glist); } Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.2.2.1 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.2.2.1 *** g_vumeter.c 18 Nov 2003 10:34:10 -0000 1.1.1.3.2.2 --- g_vumeter.c 5 Mar 2004 19:27:52 -0000 1.1.1.3.2.2.2.1 *************** *** 126,155 **** strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); ! if(!x->x_gui.x_fsf.x_snd_able) ! { ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", ! canvas, ! xpos-1, ypos + x->x_gui.x_h+1, ! xpos + IOWIDTH-1, ypos + x->x_gui.x_h+2, ! x, 0); ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", ! canvas, ! xpos+x->x_gui.x_w+1-IOWIDTH, ypos + x->x_gui.x_h+1, ! xpos+x->x_gui.x_w+1, ypos + x->x_gui.x_h+2, ! x, 1); ! } ! if(!x->x_gui.x_fsf.x_rcv_able) ! { ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", ! canvas, ! xpos-1, ypos-2, ! xpos + IOWIDTH-1, ypos-1, ! x, 0); ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", ! canvas, ! xpos+x->x_gui.x_w+1-IOWIDTH, ypos-2, ! xpos+x->x_gui.x_w+1, ypos-1, ! x, 1); ! } } --- 126,132 ---- strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); ! sys_vgui("io_draw .x%x.c %x %d %d %d %d %d %d\n", ! canvas, x, xpos-1, ypos-2, xpos+x->x_gui.x_w+1, ypos+x->x_gui.x_h+2, ! 2*!x->x_gui.x_fsf.x_rcv_able, 2*!x->x_gui.x_fsf.x_snd_able); } *************** *** 191,216 **** canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); ! if(!x->x_gui.x_fsf.x_snd_able) ! { ! sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", ! canvas, x, 0, ! xpos-1, ypos + x->x_gui.x_h+1, ! xpos + IOWIDTH-1, ypos + x->x_gui.x_h+2); ! sys_vgui(".x%x.c coords %xOUT%d %d %d %d %d\n", ! canvas, x, 1, ! xpos+x->x_gui.x_w+1-IOWIDTH, ypos + x->x_gui.x_h+1, ! xpos+x->x_gui.x_w+1, ypos + x->x_gui.x_h+2); ! } ! if(!x->x_gui.x_fsf.x_rcv_able) ! { ! sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", ! canvas, x, 0, ! xpos-1, ypos-2, ! xpos + IOWIDTH-1, ypos-1); ! sys_vgui(".x%x.c coords %xIN%d %d %d %d %d\n", ! canvas, x, 1, ! xpos+x->x_gui.x_w+1-IOWIDTH, ypos-2, ! xpos+x->x_gui.x_w+1, ypos-1); ! } } --- 168,174 ---- canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); ! sys_vgui("io_draw .x%x.c %x %d %d %d %d %d %d\n", ! canvas, x, xpos-1, ypos-2, xpos+x->x_gui.x_w+1, ypos+x->x_gui.x_h+2, ! 2*!x->x_gui.x_fsf.x_rcv_able, 2*!x->x_gui.x_fsf.x_snd_able); }

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.9,1.1.1.4.2.7.4.10
by matju＠users.sourceforge.net 05 Mar '04

05 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6182 Modified Files: Tag: impd_0_37 u_main.tk Log Message: a beginning of global color configuration (for use by upcoming commits) Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.9 retrieving revision 1.1.1.4.2.7.4.10 diff -C2 -d -r1.1.1.4.2.7.4.9 -r1.1.1.4.2.7.4.10 *** u_main.tk 5 Mar 2004 05:25:03 -0000 1.1.1.4.2.7.4.9 --- u_main.tk 5 Mar 2004 19:02:10 -0000 1.1.1.4.2.7.4.10 *************** *** 2633,2644 **** #####################iemlib####################### proc pdtk_canvas_editval {name value} { if {$value} { $name.m.edit entryconfigure "Edit mode" -indicatoron true catch {$name.bbar.edit configure -image icon_mode_edit} ! $name.c configure -background #dddddd } else { $name.m.edit entryconfigure "Edit mode" -indicatoron false catch {$name.bbar.edit configure -image icon_mode_run} ! $name.c configure -background #ffffff } } --- 2633,2645 ---- #####################iemlib####################### proc pdtk_canvas_editval {name value} { + global look if {$value} { $name.m.edit entryconfigure "Edit mode" -indicatoron true catch {$name.bbar.edit configure -image icon_mode_edit} ! $name.c configure -background $look(canvasbgedit) } else { $name.m.edit entryconfigure "Edit mode" -indicatoron false catch {$name.bbar.edit configure -image icon_mode_run} ! $name.c configure -background $look(canvasbgrun) } } *************** *** 3591,3593 **** --- 3592,3617 ---- source $pd_guidir/bin/u_object.tk + # theme: + if {1} { + set look(objectfg) #000000 + set look(objectbg) #ffffff + set look(objectframe1) #99cccc + set look(objectframe2) #668888 + set look(objectframe3) #000000 + set look(objectframe4) #0000ff + set look(canvasbgrun) #ffffff + set look(canvasbgedit) #dddddd + set look(wirefg) #888888 + } { + set look(objectfg) #ffffff + set look(objectbg) #888888 + set look(objectframe1) #008888 + set look(objectframe2) #005555 + set look(objectframe3) #000000 + set look(objectframe4) #0000ff + set look(canvasbgrun) #000000 + set look(canvasbgedit) #500030 + set look(wirefg) #88cccc + } + raise .

1 0

pd/src u_object.tk,1.1.2.1,1.1.2.2
by matju＠users.sourceforge.net 05 Mar '04

05 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5696 Modified Files: Tag: impd_0_37 u_object.tk Log Message: this part gets used by the upcoming rewritten Pd widgets Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** u_object.tk 22 Feb 2004 22:15:05 -0000 1.1.2.1 --- u_object.tk 5 Mar 2004 18:59:50 -0000 1.1.2.2 *************** *** 0 **** --- 1,242 ---- + ############ colouring + + proc bluify {colour} { + scan $colour #%02x%02x%02x r g b + set r [expr ($r*0xbb)>>8] + set g [expr ($g*0xe4)>>8] + return [format #%02x%02x%02x $r $g $b] + } + + proc darker {colour} { + scan $colour #%02x%02x%02x r g b + set r [expr $r*3/4] + set g [expr $g*3/4] + set b [expr $b*3/4] + return [format #%02x%02x%02x $r $g $b] + } + + ############ rendering + + # modes: + # 0: creation + # 1: resize (or move) + + proc wire_draw {canvas tag thick x1 y1 x2 y2} { + global look + set xys [list $x1 $y1 $x2 $y2] + if {[llength [$canvas gettags $tag]] != 0} { + eval "$canvas coords $tag $xys" + } { + eval "$canvas create line $xys -tags $tag -width $thick \ + -arrow last -fill $look(wirefg) -smooth yes" + } + } + + proc wire_select {canvas tag flag} { + if {$flag} {set colour #0000ff} {set colour #8888cc} + $canvas itemconfigure $tag -fill $colour + } + + proc wire_erase {canvas tag} { + $canvas delete $tag + } + + #ifdef MACOSX + #set look(extrapix) 2 + #else + set look(extrapix) 1 + #endif + + set look(iowidth) 7 + set look(iopos) 1 + + proc io_draw {canvas tag x1 y1 x2 y2 ins outs} { + global look + set width [expr $x2 - $x1] + set fx $look(iopos) + set fy $look(iopos) + set nplus [expr $ins == 1 ? 1 : $ins-1] + for {set i 0} {$i<$ins} {incr i} { + set onset [expr $x1 + ($width - $look(iowidth)) * $i / $nplus] + set points [list [expr $onset+$fx] [expr $y1-$fy] \ + [expr $onset-$fx+$look(iowidth)] [expr $y1-$fy+$look(extrapix)]] + if {[llength [$canvas gettags ${tag}i$i]] != 0} { + eval "$canvas coords ${tag}i$i $points" + } { + eval "$canvas create rectangle $points -tags {${tag}i ${tag}i$i} -outline red" + } + } + set nplus [expr $outs == 1 ? 1 : $outs-1] + for {set i 0} {$i<$outs} {incr i} { + set onset [expr $x1 + ($width - $look(iowidth)) * $i / $nplus] + set points [list [expr $onset+$fx] [expr $y2-1+$fy] \ + [expr $onset-$fx+$look(iowidth)] [expr $y2+$fy]] + if {[llength [$canvas gettags ${tag}o$i]] != 0} { + eval "$canvas coords ${tag}o$i $points" + } { + eval "$canvas create rectangle $points -tags {${tag}o ${tag}o$i} -outline red" + } + } + } + + proc io_erase {canvas tag} { + $canvas delete ${tag}i + $canvas delete ${tag}o + } + + proc objectbox_draw {canvas tag x1 y1 x2 y2 ins outs} { + global look + set xya [list $x1 $y1 $x2 $y2] + set xyb [list [expr $x2-1] [expr $y1+1] [expr $x1+1] [expr $y1+1] [expr $x1+1] [expr $y2-1]] + set xyc [list [expr $x2-1] [expr $y1+1] [expr $x2-1] [expr $y2-1] [expr $x1+1] [expr $y2-1]] + set xyd [list [expr $x1+4] [expr $y1+4] [expr $x2+4] [expr $y2+4]] + if {[llength [$canvas gettags $tag]] != 0} { + eval "$canvas coords ${tag} $xya" + eval "$canvas coords ${tag}+ $xyb" + eval "$canvas coords ${tag}++ $xyc" + } { + eval "$canvas create rectangle $xya -tag ${tag} -fill ${look(objectbg)}" + eval "$canvas create line $xyb -tag ${tag}+ -fill ${look(objectframe1)}" + eval "$canvas create line $xyc -tag ${tag}++ -fill ${look(objectframe2)}" + } + io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs + } + + proc objectbox_select {canvas tag flag} { + global look + if {$flag} {set colour $look(objectframe4)} {set colour $look(objectframe3)} + $canvas itemconfigure $tag -outline $colour + } + + proc objectbox_erase {canvas tag} { + $canvas delete $tag $tag+ $tag++ + io_erase $canvas $tag + } + + proc brokenbox_draw {canvas tag x1 y1 x2 y2 ins outs} { + objectbox_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs + $canvas itemconfigure ${tag}.l -fill #ffcccc + } + + proc brokenbox_select {canvas tag flag} {objectbox_select $canvas $tag $flag} + proc brokenbox_erase {canvas tag} {objectbox_erase $canvas $tag} + + proc message_draw {canvas tag x1 y1 x2 y2 ins outs} { + global look + set points [list $x1 $y1 [expr $x2+4] $y1 $x2 [expr $y1+4] $x2 [expr $y2-4] \ + [expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2] + if {[llength [$canvas gettags $tag]] != 0} { + eval "$canvas coords ${tag} $points" + } { + eval "$canvas create polygon $points -tag ${tag} -fill $look(objectbg) -outline $look(objectframe3)" + } + io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs + } + + proc message_select {canvas tag flag} { + global look + if {$flag} {set colour $look(objectframe4)} {set colour $look(objectframe3)} + $canvas itemconfigure $tag -outline $colour + } + + proc message_erase {canvas tag} { + $canvas delete $tag + io_erase $canvas $tag + } + + #proc message_click {canvas tag} {} + #proc message_tick {canvas tag} {} + + proc atom_draw {canvas tag x1 y1 x2 y2 ins outs} { + global look + set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] + if {[llength [$canvas gettags $tag]] != 0} { + eval "$canvas coords ${tag} $points" + } { + eval "$canvas create polygon $points -tag ${tag} -fill $look(objectbg) -outline $look(objectframe3)" + } + io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs + } + + proc atom_select {canvas tag flag} { + if {$flag} {set colour #0000ff} {set colour #000000} + $canvas itemconfigure $tag -outline $colour + } + + proc atom_erase {canvas tag} { + $canvas delete $tag + io_erase $canvas $tag + } + + proc comment_draw {canvas tag x1 y1 x2 y2 ins outs} { + if {[llength [$canvas gettags $tag]] != 0} {} + } + proc comment_select {canvas tag flag} {} + proc comment_erase {canvas tag} {} + + proc bluebox_draw {canvas tag x1 y1 x2 y2 ins outs colour} { + set xya [list $x1 $y1 $x2 $y2] + set xyb [list [expr $x2-1] [expr $y1+1] [expr $x1+1] [expr $y1+1] [expr $x1+1] [expr $y2-1]] + set xyc [list [expr $x2-1] [expr $y1+1] [expr $x2-1] [expr $y2-1] [expr $x1+1] [expr $y2-1]] + if {[llength [$canvas gettags $tag]] != 0} { + eval "$canvas coords ${tag} $xya" + eval "$canvas coords ${tag}+ $xyb" + eval "$canvas coords ${tag}++ $xyc" + } { + set color [bluify #ffffff] + eval "$canvas create rectangle $xya -tag ${tag} -fill $color" + eval "$canvas create line $xyb -tag ${tag}+ -fill #ffffff" + eval "$canvas create line $xyc -tag ${tag}++ -fill [darker $color]" + } + io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs + } + + proc bluebox_select {canvas tag flag} { + if {$flag} {set colour #0000ff} {set colour #000000} + $canvas itemconfigure $tag -outline $colour + } + + proc bluebox_erase {canvas tag} { + $canvas delete $tag $tag+ $tag++ + io_erase $canvas $tag + } + + proc slider_select {canvas tag flag} { + if {$flag} {set colour #0000ff} {set colour #000000} + $canvas itemconfigure $tag -outline $colour + } + + proc numbox_draw {canvas tag x1 y1 x2 y2 ins outs color1 color2} { + atom_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs + } + + proc numbox_erase {canvas tag} { + atom_erase $canvas $tag + io_erase $canvas $tag + } + + proc radio_draw {canvas tag x1 y1 x2 y2 ins outs orient number colour} { + set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] + bluebox_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs $colour + if {$orient} {set size [expr $y2-$y1]} {set size [expr $x2-$x1]} + set size [expr $size/$number] + for {set i 0} {$i<$number} {incr i} { + if {$isnew} { + $canvas create rectangle \ + [expr $x1+3] [expr $y1+3] \ + [expr $x1+$size-3] [expr $y1+$size-3] \ + -fill #ffffff -outline #000000 -tags "${tag}BUT ${tag}BUT$i" + } else { + $canvas coords ${tag}BUT$i \ + [expr $x1+3] [expr $y1+3] \ + [expr $x1+$size-3] [expr $y1+$size-3] + } + if {$orient} {set y1 [expr $y1+$size]} {set x1 [expr $x1+$size]} + } + } + + proc radio_set {canvas tag value} { + post_to_gui "radio_set: $value\n" + $canvas itemconfigure ${tag}BUT -fill #ffffff + $canvas itemconfigure ${tag}BUT$value -fill #000000 + }

1 0

pd/src ChangeLog,1.1.2.2,1.1.2.3 x_misc.c,1.1.1.2,1.1.1.2.4.1
by matju＠users.sourceforge.net 05 Mar '04

05 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32216 Modified Files: Tag: impd_0_37 ChangeLog x_misc.c Log Message: . Index: ChangeLog =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/ChangeLog,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** ChangeLog 5 Mar 2004 05:31:48 -0000 1.1.2.2 --- ChangeLog 5 Mar 2004 18:33:47 -0000 1.1.2.3 *************** *** 1,3 **** ! Impd 0.37.A : * forked from devel_0_37, 2004.02.21 --- 1,3 ---- ! Impd 0.37.A (-r impd_0_37_A) : * forked from devel_0_37, 2004.02.21 *************** *** 15,18 **** --- 15,21 ---- * statusbar shows cursor position (enable with -statusbar) + Impd 0.37.A.2 (-r impd_0_37_A_2) : + * merged GG's reverting of "quote hack" + Impd 0.37.B : Index: x_misc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_misc.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.4.1 diff -C2 -d -r1.1.1.2 -r1.1.1.2.4.1 *** x_misc.c 9 May 2003 16:03:45 -0000 1.1.1.2 --- x_misc.c 5 Mar 2004 18:33:47 -0000 1.1.1.2.4.1 *************** *** 15,18 **** --- 15,19 ---- #include <sys/times.h> #include <sys/param.h> + #include <unistd.h> #endif #ifdef MSW

1 0

pd/src m_binbuf.c,1.1.1.4.2.4,1.1.1.4.2.4.2.1
by matju＠users.sourceforge.net 05 Mar '04

05 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30915 Modified Files: Tag: impd_0_37 m_binbuf.c Log Message: merging GG's removal of quote hack Index: m_binbuf.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v retrieving revision 1.1.1.4.2.4 retrieving revision 1.1.1.4.2.4.2.1 diff -C2 -d -r1.1.1.4.2.4 -r1.1.1.4.2.4.2.1 *** m_binbuf.c 18 Nov 2003 10:34:10 -0000 1.1.1.4.2.4 --- m_binbuf.c 5 Mar 2004 18:28:42 -0000 1.1.1.4.2.4.2.1 *************** *** 66,70 **** t_atom *ap; int nalloc = 16, natom = 0; ! int escape = 0; /* GG: escape mechanism */ t_freebytes(x->b_vec, x->b_n * sizeof(*x->b_vec)); --- 66,73 ---- t_atom *ap; int nalloc = 16, natom = 0; ! ! #ifdef GG_ESCAPE_HACK ! int escape = 0; /* GG: escape mechanism */ ! #endif t_freebytes(x->b_vec, x->b_n * sizeof(*x->b_vec)); *************** *** 79,87 **** || *textp == '\r' || *textp == '\t')) textp++; /* GG: escape mechanism */ if (*textp == '"') escape = !escape,textp++; while ((textp != etext) && !escape && (*textp == ' ' || *textp == '\n' || *textp == '\r' || *textp == '\t')) textp++; ! if (textp == etext) break; if (*textp == ';') SETSEMI(ap), textp++; --- 82,91 ---- || *textp == '\r' || *textp == '\t')) textp++; + #ifdef GG_ESCAPE_HACK /* GG: escape mechanism */ if (*textp == '"') escape = !escape,textp++; while ((textp != etext) && !escape && (*textp == ' ' || *textp == '\n' || *textp == '\r' || *textp == '\t')) textp++; ! #endif if (textp == etext) break; if (*textp == ';') SETSEMI(ap), textp++; *************** *** 160,166 **** } while (textp != etext && bufp != ebuf && ! ((escape && (*textp != '"')) || slash || /* GG: escape mechanism */ ! (*textp != ' ' && *textp != '\n'&& *textp != '"' && *textp != '\r' ! && *textp != '\t' &&*textp != ',' && *textp != ';'))); *bufp = 0; #if 0 --- 164,173 ---- } while (textp != etext && bufp != ebuf && ! (slash || (*textp != ' ' && *textp != '\n' && *textp != '\r' ! && *textp != '\t' &&*textp != ',' && *textp != ';' ! #ifdef GG_ESCAPE_HACK ! && *textp != '"') || (escape && (*textp != '"') /* GG: */ ! #endif ! ))); *bufp = 0; #if 0

1 0

pd/src ChangeLog,1.1.2.1,1.1.2.2
by matju＠users.sourceforge.net 05 Mar '04

05 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10002 Modified Files: Tag: impd_0_37 ChangeLog Log Message: let's call this impd_0_37_A Index: ChangeLog =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/ChangeLog,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** ChangeLog 4 Mar 2004 18:43:29 -0000 1.1.2.1 --- ChangeLog 5 Mar 2004 05:31:48 -0000 1.1.2.2 *************** *** 1,3 **** ! Impd 0.37 A : * forked from devel_0_37, 2004.02.21 --- 1,3 ---- ! Impd 0.37.A : * forked from devel_0_37, 2004.02.21 *************** *** 6,9 **** --- 6,10 ---- * added button bar (that does like Ctrl+E & Put menu) * .pdrc: -look <directory_of_icons> + (remember you can't use ~ nor $HOME in .pdrc) * includes a selectable windowid (for those who know how to use it) * class list dialog *************** *** 12,17 **** * filter box helps finding classes quickly * displays some info on the class, like a list of defined methods and such. * moving rendering to the TCL side * new file u_object.tk ! \ No newline at end of file --- 13,21 ---- * filter box helps finding classes quickly * displays some info on the class, like a list of defined methods and such. + * statusbar shows cursor position (enable with -statusbar) + + Impd 0.37.B : * moving rendering to the TCL side * new file u_object.tk !

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 March 2004