From basher39 at lycos.com Tue Jul 8 01:17:14 2003 From: basher39 at lycos.com (BASHER MOBUTU) Date: Fri Feb 25 22:16:25 2005 Subject: [Fresco-changes] ASSISTANCE NEEDED Message-ID: Good Day, You may be surprise to receive this email since you do not know me. I am the son of the late president of Democratic Republic Of Zaire, President Mobutu Sese Seko, ( now The Republic of Congo, under the leadership of the son of Mr. Laurent Kabila). I presume you are aware there is a financial dispute between my family ( THEMOBUTUS ) and the present civilian Government. This is based on what they believe as bad and corrupt governance on my late father's part. May his soul rest in perfect peace. As you might have heard how a lot of my father's bank account in Switzerland and North America have been frozen. Following the above named reasons, I am soliciting for your humble and confidential assistance to take custody of THIRTY Million United States Dollars ( US$30,000,000.00 ), also to front for me in the areas of business you desire profitable. These funds have secretly been deposited into a confidential Security Company, where it can easily be withdrawn or paid to a recommended beneficiary. The funds will be released to you by the Security Company, based on my recommendations, on that note, you will be presented as my partner who will be fronting for me and my family in any subsequent ventures. Myself and my mother have decided to give 20% to you if you are able to help us claim this consignment. We have also decided to give you any money spent on phone calls or traveling expenses in the course of this transaction at the end of the transaction. Please, I need your entire support and co-operation for the success of this transaction, your utmost confidentiality and secrecy is highly required, due to my family's present predicament. I sincerely will appreciate your willingness to assist us as soon as possible. I am presently in the refugee camp here in the Netherlands under the united nations refugee camp in Netherlands and I can be reached on phone number +31-655-904-604 or E-mail me at bashermobutu2@latinmail.com for more information on how we can proceed in this transaction. Please indicate your interest by sending your telephone and fax number or call me up at anytime. I sincerely will appreciate your acknowledgement as soon as possible. Warmest regards, Basher Mobutu Sese-Seko. From stefan at fresco.org Tue Jul 15 03:50:46 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:25 2005 Subject: [Fresco-changes] Fresco/Prague/include/Prague/Filter bzbuf.hh,1.3,1.4 cbuf.hh,1.2,1.3 xdrbuf.hh,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Prague/include/Prague/Filter In directory purcel:/tmp/cvs-serv9086/Prague/include/Prague/Filter Modified Files: bzbuf.hh cbuf.hh xdrbuf.hh Log Message: little compatibility fixes Index: bzbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/Filter/bzbuf.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bzbuf.hh 23 Sep 2000 19:15:46 -0000 1.3 +++ bzbuf.hh 15 Jul 2003 03:50:43 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -22,7 +22,7 @@ #ifndef _bzbuf_hh #define _bzbuf_hh -#include +#include #include extern "C" { @@ -36,28 +36,28 @@ * * @Description {filter using bzip2 library} */ -class bzbuf : public streambuf, private bz_stream +class bzbuf : public std::streambuf, private bz_stream { public: - typedef char char_type; - typedef streampos pos_type; - typedef streamoff off_type; - typedef int int_type; - bzbuf(streambuf *, int); + typedef char char_type; + typedef std::streampos pos_type; + typedef std::streamoff off_type; + typedef int int_type; + bzbuf(std::streambuf *, int); virtual ~bzbuf(); virtual int sync(); protected: virtual int_type underflow(); virtual int_type uflow(); virtual int_type overflow(int = EOF); - char_type *cbase() const { return comp;} - char_type *ecptr() const { return comp + BUFSIZ;} + char_type *cbase() const { return my_comp;} + char_type *ecptr() const { return my_comp + BUFSIZ;} char_type *cin() const { return next_in + avail_in;} - char_type *cout() const { return pout;} + char_type *cout() const { return my_pout;} private: - char_type *comp; - char_type *pout; - streambuf *back; + char_type *my_comp; + char_type *my_pout; + std::streambuf *my_back; }; }; Index: cbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/Filter/cbuf.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cbuf.hh 25 Mar 2002 15:34:16 -0000 1.2 +++ cbuf.hh 15 Jul 2003 03:50:43 -0000 1.3 @@ -1,7 +1,8 @@ -/*+P - * This file is part of OffiX, - * a C++ API for the X Window System and Unix - * Copyright (C) 1995-98 Stefan Seefeld +/*$Id$ + * + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,49 +20,48 @@ * MA 02139, USA. -P*/ /* $Id$ */ -#ifndef _cbuf_h -#define _cbuf_h +#ifndef _cbuf_hh +#define _cbuf_hh -#include +#include /* @Class {cbuf : public streambuf} * * @Description {suppress comments from input} */ -class cbuf: public streambuf +class cbuf: public std::streambuf { public: - cbuf(streambuf *sb, char c = '#') :sbuf(sb), comment(c), newline(true) {} + cbuf(std::streambuf *sb, char c = '#') : my_sbuf(sb), my_comment(c), my_newline(true) {} protected: - int sync() { return sbuf->sync();} + int sync() { return my_sbuf->sync();} inline int uflow(); - int sungetc() { return sbuf->sungetc();} + int sungetc() { return my_sbuf->sungetc();} private: cbuf(cbuf const &); void operator= (cbuf const &); - streambuf *sbuf; - const char comment; - bool newline; + std::streambuf *my_sbuf; + const char my_comment; + bool my_newline; }; inline int cbuf::uflow() { - int c = sbuf->sbumpc(); - if (c == '\n') newline = true; - else if (c == comment) + int c = my_sbuf->sbumpc(); + if (c == '\n') my_newline = true; + else if (c == my_comment) { do // for all lines starting with { - do c = sbuf->sbumpc(); + do c = my_sbuf->sbumpc(); while (c != EOF && c != '\n'); // for all letters of the line - if (newline && c == '\n') c = sbuf->sbumpc(); + if (my_newline && c == '\n') c = my_sbuf->sbumpc(); } - while (c == comment); - if (c == '\n') newline = true; + while (c == my_comment); + if (c == '\n') my_newline = true; } - else newline = false; -// std::cerr << (char)c << std::endl; + else my_newline = false; return c; } -#endif /* _cbuf_h */ +#endif Index: xdrbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/Filter/xdrbuf.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xdrbuf.hh 23 Sep 2000 19:15:47 -0000 1.3 +++ xdrbuf.hh 15 Jul 2003 03:50:43 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * this code is based on binio from Dietmar Kuehl: * @@ -24,19 +24,19 @@ * Free Software Foundation, Inc., 675 Mass Ave, Cambridge, * MA 02139, USA. */ -#ifndef _xdrbuf_h -#define _xdrbuf_h +#ifndef _xdrbuf_hh +#define _xdrbuf_hh -#include +#include #include #include namespace Prague { -extern void xdrbuf_create(XDR *xdrs, streambuf *sb, xdr_op op); -extern void xdrbuf_reseat(XDR *xdrs, streambuf *sb); +extern void xdrbuf_create(XDR *xdrs, std::streambuf *sb, xdr_op op); +extern void xdrbuf_reseat(XDR *xdrs, std::streambuf *sb); }; -#endif /* xdrbuf_h */ +#endif From stefan at fresco.org Tue Jul 15 03:50:46 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:25 2005 Subject: [Fresco-changes] Fresco/Prague/src/Filter bzbuf.cc,1.3,1.4 xdrbuf.cc,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Prague/src/Filter In directory purcel:/tmp/cvs-serv9086/Prague/src/Filter Modified Files: bzbuf.cc xdrbuf.cc Log Message: little compatibility fixes Index: bzbuf.cc =================================================================== RCS file: /cvs/fresco/Fresco/Prague/src/Filter/bzbuf.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bzbuf.cc 23 Sep 2000 21:18:36 -0000 1.3 +++ bzbuf.cc 15 Jul 2003 03:50:44 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * this file defines a C++ interface to zlib * written by Kevin Ruland @@ -27,23 +27,23 @@ using namespace Prague; -bzbuf::bzbuf(streambuf *b, int mode) - : comp(new char_type [BUFSIZ]), back(b) +bzbuf::bzbuf(std::streambuf *b, int mode) + : my_comp(new char_type [BUFSIZ]), my_back(b) { - char_type *buf = new char_type [BUFSIZ]; - if (mode & ios::in) + char_type *buf = new char_type[BUFSIZ]; + if (mode & std::ios::in) { setg (buf, buf + BUFSIZ, buf + BUFSIZ); - next_in = comp; + next_in = my_comp; avail_in = BUFSIZ; - pout = eback(); + my_pout = eback(); } - else if (mode & ios::out) + else if (mode & std::ios::out) { setp (buf, buf + BUFSIZ); - next_out = comp; + next_out = my_comp; avail_out = BUFSIZ; - pout = pbase(); + my_pout = pbase(); } bzalloc = 0; bzfree = 0; @@ -52,10 +52,10 @@ int verbosity = 4; int workFactor = 30; int small = 0; - if (mode &= ios::out) - int ret = bzCompressInit (this, blocksize, verbosity, workFactor); + if (mode &= std::ios::out) + int ret = BZ2_bzCompressInit(this, blocksize, verbosity, workFactor); else - int ret = bzDecompressInit (this, verbosity, small); + int ret = BZ2_bzDecompressInit(this, verbosity, small); } bzbuf::~bzbuf() @@ -66,45 +66,45 @@ bool done; do { - done = bzCompress(this, BZ_FINISH) == BZ_STREAM_END; - if (avail_out) pout = next_out; + done = BZ2_bzCompress(this, BZ_FINISH) == BZ_STREAM_END; + if (avail_out) my_pout = next_out; else { - pout = next_out = cbase(); + my_pout = next_out = cbase(); avail_out = BUFSIZ; } - streamsize l = next_out - cout();//comp + BUFSIZ - next_out; - if (l) l = back->sputn(cout(), l), ::cout << "writing " << l << " bytes " << endl; + std::streamsize l = next_out - cout();//comp + BUFSIZ - next_out; + if (l) l = my_back->sputn(cout(), l); next_out -= l; avail_out += l; } while (!done); - bzCompressEnd(this); + BZ2_bzCompressEnd(this); delete [] pbase(); } else delete [] eback(); - delete [] comp; - back->sync(); + delete [] my_comp; + my_back->pubsync(); } int bzbuf::sync() { if (pptr() && avail_in) { - bzCompress(this, BZ_RUN); + BZ2_bzCompress(this, BZ_RUN); if (cin() == epptr()) next_in = pbase(); setp (cin(), epptr()); - streamsize l = next_out - cout(); + std::streamsize l = next_out - cout(); /* * what if sputn returns less than l ??? */ - if (l) l = back->sputn(cout(), l), ::cout << "writing " << l << " bytes " << endl; - pout += l; - if (avail_out) pout = next_out; + if (l) l = my_back->sputn(cout(), l); + my_pout += l; + if (avail_out) my_pout = next_out; else { - pout = next_out = cbase(); + my_pout = next_out = cbase(); avail_out = BUFSIZ; } } @@ -113,11 +113,11 @@ bzbuf::int_type bzbuf::overflow (int c) { - if (pbase () == 0) return EOF; + if (pbase() == 0) return EOF; if (c == EOF) return sync(); - if (pptr () == epptr()) sync(); + if (pptr() == epptr()) sync(); *pptr() = (char_type) c; - pbump (1); + pbump(1); avail_in++; return c; } @@ -134,11 +134,11 @@ if (!avail_in) { if (cin() == ecptr()) next_in = cbase(); - streamsize l = back->sgetn(cin(), ecptr() - cin()); + std::streamsize l = my_back->sgetn(cin(), ecptr() - cin()); if (l == EOF) return EOF; avail_in += l; } - bzDecompress(this); + BZ2_bzDecompress(this); setg (cout(), cout(), next_out); return (unsigned char) *gptr(); } @@ -152,6 +152,6 @@ int_type ret = underflow (); if (ret == EOF) return EOF; gbump(1); - pout++; + my_pout++; return ret; } Index: xdrbuf.cc =================================================================== RCS file: /cvs/fresco/Fresco/Prague/src/Filter/xdrbuf.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xdrbuf.cc 23 Sep 2000 21:18:36 -0000 1.3 +++ xdrbuf.cc 15 Jul 2003 03:50:44 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * this code is based on binio from Dietmar Kuehl: * @@ -32,10 +32,6 @@ // 'pubsync()' for 'streambuf' but has no access restrictions on 'sync() // => Use this function. -#ifdef __GNUG__ -# define pubsync sync -#endif - // The following somewhat defeats the naming of 'long' but then... #if LONG_BIT == 64 @@ -69,7 +65,7 @@ xdrbuf_destroy, }; -void xdrbuf_create(XDR *xdrs, streambuf *sb, xdr_op op) +void xdrbuf_create(XDR *xdrs, std::streambuf *sb, xdr_op op) { xdrs->x_op = op; xdrs->x_ops = &xdrsb_ops; @@ -85,16 +81,16 @@ * like for 'iostream' the 'streambuf' is owned by someone else. * However, synchronization would be nice: */ - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb != 0) sb->pubsync(); } -void xdrbuf_reseat(XDR *xdrs, streambuf *sb) +void xdrbuf_reseat(XDR *xdrs, std::streambuf *sb) { /* * A method to implement the 'rdbuf()' mechanism of 'binios' */ - reinterpret_cast (xdrs->x_private)->pubsync(); + reinterpret_cast (xdrs->x_private)->pubsync(); xdrs->x_private = reinterpret_cast (sb); } @@ -104,7 +100,7 @@ * Why is 'x_getlong()' defined to work on 'long'? 'ntohl' and family works * on 'unsigned long'! */ - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb->sgetn(reinterpret_cast (ptr), 4) == 4) { *ptr = ntohl(*ptr); @@ -115,7 +111,7 @@ bool_t xdrbuf_putlong(XDR *xdrs, const long_t *ptr) { - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); long l = htonl(*ptr); if (sb->sputn(reinterpret_cast (&l), 4) == 4) return TRUE; else return FALSE; @@ -123,31 +119,32 @@ bool_t xdrbuf_getbytes(XDR *xdrs, caddr_t ptr, unsigned int len) { - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb->sgetn(reinterpret_cast (ptr), len) == (int) len) return TRUE; else return FALSE; } bool_t xdrbuf_putbytes(XDR *xdrs, const char *ptr, unsigned int len) { - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb->sputn(const_cast (ptr), len) == (int) len) return TRUE; else return FALSE; } unsigned int xdrbuf_getpostn(const XDR *xdrs) { - streambuf *sb = reinterpret_cast (xdrs->x_private); - streampos pos = sb->pubseekoff(0, ios::cur, xdrs->x_op == XDR_ENCODE? ios::out : ios::in); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streampos pos = sb->pubseekoff(0, std::ios::cur, + xdrs->x_op == XDR_ENCODE? std::ios::out : std::ios::in); return static_cast (pos); } bool_t xdrbuf_setpostn(XDR *xdrs, unsigned int p) { - streambuf *sb = reinterpret_cast (xdrs->x_private); - streampos pos = static_cast (p); - ios::openmode which = xdrs->x_op == XDR_ENCODE? ios::out: ios::in; - if (sb->pubseekpos(pos, which) != static_cast (streamoff(-1))) return TRUE; + std::streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streampos pos = static_cast (p); + std::ios::openmode which = xdrs->x_op == XDR_ENCODE? std::ios::out : std::ios::in; + if (sb->pubseekpos(pos, which) != static_cast (streamoff(-1))) return TRUE; else return FALSE; } From tobias at fresco.org Fri Jul 18 21:05:18 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:16:25 2005 Subject: [Fresco-changes] Fresco/Documentation/src scene-graph.xml,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Documentation/src In directory purcel:/tmp/cvs-serv14991 Modified Files: scene-graph.xml Log Message: Removed test message that shouldn't have shown up anyway. Index: scene-graph.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/scene-graph.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- scene-graph.xml 2 Apr 2002 04:50:12 -0000 1.3 +++ scene-graph.xml 18 Jul 2003 21:05:16 -0000 1.4 @@ -99,7 +99,7 @@ the concept of a trail, it is important to realize that a graphic cannot reliably store a copy of its cumulative transformation or layout information, since it may be laid out at multiple places on the screen, - many of which may have different cumulative transformations. Thus is can + many of which may have different cumulative transformations. Thus it can only store "relative" information about its layout requirements, and have its true state computed on the fly. This is known as "externalizing" its state; in fresco we attempt to externalize as much From tobias at fresco.org Fri Jul 18 21:07:52 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:16:25 2005 Subject: [Fresco-changes] Fresco/Documentation/src scene-graph.xml,1.4,1.5 Message-ID: Update of /cvs/fresco/Fresco/Documentation/src In directory purcel:/tmp/cvs-serv15171 Modified Files: scene-graph.xml Log Message: Make sure the line limit of 80 chars is adhered to. Index: scene-graph.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/scene-graph.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- scene-graph.xml 18 Jul 2003 21:05:16 -0000 1.4 +++ scene-graph.xml 18 Jul 2003 21:07:50 -0000 1.5 @@ -30,7 +30,8 @@
transformational containment - Since the scene graph is actually + Since the scene graph + is actually stored in double-precision floating point values, and since any graphic may be subject to arbitrary linear transformations within the scene, the parent/child relationship between graphics naturally extends to @@ -104,10 +105,10 @@ have its true state computed on the fly. This is known as "externalizing" its state; in fresco we attempt to externalize as much state from each graphic as possible. Partly this is done to facilitate - the memory savings mentionned previously, but it also simplifies the task of - maintaining the proper values for layout and cumulative transformation, - which are highly dynamic to begin with. Since we compute them on the - fly, such values are never "out of sync" with one another. + the memory savings mentionned previously, but it also simplifies the + task of maintaining the proper values for layout and cumulative + transformation, which are highly dynamic to begin with. Since we compute + them on the fly, such values are never "out of sync" with one another.
From tobias at fresco.org Fri Jul 18 21:22:56 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:16:25 2005 Subject: [Fresco-changes] Fresco/Documentation/src hello-list.xml,1.6,1.7 Message-ID: Update of /cvs/fresco/Fresco/Documentation/src In directory purcel:/tmp/cvs-serv15875 Modified Files: hello-list.xml Log Message: Add missing #include as reported by cinap_lenrek. Thanks! Index: hello-list.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/hello-list.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- hello-list.xml 28 Jan 2003 18:44:34 -0000 1.6 +++ hello-list.xml 18 Jul 2003 21:22:53 -0000 1.7 @@ -6,6 +6,7 @@ #include <Fresco/DesktopKit.hh> #include <Fresco/TextKit.hh> #include <Fresco/WidgetKit.hh> + #include <Fresco/ToolKit.hh> #include <Fresco/resolve.hh> #include <Fresco/Unicode.hh> #include <Fresco/ClientContextImpl.hh> From basher39 at lycos.com Tue Jul 8 01:17:14 2003 From: basher39 at lycos.com (BASHER MOBUTU) Date: Fri Feb 25 22:53:14 2005 Subject: [Fresco-changes] ASSISTANCE NEEDED Message-ID: Good Day, You may be surprise to receive this email since you do not know me. I am the son of the late president of Democratic Republic Of Zaire, President Mobutu Sese Seko, ( now The Republic of Congo, under the leadership of the son of Mr. Laurent Kabila). I presume you are aware there is a financial dispute between my family ( THEMOBUTUS ) and the present civilian Government. This is based on what they believe as bad and corrupt governance on my late father's part. May his soul rest in perfect peace. As you might have heard how a lot of my father's bank account in Switzerland and North America have been frozen. Following the above named reasons, I am soliciting for your humble and confidential assistance to take custody of THIRTY Million United States Dollars ( US$30,000,000.00 ), also to front for me in the areas of business you desire profitable. These funds have secretly been deposited into a confidential Security Company, where it can easily be withdrawn or paid to a recommended beneficiary. The funds will be released to you by the Security Company, based on my recommendations, on that note, you will be presented as my partner who will be fronting for me and my family in any subsequent ventures. Myself and my mother have decided to give 20% to you if you are able to help us claim this consignment. We have also decided to give you any money spent on phone calls or traveling expenses in the course of this transaction at the end of the transaction. Please, I need your entire support and co-operation for the success of this transaction, your utmost confidentiality and secrecy is highly required, due to my family's present predicament. I sincerely will appreciate your willingness to assist us as soon as possible. I am presently in the refugee camp here in the Netherlands under the united nations refugee camp in Netherlands and I can be reached on phone number +31-655-904-604 or E-mail me at bashermobutu2@latinmail.com for more information on how we can proceed in this transaction. Please indicate your interest by sending your telephone and fax number or call me up at anytime. I sincerely will appreciate your acknowledgement as soon as possible. Warmest regards, Basher Mobutu Sese-Seko. From stefan at fresco.org Tue Jul 15 03:50:46 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:53:14 2005 Subject: [Fresco-changes] Fresco/Prague/include/Prague/Filter bzbuf.hh,1.3,1.4 cbuf.hh,1.2,1.3 xdrbuf.hh,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Prague/include/Prague/Filter In directory purcel:/tmp/cvs-serv9086/Prague/include/Prague/Filter Modified Files: bzbuf.hh cbuf.hh xdrbuf.hh Log Message: little compatibility fixes Index: bzbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/Filter/bzbuf.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bzbuf.hh 23 Sep 2000 19:15:46 -0000 1.3 +++ bzbuf.hh 15 Jul 2003 03:50:43 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -22,7 +22,7 @@ #ifndef _bzbuf_hh #define _bzbuf_hh -#include +#include #include extern "C" { @@ -36,28 +36,28 @@ * * @Description {filter using bzip2 library} */ -class bzbuf : public streambuf, private bz_stream +class bzbuf : public std::streambuf, private bz_stream { public: - typedef char char_type; - typedef streampos pos_type; - typedef streamoff off_type; - typedef int int_type; - bzbuf(streambuf *, int); + typedef char char_type; + typedef std::streampos pos_type; + typedef std::streamoff off_type; + typedef int int_type; + bzbuf(std::streambuf *, int); virtual ~bzbuf(); virtual int sync(); protected: virtual int_type underflow(); virtual int_type uflow(); virtual int_type overflow(int = EOF); - char_type *cbase() const { return comp;} - char_type *ecptr() const { return comp + BUFSIZ;} + char_type *cbase() const { return my_comp;} + char_type *ecptr() const { return my_comp + BUFSIZ;} char_type *cin() const { return next_in + avail_in;} - char_type *cout() const { return pout;} + char_type *cout() const { return my_pout;} private: - char_type *comp; - char_type *pout; - streambuf *back; + char_type *my_comp; + char_type *my_pout; + std::streambuf *my_back; }; }; Index: cbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/Filter/cbuf.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cbuf.hh 25 Mar 2002 15:34:16 -0000 1.2 +++ cbuf.hh 15 Jul 2003 03:50:43 -0000 1.3 @@ -1,7 +1,8 @@ -/*+P - * This file is part of OffiX, - * a C++ API for the X Window System and Unix - * Copyright (C) 1995-98 Stefan Seefeld +/*$Id$ + * + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,49 +20,48 @@ * MA 02139, USA. -P*/ /* $Id$ */ -#ifndef _cbuf_h -#define _cbuf_h +#ifndef _cbuf_hh +#define _cbuf_hh -#include +#include /* @Class {cbuf : public streambuf} * * @Description {suppress comments from input} */ -class cbuf: public streambuf +class cbuf: public std::streambuf { public: - cbuf(streambuf *sb, char c = '#') :sbuf(sb), comment(c), newline(true) {} + cbuf(std::streambuf *sb, char c = '#') : my_sbuf(sb), my_comment(c), my_newline(true) {} protected: - int sync() { return sbuf->sync();} + int sync() { return my_sbuf->sync();} inline int uflow(); - int sungetc() { return sbuf->sungetc();} + int sungetc() { return my_sbuf->sungetc();} private: cbuf(cbuf const &); void operator= (cbuf const &); - streambuf *sbuf; - const char comment; - bool newline; + std::streambuf *my_sbuf; + const char my_comment; + bool my_newline; }; inline int cbuf::uflow() { - int c = sbuf->sbumpc(); - if (c == '\n') newline = true; - else if (c == comment) + int c = my_sbuf->sbumpc(); + if (c == '\n') my_newline = true; + else if (c == my_comment) { do // for all lines starting with { - do c = sbuf->sbumpc(); + do c = my_sbuf->sbumpc(); while (c != EOF && c != '\n'); // for all letters of the line - if (newline && c == '\n') c = sbuf->sbumpc(); + if (my_newline && c == '\n') c = my_sbuf->sbumpc(); } - while (c == comment); - if (c == '\n') newline = true; + while (c == my_comment); + if (c == '\n') my_newline = true; } - else newline = false; -// std::cerr << (char)c << std::endl; + else my_newline = false; return c; } -#endif /* _cbuf_h */ +#endif Index: xdrbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/Filter/xdrbuf.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xdrbuf.hh 23 Sep 2000 19:15:47 -0000 1.3 +++ xdrbuf.hh 15 Jul 2003 03:50:43 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * this code is based on binio from Dietmar Kuehl: * @@ -24,19 +24,19 @@ * Free Software Foundation, Inc., 675 Mass Ave, Cambridge, * MA 02139, USA. */ -#ifndef _xdrbuf_h -#define _xdrbuf_h +#ifndef _xdrbuf_hh +#define _xdrbuf_hh -#include +#include #include #include namespace Prague { -extern void xdrbuf_create(XDR *xdrs, streambuf *sb, xdr_op op); -extern void xdrbuf_reseat(XDR *xdrs, streambuf *sb); +extern void xdrbuf_create(XDR *xdrs, std::streambuf *sb, xdr_op op); +extern void xdrbuf_reseat(XDR *xdrs, std::streambuf *sb); }; -#endif /* xdrbuf_h */ +#endif From stefan at fresco.org Tue Jul 15 03:50:46 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:53:14 2005 Subject: [Fresco-changes] Fresco/Prague/src/Filter bzbuf.cc,1.3,1.4 xdrbuf.cc,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Prague/src/Filter In directory purcel:/tmp/cvs-serv9086/Prague/src/Filter Modified Files: bzbuf.cc xdrbuf.cc Log Message: little compatibility fixes Index: bzbuf.cc =================================================================== RCS file: /cvs/fresco/Fresco/Prague/src/Filter/bzbuf.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bzbuf.cc 23 Sep 2000 21:18:36 -0000 1.3 +++ bzbuf.cc 15 Jul 2003 03:50:44 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * this file defines a C++ interface to zlib * written by Kevin Ruland @@ -27,23 +27,23 @@ using namespace Prague; -bzbuf::bzbuf(streambuf *b, int mode) - : comp(new char_type [BUFSIZ]), back(b) +bzbuf::bzbuf(std::streambuf *b, int mode) + : my_comp(new char_type [BUFSIZ]), my_back(b) { - char_type *buf = new char_type [BUFSIZ]; - if (mode & ios::in) + char_type *buf = new char_type[BUFSIZ]; + if (mode & std::ios::in) { setg (buf, buf + BUFSIZ, buf + BUFSIZ); - next_in = comp; + next_in = my_comp; avail_in = BUFSIZ; - pout = eback(); + my_pout = eback(); } - else if (mode & ios::out) + else if (mode & std::ios::out) { setp (buf, buf + BUFSIZ); - next_out = comp; + next_out = my_comp; avail_out = BUFSIZ; - pout = pbase(); + my_pout = pbase(); } bzalloc = 0; bzfree = 0; @@ -52,10 +52,10 @@ int verbosity = 4; int workFactor = 30; int small = 0; - if (mode &= ios::out) - int ret = bzCompressInit (this, blocksize, verbosity, workFactor); + if (mode &= std::ios::out) + int ret = BZ2_bzCompressInit(this, blocksize, verbosity, workFactor); else - int ret = bzDecompressInit (this, verbosity, small); + int ret = BZ2_bzDecompressInit(this, verbosity, small); } bzbuf::~bzbuf() @@ -66,45 +66,45 @@ bool done; do { - done = bzCompress(this, BZ_FINISH) == BZ_STREAM_END; - if (avail_out) pout = next_out; + done = BZ2_bzCompress(this, BZ_FINISH) == BZ_STREAM_END; + if (avail_out) my_pout = next_out; else { - pout = next_out = cbase(); + my_pout = next_out = cbase(); avail_out = BUFSIZ; } - streamsize l = next_out - cout();//comp + BUFSIZ - next_out; - if (l) l = back->sputn(cout(), l), ::cout << "writing " << l << " bytes " << endl; + std::streamsize l = next_out - cout();//comp + BUFSIZ - next_out; + if (l) l = my_back->sputn(cout(), l); next_out -= l; avail_out += l; } while (!done); - bzCompressEnd(this); + BZ2_bzCompressEnd(this); delete [] pbase(); } else delete [] eback(); - delete [] comp; - back->sync(); + delete [] my_comp; + my_back->pubsync(); } int bzbuf::sync() { if (pptr() && avail_in) { - bzCompress(this, BZ_RUN); + BZ2_bzCompress(this, BZ_RUN); if (cin() == epptr()) next_in = pbase(); setp (cin(), epptr()); - streamsize l = next_out - cout(); + std::streamsize l = next_out - cout(); /* * what if sputn returns less than l ??? */ - if (l) l = back->sputn(cout(), l), ::cout << "writing " << l << " bytes " << endl; - pout += l; - if (avail_out) pout = next_out; + if (l) l = my_back->sputn(cout(), l); + my_pout += l; + if (avail_out) my_pout = next_out; else { - pout = next_out = cbase(); + my_pout = next_out = cbase(); avail_out = BUFSIZ; } } @@ -113,11 +113,11 @@ bzbuf::int_type bzbuf::overflow (int c) { - if (pbase () == 0) return EOF; + if (pbase() == 0) return EOF; if (c == EOF) return sync(); - if (pptr () == epptr()) sync(); + if (pptr() == epptr()) sync(); *pptr() = (char_type) c; - pbump (1); + pbump(1); avail_in++; return c; } @@ -134,11 +134,11 @@ if (!avail_in) { if (cin() == ecptr()) next_in = cbase(); - streamsize l = back->sgetn(cin(), ecptr() - cin()); + std::streamsize l = my_back->sgetn(cin(), ecptr() - cin()); if (l == EOF) return EOF; avail_in += l; } - bzDecompress(this); + BZ2_bzDecompress(this); setg (cout(), cout(), next_out); return (unsigned char) *gptr(); } @@ -152,6 +152,6 @@ int_type ret = underflow (); if (ret == EOF) return EOF; gbump(1); - pout++; + my_pout++; return ret; } Index: xdrbuf.cc =================================================================== RCS file: /cvs/fresco/Fresco/Prague/src/Filter/xdrbuf.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xdrbuf.cc 23 Sep 2000 21:18:36 -0000 1.3 +++ xdrbuf.cc 15 Jul 2003 03:50:44 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * this code is based on binio from Dietmar Kuehl: * @@ -32,10 +32,6 @@ // 'pubsync()' for 'streambuf' but has no access restrictions on 'sync() // => Use this function. -#ifdef __GNUG__ -# define pubsync sync -#endif - // The following somewhat defeats the naming of 'long' but then... #if LONG_BIT == 64 @@ -69,7 +65,7 @@ xdrbuf_destroy, }; -void xdrbuf_create(XDR *xdrs, streambuf *sb, xdr_op op) +void xdrbuf_create(XDR *xdrs, std::streambuf *sb, xdr_op op) { xdrs->x_op = op; xdrs->x_ops = &xdrsb_ops; @@ -85,16 +81,16 @@ * like for 'iostream' the 'streambuf' is owned by someone else. * However, synchronization would be nice: */ - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb != 0) sb->pubsync(); } -void xdrbuf_reseat(XDR *xdrs, streambuf *sb) +void xdrbuf_reseat(XDR *xdrs, std::streambuf *sb) { /* * A method to implement the 'rdbuf()' mechanism of 'binios' */ - reinterpret_cast (xdrs->x_private)->pubsync(); + reinterpret_cast (xdrs->x_private)->pubsync(); xdrs->x_private = reinterpret_cast (sb); } @@ -104,7 +100,7 @@ * Why is 'x_getlong()' defined to work on 'long'? 'ntohl' and family works * on 'unsigned long'! */ - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb->sgetn(reinterpret_cast (ptr), 4) == 4) { *ptr = ntohl(*ptr); @@ -115,7 +111,7 @@ bool_t xdrbuf_putlong(XDR *xdrs, const long_t *ptr) { - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); long l = htonl(*ptr); if (sb->sputn(reinterpret_cast (&l), 4) == 4) return TRUE; else return FALSE; @@ -123,31 +119,32 @@ bool_t xdrbuf_getbytes(XDR *xdrs, caddr_t ptr, unsigned int len) { - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb->sgetn(reinterpret_cast (ptr), len) == (int) len) return TRUE; else return FALSE; } bool_t xdrbuf_putbytes(XDR *xdrs, const char *ptr, unsigned int len) { - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb->sputn(const_cast (ptr), len) == (int) len) return TRUE; else return FALSE; } unsigned int xdrbuf_getpostn(const XDR *xdrs) { - streambuf *sb = reinterpret_cast (xdrs->x_private); - streampos pos = sb->pubseekoff(0, ios::cur, xdrs->x_op == XDR_ENCODE? ios::out : ios::in); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streampos pos = sb->pubseekoff(0, std::ios::cur, + xdrs->x_op == XDR_ENCODE? std::ios::out : std::ios::in); return static_cast (pos); } bool_t xdrbuf_setpostn(XDR *xdrs, unsigned int p) { - streambuf *sb = reinterpret_cast (xdrs->x_private); - streampos pos = static_cast (p); - ios::openmode which = xdrs->x_op == XDR_ENCODE? ios::out: ios::in; - if (sb->pubseekpos(pos, which) != static_cast (streamoff(-1))) return TRUE; + std::streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streampos pos = static_cast (p); + std::ios::openmode which = xdrs->x_op == XDR_ENCODE? std::ios::out : std::ios::in; + if (sb->pubseekpos(pos, which) != static_cast (streamoff(-1))) return TRUE; else return FALSE; } From tobias at fresco.org Fri Jul 18 21:05:18 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:53:14 2005 Subject: [Fresco-changes] Fresco/Documentation/src scene-graph.xml,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Documentation/src In directory purcel:/tmp/cvs-serv14991 Modified Files: scene-graph.xml Log Message: Removed test message that shouldn't have shown up anyway. Index: scene-graph.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/scene-graph.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- scene-graph.xml 2 Apr 2002 04:50:12 -0000 1.3 +++ scene-graph.xml 18 Jul 2003 21:05:16 -0000 1.4 @@ -99,7 +99,7 @@ the concept of a trail, it is important to realize that a graphic cannot reliably store a copy of its cumulative transformation or layout information, since it may be laid out at multiple places on the screen, - many of which may have different cumulative transformations. Thus is can + many of which may have different cumulative transformations. Thus it can only store "relative" information about its layout requirements, and have its true state computed on the fly. This is known as "externalizing" its state; in fresco we attempt to externalize as much From tobias at fresco.org Fri Jul 18 21:07:52 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:53:14 2005 Subject: [Fresco-changes] Fresco/Documentation/src scene-graph.xml,1.4,1.5 Message-ID: Update of /cvs/fresco/Fresco/Documentation/src In directory purcel:/tmp/cvs-serv15171 Modified Files: scene-graph.xml Log Message: Make sure the line limit of 80 chars is adhered to. Index: scene-graph.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/scene-graph.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- scene-graph.xml 18 Jul 2003 21:05:16 -0000 1.4 +++ scene-graph.xml 18 Jul 2003 21:07:50 -0000 1.5 @@ -30,7 +30,8 @@
transformational containment - Since the scene graph is actually + Since the scene graph + is actually stored in double-precision floating point values, and since any graphic may be subject to arbitrary linear transformations within the scene, the parent/child relationship between graphics naturally extends to @@ -104,10 +105,10 @@ have its true state computed on the fly. This is known as "externalizing" its state; in fresco we attempt to externalize as much state from each graphic as possible. Partly this is done to facilitate - the memory savings mentionned previously, but it also simplifies the task of - maintaining the proper values for layout and cumulative transformation, - which are highly dynamic to begin with. Since we compute them on the - fly, such values are never "out of sync" with one another. + the memory savings mentionned previously, but it also simplifies the + task of maintaining the proper values for layout and cumulative + transformation, which are highly dynamic to begin with. Since we compute + them on the fly, such values are never "out of sync" with one another.
From tobias at fresco.org Fri Jul 18 21:22:56 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:53:14 2005 Subject: [Fresco-changes] Fresco/Documentation/src hello-list.xml,1.6,1.7 Message-ID: Update of /cvs/fresco/Fresco/Documentation/src In directory purcel:/tmp/cvs-serv15875 Modified Files: hello-list.xml Log Message: Add missing #include as reported by cinap_lenrek. Thanks! Index: hello-list.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/hello-list.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- hello-list.xml 28 Jan 2003 18:44:34 -0000 1.6 +++ hello-list.xml 18 Jul 2003 21:22:53 -0000 1.7 @@ -6,6 +6,7 @@ #include <Fresco/DesktopKit.hh> #include <Fresco/TextKit.hh> #include <Fresco/WidgetKit.hh> + #include <Fresco/ToolKit.hh> #include <Fresco/resolve.hh> #include <Fresco/Unicode.hh> #include <Fresco/ClientContextImpl.hh> From basher39 at lycos.com Tue Jul 8 01:17:14 2003 From: basher39 at lycos.com (BASHER MOBUTU) Date: Fri Feb 25 23:14:57 2005 Subject: [Fresco-changes] ASSISTANCE NEEDED Message-ID: Good Day, You may be surprise to receive this email since you do not know me. I am the son of the late president of Democratic Republic Of Zaire, President Mobutu Sese Seko, ( now The Republic of Congo, under the leadership of the son of Mr. Laurent Kabila). I presume you are aware there is a financial dispute between my family ( THEMOBUTUS ) and the present civilian Government. This is based on what they believe as bad and corrupt governance on my late father's part. May his soul rest in perfect peace. As you might have heard how a lot of my father's bank account in Switzerland and North America have been frozen. Following the above named reasons, I am soliciting for your humble and confidential assistance to take custody of THIRTY Million United States Dollars ( US$30,000,000.00 ), also to front for me in the areas of business you desire profitable. These funds have secretly been deposited into a confidential Security Company, where it can easily be withdrawn or paid to a recommended beneficiary. The funds will be released to you by the Security Company, based on my recommendations, on that note, you will be presented as my partner who will be fronting for me and my family in any subsequent ventures. Myself and my mother have decided to give 20% to you if you are able to help us claim this consignment. We have also decided to give you any money spent on phone calls or traveling expenses in the course of this transaction at the end of the transaction. Please, I need your entire support and co-operation for the success of this transaction, your utmost confidentiality and secrecy is highly required, due to my family's present predicament. I sincerely will appreciate your willingness to assist us as soon as possible. I am presently in the refugee camp here in the Netherlands under the united nations refugee camp in Netherlands and I can be reached on phone number +31-655-904-604 or E-mail me at bashermobutu2@latinmail.com for more information on how we can proceed in this transaction. Please indicate your interest by sending your telephone and fax number or call me up at anytime. I sincerely will appreciate your acknowledgement as soon as possible. Warmest regards, Basher Mobutu Sese-Seko. From stefan at fresco.org Tue Jul 15 03:50:46 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 23:14:57 2005 Subject: [Fresco-changes] Fresco/Prague/include/Prague/Filter bzbuf.hh,1.3,1.4 cbuf.hh,1.2,1.3 xdrbuf.hh,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Prague/include/Prague/Filter In directory purcel:/tmp/cvs-serv9086/Prague/include/Prague/Filter Modified Files: bzbuf.hh cbuf.hh xdrbuf.hh Log Message: little compatibility fixes Index: bzbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/Filter/bzbuf.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bzbuf.hh 23 Sep 2000 19:15:46 -0000 1.3 +++ bzbuf.hh 15 Jul 2003 03:50:43 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -22,7 +22,7 @@ #ifndef _bzbuf_hh #define _bzbuf_hh -#include +#include #include extern "C" { @@ -36,28 +36,28 @@ * * @Description {filter using bzip2 library} */ -class bzbuf : public streambuf, private bz_stream +class bzbuf : public std::streambuf, private bz_stream { public: - typedef char char_type; - typedef streampos pos_type; - typedef streamoff off_type; - typedef int int_type; - bzbuf(streambuf *, int); + typedef char char_type; + typedef std::streampos pos_type; + typedef std::streamoff off_type; + typedef int int_type; + bzbuf(std::streambuf *, int); virtual ~bzbuf(); virtual int sync(); protected: virtual int_type underflow(); virtual int_type uflow(); virtual int_type overflow(int = EOF); - char_type *cbase() const { return comp;} - char_type *ecptr() const { return comp + BUFSIZ;} + char_type *cbase() const { return my_comp;} + char_type *ecptr() const { return my_comp + BUFSIZ;} char_type *cin() const { return next_in + avail_in;} - char_type *cout() const { return pout;} + char_type *cout() const { return my_pout;} private: - char_type *comp; - char_type *pout; - streambuf *back; + char_type *my_comp; + char_type *my_pout; + std::streambuf *my_back; }; }; Index: cbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/Filter/cbuf.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cbuf.hh 25 Mar 2002 15:34:16 -0000 1.2 +++ cbuf.hh 15 Jul 2003 03:50:43 -0000 1.3 @@ -1,7 +1,8 @@ -/*+P - * This file is part of OffiX, - * a C++ API for the X Window System and Unix - * Copyright (C) 1995-98 Stefan Seefeld +/*$Id$ + * + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,49 +20,48 @@ * MA 02139, USA. -P*/ /* $Id$ */ -#ifndef _cbuf_h -#define _cbuf_h +#ifndef _cbuf_hh +#define _cbuf_hh -#include +#include /* @Class {cbuf : public streambuf} * * @Description {suppress comments from input} */ -class cbuf: public streambuf +class cbuf: public std::streambuf { public: - cbuf(streambuf *sb, char c = '#') :sbuf(sb), comment(c), newline(true) {} + cbuf(std::streambuf *sb, char c = '#') : my_sbuf(sb), my_comment(c), my_newline(true) {} protected: - int sync() { return sbuf->sync();} + int sync() { return my_sbuf->sync();} inline int uflow(); - int sungetc() { return sbuf->sungetc();} + int sungetc() { return my_sbuf->sungetc();} private: cbuf(cbuf const &); void operator= (cbuf const &); - streambuf *sbuf; - const char comment; - bool newline; + std::streambuf *my_sbuf; + const char my_comment; + bool my_newline; }; inline int cbuf::uflow() { - int c = sbuf->sbumpc(); - if (c == '\n') newline = true; - else if (c == comment) + int c = my_sbuf->sbumpc(); + if (c == '\n') my_newline = true; + else if (c == my_comment) { do // for all lines starting with { - do c = sbuf->sbumpc(); + do c = my_sbuf->sbumpc(); while (c != EOF && c != '\n'); // for all letters of the line - if (newline && c == '\n') c = sbuf->sbumpc(); + if (my_newline && c == '\n') c = my_sbuf->sbumpc(); } - while (c == comment); - if (c == '\n') newline = true; + while (c == my_comment); + if (c == '\n') my_newline = true; } - else newline = false; -// std::cerr << (char)c << std::endl; + else my_newline = false; return c; } -#endif /* _cbuf_h */ +#endif Index: xdrbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/Filter/xdrbuf.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xdrbuf.hh 23 Sep 2000 19:15:47 -0000 1.3 +++ xdrbuf.hh 15 Jul 2003 03:50:43 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * this code is based on binio from Dietmar Kuehl: * @@ -24,19 +24,19 @@ * Free Software Foundation, Inc., 675 Mass Ave, Cambridge, * MA 02139, USA. */ -#ifndef _xdrbuf_h -#define _xdrbuf_h +#ifndef _xdrbuf_hh +#define _xdrbuf_hh -#include +#include #include #include namespace Prague { -extern void xdrbuf_create(XDR *xdrs, streambuf *sb, xdr_op op); -extern void xdrbuf_reseat(XDR *xdrs, streambuf *sb); +extern void xdrbuf_create(XDR *xdrs, std::streambuf *sb, xdr_op op); +extern void xdrbuf_reseat(XDR *xdrs, std::streambuf *sb); }; -#endif /* xdrbuf_h */ +#endif From stefan at fresco.org Tue Jul 15 03:50:46 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 23:14:57 2005 Subject: [Fresco-changes] Fresco/Prague/src/Filter bzbuf.cc,1.3,1.4 xdrbuf.cc,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Prague/src/Filter In directory purcel:/tmp/cvs-serv9086/Prague/src/Filter Modified Files: bzbuf.cc xdrbuf.cc Log Message: little compatibility fixes Index: bzbuf.cc =================================================================== RCS file: /cvs/fresco/Fresco/Prague/src/Filter/bzbuf.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bzbuf.cc 23 Sep 2000 21:18:36 -0000 1.3 +++ bzbuf.cc 15 Jul 2003 03:50:44 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * this file defines a C++ interface to zlib * written by Kevin Ruland @@ -27,23 +27,23 @@ using namespace Prague; -bzbuf::bzbuf(streambuf *b, int mode) - : comp(new char_type [BUFSIZ]), back(b) +bzbuf::bzbuf(std::streambuf *b, int mode) + : my_comp(new char_type [BUFSIZ]), my_back(b) { - char_type *buf = new char_type [BUFSIZ]; - if (mode & ios::in) + char_type *buf = new char_type[BUFSIZ]; + if (mode & std::ios::in) { setg (buf, buf + BUFSIZ, buf + BUFSIZ); - next_in = comp; + next_in = my_comp; avail_in = BUFSIZ; - pout = eback(); + my_pout = eback(); } - else if (mode & ios::out) + else if (mode & std::ios::out) { setp (buf, buf + BUFSIZ); - next_out = comp; + next_out = my_comp; avail_out = BUFSIZ; - pout = pbase(); + my_pout = pbase(); } bzalloc = 0; bzfree = 0; @@ -52,10 +52,10 @@ int verbosity = 4; int workFactor = 30; int small = 0; - if (mode &= ios::out) - int ret = bzCompressInit (this, blocksize, verbosity, workFactor); + if (mode &= std::ios::out) + int ret = BZ2_bzCompressInit(this, blocksize, verbosity, workFactor); else - int ret = bzDecompressInit (this, verbosity, small); + int ret = BZ2_bzDecompressInit(this, verbosity, small); } bzbuf::~bzbuf() @@ -66,45 +66,45 @@ bool done; do { - done = bzCompress(this, BZ_FINISH) == BZ_STREAM_END; - if (avail_out) pout = next_out; + done = BZ2_bzCompress(this, BZ_FINISH) == BZ_STREAM_END; + if (avail_out) my_pout = next_out; else { - pout = next_out = cbase(); + my_pout = next_out = cbase(); avail_out = BUFSIZ; } - streamsize l = next_out - cout();//comp + BUFSIZ - next_out; - if (l) l = back->sputn(cout(), l), ::cout << "writing " << l << " bytes " << endl; + std::streamsize l = next_out - cout();//comp + BUFSIZ - next_out; + if (l) l = my_back->sputn(cout(), l); next_out -= l; avail_out += l; } while (!done); - bzCompressEnd(this); + BZ2_bzCompressEnd(this); delete [] pbase(); } else delete [] eback(); - delete [] comp; - back->sync(); + delete [] my_comp; + my_back->pubsync(); } int bzbuf::sync() { if (pptr() && avail_in) { - bzCompress(this, BZ_RUN); + BZ2_bzCompress(this, BZ_RUN); if (cin() == epptr()) next_in = pbase(); setp (cin(), epptr()); - streamsize l = next_out - cout(); + std::streamsize l = next_out - cout(); /* * what if sputn returns less than l ??? */ - if (l) l = back->sputn(cout(), l), ::cout << "writing " << l << " bytes " << endl; - pout += l; - if (avail_out) pout = next_out; + if (l) l = my_back->sputn(cout(), l); + my_pout += l; + if (avail_out) my_pout = next_out; else { - pout = next_out = cbase(); + my_pout = next_out = cbase(); avail_out = BUFSIZ; } } @@ -113,11 +113,11 @@ bzbuf::int_type bzbuf::overflow (int c) { - if (pbase () == 0) return EOF; + if (pbase() == 0) return EOF; if (c == EOF) return sync(); - if (pptr () == epptr()) sync(); + if (pptr() == epptr()) sync(); *pptr() = (char_type) c; - pbump (1); + pbump(1); avail_in++; return c; } @@ -134,11 +134,11 @@ if (!avail_in) { if (cin() == ecptr()) next_in = cbase(); - streamsize l = back->sgetn(cin(), ecptr() - cin()); + std::streamsize l = my_back->sgetn(cin(), ecptr() - cin()); if (l == EOF) return EOF; avail_in += l; } - bzDecompress(this); + BZ2_bzDecompress(this); setg (cout(), cout(), next_out); return (unsigned char) *gptr(); } @@ -152,6 +152,6 @@ int_type ret = underflow (); if (ret == EOF) return EOF; gbump(1); - pout++; + my_pout++; return ret; } Index: xdrbuf.cc =================================================================== RCS file: /cvs/fresco/Fresco/Prague/src/Filter/xdrbuf.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xdrbuf.cc 23 Sep 2000 21:18:36 -0000 1.3 +++ xdrbuf.cc 15 Jul 2003 03:50:44 -0000 1.4 @@ -1,8 +1,8 @@ /*$Id$ * - * This source file is a part of the Berlin Project. - * Copyright (C) 1999 Stefan Seefeld - * http://www.berlin-consortium.org + * This source file is a part of the Fresco Project. + * Copyright (C) 1999 Stefan Seefeld + * http://www.fresco.org * * this code is based on binio from Dietmar Kuehl: * @@ -32,10 +32,6 @@ // 'pubsync()' for 'streambuf' but has no access restrictions on 'sync() // => Use this function. -#ifdef __GNUG__ -# define pubsync sync -#endif - // The following somewhat defeats the naming of 'long' but then... #if LONG_BIT == 64 @@ -69,7 +65,7 @@ xdrbuf_destroy, }; -void xdrbuf_create(XDR *xdrs, streambuf *sb, xdr_op op) +void xdrbuf_create(XDR *xdrs, std::streambuf *sb, xdr_op op) { xdrs->x_op = op; xdrs->x_ops = &xdrsb_ops; @@ -85,16 +81,16 @@ * like for 'iostream' the 'streambuf' is owned by someone else. * However, synchronization would be nice: */ - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb != 0) sb->pubsync(); } -void xdrbuf_reseat(XDR *xdrs, streambuf *sb) +void xdrbuf_reseat(XDR *xdrs, std::streambuf *sb) { /* * A method to implement the 'rdbuf()' mechanism of 'binios' */ - reinterpret_cast (xdrs->x_private)->pubsync(); + reinterpret_cast (xdrs->x_private)->pubsync(); xdrs->x_private = reinterpret_cast (sb); } @@ -104,7 +100,7 @@ * Why is 'x_getlong()' defined to work on 'long'? 'ntohl' and family works * on 'unsigned long'! */ - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb->sgetn(reinterpret_cast (ptr), 4) == 4) { *ptr = ntohl(*ptr); @@ -115,7 +111,7 @@ bool_t xdrbuf_putlong(XDR *xdrs, const long_t *ptr) { - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); long l = htonl(*ptr); if (sb->sputn(reinterpret_cast (&l), 4) == 4) return TRUE; else return FALSE; @@ -123,31 +119,32 @@ bool_t xdrbuf_getbytes(XDR *xdrs, caddr_t ptr, unsigned int len) { - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb->sgetn(reinterpret_cast (ptr), len) == (int) len) return TRUE; else return FALSE; } bool_t xdrbuf_putbytes(XDR *xdrs, const char *ptr, unsigned int len) { - streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); if (sb->sputn(const_cast (ptr), len) == (int) len) return TRUE; else return FALSE; } unsigned int xdrbuf_getpostn(const XDR *xdrs) { - streambuf *sb = reinterpret_cast (xdrs->x_private); - streampos pos = sb->pubseekoff(0, ios::cur, xdrs->x_op == XDR_ENCODE? ios::out : ios::in); + std::streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streampos pos = sb->pubseekoff(0, std::ios::cur, + xdrs->x_op == XDR_ENCODE? std::ios::out : std::ios::in); return static_cast (pos); } bool_t xdrbuf_setpostn(XDR *xdrs, unsigned int p) { - streambuf *sb = reinterpret_cast (xdrs->x_private); - streampos pos = static_cast (p); - ios::openmode which = xdrs->x_op == XDR_ENCODE? ios::out: ios::in; - if (sb->pubseekpos(pos, which) != static_cast (streamoff(-1))) return TRUE; + std::streambuf *sb = reinterpret_cast (xdrs->x_private); + std::streampos pos = static_cast (p); + std::ios::openmode which = xdrs->x_op == XDR_ENCODE? std::ios::out : std::ios::in; + if (sb->pubseekpos(pos, which) != static_cast (streamoff(-1))) return TRUE; else return FALSE; } From tobias at fresco.org Fri Jul 18 21:05:18 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 23:14:57 2005 Subject: [Fresco-changes] Fresco/Documentation/src scene-graph.xml,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Documentation/src In directory purcel:/tmp/cvs-serv14991 Modified Files: scene-graph.xml Log Message: Removed test message that shouldn't have shown up anyway. Index: scene-graph.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/scene-graph.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- scene-graph.xml 2 Apr 2002 04:50:12 -0000 1.3 +++ scene-graph.xml 18 Jul 2003 21:05:16 -0000 1.4 @@ -99,7 +99,7 @@ the concept of a trail, it is important to realize that a graphic cannot reliably store a copy of its cumulative transformation or layout information, since it may be laid out at multiple places on the screen, - many of which may have different cumulative transformations. Thus is can + many of which may have different cumulative transformations. Thus it can only store "relative" information about its layout requirements, and have its true state computed on the fly. This is known as "externalizing" its state; in fresco we attempt to externalize as much From tobias at fresco.org Fri Jul 18 21:07:52 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 23:14:57 2005 Subject: [Fresco-changes] Fresco/Documentation/src scene-graph.xml,1.4,1.5 Message-ID: Update of /cvs/fresco/Fresco/Documentation/src In directory purcel:/tmp/cvs-serv15171 Modified Files: scene-graph.xml Log Message: Make sure the line limit of 80 chars is adhered to. Index: scene-graph.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/scene-graph.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- scene-graph.xml 18 Jul 2003 21:05:16 -0000 1.4 +++ scene-graph.xml 18 Jul 2003 21:07:50 -0000 1.5 @@ -30,7 +30,8 @@
transformational containment - Since the scene graph is actually + Since the scene graph + is actually stored in double-precision floating point values, and since any graphic may be subject to arbitrary linear transformations within the scene, the parent/child relationship between graphics naturally extends to @@ -104,10 +105,10 @@ have its true state computed on the fly. This is known as "externalizing" its state; in fresco we attempt to externalize as much state from each graphic as possible. Partly this is done to facilitate - the memory savings mentionned previously, but it also simplifies the task of - maintaining the proper values for layout and cumulative transformation, - which are highly dynamic to begin with. Since we compute them on the - fly, such values are never "out of sync" with one another. + the memory savings mentionned previously, but it also simplifies the + task of maintaining the proper values for layout and cumulative + transformation, which are highly dynamic to begin with. Since we compute + them on the fly, such values are never "out of sync" with one another.
From tobias at fresco.org Fri Jul 18 21:22:56 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 23:14:57 2005 Subject: [Fresco-changes] Fresco/Documentation/src hello-list.xml,1.6,1.7 Message-ID: Update of /cvs/fresco/Fresco/Documentation/src In directory purcel:/tmp/cvs-serv15875 Modified Files: hello-list.xml Log Message: Add missing #include as reported by cinap_lenrek. Thanks! Index: hello-list.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/hello-list.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- hello-list.xml 28 Jan 2003 18:44:34 -0000 1.6 +++ hello-list.xml 18 Jul 2003 21:22:53 -0000 1.7 @@ -6,6 +6,7 @@ #include <Fresco/DesktopKit.hh> #include <Fresco/TextKit.hh> #include <Fresco/WidgetKit.hh> + #include <Fresco/ToolKit.hh> #include <Fresco/resolve.hh> #include <Fresco/Unicode.hh> #include <Fresco/ClientContextImpl.hh>