Fresco/Documentation/src Makefile.in,1.12,1.13 control-graph.xml,1.5,1.6 hello-list.xml,1.5,1.6 hello.xml,1.13,1.14 kits.xml,1.6,1.7 overview.xml,1.4,1.5
Stefan Seefeld <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Documentation/src
In directory purcel:/tmp/cvs-serv4816
Modified Files:
Makefile.in control-graph.xml hello-list.xml hello.xml
kits.xml overview.xml
Log Message:
s/Warsaw/Fresco/g
Index: Makefile.in
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.in 23 Jan 2003 20:47:34 -0000 1.12
+++ Makefile.in 28 Jan 2003 18:44:33 -0000 1.13
@@ -55,7 +55,7 @@
$(XSLT) $(xsl) $(srcdir)/book.xml
endif
-pdf: $(PDF)
+pdf: $(PNG)
ifeq ($(xsl),)
@echo "please use \"$(MAKE) xsl=<stylesheet>\""
else
Index: control-graph.xml
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/control-graph.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- control-graph.xml 23 Jan 2003 08:09:06 -0000 1.5
+++ control-graph.xml 28 Jan 2003 18:44:34 -0000 1.6
@@ -213,9 +213,9 @@
<imageobject>
<imagedata fileref="figures/scene.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/scene.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/scene.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
<figure id="scene-graph-figure" float="1">
@@ -224,9 +224,9 @@
<imageobject>
<imagedata fileref="figures/scene-graph.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/scene-graph.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/scene-graph.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
Imagine the mouse to click on the red polygon. This will result in
@@ -248,9 +248,9 @@
<imageobject>
<imagedata fileref="figures/trail.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/trail.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/trail.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
For each position, the trail contains the following information:
@@ -286,9 +286,9 @@
<imageobject>
<imagedata fileref="figures/cstack.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/cstack.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/cstack.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
It is used to update the focus, i.e. to call (in appropriate order) all the controllers'
@@ -312,9 +312,9 @@
<imageobject>
<imagedata fileref="figures/gstack.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/gstack.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/gstack.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
A special iterator allows it to access the graphics which, inside the editor, were intersecting
@@ -330,9 +330,9 @@
<imageobject>
<imagedata fileref="figures/control-graph.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/control-graph.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/control-graph.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
You can navigate the focus through this control graph via the following
@@ -361,9 +361,9 @@
<imageobject>
<imagedata fileref="figures/events.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/events.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/events.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
</para>
Index: hello-list.xml
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/hello-list.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hello-list.xml 9 Apr 2002 04:15:32 -0000 1.5
+++ hello-list.xml 28 Jan 2003 18:44:34 -0000 1.6
@@ -1,24 +1,24 @@
<appendix><title>the complete listing of the hello world program</title>
<programlisting>
#include <Prague/Sys/Thread.hh>
- #include <Warsaw/config.hh>
- #include <Warsaw/Trigger.hh>
- #include <Warsaw/DesktopKit.hh>
- #include <Warsaw/TextKit.hh>
- #include <Warsaw/WidgetKit.hh>
- #include <Warsaw/resolve.hh>
- #include <Warsaw/Unicode.hh>
- #include <Warsaw/ClientContextImpl.hh>
+ #include <Fresco/config.hh>
+ #include <Fresco/Trigger.hh>
+ #include <Fresco/DesktopKit.hh>
+ #include <Fresco/TextKit.hh>
+ #include <Fresco/WidgetKit.hh>
+ #include <Fresco/resolve.hh>
+ #include <Fresco/Unicode.hh>
+ #include <Fresco/ClientContextImpl.hh>
using namespace Prague;
- using namespace Warsaw;
+ using namespace Fresco;
int main(int argc, char **argv)
{
CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
CosNaming::NamingContext_var ncontext =
resolve_init<CosNaming::NamingContext>(orb, "NameService");
- Server_var server = resolve_name<Server>(ncontext, "IDL:Warsaw/Server:1.0");
+ Server_var server = resolve_name<Server>(ncontext, "IDL:fresco.org/Fresco/Server:1.0");
PortableServer::POA_var poa = resolve_init<PortableServer::POA>(orb, "RootPOA");
PortableServer::POAManager_var pman = poa->the_POAManager();
@@ -28,10 +28,10 @@
ClientContext_var client = ci->_this();
ServerContext_var context = server->create_server_context(client);
- DesktopKit_var desktop = resolve_kit<DesktopKit>(context, "IDL:Warsaw/DesktopKit:1.0");
- TextKit_var text = resolve_kit<TextKit>(context, "IDL:Warsaw/TextKit:1.0");
- WidgetKit_var widgets = resolve_kit<WidgetKit>(context, "IDL:Warsaw/WidgetKit:1.0");
- ToolKit_var tools = resolve_kit<ToolKit>(context, "IDL:Warsaw/ToolKit:1.0");
+ DesktopKit_var desktop = resolve_kit<DesktopKit>(context, "IDL:fresco.org/Fresco/DesktopKit:1.0");
+ TextKit_var text = resolve_kit<TextKit>(context, "IDL:fresco.org/Fresco/TextKit:1.0");
+ WidgetKit_var widgets = resolve_kit<WidgetKit>(context, "IDL:fresco.org/Fresco/WidgetKit:1.0");
+ ToolKit_var tools = resolve_kit<ToolKit>(context, "IDL:fresco.org/Fresco/ToolKit:1.0");
Graphic_var label = text->chunk(Unicode::to_CORBA(Babylon::String("hello world")));
Graphic_var black = tools->rgb(label, 0., 0., 0.);
Index: hello.xml
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/hello.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- hello.xml 23 Jan 2003 08:09:06 -0000 1.13
+++ hello.xml 28 Jan 2003 18:44:34 -0000 1.14
@@ -16,9 +16,9 @@
<imageobject>
<imagedata fileref="figures/resolve.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/resolve.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/resolve.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
Here is the relevant code in python:
@@ -27,9 +27,9 @@
orb = CORBA.ORB_init(sys.argv, CORBA.ORB_ID)
object = orb.resolve_initial_references("NameService");
ncontext = object._narrow(CosNaming.NamingContext)
- name = [CosNaming.NameComponent("IDL:Warsaw/Server:1.0", "Object")]
+ name = [CosNaming.NameComponent("IDL:fresco.org/Fresco/Server:1.0", "Object")]
object = ncontext.resolve(name)
- server = object._narrow(Warsaw.Server)
+ server = object._narrow(Fresco.Server)
</programlisting>
<para>and the same in C++:</para>
<programlisting>
@@ -37,7 +37,7 @@
CosNaming::NamingContext_var ncontext =
resolve_init<CosNaming::NamingContext>(orb, "NameService");
Server_var server =
- resolve_name<Server>(ncontext, "IDL:Warsaw/Server:1.0");
+ resolve_name<Server>(ncontext, "IDL:fresco.org/Fresco/Server:1.0");
</programlisting>
<para>
One of the most frequent errors is a misconfigured naming service, i.e. the ORB is unable to
@@ -89,21 +89,21 @@
</para>
<programlisting>
properties = []
- object = context.resolve("IDL:Warsaw/DesktopKit:1.0", properties)
- desktop = object._narrow(Warsaw.DesktopKit)
- object = context.resolve("IDL:Warsaw/TextKit:1.0", properties)
- text = object._narrow(Warsaw.TextKit)
- object = context.resolve("IDL:Warsaw/WidgetKit:1.0", properties)
- widgets = object._narrow(Warsaw.WidgetKit)
- object = context.resolve("IDL:Warsaw/ToolKit:1.0", properties)
- tools = object._narrow(Warsaw.ToolKit)
+ object = context.resolve("IDL:fresco.org/Fresco/DesktopKit:1.0", properties)
+ desktop = object._narrow(Fresco.DesktopKit)
+ object = context.resolve("IDL:fresco.org/Fresco/TextKit:1.0", properties)
+ text = object._narrow(Fresco.TextKit)
+ object = context.resolve("IDL:fresco.org/Fresco/WidgetKit:1.0", properties)
+ widgets = object._narrow(Fresco.WidgetKit)
+ object = context.resolve("IDL:fresco.org/Fresco/ToolKit:1.0", properties)
+ tools = object._narrow(Fresco.ToolKit)
</programlisting>
<para>and the same in C++:</para>
<programlisting>
- DesktopKit_var desktop = resolve_kit<DesktopKit>(context, "IDL:Warsaw/DesktopKit:1.0");
- TextKit_var text = resolve_kit<TextKit>(context, "IDL:Warsaw/TextKit:1.0");
- WidgetKit_var widgets = resolve_kit<WidgetKit>(context, "IDL:Warsaw/WidgetKit:1.0");
- ToolKit_var tools = resolve_kit<ToolKit>(context, "IDL:Warsaw/ToolKit:1.0");
+ DesktopKit_var desktop = resolve_kit<DesktopKit>(context, "IDL:fresco.org/Fresco/DesktopKit:1.0");
+ TextKit_var text = resolve_kit<TextKit>(context, "IDL:fresco.org/Fresco/TextKit:1.0");
+ WidgetKit_var widgets = resolve_kit<WidgetKit>(context, "IDL:fresco.org/Fresco/WidgetKit:1.0");
+ ToolKit_var tools = resolve_kit<ToolKit>(context, "IDL:fresco.org/Fresco/ToolKit:1.0");
</programlisting>
</section>
<section>
Index: kits.xml
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/kits.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kits.xml 23 Jan 2003 08:09:06 -0000 1.6
+++ kits.xml 28 Jan 2003 18:44:34 -0000 1.7
@@ -18,9 +18,9 @@
<imageobject>
<imagedata fileref="figures/about-button.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/about-button.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/about-button.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
<figure id="fig.about-button-sg" float="1">
@@ -29,9 +29,9 @@
<imageobject>
<imagedata fileref="figures/about-button-sg.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/about-button-sg.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/about-button-sg.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
<para>As simple as this button looks, it is already an amazing composition of smaller parts coming
@@ -63,9 +63,9 @@
<imageobject>
<imagedata fileref="figures/abstract-factory.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/abstract-factory.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/abstract-factory.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
<para>The exact type of the returned object isn't known, which means that the server has more freedom to choose
@@ -117,17 +117,17 @@
<imageobject>
<imagedata fileref="figures/prototype.png" align="center" format="PNG"/>
</imageobject>
- <imageobject>
- <imagedata fileref="figures/prototype.pdf" align="center" format="PDF"/>
- </imageobject>
+<!-- <imageobject> -->
+<!-- <imagedata fileref="figures/prototype.pdf" align="center" format="PDF"/> -->
+<!-- </imageobject> -->
</mediaobject>
</figure>
<para> the full sequence of events thus looks like this:</para>
<programlisting>
template <class T>
- typename T::_ptr_type resolve_kit(Warsaw::ServerContext_ptr context,
+ typename T::_ptr_type resolve_kit(Fresco::ServerContext_ptr context,
const char *name,
- const Warsaw::Kit::PropertySeq &props)
+ const Fresco::Kit::PropertySeq &props)
{
CORBA::Object_ptr object;
try
@@ -150,7 +150,7 @@
properties[0].name = CORBA::string_dup("style");
properties[0].value = CORBA::string_dup("Motif");
widgets =
- resolve_kit<WidgetKit>(context, "IDL:Warsaw/WidgetKit:1.0", properties);
+ resolve_kit<WidgetKit>(context, "IDL:fresco.org/Fresco/WidgetKit:1.0", properties);
</programlisting>
</section>
Index: overview.xml
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/overview.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- overview.xml 21 Jan 2003 07:45:32 -0000 1.4
+++ overview.xml 28 Jan 2003 18:44:34 -0000 1.5
@@ -8,7 +8,7 @@
</para>
</section>
<section>
- <title>Warsaw: a protocol stack</title>
+ <title>Fresco: a protocol stack</title>
<para>
</para>
<section>