[svn-upgrade] Integrating new upstream version, ion3 (20070203)

[ion3-doc.git] / objects.tex

diff --git a/objects.tex b/objects.tex
index e751eabf27fe4c7de892c0d58b01201177e623a0..80321fa94cc61cade38de40cdf2d994c0109ec76 100644 (file)
--- a/objects.tex
+++ b/objects.tex
@@ -44,10 +44,10 @@ implement.
      |-->WRegion
      |    |-->WClientWin
      |    |-->WWindow
-     |    |    |-->WRootWin
      |    |    |-->WMPlex
-     |    |    |    |-->WScreen
      |    |    |    |-->WFrame
+     |    |    |    |-->WScreen
+     |    |    |         |-->WRootWin
      |    |    |-->WInput (mod_query)
      |    |         |-->WEdln (mod_query)
      |    |         |-->WMessage (mod_query)
@@ -89,10 +89,10 @@ The core classes:
     root windows\index{root window} of X screens\index{screen!X}.
     Note that an ''X screen'' or root window is not necessarily a
     single  physical screen\index{screen!physical} as a root window
-    may be split over multiple screens when multi-head extensions 
-    such as Xinerama\index{Xinerama} are used. (Actually there
-    can be only one \type{WRootWin} when Xinerama is used.)
-       
+    may be split over multiple screens when hacks such as 
+    Xinerama\index{Xinerama} are used. (Actually there can be only 
+    one root window when Xinerama is used.)
+    
   \item[\type{WMPlex}] is a base class for all regions that''multiplex'' 
     other regions. This means that of the regions managed by the multiplexer,
     only one can be displayed at a time. Classes that inhereit \type{WMPlex}
@@ -100,8 +100,7 @@ The core classes:
     
   \item[\type{WScreen}]\indextype{WScreen} is the class for objects
     corresponding to physical screens. Screens may share a root
-    window when Xinerama multihead extensions are used as explained
-    above.
+    window when the Xinerama extension is used as explained above.
 
   \item[\type{WFrame}]\indextype{WFrame} is the class for frames.
     While most Ion's objects have no graphical presentation, frames basically