[teklib-general] teklib: merge

[Franciska Schulze]

details:   http://hg.teklib.org/teklib/rev/4ed8394acfc2
changeset: 190:4ed8394acfc2
user:      Franciska Schulze <fschulze at neoscientists.org>
date:      Thu May 15 15:12:06 2008 +0000
description:
merge

diffs (truncated from 457 to 100 lines):

diff -r 76707ff52967 -r 4ed8394acfc2 build/config/posix_fbsd.tmk
--- a/build/config/posix_fbsd.tmk	Thu May 15 15:11:33 2008 +0000
+++ b/build/config/posix_fbsd.tmk	Thu May 15 15:12:06 2008 +0000
@@ -218,7 +218,7 @@
 		\t$(ECHO) "/*" > %1
 		\t$(ECHO) "**\tAUTOMATICALLY GENERATED - DO NOT EDIT BY HAND." >> %1
 		\t$(ECHO) "**\tSee http://www.teklib.org/ for details - to regenerate," >> %1
-		\t$(ECHO) "**\tissue  make linux_sources  in TEKlib's root directory." >> %1
+		\t$(ECHO) "**\tissue  make sources  in TEKlib's root directory." >> %1
 		\t$(ECHO) "*/" >> %1
 		\t$(CAT) %2 >> %1
 [/body]
diff -r 76707ff52967 -r 4ed8394acfc2 build/config/posix_linux.tmk
--- a/build/config/posix_linux.tmk	Thu May 15 15:11:33 2008 +0000
+++ b/build/config/posix_linux.tmk	Thu May 15 15:12:06 2008 +0000
@@ -220,7 +220,7 @@
 		\t$(ECHO) "/*" > %1
 		\t$(ECHO) "**\tAUTOMATICALLY GENERATED - DO NOT EDIT BY HAND." >> %1
 		\t$(ECHO) "**\tSee http://www.teklib.org/ for details - to regenerate," >> %1
-		\t$(ECHO) "**\tissue  make linux_sources  in TEKlib's root directory." >> %1
+		\t$(ECHO) "**\tissue  make sources  in TEKlib's root directory." >> %1
 		\t$(ECHO) "*/" >> %1
 		\t$(CAT) %2 >> %1
 [/body]
diff -r 76707ff52967 -r 4ed8394acfc2 build/config/ps2_ps2_gcc.tmk
--- a/build/config/ps2_ps2_gcc.tmk	Thu May 15 15:11:33 2008 +0000
+++ b/build/config/ps2_ps2_gcc.tmk	Thu May 15 15:12:06 2008 +0000
@@ -242,7 +242,7 @@
 		\t$(ECHO) "/*" > %1
 		\t$(ECHO) "**\tAUTOMATICALLY GENERATED - DO NOT EDIT BY HAND." >> %1
 		\t$(ECHO) "**\tSee http://www.teklib.org/ for details - to regenerate," >> %1
-		\t$(ECHO) "**\tissue  make linux_sources  in TEKlib's root directory." >> %1
+		\t$(ECHO) "**\tissue  make sources  in TEKlib's root directory." >> %1
 		\t$(ECHO) "*/" >> %1
 		\t$(CAT) %2 >> %1
 [/body]
diff -r 76707ff52967 -r 4ed8394acfc2 doc/html/exec.html
--- a/doc/html/exec.html	Thu May 15 15:11:33 2008 +0000
+++ b/doc/html/exec.html	Thu May 15 15:12:06 2008 +0000
@@ -14,14 +14,6 @@
 			<table>
 				<tr>
 					<td class="column1">
-						<a href="#TGetExecBase"><code>TGetExecBase()</code></a> 
-					</td>
-					<td class="column2">
-						Get Execbase pointer from an Exec object
-					</td>
-				</tr>
-				<tr>
-					<td class="column1">
 						<a href="#Modules">Modules</a> 
 					</td>
 					<td class="column2">
@@ -188,6 +180,14 @@
 		</div>
 		<div class="node"><h3><a name="Modules" id="Modules">Modules</a></h3>
 			<table>
+				<tr>
+					<td class="column1">
+						<a href="#TGetExecBase"><code>TGetExecBase()</code></a> 
+					</td>
+					<td class="column2">
+						Get Execbase pointer from an Exec object
+					</td>
+				</tr>
 				<tr>
 					<td class="column1">
 						<a href="#TOpenModule"><code>TOpenModule()</code></a> 
diff -r 76707ff52967 -r 4ed8394acfc2 doc/text/exec.txt
--- a/doc/text/exec.txt	Thu May 15 15:11:33 2008 +0000
+++ b/doc/text/exec.txt	Thu May 15 15:12:06 2008 +0000
@@ -5,7 +5,6 @@
 
 ===( Overview )===
 
-TGetExecBase()		|| Get Execbase pointer from an Exec object
 [[#Modules]]		|| Module opening, closing and instances
 [[#Tasks]]			|| Tasks, signals and waiting
 [[#Locking]]		|| Locks and named atoms
@@ -32,6 +31,7 @@ TFillMem32()      	|| Fill memory with a
 
 ===( Modules )===
 
+TGetExecBase()		|| Get Execbase pointer from an Exec object
 TOpenModule()     	|| Open a shared module (or instance)
 TCloseModule()    	|| Close a module (or instance)
 
diff -r 76707ff52967 -r 4ed8394acfc2 src/display_x11/display_x11_api.c
--- a/src/display_x11/display_x11_api.c	Thu May 15 15:11:33 2008 +0000
+++ b/src/display_x11/display_x11_api.c	Thu May 15 15:12:06 2008 +0000
@@ -2,6 +2,9 @@
 #include "display_x11_mod.h"
 
 static void freepen(TMOD_X11 *mod, VISUAL *v, struct X11Pen *pen);
+
+#define DEF_WINWIDTH 600
+#define DEF_WINHEIGHT 400
 
 /*****************************************************************************/