diff -Nur Fresco-040202/Babylon/include/Babylon/internal/CVS/Entries Fresco-040208/Babylon/include/Babylon/internal/CVS/Entries --- Fresco-040202/Babylon/include/Babylon/internal/CVS/Entries Mon Feb 2 00:07:24 2004 +++ Fresco-040208/Babylon/include/Babylon/internal/CVS/Entries Sun Feb 8 00:07:00 2004 @@ -3,5 +3,5 @@ /Blocks.hh/1.3/Tue Dec 30 00:05:14 2003// /Dictionary.hh/1.2/Tue Dec 30 00:05:14 2003// /utfstrings.hh/1.2/Tue Dec 30 00:05:14 2003// -/utils.hh/1.2/Tue Dec 30 00:05:15 2003// +/utils.hh/1.3/Sun Feb 8 00:05:14 2004// D diff -Nur Fresco-040202/Babylon/include/Babylon/internal/utils.hh Fresco-040208/Babylon/include/Babylon/internal/utils.hh --- Fresco-040202/Babylon/include/Babylon/internal/utils.hh Mon Feb 2 00:07:24 2004 +++ Fresco-040208/Babylon/include/Babylon/internal/utils.hh Sun Feb 8 00:07:00 2004 @@ -1,4 +1,4 @@ -/*$Id: utils.hh,v 1.2 2003/12/29 08:42:43 tobias Exp $ +/*$Id: utils.hh,v 1.3 2004/02/07 23:43:26 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999-2003 Tobias Hunger @@ -259,7 +259,7 @@ // max_current >= over_it.start result.push_back(current); - // Insert over_it (we allways need to do this!) + // Insert over_it (we always need to do this!) result.push_back(*over_it); // over_it reaches into the next base_it: diff -Nur Fresco-040202/Babylon/src/CVS/Entries Fresco-040208/Babylon/src/CVS/Entries --- Fresco-040202/Babylon/src/CVS/Entries Mon Feb 2 00:07:25 2004 +++ Fresco-040208/Babylon/src/CVS/Entries Sun Feb 8 00:07:00 2004 @@ -5,8 +5,8 @@ /String.cc/1.14/Tue Dec 30 00:05:25 2003// /exceptions.cc/1.2/Tue Dec 30 00:05:25 2003// /traits.cc/1.3/Tue Dec 30 00:05:25 2003// -/utils.cc/1.16/Tue Dec 30 00:05:25 2003// /Makefile.in/1.31/Thu Jan 8 00:05:16 2004// /Char.cc/1.12/Wed Jan 14 00:05:15 2004// /Dictionary.cc/1.20/Mon Feb 2 00:05:17 2004// +/utils.cc/1.17/Sun Feb 8 00:05:14 2004// D diff -Nur Fresco-040202/Babylon/src/utils.cc Fresco-040208/Babylon/src/utils.cc --- Fresco-040202/Babylon/src/utils.cc Mon Feb 2 00:07:25 2004 +++ Fresco-040208/Babylon/src/utils.cc Sun Feb 8 00:07:01 2004 @@ -1,4 +1,4 @@ -/*$Id: utils.cc,v 1.16 2003/12/29 08:42:48 tobias Exp $ +/*$Id: utils.cc,v 1.17 2004/02/07 23:43:26 tobias Exp $ * * This source file is a part of the Berlin Project. * Copyright (C) 2000 Tobias Hunger @@ -257,7 +257,7 @@ // current.length can't become < 0 as max_current >= over_it.start result.push_back(current); - // Insert over_it (we allways need to do this!) + // Insert over_it (we always need to do this!) result.push_back(*over_it); // over_it reaches into the next base_it: diff -Nur Fresco-040202/Berlin/autom4te.cache/output.0 Fresco-040208/Berlin/autom4te.cache/output.0 --- Fresco-040202/Berlin/autom4te.cache/output.0 Mon Feb 2 00:07:31 2004 +++ Fresco-040208/Berlin/autom4te.cache/output.0 Sun Feb 8 00:07:06 2004 @@ -4936,7 +4936,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $LIBS" +LIBS="-lGLU -lGL $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" diff -Nur Fresco-040202/Berlin/autom4te.cache/traces.0 Fresco-040208/Berlin/autom4te.cache/traces.0 --- Fresco-040202/Berlin/autom4te.cache/traces.0 Mon Feb 2 00:07:31 2004 +++ Fresco-040208/Berlin/autom4te.cache/traces.0 Sun Feb 8 00:07:06 2004 @@ -209,7 +209,7 @@ m4trace:configure.ac:92: -1- AC_SUBST([LIBART_LIBS]) m4trace:configure.ac:92: -1- AC_SUBST([HAVE_LIBART], [0]) m4trace:configure.ac:97: -1- AC_CHECK_LIB([GL], [glLoadIdentity], [:], [no_gl=yes]) -m4trace:configure.ac:97: -1- AC_CHECK_LIB([GLU], [gluNewTess], [:], [no_gl=yes]) +m4trace:configure.ac:97: -1- AC_CHECK_LIB([GLU], [gluNewTess], [:], [no_gl=yes], [-lGL]) m4trace:configure.ac:97: -1- AC_SUBST([HAVE_GL], [0]) m4trace:configure.ac:97: -1- AC_SUBST([HAVE_GL], [1]) m4trace:configure.ac:97: -1- AC_SUBST([GL_CPPFLAGS], ["$GL_CPPFLAGS"]) diff -Nur Fresco-040202/Berlin/config/aclocal.m4 Fresco-040208/Berlin/config/aclocal.m4 --- Fresco-040202/Berlin/config/aclocal.m4 Mon Feb 2 00:07:25 2004 +++ Fresco-040208/Berlin/config/aclocal.m4 Sun Feb 8 00:07:01 2004 @@ -683,7 +683,7 @@ save_LDFLAGS="$LDFLAGS" LDFLAGS="$GL_LIBS $LDFLAGS" AC_CHECK_LIB(GL, glLoadIdentity, :, no_gl=yes) - AC_CHECK_LIB(GLU, gluNewTess, :, no_gl=yes) + AC_CHECK_LIB(GLU, gluNewTess, :, no_gl=yes, [-lGL]) LDFLAGS="$save_LDFLAGS" fi diff -Nur Fresco-040202/Berlin/configure Fresco-040208/Berlin/configure --- Fresco-040202/Berlin/configure Mon Feb 2 00:07:32 2004 +++ Fresco-040208/Berlin/configure Sun Feb 8 00:07:06 2004 @@ -4936,7 +4936,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $LIBS" +LIBS="-lGLU -lGL $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" diff -Nur Fresco-040202/Berlin/include/Berlin/CVS/Entries Fresco-040208/Berlin/include/Berlin/CVS/Entries --- Fresco-040202/Berlin/include/Berlin/CVS/Entries Mon Feb 2 00:07:26 2004 +++ Fresco-040208/Berlin/include/Berlin/CVS/Entries Sun Feb 8 00:07:01 2004 @@ -22,7 +22,6 @@ /EventManager.hh/1.23/Tue Dec 30 00:05:27 2003// /FilterImpl.hh/1.7/Tue Dec 30 00:05:27 2003// /FocusImpl.hh/1.20/Tue Dec 30 00:05:27 2003// -/GapBuffer.hh/1.12/Tue Dec 30 00:05:27 2003// /Geometry.hh/1.11/Tue Dec 30 00:05:27 2003// /GraphDebugger.hh/1.3/Tue Dec 30 00:05:27 2003// /GraphicDictionary.hh/1.2/Tue Dec 30 00:05:27 2003// @@ -39,7 +38,6 @@ /ObjectVar.hh/1.4/Tue Dec 30 00:05:28 2003// /ObserverImpl.hh/1.4/Tue Dec 30 00:05:28 2003// /PNG.hh/1.7/Tue Dec 30 00:05:28 2003// -/PickTraversalImpl.hh/1.35/Tue Dec 30 00:05:28 2003// /PolyGraphic.hh/1.25/Tue Dec 30 00:05:28 2003// /Pool.hh/1.7/Tue Dec 30 00:05:28 2003// /PositionalFocus.hh/1.17/Tue Dec 30 00:05:28 2003// @@ -60,5 +58,7 @@ /TraversalImpl.hh/1.28/Tue Dec 30 00:05:29 2003// /Vertex.hh/1.9/Tue Dec 30 00:05:29 2003// /ViewImpl.hh/1.4/Tue Dec 30 00:05:29 2003// -/Console.hh/1.34/Wed Jan 14 00:05:17 2004// /QuadTree.hh/1.22/Wed Jan 14 00:05:19 2004// +/Console.hh/1.35/Sun Feb 8 00:05:14 2004// +/GapBuffer.hh/1.13/Sun Feb 8 00:05:14 2004// +/PickTraversalImpl.hh/1.36/Sun Feb 8 00:05:14 2004// diff -Nur Fresco-040202/Berlin/include/Berlin/Console.hh Fresco-040208/Berlin/include/Berlin/Console.hh --- Fresco-040202/Berlin/include/Berlin/Console.hh Mon Feb 2 00:07:26 2004 +++ Fresco-040208/Berlin/include/Berlin/Console.hh Sun Feb 8 00:07:01 2004 @@ -1,4 +1,4 @@ -/*$Id: Console.hh,v 1.34 2004/01/13 22:34:20 tobias Exp $ +/*$Id: Console.hh,v 1.35 2004/02/07 23:43:27 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 2000 Stefan Seefeld @@ -260,13 +260,13 @@ virtual Fresco::Raster_ptr raster() = 0; //. Move the pointer to the given Pixelcoordinate. virtual void move(Fresco::Coord, Fresco::Coord) = 0; - //. FIXME: Missing documentation! + //. Draw the pointer. virtual void draw() = 0; - //. FIXME: Missing documentation! + //. Save the pointer. virtual void save() = 0; - //. FIXME: Missing documentation! + //. Restore the pointer. virtual void restore() = 0; - //. FIXME: Missing documentation! + //. Return if the pointer intersects with the given coordinates. virtual bool intersects(Fresco::Coord, Fresco::Coord, Fresco::Coord, Fresco::Coord) = 0; }; diff -Nur Fresco-040202/Berlin/include/Berlin/GapBuffer.hh Fresco-040208/Berlin/include/Berlin/GapBuffer.hh --- Fresco-040202/Berlin/include/Berlin/GapBuffer.hh Mon Feb 2 00:07:26 2004 +++ Fresco-040208/Berlin/include/Berlin/GapBuffer.hh Sun Feb 8 00:07:02 2004 @@ -1,4 +1,4 @@ -/*$Id: GapBuffer.hh,v 1.12 2003/12/29 08:42:50 tobias Exp $ +/*$Id: GapBuffer.hh,v 1.13 2004/02/07 23:36:41 tobias Exp $ * * This source file is a part of the Berlin Project. * Copyright (C) 1999 Stefan Seefeld @@ -95,7 +95,11 @@ } void backward() { - if (my_cursor == my_gapend) my_cursor -= gap(); + if (my_cursor == my_gapend) + if (gap()) + my_cursor -= gap(); + else + my_cursor--; else if (cursor() > begin()) my_cursor--; } void shift(size_type d) diff -Nur Fresco-040202/Berlin/include/Berlin/PickTraversalImpl.hh Fresco-040208/Berlin/include/Berlin/PickTraversalImpl.hh --- Fresco-040202/Berlin/include/Berlin/PickTraversalImpl.hh Mon Feb 2 00:07:26 2004 +++ Fresco-040208/Berlin/include/Berlin/PickTraversalImpl.hh Sun Feb 8 00:07:02 2004 @@ -1,4 +1,4 @@ -/*$Id: PickTraversalImpl.hh,v 1.35 2003/12/29 08:42:50 tobias Exp $ +/*$Id: PickTraversalImpl.hh,v 1.36 2004/02/07 23:43:27 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999, 2000 Stefan Seefeld @@ -93,7 +93,7 @@ Fresco::PickTraversal_var my_this; }; - //. remove one controller level from the top, it might have got out of scope + //. remove one controller level from the top, it might have gone out of scope inline void PickTraversalImpl::pop_controller() { Prague::Trace trace("PickTraversal::pop_controller"); diff -Nur Fresco-040202/Berlin/modules/Commands/CVS/Entries Fresco-040208/Berlin/modules/Commands/CVS/Entries --- Fresco-040202/Berlin/modules/Commands/CVS/Entries Mon Feb 2 00:07:26 2004 +++ Fresco-040208/Berlin/modules/Commands/CVS/Entries Sun Feb 8 00:07:02 2004 @@ -13,6 +13,6 @@ /StreamBufferImpl.hh/1.9/Tue Dec 30 00:05:30 2003// /TelltaleImpl.cc/1.13/Tue Dec 30 00:05:30 2003// /TelltaleImpl.hh/1.10/Tue Dec 30 00:05:30 2003// -/TextBufferImpl.cc/1.14/Tue Dec 30 00:05:30 2003// /TextBufferImpl.hh/1.12/Tue Dec 30 00:05:30 2003// +/TextBufferImpl.cc/1.15/Sun Feb 8 00:05:14 2004// D diff -Nur Fresco-040202/Berlin/modules/Commands/TextBufferImpl.cc Fresco-040208/Berlin/modules/Commands/TextBufferImpl.cc --- Fresco-040202/Berlin/modules/Commands/TextBufferImpl.cc Mon Feb 2 00:07:26 2004 +++ Fresco-040208/Berlin/modules/Commands/TextBufferImpl.cc Sun Feb 8 00:07:02 2004 @@ -1,4 +1,4 @@ -/*$Id: TextBufferImpl.cc,v 1.14 2003/12/29 08:03:20 tobias Exp $ +/*$Id: TextBufferImpl.cc,v 1.15 2004/02/07 23:43:28 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999 Stefan Seefeld @@ -120,7 +120,7 @@ void Berlin::CommandKit::TextBufferImpl::shift(CORBA::Long d) { - Prague::Trace trace("TextBufferImpl::size()"); + Prague::Trace trace("TextBufferImpl::shift(...)"); Fresco::TextBuffer::Change ch; { Prague::Guard guard(my_mutex); diff -Nur Fresco-040202/Berlin/modules/Text/CVS/Entries Fresco-040208/Berlin/modules/Text/CVS/Entries --- Fresco-040202/Berlin/modules/Text/CVS/Entries Mon Feb 2 00:07:27 2004 +++ Fresco-040208/Berlin/modules/Text/CVS/Entries Sun Feb 8 00:07:03 2004 @@ -4,7 +4,6 @@ /Composition.cc/1.12/Tue Dec 30 00:05:37 2003// /Composition.hh/1.9/Tue Dec 30 00:05:37 2003// /Compositor.cc/1.10/Tue Dec 30 00:05:37 2003// -/Compositor.hh/1.12/Tue Dec 30 00:05:37 2003// /Strut.hh/1.6/Tue Dec 30 00:05:37 2003// /TerminalView.cc/1.15/Tue Dec 30 00:05:37 2003// /TerminalView.hh/1.11/Tue Dec 30 00:05:37 2003// @@ -12,6 +11,7 @@ /TextChunk.hh/1.18/Tue Dec 30 00:05:37 2003// /TextKitImpl.cc/1.43/Tue Dec 30 00:05:37 2003// /TextKitImpl.hh/1.31/Tue Dec 30 00:05:37 2003// -/TextViewer.cc/1.28/Tue Dec 30 00:05:37 2003// /TextViewer.hh/1.19/Tue Dec 30 00:05:37 2003// +/Compositor.hh/1.13/Sun Feb 8 00:05:14 2004// +/TextViewer.cc/1.29/Sun Feb 8 00:05:14 2004// D diff -Nur Fresco-040202/Berlin/modules/Text/Compositor.hh Fresco-040208/Berlin/modules/Text/Compositor.hh --- Fresco-040202/Berlin/modules/Text/Compositor.hh Mon Feb 2 00:07:27 2004 +++ Fresco-040208/Berlin/modules/Text/Compositor.hh Sun Feb 8 00:07:03 2004 @@ -1,4 +1,4 @@ -/*$Id: Compositor.hh,v 1.12 2003/12/29 08:43:01 tobias Exp $ +/*$Id: Compositor.hh,v 1.13 2004/02/07 23:43:28 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999 Graydon Hoare @@ -78,7 +78,7 @@ Fresco::Graphic::Requisition my_requisition; }; - //. top to button compositor -- aligns horicontally, tiles top to + //. top to button compositor -- aligns horizontally, tiles top to //. bottom for now it ignores the DrawingKit parameter and does no //. compensation no line breaking. class TBCompositor : public Compositor diff -Nur Fresco-040202/Berlin/modules/Text/TextViewer.cc Fresco-040208/Berlin/modules/Text/TextViewer.cc --- Fresco-040202/Berlin/modules/Text/TextViewer.cc Mon Feb 2 00:07:27 2004 +++ Fresco-040208/Berlin/modules/Text/TextViewer.cc Sun Feb 8 00:07:04 2004 @@ -1,7 +1,7 @@ -/*$Id: TextViewer.cc,v 1.28 2003/12/29 08:43:01 tobias Exp $ +/*$Id: TextViewer.cc,v 1.29 2004/02/07 23:43:28 tobias Exp $ * * This source file is a part of the Fresco Project. - * Copyright (C) 1999 Graydon Hoare + * Copyright (C) 1999 Graydon Hoare * Copyright (C) 1999 Stefan Seefeld * Copyright (C) 2000 Nathaniel Smith * http://www.fresco.org diff -Nur Fresco-040202/Berlin/modules/Tools/CVS/Entries Fresco-040208/Berlin/modules/Tools/CVS/Entries --- Fresco-040202/Berlin/modules/Tools/CVS/Entries Mon Feb 2 00:07:27 2004 +++ Fresco-040208/Berlin/modules/Tools/CVS/Entries Sun Feb 8 00:07:04 2004 @@ -22,7 +22,6 @@ /Switch.hh/1.3/Tue Dec 30 00:05:40 2003// /Terminal.cc/1.12/Tue Dec 30 00:05:40 2003// /Terminal.hh/1.8/Tue Dec 30 00:05:40 2003// -/TextInput.cc/1.16/Tue Dec 30 00:05:40 2003// /TextInput.hh/1.8/Tue Dec 30 00:05:41 2003// /Toggle.cc/1.12/Tue Dec 30 00:05:41 2003// /Toggle.hh/1.8/Tue Dec 30 00:05:41 2003// @@ -32,4 +31,5 @@ /Triangle.hh/1.7/Tue Dec 30 00:05:41 2003// /TriggerImpl.cc/1.16/Tue Dec 30 00:05:41 2003// /TriggerImpl.hh/1.10/Tue Dec 30 00:05:41 2003// +/TextInput.cc/1.17/Sun Feb 8 00:05:14 2004// D diff -Nur Fresco-040202/Berlin/modules/Tools/TextInput.cc Fresco-040208/Berlin/modules/Tools/TextInput.cc --- Fresco-040202/Berlin/modules/Tools/TextInput.cc Mon Feb 2 00:07:28 2004 +++ Fresco-040208/Berlin/modules/Tools/TextInput.cc Sun Feb 8 00:07:04 2004 @@ -1,4 +1,4 @@ -/*$Id: TextInput.cc,v 1.16 2003/12/29 08:43:04 tobias Exp $ +/*$Id: TextInput.cc,v 1.17 2004/02/07 23:37:27 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 2000 Stefan Seefeld @@ -36,11 +36,25 @@ Trace trace("TextInput::key_press"); const Input::Toggle &toggle = event[0].attr.selection(); Babylon::Char uc(static_cast(toggle.number)); + switch (toggle.number) { case Babylon::UC_BACKSPACE: my_buffer->remove_backward(1); break; // backspace + case Babylon::UC_DELETE: + my_buffer->remove_forward(1); + break; // delete +#if 1 + case Babylon::UC_KEY_CURSOR_UP: + case Babylon::UC_KEY_HOME: + my_buffer->position(0); + break; // up/home + case Babylon::UC_KEY_CURSOR_DOWN: + case Babylon::UC_KEY_END: + my_buffer->position(my_buffer->size()); + break; // down/end +#endif case Babylon::UC_KEY_CURSOR_LEFT: my_buffer->backward(); break; // left diff -Nur Fresco-040202/Berlin/src/CVS/Entries Fresco-040208/Berlin/src/CVS/Entries --- Fresco-040202/Berlin/src/CVS/Entries Mon Feb 2 00:07:30 2004 +++ Fresco-040208/Berlin/src/CVS/Entries Sun Feb 8 00:07:06 2004 @@ -13,7 +13,6 @@ /EventManager.cc/1.36/Tue Dec 30 00:05:43 2003// /FilterImpl.cc/1.6/Tue Dec 30 00:05:43 2003// /GLUT.cc/1.8/Tue Dec 30 00:05:43 2003// -/GraphicImpl.cc/1.60/Tue Dec 30 00:05:44 2003// /IdentifiableImpl.cc/1.8/Tue Dec 30 00:05:44 2003// /KitImpl.cc/1.15/Tue Dec 30 00:05:44 2003// /Logger.cc/1.8/Tue Dec 30 00:05:44 2003// @@ -39,4 +38,5 @@ /GraphicDictionary.cc/1.4/Wed Jan 14 00:05:25 2004// /PNG.cc/1.15/Wed Jan 14 00:05:26 2004// /ServerImpl.cc/1.14/Wed Jan 14 00:05:26 2004// +/GraphicImpl.cc/1.61/Sun Feb 8 00:05:15 2004// D diff -Nur Fresco-040202/Berlin/src/GraphicImpl.cc Fresco-040208/Berlin/src/GraphicImpl.cc --- Fresco-040202/Berlin/src/GraphicImpl.cc Mon Feb 2 00:07:31 2004 +++ Fresco-040208/Berlin/src/GraphicImpl.cc Sun Feb 8 00:07:06 2004 @@ -1,9 +1,9 @@ -/*$Id: GraphicImpl.cc,v 1.60 2003/12/29 08:43:08 tobias Exp $ +/*$Id: GraphicImpl.cc,v 1.61 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999 Stefan Seefeld * Copyright (C) 1998 Graydon Hoare - * http://www.berlin-consortium.org + * 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 diff -Nur Fresco-040202/Fresco-C++-demos/autom4te.cache/requests Fresco-040208/Fresco-C++-demos/autom4te.cache/requests --- Fresco-040202/Fresco-C++-demos/autom4te.cache/requests Mon Feb 2 00:07:41 2004 +++ Fresco-040208/Fresco-C++-demos/autom4te.cache/requests Sun Feb 8 00:07:15 2004 @@ -25,8 +25,8 @@ 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_HEADER_SYS_WAIT' => 1, 'AC_TYPE_UID_T' => 1, - 'AC_CHECK_LIB' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CHECK_LIB' => 1, 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, 'AC_FUNC_FORK' => 1, @@ -48,8 +48,8 @@ 'AC_TYPE_MODE_T' => 1, 'AC_CHECK_TYPES' => 1, 'AC_PROG_YACC' => 1, - 'AC_FUNC_STRERROR_R' => 1, 'AC_TYPE_PID_T' => 1, + 'AC_FUNC_STRERROR_R' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_TYPE_SIGNAL' => 1, @@ -84,11 +84,11 @@ 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_FUNC_FSEEKO' => 1, - 'AC_STRUCT_TM' => 1, 'AC_FUNC_MMAP' => 1, + 'AC_STRUCT_TM' => 1, 'AC_SUBST' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_PROG_CC' => 1 + 'AC_PROG_CC' => 1, + 'AC_PROG_LIBTOOL' => 1 } ], 'Request' ) ); diff -Nur Fresco-040202/Fresco-IDL/autom4te.cache/requests Fresco-040208/Fresco-IDL/autom4te.cache/requests --- Fresco-040202/Fresco-IDL/autom4te.cache/requests Mon Feb 2 00:07:38 2004 +++ Fresco-040208/Fresco-IDL/autom4te.cache/requests Sun Feb 8 00:07:14 2004 @@ -24,8 +24,8 @@ 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_HEADER_SYS_WAIT' => 1, 'AC_TYPE_UID_T' => 1, - 'AM_CONDITIONAL' => 1, 'AC_CHECK_LIB' => 1, + 'AM_CONDITIONAL' => 1, 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, 'AC_FUNC_FORK' => 1, @@ -47,8 +47,8 @@ 'AC_TYPE_MODE_T' => 1, 'AC_CHECK_TYPES' => 1, 'AC_PROG_YACC' => 1, - 'AC_TYPE_PID_T' => 1, 'AC_FUNC_STRERROR_R' => 1, + 'AC_TYPE_PID_T' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_TYPE_SIGNAL' => 1, @@ -83,11 +83,11 @@ 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_FUNC_FSEEKO' => 1, - 'AC_FUNC_MMAP' => 1, 'AC_STRUCT_TM' => 1, + 'AC_FUNC_MMAP' => 1, 'AC_SUBST' => 1, - 'AC_PROG_CC' => 1, - 'AC_PROG_LIBTOOL' => 1 + 'AC_PROG_LIBTOOL' => 1, + 'AC_PROG_CC' => 1 } ], 'Request' ), bless( [ @@ -112,8 +112,8 @@ 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_HEADER_SYS_WAIT' => 1, 'AC_TYPE_UID_T' => 1, - 'AM_CONDITIONAL' => 1, 'AC_CHECK_LIB' => 1, + 'AM_CONDITIONAL' => 1, 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, 'AC_FUNC_FORK' => 1, @@ -135,8 +135,8 @@ 'AC_TYPE_MODE_T' => 1, 'AC_CHECK_TYPES' => 1, 'AC_PROG_YACC' => 1, - 'AC_TYPE_PID_T' => 1, 'AC_FUNC_STRERROR_R' => 1, + 'AC_TYPE_PID_T' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_TYPE_SIGNAL' => 1, @@ -171,11 +171,11 @@ 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_FUNC_FSEEKO' => 1, - 'AC_FUNC_MMAP' => 1, 'AC_STRUCT_TM' => 1, + 'AC_FUNC_MMAP' => 1, 'AC_SUBST' => 1, - 'AC_PROG_CC' => 1, - 'AC_PROG_LIBTOOL' => 1 + 'AC_PROG_LIBTOOL' => 1, + 'AC_PROG_CC' => 1 } ], 'Request' ) ); diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/BoundedRange.idl Fresco-040208/Fresco-IDL/share/idl/Fresco/BoundedRange.idl --- Fresco-040202/Fresco-IDL/share/idl/Fresco/BoundedRange.idl Mon Feb 2 00:07:37 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/BoundedRange.idl Sun Feb 8 00:07:14 2004 @@ -1,4 +1,4 @@ -/*$Id: BoundedRange.idl,v 1.8 2002/05/29 06:57:01 stefan Exp $ +/*$Id: BoundedRange.idl,v 1.9 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999, 2000 Stefan Seefeld @@ -31,7 +31,7 @@ { //. A BoundedRange describes a 'range within a range' //. such as a Viewport (a 'window') manipulated by a - //. scrollbar. The 'internal' range will allways stay + //. scrollbar. The 'internal' range will always stay //. completely contained in the 'external' range. interface BoundedRange : Subject { @@ -53,10 +53,10 @@ attribute Coord step; //. The current page size. attribute Coord page; - //. The current lower bound of the 'internal' range. This is allways + //. The current lower bound of the 'internal' range. This is always //. in ]lower, uvalue]. attribute Coord lvalue; - //. The current upper bound of the 'internal' range. This is allways + //. The current upper bound of the 'internal' range. This is always //. in [lvalue, upper[. attribute Coord uvalue; diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/BoundedValue.idl Fresco-040208/Fresco-IDL/share/idl/Fresco/BoundedValue.idl --- Fresco-040202/Fresco-IDL/share/idl/Fresco/BoundedValue.idl Mon Feb 2 00:07:37 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/BoundedValue.idl Sun Feb 8 00:07:14 2004 @@ -1,4 +1,4 @@ -/*$Id: BoundedValue.idl,v 1.6 2002/05/29 06:57:01 stefan Exp $ +/*$Id: BoundedValue.idl,v 1.7 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999 Stefan Seefeld @@ -32,7 +32,7 @@ { //. A BoundedValue describes a 'value within a range' //. such as a Slider. - //. The value will allways stay contained in the range. + //. The value will always stay contained in the range. interface BoundedValue : Subject { //. The current lower bound of the range. @@ -43,7 +43,7 @@ attribute Coord step; //. The current page size. attribute Coord page; - //. The current value. It will allways be contained in ]lower, upper[. + //. The current value. It will always be contained in ]lower, upper[. attribute Coord value; //. Move the value a step forward. void forward(); diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/CVS/Entries Fresco-040208/Fresco-IDL/share/idl/Fresco/CVS/Entries --- Fresco-040202/Fresco-IDL/share/idl/Fresco/CVS/Entries Mon Feb 2 00:07:37 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/CVS/Entries Sun Feb 8 00:07:14 2004 @@ -1,10 +1,5 @@ /Allocation.idl/1.6/Wed May 29 06:57:01 2002// -/BoundedRange.idl/1.8/Wed May 29 06:57:01 2002// -/BoundedValue.idl/1.6/Wed May 29 06:57:01 2002// /Canvas.idl/1.4/Wed May 29 06:57:01 2002// -/ClientContext.idl/1.9/Wed May 29 06:57:01 2002// -/Command.idl/1.8/Wed May 29 06:57:01 2002// -/CommandKit.idl/1.11/Wed May 29 06:57:01 2002// /Controller.idl/1.10/Wed May 29 06:57:01 2002// /Desktop.idl/1.6/Wed May 29 06:57:01 2002// /DesktopKit.idl/1.9/Wed May 29 06:57:01 2002// @@ -17,12 +12,10 @@ /Font.idl/1.7/Sun Mar 2 15:13:01 2003// /FontKit.idl/1.3/Sun Mar 2 15:13:01 2003// /GadgetKit.idl/1.9/Wed May 29 06:57:01 2002// -/Graphic.idl/1.12/Wed May 29 06:57:01 2002// /Grid.idl/1.7/Wed May 29 06:57:01 2002// /Image.idl/1.7/Wed May 29 06:57:01 2002// /Input.idl/1.6/Wed May 29 06:57:01 2002// /Kit.idl/1.7/Wed May 29 06:57:01 2002// -/LayoutKit.idl/1.10/Wed May 29 06:57:01 2002// /MainController.idl/1.2/Wed May 29 06:57:01 2002// /MenuKit.idl/1.4/Wed May 29 06:57:01 2002// /Observer.idl/1.3/Wed May 29 06:57:01 2002// @@ -43,19 +36,26 @@ /TextKit.idl/1.10/Wed May 29 06:57:01 2002// /Transform.idl/1.8/Wed May 29 06:57:01 2002// /Trigger.idl/1.7/Wed Aug 7 23:11:04 2002// -/Types.idl/1.14/Wed May 29 06:57:01 2002// /UnidrawKit.idl/1.7/Wed May 29 06:57:01 2002// /View.idl/1.6/Wed May 29 06:57:01 2002// /Viewport.idl/1.9/Wed May 29 06:57:01 2002// /WHAT-IS-THIS/1.1/Tue Feb 5 21:26:22 2002// /Widget.idl/1.7/Wed May 29 06:57:01 2002// -/WidgetKit.idl/1.13/Wed May 29 06:57:01 2002// /DrawingKit.idl/1.22/Wed May 28 05:05:24 2003// /Path.idl/1.1/Tue May 27 23:12:48 2003// -/TextBuffer.idl/1.18/Thu Aug 14 05:05:24 2003// /Identifiable.idl/1.5/Wed Jan 14 00:05:31 2004// /Server.idl/1.12/Wed Jan 14 00:05:31 2004// /ToolKit.idl/1.20/Wed Jan 14 00:05:31 2004// /Traversal.idl/1.10/Wed Jan 14 00:05:31 2004// /Window.idl/1.10/Wed Jan 14 00:05:31 2004// +/BoundedRange.idl/1.9/Sun Feb 8 00:05:15 2004// +/BoundedValue.idl/1.7/Sun Feb 8 00:05:15 2004// +/ClientContext.idl/1.10/Sun Feb 8 00:05:15 2004// +/Command.idl/1.9/Sun Feb 8 00:05:15 2004// +/CommandKit.idl/1.12/Sun Feb 8 00:05:15 2004// +/Graphic.idl/1.13/Sun Feb 8 00:05:15 2004// +/LayoutKit.idl/1.11/Sun Feb 8 00:05:15 2004// +/TextBuffer.idl/1.19/Sun Feb 8 00:05:15 2004// +/Types.idl/1.15/Sun Feb 8 00:05:15 2004// +/WidgetKit.idl/1.14/Sun Feb 8 00:05:15 2004// D diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/ClientContext.idl Fresco-040208/Fresco-IDL/share/idl/Fresco/ClientContext.idl --- Fresco-040202/Fresco-IDL/share/idl/Fresco/ClientContext.idl Mon Feb 2 00:07:37 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/ClientContext.idl Sun Feb 8 00:07:14 2004 @@ -1,7 +1,7 @@ -/*$Id: ClientContext.idl,v 1.9 2002/05/29 06:57:01 stefan Exp $ +/*$Id: ClientContext.idl,v 1.10 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. - * Copyright (C) 1998 Graydon Hoare + * Copyright (C) 1998 Graydon Hoare * http://www.fresco.org * * This library is free software; you can redistribute it and/or diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/Command.idl Fresco-040208/Fresco-IDL/share/idl/Fresco/Command.idl --- Fresco-040202/Fresco-IDL/share/idl/Fresco/Command.idl Mon Feb 2 00:07:37 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/Command.idl Sun Feb 8 00:07:14 2004 @@ -1,7 +1,7 @@ -/*$Id: Command.idl,v 1.8 2002/05/29 06:57:01 stefan Exp $ +/*$Id: Command.idl,v 1.9 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. - * Copyright (C) 1998 Graydon Hoare + * Copyright (C) 1998 Graydon Hoare * Copyright (C) 1999, 2000 Stefan Seefeld * http://www.fresco.org * @@ -44,7 +44,7 @@ //. Add a Command to the end of the list of Commands of this //. MacroCommand. void append(in Command c); - //. Add a Command to the begining of the list of Commands of this + //. Add a Command to the beginning of the list of Commands of this //. MacroCommand. void prepend(in Command c); }; diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/CommandKit.idl Fresco-040208/Fresco-IDL/share/idl/Fresco/CommandKit.idl --- Fresco-040202/Fresco-IDL/share/idl/Fresco/CommandKit.idl Mon Feb 2 00:07:37 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/CommandKit.idl Sun Feb 8 00:07:14 2004 @@ -1,7 +1,7 @@ -/*$Id: CommandKit.idl,v 1.11 2002/05/29 06:57:01 stefan Exp $ +/*$Id: CommandKit.idl,v 1.12 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. - * Copyright (C) 1998 Graydon Hoare + * Copyright (C) 1998 Graydon Hoare * Copyright (C) 1999, 2000 Stefan Seefeld * http://www.fresco.org * diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/Graphic.idl Fresco-040208/Fresco-IDL/share/idl/Fresco/Graphic.idl --- Fresco-040202/Fresco-IDL/share/idl/Fresco/Graphic.idl Mon Feb 2 00:07:37 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/Graphic.idl Sun Feb 8 00:07:14 2004 @@ -1,4 +1,4 @@ -/*$Id: Graphic.idl,v 1.12 2002/05/29 06:57:01 stefan Exp $ +/*$Id: Graphic.idl,v 1.13 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999, 2000 Stefan Seefeld @@ -39,7 +39,7 @@ interface DrawingKit; interface Graphic; - //. A GraphicIterator is a reference to a graphic within an composite graphic + //. A GraphicIterator is a reference to a graphic within a composite graphic interface GraphicIterator { //. Return the child graphic to which the iterator currently refers @@ -112,17 +112,15 @@ //. alter appearance without affecting structural operations. void append_graphic(in Graphic g); void prepend_graphic(in Graphic g); - //. Remove the child on the edge labled the given Tag. + //. Remove the child on the edge labeled the given Tag. void remove_graphic(in Tag t); //. Called by the child to detach itself from the parent //. (which is this graphic). - //. FIXME: What is this Tag? + //. The Tag is a unique Identifier of the graphic. void remove_child_graphic(in Tag t); //. Add a parent for this graphic. - //. FIXME: What is the given Tag? What is the returned Tag? Tag add_parent_graphic(in Graphic g, in Tag t); //. Remove a parent for this Graphic. - //. FIXME: What is this Tag? void remove_parent_graphic(in Tag t); //. Return an Iterator pointing to the first child Graphic. GraphicIterator first_child_graphic(); diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/LayoutKit.idl Fresco-040208/Fresco-IDL/share/idl/Fresco/LayoutKit.idl --- Fresco-040202/Fresco-IDL/share/idl/Fresco/LayoutKit.idl Mon Feb 2 00:07:37 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/LayoutKit.idl Sun Feb 8 00:07:14 2004 @@ -1,4 +1,4 @@ -/*$Id: LayoutKit.idl,v 1.10 2002/05/29 06:57:01 stefan Exp $ +/*$Id: LayoutKit.idl,v 1.11 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999 Stefan Seefeld @@ -250,7 +250,7 @@ Graphic margin_lrbt(in Graphic g, in Coord lmargin, in Coord rmargin, in Coord bmargin, in Coord tmargin); Graphic margin_flexible(in Graphic g, - in Coord margn, in Coord stretch, in Coord shrink); + in Coord margin, in Coord stretch, in Coord shrink); Graphic margin_lrbt_flexible(in Graphic g, in Coord lmargin, in Coord lstretch, in Coord lshrink, in Coord rmargin, in Coord rstretch, in Coord rshrink, diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/TextBuffer.idl Fresco-040208/Fresco-IDL/share/idl/Fresco/TextBuffer.idl --- Fresco-040202/Fresco-IDL/share/idl/Fresco/TextBuffer.idl Mon Feb 2 00:07:38 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/TextBuffer.idl Sun Feb 8 00:07:14 2004 @@ -1,4 +1,4 @@ -/*$Id: TextBuffer.idl,v 1.18 2003/08/13 18:56:54 tobias Exp $ +/*$Id: TextBuffer.idl,v 1.19 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999 Stefan Seefeld , @@ -47,7 +47,7 @@ unsigned long pos; //.< Where did it happen? long len; //.< How long was the change? This might be a negative number. }; - + //. The length of the TextBuffer. readonly attribute unsigned long size; //. The contents of the TextBuffer. @@ -66,8 +66,9 @@ void forward(); //. Move the cursor backwards for one character. void backward(); - - //. FIXME: What does this do?! -- tobias + //. Shift the gap reserved for inserting new characters. When editing + //. we reserve a gap to hold new characters so not every insertion of + //. a new char forces us to move the following existent characters. void shift(in long d); //. Insert a character in front of the current position into the //. TextBuffer. You can only insert characters below 0xFFFF, you will @@ -78,7 +79,7 @@ //. operation is finished. //. //. The TextChange that will be passed around after the insertion will - //. allways have a length of 1, the pos field will be the cursor position + //. always have a length of 1, the pos field will be the cursor position //. *before* the insertion and the type will be insert. void insert_char(in Unichar u); //. Insert a string into the Buffer before the current position. @@ -88,19 +89,19 @@ //. operation is finished. //. //. The TextChange that will be passed around after the insertion will - //. allways have a positive length, the pos field will be the cursor position - //. *before* the insertion and the type will be insert. + //. always have a positive length, the pos field will be the cursor + //. position *before* the insertion and the type will be insert. void insert_string(in Unistring u); //. Remove d characters backward. This is relative to the current position. //. //. The TextChange that will be passed around after the removal will - //. allways have a *negative* length, the pos field will be the cursor + //. always have a *negative* length, the pos field will be the cursor //. position *before* the removal and the type will be remove. void remove_backward(in unsigned long d); //. Remove d characters forward. This is relative to the current position. //. //. The TextChange that will be passed around after the removal will - //. allways have a *positive* length, the pos field will be the cursor + //. always have a *positive* length, the pos field will be the cursor //. position *before* the removal and the type will be remove. void remove_forward(in unsigned long d); //. Clear the buffer. It will be empty afterwards. diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/Types.idl Fresco-040208/Fresco-IDL/share/idl/Fresco/Types.idl --- Fresco-040202/Fresco-IDL/share/idl/Fresco/Types.idl Mon Feb 2 00:07:38 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/Types.idl Sun Feb 8 00:07:14 2004 @@ -1,4 +1,4 @@ -/*$Id: Types.idl,v 1.14 2002/05/29 06:57:01 stefan Exp $ +/*$Id: Types.idl,v 1.15 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. * Portions Copyright (C) 1999 Stefan Seefeld @@ -29,7 +29,7 @@ { //. Tags are used to uniquely identify objects and links between objects. //. They are garanteed to be unique to each scope by each function - //. generationg Tags. + //. generating Tags. typedef unsigned long Tag; //. User interface objects specify positions and sizes in terms //. of coordinates. The Coord type represents a position or distance diff -Nur Fresco-040202/Fresco-IDL/share/idl/Fresco/WidgetKit.idl Fresco-040208/Fresco-IDL/share/idl/Fresco/WidgetKit.idl --- Fresco-040202/Fresco-IDL/share/idl/Fresco/WidgetKit.idl Mon Feb 2 00:07:38 2004 +++ Fresco-040208/Fresco-IDL/share/idl/Fresco/WidgetKit.idl Sun Feb 8 00:07:14 2004 @@ -1,4 +1,4 @@ -/*$Id: WidgetKit.idl,v 1.13 2002/05/29 06:57:01 stefan Exp $ +/*$Id: WidgetKit.idl,v 1.14 2004/02/07 23:43:29 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 1999 Graydon Hoare @@ -82,7 +82,7 @@ //. //. You will need to attach() an observer to the returned graphic to //. figure out the state. - //. FIXME: This is allways a vbox. We need something like axis for the + //. FIXME: This is always a vbox. We need something like axis for the //. scrollbar (and others) don't we? Or can we pass the graphic //. used for layout? -- tobias Widget::Choice toggle_choice(); diff -Nur Fresco-040202/Fresco-Python/autom4te.cache/requests Fresco-040208/Fresco-Python/autom4te.cache/requests --- Fresco-040202/Fresco-Python/autom4te.cache/requests Mon Feb 2 00:07:39 2004 +++ Fresco-040208/Fresco-Python/autom4te.cache/requests Sun Feb 8 00:07:14 2004 @@ -25,8 +25,8 @@ 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_HEADER_SYS_WAIT' => 1, 'AC_TYPE_UID_T' => 1, - 'AC_CHECK_LIB' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CHECK_LIB' => 1, 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, 'AC_FUNC_FORK' => 1, @@ -48,8 +48,8 @@ 'AC_TYPE_MODE_T' => 1, 'AC_CHECK_TYPES' => 1, 'AC_PROG_YACC' => 1, - 'AC_FUNC_STRERROR_R' => 1, 'AC_TYPE_PID_T' => 1, + 'AC_FUNC_STRERROR_R' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_TYPE_SIGNAL' => 1, @@ -84,11 +84,11 @@ 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_FUNC_FSEEKO' => 1, - 'AC_STRUCT_TM' => 1, 'AC_FUNC_MMAP' => 1, + 'AC_STRUCT_TM' => 1, 'AC_SUBST' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_PROG_CC' => 1 + 'AC_PROG_CC' => 1, + 'AC_PROG_LIBTOOL' => 1 } ], 'Request' ) ); diff -Nur Fresco-040202/Fresco-Python-demos/autom4te.cache/requests Fresco-040208/Fresco-Python-demos/autom4te.cache/requests --- Fresco-040202/Fresco-Python-demos/autom4te.cache/requests Mon Feb 2 00:07:42 2004 +++ Fresco-040208/Fresco-Python-demos/autom4te.cache/requests Sun Feb 8 00:07:15 2004 @@ -24,8 +24,8 @@ 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_HEADER_SYS_WAIT' => 1, 'AC_TYPE_UID_T' => 1, - 'AM_CONDITIONAL' => 1, 'AC_CHECK_LIB' => 1, + 'AM_CONDITIONAL' => 1, 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, 'AC_FUNC_FORK' => 1, @@ -47,8 +47,8 @@ 'AC_TYPE_MODE_T' => 1, 'AC_CHECK_TYPES' => 1, 'AC_PROG_YACC' => 1, - 'AC_TYPE_PID_T' => 1, 'AC_FUNC_STRERROR_R' => 1, + 'AC_TYPE_PID_T' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_TYPE_SIGNAL' => 1, @@ -83,11 +83,11 @@ 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_FUNC_FSEEKO' => 1, - 'AC_FUNC_MMAP' => 1, 'AC_STRUCT_TM' => 1, + 'AC_FUNC_MMAP' => 1, 'AC_SUBST' => 1, - 'AC_PROG_CC' => 1, - 'AC_PROG_LIBTOOL' => 1 + 'AC_PROG_LIBTOOL' => 1, + 'AC_PROG_CC' => 1 } ], 'Request' ) ); diff -Nur Fresco-040202/Fresco-Test/autom4te.cache/requests Fresco-040208/Fresco-Test/autom4te.cache/requests --- Fresco-040202/Fresco-Test/autom4te.cache/requests Mon Feb 2 00:07:25 2004 +++ Fresco-040208/Fresco-Test/autom4te.cache/requests Sun Feb 8 00:07:01 2004 @@ -25,8 +25,8 @@ 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_HEADER_SYS_WAIT' => 1, 'AC_TYPE_UID_T' => 1, - 'AM_CONDITIONAL' => 1, 'AC_CHECK_LIB' => 1, + 'AM_CONDITIONAL' => 1, 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, 'AC_FUNC_FORK' => 1, @@ -48,8 +48,8 @@ 'AC_TYPE_MODE_T' => 1, 'AC_CHECK_TYPES' => 1, 'AC_PROG_YACC' => 1, - 'AC_TYPE_PID_T' => 1, 'AC_FUNC_STRERROR_R' => 1, + 'AC_TYPE_PID_T' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_TYPE_SIGNAL' => 1, @@ -84,11 +84,11 @@ 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_FUNC_FSEEKO' => 1, - 'AC_FUNC_MMAP' => 1, 'AC_STRUCT_TM' => 1, + 'AC_FUNC_MMAP' => 1, 'AC_SUBST' => 1, - 'AC_PROG_CC' => 1, - 'AC_PROG_LIBTOOL' => 1 + 'AC_PROG_LIBTOOL' => 1, + 'AC_PROG_CC' => 1 } ], 'Request' ) ); diff -Nur Fresco-040202/Fresco-Test/doc/examples/CVS/Entries Fresco-040208/Fresco-Test/doc/examples/CVS/Entries --- Fresco-040202/Fresco-Test/doc/examples/CVS/Entries Mon Feb 2 00:07:25 2004 +++ Fresco-040208/Fresco-Test/doc/examples/CVS/Entries Sun Feb 8 00:07:01 2004 @@ -1,4 +1,4 @@ /script.sh/1.1/Sun Apr 6 16:15:54 2003// -/framework.cc/1.2/Tue Dec 30 00:05:54 2003// /Makefile.in/1.2/Fri Jan 30 00:05:42 2004// +/framework.cc/1.3/Sun Feb 8 00:05:15 2004// D diff -Nur Fresco-040202/Fresco-Test/doc/examples/framework.cc Fresco-040208/Fresco-Test/doc/examples/framework.cc --- Fresco-040202/Fresco-Test/doc/examples/framework.cc Mon Feb 2 00:07:25 2004 +++ Fresco-040208/Fresco-Test/doc/examples/framework.cc Sun Feb 8 00:07:01 2004 @@ -1,8 +1,8 @@ -/* $Id: framework.cc,v 1.2 2003/12/29 08:43:15 tobias Exp $ +/* $Id: framework.cc,v 1.3 2004/02/07 23:43:30 tobias Exp $ * * This source file is a part of the Berlin Project. - * Copyright (C) 1999,2000 Tobias Hunger - * http://www.berlin-consortium.org + * Copyright (C) 1999,2000 Tobias Hunger + * 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 @@ -27,13 +27,13 @@ class Framework : public SyUnit::TestCase { public: - // Allways pass this test. + // Always pass this test. void pass() { assert_true(true); } - // Allways fail this test. + // Always fail this test. void fail() { assert_true(false); diff -Nur Fresco-040202/GGI/src/CVS/Entries Fresco-040208/GGI/src/CVS/Entries --- Fresco-040202/GGI/src/CVS/Entries Mon Feb 2 00:07:32 2004 +++ Fresco-040208/GGI/src/CVS/Entries Sun Feb 8 00:07:07 2004 @@ -1,5 +1,4 @@ /Makefile.in/1.18/Mon Apr 7 05:05:36 2003// -/Console.cc/1.14/Tue Dec 30 00:05:55 2003// /Console.hh/1.10/Tue Dec 30 00:05:55 2003// /Drawable.cc/1.7/Tue Dec 30 00:05:55 2003// /Drawable.hh/1.4/Tue Dec 30 00:05:55 2003// @@ -8,4 +7,5 @@ /GGIGL.cc/1.9/Tue Dec 30 00:05:56 2003// /Pointer.cc/1.7/Tue Dec 30 00:05:56 2003// /Pointer.hh/1.4/Tue Dec 30 00:05:56 2003// +/Console.cc/1.15/Sun Feb 8 00:05:15 2004// D diff -Nur Fresco-040202/GGI/src/Console.cc Fresco-040208/GGI/src/Console.cc --- Fresco-040202/GGI/src/Console.cc Mon Feb 2 00:07:32 2004 +++ Fresco-040208/GGI/src/Console.cc Sun Feb 8 00:07:07 2004 @@ -1,4 +1,4 @@ -/*$Id: Console.cc,v 1.14 2003/12/29 08:43:18 tobias Exp $ +/*$Id: Console.cc,v 1.15 2004/02/07 23:43:30 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 2000 Stefan Seefeld @@ -58,9 +58,9 @@ std::cin >> e.pmove.x >> e.pmove.y; break; } - case evPtrButtonPress: - case evPtrButtonRelease: - break; +// case evPtrButtonPress: +// case evPtrButtonRelease: +// break; } } @@ -82,9 +82,9 @@ std::cout << e.pmove.x << ' ' << e.pmove.y; break; } - case evPtrButtonPress: - case evPtrButtonRelease: - break; +// case evPtrButtonPress: +// case evPtrButtonRelease: +// break; } std::cout << std::endl; } @@ -98,6 +98,7 @@ GGI::Drawable *drawable = new GGI::Drawable(0, x, y); my_visual = drawable->my_visual; #ifdef RMDEBUG + Trace trace("Console open -- RMDEBUG"); // make a fullscreen backup visual my_backup = ggiOpen("display-memory", 0); ggi_mode mode; @@ -108,7 +109,7 @@ mode.dpp.x = mode.dpp.y = 1; mode.graphtype = GT_24BIT; mode.frames = 1; - ggiSetMode(_backup, &mode); + ggiSetMode(my_backup, &mode); #endif my_size[0] = drawable->my_mode.visible.x; my_size[1] = drawable->my_mode.visible.y; @@ -196,13 +197,13 @@ Input::Event *GGI::Console::next_event() { - Prague::Trace trace("GGI::Console::next_event"); + Trace trace("GGI::Console::next_event"); ggi_event event; ggi_event_mask mask; ggi_event_mask move_mask = ggi_event_mask(emPtrMove | emValuator); int input = fileno(stdin); - Prague::FdSet rfdset; + FdSet rfdset; int nfds = -1; do @@ -397,7 +398,7 @@ PixelCoord h = static_cast(uy * my_resolution[1] - y); // make a backup - ggiCrossBlit(my_visual, x, y, w, h, _backup, x, y); + ggiCrossBlit(my_visual, x, y, w, h, my_backup, x, y); // fill region with red ggi_pixel back; diff -Nur Fresco-040202/SDL/autom4te.cache/output.0 Fresco-040208/SDL/autom4te.cache/output.0 --- Fresco-040202/SDL/autom4te.cache/output.0 Mon Feb 2 00:07:34 2004 +++ Fresco-040208/SDL/autom4te.cache/output.0 Sun Feb 8 00:07:09 2004 @@ -4137,7 +4137,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $LIBS" +LIBS="-lGLU -lGL $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" diff -Nur Fresco-040202/SDL/autom4te.cache/requests Fresco-040208/SDL/autom4te.cache/requests --- Fresco-040202/SDL/autom4te.cache/requests Mon Feb 2 00:07:34 2004 +++ Fresco-040208/SDL/autom4te.cache/requests Sun Feb 8 00:07:09 2004 @@ -25,8 +25,8 @@ 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_HEADER_SYS_WAIT' => 1, 'AC_TYPE_UID_T' => 1, - 'AC_CHECK_LIB' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CHECK_LIB' => 1, 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, 'AC_FUNC_FORK' => 1, @@ -48,8 +48,8 @@ 'AC_TYPE_MODE_T' => 1, 'AC_CHECK_TYPES' => 1, 'AC_PROG_YACC' => 1, - 'AC_FUNC_STRERROR_R' => 1, 'AC_TYPE_PID_T' => 1, + 'AC_FUNC_STRERROR_R' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_TYPE_SIGNAL' => 1, @@ -84,11 +84,11 @@ 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_FUNC_FSEEKO' => 1, - 'AC_STRUCT_TM' => 1, 'AC_FUNC_MMAP' => 1, + 'AC_STRUCT_TM' => 1, 'AC_SUBST' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_PROG_CC' => 1 + 'AC_PROG_CC' => 1, + 'AC_PROG_LIBTOOL' => 1 } ], 'Request' ) ); diff -Nur Fresco-040202/SDL/autom4te.cache/traces.0 Fresco-040208/SDL/autom4te.cache/traces.0 --- Fresco-040202/SDL/autom4te.cache/traces.0 Mon Feb 2 00:07:34 2004 +++ Fresco-040208/SDL/autom4te.cache/traces.0 Sun Feb 8 00:07:09 2004 @@ -118,7 +118,7 @@ m4trace:configure.ac:63: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H]) m4trace:configure.ac:63: -1- AC_CHECK_LIB([GL], [glLoadIdentity], [:], [no_gl=yes]) -m4trace:configure.ac:63: -1- AC_CHECK_LIB([GLU], [gluNewTess], [:], [no_gl=yes]) +m4trace:configure.ac:63: -1- AC_CHECK_LIB([GLU], [gluNewTess], [:], [no_gl=yes], [-lGL]) m4trace:configure.ac:63: -1- AC_SUBST([HAVE_GL], [0]) m4trace:configure.ac:63: -1- AC_SUBST([HAVE_GL], [1]) m4trace:configure.ac:63: -1- AC_SUBST([GL_CPPFLAGS], ["$GL_CPPFLAGS"]) diff -Nur Fresco-040202/SDL/config/aclocal.m4 Fresco-040208/SDL/config/aclocal.m4 --- Fresco-040202/SDL/config/aclocal.m4 Mon Feb 2 00:07:33 2004 +++ Fresco-040208/SDL/config/aclocal.m4 Sun Feb 8 00:07:08 2004 @@ -515,7 +515,7 @@ save_LDFLAGS="$LDFLAGS" LDFLAGS="$GL_LIBS $LDFLAGS" AC_CHECK_LIB(GL, glLoadIdentity, :, no_gl=yes) - AC_CHECK_LIB(GLU, gluNewTess, :, no_gl=yes) + AC_CHECK_LIB(GLU, gluNewTess, :, no_gl=yes, [-lGL]) LDFLAGS="$save_LDFLAGS" fi diff -Nur Fresco-040202/SDL/configure Fresco-040208/SDL/configure --- Fresco-040202/SDL/configure Mon Feb 2 00:07:34 2004 +++ Fresco-040208/SDL/configure Sun Feb 8 00:07:09 2004 @@ -4137,7 +4137,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $LIBS" +LIBS="-lGLU -lGL $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" diff -Nur Fresco-040202/SDL/src/CVS/Entries Fresco-040208/SDL/src/CVS/Entries --- Fresco-040202/SDL/src/CVS/Entries Mon Feb 2 00:07:34 2004 +++ Fresco-040208/SDL/src/CVS/Entries Sun Feb 8 00:07:08 2004 @@ -1,5 +1,4 @@ /Makefile.in/1.13/Mon Apr 7 05:05:38 2003// -/Console.cc/1.16/Tue Dec 30 00:06:03 2003// /Console.hh/1.13/Tue Dec 30 00:06:04 2003// /Drawable.cc/1.9/Tue Dec 30 00:06:04 2003// /Drawable.hh/1.5/Tue Dec 30 00:06:04 2003// @@ -9,4 +8,5 @@ /Pointer.hh/1.6/Tue Dec 30 00:06:04 2003// /SDLGL.cc/1.15/Tue Dec 30 00:06:04 2003// /SDLGL.hh/1.6/Tue Dec 30 00:06:04 2003// +/Console.cc/1.17/Sun Feb 8 00:05:16 2004// D diff -Nur Fresco-040202/SDL/src/Console.cc Fresco-040208/SDL/src/Console.cc --- Fresco-040202/SDL/src/Console.cc Mon Feb 2 00:07:34 2004 +++ Fresco-040208/SDL/src/Console.cc Sun Feb 8 00:07:08 2004 @@ -1,4 +1,4 @@ -/*$Id: Console.cc,v 1.16 2003/12/29 08:43:25 tobias Exp $ +/*$Id: Console.cc,v 1.17 2004/02/07 23:43:31 tobias Exp $ * * This source file is a part of the Fresco Project. * Copyright (C) 2000 Stefan Seefeld @@ -348,7 +348,7 @@ // in that code cannot influence the highlighting. if (is_gl()) { - std::cer << "Region Management Debugging does not work " + std::cerr << "Region Management Debugging does not work " << "with OpenGL on SDL." << std::endl; return; @@ -371,7 +371,7 @@ pf->Rmask, pf->Gmask, pf->Bmask, pf->Amask); // make a backup: - SDL_BlitSurface(screen, 0, _backup, 0); + SDL_BlitSurface(screen, 0, my_backup, 0); // fill region: SDL_FillRect(screen, @@ -387,7 +387,7 @@ select(0, 0, 0, 0, &tv); // restore old content - SDL_BlitSurface(_backup, NULL, screen, NULL); + SDL_BlitSurface(my_backup, NULL, screen, NULL); SDL_UpdateRect(screen, 0, 0, 0, 0); #endif } diff -Nur Fresco-040202/autom4te.cache/requests Fresco-040208/autom4te.cache/requests --- Fresco-040202/autom4te.cache/requests Mon Feb 2 00:07:35 2004 +++ Fresco-040208/autom4te.cache/requests Sun Feb 8 00:07:12 2004 @@ -23,8 +23,8 @@ 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_HEADER_SYS_WAIT' => 1, 'AC_TYPE_UID_T' => 1, - 'AC_CHECK_LIB' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CHECK_LIB' => 1, 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, 'AC_FUNC_FORK' => 1, @@ -46,8 +46,8 @@ 'AC_TYPE_MODE_T' => 1, 'AC_CHECK_TYPES' => 1, 'AC_PROG_YACC' => 1, - 'AC_FUNC_STRERROR_R' => 1, 'AC_TYPE_PID_T' => 1, + 'AC_FUNC_STRERROR_R' => 1, 'AC_STRUCT_ST_BLOCKS' => 1, 'AC_PROG_GCC_TRADITIONAL' => 1, 'AC_TYPE_SIGNAL' => 1, @@ -82,11 +82,11 @@ 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_ERROR_AT_LINE' => 1, 'AC_FUNC_FSEEKO' => 1, - 'AC_STRUCT_TM' => 1, 'AC_FUNC_MMAP' => 1, + 'AC_STRUCT_TM' => 1, 'AC_SUBST' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_PROG_CC' => 1 + 'AC_PROG_CC' => 1, + 'AC_PROG_LIBTOOL' => 1 } ], 'Request' ) ); diff -Nur Fresco-040202/config/CVS/Entries Fresco-040208/config/CVS/Entries --- Fresco-040202/config/CVS/Entries Mon Feb 2 00:07:34 2004 +++ Fresco-040208/config/CVS/Entries Sun Feb 8 00:07:09 2004 @@ -18,7 +18,6 @@ /fonts.m4/1.1/Fri Aug 29 20:05:36 2003// /orb.m4/1.17/Sat Aug 30 00:05:24 2003// /freetype.m4/1.12/Mon Nov 17 00:05:33 2003// -/openGL.m4/1.8/Mon Jan 5 00:05:13 2004// /cave.m4/1.4/Thu Jan 8 00:05:37 2004// /glut.m4/1.3/Thu Jan 8 00:05:38 2004// /omniorb.m4/1.30/Thu Jan 8 00:05:38 2004// @@ -28,4 +27,5 @@ /thread.m4/1.5/Thu Jan 8 00:05:38 2004// /xslt.m4/1.2/Thu Jan 8 00:05:38 2004// /iconv.m4/1.3/Fri Jan 9 00:05:39 2004// +/openGL.m4/1.9/Sun Feb 8 00:05:16 2004// D diff -Nur Fresco-040202/config/openGL.m4 Fresco-040208/config/openGL.m4 --- Fresco-040202/config/openGL.m4 Mon Feb 2 00:07:34 2004 +++ Fresco-040208/config/openGL.m4 Sun Feb 8 00:07:09 2004 @@ -45,7 +45,7 @@ save_LDFLAGS="$LDFLAGS" LDFLAGS="$GL_LIBS $LDFLAGS" AC_CHECK_LIB(GL, glLoadIdentity, :, no_gl=yes) - AC_CHECK_LIB(GLU, gluNewTess, :, no_gl=yes) + AC_CHECK_LIB(GLU, gluNewTess, :, no_gl=yes, [-lGL]) LDFLAGS="$save_LDFLAGS" fi