From njs at fresco.org Sat Mar 1 22:53:40 2003 From: njs at fresco.org (Nathaniel Smith) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/contrib/indent - New directory Message-ID: Update of /cvs/fresco/Fresco/contrib/indent In directory purcel:/tmp/cvs-serv1028/indent Log Message: Directory /cvs/fresco/Fresco/contrib/indent added to the repository From njs at fresco.org Sat Mar 1 22:58:31 2003 From: njs at fresco.org (Nathaniel Smith) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/contrib/indent fresco.el,NONE,1.1 fresco.pro,NONE,1.1 fresco.vimrc,NONE,1.1 Message-ID: Update of /cvs/fresco/Fresco/contrib/indent In directory purcel:/tmp/cvs-serv1067/indent Added Files: fresco.el fresco.pro fresco.vimrc Log Message: Add all the indent implementations that people have created. They're not perfect, but a good start. --- NEW FILE: fresco.el --- ;;; Basic Fresco coding style for Emacs ;;; To use: ;;; 1) load this file, or copy it into your .emacs, or whatever. ;;; 2) then do one of: ;;; 2a) Set the variable c-default-style to "fresco" (using M-x customize ;;; or setq or whatever) ;;; 2b) Use C-c . fresco to set the style manually per-buffer ;;; 2c) Put the following line into a C++ file: ;;; // -*- mode: c++; c-file-style: fresco -*- ;;; Known bugs: ;;; -- uses 4 spaces of indentation for namespaces, instead of 2 ;;; -- class access labels are indented 0 spaces, instead of 2 ;;; probably lots more of improvements possible, but this is a start ;;; If you find any particular problems or fixes, post to issues.fresco.org. (c-add-style "fresco" '((c-basic-offset . 4) (c-offsets-alist (innamespace . *) (access-label . /) (inline-open . +) (inline-close . 0) (substatement-open . 0)) (c-hanging-braces-alist (class-close before) (inline-open nil) (inline-close after)) (c-hanging-colons-alist (access-label after) (member-init-intro after)) (c-hanging-semi&comma-criteria c-semi&comma-no-newlines-for-oneline-inliners c-semi&comma-inside-parenlist))) --- NEW FILE: fresco.pro --- // This file attempts to implement the Fresco style guidelines for // indent(1). // To use, copy to ~/.indent.pro, or just set the environment variable // INDENT_PROFILE to point to it. // Please reports bugs and improvements at issues.fresco.org. // Blank lines --blank-lines-after-declarations --blank-lines-after-procedures --blank-lines-before-block-comments --leave-optional-blank-lines // Comments --comment-delimiters-on-blank-lines --start-left-side-of-comments // Braces --braces-after-if-line --brace-indent0 --dont-cuddle-do-while --case-indentation0 --case-brace-indentation0 --space-special-semicolon // Spaces and newlines --no-space-after-function-call-names --blank-before-sizeof --space-after-cast --space-after-for --space-after-if --space-after-while --no-space-after-parentheses --no-blank-lines-after-commas // newlines after commas in function declarations --procnames-start-lines --braces-after-struct-decl-line // Indentation --indent-level4 --continuation-indentation4 --continue-at-parentheses --leave-preprocessor-space // Line length --line-length78 --- NEW FILE: fresco.vimrc --- " Fresco VIM Script " Implements coding guidelines at http://www2.fresco.org/coding-style.html " general set tw=78 " textwidth of 78 chars, will break at whitespace " tabs set sw=4 " 4 spaces for shiftwidth set ts=4 " 2 spaces for tabs set sts=2 " 2 spaces for softtabstop set expandtab " changes tabs to spaces " cindent options set formatoptions=tcqro " this will allow needed C-comment style set cinoptions=g0.5s,h0.5s,t0 set cindent " indent on cinwords From nicholas at fresco.org Sun Mar 2 02:51:08 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/GGI/src Pointer.cc,1.4,1.5 Message-ID: Update of /cvs/fresco/Fresco/GGI/src In directory purcel:/tmp/cvs-serv8798 Modified Files: Pointer.cc Log Message: Make pointer appear on newer ggi displays at the cost of performence on versions that don't need it. A better solution can be coded. Patch from Paul Redmond. http://issues.fresco.org/bug183 Index: Pointer.cc =================================================================== RCS file: /cvs/fresco/Fresco/GGI/src/Pointer.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Pointer.cc 29 May 2002 06:49:41 -0000 1.4 +++ Pointer.cc 2 Mar 2003 02:51:06 -0000 1.5 @@ -120,11 +120,13 @@ PixelCoord r = _screen->row_length(); PixelCoord s = _screen->vwidth() * _screen->vheight(); PixelCoord d = _screen->pixel_format().size >> 3; - DirectBuffer::Guard buffer = _dbuffer->read_buffer(); - data_type *from = buffer.get() + y*r + x*d; + const ggi_directbuffer *dbuf = _screen->buffer(0); + ggiResourceAcquire(dbuf->resource, GGI_ACTYPE_READ); + data_type *from = static_cast(dbuf->read) + y*r +x*d; data_type *to = _cache; for (PixelCoord o = 0; o != h && (y + o) * r / d + x + w < s; o++, from += r, to += d * w) Memory::copy(from, to, d * w); + ggiResourceRelease(dbuf->resource); } void GGI::Pointer::restore() @@ -137,13 +139,15 @@ PixelCoord s = _screen->vwidth() * _screen->vheight(); PixelCoord d = _screen->pixel_format().size >> 3; data_type *from = _cache; - DirectBuffer::Guard buffer = _dbuffer->write_buffer(); - data_type *to = buffer.get() + y*r + x*d; + const ggi_directbuffer *dbuf = _screen->buffer(0); + ggiResourceAcquire(dbuf->resource, GGI_ACTYPE_WRITE); + data_type *to = static_cast(dbuf->write) + y*r + x*d; for (PixelCoord o = 0; o != h && (y + o) * r / d + x + w < s; o++, from += d * w, to += r) Memory::copy(from, to, d * w); _screen->flush(x, y, w, h); + ggiResourceRelease(dbuf->resource); } void GGI::Pointer::draw() @@ -157,11 +161,13 @@ PixelCoord d = _screen->pixel_format().size >> 3; data_type *from = _image; data_type *bits = _mask; - DirectBuffer::Guard buffer = _dbuffer->write_buffer(); - data_type *to = buffer.get() + y * r + x * d; + const ggi_directbuffer *dbuf = _screen->buffer(0); + ggiResourceAcquire(dbuf->resource, GGI_ACTYPE_WRITE); + data_type *to = static_cast(dbuf->write) + y*r + x*d; for (PixelCoord i = 0; i != h && (y + i) * r / d + x + w < s; i++, to += r - w * d) for (PixelCoord j = 0; j != w * d; j++, from++, bits++, to++) *to = (*from & *bits) | (*to & ~*bits); _screen->flush(x, y, w, h); + ggiResourceRelease(dbuf->resource); } From nicholas at fresco.org Sun Mar 2 15:13:04 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Fresco-IDL/share/idl/Fresco Font.idl,1.6,1.7 FontKit.idl,1.2,1.3 Message-ID: Update of /cvs/fresco/Fresco/Fresco-IDL/share/idl/Fresco In directory purcel:/tmp/cvs-serv6529/Fresco-IDL/share/idl/Fresco Modified Files: Font.idl FontKit.idl Log Message: Make it compile again after Tobias' scene graph debugging patch. Preliminary (untested) implementation of decompose. Size now means point size, an unsigned long. Index: Font.idl =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-IDL/share/idl/Fresco/Font.idl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Font.idl 17 Feb 2003 02:10:33 -0000 1.6 +++ Font.idl 2 Mar 2003 15:13:01 -0000 1.7 @@ -42,6 +42,12 @@ // horizontally to the center line of vertical // fonts. Coord underline_offset, underline_thickness; + unsigned long point_size; + // PANOSE: classification (latin, kanji...), genre (text, decorative) + // variation (normal, italic), weight, serif-type (panose1 lists + // 13 possible styles while panose2 has ten measurments to make) + // proportion (monospace, expanded), contrast, stroke variation, + // arm style, letterform, midline, x-height... }; enum SegmentType { move, line, conic, cubic }; @@ -71,7 +77,7 @@ interface Glyph : RefCountBase, Identifiable { - Raster bitmap(in unsigned short xdpi, in unsigned short ydpi); + Raster bitmap(in unsigned long xdpi, in unsigned long ydpi); FontShape decompose(); void char_info(out GlyphMetrics gm); void transformation(in Transform t); @@ -94,8 +100,6 @@ void font_metrics(out FontMetrics fm); Unistring font_style(); Unistring fullname(); - //. font size - Coord height(); Vertex kerning(in Unichar first, //.< first in visual order in Unichar second); //.< second in visual order Index: FontKit.idl =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-IDL/share/idl/Fresco/FontKit.idl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- FontKit.idl 16 Feb 2003 03:47:46 -0000 1.2 +++ FontKit.idl 2 Mar 2003 15:13:01 -0000 1.3 @@ -46,14 +46,16 @@ //. supply the One True Font. Font _default(); //. inform the FontKit of a new Font - Font filename(in string file, in Unistring style, in Coord size); + Font filename(in string file, in Unistring style, + in unsigned long point_size); //. look up font from list of known fonts. - Font provide(in Unistring family, in Unistring style, in Coord size); + Font provide(in Unistring family, in Unistring style, + in unsigned long point_size); Graphic set_font(in Graphic g, in Font f); - Graphic size(in Graphic g, in Coord s); + Graphic size(in Graphic g, in unsigned long s); Graphic style(in Graphic g, in Unistring s); - Graphic delta_size(in Graphic g, in Coord ds); + Graphic delta_size(in Graphic g, in long ds); Graphic delta_style(in Graphic g, in Unistring ds); FontIterator first_font(); From nicholas at fresco.org Sun Mar 2 15:13:04 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Berlin/modules/Fonts Font.cc,1.5,1.6 Font.hh,1.3,1.4 FontKitImpl.cc,1.8,1.9 FontKitImpl.hh,1.7,1.8 Glyph.cc,1.6,1.7 Glyph.hh,1.5,1.6 Message-ID: Update of /cvs/fresco/Fresco/Berlin/modules/Fonts In directory purcel:/tmp/cvs-serv6529/Berlin/modules/Fonts Modified Files: Font.cc Font.hh FontKitImpl.cc FontKitImpl.hh Glyph.cc Glyph.hh Log Message: Make it compile again after Tobias' scene graph debugging patch. Preliminary (untested) implementation of decompose. Size now means point size, an unsigned long. Index: Font.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Fonts/Font.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Font.cc 17 Feb 2003 02:10:33 -0000 1.5 +++ Font.cc 2 Mar 2003 15:13:01 -0000 1.6 @@ -27,7 +27,7 @@ namespace FontKit { -Font::Font(const char *filename, int size, FT_Library library) +Font::Font(const char *filename, CORBA::ULong size, FT_Library library) : my_ftlib(library), my_size(size) { if (FT_New_Face(my_ftlib, filename, 0, &my_face) != 0) @@ -45,7 +45,7 @@ CORBA::Boolean Font::has_char(Fresco::Unichar c) { - return FT_Get_Char_Index(my_face, c); + return FT_Get_Char_Index(my_face, c) != 0; } CORBA::Boolean Font::can_display(Fresco::Unichar begin, Fresco::Unichar end) @@ -90,12 +90,17 @@ Fresco::Vertex Font::kerning(Fresco::Unichar first, Fresco::Unichar second) { // XXX this is BIDI-incorrect, of course... - FT_Vector kern; - FT_Get_Kerning(my_face, first, second, FT_KERNING_DEFAULT, &kern); - Fresco::Vertex v; - v.x = kern.x / 0x10000; - v.y = kern.y / 0x10000; - return v; + Fresco::Vertex k; + k.x = 0; k.y = 0; + if (FT_HAS_KERNING(my_face)) + { + FT_Vector kern; + FT_Get_Kerning(my_face, FT_Get_Char_Index(my_face, first), + FT_Get_Char_Index(my_face, second), FT_KERNING_UNFITTED, &kern); + k.x = kern.x >> 6; + k.y = kern.y >> 6; + } + return k; } CORBA::Float Font::angle() Index: Font.hh =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Fonts/Font.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Font.hh 17 Feb 2003 02:10:33 -0000 1.3 +++ Font.hh 2 Mar 2003 15:13:01 -0000 1.4 @@ -43,7 +43,7 @@ public virtual IdentifiableImpl { public: - Font(const char *filename, int size, FT_Library library); + Font(const char *filename, CORBA::ULong size, FT_Library library); virtual ~Font(); virtual Fresco::Glyph_ptr glyph_char(Fresco::Unichar c); @@ -62,7 +62,7 @@ private: FT_Library my_ftlib; FT_Face my_face; - Fresco::Coord my_size; + CORBA::ULong my_size; }; } // namespace Index: FontKitImpl.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Fonts/FontKitImpl.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- FontKitImpl.cc 20 Feb 2003 02:38:20 -0000 1.8 +++ FontKitImpl.cc 2 Mar 2003 15:13:01 -0000 1.9 @@ -40,15 +40,18 @@ class FontDecorator : public MonoGraphic { public: - FontDecorator(Font_ptr f) : my_font(f) {} + FontDecorator(Font_ptr f) : my_font(Fresco::Font::_duplicate(f)) {} virtual void traverse(Traversal_ptr traversal) { traversal->visit(Graphic_var(_this())); } virtual void draw(DrawTraversal_ptr traversal) { - DrawingKit_var drawing = traversal->drawing(); // and do... NOTHING! yet. +#if 0 + DrawingKit_var drawing = traversal->drawing(); + drawing->set_font(my_font); +#endif MonoGraphic::traverse(traversal); } virtual void pick(PickTraversal_ptr traversal) @@ -56,21 +59,23 @@ MonoGraphic::traverse(traversal); } private: - Font_ptr my_font; + Font_var my_font; }; class FontSizeDecorator : public MonoGraphic { public: - FontSizeDecorator(Coord s) : my_size(s) {} + FontSizeDecorator(CORBA::ULong s) : my_size(s) {} virtual void traverse(Traversal_ptr traversal) { traversal->visit(Graphic_var(_this())); } virtual void draw(DrawTraversal_ptr traversal) { - DrawingKit_var drawing = traversal->drawing(); // and do... NOTHING! yet. +#if 0 + DrawingKit_var drawing = traversal->drawing(); +#endif MonoGraphic::traverse(traversal); } virtual void pick(PickTraversal_ptr traversal) @@ -78,7 +83,7 @@ MonoGraphic::traverse(traversal); } private: - Coord my_size; + CORBA::ULong my_size; }; FontKitImpl::FontIterator::FontIterator(FontKitImpl *fk) @@ -117,17 +122,17 @@ for (Prague::Path::iterator i = path.begin(); i != path.end(); ++i) { Directory directory(*i, Directory::alpha); - for (Prague::Directory::iterator j = directory.begin(); j != directory.end(); ++j) - { - if ((*j)->name()[0] == '.') continue; - std::string file = (*j)->long_name(); - if (FT_New_Face(*(my_fk->get_ftlibrary()), file.c_str(), 0, &my_face)) - { - Logger::log(Logger::text) << "file " << file << " is not a font." << std::endl; - continue; - } - faces.push_back(file); - } + for (Directory::iterator j = directory.begin(); j != directory.end(); ++j) + { + if ((*j)->name()[0] == '.') continue; + std::string file = (*j)->long_name(); + if (FT_New_Face(*(my_fk->get_ftlibrary()), file.c_str(), 0, &my_face)) + { + Logger::log(Logger::text) << "file " << file << " is not a font." << std::endl; + continue; + } + faces.push_back(file); + } } } @@ -153,51 +158,48 @@ return f->_this(); } -Font_ptr FontKitImpl::filename(const char *fn, const Fresco::Unistring &style, - const Fresco::Coord size) +Font_ptr FontKitImpl::filename(const char *fn, const Unistring &style, + const CORBA::ULong size) { Font *f = new Font(fn, size, my_library); return f->_this(); } -Font_ptr FontKitImpl::provide(const Fresco::Unistring &family, - const Fresco::Unistring &style, - const Fresco::Coord size) +Font_ptr FontKitImpl::provide(const Unistring &family, const Unistring &style, + const CORBA::ULong size) { return _cxx_default(); // XXX } -// pantone 1 and 2 font matching functions belong here. +// panose 1 and 2 font matching functions belong here. -Fresco::Graphic_ptr FontKitImpl::set_font(Fresco::Graphic_ptr g, Font_ptr f) +Graphic_ptr FontKitImpl::set_font(Graphic_ptr g, Font_ptr f) { Trace trace("FontKitImpl::set_font"); - return create_and_set_body(new FontDecorator(f), g); + return create_and_set_body(new FontDecorator(f), g, + "FontKit/Font"); } -Fresco::Graphic_ptr FontKitImpl::size(Fresco::Graphic_ptr g, - const Fresco::Coord s) +Graphic_ptr FontKitImpl::size(Graphic_ptr g, const CORBA::ULong s) { Trace trace("FontKitImpl::size"); - return create_and_set_body(new FontSizeDecorator(s), g); + return create_and_set_body(new FontSizeDecorator(s), g, + "FontKit/size"); } -Fresco::Graphic_ptr FontKitImpl::style(Fresco::Graphic_ptr g, - const Fresco::Unistring &style) +Graphic_ptr FontKitImpl::style(Graphic_ptr g, const Unistring &style) { Trace trace("FontKitImpl::style"); return Graphic::_nil(); } -Fresco::Graphic_ptr FontKitImpl::delta_size(Fresco::Graphic_ptr g, - const Fresco::Coord ds) +Graphic_ptr FontKitImpl::delta_size(Graphic_ptr g, const CORBA::Long ds) { Trace trace("FontKitImpl::delta_size"); return Graphic::_nil(); } -Fresco::Graphic_ptr FontKitImpl::delta_style(Fresco::Graphic_ptr g, - const Fresco::Unistring &style) +Graphic_ptr FontKitImpl::delta_style(Graphic_ptr g, const Unistring &style) { Trace trace("FontKitImpl::delta_style"); return Graphic::_nil(); Index: FontKitImpl.hh =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Fonts/FontKitImpl.hh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- FontKitImpl.hh 18 Feb 2003 15:06:48 -0000 1.7 +++ FontKitImpl.hh 2 Mar 2003 15:13:01 -0000 1.8 @@ -78,17 +78,24 @@ ServerContextImpl *); virtual Fresco::Font_ptr _cxx_default(); - virtual Fresco::Font_ptr filename(const char* file, const Fresco::Unistring& style, - Fresco::Coord size); - virtual Fresco::Font_ptr provide(const Fresco::Unistring& family, const Fresco::Unistring& style, - const Fresco::Coord size); - virtual Fresco::Graphic_ptr set_font(Fresco::Graphic_ptr g, const Fresco::Font_ptr f); - virtual Fresco::Graphic_ptr size(Fresco::Graphic_ptr g, const Fresco::Coord s); - virtual Fresco::Graphic_ptr style(Fresco::Graphic_ptr g, const Fresco::Unistring& s); - virtual Fresco::Graphic_ptr delta_size(Fresco::Graphic_ptr g, const Fresco::Coord ds); - virtual Fresco::Graphic_ptr delta_style(Fresco::Graphic_ptr g, const Fresco::Unistring& ds); + virtual Fresco::Font_ptr filename(const char* file, + const Fresco::Unistring& style, + const CORBA::ULong size); + virtual Fresco::Font_ptr provide(const Fresco::Unistring& family, + const Fresco::Unistring& style, + const CORBA::ULong size); + virtual Fresco::Graphic_ptr set_font(Fresco::Graphic_ptr g, + const Fresco::Font_ptr f); + virtual Fresco::Graphic_ptr size(Fresco::Graphic_ptr g, + const CORBA::ULong s); + virtual Fresco::Graphic_ptr style(Fresco::Graphic_ptr g, + const Fresco::Unistring& s); + virtual Fresco::Graphic_ptr delta_size(Fresco::Graphic_ptr g, + const CORBA::Long ds); + virtual Fresco::Graphic_ptr delta_style(Fresco::Graphic_ptr g, + const Fresco::Unistring& ds); - virtual FT_Library *FontKitImpl::get_ftlibrary(); + virtual FT_Library *get_ftlibrary(); virtual Fresco::FontIterator_ptr first_font(); virtual Fresco::FontIterator_ptr last_font(); Index: Glyph.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Fonts/Glyph.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Glyph.cc 20 Feb 2003 02:38:20 -0000 1.6 +++ Glyph.cc 2 Mar 2003 15:13:01 -0000 1.7 @@ -29,8 +29,9 @@ namespace FontKit { -GlyphImpl::GlyphImpl(FT_Face face, Fresco::Coord size, FT_ULong char_index) - : my_face(face), my_size(size), my_uc(char_index) +GlyphImpl::GlyphImpl(const FT_Face face, const CORBA::ULong size, + Fresco::Unichar char_index) + : my_face(face), my_size(size*64), my_uc(char_index) { my_tr.xx = 0x10000; my_tr.xy = 0x00000; @@ -40,9 +41,9 @@ GlyphImpl::~GlyphImpl() {} -Fresco::Raster_ptr GlyphImpl::bitmap(short unsigned int xdpi, short unsigned int ydpi) +Fresco::Raster_ptr GlyphImpl::bitmap(CORBA::ULong xdpi, CORBA::ULong ydpi) { - if (FT_Set_Char_Size(my_face, 0, my_size*64, xdpi, ydpi) != 0) + if (FT_Set_Char_Size(my_face, 0, my_size, xdpi, ydpi) != 0) std::cerr << "FontKit bitmap: set char size failed." << std::endl; FT_Set_Transform(my_face, &my_tr, 0); @@ -126,13 +127,28 @@ Fresco::FontShape *GlyphImpl::decompose() { - FT_Set_Char_Size(my_face, 0, my_size*64, 0, 0); + FT_Set_Char_Size(my_face, 0, my_size, 0, 0); FT_Set_Transform(my_face, &my_tr, 0); if (FT_Load_Glyph(my_face, FT_Get_Char_Index(my_face, my_uc), FT_LOAD_DEFAULT) != 0) std::cerr << "FontKit decompose: load glyph failed." << std::endl; Fresco::FontShape *f = new Fresco::FontShape(); f->length(0); // use FT_Outline_Decompose + + FT_Outline_Funcs funcs; + funcs.move_to = &moveto; + funcs.line_to = &lineto; + funcs.conic_to = &conicto; + funcs.shift = 0; + funcs.delta = 0; + + FT_Glyph glyph; + FT_Get_Glyph(my_face->glyph, &glyph); + FT_OutlineGlyph oglyph = (FT_OutlineGlyph)glyph; + + FT_Outline_Decompose(&(oglyph->outline), &funcs, 0); + + FT_Done_Glyph(glyph); FT_Set_Transform(my_face, 0, 0); return f; @@ -140,12 +156,16 @@ void GlyphImpl::char_info(Fresco::GlyphMetrics &gm) { + if (FT_Load_Glyph(my_face, FT_Get_Char_Index(my_face, my_uc), + FT_LOAD_DEFAULT) != 0) + std::cerr << "FontKit char_info: load glyph failed." << std::endl; + double scale = 1.; - // this isn't safe enough. We need to keep our own copy of the glyph. + gm.size.x = static_cast(my_face->glyph->metrics.width / scale); gm.size.y = static_cast(my_face->glyph->metrics.height / scale); gm.hori_bearing.x = static_cast(my_face->glyph->metrics.horiBearingX / scale); - gm.hori_bearing.y = static_cast(my_face->glyph->metrics.horiBearingY /scale); + gm.hori_bearing.y = static_cast(my_face->glyph->metrics.horiBearingY / scale); gm.hori_advance = static_cast(my_face->glyph->metrics.horiAdvance / scale); gm.vert_bearing.x = static_cast(my_face->glyph->metrics.vertBearingX / scale); gm.vert_bearing.y = static_cast(my_face->glyph->metrics.vertBearingY / scale); @@ -156,7 +176,7 @@ void *table = FT_Get_Sfnt_Table(my_face, ft_sfnt_hhea); if (table) { TT_HoriHeader *header = (TT_HoriHeader*)table; - gm.italic_correction = header->caret_Offset / 64.; // XXX MAYBE WRONG + gm.italic_correction = header->caret_Offset / scale; // XXX MAYBE WRONG } } @@ -170,10 +190,53 @@ tr->transform_vertex(e1); tr->transform_vertex(e2); - my_tr.xx = (e1.x-o.x)*0x10000; - my_tr.xy = (e1.y-o.y)*0x10000; - my_tr.yx = (e2.x-o.x)*0x10000; - my_tr.yy = (e2.y-o.y)*0x10000; + my_tr.xx = static_cast((e1.x-o.x)*0x10000); + my_tr.xy = static_cast((e1.y-o.y)*0x10000); + my_tr.yx = static_cast((e2.x-o.x)*0x10000); + my_tr.yy = static_cast((e2.y-o.y)*0x10000); +} + +int moveto(FT_Vector *to, void*f) +{ + Fresco::FontShape *fs = (Fresco::FontShape*)f; + + Fresco::FontShapeSegment *fss = new Fresco::FontShapeSegment; + fss->type = Fresco::move; + fss->to.x = to->x; fss->to.y = to->y; + return 0; +} + +int lineto(FT_Vector *to, void*f) +{ + Fresco::FontShape *fs = (Fresco::FontShape*)f; + + Fresco::FontShapeSegment *fss = new Fresco::FontShapeSegment; + fss->type = Fresco::line; + fss->to.x = to->x; fss->to.y = to->y; + return 0; +} + +int conicto(FT_Vector *c, FT_Vector *to, void*f) +{ + Fresco::FontShape *fs = (Fresco::FontShape*)f; + + Fresco::FontShapeSegment *fss = new Fresco::FontShapeSegment; + fss->type = Fresco::conic; + fss->to.x = to->x; fss->to.y = to->y; + fss->control1.x = c->x; fss->control1.y = c->y; + return 0; +} + +int cubicto(FT_Vector *c1, FT_Vector *c2, FT_Vector *to, void*f) +{ + Fresco::FontShape *fs = (Fresco::FontShape*)f; + + Fresco::FontShapeSegment *fss = new Fresco::FontShapeSegment; + fss->type = Fresco::conic; + fss->to.x = to->x; fss->to.y = to->y; + fss->control1.x = c1->x; fss->control1.y = c1->y; + fss->control2.x = c2->x; fss->control2.y = c2->y; + return 0; } } // namespace Index: Glyph.hh =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Fonts/Glyph.hh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Glyph.hh 17 Feb 2003 02:10:33 -0000 1.5 +++ Glyph.hh 2 Mar 2003 15:13:01 -0000 1.6 @@ -33,6 +33,7 @@ #include FT_FREETYPE_H #include FT_GLYPH_H #include FT_TRUETYPE_TABLES_H +#include FT_OUTLINE_H class Fresco::Raster; @@ -41,23 +42,28 @@ namespace FontKit { + int moveto(FT_Vector *, void*); + int lineto(FT_Vector *, void*); + int conicto(FT_Vector *, FT_Vector *, void*); + int cubicto(FT_Vector *, FT_Vector *, FT_Vector *, void*); + class GlyphImpl : public virtual POA_Fresco::Glyph, public virtual RefCountBaseImpl, public virtual IdentifiableImpl { public: - GlyphImpl(FT_Face face, Fresco::Coord size, FT_ULong char_index); + GlyphImpl(const FT_Face face, const CORBA::ULong size, + const Fresco::Unichar char_index); virtual ~GlyphImpl(); - virtual Fresco::Raster_ptr bitmap(short unsigned int xdpi, - short unsigned int ydpi); + virtual Fresco::Raster_ptr bitmap(CORBA::ULong xdpi, CORBA::ULong ydpi); virtual Fresco::FontShape *decompose(); virtual void char_info(Fresco::GlyphMetrics &gm); virtual void transformation(Fresco::Transform_ptr); private: FT_Face my_face; FT_Matrix my_tr; - Fresco::Coord my_size; + CORBA::ULong my_size; Fresco::Unichar my_uc; }; From nicholas at fresco.org Sun Mar 2 15:49:50 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Berlin/modules/Drawing/PostScript DrawingKit.cc,1.28,1.29 Message-ID: Update of /cvs/fresco/Fresco/Berlin/modules/Drawing/PostScript In directory purcel:/tmp/cvs-serv7556 Modified Files: DrawingKit.cc Log Message: Revert scale to "broken" coordinate system so that the print button works correctly in the M2 release. Index: DrawingKit.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Drawing/PostScript/DrawingKit.cc,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- DrawingKit.cc 18 Feb 2003 07:26:26 -0000 1.28 +++ DrawingKit.cc 2 Mar 2003 15:49:47 -0000 1.29 @@ -82,8 +82,8 @@ // the problems seems to be in the coordinate system used, // not PS... // -stefan - double xfactor = 1.;//resolution(xaxis); - double yfactor = 1.;//resolution(yaxis); + double xfactor = resolution(xaxis); + double yfactor = resolution(yaxis); static Transform::Matrix m = {{xfactor*xfactor, 0., 0., 0.}, @@ -121,7 +121,7 @@ << (region.upper.y - region.lower.y)*resolution(yaxis)*yfactor + 35. << std::endl; _os << "%%LanguageLevel: 2" << std::endl; _os << "%%Creator: Fresco" << std::endl; - _os << "/Times-Roman findfont 14 scalefont setfont" << std::endl; + _os << "/Times-Roman findfont 112 scalefont setfont" << std::endl; _os << "0 0 0 setrgbcolor" << std::endl; _os << std::endl; } From stefan at fresco.org Mon Mar 3 21:41:38 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Fresco-Python Makefile.in,1.14,1.15 setup.py.in,1.1,1.2 configure.ac,1.19,1.20 Message-ID: Update of /cvs/fresco/Fresco/Fresco-Python In directory purcel:/tmp/cvs-serv8369 Modified Files: Makefile.in setup.py.in configure.ac Log Message: fixes for the python module layout Index: Makefile.in =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile.in 20 Feb 2003 15:30:34 -0000 1.14 +++ Makefile.in 3 Mar 2003 21:41:35 -0000 1.15 @@ -25,7 +25,7 @@ top_srcdir := @top_srcdir@ srcdir := @srcdir@ -subdirs := Fresco +subdirs := src # insert inter-directory dependencies below # Overridden by the clean-targets, allowing the same subdirs-rule to be used @@ -45,7 +45,7 @@ xref: #do nothing doc: #do nothing here -install: +install: all ./setup.py install --prefix=$(DESTDIR)$(prefix) install-doc: #do nothing here Index: setup.py.in =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python/setup.py.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- setup.py.in 11 Feb 2003 02:58:37 -0000 1.1 +++ setup.py.in 3 Mar 2003 21:41:35 -0000 1.2 @@ -6,4 +6,11 @@ version="@PACKAGE_VERSION@", description="Fresco Python bindings", url="http://www.fresco.org", - packages=["Fresco"]) + package_dir = {'' : 'src'}, + packages=["Fresco", "Fresco.Input", + "Layout", "Layout__POA", + "Figure", "Figure__POA", + "Primitive", "Primitive__POA", + "Widget", "Widget__POA", + "Unidraw", "Unidraw__POA", + "FrescoStubs"]) Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python/configure.ac,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- configure.ac 20 Feb 2003 22:21:47 -0000 1.19 +++ configure.ac 3 Mar 2003 21:41:35 -0000 1.20 @@ -62,9 +62,11 @@ AC_CONFIG_FILES([setup.py], [chmod +x setup.py]) AC_CONFIG_FILES([config/local.mk]) -AC_CONFIG_FILES([Makefile Fresco/Makefile:config/Makefile.omniorb.in]) +AC_CONFIG_FILES([Makefile src/Makefile:config/Makefile.omniorb.in]) if test "$srcdir" != .; then AC_CONFIG_LINKS([Fresco/__init__.py:Fresco/__init__.py]) fi + +mkdir -p src/FrescoStubs AC_OUTPUT From tobias at fresco.org Tue Mar 4 00:23:49 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Berlin/src GraphDebugger.cc,1.1,1.2 Message-ID: Update of /cvs/fresco/Fresco/Berlin/src In directory purcel:/tmp/cvs-serv11922/src Modified Files: GraphDebugger.cc Log Message: Add transformation and allocation information into the dumped graph. Now we can close task40 IMHO. I'll open a new task on wether/how to extend this framework tomorrow. Index: GraphDebugger.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/src/GraphDebugger.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GraphDebugger.cc 26 Feb 2003 00:19:09 -0000 1.1 +++ GraphDebugger.cc 4 Mar 2003 00:23:47 -0000 1.2 @@ -21,6 +21,7 @@ */ #include +#include #include #include @@ -70,8 +71,50 @@ out << " n" << info.id << " "; // label: name - out << "[label=\"" << info.name << "(n" << info.id << ")\"," - << std::endl; + out << "[label=\"" << info.name << "(n" << info.id << ")\\n"; + + // label: allocation + Fresco::Graphic::Requisition r; + g->request(r); + out << "X("; + if (r.x.defined) + out << r.x.minimum << "," + << r.x.natural << "," + << r.x.maximum << ")"; + else + out << "-"; + out << "):Y("; + if (r.y.defined) + out << r.y.minimum << "," + << r.y.natural << "," + << r.y.maximum << ")"; + else + out << "-"; + out << "):Z("; + if (r.z.defined) + out << r.z.minimum << "," + << r.z.natural << "," + << r.z.maximum << ")"; + else + out << "-"; + out << ")"; + + // label: transformation + Fresco::Transform_var t = g->transformation(); + if (!CORBA::is_nil(t) && !t->identity()) + { + Fresco::Transform::Matrix m; + t->store_matrix(m); + out << "[" << m[0][0] << ", " << m[0][1] << ", " + << m[0][2] << ", " << m[0][3] << "]\\n"; + out << "[" << m[1][0] << ", " << m[1][1] << ", " + << m[1][2] << ", " << m[1][3] << "]\\n"; + out << "[" << m[2][0] << ", " << m[2][1] << ", " + << m[2][2] << ", " << m[2][3] << "]\\n"; + out << "[" << m[3][0] << ", " << m[3][1] << ", " + << m[3][2] << ", " << m[3][3] << "]\\n"; + } + out << "\"," << std::endl; // shape (depending on type of g) out << " shape=\""; @@ -103,7 +146,8 @@ children.push_back(g->body()); // children contain all childgraphics now! - for (std::vector::const_iterator i = children.begin(); + for (std::vector::const_iterator i = + children.begin(); i != children.end(); ++i) { @@ -111,7 +155,8 @@ out << " n" << info.id << " -> n" << target.id << std::endl; } - for (std::vector::const_iterator i = children.begin(); + for (std::vector::const_iterator i = + children.begin(); i != children.end(); ++i) dump_graphic(*i, out); @@ -130,7 +175,7 @@ my_known_graphics.begin(); i != my_known_graphics.end(); ++i) - if ((hash == i->hash) && + if (hash == i->hash && (p == i->impl || g->is_identical(i->graphic))) return *i; // we allready know this one From stefan at fresco.org Tue Mar 4 04:45:09 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Fresco-Python/src/FrescoClient - New directory Message-ID: Update of /cvs/fresco/Fresco/Fresco-Python/src/FrescoClient In directory purcel:/tmp/cvs-serv18139/FrescoClient Log Message: Directory /cvs/fresco/Fresco/Fresco-Python/src/FrescoClient added to the repository From stefan at fresco.org Tue Mar 4 05:30:04 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Fresco-Python Makefile.in,1.15,1.16 configure.ac,1.20,1.21 setup.py.in,1.2,1.3 Message-ID: Update of /cvs/fresco/Fresco/Fresco-Python In directory purcel:/tmp/cvs-serv19173 Modified Files: Makefile.in configure.ac setup.py.in Log Message: some internal reorganization to make the python runtime actually installable. All add-on is in FrescoClient Index: Makefile.in =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile.in 3 Mar 2003 21:41:35 -0000 1.15 +++ Makefile.in 4 Mar 2003 05:30:00 -0000 1.16 @@ -45,7 +45,8 @@ xref: #do nothing doc: #do nothing here -install: all +install: + $(MAKE) action="all" ./setup.py install --prefix=$(DESTDIR)$(prefix) install-doc: #do nothing here Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python/configure.ac,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- configure.ac 3 Mar 2003 21:41:35 -0000 1.20 +++ configure.ac 4 Mar 2003 05:30:00 -0000 1.21 @@ -64,7 +64,7 @@ AC_CONFIG_FILES([config/local.mk]) AC_CONFIG_FILES([Makefile src/Makefile:config/Makefile.omniorb.in]) if test "$srcdir" != .; then - AC_CONFIG_LINKS([Fresco/__init__.py:Fresco/__init__.py]) + AC_CONFIG_LINKS([src/FrescoClient:src/FrescoClient]) fi mkdir -p src/FrescoStubs Index: setup.py.in =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python/setup.py.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- setup.py.in 3 Mar 2003 21:41:35 -0000 1.2 +++ setup.py.in 4 Mar 2003 05:30:00 -0000 1.3 @@ -7,10 +7,12 @@ description="Fresco Python bindings", url="http://www.fresco.org", package_dir = {'' : 'src'}, - packages=["Fresco", "Fresco.Input", + packages=["Fresco", "Fresco__POA", + "Fresco.Input", "Fresco__POA.Input", "Layout", "Layout__POA", "Figure", "Figure__POA", "Primitive", "Primitive__POA", "Widget", "Widget__POA", "Unidraw", "Unidraw__POA", - "FrescoStubs"]) + "FrescoStubs", + "FrescoClient"]) From stefan at fresco.org Tue Mar 4 05:30:03 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Fresco-Python/config Makefile.omniorb.in,1.23,1.24 Message-ID: Update of /cvs/fresco/Fresco/Fresco-Python/config In directory purcel:/tmp/cvs-serv19173/config Modified Files: Makefile.omniorb.in Log Message: some internal reorganization to make the python runtime actually installable. All add-on is in FrescoClient Index: Makefile.omniorb.in =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python/config/Makefile.omniorb.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile.omniorb.in 18 Feb 2003 21:18:17 -0000 1.23 +++ Makefile.omniorb.in 4 Mar 2003 05:30:01 -0000 1.24 @@ -27,7 +27,7 @@ include $(cdir)/local.mk IDLPY := omniidl -IDLPYFLAGS := -I$(idir) -nf -bpython# -Wbglobal=Warsaw +IDLPYFLAGS := -I$(idir) -nf -bpython -Wbstubs=FrescoStubs IDL := Types.idl RefCountBase.idl Identifiable.idl ClientContext.idl \ Server.idl Kit.idl Transform.idl Region.idl \ @@ -44,29 +44,29 @@ Window.idl DesktopKit.idl UnidrawKit.idl \ PrimitiveKit.idl Primitive.idl -SRC := $(patsubst %.idl, %_idl.py, $(IDL)) +SRC := $(patsubst %.idl, FrescoStubs/%_idl.py, $(IDL)) CMP := $(patsubst %.py, %.pyc, $(SRC)) PACKAGES := Fresco Figure Layout Primitive Unidraw Widget -PACKAGES := $(PACKAGES) $(PACKAGES:%=%__POA) -PACKAGES := $(PACKAGES) Fresco/Input Fresco__POA/Input +PACKAGES += $(patsubst %, %__POA, $(PACKAGES)) +#PACKAGES := $(PACKAGES) Fresco/Input Fresco__POA/Input TARGET := $(SRC) all: $(TARGET) clean: - rm -rf $(SRC) $(CMP) Input Figure Fresco Layout *__POA *~ + rm -rf $(SRC) $(CMP) $(PACKAGES) distclean: clean rm -f $(TARGET) cvsclean: distclean -$(SRC): %_idl.py: $(idir)/Fresco/%.idl - @echo generating $(@F) +$(SRC): FrescoStubs/%_idl.py: $(idir)/Fresco/%.idl + @echo generating $@ $(IDLPY) $(IDLPYFLAGS) $< - mv -f $(@F) $(@F).old - cat $(@F).old | sed -e "s,@Fresco_IDL_prefix@,$(prefix)," > $(@F) - rm -f $(@F).old + mv -f $@ $@.old + cat $@.old | sed -e "s,@Fresco_IDL_prefix@,$(prefix)," > $@ + rm -f $@.old From stefan at fresco.org Tue Mar 4 05:30:05 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Fresco-Python/src/FrescoClient Impl.py,1.14,1.15 __init__.py,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Fresco-Python/src/FrescoClient In directory purcel:/tmp/cvs-serv19173/src/FrescoClient Modified Files: Impl.py __init__.py Log Message: some internal reorganization to make the python runtime actually installable. All add-on is in FrescoClient Index: Impl.py =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python/src/FrescoClient/Impl.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Impl.py 10 Oct 2002 06:36:56 -0000 1.14 +++ Impl.py 4 Mar 2003 05:30:01 -0000 1.15 @@ -1,6 +1,22 @@ -# Python Fresco library -# Copyright (c) 2000 by Stephen Davies -# This file is licensed for use under the GPL +# +# This source file is a part of the Fresco Project. +# Copyright (C) 2000 by Stephen Davies +# 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 +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +# MA 02139, USA. # # Tabstop is 8, SoftTabStop is 4, ShiftWidth is 4 (as per last line) # @@ -41,30 +57,30 @@ # --------------- # -- Python base classes -class PyIdentifiable (Fresco__POA.Identifiable): +class Identifiable (Fresco__POA.Identifiable): def is_identical(self, other): try: me_id = self._default_POA().servant_to_id(self) other_id = self._default_POA().reference_to_id(other) return me_id == other_id except: - print "An error occurred in PyIdentifiable.is_identical():" + print "An error occurred in Identifiable.is_identical():" traceback.print_exc() return 0 -class PyRefCountBase (Fresco__POA.RefCountBase): +class RefCountBase (Fresco__POA.RefCountBase): def __init__(self): self.__refcount = 0 def increment(self): - #print "PyRefCountBase.increment()" + #print "RefCountBase.increment()" self.__refcount = self.__refcount + 1 def decrement(self): self.__refcount = self.__refcount - 1 if self.__refcount < 1: - print "PyRefCountBase.decrement(): RefCount reached",self.__refcount + print "RefCountBase.decrement(): RefCount reached",self.__refcount # (PortableServer::RefCountServantBase): -class PyServantBase: +class ServantBase: def deactivate(self): # Something to do with poa here pass @@ -77,7 +93,7 @@ yspan.begin, yspan.end, yspan.align ) -class PyRegion (Fresco__POA.Region): +class Region (Fresco__POA.Region): def __init__(self): self.__lower = Fresco.Vertex(0, 0, 0) self.__upper = Fresco.Vertex(0, 0, 0) @@ -203,7 +219,8 @@ if j == 1: print "M =", else: print " ", print "[ %s ]"%string.join(map(str, m[j])) -class PyTransform (Fresco__POA.Transform): + +class Transform (Fresco__POA.Transform): """Transform impl. [ r00 r01 r02 tx] M = [ r10 r11 r12 ty] @@ -394,13 +411,13 @@ (self[0][0] * self[1][1] - self[0][1] * self[1][0])) / d return Fresco.Vertex(nx, ny, nz) -class PyAllocation (Fresco__POA.Allocation): +class Allocation (Fresco__POA.Allocation): def __init__(self): self.__list = [] def add(self, region, screen): - alloc = PyRegion() + alloc = Region() alloc.copy(region) - xform = PyTransform() + xform = Transform() xform.load_identity() info = Fresco.Allocation.Info(alloc._this(), xform._this(), screen) self.__list.append(info) @@ -409,9 +426,9 @@ def get(self, index): return self.__list[index] -class PySubject (Fresco__POA.Identifiable, Fresco__POA.RefCountBase): +class Subject (Fresco__POA.Identifiable, Fresco__POA.RefCountBase): def __init__(self): - PyRefCountBase.__init__(self) + RefCountBase.__init__(self) self.__blocked = 0 self.__observers = [] def attach(self, observer): @@ -432,7 +449,7 @@ # Remove observer self.__observers.remove(observer) except: - print "PySubject.notify(): Error occurred during update." + print "Subject.notify(): Error occurred during update." raise class Edge: @@ -442,12 +459,12 @@ self.peerId = peerId self.localId = localId -class PyGraphic (Fresco__POA.Graphic, PyIdentifiable, PyRefCountBase): +class Graphic (Fresco__POA.Graphic, Identifiable, RefCountBase): def __init__(self): - PyRefCountBase.__init__(self) + RefCountBase.__init__(self) self.__parents = [] - class Iterator (Fresco__POA.GraphicIterator, PyServantBase): + class Iterator (Fresco__POA.GraphicIterator, ServantBase): def destroy(self): self.deactivate() # Attribute 'body' @@ -491,7 +508,7 @@ def extension(self, alloc_info, region): # --> void if alloc_info.transformation: - tmp = PyRegion() + tmp = Region() tmp.copy(alloc_info.allocation) if not alloc_info.transformation.identity(): tmp.apply_transform(alloc_info.transformation) @@ -533,10 +550,10 @@ def need_resize(self): # --> void pass -class PyMonoGraphic (PyGraphic): +class MonoGraphic (Graphic): "Python analogue of MonoGraphic" def __init__(self): - PyGraphic.__init__(self) + Graphic.__init__(self) self.__child = Edge() def _get_body(self): self.__child.peer.increment() @@ -576,9 +593,9 @@ self.__child.peer.request() def extension(self, info, region): if not self.__child.peer: return - my_region = PyRegion() + my_region = Region() my_region.copy(info.allocation) - my_trans = PyTransform() + my_trans = Transform() my_trans.copy(info.transformation) my_info = Fresco.Allocation.Info(my_region._this(), my_trans._this(), None) self.allocate(0, my_info) # Template method to modify as per the concrete Graphic type (eg layout decorators etc) @@ -593,11 +610,11 @@ -class PyController (Fresco__POA.Controller, PyMonoGraphic, PySubject): +class Controller (Fresco__POA.Controller, MonoGraphic, Subject): "Python impl of Fresco::Controller interface" def __init__(self, transparent): - PyMonoGraphic.__init__(self) - PySubject.__init__(self) + MonoGraphic.__init__(self) + Subject.__init__(self) self.__parent = None self.__telltale = 0 self.__constraint = None @@ -606,7 +623,7 @@ self._children = [] self.__transparent = transparent - class Iterator (Fresco__POA.ControllerIterator, PyGraphic.Iterator): + class Iterator (Fresco__POA.ControllerIterator, Graphic.Iterator): def __init__(self, con, tag): self.__parent = con self.__cursor = tag @@ -663,12 +680,12 @@ # ---- Graphic interface def draw(self, drawTraversal): - PyMonoGraphic.traverse(self, drawTraversal) + MonoGraphic.traverse(self, drawTraversal) def pick(self, traversal): if not traversal.intersects_allocation(): return traversal.enter_controller(self._this()) - PyMonoGraphic.traverse(self, traversal) + MonoGraphic.traverse(self, traversal) if not self.__transparent and not traversal.picked(): traversal.hit() traversal.leave_controller() @@ -698,11 +715,11 @@ def parent_controller(self): # --> Controller return self.__parent def first_child_controller(self): # --> Iterator - iter = PyController.Iterator(self, 0) + iter = Controller.Iterator(self, 0) #self.activate(iter) return iter._this() def last_child_controller(self): # --> Iterator - iter = PyController.Iterator(self, len(self._children) - 1) + iter = Controller.Iterator(self, len(self._children) - 1) #self.activate(iter) return iter._this() def grabbed(self, input_device): return self.__grabs & (1 << input_device) Index: __init__.py =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python/src/FrescoClient/__init__.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- __init__.py 18 Feb 2003 21:18:16 -0000 1.3 +++ __init__.py 4 Mar 2003 05:30:01 -0000 1.4 @@ -35,6 +35,7 @@ # Import the Fresco stubs import Unidraw import Fresco__POA +from Impl import * class ExitCommand(Fresco__POA.Command): def execute(self, any): app.quit.set() From stefan at fresco.org Tue Mar 4 05:31:48 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Fresco-Python-demos/src clock,1.8,1.9 logo,1.16,1.17 menu,1.18,1.19 multilogo,1.11,1.12 primitive,1.8,1.9 unidraw,1.6,1.7 viewport,1.5,1.6 Message-ID: Update of /cvs/fresco/Fresco/Fresco-Python-demos/src In directory purcel:/tmp/cvs-serv19450/src Modified Files: clock logo menu multilogo primitive unidraw viewport Log Message: changes to the python demos to reflect the fixed runtime Index: clock =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/clock,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- clock 18 Feb 2003 01:52:03 -0000 1.8 +++ clock 4 Mar 2003 05:31:45 -0000 1.9 @@ -11,13 +11,9 @@ # Import the Fresco stubs and client lib import Fresco, Unidraw -import Fresco__POA -from Fresco import Label, Callback, nullAny - -# Import Fresco lib -import pyfresco +import FrescoClient -class TickGraphic (pyfresco.PyGraphic): +class TickGraphic (FrescoClient.Graphic): "Simple graphic that draws a 'tick'" def request(self): # --> void x = Fresco.Graphic.Requirement(1, 2000., 3000., 100., 0.) @@ -48,10 +44,10 @@ dk.restore() -class ClockGraphic (pyfresco.PyGraphic): +class ClockGraphic (FrescoClient.Graphic): "Simple graphic that draws a clock" def __init__(self): - pyfresco.PyGraphic.__init__(self) + FrescoClient.Graphic.__init__(self) thread.start_new_thread(self._run_update_thread, ()) self._offset = 0. #angular offset self._lock = threading.Lock() @@ -124,9 +120,9 @@ dk.draw_path(path) dk.restore() -class ClockController (pyfresco.PyController): +class ClockController (FrescoClient.Controller): def __init__(self): - pyfresco.PyController.__init__(self, 0) + FrescoClient.Controller.__init__(self, 0) self.clock = ClockGraphic() self._set_body(self.clock._this()) self._rot = 0. @@ -136,25 +132,25 @@ print "Press a key (in the Fresco window) to reset the angle" def traverse(self, traversal): - pyfresco.PyController.traverse(self, traversal) + FrescoClient.Controller.traverse(self, traversal) def press(self, pickTraversal, input_event): print "Press" self.clock._lock.acquire() - pyfresco.PyController.press(self, pickTraversal, input_event) - self._pos = pyfresco.get_position(input_event) + FrescoClient.Controller.press(self, pickTraversal, input_event) + self._pos = FrescoClient.get_position(input_event) self._rot = self.clock._offset self._start_rot = None self._curr_rot = self._rot def release(self, pickTraversal, input_event): print "Release" - pyfresco.PyController.release(self, pickTraversal, input_event) - pos = pyfresco.get_position(input_event) + FrescoClient.Controller.release(self, pickTraversal, input_event) + pos = FrescoClient.get_position(input_event) bounds = pickTraversal.current_allocation().bounds() bounds = map(pickTraversal.current_transformation().transform_vertex, bounds) self.do_drag(bounds, pos) self.clock._lock.release() def drag(self, pickTraversal, input_event): - pos = pyfresco.get_position(input_event) + pos = FrescoClient.get_position(input_event) bounds = pickTraversal.current_allocation().bounds() bounds = map(pickTraversal.current_transformation().transform_vertex, bounds) self.do_drag(bounds, pos) @@ -181,10 +177,10 @@ self.clock.need_redraw() self.clock._lock.release() -class GraphicApp (Fresco.App): +class GraphicApp (FrescoClient.App): def run(self): clock = ClockController()._this() - clock_group = kits.tool.group(clock) + clock_group = kits.tools.group(clock) clock_group.append_controller(clock) self.window = kits.desktop.shell(clock_group, connection.clientContext) @@ -194,8 +190,8 @@ def main(): # Create singletons global app, kits, connection - connection = Fresco.get_connection() - kits = Fresco.get_kits() + connection = FrescoClient.get_connection() + kits = FrescoClient.get_kits() app = GraphicApp() app.run() Index: logo =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/logo,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- logo 18 Feb 2003 01:52:03 -0000 1.16 +++ logo 4 Mar 2003 05:31:46 -0000 1.17 @@ -5,16 +5,16 @@ # Import Fresco client lib import Fresco -from Fresco import Label, Callback, nullAny +import FrescoClient -class DemoApp (Fresco.App): +class DemoApp (FrescoClient.App): def run(self): # Create a pixmap - pixmap = kits.figure.pixmap(kits.image.create_raster("berlin-128.png")) + pixmap = kits.figures.pixmap(kits.rasters.create_raster("fresco.png")) margin = kits.layout.margin_flexible(pixmap, 100., 500., 100.) spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.5) - demo = kits.tool.frame(margin, 10., spec, 1) - group = kits.tool.group(kits.tool.debugger(demo, "debug")) + demo = kits.tools.frame(margin, 10., spec, 1) + group = kits.tools.group(kits.tools.debugger(demo, "debug")) shell = kits.desktop.shell(group, connection.clientContext) @@ -22,8 +22,8 @@ def main(): # Create singletons global app, kits, connection - connection = Fresco.get_connection() - kits = Fresco.get_kits() + connection = FrescoClient.get_connection() + kits = FrescoClient.get_kits() app = DemoApp() app.run() Index: menu =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/menu,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- menu 18 Feb 2003 01:52:03 -0000 1.18 +++ menu 4 Mar 2003 05:31:46 -0000 1.19 @@ -13,15 +13,11 @@ from omniORB import CORBA, PortableServer # Import the Fresco stubs and client lib -import Fresco, Layout -import Fresco__POA -from Fresco import Label, Callback, nullAny - -# Import Python client lib -import pyfresco -from pyfresco import Babylon +import Fresco, Layout, Fresco__POA +import FrescoClient +from FrescoClient import Label, Callback, nullAny, Babylon -class MenuKitImpl (Fresco__POA.MenuKit): +class MenuKitImpl(Fresco__POA.MenuKit): """Pretend kit that builds menu objects""" def menu_bar(self): """Returns a menubar object""" @@ -44,7 +40,7 @@ if not isinstance(obj, class_obj): raise TypeError, "Not local object" return obj -class MenuItem (pyfresco.PyController): +class MenuItem (FrescoClient.Controller): """Encapsulates a Menu item with label and optional submenu and callback. TODO: provide api to close all parent popups once an item is selected.""" def __init__(self, root, label, orient, submenu=None, callback=None): @@ -70,7 +66,7 @@ # Construct the dynamic frame that shows when in focus or not fspec_out = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.5) fspec_none = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.none, 1.0) - self.frame = kits.tool.dynamic(self.button, 10., + self.frame = kits.tools.dynamic(self.button, 10., Fresco.Controller.active, fspec_out, fspec_none, 0, self._this()) self._set_body(self.frame) @@ -86,7 +82,7 @@ if self.submenu: fspec_focus = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.8) fspec_none = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.3) - tri = kits.tool.dynamic_triangle(None, + tri = kits.tools.dynamic_triangle(None, 10., Fresco.Controller.active, fspec_focus, fspec_none, 1, Fresco.ToolKit.right, self._this()) tri = kits.layout.fixed_size(tri, 140., 140.) @@ -245,7 +241,7 @@ else: to = Fresco.Vertex(lower.x, upper.y, 0.) sub._set_position(to) -class Menu (pyfresco.PyController): +class Menu (FrescoClient.Controller): """Encapsulates a vertical menu of MenuItems""" def __init__(self): "Creates menu from sequence of items" @@ -279,7 +275,7 @@ self.box = kits.layout.vbox() self._set_body(self.box) #fspec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.2) - #frame = kits.tool.frame(box, 10.0, fspec, 1) + #frame = kits.tools.frame(box, 10.0, fspec, 1) map(self._add_item, self.items) @@ -302,7 +298,7 @@ spacer_box.append_graphic(kits.layout.hfill()) fspec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.2) - frame = kits.tool.frame(spacer_box, 10.0, fspec, 1) + frame = kits.tools.frame(spacer_box, 10.0, fspec, 1) self._set_body(frame) @@ -317,8 +313,8 @@ self.button = kits.widget.button(Label("Okay"), self._get_hide_cmd()) self.vbox.append_graphic(self.button) fspec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.none, 0) - self.frame = kits.tool.frame(self.vbox, 0.0, fspec, 1) - self.group = kits.tool.group(kits.tool.rgb(self.frame, 0.8, 0.8, 0.8)) + self.frame = kits.tools.frame(self.vbox, 0.0, fspec, 1) + self.group = kits.tools.group(kits.tools.rgb(self.frame, 0.8, 0.8, 0.8)) self.window = kits.desktop.transient(self.group) self._mapper_show = kits.desktop.map(self.window, 1) self._mapper_hide = kits.desktop.map(self.window, 0) @@ -345,7 +341,7 @@ print "Failed" sys.exit(0) -class MenuApp (Fresco.App): +class MenuApp (FrescoClient.App): def run(self): def add(menu, items): for item in items: @@ -390,13 +386,13 @@ vbox = kits.layout.vbox() vbox.append_graphic(menu) - contents = kits.figure.pixmap(kits.image.create("marble.png")) + contents = kits.figure.pixmap(kits.rasters.create("marble.png")) grid = kits.layout.fixed_grid(Layout.Grid.Index(5,4)) for i in range(5*4): grid.append_graphic(contents) vbox.append_graphic(kits.layout.fixed_size(grid,6400.,4800.)) - group = kits.tool.group(vbox) + group = kits.tools.group(vbox) group.append_controller(menu) self.window = kits.desktop.shell(group, connection.clientContext) self.window._set_position(Fresco.Vertex(0, -210, 0)) @@ -418,8 +414,8 @@ def main(): # Create the singletons global app, kits, connection - connection = Fresco.get_connection() - kits = Fresco.get_kits() + connection = FrescoClient.get_connection() + kits = FrescoClient.get_kits() app = MenuApp() app.run() Index: multilogo =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/multilogo,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- multilogo 18 Feb 2003 01:52:03 -0000 1.11 +++ multilogo 4 Mar 2003 05:31:46 -0000 1.12 @@ -5,16 +5,17 @@ # Import Fresco stubs and client lib import Fresco +import FrescoClient -class DemoApp (Fresco.App): +class DemoApp (FrescoClient.App): def mk_frame(self, color): spec = Fresco.ToolKit.FrameSpec( Fresco.ToolKit.colored, apply(Fresco.Color, color)) - return kits.tool.frame(self.pixmap, 50, spec, 1) + return kits.tools.frame(self.pixmap, 50, spec, 1) def run(self): # Create a pixmap - raster = kits.image.create("berlin-48.png") - self.pixmap = kits.figure.pixmap(raster) + raster = kits.rasters.create_raster("fresco.png") + self.pixmap = kits.figures.pixmap(raster) if 1: # The elegant way to do it colors = ( @@ -30,7 +31,7 @@ # an object instance map(box.append_graphic, frames) # We can only shell a controller, so wrap the hbox in a group - group = kits.tool.group(box) + group = kits.tools.group(box) shell = kits.desktop.shell(group, connection.clientContext) # Get an iterator that points at the first graphic (frame) # Note the iterator is a reference to a server-side object @@ -49,22 +50,22 @@ else: # The simple way to do it :) pixmap = self.pixmap spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.colored, Fresco.Color(1., 0.5, 0.5, 1.)) - frame1 = tool.frame(pixmap, 50, spec, 1) + frame1 = tools.frame(pixmap, 50, spec, 1) spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.colored, Fresco.Color(0.5, 1., 0.5, 1.)) - frame2 = tool.frame(pixmap, 50, spec, 1) + frame2 = tools.frame(pixmap, 50, spec, 1) spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.colored, Fresco.Color(0.5, 0.5, 1., 1.)) - frame3 = tool.frame(pixmap, 50, spec, 1) + frame3 = tools.frame(pixmap, 50, spec, 1) spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.colored, Fresco.Color(1., 1., 0.5, 1.)) - frame4 = tool.frame(pixmap, 50, spec, 1) + frame4 = tools.frame(pixmap, 50, spec, 1) spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.colored, Fresco.Color(1., 0.5, 1., 1.)) - frame5 = tool.frame(pixmap, 50, spec, 1) + frame5 = tools.frame(pixmap, 50, spec, 1) box = layout.hbox() box.append_graphic(frame1) box.append_graphic(frame2) box.append_graphic(frame3) box.append_graphic(frame4) box.append_graphic(frame5) - group = tool.group(box) + group = tools.group(box) shell = desktop.shell(group) iterator = box.first_child_graphic() for i in [1,2,3,4,5]: @@ -85,8 +86,8 @@ def main(): # Create singletons global app, kits, connection - connection = Fresco.get_connection() - kits = Fresco.get_kits() + connection = FrescoClient.get_connection() + kits = FrescoClient.get_kits() app = DemoApp() app.run() Index: primitive =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/primitive,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- primitive 18 Feb 2003 01:52:03 -0000 1.8 +++ primitive 4 Mar 2003 05:31:46 -0000 1.9 @@ -10,12 +10,8 @@ from omniORB import CORBA # Import the Fresco stubs and client lib -import Fresco, Unidraw -import Fresco__POA -from Fresco import Label, Callback, nullAny - -# Import Fresco lib -import pyfresco +import Fresco, Unidraw, Fresco__POA +import FrescoClient class Rotator(Fresco__POA.Observer): def __init__(self, value, child, parent, axis): @@ -57,10 +53,10 @@ return Fresco.Mesh(map(scale, nodes), map(triangulate, triangles), map(normalize, normals)) -class Primitive (pyfresco.PyGraphic): +class Primitive (FrescoClient.Graphic): "Simple graphic that draws a clock" def __init__(self, w, h, d): - pyfresco.PyGraphic.__init__(self) + FrescoClient.Graphic.__init__(self) self.__width = w self.__height = h self.__depth = d @@ -88,45 +84,45 @@ dk.draw_mesh(self.__mesh) dk.restore() -class GraphicApp (Fresco.App): +class GraphicApp (FrescoClient.App): def run(self): vbox = kits.layout.vbox() - phi = kits.command.bvalue(0., 360., 0., 1., 10.) - psi = kits.command.bvalue(0., 360., 0., 1., 10.) + phi = kits.commands.bvalue(0., 360., 0., 1., 10.) + psi = kits.commands.bvalue(0., 360., 0., 1., 10.) hbox = kits.layout.hbox() hbox.append_graphic(kits.layout.hfill()) - hbox.append_graphic(kits.widget.slider(phi, Fresco.xaxis)) + hbox.append_graphic(kits.widgets.slider(phi, Fresco.xaxis)) hbox.append_graphic(kits.layout.hfill()) vbox.append_graphic(hbox) hbox = kits.layout.hbox() hbox.append_graphic(kits.layout.hfill()) - hbox.append_graphic(kits.widget.slider(psi, Fresco.xaxis)) + hbox.append_graphic(kits.widgets.slider(psi, Fresco.xaxis)) hbox.append_graphic(kits.layout.hfill()) vbox.append_graphic(hbox) #primitive = Primitive(3000., 3000., 3000.)._this() - primitive = kits.primitive.geometry(generate_mesh(300., 300., 300.)) - primitive = kits.tool.rgb(primitive, 0.6, 0.6, 1.0) - root = kits.primitive.root(Fresco.Graphic._nil) + primitive = kits.primitives.geometry(generate_mesh(300., 300., 300.)) + primitive = kits.tools.rgb(primitive, 0.6, 0.6, 1.0) + root = kits.primitives.root(Fresco.Graphic._nil) # heh, try to figure out what the next few lines do :) - transformer = kits.primitive.transformer(primitive) + transformer = kits.primitives.transformer(primitive) phi.attach(Rotator(phi, transformer, root, Fresco.zaxis)._this()) - transformer = kits.primitive.transformer(transformer) + transformer = kits.primitives.transformer(transformer) psi.attach(Rotator(psi, transformer, root, Fresco.yaxis)._this()) green = Fresco.Color(0., 1., 0., 1.) direction = Fresco.Vertex(1., 0., 0.) - light1 = kits.primitive.directional_light(transformer, green, 1., direction) + light1 = kits.primitives.directional_light(transformer, green, 1., direction) orange = Fresco.Color(0.8, 1., 0., 1.) direction = Fresco.Vertex(0., 1., 0.) - light2 = kits.primitive.directional_light(light1, green, 1., direction) + light2 = kits.primitives.directional_light(light1, green, 1., direction) violet = Fresco.Color(1., 0., 1., 1.) direction = Fresco.Vertex(0., 0., 1.) - light3 = kits.primitive.directional_light(light2, violet, 1., direction) + light3 = kits.primitives.directional_light(light2, violet, 1., direction) root._set_body(light3) vbox.prepend_graphic(kits.layout.align(root, 0., 0.)) spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.inset, 0.5) - frame = kits.tool.frame(vbox, 10., spec, 1) - group = kits.tool.group(frame) + frame = kits.tools.frame(vbox, 10., spec, 1) + group = kits.tools.group(frame) self.window = kits.desktop.shell(group, connection.clientContext) #kits.desktop.shell(kits.tool.group(TickGraphic()._this())) @@ -135,8 +131,8 @@ def main(): # Create singletons global app, kits, connection - connection = Fresco.get_connection() - kits = Fresco.get_kits() + connection = FrescoClient.get_connection() + kits = FrescoClient.get_kits() app = GraphicApp() app.run() Index: unidraw =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/unidraw,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- unidraw 18 Feb 2003 01:52:03 -0000 1.6 +++ unidraw 4 Mar 2003 05:31:46 -0000 1.7 @@ -9,8 +9,9 @@ # Import the Fresco stubs import Fresco, Unidraw +import FrescoClient -class DemoApp (Fresco.App): +class DemoApp (FrescoClient.App): def run(self): # FIXME: This is bitrotted editor = kits.unidraw.create_editor() @@ -20,8 +21,8 @@ def main(): # Create singletons global app, kits, connection - connection = Fresco.get_connection() - kits = Fresco.get_kits() + connection = FrescoClient.get_connection() + kits = FrescoClient.get_kits() app = DemoApp() app.run() Index: viewport =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/viewport,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- viewport 18 Feb 2003 01:52:03 -0000 1.5 +++ viewport 4 Mar 2003 05:31:46 -0000 1.6 @@ -10,38 +10,33 @@ # Import the Fresco stubs and client lib import Fresco, Unidraw, Layout -from Fresco import Label, Callback, nullAny -import Fresco__POA - -# Import Python client lib -import pyfresco -from pyfresco import Babylon +import FrescoClient -class Mapper (pyfresco.PyController): +class Mapper (FrescoClient.Controller): def __init__(self, xrange, yrange): - pyfresco.PyController.__init__(self, 0) + FrescoClient.Controller.__init__(self, 0) self.__xrange = xrange self.__yrange = yrange self._set_body(kits.layout.align(kits.layout.fixed_size(Fresco.Graphic._nil, 200., 200.), 0., 0.)) - panner = kits.widget.panner(xrange, yrange) + panner = kits.widgets.panner(xrange, yrange) self.__pulldown = kits.desktop.pulldown(panner) def press(self, pickTraversal, input_event): - position = pyfresco.get_position(input_event) + position = FrescoClient.get_position(input_event) self.__pulldown._set_position(position) self.__pulldown._set_mapped(1) def release(self, pickTraversal, input_event): print "Release" -class ViewportApp (Fresco.App): +class ViewportApp (FrescoClient.App): def run(self): - Fresco.App.__init__(self) - kits = Fresco.get_kits() - pixmap = kits.figure.pixmap(kits.image.create("landscape.png")) + FrescoClient.App.__init__(self) + kits = FrescoClient.get_kits() + pixmap = kits.figures.pixmap(kits.rasters.create_raster("landscape.png")) viewport = kits.layout.scrollable(pixmap) - xscroller = kits.widget.scrollbar(viewport.adjustment(Fresco.xaxis), Fresco.xaxis) - yscroller = kits.widget.scrollbar(viewport.adjustment(Fresco.yaxis), Fresco.yaxis) + xscroller = kits.widgets.scrollbar(viewport.adjustment(Fresco.xaxis), Fresco.xaxis) + yscroller = kits.widgets.scrollbar(viewport.adjustment(Fresco.yaxis), Fresco.yaxis) mapper = Mapper(viewport.adjustment(Fresco.xaxis), viewport.adjustment(Fresco.yaxis))._this() hbox1 = kits.layout.hbox() hbox1.append_graphic(viewport) @@ -54,8 +49,8 @@ vbox1.append_graphic(hbox2) spec = Fresco.ToolKit.FrameSpec(Fresco.ToolKit.outset, 0.5) - background = kits.tool.frame(vbox1, 10., spec, 1) - group = kits.tool.group(background) + background = kits.tools.frame(vbox1, 10., spec, 1) + group = kits.tools.group(background) self.window = kits.desktop.shell(group, connection.clientContext) def exit(self, any): @@ -64,8 +59,8 @@ def main(): # Create the singletons global app, kits, connection - connection = Fresco.get_connection() - kits = Fresco.get_kits() + connection = FrescoClient.get_connection() + kits = FrescoClient.get_kits() app = ViewportApp() app.run() From stefan at fresco.org Tue Mar 4 05:44:56 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:15 2005 Subject: [Fresco-changes] Fresco/Fresco-Test configure.ac,1.1,1.2 Message-ID: Update of /cvs/fresco/Fresco/Fresco-Test In directory purcel:/tmp/cvs-serv19912/Fresco-Test Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Test/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- configure.ac 19 Feb 2003 22:27:35 -0000 1.1 +++ configure.ac 4 Mar 2003 05:44:54 -0000 1.2 @@ -27,7 +27,7 @@ AC_PREREQ(2.53) AC_REVISION($Revision$) -AC_INIT(Fresco-Test, M1, devel@fresco.org) +AC_INIT(Fresco-Test, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_AUX_DIR(config) From stefan at fresco.org Tue Mar 4 05:44:56 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/GGI configure.ac,1.17,1.18 Message-ID: Update of /cvs/fresco/Fresco/GGI In directory purcel:/tmp/cvs-serv19912/GGI Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/GGI/configure.ac,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- configure.ac 10 Dec 2002 05:46:19 -0000 1.17 +++ configure.ac 4 Mar 2003 05:44:54 -0000 1.18 @@ -28,7 +28,7 @@ AC_PREREQ(2.53) AC_REVISION($Revision$) -AC_INIT(Berlin-GGI, M1, devel@fresco.org) +AC_INIT(Berlin-GGI, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER(include/Fresco/acconfig.hh:config/acconfig.hh.in) From stefan at fresco.org Tue Mar 4 05:44:57 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Prague configure.ac,1.41,1.42 Message-ID: Update of /cvs/fresco/Fresco/Prague In directory purcel:/tmp/cvs-serv19912/Prague Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Prague/configure.ac,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- configure.ac 20 Feb 2003 16:30:39 -0000 1.41 +++ configure.ac 4 Mar 2003 05:44:54 -0000 1.42 @@ -26,7 +26,7 @@ dnl ------------------------------------------------------------------ AC_PREREQ(2.53) AC_REVISION($Revision$) -AC_INIT(Prague, M1, devel@fresco.org) +AC_INIT(Prague, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER(include/Prague/acconfig.hh:config/acconfig.hh.in) From stefan at fresco.org Tue Mar 4 05:44:57 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/SDL configure.ac,1.9,1.10 Message-ID: Update of /cvs/fresco/Fresco/SDL In directory purcel:/tmp/cvs-serv19912/SDL Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/SDL/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- configure.ac 10 Dec 2002 05:46:23 -0000 1.9 +++ configure.ac 4 Mar 2003 05:44:55 -0000 1.10 @@ -28,7 +28,7 @@ AC_PREREQ(2.53) AC_REVISION($Revision$) -AC_INIT(Berlin-SDL, M1, devel@fresco.org) +AC_INIT(Berlin-SDL, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_AUX_DIR(config) From stefan at fresco.org Tue Mar 4 05:44:58 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/contrib/daVinci configure.ac,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/contrib/daVinci In directory purcel:/tmp/cvs-serv19912/contrib/daVinci Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/contrib/daVinci/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- configure.ac 10 Dec 2002 05:46:27 -0000 1.3 +++ configure.ac 4 Mar 2003 05:44:55 -0000 1.4 @@ -28,7 +28,7 @@ AC_PREREQ(2.53) AC_REVISION($Revision$) -AC_INIT(daVinci, M1, devel@fresco.org) +AC_INIT(daVinci, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_HEADER(include/daVinci/acconfig.hh:config/acconfig.hh.in) AC_CONFIG_AUX_DIR(config) From stefan at fresco.org Tue Mar 4 05:45:22 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco configure.ac,1.24,1.25 Message-ID: Update of /cvs/fresco/Fresco In directory purcel:/tmp/cvs-serv19912 Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/configure.ac,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- configure.ac 19 Feb 2003 22:36:11 -0000 1.24 +++ configure.ac 4 Mar 2003 05:44:50 -0000 1.25 @@ -27,7 +27,7 @@ AC_PREREQ(2.52) AC_REVISION($Revision$) -AC_INIT(Fresco, M1, devel@fresco.org) +AC_INIT(Fresco, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_AUX_DIR(config) From stefan at fresco.org Tue Mar 4 05:45:23 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Babylon configure.ac,1.19,1.20 Message-ID: Update of /cvs/fresco/Fresco/Babylon In directory purcel:/tmp/cvs-serv19912/Babylon Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Babylon/configure.ac,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- configure.ac 10 Dec 2002 05:46:10 -0000 1.19 +++ configure.ac 4 Mar 2003 05:44:50 -0000 1.20 @@ -30,7 +30,7 @@ AC_PREREQ(2.53) AC_REVISION($Revision$) -AC_INIT(Babylon, M1, devel@fresco.org) +AC_INIT(Babylon, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER(include/Babylon/acconfig.hh:config/acconfig.hh.in) From stefan at fresco.org Tue Mar 4 05:45:23 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Berlin configure.ac,1.61,1.62 Message-ID: Update of /cvs/fresco/Fresco/Berlin In directory purcel:/tmp/cvs-serv19912/Berlin Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/configure.ac,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- configure.ac 18 Feb 2003 21:18:11 -0000 1.61 +++ configure.ac 4 Mar 2003 05:44:50 -0000 1.62 @@ -28,7 +28,7 @@ AC_PREREQ(2.53) AC_REVISION($Revision$) -AC_INIT(Berlin, M1, devel@fresco.org) +AC_INIT(Berlin, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_HEADER(include/Berlin/acconfig.hh:config/acconfig.hh.in) AC_CONFIG_AUX_DIR(config) From stefan at fresco.org Tue Mar 4 05:45:23 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Documentation configure.ac,1.1,1.2 Message-ID: Update of /cvs/fresco/Fresco/Documentation In directory purcel:/tmp/cvs-serv19912/Documentation Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- configure.ac 22 Jan 2003 00:32:02 -0000 1.1 +++ configure.ac 4 Mar 2003 05:44:51 -0000 1.2 @@ -26,7 +26,7 @@ dnl ------------------------------------------------------------------ AC_PREREQ(2.56) AC_REVISION($Revision$) -AC_INIT(Documentation, M1, devel@fresco.org) +AC_INIT(Documentation, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_AUX_DIR(config) From stefan at fresco.org Tue Mar 4 05:45:24 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Fresco-C++ configure.ac,1.33,1.34 Message-ID: Update of /cvs/fresco/Fresco/Fresco-C++ In directory purcel:/tmp/cvs-serv19912/Fresco-C++ Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-C++/configure.ac,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- configure.ac 10 Dec 2002 05:46:12 -0000 1.33 +++ configure.ac 4 Mar 2003 05:44:51 -0000 1.34 @@ -28,7 +28,7 @@ AC_PREREQ(2.53) AC_REVISION($Revision$) -AC_INIT(Fresco-C++, M1, devel@fresco.org) +AC_INIT(Fresco-C++, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER(include/Fresco/acconfig.hh:config/acconfig.hh.in) From stefan at fresco.org Tue Mar 4 05:45:25 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Fresco-Python configure.ac,1.21,1.22 Message-ID: Update of /cvs/fresco/Fresco/Fresco-Python In directory purcel:/tmp/cvs-serv19912/Fresco-Python Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python/configure.ac,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- configure.ac 4 Mar 2003 05:30:00 -0000 1.21 +++ configure.ac 4 Mar 2003 05:44:53 -0000 1.22 @@ -27,7 +27,7 @@ AC_PREREQ(2.52) AC_REVISION($Revision$) -AC_INIT(Berlin, M1, devel@fresco.org) +AC_INIT(Berlin, M2, devel@fresco.org) AC_CONFIG_AUX_DIR(config) dnl ------------------------------------------------------------------ From stefan at fresco.org Tue Mar 4 05:45:25 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Fresco-IDL configure.ac,1.29,1.30 Message-ID: Update of /cvs/fresco/Fresco/Fresco-IDL In directory purcel:/tmp/cvs-serv19912/Fresco-IDL Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-IDL/configure.ac,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- configure.ac 10 Dec 2002 05:46:17 -0000 1.29 +++ configure.ac 4 Mar 2003 05:44:52 -0000 1.30 @@ -28,7 +28,7 @@ AC_PREREQ(2.53) AC_REVISION($Revision$) -AC_INIT(Fresco-IDL, M1, devel@fresco.org) +AC_INIT(Fresco-IDL, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_AUX_DIR(config) From stefan at fresco.org Tue Mar 4 05:45:24 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Fresco-C++-demos configure.ac,1.19,1.20 Message-ID: Update of /cvs/fresco/Fresco/Fresco-C++-demos In directory purcel:/tmp/cvs-serv19912/Fresco-C++-demos Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/configure.ac,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- configure.ac 10 Dec 2002 05:46:15 -0000 1.19 +++ configure.ac 4 Mar 2003 05:44:52 -0000 1.20 @@ -27,7 +27,7 @@ AC_PREREQ(2.53) AC_REVISION($Revision$) -AC_INIT(Fresco-Demos-C++, M1, devel@fresco.org) +AC_INIT(Fresco-Demos-C++, M2, devel@fresco.org) AC_CONFIG_SRCDIR(LICENSE) AC_CONFIG_AUX_DIR(config) From stefan at fresco.org Tue Mar 4 05:45:26 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Fresco-Python-demos configure.ac,1.15,1.16 Message-ID: Update of /cvs/fresco/Fresco/Fresco-Python-demos In directory purcel:/tmp/cvs-serv19912/Fresco-Python-demos Modified Files: configure.ac Log Message: bump version string Index: configure.ac =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/configure.ac,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- configure.ac 10 Dec 2002 05:46:19 -0000 1.15 +++ configure.ac 4 Mar 2003 05:44:53 -0000 1.16 @@ -27,7 +27,7 @@ AC_PREREQ(2.52) AC_REVISION($Revision$) -AC_INIT(Berlin, M3, devel@fresco.org) +AC_INIT(Berlin, M2, devel@fresco.org) AC_CONFIG_AUX_DIR(config) dnl ------------------------------------------------------------------ From stefan at fresco.org Tue Mar 4 06:32:56 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] web/data news.xml,1.7,1.8 releases.xml,1.4,1.5 Message-ID: Update of /cvs/fresco/web/data In directory purcel:/tmp/cvs-serv2534 Modified Files: news.xml releases.xml Log Message: new release Index: news.xml =================================================================== RCS file: /cvs/fresco/web/data/news.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- news.xml 22 Nov 2002 12:32:21 -0000 1.7 +++ news.xml 4 Mar 2003 06:32:52 -0000 1.8 @@ -1,6 +1,25 @@ + + 2003-03-04 + M2 released + this is the second milestone release + Stefan Seefeld + + + The M2 release is the first one with a release cycle as short as + three months. As such it was an experiment, and I think it was quite + a success. The milestone is released even though not all assigned bugs + could be closed in time. I think for now it's more important to send + out the signal that we are actually able to stick to such a release + cycle. May be we should be more realistic about what bugs/tasks to + assign for M3... + Find the release at our releases page. + + + + 2002-11-20 M1 released Index: releases.xml =================================================================== RCS file: /cvs/fresco/web/data/releases.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- releases.xml 22 Nov 2002 12:32:21 -0000 1.4 +++ releases.xml 4 Mar 2003 06:32:52 -0000 1.5 @@ -1,6 +1,19 @@ + 2003-03-04 + M2 + + + This release contains a lot of bug fixes, and some new features. + Fresco has been ported to Solaris and FreeBSD, a new unit testing + framework has been started, the python runtime has been fixed, + etc. + + Stefan Seefeld + + + 2002-11-20 M1 From stefan at fresco.org Tue Mar 4 19:30:37 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] web/xsl news.xsl,1.5,1.6 Message-ID: Update of /cvs/fresco/web/xsl In directory purcel:/tmp/cvs-serv24249/xsl Modified Files: news.xsl Log Message: add news page for 2003 Index: news.xsl =================================================================== RCS file: /cvs/fresco/web/xsl/news.xsl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- news.xsl 3 Oct 2002 02:43:42 -0000 1.5 +++ news.xsl 4 Mar 2003 19:30:33 -0000 1.6 @@ -228,6 +228,13 @@ + + + + From nicholas at fresco.org Sun Mar 9 22:04:19 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] web/xsl news.xsl,1.7,1.8 section.xsl,1.21,1.22 Message-ID: Update of /cvs/fresco/web/xsl In directory purcel:/tmp/cvs-serv19771 Modified Files: news.xsl section.xsl Log Message: Strange behaviour on www2. This is just a shot in the dark, really. Index: news.xsl =================================================================== RCS file: /cvs/fresco/web/xsl/news.xsl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- news.xsl 9 Mar 2003 03:29:11 -0000 1.7 +++ news.xsl 9 Mar 2003 22:04:10 -0000 1.8 @@ -104,7 +104,7 @@ @@ -323,7 +323,7 @@
2003 + + Items for 2003. +
2002 From stefan at fresco.org Tue Mar 4 19:30:37 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] web/data navigation.xml,1.14,1.15 Message-ID: Update of /cvs/fresco/web/data In directory purcel:/tmp/cvs-serv24249/data Modified Files: navigation.xml Log Message: add news page for 2003 Index: navigation.xml =================================================================== RCS file: /cvs/fresco/web/data/navigation.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- navigation.xml 21 Nov 2002 18:05:42 -0000 1.14 +++ navigation.xml 4 Mar 2003 19:30:35 -0000 1.15 @@ -21,6 +21,7 @@ + From stefan at fresco.org Tue Mar 4 19:30:38 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] web/hosts/www news2003.xml,NONE,1.1 Makefile.in,1.26,1.27 menu.xml,1.14,1.15 Message-ID: Update of /cvs/fresco/web/hosts/www In directory purcel:/tmp/cvs-serv24249/hosts/www Modified Files: Makefile.in menu.xml Added Files: news2003.xml Log Message: add news page for 2003 --- NEW FILE: news2003.xml --- News Index: Makefile.in =================================================================== RCS file: /cvs/fresco/web/hosts/www/Makefile.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Makefile.in 23 Jan 2003 08:13:24 -0000 1.26 +++ Makefile.in 4 Mar 2003 19:30:35 -0000 1.27 @@ -9,7 +9,7 @@ pages := index.html status.html screenshots.html \ news.html newsarchive.html news1998.html news1999.html \ - news2000.html news2001.html news2002.html \ + news2000.html news2001.html news2002.html news2003.html \ newsall.html contact.html people.html mailinglists.html irc.html \ introduction.html architecture.html \ docs_i.html history.html links.html license.html \ Index: menu.xml =================================================================== RCS file: /cvs/fresco/web/hosts/www/menu.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- menu.xml 21 Nov 2002 18:05:42 -0000 1.14 +++ menu.xml 4 Mar 2003 19:30:35 -0000 1.15 @@ -5,6 +5,7 @@ + From nicholas at fresco.org Tue Mar 4 20:27:38 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] web/data news.xml,1.8,1.9 Message-ID: Update of /cvs/fresco/web/data In directory purcel:/tmp/cvs-serv26761 Modified Files: news.xml Log Message: Fix link to releases page. Index: news.xml =================================================================== RCS file: /cvs/fresco/web/data/news.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- news.xml 4 Mar 2003 06:32:52 -0000 1.8 +++ news.xml 4 Mar 2003 20:27:35 -0000 1.9 @@ -15,7 +15,7 @@ out the signal that we are actually able to stick to such a release cycle. May be we should be more realistic about what bugs/tasks to assign for M3... - Find the release at our releases page. + Find the release at our releases page. @@ -32,7 +32,7 @@ with all the implications: new website and infrastructure, reworked and much enhanced source code structure, and quite a lot more. Read the or - get it from our releases page. + get it from our releases page. From stefan at fresco.org Wed Mar 5 02:02:51 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] web/hosts/issues/reports reports.xsl,1.16,1.17 Message-ID: Update of /cvs/fresco/web/hosts/issues/reports In directory purcel:/tmp/cvs-serv3598 Modified Files: reports.xsl Log Message: little fix Index: reports.xsl =================================================================== RCS file: /cvs/fresco/web/hosts/issues/reports/reports.xsl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- reports.xsl 10 Dec 2002 20:36:48 -0000 1.16 +++ reports.xsl 5 Mar 2003 02:02:48 -0000 1.17 @@ -46,7 +46,7 @@ -

Current Milestone :

+

Upcoming Milestone :

open bugs

@@ -129,6 +129,7 @@

    +
  • ()
    •
@@ -142,9 +143,9 @@ - - - + + + From stefan at fresco.org Wed Mar 5 21:25:28 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Prague/include/Prague/IPC ipcbuf.hh,1.14,1.15 mmapbuf.hh,1.4,1.5 Message-ID: Update of /cvs/fresco/Fresco/Prague/include/Prague/IPC In directory purcel:/tmp/cvs-serv1077/include/Prague/IPC Modified Files: ipcbuf.hh mmapbuf.hh Log Message: -> for standard compliance Index: ipcbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/IPC/ipcbuf.hh,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ipcbuf.hh 18 Nov 2002 14:39:56 -0000 1.14 +++ ipcbuf.hh 5 Mar 2003 21:25:25 -0000 1.15 @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Prague { Index: mmapbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/IPC/mmapbuf.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mmapbuf.hh 25 Mar 2001 08:25:16 -0000 1.4 +++ mmapbuf.hh 5 Mar 2003 21:25:25 -0000 1.5 @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Prague { From stefan at fresco.org Wed Mar 5 21:25:28 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Prague/include/Prague/Sys logbuf.hh,1.5,1.6 Message-ID: Update of /cvs/fresco/Fresco/Prague/include/Prague/Sys In directory purcel:/tmp/cvs-serv1077/include/Prague/Sys Modified Files: logbuf.hh Log Message: -> for standard compliance Index: logbuf.hh =================================================================== RCS file: /cvs/fresco/Fresco/Prague/include/Prague/Sys/logbuf.hh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- logbuf.hh 21 Mar 2001 06:28:23 -0000 1.5 +++ logbuf.hh 5 Mar 2003 21:25:26 -0000 1.6 @@ -22,7 +22,7 @@ #ifndef _logbuf_hh #define _logbuf_hh -#include +#include #include namespace Prague From tobias at fresco.org Wed Mar 5 23:28:19 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Babylon/include/Babylon Char.hh,1.12,1.13 Message-ID: Update of /cvs/fresco/Fresco/Babylon/include/Babylon In directory purcel:/tmp/cvs-serv4160/Babylon/include/Babylon Modified Files: Char.hh Log Message: More fixes for warnings about ststream.h Index: Char.hh =================================================================== RCS file: /cvs/fresco/Fresco/Babylon/include/Babylon/Char.hh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Char.hh 31 May 2002 23:42:11 -0000 1.12 +++ Char.hh 5 Mar 2003 23:28:16 -0000 1.13 @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include From tobias at fresco.org Wed Mar 5 23:28:19 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Berlin/src PNG.cc,1.10,1.11 Message-ID: Update of /cvs/fresco/Fresco/Berlin/src In directory purcel:/tmp/cvs-serv4160/Berlin/src Modified Files: PNG.cc Log Message: More fixes for warnings about ststream.h Index: PNG.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/src/PNG.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- PNG.cc 21 Feb 2003 00:36:47 -0000 1.10 +++ PNG.cc 5 Mar 2003 23:28:17 -0000 1.11 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include using namespace Prague; From tobias at fresco.org Wed Mar 5 23:31:11 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco INSTALL,1.25,1.26 Message-ID: Update of /cvs/fresco/Fresco In directory purcel:/tmp/cvs-serv4370 Modified Files: INSTALL Log Message: Mention that GCC 3.2 or later is needed now in the prerequisits section. Index: INSTALL =================================================================== RCS file: /cvs/fresco/Fresco/INSTALL,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- INSTALL 23 Dec 2002 01:06:14 -0000 1.25 +++ INSTALL 5 Mar 2003 23:31:09 -0000 1.26 @@ -19,6 +19,10 @@ packages of Fresco, you might want to try those instead of building it yourself. +YOU WILL NEED G++ VERSION 3.2 OR LATER to build Fresco. G++ 2.95.x will +not suffice. We are using ANSI C++ which is not supported well enough +on old GCC compilers. + Downloading From nicholas at fresco.org Thu Mar 6 05:03:05 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Berlin/modules/Rasters RasterKitImpl.cc,1.22,1.23 RasterKitImpl.hh,1.16,1.17 Message-ID: Update of /cvs/fresco/Fresco/Berlin/modules/Rasters In directory purcel:/tmp/cvs-serv12714 Modified Files: RasterKitImpl.cc RasterKitImpl.hh Log Message: Correct the namespace for the RasterKit. Index: RasterKitImpl.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Rasters/RasterKitImpl.cc,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- RasterKitImpl.cc 20 Feb 2003 02:36:43 -0000 1.22 +++ RasterKitImpl.cc 6 Mar 2003 05:03:02 -0000 1.23 @@ -29,7 +29,7 @@ using namespace Prague; using namespace Fresco; -using namespace Berlin::ImageKit; +using namespace Berlin::RasterKit; RasterKitImpl::RasterKitImpl(const std::string &id, const Fresco::Kit::PropertySeq &p, Index: RasterKitImpl.hh =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Rasters/RasterKitImpl.hh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- RasterKitImpl.hh 20 Feb 2003 02:36:44 -0000 1.16 +++ RasterKitImpl.hh 6 Mar 2003 05:03:02 -0000 1.17 @@ -34,7 +34,7 @@ namespace Berlin { -namespace ImageKit +namespace RasterKit { class RasterKitImpl : public virtual POA_Fresco::RasterKit, From nicholas at fresco.org Thu Mar 6 16:03:50 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Fresco-Python-demos/src clock,1.9,1.10 Message-ID: Update of /cvs/fresco/Fresco/Fresco-Python-demos/src In directory purcel:/tmp/cvs-serv11795 Modified Files: clock Log Message: Update the hour and minute hands with each motion of the second hand, like a real analog clock. Index: clock =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-Python-demos/src/clock,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- clock 4 Mar 2003 05:31:45 -0000 1.9 +++ clock 6 Mar 2003 16:03:46 -0000 1.10 @@ -106,6 +106,8 @@ # Get time times = time.localtime(time.time()) hours, mins, secs = times[3], times[4], times[5] + mins += secs / 60. + hours += mins / 60. # Hours vertices = [(-.03,.03),(0,-.6),(.03,.03),(-.03,.03)] path.nodes = map(scale, rotate(hours*circle/12, vertices)) From tobias at fresco.org Fri Mar 7 15:52:31 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Berlin/src GraphDebugger.cc,1.2,1.3 Message-ID: Update of /cvs/fresco/Fresco/Berlin/src In directory purcel:/tmp/cvs-serv10313/Berlin/src Modified Files: GraphDebugger.cc Log Message: * Remove implementation pointer from test of Graphic identity. Several Graphics may share one implementation. * use _is_equivalent instead of is_identical: The latter does produce some strange output. Index: GraphDebugger.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/src/GraphDebugger.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GraphDebugger.cc 4 Mar 2003 00:23:47 -0000 1.2 +++ GraphDebugger.cc 7 Mar 2003 15:52:29 -0000 1.3 @@ -176,8 +176,7 @@ i != my_known_graphics.end(); ++i) if (hash == i->hash && - (p == i->impl || - g->is_identical(i->graphic))) + g->_is_equivalent(i->graphic)) return *i; // we allready know this one // the graphic is unknown: register it and return a reference to it. From nicholas at fresco.org Sun Mar 9 03:29:15 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] web/xsl news.xsl,1.6,1.7 section.xsl,1.20,1.21 Message-ID: Update of /cvs/fresco/web/xsl In directory purcel:/tmp/cvs-serv18754 Modified Files: news.xsl section.xsl Log Message: Correct the style of the attributions. See Webster's Standard American Style Manual and http://www.alistapart.com/stories/emen/ Index: news.xsl =================================================================== RCS file: /cvs/fresco/web/xsl/news.xsl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- news.xsl 4 Mar 2003 19:30:33 -0000 1.6 +++ news.xsl 9 Mar 2003 03:29:11 -0000 1.7 @@ -104,7 +104,7 @@ @@ -323,7 +323,7 @@
- -- + &8212;
- -- + &8212;
Index: section.xsl =================================================================== RCS file: /cvs/fresco/web/xsl/section.xsl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- section.xsl 22 Nov 2002 12:32:21 -0000 1.20 +++ section.xsl 9 Mar 2003 03:29:12 -0000 1.21 @@ -217,7 +217,7 @@

- -- +
&8212;
 @@ -285,7 +285,7 @@

- -- +
&8212;
- &8212; +
- &8212; +
Index: section.xsl =================================================================== RCS file: /cvs/fresco/web/xsl/section.xsl,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- section.xsl 9 Mar 2003 03:29:12 -0000 1.21 +++ section.xsl 9 Mar 2003 22:04:11 -0000 1.22 @@ -217,7 +217,7 @@

-
&8212;
+
@@ -285,7 +285,7 @@

-
&8212;
+
From nicholas at fresco.org Sun Mar 9 22:25:17 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] web/xsl news.xsl,1.8,1.9 section.xsl,1.22,1.23 Message-ID: Update of /cvs/fresco/web/xsl In directory purcel:/tmp/cvs-serv21707 Modified Files: news.xsl section.xsl Log Message: How tiresome. Correct the em dash entity, take three. Index: news.xsl =================================================================== RCS file: /cvs/fresco/web/xsl/news.xsl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- news.xsl 9 Mar 2003 22:04:10 -0000 1.8 +++ news.xsl 9 Mar 2003 22:25:15 -0000 1.9 @@ -104,7 +104,7 @@ - + — @@ -323,7 +323,7 @@ - + — Index: section.xsl =================================================================== RCS file: /cvs/fresco/web/xsl/section.xsl,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- section.xsl 9 Mar 2003 22:04:11 -0000 1.22 +++ section.xsl 9 Mar 2003 22:25:15 -0000 1.23 @@ -217,7 +217,7 @@

-
+
—
@@ -285,7 +285,7 @@

-
+
—
From nicholas at fresco.org Mon Mar 10 02:42:34 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Berlin/modules/Widgets/Motif Panner.cc,1.20,1.21 Message-ID: Update of /cvs/fresco/Fresco/Berlin/modules/Widgets/Motif In directory purcel:/tmp/cvs-serv30419 Modified Files: Panner.cc Log Message: Don't leave garbage around the edge of the panner thumb. The old code was damaging an area the size of the panner control, but with an origin point at the top-left of the thumb. This change makes it damage the whole control--which may be too much. If someone wants to optimize, that may be possible. Index: Panner.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Widgets/Motif/Panner.cc,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Panner.cc 5 Jan 2003 16:21:36 -0000 1.20 +++ Panner.cc 10 Mar 2003 02:42:27 -0000 1.21 @@ -74,12 +74,12 @@ Impl_var allocation(new RegionImpl(info.allocation)); Coord lower = allocation->lower.x; Coord scale = allocation->upper.x - allocation->lower.x; - allocation->lower.x = lower + scale*_offset[xaxis].lower; - allocation->upper.x = lower + scale*_offset[xaxis].upper; + allocation->lower.x = lower + scale; + allocation->upper.x = lower + scale; lower = allocation->lower.y; scale = allocation->upper.y - allocation->lower.y; - allocation->lower.y = lower + scale*_offset[yaxis].lower; - allocation->upper.y = lower + scale*_offset[yaxis].upper; + allocation->lower.y = lower + scale; + allocation->upper.y = lower + scale; allocation->lower.z = allocation->upper.z = 0.; allocation->normalize(info.transformation); From nicholas at fresco.org Mon Mar 10 03:47:21 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Berlin/modules/Tools Switch.cc,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Berlin/modules/Tools In directory purcel:/tmp/cvs-serv31951 Modified Files: Switch.cc Log Message: Improve the Switch a little. Use need_resize instead of need_redraw. Index: Switch.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Tools/Switch.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Switch.cc 5 Jan 2003 17:54:42 -0000 1.3 +++ Switch.cc 10 Mar 2003 03:47:18 -0000 1.4 @@ -66,7 +66,7 @@ if (flag == my_on) return; my_on = flag; set(my_alternate, body()); - need_redraw(); + need_resize(); } else my_telltale = Telltale::_nil(); } @@ -77,8 +77,9 @@ bool flag = my_telltale->test(my_mask); if (flag == my_on) return; my_on = flag; + need_resize(); // FIXME race condition, see bug256. set(my_alternate, body()); - need_redraw(); + need_resize(); } void Switch::set(Graphic_ptr g1, Graphic_ptr g2) From nicholas at fresco.org Mon Mar 10 23:16:55 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/Berlin/modules/Tools Switch.cc,1.4,1.5 Message-ID: Update of /cvs/fresco/Fresco/Berlin/modules/Tools In directory purcel:/tmp/cvs-serv8731 Modified Files: Switch.cc Log Message: Remove redundant extra function call. Index: Switch.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Tools/Switch.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Switch.cc 10 Mar 2003 03:47:18 -0000 1.4 +++ Switch.cc 10 Mar 2003 23:16:52 -0000 1.5 @@ -77,7 +77,6 @@ bool flag = my_telltale->test(my_mask); if (flag == my_on) return; my_on = flag; - need_resize(); // FIXME race condition, see bug256. set(my_alternate, body()); need_resize(); } From stefan at fresco.org Wed Mar 12 00:47:14 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:16 2005 Subject: [Fresco-changes] Fresco/config openGL.m4,1.6,1.7 Message-ID: Update of /cvs/fresco/Fresco/config In directory purcel:/tmp/cvs-serv4408/config Modified Files: openGL.m4 Log Message: fix for http://issues.fresco.org/bug257 from Paul Redmond Index: openGL.m4 =================================================================== RCS file: /cvs/fresco/Fresco/config/openGL.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- openGL.m4 29 May 2002 06:49:42 -0000 1.6 +++ openGL.m4 12 Mar 2003 00:47:11 -0000 1.7 @@ -31,7 +31,7 @@ GL_CPPFLAGS=-I$opengl_prefix/include fi save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$GL_CFLAGS $CPPFLAGS" + CPPFLAGS="$GL_CPPFLAGS $CPPFLAGS" AC_CHECK_HEADER(GL/gl.h,,no_gl=yes) CPPFLAGS="$save_CPPFLAGS" @@ -52,7 +52,7 @@ AC_SUBST(HAVE_GL, 0) else AC_SUBST(HAVE_GL, 1) - AC_SUBST(GL_CPPFLAGS, "$GL_CFLAGS") + AC_SUBST(GL_CPPFLAGS, "$GL_CPPFLAGS") AC_SUBST(GL_LIBS, "$GL_LIBS -lGL -lGLU") fi ]) From tobias at fresco.org Wed Mar 12 17:45:40 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:16:17 2005 Subject: [Fresco-changes] Fresco/Berlin/src GraphDebugger.cc,1.3,1.4 Message-ID: Update of /cvs/fresco/Fresco/Berlin/src In directory purcel:/tmp/cvs-serv8931 Modified Files: GraphDebugger.cc Log Message: Forgot a newline. Index: GraphDebugger.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/src/GraphDebugger.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GraphDebugger.cc 7 Mar 2003 15:52:29 -0000 1.3 +++ GraphDebugger.cc 12 Mar 2003 17:45:38 -0000 1.4 @@ -105,6 +105,7 @@ { Fresco::Transform::Matrix m; t->store_matrix(m); + out << "\\n"; out << "[" << m[0][0] << ", " << m[0][1] << ", " << m[0][2] << ", " << m[0][3] << "]\\n"; out << "[" << m[1][0] << ", " << m[1][1] << ", " From tobias at fresco.org Wed Mar 12 23:29:32 2003 From: tobias at fresco.org (Tobias Hunger) Date: Fri Feb 25 22:16:17 2005 Subject: [Fresco-changes] web/data links.xml,1.43,1.44 Message-ID: Update of /cvs/fresco/web/data In directory purcel:/tmp/cvs-serv17865 Modified Files: links.xml Log Message: Add link to opencroquet. The tutorial is really nice. Index: links.xml =================================================================== RCS file: /cvs/fresco/web/data/links.xml,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- links.xml 15 Feb 2003 20:58:17 -0000 1.43 +++ links.xml 12 Mar 2003 23:29:28 -0000 1.44 @@ -1,125 +1,125 @@ - - - - - - index.html - Home - Main page - - - cvs.html [...1217 lines suppressed...] + + http://www.opencroquet.org/ + OpenCroquet + A Squeak-based 3D GUI system from the guy that brought us Smalltalk + (and others of course;-). They have a very nice PDF tutorial. + + + + + + + ftp://ftp.altlinux.ru/pub/distributions/ALTLinux/Sisyphus/i586/Mandrake/RPMS/Berlin-0.2.2-alt1.i586.rpm + RPM + + + + ftp://ftp.altlinux.ru/pub/distributions/ALTLinux/Sisyphus/SRPMS/Berlin-0.2.2-alt1.src.rpm + RPMS + + From nicholas at fresco.org Sat Mar 15 01:29:53 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:17 2005 Subject: [Fresco-changes] Fresco/Berlin/src PNG.cc,1.11,1.12 Message-ID: Update of /cvs/fresco/Fresco/Berlin/src In directory purcel:/tmp/cvs-serv28527 Modified Files: PNG.cc Log Message: Perform colour conversion for one-pixel lookups. http://issues.fresco.org/bug65 Index: PNG.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/src/PNG.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- PNG.cc 5 Mar 2003 23:28:17 -0000 1.11 +++ PNG.cc 15 Mar 2003 01:29:50 -0000 1.12 @@ -305,13 +305,24 @@ } else { - if (_rinfo->color_type != rgbalpha) std::cerr << "wrong color type : " << (int) _rinfo->color_type << std::endl; - if (_rinfo->bit_depth != 8) std::cerr << "wrong depth : " << (int) _rinfo->bit_depth << std::endl; - const unsigned char *pixel = rows[y] + 4*x; + unsigned char *pixel = 0; + unsigned char *buffer = 0; + if (_rinfo->color_type != rgbalpha) pixel = buffer = new unsigned char[4]; + + switch (_rinfo->color_type) + { + case palette: palette_to_rgbalpha(rows[y] + x, rows[y] + x+1, buffer); break; + case gray: gray_to_rgbalpha(rows[y] + x, rows[y] + x+1, buffer); break; + case grayalpha: grayalpha_to_rgbalpha(rows[y] + 2*x, rows[y] + 2*(x+1), buffer); break; + case rgb: rgb_to_rgbalpha(rows[y] + 3*x, rows[y] + 3*(x+1), buffer); break; + default: pixel = rows[y] + 4*x; + } + color.red = static_cast(*pixel) / 255; color.green = static_cast(*(pixel + 1)) / 255; color.blue = static_cast(*(pixel + 2)) / 255; color.alpha = static_cast(*(pixel + 3)) / 255; + delete [] buffer; } return color; } From nicholas at fresco.org Thu Mar 20 22:14:57 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:17 2005 Subject: [Fresco-changes] Fresco/Berlin/modules/Figures FigureImpl.cc,1.25,1.26 Message-ID: Update of /cvs/fresco/Fresco/Berlin/modules/Figures In directory purcel:/tmp/cvs-serv32437/Berlin/modules/Figures Modified Files: FigureImpl.cc Log Message: Remove silly debugging information. Index: FigureImpl.cc =================================================================== RCS file: /cvs/fresco/Fresco/Berlin/modules/Figures/FigureImpl.cc,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- FigureImpl.cc 18 Feb 2003 21:21:54 -0000 1.25 +++ FigureImpl.cc 20 Mar 2003 22:14:50 -0000 1.26 @@ -189,9 +189,6 @@ extension(info, Region_var(region->_this())); if (traversal->intersects_region(Region_var(region->_this()))) { - std::cout << "FigureImpl::draw with " << _path->nodes.length() << " vertices" << std::endl; - for (size_t i = 0; i != _path->nodes.length(); ++i) - std::cout << _path->nodes[i].x << ' ' << _path->nodes[i].y << std::endl; DrawingKit_var drawing = traversal->drawing(); Color color = drawing->foreground(); drawing->save(); From nicholas at fresco.org Thu Mar 20 22:16:04 2003 From: nicholas at fresco.org (Nick Lewycky) Date: Fri Feb 25 22:16:17 2005 Subject: [Fresco-changes] Fresco/Fresco-IDL/share/idl/Fresco DrawingKit.idl,1.20,1.21 Message-ID: Update of /cvs/fresco/Fresco/Fresco-IDL/share/idl/Fresco In directory purcel:/tmp/cvs-serv32603/Fresco-IDL/share/idl/Fresco Modified Files: DrawingKit.idl Log Message: Fix spelling mistake in documentation. Index: DrawingKit.idl =================================================================== RCS file: /cvs/fresco/Fresco/Fresco-IDL/share/idl/Fresco/DrawingKit.idl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- DrawingKit.idl 29 May 2002 06:57:01 -0000 1.20 +++ DrawingKit.idl 20 Mar 2003 22:16:01 -0000 1.21 @@ -45,23 +45,23 @@ //. All values are given in 1/64th of a pixel struct FontMetrics { - long ascender; //.< Ascender in 26.6 frac. pixels - long descender; //.< Descender in 26.6 frac. pixels - long height; //.< Text height in 26.6 frac. pixels - long max_advance; //.< Max. horizontal advance, in 26.6 pixels + long ascender; //.< Ascender in 26.6 frac. pixels + long descender; //.< Descender in 26.6 frac. pixels + long height; //.< Text height in 26.6 frac. pixels + long max_advance; //.< Max. horizontal advance, in 26.6 pixels }; - + //. All values are given in 1/64th of a pixel struct GlyphMetrics { - long width; //.< Glyph width - long height; //.< Glyph height - long horiBearingX; //.< Left side bearing in horizontal layouts - long horiBearingY; //.< Top side bearing in horizontal layouts - long horiAdvance; //.< Advance width for horizontal layout - long vertBearingX; //.< Left side bearing in vertical layouts - long vertBearingY; //.< Top side bearing in vertical layouts - long vertAdvance; //.< Advance height for vertical layout + long width; //.< Glyph width + long height; //.< Glyph height + long horiBearingX; //.< Left side bearing in horizontal layouts + long horiBearingY; //.< Top side bearing in horizontal layouts + long horiAdvance; //.< Advance width for horizontal layout + long vertBearingX; //.< Left side bearing in vertical layouts + long vertBearingY; //.< Top side bearing in vertical layouts + long vertAdvance; //.< Advance height for vertical layout }; //. Matrix to derive arbitrary quadrics from circle segments //. FIXME: What's that? @@ -129,7 +129,7 @@ //. Return the resolution for the given Axis. Coord resolution(in Axis a); //. Draws a given Path. - //. FIXME: Which restrictions need to apply for pathes/polygones? + //. FIXME: Which restrictions need to apply for paths/polygons? //. Direction? Convex? Simple? void draw_path(in Path p); // void drawPatch(in Patch p); From stefan at fresco.org Sun Mar 23 19:19:51 2003 From: stefan at fresco.org (Stefan Seefeld) Date: Fri Feb 25 22:16:17 2005 Subject: [Fresco-changes] Fresco/Documentation/src book.xml,1.8,1.9 control-graph.xml,1.6,1.7 hello.xml,1.14,1.15 kits.xml,1.7,1.8 Message-ID: Update of /cvs/fresco/Fresco/Documentation/src In directory purcel:/tmp/cvs-serv10841 Modified Files: book.xml control-graph.xml hello.xml kits.xml Log Message: prefer svg imagedata over png, if ever possible Index: book.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/book.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- book.xml 21 Jan 2003 07:45:32 -0000 1.8 +++ book.xml 23 Mar 2003 19:19:43 -0000 1.9 @@ -1,5 +1,5 @@ Index: control-graph.xml =================================================================== RCS file: /cvs/fresco/Fresco/Documentation/src/control-graph.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- control-graph.xml 28 Jan 2003 18:44:34 -0000 1.6 +++ control-graph.xml 23 Mar 2003 19:19:43 -0000 1.7 @@ -207,26 +207,26 @@ represents a "trail" or "path" to the currently traversed graphic. We need to create a "snapshot" of this trail at the hit graphic. This is done by calling hit on the PickTraversal, resulting in a memento being created. -
+
scene + + + - - -
-
+
scene graph corresponding to the snapshot in ... + + + - - -
Imagine the mouse to click on the red polygon. This will result in @@ -242,15 +2