From axeld at pinc-software.de  Sat Mar  1 00:05:07 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sat, 01 Mar 2008 00:05:07 +0100 CET
Subject: [Haiku-commits] r24143 - haiku/trunk/src/servers/app
In-Reply-To: <20080229162824.M8028@mlotz.ch>
Message-ID: <51790263594-BeMail@zon>

"Michael Lotz" <mmlr at mlotz.ch> wrote:
> On Fri, 29 Feb 2008 16:45:44 +0100 CET, Axel D?rfler wrote
> > Alexandre Deckner <alex at zappotek.com> wrote:
> > > Strangely, as i noticed last week, this font (and only this one) 
> > > renders in gray in the Keymap preflet! Any idea?
> > Are you eventually rendering at some sub-pixel position? At least 
> > that may affect the rendering AFAICT.
> Probably the "extra condensed" version of the font is used. I saw 
> that the
> text is also "gray" in StyledEdit with this font. Do we really need 
> all those
> variations is the other question...

Good catch! At least we needed it to find a bug in our font engine that 
apparently chooses the wrong font here ;-)

Bye,
   Axel.



From revol at free.fr  Sat Mar  1 00:34:57 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sat, 01 Mar 2008 00:34:57 +0100 CET
Subject: [Haiku-commits]
 =?windows-1252?q?r24179_-_in_haiku/trunk=3A_heade?=
 =?windows-1252?q?rs/build_src/build/libhaikucompat?=
In-Reply-To: <200802291502.m1TF2D7Z032050@sheep.berlios.de>
Message-ID: <10458560227-BeMail@laptop>

> Author: axeld
> Date: 2008-02-29 16:02:12 +0100 (Fri, 29 Feb 2008)
> New Revision: 24179
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24179&view=rev
> 
> Modified:
>    haiku/trunk/headers/build/HaikuBuildCompatibility.h
>    haiku/trunk/src/build/libhaikucompat/Jamfile
> Log:
> Hopefully final build fix for Dano; at least I build everything with 
> "-a" this
> time and it worked :-)

$ jam AboutSystem
...patience...
...patience...
...patience...
...patience...
...patience...
...found 5787 target(s)...
...updating 115 target(s)...
C++ generated/objects/haiku/x86/release/apps/aboutsystem/AboutSystem.o
C++ generated/objects/dano/x86/release/build/libhaikucompat/
AppFileInfo.o
In file included from /work/haiku/trunk/headers/build/
HaikuBuildCompatibility.h:26,
                 from /work/haiku/trunk/src/build/libbe/storage/
AppFileInfo.cpp:1:
/work/haiku/trunk/headers/build/os/support/SupportDefs.h:125: syntax 
error before `atomic_set'
/work/haiku/trunk/headers/build/os/support/SupportDefs.h:126: syntax 
error before `atomic_test_and_set'
/work/haiku/trunk/headers/build/os/support/SupportDefs.h:127: syntax 
error before `atomic_add'

it seems to fail at _IMPEXP_ROOT...

Fran?ois.


From axeld at mail.berlios.de  Sat Mar  1 00:43:19 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 1 Mar 2008 00:43:19 +0100
Subject: [Haiku-commits] r24184 - haiku/trunk/headers/build/os/support
Message-ID: <200802292343.m1TNhJtj027421@sheep.berlios.de>

Author: axeld
Date: 2008-03-01 00:43:18 +0100 (Sat, 01 Mar 2008)
New Revision: 24184
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24184&view=rev

Modified:
   haiku/trunk/headers/build/os/support/SupportDefs.h
Log:
Updated our build SupportDefs.h to the same version as the current standard
version. This gets rid of the _IMPEXP* definitions so it should not cause
any trouble.


Modified: haiku/trunk/headers/build/os/support/SupportDefs.h
===================================================================
--- haiku/trunk/headers/build/os/support/SupportDefs.h	2008-02-29 19:09:59 UTC (rev 24183)
+++ haiku/trunk/headers/build/os/support/SupportDefs.h	2008-02-29 23:43:18 UTC (rev 24184)
@@ -1,49 +1,28 @@
-//------------------------------------------------------------------------------
-//	Copyright (c) 2004-2005, Haiku
-//
-//	Permission is hereby granted, free of charge, to any person obtaining a
-//	copy of this software and associated documentation files (the "Software"),
-//	to deal in the Software without restriction, including without limitation
-//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-//	and/or sell copies of the Software, and to permit persons to whom the
-//	Software is furnished to do so, subject to the following conditions:
-//
-//	The above copyright notice and this permission notice shall be included in
-//	all copies or substantial portions of the Software.
-//
-//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-//	DEALINGS IN THE SOFTWARE.
-//
-//	File Name:		SupportDefs.h
-//	Author:			Erik Jaesler (erik at cgsoftware.com)
-//	Description:	Common type definitions.
-//------------------------------------------------------------------------------
-
+/*
+ * Copyright 2004-2007, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author:
+ *		Erik Jaesler (erik at cgsoftware.com)
+ */
 #ifndef _SUPPORT_DEFS_H
 #define _SUPPORT_DEFS_H
 
-/* this !must! be located before the include of sys/types.h */
+
+/* this must be located before the include of sys/types.h */
 #if !defined(_SYS_TYPES_H) && !defined(_SYS_TYPES_H_)
 typedef unsigned long			ulong;
 typedef unsigned int			uint;
 typedef unsigned short			ushort;
 #endif
 
-
-// Standard Includes -----------------------------------------------------------
-
-// System Includes -------------------------------------------------------------
 #include <BeBuild.h>
-#include <sys/types.h>
 #include <Errors.h>
 
-// Shorthand type formats ------------------------------------------------------
+#include <sys/types.h>
 
+
+// Shorthand type formats
 typedef	signed char				int8;
 typedef unsigned char			uint8;
 typedef volatile signed char   	vint8;
@@ -59,9 +38,9 @@
 typedef volatile long			vint32;
 typedef volatile unsigned long	vuint32;
 
-typedef	long long					int64;
-typedef unsigned long long			uint64;
-typedef volatile long long			vint64;
+typedef	long long				int64;
+typedef unsigned long long		uint64;
+typedef volatile long long		vint64;
 typedef volatile unsigned long long	vuint64;
 
 typedef volatile long			vlong;
@@ -78,24 +57,20 @@
 typedef unsigned short          unichar;
 
 
-// Descriptive formats ---------------------------------------------------------
+// Descriptive formats
 typedef int32					status_t;
 typedef int64					bigtime_t;
 typedef uint32					type_code;
 typedef uint32					perform_code;
 
 
-// Empty string ("") -----------------------------------------------------------
+// Empty string ("")
 #ifdef __cplusplus
-extern _IMPEXP_BE const char *B_EMPTY_STRING;
+extern const char *B_EMPTY_STRING;
 #endif
 
 
-// min and max comparisons -----------------------------------------------------
-//	min() and max() won't work in C++
-#define min_c(a,b) ((a)>(b)?(b):(a))
-#define max_c(a,b) ((a)>(b)?(a):(b))
-
+// min and max comparisons
 #ifndef __cplusplus
 #	ifndef min
 #		define min(a,b) ((a)>(b)?(b):(a))
@@ -105,8 +80,12 @@
 #	endif
 #endif 
 
+// min() and max() won't work in C++
+#define min_c(a,b) ((a)>(b)?(b):(a))
+#define max_c(a,b) ((a)>(b)?(a):(b))
 
-// Grandfathering --------------------------------------------------------------
+
+// Grandfathering
 #ifndef __cplusplus
 #	include <stdbool.h>
 #endif 
@@ -116,34 +95,33 @@
 #endif
 
 
-//------------------------------------------------------------------------------
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-//----- Atomic functions; old value is returned --------------------------------
-extern _IMPEXP_ROOT int32	atomic_set(vint32 *value, int32 newValue);
-extern _IMPEXP_ROOT int32	atomic_test_and_set(vint32 *value, int32 newValue, int32 testAgainst);
-extern _IMPEXP_ROOT int32	atomic_add(vint32 *value, int32 addValue);
-extern _IMPEXP_ROOT int32	atomic_and(vint32 *value, int32 andValue);
-extern _IMPEXP_ROOT int32	atomic_or(vint32 *value, int32 orValue);	
-extern _IMPEXP_ROOT int32	atomic_get(vint32 *value);
+// Atomic functions; previous value is returned
+extern int32	atomic_set(vint32 *value, int32 newValue);
+extern int32	atomic_test_and_set(vint32 *value, int32 newValue, int32 testAgainst);
+extern int32	atomic_add(vint32 *value, int32 addValue);
+extern int32	atomic_and(vint32 *value, int32 andValue);
+extern int32	atomic_or(vint32 *value, int32 orValue);	
+extern int32	atomic_get(vint32 *value);
 
-extern _IMPEXP_ROOT int64	atomic_set64(vint64 *value, int64 newValue);
-extern _IMPEXP_ROOT int64	atomic_test_and_set64(vint64 *value, int64 newValue, int64 testAgainst);
-extern _IMPEXP_ROOT int64	atomic_add64(vint64 *value, int64 addValue);
-extern _IMPEXP_ROOT int64	atomic_and64(vint64 *value, int64 andValue);
-extern _IMPEXP_ROOT int64	atomic_or64(vint64 *value, int64 orValue);	
-extern _IMPEXP_ROOT int64	atomic_get64(vint64 *value);
+extern int64	atomic_set64(vint64 *value, int64 newValue);
+extern int64	atomic_test_and_set64(vint64 *value, int64 newValue, int64 testAgainst);
+extern int64	atomic_add64(vint64 *value, int64 addValue);
+extern int64	atomic_and64(vint64 *value, int64 andValue);
+extern int64	atomic_or64(vint64 *value, int64 orValue);	
+extern int64	atomic_get64(vint64 *value);
 
-// Other stuff -----------------------------------------------------------------
-extern _IMPEXP_ROOT void *	get_stack_frame(void);
+// Other stuff
+extern void*	get_stack_frame(void);
 
 #ifdef __cplusplus
 }
 #endif
 
-//-------- Obsolete or discouraged API -----------------------------------------
+// Obsolete or discouraged API
 
 // use 'true' and 'false'
 #ifndef FALSE



From axeld at pinc-software.de  Sat Mar  1 00:43:56 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sat, 01 Mar 2008 00:43:56 +0100 CET
Subject: [Haiku-commits] r24179 - in haiku/trunk: headers/build
 src/build/libhaikucompat
In-Reply-To: <10458560227-BeMail@laptop>
Message-ID: <54119194411-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> > Hopefully final build fix for Dano; at least I build everything 
> > with 
> > "-a" this
> > time and it worked :-)
> $ jam AboutSystem
[...]
> HaikuBuildCompatibility.h:26,
>                  from /work/haiku/trunk/src/build/libbe/storage/
> AppFileInfo.cpp:1:
> /work/haiku/trunk/headers/build/os/support/SupportDefs.h:125: syntax 
> error before `atomic_set'
> /work/haiku/trunk/headers/build/os/support/SupportDefs.h:126: syntax 
> error before `atomic_test_and_set'
> /work/haiku/trunk/headers/build/os/support/SupportDefs.h:127: syntax 
> error before `atomic_add'
> 
> it seems to fail at _IMPEXP_ROOT...

Since it builds fine over here, I guess I must have some local 
modifications in my Dano headers (which is very well possible).
Anyway, please try r24184. If that doesn't help, someone else has to 
fix it, I'm afraid.

Bye,
   Axel.



From revol at free.fr  Sat Mar  1 00:49:55 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sat, 01 Mar 2008 00:49:55 +0100 CET
Subject: [Haiku-commits] r24184 - haiku/trunk/headers/build/os/support
In-Reply-To: <200802292343.m1TNhJtj027421@sheep.berlios.de>
Message-ID: <11356862685-BeMail@laptop>

> Author: axeld
> Date: 2008-03-01 00:43:18 +0100 (Sat, 01 Mar 2008)
> New Revision: 24184
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24184&view=rev
> 
> Modified:
>    haiku/trunk/headers/build/os/support/SupportDefs.h
> Log:
> Updated our build SupportDefs.h to the same version as the current 
> standard
> version. This gets rid of the _IMPEXP* definitions so it should not 
> cause
> any trouble.

Thanks, seems to work now.

Fran?ois.


From anevilyak at mail.berlios.de  Sat Mar  1 01:57:19 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 1 Mar 2008 01:57:19 +0100
Subject: [Haiku-commits] r24185 - in haiku/trunk: headers/os/interface
	src/preferences/appearance
Message-ID: <200803010057.m210vJ9K001961@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-01 01:57:18 +0100 (Sat, 01 Mar 2008)
New Revision: 24185
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24185&view=rev

Modified:
   haiku/trunk/headers/os/interface/GraphicsDefs.h
   haiku/trunk/src/preferences/appearance/APRView.cpp
   haiku/trunk/src/preferences/appearance/APRView.h
   haiku/trunk/src/preferences/appearance/ColorSet.cpp
   haiku/trunk/src/preferences/appearance/ColorSet.h
   haiku/trunk/src/preferences/appearance/ColorWhichItem.cpp
   haiku/trunk/src/preferences/appearance/ColorWhichItem.h
Log:
- Added operator = implementation to rgb_color for convenience.
- Major cleanup of Appearance prefs - colors are now dynamically
  read from the app_server, and updating them also works, but
  triggers a bug: the state of the current window somehow gets
  confused, i.e. if I update the panel background color, for some
  reason the color of the BButtons in the appearance pref change color
  and also the textviews begin misbehaving. Have not yet tracked down
  the cause of this, but newly created windows after making the change
  do show up with the updated color and behave properly. Also vastly
  simplified the pref and cleaned up some obsolete definitions.



Modified: haiku/trunk/headers/os/interface/GraphicsDefs.h
===================================================================
--- haiku/trunk/headers/os/interface/GraphicsDefs.h	2008-02-29 23:43:18 UTC (rev 24184)
+++ haiku/trunk/headers/os/interface/GraphicsDefs.h	2008-03-01 00:57:18 UTC (rev 24185)
@@ -101,6 +101,12 @@
 	{
 		return *(const uint32 *)this != *(const uint32 *)&other;
 	}
+	
+	inline rgb_color&
+	operator=(const rgb_color& other)
+	{
+		return set_to(other.red, other.green, other.blue, other.alpha);
+	}
 #endif
 } rgb_color;
 

Modified: haiku/trunk/src/preferences/appearance/APRView.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/APRView.cpp	2008-02-29 23:43:18 UTC (rev 24184)
+++ haiku/trunk/src/preferences/appearance/APRView.cpp	2008-03-01 00:57:18 UTC (rev 24185)
@@ -1,9 +1,10 @@
 /*
- * Copyright 2002-2006, Haiku. All rights reserved.
+ * Copyright 2002-2008, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		DarkWyrm (darkwyrm at earthlink.net)
+ *		Rene Gollent (rene at gollent.com)
  */
 #include <OS.h>
 #include <Directory.h>
@@ -33,6 +34,36 @@
 #define COLOR_DROPPED 'cldp'
 #define DECORATOR_CHANGED 'dcch'
 
+int32 sColorConsts[] = {
+	B_PANEL_BACKGROUND_COLOR,
+	B_PANEL_TEXT_COLOR,
+	B_DOCUMENT_BACKGROUND_COLOR,
+	B_DOCUMENT_TEXT_COLOR,
+	B_CONTROL_BACKGROUND_COLOR,
+	B_CONTROL_TEXT_COLOR,
+	B_CONTROL_BORDER_COLOR,
+	B_CONTROL_HIGHLIGHT_COLOR,
+	B_NAVIGATION_BASE_COLOR,
+	B_NAVIGATION_PULSE_COLOR,
+	B_SHINE_COLOR,
+	B_SHADOW_COLOR,
+	B_MENU_BACKGROUND_COLOR,
+	B_MENU_SELECTED_BACKGROUND_COLOR,
+	B_MENU_ITEM_TEXT_COLOR,
+	B_MENU_SELECTED_ITEM_TEXT_COLOR,
+	B_MENU_SELECTED_BORDER_COLOR,
+	B_TOOLTIP_BACKGROUND_COLOR,
+	B_TOOLTIP_TEXT_COLOR,
+	B_SUCCESS_COLOR,
+	B_FAILURE_COLOR,
+	B_WINDOW_TAB_COLOR,
+	B_WINDOW_TEXT_COLOR,
+	B_WINDOW_INACTIVE_TAB_COLOR,
+	B_WINDOW_INACTIVE_TEXT_COLOR,
+};
+
+const uint32 sColorCount = sizeof(sColorConsts) / sizeof(int32);
+
 namespace BPrivate
 {
 	int32 count_decorators(void);
@@ -99,32 +130,12 @@
 	
 	fAttrList->SetSelectionMessage(new BMessage(ATTRIBUTE_CHOSEN));
 
-	fAttrList->AddItem(new ColorWhichItem(B_PANEL_BACKGROUND_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_PANEL_TEXT_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_DOCUMENT_BACKGROUND_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_DOCUMENT_TEXT_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_CONTROL_BACKGROUND_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_CONTROL_TEXT_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_CONTROL_BORDER_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_CONTROL_HIGHLIGHT_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_NAVIGATION_BASE_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_NAVIGATION_PULSE_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_SHINE_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_SHADOW_COLOR));
-	fAttrList->AddItem(new ColorWhichItem(B_MENU_BACKGROUND_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_MENU_SELECTED_BACKGROUND_COLOR));
-	fAttrList->AddItem(new ColorWhichItem(B_MENU_ITEM_TEXT_COLOR));
-	fAttrList->AddItem(new ColorWhichItem(B_MENU_SELECTED_ITEM_TEXT_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_MENU_SELECTED_BORDER_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_TOOLTIP_BACKGROUND_COLOR));
-	
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_SUCCESS_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_FAILURE_COLOR));
-	fAttrList->AddItem(new ColorWhichItem(B_WINDOW_TAB_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_WINDOW_TAB_TEXT_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_INACTIVE_WINDOW_TAB_COLOR));
-	fAttrList->AddItem(new ColorWhichItem((color_which)B_INACTIVE_WINDOW_TAB_TEXT_COLOR));
+	printf("Color count: %lu\n", sColorCount);
 
+	for (uint32 i = 0; i < sColorCount; i++) {
+		printf("Adding color item for which: %ld\n", sColorConsts[i]);
+		fAttrList->AddItem(new ColorWhichItem((color_which)sColorConsts[i]));
+	}
 
 	BRect wellrect(0,0,50,50);
 	wellrect.OffsetTo(rect.right + 30, rect.top +
@@ -201,6 +212,7 @@
 			fPicker->SetValue(*col);
 			fColorWell->SetColor(*col);
 			fColorWell->Invalidate();
+			UpdateCurrentColor();
 		}
 	}
 
@@ -220,10 +232,11 @@
 
 			fColorWell->SetColor(col);
 			fColorWell->Invalidate();
-			
+				
 			// Update current fAttribute in the settings
-			fCurrentSet.SetColor(fAttrString.String(),col);
-			
+			fCurrentSet.SetColor(fAttribute, col);
+			UpdateCurrentColor();				
+	
 			fDefaults->SetEnabled(fCurrentSet.IsDefaultable());
 			fRevert->SetEnabled(true);
 			
@@ -240,23 +253,26 @@
 			
 			fAttrString=whichitem->Text();
 			UpdateControlsFromAttr(whichitem->Text());
-
+			
 			fDefaults->SetEnabled(fCurrentSet.IsDefaultable());
 			break;
 		}
 		case REVERT_SETTINGS: {
 			fCurrentSet=fPrevSet;
 			UpdateControlsFromAttr(fAttrString.String());
+			UpdateAllColors();
 			
 			fRevert->SetEnabled(false);
 			
 			break;
 		}
 		case DEFAULT_SETTINGS: {
-			fCurrentSet.SetToDefaults();
+			fCurrentSet = ColorSet::DefaultColorSet();
 			fDefaults->SetEnabled(false);
 			
 			UpdateControlsFromAttr(fAttrString.String());
+			UpdateAllColors();
+
 			BMenuItem *item = fDecorMenu->FindItem("Default");
 			if (item)
 			{
@@ -275,21 +291,31 @@
 
 void APRView::LoadSettings(void)
 {
-	// Load the current GUI color settings from disk. This is done instead of
-	// getting them from the server at this point for testing purposes.
-	
-	// Query the server for the current settings
-	//BPrivate::get_system_colors(&fCurrentSet);
-	
-	// TODO: remove this and enable the get_system_colors() call
-	if (ColorSet::LoadColorSet("/boot/home/config/settings/app_server/system_colors",&fCurrentSet) != B_OK) {
-		fCurrentSet.SetToDefaults();
-		ColorSet::SaveColorSet("/boot/home/config/settings/app_server/system_colors",fCurrentSet);
+	printf("Max colors: %lu\n", sColorCount);
+	for (uint32 i = 0; i < sColorCount; i++) {
+		printf("getting ui_color for index %lu, constant: %ld\n", i, sColorConsts[i]);
+		fCurrentSet.SetColor((color_which)sColorConsts[i], ui_color((color_which)sColorConsts[i]));
 	}
-	
+
+	fCurrentSet.PrintToStream();
+
 	fPrevSet = fCurrentSet;
 }
 
+void APRView::UpdateAllColors(void)
+{
+	for (uint32 i = 0; i < sColorCount; i++)
+		set_ui_color((color_which)sColorConsts[i], 
+			fCurrentSet.AttributeToColor((color_which)sColorConsts[i]));
+}
+
+void APRView::UpdateCurrentColor(void)
+{
+	rgb_color col=fPicker->ValueAsColor();
+	ColorWhichItem *whichitem = (ColorWhichItem *)fAttrList->ItemAt(fAttrList->CurrentSelection());
+	set_ui_color(whichitem->GetAttribute(), col);
+}
+
 void APRView::UpdateControlsFromAttr(const char *string)
 {
 	if (!string)

Modified: haiku/trunk/src/preferences/appearance/APRView.h
===================================================================
--- haiku/trunk/src/preferences/appearance/APRView.h	2008-02-29 23:43:18 UTC (rev 24184)
+++ haiku/trunk/src/preferences/appearance/APRView.h	2008-03-01 00:57:18 UTC (rev 24185)
@@ -1,9 +1,10 @@
 /*
- * Copyright 2002-2006, Haiku. All rights reserved.
+ * Copyright 2002-2008, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		DarkWyrm (darkwyrm at earthlink.net)
+ *		Rene Gollent (rene at gollent.com)
  */
 #ifndef APR_VIEW_H_
 #define APR_VIEW_H_
@@ -43,6 +44,8 @@
 protected:
 
 	void	UpdateControlsFromAttr(const char *string);
+	void	UpdateCurrentColor();
+	void	UpdateAllColors();
 	
 	BColorControl	*fPicker;
 	

Modified: haiku/trunk/src/preferences/appearance/ColorSet.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/ColorSet.cpp	2008-02-29 23:43:18 UTC (rev 24184)
+++ haiku/trunk/src/preferences/appearance/ColorSet.cpp	2008-03-01 00:57:18 UTC (rev 24185)
@@ -1,10 +1,11 @@
 /*
- * Copyright 2001-2006, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		DarkWyrm <bpmagic at columbus.rr.com>
  *		Stephan A?mus <superstippi at gmx.de>
+ *		Rene Gollent <rene at gollent.com>
  */
 
 #include <stdio.h>
@@ -16,17 +17,10 @@
 #include <String.h>
 #include "ColorSet.h"
 
-static void
-set_rgb_color(rgb_color& color, uint8 red, uint8 green, uint8 blue)
-{
-	color.red = red;
-	color.green = green;
-	color.blue = blue;
-	color.alpha = 255;
-}
+static ColorSet sDefaults = ColorSet::DefaultColorSet(); 
+static std::map<color_which, BString> sColorNames = ColorSet::DefaultColorNames();
 
-
-static bool
+bool 
 match_rgb_color(rgb_color& color, uint8 red, uint8 green, uint8 blue)
 {
 	return color.red == red
@@ -71,148 +65,68 @@
 void
 ColorSet::SetColors(const ColorSet &cs)
 {
-	panel_background=cs.panel_background;
-	panel_text=cs.panel_text;
-
-	document_background=cs.document_background;
-	document_text=cs.document_text;
-
-	control_background=cs.control_background;
-	control_text=cs.control_text;
-	control_highlight=cs.control_highlight;
-	control_border=cs.control_border;
-
-	tooltip_background=cs.tooltip_background;
-	tooltip_text=cs.tooltip_text;
-
-	menu_background=cs.menu_background;
-	menu_selected_background=cs.menu_selected_background;
-	menu_text=cs.menu_text;
-	menu_selected_text=cs.menu_selected_text;
-	menu_selected_border=cs.menu_selected_border;
-
-	keyboard_navigation_base=cs.keyboard_navigation_base;
-	keyboard_navigation_pulse=cs.keyboard_navigation_pulse;
-
-	success=cs.success;
-	failure=cs.failure;
-	shine=cs.shine;
-	shadow=cs.shadow;
-
-	window_tab=cs.window_tab;
-	window_tab_text=cs.window_tab_text;
-	inactive_window_tab=cs.inactive_window_tab;
-	inactive_window_tab_text=cs.inactive_window_tab_text;
+	fColors = cs.fColors;
 }
 
 //! Prints all color set elements to stdout
 void
 ColorSet::PrintToStream(void) const
 {
-	printf("panel_background "); PrintMember(panel_background);
-	printf("panel_text "); PrintMember(panel_text);
-
-	printf("document_background "); PrintMember(document_background);
-	printf("document_text "); PrintMember(document_text);
-
-	printf("control_background "); PrintMember(control_background);
-	printf("control_text "); PrintMember(control_text);
-	printf("control_highlight "); PrintMember(control_highlight);
-	printf("control_border "); PrintMember(control_border);
-
-	printf("tooltip_background "); PrintMember(tooltip_background);
-	printf("tooltip_text "); PrintMember(tooltip_text);
-
-	printf("menu_background "); PrintMember(menu_background);
-	printf("menu_selected_background "); PrintMember(menu_selected_background);
-	printf("menu_text "); PrintMember(menu_text);
-	printf("menu_selected_text "); PrintMember(menu_selected_text);
-	printf("menu_selected_border "); PrintMember(menu_selected_border);
-
-	printf("keyboard_navigation_base "); PrintMember(keyboard_navigation_base);
-	printf("keyboard_navigation_pulse "); PrintMember(keyboard_navigation_pulse);
-
-	printf("success "); PrintMember(success);
-	printf("failure "); PrintMember(failure);
-	printf("shine "); PrintMember(shine);
-	printf("shadow "); PrintMember(shadow);
-
-	printf("window_tab "); PrintMember(window_tab);
-	printf("window_tab_text "); PrintMember(window_tab_text);
-
-	printf("inactive_window_tab "); PrintMember(inactive_window_tab);
-	printf("inactive_window_tab_text "); PrintMember(inactive_window_tab_text);
+	for (std::map<color_which, BString>::const_iterator it = sColorNames.begin(); it != sColorNames.end(); ++it) {
+		printf("%s ", it->second.String());
+		PrintMember(it->first);
+		printf("\n");
+	}
 }
 
 /*!
 	\brief Assigns the default system colors to the passed ColorSet object
 	\param set The ColorSet object to set to defaults
 */
-void
-ColorSet::SetToDefaults(void)
+ColorSet
+ColorSet::DefaultColorSet(void)
 {
 #ifdef DEBUG_COLORSET
 printf("Initializing color settings to defaults\n");
 #endif
-	set_rgb_color(panel_background, 216, 216, 216);
-	set_rgb_color(panel_text, 0, 0, 0);
-	set_rgb_color(document_background, 255, 255, 255);
-	set_rgb_color(document_text, 0, 0, 0);
-	set_rgb_color(control_background, 245, 245, 245);
-	set_rgb_color(control_text, 0, 0, 0);
-	set_rgb_color(control_border, 0, 0, 0);
-	set_rgb_color(control_highlight, 102, 152, 203);
-	set_rgb_color(keyboard_navigation_base, 0, 0, 229);
-	set_rgb_color(keyboard_navigation_pulse, 0, 0, 0);
-	set_rgb_color(shine, 255, 255, 255);
-	set_rgb_color(shadow, 0, 0, 0);
-	set_rgb_color(menu_background, 216, 216, 216);
-	set_rgb_color(menu_selected_background, 115, 120, 184);
-	set_rgb_color(menu_text, 0, 0, 0);
-	set_rgb_color(menu_selected_text, 255, 255, 255);
-	set_rgb_color(menu_selected_border, 0, 0, 0);
-	set_rgb_color(tooltip_background, 255, 255, 0);
-	set_rgb_color(tooltip_text, 0, 0, 0);
-	set_rgb_color(success, 0, 255, 0);
-	set_rgb_color(failure, 255, 0, 0);
-	set_rgb_color(window_tab, 255, 203, 0);
-	set_rgb_color(window_tab_text, 0, 0, 0);
-	set_rgb_color(inactive_window_tab, 232, 232, 232);
-	set_rgb_color(inactive_window_tab_text, 80, 80, 80);
+	ColorSet set;
+	set.fColors[B_PANEL_BACKGROUND_COLOR] = make_color(216, 216, 216);
+	set.fColors[B_PANEL_TEXT_COLOR] = make_color(0, 0, 0);
+	set.fColors[B_DOCUMENT_BACKGROUND_COLOR] = make_color(255,255, 255);
+	set.fColors[B_DOCUMENT_TEXT_COLOR] = make_color(0, 0, 0);
+	set.fColors[B_CONTROL_BACKGROUND_COLOR] = make_color(245, 245, 245);
+	set.fColors[B_CONTROL_TEXT_COLOR] = make_color(0, 0, 0);
+	set.fColors[B_CONTROL_BORDER_COLOR] = make_color(0, 0, 0);
+	set.fColors[B_CONTROL_HIGHLIGHT_COLOR] = make_color(102, 152, 203);
+	set.fColors[B_NAVIGATION_BASE_COLOR] = make_color(0, 0, 229);
+	set.fColors[B_NAVIGATION_PULSE_COLOR] = make_color(0, 0, 0);
+	set.fColors[B_SHINE_COLOR] = make_color(255, 255, 255);
+	set.fColors[B_SHADOW_COLOR] = make_color(0, 0, 0);
+	set.fColors[B_MENU_BACKGROUND_COLOR] = make_color(216, 216, 216);
+	set.fColors[B_MENU_SELECTED_BACKGROUND_COLOR] = make_color(115, 120, 184);
+	set.fColors[B_MENU_ITEM_TEXT_COLOR] = make_color(0, 0, 0);
+	set.fColors[B_MENU_SELECTED_ITEM_TEXT_COLOR] = make_color(255, 255, 255);
+	set.fColors[B_MENU_SELECTED_BORDER_COLOR] = make_color(0, 0, 0);
+	set.fColors[B_TOOLTIP_BACKGROUND_COLOR] = make_color(255, 255, 0);
+	set.fColors[B_TOOLTIP_TEXT_COLOR] = make_color(0, 0, 0);
+	set.fColors[B_SUCCESS_COLOR] = make_color(0, 255, 0);
+	set.fColors[B_FAILURE_COLOR] = make_color(255, 0, 0);
+	set.fColors[B_WINDOW_TAB_COLOR] = make_color(255, 203, 0);
+	set.fColors[B_WINDOW_TEXT_COLOR] = make_color(0, 0, 0);
+	set.fColors[B_WINDOW_INACTIVE_TAB_COLOR] = make_color(232, 232, 232);
+	set.fColors[B_WINDOW_INACTIVE_TEXT_COLOR] = make_color(80, 80, 80);
+
+	return set;
 }
 
+
 /*!
 	\brief Checks if the ColorSet can be set to defaults.
 */
 bool
 ColorSet::IsDefaultable()
 {
-	// TODO: Move all the default color values into constants
-	return !match_rgb_color(panel_background, 216, 216, 216)
-		|| !match_rgb_color(panel_text, 0, 0, 0)
-		|| !match_rgb_color(document_background, 255, 255, 255)
-		|| !match_rgb_color(document_text, 0, 0, 0)
-		|| !match_rgb_color(control_background, 245, 245, 245)
-		|| !match_rgb_color(control_text, 0, 0, 0)
-		|| !match_rgb_color(control_border, 0, 0, 0)
-		|| !match_rgb_color(control_highlight, 102, 152, 203)
-		|| !match_rgb_color(keyboard_navigation_base, 0, 0, 229)
-		|| !match_rgb_color(keyboard_navigation_pulse, 0, 0, 0)
-		|| !match_rgb_color(shine, 255, 255, 255)
-		|| !match_rgb_color(shadow, 0, 0, 0)
-		|| !match_rgb_color(menu_background, 216, 216, 216)
-		|| !match_rgb_color(menu_selected_background, 115, 120, 184)
-		|| !match_rgb_color(menu_text, 0, 0, 0)
-		|| !match_rgb_color(menu_selected_text, 255, 255, 255)
-		|| !match_rgb_color(menu_selected_border, 0, 0, 0)
-		|| !match_rgb_color(tooltip_background, 255, 255, 0)
-		|| !match_rgb_color(tooltip_text, 0, 0, 0)
-		|| !match_rgb_color(success, 0, 255, 0)
-		|| !match_rgb_color(failure, 255, 0, 0)
-		|| !match_rgb_color(window_tab, 255, 203, 0)
-		|| !match_rgb_color(window_tab_text, 0, 0, 0)
-		|| !match_rgb_color(inactive_window_tab, 232, 232, 232)
-		|| !match_rgb_color(inactive_window_tab_text, 80, 80, 80);
+	return (*this == sDefaults);
 }
 
 /*!
@@ -226,46 +140,16 @@
 		return false;
 
 	msg->MakeEmpty();
-	
-	msg->AddData("Panel Background",(type_code)'RGBC',&panel_background,
-				sizeof(rgb_color) );
-	msg->AddData("Panel Text",(type_code)'RGBC',&panel_text,sizeof(rgb_color));
-	msg->AddData("Document Background",(type_code)'RGBC',&document_background,
-				sizeof(rgb_color));
-	msg->AddData("Document Text",(type_code)'RGBC',&document_text,sizeof(rgb_color));
-	msg->AddData("Control Background",(type_code)'RGBC',&control_background,
-				sizeof(rgb_color));
-	msg->AddData("Control Text",(type_code)'RGBC',&control_text,sizeof(rgb_color));
-	msg->AddData("Control Highlight",(type_code)'RGBC',&control_highlight,
-				sizeof(rgb_color));
-	msg->AddData("Control Border",(type_code)'RGBC',&control_border,sizeof(rgb_color));
-	msg->AddData("Tooltip Background",(type_code)'RGBC',&tooltip_background,
-				sizeof(rgb_color));
-	msg->AddData("Tooltip Text",(type_code)'RGBC',&tooltip_text,sizeof(rgb_color));
-	msg->AddData("Menu Background",(type_code)'RGBC',&menu_background,
-				sizeof(rgb_color));
-	msg->AddData("Selected Menu Item Background",(type_code)'RGBC',&menu_selected_background,
-				sizeof(rgb_color));
-	msg->AddData("Keyboard Navigation Base",(type_code)'RGBC',&keyboard_navigation_base,
-				sizeof(rgb_color));
-	msg->AddData("Keyboard Navigation Pulse",(type_code)'RGBC',
-				&keyboard_navigation_pulse,sizeof(rgb_color));
-	msg->AddData("Menu Item Text",(type_code)'RGBC',&menu_text,sizeof(rgb_color));
-	msg->AddData("Selected Menu Item Text",(type_code)'RGBC',&menu_selected_text,
-				sizeof(rgb_color));
-	msg->AddData("Selected Menu Item Border",(type_code)'RGBC',&menu_selected_border,
-				sizeof(rgb_color));
-	msg->AddData("Success",(type_code)'RGBC',&success,sizeof(rgb_color));
-	msg->AddData("Failure",(type_code)'RGBC',&failure,sizeof(rgb_color));
-	msg->AddData("Shine",(type_code)'RGBC',&shine,sizeof(rgb_color));
-	msg->AddData("Shadow",(type_code)'RGBC',&shadow,sizeof(rgb_color));
-	msg->AddData("Window Tab",(type_code)'RGBC',&window_tab,sizeof(rgb_color));
-	msg->AddData("Window Tab Text",(type_code)'RGBC',&window_tab_text,
-				sizeof(rgb_color));
-	msg->AddData("Inactive Window Tab",(type_code)'RGBC',&inactive_window_tab,
-				sizeof(rgb_color));
-	msg->AddData("Inactive Window Tab Text",(type_code)'RGBC',
-				&inactive_window_tab_text,sizeof(rgb_color));
+	rgb_color color;
+
+	for (std::map<color_which, BString>::const_iterator it = sColorNames.begin(); it != sColorNames.end(); ++it) {
+		std::map<color_which, rgb_color>::const_iterator cit = fColors.find(it->first);
+		if (cit != fColors.end())
+			msg->AddData(it->second.String(), (type_code)'RGBC', &(cit->second), sizeof(rgb_color));
+		else
+			msg->AddData(it->second.String(), (type_code)'RGBC', &color, sizeof(rgb_color));
+	}
+
 	return true;
 }
 
@@ -284,286 +168,114 @@
 	ssize_t size;
 	BString str;
 
-	if(msg->FindData("Panel Background",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		panel_background=*col;
-	if(msg->FindData("Panel Text",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		panel_text=*col;
-	if(msg->FindData("Document Background",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		document_background=*col;
-	if(msg->FindData("Document Text",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		document_text=*col;
-	if(msg->FindData("Control Background",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		control_background=*col;
-	if(msg->FindData("Control Text",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		control_text=*col;
-	if(msg->FindData("Control Highlight",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		control_highlight=*col;
-	if(msg->FindData("Control Border",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		control_border=*col;
-	if(msg->FindData("Tooltip Background",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		tooltip_background=*col;
-	if(msg->FindData("Tooltip Text",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		tooltip_text=*col;
-	if(msg->FindData("Menu Background",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		menu_background=*col;
-	if(msg->FindData("Selected Menu Item Background",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		menu_selected_background=*col;
-	if(msg->FindData("Navigation Base",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		keyboard_navigation_base=*col;
-	if(msg->FindData("Navigation Pulse",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		keyboard_navigation_pulse=*col;
-	if(msg->FindData("Menu Item Text",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		menu_text=*col;
-	if(msg->FindData("Selected Menu Item Text",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		menu_selected_text=*col;
-	if(msg->FindData("Selected Menu Item Border",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		menu_selected_border=*col;
-	if(msg->FindData("Success",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		success=*col;
-	if(msg->FindData("Failure",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		failure=*col;
-	if(msg->FindData("Shine",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		shine=*col;
-	if(msg->FindData("Shadow",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		shadow=*col;
-	if(msg->FindData("Window Tab",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		window_tab=*col;
-	if(msg->FindData("Window Tab Text",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		window_tab_text=*col;
-	if(msg->FindData("Inactive Window Tab",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		inactive_window_tab=*col;
-	if(msg->FindData("Inactive Window Tab Text",(type_code)'RGBC',(const void**)&col,&size)==B_OK)
-		inactive_window_tab_text=*col;
+	for (std::map<color_which, BString>::const_iterator it = sColorNames.begin(); 
+			it != sColorNames.end(); ++it) {
+		if (msg->FindData(it->second.String(),(type_code)'RGBC',(const void**)&col,&size)==B_OK)
+			fColors[it->first] = *col;
+	}
+	
 	return true;
 }
 
+std::map<color_which, BString>
+ColorSet::DefaultColorNames(void)
+{
+	std::map<color_which, BString> names;
+
+	names[B_PANEL_BACKGROUND_COLOR] = "Panel Background";
+	names[B_PANEL_TEXT_COLOR] = "Panel Text";
+	names[B_DOCUMENT_BACKGROUND_COLOR] = "Document Background";
+	names[B_DOCUMENT_TEXT_COLOR] = "Document Text";
+	names[B_CONTROL_BACKGROUND_COLOR] = "Control Background";
+	names[B_CONTROL_TEXT_COLOR] = "Control Text";
+	names[B_CONTROL_BORDER_COLOR] = "Control Border";
+	names[B_CONTROL_HIGHLIGHT_COLOR] = "Control Highlight";
+	names[B_NAVIGATION_BASE_COLOR] = "Navigation Base";
+	names[B_NAVIGATION_PULSE_COLOR] = "Navigation Pulse";
+	names[B_SHINE_COLOR] = "Shine";
+	names[B_SHADOW_COLOR] = "Shadow";
+	names[B_MENU_BACKGROUND_COLOR] = "Menu Background";
+	names[B_MENU_SELECTED_BACKGROUND_COLOR] = "Selected Menu Item Background";
+	names[B_MENU_ITEM_TEXT_COLOR] = "Menu Item Text";
+	names[B_MENU_SELECTED_ITEM_TEXT_COLOR] = "Selected Menu Item Text";
+	names[B_MENU_SELECTED_BORDER_COLOR] = "Selected Menu Item Border";
+	names[B_TOOLTIP_BACKGROUND_COLOR] = "Tooltip Background";
+	names[B_TOOLTIP_TEXT_COLOR] = "Tooltip Text";
+	names[B_SUCCESS_COLOR] = "Success";
+	names[B_FAILURE_COLOR] = "Failure";
+	names[B_WINDOW_TAB_COLOR] = "Window Tab";
+	names[B_WINDOW_TEXT_COLOR] = "Window Tab Text";
+	names[B_WINDOW_INACTIVE_TAB_COLOR] = "Inactive Window Tab";
+	names[B_WINDOW_INACTIVE_TEXT_COLOR] = "Inactive Window Tab Text";
 	
+	return names;
+}
+	
 /*!
 	\brief Assigns a value to a named color member
 	\param string name of the color to receive the value
 	\param value An rgb_color which is the new value of the member
 */
 status_t
-ColorSet::SetColor(const char *string, rgb_color value)
+ColorSet::SetColor(color_which which, rgb_color value)
 {
-	if(!string)
-		return B_BAD_VALUE;
-	
-	rgb_color *col=StringToMember(string);
-	if(!col)
-		return B_NAME_NOT_FOUND;
-	*col=value;
+	fColors[which] = value;
 	return B_OK;
 }
 
 /*!
-	\brief Obtains a color based on a specified string
-	\param string name of the color to obtain
-	\return The set's color or (0,0,0,0) if not found
+	\brief Obtains the set's color member based on a specified string
+	\param string name of the color member to obtain
+	\return An RGBColor pointer or NULL if not found
 */
+
 rgb_color
-ColorSet::StringToColor(const char *string)
+ColorSet::StringToColor(const char *string) const
 {
-	rgb_color *col=StringToMember(string);
-	if(!col) {
-		rgb_color c;
-		return c;
+	rgb_color color;
+
+	if (!string)
+		return color;
+
+	color_which which = StringToWhich(string);
+	if (which != -1) {
+		std::map<color_which, rgb_color>::const_iterator it = fColors.find(which);
+		if (it != fColors.end())
+			return it->second;
 	}
-		
-	return *col;
+	
+	return color;
 }
 
-/*!
-	\brief Obtains the set's color member based on a specified string
-	\param string name of the color member to obtain
-	\return An RGBColor pointer or NULL if not found
-*/
-rgb_color *
-ColorSet::StringToMember(const char *string)
+color_which
+ColorSet::StringToWhich(const char *string) const
 {
 	if(!string)
-		return NULL;
+		return (color_which)-1;
 
-	if(strcmp(string,"Panel Background")==0)
-		return &panel_background;
-	if(strcmp(string,"Panel Text")==0)
-		return &panel_text;
-	if(strcmp(string,"Document Background")==0)
-		return &document_background;
-	if(strcmp(string,"Document Text")==0)
-		return &document_text;
-	if(strcmp(string,"Control Background")==0)
-		return &control_background;
-	if(strcmp(string,"Control Text")==0)
-		return &control_text;
-	if(strcmp(string,"Control Highlight")==0)
-		return &control_highlight;
-	if(strcmp(string,"Control Border")==0)
-		return &control_border;
-	if(strcmp(string,"Tooltip Background")==0)
-		return &tooltip_background;
-	if(strcmp(string,"Tooltip Text")==0)
-		return &tooltip_text;
-	if(strcmp(string,"Menu Background")==0)
-		return &menu_background;
-	if(strcmp(string,"Selected Menu Item Background")==0)
-		return &menu_selected_background;
-	if(strcmp(string,"Navigation Base")==0)
-		return &keyboard_navigation_base;
-	if(strcmp(string,"Navigation Pulse")==0)
-		return &keyboard_navigation_pulse;
-	if(strcmp(string,"Menu Item Text")==0)
-		return &menu_text;
-	if(strcmp(string,"Selected Menu Item Text")==0)
-		return &menu_selected_text;
-	if(strcmp(string,"Selected Menu Item Border")==0)
-		return &menu_selected_border;
-	if(strcmp(string,"Success")==0)
-		return &success;
-	if(strcmp(string,"Failure")==0)
-		return &failure;
-	if(strcmp(string,"Shine")==0)
-		return &shine;
-	if(strcmp(string,"Shadow")==0)
-		return &shadow;
-	if(strcmp(string,"Window Tab")==0)
-		return &window_tab;
-	if(strcmp(string,"Window Tab Text")==0)
-		return &window_tab_text;
-	if(strcmp(string,"Inactive Window Tab")==0)
-		return &inactive_window_tab;
-	if(strcmp(string,"Inactive Window Tab Text")==0)
-		return &inactive_window_tab_text;
+	for (std::map<color_which, BString>::const_iterator it = sColorNames.begin(); it != sColorNames.end(); ++it)
+		if (it->second == string)
+			return it->first;
 
-	return NULL;
+	return (color_which)-1;
 	
 }
 
 rgb_color
 ColorSet::AttributeToColor(int32 which)
 {
-	switch(which) {
-		case B_PANEL_BACKGROUND_COLOR: {
-			return panel_background;
-			break;
-		}
-		
-#ifndef HAIKU_TARGET_PLATFORM_BEOS
-		case B_PANEL_TEXT_COLOR: {
-			return panel_text;
-			break;
-		}
-		case B_DOCUMENT_BACKGROUND_COLOR: {
-			return document_background;
-			break;
-		}
-		case B_DOCUMENT_TEXT_COLOR: {
-			return document_text;
-			break;
-		}
-		case B_CONTROL_BACKGROUND_COLOR: {
-			return control_background;
-			break;
-		}
-		case B_CONTROL_TEXT_COLOR: {
-			return control_text;
-			break;
-		}
-		case B_CONTROL_BORDER_COLOR: {
-			return control_border;
-			break;
-		}
-		case B_CONTROL_HIGHLIGHT_COLOR: {
-			return control_highlight;
-			break;
-		}
-		case B_NAVIGATION_BASE_COLOR: {
-			return keyboard_navigation_base;
-			break;
-		}
-		case B_NAVIGATION_PULSE_COLOR: {
-			return keyboard_navigation_pulse;
-			break;
-		}
-		case B_SHINE_COLOR: {
-			return shine;
-			break;
-		}
-		case B_SHADOW_COLOR: {
-			return shadow;
-			break;
-		}
-		case B_MENU_SELECTED_BACKGROUND_COLOR: {
-			return menu_selected_background;
-			break;
-		}
-		case B_MENU_SELECTED_BORDER_COLOR: {
-			return menu_selected_border;
-			break;
-		}
-		case B_TOOLTIP_BACKGROUND_COLOR: {
-			return tooltip_background;
-			break;
-		}
-		case B_TOOLTIP_TEXT_COLOR: {
-			return tooltip_text;
-			break;
-		}
-		case B_SUCCESS_COLOR: {
-			return success;
-			break;
-		}
-		case B_FAILURE_COLOR: {
-			return failure;
-			break;
-		}
-#endif
-		case B_MENU_BACKGROUND_COLOR: {
-			return menu_background;
-			break;
-		}
-		case B_MENU_ITEM_TEXT_COLOR: {
-			return menu_text;
-			break;
-		}
-		case B_MENU_SELECTED_ITEM_TEXT_COLOR: {
-			return menu_selected_text;
-			break;
-		}
-		case B_WINDOW_TAB_COLOR: {
-			return window_tab;
-			break;
-		}
-		
-		// DANGER! DANGER, WILL ROBINSON!!
-		// These are magic numbers to work around compatibility difficulties while still keeping
-		// functionality. This __will__ break following R1
-		case 22: {
-			return window_tab_text;
-			break;
-		}
-		case 23: {
-			return inactive_window_tab;
-			break;
-		}
-		case 24: {
-			return inactive_window_tab_text;
-			break;
-		}
-		
-		default: {
-			rgb_color c;
-			return c;
-			break;
-		}
-	}
+	return fColors[(color_which)which];
 }
 
 void
-ColorSet::PrintMember(const rgb_color &color) const
+ColorSet::PrintMember(color_which which) const
 {
-	printf("rgb_color(%d, %d, %d, %d)",color.red,color.green,color.blue,
-			color.alpha);
+	std::map<color_which, rgb_color>::const_iterator it = fColors.find(which);
+	if (it != fColors.end())
+		printf("rgb_color(%d, %d, %d, %d)", it->second.red,it->second.green,it->second.blue,
+			it->second.alpha);
+	else
+		printf("color (%d) not found\n", which);
 }
 
 
@@ -607,3 +319,4 @@
 
 	return msg.Flatten(&file);	
 }
+

Modified: haiku/trunk/src/preferences/appearance/ColorSet.h
===================================================================
--- haiku/trunk/src/preferences/appearance/ColorSet.h	2008-02-29 23:43:18 UTC (rev 24184)
+++ haiku/trunk/src/preferences/appearance/ColorSet.h	2008-03-01 00:57:18 UTC (rev 24185)
@@ -1,9 +1,10 @@
 /*
- * Copyright 2001-2006, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		DarkWyrm <bpmagic at columbus.rr.com>
+ *		Rene Gollent <rene at gollent.com>
  */
 #ifndef COLOR_SET_H
 #define COLOR_SET_H
@@ -14,6 +15,7 @@
 #include <Message.h>
 #include <String.h>
 
+#include <map>
 
 /*!
 	\class ColorSet ColorSet.h
@@ -31,56 +33,28 @@
 		bool		ConvertToMessage(BMessage *msg) const;
 		bool		ConvertFromMessage(const BMessage *msg);
 
-		void		SetToDefaults(void);
 		bool		IsDefaultable(void);
 
-		rgb_color 	StringToColor(const char *string);
+		rgb_color 	StringToColor(const char *string) const;
 		rgb_color	AttributeToColor(int32 which);
 
-		status_t	SetColor(const char *string, rgb_color value);
+		status_t	SetColor(color_which which, rgb_color value);
 
 		static status_t LoadColorSet(const char *path, ColorSet *set);
 		static status_t SaveColorSet(const char *path, const ColorSet &set);
+		
+		static ColorSet	DefaultColorSet(void);
+		static std::map<color_which, BString> DefaultColorNames(void);
+	
+		inline bool operator==(const ColorSet &other)
+		{
+			return (fColors == other.fColors);
+		}
 
-		rgb_color	panel_background,
-					panel_text,
-					
-					document_background,
-					document_text,
-					
-					control_background,
-					control_text,
-					control_highlight,
-					control_border,
-					
-					tooltip_background,
-					tooltip_text,
-					
-					menu_background,
-					menu_selected_background,
-					menu_text,
-					menu_selected_text,
-					menu_selected_border,
-					
-					keyboard_navigation_base,
-					keyboard_navigation_pulse,
-					
-					success,
-					failure,
-					shine,
-					shadow,
-					window_tab,
-					
-					// Not all of these guys do exist in InterfaceDefs.h,
-					// but we keep them as part of the color set anyway - 
-					// they're important nonetheless
-					window_tab_text,
-					inactive_window_tab,
-					inactive_window_tab_text;
-
 	private:
-		rgb_color	*StringToMember(const char *string);
-		void		PrintMember(const rgb_color &color) const;
+		color_which	StringToWhich(const char *string) const;
+		void		PrintMember(color_which which) const;
+		std::map<color_which, rgb_color> fColors;
 };
 
 #endif	// COLOR_SET_H

Modified: haiku/trunk/src/preferences/appearance/ColorWhichItem.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/ColorWhichItem.cpp	2008-02-29 23:43:18 UTC (rev 24184)
+++ haiku/trunk/src/preferences/appearance/ColorWhichItem.cpp	2008-03-01 00:57:18 UTC (rev 24185)
@@ -1,9 +1,10 @@
 /*
- * Copyright 2002-2006, Haiku. All rights reserved.
+ * Copyright 2002-2008, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		DarkWyrm (darkwyrm at earthlink.net)
+ *		Rene Gollent (rene at gollent.com)
  */
 #include "ColorWhichItem.h"
 #include <stdio.h>
@@ -134,17 +135,17 @@
 			SetText("Window Tab");
 			break;
 		}
-		case B_WINDOW_TAB_TEXT_COLOR: {
+		case B_WINDOW_TEXT_COLOR: {
 			attribute=which;
-			SetText("Window Tab Text");
+			SetText("Window Text");
 			break;

[... truncated: 61 lines follow ...]


From anevilyak at mail.berlios.de  Sat Mar  1 02:12:23 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 1 Mar 2008 02:12:23 +0100
Subject: [Haiku-commits] r24186 - haiku/trunk/src/preferences/appearance
Message-ID: <200803010112.m211CNVa003171@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-01 02:12:22 +0100 (Sat, 01 Mar 2008)
New Revision: 24186
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24186&view=rev

Modified:
   haiku/trunk/src/preferences/appearance/ColorSet.cpp
Log:
Fix gcc4 warning.



Modified: haiku/trunk/src/preferences/appearance/ColorSet.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/ColorSet.cpp	2008-03-01 00:57:18 UTC (rev 24185)
+++ haiku/trunk/src/preferences/appearance/ColorSet.cpp	2008-03-01 01:12:22 UTC (rev 24186)
@@ -233,6 +233,7 @@
 ColorSet::StringToColor(const char *string) const
 {
 	rgb_color color;
+	color.set_to(0,0,0);
 
 	if (!string)
 		return color;



From axeld at mail.berlios.de  Sat Mar  1 12:56:33 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 1 Mar 2008 12:56:33 +0100
Subject: [Haiku-commits] r24187 - in haiku/trunk/src:
	add-ons/translators/stxt servers/registrar
Message-ID: <200803011156.m21BuXF4003065@sheep.berlios.de>

Author: axeld
Date: 2008-03-01 12:56:30 +0100 (Sat, 01 Mar 2008)
New Revision: 24187
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24187&view=rev

Modified:
   haiku/trunk/src/add-ons/translators/stxt/STXTTranslator.cpp
   haiku/trunk/src/servers/registrar/TextSnifferAddon.cpp
   haiku/trunk/src/servers/registrar/names.h
Log:
* Added a more generic subtype for the source code files for automatic
  MIME type guessing.
* Now, if the specific MIME type exists, it will be chosen, if it doesn't,
  the generic MIME type is chosen. If that does not exist either, the most
  generic is chosen (a.k.a. "text/plain").


Modified: haiku/trunk/src/add-ons/translators/stxt/STXTTranslator.cpp
===================================================================
--- haiku/trunk/src/add-ons/translators/stxt/STXTTranslator.cpp	2008-03-01 01:12:22 UTC (rev 24186)
+++ haiku/trunk/src/add-ons/translators/stxt/STXTTranslator.cpp	2008-03-01 11:56:30 UTC (rev 24187)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2002-2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -143,7 +143,20 @@
 /*
  * ASCII magic -- file types that we know based on keywords
  * that can appear anywhere in the file.
- *
+ *		bool found = false;
+		if (subtypeMimeSpecific != NULL) {
+			mimeType->SetTo(subtypeMimeSpecific);
+			if (mimeType->IsInstalled())
+				found = true;			
+		}
+		if (!found && subtypeMimeGeneric != NULL) {
+			mimeType->SetTo(subtypeMimeGeneric);
+			if (mimeType->IsInstalled())
+				found = true;			
+		}
+		if (!found)
+			mimeType->SetTo("text/plain");
+
  * Extensively modified by Eric Fischer <enf at pobox.com> in July, 2000,
  * to handle character codes other than ASCII on a unified basis.
  *
@@ -189,7 +202,8 @@
 	encoding = NULL;
 	const char *type = NULL;
 	const char *subtype = NULL;
-	const char *subtype_mime = NULL;
+	const char *subtypeMimeGeneric = NULL;
+	const char *subtypeMimeSpecific = NULL;
 
 	int has_escapes = 0;
 	int has_backspace = 0;
@@ -291,14 +305,16 @@
 		     isascii((unsigned char)tp[1]) &&
 		     isalnum((unsigned char)tp[1]) &&
 		     ISSPC(tp[2]))) {
-			subtype_mime = "text/troff";
+		    subtypeMimeGeneric = "text/x-source-code";
+			subtypeMimeSpecific = "text/troff";
 			subtype = "troff or preprocessor input";
 			goto subtype_identified;
 		}
 	}
 
 	if ((*buf == 'c' || *buf == 'C') && ISSPC(buf[1])) {
-		subtype_mime = "text/fortran";
+		subtypeMimeGeneric = "text/x-source-code";
+		subtypeMimeSpecific = "text/fortran";
 		subtype = "fortran program";
 		goto subtype_identified;
 	}
@@ -331,7 +347,8 @@
 			if (ascmatch((const unsigned char *)p->name, ubuf + i,
 			    end - i)) {
 				subtype = types[p->type].human;
-				subtype_mime = types[p->type].mime;
+				subtypeMimeGeneric = types[p->type].generic_mime;
+				subtypeMimeSpecific = types[p->type].specific_mime;
 				goto subtype_identified;
 			}
 		}
@@ -383,9 +400,19 @@
 	if (rv) {
 		// If we have identified the subtype, return it, otherwise just
 		// text/plain.
-		if (subtype_mime)
-			mimeType->SetTo(subtype_mime);
-		else
+
+		bool found = false;
+		if (subtypeMimeSpecific != NULL) {
+			mimeType->SetTo(subtypeMimeSpecific);
+			if (mimeType->IsInstalled())
+				found = true;			
+		}
+		if (!found && subtypeMimeGeneric != NULL) {
+			mimeType->SetTo(subtypeMimeGeneric);
+			if (mimeType->IsInstalled())
+				found = true;			
+		}
+		if (!found)
 			mimeType->SetTo("text/plain");
 	}
 

Modified: haiku/trunk/src/servers/registrar/TextSnifferAddon.cpp
===================================================================
--- haiku/trunk/src/servers/registrar/TextSnifferAddon.cpp	2008-03-01 01:12:22 UTC (rev 24186)
+++ haiku/trunk/src/servers/registrar/TextSnifferAddon.cpp	2008-03-01 11:56:30 UTC (rev 24187)
@@ -135,7 +135,8 @@
 	const char *code_mime = NULL;
 	const char *type = NULL;
 	const char *subtype = NULL;
-	const char *subtype_mime = NULL;
+	const char *subtypeMimeGeneric = NULL;
+	const char *subtypeMimeSpecific = NULL;
 
 	int has_escapes = 0;
 	int has_backspace = 0;
@@ -225,14 +226,16 @@
 		     isascii((unsigned char)tp[1]) &&
 		     isalnum((unsigned char)tp[1]) &&
 		     ISSPC(tp[2]))) {
-			subtype_mime = "text/troff";
+		    subtypeMimeGeneric = "text/x-source-code";
+			subtypeMimeSpecific = "text/troff";
 			subtype = "troff or preprocessor input";
 			goto subtype_identified;
 		}
 	}
 
 	if ((*buf == 'c' || *buf == 'C') && ISSPC(buf[1])) {
-		subtype_mime = "text/fortran";
+		subtypeMimeGeneric = "text/x-source-code";
+		subtypeMimeSpecific = "text/fortran";
 		subtype = "fortran program";
 		goto subtype_identified;
 	}
@@ -265,7 +268,8 @@
 			if (ascmatch((const unsigned char *)p->name, ubuf + i,
 			    end - i)) {
 				subtype = types[p->type].human;
-				subtype_mime = types[p->type].mime;
+				subtypeMimeGeneric = types[p->type].generic_mime;
+				subtypeMimeSpecific = types[p->type].specific_mime;
 				goto subtype_identified;
 			}
 		}
@@ -317,9 +321,19 @@
 	if (rv) {
 		// If we have identified the subtype, return it, otherwise just
 		// text/plain.
-		if (subtype_mime)
-			mimeType->SetTo(subtype_mime);
-		else
+
+		bool found = false;
+		if (subtypeMimeSpecific != NULL) {
+			mimeType->SetTo(subtypeMimeSpecific);
+			if (mimeType->IsInstalled())
+				found = true;			
+		}
+		if (!found && subtypeMimeGeneric != NULL) {
+			mimeType->SetTo(subtypeMimeGeneric);
+			if (mimeType->IsInstalled())
+				found = true;			
+		}
+		if (!found)
 			mimeType->SetTo("text/plain");
 	}
 

Modified: haiku/trunk/src/servers/registrar/names.h
===================================================================
--- haiku/trunk/src/servers/registrar/names.h	2008-03-01 01:12:22 UTC (rev 24186)
+++ haiku/trunk/src/servers/registrar/names.h	2008-03-01 11:56:30 UTC (rev 24187)
@@ -41,7 +41,7 @@
 */
 
 /* these types are used to index the table 'types': keep em in sync! */
-#define	L_C	0		/* first and foremost on UNIX */
+#define	L_C		0		/* first and foremost on UNIX */
 #define	L_CC	1		/* Bjarne's postincrement */
 #define	L_FORT	2		/* the oldest one */
 #define	L_MAKE	3		/* Makefiles */
@@ -59,25 +59,26 @@
 
 static const struct {
 	const char *human;
-	const char *mime;
+	const char *generic_mime;
+	const char *specific_mime;
 } types[] = {
-	{ "C program",					"text/x-c", },
-	{ "C++ program",				"text/x-c++" },
-	{ "FORTRAN program",				"text/x-fortran" },
-	{ "make commands",				"text/x-makefile" },
-	{ "PL/1 program",				"text/x-pl1" },
-	{ "assembler program",				"text/x-asm" },
-	{ "English",					"text/plain" },
-	{ "Pascal program",				"text/x-pascal" },
-	{ "mail",					"text/x-mail" },
-	{ "news",					"text/x-news" },
-	{ "Java program",				"text/x-java" },
-	{ "HTML document",				"text/html", },
-	{ "BCPL program",				"text/x-bcpl" },
-	{ "M4 macro language pre-processor",		"text/x-m4" },
-	{ "PO (gettext message catalogue)",             "text/x-po" },
-	{ "cannot happen error on names.h/types",	"error/x-error" },
-	{ 0, 0}
+	{ "C program",					"text/x-source-code", "text/x-c", },
+	{ "C++ program",				"text/x-source-code", "text/x-c++" },
+	{ "FORTRAN program",			"text/x-source-code", "text/x-fortran" },
+	{ "make commands",				"text/x-source-code", "text/x-makefile" },
+	{ "PL/1 program",				"text/x-source-code", "text/x-pl1" },
+	{ "assembler program",			"text/x-source-code", "text/x-asm" },
+	{ "English",					"text/plain", NULL },
+	{ "Pascal program",				"text/x-source-code", "text/x-pascal" },
+	{ "mail",						"text/plain", "text/x-mail" },
+	{ "news",						"text/plain", "text/x-news" },
+	{ "Java program",				"text/x-source-code", "text/x-java" },
+	{ "HTML document",				"text/x-source-code", "text/html", },
+	{ "BCPL program",				"text/x-source-code", "text/x-bcpl" },
+	{ "M4 macro language pre-processor", "text/x-source-code", "text/x-m4" },
+	{ "PO (gettext message catalogue)",	"text/plain", "text/x-po" },
+	{ "cannot happen error on names.h/types", "text/plain", "error/x-error" },
+	{ NULL, NULL, NULL }
 };
 
 /*



From axeld at mail.berlios.de  Sat Mar  1 13:36:03 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 1 Mar 2008 13:36:03 +0100
Subject: [Haiku-commits] r24188 - haiku/trunk/src/servers/registrar
Message-ID: <200803011236.m21Ca3GQ021649@sheep.berlios.de>

Author: axeld
Date: 2008-03-01 13:36:03 +0100 (Sat, 01 Mar 2008)
New Revision: 24188
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24188&view=rev

Modified:
   haiku/trunk/src/servers/registrar/names.h
Log:
Added support for recognizing Jamfiles.


Modified: haiku/trunk/src/servers/registrar/names.h
===================================================================
--- haiku/trunk/src/servers/registrar/names.h	2008-03-01 11:56:30 UTC (rev 24187)
+++ haiku/trunk/src/servers/registrar/names.h	2008-03-01 12:36:03 UTC (rev 24188)
@@ -56,6 +56,7 @@
 #define	L_BCPL	12		/* BCPL */
 #define	L_M4	13		/* M4 */
 #define	L_PO	14		/* PO */
+#define L_JAM	15		/* Jamfiles */
 
 static const struct {
 	const char *human;
@@ -77,6 +78,7 @@
 	{ "BCPL program",				"text/x-source-code", "text/x-bcpl" },
 	{ "M4 macro language pre-processor", "text/x-source-code", "text/x-m4" },
 	{ "PO (gettext message catalogue)",	"text/plain", "text/x-po" },
+	{ "Jamfile",					"text/x-source-code", "text/x-jamfile" },
 	{ "cannot happen error on names.h/types", "text/plain", "error/x-error" },
 	{ NULL, NULL, NULL }
 };
@@ -144,6 +146,9 @@
 	{"float",	L_C},
 	{"struct",	L_C},
 	{"union",	L_C},
+	{"SubDir",	L_JAM},
+	{"rule",	L_JAM},
+	{"actions",	L_JAM},
 	{"CFLAGS",	L_MAKE},
 	{"LDFLAGS",	L_MAKE},
 	{"all:",	L_MAKE},



From stefano.ceccherini at gmail.com  Sat Mar  1 14:26:49 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Sat, 1 Mar 2008 14:26:49 +0100
Subject: [Haiku-commits] r24175 - haiku/trunk/headers/private/interface
In-Reply-To: <20080229163221.M64585@mlotz.ch>
References: <200802282304.m1SN4lFI000385@sheep.berlios.de>
	<20080229080834.M6488@mlotz.ch> <47C7C8D6.6060005@digintrans.com>
	<c47b1d430802290132q68d69680q5c7039d3dca803d1@mail.gmail.com>
	<47C8191E.6060607@digintrans.com> <20080229163221.M64585@mlotz.ch>
Message-ID: <894b9700803010526o359efdb5ne1300e95aafe224e@mail.gmail.com>

2008/2/29, Michael Lotz <mmlr at mlotz.ch>:
> >
>  http://svn.berlios.de/viewcvs/*checkout*/haiku/haiku/trunk/data/etc/KanBe/default/.canna?rev=13558
>  >
>  > It is encoded in EUC-JP.
>

Is bug #1735 related in any way to this ?


From axeld at mail.berlios.de  Sat Mar  1 18:23:41 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 1 Mar 2008 18:23:41 +0100
Subject: [Haiku-commits] r24189 - haiku/trunk/src/add-ons/accelerants/common
Message-ID: <200803011723.m21HNfQ8011914@sheep.berlios.de>

Author: axeld
Date: 2008-03-01 18:23:40 +0100 (Sat, 01 Mar 2008)
New Revision: 24189
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24189&view=rev

Modified:
   haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp
Log:
Added modes for 1270x720 and 1400x1050 to the generic mode list.


Modified: haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp	2008-03-01 12:36:03 UTC (rev 24188)
+++ haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp	2008-03-01 17:23:40 UTC (rev 24189)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2007-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 
@@ -40,9 +40,11 @@
 	{{94200, 1152, 1184, 1280, 1472, 864, 865, 868, 914, POSITIVE_SYNC}, B_CMAP8, 1152, 864, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 70Hz_(1152X864X8.Z1) */
 	{{108000, 1152, 1216, 1344, 1600, 864, 865, 868, 900, POSITIVE_SYNC}, B_CMAP8, 1152, 864, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(1152X864X8.Z1) */
 	{{121500, 1152, 1216, 1344, 1568, 864, 865, 868, 911, POSITIVE_SYNC}, B_CMAP8, 1152, 864, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 85Hz_(1152X864X8.Z1) */
+	{{74520, 1280, 1368, 1424, 1656, 720, 724, 730, 750, POSITIVE_SYNC}, B_CMAP8, 1280, 720, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(1280X720) */
 	{{108000, 1280, 1328, 1440, 1688, 1024, 1025, 1028, 1066, POSITIVE_SYNC}, B_CMAP8, 1280, 1024, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(1280X1024X8.Z1) */
 	{{135000, 1280, 1296, 1440, 1688, 1024, 1025, 1028, 1066, POSITIVE_SYNC}, B_CMAP8, 1280, 1024, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(1280X1024X8.Z1) */
 	{{157500, 1280, 1344, 1504, 1728, 1024, 1025, 1028, 1072, POSITIVE_SYNC}, B_CMAP8, 1280, 1024, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 85Hz_(1280X1024X8.Z1) */
+	{{122600, 1400, 1488, 1640, 1880, 1050, 1051, 1054, 1087, POSITIVE_SYNC}, B_CMAP8, 1400, 1050, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(1400X1050) */
 
 	{{106500, 1440, 1520, 1672, 1904, 900, 901, 904, 932, POSITIVE_SYNC}, B_CMAP8, 1440, 900, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(1440X900) */
 



From axeld at mail.berlios.de  Sat Mar  1 18:27:21 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 1 Mar 2008 18:27:21 +0100
Subject: [Haiku-commits] r24190 - haiku/trunk/src/add-ons/accelerants/vesa
Message-ID: <200803011727.m21HRLku012261@sheep.berlios.de>

Author: axeld
Date: 2008-03-01 18:27:20 +0100 (Sat, 01 Mar 2008)
New Revision: 24190
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24190&view=rev

Modified:
   haiku/trunk/src/add-ons/accelerants/vesa/Jamfile
   haiku/trunk/src/add-ons/accelerants/vesa/accelerant.cpp
   haiku/trunk/src/add-ons/accelerants/vesa/mode.cpp
Log:
* Now completely initializes the current_mode if it's in the mode list.
* The mode list is now created by the common mode list creation code.
* Minor cleanup.


Modified: haiku/trunk/src/add-ons/accelerants/vesa/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/accelerants/vesa/Jamfile	2008-03-01 17:23:40 UTC (rev 24189)
+++ haiku/trunk/src/add-ons/accelerants/vesa/Jamfile	2008-03-01 17:27:20 UTC (rev 24190)
@@ -2,6 +2,7 @@
 
 UsePrivateHeaders graphics ;
 UsePrivateHeaders [ FDirName graphics vesa ] ;
+UsePrivateHeaders [ FDirName graphics common ] ;
 
 #AddResources vesa.accelerant : vesa.accelerant.rdef ;
 
@@ -11,4 +12,5 @@
 	engine.cpp
 	hooks.cpp
 	mode.cpp
+	: libaccelerantscommon.a
 ;

Modified: haiku/trunk/src/add-ons/accelerants/vesa/accelerant.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/vesa/accelerant.cpp	2008-03-01 17:23:40 UTC (rev 24189)
+++ haiku/trunk/src/add-ons/accelerants/vesa/accelerant.cpp	2008-03-01 17:27:20 UTC (rev 24190)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2005-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 
@@ -74,10 +74,9 @@
 //	#pragma mark -
 
 
-/** This is the common accelerant_info initializer. It is called by
- *	both, the first accelerant and all clones.
- */
-
+/*!	This is the common accelerant_info initializer. It is called by
+	both, the first accelerant and all clones.
+*/
 static status_t
 init_common(int device, bool isClone)
 {
@@ -95,16 +94,16 @@
 	// get basic info from driver
 
 	area_id sharedArea;
-	if (ioctl(device, VESA_GET_PRIVATE_DATA, &sharedArea, sizeof(area_id)) != 0) {
+	if (ioctl(device, VESA_GET_PRIVATE_DATA, &sharedArea, sizeof(area_id))
+			!= 0) {
 		free(gInfo);
 		return B_ERROR;
 	}
 
 	AreaCloner sharedCloner;
 	gInfo->shared_info_area = sharedCloner.Clone("vesa shared info",
-								(void **)&gInfo->shared_info, B_ANY_ADDRESS,
-								B_READ_AREA | B_WRITE_AREA,
-								sharedArea);
+		(void **)&gInfo->shared_info, B_ANY_ADDRESS,
+		B_READ_AREA | B_WRITE_AREA, sharedArea);
 	status_t status = sharedCloner.InitCheck();
 	if (status < B_OK) {
 		free(gInfo);
@@ -135,11 +134,10 @@
 }
 
 
-//	#pragma mark -
-//	public accelerant functions
+//	#pragma mark - public accelerant functions
 
 
-/** init primary accelerant */
+/*!	Init primary accelerant */
 
 status_t
 vesa_init_accelerant(int device)
@@ -156,6 +154,8 @@
 		return status;
 	}
 
+	// Initialize current mode completely from the mode list
+	vesa_propose_display_mode(&gInfo->shared_info->current_mode, NULL, NULL);
 	return B_OK;
 }
 
@@ -210,10 +210,9 @@
 }
 
 
-/** This function is called for both, the primary accelerant and all of
- *	its clones.
- */
-
+/*!	This function is called for both, the primary accelerant and all of
+	its clones.
+*/
 void
 vesa_uninit_accelerant(void)
 {

Modified: haiku/trunk/src/add-ons/accelerants/vesa/mode.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/vesa/mode.cpp	2008-03-01 17:23:40 UTC (rev 24189)
+++ haiku/trunk/src/add-ons/accelerants/vesa/mode.cpp	2008-03-01 17:27:20 UTC (rev 24190)
@@ -1,10 +1,12 @@
 /*
- * Copyright 2005-2006, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2005-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 
 #include <string.h>
 
+#include <create_display_modes.h>
+
 #include "accelerant_protos.h"
 #include "accelerant.h"
 #include "utility.h"
@@ -19,82 +21,22 @@
 #endif
 
 
-#define	T_POSITIVE_SYNC	(B_POSITIVE_HSYNC | B_POSITIVE_VSYNC)
-#define MODE_FLAGS	(B_8_BIT_DAC | B_HARDWARE_CURSOR | B_PARALLEL_ACCESS | B_DPMS /*| B_SUPPORTS_OVERLAYS*/)
 
-static const display_mode kBaseModeList[] = {
-{ { 25175, 640, 656, 752, 800, 350, 387, 389, 449, B_POSITIVE_HSYNC}, B_CMAP8, 640, 350, 0, 0, MODE_FLAGS}, /* 640x350 - www.epanorama.net/documents/pc/vga_timing.html) */
-{ { 25175, 640, 656, 752, 800, 400, 412, 414, 449, B_POSITIVE_VSYNC}, B_CMAP8, 640, 400, 0, 0, MODE_FLAGS}, /* 640x400 - www.epanorama.net/documents/pc/vga_timing.html) */
-{ { 25175, 640, 656, 752, 800, 480, 490, 492, 525, 0}, B_CMAP8, 640, 480, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(640X480X8.Z1) */
-{ { 27500, 640, 672, 768, 864, 480, 488, 494, 530, 0}, B_CMAP8, 640, 480, 0, 0, MODE_FLAGS}, /* 640X480X60Hz */
-{ { 30500, 640, 672, 768, 864, 480, 517, 523, 588, 0}, B_CMAP8, 640, 480, 0, 0, MODE_FLAGS}, /* SVGA_640X480X60HzNI */
-{ { 31500, 640, 664, 704, 832, 480, 489, 492, 520, 0}, B_CMAP8, 640, 480, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 70-72Hz_(640X480X8.Z1) */
-{ { 31500, 640, 656, 720, 840, 480, 481, 484, 500, 0}, B_CMAP8, 640, 480, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(640X480X8.Z1) */
-{ { 36000, 640, 696, 752, 832, 480, 481, 484, 509, 0}, B_CMAP8, 640, 480, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 85Hz_(640X480X8.Z1) */
-{ { 38100, 800, 832, 960, 1088, 600, 602, 606, 620, 0}, B_CMAP8, 800, 600, 0, 0, MODE_FLAGS}, /* SVGA_800X600X56HzNI */
-{ { 40000, 800, 840, 968, 1056, 600, 601, 605, 628, T_POSITIVE_SYNC}, B_CMAP8, 800, 600, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(800X600X8.Z1) */
-{ { 49500, 800, 816, 896, 1056, 600, 601, 604, 625, T_POSITIVE_SYNC}, B_CMAP8, 800, 600, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(800X600X8.Z1) */
-{ { 50000, 800, 856, 976, 1040, 600, 637, 643, 666, T_POSITIVE_SYNC}, B_CMAP8, 800, 600, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 70-72Hz_(800X600X8.Z1) */
-{ { 56250, 800, 832, 896, 1048, 600, 601, 604, 631, T_POSITIVE_SYNC}, B_CMAP8, 800, 600, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 85Hz_(800X600X8.Z1) */
-{ { 65000, 1024, 1048, 1184, 1344, 768, 771, 777, 806, 0}, B_CMAP8, 1024, 768, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(1024X768X8.Z1) */
-{ { 75000, 1024, 1048, 1184, 1328, 768, 771, 777, 806, 0}, B_CMAP8, 1024, 768, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 70-72Hz_(1024X768X8.Z1) */
-{ { 78750, 1024, 1040, 1136, 1312, 768, 769, 772, 800, T_POSITIVE_SYNC}, B_CMAP8, 1024, 768, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(1024X768X8.Z1) */
-{ { 94500, 1024, 1072, 1168, 1376, 768, 769, 772, 808, T_POSITIVE_SYNC}, B_CMAP8, 1024, 768, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 85Hz_(1024X768X8.Z1) */
-{ { 94200, 1152, 1184, 1280, 1472, 864, 865, 868, 914, T_POSITIVE_SYNC}, B_CMAP8, 1152, 864, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 70Hz_(1152X864X8.Z1) */
-{ { 108000, 1152, 1216, 1344, 1600, 864, 865, 868, 900, T_POSITIVE_SYNC}, B_CMAP8, 1152, 864, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(1152X864X8.Z1) */
-{ { 121500, 1152, 1216, 1344, 1568, 864, 865, 868, 911, T_POSITIVE_SYNC}, B_CMAP8, 1152, 864, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 85Hz_(1152X864X8.Z1) */
-{ { 108000, 1280, 1328, 1440, 1688, 1024, 1025, 1028, 1066, T_POSITIVE_SYNC}, B_CMAP8, 1280, 1024, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(1280X1024X8.Z1) */
-{ { 135000, 1280, 1296, 1440, 1688, 1024, 1025, 1028, 1066, T_POSITIVE_SYNC}, B_CMAP8, 1280, 1024, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(1280X1024X8.Z1) */
-{ { 157500, 1280, 1344, 1504, 1728, 1024, 1025, 1028, 1072, T_POSITIVE_SYNC}, B_CMAP8, 1280, 1024, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 85Hz_(1280X1024X8.Z1) */
-{ { 162000, 1600, 1664, 1856, 2160, 1200, 1201, 1204, 1250, T_POSITIVE_SYNC}, B_CMAP8, 1600, 1200, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(1600X1200X8.Z1) */
-{ { 175500, 1600, 1664, 1856, 2160, 1200, 1201, 1204, 1250, T_POSITIVE_SYNC}, B_CMAP8, 1600, 1200, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 65Hz_(1600X1200X8.Z1) */
-{ { 189000, 1600, 1664, 1856, 2160, 1200, 1201, 1204, 1250, T_POSITIVE_SYNC}, B_CMAP8, 1600, 1200, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 70Hz_(1600X1200X8.Z1) */
-{ { 202500, 1600, 1664, 1856, 2160, 1200, 1201, 1204, 1250, T_POSITIVE_SYNC}, B_CMAP8, 1600, 1200, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(1600X1200X8.Z1) */
-{ { 216000, 1600, 1664, 1856, 2160, 1200, 1201, 1204, 1250, T_POSITIVE_SYNC}, B_CMAP8, 1600, 1200, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 80Hz_(1600X1200X8.Z1) */
-{ { 229500, 1600, 1664, 1856, 2160, 1200, 1201, 1204, 1250, T_POSITIVE_SYNC}, B_CMAP8, 1600, 1200, 0, 0, MODE_FLAGS}  /* Vesa_Monitor_ at 85Hz_(1600X1200X8.Z1) */
-};
-static const uint32 kNumBaseModes = sizeof(kBaseModeList) / sizeof(display_mode);
-static const uint32 kMaxNumModes = kNumBaseModes * 4;
-
-
-/**	Creates the initial mode list of the primary accelerant.
- *	It's called from vesa_init_accelerant().
- */
-
+/*!	Creates the initial mode list of the primary accelerant.
+	It's called from vesa_init_accelerant().
+*/
 status_t
 create_mode_list(void)
 {
 	// ToDo: basically, the boot loader should pass a list of all supported
 	//	VESA modes to us.
-	color_space spaces[4] = {B_RGB32_LITTLE, B_RGB16_LITTLE, B_RGB15_LITTLE, B_CMAP8};
-	size_t size = ROUND_TO_PAGE_SIZE(kMaxNumModes * sizeof(display_mode));
-	display_mode *list;
-
-	gInfo->mode_list_area = create_area("vesa modes", (void **)&list, B_ANY_ADDRESS,
-		size, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA);
+	
+	gInfo->mode_list_area = create_display_modes("vesa modes", NULL, NULL, 0,
+		NULL, 0, NULL, &gInfo->mode_list, &gInfo->shared_info->mode_count);
 	if (gInfo->mode_list_area < B_OK)
 		return gInfo->mode_list_area;
 
-	// for now, just copy all of the modes with different color spaces
-
-	const display_mode *source = kBaseModeList;
-	uint32 count = 0;
-
-	for (uint32 i = 0; i < kNumBaseModes; i++) {
-		for (uint32 j = 0; j < (sizeof(spaces) / sizeof(color_space)); j++) {
-			list[count] = *source;
-			list[count].space = spaces[j];
-
-			count++;
-		}
-
-		source++;
-	}
-
-	gInfo->mode_list = list;
 	gInfo->shared_info->mode_list_area = gInfo->mode_list_area;
-	gInfo->shared_info->mode_count = count;
-
 	return B_OK;
 }
 
@@ -153,23 +95,6 @@
 
 	// ToDo: unless we have a VBE3 device, we can't change the display mode
 	return B_UNSUPPORTED;
-#if 0
-	gInfo->shared_info->current_mode = mode;
-
-	switch (mode.space) {
-		case B_RGB32_LITTLE:
-			gInfo->shared_info->bytes_per_row = mode.virtual_width * 4;
-			break;
-		case B_RGB16_LITTLE:
-		case B_RGB15_LITTLE:
-			gInfo->shared_info->bytes_per_row = mode.virtual_width * 2;
-			break;
-		case B_CMAP8:
-			gInfo->shared_info->bytes_per_row = mode.virtual_width;
-			break;
-	}
-	return B_OK;
-#endif
 }
 
 



From bga at bug-br.org.br  Sat Mar  1 19:10:33 2008
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sat, 01 Mar 2008 15:10:33 -0300
Subject: [Haiku-commits] r24189 -
	haiku/trunk/src/add-ons/accelerants/common
In-Reply-To: <200803011723.m21HNfQ8011914@sheep.berlios.de>
References: <200803011723.m21HNfQ8011914@sheep.berlios.de>
Message-ID: <47C99C19.5050504@bug-br.org.br>

axeld at BerliOS escreveu:

> Added modes for 1270x720 and 1400x1050 to the generic mode list.

How about adding 1680x1050? That?s my monitor?s natove resolution. :)

-Bruno



From mmu_man at mail.berlios.de  Sat Mar  1 19:46:21 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sat, 1 Mar 2008 19:46:21 +0100
Subject: [Haiku-commits] r24191 - haiku/trunk/src/apps/expander
Message-ID: <200803011846.m21IkLhC004436@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-01 19:46:20 +0100 (Sat, 01 Mar 2008)
New Revision: 24191
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24191&view=rev

Modified:
   haiku/trunk/src/apps/expander/ExpanderThread.cpp
Log:
lower the command priority since it is a background task.


Modified: haiku/trunk/src/apps/expander/ExpanderThread.cpp
===================================================================
--- haiku/trunk/src/apps/expander/ExpanderThread.cpp	2008-03-01 17:27:20 UTC (rev 24190)
+++ haiku/trunk/src/apps/expander/ExpanderThread.cpp	2008-03-01 18:46:20 UTC (rev 24191)
@@ -73,6 +73,9 @@
 	if (fThreadId < 0)
 		return fThreadId;
 
+	// lower the command priority since it is a background task.
+	set_thread_priority(fThreadId, B_LOW_PRIORITY);
+
 	resume_thread(fThreadId);
 
 	fExpanderOutput = fdopen(fStdOut, "r");



From anevilyak at gmail.com  Sat Mar  1 20:05:56 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Sat, 1 Mar 2008 13:05:56 -0600
Subject: [Haiku-commits] r24189 -
	haiku/trunk/src/add-ons/accelerants/common
In-Reply-To: <47C99C19.5050504@bug-br.org.br>
References: <200803011723.m21HNfQ8011914@sheep.berlios.de>
	<47C99C19.5050504@bug-br.org.br>
Message-ID: <f019d2f30803011105o7a81fbb4oc335275b29b18b81@mail.gmail.com>

1680x1050 shows up in Screen prefs here?

Rene

On Sat, Mar 1, 2008 at 12:10 PM, Bruno Albuquerque <bga at bug-br.org.br> wrote:
> axeld at BerliOS escreveu:
>
>
>  > Added modes for 1270x720 and 1400x1050 to the generic mode list.
>
>  How about adding 1680x1050? That?s my monitor?s natove resolution. :)
>
>  -Bruno
>
>
>
>  _______________________________________________
>  Haiku-commits mailing list
>  Haiku-commits at lists.berlios.de
>  https://lists.berlios.de/mailman/listinfo/haiku-commits
>


From axeld at pinc-software.de  Sat Mar  1 21:25:27 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sat, 01 Mar 2008 21:25:27 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24189_-_haiku/trunk/src/add-ons/?=
 =?iso-8859-15?q?accelerants/common?=
In-Reply-To: <47C99C19.5050504@bug-br.org.br>
Message-ID: <38841923038-BeMail@zon>

Bruno Albuquerque <bga at bug-br.org.br> wrote:
> axeld at BerliOS escreveu:
> > Added modes for 1270x720 and 1400x1050 to the generic mode list.
> How about adding 1680x1050? Thats my monitors natove resolution. :)

That's already in that list - if it doesn't show up in VESA mode, your 
BIOS obviously does not support it.

Bye,
   Axel.



From axeld at pinc-software.de  Sat Mar  1 21:34:20 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sat, 01 Mar 2008 21:34:20 +0100 CET
Subject: [Haiku-commits] r24175 - haiku/trunk/headers/private/interface
In-Reply-To: <894b9700803010526o359efdb5ne1300e95aafe224e@mail.gmail.com>
Message-ID: <39374470108-BeMail@zon>

"Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
> 2008/2/29, Michael Lotz <mmlr at mlotz.ch>:
> >  http://svn.berlios.de/viewcvs/*checkout*/haiku/haiku/trunk/data/etc/KanBe/default/.canna?rev=13558
> > > >  > It is encoded in EUC-JP.
> Is bug #1735 related in any way to this ?

I don't think so, at least I doubt that StyledEdit would automatically 
recognize that encoding - you might be able to select it afterwards, 
but that I don't know :-)
Maybe we should just try to integrate this stuff?? :)

Bye,
   Axel.



From mmu_man at mail.berlios.de  Sat Mar  1 22:24:48 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sat, 1 Mar 2008 22:24:48 +0100
Subject: [Haiku-commits] r24192 - in haiku/trunk/src/system/libroot/posix:
	glibc/misc stdlib
Message-ID: <200803012124.m21LOm1Z018004@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-01 22:24:48 +0100 (Sat, 01 Mar 2008)
New Revision: 24192
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24192&view=rev

Added:
   haiku/trunk/src/system/libroot/posix/glibc/misc/efgcvt.c
   haiku/trunk/src/system/libroot/posix/glibc/misc/efgcvt_r.c
Removed:
   haiku/trunk/src/system/libroot/posix/stdlib/gcvt.c
Modified:
   haiku/trunk/src/system/libroot/posix/glibc/misc/Jamfile
   haiku/trunk/src/system/libroot/posix/stdlib/Jamfile
Log:
Copied [efg]cvt() and *cvt_r() from glibc 2.3.2, this gets cdrecord running.
Btw, why do we have _G_config.h in 2 places ?


Modified: haiku/trunk/src/system/libroot/posix/glibc/misc/Jamfile
===================================================================
--- haiku/trunk/src/system/libroot/posix/glibc/misc/Jamfile	2008-03-01 18:46:20 UTC (rev 24191)
+++ haiku/trunk/src/system/libroot/posix/glibc/misc/Jamfile	2008-03-01 21:24:48 UTC (rev 24192)
@@ -4,7 +4,7 @@
 	$(TARGET_ARCH) ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc include arch generic ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc include ;
-#SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc libio ;
+SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc libio ;
 #SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc wcsmbs ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc misc ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc locale ;
@@ -14,4 +14,6 @@
 
 MergeObject posix_gnu_misc.o :
 	tsearch.c
+	efgcvt.c
+	efgcvt_r.c
 ;

Added: haiku/trunk/src/system/libroot/posix/glibc/misc/efgcvt.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/glibc/misc/efgcvt.c	2008-03-01 18:46:20 UTC (rev 24191)
+++ haiku/trunk/src/system/libroot/posix/glibc/misc/efgcvt.c	2008-03-01 21:24:48 UTC (rev 24192)
@@ -0,0 +1,104 @@
+/* Compatibility functions for floating point formatting.
+   Copyright (C) 1995, 1996, 1997, 1999, 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/param.h>
+#include <float.h>
+#include <bits/libc-lock.h>
+
+#ifndef FLOAT_TYPE
+# define FLOAT_TYPE double
+# define FUNC_PREFIX
+# define FLOAT_FMT_FLAG
+/* Actually we have to write (DBL_DIG + log10 (DBL_MAX_10_EXP)) but we
+   don't have log10 available in the preprocessor.  */
+# define MAXDIG (NDIGIT_MAX + 3)
+# define FCVT_MAXDIG (DBL_MAX_10_EXP + MAXDIG)
+# if DBL_MANT_DIG == 53
+#  define NDIGIT_MAX 17
+# elif DBL_MANT_DIG == 24
+#  define NDIGIT_MAX 9
+# elif DBL_MANT_DIG == 56
+#  define NDIGIT_MAX 18
+# else
+/* See IEEE 854 5.6, table 2 for this formula.  Unfortunately we need a
+   compile time constant here, so we cannot use it.  */
+#  error "NDIGIT_MAX must be precomputed"
+#  define NDIGIT_MAX (lrint (ceil (M_LN2 / M_LN10 * DBL_MANT_DIG + 1.0)))
+# endif
+#endif
+
+#define APPEND(a, b) APPEND2 (a, b)
+#define APPEND2(a, b) a##b
+
+
+#define FCVT_BUFFER APPEND (FUNC_PREFIX, fcvt_buffer)
+#define FCVT_BUFPTR APPEND (FUNC_PREFIX, fcvt_bufptr)
+#define ECVT_BUFFER APPEND (FUNC_PREFIX, ecvt_buffer)
+
+
+static char FCVT_BUFFER[MAXDIG];
+static char ECVT_BUFFER[MAXDIG];
+libc_freeres_ptr (static char *FCVT_BUFPTR);
+
+char *
+APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign)
+     FLOAT_TYPE value;
+     int ndigit, *decpt, *sign;
+{
+  if (FCVT_BUFPTR == NULL)
+    {
+      if (APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign,
+					FCVT_BUFFER, MAXDIG) != -1)
+	return FCVT_BUFFER;
+
+      FCVT_BUFPTR = (char *) malloc (FCVT_MAXDIG);
+      if (FCVT_BUFPTR == NULL)
+	return FCVT_BUFFER;
+    }
+
+  (void) APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign,
+				       FCVT_BUFPTR, FCVT_MAXDIG);
+
+  return FCVT_BUFPTR;
+}
+
+
+char *
+APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign)
+     FLOAT_TYPE value;
+     int ndigit, *decpt, *sign;
+{
+  (void) APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign,
+				       ECVT_BUFFER, MAXDIG);
+
+  return ECVT_BUFFER;
+}
+
+char *
+APPEND (FUNC_PREFIX, gcvt) (value, ndigit, buf)
+     FLOAT_TYPE value;
+     int ndigit;
+     char *buf;
+{
+  sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", MIN (ndigit, NDIGIT_MAX), value);
+  return buf;
+}

Added: haiku/trunk/src/system/libroot/posix/glibc/misc/efgcvt_r.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/glibc/misc/efgcvt_r.c	2008-03-01 18:46:20 UTC (rev 24191)
+++ haiku/trunk/src/system/libroot/posix/glibc/misc/efgcvt_r.c	2008-03-01 21:24:48 UTC (rev 24192)
@@ -0,0 +1,216 @@
+/* Compatibility functions for floating point formatting, reentrant versions.
+   Copyright (C) 1995,96,97,98,99,2000,01,02 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <float.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <math.h>
+#include <stdlib.h>
+#include <sys/param.h>
+
+#ifndef FLOAT_TYPE
+# define FLOAT_TYPE double
+# define FUNC_PREFIX
+# define FLOAT_FMT_FLAG
+# define FLOAT_NAME_EXT
+# if DBL_MANT_DIG == 53
+#  define NDIGIT_MAX 17
+# elif DBL_MANT_DIG == 24
+#  define NDIGIT_MAX 9
+# elif DBL_MANT_DIG == 56
+#  define NDIGIT_MAX 18
+# else
+/* See IEEE 854 5.6, table 2 for this formula.  Unfortunately we need a
+   compile time constant here, so we cannot use it.  */
+#  error "NDIGIT_MAX must be precomputed"
+#  define NDIGIT_MAX (lrint (ceil (M_LN2 / M_LN10 * DBL_MANT_DIG + 1.0)))
+# endif
+#endif
+
+#define APPEND(a, b) APPEND2 (a, b)
+#define APPEND2(a, b) a##b
+
+#define FLOOR APPEND(floor, FLOAT_NAME_EXT)
+#define FABS APPEND(fabs, FLOAT_NAME_EXT)
+#define LOG10 APPEND(log10, FLOAT_NAME_EXT)
+#define EXP APPEND(exp, FLOAT_NAME_EXT)
+
+
+int
+APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len)
+     FLOAT_TYPE value;
+     int ndigit, *decpt, *sign;
+     char *buf;
+     size_t len;
+{
+  ssize_t n;
+  ssize_t i;
+  int left;
+
+  if (buf == NULL)
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  left = 0;
+  if (isfinite (value))
+    {
+      *sign = signbit (value) != 0;
+      if (*sign)
+	value = -value;
+
+      if (ndigit < 0)
+	{
+	  /* Rounding to the left of the decimal point.  */
+	  while (ndigit < 0)
+	    {
+	      FLOAT_TYPE new_value = value * 0.1;
+
+	      if (new_value < 1.0)
+		{
+		  ndigit = 0;
+		  break;
+		}
+
+	      value = new_value;
+	      ++left;
+	      ++ndigit;
+	    }
+	}
+    }
+  else
+    /* Value is Inf or NaN.  */
+    *sign = 0;
+
+  n = __snprintf (buf, len, "%.*" FLOAT_FMT_FLAG "f", MIN (ndigit, NDIGIT_MAX),
+		  value);
+  /* Check for a too small buffer.  */
+  if (n >= (ssize_t) len)
+    return -1;
+
+  i = 0;
+  while (i < n && isdigit (buf[i]))
+    ++i;
+  *decpt = i;
+
+  if (i == 0)
+    /* Value is Inf or NaN.  */
+    return 0;
+
+  if (i < n)
+    {
+      do
+	++i;
+      while (i < n && !isdigit (buf[i]));
+
+      if (*decpt == 1 && buf[0] == '0' && value != 0.0)
+	{
+	  /* We must not have leading zeroes.  Strip them all out and
+	     adjust *DECPT if necessary.  */
+	  --*decpt;
+	  while (i < n && buf[i] == '0')
+	    {
+	      --*decpt;
+	      ++i;
+	    }
+	}
+
+      memmove (&buf[MAX (*decpt, 0)], &buf[i], n - i);
+      buf[n - (i - MAX (*decpt, 0))] = '\0';
+    }
+
+  if (left)
+    {
+      *decpt += left;
+      if ((ssize_t) --len > n)
+	{
+	  while (left-- > 0 && n < (ssize_t) len)
+	    buf[n++] = '0';
+	  buf[n] = '\0';
+	}
+    }
+
+  return 0;
+}
+libc_hidden_def (APPEND (FUNC_PREFIX, fcvt_r))
+
+int
+APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, buf, len)
+     FLOAT_TYPE value;
+     int ndigit, *decpt, *sign;
+     char *buf;
+     size_t len;
+{
+  int exponent = 0;
+
+  if (isfinite (value) && value != 0.0)
+    {
+      /* Slow code that doesn't require -lm functions.  */
+      FLOAT_TYPE d;
+      FLOAT_TYPE f = 1.0;
+      if (value < 0.0)
+	d = -value;
+      else
+	d = value;
+      if (d < 1.0)
+	{
+	  do
+	    {
+	      f *= 10.0;
+	      --exponent;
+	    }
+	  while (d * f < 1.0);
+
+	  value *= f;
+	}
+      else if (d >= 10.0)
+	{
+	  do
+	    {
+	      f *= 10;
+	      ++exponent;
+	    }
+	  while (d >= f * 10.0);
+
+	  value /= f;
+	}
+    }
+  else if (value == 0.0)
+    /* SUSv2 leaves it unspecified whether *DECPT is 0 or 1 for 0.0.
+       This could be changed to -1 if we want to return 0.  */
+    exponent = 0;
+
+  if (ndigit <= 0 && len > 0)
+    {
+      buf[0] = '\0';
+      *decpt = 1;
+      *sign = isfinite (value) ? signbit (value) != 0 : 0;
+    }
+  else
+    if (APPEND (FUNC_PREFIX, fcvt_r) (value, MIN (ndigit, NDIGIT_MAX) - 1,
+				      decpt, sign, buf, len))
+      return -1;
+
+  *decpt += exponent;
+  return 0;
+}
+libc_hidden_def (APPEND (FUNC_PREFIX, ecvt_r))

Modified: haiku/trunk/src/system/libroot/posix/stdlib/Jamfile
===================================================================
--- haiku/trunk/src/system/libroot/posix/stdlib/Jamfile	2008-03-01 18:46:20 UTC (rev 24191)
+++ haiku/trunk/src/system/libroot/posix/stdlib/Jamfile	2008-03-01 21:24:48 UTC (rev 24192)
@@ -12,7 +12,6 @@
 	div.c 
 	env.c
 	exit.c
-	gcvt.c
 	heapsort.c 
 	merge.c
 	mktemp.c

Deleted: haiku/trunk/src/system/libroot/posix/stdlib/gcvt.c



From jackburton at mail.berlios.de  Sat Mar  1 23:15:30 2008
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Sat, 1 Mar 2008 23:15:30 +0100
Subject: [Haiku-commits] r24193 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200803012215.m21MFU40022335@sheep.berlios.de>

Author: jackburton
Date: 2008-03-01 23:15:23 +0100 (Sat, 01 Mar 2008)
New Revision: 24193
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24193&view=rev

Modified:
   haiku/trunk/headers/os/interface/Menu.h
   haiku/trunk/src/kits/interface/Menu.cpp
Log:
Applied patch by Denis Washington which implements "diagonal mouse 
support" for menus (see ticket #284). Thanks a lot!


Modified: haiku/trunk/headers/os/interface/Menu.h
===================================================================
--- haiku/trunk/headers/os/interface/Menu.h	2008-03-01 21:24:48 UTC (rev 24192)
+++ haiku/trunk/headers/os/interface/Menu.h	2008-03-01 22:15:23 UTC (rev 24193)
@@ -180,8 +180,13 @@
 			void			_Hide();
 			BMenuItem*		_Track(int* action, long start = -1);
 
+			void			_UpdateNavigationArea(BPoint position,
+								BRect& navAreaRectAbove, BRect& navAreaBelow);
+
 			void			_UpdateStateOpenSelect(BMenuItem* item,
-								bigtime_t& openTime, const int32 &mouseSpeed);
+								BPoint position, BRect& navAreaRectAbove,
+								BRect& navAreaBelow, bigtime_t& selectedTime,
+								bigtime_t& navigationAreaTime);
 			void			_UpdateStateClose(BMenuItem* item, const BPoint& where,
 								const uint32& buttons);
 

Modified: haiku/trunk/src/kits/interface/Menu.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Menu.cpp	2008-03-01 21:24:48 UTC (rev 24192)
+++ haiku/trunk/src/kits/interface/Menu.cpp	2008-03-01 22:15:23 UTC (rev 24193)
@@ -1384,6 +1384,8 @@
 }
 
 
+const static bigtime_t kOpenSubmenuDelay = 225000;
+const static bigtime_t kNavigationAreaTimeout = 1000000;
 const static bigtime_t kHysteresis = 200000; // TODO: Test and reduce if needed.
 const static int32 kMouseMotionThreshold = 15; 
 	// TODO: Same as above. Actually, we could get rid of the kHysteresis
@@ -1394,8 +1396,10 @@
 {
 	// TODO: cleanup
 	BMenuItem *item = NULL;
-	bigtime_t openTime = system_time();
-	
+	BRect navAreaRectAbove, navAreaRectBelow;
+	bigtime_t selectedTime = system_time();
+	bigtime_t navigationAreaTime = 0;
+
 	fState = MENU_STATE_TRACKING;
 	if (fSuper != NULL)
 		fSuper->fState = MENU_STATE_TRACKING_SUBMENU;
@@ -1432,6 +1436,9 @@
 		bool overSub = _OverSubmenu(fSelected, screenLocation);
 		item = _HitTestItems(location, B_ORIGIN);
 		if (overSub) {
+			navAreaRectAbove = BRect();
+			navAreaRectBelow = BRect();
+
 			// Since the submenu has its own looper,
 			// we can unlock ours. Doing so also make sure
 			// that our window gets any update message to
@@ -1453,7 +1460,8 @@
 			if (!LockLooper())
 				break;			
 		} else if (item != NULL) {
-			_UpdateStateOpenSelect(item, openTime, mouseSpeed);
+			_UpdateStateOpenSelect(item, location, navAreaRectAbove,
+				navAreaRectBelow, selectedTime, navigationAreaTime);
 			if (!releasedOnce)
 				releasedOnce = true;		
 		} else if (_OverSuper(screenLocation)) {
@@ -1528,26 +1536,164 @@
 
 
 void
-BMenu::_UpdateStateOpenSelect(BMenuItem* item, bigtime_t& openTime,
-	const int32 &mouseSpeed)
+BMenu::_UpdateNavigationArea(BPoint position, BRect& navAreaRectAbove,
+	BRect& navAreaRectBelow)
 {
+#define NAV_AREA_THRESHOLD    8
+
+	// The navigation area is a region in which mouse-overs won't select
+	// the item under the cursor. This makes it easier to navigate to
+	// submenus, as the cursor can be moved to submenu items directly instead
+	// of having to move it horizontally into the submenu first. The concept
+	// is illustrated below:
+	// 
+	// +-------+----+---------+
+	// |       |   /|         |
+	// |       |  /*|         |
+	// |[2]--> | /**|         |
+	// |       |/[4]|         |
+	// |------------|         |
+	// |    [1]     |   [6]   |
+	// |------------|         |
+	// |       |\[5]|         |
+	// |[3]--> | \**|         |
+	// |       |  \*|         |
+	// |       |   \|         |
+	// |       +----|---------+
+	// |            |
+	// +------------+
+	//
+	// [1] Selected item, cursor position ('position')
+	// [2] Upper navigation area rectangle ('navAreaRectAbove')
+	// [3] Lower navigation area rectangle ('navAreaRectBelow')
+	// [4] Upper navigation area
+	// [5] Lower navigation area
+	// [6] Submenu	
+	//
+	// The rectangles are used to calculate if the cursor is in the actual
+	// navigation area (see _UpdateStateOpenSelect()).
+
+	if (fSelected == NULL)
+		return;
+
+	BMenu *submenu = fSelected->Submenu();
+
+	if (submenu != NULL) {
+		BRect menuBounds = ConvertToScreen(Bounds());
+
+		fSelected->Submenu()->LockLooper();
+		BRect submenuBounds = fSelected->Submenu()->ConvertToScreen(
+			fSelected->Submenu()->Bounds());
+		fSelected->Submenu()->UnlockLooper();
+
+		if (menuBounds.left < submenuBounds.left) {
+			navAreaRectAbove.Set(position.x + NAV_AREA_THRESHOLD,
+				submenuBounds.top, menuBounds.right,
+				position.y);
+			navAreaRectBelow.Set(position.x + NAV_AREA_THRESHOLD,
+				position.y, menuBounds.right,
+				submenuBounds.bottom);
+		} else {
+			navAreaRectAbove.Set(menuBounds.left,
+				submenuBounds.top, position.x - NAV_AREA_THRESHOLD,
+				position.y);
+			navAreaRectBelow.Set(menuBounds.left,
+				position.y, position.x - NAV_AREA_THRESHOLD,
+				submenuBounds.bottom);
+		}	
+	} else {
+		navAreaRectAbove = BRect();
+		navAreaRectBelow = BRect();
+	}
+}
+
+void
+BMenu::_UpdateStateOpenSelect(BMenuItem* item, BPoint position,
+	BRect& navAreaRectAbove, BRect& navAreaRectBelow, bigtime_t& selectedTime,
+	bigtime_t& navigationAreaTime)
+{
 	if (fState == MENU_STATE_CLOSED)
 		return;
 
+
 	if (item != fSelected) {
-		if (mouseSpeed < kMouseMotionThreshold) {		
+		if (navigationAreaTime == 0)
+			navigationAreaTime = system_time();
+
+		position = ConvertToScreen(position);
+
+		bool inNavAreaRectAbove = navAreaRectAbove.Contains(position);
+		bool inNavAreaRectBelow = navAreaRectBelow.Contains(position);
+
+		if (!inNavAreaRectAbove && !inNavAreaRectBelow) {
 			_SelectItem(item, false);
-			openTime = system_time();
+			navAreaRectAbove = BRect();
+			navAreaRectBelow = BRect();
+			selectedTime = system_time();
+			navigationAreaTime = 0;
+			return;
+		}
+
+		BRect menuBounds = ConvertToScreen(Bounds());
+
+		fSelected->Submenu()->LockLooper();
+		BRect submenuBounds = fSelected->Submenu()->ConvertToScreen(
+			fSelected->Submenu()->Bounds());
+		fSelected->Submenu()->UnlockLooper();
+
+		float x_offset;
+
+		// navAreaRectAbove and navAreaRectBelow have the same X
+		// position and width, so it doesn't matter which one we use to
+		// calculate the X offset
+		if (menuBounds.left < submenuBounds.left)
+			x_offset = position.x - navAreaRectAbove.left;
+		else
+			x_offset = navAreaRectAbove.right - position.x;
+
+		bool inNavArea;
+
+		if (inNavAreaRectAbove) {
+			float y_offset = navAreaRectAbove.bottom - position.y;
+			float ratio = navAreaRectAbove.Width() / navAreaRectAbove.Height();
+
+			inNavArea = y_offset <= x_offset / ratio;
 		} else {
-			//printf("Mouse moving too fast (%ld), ignoring...\n", mouseSpeed);		
+			float y_offset = navAreaRectBelow.bottom - position.y;
+			float ratio = navAreaRectBelow.Width() / navAreaRectBelow.Height();
+
+			inNavArea = y_offset >= (navAreaRectBelow.Height() - x_offset / ratio);
 		}
-	} else if (system_time() > kHysteresis + openTime && item->Submenu() != NULL
-		&& item->Submenu()->Window() == NULL) {
-		// Open the submenu if it's not opened yet, but only if
-		// the mouse pointer stayed over there for some time
-		// (hysteresis)
-		_SelectItem(item);
+
+		bigtime_t systime = system_time();
+
+		if (!inNavArea || (navigationAreaTime > 0 && systime -
+			navigationAreaTime > kNavigationAreaTimeout)) {
+			// Don't delay opening of submenu if the user had
+			// to wait for the navigation area timeout anyway
+			_SelectItem(item, inNavArea);
+
+			if (inNavArea) {
+				_UpdateNavigationArea(position, navAreaRectAbove,
+					navAreaRectBelow);
+			} else {
+				navAreaRectAbove = BRect();
+				navAreaRectBelow = BRect();
+			}
+
+			selectedTime = system_time();
+			navigationAreaTime = 0;
+		}
+	} else if (fSelected->Submenu() != NULL &&
+		system_time() - selectedTime > kOpenSubmenuDelay) {
+		_SelectItem(fSelected, true);
+
+		if (!navAreaRectAbove.IsValid() && !navAreaRectBelow.IsValid()) {
+			position = ConvertToScreen(position);
+			_UpdateNavigationArea(position, navAreaRectAbove, navAreaRectBelow);
+		}
 	}
+
 	if (fState != MENU_STATE_TRACKING)
 		fState = MENU_STATE_TRACKING;
 }
@@ -1561,9 +1707,14 @@
 		return;
 
 	if (buttons != 0 && _IsStickyMode()) {
-		if (item == NULL)
+		if (item == NULL) {
+			if (item != fSelected) {
+				LockLooper();
+				_SelectItem(item, false);
+				UnlockLooper();
+			}
 			fState = MENU_STATE_CLOSED;
-		else
+		} else
 			_SetStickyMode(false);
 	} else if (buttons == 0 && !_IsStickyMode()) {
 		if (fExtraRect != NULL && fExtraRect->Contains(where)) {
@@ -1571,8 +1722,14 @@
 			fExtraRect = NULL;
 				// Setting this to NULL will prevent this code
 				// to be executed next time
-		} else
+		} else {
+			if (item != fSelected) {
+				LockLooper();
+				_SelectItem(item, false);
+				UnlockLooper();
+			}
 			fState = MENU_STATE_CLOSED;
+		}
 	}
 }
 



From jackburton at mail.berlios.de  Sat Mar  1 23:17:43 2008
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Sat, 1 Mar 2008 23:17:43 +0100
Subject: [Haiku-commits] r24194 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200803012217.m21MHh4h022478@sheep.berlios.de>

Author: jackburton
Date: 2008-03-01 23:17:42 +0100 (Sat, 01 Mar 2008)
New Revision: 24194
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24194&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Added Denis Washington to the contributors' list.


Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-01 22:15:23 UTC (rev 24193)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-01 22:17:42 UTC (rev 24194)
@@ -453,6 +453,7 @@
 		"Oliver Tappe\n"
 		"Jason Vandermark\n"
 		"Sandor Vroemisse\n"
+		"Denis Washington\n"
 		"Nathan Whitehorn\n"
 		"Michael Wilber\n"
 		"Ulrich Wimboeck\n"



From koki at digintrans.com  Sat Mar  1 22:45:57 2008
From: koki at digintrans.com (Jorge G. Mare (a.k.a. Koki))
Date: Sat, 01 Mar 2008 13:45:57 -0800
Subject: [Haiku-commits] r24175 - haiku/trunk/headers/private/interface
In-Reply-To: <39374470108-BeMail@zon>
References: <39374470108-BeMail@zon>
Message-ID: <47C9CE95.8000308@digintrans.com>

Axel D?rfler wrote:
> "Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
>> 2008/2/29, Michael Lotz <mmlr at mlotz.ch>:
>>>  http://svn.berlios.de/viewcvs/*checkout*/haiku/haiku/trunk/data/etc/KanBe/default/.canna?rev=13558
>>>>>  > It is encoded in EUC-JP.
>> Is bug #1735 related in any way to this ?
> 
> I don't think so, at least I doubt that StyledEdit would automatically 
> recognize that encoding - you might be able to select it afterwards, 
> but that I don't know :-)

Per the screenshot linked below, the file open dialog in StyledEdit has 
an Encoding menu where you can select the encoding that you want to 
apply when opening a file:

http://myhaiku.org/haiku/2008-03-29_se-encoding.png

> Maybe we should just try to integrate this stuff?? :)

It would be nice if StyledEdit automatically detected and used the right 
encoding of the text file it is opening. There is an editor for BeOS 
called KEdit which does exactly that, and may be a good reference. You 
can find binary and sources here:

http://www.bebits.com/app/1323

FWIW

Koki


From marcusoverhagen at mail.berlios.de  Sat Mar  1 23:33:38 2008
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Sat, 1 Mar 2008 23:33:38 +0100
Subject: [Haiku-commits] r24195 -
	haiku/trunk/src/add-ons/media/media-add-ons/videowindow
Message-ID: <200803012233.m21MXbDT023870@sheep.berlios.de>

Author: marcusoverhagen
Date: 2008-03-01 23:33:37 +0100 (Sat, 01 Mar 2008)
New Revision: 24195
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24195&view=rev

Modified:
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.h
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.h
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.h
Log:
Changed the license from GPL to MIT on request by Maurice. I'm the sole author of this code.


Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp	2008-03-01 22:17:42 UTC (rev 24194)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp	2008-03-01 22:33:37 UTC (rev 24195)
@@ -1,20 +1,6 @@
 /*
- * VideoAddOn.cpp - "Video Window" media add-on.
+ * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
  *
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * Distributed under the terms of the MIT License.
  */
 #include "VideoAddOn.h"

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h	2008-03-01 22:17:42 UTC (rev 24194)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h	2008-03-01 22:33:37 UTC (rev 24195)
@@ -1,21 +1,7 @@
 /*
- * VideoAddOn.h - "Video Window" media add-on.
+ * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
  *
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * Distributed under the terms of the MIT License.
  */
 #ifndef __VIDEO_ADD_ON_H
 #define __VIDEO_ADD_ON_H

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp	2008-03-01 22:17:42 UTC (rev 24194)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp	2008-03-01 22:33:37 UTC (rev 24195)
@@ -1,21 +1,7 @@
 /*
- * VideoNode.cpp - "Video Window" media add-on.
+ * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
  *
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * Distributed under the terms of the MIT License.
  */
 #include <stdio.h>
 #include <string.h>

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.h	2008-03-01 22:17:42 UTC (rev 24194)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.h	2008-03-01 22:33:37 UTC (rev 24195)
@@ -1,21 +1,7 @@
 /*
- * VideoNode.h - "Video Window" media add-on.
+ * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
  *
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * Distributed under the terms of the MIT License.
  */
 #ifndef __VIDEO_NODE_H_
 #define __VIDEO_NODE_H_

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.cpp	2008-03-01 22:17:42 UTC (rev 24194)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.cpp	2008-03-01 22:33:37 UTC (rev 24195)
@@ -1,21 +1,7 @@
 /*
- * VideoView.cpp - "Video Window" media add-on.
+ * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
  *
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * Distributed under the terms of the MIT License.
  */
 #include <Bitmap.h>
 #include <MediaRoster.h>

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.h	2008-03-01 22:17:42 UTC (rev 24194)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.h	2008-03-01 22:33:37 UTC (rev 24195)
@@ -1,21 +1,7 @@
 /*
- * VideoView.h - "Video Window" media add-on.
+ * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
  *
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * Distributed under the terms of the MIT License.
  */
 #ifndef __VIDEO_VIEW_H
 #define __VIDEO_VIEW_H

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.cpp	2008-03-01 22:17:42 UTC (rev 24194)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.cpp	2008-03-01 22:33:37 UTC (rev 24195)
@@ -1,21 +1,7 @@
 /*
- * VideoWindow.cpp - "Video Window" media add-on.
+ * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
  *
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * Distributed under the terms of the MIT License.
  */
 #include "VideoView.h"
 #include "VideoNode.h"

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.h	2008-03-01 22:17:42 UTC (rev 24194)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.h	2008-03-01 22:33:37 UTC (rev 24195)
@@ -1,21 +1,7 @@
 /*
- * VideoWindow.h - "Video Window" media add-on.
+ * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
  *
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * Distributed under the terms of the MIT License.
  */
 #ifndef __VIDEO_WINDOW_H
 #define __VIDEO_WINDOW_H



From bga at bug-br.org.br  Sun Mar  2 00:14:37 2008
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sat, 01 Mar 2008 20:14:37 -0300
Subject: [Haiku-commits] r24189
	-	haiku/trunk/src/add-ons/accelerants/common
In-Reply-To: <f019d2f30803011105o7a81fbb4oc335275b29b18b81@mail.gmail.com>
References: <200803011723.m21HNfQ8011914@sheep.berlios.de>	<47C99C19.5050504@bug-br.org.br>
	<f019d2f30803011105o7a81fbb4oc335275b29b18b81@mail.gmail.com>
Message-ID: <47C9E35D.8080304@bug-br.org.br>

Rene Gollent escreveu:
> 1680x1050 shows up in Screen prefs here?

That?s because your card is supported. Mine is not so I am using VESA mode.

-Bruno



From julun at mail.berlios.de  Sun Mar  2 01:06:46 2008
From: julun at mail.berlios.de (julun at BerliOS)
Date: Sun, 2 Mar 2008 01:06:46 +0100
Subject: [Haiku-commits] r24196 - haiku/trunk/src/kits/app
Message-ID: <200803020006.m2206kNl010746@sheep.berlios.de>

Author: julun
Date: 2008-03-02 01:06:45 +0100 (Sun, 02 Mar 2008)
New Revision: 24196
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24196&view=rev

Modified:
   haiku/trunk/src/kits/app/Message.cpp
Log:
* This fixes ticket #1865
* Allocate the buffer to flatten the message on the heap, if it's size is bigger then a given 
  buffer on the stack. It seem's to exceed the stack size (this might count for AddFlat() too).

  Note: With this change one is able to copy the text into the clipboard (1mb), but it
        is still impossible to paste it somewhere, as in BClipboard::_DownloadFromSystem()
        SendMessage() fails transferring the data back in the reply msg because of the port size limit...



Modified: haiku/trunk/src/kits/app/Message.cpp
===================================================================
--- haiku/trunk/src/kits/app/Message.cpp	2008-03-01 22:33:37 UTC (rev 24195)
+++ haiku/trunk/src/kits/app/Message.cpp	2008-03-02 00:06:45 UTC (rev 24196)
@@ -2300,14 +2300,26 @@
 	copying an extra buffer. Functions can be added that return a direct
 	pointer into the message. */
 
+	char buf[4096] = { 0 };
 	ssize_t size = message->FlattenedSize();
-	char buffer[size];
 
+	bool freeBuffer = false;
+	char* buffer = NULL;
+	if (size > (ssize_t)sizeof(buffer)) {
+		freeBuffer = true;
+		buffer = static_cast<char*>(malloc(size));
+	} else {
+		buffer = buf;
+	}
+
 	status_t error = message->Flatten(buffer, size);
 
 	if (error >= B_OK)
-		error = AddData(name, B_MESSAGE_TYPE, &buffer, size, false);
+		error = AddData(name, B_MESSAGE_TYPE, buffer, size, false);
 
+	if (freeBuffer)
+		free(buffer);
+
 	return error;
 }
 



From marcusoverhagen at arcor.de  Sun Mar  2 03:45:18 2008
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Sun, 2 Mar 2008 03:45:18 +0100 (CET)
Subject: [Haiku-commits] r24196 - haiku/trunk/src/kits/app
In-Reply-To: <200803020006.m2206kNl010746@sheep.berlios.de>
References: <200803020006.m2206kNl010746@sheep.berlios.de>
Message-ID: <16419283.1204425918989.JavaMail.ngmail@webmail16>

julun at BerliOS <julun at mail.berlios.de> wrote:

>  
> +	char buf[4096] = { 0 };
Why are you initializing the buffer with zeroes?

> +	char* buffer = NULL;
Why are you initiazing the pointer?

> +	if (size > (ssize_t)sizeof(buffer)) {
> +		freeBuffer = true;
> +		buffer = static_cast<char*>(malloc(size));
You should check for out of memory error here

regards
Marcs

Jetzt komfortabel bei Arcor-Digital TV einsteigen: Mehr Happy Ends, mehr Herzschmerz, mehr Fernsehen! Erleben Sie 50 digitale TV Programme und optional 60 Pay TV Sender, einen elektronischen Programmf?hrer mit Movie Star Bewertungen von TV Movie. Au?erdem, aktuelle Filmhits und prickelnde Erotik in der Arcor-Videothek. Infos unter www.arcor.de/tv


From marcusoverhagen at mail.berlios.de  Sun Mar  2 03:57:29 2008
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Sun, 2 Mar 2008 03:57:29 +0100
Subject: [Haiku-commits] r24197 - haiku/trunk/src/apps/mediaplayer
Message-ID: <200803020257.m222vTkD001897@sheep.berlios.de>

Author: marcusoverhagen
Date: 2008-03-02 03:57:28 +0100 (Sun, 02 Mar 2008)
New Revision: 24197
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24197&view=rev

Modified:
   haiku/trunk/src/apps/mediaplayer/VideoNode.cpp
   haiku/trunk/src/apps/mediaplayer/VideoNode.h
Log:
Changed license from GPL to MIT. I'm the sole author of this code.


Modified: haiku/trunk/src/apps/mediaplayer/VideoNode.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/VideoNode.cpp	2008-03-02 00:06:45 UTC (rev 24196)
+++ haiku/trunk/src/apps/mediaplayer/VideoNode.cpp	2008-03-02 02:57:28 UTC (rev 24197)
@@ -1,21 +1,7 @@
 /*
- * VideoNode.cpp - Media Player for the Haiku Operating System
+ * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
  *
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * Distributed under the terms of the MIT License.
  */
 #include <stdio.h>
 #include <string.h>

Modified: haiku/trunk/src/apps/mediaplayer/VideoNode.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/VideoNode.h	2008-03-02 00:06:45 UTC (rev 24196)
+++ haiku/trunk/src/apps/mediaplayer/VideoNode.h	2008-03-02 02:57:28 UTC (rev 24197)
@@ -1,21 +1,7 @@
 /*
- * VideoNode.h - Media Player for the Haiku Operating System
+ * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
  *
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * Distributed under the terms of the MIT License.
  */
 #ifndef __VIDEO_NODE_H_
 #define __VIDEO_NODE_H_



From mmu_man at mail.berlios.de  Sun Mar  2 04:05:25 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 2 Mar 2008 04:05:25 +0100
Subject: [Haiku-commits] r24198 - in haiku/trunk: . build/jam
Message-ID: <200803020305.m2235P4T003081@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-02 04:05:23 +0100 (Sun, 02 Mar 2008)
New Revision: 24198
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24198&view=rev

Added:
   haiku/trunk/build/jam/FloppyBootImage
Modified:
   haiku/trunk/Jamfile
   haiku/trunk/build/jam/BuildSetup
   haiku/trunk/build/jam/ImageRules
Log:
Add rules to create a boot floppy (use jam haiku-boot-floppy), in preparation for CD booting.


Modified: haiku/trunk/Jamfile
===================================================================
--- haiku/trunk/Jamfile	2008-03-02 02:57:28 UTC (rev 24197)
+++ haiku/trunk/Jamfile	2008-03-02 03:05:23 UTC (rev 24198)
@@ -151,6 +151,7 @@
 # specify the Haiku image and network boot archive contents
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuImage ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) NetBootArchive ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) FloppyBootImage ] ;
 
 # Perform deferred SubIncludes.
 ExecuteDeferredSubIncludes ;

Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2008-03-02 02:57:28 UTC (rev 24197)
+++ haiku/trunk/build/jam/BuildSetup	2008-03-02 03:05:23 UTC (rev 24198)
@@ -29,7 +29,16 @@
 HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME)
 	= HAIKU_NET_BOOT_ARCHIVE_INSTALL_TARGETS ;
 
+# boot floppy
+HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME = haiku-boot-floppy-container ;
+HAIKU_CONTAINER_GRIST on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME) = FloppyBootImage ;
+# HAIKU_INCLUDE_IN_CONTAINER_VAR -- update only mode not supported
+HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
+	= HAIKU_FLOPPY_BOOT_IMAGE_INSTALL_TARGETS ;
 
+# boot CD image
+#TODO
+
 # analyze an optionally replace jam's target parameters
 HAIKU_ORIGINAL_JAM_TARGETS = $(JAM_TARGETS) ;
 if $(JAM_TARGETS) {

Added: haiku/trunk/build/jam/FloppyBootImage
===================================================================
--- haiku/trunk/build/jam/FloppyBootImage	2008-03-02 02:57:28 UTC (rev 24197)
+++ haiku/trunk/build/jam/FloppyBootImage	2008-03-02 03:05:23 UTC (rev 24198)
@@ -0,0 +1,149 @@
+# This file defines what ends up in the floppy boot image and it executes the
+# rules building the image.
+
+local X86_ONLY = ;
+local PPC_ONLY = ;
+if $(TARGET_ARCH) = x86 {
+	X86_ONLY = "" ;
+} else if $(TARGET_ARCH) = ppc {
+	X86_ONLY = ;
+}
+
+local GPL_ONLY = ;
+if $(INCLUDE_GPL_ADDONS) = 1 {
+	GPL_ONLY = "" ;
+}
+
+BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi
+	config_manager agp_gart
+;
+BEOS_ADD_ONS_FILE_SYSTEMS = bfs ;
+#cdda fat googlefs iso9660 nfs ;
+
+
+# modules
+AddFilesToFloppyBootArchive beos system add-ons kernel bus_managers
+	: $(BEOS_ADD_ONS_BUS_MANAGERS) ;
+AddFilesToFloppyBootArchive beos system add-ons kernel busses agp_gart
+	: $(X86_ONLY)<agp_gart>intel ;
+AddFilesToFloppyBootArchive beos system add-ons kernel busses ide
+	: ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
+AddFilesToFloppyBootArchive beos system add-ons kernel console : vga_text ;
+AddFilesToFloppyBootArchive beos system add-ons kernel file_systems
+	: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
+AddFilesToFloppyBootArchive beos system add-ons kernel generic
+	: block_io fast_log ide_adapter locked_pool scsi_periph ;
+AddFilesToFloppyBootArchive beos system add-ons kernel partitioning_systems
+	: intel session ;
+AddFilesToFloppyBootArchive beos system add-ons kernel interrupt_controllers
+	: $(PPC_ONLY)openpic ;
+
+if $(TARGET_ARCH) = x86 {
+	AddFilesToFloppyBootArchive beos system add-ons kernel cpu : generic_x86 ;
+}
+
+# drivers
+AddDriversToFloppyBootArchive disk scsi	: scsi_cd scsi_dsk ;
+#AddDriversToFloppyBootArchive disk virtual	: nbd ;
+AddDriversToFloppyBootArchive disk virtual	: remote_disk ;
+AddDriversToFloppyBootArchive net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
+
+# kernel
+AddFilesToFloppyBootArchive beos system : <revisioned>kernel_$(TARGET_ARCH) ;
+
+# scripts and data files
+
+local driverSettingsFiles = <driver-settings>kernel ;
+SEARCH on $(driverSettingsFiles)
+	= [ FDirName $(HAIKU_TOP) data settings kernel drivers ] ;
+AddFilesToFloppyBootArchive home config settings kernel drivers
+	: $(driverSettingsFiles) ;
+
+# add-ons
+AddFilesToFloppyBootArchive beos system add-ons kernel network
+	: stack socket ;
+AddFilesToFloppyBootArchive beos system add-ons kernel network devices
+	: $(BEOS_NETWORK_DEVICES) ;
+AddFilesToFloppyBootArchive beos system add-ons kernel network datalink_protocols
+	: $(BEOS_NETWORK_DATALINK_PROTOCOLS) ;
+AddFilesToFloppyBootArchive beos system add-ons kernel network ppp
+	: $(BEOS_NETWORK_PPP) ;
+AddFilesToFloppyBootArchive beos system add-ons kernel network protocols
+	: $(BEOS_NETWORK_PROTOCOLS) ;
+
+# boot module links
+AddBootModuleSymlinksToFloppyBootArchive
+	$(BEOS_ADD_ONS_BUS_MANAGERS)
+	ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112
+	$(BEOS_ADD_ONS_FILE_SYSTEMS)
+	block_io fast_log ide_adapter locked_pool scsi_periph
+	intel session
+	$(PPC_ONLY)openpic
+	$(X86_ONLY)generic_x86
+#	nbd
+	remote_disk
+	$(BEOS_ADD_ONS_DRIVERS_NET)
+	stack socket
+	$(BEOS_NETWORK_DEVICES)
+	$(BEOS_NETWORK_DATALINK_PROTOCOLS) 
+	$(BEOS_NETWORK_PPP)
+	$(BEOS_NETWORK_PROTOCOLS)
+;
+
+
+#pragma mark - Build The Archive
+
+# archive target
+HAIKU_FLOPPY_BOOT_ARCHIVE = haiku-floppyboot.tgz ;
+MakeLocate $(HAIKU_FLOPPY_BOOT_ARCHIVE) : $(HAIKU_OUTPUT_DIR) ;
+
+# the pseudo target all archive contents is attached to
+NotFile $(HAIKU_BOOT_FLOPPY_CONTAINER_NAME) ;
+
+# prepare the script that initializes the shell variables
+local initVarsScript = <FloppyBootArchive>haiku-floppyboot-init-vars ;
+local script = $(initVarsScript) ;
+MakeLocate $(script) : $(HAIKU_OUTPUT_DIR) ;
+Always $(script) ;
+
+AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
+AddVariableToScript $(script) : addBuildCompatibilityLibDir
+	: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
+AddTargetVariableToScript $(script) : <build>copyattr ;
+
+# create the other scripts
+local makeDirsScript = <FloppyBootArchive>haiku-floppyboot-make-dirs ;
+local copyFilesScript = <FloppyBootArchive>haiku-floppyboot-copy-files ;
+MakeLocate $(makeDirsScript) $(copyFilesScript) : $(HAIKU_OUTPUT_DIR) ;
+
+CreateFloppyBootArchiveMakeDirectoriesScript $(makeDirsScript) ;
+CreateFloppyBootArchiveCopyFilesScript $(copyFilesScript) ;
+
+# build the archive
+
+BuildFloppyBootArchive $(HAIKU_FLOPPY_BOOT_ARCHIVE) :
+	$(initVarsScript)
+	$(makeDirsScript)
+	$(copyFilesScript)
+;
+
+# remove the scripts we have generated
+RmTemps $(HAIKU_FLOPPY_BOOT_ARCHIVE) :
+	$(initVarsScript)
+	$(makeDirsScript)
+	$(copyFilesScript)
+;
+
+NotFile haiku-floppyboot-archive ;
+Depends haiku-floppyboot-archive : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
+
+# floppy image target
+HAIKU_BOOT_FLOPPY = haiku-boot-floppy.image ;
+MakeLocate $(HAIKU_BOOT_FLOPPY) : $(HAIKU_OUTPUT_DIR) ;
+
+BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : zbeos : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
+
+NotFile haiku-boot-floppy ;
+Depends haiku-boot-floppy : $(HAIKU_BOOT_FLOPPY) ;
+
+

Modified: haiku/trunk/build/jam/ImageRules
===================================================================
--- haiku/trunk/build/jam/ImageRules	2008-03-02 02:57:28 UTC (rev 24197)
+++ haiku/trunk/build/jam/ImageRules	2008-03-02 03:05:23 UTC (rev 24198)
@@ -763,3 +763,109 @@
 {
 	$(2[1]) $(1) $(2[2-])
 }
+
+
+#pragma mark - Floppy Boot Archive rules
+
+rule AddDirectoryToFloppyBootArchive directoryTokens
+{
+	# AddDirectoryToFloppyBootArchive <directoryTokens>
+
+	return [ AddDirectoryToContainer $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
+		: $(directoryTokens) ] ;
+}
+
+rule AddFilesToFloppyBootArchive directory : targets : destName
+{
+	# AddFilesToFloppyBootArchive <directory> : <targets> [ : dest name ]
+
+	AddFilesToContainer $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME) : $(directory)
+		: $(targets) : $(destName) ;
+}
+
+rule AddSymlinkToFloppyBootArchive directoryTokens : linkTarget : linkName
+{
+	# AddSymlinkToFloppyBootArchive <directory> : <link target> [ : <link name> ] ;
+
+	AddSymlinkToContainer $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
+		: $(directoryTokens) : $(linkTarget) : $(linkName) ;
+}
+
+rule AddDriversToFloppyBootArchive relativeDirectoryTokens : targets
+{
+	# AddDriversToFloppyBootArchive <relative directory> : <targets> ;
+
+	AddDriversToContainer $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
+		: $(relativeDirectoryTokens) : $(targets) ;
+}
+
+rule AddDriverRegistrationToFloppyBootArchive relativeDirectoryTokens : target
+	: links
+{
+	# AddDriverRegistrationToFloppyBootArchive <directory> : <link target>
+	#	: <link names> ] ;
+
+	AddDriverRegistrationToContainer $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
+		: $(relativeDirectoryTokens) : $(target) : $(links) ;
+}
+
+rule AddBootModuleSymlinksToFloppyBootArchive targets
+{
+	# AddBootModuleSymlinksToFloppyBootArchive <targets> ;
+
+	AddBootModuleSymlinksToContainer $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
+		: $(targets) ;
+}
+
+rule CreateFloppyBootArchiveMakeDirectoriesScript script
+{
+	CreateContainerMakeDirectoriesScript
+		$(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME) : $(script) ;
+}
+
+rule CreateFloppyBootArchiveCopyFilesScript script
+{
+	CreateContainerCopyFilesScript $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
+		: $(script) ;
+}
+
+rule BuildFloppyBootArchive archive : scripts
+{
+	# BuildHFloppyBootArchive <archive> : <scripts>  ;
+
+	local mainScript = build_tgz_archive ;
+	SEARCH on $(mainScript) = [ FDirName $(HAIKU_TOP) build scripts ] ;
+
+	Depends $(archive) : $(mainScript) $(scripts) ;
+	BuildFloppyBootArchive1 $(archive) : $(mainScript) $(scripts) ;
+}
+
+actions BuildFloppyBootArchive1
+{
+	$(2[1]) $(1) $(2[2-])
+}
+
+# warning: that is quite x86 dependant...
+
+rule BuildFloppyBootImage image : zbeos : archive
+{
+	Depends $(image) : $(zbeos) ;
+	Depends $(image) : $(archive) ;
+	#MakeLocateDebug $(image) ;
+	BuildFloppyBootImage1 $(image) : $(zbeos) $(archive) ;
+}
+
+actions BuildFloppyBootImage1
+{
+	rm -f $(<)
+	# make an empty image
+	dd if=/dev/zero of=$(<) bs=1k count=1440
+	# add zbeos
+	dd if=$(>[1]) of=$(<) conv=notrunc
+	# add the boot drivers tgz archive
+	# keep the offset in sync with
+	# src/system/boot/loader/file_systems/tarfs/tarfs.cpp:kFloppyArchiveOffset
+	dd if=$(>[2]) of=$(<) bs=192k seek=1 conv=notrunc
+}
+
+



From mmu_man at mail.berlios.de  Sun Mar  2 04:23:52 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 2 Mar 2008 04:23:52 +0100
Subject: [Haiku-commits] r24199 - haiku/trunk/build/jam
Message-ID: <200803020323.m223Nq8P005104@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-02 04:23:51 +0100 (Sun, 02 Mar 2008)
New Revision: 24199
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24199&view=rev

Modified:
   haiku/trunk/build/jam/FloppyBootImage
Log:
Make network support disabled by default for boot floppy, it's not needed and doesn't fit 1.44M.


Modified: haiku/trunk/build/jam/FloppyBootImage
===================================================================
--- haiku/trunk/build/jam/FloppyBootImage	2008-03-02 03:05:23 UTC (rev 24198)
+++ haiku/trunk/build/jam/FloppyBootImage	2008-03-02 03:23:51 UTC (rev 24199)
@@ -14,6 +14,22 @@
 	GPL_ONLY = "" ;
 }
 
+local NET_BOOT = 0 ;
+
+local BOOT_ADD_ONS_NET ;
+if $(NET_BOOT) = 1 {
+BOOT_ADD_ONS_NET = 
+#	nbd
+#	remote_disk
+#	$(BEOS_ADD_ONS_DRIVERS_NET)
+#	stack socket
+#	$(BEOS_NETWORK_DEVICES)
+#	$(BEOS_NETWORK_DATALINK_PROTOCOLS) 
+#	$(BEOS_NETWORK_PPP)
+#	$(BEOS_NETWORK_PROTOCOLS)
+;
+}
+
 BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi
 	config_manager agp_gart
 ;
@@ -44,9 +60,11 @@
 
 # drivers
 AddDriversToFloppyBootArchive disk scsi	: scsi_cd scsi_dsk ;
+if $(NET_BOOT) = 1 {
 #AddDriversToFloppyBootArchive disk virtual	: nbd ;
 AddDriversToFloppyBootArchive disk virtual	: remote_disk ;
 AddDriversToFloppyBootArchive net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
+}
 
 # kernel
 AddFilesToFloppyBootArchive beos system : <revisioned>kernel_$(TARGET_ARCH) ;
@@ -59,6 +77,7 @@
 AddFilesToFloppyBootArchive home config settings kernel drivers
 	: $(driverSettingsFiles) ;
 
+if $(NET_BOOT) = 1 {
 # add-ons
 AddFilesToFloppyBootArchive beos system add-ons kernel network
 	: stack socket ;
@@ -70,6 +89,7 @@
 	: $(BEOS_NETWORK_PPP) ;
 AddFilesToFloppyBootArchive beos system add-ons kernel network protocols
 	: $(BEOS_NETWORK_PROTOCOLS) ;
+}
 
 # boot module links
 AddBootModuleSymlinksToFloppyBootArchive
@@ -80,14 +100,7 @@
 	intel session
 	$(PPC_ONLY)openpic
 	$(X86_ONLY)generic_x86
-#	nbd
-	remote_disk
-	$(BEOS_ADD_ONS_DRIVERS_NET)
-	stack socket
-	$(BEOS_NETWORK_DEVICES)
-	$(BEOS_NETWORK_DATALINK_PROTOCOLS) 
-	$(BEOS_NETWORK_PPP)
-	$(BEOS_NETWORK_PROTOCOLS)
+	$(BOOT_ADD_ONS_NET)
 ;
 
 



From mmu_man at mail.berlios.de  Sun Mar  2 05:35:47 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 2 Mar 2008 05:35:47 +0100
Subject: [Haiku-commits] r24200 - in haiku/trunk/data: . boot_cd
Message-ID: <200803020435.m224ZlZD008997@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-02 05:35:46 +0100 (Sun, 02 Mar 2008)
New Revision: 24200
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24200&view=rev

Added:
   haiku/trunk/data/boot_cd/
   haiku/trunk/data/boot_cd/README.html
Log:
Simple readme to put on a boot CD iso...


Added: haiku/trunk/data/boot_cd/README.html
===================================================================
--- haiku/trunk/data/boot_cd/README.html	2008-03-02 03:23:51 UTC (rev 24199)
+++ haiku/trunk/data/boot_cd/README.html	2008-03-02 04:35:46 UTC (rev 24200)
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Welcome to the Haiku Operating System</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="copyright" content="Haiku Inc., 2001 - 2007" />
+<meta name="description" content="Haiku is an open source desktop operating system currently under development inspired by the BeOS. Haiku aims to provide users of all levels with a personal computing experience that is simple yet powerful, and free of any unnecessary complexities." />
+<meta name="keywords" content="haiku,haiku os,os,operating system,desktop,beos,oss,open source,opensource,openbeos,open beos,computer,personal computer,software,development,innovative,fast,easy to use,ease of use,usability,interaction design" />
+
+</head>
+<body>
+<table width="50%" align="right">
+<tr>
+<td bgcolor="#336698">
+<div style="font-family:sans-serif; color:white; line-height:2.0em; font-size:medium; margin-left:7px"><font color="white">Haiku is an open-source operating system currently in development designed from the ground up for desktop computing. Inspired by the BeOS, Haiku aims to provide users of all levels with a personal computing experience that is simple yet powerful, and free of any unnecessary complexities.</font></div>
+</td>
+</tr>
+</table>
+Links:
+<ul>
+<li><a href="http://www.haiku-os.org/">Haiku website</a></li>
+<ul>
+</body>
+</html>



From mmu_man at mail.berlios.de  Sun Mar  2 05:38:30 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 2 Mar 2008 05:38:30 +0100
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
Message-ID: <200803020438.m224cUXl009100@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-02 05:38:29 +0100 (Sun, 02 Mar 2008)
New Revision: 24201
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24201&view=rev

Added:
   haiku/trunk/build/jam/CDBootImage
Modified:
   haiku/trunk/Jamfile
   haiku/trunk/build/jam/BuildSetup
   haiku/trunk/build/jam/ImageRules
Log:
Rules and targets to build a boot CD iso... use:
jam haiku-boot-cd


Modified: haiku/trunk/Jamfile
===================================================================
--- haiku/trunk/Jamfile	2008-03-02 04:35:46 UTC (rev 24200)
+++ haiku/trunk/Jamfile	2008-03-02 04:38:29 UTC (rev 24201)
@@ -152,6 +152,7 @@
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuImage ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) NetBootArchive ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) FloppyBootImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootImage ] ;
 
 # Perform deferred SubIncludes.
 ExecuteDeferredSubIncludes ;

Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2008-03-02 04:35:46 UTC (rev 24200)
+++ haiku/trunk/build/jam/BuildSetup	2008-03-02 04:38:29 UTC (rev 24201)
@@ -37,7 +37,11 @@
 	= HAIKU_FLOPPY_BOOT_IMAGE_INSTALL_TARGETS ;
 
 # boot CD image
-#TODO
+HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME = haiku-boot-cd-container ;
+HAIKU_CONTAINER_GRIST on $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME) = CDBootImage ;
+# HAIKU_INCLUDE_IN_CONTAINER_VAR -- update only mode not supported
+HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME)
+	= HAIKU_CD_BOOT_IMAGE_INSTALL_TARGETS ;
 
 # analyze an optionally replace jam's target parameters
 HAIKU_ORIGINAL_JAM_TARGETS = $(JAM_TARGETS) ;

Added: haiku/trunk/build/jam/CDBootImage
===================================================================
--- haiku/trunk/build/jam/CDBootImage	2008-03-02 04:35:46 UTC (rev 24200)
+++ haiku/trunk/build/jam/CDBootImage	2008-03-02 04:38:29 UTC (rev 24201)
@@ -0,0 +1,24 @@
+# This file defines what ends up in the CD boot image and it executes the
+# rules building the image.
+
+#HAIKU_BOOT_FLOPPY = haiku-boot-floppy.image ;
+#MakeLocate $(HAIKU_BOOT_FLOPPY) : $(HAIKU_OUTPUT_DIR) ;
+
+# CD image target
+HAIKU_CD_BOOT_IMAGE = haiku-boot-cd.iso ;
+MakeLocate $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_OUTPUT_DIR) ;
+
+# the pseudo target all archive contents is attached to
+NotFile $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME) ;
+
+# extra files to put on the boot iso
+local extras = README.html ;
+SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
+
+BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY) : $(extras) ;
+
+
+NotFile haiku-boot-cd ;
+Depends haiku-boot-cd : $(HAIKU_CD_BOOT_IMAGE) ;
+
+

Modified: haiku/trunk/build/jam/ImageRules
===================================================================
--- haiku/trunk/build/jam/ImageRules	2008-03-02 04:35:46 UTC (rev 24200)
+++ haiku/trunk/build/jam/ImageRules	2008-03-02 04:38:29 UTC (rev 24201)
@@ -869,3 +869,21 @@
 }
 
 
+#pragma mark - CD Boot Image rules
+
+rule BuildCDBootImage image : bootfloppy : extrafiles
+{
+	Depends $(image) : $(bootfloppy) ;
+	Depends $(image) : $(extrafiles) ;
+	BOOTIMG on $(image) = $(bootfloppy) ;
+
+	BuildCDBootImage1 $(image) : $(bootfloppy) $(extrafiles) ;
+}
+
+actions BuildCDBootImage1
+{
+	rm -f $(<)
+	mkisofs -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-])
+}
+
+



From niels.reedijk at gmail.com  Sun Mar  2 11:34:25 2008
From: niels.reedijk at gmail.com (Niels Reedijk)
Date: Sun, 2 Mar 2008 11:34:25 +0100
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
In-Reply-To: <200803020438.m224cUXl009100@sheep.berlios.de>
References: <200803020438.m224cUXl009100@sheep.berlios.de>
Message-ID: <507d86c0803020234u175ebf80m4ca5f2851d248033@mail.gmail.com>

2008/3/2, mmu_man at BerliOS <mmu_man at mail.berlios.de>:
> Author: mmu_man
>  Date: 2008-03-02 05:38:29 +0100 (Sun, 02 Mar 2008)
>  New Revision: 24201
>  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24201&view=rev
>
>  Added:
>    haiku/trunk/build/jam/CDBootImage
>  Modified:
>    haiku/trunk/Jamfile
>    haiku/trunk/build/jam/BuildSetup
>    haiku/trunk/build/jam/ImageRules
>  Log:
>  Rules and targets to build a boot CD iso... use:
>  jam haiku-boot-cd

Ah cool! If you are planning to perfect this, please take ticket
#1268. Can I try this already, or is it WIP?

N.


From revol at free.fr  Sun Mar  2 12:24:54 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sun, 02 Mar 2008 12:24:54 +0100 CET
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
In-Reply-To: <507d86c0803020234u175ebf80m4ca5f2851d248033@mail.gmail.com>
Message-ID: <4207306403-BeMail@laptop>

> >  Rules and targets to build a boot CD iso... use:
> >  jam haiku-boot-cd
> 
> Ah cool! If you are planning to perfect this, please take ticket
> #1268. Can I try this already, or is it WIP?

It builds an image, but I don't know if it would boot on real hw.
I tried in qemu (appending haiku.image to it and using qemu -cd foo -
cdtoc 0,904 but I'm not sure it's how it works) but it gives the boot 
menu without anyway to continue.

Fran?ois.


From superstippi at gmx.de  Sun Mar  2 12:53:44 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Sun, 02 Mar 2008 12:53:44 +0100
Subject: [Haiku-commits] Build broken
In-Reply-To: <200803020305.m2235P4T003081@sheep.berlios.de>
References: <200803020305.m2235P4T003081@sheep.berlios.de>
Message-ID: <20080302115344.273200@gmx.net>

The build is currently broken since the changes to support cdrecord. I cannot check right now, but I think the error is that the new functions are exported multiple times. I am trying to do a GCC2 build in Linux.

Best regards,
-Stephan


From stefano.ceccherini at gmail.com  Sun Mar  2 13:57:40 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Sun, 2 Mar 2008 13:57:40 +0100
Subject: [Haiku-commits] Build broken
In-Reply-To: <20080302115344.273200@gmx.net>
References: <200803020305.m2235P4T003081@sheep.berlios.de>
	<20080302115344.273200@gmx.net>
Message-ID: <894b9700803020457qc66e4ddtf72bf43cb17f1291@mail.gmail.com>

2008/3/2, Stephan Assmus <superstippi at gmx.de>:
> The build is currently broken since the changes to support cdrecord. I cannot check right now, but I think the error is that the new functions are exported multiple times. I am trying to do a GCC2 build in Linux.
>
You might have to delete some objects manually. Try "rm
generated/objects/haiku/x86/release/system/libroot/posix/stdlib"


From axeld at mail.berlios.de  Sun Mar  2 14:51:17 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 2 Mar 2008 14:51:17 +0100
Subject: [Haiku-commits] r24202 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200803021351.m22DpHu9026531@sheep.berlios.de>

Author: axeld
Date: 2008-03-02 14:51:17 +0100 (Sun, 02 Mar 2008)
New Revision: 24202
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24202&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_cpu.c
Log:
Applied patch by Olivier Coursi?\195?\168re: this should help rebooting on some
machines, and fixes bug #1884, thanks!


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_cpu.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_cpu.c	2008-03-02 04:38:29 UTC (rev 24201)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_cpu.c	2008-03-02 13:51:17 UTC (rev 24202)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2002-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -684,6 +684,9 @@
 	// try to reset the system using the keyboard controller
 	out8(0xfe, 0x64);
 
+	// Give some time to the controller to do its job (0.5s)
+	snooze(500000);
+
 	// if that didn't help, try it this way
 	reboot();
 



From axeld at mail.berlios.de  Sun Mar  2 15:37:26 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 2 Mar 2008 15:37:26 +0100
Subject: [Haiku-commits] r24203 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803021437.m22EbQc9029811@sheep.berlios.de>

Author: axeld
Date: 2008-03-02 15:37:26 +0100 (Sun, 02 Mar 2008)
New Revision: 24203
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24203&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
Log:
Patch by Vasilis Kaoutsis to fix some warnings, thanks!


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp	2008-03-02 13:51:17 UTC (rev 24202)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp	2008-03-02 14:37:26 UTC (rev 24203)
@@ -476,8 +476,8 @@
 			| S_FLOAT_INDEX | S_DOUBLE_INDEX);
 
 		if (fHeader->DataType() > BPLUSTREE_DOUBLE_TYPE
-			|| (stream->Mode() & S_INDEX_DIR)
-				&& toMode[fHeader->DataType()] != mode
+			|| ((stream->Mode() & S_INDEX_DIR) != 0
+				&& toMode[fHeader->DataType()] != mode)
 			|| !stream->IsContainer()) {
 			D(	dump_bplustree_header(fHeader);
 				dump_inode(&stream->Node());
@@ -1709,7 +1709,7 @@
 		// to a leaf node by dropping the overflow link, or,
 		// if it's already a leaf node, just empty it
 		if (nodeAndKey.nodeOffset == fHeader->RootNode()
-			&& (node->NumKeys() == 0 || node->NumKeys() == 1 && node->IsLeaf())) {
+			&& (node->NumKeys() == 0 || (node->NumKeys() == 1 && node->IsLeaf()))) {
 			writableNode->overflow_link = HOST_ENDIAN_TO_BFS_INT64((uint64)BPLUSTREE_NULL);
 			writableNode->all_key_count = 0;
 			writableNode->all_key_length = 0;
@@ -1730,7 +1730,7 @@
 		// it, we can just dump the node (index nodes still have
 		// the overflow link, so we have to drop the last key)
 		if (writableNode->NumKeys() > 1
-			|| !writableNode->IsLeaf() && writableNode->NumKeys() == 1) {
+			|| (!writableNode->IsLeaf() && writableNode->NumKeys() == 1)) {
 			_RemoveKey(writableNode, nodeAndKey.keyIndex);
 			return B_OK;
 		}



From axeld at mail.berlios.de  Sun Mar  2 15:47:03 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 2 Mar 2008 15:47:03 +0100
Subject: [Haiku-commits] r24204 - haiku/trunk/src/kits/app
Message-ID: <200803021447.m22El3Bt030426@sheep.berlios.de>

Author: axeld
Date: 2008-03-02 15:47:03 +0100 (Sun, 02 Mar 2008)
New Revision: 24204
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24204&view=rev

Modified:
   haiku/trunk/src/kits/app/Message.cpp
Log:
* Fixed a few problems in AddMessage() (most of them were pointed out by Marcus):
  - no need to initialize the buffer on stack
  - no need to initialize "buffer" to NULL
  - renamed "buf" to stackBuffer
  - enlarged buffer on stack to 16384 bytes (we have a minimum of 192 kB of
    stack per thread, anyway).
  - check the actual size of the stack buffer against the message's flattened
    size instead of the one of its pointer.
  - check if the allocation of the helper buffer failed, and return B_NO_MEMORY
    in this case.
* Moved static helper functions to the top of the file.
* Minor cleanup.


Modified: haiku/trunk/src/kits/app/Message.cpp
===================================================================
--- haiku/trunk/src/kits/app/Message.cpp	2008-03-02 14:37:26 UTC (rev 24203)
+++ haiku/trunk/src/kits/app/Message.cpp	2008-03-02 14:47:03 UTC (rev 24204)
@@ -1,10 +1,11 @@
 /*
- * Copyright 2005-2007, Haiku Inc. All rights reserved.
+ * Copyright 2005-2008, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Michael Lotz <mmlr at mlotz.ch>
  */
+
 #include <Message.h>
 #include <MessageAdapter.h>
 #include <MessagePrivate.h>
@@ -51,13 +52,13 @@
 const char *B_PROPERTY_NAME_ENTRY = "name";
 
 
-static status_t		handle_reply(port_id replyPort, int32 *pCode,
-						bigtime_t timeout, BMessage *reply);
+static status_t	handle_reply(port_id replyPort, int32 *pCode, bigtime_t timeout,
+	BMessage *reply);
 
 extern "C" {
-		// private os function to set the owning team of an area
-		status_t	_kern_transfer_area(area_id area, void **_address,
-						uint32 addressSpec, team_id target);
+	// private os function to set the owning team of an area
+	status_t _kern_transfer_area(area_id area, void **_address,
+		uint32 addressSpec, team_id target);
 }
 
 
@@ -66,6 +67,57 @@
 long BMessage::sReplyPortInUse[sNumReplyPorts];
 
 
+template<typename Type> static uint8 *
+print_to_stream_type(uint8* pointer)
+{
+	Type *item = (Type *)pointer;
+	item->PrintToStream();
+	return (uint8 *)(item+1);
+}
+
+
+template<typename Type> static uint8 *
+print_type(const char* format, uint8* pointer)
+{
+	Type *item = (Type *)pointer;
+	printf(format, *item, *item);
+	return (uint8 *)(item+1);
+}
+
+
+static status_t
+handle_reply(port_id replyPort, int32 *_code, bigtime_t timeout,
+	BMessage *reply)
+{
+	DEBUG_FUNCTION_ENTER2;
+	ssize_t size;
+	do {
+		size = port_buffer_size_etc(replyPort, B_RELATIVE_TIMEOUT, timeout);
+	} while (size == B_INTERRUPTED);
+
+	if (size < B_OK)
+		return size;
+
+	status_t result;
+	char *buffer = (char *)malloc(size);
+	do {
+		result = read_port(replyPort, _code, buffer, size);
+	} while (result == B_INTERRUPTED);
+
+	if (result < B_OK || *_code != kPortMessageCode) {
+		free(buffer);
+		return result < B_OK ? result : B_ERROR;
+	}
+
+	result = reply->Unflatten(buffer);
+	free(buffer);
+	return result;
+}
+
+
+//	#pragma mark -
+
+
 BMessage::BMessage()
 {
 	DEBUG_FUNCTION_ENTER;
@@ -376,24 +428,6 @@
 }
 
 
-template<typename Type> static uint8 *
-print_to_stream_type(uint8* pointer)
-{
-	Type *item = (Type *)pointer;
-	item->PrintToStream();
-	return (uint8 *)(item+1);
-}
-
-
-template<typename Type> static uint8 *
-print_type(const char* format, uint8* pointer)
-{
-	Type *item = (Type *)pointer;
-	printf(format, *item, *item);
-	return (uint8 *)(item+1);
-}
-
-
 void
 BMessage::PrintToStream() const
 {
@@ -2107,36 +2141,6 @@
 }
 
 
-static status_t
-handle_reply(port_id replyPort, int32 *_code, bigtime_t timeout,
-	BMessage *reply)
-{
-	DEBUG_FUNCTION_ENTER2;
-	ssize_t size;
-	do {
-		size = port_buffer_size_etc(replyPort, B_RELATIVE_TIMEOUT, timeout);
-	} while (size == B_INTERRUPTED);
-
-	if (size < B_OK)
-		return size;
-
-	status_t result;
-	char *buffer = (char *)malloc(size);
-	do {
-		result = read_port(replyPort, _code, buffer, size);
-	} while (result == B_INTERRUPTED);
-
-	if (result < B_OK || *_code != kPortMessageCode) {
-		free(buffer);
-		return result < B_OK ? result : B_ERROR;
-	}
-
-	result = reply->Unflatten(buffer);
-	free(buffer);
-	return result;
-}
-
-
 void BMessage::_ReservedMessage1(void) {};
 void BMessage::_ReservedMessage2(void) {};
 void BMessage::_ReservedMessage3(void) {};
@@ -2300,16 +2304,18 @@
 	copying an extra buffer. Functions can be added that return a direct
 	pointer into the message. */
 
-	char buf[4096] = { 0 };
+	char stackBuffer[16384];
 	ssize_t size = message->FlattenedSize();
 
 	bool freeBuffer = false;
-	char* buffer = NULL;
-	if (size > (ssize_t)sizeof(buffer)) {
+	char* buffer;
+	if (size > (ssize_t)sizeof(stackBuffer)) {
 		freeBuffer = true;
 		buffer = static_cast<char*>(malloc(size));
+		if (buffer == NULL)
+			return B_NO_MEMORY;
 	} else {
-		buffer = buf;
+		buffer = stackBuffer;
 	}
 
 	status_t error = message->Flatten(buffer, size);



From axeld at pinc-software.de  Sun Mar  2 15:47:13 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 02 Mar 2008 15:47:13 +0100 CET
Subject: [Haiku-commits] r24196 - haiku/trunk/src/kits/app
In-Reply-To: <16419283.1204425918989.JavaMail.ngmail@webmail16>
Message-ID: <5676044310-BeMail@zon>

Marcus Overhagen <marcusoverhagen at arcor.de> wrote:
> julun at BerliOS <julun at mail.berlios.de> wrote:
> > +	char buf[4096] = { 0 };
> Why are you initializing the buffer with zeroes?
> 
> > +	char* buffer = NULL;
> Why are you initiazing the pointer?
> 
> > +	if (size > (ssize_t)sizeof(buffer)) {
> > +		freeBuffer = true;
> > +		buffer = static_cast<char*>(malloc(size));
> You should check for out of memory error here

There were a few other problems so I took the liberty of fixing them in 
r24204.

Bye,
   Axel.



From revol at free.fr  Sun Mar  2 17:13:12 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sun, 02 Mar 2008 17:13:12 +0100 CET
Subject: [Haiku-commits] Build broken
In-Reply-To: <894b9700803020457qc66e4ddtf72bf43cb17f1291@mail.gmail.com>
Message-ID: <418276636-BeMail@laptop>

> 2008/3/2, Stephan Assmus <superstippi at gmx.de>:
> > The build is currently broken since the changes to support 
> > cdrecord. I cannot check right now, but I think the error is that the 
new functions are exported multiple times. I am trying to do a GCC2 
build in Linux.
> >
> You might have to delete some objects manually. Try "rm
> generated/objects/haiku/x86/release/system/libroot/posix/stdlib"

rm generated/objects/haiku/x86/release/system/libroot/posix/stdlib/
posix_stdlib.o

exactly.
Since the file with sprintf-based version axel wrote got removed.

Sorry, should have mentionned that.

Fran?ois.


From axeld at mail.berlios.de  Sun Mar  2 17:18:08 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 2 Mar 2008 17:18:08 +0100
Subject: [Haiku-commits] r24205 - haiku/trunk/src/apps/cortex/support
Message-ID: <200803021618.m22GI8ce006286@sheep.berlios.de>

Author: axeld
Date: 2008-03-02 17:18:08 +0100 (Sun, 02 Mar 2008)
New Revision: 24205
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24205&view=rev

Modified:
   haiku/trunk/src/apps/cortex/support/MediaIcon.cpp
Log:
* Applied patch by Maurice to make Cortex behave nicer in case
  GetDormantFlavorInfoFor() fails. See bug #1763.
* Minor cleanup.


Modified: haiku/trunk/src/apps/cortex/support/MediaIcon.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/support/MediaIcon.cpp	2008-03-02 14:47:03 UTC (rev 24204)
+++ haiku/trunk/src/apps/cortex/support/MediaIcon.cpp	2008-03-02 16:18:08 UTC (rev 24205)
@@ -158,27 +158,35 @@
 	}
 }
 
-void MediaIcon::_findIconFor(
-	const dormant_node_info &nodeInfo) {
+
+void
+MediaIcon::_findIconFor(const dormant_node_info &nodeInfo)
+{
 	D_INTERNAL(("MediaIcon::_findIconFor(dormant_node_info)\n"));
 
 	dormant_flavor_info flavorInfo;
 	BMediaRoster *roster = BMediaRoster::CurrentRoster();
 	status_t error = roster->GetDormantFlavorInfoFor(nodeInfo, &flavorInfo);
-	if (!error) {
+	if (error == B_OK) {
 		m_nodeKind = flavorInfo.kinds;
-		bool audioIn = false, audioOut = false, videoIn = false, videoOut = false;
+		bool audioIn = false, audioOut = false;
+		bool videoIn = false, videoOut = false;
 		_getMediaTypesFor(flavorInfo, &audioIn, &audioOut, &videoIn, &videoOut);
 		_findDefaultIconFor(audioIn, audioOut, videoIn, videoOut);
+	} else {
+		// use generic icon in case we couldn't get any info
+		if (m_size == B_LARGE_ICON)
+			SetBits(M_GENERIC_ICON.large, 1024, 0, B_CMAP8);
+		else if (m_size == B_MINI_ICON)
+			SetBits(M_GENERIC_ICON.small, 256, 0, B_CMAP8);
 	}
 }
 
-void MediaIcon::_getMediaTypesFor(
-	const live_node_info &nodeInfo,
-	bool *audioIn,
-	bool *audioOut,
-	bool *videoIn,
-	bool *videoOut) {
+
+void
+MediaIcon::_getMediaTypesFor(const live_node_info &nodeInfo, bool *audioIn,
+	bool *audioOut, bool *videoIn, bool *videoOut)
+{
 	D_INTERNAL(("MediaIcon::_getMediaTypeFor(live_node_info)\n"));
 
 	// get the media_types supported by this node



From mmu_man at mail.berlios.de  Sun Mar  2 17:27:52 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 2 Mar 2008 17:27:52 +0100
Subject: [Haiku-commits] r24206 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200803021627.m22GRqEQ008446@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-02 17:27:52 +0100 (Sun, 02 Mar 2008)
New Revision: 24206
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24206&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Added Maurice Kalinowski to the contributors' list.

Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-02 16:18:08 UTC (rev 24205)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-02 16:27:52 UTC (rev 24206)
@@ -408,6 +408,7 @@
 		"Morgan Howe\n"
 		"Erik Jaesler\n"
 		"Carwyn Jones\n"
+		"Maurice Kalinowski\n"
 		"Vasilis Kaoutsis\n"
 		"James Kim\n"
 		"Euan Kirkhope\n"



From axeld at pinc-software.de  Sun Mar  2 17:41:58 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 02 Mar 2008 17:41:58 +0100 CET
Subject: [Haiku-commits] r24175 - haiku/trunk/headers/private/interface
In-Reply-To: <47C9CE95.8000308@digintrans.com>
Message-ID: <12561896898-BeMail@zon>

"Jorge G. Mare (a.k.a. Koki)" <koki at digintrans.com> wrote:
> Axel D?rfler wrote:
> > I don't think so, at least I doubt that StyledEdit would 
> > automatically 
> > recognize that encoding - you might be able to select it 
> > afterwards, 
> > but that I don't know :-)
> Per the screenshot linked below, the file open dialog in StyledEdit 
> has 
> an Encoding menu where you can select the encoding that you want to 
> apply when opening a file:
> 
> http://myhaiku.org/haiku/2008-03-29_se-encoding.png

So we already support that one - good to know :-)

> > Maybe we should just try to integrate this stuff?? :)
> It would be nice if StyledEdit automatically detected and used the 
> right 
> encoding of the text file it is opening. There is an editor for BeOS 
> called KEdit which does exactly that, and may be a good reference. 
> You 
> can find binary and sources here:
> 
> http://www.bebits.com/app/1323

Thanks for the link! I've looked at it, but as detecting encodings is 
hard to do anyway, I was not surprised that this method is 
unfortunately not at all suitable for generic detection if you're not 
using Kanji + UTF-8/ASCII only.

Bye,
   Axel.



From umccullough at gmail.com  Sun Mar  2 17:54:04 2008
From: umccullough at gmail.com (Urias McCullough)
Date: Sun, 2 Mar 2008 08:54:04 -0800
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
In-Reply-To: <4207306403-BeMail@laptop>
References: <507d86c0803020234u175ebf80m4ca5f2851d248033@mail.gmail.com>
	<4207306403-BeMail@laptop>
Message-ID: <1e80d8750803020854o34b8fd5fid8afaca6f0773f6b@mail.gmail.com>

On 02/03/2008, Fran?ois Revol <revol at free.fr> wrote:
> > >  Rules and targets to build a boot CD iso... use:
>  > >  jam haiku-boot-cd
>  >
>  > Ah cool! If you are planning to perfect this, please take ticket
>  > #1268. Can I try this already, or is it WIP?
>
> It builds an image, but I don't know if it would boot on real hw.
>  I tried in qemu (appending haiku.image to it and using qemu -cd foo -
>  cdtoc 0,904 but I'm not sure it's how it works) but it gives the boot
>  menu without anyway to continue.

I tried on real hardware. I got an error about no boot partitions, and
then the boot menu, but it couldn't find the image on the CD. It *was*
able to find my HD Haiku partition and boot that.

I used the following in a CUE to burn the disk with Nero on Windows
(what I use for BeOS Max CDs, etc):

FILE "haiku-boot-cd.iso" BINARY
TRACK 01 MODE1/2048
INDEX 01 00:00:00
POSTGAP 00:02:00
FILE "haiku.image" BINARY
TRACK 02 MODE1/2048
INDEX 01 00:00:00
POSTGAP 00:02:00

Assuming that this is correct, I would guess something is still
missing. Perhaps I'll find some time to tinker with it today - we'll
see..


From alex at zappotek.com  Sun Mar  2 18:08:00 2008
From: alex at zappotek.com (Alexandre Deckner)
Date: Sun, 02 Mar 2008 18:08:00 +0100
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
In-Reply-To: <1e80d8750803020854o34b8fd5fid8afaca6f0773f6b@mail.gmail.com>
References: <507d86c0803020234u175ebf80m4ca5f2851d248033@mail.gmail.com>	<4207306403-BeMail@laptop>
	<1e80d8750803020854o34b8fd5fid8afaca6f0773f6b@mail.gmail.com>
Message-ID: <47CADEF0.3070607@zappotek.com>

Urias McCullough a ?crit :
> On 02/03/2008, Fran?ois Revol <revol at free.fr> wrote:
>   
>>>>  Rules and targets to build a boot CD iso... use:
>>>>         
>>  > >  jam haiku-boot-cd
>>  >
>>  > Ah cool! If you are planning to perfect this, please take ticket
>>  > #1268. Can I try this already, or is it WIP?
>>
>> It builds an image, but I don't know if it would boot on real hw.
>>  I tried in qemu (appending haiku.image to it and using qemu -cd foo -
>>  cdtoc 0,904 but I'm not sure it's how it works) but it gives the boot
>>  menu without anyway to continue.
>>     
>
> I tried on real hardware. I got an error about no boot partitions, and
> then the boot menu, but it couldn't find the image on the CD. It *was*
> able to find my HD Haiku partition and boot that.
>   
Same here! http://dev.haiku-os.org/ticket/1364 . It used to work around 
summer 2006 iirc though.

-Alex




From leavengood at gmail.com  Sun Mar  2 18:21:31 2008
From: leavengood at gmail.com (Ryan Leavengood)
Date: Sun, 2 Mar 2008 12:21:31 -0500
Subject: [Haiku-commits] r24193 - in haiku/trunk: headers/os/interface
	src/kits/interface
In-Reply-To: <200803012215.m21MFU40022335@sheep.berlios.de>
References: <200803012215.m21MFU40022335@sheep.berlios.de>
Message-ID: <a4855ac50803020921x7638d95fm793824924efdfe2c@mail.gmail.com>

On Sat, Mar 1, 2008 at 5:15 PM, jackburton at BerliOS
<jackburton at mail.berlios.de> wrote:
>  Applied patch by Denis Washington which implements "diagonal mouse
>  support" for menus (see ticket #284). Thanks a lot!

Awesome, good stuff Denis! He even included documentation of how it
works, great! I can't wait to test this out, this was something that
has been bugging me for a while.

Regards,
Ryan


From zharik at gmx.li  Sun Mar  2 21:09:17 2008
From: zharik at gmx.li (Siarzhuk Zharski)
Date: Sun, 02 Mar 2008 21:09:17 +0100
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
In-Reply-To: <1e80d8750803020854o34b8fd5fid8afaca6f0773f6b@mail.gmail.com>
References: <507d86c0803020234u175ebf80m4ca5f2851d248033@mail.gmail.com>	<4207306403-BeMail@laptop>
	<1e80d8750803020854o34b8fd5fid8afaca6f0773f6b@mail.gmail.com>
Message-ID: <47CB096D.8060603@gmx.li>

Hi

Urias McCullough wrote:
>> It builds an image, but I don't know if it would boot on real hw.
>>     
> I tried on real hardware. I got an error about no boot partitions, and
> then the boot menu, but it couldn't find the image on the CD. It *was*
> able to find my HD Haiku partition and boot that.
>
> I used the following in a CUE to burn the disk with Nero on Windows
> (what I use for BeOS Max CDs, etc):
>
> FILE "haiku-boot-cd.iso" BINARY
> TRACK 01 MODE1/2048
>   
2048
> INDEX 01 00:00:00
> POSTGAP 00:02:00
> FILE "haiku.image" BINARY
> TRACK 02 MODE1/2048
>   
2048
> INDEX 01 00:00:00
> POSTGAP 00:02:00
>
> Assuming that this is correct, I would guess something is still
> missing. Perhaps I'll find some time to tinker with it today - we'll
> see..
>   
Last time I looked in same problem the block size of build-created bfs 
image was 1024 by default. May be it is the source of your problem?

Kind Regards,
  S.Z.



From mmlr at mlotz.ch  Sun Mar  2 21:48:46 2008
From: mmlr at mlotz.ch (Michael Lotz)
Date: Sun, 02 Mar 2008 21:48:46 +0100
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
In-Reply-To: <4207306403-BeMail@laptop>
Message-ID: <5041612089-BeMail@primary>

> > >  Rules and targets to build a boot CD iso... use:
> > >  jam haiku-boot-cd
> > 
> > Ah cool! If you are planning to perfect this, please take ticket
> > #1268. Can I try this already, or is it WIP?
> 
> It builds an image, but I don't know if it would boot on real hw.
> I tried in qemu (appending haiku.image to it and using qemu -cd foo -
> cdtoc 0,904 but I'm not sure it's how it works) but it gives the boot 
> menu without anyway to continue.

Note though that the "-cdtoc" option is only present in the BeOS 
version of QEMU, as I hacked that in specifically to allow booting 
multi session BeOS CDs...

Regards
Michael


From mmlr at mlotz.ch  Sun Mar  2 22:01:29 2008
From: mmlr at mlotz.ch (Michael Lotz)
Date: Sun, 02 Mar 2008 22:01:29 +0100
Subject: [Haiku-commits] r24189 -
 haiku/trunk/src/add-ons/accelerants/common
In-Reply-To: <200803011723.m21HNfQ8011914@sheep.berlios.de>
Message-ID: <5804316622-BeMail@primary>

> Author: axeld
> Added modes for 1270x720 and 1400x1050 to the generic mode list.

Also 1280x800 would be a nice resolution to add. It's used on many 
12.1" laptops. I have it on my hp 2510p and I added this mode line 
(adapted from an X11 config) and it works (with a sligthly hacked 
intel_extreme driver):

{{83564, 1280, 1344, 1480, 1680, 800, 801, 804, 828, POSITIVE_VSYNC}, 
B_CMAP8, 1280, 800, 0, 0, MODE_FLAGS}, /* WXGA (1280x800x60) */

Regards
Michael


From axeld at mail.berlios.de  Sun Mar  2 22:08:34 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 2 Mar 2008 22:08:34 +0100
Subject: [Haiku-commits] r24207 -
	haiku/trunk/src/apps/cortex/MediaRoutingView
Message-ID: <200803022108.m22L8YMW024734@sheep.berlios.de>

Author: axeld
Date: 2008-03-02 22:08:33 +0100 (Sun, 02 Mar 2008)
New Revision: 24207
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24207&view=rev

Modified:
   haiku/trunk/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp
   haiku/trunk/src/apps/cortex/MediaRoutingView/MediaRoutingView.h
Log:
Applied patch by Maurice to fix Cortex' transport add-on selection, thanks!


Modified: haiku/trunk/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp	2008-03-02 16:27:52 UTC (rev 24206)
+++ haiku/trunk/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp	2008-03-02 21:08:33 UTC (rev 24207)
@@ -273,7 +273,7 @@
 
 
 void
-MediaRoutingView::selectionChanged()
+MediaRoutingView::SelectionChanged()
 {
 	D_METHOD(("MediaRoutingView::selectionChanged()\n"));
 	_broadcastSelection();

Modified: haiku/trunk/src/apps/cortex/MediaRoutingView/MediaRoutingView.h
===================================================================
--- haiku/trunk/src/apps/cortex/MediaRoutingView/MediaRoutingView.h	2008-03-02 16:27:52 UTC (rev 24206)
+++ haiku/trunk/src/apps/cortex/MediaRoutingView/MediaRoutingView.h	2008-03-02 21:08:33 UTC (rev 24207)
@@ -181,7 +181,7 @@
 								BPoint point,
 								BMessage *message);
 
-	virtual void			selectionChanged();
+	virtual void			SelectionChanged();
 
 public:						// *** BView impl
 



From axeld at pinc-software.de  Sun Mar  2 22:10:35 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 02 Mar 2008 22:10:35 +0100 CET
Subject: [Haiku-commits] r24189 -
 haiku/trunk/src/add-ons/accelerants/common
In-Reply-To: <5804316622-BeMail@primary>
Message-ID: <28678198222-BeMail@zon>

"Michael Lotz" <mmlr at mlotz.ch> wrote:
> {{83564, 1280, 1344, 1480, 1680, 800, 801, 804, 828, POSITIVE_VSYNC}, 
> B_CMAP8, 1280, 800, 0, 0, MODE_FLAGS}, /* WXGA (1280x800x60) */

Is positive vsync wanted or accidental? (it would be either 
B_POSITIVE_VSYNC or POSITIVE_SYNC to have both, that's why I'm asking :
-))

Bye,
   Axel.



From mmlr at mlotz.ch  Sun Mar  2 22:14:26 2008
From: mmlr at mlotz.ch (Michael Lotz)
Date: Sun, 02 Mar 2008 22:14:26 +0100
Subject: [Haiku-commits] r24189 -
 haiku/trunk/src/add-ons/accelerants/common
In-Reply-To: <28678198222-BeMail@zon>
Message-ID: <6581902298-BeMail@primary>

> "Michael Lotz" <mmlr at mlotz.ch> wrote:
> > {{83564, 1280, 1344, 1480, 1680, 800, 801, 804, 828, 
> > POSITIVE_VSYNC}, 
> > B_CMAP8, 1280, 800, 0, 0, MODE_FLAGS}, /* WXGA (1280x800x60) */
> 
> Is positive vsync wanted or accidental? (it would be either 
> B_POSITIVE_VSYNC or POSITIVE_SYNC to have both, that's why I'm asking 
> :
> -))

It's accidental. I first had B_POSITIVE_VSYNC there as HSYNC didn't 
seem necessary, but I have now tested that it works with it as well, so 
the POSITIVE_SYNC define should be save to use (for my display at least 
that is...).

Regards
Michael


From anevilyak at mail.berlios.de  Sun Mar  2 22:16:44 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sun, 2 Mar 2008 22:16:44 +0100
Subject: [Haiku-commits] r24208 - haiku/trunk/src/kits/tracker
Message-ID: <200803022116.m22LGi3M025692@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-02 22:16:43 +0100 (Sun, 02 Mar 2008)
New Revision: 24208
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24208&view=rev

Modified:
   haiku/trunk/src/kits/tracker/Navigator.cpp
Log:
Made Navigator color-sensitive. More to come.



Modified: haiku/trunk/src/kits/tracker/Navigator.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Navigator.cpp	2008-03-02 21:08:33 UTC (rev 24207)
+++ haiku/trunk/src/kits/tracker/Navigator.cpp	2008-03-02 21:16:43 UTC (rev 24208)
@@ -46,11 +46,6 @@
 
 static const int32 kMaxHistory = 32;
 
-static const rgb_color kBgColor = {220, 220, 220, 255};
-static const rgb_color kShineColor = {255, 255, 255, 255};
-static const rgb_color kHalfDarkColor = {200, 200, 200, 255};
-static const rgb_color kDarkColor = {166, 166, 166, 255};
-
 }
 
 // BPictureButton() will crash when giving zero pointers,
@@ -67,9 +62,9 @@
 {
 	// Clear to background color to 
 	// avoid ugly border on click
-	SetViewColor(kBgColor);
-	SetHighColor(kBgColor);
-	SetLowColor(kBgColor);
+	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+	SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+	SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 }
 
 BNavigatorButton::~BNavigatorButton()
@@ -104,7 +99,7 @@
 		BView view(bitmap->Bounds(), "", 0, 0);
 		AddChild(&view);
 		view.BeginPicture(&picture);
-		view.SetHighColor(kBgColor);
+		view.SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 		view.FillRect(view.Bounds());
 		view.SetDrawingMode(B_OP_OVER);
 		view.DrawBitmap(bitmap, BPoint(0, 0));
@@ -135,7 +130,7 @@
 	// Get initial path
 	model->GetPath(&fPath);
 	
-	SetViewColor(kBgColor);
+	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
 	float top = 2 + (be_plain_font->Size() - 8) / 2;
 
@@ -186,12 +181,16 @@
 void 
 BNavigator::Draw(BRect)
 {
+	rgb_color bgColor = ui_color(B_PANEL_BACKGROUND_COLOR);
+	rgb_color shineColor = ui_color(B_SHINE_COLOR);
+	rgb_color halfDarkColor = tint_color(bgColor, B_DARKEN_1_TINT);
+	rgb_color darkColor = tint_color(bgColor, B_DARKEN_2_TINT);
 	// Draws a beveled smooth border
 	BeginLineArray(4);
-	AddLine(Bounds().LeftTop(), Bounds().RightTop(), kShineColor);
-	AddLine(Bounds().LeftTop(), Bounds().LeftBottom() - BPoint(0, 1), kShineColor);
-	AddLine(Bounds().LeftBottom() - BPoint(-1, 1), Bounds().RightBottom() - BPoint(0, 1), kHalfDarkColor);
-	AddLine(Bounds().LeftBottom(), Bounds().RightBottom(), kDarkColor);
+	AddLine(Bounds().LeftTop(), Bounds().RightTop(), shineColor);
+	AddLine(Bounds().LeftTop(), Bounds().LeftBottom() - BPoint(0, 1), shineColor);
+	AddLine(Bounds().LeftBottom() - BPoint(-1, 1), Bounds().RightBottom() - BPoint(0, 1), halfDarkColor);
+	AddLine(Bounds().LeftBottom(), Bounds().RightBottom(), darkColor);
 	EndLineArray();
 }
 



From axeld at mail.berlios.de  Sun Mar  2 22:22:58 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 2 Mar 2008 22:22:58 +0100
Subject: [Haiku-commits] r24209 - haiku/trunk/src/add-ons/accelerants/common
Message-ID: <200803022122.m22LMwqg026528@sheep.berlios.de>

Author: axeld
Date: 2008-03-02 22:22:57 +0100 (Sun, 02 Mar 2008)
New Revision: 24209
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24209&view=rev

Modified:
   haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp
Log:
* Added 1280x800x60, thanks Michael!
* Also added 800x480x60.


Modified: haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp	2008-03-02 21:16:43 UTC (rev 24208)
+++ haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp	2008-03-02 21:22:57 UTC (rev 24209)
@@ -28,6 +28,7 @@
 	{{31500, 640, 664, 704, 832, 480, 489, 492, 520, 0}, B_CMAP8, 640, 480, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 70-72Hz_(640X480X8.Z1) */
 	{{31500, 640, 656, 720, 840, 480, 481, 484, 500, 0}, B_CMAP8, 640, 480, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(640X480X8.Z1) */
 	{{36000, 640, 696, 752, 832, 480, 481, 484, 509, 0}, B_CMAP8, 640, 480, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 85Hz_(640X480X8.Z1) */
+	{{29580, 800, 816, 896, 992, 480, 481, 484, 497, B_POSITIVE_VSYNC}, B_CMAP8, 800, 480, 0, 0, MODE_FLAGS}, /* 800x480x60Hz */
 	{{38100, 800, 832, 960, 1088, 600, 602, 606, 620, 0}, B_CMAP8, 800, 600, 0, 0, MODE_FLAGS}, /* SVGA_800X600X56HzNI */
 	{{40000, 800, 840, 968, 1056, 600, 601, 605, 628, POSITIVE_SYNC}, B_CMAP8, 800, 600, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(800X600X8.Z1) */
 	{{49500, 800, 816, 896, 1056, 600, 601, 604, 625, POSITIVE_SYNC}, B_CMAP8, 800, 600, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(800X600X8.Z1) */
@@ -41,6 +42,7 @@
 	{{108000, 1152, 1216, 1344, 1600, 864, 865, 868, 900, POSITIVE_SYNC}, B_CMAP8, 1152, 864, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(1152X864X8.Z1) */
 	{{121500, 1152, 1216, 1344, 1568, 864, 865, 868, 911, POSITIVE_SYNC}, B_CMAP8, 1152, 864, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 85Hz_(1152X864X8.Z1) */
 	{{74520, 1280, 1368, 1424, 1656, 720, 724, 730, 750, POSITIVE_SYNC}, B_CMAP8, 1280, 720, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(1280X720) */
+	{{83460, 1280, 1344, 1480, 1680, 800, 801, 804, 828, B_POSITIVE_VSYNC}, B_CMAP8, 1280, 800, 0, 0, MODE_FLAGS}, /* WXGA (1280x800x60) */
 	{{108000, 1280, 1328, 1440, 1688, 1024, 1025, 1028, 1066, POSITIVE_SYNC}, B_CMAP8, 1280, 1024, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 60Hz_(1280X1024X8.Z1) */
 	{{135000, 1280, 1296, 1440, 1688, 1024, 1025, 1028, 1066, POSITIVE_SYNC}, B_CMAP8, 1280, 1024, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 75Hz_(1280X1024X8.Z1) */
 	{{157500, 1280, 1344, 1504, 1728, 1024, 1025, 1028, 1072, POSITIVE_SYNC}, B_CMAP8, 1280, 1024, 0, 0, MODE_FLAGS}, /* Vesa_Monitor_ at 85Hz_(1280X1024X8.Z1) */



From revol at free.fr  Sun Mar  2 22:44:40 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sun, 02 Mar 2008 22:44:40 +0100 CET
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
In-Reply-To: <5041612089-BeMail@primary>
Message-ID: <20306371119-BeMail@laptop>

> > > >  Rules and targets to build a boot CD iso... use:
> > > >  jam haiku-boot-cd
> > > 
> > > Ah cool! If you are planning to perfect this, please take ticket
> > > #1268. Can I try this already, or is it WIP?
> > 
> > It builds an image, but I don't know if it would boot on real hw.
> > I tried in qemu (appending haiku.image to it and using qemu -cd foo 
> > -
> > cdtoc 0,904 but I'm not sure it's how it works) but it gives the 
> > boot 
> > menu without anyway to continue.
> 
> Note though that the "-cdtoc" option is only present in the BeOS 
> version of QEMU, as I hacked that in specifically to allow booting 
> multi session BeOS CDs...
> 

Gahh, didn't notice...
that'll need to be pushed to HEAD :)

Fran?ois.


From revol at free.fr  Sun Mar  2 22:52:33 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sun, 02 Mar 2008 22:52:33 +0100 CET
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
In-Reply-To: <20306371119-BeMail@laptop>
Message-ID: <20779638638-BeMail@laptop>

> > > > >  Rules and targets to build a boot CD iso... use:
> > > > >  jam haiku-boot-cd
> > > > 
> > > > Ah cool! If you are planning to perfect this, please take 
> > > > ticket
> > > > #1268. Can I try this already, or is it WIP?
> > > 
> > > It builds an image, but I don't know if it would boot on real hw.
> > > I tried in qemu (appending haiku.image to it and using qemu -cd 
> > > foo 
> > > -
> > > cdtoc 0,904 but I'm not sure it's how it works) but it gives the 
> > > boot 
> > > menu without anyway to continue.
> > 
> > Note though that the "-cdtoc" option is only present in the BeOS 
> > version of QEMU, as I hacked that in specifically to allow booting 
> > multi session BeOS CDs...
> > 
> 
> Gahh, didn't notice...
> that'll need to be pushed to HEAD :)

OTH, similar behaviour can be generated with
qemu -cdrom generated/haiku.image -fda generated/haiku-boot-
floppy.image

Fran?ois.


From mmlr at mlotz.ch  Sun Mar  2 23:04:57 2008
From: mmlr at mlotz.ch (Michael Lotz)
Date: Sun, 02 Mar 2008 23:04:57 +0100
Subject: [Haiku-commits] r24179 - in haiku/trunk: headers/build
 src/build/libhaikucompat
In-Reply-To: <10458560227-BeMail@laptop>
Message-ID: <9612247463-BeMail@primary>

> > Author: axeld
> > Date: 2008-02-29 16:02:12 +0100 (Fri, 29 Feb 2008)
> > New Revision: 24179
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24179&view=rev
> > 
> > Modified:
> >    haiku/trunk/headers/build/HaikuBuildCompatibility.h
> >    haiku/trunk/src/build/libhaikucompat/Jamfile
> > Log:
> > Hopefully final build fix for Dano; at least I build everything 
> > with 
> > "-a" this
> > time and it worked :-)

It seems that this broke the build for BONE. I had to add the following 
to the libhaikucompat jamfile to get it to work again over here:

if $(HOST_PLATFORM) = bone {
	ObjectDefines $(libbePatchSources) :
		USING_HAIKU_TYPE_CONSTANTS_H= ;
}

Which is the same as the one for Dano except for the "IMPEX_BE=" part 
as this generates a lot of redefinition warnings under BONE.

Regards
Michael




From revol at free.fr  Sun Mar  2 23:10:14 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sun, 02 Mar 2008 23:10:14 +0100 CET
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
In-Reply-To: <47CB096D.8060603@gmx.li>
Message-ID: <21841030079-BeMail@laptop>

> >   
> 2048
> > INDEX 01 00:00:00
> > POSTGAP 00:02:00
> > FILE "haiku.image" BINARY
> > TRACK 02 MODE1/2048
> >   
> 2048
> > INDEX 01 00:00:00
> > POSTGAP 00:02:00
> >
> > Assuming that this is correct, I would guess something is still
> > missing. Perhaps I'll find some time to tinker with it today - 
> > we'll
> > see..
> >   
> Last time I looked in same problem the block size of build-created 
> bfs 
> image was 1024 by default. May be it is the source of your problem?

Good idea but it didnd't help.
Added "block_size 2048" in the build_haiku_image script but it doesn't 
help.

Fran?ois.


From axeld at pinc-software.de  Sun Mar  2 23:28:50 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 02 Mar 2008 23:28:50 +0100 CET
Subject: [Haiku-commits] r24189 -
 haiku/trunk/src/add-ons/accelerants/common
In-Reply-To: <6581902298-BeMail@primary>
Message-ID: <33373896644-BeMail@zon>

"Michael Lotz" <mmlr at mlotz.ch> wrote:
> > "Michael Lotz" <mmlr at mlotz.ch> wrote:
> > > {{83564, 1280, 1344, 1480, 1680, 800, 801, 804, 828, 
> > > POSITIVE_VSYNC}, 
> > > B_CMAP8, 1280, 800, 0, 0, MODE_FLAGS}, /* WXGA (1280x800x60) */
> > Is positive vsync wanted or accidental? (it would be either 
> > B_POSITIVE_VSYNC or POSITIVE_SYNC to have both, that's why I'm 
> > asking 
> > :-))
> It's accidental. I first had B_POSITIVE_VSYNC there as HSYNC didn't 
> seem necessary, but I have now tested that it works with it as well, 
> so 
> the POSITIVE_SYNC define should be save to use (for my display at 
> least 
> that is...).

I've used "gtf" to create that modeline for me, and it used -hsync +
vsync, so I opted for B_POSITIVE_VSYNC. Shouldn't matter much, I would 
guess.

Bye,
   Axel.



From axeld at pinc-software.de  Sun Mar  2 23:52:59 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 02 Mar 2008 23:52:59 +0100 CET
Subject: [Haiku-commits] r24179 - in haiku/trunk: headers/build
 src/build/libhaikucompat
In-Reply-To: <9612247463-BeMail@primary>
Message-ID: <34822732653-BeMail@zon>

"Michael Lotz" <mmlr at mlotz.ch> wrote:
> > > Log:
> > > Hopefully final build fix for Dano; at least I build everything 
> > > with "-a" this time and it worked :-)
> It seems that this broke the build for BONE. I had to add the 
> following 
> to the libhaikucompat jamfile to get it to work again over here:
> 
> if $(HOST_PLATFORM) = bone {
> 	ObjectDefines $(libbePatchSources) :
> 		USING_HAIKU_TYPE_CONSTANTS_H= ;
> }
> 
> Which is the same as the one for Dano except for the "IMPEX_BE=" part 
> as this generates a lot of redefinition warnings under BONE.

Sorry! I currently don't have any working R5 around anymore; I guess I 
need to set it up in VMware/Qemu to be able to continue to use it :-/
Can you commit this change?

Bye,
   Axel.



From mmlr at mail.berlios.de  Mon Mar  3 00:13:50 2008
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Mon, 3 Mar 2008 00:13:50 +0100
Subject: [Haiku-commits] r24210 - haiku/trunk/src/build/libhaikucompat
Message-ID: <200803022313.m22NDou0011077@sheep.berlios.de>

Author: mmlr
Date: 2008-03-03 00:13:50 +0100 (Mon, 03 Mar 2008)
New Revision: 24210
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24210&view=rev

Modified:
   haiku/trunk/src/build/libhaikucompat/Jamfile
Log:
Use the USING_HAIKU_TYPE_CONSTANTS_H define also for the BONE platform.
Maybe this needs to be extended to plain R5 as well, but I cannot currently
test that.

Modified: haiku/trunk/src/build/libhaikucompat/Jamfile
===================================================================
--- haiku/trunk/src/build/libhaikucompat/Jamfile	2008-03-02 21:22:57 UTC (rev 24209)
+++ haiku/trunk/src/build/libhaikucompat/Jamfile	2008-03-02 23:13:50 UTC (rev 24210)
@@ -25,6 +25,10 @@
 		: [ FDirName $(HAIKU_TOP) headers build os support ] ;
 	ObjectSysHdrs $(libbePatchSources)
 		: [ FDirName $(HAIKU_TOP) headers build os storage ] ;
+	if $(HOST_PLATFORM) = bone {
+		ObjectDefines $(libbePatchSources) :
+			USING_HAIKU_TYPE_CONSTANTS_H= ;
+	}
 	if $(HOST_PLATFORM) = dano {
 		ObjectDefines $(libbePatchSources) : _IMPEXP_BE=
 			USING_HAIKU_TYPE_CONSTANTS_H= ;



From mmu_man at mail.berlios.de  Mon Mar  3 00:14:55 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Mon, 3 Mar 2008 00:14:55 +0100
Subject: [Haiku-commits] r24211 - in haiku/trunk/src/system/boot/platform:
	atari_m68k bios_ia32
Message-ID: <200803022314.m22NEttw011182@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-03 00:14:54 +0100 (Mon, 03 Mar 2008)
New Revision: 24211
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24211&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/atari_m68k/devices.cpp
   haiku/trunk/src/system/boot/platform/bios_ia32/devices.cpp
Log:
Setting a Bool when you actually Get a Bool might help...

Modified: haiku/trunk/src/system/boot/platform/atari_m68k/devices.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/atari_m68k/devices.cpp	2008-03-02 23:13:50 UTC (rev 24210)
+++ haiku/trunk/src/system/boot/platform/atari_m68k/devices.cpp	2008-03-02 23:14:54 UTC (rev 24211)
@@ -942,7 +942,7 @@
 	}
 
 	TRACE(("boot drive size: %Ld bytes\n", drive->Size()));
-	gKernelArgs.boot_volume.SetInt32(BOOT_VOLUME_BOOTED_FROM_IMAGE,
+	gKernelArgs.boot_volume.SetBool(BOOT_VOLUME_BOOTED_FROM_IMAGE,
 		gBootedFromImage);
 
 	return B_OK;

Modified: haiku/trunk/src/system/boot/platform/bios_ia32/devices.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/devices.cpp	2008-03-02 23:13:50 UTC (rev 24210)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/devices.cpp	2008-03-02 23:14:54 UTC (rev 24211)
@@ -757,7 +757,7 @@
 	}
 
 	TRACE(("boot drive size: %Ld bytes\n", drive->Size()));
-	gKernelArgs.boot_volume.SetInt32(BOOT_VOLUME_BOOTED_FROM_IMAGE,
+	gKernelArgs.boot_volume.SetBool(BOOT_VOLUME_BOOTED_FROM_IMAGE,
 		gBootedFromImage);
 
 	return B_OK;



From axeld at mail.berlios.de  Mon Mar  3 00:17:26 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 3 Mar 2008 00:17:26 +0100
Subject: [Haiku-commits] r24212 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803022317.m22NHQ8V011348@sheep.berlios.de>

Author: axeld
Date: 2008-03-03 00:17:26 +0100 (Mon, 03 Mar 2008)
New Revision: 24212
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24212&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp
Log:
* Ever since I added O_NOCACHE to the flags BFS is using to open its
  device, the read-only detection did not work anymore; I've now added
  handy methods to correctly check for this. This fixes bug #1829.
* Volume::Initialize() now also checks if the device could really be 
  opened read/write.
* Minor cleanup.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp	2008-03-02 23:14:54 UTC (rev 24211)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp	2008-03-02 23:17:26 UTC (rev 24212)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de.
  * This file may be used under the terms of the MIT License.
  */
 
@@ -40,10 +40,16 @@
 
 		int Device() const { return fDevice; }
 		int Mode() const { return fMode; }
+		bool IsReadOnly() const { return _IsReadOnly(fMode); }
 
 		status_t GetSize(off_t *_size, uint32 *_blockSize = NULL);
 
 	private:
+		static bool _IsReadOnly(int mode)
+			{ return (mode & O_RWMASK) == O_RDONLY;}
+		static bool _IsReadWrite(int mode)
+			{ return (mode & O_RWMASK) == O_RDWR;}
+
 		int		fDevice;
 		int		fMode;
 		void	*fBlockCache;
@@ -82,7 +88,7 @@
 	if (fDevice < 0)
 		fDevice = errno;
 
-	if (fDevice < 0 && mode == O_RDWR) {
+	if (fDevice < 0 && _IsReadWrite(mode)) {
 		// try again to open read-only (don't rely on a specific error code)
 		return Open(device, O_RDONLY | O_NOCACHE);
 	}
@@ -90,7 +96,7 @@
 	if (fDevice >= 0) {
 		// opening succeeded
 		fMode = mode;
-		if (mode == O_RDWR) {
+		if (_IsReadWrite(mode)) {
 			// check out if the device really allows for read/write access
 			device_geometry geometry;
 			if (!ioctl(fDevice, B_GET_GEOMETRY, &geometry)) {
@@ -145,10 +151,9 @@
 }
 
 
-/** Returns the size of the device in bytes. It uses B_GET_GEOMETRY
- *	to compute the size, or fstat() if that failed.
- */
-
+/*!	Returns the size of the device in bytes. It uses B_GET_GEOMETRY
+	to compute the size, or fstat() if that failed.
+*/
 status_t
 DeviceOpener::GetSize(off_t *_size, uint32 *_blockSize)
 {
@@ -319,7 +324,7 @@
 	if (fDevice < B_OK)
 		RETURN_ERROR(fDevice);
 
-	if (opener.Mode() == O_RDONLY)
+	if (opener.IsReadOnly())
 		fFlags |= VOLUME_READ_ONLY;
 
 	// check if it's a regular file, and if so, disable the cache for the
@@ -513,8 +518,7 @@
 }
 
 
-/*!
-	Checks if there is a live query whose results depend on the presence
+/*!	Checks if there is a live query whose results depend on the presence
 	or value of the specified attribute.
 	Don't use it if you already have all the data together to evaluate
 	the queries - it wouldn't safe you anything in this case.
@@ -595,6 +599,9 @@
 	if (opener.Device() < B_OK)
 		return B_BAD_VALUE;
 
+	if (opener.IsReadOnly())
+		return B_READ_ONLY_DEVICE;
+
 	fDevice = opener.Device();
 
 	uint32 deviceBlockSize;



From umccullough at gmail.com  Mon Mar  3 00:30:59 2008
From: umccullough at gmail.com (Urias McCullough)
Date: Sun, 2 Mar 2008 15:30:59 -0800
Subject: [Haiku-commits] r24179 - in haiku/trunk: headers/build
	src/build/libhaikucompat
In-Reply-To: <34822732653-BeMail@zon>
References: <9612247463-BeMail@primary> <34822732653-BeMail@zon>
Message-ID: <1e80d8750803021530q4d58aab2g5ad02f7c2bb35343@mail.gmail.com>

On 02/03/2008, Axel D?rfler <axeld at pinc-software.de> wrote:
> "Michael Lotz" <mmlr at mlotz.ch> wrote:
>  > > > Log:
>  > > > Hopefully final build fix for Dano; at least I build everything
>  > > > with "-a" this time and it worked :-)
>  > It seems that this broke the build for BONE. I had to add the
>  > following
>  > to the libhaikucompat jamfile to get it to work again over here:
>  >
>  > if $(HOST_PLATFORM) = bone {
>  >       ObjectDefines $(libbePatchSources) :
>  >               USING_HAIKU_TYPE_CONSTANTS_H= ;
>  > }
>  >
>  > Which is the same as the one for Dano except for the "IMPEX_BE=" part
>  > as this generates a lot of redefinition warnings under BONE.
>
>
> Sorry! I currently don't have any working R5 around anymore; I guess I
>  need to set it up in VMware/Qemu to be able to continue to use it :-/
>  Can you commit this change?

Let me know if you need a VMWare image of BeOS Max V4b1 with vmware
drivers installed and latest gcc from bebits... I just built one
couple days ago for someone else. It doesn't work properly in VMWare
server 1.0.x, but does work great in vmware player 2.0.2


From revol at free.fr  Mon Mar  3 00:36:28 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Mon, 03 Mar 2008 00:36:28 +0100 CET
Subject: [Haiku-commits] r24201 - in haiku/trunk: . build/jam
In-Reply-To: <47CADEF0.3070607@zappotek.com>
Message-ID: <27014364638-BeMail@laptop>

> Urias McCullough a ?crit :
> > On 02/03/2008, Fran?ois Revol <revol at free.fr> wrote:
> >   
> >>>>  Rules and targets to build a boot CD iso... use:
> >>>>         
> >>  > >  jam haiku-boot-cd
> >>  >
> >>  > Ah cool! If you are planning to perfect this, please take 
> > > > ticket
> >>  > #1268. Can I try this already, or is it WIP?
> >>
> >> It builds an image, but I don't know if it would boot on real hw.
> >>  I tried in qemu (appending haiku.image to it and using qemu -cd 
> > > foo -
> >>  cdtoc 0,904 but I'm not sure it's how it works) but it gives the 
> > > boot
> >>  menu without anyway to continue.
> >>     
> >
> > I tried on real hardware. I got an error about no boot partitions, 
> > and
> > then the boot menu, but it couldn't find the image on the CD. It *
> > was*
> > able to find my HD Haiku partition and boot that.
> >   
> Same here! http://dev.haiku-os.org/ticket/1364 . It used to work 
> around 
> summer 2006 iirc though.

Ok, it's not loading the tgz data, need to see if it works on a CD 
(doesn't work with -fda & -cdrom).

Fran?ois.


From axeld at pinc-software.de  Mon Mar  3 00:41:25 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 03 Mar 2008 00:41:25 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24179_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/build_src/build/libhaikucompat?=
In-Reply-To: <1e80d8750803021530q4d58aab2g5ad02f7c2bb35343@mail.gmail.com>
Message-ID: <37728882644-BeMail@zon>

"Urias McCullough" <umccullough at gmail.com> wrote:
> On 02/03/2008, Axel D?rfler <axeld at pinc-software.de> wrote:
> > Sorry! I currently don't have any working R5 around anymore; I 
> > guess I
> >  need to set it up in VMware/Qemu to be able to continue to use it 
> > :-/
> >  Can you commit this change?
> Let me know if you need a VMWare image of BeOS Max V4b1 with vmware
> drivers installed and latest gcc from bebits... I just built one
> couple days ago for someone else. It doesn't work properly in VMWare
> server 1.0.x, but does work great in vmware player 2.0.2

Does it use BONE or net_server? In any way, such an image might be 
helpful, thanks! :-)

Bye,
   Axel.



From umccullough at gmail.com  Mon Mar  3 02:31:38 2008
From: umccullough at gmail.com (Urias McCullough)
Date: Sun, 2 Mar 2008 17:31:38 -0800
Subject: [Haiku-commits] r24179 - in haiku/trunk: headers/build
	src/build/libhaikucompat
In-Reply-To: <37728882644-BeMail@zon>
References: <1e80d8750803021530q4d58aab2g5ad02f7c2bb35343@mail.gmail.com>
	<37728882644-BeMail@zon>
Message-ID: <1e80d8750803021731h6456f1dclbc1fec14d1a0b058@mail.gmail.com>

On 02/03/2008, Axel D?rfler <axeld at pinc-software.de> wrote:
> "Urias McCullough" <umccullough at gmail.com> wrote:
>  > On 02/03/2008, Axel D?rfler <axeld at pinc-software.de> wrote:
>
> > > Sorry! I currently don't have any working R5 around anymore; I
>  > > guess I
>  > >  need to set it up in VMware/Qemu to be able to continue to use it
>  > > :-/
>  > >  Can you commit this change?
>  > Let me know if you need a VMWare image of BeOS Max V4b1 with vmware
>  > drivers installed and latest gcc from bebits... I just built one
>  > couple days ago for someone else. It doesn't work properly in VMWare
>  > server 1.0.x, but does work great in vmware player 2.0.2
>
>
> Does it use BONE or net_server? In any way, such an image might be
>  helpful, thanks! :-)

It's currently net_server...

I believe it also has the athlon patch applied, and the memory-limited
bootloader.

I will put it on a server and email you the URL privately (to keep my
bandwidth usage in check ;)


From jackburton at mail.berlios.de  Mon Mar  3 13:29:08 2008
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 3 Mar 2008 13:29:08 +0100
Subject: [Haiku-commits] r24213 - haiku/trunk/src/kits/interface
Message-ID: <200803031229.m23CT82b015530@sheep.berlios.de>

Author: jackburton
Date: 2008-03-03 13:29:07 +0100 (Mon, 03 Mar 2008)
New Revision: 24213
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24213&view=rev

Modified:
   haiku/trunk/src/kits/interface/Menu.cpp
Log:
x_offset -> xOffset


Modified: haiku/trunk/src/kits/interface/Menu.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Menu.cpp	2008-03-02 23:17:26 UTC (rev 24212)
+++ haiku/trunk/src/kits/interface/Menu.cpp	2008-03-03 12:29:07 UTC (rev 24213)
@@ -1641,28 +1641,28 @@
 			fSelected->Submenu()->Bounds());
 		fSelected->Submenu()->UnlockLooper();
 
-		float x_offset;
+		float xOffset;
 
 		// navAreaRectAbove and navAreaRectBelow have the same X
 		// position and width, so it doesn't matter which one we use to
 		// calculate the X offset
 		if (menuBounds.left < submenuBounds.left)
-			x_offset = position.x - navAreaRectAbove.left;
+			xOffset = position.x - navAreaRectAbove.left;
 		else
-			x_offset = navAreaRectAbove.right - position.x;
+			xOffset = navAreaRectAbove.right - position.x;
 
 		bool inNavArea;
 
 		if (inNavAreaRectAbove) {
-			float y_offset = navAreaRectAbove.bottom - position.y;
+			float yOffset = navAreaRectAbove.bottom - position.y;
 			float ratio = navAreaRectAbove.Width() / navAreaRectAbove.Height();
 
-			inNavArea = y_offset <= x_offset / ratio;
+			inNavArea = yOffset <= xOffset / ratio;
 		} else {
-			float y_offset = navAreaRectBelow.bottom - position.y;
+			float yOffset = navAreaRectBelow.bottom - position.y;
 			float ratio = navAreaRectBelow.Width() / navAreaRectBelow.Height();
 
-			inNavArea = y_offset >= (navAreaRectBelow.Height() - x_offset / ratio);
+			inNavArea = yOffset >= (navAreaRectBelow.Height() - xOffset / ratio);
 		}
 
 		bigtime_t systime = system_time();



From jackburton at mail.berlios.de  Mon Mar  3 13:41:06 2008
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 3 Mar 2008 13:41:06 +0100
Subject: [Haiku-commits] r24214 - haiku/trunk/src/kits/interface
Message-ID: <200803031241.m23Cf6Yn016872@sheep.berlios.de>

Author: jackburton
Date: 2008-03-03 13:41:05 +0100 (Mon, 03 Mar 2008)
New Revision: 24214
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24214&view=rev

Modified:
   haiku/trunk/src/kits/interface/TabView.cpp
Log:
patch by Andrea Anzani (with a few style modification by me) which 
enables tab (as BTab) switching via mouse wheel. Thanks!
 


Modified: haiku/trunk/src/kits/interface/TabView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TabView.cpp	2008-03-03 12:29:07 UTC (rev 24213)
+++ haiku/trunk/src/kits/interface/TabView.cpp	2008-03-03 12:41:05 UTC (rev 24214)
@@ -508,37 +508,68 @@
 void
 BTabView::MessageReceived(BMessage *message)
 {
-	if (message->what == B_GET_PROPERTY || message->what == B_SET_PROPERTY) {
-		BMessage reply(B_REPLY);
-		bool handled = false;
+	switch (message->what) {
+		case B_GET_PROPERTY:
+		case B_SET_PROPERTY:
+		{
+			BMessage reply(B_REPLY);
+			bool handled = false;
 
-		BMessage specifier;
-		int32 index;
-		int32 form;
-		const char *property;
-		if (message->GetCurrentSpecifier(&index, &specifier, &form, &property) == B_OK) {
-			if (strcmp(property, "Selection") == 0) {
-				if (message->what == B_GET_PROPERTY) {
-					reply.AddInt32("result", fSelection);
-					handled = true;
-				} else {
-					// B_GET_PROPERTY
-					int32 selection;
-					if (message->FindInt32("data", &selection) == B_OK) {
-						Select(selection);
-						reply.AddInt32("error", B_OK);
+			BMessage specifier;
+			int32 index;
+			int32 form;
+			const char *property;
+			if (message->GetCurrentSpecifier(&index, &specifier, &form, &property) == B_OK) {
+				if (strcmp(property, "Selection") == 0) {
+					if (message->what == B_GET_PROPERTY) {
+						reply.AddInt32("result", fSelection);
 						handled = true;
+					} else {
+						// B_GET_PROPERTY
+						int32 selection;
+						if (message->FindInt32("data", &selection) == B_OK) {
+							Select(selection);
+							reply.AddInt32("error", B_OK);
+							handled = true;
+						}
 					}
 				}
 			}
+			
+			if (handled)
+				message->SendReply(&reply);
+			else
+				BView::MessageReceived(message);
+			break;
 		}
 		
-		if (handled) {
-			message->SendReply(&reply);
-			return;
+		case B_MOUSE_WHEEL_CHANGED:
+		{
+			float deltaX = 0.0f;
+			float deltaY = 0.0f;
+			message->FindFloat("be:wheel_delta_x", &deltaX);
+			message->FindFloat("be:wheel_delta_y", &deltaY);
+			
+			if (deltaX == 0.0f && deltaY == 0.0f)
+				return;
+			
+			if (deltaY == 0.0f)
+				deltaY = deltaX;
+				
+			int32 selection = Selection();
+			int32 numTabs = CountTabs();
+			if (deltaY > 0  && selection < numTabs - 1) {
+				//move to the right tab.
+				Select(Selection() + 1);
+			} else if (deltaY < 0 && selection > 0 && numTabs > 1) {
+				//move to the left tab.
+				Select(selection - 1);
+			}
 		}
+		default:
+			BView::MessageReceived(message);
+			break;	
 	}
-	BView::MessageReceived(message);
 }
 
 



From axeld at mail.berlios.de  Mon Mar  3 15:55:38 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 3 Mar 2008 15:55:38 +0100
Subject: [Haiku-commits] r24215 -
	haiku/trunk/src/add-ons/kernel/drivers/audio/hda
Message-ID: <200803031455.m23EtcLi003202@sheep.berlios.de>

Author: axeld
Date: 2008-03-03 15:55:37 +0100 (Mon, 03 Mar 2008)
New Revision: 24215
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24215&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h
Log:
* Also print the codec's revision.
* Only print [Output] if it's an output.
* Further cleanup.


Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h	2008-03-03 12:41:05 UTC (rev 24214)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h	2008-03-03 14:55:37 UTC (rev 24215)
@@ -114,7 +114,7 @@
 	} d;
 };
 
-/*!	This structure describes a single Audio Function Group. An afg
+/*!	This structure describes a single Audio Function Group. An AFG
 	is a group of audio widgets which can be used to configure multiple
 	streams of audio either from the HDA Link to an output device (= playback)
 	or from an input device to the HDA link (= recording).

Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp	2008-03-03 12:41:05 UTC (rev 24214)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp	2008-03-03 14:55:37 UTC (rev 24215)
@@ -128,7 +128,8 @@
 	corb_t verb;
 	uint32 resp;
 
-	verb = MAKE_VERB(codec->addr, nodeID, VID_GET_PARAMETER, PID_OUTPUT_AMP_CAP);
+	verb = MAKE_VERB(codec->addr, nodeID, VID_GET_PARAMETER,
+		PID_OUTPUT_AMPLIFIER_CAP);
 	rc = hda_send_verbs(codec, &verb, &resp, 1);
 	if (rc == B_OK && resp != 0) {
 		dprintf("\tAMP: Mute: %s, step size: %ld, # steps: %ld, offset: %ld\n",
@@ -159,7 +160,7 @@
 	verbs[1] = MAKE_VERB(audioGroup->codec->addr, audioGroup->root_node_id,
 		VID_GET_PARAMETER, PID_GPIO_COUNT);
 	verbs[2] = MAKE_VERB(audioGroup->codec->addr, audioGroup->root_node_id,
-		VID_GET_PARAMETER, PID_SUBORD_NODE_COUNT);
+		VID_GET_PARAMETER, PID_SUBORDINATE_NODE_COUNT);
 
 	if (hda_send_verbs(audioGroup->codec, verbs, resp, 3) != B_OK)
 		return B_ERROR;
@@ -266,7 +267,7 @@
 
 					dprintf("\t%s%s\n", 
 						audioGroup->widgets[widx].d.pin.input ? "[Input] " : "",
-						audioGroup->widgets[widx].d.pin.input ? "[Output]" : "");
+						audioGroup->widgets[widx].d.pin.output ? "[Output]" : "");
 				} else {
 					dprintf("%s: Error getting Pin Complex IO\n", __func__);
 				}
@@ -451,6 +452,7 @@
 						audioGroup->widgets[i].inputs[inputIndex],
 						WT_AUDIO_OUTPUT, 0);
 				} else {
+					// find and select output widget
 					for (inputIndex = 0; (uint32)inputIndex
 							< audioGroup->widgets[i].num_inputs; inputIndex++) {
 						outputWidget = hda_codec_audio_group_find_path(audioGroup,
@@ -485,11 +487,12 @@
 						verb[0] = MAKE_VERB(codec->addr,
 							audioGroup->playback_stream->pin_widget,
 							VID_SET_AMPLIFIER_GAIN_MUTE,
-							(1 << 15) | (1 << 13) | (1 << 12));
+							AMP_SET_OUTPUT | AMP_SET_LEFT_CHANNEL
+								| AMP_SET_RIGHT_CHANNEL);
 						verb[1] = MAKE_VERB(codec->addr,
 							audioGroup->playback_stream->pin_widget,
 							VID_SET_PIN_WIDGET_CONTROL,
-							(1 << 7) | (1 << 6));
+							PIN_ENABLE_HEAD_PHONE | PIN_ENABLE_OUTPUT);
 						hda_send_verbs(codec, verb, NULL, 2);
 
 						dprintf("%s: Found output PIN (%s) connected to output "
@@ -507,6 +510,7 @@
 					audioGroup->widgets[i].inputs[inputIndex], WT_PIN_COMPLEX,
 					0);
 			} else {
+				// find and select input widget
 				for (inputIndex = 0; (uint32)inputIndex
 						< audioGroup->widgets[i].num_inputs; inputIndex++) {
 					inputWidget = hda_codec_audio_group_find_path(audioGroup,
@@ -541,9 +545,10 @@
 					verb = MAKE_VERB(codec->addr,
 						audioGroup->record_stream->pin_widget,
 						VID_SET_AMPLIFIER_GAIN_MUTE,
-						(1 << 15) | (1 << 13) | (1 << 12));
+						AMP_SET_INPUT | AMP_SET_LEFT_CHANNEL
+							| AMP_SET_RIGHT_CHANNEL);
 					hda_send_verbs(codec, &verb, NULL, 1);
-				}	
+				}
 
 				dprintf("%s: Found input PIN (%s) connected to input CONV "
 					"wid:%ld\n", __func__, kDefaultDevice[audioGroup->widgets[
@@ -571,74 +576,86 @@
 void
 hda_codec_delete(hda_codec* codec)
 {
-	if (codec == NULL) {
-		uint32 idx;
+	if (codec == NULL)
+		return;
 
-		delete_sem(codec->response_sem);
+	delete_sem(codec->response_sem);
 
-		for (idx = 0; idx < codec->num_audio_groups; idx++) {
-			hda_codec_delete_audio_group(codec->audio_groups[idx]);
-			codec->audio_groups[idx] = NULL;
-		}
+	for (uint32 i = 0; i < codec->num_audio_groups; i++) {
+		hda_codec_delete_audio_group(codec->audio_groups[i]);
+		codec->audio_groups[i] = NULL;
+	}
 
-		free(codec);
-	}
+	free(codec);
 }
 
 
 hda_codec*
-hda_codec_new(hda_controller* controller, uint32 cad)
+hda_codec_new(hda_controller* controller, uint32 codecAddress)
 {
+	if (codecAddress > HDA_MAX_CODECS)
+		return NULL;
+
 	hda_codec* codec = (hda_codec*)calloc(1, sizeof(hda_codec));
-	uint32 responses[3];
-	corb_t verbs[3];
-	uint32 nodeID;
-
 	if (codec == NULL)
-		goto exit_new;
+		return NULL;
 
 	codec->controller = controller;
-	codec->addr = cad;
+	codec->addr = codecAddress;
 	codec->response_sem = create_sem(0, "hda_codec_response_sem");
-	controller->codecs[cad] = codec;
+	controller->codecs[codecAddress] = codec;
 
-	verbs[0] = MAKE_VERB(cad, 0, VID_GET_PARAMETER, PID_VENDOR_ID);
-	verbs[1] = MAKE_VERB(cad, 0, VID_GET_PARAMETER, PID_REVISION_ID);
-	verbs[2] = MAKE_VERB(cad, 0, VID_GET_PARAMETER, PID_SUBORD_NODE_COUNT);
+	struct {
+		uint32 device : 16;
+		uint32 vendor : 16;
+		uint32 stepping : 8;
+		uint32 revision : 8;
+		uint32 minor : 4;
+		uint32 major : 4;
+		uint32 _reserved0 : 8;
+		uint32 count : 8;
+		uint32 _reserved1 : 8;
+		uint32 start : 8;
+		uint32 _reserved2 : 8;
+	} response;
+	corb_t verbs[3];
 
-	if (hda_send_verbs(codec, verbs, responses, 3) != B_OK)
-		goto cmd_failed;
+	verbs[0] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_VENDOR_ID);
+	verbs[1] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_REVISION_ID);
+	verbs[2] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER,
+		PID_SUBORDINATE_NODE_COUNT);
 
-	dprintf("Codec %ld Vendor: %04lx Product: %04lx\n",  
-		cad, responses[0] >> 16, responses[0] & 0xffff);
+	if (hda_send_verbs(codec, verbs, (uint32*)&response, 3) != B_OK)
+		goto err;
 
-	for (nodeID = responses[2] >> 16;
-			nodeID < (responses[2] >> 16) + (responses[2] & 0xff); nodeID++) {
-		uint32 resp;
-		verbs[0] = MAKE_VERB(cad, nodeID, VID_GET_PARAMETER,
+	dprintf("Codec %ld Vendor: %04lx Product: %04lx, Revision: "
+		"%lu.%lu.%lu.%lu\n", codecAddress, response.vendor, response.device,
+		response.major, response.minor, response.revision, response.stepping);
+
+	for (uint32 nodeID = response.start; nodeID < response.start
+			+ response.count; nodeID++) {
+		uint32 groupType;
+		verbs[0] = MAKE_VERB(codecAddress, nodeID, VID_GET_PARAMETER,
 			PID_FUNCTION_GROUP_TYPE);
 
-		if (hda_send_verbs(codec, verbs, &resp, 1) != B_OK)
-			goto cmd_failed;
+		if (hda_send_verbs(codec, verbs, &groupType, 1) != B_OK)
+			goto err;
 
-		if ((resp & 0xff) == 1) {
+		if ((groupType & 0xff) == 1) {
 			/* Found an Audio Function Group! */
-			status_t rc = hda_codec_new_audio_group(codec, nodeID);
-			if (rc != B_OK) {
-				dprintf("%s: Failed to setup new audio function group (%s)!\n",
-					__func__, strerror(rc));
-				goto cmd_failed;
+			status_t status = hda_codec_new_audio_group(codec, nodeID);
+			if (status != B_OK) {
+				dprintf("hda: Failed to setup new audio function group (%s)!\n",
+					strerror(status));
+				goto err;
 			}
 		}
 	}
 
-	goto exit_new;
+	return codec;
 
-cmd_failed:
-	controller->codecs[cad] = NULL;
+err:
+	controller->codecs[codecAddress] = NULL;
 	hda_codec_delete(codec);
-	codec = NULL;
-
-exit_new:
-	return codec;
+	return NULL;
 }

Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h	2008-03-03 12:41:05 UTC (rev 24214)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h	2008-03-03 14:55:37 UTC (rev 24215)
@@ -101,8 +101,8 @@
 #define VID_SET_GPIOSTICKY		0x71A00
 #define VID_GET_BEEPGEN			0xF0A00
 #define VID_SET_BEEPGEN			0x70A00
-#define VID_GET_VOLUMEKNOB		0xF0F00
-#define VID_SET_VOLUMEKNOB		0x70F00
+#define VID_GET_VOLUME_KNOB					0xf0f00
+#define VID_SET_VOLUME_KNOB					0x70f00
 #define VID_GET_SUBSYSTEMID		0xF2000
 #define VID_SET_SUBSYSTEMID1	0x72000
 #define VID_SET_SUBSYSTEMID2	0x72100
@@ -113,38 +113,62 @@
 #define VID_SET_CONFIGURATION_DEFAULT2		0x71d00
 #define VID_SET_CONFIGURATION_DEFAULT3		0x71e00
 #define VID_SET_CONFIGURATION_DEFAULT4		0x71f00
-#define VID_GET_STRIPECTRL		0xF2400
-#define VID_SET_STRIPECTRL		0x72000
-#define VID_FUNCTION_RESET		0x7FF00
+#define VID_GET_STRIPE_CONTROL				0xf2400
+#define VID_SET_STRIPE_CONTROL				0x72000
+#define VID_FUNCTION_RESET					0x7ff00
 
 /* Parameter IDs */
-#define PID_VENDOR_ID			0x00
-#define PID_REVISION_ID			0x02
-#define PID_SUBORD_NODE_COUNT	0x04
-#define PID_FUNCTION_GROUP_TYPE	0x05
-#define PID_AUDIO_GROUP_CAP		0x08
-#define PID_AUDIO_WIDGET_CAP	0x09
-#define PID_PCM_SUPPORT			0x0A
-#define PID_STREAM_SUPPORT		0x0B
-#define PID_PIN_CAP				0x0C
-#define PID_INPUT_AMP_CAP		0x0D
-#define PID_CONNECTION_LIST_LENGTH	0x0E
-#define PID_POWERSTATE_SUPPORT	0x0F
-#define PID_PROCESSING_CAP		0x10
-#define PID_GPIO_COUNT			0x11
-#define PID_OUTPUT_AMP_CAP		0x12
-#define PID_VOLUMEKNOB_CAP		0x13
+#define PID_VENDOR_ID				0x00
+#define PID_REVISION_ID				0x02
+#define PID_SUBORDINATE_NODE_COUNT	0x04
+#define PID_FUNCTION_GROUP_TYPE		0x05
+#define PID_AUDIO_GROUP_CAP			0x08
+#define PID_AUDIO_WIDGET_CAP		0x09
+#define PID_PCM_SUPPORT				0x0a
+#define PID_STREAM_SUPPORT			0x0b
+#define PID_PIN_CAP					0x0c
+#define PID_INPUT_AMPLIFIER_CAP		0x0d
+#define PID_CONNECTION_LIST_LENGTH	0x0e
+#define PID_POWERSTATE_SUPPORT		0x0f
+#define PID_PROCESSING_CAP			0x10
+#define PID_GPIO_COUNT				0x11
+#define PID_OUTPUT_AMPLIFIER_CAP	0x12
+#define PID_VOLUME_KNOB_CAP			0x13
 
 /* PCM support */
-#define PCM_8_BIT				(1L << 16)
-#define PCM_16_BIT				(1L << 17)
-#define PCM_20_BIT				(1L << 18)
-#define PCM_24_BIT				(1L << 19)
-#define PCM_32_BIT				(1L << 20)
+#define PCM_8_BIT					(1L << 16)
+#define PCM_16_BIT					(1L << 17)
+#define PCM_20_BIT					(1L << 18)
+#define PCM_24_BIT					(1L << 19)
+#define PCM_32_BIT					(1L << 20)
 
 /* stream support */
-#define STREAM_AC3				0x00000004
-#define STREAM_FLOAT			0x00000002
-#define STREAM_PCM				0x00000001
+#define STREAM_AC3					0x00000004
+#define STREAM_FLOAT				0x00000002
+#define STREAM_PCM					0x00000001
 
+/* Amplifier Gain/Mute */
+#define AMP_GET_OUTPUT				(1L << 15)
+#define AMP_GET_INPUT				(0L << 15)
+#define AMP_GET_LEFT_CHANNEL		(1L << 13)
+#define AMP_GET_RIGHT_CHANNEL		(0L << 13)
+#define AMP_GET_INPUT_INDEX_MASK	0x0000000f
+#define AMP_GET_INPUT_INDEX_SHIFT	0
+
+#define AMP_SET_OUTPUT				(1L << 15)
+#define AMP_SET_INPUT				(1L << 14)
+#define AMP_SET_LEFT_CHANNEL		(1L << 13)
+#define AMP_SET_RIGHT_CHANNEL		(1L << 12)
+#define AMP_SET_INPUT_INDEX_MASK	0x00000f00
+#define AMP_SET_INPUT_INDEX_SHIFT	8
+
+#define AMP_GAIN_MASK				0x0000007f
+#define AMP_MUTE					(1L << 8)
+
+/* Pin Widget Control */
+#define PIN_ENABLE_HEAD_PHONE		(1L << 7)
+#define PIN_ENABLE_OUTPUT			(1L << 6)
+#define PIN_ENABLE_INPUT			(1L << 5)
+#define PIN_ENABLE_VOLTAGE_REF_MASK	0x3
+
 #endif /* HDA_CODEC_H */



From stippi at mail.berlios.de  Mon Mar  3 21:58:17 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 3 Mar 2008 21:58:17 +0100
Subject: [Haiku-commits] r24216 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200803032058.m23KwHE8026686@sheep.berlios.de>

Author: stippi
Date: 2008-03-03 21:58:16 +0100 (Mon, 03 Mar 2008)
New Revision: 24216
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24216&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Added James Urquhart to the list of contributors.


Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-03 14:55:37 UTC (rev 24215)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-03 20:58:16 UTC (rev 24216)
@@ -452,6 +452,7 @@
 		"Daniel Switkin\n"
 		"Atsushi Takamatsu\n"
 		"Oliver Tappe\n"
+		"James Urquhart\n"
 		"Jason Vandermark\n"
 		"Sandor Vroemisse\n"
 		"Denis Washington\n"



From mmu_man at mail.berlios.de  Mon Mar  3 22:16:30 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Mon, 3 Mar 2008 22:16:30 +0100
Subject: [Haiku-commits] r24217 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200803032116.m23LGTCR028421@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-03 22:16:29 +0100 (Mon, 03 Mar 2008)
New Revision: 24217
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24217&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Added Rene Gollent to the list of contributors, how come we forgot ?


Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-03 20:58:16 UTC (rev 24216)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-03 21:16:29 UTC (rev 24217)
@@ -404,6 +404,7 @@
 		"Marc Flerackers\n"
 		"Daniel Furrer\n"
 		"Troeglazov Gerasim\n"
+		"Rene Gollent\n"
 		"Matthijs Hollemans\n"
 		"Morgan Howe\n"
 		"Erik Jaesler\n"



From superstippi at gmx.de  Mon Mar  3 23:07:11 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 03 Mar 2008 23:07:11 +0100
Subject: [Haiku-commits] r24217 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <200803032116.m23LGTCR028421@sheep.berlios.de>
References: <200803032116.m23LGTCR028421@sheep.berlios.de>
Message-ID: <20080303230711.15943.9@stippis2.1204533653.fake>


On 2008-03-03 at 22:16:30 [+0100], mmu_man at BerliOS 
<mmu_man at mail.berlios.de> wrote:
> Author: mmu_man
> Date: 2008-03-03 22:16:29 +0100 (Mon, 03 Mar 2008) New Revision: 24217
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24217&view=rev
> 
> Modified:
>    haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
> Log:
> Added Rene Gollent to the list of contributors, how come we forgot ?

Actually, it should be the Developers list. Anyone with commit access is a 
developer. :-)

Best regards,
-Stephan


From stippi at mail.berlios.de  Mon Mar  3 23:25:17 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 3 Mar 2008 23:25:17 +0100
Subject: [Haiku-commits] r24218 - haiku/trunk/src/build/libhaikucompat
Message-ID: <200803032225.m23MPH3c002451@sheep.berlios.de>

Author: stippi
Date: 2008-03-03 23:25:16 +0100 (Mon, 03 Mar 2008)
New Revision: 24218
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24218&view=rev

Modified:
   haiku/trunk/src/build/libhaikucompat/Jamfile
Log:
R5 host platform needs this too (for Haiku target platform).


Modified: haiku/trunk/src/build/libhaikucompat/Jamfile
===================================================================
--- haiku/trunk/src/build/libhaikucompat/Jamfile	2008-03-03 21:16:29 UTC (rev 24217)
+++ haiku/trunk/src/build/libhaikucompat/Jamfile	2008-03-03 22:25:16 UTC (rev 24218)
@@ -25,6 +25,10 @@
 		: [ FDirName $(HAIKU_TOP) headers build os support ] ;
 	ObjectSysHdrs $(libbePatchSources)
 		: [ FDirName $(HAIKU_TOP) headers build os storage ] ;
+	if $(HOST_PLATFORM) = r5 {
+		ObjectDefines $(libbePatchSources) :
+			USING_HAIKU_TYPE_CONSTANTS_H= ;
+	}
 	if $(HOST_PLATFORM) = bone {
 		ObjectDefines $(libbePatchSources) :
 			USING_HAIKU_TYPE_CONSTANTS_H= ;



From revol at free.fr  Mon Mar  3 23:46:55 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Mon, 03 Mar 2008 23:46:55 +0100 CET
Subject: [Haiku-commits] r24217 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <20080303230711.15943.9@stippis2.1204533653.fake>
Message-ID: <7496226254-BeMail@laptop>

> > Modified:
> >    haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
> > Log:
> > Added Rene Gollent to the list of contributors, how come we forgot 
> > ?
> 
> Actually, it should be the Developers list. Anyone with commit access 
> is a 
> developer. :-)

I was actually wondering as I didn't recall of a policy on that :)

Fran?ois.


From anevilyak at mail.berlios.de  Tue Mar  4 00:00:51 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 4 Mar 2008 00:00:51 +0100
Subject: [Haiku-commits] r24219 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200803032300.m23N0pCU005810@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-04 00:00:51 +0100 (Tue, 04 Mar 2008)
New Revision: 24219
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24219&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Corrected accent on name and moved it where stippi said :)


Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-03 22:25:16 UTC (rev 24218)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-03 23:00:51 UTC (rev 24219)
@@ -375,6 +375,7 @@
 		"Stefano Ceccherini\n"
 		"Rudolf Cornelissen\n"
 		"J?r?me Duval\n"
+		"Ren? Golllnt\n"
 		"Julun\n"
 		"Waldemar Kornewald\n"
 		"Ryan Leavengood\n"
@@ -404,7 +405,6 @@
 		"Marc Flerackers\n"
 		"Daniel Furrer\n"
 		"Troeglazov Gerasim\n"
-		"Rene Gollent\n"
 		"Matthijs Hollemans\n"
 		"Morgan Howe\n"
 		"Erik Jaesler\n"



From anevilyak at mail.berlios.de  Tue Mar  4 00:03:05 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 4 Mar 2008 00:03:05 +0100
Subject: [Haiku-commits] r24220 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200803032303.m23N35Er005962@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-04 00:03:04 +0100 (Tue, 04 Mar 2008)
New Revision: 24220
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24220&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Argh.



Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-03 23:00:51 UTC (rev 24219)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-03 23:03:04 UTC (rev 24220)
@@ -375,7 +375,7 @@
 		"Stefano Ceccherini\n"
 		"Rudolf Cornelissen\n"
 		"J?r?me Duval\n"
-		"Ren? Golllnt\n"
+		"Ren? Goollent\n"
 		"Julun\n"
 		"Waldemar Kornewald\n"
 		"Ryan Leavengood\n"



From anevilyak at mail.berlios.de  Tue Mar  4 00:06:47 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 4 Mar 2008 00:06:47 +0100
Subject: [Haiku-commits] r24221 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200803032306.m23N6lTw006342@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-04 00:06:46 +0100 (Tue, 04 Mar 2008)
New Revision: 24221
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24221&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Sorry about this, apparently my terminal kept getting confused by the UTF-8 char.



Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-03 23:03:04 UTC (rev 24220)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-03 23:06:46 UTC (rev 24221)
@@ -375,7 +375,7 @@
 		"Stefano Ceccherini\n"
 		"Rudolf Cornelissen\n"
 		"J?r?me Duval\n"
-		"Ren? Goollent\n"
+		"Ren? Gollent\n"
 		"Julun\n"
 		"Waldemar Kornewald\n"
 		"Ryan Leavengood\n"



From mmu_man at mail.berlios.de  Tue Mar  4 00:20:26 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Tue, 4 Mar 2008 00:20:26 +0100
Subject: [Haiku-commits] r24222 - haiku/trunk
Message-ID: <200803032320.m23NKQCB009105@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-04 00:20:26 +0100 (Tue, 04 Mar 2008)
New Revision: 24222
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24222&view=rev

Modified:
   haiku/trunk/ReadMe
Log:
Added info on how to create a CD.


Modified: haiku/trunk/ReadMe
===================================================================
--- haiku/trunk/ReadMe	2008-03-03 23:06:46 UTC (rev 24221)
+++ haiku/trunk/ReadMe	2008-03-03 23:20:26 UTC (rev 24222)
@@ -72,6 +72,28 @@
 Note that installing Haiku in a directory only works as expected under BeOS,
 but it is not yet supported under Linux and other non-BeOS platforms.
 
+Bootable CD-ROM Image
+---------------------
+
+* UNSUPPORTED yet *
+
+Creating a bootable CD requires burning 2 tracks on a single CD.
+The first track is an El-Torito bootable ISO file-system containing a boot 
+floppy image, and is created with:
+
+  jam -q haiku-boot-cd
+
+This generates an image file named 'haiku-boot-cd.iso' in your output directory
+under 'generated/'.
+The second track is the raw BFS image 'haiku.image' in 'generated/' created 
+with:
+
+  jam -q haiku-image
+
+Under Unix/Linux, and BeOS you can use cdrecord to create a CD with:
+
+  cdrecord dev=x,y,z -v -eject -dao -data generated/haiku-boot-cd.iso generated/haiku.image
+
 Building Components
 -------------------
 



From revol at free.fr  Tue Mar  4 00:24:06 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Tue, 04 Mar 2008 00:24:06 +0100 CET
Subject: [Haiku-commits] r24219 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <200803032300.m23N0pCU005810@sheep.berlios.de>
Message-ID: <351970671-BeMail@laptop>

> Author: anevilyak
> Date: 2008-03-04 00:00:51 +0100 (Tue, 04 Mar 2008)
> New Revision: 24219
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24219&view=rev
> 
> Modified:
>    haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
> Log:
> Corrected accent on name and moved it where stippi said :)
> 

I was wondering but I didn't see any accent elsewhere :p
> +		"Ren? Golllnt\n"

lll ?

Fran?ois.


From anevilyak at gmail.com  Tue Mar  4 00:30:26 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Mon, 3 Mar 2008 17:30:26 -0600
Subject: [Haiku-commits] r24219 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <351970671-BeMail@laptop>
References: <200803032300.m23N0pCU005810@sheep.berlios.de>
	<351970671-BeMail@laptop>
Message-ID: <f019d2f30803031530k669424b8oa8cf30bc6d020747@mail.gmail.com>

>  > +             "Ren? Golllnt\n"
>
>  lll ?
>
>  Fran?ois.


I fixed that, my terminal was set to 8859-1, moving the cursor around
would overwrite characters when I passed the UTF-8 char, my mistake.

Rene


From mmu_man at mail.berlios.de  Tue Mar  4 02:01:01 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Tue, 4 Mar 2008 02:01:01 +0100
Subject: [Haiku-commits] r24223 - haiku/trunk/build/jam
Message-ID: <200803040101.m24111vk005117@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-04 02:01:00 +0100 (Tue, 04 Mar 2008)
New Revision: 24223
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24223&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Reorder the list of boot modules by logical layer to make it easier to catch the missing ones.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2008-03-03 23:20:26 UTC (rev 24222)
+++ haiku/trunk/build/jam/HaikuImage	2008-03-04 01:01:00 UTC (rev 24223)
@@ -367,10 +367,14 @@
 AddFilesToHaikuImage beos system : zbeos ;
 
 # boot module links
-AddBootModuleSymlinksToHaikuImage config_manager bfs block_io fast_log
-	generic_ide_pci $(X86_ONLY)isa ide ide_adapter $(X86_ONLY)ide_isa intel
-	locked_pool $(PPC_ONLY)openpic pci scsi scsi_cd scsi_dsk scsi_periph
-	silicon_image_3112 legacy_sata ahci
+AddBootModuleSymlinksToHaikuImage 
+	pci $(X86_ONLY)isa config_manager ide scsi
+	$(PPC_ONLY)openpic
+	block_io fast_log ide_adapter locked_pool scsi_periph
+	ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata
+	scsi_cd scsi_dsk
+	intel
+	bfs
 ;
 
 # add-ons



From mmu_man at mail.berlios.de  Tue Mar  4 02:05:54 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Tue, 4 Mar 2008 02:05:54 +0100
Subject: [Haiku-commits] r24224 - haiku/trunk/build/jam
Message-ID: <200803040105.m2415spp005319@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-04 02:05:50 +0100 (Tue, 04 Mar 2008)
New Revision: 24224
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24224&view=rev

Modified:
   haiku/trunk/build/jam/FloppyBootImage
Log:
Reordered boot module list as well, it works much better when scsi_cd is here!
Added legacy_sata just in case.
At least now qemu finds the bfs track and tries to run Bootscript, but I get loads of ide timeouts so it ends up panicing anyway.


Modified: haiku/trunk/build/jam/FloppyBootImage
===================================================================
--- haiku/trunk/build/jam/FloppyBootImage	2008-03-04 01:01:00 UTC (rev 24223)
+++ haiku/trunk/build/jam/FloppyBootImage	2008-03-04 01:05:50 UTC (rev 24224)
@@ -43,7 +43,7 @@
 AddFilesToFloppyBootArchive beos system add-ons kernel busses agp_gart
 	: $(X86_ONLY)<agp_gart>intel ;
 AddFilesToFloppyBootArchive beos system add-ons kernel busses ide
-	: ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
+	: ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ;
 AddFilesToFloppyBootArchive beos system add-ons kernel console : vga_text ;
 AddFilesToFloppyBootArchive beos system add-ons kernel file_systems
 	: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
@@ -94,12 +94,13 @@
 # boot module links
 AddBootModuleSymlinksToFloppyBootArchive
 	$(BEOS_ADD_ONS_BUS_MANAGERS)
-	ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112
-	$(BEOS_ADD_ONS_FILE_SYSTEMS)
+	$(PPC_ONLY)openpic
 	block_io fast_log ide_adapter locked_pool scsi_periph
+	$(X86_ONLY)generic_x86
+	ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata
+	scsi_cd scsi_dsk
 	intel session
-	$(PPC_ONLY)openpic
-	$(X86_ONLY)generic_x86
+	$(BEOS_ADD_ONS_FILE_SYSTEMS)
 	$(BOOT_ADD_ONS_NET)
 ;
 



From anevilyak at mail.berlios.de  Tue Mar  4 02:19:05 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 4 Mar 2008 02:19:05 +0100
Subject: [Haiku-commits] r24225 - in haiku/trunk: headers/private/app
	src/servers/app
Message-ID: <200803040119.m241J5wq007335@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-04 02:19:04 +0100 (Tue, 04 Mar 2008)
New Revision: 24225
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24225&view=rev

Modified:
   haiku/trunk/headers/private/app/ServerReadOnlyMemory.h
   haiku/trunk/src/servers/app/DesktopSettings.cpp
Log:
App Server now saves/restores ui_color settings.



Modified: haiku/trunk/headers/private/app/ServerReadOnlyMemory.h
===================================================================
--- haiku/trunk/headers/private/app/ServerReadOnlyMemory.h	2008-03-04 01:05:50 UTC (rev 24224)
+++ haiku/trunk/headers/private/app/ServerReadOnlyMemory.h	2008-03-04 01:19:04 UTC (rev 24225)
@@ -20,6 +20,8 @@
 };
 
 
+// NOTE: these functions must be kept in sync with InterfaceDefs.h color_which!
+
 static inline int32
 color_which_to_index(color_which which)
 {
@@ -32,4 +34,17 @@
 	return -1;
 }
 
+static inline color_which
+index_to_color_which(int32 index)
+{
+	if (index >= 0 && index < kNumColors) {
+		if ((color_which)index < B_WINDOW_INACTIVE_TEXT_COLOR)
+			return (color_which)(index + 1);
+		else 
+			return (color_which)(index + B_SUCCESS_COLOR - B_WINDOW_INACTIVE_TEXT_COLOR);
+	}
+
+	return (color_which)-1;
+}
+
 #endif	/* SERVER_READ_ONLY_MEMORY_H */

Modified: haiku/trunk/src/servers/app/DesktopSettings.cpp
===================================================================
--- haiku/trunk/src/servers/app/DesktopSettings.cpp	2008-03-04 01:05:50 UTC (rev 24224)
+++ haiku/trunk/src/servers/app/DesktopSettings.cpp	2008-03-04 01:19:04 UTC (rev 24225)
@@ -216,6 +216,13 @@
 			bool triggersAlwaysShown;
 			if (settings.FindBool("triggers always shown", &triggersAlwaysShown) == B_OK)
 				fMenuInfo.triggers_always_shown = triggersAlwaysShown;
+			
+			char colorName[12];	
+			
+			for (int32 i = 0; i < kNumColors; i++) {
+				snprintf(colorName, sizeof(colorName), "color%ld", index_to_color_which(i));
+				settings.FindInt32(colorName, (int32*)&fShared.colors[i]);
+			}
 		}
 	}
 
@@ -313,8 +320,14 @@
 			settings.AddInt32("separator", fMenuInfo.separator);
 			settings.AddBool("click to open", fMenuInfo.click_to_open);
 			settings.AddBool("triggers always shown", fMenuInfo.triggers_always_shown);
-			// TODO: more appearance settings
 
+			char colorName[12];
+
+			for (int32 i = 0; i < kNumColors; i++) {
+				snprintf(colorName, sizeof(colorName), "color%ld", index_to_color_which(i));
+				settings.AddInt32(colorName, (const int32&)fShared.colors[i]);
+			}
+
 			BFile file;
 			status = file.SetTo(path.Path(), B_CREATE_FILE | B_ERASE_FILE | B_READ_WRITE);
 			if (status == B_OK) {



From anevilyak at mail.berlios.de  Tue Mar  4 02:21:00 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 4 Mar 2008 02:21:00 +0100
Subject: [Haiku-commits] r24226 - in haiku/trunk/src: kits/interface
	servers/registrar
Message-ID: <200803040121.m241L022007543@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-04 02:21:00 +0100 (Tue, 04 Mar 2008)
New Revision: 24226
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24226&view=rev

Modified:
   haiku/trunk/src/kits/interface/Alert.cpp
   haiku/trunk/src/servers/registrar/ShutdownProcess.cpp
Log:
The registrar's shutdown window and BAlert both use
a BTextView in order to be able to display multiline
panel text (since BStringView can't handle this). However,
while they correctly set the background panel color, they
neglected to set the font style/color to that used by panel.
Fixed. This makes shutdown/restart dialogs properly color sensitive.




Modified: haiku/trunk/src/kits/interface/Alert.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Alert.cpp	2008-03-04 01:19:04 UTC (rev 24225)
+++ haiku/trunk/src/kits/interface/Alert.cpp	2008-03-04 01:21:00 UTC (rev 24226)
@@ -533,6 +533,8 @@
 		textViewRect.OffsetByCopy(B_ORIGIN),
 		B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW);
 	fTextView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+	rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
+	fTextView->SetFontAndColor(be_plain_font, B_FONT_ALL, &textColor);
 	fTextView->SetText(text, strlen(text));
 	fTextView->MakeEditable(false);
 	fTextView->MakeSelectable(false);

Modified: haiku/trunk/src/servers/registrar/ShutdownProcess.cpp
===================================================================
--- haiku/trunk/src/servers/registrar/ShutdownProcess.cpp	2008-03-04 01:19:04 UTC (rev 24225)
+++ haiku/trunk/src/servers/registrar/ShutdownProcess.cpp	2008-03-04 01:21:00 UTC (rev 24226)
@@ -264,6 +264,8 @@
 		if (!fTextView)
 			return B_NO_MEMORY;
 		fTextView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+		rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
+		fTextView->SetFontAndColor(be_plain_font, B_FONT_ALL, &textColor);
 		fTextView->MakeEditable(false);
 		fTextView->MakeSelectable(false);
 		fTextView->SetWordWrap(true);



From anevilyak at mail.berlios.de  Tue Mar  4 02:43:57 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 4 Mar 2008 02:43:57 +0100
Subject: [Haiku-commits] r24227 -
	haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon
Message-ID: <200803040143.m241hvn6009190@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-04 02:43:56 +0100 (Tue, 04 Mar 2008)
New Revision: 24227
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24227&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/detect.c
Log:
Add R430 (aka X800XL) to DMA blacklist, as it currently doesn't draw correctly with the DMA engine enabled (change 
suggested by Euan Kirkhope, pending him figuring out what's causing that problem).



Modified: haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/detect.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/detect.c	2008-03-04 01:21:00 UTC (rev 24226)
+++ haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/detect.c	2008-03-04 01:43:56 UTC (rev 24227)
@@ -632,7 +632,8 @@
 				// rs410                  
 				case DEVICE_ID_RS410_5a61:
 				case DEVICE_ID_RS410_5a62:
-				                          
+				// r430
+				case DEVICE_ID_RADEON_UM:	                          
 				// rs480                  
 				case DEVICE_ID_RS480_5954:
 				case DEVICE_ID_RS480_5955:



From anevilyak at mail.berlios.de  Tue Mar  4 07:08:22 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 4 Mar 2008 07:08:22 +0100
Subject: [Haiku-commits] r24228 - haiku/trunk/src/kits/app
Message-ID: <200803040608.m2468Mp8000615@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-04 07:08:20 +0100 (Tue, 04 Mar 2008)
New Revision: 24228
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24228&view=rev

Modified:
   haiku/trunk/src/kits/app/Message.cpp
Log:
Fixed a crash that would happen sometimes with BInvoker: If an invoker was
set up with a null replyTo, sometimes BMessage would crash 
calling IsSourceWaiting() after delivering the message. This appeared
to be because fHeader was NULL, but I'm not entirely certain if this
is actually supposed to be possible, so this may be masking a different
bug. This was observable using the multiline paste spam BAlert in
Vision, which would sometimes but not always crash in Haiku after hitting
any of the buttons to dismiss it, though consistently when calling IsSourceWaiting()
from the private BMessage::_SendMessage().



Modified: haiku/trunk/src/kits/app/Message.cpp
===================================================================
--- haiku/trunk/src/kits/app/Message.cpp	2008-03-04 01:43:56 UTC (rev 24227)
+++ haiku/trunk/src/kits/app/Message.cpp	2008-03-04 06:08:20 UTC (rev 24228)
@@ -613,7 +613,7 @@
 BMessage::IsSourceWaiting() const
 {
 	DEBUG_FUNCTION_ENTER;
-	return (fHeader->flags & MESSAGE_FLAG_REPLY_REQUIRED)
+	return fHeader && (fHeader->flags & MESSAGE_FLAG_REPLY_REQUIRED)
 		&& !(fHeader->flags & MESSAGE_FLAG_REPLY_DONE);
 }
 
@@ -622,7 +622,7 @@
 BMessage::IsSourceRemote() const
 {
 	DEBUG_FUNCTION_ENTER;
-	return (fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED)
+	return fHeader && (fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED)
 		&& (fHeader->reply_team != BPrivate::current_team());
 }
 



From stefano.ceccherini at gmail.com  Tue Mar  4 08:45:42 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Tue, 4 Mar 2008 08:45:42 +0100
Subject: [Haiku-commits] r24224 - haiku/trunk/build/jam
In-Reply-To: <200803040105.m2415spp005319@sheep.berlios.de>
References: <200803040105.m2415spp005319@sheep.berlios.de>
Message-ID: <894b9700803032345u679a5638x253774fdb63ef3ae@mail.gmail.com>

2008/3/4, mmu_man at BerliOS <mmu_man at mail.berlios.de>:
> Author: mmu_man
>  Date: 2008-03-04 02:05:50 +0100 (Tue, 04 Mar 2008)
>  New Revision: 24224
>  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24224&view=rev
>
>  Modified:
>    haiku/trunk/build/jam/FloppyBootImage
>  Log:
>  Reordered boot module list as well, it works much better when scsi_cd is here!
>  Added legacy_sata just in case.
>  At least now qemu finds the bfs track and tries to run Bootscript, but I get loads of ide timeouts so it ends up panicing anyway.

Tried disabling ide dma ?


From dlmcpaul at mail.berlios.de  Tue Mar  4 10:55:49 2008
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Tue, 4 Mar 2008 10:55:49 +0100
Subject: [Haiku-commits] r24229 - in
	haiku/trunk/src/add-ons/media/plugins/mp4_reader: . libMP4
Message-ID: <200803040955.m249tnRP001372@sheep.berlios.de>

Author: dlmcpaul
Date: 2008-03-04 10:55:49 +0100 (Tue, 04 Mar 2008)
New Revision: 24229
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24229&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4FileReader.cpp
   haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4FileReader.h
   haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4Parser.cpp
   haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4Parser.h
   haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4TrakAtom.cpp
   haiku/trunk/src/add-ons/media/plugins/mp4_reader/mp4_reader.cpp
Log:
changes for aac decoder

Modified: haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4FileReader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4FileReader.cpp	2008-03-04 06:08:20 UTC (rev 24228)
+++ haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4FileReader.cpp	2008-03-04 09:55:49 UTC (rev 24229)
@@ -275,15 +275,25 @@
 uint32
 MP4FileReader::getAudioFrameCount(uint32 streamIndex)
 {
-	if (IsAudio(streamIndex)) {
-		return uint32(((getAudioDuration(streamIndex)
-			* AudioFormat(streamIndex)->SampleRate) / 1000000L) + 0.5);
-	}
+	AtomBase *aAtomBase = GetChildAtom(uint32('trak'), streamIndex);
 
-	return 0;
+	if (aAtomBase && dynamic_cast<TRAKAtom *>(aAtomBase)->IsAudio())
+		return dynamic_cast<TRAKAtom *>(aAtomBase)->FrameCount();
+
+	return 1;
 }
 
+uint32
+MP4FileReader::getAudioChunkCount(uint32 streamIndex)
+{
+	AtomBase *aAtomBase = GetChildAtom(uint32('trak'), streamIndex);
 
+	if (aAtomBase && dynamic_cast<TRAKAtom *>(aAtomBase)->IsAudio())
+		return dynamic_cast<TRAKAtom *>(aAtomBase)->getTotalChunks();
+	
+	return 0;
+}
+
 bool
 MP4FileReader::IsVideo(uint32 streamIndex)
 {
@@ -329,24 +339,19 @@
 
 
 uint32
-MP4FileReader::getNoFramesInChunk(uint32 stream_index, uint32 pFrameNo)
+MP4FileReader::getNoFramesInChunk(uint32 streamIndex, uint32 pFrameNo)
 {
 	// Find Track
-	AtomBase *aAtomBase = GetChildAtom(uint32('trak'),stream_index);
+	AtomBase *aAtomBase = GetChildAtom(uint32('trak'),streamIndex);
 	if (aAtomBase) {
 		TRAKAtom *aTrakAtom = dynamic_cast<TRAKAtom *>(aAtomBase);
 		uint32 ChunkNo = 1;
 
-		if (IsAudio(stream_index))
-			ChunkNo = pFrameNo;
+		uint32 SampleNo = aTrakAtom->getSampleForFrame(pFrameNo);
 
-		if (IsVideo(stream_index)) {
-			uint32 SampleNo = aTrakAtom->getSampleForFrame(pFrameNo);
+		uint32 OffsetInChunk;
+		ChunkNo = aTrakAtom->getChunkForSample(SampleNo, &OffsetInChunk);
 
-			uint32 OffsetInChunk;
-			ChunkNo = aTrakAtom->getChunkForSample(SampleNo, &OffsetInChunk);
-		}
-
 		return aTrakAtom->getNoSamplesInChunk(ChunkNo);
 	}
 	
@@ -355,48 +360,38 @@
 
 
 uint64
-MP4FileReader::getOffsetForFrame(uint32 stream_index, uint32 pFrameNo)
+MP4FileReader::getOffsetForFrame(uint32 streamIndex, uint32 pFrameNo)
 {
 	// Find Track
-	AtomBase *aAtomBase = GetChildAtom(uint32('trak'),stream_index);
+	AtomBase *aAtomBase = GetChildAtom(uint32('trak'),streamIndex);
 	if (aAtomBase) {
 		TRAKAtom *aTrakAtom = dynamic_cast<TRAKAtom *>(aAtomBase);
 
-		if (IsAudio(stream_index)) {
-			// FrameNo is really chunk No for audio
-			uint32 ChunkNo = pFrameNo;
-
+		if (pFrameNo < aTrakAtom->FrameCount()) {
+			// Get Sample for Frame
+			uint32 SampleNo = aTrakAtom->getSampleForFrame(pFrameNo);
+			// Get Chunk For Sample and the offset for the frame within that chunk
+			uint32 OffsetInChunk;
+			uint32 ChunkNo = aTrakAtom->getChunkForSample(SampleNo, &OffsetInChunk);
 			// Get Offset For Chunk
-			return aTrakAtom->getOffsetForChunk(ChunkNo);
-		}
+			uint64 OffsetNo = aTrakAtom->getOffsetForChunk(ChunkNo);
 
-		if (IsVideo(stream_index)) {
-			if (pFrameNo < aTrakAtom->FrameCount()) {
-				// Get Sample for Frame
-				uint32 SampleNo = aTrakAtom->getSampleForFrame(pFrameNo);
-				// Get Chunk For Sample and the offset for the frame within that chunk
-				uint32 OffsetInChunk;
-				uint32 ChunkNo = aTrakAtom->getChunkForSample(SampleNo, &OffsetInChunk);
-				// Get Offset For Chunk
-				uint64 OffsetNo = aTrakAtom->getOffsetForChunk(ChunkNo);
-
-				if (ChunkNo != 0) {
-					uint32 SizeForSample;
-					// Adjust the Offset for the Offset in the chunk
-					if (aTrakAtom->IsSingleSampleSize()) {
-						SizeForSample = aTrakAtom->getSizeForSample(SampleNo);
-						OffsetNo = OffsetNo + (OffsetInChunk * SizeForSample);
-					} else {
-						// This is bad news performance wise
-						for (uint32 i=1;i<=OffsetInChunk;i++) {
-							SizeForSample = aTrakAtom->getSizeForSample(SampleNo-i);
-							OffsetNo = OffsetNo + SizeForSample;
-						}
+			if (ChunkNo != 0) {
+				uint32 SizeForSample;
+				// Adjust the Offset for the Offset in the chunk
+				if (aTrakAtom->IsSingleSampleSize()) {
+					SizeForSample = aTrakAtom->getSizeForSample(SampleNo);
+					OffsetNo = OffsetNo + (OffsetInChunk * SizeForSample);
+				} else {
+					// This is bad news performance wise
+					for (uint32 i=1;i<=OffsetInChunk;i++) {
+						SizeForSample = aTrakAtom->getSizeForSample(SampleNo-i);
+						OffsetNo = OffsetNo + SizeForSample;
 					}
 				}
-		
-				return OffsetNo;
 			}
+		
+			return OffsetNo;
 		}
 	}
 
@@ -476,10 +471,10 @@
 
 
 const AudioMetaData *
-MP4FileReader::AudioFormat(uint32 stream_index, size_t *size)
+MP4FileReader::AudioFormat(uint32 streamIndex, size_t *size)
 {
-	if (IsAudio(stream_index)) {
-		AtomBase *aAtomBase = GetChildAtom(uint32('trak'),stream_index);
+	if (IsAudio(streamIndex)) {
+		AtomBase *aAtomBase = GetChildAtom(uint32('trak'),streamIndex);
 
 		if (aAtomBase) {
 			TRAKAtom *aTrakAtom = dynamic_cast<TRAKAtom *>(aAtomBase);
@@ -496,7 +491,7 @@
 				theAudio.NoOfChannels = aAudioDescription.theAudioSampleEntry.ChannelCount;
 				theAudio.SampleSize = aAudioDescription.theAudioSampleEntry.SampleSize;
 				theAudio.SampleRate = aAudioDescription.theAudioSampleEntry.SampleRate / 65536;	// Convert from fixed point decimal to float
-				theAudio.PacketSize = uint32((theAudio.SampleRate * theAudio.NoOfChannels * theAudio.SampleSize) / 8);
+				theAudio.PacketSize = uint32((theAudio.SampleSize * theAudio.NoOfChannels * 1024) / 8);
 
 				theAudio.theVOL = aAudioDescription.theVOL;
 				theAudio.VOLSize = aAudioDescription.VOLSize;
@@ -509,12 +504,11 @@
 	return NULL;
 }
 
-
 const VideoMetaData*
-MP4FileReader::VideoFormat(uint32 stream_index)
+MP4FileReader::VideoFormat(uint32 streamIndex)
 {
-	if (IsVideo(stream_index)) {
-		AtomBase *aAtomBase = GetChildAtom(uint32('trak'),stream_index);
+	if (IsVideo(streamIndex)) {
+		AtomBase *aAtomBase = GetChildAtom(uint32('trak'),streamIndex);
 
 		if (aAtomBase) {
 			TRAKAtom *aTrakAtom = dynamic_cast<TRAKAtom *>(aAtomBase);
@@ -556,26 +550,26 @@
 
 
 const mp4_stream_header*
-MP4FileReader::StreamFormat(uint32 stream_index)
+MP4FileReader::StreamFormat(uint32 streamIndex)
 {
 	// Fill In a Stream Header
 	theStreamHeader.length = 0;
 	
-	if (IsActive(stream_index) == false) {
+	if (IsActive(streamIndex) == false) {
 		return NULL;
 	}
 
-	if (IsVideo(stream_index)) {
-		theStreamHeader.rate = uint32(1000000L*VideoFormat(stream_index)->FrameRate);
+	if (IsVideo(streamIndex)) {
+		theStreamHeader.rate = uint32(1000000L*VideoFormat(streamIndex)->FrameRate);
 		theStreamHeader.scale = 1000000L;
-		theStreamHeader.length = getVideoFrameCount(stream_index);
+		theStreamHeader.length = getVideoFrameCount(streamIndex);
 	}
 
-	if (IsAudio(stream_index)) {
-		theStreamHeader.rate = uint32(AudioFormat(stream_index)->SampleRate);
+	if (IsAudio(streamIndex)) {
+		theStreamHeader.rate = uint32(AudioFormat(streamIndex)->SampleRate);
 		theStreamHeader.scale = 1;
-		theStreamHeader.length = getAudioFrameCount(stream_index);
-		theStreamHeader.sample_size = AudioFormat(stream_index)->SampleSize;
+		theStreamHeader.length = getAudioFrameCount(streamIndex);
+		theStreamHeader.sample_size = AudioFormat(streamIndex)->SampleSize;
 		theStreamHeader.suggested_buffer_size =	theStreamHeader.rate * theStreamHeader.sample_size;
 	}
 
@@ -584,28 +578,16 @@
 
 
 uint32
-MP4FileReader::getChunkSize(uint32 stream_index, uint32 pFrameNo)
+MP4FileReader::getChunkSize(uint32 streamIndex, uint32 pFrameNo)
 {
-	AtomBase *aAtomBase = GetChildAtom(uint32('trak'),stream_index);
+	AtomBase *aAtomBase = GetChildAtom(uint32('trak'),streamIndex);
 	if (aAtomBase) {
 		TRAKAtom *aTrakAtom = dynamic_cast<TRAKAtom *>(aAtomBase);
 
-		if (IsAudio(stream_index)) {
-			// We read audio in chunk by chunk so chunk size is chunk size
-			uint32	ChunkNo 	= pFrameNo;
-			off_t	Chunk_Start = aTrakAtom->getOffsetForChunk(ChunkNo);
-			uint32	ChunkSize 	= theChunkSuperIndex.getChunkSize(stream_index,ChunkNo,Chunk_Start);
-
-			return ChunkSize;
+		if (pFrameNo < aTrakAtom->FrameCount()) {
+			uint32 SampleNo = aTrakAtom->getSampleForFrame(pFrameNo);
+			return aTrakAtom->getSizeForSample(SampleNo);
 		}
-
-		if (IsVideo(stream_index)) {
-			if (pFrameNo < aTrakAtom->FrameCount()) {
-				// We read video in Sample by Sample so we use get Sample Size
-				uint32 SampleNo = aTrakAtom->getSampleForFrame(pFrameNo);
-				return aTrakAtom->getSizeForSample(SampleNo);
-			}
-		}
 	}
 
 	return 0;
@@ -613,9 +595,9 @@
 
 
 bool
-MP4FileReader::IsKeyFrame(uint32 stream_index, uint32 pFrameNo)
+MP4FileReader::IsKeyFrame(uint32 streamIndex, uint32 pFrameNo)
 {
-	AtomBase *aAtomBase = GetChildAtom(uint32('trak'),stream_index);
+	AtomBase *aAtomBase = GetChildAtom(uint32('trak'),streamIndex);
 	if (aAtomBase) {
 		TRAKAtom *aTrakAtom = dynamic_cast<TRAKAtom *>(aAtomBase);
 
@@ -628,14 +610,14 @@
 
 
 bool
-MP4FileReader::GetNextChunkInfo(uint32 stream_index, uint32 pFrameNo,
+MP4FileReader::GetNextChunkInfo(uint32 streamIndex, uint32 pFrameNo,
 	off_t *start, uint32 *size, bool *keyframe)
 {
-	*start = getOffsetForFrame(stream_index, pFrameNo);
-	*size = getChunkSize(stream_index, pFrameNo);
+	*start = getOffsetForFrame(streamIndex, pFrameNo);
+	*size = getChunkSize(streamIndex, pFrameNo);
 
 	if ((*start > 0) && (*size > 0)) {
-		*keyframe = IsKeyFrame(stream_index, pFrameNo);
+		*keyframe = IsKeyFrame(streamIndex, pFrameNo);
 	}
 
 	// TODO need a better method for detecting End of Data Note ChunkSize of 0 seems to be it.
@@ -645,9 +627,9 @@
 
 
 bool
-MP4FileReader::IsActive(uint32 stream_index)
+MP4FileReader::IsActive(uint32 streamIndex)
 {
-	AtomBase *aAtomBase = GetChildAtom(uint32('trak'),stream_index);
+	AtomBase *aAtomBase = GetChildAtom(uint32('trak'),streamIndex);
 	if (aAtomBase) {
 		TRAKAtom *aTrakAtom = dynamic_cast<TRAKAtom *>(aAtomBase);
 		return aTrakAtom->IsActive();

Modified: haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4FileReader.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4FileReader.h	2008-03-04 06:08:20 UTC (rev 24228)
+++ haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4FileReader.h	2008-03-04 09:55:49 UTC (rev 24229)
@@ -81,45 +81,47 @@
 	// Duration defined by the movie header
 	bigtime_t	getMovieDuration();
 	
-	// The first video track duration indexed by stream_index
-	bigtime_t	getVideoDuration(uint32 stream_index);
-	// the first audio track duration indexed by stream_index
-	bigtime_t	getAudioDuration(uint32 stream_index);
+	// The first video track duration indexed by streamIndex
+	bigtime_t	getVideoDuration(uint32 streamIndex);
+	// the first audio track duration indexed by streamIndex
+	bigtime_t	getAudioDuration(uint32 streamIndex);
 	// the max of all active audio or video durations
 	bigtime_t	getMaxDuration();
 
-	// The no of frames in the video track indexed by stream_index
-	uint32		getVideoFrameCount(uint32 stream_index);
-	// The no of frames in the audio track indexed by stream_index
-	uint32		getAudioFrameCount(uint32 stream_index);
-
+	// The no of frames in the video track indexed by streamIndex
+	// 1 frame = 1 chunk
+	uint32		getVideoFrameCount(uint32 streamIndex);
+	// The no of frames in the audio track indexed by streamIndex
+	uint32		getAudioFrameCount(uint32 streamIndex);
+	// The no of chunks in the audio track indexed by streamIndex
+	uint32		getAudioChunkCount(uint32 streamIndex);
 	// Is stream (track) a video track
-	bool		IsVideo(uint32 stream_index);
+	bool		IsVideo(uint32 streamIndex);
 	// Is stream (track) a audio track
-	bool		IsAudio(uint32 stream_index);
+	bool		IsAudio(uint32 streamIndex);
 
-	uint32	getNoFramesInChunk(uint32 stream_index, uint32 pFrameNo);
-	uint32	getFirstFrameInChunk(uint32 stream_index, uint32 pChunkID);
+	uint32	getNoFramesInChunk(uint32 streamIndex, uint32 pFrameNo);
+	uint32	getFirstFrameInChunk(uint32 streamIndex, uint32 pChunkID);
 
-	uint64	getOffsetForFrame(uint32 stream_index, uint32 pFrameNo);
-	uint32	getChunkSize(uint32 stream_index, uint32 pFrameNo);
-	bool	IsKeyFrame(uint32 stream_index, uint32 pFrameNo);
+	uint64	getOffsetForFrame(uint32 streamIndex, uint32 pFrameNo);
+	uint32	getChunkSize(uint32 streamIndex, uint32 pFrameNo);
+	bool	IsKeyFrame(uint32 streamIndex, uint32 pFrameNo);
 
 	status_t	ParseFile();
 	BPositionIO *Source() {return theStream;};
 
-	bool	IsActive(uint32 stream_index);
+	bool	IsActive(uint32 streamIndex);
 
-	bool	GetNextChunkInfo(uint32 stream_index, uint32 pFrameNo, off_t *start, uint32 *size, bool *keyframe);
+	bool	GetNextChunkInfo(uint32 streamIndex, uint32 pFrameNo, off_t *start, uint32 *size, bool *keyframe);
 	
 	// Return all Audio Meta Data
-	const 	AudioMetaData 		*AudioFormat(uint32 stream_index, size_t *size = 0);
+	const 	AudioMetaData 		*AudioFormat(uint32 streamIndex, size_t *size = 0);
 	// Return all Video Meta Data
-	const 	VideoMetaData		*VideoFormat(uint32 stream_index);
+	const 	VideoMetaData		*VideoFormat(uint32 streamIndex);
 	
 	// XXX these need work
 	const 	mp4_main_header		*MovMainHeader();
-	const 	mp4_stream_header	*StreamFormat(uint32 stream_index);
+	const 	mp4_stream_header	*StreamFormat(uint32 streamIndex);
 };
 
 #endif

Modified: haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4Parser.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4Parser.cpp	2008-03-04 06:08:20 UTC (rev 24228)
+++ haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4Parser.cpp	2008-03-04 09:55:49 UTC (rev 24229)
@@ -209,7 +209,7 @@
 
 char *MOOVAtom::OnGetAtomName()
 {
-	return "Quicktime Movie";
+	return "MPEG-4 Movie";
 }
 
 CMOVAtom::CMOVAtom(BPositionIO *pStream, off_t pstreamOffset, uint32 patomType, uint64 patomSize) : AtomContainer(pStream, pstreamOffset, patomType, patomSize)
@@ -322,7 +322,7 @@
 
 char *CMOVAtom::OnGetAtomName()
 {
-	return "Compressed Quicktime Movie";
+	return "Compressed MPEG-4 Movie";
 }
 
 DCOMAtom::DCOMAtom(BPositionIO *pStream, off_t pstreamOffset, uint32 patomType, uint64 patomSize) : AtomBase(pStream, pstreamOffset, patomType, patomSize)
@@ -438,7 +438,7 @@
 
 char *MVHDAtom::OnGetAtomName()
 {
-	return "Quicktime Movie Header";
+	return "MPEG-4 Movie Header";
 }
 
 MVHDAtom *MOOVAtom::getMVHDAtom()
@@ -908,7 +908,7 @@
 	return 0LL;
 }
 
-ESDSAtom::ESDSAtom(BPositionIO *pStream, off_t pstreamOffset, uint32 patomType, uint64 patomSize) : AtomBase(pStream, pstreamOffset, patomType, patomSize)
+ESDSAtom::ESDSAtom(BPositionIO *pStream, off_t pstreamOffset, uint32 patomType, uint64 patomSize) : FullAtom(pStream, pstreamOffset, patomType, patomSize)
 {
 	theVOL = NULL;
 }
@@ -920,17 +920,118 @@
 	}
 }
 
+bool ESDSAtom::SkipTag(uint8 Tag, uint32 *offset) {
+	uint8 byte;
+
+	byte = theVOL[(*offset)++];
+	if (byte == Tag) {
+		uint8 numBytes = 0;
+		unsigned int length = 0;
+
+		do {
+			byte = theVOL[(*offset)++];
+			numBytes++;
+			length = (length << 7) | (byte & 0x7F);
+		} while ((byte & 0x80) && numBytes < 4);
+
+	} else {
+		// go back Tag not found
+		(*offset)--;
+		printf("No Tag %d\n",Tag);
+		return false;
+	}
+	
+	return true;
+}
+
 void ESDSAtom::OnProcessMetaData()
 {
-	theVOL = (uint8 *)(malloc(getBytesRemaining()));
-	Read(theVOL,getBytesRemaining());
+	FullAtom::OnProcessMetaData();
+
+	VOLSize = getBytesRemaining();
+	uint32 offset = 0;
+	
+	theVOL = (uint8 *)(malloc(VOLSize));
+	Read(theVOL,VOLSize);
+	
+	// Display the VOL
+	if (VOLSize > 0) {
+		if (SkipTag(0x03,&offset)) {
+			offset += 3;
+		} else {
+			offset += 2;
+		}
+
+		if (SkipTag(0x04,&offset)) {
+			printf("type id is %d", theVOL[offset]);
+			switch (theVOL[offset]) {
+				case 1: printf("system v1"); break;
+				case 2: printf("system v2"); break;
+				case 32: printf("MPEG-4 video"); break;
+				case 33: printf("MPEG-4 AVC SPS"); break;
+				case 34: printf("MPEG-4 AVC PPS"); break;
+				case 64: printf("MPEG-4 audio"); break;
+			}
+			
+			offset+=2;
+			
+			uint32 a,b,c;
+			uint32 buff;
+			
+			a = theVOL[offset];
+			b = theVOL[offset+1];
+			c = theVOL[offset+2];
+
+			buff = (a << 16) | (b << 8) | c;
+
+			printf(" buf size %ld ",buff);
+			printf(" max bit rate %ld",uint32(theVOL[offset+4]));
+			printf(" avg bit rate %ld\n",uint32(theVOL[offset+8]));
+		}
+	} else {
+		printf("VOL size is 0\n");
+	}
+	
 }
 
-uint8 *ESDSAtom::getVOL()
+size_t ESDSAtom::getVOLSize(bool forAudio) 
 {
-	return theVOL;
+	uint32 offset = 0;
+	if (forAudio) {
+		if (SkipTag(0x03,&offset)) {
+			offset += 3;
+		} else {
+			offset += 2;
+		}
+		if (SkipTag(0x04,&offset)) {
+			offset += 13;
+		}
+
+		SkipTag(0x05,&offset);
+	}
+	
+	return ( VOLSize - offset);
 }
 
+uint8 *ESDSAtom::getVOL(bool forAudio)
+{
+	uint32 offset = 0;
+	if (forAudio) {
+		if (SkipTag(0x03,&offset)) {
+			offset += 3;
+		} else {
+			offset += 2;
+		}
+		if (SkipTag(0x04,&offset)) {
+			offset += 13;
+		}
+
+		SkipTag(0x05,&offset);
+	}
+	
+	return &theVOL[offset];
+}
+
 char *ESDSAtom::OnGetAtomName()
 {
 	return "Extended Sample Description Atom";
@@ -961,7 +1062,7 @@
 	return dynamic_cast<STBLAtom *>(getParent())->getMediaHandlerType();
 }
 
-void STSDAtom::ReadESDS(uint8 **VOL, size_t *VOLSize)
+void STSDAtom::ReadESDS(uint8 **VOL, size_t *VOLSize, bool forAudio)
 {
 	// Check for a esds and if it exists read it into the VOL buffer
 	// MPEG-4 video/audio use the esds to store the VOL (STUPID COMMITTEE IDEA)
@@ -976,9 +1077,9 @@
 
 		if (dynamic_cast<ESDSAtom *>(aAtomBase)) {
 			// ESDS atom good
-			*VOLSize = aAtomBase->getDataSize();
+			*VOLSize = dynamic_cast<ESDSAtom *>(aAtomBase)->getVOLSize(forAudio);
 			*VOL = (uint8 *)(malloc(*VOLSize));
-			memcpy(*VOL,dynamic_cast<ESDSAtom *>(aAtomBase)->getVOL(),*VOLSize);
+			memcpy(*VOL,dynamic_cast<ESDSAtom *>(aAtomBase)->getVOL(forAudio),*VOLSize);
 
 			delete aAtomBase;
 		} else {
@@ -997,8 +1098,8 @@
 	Read(&theAudioDescription.theAudioSampleEntry.pre_defined);
 	Read(&theAudioDescription.theAudioSampleEntry.reserved);
 	Read(&theAudioDescription.theAudioSampleEntry.SampleRate);
-
-	ReadESDS(&theAudioDescription.theVOL,&theAudioDescription.VOLSize);
+	
+	ReadESDS(&theAudioDescription.theVOL,&theAudioDescription.VOLSize,true);
 }
 
 void STSDAtom::ReadVideoDescription()
@@ -1028,7 +1129,7 @@
 	Read(&theVideoDescription.theVideoSampleEntry.Depth);
 	Read(&theVideoDescription.theVideoSampleEntry.pre_defined3);
 
-	ReadESDS(&theVideoDescription.theVOL,&theVideoDescription.VOLSize);
+	ReadESDS(&theVideoDescription.theVOL,&theVideoDescription.VOLSize, false);
 }
 
 void STSDAtom::OnProcessMetaData()
@@ -1253,7 +1354,7 @@
 
 char *MINFAtom::OnGetAtomName()
 {
-	return "Quicktime Media Information Atom";
+	return "MPEG-4 Media Information Atom";
 }
 
 uint32 MINFAtom::getMediaHandlerType()
@@ -1275,7 +1376,7 @@
 
 char *STBLAtom::OnGetAtomName()
 {
-	return "Quicktime Sample Table Atom";
+	return "MPEG-4 Sample Table Atom";
 }
 
 uint32 STBLAtom::getMediaHandlerType()
@@ -1297,7 +1398,7 @@
 
 char *DINFAtom::OnGetAtomName()
 {
-	return "Quicktime Data Information Atom";
+	return "MPEG-4 Data Information Atom";
 }
 
 TKHDAtom::TKHDAtom(BPositionIO *pStream, off_t pstreamOffset, uint32 patomType, uint64 patomSize) : FullAtom(pStream, pstreamOffset, patomType, patomSize)
@@ -1371,7 +1472,7 @@
 
 char *TKHDAtom::OnGetAtomName()
 {
-	return "Quicktime Track Header";
+	return "MPEG-4 Track Header";
 }
 
 MDIAAtom::MDIAAtom(BPositionIO *pStream, off_t pstreamOffset, uint32 patomType, uint64 patomSize) : AtomContainer(pStream, pstreamOffset, patomType, patomSize)
@@ -1388,7 +1489,7 @@
 
 char *MDIAAtom::OnGetAtomName()
 {
-	return "Quicktime Media Atom";
+	return "MPEG-4 Media Atom";
 }
 
 uint32 MDIAAtom::getMediaHandlerType()
@@ -1443,7 +1544,7 @@
 
 char *MDHDAtom::OnGetAtomName()
 {
-	return "Quicktime Media Header";
+	return "MPEG-4 Media Header";
 }
 
 bigtime_t	MDHDAtom::getDuration() 
@@ -1486,7 +1587,7 @@
 char *HDLRAtom::OnGetAtomName()
 {
 	printf("%s %s:",(char *)&(theHeader.handler_type),name);
-	return "Quicktime Handler Reference Atom ";
+	return "MPEG-4 Handler Reference Atom ";
 }
 
 bool HDLRAtom::IsVideoHandler()
@@ -1524,7 +1625,7 @@
 
 char *VMHDAtom::OnGetAtomName()
 {
-	return "Quicktime Video Media Header";
+	return "MPEG-4 Video Media Header";
 }
 
 SMHDAtom::SMHDAtom(BPositionIO *pStream, off_t pstreamOffset, uint32 patomType, uint64 patomSize) : FullAtom(pStream, pstreamOffset, patomType, patomSize)
@@ -1545,5 +1646,5 @@
 
 char *SMHDAtom::OnGetAtomName()
 {
-	return "Quicktime Sound Media Header";
+	return "MPEG-4 Sound Media Header";
 }

Modified: haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4Parser.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4Parser.h	2008-03-04 06:08:20 UTC (rev 24228)
+++ haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4Parser.h	2008-03-04 09:55:49 UTC (rev 24229)
@@ -300,16 +300,19 @@
 	off_t	getEOF();
 };
 
-class ESDSAtom : public AtomBase {
+class ESDSAtom : public FullAtom {
 public:
 			ESDSAtom(BPositionIO *pStream, off_t pstreamOffset, uint32 patomType, uint64 patomSize);
 	virtual	~ESDSAtom();
 	void	OnProcessMetaData();
 	char	*OnGetAtomName();
 	
-	uint8	*getVOL();
+	uint8	*getVOL(bool forAudio);
+	size_t	getVOLSize(bool forAudio);
 private:
+	bool SkipTag(uint8 Tag, uint32 *offset);
 	uint8	*theVOL;
+	size_t	VOLSize;
 };
 
 // Atom class for reading the sdst atom
@@ -326,7 +329,7 @@
 private:
 	uint32	getMediaHandlerType();
 
-	void	ReadESDS(uint8 **VOL, size_t *VOLSize);
+	void	ReadESDS(uint8 **VOL, size_t *VOLSize, bool forAudio);
 	void	ReadSoundDescription();
 	void	ReadVideoDescription();
 

Modified: haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4TrakAtom.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4TrakAtom.cpp	2008-03-04 06:08:20 UTC (rev 24228)
+++ haiku/trunk/src/add-ons/media/plugins/mp4_reader/libMP4/MP4TrakAtom.cpp	2008-03-04 09:55:49 UTC (rev 24229)
@@ -42,7 +42,7 @@
 
 char *TRAKAtom::OnGetAtomName()
 {
-	return "Quicktime Track Atom";
+	return "MPEG-4 Track Atom";
 }
 
 TKHDAtom	*TRAKAtom::getTKHDAtom()

Modified: haiku/trunk/src/add-ons/media/plugins/mp4_reader/mp4_reader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/mp4_reader/mp4_reader.cpp	2008-03-04 06:08:20 UTC (rev 24228)
+++ haiku/trunk/src/add-ons/media/plugins/mp4_reader/mp4_reader.cpp	2008-03-04 09:55:49 UTC (rev 24229)
@@ -421,31 +421,56 @@
 		format->user_data_type = B_CODEC_TYPE_INFO;
 		*(uint32 *)format->user_data = description.u.quicktime.codec; format->user_data[4] = 0;
 		
-		format->u.encoded_video.max_bit_rate = 8 * theFileReader->MovMainHeader()->max_bytes_per_sec;
-		format->u.encoded_video.avg_bit_rate = format->u.encoded_video.max_bit_rate / 2; // XXX fix this
+//		format->u.encoded_video.max_bit_rate = 8 * theFileReader->MovMainHeader()->max_bytes_per_sec;
+//		format->u.encoded_video.avg_bit_rate = format->u.encoded_video.max_bit_rate / 2; // XXX fix this
 		format->u.encoded_video.output.field_rate = cookie->frames_per_sec_rate / (float)cookie->frames_per_sec_scale;
+
+		format->u.encoded_video.avg_bit_rate = 1;
+		format->u.encoded_video.max_bit_rate = 1;
+
+		format->u.encoded_video.frame_size = video_format->width * video_format->height * video_format->planes / 8;
+		format->u.encoded_video.output.display.bytes_per_row = video_format->planes / 8 * video_format->width;
+		// align to 2 bytes
+		format->u.encoded_video.output.display.bytes_per_row +=	format->u.encoded_video.output.display.bytes_per_row & 1;
+
+		switch (video_format->planes) {
+			case 16:
+				format->u.encoded_video.output.display.format = B_RGB15_BIG;
+				break;
+			case 24:
+				format->u.encoded_video.output.display.format = B_RGB24_BIG;
+				break;
+			case 32:
+				format->u.encoded_video.output.display.format = B_RGB32_BIG;
+				break;
+			default:
+				format->u.encoded_video.output.display.format = B_NO_COLOR_SPACE;
+				format->u.encoded_video.frame_size = video_format->width * video_format->height * 8 / 8;
+		}
+
+		format->u.encoded_video.output.display.line_width = video_format->width;
+		format->u.encoded_video.output.display.line_count = video_format->height;
+		format->u.encoded_video.output.display.pixel_offset = 0;
+		format->u.encoded_video.output.display.line_offset = 0;
+		format->u.encoded_video.output.display.flags = 0;
 		format->u.encoded_video.output.interlace = 1; // 1: progressive
 		format->u.encoded_video.output.first_active = 0;
-		format->u.encoded_video.output.last_active = cookie->line_count - 1;
+		format->u.encoded_video.output.last_active = format->u.encoded_video.output.display.line_count - 1;
 		format->u.encoded_video.output.orientation = B_VIDEO_TOP_LEFT_RIGHT;
 		format->u.encoded_video.output.pixel_width_aspect = 1;
 		format->u.encoded_video.output.pixel_height_aspect = 1;
-		// format->u.encoded_video.output.display.format = 0;
-		format->u.encoded_video.output.display.line_width = theFileReader->MovMainHeader()->width;
-		format->u.encoded_video.output.display.line_count = cookie->line_count;
-		format->u.encoded_video.output.display.bytes_per_row = 0; // format->u.encoded_video.output.display.line_width * 4;
-		format->u.encoded_video.output.display.pixel_offset = 0;
-		format->u.encoded_video.output.display.line_offset = 0;
-		format->u.encoded_video.output.display.flags = 0;
 		
 		TRACE("max_bit_rate %.3f\n", format->u.encoded_video.max_bit_rate);
 		TRACE("field_rate   %.3f\n", format->u.encoded_video.output.field_rate);
 
 		// Set the VOL
 		if (video_format->VOLSize > 0) {
+			TRACE("VOL Found Size is %ld\n",video_format->VOLSize);
 			size_t size = video_format->VOLSize;
 			const void *data = video_format->theVOL;
-			format->SetMetaData(data, size);
+			if (format->SetMetaData(data, size) != B_OK) {
+				printf("Failed to set VOL\n %d %d",(16 << 20),32000);
+			}
 
 #ifdef TRACE_MP4_READER
 			if (data) {
@@ -485,8 +510,17 @@
 	*frameCount = cookie->frame_count;
 	*duration = cookie->duration;
 	*format = cookie->format;
-	*infoBuffer = 0;
-	*infoSize = 0;
+
+	// Copy metadata to infoBuffer
+	if (theFileReader->IsVideo(cookie->stream)) {
+		const VideoMetaData *video_format = theFileReader->VideoFormat(cookie->stream);
+		*infoBuffer = video_format->theVOL;
+		*infoSize = video_format->VOLSize;
+	} else {
+		const AudioMetaData *audio_format = theFileReader->AudioFormat(cookie->stream);
+		*infoBuffer = audio_format->theVOL;
+		*infoSize = audio_format->VOLSize;
+	}
 	return B_OK;
 }
 
@@ -578,6 +612,8 @@
 		mediaHeader->u.encoded_video.field_flags = keyframe ? B_MEDIA_KEY_FRAME : 0;
 		mediaHeader->u.encoded_video.first_active_line = 0;
 		mediaHeader->u.encoded_video.line_count = cookie->line_count;
+		mediaHeader->u.encoded_video.field_number = 0;
+		mediaHeader->u.encoded_video.field_sequence = cookie->frame_pos;
 	
 		cookie->frame_pos++;
 	}



From revol at free.fr  Tue Mar  4 11:46:05 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Tue, 04 Mar 2008 11:46:05 +0100 CET
Subject: [Haiku-commits] r24224 - haiku/trunk/build/jam
In-Reply-To: <894b9700803032345u679a5638x253774fdb63ef3ae@mail.gmail.com>
Message-ID: <2517951514-BeMail@laptop>

> 2008/3/4, mmu_man at BerliOS <mmu_man at mail.berlios.de>:
> > Author: mmu_man
> >  Date: 2008-03-04 02:05:50 +0100 (Tue, 04 Mar 2008)
> >  New Revision: 24224
> >  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24224&view=rev
> >
> >  Modified:
> >    haiku/trunk/build/jam/FloppyBootImage
> >  Log:
> >  Reordered boot module list as well, it works much better when 
> > scsi_cd is here!
> >  Added legacy_sata just in case.
> >  At least now qemu finds the bfs track and tries to run Bootscript, 
> > but I get loads of ide timeouts so it ends up panicing anyway.
> 
> Tried disabling ide dma ?

Didn't help much, dont call the bios maybe...
Still some timeouts at the beginning but it goes ok then.

Fran?ois.


From mmlr at mlotz.ch  Tue Mar  4 12:44:48 2008
From: mmlr at mlotz.ch (Michael Lotz)
Date: Tue, 4 Mar 2008 12:44:48 +0100
Subject: [Haiku-commits] r24228 - haiku/trunk/src/kits/app
In-Reply-To: <200803040608.m2468Mp8000615@sheep.berlios.de>
References: <200803040608.m2468Mp8000615@sheep.berlios.de>
Message-ID: <20080304113447.M87610@mlotz.ch>

On Tue, 4 Mar 2008 07:08:22 +0100, anevilyak at BerliOS wrote
> Author: anevilyak
> Date: 2008-03-04 07:08:20 +0100 (Tue, 04 Mar 2008)
> New Revision: 24228
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24228&view=rev
> 
> Modified:
>    haiku/trunk/src/kits/app/Message.cpp
> Log:
> Fixed a crash that would happen sometimes with BInvoker: If an 
> invoker was set up with a null replyTo, sometimes BMessage would 
> crash calling IsSourceWaiting() after delivering the message. This appeared
> to be because fHeader was NULL, but I'm not entirely certain if this
> is actually supposed to be possible, so this may be masking a different
> bug. This was observable using the multiline paste spam BAlert in
> Vision, which would sometimes but not always crash in Haiku after hitting
> any of the buttons to dismiss it, though consistently when calling 
> IsSourceWaiting() from the private BMessage::_SendMessage().

This definitely hides some other bug. The fHeader field must _always_ be
valid. And from quickly reviewing the code paths it also is always initialized
correctly after being cleared. There are some possibilities: a thread safety
issue, corruption of the message data or usage of a destroyed BMessage object.
I'd tend to the first or the last. As there is no locking involved it could
easily be a thread safety issue that happens when a BMessage is shared by
multiple threads that do not properly synchronize themselves. I am not sure
the R5 BMessage is thread safe, and I don't know if it should be at all. I
thought I had read somewhere that it is not thread safe, but I can't find that
source anymore. Anyway, I will look into it and try reproducing using the
steps you mentioned above. Thanks for the pointers!

Regards
Michael


From bga at bug-br.org.br  Tue Mar  4 12:58:02 2008
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Tue, 04 Mar 2008 08:58:02 -0300
Subject: [Haiku-commits] r24217 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <20080303230711.15943.9@stippis2.1204533653.fake>
References: <200803032116.m23LGTCR028421@sheep.berlios.de>
	<20080303230711.15943.9@stippis2.1204533653.fake>
Message-ID: <47CD394A.9090405@bug-br.org.br>

Stephan Assmus wrote:

> Actually, it should be the Developers list. Anyone with commit access is a 
> developer. :-)

Except for me, right? :P

-Bruno



From mmu_man at mail.berlios.de  Tue Mar  4 13:28:23 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Tue, 4 Mar 2008 13:28:23 +0100
Subject: [Haiku-commits] r24230 - in haiku/trunk/3rdparty: . nero
Message-ID: <200803041228.m24CSNm7026079@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-04 13:28:22 +0100 (Tue, 04 Mar 2008)
New Revision: 24230
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24230&view=rev

Added:
   haiku/trunk/3rdparty/nero/
   haiku/trunk/3rdparty/nero/haiku-cd.cue
Log:
Added a cue file for windows users to make a CD.


Added: haiku/trunk/3rdparty/nero/haiku-cd.cue
===================================================================
--- haiku/trunk/3rdparty/nero/haiku-cd.cue	2008-03-04 09:55:49 UTC (rev 24229)
+++ haiku/trunk/3rdparty/nero/haiku-cd.cue	2008-03-04 12:28:22 UTC (rev 24230)
@@ -0,0 +1,8 @@
+FILE "haiku-boot-cd.iso" BINARY
+TRACK 01 MODE1/2048
+INDEX 01 00:00:00
+POSTGAP 00:02:00
+FILE "haiku.image" BINARY
+TRACK 02 MODE1/2048
+INDEX 01 00:00:00
+POSTGAP 00:02:00



From mmu_man at mail.berlios.de  Tue Mar  4 13:32:07 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Tue, 4 Mar 2008 13:32:07 +0100
Subject: [Haiku-commits] r24231 - haiku/trunk
Message-ID: <200803041232.m24CW7Yn004639@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-04 13:32:07 +0100 (Tue, 04 Mar 2008)
New Revision: 24231
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24231&view=rev

Modified:
   haiku/trunk/ReadMe
Log:
* note on dev id for cdrecord.
* note about cue file.


Modified: haiku/trunk/ReadMe
===================================================================
--- haiku/trunk/ReadMe	2008-03-04 12:28:22 UTC (rev 24230)
+++ haiku/trunk/ReadMe	2008-03-04 12:32:07 UTC (rev 24231)
@@ -94,6 +94,11 @@
 
   cdrecord dev=x,y,z -v -eject -dao -data generated/haiku-boot-cd.iso generated/haiku.image
 
+Here x,y,z is the device number as found with cdrecord -scanbus, it can also 
+be a device path on Linux.
+
+Windows users will find '3rdparty/nero/haiku-cd.cue' useful.
+
 Building Components
 -------------------
 



From superstippi at gmx.de  Tue Mar  4 13:33:29 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 04 Mar 2008 13:33:29 +0100
Subject: [Haiku-commits] r24217 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <47CD394A.9090405@bug-br.org.br>
References: <200803032116.m23LGTCR028421@sheep.berlios.de>
	<20080303230711.15943.9@stippis2.1204533653.fake>
	<47CD394A.9090405@bug-br.org.br>
Message-ID: <20080304133329.34458.23@stippis2.1204533653.fake>


On 2008-03-04 at 12:58:02 [+0100], Bruno Albuquerque <bga at bug-br.org.br> 
wrote:
> Stephan Assmus wrote:
> 
> > Actually, it should be the Developers list. Anyone with commit access 
> > is a developer. :-)
> 
> Except for me, right? :P

Actually... see my forthcomming commit. I went through the list and tried 
to fix the About list to the best of my knowledge.

But there are a couple of people on the list on Berlios who have not 
contributed in quite a while (IIRC, please forgive me any blunders):

Andrew Bachmann
Alexander G. M. Smith
Daniel Furrer
Bryan Varner
Greg Crain
Nathan Whitehorn
Gabe Yoder
Waldemar Kornewald

Bryan and Andrew are known to be active with Java, so I think they should 
just stay in it. Waldemar left the project, but left before and came back, 
I don't know about this time, but at least he was active in Trac very 
recently. And as for yourself, BGA, you do the occasional commit (so you 
should definitely keep acces IMHO), but what about being able to spend 20% 
of your work time at Google on a project of your choice? That's one day per 
week! :-P

Best regards,
-Stephan


From axeld at mail.berlios.de  Tue Mar  4 13:36:53 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 4 Mar 2008 13:36:53 +0100
Subject: [Haiku-commits] r24232 - haiku/trunk/src/system/kernel
Message-ID: <200803041236.m24CarBV005044@sheep.berlios.de>

Author: axeld
Date: 2008-03-04 13:36:53 +0100 (Tue, 04 Mar 2008)
New Revision: 24232
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24232&view=rev

Modified:
   haiku/trunk/src/system/kernel/elf.cpp
Log:
* unload_elf_image() never unloaded any image because the ref_count
  check was wrong (never gets below zero if everything goes as 
  intended).
* Removed erroneous white space.


Modified: haiku/trunk/src/system/kernel/elf.cpp
===================================================================
--- haiku/trunk/src/system/kernel/elf.cpp	2008-03-04 12:32:07 UTC (rev 24231)
+++ haiku/trunk/src/system/kernel/elf.cpp	2008-03-04 12:36:53 UTC (rev 24232)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2002-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001, Travis Geiselbrecht. All rights reserved.
@@ -107,7 +107,7 @@
 	imageInfo.id = image->id;
 	imageInfo.type = B_SYSTEM_IMAGE;
 	strlcpy(imageInfo.name, image->name, sizeof(imageInfo.name));
-	
+
 	imageInfo.text = (void *)image->text_region.start;
 	imageInfo.text_size = image->text_region.size;
 	imageInfo.data = (void *)image->data_region.start;
@@ -144,7 +144,7 @@
 }
 
 
-static int 
+static int
 dump_address_info(int argc, char **argv)
 {
 	const char *symbol, *imageName;
@@ -273,7 +273,7 @@
 	if (argc > 1) {
 		if (isdigit(argv[1][0])) {
 			uint32 num = strtoul(argv[1], NULL, 0);
-	
+
 			if (IS_KERNEL_ADDRESS(num)) {
 				// find image at address
 
@@ -284,7 +284,7 @@
 						break;
 				}
 				hash_close(sImagesHash, &iterator, false);
-	
+
 				if (image == NULL)
 					kprintf("No image covers 0x%lx in the kernel!\n", num);
 			} else {
@@ -669,13 +669,13 @@
 elf_unlink_relocs(struct elf_image_info *image)
 {
 	elf_linked_image *link, *next_link;
-	
+
 	for (link = image->linked_images; link; link = next_link) {
 		next_link = link->next;
 		elf_unload_image(link->image);
 		free(link);
 	}
-	
+
 	return B_NO_ERROR;
 }
 #endif
@@ -684,9 +684,11 @@
 static status_t
 unload_elf_image(struct elf_image_info *image)
 {
-	if (atomic_add(&image->ref_count, -1) > 0)
-		return B_NO_ERROR;
+	if (atomic_add(&image->ref_count, -1) > 1)
+		return B_OK;
 
+	TRACE(("unload image %ld, %s\n", image->id, image->name));
+
 	//elf_unlink_relocs(image);
 		// not yet used
 
@@ -699,7 +701,7 @@
 	unregister_elf_image(image);
 
 	free(image->elf_header);
-	free(image->name);	
+	free(image->name);
 	free(image);
 
 	return B_NO_ERROR;
@@ -904,7 +906,7 @@
 		// the tables referred to by the .dynamic section, also contain proper names
 		// and sizes for those symbols. Therefore, to get completely satisfying
 		// results, we would need to read those tables from the shared object.
-	
+
 		// get the image for the address
 		image_t image;
 		status_t error = _FindImageAtAddress(address, image);
@@ -928,7 +930,7 @@
 		Elf32_Sym symbolFound;
 		addr_t deltaFound = INT_MAX;
 		bool exactMatch = false;
-	
+
 		for (uint32 i = 0; i < hashTabSize; i++) {
 			uint32 bucket;
 			if (!_Read(&hashBuckets[i], bucket))
@@ -936,11 +938,11 @@
 
 			for (uint32 j = bucket; j != STN_UNDEF;
 					_Read(&hashChains[j], j) ? 0 : j = STN_UNDEF) {
-	
+
 				Elf32_Sym symbol;
 				if (!_Read(image.syms + j, symbol))
 					continue;
-	
+
 				// The symbol table contains not only symbols referring to functions
 				// and data symbols within the shared object, but also referenced
 				// symbols of other shared objects, as well as section and file
@@ -955,17 +957,17 @@
 						> textRegion.vmstart + textRegion.size) {
 					continue;
 				}
-	
+
 				// skip symbols starting after the given address
 				addr_t symbolAddress = symbol.st_value + textRegion.delta;
 				if (symbolAddress > address)
 					continue;
 				addr_t symbolDelta = address - symbolAddress;
-	
+
 				if (symbolDelta < deltaFound) {
 					deltaFound = symbolDelta;
 					symbolFound = symbol;
-	
+
 					if (symbolDelta >= 0 && symbolDelta < symbol.st_size) {
 						// exact match
 						exactMatch = true;
@@ -974,10 +976,10 @@
 				}
 			}
 		}
-	
+
 		if (_imageName)
 			*_imageName = fImageName;
-	
+
 		if (_symbolName) {
 			*_symbolName = NULL;
 
@@ -991,17 +993,17 @@
 				}
 			}
 		}
-	
+
 		if (_baseAddress) {
 			if (deltaFound < INT_MAX)
 				*_baseAddress = symbolFound.st_value + textRegion.delta;
 			else
 				*_baseAddress = textRegion.vmstart;
 		}
-	
+
 		if (_exactMatch)
 			*_exactMatch = exactMatch;
-	
+
 		return B_OK;
 	}
 
@@ -1024,7 +1026,7 @@
 
 			imageAddress = image.next;
 		}
-	
+
 		return B_ENTRY_NOT_FOUND;
 	}
 
@@ -1093,7 +1095,7 @@
 
 	// ToDo: support the "sclass" parameter!
 
-	TRACE(("found: %lx (%lx + %lx)\n", symbol->st_value + image->text_region.delta, 
+	TRACE(("found: %lx (%lx + %lx)\n", symbol->st_value + image->text_region.delta,
 		symbol->st_value, image->text_region.delta));
 
 	*_symbol = (void *)(symbol->st_value + image->text_region.delta);
@@ -1712,14 +1714,14 @@
 
 	mutex_lock(&sImageLoadMutex);
 	mutex_lock(&sImageMutex);
-	
+
 	image = find_image(id);
 	if (image != NULL)
 		status = unload_elf_image(image);
 	else
 		status = B_BAD_IMAGE_ID;
 
-	mutex_unlock(&sImageMutex);	
+	mutex_unlock(&sImageMutex);
 	mutex_unlock(&sImageLoadMutex);
 
 	return status;



From stippi at mail.berlios.de  Tue Mar  4 13:41:45 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 4 Mar 2008 13:41:45 +0100
Subject: [Haiku-commits] r24233 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200803041241.m24CfjTJ005600@sheep.berlios.de>

Author: stippi
Date: 2008-03-04 13:41:45 +0100 (Tue, 04 Mar 2008)
New Revision: 24233
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24233&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
I have tried to bring the developer list up to date to the best of my
knowledge. I compared it with the current commiters list on Berlios. Some
people listed there are still in the contributors list, since they have
been inactive for a long time. Any blunders are unintentional and I will
fix those ASAP once pointed out!


Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-04 12:36:53 UTC (rev 24232)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-04 12:41:45 UTC (rev 24233)
@@ -358,7 +358,6 @@
 		"Axel D?rfler\n"
 		"Phil Greenway\n"
 		"Philippe Houdoin\n"
-		"Waldemar Kornewald\n"
 		"Marcus Overhagen\n"
 		"Ingo Weinhold\n"
 		"Jonathan Yoder\n"
@@ -370,20 +369,29 @@
 	fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
 	fCreditsView->Insert(
 		"Ithamar R. Adema\n"
+		"Bruno G. Albuquerque\n"
 		"Stephan A?mus\n"
 		"Andrew Bachmann\n"
+		"Salvatore Benedetto\n"
 		"Stefano Ceccherini\n"
 		"Rudolf Cornelissen\n"
+		"Alexandre Deckner\n"
+		"Oliver Ruiz Dorantes\n"
 		"J?r?me Duval\n"
+		"Andre Alves Garzia\n"
 		"Ren? Gollent\n"
-		"Julun\n"
+		"Karsten Heimrich\n"
+		"Euan Kirkhope\n"
 		"Waldemar Kornewald\n"
 		"Ryan Leavengood\n"
 		"Michael Lotz\n"
+		"David McPaul\n"
 		"Michael Pfeiffer\n"
-		"Niels Reedijk\n"
+		"Niels Sascha Reedijk\n"
+		"Jonas Sundstr?m\n"
 		"Fran?ois Revol\n"
 		"Hugo Santos\n"
+		"Gerasim Troeglazov\n"
 		"Bryan Varner\n"
 		"Siarzhuk Zharski\n"
 		"\n");
@@ -393,18 +401,15 @@
 
 	fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
 	fCreditsView->Insert(
-		"Bruno G. Albuquerque\n"
 		"Andrea Anzani\n"
+		"Andre Braga\n"
 		"Bruce Cameron\n"
 		"Greg Crain\n"
 		"Tyler Dauwalder\n"
-		"Alexandre Deckner\n"
-		"Oliver Ruiz Dorantes\n"
 		"John Drinkwater\n"
 		"Cian Duffy\n"
 		"Marc Flerackers\n"
 		"Daniel Furrer\n"
-		"Troeglazov Gerasim\n"
 		"Matthijs Hollemans\n"
 		"Morgan Howe\n"
 		"Erik Jaesler\n"
@@ -412,10 +417,10 @@
 		"Maurice Kalinowski\n"
 		"Vasilis Kaoutsis\n"
 		"James Kim\n"
-		"Euan Kirkhope\n"
 		"Jan Kl?tzke\n"
 		"Marcin Konicki\n"
 		"Kurtis Kopf\n"
+		"Waldemar Kornewald\n"
 		"Tom?? Ku?era\n"
 		"Lubo? Kuli?\n"
 		"Thomas Kurschel\n"
@@ -430,7 +435,6 @@
 		"Brian Matzon\n"
 		"Christopher ML Zumwalt May\n"
 		"Andrew McCall\n"
-		"David McPaul\n"
 		"Michele (zuMi)\n"
 		"Misza\n"
 		"MrSiggler\n"
@@ -449,7 +453,7 @@
 		"Rafael Romo\n"
 		"Reznikov Sergei\n"
 		"Zousar Shaker\n"
-		"Jonas Sundstr?m\n"
+		"Alexander G. M. Smith\n"
 		"Daniel Switkin\n"
 		"Atsushi Takamatsu\n"
 		"Oliver Tappe\n"



From axeld at mail.berlios.de  Tue Mar  4 13:47:35 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 4 Mar 2008 13:47:35 +0100
Subject: [Haiku-commits] r24234 - haiku/trunk/src/servers/app
Message-ID: <200803041247.m24ClZ6n006256@sheep.berlios.de>

Author: axeld
Date: 2008-03-04 13:47:34 +0100 (Tue, 04 Mar 2008)
New Revision: 24234
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24234&view=rev

Modified:
   haiku/trunk/src/servers/app/Desktop.cpp
   haiku/trunk/src/servers/app/Desktop.h
   haiku/trunk/src/servers/app/WindowList.h
Log:
* Added a separate focus list that will contain all windows in the order
  of the last focus.
* When choosing a new focus window, this list is now used to find the
  new focus window instead of just choosing the next window in the
  workspace list.
* With the normal mode mouse, this shouldn't change anything, but with
  focus follows mouse turned on, this will behave much better if you 
  don't actually move the mouse - and it also fixes bug #1886.


Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2008-03-04 12:41:45 UTC (rev 24233)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2008-03-04 12:47:34 UTC (rev 24234)
@@ -316,6 +316,7 @@
 	fCurrentWorkspace(0),
 	fAllWindows(kAllWindowList),
 	fSubsetWindows(kSubsetList),
+	fFocusList(kFocusList),
 	fWorkspacesLayer(NULL),
 	fActiveScreen(NULL),
 
@@ -670,7 +671,7 @@
 
 	for (WindowLayer* window = fAllWindows.FirstWindow(); window != NULL;
 			window = window->NextWindow(kAllWindowList)) {
-		// if window is a normal window of the team, and not hidden, 
+		// if window is a normal window of the team, and not hidden,
 		// we've found our target
 		if (!window->IsHidden() && window->IsNormal()
 			&& window->ServerWindow()->ClientTeam() == team) {
@@ -685,8 +686,8 @@
 
 /*!
 	\brief Send a quick (no attachments) message to all applications
-	
-	Quite useful for notification for things like server shutdown, system 
+
+	Quite useful for notification for things like server shutdown, system
 	color changes, etc.
 */
 void
@@ -1020,7 +1021,7 @@
 	if (!_Windows(index).HasWindow(FocusWindow()) || !FocusWindow()->IsFloating())
 		SetFocusWindow(FrontWindow());
 
-	_WindowChanged(NULL);	
+	_WindowChanged(NULL);
 	MarkDirty(dirty);
 
 #if 0
@@ -1147,7 +1148,7 @@
 			_HideWindow(floating);
 
 			if (FocusWindow() == floating)
-				SetFocusWindow(_CurrentWindows().LastWindow());
+				SetFocusWindow();
 		}
 	}
 }
@@ -1324,21 +1325,16 @@
 		return;
 	}
 
-	if (focus == NULL || hasModal) {
-		focus = FrontWindow();
-		if (focus == NULL) {
-			// there might be no front window in case of only a single
-			// window with B_FLOATING_ALL_WINDOW_FEEL
-			focus = _CurrentWindows().LastWindow();
-		}
-	}
+	if (focus == NULL || hasModal)
+		focus = fFocusList.LastWindow();
 
 	// make sure no window is chosen that doesn't want focus or cannot have it
 	while (focus != NULL
-		&& ((focus->Flags() & B_AVOID_FOCUS) != 0
+		&& (!focus->InWorkspace(fCurrentWorkspace)
+			|| (focus->Flags() & B_AVOID_FOCUS) != 0
 			|| _WindowHasModal(focus)
 			|| focus->IsHidden())) {
-		focus = focus->PreviousWindow(fCurrentWorkspace);
+		focus = focus->PreviousWindow(kFocusList);
 	}
 
 	if (fFocus == focus) {
@@ -1360,6 +1356,10 @@
 	if (fFocus != NULL) {
 		fFocus->SetFocus(true);
 		newActiveApp = fFocus->ServerWindow()->App()->ClientTeam();
+
+		// move current focus to the end of the focus list
+		fFocusList.RemoveWindow(fFocus);
+		fFocusList.AddWindow(fFocus);
 	}
 
 	if (newActiveApp == -1) {
@@ -1571,7 +1571,7 @@
 	MarkDirty(dirty);
 
 	_UpdateFronts();
-	SetFocusWindow(_CurrentWindows().LastWindow());
+	SetFocusWindow();
 	_WindowChanged(window);
 
 	UnlockAllWindows();
@@ -1587,6 +1587,7 @@
 	LockAllWindows();
 
 	window->SetHidden(false);
+	fFocusList.AddWindow(window);
 
 	if (window->InWorkspace(fCurrentWorkspace)) {
 		_ShowWindow(window, true);
@@ -1625,6 +1626,8 @@
 		return;
 
 	window->SetHidden(true);
+	fFocusList.RemoveWindow(window);
+
 	if (fMouseEventWindow == window)
 		fMouseEventWindow = NULL;
 
@@ -1634,7 +1637,7 @@
 		_UpdateFronts();
 
 		if (FocusWindow() == window)
-			SetFocusWindow(_CurrentWindows().LastWindow());
+			SetFocusWindow();
 	} else
 		_WindowChanged(window);
 
@@ -1785,7 +1788,7 @@
 	// track the dirty region outside the window in case
 	// it is shrunk in "previouslyOccupiedRegion"
 	BRegion previouslyOccupiedRegion(window->VisibleRegion());
-	
+
 	window->ResizeBy(x, y, &newDirtyRegion);
 
 	BRegion background;
@@ -1848,7 +1851,7 @@
 		BRegion stillAvailableOnScreen;
 		_RebuildClippingForAllWindows(stillAvailableOnScreen);
 		_SetBackground(stillAvailableOnScreen);
-	
+
 		_TriggerWindowRedrawing(dirty);
 	}
 
@@ -2157,7 +2160,7 @@
 	_UpdateFronts();
 
 	if (window == FocusWindow() && !window->IsVisible())
-		SetFocusWindow(_CurrentWindows().LastWindow());
+		SetFocusWindow();
 
 	UnlockAllWindows();
 }
@@ -2201,7 +2204,7 @@
 		BRegion stillAvailableOnScreen;
 		_RebuildClippingForAllWindows(stillAvailableOnScreen);
 		_SetBackground(stillAvailableOnScreen);
-	
+
 		_TriggerWindowRedrawing(dirty);
 	}
 
@@ -2448,7 +2451,7 @@
 	// moving windows
 
 	// remember the region not covered by any windows
-	// and redraw the dirty background 
+	// and redraw the dirty background
 	BRegion dirtyBackground(background);
 	dirtyBackground.Exclude(&fBackgroundRegion);
 	dirtyBackground.IntersectWith(&background);

Modified: haiku/trunk/src/servers/app/Desktop.h
===================================================================
--- haiku/trunk/src/servers/app/Desktop.h	2008-03-04 12:41:45 UTC (rev 24233)
+++ haiku/trunk/src/servers/app/Desktop.h	2008-03-04 12:47:34 UTC (rev 24234)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -153,7 +153,7 @@
 		void					SetViewUnderMouse(const WindowLayer* window, int32 viewToken);
 		int32					ViewUnderMouse(const WindowLayer* window);
 
-		void					SetFocusWindow(WindowLayer* window);
+		void					SetFocusWindow(WindowLayer* window = NULL);
 		EventTarget*			KeyboardEventTarget();
 
 		WindowLayer*			FindWindowLayerByClientToken(int32 token, team_id teamID);
@@ -253,6 +253,7 @@
 
 		WindowList				fAllWindows;
 		WindowList				fSubsetWindows;
+		WindowList				fFocusList;
 		WorkspacesLayer*		fWorkspacesLayer;
 
 		Screen*					fActiveScreen;

Modified: haiku/trunk/src/servers/app/WindowList.h
===================================================================
--- haiku/trunk/src/servers/app/WindowList.h	2008-03-04 12:41:45 UTC (rev 24233)
+++ haiku/trunk/src/servers/app/WindowList.h	2008-03-04 12:47:34 UTC (rev 24234)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Haiku, Inc.
+ * Copyright (c) 2005-2008, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
  * Authors:
@@ -41,6 +41,7 @@
 enum window_lists {
 	kAllWindowList = 32,
 	kSubsetList,
+	kFocusList,
 	kWorkingList,
 
 	kListCount



From alex at zappotek.com  Tue Mar  4 13:59:16 2008
From: alex at zappotek.com (Alexandre Deckner)
Date: Tue, 04 Mar 2008 13:59:16 +0100
Subject: [Haiku-commits] r24230 - in haiku/trunk/3rdparty: . nero
In-Reply-To: <200803041228.m24CSNm7026079@sheep.berlios.de>
References: <200803041228.m24CSNm7026079@sheep.berlios.de>
Message-ID: <47CD47A4.9010007@zappotek.com>

mmu_man at BerliOS wrote :
>
> Added:
>    haiku/trunk/3rdparty/nero/
>    haiku/trunk/3rdparty/nero/haiku-cd.cue
> Log:
> Added a cue file for windows users to make a CD.
>
>
>   
Thanks!
Actually, although most use it with nero nowadays, i just found out that 
the .cue format was first introduced by cdrwin. 
http://en.wikipedia.org/wiki/Disk_image

Regards,
Alex



From anevilyak at gmail.com  Tue Mar  4 14:39:12 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Tue, 4 Mar 2008 07:39:12 -0600
Subject: [Haiku-commits] r24228 - haiku/trunk/src/kits/app
In-Reply-To: <20080304113447.M87610@mlotz.ch>
References: <200803040608.m2468Mp8000615@sheep.berlios.de>
	<20080304113447.M87610@mlotz.ch>
Message-ID: <f019d2f30803040539j1af700d8y81bdb75abe59811d@mail.gmail.com>

>  This definitely hides some other bug. The fHeader field must _always_ be
>  valid. And from quickly reviewing the code paths it also is always initialized
>  correctly after being cleared. There are some possibilities: a thread safety
>  issue, corruption of the message data or usage of a destroyed BMessage object.
>  I'd tend to the first or the last. As there is no locking involved it could
>  easily be a thread safety issue that happens when a BMessage is shared by
>  multiple threads that do not properly synchronize themselves. I am not sure
>  the R5 BMessage is thread safe, and I don't know if it should be at all. I
>  thought I had read somewhere that it is not thread safe, but I can't find that
>  source anymore. Anyway, I will look into it and try reproducing using the
>  steps you mentioned above. Thanks for the pointers!
>

Ah, thanks for the explanation. That confused me as well because I
couldn't see any obvious path by which _InitObject() wouldn't be
called, which seemed to always create the header. That message
shouldn't be getting reused in any case, unless it's internally by the
kit somewhere, as the code that sets up the BAlert in this case is as
follows:

                        BMessage *invokeMsg (new BMessage (msg));
                        BInvoker *invoker (new BInvoker (invokeMsg, msgr));
                        invokeMsg->AddPointer ("invoker", invoker);
                        alert->Go (invoker);

Neither variable is touched again before end of function, and the
alert is likewise heap allocated.

Let me know if any other information would be of use.

Regards,

Rene


From mmu_man at mail.berlios.de  Tue Mar  4 17:10:22 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Tue, 4 Mar 2008 17:10:22 +0100
Subject: [Haiku-commits] r24235 - haiku/trunk
Message-ID: <200803041610.m24GAMvN032023@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-04 17:10:22 +0100 (Tue, 04 Mar 2008)
New Revision: 24235
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24235&view=rev

Modified:
   haiku/trunk/ReadMe
Log:
Added info for testing cd in Qemu.


Modified: haiku/trunk/ReadMe
===================================================================
--- haiku/trunk/ReadMe	2008-03-04 12:47:34 UTC (rev 24234)
+++ haiku/trunk/ReadMe	2008-03-04 16:10:22 UTC (rev 24235)
@@ -99,6 +99,14 @@
 
 Windows users will find '3rdparty/nero/haiku-cd.cue' useful.
 
+Since the CD has two tracks it is not easy to test it from an emulator.
+Instead it is simpler to use the 'haiku.image' as CD image and the floppy
+image 'haiku-boot-floppy.image' to boot from it.
+
+For Qemu:
+
+qemu -cdrom generated/haiku.image -fda generated/haiku-boot-floppy.image -boot a
+
 Building Components
 -------------------
 



From mmlr at mlotz.ch  Tue Mar  4 17:55:57 2008
From: mmlr at mlotz.ch (Michael Lotz)
Date: Tue, 4 Mar 2008 17:55:57 +0100
Subject: [Haiku-commits] r24233 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <200803041241.m24CfjTJ005600@sheep.berlios.de>
References: <200803041241.m24CfjTJ005600@sheep.berlios.de>
Message-ID: <20080304165350.M10647@mlotz.ch>

On Tue, 4 Mar 2008 13:41:45 +0100, stippi at BerliOS wrote
> Author: stippi
> Date: 2008-03-04 13:41:45 +0100 (Tue, 04 Mar 2008)
> New Revision: 24233
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24233&view=rev
> 
> Modified:
>    haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
> Log:
> I have tried to bring the developer list up to date to the best of my
> knowledge. I compared it with the current commiters list on Berlios. 
> Some people listed there are still in the contributors list, since 
> they have been inactive for a long time. Any blunders are 
> unintentional and I will fix those ASAP once pointed out!

Didn't we want to clean out the team leads section once? It doesn't represent
the current structure anymore at least.

Regards
Michael


From axeld at mail.berlios.de  Tue Mar  4 18:00:00 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 4 Mar 2008 18:00:00 +0100
Subject: [Haiku-commits] r24236 - haiku/trunk/src/system/kernel/fs
Message-ID: <200803041700.m24H00jj003983@sheep.berlios.de>

Author: axeld
Date: 2008-03-04 17:59:59 +0100 (Tue, 04 Mar 2008)
New Revision: 24236
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24236&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/vfs.cpp
Log:
* Minor cleanup.


Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-04 16:10:22 UTC (rev 24235)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-04 16:59:59 UTC (rev 24236)
@@ -157,7 +157,7 @@
 	- the fields immutable after initialization of the fs_mount structures in
 	  sMountsTable will not be modified,
 	- vnode::covered_by of any vnode in sVnodeTable will not be modified.
-	
+
 	The thread trying to lock the lock must not hold sVnodeMutex or
 	sMountMutex.
 */
@@ -643,7 +643,7 @@
 	vnode->id = vnodeID;
 
 	// add the vnode to the mount structure
-	mutex_lock(&sMountMutex);	
+	mutex_lock(&sMountMutex);
 	vnode->mount = find_mount(mountID);
 	if (!vnode->mount || vnode->mount->unmounting) {
 		mutex_unlock(&sMountMutex);
@@ -1390,7 +1390,7 @@
 }
 
 
-/*!	Disconnects all file descriptors that are associated with the 
+/*!	Disconnects all file descriptors that are associated with the
 	\a vnodeToDisconnect, or if this is NULL, all vnodes of the specified
 	\a mount object.
 
@@ -2606,7 +2606,7 @@
 {
 	struct hash_iterator iterator;
 	struct vnode *vnode;
-	
+
 	if (argc > 2 || !strcmp(argv[1], "--help")) {
 		kprintf("usage: %s [device]\n", argv[0]);
 		return 0;
@@ -2672,7 +2672,7 @@
 	kprintf(" cwd vnode:\t%p\n", context->cwd);
 	kprintf(" used fds:\t%lu\n", context->num_used_fds);
 	kprintf(" max fds:\t%lu\n", context->table_size);
-	
+
 	if (context->num_used_fds)
 		kprintf("   no. type     ops ref open mode        pos cookie\n");
 
@@ -2816,7 +2816,7 @@
 			uint32 tempCount = 0;
 
 			// size tracks how much of what is left of the current fileVec
-			// (fileLeft) has been assigned to tempVecs 
+			// (fileLeft) has been assigned to tempVecs
 			size = 0;
 
 			// assign what is left of the current fileVec to the tempVecs
@@ -3004,7 +3004,7 @@
 	}
 
 	locker.Unlock();
-	
+
 	if (remove) {
 		// if the vnode hasn't been published yet, we delete it here
 		atomic_add(&vnode->ref_count, -1);
@@ -3973,15 +3973,15 @@
 	switch (resource) {
 		case RLIMIT_NOFILE:
 			/* TODO: check getuid() */
-			if (rlp->rlim_max != RLIM_SAVED_MAX && 
-			    rlp->rlim_max != MAX_FD_TABLE_SIZE)
+			if (rlp->rlim_max != RLIM_SAVED_MAX
+				&& rlp->rlim_max != MAX_FD_TABLE_SIZE)
 				return EPERM;
 			return vfs_resize_fd_table(get_current_io_context(false), rlp->rlim_cur);
 
 		case RLIMIT_NOVMON:
 			/* TODO: check getuid() */
-			if (rlp->rlim_max != RLIM_SAVED_MAX && 
-			    rlp->rlim_max != MAX_NODE_MONITORS)
+			if (rlp->rlim_max != RLIM_SAVED_MAX
+				&& rlp->rlim_max != MAX_NODE_MONITORS)
 				return EPERM;
 			return vfs_resize_monitor_table(get_current_io_context(false), rlp->rlim_cur);
 
@@ -4089,7 +4089,7 @@
 	put_vnode(vnode);
 
 	FS_CALL(directory, unlink)(directory->mount->cookie, directory->private_node, name);
-	
+
 	return status;
 }
 
@@ -4180,7 +4180,7 @@
 
 	FUNCTION(("file_create_entry_ref: name = '%s', omode %x, perms %d, kernel %d\n", name, openMode, perms, kernel));
 
-	// get directory to put the new file in	
+	// get directory to put the new file in
 	status = get_vnode(mountID, directoryID, &directory, true, false);
 	if (status < B_OK)
 		return status;
@@ -4201,7 +4201,7 @@
 
 	FUNCTION(("file_create: path '%s', omode %x, perms %d, kernel %d\n", path, openMode, perms, kernel));
 
-	// get directory to put the new file in	
+	// get directory to put the new file in
 	status = fd_and_path_to_dir_vnode(fd, path, &directory, name, kernel);
 	if (status < 0)
 		return status;
@@ -4421,7 +4421,7 @@
 		return B_BAD_VALUE;
 
 	FUNCTION(("dir_create_entry_ref(dev = %ld, ino = %Ld, name = '%s', perms = %d)\n", mountID, parentID, name, perms));
-	
+
 	status = get_vnode(mountID, parentID, &vnode, true, false);
 	if (status < B_OK)
 		return status;
@@ -4539,7 +4539,7 @@
 }
 
 
-static status_t 
+static status_t
 dir_read(struct file_descriptor *descriptor, struct dirent *buffer, size_t bufferSize, uint32 *_count)
 {
 	return dir_read(descriptor->u.vnode, descriptor->cookie, buffer, bufferSize, _count);
@@ -4589,7 +4589,7 @@
 }
 
 
-static status_t 
+static status_t
 dir_read(struct vnode *vnode, fs_cookie cookie, struct dirent *buffer, size_t bufferSize, uint32 *_count)
 {
 	if (!FS_CALL(vnode, read_dir))
@@ -4609,7 +4609,7 @@
 }
 
 
-static status_t 
+static status_t
 dir_rewind(struct file_descriptor *descriptor)
 {
 	struct vnode *vnode = descriptor->u.vnode;
@@ -4641,7 +4641,7 @@
 				lastSlash--;
 			}
 
-			if (!leaf[0]		
+			if (!leaf[0]
 				|| !strcmp(leaf, ".")) {
 				// "name/" -> "name", or "name/." -> "name"
 				lastSlash[0] = '\0';
@@ -4680,7 +4680,7 @@
 }
 
 
-static status_t 
+static status_t
 common_fcntl(int fd, int op, uint32 argument, bool kernel)
 {
 	struct file_descriptor *descriptor;
@@ -5074,7 +5074,7 @@
 common_write_stat(struct file_descriptor *descriptor, const struct stat *stat, int statMask)
 {
 	struct vnode *vnode = descriptor->u.vnode;
-	
+
 	FUNCTION(("common_write_stat(vnode = %p, stat = %p, statMask = %d)\n", vnode, stat, statMask));
 	if (!FS_CALL(vnode, write_stat))
 		return EROFS;
@@ -5179,7 +5179,7 @@
 }
 
 
-static status_t 
+static status_t
 attr_dir_read(struct file_descriptor *descriptor, struct dirent *buffer, size_t bufferSize, uint32 *_count)
 {
 	struct vnode *vnode = descriptor->u.vnode;
@@ -5193,7 +5193,7 @@
 }
 
 
-static status_t 
+static status_t
 attr_dir_rewind(struct file_descriptor *descriptor)
 {
 	struct vnode *vnode = descriptor->u.vnode;
@@ -5538,7 +5538,7 @@
 }
 
 
-static status_t 
+static status_t
 index_dir_read(struct file_descriptor *descriptor, struct dirent *buffer, size_t bufferSize, uint32 *_count)
 {
 	struct fs_mount *mount = descriptor->u.mount;
@@ -5550,7 +5550,7 @@
 }
 
 
-static status_t 
+static status_t
 index_dir_rewind(struct file_descriptor *descriptor)
 {
 	struct fs_mount *mount = descriptor->u.mount;
@@ -5729,7 +5729,7 @@
 }
 
 
-static status_t 
+static status_t
 query_read(struct file_descriptor *descriptor, struct dirent *buffer, size_t bufferSize, uint32 *_count)
 {
 	struct fs_mount *mount = descriptor->u.mount;
@@ -5741,7 +5741,7 @@
 }
 
 
-static status_t 
+static status_t
 query_rewind(struct file_descriptor *descriptor)
 {
 	struct fs_mount *mount = descriptor->u.mount;
@@ -6326,7 +6326,7 @@
 	struct fs_mount *mount = NULL;
 	dev_t device = *_cookie;
 
-	mutex_lock(&sMountMutex);	
+	mutex_lock(&sMountMutex);
 
 	// Since device IDs are assigned sequentially, this algorithm
 	// does work good enough. It makes sure that the device list
@@ -6347,7 +6347,7 @@
 		device = B_BAD_VALUE;
 
 	mutex_unlock(&sMountMutex);
-	
+
 	return device;
 }
 
@@ -6369,7 +6369,7 @@
 		status = B_ERROR;
 
 	mutex_unlock(&context->io_mutex);
-	return status; 
+	return status;
 }
 
 
@@ -6643,7 +6643,7 @@
 }
 
 
-status_t 
+status_t
 _kern_fcntl(int fd, int op, uint32 argument)
 {
 	return common_fcntl(fd, op, argument, true);
@@ -6746,7 +6746,7 @@
 		if (pathBuffer.InitCheck() != B_OK)
 			return B_NO_MEMORY;
 
-		return common_read_link(fd, pathBuffer.LockBuffer(), 
+		return common_read_link(fd, pathBuffer.LockBuffer(),
 			buffer, _bufferSize, true);
 	}
 
@@ -6775,7 +6775,7 @@
 	if (pathBuffer.InitCheck() != B_OK)
 		return B_NO_MEMORY;
 
-	return common_create_symlink(fd, pathBuffer.LockBuffer(), 
+	return common_create_symlink(fd, pathBuffer.LockBuffer(),
 		toPath, mode, true);
 }
 
@@ -6788,7 +6788,7 @@
 	if (pathBuffer.InitCheck() != B_OK || toPathBuffer.InitCheck() != B_OK)
 		return B_NO_MEMORY;
 
-	return common_create_link(pathBuffer.LockBuffer(), 
+	return common_create_link(pathBuffer.LockBuffer(),
 		toPathBuffer.LockBuffer(), true);
 }
 
@@ -6843,7 +6843,7 @@
 	if (oldPathBuffer.InitCheck() != B_OK || newPathBuffer.InitCheck() != B_OK)
 		return B_NO_MEMORY;
 
-	return common_rename(oldFD, oldPathBuffer.LockBuffer(), 
+	return common_rename(oldFD, oldPathBuffer.LockBuffer(),
 		newFD, newPathBuffer.LockBuffer(), true);
 }
 
@@ -6901,7 +6901,7 @@
 		if (pathBuffer.InitCheck() != B_OK)
 			return B_NO_MEMORY;
 
-		status = common_path_read_stat(fd, pathBuffer.LockBuffer(), 
+		status = common_path_read_stat(fd, pathBuffer.LockBuffer(),
 			traverseLeafLink, stat, true);
 	} else {
 		// no path given: get the FD and use the FD operation
@@ -6970,7 +6970,7 @@
 		if (pathBuffer.InitCheck() != B_OK)
 			return B_NO_MEMORY;
 
-		status = common_path_write_stat(fd, pathBuffer.LockBuffer(), 
+		status = common_path_write_stat(fd, pathBuffer.LockBuffer(),
 			traverseLeafLink, stat, statMask, true);
 	} else {
 		// no path given: get the FD and use the FD operation
@@ -7385,7 +7385,7 @@
 				return len;
 			if (len >= B_PATH_NAME_LENGTH)
 				return B_BUFFER_OVERFLOW;
-		
+
 			return B_OK;
 		}
 
@@ -7537,7 +7537,7 @@
 }
 
 
-status_t 
+status_t
 _user_fcntl(int fd, int op, uint32 argument)
 {
 	status_t status = common_fcntl(fd, op, argument, false);
@@ -7555,7 +7555,7 @@
 }
 
 
-status_t 
+status_t
 _user_flock(int fd, int op)
 {
 	struct file_descriptor *descriptor;
@@ -7823,13 +7823,13 @@
 		// path given: get the stat of the node referred to by (fd, path)
 		if (!IS_USER_ADDRESS(userPath))
 			return B_BAD_ADDRESS;
-		
+
 		KPath pathBuffer(B_PATH_NAME_LENGTH + 1);
 		if (pathBuffer.InitCheck() != B_OK)
 			return B_NO_MEMORY;
-	
+
 		char *path = pathBuffer.LockBuffer();
-	
+
 		ssize_t length = user_strlcpy(path, userPath, B_PATH_NAME_LENGTH);
 		if (length < B_OK)
 			return length;
@@ -7882,13 +7882,13 @@
 		// path given: write the stat of the node referred to by (fd, path)
 		if (!IS_USER_ADDRESS(userPath))
 			return B_BAD_ADDRESS;
-		
+
 		KPath pathBuffer(B_PATH_NAME_LENGTH + 1);
 		if (pathBuffer.InitCheck() != B_OK)
 			return B_NO_MEMORY;
-	
+
 		char *path = pathBuffer.LockBuffer();
-	
+
 		ssize_t length = user_strlcpy(path, userPath, B_PATH_NAME_LENGTH);
 		if (length < B_OK)
 			return length;
@@ -8008,7 +8008,7 @@
 _user_create_index(dev_t device, const char *userName, uint32 type, uint32 flags)
 {
 	char name[B_FILE_NAME_LENGTH];
-	
+
 	if (!IS_USER_ADDRESS(userName)
 		|| user_strlcpy(name, userName, B_FILE_NAME_LENGTH) < B_OK)
 		return B_BAD_ADDRESS;
@@ -8043,7 +8043,7 @@
 _user_remove_index(dev_t device, const char *userName)
 {
 	char name[B_FILE_NAME_LENGTH];
-	
+
 	if (!IS_USER_ADDRESS(userName)
 		|| user_strlcpy(name, userName, B_FILE_NAME_LENGTH) < B_OK)
 		return B_BAD_ADDRESS;



From axeld at mail.berlios.de  Tue Mar  4 18:03:25 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 4 Mar 2008 18:03:25 +0100
Subject: [Haiku-commits] r24237 - haiku/trunk/src/system/kernel/fs
Message-ID: <200803041703.m24H3P0J004607@sheep.berlios.de>

Author: axeld
Date: 2008-03-04 18:03:25 +0100 (Tue, 04 Mar 2008)
New Revision: 24237
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24237&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/devfs.cpp
Log:
* Since the device hooks can actually change when the driver is 
  republished, we now update them.
* This fixes occasional crashes with reloaded/repulished drivers.
* Minor cleanup.


Modified: haiku/trunk/src/system/kernel/fs/devfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/devfs.cpp	2008-03-04 16:59:59 UTC (rev 24236)
+++ haiku/trunk/src/system/kernel/fs/devfs.cpp	2008-03-04 17:03:25 UTC (rev 24237)
@@ -159,6 +159,8 @@
 };
 
 
+static status_t get_node_for_path(struct devfs *fs, const char *path,
+	struct devfs_vnode **_node);
 static void get_device_name(struct devfs_vnode *vnode, char *buffer,
 	size_t size);
 static status_t unpublish_node(struct devfs *fs, devfs_vnode *node,
@@ -267,14 +269,23 @@
 			entry = currentNodes.GetNext(entry);
 		}
 
-		if (present)
-			continue;
-
-		// the device was not present before -> publish it now
 		device_hooks *hooks = driver->find_device(devicePaths[0]);
 		if (hooks == NULL)
 			continue;
 
+		if (present) {
+			// update hooks
+			devfs_vnode *vnode;
+			status_t status = get_node_for_path(sDeviceFileSystem,
+				devicePaths[0], &vnode);
+			if (status != B_OK)
+				return status;
+
+			vnode->stream.u.dev.ops = hooks;
+			continue;
+		}
+
+		// the device was not present before -> publish it now
 		TRACE(("devfs: publishing new device \"%s\"\n", devicePaths[0]));
 		if (publish_device(sDeviceFileSystem, devicePaths[0], NULL, NULL,
 				driver, hooks, driver->api_version) == B_OK)
@@ -960,8 +971,8 @@
 		goto err1;
 	}
 
-	// increase reference count of raw device - 
-	// the partition device really needs it 
+	// increase reference count of raw device -
+	// the partition device really needs it
 	status = get_vnode(fs->id, device->id, (fs_vnode *)&partition->raw_device);
 	if (status < B_OK)
 		goto err1;
@@ -1031,7 +1042,7 @@
 	info->read_pages = NULL;
 	info->write_pages = NULL;
 		// old devices can't know how to do physical page access
-	
+
 	if (version >= 2) {
 		// According to Be newsletter, vol II, issue 36,
 		// version 2 added readv/writev, which we don't support, but also
@@ -1334,7 +1345,8 @@
 
 	// construct full path name
 
-	for (vnode = leaf; vnode->parent && vnode->parent != vnode; vnode = vnode->parent) {
+	for (vnode = leaf; vnode->parent && vnode->parent != vnode;
+			vnode = vnode->parent) {
 		size_t length = strlen(vnode->name);
 		size_t start = offset - length - 1;
 
@@ -1344,7 +1356,7 @@
 				buffer[offset - 1] = '/';
 		}
 
-		offset = start;	
+		offset = start;
 	}
 }
 
@@ -1357,19 +1369,39 @@
 		return 0;
 	}
 
-	struct devfs_vnode *vnode = (struct devfs_vnode *)strtoul(argv[1], NULL, 0);
+	struct devfs_vnode *vnode = (struct devfs_vnode *)parse_expression(argv[1]);
 	if (vnode == NULL) {
 		kprintf("invalid node address\n");
 		return 0;
 	}
 
 	kprintf("DEVFS NODE: %p\n", vnode);
-	kprintf(" id:       %Ld\n", vnode->id);
-	kprintf(" name:     %s\n", vnode->name);
-	kprintf(" type:     %x\n", vnode->stream.type);
-	kprintf(" parent:   %p\n", vnode->parent);
-	kprintf(" dir_next: %p\n", vnode->dir_next);
+	kprintf(" id:          %Ld\n", vnode->id);
+	kprintf(" name:        \"%s\"\n", vnode->name);
+	kprintf(" type:        %x\n", vnode->stream.type);
+	kprintf(" parent:      %p\n", vnode->parent);
+	kprintf(" dir next:    %p\n", vnode->dir_next);
 
+	if (S_ISDIR(vnode->stream.type)) {
+		kprintf(" dir scanned: %ld\n", vnode->stream.u.dir.scanned);
+		kprintf(" contents:\n");
+
+		devfs_vnode *children = vnode->stream.u.dir.dir_head;
+		while (children != NULL) {
+			kprintf("   %p, id %Ld\n", children, children->id);
+			children = children->dir_next;
+		}
+	} else if (S_ISLNK(vnode->stream.type)) {
+		kprintf(" symlink to:  %s\n", vnode->stream.u.symlink.path);
+	} else {
+		kprintf(" device node: %p\n", vnode->stream.u.dev.node);
+		kprintf(" driver info: %p\n", vnode->stream.u.dev.info);
+		kprintf(" hooks:       %p\n", vnode->stream.u.dev.ops);
+		kprintf(" partition:   %p\n", vnode->stream.u.dev.partition);
+		kprintf(" scheduler:   %p\n", vnode->stream.u.dev.scheduler);
+		kprintf(" driver:      %p\n", vnode->stream.u.dev.driver);
+	}
+
 	return 0;
 }
 
@@ -1611,7 +1643,7 @@
 	struct devfs_vnode *vnode = (struct devfs_vnode *)_vnode;
 
 	TRACE(("devfs_get_vnode_name: vnode = %p\n", vnode));
-	
+
 	strlcpy(buffer, vnode->name, bufferSize);
 	return B_OK;
 }
@@ -1952,7 +1984,7 @@
 	if (vnode != NULL) {
 		return EEXIST;
 	}
-	
+
 	vnode = devfs_create_vnode(fs, dir, name);
 	if (vnode == NULL) {
 		return B_NO_MEMORY;
@@ -2480,7 +2512,7 @@
 
 	if (statMask & FS_WRITE_STAT_MTIME)
 		vnode->modification_time = stat->st_mtime;
-	if (statMask & FS_WRITE_STAT_CRTIME) 
+	if (statMask & FS_WRITE_STAT_CRTIME)
 		vnode->creation_time = stat->st_crtime;
 
 	notify_stat_changed(fs->id, vnode->id, statMask);
@@ -2659,16 +2691,16 @@
 {
 	TRACE(("removing device %s from public list\n", device->name));
 
-	--num_devices;	
+	--num_devices;
 	REMOVE_DL_LIST( device, devices, );
-	
+
 	++num_unpublished_devices;
 	ADD_DL_LIST_HEAD( device, devices_to_unpublish, );
-	
+
 	// (don't free it even if no handle is open - the device
 	//  info block contains the hook list which may just got passed
-	//  to the devfs layer; we better wait until next 
-	//  publish_devices, so we are sure that devfs won't access 
+	//  to the devfs layer; we better wait until next
+	//  publish_devices, so we are sure that devfs won't access
 	//  the hook list anymore)
 }
 #endif
@@ -2686,13 +2718,13 @@
 	TRACE(("pnp_devfs_device_removed()\n"));
 #if 0
 	parent = sDeviceManager->get_parent(node);
-	
+
 	// don't use cookie - we don't use sDeviceManager loading scheme but
 	// global data and keep care of everything ourself!
 	ACQUIRE_BEN( &device_list_lock );
-	
+
 	for( device = devices; device; device = device->next ) {
-		if( device->parent == parent ) 
+		if( device->parent == parent )
 			break;
 	}
 
@@ -2702,9 +2734,9 @@
 		SHOW_ERROR( 0, "bug: node %p couldn't been found", node );
 		res = B_NAME_NOT_FOUND;
 	}
-		
+
 	RELEASE_BEN( &device_list_lock );
-	
+
 	//nudge();
 #endif
 }



From axeld at mail.berlios.de  Tue Mar  4 22:28:11 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 4 Mar 2008 22:28:11 +0100
Subject: [Haiku-commits] r24238 -
	haiku/trunk/src/add-ons/kernel/drivers/audio/hda
Message-ID: <200803042128.m24LSBUP019990@sheep.berlios.de>

Author: axeld
Date: 2008-03-04 22:28:09 +0100 (Tue, 04 Mar 2008)
New Revision: 24238
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24238&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
Log:
* Fixed various errors in the widget debug output.
* Further cleanup.


Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp	2008-03-04 17:03:25 UTC (rev 24237)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp	2008-03-04 21:28:09 UTC (rev 24238)
@@ -143,12 +143,39 @@
 }
 
 
+static const char*
+get_widget_type_name(hda_widget_type type)
+{
+	switch (type) {
+		case WT_AUDIO_OUTPUT:
+			return "Audio Output";
+		case WT_AUDIO_INPUT:
+			return "Audio Input";
+		case WT_AUDIO_MIXER:
+			return "Audio Mixer";
+		case WT_AUDIO_SELECTOR:
+			return "Audio Selector";
+		case WT_PIN_COMPLEX:
+			return "Pin Complex";
+		case WT_POWER:
+			return "Power";
+		case WT_VOLUME_KNOB:
+			return "Volume Knob";
+		case WT_BEEP_GENERATOR:
+			return "Beep Generator";
+		case WT_VENDOR_DEFINED:
+			return "Vendor Defined";
+		default:
+			return "Unknown";
+	}
+}
+
+
 static status_t
 hda_codec_parse_audio_group(hda_audio_group* audioGroup)
 {
-	corb_t verbs[6];
-	uint32 resp[6];
-	uint32 widx;
+	corb_t verbs[3];
+	uint32 resp[3];
 
 	hda_widget_get_stream_support(audioGroup->codec, audioGroup->root_node_id,
 		&audioGroup->supported_formats, &audioGroup->supported_rates);
@@ -165,18 +192,21 @@
 	if (hda_send_verbs(audioGroup->codec, verbs, resp, 3) != B_OK)
 		return B_ERROR;
 
-	dprintf("%s: Output delay: %ld samples, Input delay: %ld samples, "
-		"Beep Generator: %s\n", __func__, resp[0] & 0xf,
+	dprintf("hda: Audio Group: Output delay: %ld samples, Input delay: %ld "
+		"samples, Beep Generator: %s\n", resp[0] & 0xf,
 		(resp[0] >> 8) & 0xf, (resp[0] & (1 << 16)) ? "yes" : "no");
 
-	dprintf("%s: #GPIO: %ld, #GPO: %ld, #GPI: %ld, unsol: %s, wake: %s\n",
-		__func__, resp[4] & 0xFF, (resp[1] >> 8) & 0xFF,
-		(resp[1] >> 16) & 0xFF, (resp[1] & (1 << 30)) ? "yes" : "no",
+	dprintf("hda:   #GPIO: %ld, #GPO: %ld, #GPI: %ld, unsol: %s, wake: %s\n",
+		resp[4] & 0xff, (resp[1] >> 8) & 0xff,
+		(resp[1] >> 16) & 0xff, (resp[1] & (1 << 30)) ? "yes" : "no",
 		(resp[1] & (1 << 31)) ? "yes" : "no");
 
 	audioGroup->widget_start = resp[2] >> 16;
-	audioGroup->widget_count = resp[2] & 0xFF;
+	audioGroup->widget_count = resp[2] & 0xff;
 
+	dprintf("hda:   widget start %lu, count %lu\n", audioGroup->widget_start,
+		audioGroup->widget_count);
+
 	audioGroup->widgets = (hda_widget*)calloc(audioGroup->widget_count,
 		sizeof(*audioGroup->widgets));
 	if (audioGroup->widgets == NULL) {
@@ -185,21 +215,26 @@
 	}
 
 	/* Iterate over all Widgets and collect info */
-	for (widx = 0; widx < audioGroup->widget_count; widx++) {
-		uint32 wid = audioGroup->widget_start + widx;
-		char buf[256];
-		int off;
+	for (uint32 i = 0; i < audioGroup->widget_count; i++) {
+		uint32 widget = audioGroup->widget_start + i;
 
-		verbs[0] = MAKE_VERB(audioGroup->codec->addr, wid, VID_GET_PARAMETER,
+		verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget, VID_GET_PARAMETER,
 			PID_AUDIO_WIDGET_CAP);
-		verbs[1] = MAKE_VERB(audioGroup->codec->addr, wid, VID_GET_PARAMETER,
+		verbs[1] = MAKE_VERB(audioGroup->codec->addr, widget, VID_GET_PARAMETER,
 			PID_CONNECTION_LIST_LENGTH);
-		hda_send_verbs(audioGroup->codec, verbs, resp, 2);
+		if (hda_send_verbs(audioGroup->codec, verbs, resp, 2) != B_OK)
+			return B_ERROR;
 
-		audioGroup->widgets[widx].type = (hda_widget_type)(resp[0] >> 20);
-		audioGroup->widgets[widx].num_inputs = resp[1] & 0x7F;
+		audioGroup->widgets[i].type = (hda_widget_type)(resp[0] >> 20);
+		audioGroup->widgets[i].num_inputs = resp[1] & 0x7f;
 
-		off = 0;
+		dprintf("%ld: %s\n", widget,
+			get_widget_type_name(audioGroup->widgets[i].type));
+
+		char buf[256];
+		int off = 0;
+		buf[0] = '\0';
+
 		if (resp[0] & (1 << 11))
 			off += sprintf(buf + off, "[L-R Swap] ");
 
@@ -207,10 +242,10 @@
 			corb_t verb;
 			uint32 resp;
 
-			off += sprintf(buf+off, "[Power] ");
+			off += sprintf(buf + off, "[Power] ");
 
 			/* We support power; switch us on! */
-			verb = MAKE_VERB(audioGroup->codec->addr, wid,
+			verb = MAKE_VERB(audioGroup->codec->addr, widget,
 				VID_SET_POWER_STATE, 0);
 			hda_send_verbs(audioGroup->codec, &verb, &resp, 1);
 		}
@@ -234,116 +269,104 @@
 		if (resp[0] & (1 << 0))
 			off += sprintf(buf + off, "[Stereo] ");
 
-		switch (audioGroup->widgets[widx].type) {
+		switch (audioGroup->widgets[i].type) {
 			case WT_AUDIO_OUTPUT:
-				dprintf("%ld:\tAudio Output\n", wid);
-				hda_widget_get_stream_support(audioGroup->codec, wid,
-					&audioGroup->widgets[widx].d.input.formats,
-					&audioGroup->widgets[widx].d.input.rates);
-				hda_widget_get_amplifier_capabilities(audioGroup->codec, wid);
+				hda_widget_get_stream_support(audioGroup->codec, widget,
+					&audioGroup->widgets[i].d.input.formats,
+					&audioGroup->widgets[i].d.input.rates);
+				hda_widget_get_amplifier_capabilities(audioGroup->codec, widget);
 				break;
 			case WT_AUDIO_INPUT:
-				dprintf("%ld:\tAudio Input\n", wid);
-				hda_widget_get_stream_support(audioGroup->codec, wid,
-					&audioGroup->widgets[widx].d.input.formats,
-					&audioGroup->widgets[widx].d.input.rates);
-				hda_widget_get_amplifier_capabilities(audioGroup->codec, wid);
+				hda_widget_get_stream_support(audioGroup->codec, widget,
+					&audioGroup->widgets[i].d.input.formats,
+					&audioGroup->widgets[i].d.input.rates);
+				hda_widget_get_amplifier_capabilities(audioGroup->codec, widget);
 				break;
 			case WT_AUDIO_MIXER:
-				dprintf("%ld:\tAudio Mixer\n", wid);
-				hda_widget_get_amplifier_capabilities(audioGroup->codec, wid);
+				hda_widget_get_amplifier_capabilities(audioGroup->codec, widget);
 				break;
 			case WT_AUDIO_SELECTOR:
-				dprintf("%ld:\tAudio Selector\n", wid);
-				hda_widget_get_amplifier_capabilities(audioGroup->codec, wid);
+				hda_widget_get_amplifier_capabilities(audioGroup->codec, widget);
 				break;
 			case WT_PIN_COMPLEX:
-				dprintf("%ld:\tPin Complex\n", wid);
-				verbs[0] = MAKE_VERB(audioGroup->codec->addr, wid, VID_GET_PARAMETER,
-					PID_PIN_CAP);
+				verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget,
+					VID_GET_PARAMETER, PID_PIN_CAP);
 				if (hda_send_verbs(audioGroup->codec, verbs, resp, 1) == B_OK) {
-					audioGroup->widgets[widx].d.pin.input = resp[0] & (1 << 5);
-					audioGroup->widgets[widx].d.pin.output = resp[0] & (1 << 4);
+					audioGroup->widgets[i].d.pin.input = resp[0] & (1 << 5);
+					audioGroup->widgets[i].d.pin.output = resp[0] & (1 << 4);
 
 					dprintf("\t%s%s\n", 
-						audioGroup->widgets[widx].d.pin.input ? "[Input] " : "",
-						audioGroup->widgets[widx].d.pin.output ? "[Output]" : "");
+						audioGroup->widgets[i].d.pin.input ? "[Input] " : "",
+						audioGroup->widgets[i].d.pin.output ? "[Output]" : "");
 				} else {
 					dprintf("%s: Error getting Pin Complex IO\n", __func__);
 				}
 
-				verbs[0] = MAKE_VERB(audioGroup->codec->addr, wid,
+				verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget,
 					VID_GET_CONFIGURATION_DEFAULT, 0);
 				if (hda_send_verbs(audioGroup->codec, verbs, resp, 1) == B_OK) {
-					audioGroup->widgets[widx].d.pin.device = (pin_dev_type)
+					audioGroup->widgets[i].d.pin.device = (pin_dev_type)
 						((resp[0] >> 20) & 0xf);
 					dprintf("\t%s, %s, %s, %s\n",
 						kPortConnector[resp[0] >> 30],	
-						kDefaultDevice[audioGroup->widgets[widx].d.pin.device],
+						kDefaultDevice[audioGroup->widgets[i].d.pin.device],
 						kConnectionType[(resp[0] >> 16) & 0xF],
 						kJackColor[(resp[0] >> 12) & 0xF]);
 				}
 
-				hda_widget_get_amplifier_capabilities(audioGroup->codec, wid);
+				hda_widget_get_amplifier_capabilities(audioGroup->codec, widget);
 				break;
-			case WT_POWER:
-				dprintf("%ld:\tPower\n", wid);
+
+			default:
 				break;
-			case WT_VOLUME_KNOB:
-				dprintf("%ld:\tVolume Knob\n", wid);
-				break;
-			case WT_BEEP_GENERATOR:
-				dprintf("%ld:\tBeep Generator\n", wid);
-				break;
-			case WT_VENDOR_DEFINED:
-				dprintf("%ld:\tVendor Defined\n", wid);
-				break;
-			default:	/* Reserved */
-				break;
 		}
 
-		dprintf("\t%s\n", buf);
+		if (off)
+			dprintf("\t%s\n", buf);
 
-		hda_widget_get_pm_support(audioGroup->codec, wid,
-			&audioGroup->widgets[widx].pm);
+		hda_widget_get_pm_support(audioGroup->codec, widget,
+			&audioGroup->widgets[i].pm);
 
-		if (audioGroup->widgets[widx].num_inputs) {
-			if (audioGroup->widgets[widx].num_inputs > 1) {
-				verbs[0] = MAKE_VERB(audioGroup->codec->addr, wid,
+		if (audioGroup->widgets[i].num_inputs) {
+			if (audioGroup->widgets[i].num_inputs > 1) {
+				verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget,
 					VID_GET_CONNECTION_SELECT, 0);
 				if (hda_send_verbs(audioGroup->codec, verbs, resp, 1) == B_OK)
-					audioGroup->widgets[widx].active_input = resp[0] & 0xFF;
+					audioGroup->widgets[i].active_input = resp[0] & 0xff;
 				else
-					audioGroup->widgets[widx].active_input = -1;
+					audioGroup->widgets[i].active_input = -1;
 			} else 
-				audioGroup->widgets[widx].active_input = -1;
+				audioGroup->widgets[i].active_input = -1;
 
+			buf[0] = '\0';
 			off = 0;
 
-			for (uint32 i = 0; i < audioGroup->widgets[widx].num_inputs; i++) {
-				if (!(i % 4)) {
-					verbs[0] = MAKE_VERB(audioGroup->codec->addr, wid,
-						VID_GET_CONNECTION_LIST_ENTRY, i);
-					if (hda_send_verbs(audioGroup->codec, verbs, resp, 1) != B_OK) {
-						dprintf("%s: Error parsing inputs for widget %ld!\n",
-							__func__, wid);
+			for (uint32 inputIndex = 0; inputIndex
+					< audioGroup->widgets[i].num_inputs; inputIndex++) {
+				if ((inputIndex % 4) == 0) {
+					// we get 4 answers per call in short list mode
+					verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget,
+						VID_GET_CONNECTION_LIST_ENTRY, inputIndex);
+					if (hda_send_verbs(audioGroup->codec, verbs, resp, 1)
+							!= B_OK) {
+						dprintf("hda: Error parsing inputs for widget %ld!\n",
+							widget);
 						break;
 					}
 				}
 
-				if ((int32)i != audioGroup->widgets[widx].active_input) {
-					off += sprintf(buf + off, "%ld ",
-						(resp[0] >> (8 * (i % 4))) & 0xff);
-				} else {
-					off += sprintf(buf + off, "(%ld) ",
-						(resp[0] >> (8 * (i % 4))) & 0xff);
-				}
+				uint32 input = (resp[0] >> (8 * (inputIndex % 4))) & 0xff;
 
-				audioGroup->widgets[widx].inputs[i]
-					= (resp[0] >> (8 * (i % 4))) & 0xff;
+				if ((int32)inputIndex != audioGroup->widgets[i].active_input)
+					off += sprintf(buf + off, "%ld ", input);
+				else
+					off += sprintf(buf + off, "(%ld) ", input);
+
+				audioGroup->widgets[i].inputs[inputIndex] = input;
 			}
 
-			dprintf("\t[ %s]\n", buf);
+			if (off != 0)
+				dprintf("\tConnections: %s\n", buf);
 		}
 	}
 
@@ -351,7 +374,7 @@
 }
 
 
-/*! Find path from 'wid' to a widget of type \a widgetType, returning its
+/*! Find path from 'widget' to a widget of type \a widgetType, returning its
 	widget id.
 	Returns 0 if not found.
 */
@@ -359,27 +382,27 @@
 hda_codec_audio_group_find_path(hda_audio_group* audioGroup, uint32 widget,
 	hda_widget_type widgetType, uint32 depth)
 {
-	int widx = widget - audioGroup->widget_start;
+	int groupIndex = widget - audioGroup->widget_start;
 
-	switch (audioGroup->widgets[widx].type) {
+	switch (audioGroup->widgets[groupIndex].type) {
 		case WT_AUDIO_MIXER:
-			for (uint32 i = 0; i < audioGroup->widgets[widx].num_inputs; i++) {
+			for (uint32 i = 0; i < audioGroup->widgets[groupIndex].num_inputs; i++) {
 				if (hda_codec_audio_group_find_path(audioGroup,
-						audioGroup->widgets[widx].inputs[i], widgetType,
+						audioGroup->widgets[groupIndex].inputs[i], widgetType,
 						depth + 1)) {
-					if (audioGroup->widgets[widx].active_input == -1)
-						audioGroup->widgets[widx].active_input = i;
+					if (audioGroup->widgets[groupIndex].active_input == -1)
+						audioGroup->widgets[groupIndex].active_input = i;
 
-					return audioGroup->widgets[widx].inputs[i];
+					return audioGroup->widgets[groupIndex].inputs[i];
 				}
 			}
 			break;
 
 		case WT_AUDIO_SELECTOR:
 		{
-			int32 i = audioGroup->widgets[widx].active_input;
+			int32 i = audioGroup->widgets[groupIndex].active_input;
 			if (i != -1) {
-				widget = audioGroup->widgets[widx].inputs[i];
+				widget = audioGroup->widgets[groupIndex].inputs[i];
 				if (hda_codec_audio_group_find_path(audioGroup, widget,
 						widgetType, depth + 1)) {
 					return widget;
@@ -389,12 +412,12 @@
 		}
 
 		default:
-			if (audioGroup->widgets[widx].type == widgetType)
+			if (audioGroup->widgets[groupIndex].type == widgetType)
 				return widget;
 
 			break;
 	}
-	
+
 	return 0;
 }
 



From axeld at mail.berlios.de  Tue Mar  4 22:49:40 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 4 Mar 2008 22:49:40 +0100
Subject: [Haiku-commits] r24239 - haiku/trunk/src/system/kernel
Message-ID: <200803042149.m24LnebJ023637@sheep.berlios.de>

Author: axeld
Date: 2008-03-04 22:49:40 +0100 (Tue, 04 Mar 2008)
New Revision: 24239
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24239&view=rev

Modified:
   haiku/trunk/src/system/kernel/int.c
Log:
* This fixes the broken count of unhandled interrupts which caused some
  problems in the past (it only worked for level triggered interrupts).
* Of course, the actual problem is that on current hardware we detect
  almost all interrupts as edge triggered...


Modified: haiku/trunk/src/system/kernel/int.c
===================================================================
--- haiku/trunk/src/system/kernel/int.c	2008-03-04 21:28:09 UTC (rev 24238)
+++ haiku/trunk/src/system/kernel/int.c	2008-03-04 21:49:40 UTC (rev 24239)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2002-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -126,12 +126,12 @@
 		io_vectors[i].vector_lock = 0;			/* initialize spinlock */
 		io_vectors[i].enable_count = 0;
 		io_vectors[i].no_lock_vector = false;
-		#ifdef DEBUG_INT
-			io_vectors[i].handled_count = 0;
-			io_vectors[i].unhandled_count = 0;
-			io_vectors[i].trigger_count = 0;
-			io_vectors[i].ignored_count = 0;
-		#endif
+#ifdef DEBUG_INT
+		io_vectors[i].handled_count = 0;
+		io_vectors[i].unhandled_count = 0;
+		io_vectors[i].trigger_count = 0;
+		io_vectors[i].ignored_count = 0;
+#endif
 		initque(&io_vectors[i].handler_list);	/* initialize handler queue */
 	}
 
@@ -302,7 +302,7 @@
 
 #ifdef DEBUG_INT
 	io_vectors[vector].trigger_count++;
-	if (status != B_UNHANDLED_INTERRUPT) {
+	if (status != B_UNHANDLED_INTERRUPT || handled || invokeScheduler) {
 		io_vectors[vector].handled_count++;
 	} else {
 		io_vectors[vector].unhandled_count++;



From anevilyak at gmail.com  Wed Mar  5 05:49:44 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Tue, 4 Mar 2008 22:49:44 -0600
Subject: [Haiku-commits] r24228 - haiku/trunk/src/kits/app
In-Reply-To: <f019d2f30803040539j1af700d8y81bdb75abe59811d@mail.gmail.com>
References: <200803040608.m2468Mp8000615@sheep.berlios.de>
	<20080304113447.M87610@mlotz.ch>
	<f019d2f30803040539j1af700d8y81bdb75abe59811d@mail.gmail.com>
Message-ID: <f019d2f30803042049r66b9b302t5480607fb6433bf9@mail.gmail.com>

Hi Michael,

>  >  source anymore. Anyway, I will look into it and try reproducing using the
>  >  steps you mentioned above. Thanks for the pointers!
>  >
>

If it helps, I've done some further debugging...what seems to happen
confuses me though. Up until the following code, it executes
correctly:

                if (direct->Queue()->IsNextMessage(copy) &&
port_count(port) <= 0) {
                        // there is currently no message waiting, and
we need to wakeup the looper
                        write_port_etc(port, 0, NULL, 0, B_RELATIVE_TIMEOUT, 0);
                }

However, as soon as it calls write_port_etc(), it suddenly ends up in
IsSourceWaiting(), with the same this ptr, but a null fHeader, and
never executes the rest of BMessage::_SendMessage() following that if
block. Could something be going wrong at the kernel level here?

Regards,

Rene


From bga at mail.berlios.de  Wed Mar  5 15:37:02 2008
From: bga at mail.berlios.de (bga at BerliOS)
Date: Wed, 5 Mar 2008 15:37:02 +0100
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
Message-ID: <200803051437.m25Eb2D5002683@sheep.berlios.de>

Author: bga
Date: 2008-03-05 15:37:01 +0100 (Wed, 05 Mar 2008)
New Revision: 24240
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24240&view=rev

Modified:
   haiku/trunk/build/jam/UserBuildConfig.sample
Log:
- Commented out all entries as this is a template file. When copying it to
  UserBuildConfig the user just have to uncomment whatever he/she wants. This
  is easier than commenting out almost everything.
- Added entries for Pe and Links optional packages.



Modified: haiku/trunk/build/jam/UserBuildConfig.sample
===================================================================
--- haiku/trunk/build/jam/UserBuildConfig.sample	2008-03-04 21:49:40 UTC (rev 24239)
+++ haiku/trunk/build/jam/UserBuildConfig.sample	2008-03-05 14:37:01 UTC (rev 24240)
@@ -19,18 +19,18 @@
 # Turn off warnings in directory src/system/kernel. As fourth (scope) parameter
 # "local" is specified, which means, that this setting applies only to the
 # given directory, but not any of its subdirectories.
-SetConfigVar WARNINGS : HAIKU_TOP src system kernel : 0 : local ;
+#SetConfigVar WARNINGS : HAIKU_TOP src system kernel : 0 : local ;
 
 # Set the debug level for directory src/system/boot/loader and recursively all
 # of its subdirectories (scope is "global") to 1. All affected generated files
 # will be put into another subtree of the "generated" directory, which allows
 # for fast switching between normal and debug builds.
-SetConfigVar DEBUG : HAIKU_TOP src system boot loader : 1 : global ;
+#SetConfigVar DEBUG : HAIKU_TOP src system boot loader : 1 : global ;
 
 # Add "RUN_WITHOUT_REGISTRAR" to the DEFINES for the directory src/kits and
 # all of its subdirectories.
-AppendToConfigVar DEFINES : HAIKU_TOP src kits : RUN_WITHOUT_REGISTRAR
-	: global ;
+#AppendToConfigVar DEFINES : HAIKU_TOP src kits : RUN_WITHOUT_REGISTRAR
+#	: global ;
 
 # Set the debug level for file src/bin/gdb/gdb/haiku-nat.c (note, that
 # the object file must be specified) to 1. It is worth mentioning, that the
@@ -38,25 +38,25 @@
 # generated/objects/.../release/... Only when setting DEBUG for the executable,
 # too, it will be placed in .../debug_1/.... Apart from that, the DEBUG variable
 # has no effect on executables or other shared objects.
-DEBUG on <src!bin!gdb!gdb!>haiku-nat.o = 1 ;
+#DEBUG on <src!bin!gdb!gdb!>haiku-nat.o = 1 ;
 
 
 # Haiku Image Related Modifications
 
 # Create a 100 MB image at /tmp/walter.image.
-HAIKU_IMAGE_NAME	= walter.image ;
-HAIKU_IMAGE_DIR		= /tmp ;
-HAIKU_IMAGE_SIZE	= 100 ;
+#HAIKU_IMAGE_NAME	= walter.image ;
+#HAIKU_IMAGE_DIR		= /tmp ;
+#HAIKU_IMAGE_SIZE	= 100 ;
 
 # Name the VMWare image walter.vmdk (in directory $(HAIKU_IMAGE_DIR)).
-HAIKU_VMWARE_IMAGE_NAME	= walter.vmdk ;
+#HAIKU_VMWARE_IMAGE_NAME	= walter.vmdk ;
 
 # Install Haiku in directory /Haiku.
-HAIKU_INSTALL_DIR = /Haiku ;
+#HAIKU_INSTALL_DIR = /Haiku ;
 
 # If the image does already exist it won't be zeroed out. It will nevertheless
 # freshly be initialized with BFS. Useful when installing Haiku on a partition.
-HAIKU_DONT_CLEAR_IMAGE = 1 ;
+#HAIKU_DONT_CLEAR_IMAGE = 1 ;
 
 
 # Affects the haiku-image, haiku-vmware-image, and install-haiku targets. Only
@@ -64,49 +64,55 @@
 # updated in the image file/installation directory.
 # The update-image, update-vmware-image, and update-install targets always invoke
 # this rule, so one likely doesn't ever need to do it manually.
-SetUpdateHaikuImageOnly 1 ;
+#SetUpdateHaikuImageOnly 1 ;
 
 # libbe.so and the kernel will be updated on image updates. Note that this
 # generally doesn't work for pseudo targets (it does where special support
 # has been added, like for "kernel").
-HAIKU_INCLUDE_IN_IMAGE on libbe.so kernel = 1 ;
+#HAIKU_INCLUDE_IN_IMAGE on libbe.so kernel = 1 ;
 
 # Add "crashing_app" to the beos/bin directory of the Haiku image/installation.
 # Note, that this also makes the image depend on the target, i.e. it is
 # automatically updated when the image is built.
-AddFilesToHaikuImage beos bin : crashing_app ;
+#AddFilesToHaikuImage beos bin : crashing_app ;
 
 # Make a symlink to home/config/bin/crash.
-AddSymlinkToHaikuImage home config bin : /beos/bin/crashing_app : crash ;
+#AddSymlinkToHaikuImage home config bin : /beos/bin/crashing_app : crash ;
 
 # Adds the source directories src/kits/storage and src/tests/servers/debug
 # (recursively) to the image (as /boot/home/HaikuSources/src/kits/storage
 # and /boot/home/HaikuSources/src/tests/servers/debug respectively).
 # Note that the second directory will also be copied, if the image will only
 # be updated; the first one won't in that case.
-AddSourceDirectoryToHaikuImage src/kits/storage ;
-AddSourceDirectoryToHaikuImage src/tests/servers/debug : 1 ;
+#AddSourceDirectoryToHaikuImage src/kits/storage ;
+#AddSourceDirectoryToHaikuImage src/tests/servers/debug : 1 ;
 
 # Unzips the given zip archive onto the image under /boot/develop/tools.
-UnzipArchiveToHaikuImage develop tools
-	: /home/bonefish/develop/haiku/misc/gcc-2.95.3-beos-070218/gcc-2.95.3_binutils-2.17_rel-070218.zip ;
+#UnzipArchiveToHaikuImage develop tools
+#	: /home/bonefish/develop/haiku/misc/gcc-2.95.3-beos-070218/gcc-2.95.3_binutils-2.17_rel-070218.zip ;
 
 # Adds the optional package WonderBrush to the image. The package is downloaded
 # via wget (i.e. wget must be installed).
-AddOptionalHaikuImagePackages WonderBrush ;
+#AddOptionalHaikuImagePackages WonderBrush ;
 
 # Adds the optional package Vision to the image. See above.
-AddOptionalHaikuImagePackages Vision ;
+#AddOptionalHaikuImagePackages Vision ;
 
+# Adds the optional package Pe to the image. See above.
+#AddOptionalHaikuImagePackages Pe ;
+
+# Adds the optional package Links to the image. See above.
+#AddOptionalHaikuImagePackages Links ;
+
 # Add all available optional packages.
-HAIKU_ADD_ALL_OPTIONAL_PACKAGES = 1 ;
+#HAIKU_ADD_ALL_OPTIONAL_PACKAGES = 1 ;
 
 # Specify scripts that shall be run when populating the image/installation
 # directory. The "early" script is run before anything has been copied onto
 # the image/into the installation directory. The "late" script is run after
 # everything has been copied, but before the MIME database is installed.
-HAIKU_IMAGE_EARLY_USER_SCRIPTS	= $(HAIKU_TOP)/../early-image-script.sh ;
-HAIKU_IMAGE_LATE_USER_SCRIPTS	= $(HAIKU_TOP)/../late-image-script.sh ;
+#HAIKU_IMAGE_EARLY_USER_SCRIPTS	= $(HAIKU_TOP)/../early-image-script.sh ;
+#HAIKU_IMAGE_LATE_USER_SCRIPTS	= $(HAIKU_TOP)/../late-image-script.sh ;
 
 
 # Creating Sourceable Shell Scripts
@@ -117,22 +123,22 @@
 
 # General setup for the shell script to generate. Name is test.inc, located
 # in the output directory.
-MakeLocate test.inc : $(HAIKU_OUTPUT_DIR) ;
-Always test.inc ;
+#MakeLocate test.inc : $(HAIKU_OUTPUT_DIR) ;
+#Always test.inc ;
 
 # Define variable "outputDir" in the shell script, with the value of
 # HAIKU_OUTPUT_DIR.
-AddVariableToScript test.inc : outputDir : $(HAIKU_OUTPUT_DIR) ;
+#AddVariableToScript test.inc : outputDir : $(HAIKU_OUTPUT_DIR) ;
 
 # Define variables "bfsShell" and "fsShellCommand" referring to the
 # generated bfs_shell and fs_shell_command respectively.
-AddTargetVariableToScript test.inc : bfs_shell : bfsShell ;
-AddTargetVariableToScript test.inc : fs_shell_command : fsShellCommand ;
+#AddTargetVariableToScript test.inc : bfs_shell : bfsShell ;
+#AddTargetVariableToScript test.inc : fs_shell_command : fsShellCommand ;
 
 # If no variable name is given, the name (without grist) of the target is
 # used, i.e. a variable "rc" referring to the rc command built for the host
 # platform is defined in the script.
-AddTargetVariableToScript test.inc : <build>rc ;
+#AddTargetVariableToScript test.inc : <build>rc ;
 
 
 # Optimizing Jamfile Parsing Times
@@ -140,16 +146,16 @@
 # Setting this variable will prevent the root Jamfile to include the Jamfile
 # in the src directory. Instead only the directories required for building the
 # build tools are included. Only useful in combination with DeferredSubInclude.
-HAIKU_DONT_INCLUDE_SRC = 1 ;
+#HAIKU_DONT_INCLUDE_SRC = 1 ;
 
 # Schedule the given subdirectory for inclusion at the end of the root
 # Jamfile (directly using SubInclude here is not possible). Using this
 # feature together with HAIKU_DONT_INCLUDE_SRC allows developers working
 # only on a subproject to reduce Jamfile parsing times considerably.
-DeferredSubInclude HAIKU_TOP src tests add-ons kernel file_systems
-	userlandfs ;
+#DeferredSubInclude HAIKU_TOP src tests add-ons kernel file_systems
+#	userlandfs ;
 
 
 # Copy the posix test suite onto the image (or on the installation) into 
 # "home/posixtestsuite" directory, including the run script.
-HAIKU_ADD_POSIX_TEST_SUITE_TO_IMAGE = 1 ;
+#HAIKU_ADD_POSIX_TEST_SUITE_TO_IMAGE = 1 ;



From axeld at mail.berlios.de  Wed Mar  5 15:43:47 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 5 Mar 2008 15:43:47 +0100
Subject: [Haiku-commits] r24241 - haiku/trunk/src/add-ons/accelerants/nvidia
Message-ID: <200803051443.m25Ehl9T003266@sheep.berlios.de>

Author: axeld
Date: 2008-03-05 15:43:46 +0100 (Wed, 05 Mar 2008)
New Revision: 24241
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24241&view=rev

Modified:
   haiku/trunk/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c
Log:
* Effectively disabled the force_ws option: wide screen resolutions are pretty common
  these days, so having a not so crowded resolution menu is not really a good argument
  for making the driver unusable for the majority of potential users.


Modified: haiku/trunk/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c	2008-03-05 14:37:01 UTC (rev 24240)
+++ haiku/trunk/src/add-ons/accelerants/nvidia/ProposeDisplayMode.c	2008-03-05 14:43:46 UTC (rev 24241)
@@ -217,15 +217,19 @@
 				}
 				break;
 			default:
+#if 0
 				/* at least one analog monitor is connected, or nothing detected at all */
 				/* (if forcing widescreen type was requested don't block mode) */
 				if (target_aspect > 1.34 && !si->settings.force_ws) {
 					LOG(4, ("PROPOSEMODE: not all output devices can display widescreen modes, aborted.\n"));
 					return B_ERROR;
 				}
+#endif
 				break;
 		}
 
+// Wide screen modes are pretty common these days... - better use EDID!
+#if 0
 		/* only export widescreen panel-TV modes when an exact resolution match exists,
 		 * to prevent the modelist from becoming too crowded */
 		if (target_aspect > 1.61 && !si->settings.force_ws) {
@@ -246,6 +250,7 @@
 				return B_ERROR;
 			}
 		}
+#endif
 	}
 
 	/* check if panel(s) can display the requested resolution (if connected) */



From stefano.ceccherini at gmail.com  Wed Mar  5 17:42:15 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Wed, 5 Mar 2008 17:42:15 +0100
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <200803051437.m25Eb2D5002683@sheep.berlios.de>
References: <200803051437.m25Eb2D5002683@sheep.berlios.de>
Message-ID: <894b9700803050842l258c2373xb817270e60a9e119@mail.gmail.com>

2008/3/5, bga at BerliOS <bga at mail.berlios.de>:
> Author: bga
>  Date: 2008-03-05 15:37:01 +0100 (Wed, 05 Mar 2008)
>  New Revision: 24240
>  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24240&view=rev
>
>  Modified:
>    haiku/trunk/build/jam/UserBuildConfig.sample
>  Log:
>  - Commented out all entries as this is a template file. When copying it to
>   UserBuildConfig the user just have to uncomment whatever he/she wants. This
>   is easier than commenting out almost everything.
>  - Added entries for Pe and Links optional packages.

What about creating an optional package for firefox ?


From bga at bug-br.org.br  Wed Mar  5 17:46:01 2008
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Wed, 05 Mar 2008 13:46:01 -0300
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <894b9700803050842l258c2373xb817270e60a9e119@mail.gmail.com>
References: <200803051437.m25Eb2D5002683@sheep.berlios.de>
	<894b9700803050842l258c2373xb817270e60a9e119@mail.gmail.com>
Message-ID: <47CECE49.5070406@bug-br.org.br>

Stefano Ceccherini wrote:

> What about creating an optional package for firefox ?

Last time I tried Firefox, it crashed in under 3 minutes. But I will 
check again.

-Bruno



From stefano.ceccherini at gmail.com  Wed Mar  5 18:46:34 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Wed, 5 Mar 2008 18:46:34 +0100
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <47CECE49.5070406@bug-br.org.br>
References: <200803051437.m25Eb2D5002683@sheep.berlios.de>
	<894b9700803050842l258c2373xb817270e60a9e119@mail.gmail.com>
	<47CECE49.5070406@bug-br.org.br>
Message-ID: <894b9700803050946m2ef54ca0oe9f0d46ab80846c5@mail.gmail.com>

2008/3/5, Bruno Albuquerque <bga at bug-br.org.br>:
> Stefano Ceccherini wrote:
>
>  > What about creating an optional package for firefox ?
>
>
> Last time I tried Firefox, it crashed in under 3 minutes. But I will
>  check again.

Firefox 2.0.0.12 on current haiku only crashes on ssl sites :)


From revol at free.fr  Wed Mar  5 19:01:07 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Wed, 05 Mar 2008 19:01:07 +0100 CET
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <894b9700803050946m2ef54ca0oe9f0d46ab80846c5@mail.gmail.com>
Message-ID: <1427430017-BeMail@laptop>

> 2008/3/5, Bruno Albuquerque <bga at bug-br.org.br>:
> > Stefano Ceccherini wrote:
> >
> >  > What about creating an optional package for firefox ?
> >
> >
> > Last time I tried Firefox, it crashed in under 3 minutes. But I 
> > will
> >  check again.
> 
> Firefox 2.0.0.12 on current haiku only crashes on ssl sites :)

Which reminds me we should have (open)ssl in as I had to put it along 
with im_kit.

Didn't niels get it building yet ?

Fran?ois.


From niels.reedijk at gmail.com  Wed Mar  5 19:02:49 2008
From: niels.reedijk at gmail.com (Niels Reedijk)
Date: Wed, 5 Mar 2008 19:02:49 +0100
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <1427430017-BeMail@laptop>
References: <894b9700803050946m2ef54ca0oe9f0d46ab80846c5@mail.gmail.com>
	<1427430017-BeMail@laptop>
Message-ID: <507d86c0803051002l44763e53g48abc3d870c14545@mail.gmail.com>

2008/3/5, Fran?ois Revol <revol at free.fr>:
> > 2008/3/5, Bruno Albuquerque <bga at bug-br.org.br>:
>  > > Stefano Ceccherini wrote:
>  > >
>  > >  > What about creating an optional package for firefox ?
>  > >
>  > >
>  > > Last time I tried Firefox, it crashed in under 3 minutes. But I
>  > > will
>  > >  check again.
>  >
>  > Firefox 2.0.0.12 on current haiku only crashes on ssl sites :)
>
>
> Which reminds me we should have (open)ssl in as I had to put it along
>  with im_kit.
>
>  Didn't niels get it building yet ?

I got it building, I just not gotten into the testing phase.

On my list now, will do this weekend.

Niels


From mmu_man at mail.berlios.de  Wed Mar  5 19:27:57 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Wed, 5 Mar 2008 19:27:57 +0100
Subject: [Haiku-commits] r24242 - haiku/trunk/src/apps/mediaplayer
Message-ID: <200803051827.m25IRvn1023937@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-05 19:27:57 +0100 (Wed, 05 Mar 2008)
New Revision: 24242
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24242&view=rev

Modified:
   haiku/trunk/src/apps/mediaplayer/InfoWin.cpp
Log:
Tell if overlay is used or not.


Modified: haiku/trunk/src/apps/mediaplayer/InfoWin.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/InfoWin.cpp	2008-03-05 14:43:46 UTC (rev 24241)
+++ haiku/trunk/src/apps/mediaplayer/InfoWin.cpp	2008-03-05 18:27:57 UTC (rev 24242)
@@ -87,7 +87,7 @@
 	BRect rect = Bounds();
 
 	// accomodate for big fonts
-	float div = max_c(2 * 32, be_plain_font->StringWidth("Container") + 5);
+	float div = max_c(2 * 32, be_plain_font->StringWidth("Display Mode") + 10);
 
 	fInfoView = new InfoView(rect, "background", div);
 	fInfoView->SetViewColor(ui_color(B_DOCUMENT_BACKGROUND_COLOR));
@@ -310,7 +310,7 @@
 
 	// statistics
 	if ((which & INFO_STATS) && fController->HasFile()) {
-		fLabelsView->Insert("Duration\n\n");
+		fLabelsView->Insert("Duration\n");
 		BString s;
 		bigtime_t d = fController->Duration();
 		bigtime_t v;
@@ -333,13 +333,22 @@
 			s << " h";
 		else
 			s << " min";
-		s << "\n\n";
+		s << "\n";
 		fContentsView->Insert(s.String());
 		// TODO: demux/video/audio/... perfs (Kb/s)
+		
+		fLabelsView->Insert("Display Mode\n");
+		if (fController->IsOverlayActive())
+			fContentsView->Insert("Overlay\n");
+		else
+			fContentsView->Insert("DrawBitmap\n");
+		
+		fLabelsView->Insert("\n");
+		fContentsView->Insert("\n");
 	}
 
 	if (which & INFO_TRANSPORT) {
-		// what is "Transport"?
+		// Transport protocol info (file, http, rtsp, ...)
 	}
 
 	if (which & INFO_FILE) {



From axeld at mail.berlios.de  Wed Mar  5 20:41:05 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 5 Mar 2008 20:41:05 +0100
Subject: [Haiku-commits] r24243 - haiku/trunk/src/system/libroot/os
Message-ID: <200803051941.m25Jf5CH031852@sheep.berlios.de>

Author: axeld
Date: 2008-03-05 20:41:05 +0100 (Wed, 05 Mar 2008)
New Revision: 24243
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24243&view=rev

Modified:
   haiku/trunk/src/system/libroot/os/debug.c
Log:
* _rtDebugFlag is supposed to default to true (is usually only used when
  DEBUG is defined, anyway). This fixes bug #1892.
* _debugPrintf() and _sPrintf() are supposed to be silent when _rtDebugFlag
  is false.


Modified: haiku/trunk/src/system/libroot/os/debug.c
===================================================================
--- haiku/trunk/src/system/libroot/os/debug.c	2008-03-05 18:27:57 UTC (rev 24242)
+++ haiku/trunk/src/system/libroot/os/debug.c	2008-03-05 19:41:05 UTC (rev 24243)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2002-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 
@@ -54,7 +54,9 @@
 	{ NULL, 0 }
 };
 
+bool _rtDebugFlag = true;
 
+
 void
 debugger(const char *message)
 {
@@ -180,15 +182,9 @@
 }
 
 
-//	#pragma mark -
-//	Debug.h functions
+//	#pragma mark - Debug.h functions
 
-// TODO: verify these functions
-// TODO: add implementations for printfs?
 
-
-bool _rtDebugFlag = false;
-
 bool
 _debugFlag(void)
 {
@@ -211,6 +207,9 @@
 	va_list ap;
 	int ret;
 
+	if (!_rtDebugFlag)
+		return 0;
+
 	va_start(ap, fmt);
 	ret = vfprintf(stdout, fmt, ap);
 	va_end(ap);
@@ -222,10 +221,13 @@
 int
 _sPrintf(const char *fmt, ...)
 {
-	char buffer[1024];
+	char buffer[512];
 	va_list ap;
 	int ret;
 
+	if (!_rtDebugFlag)
+		return 0;
+
 	va_start(ap, fmt);
 	ret = vsnprintf(buffer, sizeof(buffer), fmt, ap);
 	va_end(ap);
@@ -238,7 +240,7 @@
 
 
 int
-_xdebugPrintf(const char * fmt, ...)
+_xdebugPrintf(const char *fmt, ...)
 {
 	va_list ap;
 	int ret;
@@ -252,14 +254,15 @@
 
 
 int
-_debuggerAssert(const char * file, int line, char *message)
+_debuggerAssert(const char *file, int line, char *message)
 {
 	char buffer[1024];
 	snprintf(buffer, sizeof(buffer),
 		"Assert failed: File: %s, Line: %d, %s",
 		file, line, message);
-	
-	debug_printf("%ld: ASSERT: %s\n", find_thread(NULL), buffer);
+
+	debug_printf("%ld: ASSERT: %s:%d %s\n", find_thread(NULL), file, line,
+		buffer);
 	_kern_debugger(buffer);
 
 	return 0;



From korli at mail.berlios.de  Wed Mar  5 21:06:19 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 5 Mar 2008 21:06:19 +0100
Subject: [Haiku-commits] r24244 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200803052006.m25K6Jp3002422@sheep.berlios.de>

Author: korli
Date: 2008-03-05 21:06:18 +0100 (Wed, 05 Mar 2008)
New Revision: 24244
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24244&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
Log:
here with 3GB of memory, a 4GB MTRR slot is being written, which triggers a reboot.
we now split more than 2GB MTRR slot, we might improve this and split more and more.
this could fix the bug #1711.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-05 19:41:05 UTC (rev 24243)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-05 20:06:18 UTC (rev 24244)
@@ -91,21 +91,23 @@
 	if (type == 0)
 		return B_OK;
 
+	uint32 newType;
+
 	switch (type) {
 		case B_MTR_UC:
-			type = IA32_MTR_UNCACHED;
+			newType = IA32_MTR_UNCACHED;
 			break;
 		case B_MTR_WC:
-			type = IA32_MTR_WRITE_COMBINING;
+			newType = IA32_MTR_WRITE_COMBINING;
 			break;
 		case B_MTR_WT:
-			type = IA32_MTR_WRITE_THROUGH;
+			newType = IA32_MTR_WRITE_THROUGH;
 			break;
 		case B_MTR_WP:
-			type = IA32_MTR_WRITE_PROTECTED;
+			newType = IA32_MTR_WRITE_PROTECTED;
 			break;
 		case B_MTR_WB:
-			type = IA32_MTR_WRITE_BACK;
+			newType = IA32_MTR_WRITE_BACK;
 			break;
 
 		default:
@@ -116,14 +118,19 @@
 		return B_NOT_SUPPORTED;
 
 	// length must be a power of 2; just round it up to the next value
-	length = nearest_power(length);
-	if (length + base <= base) {
+	uint64 newLength = nearest_power(length);
+
+	// avoids more than 2GB slots
+	if (newLength > 0x80000000)
+		newLength = 0x80000000;
+
+	if (newLength + base <= base) {
 		// 4GB overflow
 		return B_BAD_VALUE;
 	}
 
 	// base must be aligned to the length
-	if (base & (length - 1))
+	if (base & (newLength - 1))
 		return B_BAD_VALUE;
 
 	index = allocate_mtrr();
@@ -131,11 +138,17 @@
 		return B_ERROR;
 
 	TRACE(("allocate MTRR slot %ld, base = %Lx, length = %Lx\n", index,
-		base, length));
+		base, newLength));
 
 	sMemoryTypeIDs[index] = id;
-	x86_set_mtrr(index, base, length, type);
+	x86_set_mtrr(index, base, newLength, newType);
 
+	// now handle remaining memory
+	if (length > newLength) {
+		// TODO iterate over smaller lengths to avoid the PCI hole after the physical memory.
+		set_memory_type(id, base + newLength, length - newLength, type);
+	}
+
 	return B_OK;
 }
 



From korli at mail.berlios.de  Wed Mar  5 22:05:14 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 5 Mar 2008 22:05:14 +0100
Subject: [Haiku-commits] r24245 - haiku/trunk/src/system/kernel
Message-ID: <200803052105.m25L5Ehk007659@sheep.berlios.de>

Author: korli
Date: 2008-03-05 22:05:13 +0100 (Wed, 05 Mar 2008)
New Revision: 24245
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24245&view=rev

Modified:
   haiku/trunk/src/system/kernel/main.c
Log:
added traces


Modified: haiku/trunk/src/system/kernel/main.c
===================================================================
--- haiku/trunk/src/system/kernel/main.c	2008-03-05 20:06:18 UTC (rev 24244)
+++ haiku/trunk/src/system/kernel/main.c	2008-03-05 21:05:13 UTC (rev 24245)
@@ -264,8 +264,14 @@
 
 	// CPU specific modules may now be available
 	cpu_init_post_modules(&sKernelArgs);
+
+	TRACE("vm_init_post_modules\n");
 	vm_init_post_modules(&sKernelArgs);
+	
+	TRACE("debug_init_post_modules\n");
 	debug_init_post_modules(&sKernelArgs);
+
+	TRACE("device_manager_init_post_modules\n");
 	device_manager_init_post_modules(&sKernelArgs);
 
 	// start the init process



From stippi at mail.berlios.de  Wed Mar  5 22:21:59 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 5 Mar 2008 22:21:59 +0100
Subject: [Haiku-commits] r24246 - in haiku/trunk: data/artwork/icons
	src/preferences/mail
Message-ID: <200803052121.m25LLxTC008884@sheep.berlios.de>

Author: stippi
Date: 2008-03-05 22:21:58 +0100 (Wed, 05 Mar 2008)
New Revision: 24246
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24246&view=rev

Added:
   haiku/trunk/data/artwork/icons/Prefs_Mail
Modified:
   haiku/trunk/src/preferences/mail/ConfigWindow.cpp
   haiku/trunk/src/preferences/mail/e-mail.rdef
Log:
* Created an icon for the Mail preflet, based on the Mail app icon.
* Added vector icon loading for the interface (Haiku build).


Added: haiku/trunk/data/artwork/icons/Prefs_Mail
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/artwork/icons/Prefs_Mail
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: haiku/trunk/src/preferences/mail/ConfigWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/ConfigWindow.cpp	2008-03-05 21:05:13 UTC (rev 24245)
+++ haiku/trunk/src/preferences/mail/ConfigWindow.cpp	2008-03-05 21:21:58 UTC (rev 24246)
@@ -1,6 +1,6 @@
 /* 
+ * Copyright 2007-2008, Haiku Inc. All Rights Reserved.
  * Copyright 2001-2003 Dr. Zoidberg Enterprises. All rights reserved.
- * Copyright 2007, Haiku Inc. All Rights Reserved.
  *
  * Distributed under the terms of the MIT License.
  */
@@ -32,19 +32,22 @@
 #include <Resources.h>
 #include <Region.h>
 
+#include <AppFileInfo.h>
 #include <Entry.h>
 #include <Directory.h>
 #include <FindDirectory.h>
 #include <Path.h>
-#include <AppFileInfo.h>
 
 #include <MailSettings.h>
 
+#include <new>
 #include <stdio.h>
 #include <string.h>
 
 #include <MDRLanguage.h>
 
+using std::nothrow;
+
 // define if you want to have an apply button
 //#define HAVE_APPLY_BUTTON
 
@@ -53,7 +56,7 @@
 const char *kBugsitePretty = "Bug-Tracker at SourceForge.net";
 const char *kBugsite = "http://sourceforge.net/tracker/?func=add&group_id=26926&atid=388726";
 const char *kWebsite = "http://www.haiku-os.org";
-const rgb_color kLinkColor = {40,40,180};
+const rgb_color kLinkColor = { 40, 40, 180, 255 };
 
 
 const uint32 kMsgAccountSelected = 'acsl';
@@ -88,11 +91,13 @@
 class BitmapView : public BView
 {
 	public:
-		BitmapView(BBitmap *bitmap) : BView(bitmap->Bounds(),NULL,B_FOLLOW_NONE,B_WILL_DRAW)
+		BitmapView(BBitmap *bitmap) : BView(bitmap->Bounds(), NULL,
+			B_FOLLOW_NONE, B_WILL_DRAW)
 		{
 			fBitmap = bitmap;
 
 			SetDrawingMode(B_OP_ALPHA);
+			SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
 		}
 
 		~BitmapView()
@@ -104,12 +109,13 @@
 		{
 			SetViewColor(Parent()->ViewColor());
 
-			MoveTo((Parent()->Bounds().Width() - Bounds().Width()) / 2,Frame().top);
+			MoveTo((Parent()->Bounds().Width() - Bounds().Width()) / 2,
+				Frame().top);
 		}
 
 		virtual void Draw(BRect updateRect)
 		{
-			DrawBitmap(fBitmap,updateRect,updateRect);
+			DrawBitmap(fBitmap, updateRect, updateRect);
 		}
 
 	private:
@@ -120,24 +126,22 @@
 class AboutTextView : public BTextView
 {
 	public:
-		AboutTextView(BRect rect) : BTextView(rect,NULL,rect.OffsetToCopy(B_ORIGIN),B_FOLLOW_NONE,B_WILL_DRAW)
+		AboutTextView(BRect rect) : BTextView(rect, NULL,
+			rect.OffsetToCopy(B_ORIGIN), B_FOLLOW_NONE, B_WILL_DRAW)
 		{
 			int32 major = 0,middle = 0,minor = 0,variety = 0,internal = 1;
 
 			// get version information for app
 
 			app_info appInfo;
-			if (be_app->GetAppInfo(&appInfo) == B_OK)
-			{
-				BFile file(&appInfo.ref,B_READ_ONLY);
-				if (file.InitCheck() == B_OK)
-				{
+			if (be_app->GetAppInfo(&appInfo) == B_OK) {
+				BFile file(&appInfo.ref, B_READ_ONLY);
+				if (file.InitCheck() == B_OK) {
 					BAppFileInfo info(&file);
-					if (info.InitCheck() == B_OK)
-					{
+					if (info.InitCheck() == B_OK) {
 						version_info versionInfo;
-						if (info.GetVersionInfo(&versionInfo,B_APP_VERSION_KIND) == B_OK)
-						{
+						if (info.GetVersionInfo(&versionInfo,
+							B_APP_VERSION_KIND) == B_OK) {
 							major = versionInfo.major;
 							middle = versionInfo.middle;
 							minor = versionInfo.minor;
@@ -440,12 +444,13 @@
 void
 ConfigWindow::MakeHowToView()
 {
+#ifndef HAIKU_TARGET_PLATFORM_HAIKU
 	BResources *resources = BApplication::AppResources();
 	if (resources) {
 		size_t length;
 		char *buffer = (char *)resources->FindResource(B_LARGE_ICON_TYPE, 101, &length);
 		if (buffer) {
-			BBitmap *bitmap = new BBitmap(BRect(0, 0, 63, 63), B_CMAP8);
+			BBitmap *bitmap = new (nothrow) BBitmap(BRect(0, 0, 63, 63), B_CMAP8);
 			if (bitmap && bitmap->InitCheck() == B_OK) {
 				// copy and enlarge a 32x32 8-bit bitmap
 				char *bits = (char *)bitmap->Bits();
@@ -461,6 +466,20 @@
 				delete bitmap;
 		}
 	}
+#else
+	app_info info;
+	if (be_app->GetAppInfo(&info) == B_OK) {
+		BFile appFile(&info.ref, B_READ_ONLY);
+		BAppFileInfo appFileInfo(&appFile);
+		if (appFileInfo.InitCheck() == B_OK) {
+			BBitmap *bitmap = new (nothrow) BBitmap(BRect(0, 0, 63, 63), B_RGBA32);
+			if (appFileInfo.GetIcon(bitmap, B_LARGE_ICON) == B_OK) {
+				fConfigView->AddChild(new BitmapView(bitmap));
+			} else
+				delete bitmap;
+		}
+	}
+#endif // HAIKU_TARGET_PLATFORM_HAIKU
 
 	BRect rect = fConfigView->Bounds();
 	BTextView *text = new BTextView(rect, NULL, rect, B_FOLLOW_NONE, B_WILL_DRAW);

Modified: haiku/trunk/src/preferences/mail/e-mail.rdef
===================================================================
--- haiku/trunk/src/preferences/mail/e-mail.rdef	2008-03-05 21:05:13 UTC (rev 24245)
+++ haiku/trunk/src/preferences/mail/e-mail.rdef	2008-03-05 21:21:58 UTC (rev 24246)
@@ -15,9 +15,57 @@
 	internal = 3,
 
 	short_info = "E-mail",
-	long_info = "E-mail ?2005-2006 Haiku"
+	long_info = "E-mail ?2005-2008 Haiku"
 };
 
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+
+resource vector_icon {
+	$"6E63696619050004006A020006063C55F93D5C9ABF48EE3E484E4B6A43C35976"
+	$"495F849385EAF7FFA2A5B7C2C2A0BCCCDC748994FF829AB2020006033B9EE13B"
+	$"9EE1BB9EE13B9EE14A10E147F9EB00ACD3DB9FFFFFFFFF6492A8020006023A2A"
+	$"16B8F45D3AE2F43C1D5446BCF5477C2100F7FBFDFF31596B02000603BA68BD3A"
+	$"CB11BCBEBBBC5E184A35D549E60100343D412F364145FF566F7A020006023B4E"
+	$"07BA96743B15213BEFCE499B3D4A176700435563FF2D404802000602B275353A"
+	$"6F4ABC7EBAB484CB49DE564A6F2E00BED1DBFF8DADBA020006033C0E4E3CF575"
+	$"BF48EE3E484E4BCE1841BF59495F849385EAF7FFC4A0BCCC020006023A11DA3A"
+	$"5196BACC2E3A7F4848C35C4A23C100FFEEC0FFE7D6A80200060238DDE0B86563"
+	$"3B86F63C1C2A48AFCD493E7A00B4A06BFFA28B4E03826A310357697C03F20606"
+	$"020006022F146D3B80D3BC7FF03032974B85E5482BA200FFC7BAFFC31A1A0200"
+	$"06022F146D3B80D3BC7FF03032974B85E5482BA201E3E3E3FF59697A02000602"
+	$"2F146D3B80D3BC7FF03032974B75E5484BA200D6D9DCFF78899903FAA28E0200"
+	$"16023C9F493AEA2DBAABFF3C6759485B5A4A38E400FFFFDA0300337F02000603"
+	$"2E9D8036396AB97D97320D5448FDF84B9FEA00FFEECEE3F4A91AFFD78F05059E"
+	$"020006022E56F335D63CB97D683220C948CD3E4BB3CA00FFE2CEFFA67C620200"
+	$"1602320FFC35FEF8B8E7A334FFA04A967B4B950500F5FF94020006022E56F335"
+	$"D63CB97D683220C948ED3E4BB3CA00FFDBD5FFFCA98F190610AAAC2FFE465631"
+	$"5C2B5E31604A4D5E4D604D5C4A5CC2FC564C56C41E564E5653535155C788C71B"
+	$"C9764E5B5F48CB8147CB8147CC4D4460406043603D5C3B5E3C5C3B0204464745"
+	$"3BC291BE263C2DC189B9DE382B2F2D342B342D392F362DBFCBBADC0608FEAF5A"
+	$"405A345A345A2B4E23572649213F2545223F252E2D2E2DB7AFB8FEB6FDBC282A"
+	$"BA75B6FDBC282A49C1BCC81F0607FE1A5A405A345A345A2B4E23572649213F25"
+	$"45223F252E2D44455608022C3AC131C13E0404FE44564446444F443D382FC066"
+	$"BAE5BAE0B8222D2F302D2D2F0606EF03382F382FB89AB6FEB6FDBD5A2A30B6FD"
+	$"BD5A2A492B3A2B3A2B30382F2E2A382FBC910605EF03382F382FB89AB6FEB763"
+	$"BD5A2B30B763BD5A2B49C0BBBDBDC0BBBDBDC000BB9BBC912FBE9DBA00BC912F"
+	$"0605FE022C4A444D3B49444D44454445C156C041C0BBBDBDC122BEEAC0BBBDBD"
+	$"2A490A0844C7EB44442C3A2C4ABE31C68A3F4A434CBFEFC74D0A04BE31C68A3F"
+	$"4A434CBFEFC74D0A054EBA2B4E285623562C50310A044CB9BA4C274E284EBA20"
+	$"0A044C274E28562354220A044E404EBA2B4F324F3F0A044E404C3F4CB9C54EBA"
+	$"390A084C274C3F4E404F3F4F32562C562354220606B60E304246384CBB53C34B"
+	$"BDB7C5AF3C52404C3C48BF65C3B6BC53C1CB0A0E314534463549384A384B3B4B"
+	$"3B4D3E4C3C4B3B4939493847364734450606CA022B5A3058484A5A4A584A5C48"
+	$"5C300A0430584658465C305C0A032B5AB82DC9CAB838CA710A04B82DC9CA3058"
+	$"305CB838CA710A0446584858485C465C06032E48584A5A4A584A5C485C190A01"
+	$"0100000A000202131001178402040A020103000A030101000A00010510011784"
+	$"00040A040106000A050107000A060108000A070109000A0C010A000A08010410"
+	$"01178200040A0001101001178400040A0D010B000A0E010C000A11010D000A0F"
+	$"010E000A10010F000A0001111001178400040A120111000A1301120815FF0A14"
+	$"0114000A150115000A160116000A170117000A18011800"
+};
+
+#else // HAIKU_TARGET_PLATFORM_HAIKU
+
 resource large_icon {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
@@ -72,4 +120,7 @@
 	$"FFFF00000F0F0F0F0FFFFFFFFFFFFFFF"
 };
 
+#endif // HAIKU_TARGET_PLATFORM_HAIKU
+
+
 resource(1, "BEOS:FILE_TYPES") message;



From stippi at mail.berlios.de  Wed Mar  5 23:25:33 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 5 Mar 2008 23:25:33 +0100
Subject: [Haiku-commits] r24247 - in haiku/trunk: build/jam data/settings
	data/system/boot
Message-ID: <200803052225.m25MPXCp014676@sheep.berlios.de>

Author: stippi
Date: 2008-03-05 23:25:33 +0100 (Wed, 05 Mar 2008)
New Revision: 24247
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24247&view=rev

Added:
   haiku/trunk/data/settings/fresh_install
Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/data/system/boot/Bootscript
Log:
* The HaikuImage script will put a file "fresh_install" into
  /boot/home/config/settings.
* The Bootscript will check for the existance of this file and updates the
  mime database with all the applications and preflets that come with the
  install. Then it removes the indicator file.

This fixes the problem that all the apps are not known to the system until
you run them once. Ie "Open With..." and such stuff works out of the box.
Feel free to find a more elegant way, I just found this simple and effective.
:-)



Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2008-03-05 21:21:58 UTC (rev 24246)
+++ haiku/trunk/build/jam/HaikuImage	2008-03-05 22:25:33 UTC (rev 24247)
@@ -363,6 +363,10 @@
 SEARCH on $(bisonFiles) = [ FDirName $(HAIKU_TOP) src bin bison data ] ;
 AddFilesToHaikuImage beos etc : $(bisonFiles) ;
 
+# fresh install indicator file
+SEARCH on <settings>fresh_install = [ FDirName $(HAIKU_TOP) data settings ] ;
+AddFilesToHaikuImage home config settings : <settings>fresh_install ;
+
 # boot loader
 AddFilesToHaikuImage beos system : zbeos ;
 

Added: haiku/trunk/data/settings/fresh_install
===================================================================
--- haiku/trunk/data/settings/fresh_install	2008-03-05 21:21:58 UTC (rev 24246)
+++ haiku/trunk/data/settings/fresh_install	2008-03-05 22:25:33 UTC (rev 24247)
@@ -0,0 +1 @@
+This file is only supposed to exist on fresh Haiku installations.

Modified: haiku/trunk/data/system/boot/Bootscript
===================================================================
--- haiku/trunk/data/system/boot/Bootscript	2008-03-05 21:21:58 UTC (rev 24246)
+++ haiku/trunk/data/system/boot/Bootscript	2008-03-05 22:25:33 UTC (rev 24247)
@@ -121,3 +121,15 @@
 		. $HOME/config/boot/UserBootscript
 	fi
 fi
+
+# Check for fresh install and register all bundled app mimetypes
+FRESH_INSTALL_INDICATOR_FILE=$HOME/config/settings/fresh_install
+if [ -e $FRESH_INSTALL_INDICATOR_FILE ]; then
+	mimeset -all -f /boot/beos/apps
+	mimeset -all -f /boot/beos/preferences
+	mimeset -all -f /boot/beos/system/servers
+	mimeset -all -f /boot/apps
+	rm $FRESH_INSTALL_INDICATOR_FILE
+fi
+
+



From mmu_man at mail.berlios.de  Wed Mar  5 23:39:36 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Wed, 5 Mar 2008 23:39:36 +0100
Subject: [Haiku-commits] r24248 - haiku/trunk/src/kits/bluetooth
Message-ID: <200803052239.m25Mda14016441@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-05 23:39:35 +0100 (Wed, 05 Mar 2008)
New Revision: 24248
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24248&view=rev

Modified:
   haiku/trunk/src/kits/bluetooth/Jamfile
Log:
This gets libbluetooth.so building at least on zeta.


Modified: haiku/trunk/src/kits/bluetooth/Jamfile
===================================================================
--- haiku/trunk/src/kits/bluetooth/Jamfile	2008-03-05 22:25:33 UTC (rev 24247)
+++ haiku/trunk/src/kits/bluetooth/Jamfile	2008-03-05 22:39:35 UTC (rev 24248)
@@ -1,5 +1,11 @@
 SubDir HAIKU_TOP src kits bluetooth ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
+        UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
+}
+
 UsePrivateHeaders bluetooth ;
 
 SharedLibrary libbluetooth.so :



From mmu_man at mail.berlios.de  Wed Mar  5 23:55:16 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Wed, 5 Mar 2008 23:55:16 +0100
Subject: [Haiku-commits] r24249 -
	haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic
Message-ID: <200803052255.m25MtGLq018834@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-05 23:55:15 +0100 (Wed, 05 Mar 2008)
New Revision: 24249
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24249&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/Jamfile
Log:
This gets h2generic building on dano, not sure it'd work though as it's messing with haiku and be headers and I'm not sure how it ends up.
Why not just #include <thefile> instead of using prefixes ?? :p


Modified: haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/Jamfile	2008-03-05 22:39:35 UTC (rev 24248)
+++ haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/Jamfile	2008-03-05 22:55:15 UTC (rev 24249)
@@ -7,6 +7,13 @@
 local r5_src =  ;
 if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers os bluetooth ] : true ;
+	# HACKs HACKs HACKs...
+	# for <bluetooth/*> ...
+        UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
+	# for <net/*> hmmm...
+	UseHeaders [ FDirName $(HAIKU_TOP) headers private ] : true ;
+	# for USB_spec.h from Haiku
+	UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ;
 	r5_src = list.c ;
 }
 



From oruizdorantes at mail.berlios.de  Thu Mar  6 00:24:27 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Thu, 6 Mar 2008 00:24:27 +0100
Subject: [Haiku-commits] r24250 - haiku/trunk/src/bin
Message-ID: <200803052324.m25NORnt020957@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-06 00:24:26 +0100 (Thu, 06 Mar 2008)
New Revision: 24250
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24250&view=rev

Modified:
   haiku/trunk/src/bin/bt_dev_info.cpp
Log:
Update a bit the tool showing name/address

Modified: haiku/trunk/src/bin/bt_dev_info.cpp
===================================================================
--- haiku/trunk/src/bin/bt_dev_info.cpp	2008-03-05 22:55:15 UTC (rev 24249)
+++ haiku/trunk/src/bin/bt_dev_info.cpp	2008-03-05 23:24:26 UTC (rev 24250)
@@ -1,29 +1,28 @@
 /*
- * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ * Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
  *
  * All rights reserved. Distributed under the terms of the MIT License.
  *
  */
- 
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <bluetooth/LocalDevice.h>
+#include <bluetooth/bdaddrUtils.h>
 
 
-void
-DumpInfo(LocalDevice* device)
+static void
+DumpInfo(LocalDevice &device)
 {
+        printf("[LocalDevice] %s\t%s\n", (device.GetFriendlyName()).String(),
+                                    bdaddrUtils::ToString(device.GetBluetoothAddress()));
 
-
-
 }
 
 static status_t
 LocalDeviceError(status_t status)
 {
-	// switch (status) {}
     fprintf(stderr,"No Device/s found");
     
     return status;
@@ -33,36 +32,33 @@
 int
 main(int argc, char *argv[])
 {
-	LocalDevice* ld = NULL;
+        if(argc == 2) {
+            // device specified
+            LocalDevice* ld = LocalDevice::GetLocalDevice(atoi(argv[0]));
+            if (ld == NULL)
+               return LocalDeviceError(ENODEV);
 
-    if(argc == 2) {
-	    // device specified
-        ld = LocalDevice::GetLocalDevice(atoi(argv[0]));
-        if (ld == NULL)
-           return LocalDeviceError(ENODEV);
+            DumpInfo(*ld);
 
-        DumpInfo(ld);
+        } else if (argc == 1) {
+            // show all devices
+            LocalDevice* ld = NULL;
 
-    } else if (argc == 1) {
-        // show all devices
-        LocalDevice* firstLocalDevice = LocalDevice::GetLocalDevice();
+            printf("Listing %ld Bluetooth Local Devices ...\n", LocalDevice::GetLocalDeviceCount());
 
-        if (firstLocalDevice == NULL)
-            return LocalDeviceError(ENODEV);
+            for (uint32 index = 0 ; index < LocalDevice::GetLocalDeviceCount() ; index++) {
 
-        printf("Listing %ld Bluetooth devices ...\n", LocalDevice::GetLocalDeviceCount());
+               ld = LocalDevice::GetLocalDevice();
+               if (ld == NULL)
+                    return LocalDeviceError(ENODEV);
+               DumpInfo(*ld);
 
-        ld = firstLocalDevice;
-        do {
-           DumpInfo(ld);
-           ld = LocalDevice::GetLocalDevice();
+            }
 
-        } while (ld != firstLocalDevice);
+            return B_OK;
 
-    	return B_OK;
-
-    } else {
-        fprintf(stderr,"Usage: bt_dev_info [device]\n");
-        return B_ERROR;
-    }
+        } else {
+                fprintf(stderr,"Usage: bt_dev_info [device]\n");
+                return B_ERROR;
+        }
 }



From oruizdorantes at mail.berlios.de  Thu Mar  6 00:29:05 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Thu, 6 Mar 2008 00:29:05 +0100
Subject: [Haiku-commits] r24251 - in haiku/trunk/headers/os/bluetooth: . HCI
Message-ID: <200803052329.m25NT5rU021167@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-06 00:29:04 +0100 (Thu, 06 Mar 2008)
New Revision: 24251
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24251&view=rev

Modified:
   haiku/trunk/headers/os/bluetooth/HCI/btHCI_command.h
   haiku/trunk/headers/os/bluetooth/HCI/btHCI_module.h
   haiku/trunk/headers/os/bluetooth/HCI/btHCI_transport.h
   haiku/trunk/headers/os/bluetooth/LocalDevice.h
Log:
Remove prefixes and adapt the JSR82 api a bit more to the Be style

Modified: haiku/trunk/headers/os/bluetooth/HCI/btHCI_command.h
===================================================================
--- haiku/trunk/headers/os/bluetooth/HCI/btHCI_command.h	2008-03-05 23:24:26 UTC (rev 24250)
+++ haiku/trunk/headers/os/bluetooth/HCI/btHCI_command.h	2008-03-05 23:29:04 UTC (rev 24251)
@@ -100,9 +100,9 @@
     
     #define OCF_WRITE_LOCAL_NAME	0x0013
     #define OCF_READ_LOCAL_NAME		0x0014
-    struct hci_read_local_name {
+    struct hci_rp_read_local_name {
     	uint8	status;
-    	char	local_name[248];
+    	char	local_name[HCI_DEVICE_NAME_SIZE];
     } __attribute__ ((packed));
     
     #define OCF_WRITE_CA_TIMEOUT  	0x0016	

Modified: haiku/trunk/headers/os/bluetooth/HCI/btHCI_module.h
===================================================================
--- haiku/trunk/headers/os/bluetooth/HCI/btHCI_module.h	2008-03-05 23:24:26 UTC (rev 24250)
+++ haiku/trunk/headers/os/bluetooth/HCI/btHCI_module.h	2008-03-05 23:29:04 UTC (rev 24251)
@@ -12,7 +12,7 @@
 
 #include <bluetooth/HCI/btHCI.h>
 #include <bluetooth/HCI/btHCI_transport.h>
-#include <net/net_buffer.h>
+#include <net_buffer.h>
 
 /* defines */
 #define	BT_HCI_MODULE_NAME	"bus_managers/hci/v1"

Modified: haiku/trunk/headers/os/bluetooth/HCI/btHCI_transport.h
===================================================================
--- haiku/trunk/headers/os/bluetooth/HCI/btHCI_transport.h	2008-03-05 23:24:26 UTC (rev 24250)
+++ haiku/trunk/headers/os/bluetooth/HCI/btHCI_transport.h	2008-03-05 23:29:04 UTC (rev 24251)
@@ -10,7 +10,7 @@
 
 #include <bluetooth/HCI/btHCI.h>
 
-#include <net/net_buffer.h>
+#include <net_buffer.h>
 #include <Drivers.h>
 
 typedef enum { ANCILLYANT = 1, 

Modified: haiku/trunk/headers/os/bluetooth/LocalDevice.h
===================================================================
--- haiku/trunk/headers/os/bluetooth/LocalDevice.h	2008-03-05 23:24:26 UTC (rev 24250)
+++ haiku/trunk/headers/os/bluetooth/LocalDevice.h	2008-03-05 23:29:04 UTC (rev 24251)
@@ -37,7 +37,7 @@
                  BString GetFriendlyName();
                  DeviceClass GetDeviceClass();
         /* Possible throwing */
-                 bool SetDiscoverable(int mode);
+                 status_t SetDiscoverable(int mode);
                  
                  BString GetProperty(const char* property);                     
                  void GetProperty(const char* property, uint32* value);



From oruizdorantes at mail.berlios.de  Thu Mar  6 00:30:36 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Thu, 6 Mar 2008 00:30:36 +0100
Subject: [Haiku-commits] r24252 - haiku/trunk/src/kits/bluetooth
Message-ID: <200803052330.m25NUax4021677@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-06 00:30:34 +0100 (Thu, 06 Mar 2008)
New Revision: 24252
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24252&view=rev

Modified:
   haiku/trunk/src/kits/bluetooth/LocalDevice.cpp
Log:
Add FriendlyName and SimpleRequest interface implementation

Modified: haiku/trunk/src/kits/bluetooth/LocalDevice.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/LocalDevice.cpp	2008-03-05 23:29:04 UTC (rev 24251)
+++ haiku/trunk/src/kits/bluetooth/LocalDevice.cpp	2008-03-05 23:30:34 UTC (rev 24252)
@@ -5,6 +5,9 @@
  *
  */
 
+
+#include <bluetooth/bluetooth_error.h>
+
 #include <bluetooth/LocalDevice.h>
 #include <bluetooth/RemoteDevice.h>
 #include <bluetooth/DeviceClass.h>
@@ -126,45 +129,6 @@
 }
 
 
-BString 
-LocalDevice::GetFriendlyName()
-{
-    if (RetrieveBluetoothMessenger() != B_OK)
-        return NULL;            
- 
-    BString friendlyname;
-    BMessage request(BT_MSG_GET_FRIENDLY_NAME);
-    BMessage reply;
-    
-    /* ADD ID */
-    request.AddInt32("hci_id", hid);
-    
-    if (fMessenger->SendMessage(&request, &reply) == B_OK &&
-        reply.FindString("friendlyname", &friendlyname) == B_OK ){		
-	    
-	    return friendlyname;
-    }      
-	
-	return BString("Unknown");
-}
-
-
-DeviceClass 
-LocalDevice::GetDeviceClass()
-{
-
-	return NULL;
-}
-
-
-bool 
-LocalDevice::SetDiscoverable(int mode)
-{
-
-	return false;
-}
-
-
 BString
 LocalDevice::GetProperty(const char* property)
 {
@@ -190,6 +154,35 @@
 }
 
 
+status_t 
+LocalDevice::SetDiscoverable(int mode)
+{
+    if (RetrieveBluetoothMessenger() != B_OK)
+        return B_ERROR;            
+
+
+    BMessage request(BT_MSG_HANDLE_SIMPLE_REQUEST);
+    BMessage reply;
+	int8	 bt_status = BT_ERROR;
+	
+    /* ADD ID */
+    request.AddInt32("hci_id", hid);
+	
+	/* Add command */
+
+    if (fMessenger->SendMessage(&request, &reply) == B_OK) {
+    	if (reply.FindInt8("status", &bt_status ) == B_OK ) {	    
+			
+			
+		}
+		
+	}    
+
+
+	return B_ERROR;
+}
+
+
 bdaddr_t 
 LocalDevice::GetBluetoothAddress()
 {
@@ -200,6 +193,7 @@
     BMessage request(BT_MSG_GET_ADDRESS);
     BMessage reply;
  	ssize_t	size;   
+
     /* ADD ID */
     request.AddInt32("hci_id", hid);
     
@@ -221,6 +215,37 @@
 }
 
 
+BString 
+LocalDevice::GetFriendlyName()
+{
+    if (RetrieveBluetoothMessenger() != B_OK)
+        return NULL;            
+ 
+    BString friendlyname;
+    BMessage request(BT_MSG_GET_FRIENDLY_NAME);
+    BMessage reply;
+    
+    /* ADD ID */
+    request.AddInt32("hci_id", hid);
+    
+    if (fMessenger->SendMessage(&request, &reply) == B_OK &&
+        reply.FindString("friendlyname", &friendlyname) == B_OK ){		
+	    
+	    return friendlyname;
+    }      
+	
+	return BString("Unknown");
+}
+
+
+DeviceClass 
+LocalDevice::GetDeviceClass()
+{
+
+	return NULL;
+}
+
+
 /*
 ServiceRecord 
 LocalDevice::getRecord(Connection notifier) {
@@ -232,6 +257,8 @@
 
 }
 */
+
+
 LocalDevice::LocalDevice(hci_id hid) : hid(hid)
 {
 



From oruizdorantes at mail.berlios.de  Thu Mar  6 00:32:17 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Thu, 6 Mar 2008 00:32:17 +0100
Subject: [Haiku-commits] r24253 - haiku/trunk/headers/private/bluetooth
Message-ID: <200803052332.m25NWHhi023952@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-06 00:32:16 +0100 (Thu, 06 Mar 2008)
New Revision: 24253
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24253&view=rev

Modified:
   haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h
Log:
ADD kit<->server Messages ids

Modified: haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h
===================================================================
--- haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h	2008-03-05 23:30:34 UTC (rev 24252)
+++ haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h	2008-03-05 23:32:16 UTC (rev 24253)
@@ -8,5 +8,8 @@
 #define BT_MSG_ADQUIRE_LOCAL_DEVICE     'btAd'
 #define BT_MSG_GET_FRIENDLY_NAME        'btFn'
 #define BT_MSG_GET_ADDRESS              'btGa'
+#define BT_MSG_HANDLE_SIMPLE_REQUEST    'btsR'
+#define BT_MSG_ADD_DEVICE               'btDD'
 
+
 #endif



From oruizdorantes at mail.berlios.de  Thu Mar  6 00:34:05 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Thu, 6 Mar 2008 00:34:05 +0100
Subject: [Haiku-commits] r24254 -
	haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic
Message-ID: <200803052334.m25NY5aC026357@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-06 00:34:04 +0100 (Thu, 06 Mar 2008)
New Revision: 24254
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24254&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c
   haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h
Log:
Remove prefixed for the net private headers

Modified: haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c	2008-03-05 23:32:16 UTC (rev 24253)
+++ haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c	2008-03-05 23:34:04 UTC (rev 24254)
@@ -15,7 +15,6 @@
 #include <USB_spec.h>
 #include <USB.h>
 
-#include <net/net_buffer.h>
 #include "snet_buffer.h"
 
 #include <bluetooth/bluetooth_util.h>

Modified: haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h	2008-03-05 23:32:16 UTC (rev 24253)
+++ haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h	2008-03-05 23:34:04 UTC (rev 24254)
@@ -15,7 +15,7 @@
 #include <bluetooth/HCI/btHCI.h>
 #include <bluetooth/HCI/btHCI_module.h>
 
-#include <net/net_buffer.h>
+#include <net_buffer.h>
 
 #include "snet_buffer.h"
 



From anevilyak at mail.berlios.de  Thu Mar  6 01:03:02 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Thu, 6 Mar 2008 01:03:02 +0100
Subject: [Haiku-commits] r24255 - haiku/trunk/headers/os/interface
Message-ID: <200803060003.m26032tr031099@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-06 01:03:02 +0100 (Thu, 06 Mar 2008)
New Revision: 24255
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24255&view=rev

Modified:
   haiku/trunk/headers/os/interface/Slider.h
Log:
BSlider had code for doing double buffered drawing, but was
disabled by default. Appears to work correctly though, so
enabling it since it produces far less flicker here.



Modified: haiku/trunk/headers/os/interface/Slider.h
===================================================================
--- haiku/trunk/headers/os/interface/Slider.h	2008-03-05 23:34:04 UTC (rev 24254)
+++ haiku/trunk/headers/os/interface/Slider.h	2008-03-06 00:03:02 UTC (rev 24255)
@@ -28,7 +28,7 @@
 };
 
 
-#define USE_OFF_SCREEN_VIEW 0
+#define USE_OFF_SCREEN_VIEW 1 
 
 
 class BSlider : public BControl {



From kirilla at mail.berlios.de  Thu Mar  6 01:05:10 2008
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Thu, 6 Mar 2008 01:05:10 +0100
Subject: [Haiku-commits] r24256 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200803060005.m2605AHm001286@sheep.berlios.de>

Author: kirilla
Date: 2008-03-06 01:05:09 +0100 (Thu, 06 Mar 2008)
New Revision: 24256
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24256&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Make text view not selectable. This fixes a problem where text is inserted not at the end of the text view but on the current page. This happens if you click the text view soon after having opened AboutSystem, to try to scroll or whatever, while it's still processing query results and calling AddCopyrightEntry() for each found application. It may not show on fast systems with few applications.

Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-06 00:03:02 UTC (rev 24255)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-06 00:05:09 UTC (rev 24256)
@@ -321,6 +321,7 @@
 	fCreditsView->SetFlags(fCreditsView->Flags() | B_FRAME_EVENTS );
 	fCreditsView->SetStylable(true);
 	fCreditsView->MakeEditable(false);
+	fCreditsView->MakeSelectable(false);
 	fCreditsView->SetWordWrap(true);
 
 	BScrollView *creditsScroller = new BScrollView("creditsScroller",



From mmu_man at mail.berlios.de  Thu Mar  6 01:22:54 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 01:22:54 +0100
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200803060022.m260MshQ020988@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 01:22:53 +0100 (Thu, 06 Mar 2008)
New Revision: 24257
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24257&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Make the text view selectable when the query is done, so one can select text, like urls to paste to a browser.


Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-06 00:05:09 UTC (rev 24256)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2008-03-06 00:22:53 UTC (rev 24257)
@@ -690,6 +690,7 @@
 			BEntry ent;
 			if (fAppsQuery.GetNextEntry(&ent) < B_OK) {
 				fAppsQuery.Clear();
+				fCreditsView->MakeSelectable(true);
 				break;
 			}
 			BFile file;



From anevilyak at mail.berlios.de  Thu Mar  6 01:36:31 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Thu, 6 Mar 2008 01:36:31 +0100
Subject: [Haiku-commits] r24258 - haiku/trunk/headers/private/app
Message-ID: <200803060036.m260aVi4015839@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-06 01:36:31 +0100 (Thu, 06 Mar 2008)
New Revision: 24258
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24258&view=rev

Modified:
   haiku/trunk/headers/private/app/DirectMessageTarget.h
Log:
Made DirectMessageTarget's destructor private to avoid potential future 
errors. This object should never be deleted directly as it's ref counted, 
only when its last ref is Release()'d.



Modified: haiku/trunk/headers/private/app/DirectMessageTarget.h
===================================================================
--- haiku/trunk/headers/private/app/DirectMessageTarget.h	2008-03-06 00:22:53 UTC (rev 24257)
+++ haiku/trunk/headers/private/app/DirectMessageTarget.h	2008-03-06 00:36:31 UTC (rev 24258)
@@ -17,7 +17,6 @@
 class BDirectMessageTarget {
 	public:
 		BDirectMessageTarget();
-		~BDirectMessageTarget();
 
 		bool AddMessage(BMessage* message);
 
@@ -28,6 +27,8 @@
 		BMessageQueue* Queue() { return &fQueue; }
 
 	private:
+		~BDirectMessageTarget();
+		
 		int32			fReferenceCount;
 		BMessageQueue	fQueue;
 		bool			fClosed;



From mmu_man at mail.berlios.de  Thu Mar  6 02:19:40 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 02:19:40 +0100
Subject: [Haiku-commits] r24259 - haiku/trunk/src/bin
Message-ID: <200803060119.m261JePi021764@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 02:19:35 +0100 (Thu, 06 Mar 2008)
New Revision: 24259
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24259&view=rev

Modified:
   haiku/trunk/src/bin/eject.c
Log:
* fix --help usage
* when a path is given that isn't on devfs, use its device instead.
Allows doing eject /foo without greppin the output of /bin/df.


Modified: haiku/trunk/src/bin/eject.c
===================================================================
--- haiku/trunk/src/bin/eject.c	2008-03-06 00:36:31 UTC (rev 24258)
+++ haiku/trunk/src/bin/eject.c	2008-03-06 01:19:35 UTC (rev 24259)
@@ -19,7 +19,9 @@
 #include <unistd.h>
 #include <Drivers.h>
 #include <device/scsi.h>
+#include <fs_info.h>
 
+
 static int usage(char *prog)
 {
 	printf("usage: eject [-q|-l|-s|-b|-u] /dev/disk/.../raw\n");
@@ -44,17 +46,18 @@
 	char operation = 'e';
 	int i;
 	int ret;
+	
 	for (i = 1; i < argc; i++) {
-		if (strncmp(argv[i], "-", 1) == 0) {
+		if (strncmp(argv[i], "--h", 3) == 0) {
+			return usage("eject");
+		} else if (strncmp(argv[i], "-", 1) == 0) {
 			if (strlen(argv[i]) > 1)
 				operation = argv[i][1];
 			else {
 				usage("eject");
 				return 1;
 			}
-		} else if (strncmp(argv[i], "--h", 2) == 0)
-			return usage("eject");
-		else {
+		} else {
 			device = argv[i];
 			ret = do_eject(operation, device);
 			if (ret != 0)
@@ -72,6 +75,16 @@
 	bool bval;
 	int fd;
 	status_t devstatus;
+	fs_info info;
+
+	// if the path is not on devfs, it's probably on 
+	// the mountpoint of the device we want to act on.
+	// (should rather stat() for blk(char) device though).
+	if (fs_stat_dev(dev_for_path(device), &info) >= B_OK) {
+		if (strcmp(info.fsh_name, "devfs"))
+			device = info.device_name;
+	}
+
 	fd = open(device, O_RDONLY);
 	if (fd < 0) {
 		perror(device);



From mmu_man at mail.berlios.de  Thu Mar  6 02:20:09 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 02:20:09 +0100
Subject: [Haiku-commits] r24260 - haiku/trunk/data/system/boot
Message-ID: <200803060120.m261K9jZ021861@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 02:20:09 +0100 (Thu, 06 Mar 2008)
New Revision: 24260
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24260&view=rev

Added:
   haiku/trunk/data/system/boot/Bootscript.cd
Modified:
   haiku/trunk/data/system/boot/Bootscript
Log:
Untested Bootscript.cd


Modified: haiku/trunk/data/system/boot/Bootscript
===================================================================
--- haiku/trunk/data/system/boot/Bootscript	2008-03-06 01:19:35 UTC (rev 24259)
+++ haiku/trunk/data/system/boot/Bootscript	2008-03-06 01:20:09 UTC (rev 24260)
@@ -59,6 +59,13 @@
 
 launchscript $SCRIPTS/SetupEnvironment
 
+# If the boot volume is a CD we use another script
+iw=`/bin/isvolume -readonly /boot`
+if [ "$iw" = "yes" ]; then
+	launchscript $SCRIPTS/Bootscript.cd
+	exit 0 # and return
+fi
+
 # Sets timezone etc.
 runprog beos/bin/clockconfig
 

Added: haiku/trunk/data/system/boot/Bootscript.cd
===================================================================
--- haiku/trunk/data/system/boot/Bootscript.cd	2008-03-06 01:19:35 UTC (rev 24259)
+++ haiku/trunk/data/system/boot/Bootscript.cd	2008-03-06 01:20:09 UTC (rev 24260)
@@ -0,0 +1,99 @@
+## The system's main CD boot script.
+
+##
+## Some functions used by the main script
+##
+
+# launch <executable path> [thread to wait for]
+
+launch() {
+	if [ -f "/boot/$1" ]
+	then
+		"/boot/$1" &
+		[ "$2" != "" ] && waitfor "$2"
+		return 1
+	else
+		echo There is no "$1"
+	fi
+	return 0
+}
+
+# launchscript <script path>
+
+launchscript() {
+	if [ -f "/boot/$1" ]
+	then
+		. "/boot/$1"
+	fi
+}
+
+# runprog <executable path>
+
+runprog() {
+	if [ -f "/boot/$1" ]
+	then
+		"/boot/$1"
+		return 1
+	else
+		echo There is no "$1"
+	fi
+	return 0
+}
+
+##
+## Main script starts here
+##
+
+# block the CD tray (avoid accidental ejection)
+/bin/eject -b /boot
+
+# Launch servers
+
+# We must wait for the app_server and registrar to be ready
+launch $SERVERS/registrar _roster_thread_	# launch registrar
+
+#launch $SERVERS/debug_server				# launch debug_server
+
+# Init Network
+if [ "$SAFEMODE" != "yes" ]; then
+	launch $SERVERS/net_server				# launch net_server
+fi
+
+if [ "$SAFEMODE" != "yes" ]; then
+	launch $SERVERS/app_server picasso		# launch app_server
+else
+	launch $SERVERS/fake_app_server picasso
+fi
+
+if [ "$SAFEMODE" != "yes" ]; then
+	#launch $SERVERS/syslog_daemon
+	waitfor _input_server_event_loop_		# wait for input devices
+fi
+
+# Launch Terminal or consoled depending on $SAFEMODE
+if [ "$SAFEMODE" != "yes" ]; then
+	if [ -x /boot/apps/Installer ]; then
+		launch /boot/apps/Installer
+		#/boot/apps/Terminal -x /boot/apps/Installer
+	else
+		#launch /boot/apps/Terminal
+	fi
+	launch beos/apps/Terminal
+else
+	launch beos/bin/consoled
+fi
+
+# sync disks
+sync
+
+# prepare for reboot
+# (reboot quickly in 10 seconds)
+# (we must start the shutdown process before /boot is ejected)
+/bin/shutdown -r -q -d 10 &
+
+# unblock the CD tray
+/bin/eject -u /boot
+# and open it before rebooting
+/bin/eject /boot
+
+



From mmu_man at mail.berlios.de  Thu Mar  6 02:33:47 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 02:33:47 +0100
Subject: [Haiku-commits] r24261 - haiku/trunk
Message-ID: <200803060133.m261Xl5G022594@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 02:33:46 +0100 (Thu, 06 Mar 2008)
New Revision: 24261
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24261&view=rev

Modified:
   haiku/trunk/ReadMe
Log:
Note on mkisofs requirement to avoid newbies asking why it fails.


Modified: haiku/trunk/ReadMe
===================================================================
--- haiku/trunk/ReadMe	2008-03-06 01:20:09 UTC (rev 24260)
+++ haiku/trunk/ReadMe	2008-03-06 01:33:46 UTC (rev 24261)
@@ -77,6 +77,11 @@
 
 * UNSUPPORTED yet *
 
+This _requires_ having the mkisofs tool installed.
+On Debian GNU/Linux for example you can install it with:
+  apt-get install mkisofs
+On BeOS you can get it from http://bebits.com/app/3964 along with cdrecord.
+
 Creating a bootable CD requires burning 2 tracks on a single CD.
 The first track is an El-Torito bootable ISO file-system containing a boot 
 floppy image, and is created with:



From mmu_man at mail.berlios.de  Thu Mar  6 04:04:29 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 04:04:29 +0100
Subject: [Haiku-commits] r24262 - haiku/trunk/build/jam
Message-ID: <200803060304.m2634T8N001167@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 04:04:28 +0100 (Thu, 06 Mar 2008)
New Revision: 24262
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24262&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Adding Bootscript.cd to the image helps a lot, though it now gets stuck waiting for input_server.
Either app_server doesn't start it, or it exits right away...


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2008-03-06 01:33:46 UTC (rev 24261)
+++ haiku/trunk/build/jam/HaikuImage	2008-03-06 03:04:28 UTC (rev 24262)
@@ -271,7 +271,7 @@
 
 
 # scripts and data files
-local bootScripts = Bootscript SetupEnvironment Netscript InstallerInitScript
+local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript InstallerInitScript
 	InstallerFinishScript ;
 SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
 AddFilesToHaikuImage beos system boot : $(bootScripts) ;



From stefano.ceccherini at gmail.com  Thu Mar  6 08:16:02 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 6 Mar 2008 08:16:02 +0100
Subject: [Haiku-commits] r24256 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <200803060005.m2605AHm001286@sheep.berlios.de>
References: <200803060005.m2605AHm001286@sheep.berlios.de>
Message-ID: <894b9700803052316k1a254326w176ffb2976a188a4@mail.gmail.com>

2008/3/6, kirilla at BerliOS <kirilla at mail.berlios.de>:
> Author: kirilla
> Date: 2008-03-06 01:05:09 +0100 (Thu, 06 Mar 2008)
> New Revision: 24256
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24256&view=rev
>
> Modified:
>   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
> Log:
> Make text view not selectable. This fixes a problem where text is inserted not at the end of the text view but on the current page. This happens if you click the text view soon after having opened AboutSystem, to try to scroll or whatever, while it's still processing query results and calling AddCopyrightEntry() for each found application. It may not show on fast systems with few applications.

I wonder if it's a bug in BTextView instead. I mean: maybe
programmatic InserText() should not take into account the current
position of the caret.
Worth investigating the R5 behaviour here.


From jonas at kirilla.com  Thu Mar  6 08:56:12 2008
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Thu, 06 Mar 2008 08:56:12 +0100 CET
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <200803060022.m260MshQ020988@sheep.berlios.de>
Message-ID: <1248409612-BeMail@kirilla>

mmu_man at BerliOS <mmu_man at mail.berlios.de> wrote:
> Author: mmu_man
> Date: 2008-03-06 01:22:53 +0100 (Thu, 06 Mar 2008)
> New Revision: 24257
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24257&view=rev
> 
> Modified:
>    haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
> Log:
> Make the text view selectable when the query is done,
> so one can select text, like urls to paste to a browser.
 ...

I think would be possible to support clicking a link. Unless
I'm mistaken one can check whether the text at that BPoint
has the blueish link color, get the start and end offsets and
then launch that piece of text via the HTTP URL mime type.

That way one doesn't have to make the text selectable 
and can avoid unintentional edits, like d&d reordering or
pasting.

I'll see what I can do tonight, unless of course someone 
beats me to it.

/Jonas.


From superstippi at gmx.de  Thu Mar  6 09:03:22 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Thu, 06 Mar 2008 09:03:22 +0100
Subject: [Haiku-commits] r24256 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <894b9700803052316k1a254326w176ffb2976a188a4@mail.gmail.com>
References: <200803060005.m2605AHm001286@sheep.berlios.de>
	<894b9700803052316k1a254326w176ffb2976a188a4@mail.gmail.com>
Message-ID: <20080306090322.747.1@stippis2.1204790150.fake>


Stefano Ceccherini wrote:
> 2008/3/6, kirilla at BerliOS <kirilla at mail.berlios.de>:
> > Author: kirilla
> > Date: 2008-03-06 01:05:09 +0100 (Thu, 06 Mar 2008) New Revision: 24256
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24256&view=rev
> >
> > Modified:
> >   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
> > Log:
> > Make text view not selectable. This fixes a problem where text is 
> > inserted not at the end of the text view but on the current page. This 
> > happens if you click the text view soon after having opened 
> > AboutSystem, to try to scroll or whatever, while it's still processing 
> > query results and calling AddCopyrightEntry() for each found 
> > application. It may not show on fast systems with few applications.
> 
> I wonder if it's a bug in BTextView instead. I mean: maybe programmatic 
> InserText() should not take into account the current position of the 
> caret.
> Worth investigating the R5 behaviour here.

R5 behaves the same, I can confirm that. However, there is another call 
which lets you specify the insert offset.

Best regards,
-Stephan


From axeld at pinc-software.de  Thu Mar  6 10:18:56 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 06 Mar 2008 10:18:56 +0100 CET
Subject: [Haiku-commits] r24260 - haiku/trunk/data/system/boot
In-Reply-To: <200803060120.m261K9jZ021861@sheep.berlios.de>
Message-ID: <2010274243-BeMail@zon>

mmu_man at BerliOS <mmu_man at mail.berlios.de> wrote:
> +# sync disks
> +sync
> +
> +# prepare for reboot
> +# (reboot quickly in 10 seconds)
> +# (we must start the shutdown process before /boot is ejected)
> +/bin/shutdown -r -q -d 10 &
> +
> +# unblock the CD tray
> +/bin/eject -u /boot
> +# and open it before rebooting
> +/bin/eject /boot

Since it never waits for any app to finish, this will probably not 
work, I guess, or did I overlook something?

Bye,
   Axel.



From axeld at pinc-software.de  Thu Mar  6 10:24:29 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 06 Mar 2008 10:24:29 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24247_-_in_haiku/trunk=3A_build/?=
 =?iso-8859-15?q?jam_data/settings_data/system/boot?=
In-Reply-To: <200803052225.m25MPXCp014676@sheep.berlios.de>
Message-ID: <2343452291-BeMail@zon>

stippi at BerliOS <stippi at mail.berlios.de> wrote:
> This fixes the problem that all the apps are not known to the system 
> until
> you run them once. Ie "Open With..." and such stuff works out of the 
> box.
> Feel free to find a more elegant way, I just found this simple and 
> effective.
> :-)

Since it won't work on CDs this way, I think we have to solve this in 
the build process one day.
Anyway, nice work-around :-)

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Mar  6 10:33:10 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 6 Mar 2008 10:33:10 +0100
Subject: [Haiku-commits] r24263 - in
	haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs: . r5
Message-ID: <200803060933.m269XA5v018972@sheep.berlios.de>

Author: axeld
Date: 2008-03-06 10:33:09 +0100 (Thu, 06 Mar 2008)
New Revision: 24263
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24263&view=rev

Modified:
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Debug.h
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.cpp
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.h
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Journal.cpp
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Journal.h
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Volume.cpp
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Volume.h
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/bfs_control.h
   haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h
Log:
Fixed building the R5 version of BFS on BeOS.


Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/Jamfile	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/Jamfile	2008-03-06 09:33:09 UTC (rev 24263)
@@ -8,6 +8,7 @@
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems bfs fragmenter ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems bfs mkbfs ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems bfs queries ;
+SubInclude HAIKU_TOP src tests add-ons kernel file_systems bfs r5 ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems bfs randomread ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems bfs rename ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems bfs structureSizes ;

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Debug.h
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Debug.h	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Debug.h	2008-03-06 09:33:09 UTC (rev 24263)
@@ -1,10 +1,9 @@
+/*
+ * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de. All Rights Reserved.
+ * This file may be used under the terms of the MIT License.
+ */
 #ifndef DEBUG_H
 #define DEBUG_H
-/* Debug - debug stuff
-**
-** Initial version by Axel D?rfler, axeld at pinc-software.de
-** This file may be used under the terms of the OpenBeOS License.
-*/
 
 
 #include <KernelExport.h>
@@ -21,6 +20,9 @@
 #	define __out dprintf
 #endif
 
+#define _KERNEL_DEBUG_H
+	// to work around problems with private/kernel/debug.h
+
 // Which debugger should be used when?
 // The DEBUGGER() macro actually has no effect if DEBUG is not defined,
 // use the DIE() macro if you really want to die.

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.cpp
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.cpp	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.cpp	2008-03-06 09:33:09 UTC (rev 24263)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Axel D?rfler, axeld at pinc-software.de
+ * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de
  * This file may be used under the terms of the MIT License.
  */
 
@@ -12,7 +12,6 @@
 #include "Stream.h"
 #include "Index.h"
 
-#include <fs_cache.h>
 #include <util/kernel_cpp.h>
 
 #include <string.h>

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.h
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.h	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.h	2008-03-06 09:33:09 UTC (rev 24263)
@@ -1,6 +1,6 @@
 /* Inode - inode access functions
  *
- * Copyright 2001-2006, Axel D?rfler, axeld at pinc-software.de
+ * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de
  * This file may be used under the terms of the MIT License.
  */
 #ifndef INODE_H
@@ -13,6 +13,7 @@
 #endif
 
 #include "cache.h"
+#include "fsproto.h"
 
 #include <string.h>
 #include <unistd.h>

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Jamfile	2008-03-06 09:33:09 UTC (rev 24263)
@@ -1,5 +1,7 @@
 SubDir HAIKU_TOP src tests add-ons kernel file_systems bfs r5 ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
 # save original optimization level
 oldOPTIM = $(OPTIM) ;
 

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Journal.cpp
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Journal.cpp	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Journal.cpp	2008-03-06 09:33:09 UTC (rev 24263)
@@ -1,13 +1,12 @@
-/* Journal - transaction and logging
- *
- * Copyright 2001-2006, Axel D?rfler, axeld at pinc-software.de
+/*
+ * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de
  * This file may be used under the terms of the MIT License.
  */
 
+//!	Transaction and logging
 
 #include "Journal.h"
 #include "Inode.h"
-#include "Debug.h"
 
 #include <Drivers.h>
 #include <util/kernel_cpp.h>

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Journal.h
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Journal.h	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Journal.h	2008-03-06 09:33:09 UTC (rev 24263)
@@ -1,12 +1,18 @@
-/* Journal - transaction and logging
- *
- * Copyright 2001-2005, Axel D?rfler, axeld at pinc-software.de
+/*
+ * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de
  * This file may be used under the terms of the MIT License.
  */
 #ifndef JOURNAL_H
 #define JOURNAL_H
 
 
+#include "Debug.h"
+#include "Volume.h"
+#include "Chain.h"
+#include "Utility.h"
+
+#include "cache.h"
+
 #include <KernelExport.h>
 #include <util/DoublyLinkedList.h>
 
@@ -14,13 +20,7 @@
 #	include <stdio.h>
 #endif
 
-#include "cache.h"
 
-#include "Volume.h"
-#include "Chain.h"
-#include "Utility.h"
-
-
 struct run_array;
 class LogEntry;
 typedef DoublyLinkedList<LogEntry> LogEntryList;

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp	2008-03-06 09:33:09 UTC (rev 24263)
@@ -4,7 +4,7 @@
  * by J. Kercheval, and on code written by Kenneth Almquist, though
  * it shares no code.
  *
- * Copyright 2001-2007, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de.
  * This file may be used under the terms of the MIT License.
  */
 
@@ -1504,7 +1504,7 @@
 			if (!fStack.Pop(&fCurrent)
 				|| fCurrent == NULL
 				|| fCurrent->PrepareQuery(fVolume, fIndex, &fIterator,
-						fFlags & B_QUERY_NON_INDEXED) < B_OK)
+						false/*fFlags & B_QUERY_NON_INDEXED*/) < B_OK)
 				return B_ENTRY_NOT_FOUND;
 		}
 		if (fCurrent == NULL)

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Volume.cpp
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Volume.cpp	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Volume.cpp	2008-03-06 09:33:09 UTC (rev 24263)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Axel D?rfler, axeld at pinc-software.de. All Rights Reserved.
+ * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de. All Rights Reserved.
  * This file may be used under the terms of the MIT License.
  */
 
@@ -15,7 +15,6 @@
 #include <util/kernel_cpp.h>
 #include <KernelExport.h>
 #include <Drivers.h>
-#include <fs_volume.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -232,7 +231,7 @@
 //	#pragma mark -
 
 
-Volume::Volume(mount_id id)
+Volume::Volume(dev_t id)
 	:
 	fID(id),
 	fBlockAllocator(this),

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Volume.h
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Volume.h	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/Volume.h	2008-03-06 09:33:09 UTC (rev 24263)
@@ -1,6 +1,5 @@
-/* Volume - BFS super block, mounting, etc.
- *
- * Initial version by Axel D?rfler, axeld at pinc-software.de
+/*
+ * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de. All Rights Reserved.
  * This file may be used under the terms of the MIT License.
  */
 #ifndef VOLUME_H
@@ -8,7 +7,7 @@
 
 
 #include <KernelExport.h>
-#include <fs_interface.h>
+#include "fsproto.h"
 
 #include "cache.h"
 
@@ -31,7 +30,7 @@
 
 class Volume {
 	public:
-		Volume(mount_id id);
+		Volume(dev_t id);
 		~Volume();
 
 		status_t			Mount(const char *device, uint32 flags);
@@ -53,7 +52,7 @@
 		vint32				&LogEnd() { return fLogEnd; }
 		int					Device() const { return fDevice; }
 
-		mount_id			ID() const { return fID; }
+		dev_t				ID() const { return fID; }
 		const char			*Name() const { return fSuperBlock.name; }
 
 		off_t				NumBlocks() const { return fSuperBlock.NumBlocks(); }
@@ -112,7 +111,7 @@
 		static status_t		Identify(int fd, disk_super_block *superBlock);
 
 	protected:
-		mount_id			fID;
+		dev_t				fID;
 		int					fDevice;
 		disk_super_block	fSuperBlock;
 

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/bfs_control.h
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/bfs_control.h	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/bfs_control.h	2008-03-06 09:33:09 UTC (rev 24263)
@@ -7,7 +7,7 @@
 */
 
 
-#include <fs_interface.h>
+#include "fsproto.h"
 
 
 /* ioctl to check the version of BFS used - parameter is a uint32 *

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h	2008-03-06 03:04:28 UTC (rev 24262)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h	2008-03-06 09:33:09 UTC (rev 24263)
@@ -238,19 +238,25 @@
 extern "C" {
 #endif
 
-extern _IMPEXP_KERNEL int		new_path(const char *path, char **copy);
-extern _IMPEXP_KERNEL void		free_path(char *p);
+extern _IMPEXP_KERNEL int	new_path(const char *path, char **copy);
+extern _IMPEXP_KERNEL void	free_path(char *p);
 
-extern _IMPEXP_KERNEL void		notify_select_event(selectsync *sync, uint32 ref);
-extern _IMPEXP_KERNEL status_t	is_vnode_removed(nspace_id nsid, vnode_id vnid);
+extern _IMPEXP_KERNEL void	notify_select_event(selectsync *sync, uint32 ref);
 
+extern _IMPEXP_KERNEL int	notify_listener(int op, nspace_id nsid,
+									vnode_id vnida,	vnode_id vnidb,
+									vnode_id vnidc, const char *name);
 extern _IMPEXP_KERNEL status_t	send_notification(port_id port, long token,
 	ulong what, long op, nspace_id device, nspace_id toDevice,
 	vnode_id parentNode, vnode_id toParentNode, vnode_id node,
 	const char *name);
 
-// The missing prototypes can be found in the fs_interface.h file.
-// That part of the VFS is still compatible with BeOS :)
+extern _IMPEXP_KERNEL int	get_vnode(nspace_id nsid, vnode_id vnid, void **data);
+extern _IMPEXP_KERNEL int	put_vnode(nspace_id nsid, vnode_id vnid);
+extern _IMPEXP_KERNEL int	new_vnode(nspace_id nsid, vnode_id vnid, void *data);
+extern _IMPEXP_KERNEL int	remove_vnode(nspace_id nsid, vnode_id vnid);
+extern _IMPEXP_KERNEL int	unremove_vnode(nspace_id nsid, vnode_id vnid);
+extern _IMPEXP_KERNEL int	is_vnode_removed(nspace_id nsid, vnode_id vnid);
 
 #ifdef __cplusplus
 }



From stefano.ceccherini at gmail.com  Thu Mar  6 11:28:26 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 6 Mar 2008 11:28:26 +0100
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <1248409612-BeMail@kirilla>
References: <200803060022.m260MshQ020988@sheep.berlios.de>
	<1248409612-BeMail@kirilla>
Message-ID: <894b9700803060228o37284e91h9a923141f96478e@mail.gmail.com>

2008/3/6, Jonas Sundstr?m <jonas at kirilla.com>:

>  That way one doesn't have to make the text selectable
>  and can avoid unintentional edits, like d&d reordering or
>  pasting.

Selectable != Editable.


From revol at free.fr  Thu Mar  6 11:52:32 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Thu, 06 Mar 2008 11:52:32 +0100 CET
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <1248409612-BeMail@kirilla>
Message-ID: <411776126-BeMail@laptop>

> mmu_man at BerliOS <mmu_man at mail.berlios.de> wrote:
> > Author: mmu_man
> > Date: 2008-03-06 01:22:53 +0100 (Thu, 06 Mar 2008)
> > New Revision: 24257
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24257&view=rev
> > 
> > Modified:
> >    haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
> > Log:
> > Make the text view selectable when the query is done,
> > so one can select text, like urls to paste to a browser.
>  ...
> 
> I think would be possible to support clicking a link. Unless
> I'm mistaken one can check whether the text at that BPoint
> has the blueish link color, get the start and end offsets and
> then launch that piece of text via the HTTP URL mime type.
> 
> That way one doesn't have to make the text selectable 
> and can avoid unintentional edits, like d&d reordering or
> pasting.

Just making it selectable (but not editable) as it is not doesn't let 
the user shuffle the text around.
Only select and copy.

Fran?ois.


From mmu_man at mail.berlios.de  Thu Mar  6 11:55:47 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 11:55:47 +0100
Subject: [Haiku-commits] r24264 - haiku/trunk/data/system/boot
Message-ID: <200803061055.m26Atl7I028514@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 11:55:47 +0100 (Thu, 06 Mar 2008)
New Revision: 24264
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24264&view=rev

Modified:
   haiku/trunk/data/system/boot/Bootscript.cd
Log:
Run installer synchronously so quitting it will end the script.


Modified: haiku/trunk/data/system/boot/Bootscript.cd
===================================================================
--- haiku/trunk/data/system/boot/Bootscript.cd	2008-03-06 09:33:09 UTC (rev 24263)
+++ haiku/trunk/data/system/boot/Bootscript.cd	2008-03-06 10:55:47 UTC (rev 24264)
@@ -72,13 +72,13 @@
 
 # Launch Terminal or consoled depending on $SAFEMODE
 if [ "$SAFEMODE" != "yes" ]; then
-	if [ -x /boot/apps/Installer ]; then
-		launch /boot/apps/Installer
-		#/boot/apps/Terminal -x /boot/apps/Installer
+	if [ -x /boot/beos/apps/Installer ]; then
+		/boot/beos/apps/Installer
+		#/boot/beos/apps/Terminal -x /boot/beos/apps/Installer
 	else
-		#launch /boot/apps/Terminal
+		/boot/beos/apps/Terminal
 	fi
-	launch beos/apps/Terminal
+	#launch beos/apps/Terminal
 else
 	launch beos/bin/consoled
 fi



From revol at free.fr  Thu Mar  6 11:58:40 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Thu, 06 Mar 2008 11:58:40 +0100 CET
Subject: [Haiku-commits] r24260 - haiku/trunk/data/system/boot
In-Reply-To: <2010274243-BeMail@zon>
Message-ID: <779153045-BeMail@laptop>

> mmu_man at BerliOS <mmu_man at mail.berlios.de> wrote:
> > +# sync disks
> > +sync
> > +
> > +# prepare for reboot
> > +# (reboot quickly in 10 seconds)
> > +# (we must start the shutdown process before /boot is ejected)
> > +/bin/shutdown -r -q -d 10 &
> > +
> > +# unblock the CD tray
> > +/bin/eject -u /boot
> > +# and open it before rebooting
> > +/bin/eject /boot
> 
> Since it never waits for any app to finish, this will probably not 
> work, I guess, or did I overlook something?

I did I think.
I was looking at the zeta one, but didn't notice it wasn't using launch 
for Installer so I just copy-pasted stuff.
Still it doesn't go that far here.

Fran?ois.


From stippi at mail.berlios.de  Thu Mar  6 12:02:49 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 6 Mar 2008 12:02:49 +0100
Subject: [Haiku-commits] r24265 - in haiku/trunk: data/artwork/icons
	src/preferences/mail
Message-ID: <200803061102.m26B2nSe028974@sheep.berlios.de>

Author: stippi
Date: 2008-03-06 12:02:48 +0100 (Thu, 06 Mar 2008)
New Revision: 24265
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24265&view=rev

Modified:
   haiku/trunk/data/artwork/icons/Prefs_Mail
   haiku/trunk/src/preferences/mail/e-mail.rdef
Log:
Tweaked the pen shadow to be a bit smaller.


Modified: haiku/trunk/data/artwork/icons/Prefs_Mail
===================================================================
(Binary files differ)

Modified: haiku/trunk/src/preferences/mail/e-mail.rdef
===================================================================
--- haiku/trunk/src/preferences/mail/e-mail.rdef	2008-03-06 10:55:47 UTC (rev 24264)
+++ haiku/trunk/src/preferences/mail/e-mail.rdef	2008-03-06 11:02:48 UTC (rev 24265)
@@ -39,7 +39,7 @@
 	$"020006022E56F335D63CB97D683220C948CD3E4BB3CA00FFE2CEFFA67C620200"
 	$"1602320FFC35FEF8B8E7A334FFA04A967B4B950500F5FF94020006022E56F335"
 	$"D63CB97D683220C948ED3E4BB3CA00FFDBD5FFFCA98F190610AAAC2FFE465631"
-	$"5C2B5E31604A4D5E4D604D5C4A5CC2FC564C56C41E564E5653535155C788C71B"
+	$"5B2B5D315F4A4D5D4D5F4D5B4A5BC2FC564C56C41E564E5653535155C788C71B"
 	$"C9764E5B5F48CB8147CB8147CC4D4460406043603D5C3B5E3C5C3B0204464745"
 	$"3BC291BE263C2DC189B9DE382B2F2D342B342D392F362DBFCBBADC0608FEAF5A"
 	$"405A345A345A2B4E23572649213F2545223F252E2D2E2DB7AFB8FEB6FDBC282A"



From stippi at mail.berlios.de  Thu Mar  6 12:06:02 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 6 Mar 2008 12:06:02 +0100
Subject: [Haiku-commits] r24266 - in haiku/trunk: data/artwork/icons
	src/tests/kits/opengl/direct_mode
Message-ID: <200803061106.m26B62v0029275@sheep.berlios.de>

Author: stippi
Date: 2008-03-06 12:06:02 +0100 (Thu, 06 Mar 2008)
New Revision: 24266
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24266&view=rev

Added:
   haiku/trunk/data/artwork/icons/App_GLDirectMode
   haiku/trunk/src/tests/kits/opengl/direct_mode/GLDirectMode.rdef
Modified:
   haiku/trunk/src/tests/kits/opengl/direct_mode/GLDirectMode.cpp
   haiku/trunk/src/tests/kits/opengl/direct_mode/Jamfile
Log:
Created a simple icon for this demo.


Added: haiku/trunk/data/artwork/icons/App_GLDirectMode
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/artwork/icons/App_GLDirectMode
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: haiku/trunk/src/tests/kits/opengl/direct_mode/GLDirectMode.cpp
===================================================================
--- haiku/trunk/src/tests/kits/opengl/direct_mode/GLDirectMode.cpp	2008-03-06 11:02:48 UTC (rev 24265)
+++ haiku/trunk/src/tests/kits/opengl/direct_mode/GLDirectMode.cpp	2008-03-06 11:06:02 UTC (rev 24266)
@@ -58,7 +58,7 @@
 
 
 SampleGLApp::SampleGLApp()
-   : BApplication("application/x-vnd.sample")
+   : BApplication("application/x-vnd.Haiku-GLDirectMode")
 {
    BRect windowRect;
    uint32 type = BGL_RGB|BGL_DOUBLE|BGL_DEPTH;

Added: haiku/trunk/src/tests/kits/opengl/direct_mode/GLDirectMode.rdef
===================================================================
--- haiku/trunk/src/tests/kits/opengl/direct_mode/GLDirectMode.rdef	2008-03-06 11:02:48 UTC (rev 24265)
+++ haiku/trunk/src/tests/kits/opengl/direct_mode/GLDirectMode.rdef	2008-03-06 11:06:02 UTC (rev 24266)
@@ -0,0 +1,29 @@
+
+resource app_signature "application/x-vnd.Haiku-GLDirectMode";
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+
+	/* 0 = development	1 = alpha			2 = beta
+	   3 = gamma		4 = golden master	5 = final */
+	variety = 5,
+
+	internal = 3,
+
+	short_info = "GLDirectMode",
+	long_info = "GLDirectMode ?2008 Haiku"
+};
+
+resource vector_icon {
+	$"6E636966050500020006023B55F13C5CD2BE755C3D78974A454E48FFCB00D3F5"
+	$"91FF05C080020006023CD471BA2F923B0FF33DF6F048DA184417BB00E5FFB3FF"
+	$"FF8282020006023C318B3A487CBD09B43EEB2D4B485C48176F00DE4E4EFF0537"
+	$"C704016D050A062231224E3E5C5248522D37260A042231224E3E5C3E3A0A0422"
+	$"313E3A522D37260A043E5C5248522D3E3A0A043E5E4E5E60485444050A040104"
+	$"000A0001001001178400040A010101000A020102000A03010300"
+};
+

Modified: haiku/trunk/src/tests/kits/opengl/direct_mode/Jamfile
===================================================================
--- haiku/trunk/src/tests/kits/opengl/direct_mode/Jamfile	2008-03-06 11:02:48 UTC (rev 24265)
+++ haiku/trunk/src/tests/kits/opengl/direct_mode/Jamfile	2008-03-06 11:06:02 UTC (rev 24266)
@@ -12,4 +12,5 @@
 SimpleTest GLDirectMode :
 	GLDirectMode.cpp
 	: be game libGL.so
+	: GLDirectMode.rdef
 ;



From stippi at mail.berlios.de  Thu Mar  6 12:15:09 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 6 Mar 2008 12:15:09 +0100
Subject: [Haiku-commits] r24267 - haiku/trunk/src/servers/app
Message-ID: <200803061115.m26BF9Ir030281@sheep.berlios.de>

Author: stippi
Date: 2008-03-06 12:15:09 +0100 (Thu, 06 Mar 2008)
New Revision: 24267
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24267&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/ViewLayer.cpp
Log:
I was trying to fix Firefox redraw problems, but this change does not
help. However it appears I might have fixed the GL apps drawing over
other windows. Cannot reproduce this problem anymore, but it may be
that this bug doesn't show on my new setup (32bit double buffered VESA).


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-06 11:06:02 UTC (rev 24266)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-06 11:15:09 UTC (rev 24267)
@@ -1821,6 +1821,7 @@
 				// of the previous state
 				fCurrentLayer->SetUserClipping(NULL);
 			}
+			fCurrentDrawingRegionValid = false;
 
 			break;
 		}

Modified: haiku/trunk/src/servers/app/ViewLayer.cpp
===================================================================
--- haiku/trunk/src/servers/app/ViewLayer.cpp	2008-03-06 11:06:02 UTC (rev 24266)
+++ haiku/trunk/src/servers/app/ViewLayer.cpp	2008-03-06 11:15:09 UTC (rev 24267)
@@ -1182,7 +1182,7 @@
 		return;
 	}
 
-	bool rebuildClipping = fDrawState->ClippingRegion() != NULL;
+	bool rebuildClipping = true; //fDrawState->ClippingRegion() != NULL;
 
 	fDrawState = fDrawState->PopState();
 	fDrawState->SetSubPixelPrecise(fFlags & B_SUBPIXEL_PRECISE);



From stippi at mail.berlios.de  Thu Mar  6 13:42:17 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 6 Mar 2008 13:42:17 +0100
Subject: [Haiku-commits] r24268 - haiku/trunk/build/jam
Message-ID: <200803061242.m26CgHwZ024849@sheep.berlios.de>

Author: stippi
Date: 2008-03-06 13:42:16 +0100 (Thu, 06 Mar 2008)
New Revision: 24268
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24268&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Thank you very much, BitmapDrawing, you have served us well. You may go and
play outside now.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2008-03-06 11:15:09 UTC (rev 24267)
+++ haiku/trunk/build/jam/HaikuImage	2008-03-06 12:42:16 UTC (rev 24268)
@@ -57,7 +57,7 @@
 	FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen
 	ScreenSaver Sounds Time VirtualMemory
 ;
-BEOS_DEMOS = BitmapDrawing BSnow Chart Clock $(X86_ONLY)Cortex FontDemo
+BEOS_DEMOS = BSnow Chart Clock $(X86_ONLY)Cortex FontDemo
 	$(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot PictureTest
 	Playground Pulse Sudoku
 ;



From axeld at mail.berlios.de  Thu Mar  6 13:55:41 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 6 Mar 2008 13:55:41 +0100
Subject: [Haiku-commits] r24269 - haiku/trunk/src/servers/app
Message-ID: <200803061255.m26CtfYj026782@sheep.berlios.de>

Author: axeld
Date: 2008-03-06 13:55:41 +0100 (Thu, 06 Mar 2008)
New Revision: 24269
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24269&view=rev

Modified:
   haiku/trunk/src/servers/app/Desktop.cpp
   haiku/trunk/src/servers/app/Desktop.h
   haiku/trunk/src/servers/app/WindowLayer.cpp
Log:
* In normal mouse mode, the focus list is no longer used to find the 
  next window to get focus after the current one is gone. This fixes the
  strange behaviour when using right-click to send the current window to
  the back.
* When FFM is active, Desktop::SendWindowBehind() will now choose the 
  new focus window to be the one under the mouse, overriding the focus 
  list.
* Desktop::SendWindowBehind() will now also call _SendFakeMouseMoved()
  if necessary.
* Removed Desktop::fFocusFollowsMouse; it was not used or 
  maintained anywhere.
* Minor cleanup.


Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2008-03-06 12:42:16 UTC (rev 24268)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2008-03-06 12:55:41 UTC (rev 24269)
@@ -322,8 +322,6 @@
 
 	fWindowLock("window lock"),
 
-	fFocusFollowsMouse(false),
-
 	fMouseEventWindow(NULL),
 	fWindowUnderMouse(NULL),
 	fViewUnderMouse(B_NULL_TOKEN),
@@ -1316,7 +1314,7 @@
 
 	bool hasModal = _WindowHasModal(focus);
 
-	// TODO: test for FFM and B_LOCK_WINDOW_FOCUS
+	// TODO: test for B_LOCK_WINDOW_FOCUS
 
 	if (focus == fFocus && focus != NULL && !focus->IsHidden()
 		&& (focus->Flags() & B_AVOID_FOCUS) == 0 && !hasModal) {
@@ -1325,16 +1323,30 @@
 		return;
 	}
 
-	if (focus == NULL || hasModal)
-		focus = fFocusList.LastWindow();
+	uint32 list = fCurrentWorkspace;
 
+	if (fSettings->FocusFollowsMouse())
+		list = kFocusList;
+
+	if (focus == NULL || hasModal) {
+		if (!fSettings->FocusFollowsMouse()) {
+			focus = FrontWindow();
+			if (focus == NULL) {
+				// there might be no front window in case of only a single
+				// window with B_FLOATING_ALL_WINDOW_FEEL
+				focus = _CurrentWindows().LastWindow();
+			}
+		} else
+			focus = fFocusList.LastWindow();
+	}
+
 	// make sure no window is chosen that doesn't want focus or cannot have it
 	while (focus != NULL
 		&& (!focus->InWorkspace(fCurrentWorkspace)
 			|| (focus->Flags() & B_AVOID_FOCUS) != 0
 			|| _WindowHasModal(focus)
 			|| focus->IsHidden())) {
-		focus = focus->PreviousWindow(kFocusList);
+		focus = focus->PreviousWindow(list);
 	}
 
 	if (fFocus == focus) {
@@ -1571,10 +1583,19 @@
 	MarkDirty(dirty);
 
 	_UpdateFronts();
-	SetFocusWindow();
+	SetFocusWindow(fSettings->FocusFollowsMouse() ?
+		WindowAt(fLastMousePosition) : NULL);
+
+	bool sendFakeMouseMoved = false;
+	if (FocusWindow() != window)
+		sendFakeMouseMoved = true;
+
 	_WindowChanged(window);
 
 	UnlockAllWindows();
+
+	if (sendFakeMouseMoved)
+		_SendFakeMouseMoved();
 }
 
 

Modified: haiku/trunk/src/servers/app/Desktop.h
===================================================================
--- haiku/trunk/src/servers/app/Desktop.h	2008-03-06 12:42:16 UTC (rev 24268)
+++ haiku/trunk/src/servers/app/Desktop.h	2008-03-06 12:55:41 UTC (rev 24269)
@@ -269,8 +269,6 @@
 		BRegion					fBackgroundRegion;
 		BRegion					fScreenRegion;
 
-		bool					fFocusFollowsMouse;
-
 		WindowLayer*			fMouseEventWindow;
 		const WindowLayer*		fWindowUnderMouse;
 		int32					fViewUnderMouse;

Modified: haiku/trunk/src/servers/app/WindowLayer.cpp
===================================================================
--- haiku/trunk/src/servers/app/WindowLayer.cpp	2008-03-06 12:42:16 UTC (rev 24268)
+++ haiku/trunk/src/servers/app/WindowLayer.cpp	2008-03-06 12:55:41 UTC (rev 24269)
@@ -128,7 +128,7 @@
 	fMinHeight(1),
 	fMaxHeight(32768)
 {
-	// make sure our arguments are valid 
+	// make sure our arguments are valid
 	if (!IsValidLook(fLook))
 		fLook = B_TITLED_WINDOW_LOOK;
 	if (!IsValidFeel(fFeel))
@@ -432,7 +432,7 @@
 			region->OffsetBy(-xOffset, -yOffset);
 			// the part which we can copy is not dirty
 			newDirty->Exclude(region);
-	
+
 			fDrawingEngine->CopyRegion(region, xOffset, yOffset);
 
 			// move along the already dirty regions that are common
@@ -485,22 +485,22 @@
 WindowLayer::SetTopLayer(ViewLayer* topLayer)
 {
 	fTopLayer = topLayer;
-	
+
 	if (fTopLayer) {
 		// the top layer is special, it has a coordinate system
 		// as if it was attached directly to the desktop, therefor,
 		// the coordinate conversion through the layer tree works
 		// as expected, since the top layer has no "parent" but has
 		// fFrame as if it had
-	
+
 		// make sure the location of the top layer on screen matches ours
 		fTopLayer->MoveBy(fFrame.left - fTopLayer->Frame().left,
 			fFrame.top - fTopLayer->Frame().top, NULL);
-	
+
 		// make sure the size of the top layer matches ours
 		fTopLayer->ResizeBy(fFrame.Width() - fTopLayer->Frame().Width(),
 			fFrame.Height() - fTopLayer->Frame().Height(), NULL);
-	
+
 		fTopLayer->AttachedToWindow(this);
 	}
 }
@@ -592,7 +592,7 @@
 		// when the dirty region was empty.
 		// NOTE: when the window thread has processed
 		// the dirty region in MessageReceived(),
-		// it will make the region empty again, 
+		// it will make the region empty again,
 		// when it is empty here, we need to send
 		// the message to initiate the next update round.
 		// Until the message is processed in the window
@@ -614,7 +614,7 @@
 	if (IsVisible()) {
 		_DrawBorder();
 
-		BRegion* dirtyContentRegion = 
+		BRegion* dirtyContentRegion =
 			fRegionPool.GetRegion(VisibleContentRegion());
 		dirtyContentRegion->IntersectWith(&fDirtyRegion);
 
@@ -812,7 +812,7 @@
 
 			// activate window if not in FFM mode
 			DesktopSettings desktopSettings(fDesktop);
-			if (desktopSettings.MouseMode() == B_NORMAL_MOUSE) {
+			if (!desktopSettings.FocusFollowsMouse()) {
 				fDesktop->ActivateWindow(this);
 			} else {
 				// actually, the window should already be
@@ -838,7 +838,7 @@
 				// Activate window in case it doesn't accept first click, and
 				// we're not in FFM mode
 				if ((Flags() & B_WILL_ACCEPT_FIRST_CLICK) == 0
-					&& desktopSettings.MouseMode() == B_NORMAL_MOUSE)
+					&& !desktopSettings.FocusFollowsMouse())
 					fDesktop->ActivateWindow(this);
 
 				// Eat the click if we don't accept first click
@@ -1046,7 +1046,7 @@
 
 	// change focus in FFM mode
 	DesktopSettings desktopSettings(fDesktop);
-	if (desktopSettings.MouseMode() != B_NORMAL_MOUSE
+	if (desktopSettings.FocusFollowsMouse()
 		&& !IsFocus() && !(Flags() & B_AVOID_FOCUS)) {
 		fDesktop->SetFocusWindow(this);
 	}
@@ -1078,7 +1078,7 @@
 	activatedMsg.AddBool("active", active);
 
 	ServerWindow()->SendMessageToClient(&activatedMsg);
-	
+
 	if (active)
 		fWindow->HandleDirectConnection(B_DIRECT_START | B_BUFFER_RESET);
 }



From mmu_man at mail.berlios.de  Thu Mar  6 14:48:54 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 14:48:54 +0100
Subject: [Haiku-commits] r24270 - haiku/trunk/data/system/boot
Message-ID: <200803061348.m26Dmso2000707@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 14:48:54 +0100 (Thu, 06 Mar 2008)
New Revision: 24270
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24270&view=rev

Modified:
   haiku/trunk/data/system/boot/Bootscript.cd
Log:
It seems we need syslog daemon to get to the desktop... something wants it somewhere...
At least it boots to the Installer now :)


Modified: haiku/trunk/data/system/boot/Bootscript.cd
===================================================================
--- haiku/trunk/data/system/boot/Bootscript.cd	2008-03-06 12:55:41 UTC (rev 24269)
+++ haiku/trunk/data/system/boot/Bootscript.cd	2008-03-06 13:48:54 UTC (rev 24270)
@@ -66,7 +66,7 @@
 fi
 
 if [ "$SAFEMODE" != "yes" ]; then
-	#launch $SERVERS/syslog_daemon
+	launch $SERVERS/syslog_daemon
 	waitfor _input_server_event_loop_		# wait for input devices
 fi
 



From mmu_man at mail.berlios.de  Thu Mar  6 15:27:18 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 15:27:18 +0100
Subject: [Haiku-commits] r24271 - haiku/trunk/src/servers/app
Message-ID: <200803061427.m26ERI1t003747@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 15:27:18 +0100 (Thu, 06 Mar 2008)
New Revision: 24271
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24271&view=rev

Modified:
   haiku/trunk/src/servers/app/Desktop.cpp
Log:
Fix tracing.


Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2008-03-06 13:48:54 UTC (rev 24270)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2008-03-06 14:27:18 UTC (rev 24271)
@@ -50,7 +50,7 @@
 
 //#define DEBUG_DESKTOP
 #ifdef DEBUG_DESKTOP
-#	define STRACE(a) printf(a)
+#	define STRACE(a) printf a
 #else
 #	define STRACE(a) ;
 #endif



From mmu_man at mail.berlios.de  Thu Mar  6 15:44:32 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 15:44:32 +0100
Subject: [Haiku-commits] r24272 - haiku/branches/developer
Message-ID: <200803061444.m26EiWTc006328@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 15:44:32 +0100 (Thu, 06 Mar 2008)
New Revision: 24272
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24272&view=rev

Added:
   haiku/branches/developer/mmu_man/
Log:
Let's try to see how branches work...




From axeld at pinc-software.de  Thu Mar  6 16:35:12 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 06 Mar 2008 16:35:12 +0100 CET
Subject: [Haiku-commits] r24270 - haiku/trunk/data/system/boot
In-Reply-To: <200803061348.m26Dmso2000707@sheep.berlios.de>
Message-ID: <17902337716-BeMail@zon>

mmu_man at BerliOS <mmu_man at mail.berlios.de> wrote:
> Modified:
>    haiku/trunk/data/system/boot/Bootscript.cd
> Log:
> It seems we need syslog daemon to get to the desktop... something 
> wants it somewhere...
> At least it boots to the Installer now :)
[...]
>  if [ "$SAFEMODE" != "yes" ]; then
> -	#launch $SERVERS/syslog_daemon
> +	launch $SERVERS/syslog_daemon
>  	waitfor _input_server_event_loop_		# wait for input devices
>  fi

The input_server is probably not started as long as the app_server 
doesn't need it (ie. when there is no application using it), so you 
shouldn't do a waitfor here.
Since there will likely only be a single input_server even in multi-
user setups, I guess we might want to change that. I'll have a look :-)

Bye,
   Axel.



From mauricek at mail.berlios.de  Thu Mar  6 18:43:44 2008
From: mauricek at mail.berlios.de (mauricek at BerliOS)
Date: Thu, 6 Mar 2008 18:43:44 +0100
Subject: [Haiku-commits] r24273 - in
	haiku/trunk/src/add-ons/media/media-add-ons: . videowindow
Message-ID: <200803061743.m26HhiEo016867@sheep.berlios.de>

Author: mauricek
Date: 2008-03-06 18:43:41 +0100 (Thu, 06 Mar 2008)
New Revision: 24273
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24273&view=rev

Added:
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/Jamfile
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/debug.h
Modified:
   haiku/trunk/src/add-ons/media/media-add-ons/Jamfile
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.h
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.h
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.h
Log:
- Compile fix/Added missing files
- Implemented missing functionality
- Added debug.h from other media addons for nicer debug.
- Instead of using the MediaNode inside the View, the node should control the view and the window in the case it is instantiated from an addon.
- During the connection process the VideoNode tried to allocate overlay buffers. This can fail for multiple reasons like there is already someone using overlay or it is not supported at all due to driver limitations. In that case try to get non overlay buffers. If this fails, the Connect() can still return an error.



Modified: haiku/trunk/src/add-ons/media/media-add-ons/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/Jamfile	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/Jamfile	2008-03-06 17:43:41 UTC (rev 24273)
@@ -14,4 +14,5 @@
 SubInclude HAIKU_TOP src add-ons media media-add-ons usb_vision ;
 SubInclude HAIKU_TOP src add-ons media media-add-ons usb_webcam ;
 SubInclude HAIKU_TOP src add-ons media media-add-ons video_producer_demo ;
+SubInclude HAIKU_TOP src add-ons media media-add-ons videowindow ;
 

Added: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/Jamfile	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/Jamfile	2008-03-06 17:43:41 UTC (rev 24273)
@@ -0,0 +1,9 @@
+SubDir HAIKU_TOP src add-ons media media-add-ons videowindow ;
+
+Addon video_window_demo.media_addon :
+    VideoAddOn.cpp
+    VideoNode.cpp
+    VideoView.cpp
+    VideoWindow.cpp
+	: be media
+;

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp	2008-03-06 17:43:41 UTC (rev 24273)
@@ -1,6 +1,102 @@
 /*
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
+ * Copyright (C) 2006-2008 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
+ * Copyright (C) 2008 Maurice Kalinowski <haiku at kaldience.com>. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
  */
 #include "VideoAddOn.h"
+#include "VideoNode.h"
+#include "VideoView.h"
+#include "debug.h"
+
+
+#include <stdio.h>
+#include <string.h>
+
+
+VideoWindowAddOn::VideoWindowAddOn(image_id id)
+		: BMediaAddOn(id)
+{
+	CALLED();
+	fInfo.internal_id = 0;
+	fInfo.name = strdup("VideoWindow Consumer");
+	fInfo.info = strdup("This node displays a simple video window");
+	fInfo.kinds = B_BUFFER_CONSUMER;
+	fInfo.flavor_flags = 0;
+	fInfo.possible_count = 0;
+	fInfo.in_format_count = 1;
+	media_format *inFormat = new media_format;
+	inFormat->type = B_MEDIA_RAW_VIDEO;
+	inFormat->u.raw_video = media_raw_video_format::wildcard;
+	fInfo.in_formats = inFormat;
+}
+
+
+VideoWindowAddOn::~VideoWindowAddOn()
+{
+}
+
+
+	
+bool
+VideoWindowAddOn::WantsAutoStart()
+{
+	CALLED();
+	return false;
+}
+
+
+int32
+VideoWindowAddOn::CountFlavors()
+{
+	CALLED();
+	return 1;
+}
+
+
+status_t
+VideoWindowAddOn::GetFlavorAt(int32 cookie, const flavor_info **flavorInfo)
+{
+	CALLED();
+	if (cookie != 0)
+		return B_BAD_INDEX;
+	if (!flavorInfo || !*flavorInfo)
+		return B_ERROR;
+
+	*flavorInfo = &fInfo;
+	return B_OK;
+}
+
+
+BMediaNode*
+VideoWindowAddOn::InstantiateNodeFor(const flavor_info *info, BMessage*, status_t *outError)
+{
+	CALLED();
+	if (!outError)
+		return NULL;
+
+	if (info->in_formats[0].type != B_MEDIA_RAW_VIDEO) {
+		*outError = B_MEDIA_BAD_FORMAT;
+		return NULL;
+	}
+
+	BRect size;
+	if (info->in_formats[0].u.raw_video.display.line_width != 0)
+		size.right = info->in_formats[0].u.raw_video.display.line_width;
+	else
+		size.right = 320;
+	if (info->in_formats[0].u.raw_video.display.line_count != 0)
+		size.bottom = info->in_formats[0].u.raw_video.display.line_count;
+	else
+		size.bottom = 240;
+
+	VideoNode* node = new VideoNode("Video Node", this, info->internal_id);
+
+	return node;
+}
+
+
+extern "C" BMediaAddOn *make_media_addon(image_id id)
+{
+	return new VideoWindowAddOn(id);
+}

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h	2008-03-06 17:43:41 UTC (rev 24273)
@@ -1,18 +1,29 @@
 /*
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
+ * Copyright (C) 2006-2008 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
+ * Copyright (C) 2008 Maurice Kalinowski <haiku at kaldience.com>. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
  */
 #ifndef __VIDEO_ADD_ON_H
 #define __VIDEO_ADD_ON_H
 
+
 #include <MediaAddOn.h>
 
-class MediaAddOn : public BMediaAddOn
+
+class VideoWindowAddOn : public BMediaAddOn
 {
 public:
+								VideoWindowAddOn(image_id);
+								~VideoWindowAddOn();
 
+	bool						WantsAutoStart();
+	int32						CountFlavors();
+	status_t					GetFlavorAt(int32, const flavor_info**);
+	BMediaNode*					InstantiateNodeFor(const flavor_info*, BMessage*, status_t*);
+
 private:
+	flavor_info					fInfo;
 };
 
 extern "C" BMediaAddOn *make_media_addon(image_id id);

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp	2008-03-06 17:43:41 UTC (rev 24273)
@@ -1,51 +1,78 @@
 /*
  * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
+ * Copyright (C) 2008 Maurice Kalinowski <haiku at kaldience.com>. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
  */
+#include "VideoNode.h"
+#include "VideoView.h"
+#include "VideoWindow.h"
+
+
+#include <Bitmap.h>
+#include <Buffer.h>
+#include <BufferGroup.h>
+#include <Debug.h>
+#include <MediaRoster.h>
+#include <Locker.h>
+#include <TimeSource.h>
+#include <Window.h>
 #include <stdio.h>
 #include <string.h>
-#include <Window.h>
-#include <TimeSource.h>
-#include <MediaRoster.h>
-#include <BufferGroup.h>
-#include <Buffer.h>
-#include <Bitmap.h>
-#include <Locker.h>
-#include <Debug.h>
 
-#include "VideoNode.h"
-#include "VideoView.h"
 
+VideoNode::VideoNode(const char *name)
+ :	BMediaNode(name)
+ ,	BMediaEventLooper()
+ ,	BBufferConsumer(B_MEDIA_RAW_VIDEO)
+ ,	fWindow(0)
+ ,	fVideoView(0)
+ ,	fInput()
+ ,	fOverlayEnabled(true)
+ ,	fOverlayActive(false)
+ ,	fDirectOverlayBuffer(false)
+ ,	fBitmap(0)
+ ,	fBitmapLocker(new BLocker("Video Node Locker"))
+ ,	fAddOn(0)
+ ,	fInternalFlavorId(0)
+{
+	_InitDisplay();
+}
 
-VideoNode::VideoNode(const char *name, VideoView *view)
+
+VideoNode::VideoNode(const char *name, BMediaAddOn* addon, int32 id)
  :	BMediaNode(name)
  ,	BMediaEventLooper()
  ,	BBufferConsumer(B_MEDIA_RAW_VIDEO)
- ,	fVideoView(view)
+ ,	fWindow(0)
+ ,	fVideoView(0)
  ,	fInput()
  ,	fOverlayEnabled(true)
  ,	fOverlayActive(false)
  ,	fDirectOverlayBuffer(false)
  ,	fBitmap(0)
  ,	fBitmapLocker(new BLocker("Video Node Locker"))
+ ,	fAddOn(addon)
+ ,	fInternalFlavorId(id)
 {
+	_InitDisplay();
 }
 
-
 VideoNode::~VideoNode()
 {
 	Quit();
 	DeleteBuffers();
 	delete fBitmapLocker;
+	if (fWindow)
+		fWindow->Quit();
 }
 
 
 BMediaAddOn	*
 VideoNode::AddOn(int32 *internal_id) const
 {
-	*internal_id = 0;
-	return NULL;
+	*internal_id = fInternalFlavorId;
+	return fAddOn;
 }
 
 
@@ -127,7 +154,7 @@
 			HandleBuffer((BBuffer *)event->pointer);
 			break;
 		default:
-			printf("VideoNode::HandleEvent unknown event");
+			fprintf(stderr, "VideoNode::HandleEvent unknown event");
 			break;
 	}			
 }
@@ -149,12 +176,13 @@
 {
 	if (dst != fInput.destination)
 		return B_MEDIA_BAD_DESTINATION;
-	
+
 	*out_latency = 10000;
 	*out_id = TimeSource()->ID();
 	return B_OK;
 }
 
+
 status_t
 VideoNode::AcceptFormat(const media_destination &dst,
 						media_format *format)
@@ -166,17 +194,15 @@
 	 *                BBufferConsumer::Connected
 	 *                BBufferProducer::Connect
 	 */
-	
 	if (dst != fInput.destination)
 		return B_MEDIA_BAD_DESTINATION;	
-	
+
 	if (format->type == B_MEDIA_NO_TYPE)
 		format->type = B_MEDIA_RAW_VIDEO;
-	
+
 	if (format->type != B_MEDIA_RAW_VIDEO)
 		return B_MEDIA_BAD_FORMAT;
 
-
 	return B_OK;	
 }
 
@@ -210,15 +236,19 @@
 
 	DeleteBuffers();
 	err = CreateBuffers(frame, colorspace, fOverlayEnabled);
+	if (err && fOverlayEnabled) {
+		SetOverlayEnabled(false);
+		err = CreateBuffers(frame, colorspace, fOverlayEnabled);
+	}
+
 	if (err) {
-		printf("VideoNode::Connected failed, fOverlayEnabled = %d\n", fOverlayEnabled);
+		fprintf(stderr, "VideoNode::Connected failed, fOverlayEnabled = %d\n", fOverlayEnabled);
 		return err;
 	}	
 
 	*out_input = fInput;
 
 	return B_OK;
-	
 }
 
 
@@ -244,7 +274,6 @@
 						 int32 from_change_count,
 						 const media_format &format)
 {
-	printf("VideoNode::FormatChanged enter\n");
 	if (src != fInput.source)
 		return B_MEDIA_BAD_SOURCE;
 	if (dst != fInput.destination)
@@ -259,20 +288,20 @@
 		fVideoView->RemoveOverlay();
 		err = CreateBuffers(frame, colorspace, true); // try overlay
 		if (err) {
-			printf("VideoNode::FormatChanged creating overlay buffer failed\n");
+			fprintf(stderr, "VideoNode::FormatChanged creating overlay buffer failed\n");
 			err = CreateBuffers(frame, colorspace, false); // no overlay
 		}
 	} else {
 		err = CreateBuffers(frame, colorspace, false); // no overlay
 	}
+
 	if (err) {
-		printf("VideoNode::FormatChanged failed (lost buffer group!)\n");
+		fprintf(stderr, "VideoNode::FormatChanged failed (lost buffer group!)\n");
 		return B_MEDIA_BAD_FORMAT;
 	}	
 
 	fInput.format = format;
 
-	printf("VideoNode::FormatChanged leave\n");
 	return B_OK;	
 }
 
@@ -280,10 +309,8 @@
 void
 VideoNode::HandleBuffer(BBuffer *buffer)
 {
-//	printf("VideoNode::HandleBuffer\n");
-	
 	LockBitmap();
-	if (fBitmap) {
+	if (fBitmap && fWindow && fVideoView) {
 //		bigtime_t start = system_time();
 		if (fOverlayActive) {
 			if (B_OK == fBitmap->LockBits()) {
@@ -341,8 +368,8 @@
 status_t
 VideoNode::CreateBuffers(BRect frame, color_space cspace, bool overlay)
 {
-	printf("VideoNode::CreateBuffers: frame %d,%d,%d,%d colorspace 0x%08x, overlay %d\n", 
-		int(frame.left), int(frame.top), int(frame.right), int(frame.bottom), int(cspace), overlay);
+	//printf("VideoNode::CreateBuffers: frame %d,%d,%d,%d colorspace 0x%08x, overlay %d\n", 
+	//	int(frame.left), int(frame.top), int(frame.right), int(frame.bottom), int(cspace), overlay);
 
 	LockBitmap();
 	ASSERT(fBitmap == 0);
@@ -353,12 +380,12 @@
 		fBitmap = 0;
 		fOverlayActive = false;
 		UnlockBitmap();
-		printf("VideoNode::CreateBuffers failed\n");
+		fprintf(stderr, "VideoNode::CreateBuffers failed\n");
 		return B_ERROR;
 	}
 	fOverlayActive = overlay;
 	UnlockBitmap();
-	printf("VideoNode::CreateBuffers success\n");
+
 	return B_OK;
 }
 
@@ -371,3 +398,16 @@
 	fBitmap = NULL;
 	UnlockBitmap();
 }
+
+
+void
+VideoNode::_InitDisplay()
+{
+	// TODO: Get rid of hardcoded values
+	BRect size(0,0,320,240);
+	fVideoView = new VideoView(size, "Video View", B_FOLLOW_ALL_SIDES, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE, this);
+
+	size.OffsetBy(40.f, 40.f);
+	fWindow = new VideoWindow(size, fVideoView);
+	fWindow->Show();
+}

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.h	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoNode.h	2008-03-06 17:43:41 UTC (rev 24273)
@@ -1,25 +1,34 @@
 /*
  * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
+ * Copyright (C) 2008 Maurice Kalinowski <haiku at kaldience.com>. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
  */
 #ifndef __VIDEO_NODE_H_
 #define __VIDEO_NODE_H_
 
+
 #include <BufferConsumer.h>
 #include <MediaEventLooper.h>
 
+
+class BBitmap;
+class BLocker;
+class BWindow;
 class VideoView;
+class VideoWindow;
 
+
 class VideoNode : public BMediaEventLooper, public BBufferConsumer
 {
 public:
-					VideoNode(const char *name, VideoView *view);
+					VideoNode(const char *name);
+					VideoNode(const char *name, BMediaAddOn* addon, int32 id);
 					~VideoNode();
 
 	void			SetOverlayEnabled(bool yesno);
 	bool			IsOverlayActive();
-	
+
 	void			LockBitmap();
 	BBitmap *		Bitmap();
 	void			UnlockBitmap();
@@ -52,7 +61,7 @@
 							const media_destination &dst,
 							int32 status,
 							bigtime_t at_media_time);
-															
+
 	status_t		GetLatencyFor(
 							const media_destination &dst,
 							bigtime_t *out_latency,
@@ -74,12 +83,13 @@
 							int32 from_change_count,
 							const media_format &format);
 
-protected:
 	void			HandleBuffer(BBuffer *buffer);
 	status_t		CreateBuffers(BRect frame, color_space cspace, bool overlay);
 	void			DeleteBuffers();
 
-protected:
+private:
+	void			_InitDisplay();
+	VideoWindow *	fWindow;
 	VideoView *		fVideoView;
 	media_input		fInput;
 	bool			fOverlayEnabled;
@@ -87,6 +97,8 @@
 	bool			fDirectOverlayBuffer;	// If the overlay memory is directly written by the producer node.
 	BBitmap *		fBitmap;
 	BLocker	*		fBitmapLocker;
+	BMediaAddOn*	fAddOn;
+	int32			fInternalFlavorId;
 };
 
 #endif

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.cpp	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.cpp	2008-03-06 17:43:41 UTC (rev 24273)
@@ -3,39 +3,32 @@
  *
  * Distributed under the terms of the MIT License.
  */
+#include "VideoNode.h"
+#include "VideoView.h"
+#include "debug.h"
+
 #include <Bitmap.h>
+#include <Locker.h>
 #include <MediaRoster.h>
-#include "VideoView.h"
-#include "VideoNode.h"
+#include <Message.h>
 
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-VideoView::VideoView(BRect frame, const char *name, uint32 resizeMask, uint32 flags)
+
+VideoView::VideoView(BRect frame, const char *name, uint32 resizeMask, uint32 flags, VideoNode *node)
  :	BView(frame, name, resizeMask, flags)
- ,	fVideoNode(0)
+ ,	fVideoNode(node)
  ,	fOverlayActive(false)
 {
 	SetViewColor(B_TRANSPARENT_COLOR);
-
-	status_t err = B_OK;
-	BMediaRoster *mroster = BMediaRoster::Roster(&err);
-	if (!mroster || err) {
-		printf("VideoView::VideoView: media_server is dead\n");
-		exit(1);
-	} else {
-		fVideoNode = new VideoNode("video in", this);
-		err = mroster->RegisterNode(fVideoNode);
-	}
 }
 
 
 VideoView::~VideoView()
 {	
-	if (fVideoNode) {
-		BMediaRoster::Roster()->UnregisterNode(fVideoNode);
-		delete fVideoNode;
-	}
 }
 
 
@@ -55,14 +48,14 @@
 void
 VideoView::OverlayLockAcquire()
 {
-   printf("VideoView::OverlayLockAcquire\n");
+	CALLED();
 }
 
 
 void
 VideoView::OverlayLockRelease()
 {
-   printf("VideoView::OverlayLockRelease\n");
+	CALLED();
 	// overlaybitmap->UnlockBits	
 }
 
@@ -70,7 +63,7 @@
 void
 VideoView::OverlayScreenshotPrepare()
 {
-	printf("OverlayScreenshotPrepare enter\n");
+	CALLED();
 /*
 	fVideoNode->LockBitmap();
 	if (fOverlayActive) {
@@ -88,14 +81,13 @@
 	}
 	fVideoNode->UnlockBitmap();
 */
-	printf("OverlayScreenshotPrepare leave\n");
 }
 
 
 void
 VideoView::OverlayScreenshotCleanup()
 {
-	printf("OverlayScreenshotCleanup enter\n");
+	CALLED();
 /*
 	snooze(50000); // give app server some time to take the screenshot
 	fVideoNode->LockBitmap();
@@ -110,15 +102,14 @@
 	}
 	fVideoNode->UnlockBitmap();
 */
-	printf("OverlayScreenshotCleanup leave\n");
 }
 
 
 void
 VideoView::RemoveVideoDisplay()
 {
-	printf("VideoView::RemoveVideoDisplay\n");
-	
+	CALLED();
+
 	if (fOverlayActive) {
 		ClearViewOverlay();
 		fOverlayActive = false;
@@ -130,7 +121,7 @@
 void
 VideoView::RemoveOverlay()
 {
-	printf("VideoView::RemoveOverlay\n");
+	CALLED();
 	if (LockLooperWithTimeout(50000) == B_OK) {
 		ClearViewOverlay();
 		fOverlayActive = false;
@@ -148,7 +139,10 @@
 	} else {
 		fVideoNode->LockBitmap();
 		BBitmap *bmp = fVideoNode->Bitmap();
-		if (bmp)
+		if (!bmp) {
+			SetHighColor(0, 0, 0, 0);
+			FillRect(updateRect);
+		} else 
 			DrawBitmap(bmp, Bounds());
 		fVideoNode->UnlockBitmap();
 	}
@@ -158,8 +152,8 @@
 void
 VideoView::DrawFrame()
 {
-//	printf("VideoView::DrawFrame\n");
-	
+	//CALLED();
+
 	bool want_overlay = fVideoNode->IsOverlayActive();
 
 	if (!want_overlay && fOverlayActive) {
@@ -168,9 +162,10 @@
 			UnlockLooper();			
 			fOverlayActive = false;
 		} else {
-			printf("can't ClearViewOverlay, as LockLooperWithTimeout failed\n");
+			fprintf(stderr, "VideoView::DrawFrame: cannot ClearViewOverlay, as LockLooperWithTimeout failed\n");
 		}
 	}
+
 	if (want_overlay && !fOverlayActive) {
 		fVideoNode->LockBitmap();
 		BBitmap *bmp = fVideoNode->Bitmap();
@@ -247,4 +242,3 @@
 	}
 	return supported;
 }
-

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.h	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoView.h	2008-03-06 17:43:41 UTC (rev 24273)
@@ -6,19 +6,23 @@
 #ifndef __VIDEO_VIEW_H
 #define __VIDEO_VIEW_H
 
+
 #include <View.h>
 
+
+class BMediaAddOn;
 class VideoNode;
 
+
 class VideoView : public BView
 {
 public:
-					VideoView(BRect frame, const char *name, uint32 resizeMask, uint32 flags);
+					VideoView(BRect frame, const char *name, uint32 resizeMask, uint32 flags, VideoNode *node);
 					~VideoView();
-	
+
 	void			RemoveVideoDisplay();
 	void			RemoveOverlay();
-					
+
 	VideoNode *		Node();
 
 	bool			IsOverlaySupported();
@@ -28,14 +32,14 @@
 
 	void			OverlayScreenshotPrepare();
 	void			OverlayScreenshotCleanup();
-	
+
 	void			DrawFrame();
 
 private:
 	void			AttachedToWindow();
 	void			MessageReceived(BMessage *msg);
 	void			Draw(BRect updateRect);
-	
+
 private:
 	VideoNode *		fVideoNode;
 	bool			fOverlayActive;

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.cpp	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.cpp	2008-03-06 17:43:41 UTC (rev 24273)
@@ -1,11 +1,30 @@
 /*
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
+ * Copyright (C) 2006-2008 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
+ * Copyright (C) 2008 Maurice Kalinowski <haiku at kaldience.com>. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
  */
+#include "VideoWindow.h"
 #include "VideoView.h"
-#include "VideoNode.h"
-#include "VideoWindow.h"
 
-#include <stdio.h>
-#include <string.h>
+
+VideoWindow::VideoWindow(BRect size, VideoView* view)
+		: BWindow(size, "Video Window", B_TITLED_WINDOW, 0)
+		, fVideoView(view)
+{
+	if (fVideoView)
+		AddChild(fVideoView);
+}
+
+
+VideoWindow::~VideoWindow()
+{
+}
+
+
+void
+VideoWindow::MessageReceived(BMessage *msg)
+{
+	if (msg)
+		BWindow::MessageReceived(msg);
+}

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.h	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoWindow.h	2008-03-06 17:43:41 UTC (rev 24273)
@@ -1,24 +1,27 @@
 /*
- * Copyright (C) 2006 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
+ * Copyright (C) 2006-2008 Marcus Overhagen <marcus at overhagen.de>. All rights reserved.
+ * Copyright (C) 2008 Maurice Kalinowski <haiku at kaldience.com>. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
  */
 #ifndef __VIDEO_WINDOW_H
 #define __VIDEO_WINDOW_H
 
+
 #include <Window.h>
 
-class VideoNode;
+
 class VideoView;
 
+
 class VideoWindow : public BWindow
 {
 public:
+	VideoWindow(BRect size, VideoView* view);
+	~VideoWindow();
+	void MessageReceived(BMessage *msg);
 
 private:
-	
-private:
-	VideoNode *		fVideoNode;
 	VideoView *		fVideoView;
 };
 

Added: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/debug.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/debug.h	2008-03-06 14:44:32 UTC (rev 24272)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/debug.h	2008-03-06 17:43:41 UTC (rev 24273)
@@ -0,0 +1,34 @@
+
+#include <stdio.h>
+
+#ifndef NDEBUG
+
+  #ifndef DEBUG
+  	#define DEBUG 2
+  #endif
+
+  #if DEBUG >= 1
+	#define UNIMPLEMENTED()		printf("UNIMPLEMENTED %s\n",__PRETTY_FUNCTION__)
+  #else
+  	#define UNIMPLEMENTED()		((void)0)
+  #endif
+
+  #if DEBUG >= 2
+	#define BROKEN()			printf("BROKEN %s\n",__PRETTY_FUNCTION__)
+  #else
+  	#define BROKEN()			((void)0)
+  #endif
+
+  #if DEBUG >= 3
+	#define CALLED() 			printf("CALLED %s\n",__PRETTY_FUNCTION__)
+  #else
+  	#define CALLED() 			((void)0)
+  #endif
+	
+#else
+
+	#define UNIMPLEMENTED() 	((void)0)
+	#define BROKEN()			((void)0)
+	#define CALLED()			((void)0)
+
+#endif



From axeld at mail.berlios.de  Thu Mar  6 18:46:53 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 6 Mar 2008 18:46:53 +0100
Subject: [Haiku-commits] r24274 - haiku/trunk/src/apps/pulse
Message-ID: <200803061746.m26HkrnN022941@sheep.berlios.de>

Author: axeld
Date: 2008-03-06 18:46:50 +0100 (Thu, 06 Mar 2008)
New Revision: 24274
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24274&view=rev

Modified:
   haiku/trunk/src/apps/pulse/Prefs.cpp
   haiku/trunk/src/apps/pulse/Prefs.h
Log:
* This should fix Pulse's broken behaviour on read-only disks.
* Minor cleanup.


Modified: haiku/trunk/src/apps/pulse/Prefs.cpp
===================================================================
--- haiku/trunk/src/apps/pulse/Prefs.cpp	2008-03-06 17:43:41 UTC (rev 24273)
+++ haiku/trunk/src/apps/pulse/Prefs.cpp	2008-03-06 17:46:50 UTC (rev 24274)
@@ -9,37 +9,45 @@
 //****************************************************************************************
 
 #include "Prefs.h"
-#include "Common.h"
-#include "PulseApp.h"
-#include <FindDirectory.h>
-#include <Path.h>
-#include <interface/Screen.h>
-#include <kernel/OS.h>
+
 #include <stdio.h>
 #include <string.h>
 
+#include <FindDirectory.h>
+#include <OS.h>
+#include <Path.h>
+#include <Screen.h>
+
+#include "Common.h"
+#include "PulseApp.h"
+
+
 Prefs::Prefs()
-: fatalerror(false)
+	:
+	fFatalError(false)
 {
 	BPath path;
 	find_directory(B_USER_SETTINGS_DIRECTORY, &path);
 	path.Append("Pulse_settings");
-	file = new BFile(path.Path(), B_READ_WRITE | B_CREATE_FILE);
-	if (file->InitCheck() != B_OK) {
-		fatalerror = true;
-		return;
+	fFile = new BFile(path.Path(), B_READ_WRITE | B_CREATE_FILE);
+	if (fFile->InitCheck() != B_OK) {
+		// try to open read-only
+		if (fFile->SetTo(path.Path(), B_READ_ONLY) != B_OK) {
+			fFatalError = true;
+			return;
+		}
 	}
 
 	int i = NORMAL_WINDOW_MODE;
 	if (!GetInt("window_mode", &window_mode, &i)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
 	// These three prefs require a connection to the app_server
 	BRect r = GetNormalWindowRect();
 	if (!GetRect("normal_window_rect", &normal_window_rect, &r)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 	// While normal window position is under user control, size is not.
@@ -49,61 +57,61 @@
 	
 	r = GetMiniWindowRect();
 	if (!GetRect("mini_window_rect", &mini_window_rect, &r)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
 	r.Set(100, 100, 415, 329);
 	if (!GetRect("prefs_window_rect", &prefs_window_rect, &r)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
 	i = DEFAULT_NORMAL_BAR_COLOR;
 	if (!GetInt("normal_bar_color", &normal_bar_color, &i)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
 	i = DEFAULT_MINI_ACTIVE_COLOR;
 	if (!GetInt("mini_active_color", &mini_active_color, &i)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
 	i = DEFAULT_MINI_IDLE_COLOR;
 	if (!GetInt("mini_idle_color", &mini_idle_color, &i)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
 	i = DEFAULT_MINI_FRAME_COLOR;
 	if (!GetInt("mini_frame_color", &mini_frame_color, &i)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
 	i = DEFAULT_DESKBAR_ACTIVE_COLOR;
 	if (!GetInt("deskbar_active_color", &deskbar_active_color, &i)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
 	i = DEFAULT_DESKBAR_IDLE_COLOR;
 	if (!GetInt("deskbar_idle_color", &deskbar_idle_color, &i)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
 	i = DEFAULT_DESKBAR_FRAME_COLOR;
 	if (!GetInt("deskbar_frame_color", &deskbar_frame_color, &i)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
 	bool b = DEFAULT_NORMAL_FADE_COLORS;
 	if (!GetBool("normal_fade_colors", &normal_fade_colors, &b)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 
@@ -113,7 +121,7 @@
 	if (i < GetMinimumViewWidth())
 		i = GetMinimumViewWidth();
 	if (!GetInt("deskbar_icon_width", &deskbar_icon_width, &i)) {
-		fatalerror = true;
+		fFatalError = true;
 		return;
 	}
 }
@@ -121,7 +129,7 @@
 
 Prefs::~Prefs()
 {
-	delete file;
+	delete fFile;
 }
 
 
@@ -131,7 +139,8 @@
 	system_info sys_info;
 	get_system_info(&sys_info);
 
-	float height = PROGRESS_MTOP + PROGRESS_MBOTTOM + sys_info.cpu_count * ITEM_OFFSET;
+	float height = PROGRESS_MTOP + PROGRESS_MBOTTOM
+		+ sys_info.cpu_count * ITEM_OFFSET;
 	if (PULSEVIEW_MIN_HEIGHT > height)
 		height = PULSEVIEW_MIN_HEIGHT;
 
@@ -173,17 +182,16 @@
 bool
 Prefs::GetInt(char *name, int *value, int *defaultvalue)
 {
-	status_t err = file->ReadAttr(name, B_INT32_TYPE, 0, value, 4);
+	status_t err = fFile->ReadAttr(name, B_INT32_TYPE, 0, value, 4);
 	if (err == B_ENTRY_NOT_FOUND) {
 		*value = *defaultvalue;
-		if (file->WriteAttr(name, B_INT32_TYPE, 0, defaultvalue, 4) < 0) {
+		if (fFile->WriteAttr(name, B_INT32_TYPE, 0, defaultvalue, 4) < 0) {
 			printf("WriteAttr on %s died\n", name);
-			fatalerror = true;
-			return false;
+			fFatalError = true;
 		}
 	} else if  (err < 0) {
 		printf("Unknown error reading %s:\n%s\n", name, strerror(err));
-		fatalerror = true;
+		fFatalError = true;
 		return false;
 	}
 	return true;
@@ -193,17 +201,16 @@
 bool
 Prefs::GetBool(char *name, bool *value, bool *defaultvalue)
 {
-	status_t err = file->ReadAttr(name, B_BOOL_TYPE, 0, value, 1);
+	status_t err = fFile->ReadAttr(name, B_BOOL_TYPE, 0, value, 1);
 	if (err == B_ENTRY_NOT_FOUND) {
 		*value = *defaultvalue;
-		if (file->WriteAttr(name, B_BOOL_TYPE, 0, defaultvalue, 1) < 0) {
+		if (fFile->WriteAttr(name, B_BOOL_TYPE, 0, defaultvalue, 1) < 0) {
 			printf("WriteAttr on %s died\n", name);
-			fatalerror = true;
-			return false;
+			fFatalError = true;
 		}
 	} else if (err < 0) {
 		printf("Unknown error reading %s:\n%s\n", name, strerror(err));
-		fatalerror = true;
+		fFatalError = true;
 		return false;
 	}
 	return true;
@@ -213,17 +220,16 @@
 bool
 Prefs::GetRect(char *name, BRect *value, BRect *defaultvalue)
 {
-	status_t err = file->ReadAttr(name, B_RECT_TYPE, 0, value, sizeof(BRect));
+	status_t err = fFile->ReadAttr(name, B_RECT_TYPE, 0, value, sizeof(BRect));
 	if (err == B_ENTRY_NOT_FOUND) {
 		*value = *defaultvalue;
-		if (file->WriteAttr(name, B_RECT_TYPE, 0, defaultvalue, sizeof(BRect)) < 0) {
+		if (fFile->WriteAttr(name, B_RECT_TYPE, 0, defaultvalue, sizeof(BRect)) < 0) {
 			printf("WriteAttr on %s died\n", name);
-			fatalerror = true;
-			return false;
+			fFatalError = true;
 		}
 	} else if (err < 0) {
 		printf("Unknown error reading %s:\n%s\n", name, strerror(err));
-		fatalerror = true;
+		fFatalError = true;
 		return false;
 	}
 	return true;
@@ -233,10 +239,10 @@
 bool
 Prefs::PutInt(char *name, int *value)
 {
-	status_t err = file->WriteAttr(name, B_INT32_TYPE, 0, value, 4);
+	status_t err = fFile->WriteAttr(name, B_INT32_TYPE, 0, value, 4);
 	if (err < 0) {
 		printf("Unknown error writing %s:\n%s\n", name, strerror(err));
-		fatalerror = true;
+		fFatalError = true;
 		return false;
 	}
 	return true;
@@ -246,10 +252,10 @@
 bool
 Prefs::PutBool(char *name, bool *value)
 {
-	status_t err = file->WriteAttr(name, B_BOOL_TYPE, 0, value, 1);
+	status_t err = fFile->WriteAttr(name, B_BOOL_TYPE, 0, value, 1);
 	if (err < 0) {
 		printf("Unknown error writing %s:\n%s\n", name, strerror(err));
-		fatalerror = true;
+		fFatalError = true;
 		return false;
 	}
 	return true;
@@ -259,10 +265,10 @@
 bool
 Prefs::PutRect(char *name, BRect *value)
 {
-	status_t err = file->WriteAttr(name, B_RECT_TYPE, 0, value, sizeof(BRect));
+	status_t err = fFile->WriteAttr(name, B_RECT_TYPE, 0, value, sizeof(BRect));
 	if (err < 0) {
 		printf("Unknown error writing %s:\n%s\n", name, strerror(err));
-		fatalerror = true;
+		fFatalError = true;
 		return false;
 	}
 	return true;
@@ -272,7 +278,7 @@
 bool
 Prefs::Save()
 {
-	if (fatalerror)
+	if (fFatalError)
 		return false;
 
 	if (!PutInt("window_mode", &window_mode)

Modified: haiku/trunk/src/apps/pulse/Prefs.h
===================================================================
--- haiku/trunk/src/apps/pulse/Prefs.h	2008-03-06 17:43:41 UTC (rev 24273)
+++ haiku/trunk/src/apps/pulse/Prefs.h	2008-03-06 17:46:50 UTC (rev 24274)
@@ -26,10 +26,8 @@
 			deskbar_active_color, deskbar_idle_color, deskbar_frame_color;
 		bool normal_fade_colors;
 
-		bool fatalerror;
-		
 	private:
-		BFile *file;
+		BFile *fFile;
 
 		bool GetInt(char *name, int *value, int *defaultvalue);
 		bool GetBool(char *name, bool *value, bool *defaultvalue);
@@ -42,6 +40,8 @@
 		void ComputeNormalWindowSize();
 		BRect GetNormalWindowRect();
 		BRect GetMiniWindowRect();
+
+		bool fFatalError;
 };
 
-#endif
+#endif	// PREFS_H



From jonas at kirilla.com  Thu Mar  6 19:25:30 2008
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Thu, 06 Mar 2008 19:25:30 +0100 CET
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <894b9700803060228o37284e91h9a923141f96478e@mail.gmail.com>
Message-ID: <1085715028-BeMail@kirilla>

"Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
> 2008/3/6, Jonas Sundstr?m <jonas at kirilla.com>:
> 
> >  That way one doesn't have to make the text selectable
> >  and can avoid unintentional edits, like d&d reordering or
> >  pasting.
> 
> Selectable != Editable.

Yeah, I know. I had experiences from earlier AboutSystem
(and a much older BTextView probably) still coloring my 
perception of it. I think one used to be able to replace the 
text by doing Alt-A, Alt-V, for example.

Anyway, I think being able to manually select and copy URLs
is a weak reason for keeping this view selectable. Clickable 
URLs should replace it, IMO. I don't think this kind of text 
usually is selectable.

/Jonas.


From mmu_man at mail.berlios.de  Thu Mar  6 19:33:00 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 19:33:00 +0100
Subject: [Haiku-commits] r24275 - in haiku/branches/developer/mmu_man: .
	distro distro/beshare distro/imkit distro/links
	distro/opensound distro/pe distro/vncviewer
Message-ID: <200803061833.m26IX08M017645@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 19:33:00 +0100 (Thu, 06 Mar 2008)
New Revision: 24275
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24275&view=rev

Added:
   haiku/branches/developer/mmu_man/distro/
   haiku/branches/developer/mmu_man/distro/DistroRules
   haiku/branches/developer/mmu_man/distro/Jamfile
   haiku/branches/developer/mmu_man/distro/UserDistroConfig.sample
   haiku/branches/developer/mmu_man/distro/beshare/
   haiku/branches/developer/mmu_man/distro/beshare/Jamfile
   haiku/branches/developer/mmu_man/distro/imkit/
   haiku/branches/developer/mmu_man/distro/imkit/Jamfile
   haiku/branches/developer/mmu_man/distro/links/
   haiku/branches/developer/mmu_man/distro/links/Jamfile
   haiku/branches/developer/mmu_man/distro/opensound/
   haiku/branches/developer/mmu_man/distro/opensound/Jamfile
   haiku/branches/developer/mmu_man/distro/pe/
   haiku/branches/developer/mmu_man/distro/pe/Jamfile
   haiku/branches/developer/mmu_man/distro/vncviewer/
   haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile
Log:
Start of rules to (cross)build 3rd party apps as part of the image (like a distro).
For now vncviewer is automatically fetched from svn and built.


Added: haiku/branches/developer/mmu_man/distro/DistroRules
===================================================================
--- haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 17:46:50 UTC (rev 24274)
+++ haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 18:33:00 UTC (rev 24275)
@@ -0,0 +1,77 @@
+
+# XXX: clean rules ? (remove svn checkouts)
+
+# Include UserDistroConfig.
+{
+        local userDistroConfig
+                = [ GLOB $(DISTRO_TOP) : UserDistroConfig ] ;
+        if $(userDistroConfig) {
+                include $(userDistroConfig) ;
+        }
+}
+
+rule DistroSubDir
+{
+	SubDir HAIKU_TOP $(DISTRO_TOP_RELTOKENS) $(1) ;
+}
+
+rule DistroRepos
+{
+	local srcPath = <$(SOURCE_GRIST)>sources ;
+	MakeLocate $(srcPath) : $(SUBDIR) ;
+	SubDirHdrs [ FDirName $(SUBDIR_TOKENS) sources ] ;
+}
+
+rule DistroLocalRepos
+{
+	local srcPath = <$(SOURCE_GRIST)>sources ;
+	DistroRepos ;
+	if $(DISTRO_$(1)_SOURCES) {
+		Depends sources : $(DISTRO_$(1)_SOURCES) ;
+		#MakeLocate $(srcPath) : $(SUBDIR_TOKENS) ;
+		SymLink $(srcPath) : $(DISTRO_$(1)_SOURCES) ;
+		#DistroLocalReposSymlink1 $(DISTRO_$(1)_SOURCES) ;
+	}
+	# else nothing we can do
+}
+
+# XXX: handle release as specific revision vs normal (HEAD) build.
+rule DistroSVNRepos
+{
+	# Usage: DistroSVNRepos reposname : svnurl [ : revision ]
+	# reposname is (uppercase) name of app (part of DISTRO_*_SOURCES)
+	local srcPath = <$(SOURCE_GRIST)>sources ;
+	DistroLocalRepos $(1) ;
+	if ! $(DISTRO_$(1)_SOURCES) {
+		#Depends sources : $(DISTRO_$(1)_SOURCES) ;
+		#MakeLocate $(srcPath) : $(SUBDIR_TOKENS) ;
+		#SymLink $(srcPath) : $(DISTRO_$(1)_SOURCES) ;
+		#DistroLocalReposSymlink1 $(DISTRO_$(1)_SOURCES) ;
+		NotFile $(2) ;
+		DistroSVNReposCheckout1 $(srcPath) : $(2) ;
+	}
+}
+
+
+# XXX: shouldn't assume existing contains a checkout ?
+actions DistroSVNReposCheckout1
+{
+	if [ ! -e "$(1)" ]; then \
+		svn co "$(2)" "$(1)" ; \
+	fi
+}
+
+
+
+rule DistroApplication
+{
+        # Application <name> : <sources> : <libraries> : <res> ;
+		#Depends $(2) : <$(SOURCE_GRIST)>sources ;
+		Depends <distro>$(1) : <$(SOURCE_GRIST)>sources ;
+		#SEARCH on $(2) += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+		#SEARCH_SOURCE on [ FGristFiles $(2) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+		#HDRSEARCH on [ FGristFiles $(2) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+		Application <distro>$(1) : $(2) : $(3) : $(4) ;
+		SEARCH on [ FGristFiles $(2) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+		SEARCH on [ FGristFiles $(4) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+}

Added: haiku/branches/developer/mmu_man/distro/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/Jamfile	2008-03-06 17:46:50 UTC (rev 24274)
+++ haiku/branches/developer/mmu_man/distro/Jamfile	2008-03-06 18:33:00 UTC (rev 24275)
@@ -0,0 +1,19 @@
+SubDir HAIKU_TOP 3rdparty mmu_man distro ;
+
+if $(ENABLE_DISTRO) {
+	DISTRO_TOP_RELTOKENS = 3rdparty mmu_man distro ;
+	DISTRO_TOP = [ FDirName $(HAIKU_TOP) $(DISTRO_TOP_RELTOKENS) ] ;
+	#SubDir DISTRO_TOP ;
+
+	include [ FDirName $(DISTRO_TOP) DistroRules ] ;
+
+	# XXX: use flat tree or apps/ and drivers/ ?
+
+	SubInclude DISTRO_TOP beshare ;
+	SubInclude DISTRO_TOP imkit ;
+	SubInclude DISTRO_TOP links ;
+	SubInclude DISTRO_TOP opensound ;
+	SubInclude DISTRO_TOP pe ;
+	SubInclude DISTRO_TOP vncviewer ;
+
+}

Added: haiku/branches/developer/mmu_man/distro/UserDistroConfig.sample
===================================================================
--- haiku/branches/developer/mmu_man/distro/UserDistroConfig.sample	2008-03-06 17:46:50 UTC (rev 24274)
+++ haiku/branches/developer/mmu_man/distro/UserDistroConfig.sample	2008-03-06 18:33:00 UTC (rev 24275)
@@ -0,0 +1,19 @@
+# UserDistroConfig can be used to customize the build according to setup.
+# It allows to specify paths to 3rd party sources to avoid forcing a 
+# check out and wasting disk space.
+
+local myDevVol ;
+# specifies a base path for all your sources.
+#myDevVol = /work ;
+
+# uncomment and change to force symlinking to your existing 
+# working copy of a specific package.
+# note doing so disables possible update/change from the build system
+# (like when doing a release). XXX: TODO
+#DISTRO_BESHARE_SOURCES = $(myDevVol)/beshare ;
+#DISTRO_IMKIT_SOURCES = $(myDevVol)/beclan/imkit ;
+#DISTRO_PE_SOURCES = $(myDevVol)/pe/trunk ;
+#DISTRO_LINKS_SOURCES = $(myDevVol)/links/trunk ;
+#DISTRO_VNCVIEWER_SOURCES = $(myDevVol)/osdrawer/vncviewer/trunk ;
+#DISTRO_OPENSOUND_SOURCES = $(myDevVol)/oss/oss-v4.1test0-071114-src-gpl ;
+

Added: haiku/branches/developer/mmu_man/distro/beshare/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/beshare/Jamfile	2008-03-06 17:46:50 UTC (rev 24274)
+++ haiku/branches/developer/mmu_man/distro/beshare/Jamfile	2008-03-06 18:33:00 UTC (rev 24275)
@@ -0,0 +1,2 @@
+DistroSubDir beshare ;
+

Added: haiku/branches/developer/mmu_man/distro/imkit/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/imkit/Jamfile	2008-03-06 17:46:50 UTC (rev 24274)
+++ haiku/branches/developer/mmu_man/distro/imkit/Jamfile	2008-03-06 18:33:00 UTC (rev 24275)
@@ -0,0 +1,2 @@
+DistroSubDir im_kit ;
+

Added: haiku/branches/developer/mmu_man/distro/links/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/links/Jamfile	2008-03-06 17:46:50 UTC (rev 24274)
+++ haiku/branches/developer/mmu_man/distro/links/Jamfile	2008-03-06 18:33:00 UTC (rev 24275)
@@ -0,0 +1,2 @@
+DistroSubDir links ;
+

Added: haiku/branches/developer/mmu_man/distro/opensound/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/opensound/Jamfile	2008-03-06 17:46:50 UTC (rev 24274)
+++ haiku/branches/developer/mmu_man/distro/opensound/Jamfile	2008-03-06 18:33:00 UTC (rev 24275)
@@ -0,0 +1,2 @@
+DistroSubDir opensound ;
+

Added: haiku/branches/developer/mmu_man/distro/pe/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/pe/Jamfile	2008-03-06 17:46:50 UTC (rev 24274)
+++ haiku/branches/developer/mmu_man/distro/pe/Jamfile	2008-03-06 18:33:00 UTC (rev 24275)
@@ -0,0 +1,2 @@
+DistroSubDir pe ;
+

Added: haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile	2008-03-06 17:46:50 UTC (rev 24274)
+++ haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile	2008-03-06 18:33:00 UTC (rev 24275)
@@ -0,0 +1,38 @@
+DistroSubDir vncviewer ;
+
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
+DistroSVNRepos VNCVIEWER : svn://svn.osdrawer.net/svnroot/vncviewer/trunk ;
+
+local networkLibs ;
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
+	networkLibs = $(HOST_NETWORK_LIBS) ;
+} else {
+	networkLibs = $(HAIKU_NETWORK_LIBS) ;
+}
+
+DistroApplication VNCViewer :
+	App.cpp
+	AuthDialog.cpp
+	Connection.cpp
+	OptionsDialog.cpp
+	PassControl.cpp
+	Socket.cpp
+	Utility.cpp
+	VNCOptions.cpp
+	WndConnection.cpp
+	WndLogin.cpp
+	d3des.c
+	vncauth.c
+	: be game $(networkLibs) textencoding z
+	: VNCviewer.rsrc connectionwindow.rsrc
+	  optionswindow.rsrc passwordwindow.rsrc
+;
+
+#
+# Add binaries to the image
+# 
+
+# note the <distro> grist (we reuse haiku rules).
+
+AddFilesToHaikuImage apps VNCViewer : <distro>VNCViewer ;



From mmlr at mlotz.ch  Thu Mar  6 19:43:43 2008
From: mmlr at mlotz.ch (Michael Lotz)
Date: Thu, 6 Mar 2008 19:43:43 +0100
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <1085715028-BeMail@kirilla>
References: <894b9700803060228o37284e91h9a923141f96478e@mail.gmail.com>
	<1085715028-BeMail@kirilla>
Message-ID: <20080306183818.M3967@mlotz.ch>

On Thu, 06 Mar 2008 19:25:30 +0100 CET, Jonas Sundstr?m wrote
> Anyway, I think being able to manually select and copy URLs
> is a weak reason for keeping this view selectable. Clickable 
> URLs should replace it, IMO. I don't think this kind of text 
> usually is selectable.

IMO it should definitely be selectable. Not necessarily because of the URLs
but to maybe copy over names or text from it. It _usually_ is not selectable
and a few times I have been annoyed by that since I had to type something in
manually just because someone else thought it does not need to be selectable.
It also makes for a nice demo for drag & drop and clipping of styled text.
Besides as long as it is not editable it doesn't hurt anyone to have it
selectable.

Regards
Michael


From revol at free.fr  Thu Mar  6 20:01:08 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Thu, 06 Mar 2008 20:01:08 +0100 CET
Subject: [Haiku-commits]
 =?windows-1252?q?r24275_-_in_haiku/branches/devel?=
 =?windows-1252?q?oper/mmu=5Fman=3A_=2E_distro_distro/beshare_distro/imkit?=
 =?windows-1252?q?_distro/links_distro/opensound_distro/pe_distro/vncviewe?=
 =?windows-1252?q?r?=
In-Reply-To: <200803061833.m26IX08M017645@sheep.berlios.de>
Message-ID: <16788632573-BeMail@laptop>

> Start of rules to (cross)build 3rd party apps as part of the image
>  (like a distro).
> For now vncviewer is automatically fetched from svn and built.
> 

Actually it doesn't work in 1 pass, first time it doesn't find the 
checked out sources...
Ingo ?

I could always have a jam distro-checkouts before doing the image...

Fran?ois.


From mauricek at mail.berlios.de  Thu Mar  6 20:22:35 2008
From: mauricek at mail.berlios.de (mauricek at BerliOS)
Date: Thu, 6 Mar 2008 20:22:35 +0100
Subject: [Haiku-commits] r24276 - haiku/trunk/src/apps/cortex/support
Message-ID: <200803061922.m26JMZr5023008@sheep.berlios.de>

Author: mauricek
Date: 2008-03-06 20:22:34 +0100 (Thu, 06 Mar 2008)
New Revision: 24276
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24276&view=rev

Modified:
   haiku/trunk/src/apps/cortex/support/observe.h
Log:
Fix compile in debug mode



Modified: haiku/trunk/src/apps/cortex/support/observe.h
===================================================================
--- haiku/trunk/src/apps/cortex/support/observe.h	2008-03-06 18:33:00 UTC (rev 24275)
+++ haiku/trunk/src/apps/cortex/support/observe.h	2008-03-06 19:22:34 UTC (rev 24276)
@@ -10,6 +10,7 @@
 
 #include <Messenger.h>
 #include <Debug.h>
+#include <string.h>
 
 #include "cortex_defs.h"
 __BEGIN_CORTEX_NAMESPACE



From axeld at pinc-software.de  Thu Mar  6 20:48:11 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 06 Mar 2008 20:48:11 +0100 CET
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <20080306183818.M3967@mlotz.ch>
Message-ID: <33081970468-BeMail@zon>

"Michael Lotz" <mmlr at mlotz.ch> wrote:
> On Thu, 06 Mar 2008 19:25:30 +0100 CET, Jonas Sundstr?m wrote
> > Anyway, I think being able to manually select and copy URLs
> > is a weak reason for keeping this view selectable. Clickable 
> > URLs should replace it, IMO. I don't think this kind of text 
> > usually is selectable.
> IMO it should definitely be selectable. Not necessarily because of 
> the URLs
> but to maybe copy over names or text from it. It _usually_ is not 
> selectable
> and a few times I have been annoyed by that since I had to type 
> something in
> manually just because someone else thought it does not need to be 
> selectable.
> It also makes for a nice demo for drag & drop and clipping of styled 
> text.
> Besides as long as it is not editable it doesn't hurt anyone to have 
> it
> selectable.

+1

Bye,
   Axel.



From mmu_man at mail.berlios.de  Thu Mar  6 20:54:41 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 20:54:41 +0100
Subject: [Haiku-commits] r24277 - in
	haiku/branches/developer/mmu_man/distro: . vncviewer
Message-ID: <200803061954.m26JsfxE025692@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 20:54:40 +0100 (Thu, 06 Mar 2008)
New Revision: 24277
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24277&view=rev

Modified:
   haiku/branches/developer/mmu_man/distro/DistroRules
   haiku/branches/developer/mmu_man/distro/Jamfile
   haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile
Log:
* VNCViewer now builds for Haiku.
* Added a <distro>checkout target to checkout all the repos. One should call it first before building anything, else jam doesn't include the repos when searching for sources and build fails.


Modified: haiku/branches/developer/mmu_man/distro/DistroRules
===================================================================
--- haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 19:22:34 UTC (rev 24276)
+++ haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 19:54:40 UTC (rev 24277)
@@ -10,6 +10,8 @@
         }
 }
 
+HAIKU_DISTRO_REPOS_LIST = ;
+
 rule DistroSubDir
 {
 	SubDir HAIKU_TOP $(DISTRO_TOP_RELTOKENS) $(1) ;
@@ -20,6 +22,7 @@
 	local srcPath = <$(SOURCE_GRIST)>sources ;
 	MakeLocate $(srcPath) : $(SUBDIR) ;
 	SubDirHdrs [ FDirName $(SUBDIR_TOKENS) sources ] ;
+	HAIKU_DISTRO_REPOS_LIST += $(srcPath) ;
 }
 
 rule DistroLocalRepos
@@ -49,6 +52,8 @@
 		#DistroLocalReposSymlink1 $(DISTRO_$(1)_SOURCES) ;
 		NotFile $(2) ;
 		DistroSVNReposCheckout1 $(srcPath) : $(2) ;
+		# avoid rebuilding all object files each time !?
+		NoUpdate $(srcPath) ;
 	}
 }
 
@@ -65,13 +70,15 @@
 
 rule DistroApplication
 {
-        # Application <name> : <sources> : <libraries> : <res> ;
-		#Depends $(2) : <$(SOURCE_GRIST)>sources ;
-		Depends <distro>$(1) : <$(SOURCE_GRIST)>sources ;
-		#SEARCH on $(2) += [ FDirName $(SUBDIR_TOKENS) sources ] ;
-		#SEARCH_SOURCE on [ FGristFiles $(2) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
-		#HDRSEARCH on [ FGristFiles $(2) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
-		Application <distro>$(1) : $(2) : $(3) : $(4) ;
-		SEARCH on [ FGristFiles $(2) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
-		SEARCH on [ FGristFiles $(4) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+	# Application <name> : <sources> : <libraries> : <res> ;
+	# (re)sources depend on them being checked out.
+	Depends [ FGristFiles $(2) ] : <$(SOURCE_GRIST)>sources ;
+	Depends [ FGristFiles $(4) ] : <$(SOURCE_GRIST)>sources ;
+	Depends <distro>$(1) : <$(SOURCE_GRIST)>sources ;
+	#SEARCH on $(2) += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+	#SEARCH_SOURCE on [ FGristFiles $(2) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+	#HDRSEARCH on [ FGristFiles $(2) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+	Application <distro>$(1) : $(2) : $(3) : $(4) ;
+	SEARCH on [ FGristFiles $(2) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+	SEARCH on [ FGristFiles $(4) ] += [ FDirName $(SUBDIR_TOKENS) sources ] ;
 }

Modified: haiku/branches/developer/mmu_man/distro/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/Jamfile	2008-03-06 19:22:34 UTC (rev 24276)
+++ haiku/branches/developer/mmu_man/distro/Jamfile	2008-03-06 19:54:40 UTC (rev 24277)
@@ -16,4 +16,7 @@
 	SubInclude DISTRO_TOP pe ;
 	SubInclude DISTRO_TOP vncviewer ;
 
+	NotFile <distro>checkout ;
+	Depends <distro>checkout : $(HAIKU_DISTRO_REPOS_LIST) ;
+
 }

Modified: haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile	2008-03-06 19:22:34 UTC (rev 24276)
+++ haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile	2008-03-06 19:54:40 UTC (rev 24277)
@@ -9,6 +9,7 @@
 	networkLibs = $(HOST_NETWORK_LIBS) ;
 } else {
 	networkLibs = $(HAIKU_NETWORK_LIBS) ;
+	UseHeaders [ FDirName $(HAIKU_TOP) headers libs zlib ] : true ;
 }
 
 DistroApplication VNCViewer :



From mmu_man at mail.berlios.de  Thu Mar  6 20:57:21 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 20:57:21 +0100
Subject: [Haiku-commits] r24278 - haiku/trunk/3rdparty/mmu_man
Message-ID: <200803061957.m26JvLtp026107@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 20:57:21 +0100 (Thu, 06 Mar 2008)
New Revision: 24278
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24278&view=rev

Modified:
   haiku/trunk/3rdparty/mmu_man/Jamfile
Log:
Hook in distro if it's there (symlink from my branch).


Modified: haiku/trunk/3rdparty/mmu_man/Jamfile
===================================================================
--- haiku/trunk/3rdparty/mmu_man/Jamfile	2008-03-06 19:54:40 UTC (rev 24277)
+++ haiku/trunk/3rdparty/mmu_man/Jamfile	2008-03-06 19:57:21 UTC (rev 24278)
@@ -1,3 +1,13 @@
 SubDir HAIKU_TOP 3rdparty mmu_man ;
 
 SubInclude HAIKU_TOP 3rdparty mmu_man themes ;
+
+# distro stuff located in my own branch, 
+# to use it symlink it here.
+{
+	local subDir
+		= [ GLOB [ FDirName $(HAIKU_TOP) 3rdparty mmu_man ] : distro ] ;
+	if $(subDir) {
+		SubInclude HAIKU_TOP 3rdparty mmu_man distro ;
+	}
+}



From axeld at mail.berlios.de  Thu Mar  6 21:11:56 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 6 Mar 2008 21:11:56 +0100
Subject: [Haiku-commits] r24279 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803062011.m26KBuoM027191@sheep.berlios.de>

Author: axeld
Date: 2008-03-06 21:11:56 +0100 (Thu, 06 Mar 2008)
New Revision: 24279
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24279&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Index.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
Log:
Corrected patch to fix warnings when compiled with GCC 4, thanks Vasilis!


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Index.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Index.cpp	2008-03-06 19:57:21 UTC (rev 24278)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Index.cpp	2008-03-06 20:11:56 UTC (rev 24279)
@@ -226,9 +226,9 @@
 	uint16 newLength, Inode *inode)
 {
 	if (name == NULL
-		|| oldKey == NULL && newKey == NULL
-		|| oldKey != NULL && oldLength == 0
-		|| newKey != NULL && newLength == 0)
+		|| (oldKey == NULL && newKey == NULL)
+		|| (oldKey != NULL && oldLength == 0)
+		|| (newKey != NULL && newLength == 0))
 		return B_BAD_VALUE;
 
 	// B_MIME_STRING_TYPE is the only supported non-standard type

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp	2008-03-06 19:57:21 UTC (rev 24278)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp	2008-03-06 20:11:56 UTC (rev 24279)
@@ -1245,7 +1245,7 @@
 		if (Mode() & (S_ATTR_DIR | S_INDEX_DIR))
 			return false;
 
-		if (++count > 2 || strcmp(".", name) && strcmp("..", name))
+		if (++count > 2 || (strcmp(".", name) && strcmp("..", name)))
 			return false;
 	}
 	return true;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp	2008-03-06 19:57:21 UTC (rev 24278)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp	2008-03-06 20:11:56 UTC (rev 24279)
@@ -1,14 +1,15 @@
-/* Query - query parsing and evaluation
- *
- * The pattern matching is roughly based on code originally written
- * by J. Kercheval, and on code written by Kenneth Almquist, though
- * it shares no code.
- *
- * Copyright 2001-2006, Axel D?rfler, axeld at pinc-software.de.
+/*
+ * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de.
  * This file may be used under the terms of the MIT License.
  */
 
+/*!	Query parsing and evaluation
 
+	The pattern matching is roughly based on code originally written
+	by J. Kercheval, and on code written by Kenneth Almquist, though
+	it shares no code.
+*/
+
 #include "Query.h"
 #include "bfs.h"
 #include "Debug.h"
@@ -1190,10 +1191,10 @@
 }
 
 
-status_t 
+status_t
 Operator::InitCheck()
 {
-	if (fOp != OP_AND && fOp != OP_OR
+	if ((fOp != OP_AND && fOp != OP_OR)
 		|| fLeft == NULL || fLeft->InitCheck() < B_OK
 		|| fRight == NULL || fRight->InitCheck() < B_OK)
 		return B_ERROR;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp	2008-03-06 19:57:21 UTC (rev 24278)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp	2008-03-06 20:11:56 UTC (rev 24279)
@@ -360,7 +360,7 @@
 
 	fJournal = new Journal(this);
 	// replaying the log is the first thing we will do on this disk
-	if (fJournal && fJournal->InitCheck() < B_OK
+	if ((fJournal != NULL && fJournal->InitCheck() < B_OK)
 		|| fBlockAllocator.Initialize() < B_OK) {
 		// ToDo: improve error reporting for a bad journal
 		FATAL(("could not initialize journal/block bitmap allocator!\n"));

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp	2008-03-06 19:57:21 UTC (rev 24278)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp	2008-03-06 20:11:56 UTC (rev 24279)
@@ -747,8 +747,8 @@
 
 	if (mask & B_STAT_MODE) {
 		PRINT(("original mode = %ld, stat->st_mode = %d\n", node.Mode(), stat->st_mode));
-		node.mode = HOST_ENDIAN_TO_BFS_INT32(node.Mode() & ~S_IUMSK
-			| stat->st_mode & S_IUMSK);
+		node.mode = HOST_ENDIAN_TO_BFS_INT32((node.Mode() & ~S_IUMSK)
+			| (stat->st_mode & S_IUMSK));
 	}
 
 	if (mask & B_STAT_UID)



From aldeck at mail.berlios.de  Thu Mar  6 21:17:20 2008
From: aldeck at mail.berlios.de (aldeck at BerliOS)
Date: Thu, 6 Mar 2008 21:17:20 +0100
Subject: [Haiku-commits] r24280 - haiku/trunk/src/preferences/screen
Message-ID: <200803062017.m26KHKv1027622@sheep.berlios.de>

Author: aldeck
Date: 2008-03-06 21:17:20 +0100 (Thu, 06 Mar 2008)
New Revision: 24280
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24280&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenWindow.cpp
   haiku/trunk/src/preferences/screen/ScreenWindow.h
Log:
* as discussed on the dev list, fixed revert and apply behaviour (tested 
under vesa and supported mode). Changed message of the vesa warning 
alert. TODO: additional warning text (see discussion)
* apply now stays deactivated if you only change the workspace count as 
it is applied instantly already.
* disabled current workspace menu item for now since it is not 
implemented. see ticket #696


Modified: haiku/trunk/src/preferences/screen/ScreenWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2008-03-06 20:11:56 UTC (rev 24279)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2008-03-06 20:17:20 UTC (rev 24280)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -9,6 +9,7 @@
  *		Thomas Kurschel
  *		Axel D?rfler, axeld at pinc-software.de
  *		Stephan A?mus <superstippi at gmx.de>
+ *		Alexandre Deckner, alex at zappotek.com
  */
 
 
@@ -245,11 +246,15 @@
 	popUpMenu->AddItem(fAllWorkspacesItem);
 	BMenuItem *item = new BMenuItem("Current Workspace",
 		new BMessage(WORKSPACE_CHECK_MSG));
-	if (_IsVesa()) {
+	
+	// TODO: since per workspace settings is unimplemented (Ticket #693)
+	// 		 we force the menu to "All Workspaces" for now
+	//if (_IsVesa()) {
 		fAllWorkspacesItem->SetMarked(true);
 		item->SetEnabled(false);
-	} else
-		item->SetMarked(true);
+	//} else
+	//	item->SetMarked(true);
+		
 	popUpMenu->AddItem(item);
 
 	BMenuField* workspaceMenuField = new BMenuField(BRect(0, 0, 100, 15),
@@ -346,6 +351,8 @@
 
 	float min, max;
 	if (fScreenMode.GetRefreshLimits(fActive, min, max) && min == max) {
+		// TODO: investigate, doesn't work for VESA at least
+		
 		// This is a special case for drivers that only support a single
 		// frequency, like the VESA driver
 		BString name;
@@ -778,8 +785,10 @@
 void
 ScreenWindow::WorkspaceActivated(int32 workspace, bool state)
 {
-	fScreenMode.GetOriginalMode(fOriginal, workspace);
-	UpdateActiveMode();
+	if (!_IsVesa()) {
+		fScreenMode.GetOriginalMode(fOriginal, workspace);
+		UpdateActiveMode();
+	}
 	
 	BMessage message(UPDATE_DESKTOP_COLOR_MSG);
 	PostMessage(&message, fMonitorView);
@@ -935,6 +944,7 @@
 		case BUTTON_REVERT_MSG:
 		{
 			fModified = false;
+			fVesaApplied = false;
 			BMenuItem *item;
 			item = fWorkspaceCountField->Menu()->ItemAt(fOriginalWorkspaceCount - 1);
 			if (item != NULL)
@@ -942,9 +952,17 @@
 
 			// ScreenMode::Revert() assumes that we first set the correct number
 			// of workspaces
-			set_workspace_count(fOriginalWorkspaceCount);
-			fScreenMode.Revert();
-			UpdateActiveMode();
+						
+			if (_IsVesa()) {				
+				set_workspace_count(fOriginalWorkspaceCount);
+				fActive = fOriginal;
+				fSelected = fOriginal;
+				UpdateControls();
+			} else {
+				set_workspace_count(fOriginalWorkspaceCount);
+				fScreenMode.Revert();
+				UpdateActiveMode();
+			}			
 			break;
 		}
 
@@ -996,26 +1014,73 @@
 }
 
 
-bool
-ScreenWindow::CanApply() const
+status_t
+ScreenWindow::_ReadVesaModeFile(screen_mode& mode) const
 {
-	return fAllWorkspacesItem->IsMarked() || fSelected != fActive;
-}
+	BPath path;
+	status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path, true);
+	if (status < B_OK)
+		return status;
 
+	path.Append("kernel/drivers/vesa");	
+	BFile file;
+	status = file.SetTo(path.Path(), B_READ_ONLY);
+	if (status < B_OK)
+		return status;
 
-bool
-ScreenWindow::CanRevert() const
-{
-	return fSelected != fActive || count_workspaces() != fOriginalWorkspaceCount
-		|| fModified;
+	char buffer[256];
+	
+	ssize_t bytesRead = file.Read(buffer, sizeof(buffer) - 1);
+	if (bytesRead < B_OK) {
+		return bytesRead;
+	} else {
+		buffer[bytesRead] = '\0';	
+	}
+	
+	char ignore[256];
+		// if the file is malformed, sscanf shouldn't crash
+		// on reading a big string since we don't even read
+		// as much from the file
+	uint32 bitDepth = 0;
+	
+	if (sscanf(buffer, "%s %ld %ld %ld", ignore,
+		&mode.width, &mode.height, &bitDepth) == 4) {
+		
+		//TODO: check for valid width and height values
+			
+		switch (bitDepth) {
+			case 32:
+				mode.space = B_RGB32;
+				break;
+			case 24:
+				mode.space = B_RGB24;
+				break;
+			case 16:
+				mode.space = B_RGB16;
+				break;
+			case 15:
+				mode.space = B_RGB15;
+				break;
+			case 8:
+				mode.space = B_CMAP8;
+				break;
+			default:
+				// invalid value, we force it to B_RGB16 just in case
+				mode.space = B_RGB16;
+				return B_ERROR;			
+		}		
+		return B_OK;
+	} else {
+		return B_ERROR;
+	}
 }
 
 
 void
 ScreenWindow::CheckApplyEnabled()
 {
-	fApplyButton->SetEnabled(CanApply());
-	fRevertButton->SetEnabled(CanRevert());
+	fApplyButton->SetEnabled(fSelected != fActive);
+	fRevertButton->SetEnabled(count_workspaces() != fOriginalWorkspaceCount || fSelected != fOriginal);
 }
 
 
@@ -1024,6 +1089,12 @@
 {
 	fOriginalWorkspaceCount = count_workspaces();
 	fScreenMode.Get(fOriginal);
+	
+	// If we are in vesa we overwrite fOriginal's resolution and bitdepth
+	// with those found the vesa settings file. (if the file exists)
+	if (_IsVesa())
+		_ReadVesaModeFile(fOriginal);
+
 	fScreenMode.UpdateOriginalModes();
 }
 
@@ -1033,12 +1104,13 @@
 {
 	if (_IsVesa()) {
 		(new BAlert("VesaAlert",
-			"Your graphics card is not supported. Resolution changes will be "
-			"adopted on next system startup.\n", "Okay", NULL, NULL, B_WIDTH_AS_USUAL,
+			"Haiku is using your video card in safe mode (VESA)."
+			" Your settings will be applied on next startup.\n", "Okay", NULL, NULL, B_WIDTH_AS_USUAL,			
 			B_INFO_ALERT))->Go(NULL);
 
 		fVesaApplied = true;
 		fActive = fSelected;
+		UpdateControls();		
 		return;
 	}
 	

Modified: haiku/trunk/src/preferences/screen/ScreenWindow.h
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.h	2008-03-06 20:11:56 UTC (rev 24279)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.h	2008-03-06 20:17:20 UTC (rev 24280)
@@ -50,10 +50,8 @@
 
 		void Apply();
 
-		bool CanApply() const;
-		bool CanRevert() const;
-
 		status_t _WriteVesaModeFile(const screen_mode& mode) const;
+		status_t _ReadVesaModeFile(screen_mode& mode) const;		
 		bool _IsVesa() const { return fIsVesa; }
 
 		void LayoutControls(uint32 flags);



From oruizdorantes at mail.berlios.de  Thu Mar  6 21:46:17 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Thu, 6 Mar 2008 21:46:17 +0100
Subject: [Haiku-commits] r24281 - haiku/trunk/src/kits/bluetooth
Message-ID: <200803062046.m26KkHiR031988@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-06 21:46:17 +0100 (Thu, 06 Mar 2008)
New Revision: 24281
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24281&view=rev

Modified:
   haiku/trunk/src/kits/bluetooth/LocalDevice.cpp
Log:
Remove warnings and text output

Modified: haiku/trunk/src/kits/bluetooth/LocalDevice.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/LocalDevice.cpp	2008-03-06 20:17:20 UTC (rev 24280)
+++ haiku/trunk/src/kits/bluetooth/LocalDevice.cpp	2008-03-06 20:46:17 UTC (rev 24281)
@@ -108,7 +108,7 @@
 LocalDevice::GetLocalDeviceCount()
 {
     if (SRetrieveBluetoothMessenger() != B_OK)
-        return NULL;
+        return 0;
 
 	BMessage request(BT_MSG_COUNT_LOCAL_DEVICES);	
 	BMessage reply;
@@ -116,7 +116,7 @@
 	if (sfMessenger->SendMessage(&request, &reply) == B_OK)
 		return reply.FindInt32("count");
     else
-        return B_ERROR;
+        return 0;
 		
 }
 
@@ -165,15 +165,15 @@
     BMessage reply;
 	int8	 bt_status = BT_ERROR;
 	
-    /* ADD ID */
+    
     request.AddInt32("hci_id", hid);
 	
-	/* Add command */
+	// TODO: Add the raw command to the BMessage + expected event
 
     if (fMessenger->SendMessage(&request, &reply) == B_OK) {
     	if (reply.FindInt8("status", &bt_status ) == B_OK ) {	    
+			return bt_status;			
 			
-			
 		}
 		
 	}    
@@ -199,9 +199,7 @@
     
     if (fMessenger->SendMessage(&request, &reply) == B_OK) {
     
-    	if (reply.FindData("bdaddr", B_ANY_TYPE, 0, (const void**)&bdaddr, &size) == B_OK ){		
-	    
-			printf("%s: %s size=%ld\n", __FUNCTION__, bdaddrUtils::ToString(*bdaddr), size);
+    	if (reply.FindData("bdaddr", B_ANY_TYPE, 0, (const void**)&bdaddr, &size) == B_OK ){
 			
 	    	return *bdaddr;
 	    
@@ -242,7 +240,8 @@
 LocalDevice::GetDeviceClass()
 {
 
-	return NULL;
+	return DeviceClass(0);
+
 }
 
 



From alex at zappotek.com  Thu Mar  6 21:47:33 2008
From: alex at zappotek.com (Alexandre Deckner)
Date: Thu, 06 Mar 2008 21:47:33 +0100
Subject: [Haiku-commits] r24280 - haiku/trunk/src/preferences/screen
In-Reply-To: <200803062017.m26KHKv1027622@sheep.berlios.de>
References: <200803062017.m26KHKv1027622@sheep.berlios.de>
Message-ID: <47D05865.5000608@zappotek.com>

Btw, tomorrow night, i'll be in vacation for 10 days! I won't answer to 
emails so feel free to mess with my changes if needed :-) (not that i 
mind in normal time)

See ya,
Alex



From jonas at kirilla.com  Thu Mar  6 21:51:11 2008
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Thu, 06 Mar 2008 21:51:11 +0100 CET
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <33081970468-BeMail@zon>
Message-ID: <981563427-BeMail@kirilla>

"Axel D?rfler" <axeld at pinc-software.de> wrote:
> "Michael Lotz" <mmlr at mlotz.ch> wrote:
 ...
> > it doesn't hurt anyone to have it selectable.
> 
> +1

One might consider this one exception harmless.
I just hope it won't spread. There must be reasons
non-interactive text isn't selectable in the major GUIs,
browser content aside.

/Jonas.



From oruizdorantes at mail.berlios.de  Thu Mar  6 22:02:09 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Thu, 6 Mar 2008 22:02:09 +0100
Subject: [Haiku-commits] r24282 - in haiku/trunk/src/servers: . bluetooth
Message-ID: <200803062102.m26L29ux000963@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-06 22:02:08 +0100 (Thu, 06 Mar 2008)
New Revision: 24282
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24282&view=rev

Added:
   haiku/trunk/src/servers/bluetooth/
   haiku/trunk/src/servers/bluetooth/BPortNot.cpp
   haiku/trunk/src/servers/bluetooth/BPortNot.h
   haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp
   haiku/trunk/src/servers/bluetooth/BluetoothServer.h
   haiku/trunk/src/servers/bluetooth/CommandManager.cpp
   haiku/trunk/src/servers/bluetooth/CommandManager.h
   haiku/trunk/src/servers/bluetooth/DeviceManager.cpp
   haiku/trunk/src/servers/bluetooth/DeviceManager.h
   haiku/trunk/src/servers/bluetooth/HCIControllerAccessor.cpp
   haiku/trunk/src/servers/bluetooth/HCIControllerAccessor.h
   haiku/trunk/src/servers/bluetooth/HCIDelegate.h
   haiku/trunk/src/servers/bluetooth/HCITransportAccessor.cpp
   haiku/trunk/src/servers/bluetooth/HCITransportAccessor.h
   haiku/trunk/src/servers/bluetooth/Jamfile
   haiku/trunk/src/servers/bluetooth/LocalDeviceHandler.cpp
   haiku/trunk/src/servers/bluetooth/LocalDeviceHandler.h
   haiku/trunk/src/servers/bluetooth/LocalDeviceImpl.cpp
   haiku/trunk/src/servers/bluetooth/LocalDeviceImpl.h
   haiku/trunk/src/servers/bluetooth/Output.cpp
   haiku/trunk/src/servers/bluetooth/Output.h
   haiku/trunk/src/servers/bluetooth/server-bluetooth.rdef
Log:
bluetooth_server: a really young piece of meat, code not even to be looked at. Bad/fast code in some modules. But better here than in a crashed partition.

Added: haiku/trunk/src/servers/bluetooth/BPortNot.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/BPortNot.cpp	2008-03-06 20:46:17 UTC (rev 24281)
+++ haiku/trunk/src/servers/bluetooth/BPortNot.cpp	2008-03-06 21:02:08 UTC (rev 24282)
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+#include "BPortNot.h"
+#include "Output.h"
+
+#include "BluetoothServer.h"
+#include "LocalDeviceImpl.h"
+
+#include <bluetooth/HCI/btHCI_event.h>
+#include <bluetooth/HCI/btHCI_transport.h>
+
+#include <stdio.h>
+
+BPortNot::BPortNot(BluetoothServer* app, const char* name) {
+
+	ourapp = (BluetoothServer*) app;		
+
+	fPort = find_port(name);	
+	if ( fPort == B_NAME_NOT_FOUND ) 
+	{
+		fPort = create_port(256, name);
+		Output::Instance()->Post("Event Listener Port Created\n",BLACKBOARD_GENERAL);
+	}
+}
+
+void
+BPortNot::loop()
+{
+	size_t 		size;
+	size_t 		ssize;
+	int32		code;
+	
+	struct hci_event_header *hdr;
+	
+	LocalDeviceImpl* ld;
+
+	while (code != HCI_HAIKU_EVENT_SERVER_QUITTING) { 
+
+		 size = port_buffer_size(fPort);
+		          
+         /* TODO: Consider using snb_buff like structure here or 
+            max event size to prevent mallocs & frees */
+	     hdr = (struct hci_event_header *) malloc(size);	     
+		 ssize = read_port(fPort, &code, hdr, size);		 		 
+
+		 if (size != ssize) {
+		    Output::Instance()->Post("Event size not matching", BLACKBOARD_GENERAL);
+		    continue;
+		 }
+
+		 if (size <= 0) {
+		    Output::Instance()->Post("Suspicious empty event", BLACKBOARD_GENERAL);
+		    continue;
+		 }
+
+		 // we only handle events
+		 if (GET_PORTCODE_TYPE(code)!= BT_EVENT) {
+		    Output::Instance()->Post("Wrong type frame code", BLACKBOARD_GENERAL);
+		    continue;
+		 }
+		 
+#if 0		 
+		 for (int i=0 ; i<ssize ; i++ ) {		 
+		 	printf("%x:",((uint8*)hdr)[i]);
+		 }
+ 		 printf("$\n");
+
+		 for (int i=0 ; i<ssize ; i++) {		 
+		 	printf("%c",((uint8*)hdr)[i]);
+		 }
+		 printf("$\n");
+#endif
+		    
+         ld = ourapp->LocateLocalDeviceImpl(GET_PORTCODE_HID(code));
+		 if (ld == NULL) {
+		    Output::Instance()->Post("LocalDevice could not be fetched", BLACKBOARD_EVENTS);
+		    continue;
+		 }
+
+
+		 ld->HandleEvent(hdr);
+
+
+		 // free the event
+		 free(hdr);
+	}	
+
+}

Added: haiku/trunk/src/servers/bluetooth/BPortNot.h
===================================================================
--- haiku/trunk/src/servers/bluetooth/BPortNot.h	2008-03-06 20:46:17 UTC (rev 24281)
+++ haiku/trunk/src/servers/bluetooth/BPortNot.h	2008-03-06 21:02:08 UTC (rev 24282)
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+#ifndef _BT_PORT_NOTIFICATION
+#define _BT_PORT_NOTIFICATION
+
+#include <OS.h>
+
+class BluetoothServer;
+
+class BPortNot {
+
+public:
+	BPortNot(BluetoothServer* app, const char* name) ;
+	void loop();
+
+	port_id 		fPort;	
+	port_id 		sdp_request_port;
+	thread_id		sdp_server_thread;
+
+	BluetoothServer* 		    ourapp;		
+};
+
+#endif

Added: haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp	2008-03-06 20:46:17 UTC (rev 24281)
+++ haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp	2008-03-06 21:02:08 UTC (rev 24282)
@@ -0,0 +1,559 @@
+/*
+ * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+
+#include <Entry.h>
+#include <Path.h>
+#include <Message.h>
+#include <Directory.h>
+#include <String.h>
+#include <Roster.h>
+
+
+#include <TypeConstants.h>
+#include <syslog.h>
+
+#include <bluetoothserver_p.h>
+#include <bluetooth/HCI/btHCI_command.h>
+#include <bluetooth/bluetooth_util.h>
+
+#include "LocalDeviceImpl.h"
+#include "BluetoothServer.h"
+#include "Output.h"
+
+
+BluetoothServer::BluetoothServer() : BApplication(BLUETOOTH_SIGNATURE)
+{ 
+	Output::Instance()->Run();
+	Output::Instance()->SetTitle("Bluetooth message gathering");
+
+	Output::Instance()->AddTab("General", BLACKBOARD_GENERAL);
+	Output::Instance()->AddTab("Device Manager", BLACKBOARD_DEVICEMANAGER);
+	Output::Instance()->AddTab("Events", BLACKBOARD_EVENTS);
+	Output::Instance()->AddTab("Kit", BLACKBOARD_KIT);
+
+	
+	ShowWindow(Output::Instance());
+
+    fDeviceManager = new DeviceManager();
+	fLocalDevicesList.MakeEmpty();
+
+	fEventListener = spawn_thread(notification_Thread, "BT port listener" , B_DISPLAY_PRIORITY , this);
+
+   
+}
+
+bool BluetoothServer::QuitRequested(void)
+{
+	// Finish quitting
+	Output::Instance()->Lock();
+	Output::Instance()->Quit();
+
+
+/*	HCIDelegate *hd = NULL;
+	while ((hd = (HCIDelegate *)fDelegatesList.RemoveItem((int32)0)) !=NULL)
+		delete hd;
+*/
+
+	printf("Accepting quitting of the application\n");
+	return BApplication::QuitRequested();
+}
+
+void BluetoothServer::ArgvReceived(int32 argc, char **argv)
+{
+	if (argc>1) {
+		if (strcmp(argv[1], "--finish") == 0)
+			PostMessage(B_QUIT_REQUESTED);
+
+	    else {
+
+	
+	    }
+	}
+
+}
+
+
+void BluetoothServer::ReadyToRun(void) {
+    
+    fDeviceManager->StartMonitoringDevice("bluetooth/h2generic");
+	
+		
+	// Launch the notifier thread
+	if ( resume_thread(fEventListener) != B_OK ) 
+	{
+		Output::Instance()->Post("Bluetooth port listener failed\n", BLACKBOARD_GENERAL);
+	}
+    
+    Output::Instance()->Post("Bluetooth server Ready\n", BLACKBOARD_GENERAL);
+}
+
+void BluetoothServer::AppActivated(bool act) {
+
+	printf("Activated %d\n",act);
+
+}
+
+
+
+void BluetoothServer::MessageReceived(BMessage *message)
+{
+	BMessage reply;
+	status_t status = B_WOULD_BLOCK; // mark somehow.. do not reply anything
+	
+	switch(message->what)
+	{
+	
+		case BT_MSG_ADD_DEVICE:
+		{
+			BString str;
+	        message->FindString("name", &str);        
+			BPath path(str.String());
+
+	  	    (Output::Instance()->Post( str.String(), BLACKBOARD_GENERAL));
+     	    (Output::Instance()->Post(" requested LocalDevice\n", BLACKBOARD_GENERAL));
+	        
+	        LocalDeviceImpl* ldi = LocalDeviceImpl::CreateTransportAccessor(&path);
+
+	        if (ldi->GetID() >= 0) {
+                      fLocalDevicesList.AddItem(ldi);
+					  Output::Instance()->AddTab("Local Device", BLACKBOARD_LD_OFFSET + ldi->GetID());
+				  	  (Output::Instance()->Post( str.String(), BLACKBOARD_LD_OFFSET + ldi->GetID()));
+					  (Output::Instance()->Post(" LocalDevice added\n", BLACKBOARD_LD_OFFSET + ldi->GetID()));
+			 
+
+            } else {
+					  (Output::Instance()->Post("Adding LocalDevice failed\n", BLACKBOARD_GENERAL));            
+            }
+            
+            status = B_WOULD_BLOCK;
+        }   
+			
+		case BT_MSG_COUNT_LOCAL_DEVICES: 
+			status = HandleLocalDevicesCount(message, &reply);
+    	break;	
+    	
+		case BT_MSG_ADQUIRE_LOCAL_DEVICE:
+			status = HandleAcquireLocalDevice(message, &reply);
+		break;
+
+        case BT_MSG_GET_FRIENDLY_NAME:
+            status = HandleGetFriendlyName(message, &reply);
+        break;
+        
+        case BT_MSG_GET_ADDRESS:
+            status = HandleGetAddress(message, &reply);
+        break;
+
+        case BT_MSG_HANDLE_SIMPLE_REQUEST:
+            status = HandleSimpleRequest(message, &reply);
+        break;
+
+
+		/* Handle if the bluetooth preferences is running */
+		case B_SOME_APP_LAUNCHED:
+   		{
+			const char *signature;
+			// TODO: what's this for?
+			if (message->FindString("be:signature", &signature)==B_OK) {
+				printf("input_server : %s\n", signature);
+				if (strcmp(signature, "application/x-vnd.Be-TSKB")==0) {
+
+				}
+			}
+			return;
+		}
+		
+
+		default:
+			BApplication::MessageReceived(message);
+		break;
+	}
+	
+	/* Can we reply right now? */
+    if (status != B_WOULD_BLOCK) {
+	    reply.AddInt32("status", status);
+	    message->SendReply(&reply);
+	    printf("Sending reply message\n"); 
+	}
+
+}
+
+#if 0
+#pragma mark -
+#endif
+
+LocalDeviceImpl* 
+BluetoothServer::LocateDelegateFromMessage(BMessage* message)
+{
+    LocalDeviceImpl* ldi = NULL;
+ 	hci_id hid;
+    
+    if (message->FindInt32("hci_id", &hid) == B_OK)	    
+	{
+	    /* Try to find out when a ID was specified */
+	    int index;
+	    
+	    for (index = 0; index < fLocalDevicesList.CountItems() ; index ++) {
+
+		    ldi = fLocalDevicesList.ItemAt(index);
+		    if (ldi->GetID() == hid)  {            
+		        break;
+		    }		    
+        }
+    }
+        	
+    return ldi;
+}
+
+LocalDeviceImpl*
+BluetoothServer::LocateLocalDeviceImpl(hci_id hid) 
+{
+
+    /* Try to find out when a ID was specified */
+    int index;
+    
+    for (index = 0; index < fLocalDevicesList.CountItems() ; index ++) {
+
+	    LocalDeviceImpl* ldi = fLocalDevicesList.ItemAt(index);
+	    if (ldi->GetID() == hid)  {
+	        return ldi;
+	    }		    
+    }
+    
+    return NULL;
+}
+
+
+#if 0
+#pragma - Messages reply
+#endif
+
+status_t
+BluetoothServer::HandleLocalDevicesCount(BMessage* message, BMessage* reply)
+{
+	return reply->AddInt32("count", fLocalDevicesList.CountItems());
+}
+
+
+status_t
+BluetoothServer::HandleAcquireLocalDevice(BMessage* message, BMessage* reply)
+{
+	hci_id hid;
+	ssize_t size;
+	bdaddr_t bdaddr;
+	LocalDeviceImpl* ldi = NULL;
+    int32 index = 0;
+	
+	if (message->FindInt32("hci_id", &hid) == B_OK)	    
+	{
+	    Output::Instance()->Post("GetLocalDevice requested with id\n", BLACKBOARD_KIT);
+        ldi = LocateDelegateFromMessage(message);						
+		
+	} else if (message->FindData("bdaddr", B_ANY_TYPE, (const void**)&bdaddr, &size ) == B_OK)
+	{
+	    /* Try to find out when the user specified the address */
+	    Output::Instance()->Post("GetLocalDevice requested with bdaddr\n", BLACKBOARD_KIT);	    
+	    for (index = 0; index < fLocalDevicesList.CountItems() ; index ++) {	        
+	        
+	        bdaddr_t local;
+		    ldi = fLocalDevicesList.ItemAt(index);
+		    if ((ldi->GetAddress(&local, message) == B_OK) && bacmp(&local, &bdaddr))  {
+		        break;
+		    }		    		    
+        }		    
+	    
+	} else
+	{
+	    /* Careless, any device not performing operations will be fine */	    	    
+	    Output::Instance()->Post("GetLocalDevice requested\n", BLACKBOARD_KIT);	    
+	    for (index = 0; index < fLocalDevicesList.CountItems() ; index ++) {
+	        
+		    ldi = fLocalDevicesList.ItemAt(index);
+		    printf("Requesting local device %ld\n", ldi->GetID());
+		    if (ldi != NULL && ldi->Available())
+		    {
+  			    printf("dev ours %ld\n", ldi->GetID());
+		        break;
+		    }
+		    
+        }	
+	}
+
+    if (index <= fLocalDevicesList.CountItems() && ldi != NULL && ldi->Available())
+	{
+	    Output::Instance()->Post("Device acquired\n", BLACKBOARD_KIT);
+	    ldi->Acquire();
+	    return reply->AddInt32("hci_id", hid);
+	}
+
+	return B_ERROR;	
+	
+}
+
+
+status_t
+BluetoothServer::HandleGetFriendlyName(BMessage* message, BMessage* reply)
+{
+    LocalDeviceImpl* ldi = LocateDelegateFromMessage(message);
+    BString name;
+        
+    if (ldi == NULL)
+    	return B_ERROR;
+    	
+    /* If the device was ocupied... Autlock?->LocalDeviceImpl will decide */
+    if (ldi->GetFriendlyName(name, DetachCurrentMessage()) == B_OK) {
+        
+        return reply->AddString("friendlyname", name);
+	}
+	
+	return B_WOULD_BLOCK; 
+}
+
+
+status_t
+BluetoothServer::HandleGetAddress(BMessage* message, BMessage* reply)
+{
+    LocalDeviceImpl* ldi = LocateDelegateFromMessage(message);
+    bdaddr_t bdaddr;
+
+    if (ldi == NULL)
+    	return B_ERROR;
+        
+    /* If the device was ocupied... Autlock?->LocalDeviceImpl will decide */
+	status_t status = ldi->GetAddress(&bdaddr, DetachCurrentMessage());
+    if ( status == B_OK) {
+        
+        return reply->AddData("bdaddr", B_ANY_TYPE, &bdaddr, sizeof(bdaddr_t));
+	}
+	
+	return status; 
+}
+
+
+status_t
+BluetoothServer::HandleSimpleRequest(BMessage* message, BMessage* reply)
+{
+
+    LocalDeviceImpl* ldi = LocateDelegateFromMessage(message);
+	BString propertyRequested;
+		
+	// Find out if there is a property being requested, 
+    if (message->FindString("property", &propertyRequested) == B_OK) {
+    	// Check if the property has been already retrieved
+    	
+    	if (ldi->IsPropertyAvailable(propertyRequested)) {
+    	
+    	    // Dump everything
+    		reply->AddMessage("properties",ldi->GetPropertiesMessage());
+    		return B_OK;
+    	}
+    	               	
+    }
+	
+	// we are gonna need issue the command ...
+	if (ldi->ProcessSimpleRequest(DetachCurrentMessage()) == B_OK)
+		return B_WOULD_BLOCK;
+	else
+		return B_ERROR;
+
+}
+
+
+#if 0
+#pragma mark -
+#endif
+
+
+int32 
+BluetoothServer::notification_Thread(void* data)
+{
+	BPortNot notifierd( (BluetoothServer*) data , BT_USERLAND_PORT_NAME);
+	
+	notifierd.loop();
+	return B_NO_ERROR;
+}
+
+int32 
+BluetoothServer::sdp_server_Thread(void* data)
+{
+
+	return B_NO_ERROR;	
+}
+
+#if 0
+
+void BluetoothServer::DevicesWatching(void) {
+
+	BDirectory* hdoses;
+	BEntry entrada;
+	BPath path;
+
+	//status_t err;
+	int fd1 = -1;
+
+	// only cheks the actual driver which we have
+	hdoses = new BDirectory("/dev/bus/bluetooth/h2/");
+//	hdoses = new BDirectory("/dev/bus/bluetooth/h3/...");
+//	hdoses = new BDirectory("/dev/bus/bluetooth/h4/...");
+	Output::Instance()->Post("Exploring present devices ...\n",1);
+	
+	while (hdoses->GetNextEntry(&entrada,true) == B_OK) {
+	Output::Instance()->Post((char*)path.Path(), 1);		
+		entrada.GetPath(&path);
+		if (entrada.IsDirectory()) {
+			Output::Instance()->Post((char*)path.Path(),1);
+			BDirectory* driver_directory = new BDirectory(path.Path());					
+			BEntry driver_entry;
+
+			syslog(LOG_ALERT, "Bluetooth driver %s\n",path.Path());
+			fprintf(stderr, "Bluetooth driver %s\n",path.Path());
+						
+			while (driver_directory->GetNextEntry(&driver_entry,true) == B_OK) {
+				Output::Instance()->Post((char*)path.Path(),1);
+				driver_entry.GetPath(&path);
+				fd1 = open(path.Path(), O_RDWR);
+				
+
+			
+				// TODO: Watching all folders under and set some kind of internal structure that hold all
+				//		 LocalDevices. 
+				// devloop = new DeviceLooper();
+				// devloop->StartMonitoringDevice("bus/bluetooth/h2");
+
+				if (fd1 < 0) {
+					syslog(LOG_ALERT,BT "Error opening device %s\n",path.Path());
+					fprintf(stderr, "Error opening device %s\n",path.Path());
+				} 
+				else 
+				{
+					struct  {
+						size_t	size;
+						struct hci_command_header header;
+						//struct hci_rp_read_bd_addr body;
+					} __attribute__ ((packed)) cm1;
+
+					struct  {
+						size_t	size;
+						struct hci_command_header header;
+						struct hci_cp_inquiry body;
+					} __attribute__ ((packed)) cm2;
+
+					struct  {
+						size_t	size;
+						struct hci_command_header header;
+						struct hci_remote_name_request body;
+					} __attribute__ ((packed)) cm3;
+
+					struct  {
+						size_t	size;
+						struct hci_command_header header;
+						struct hci_cp_create_conn body;
+					} __attribute__ ((packed)) cm4;
+					
+					 
+					syslog(LOG_ALERT,BT "Registering device %s\n",path.Path());
+					fprintf(stderr, "Opening %s\n",path.Path());
+
+					cm1.size = sizeof(struct hci_command_header);
+					cm1.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_CONTROL_BASEBAND, OCF_RESET));
+					cm1.header.clen = 0;					
+					ioctl(fd1, ISSUE_BT_COMMAND, &cm1, sizeof(cm1));	
+
+					/*cm1.size = sizeof(struct hci_command_header);
+					cm1.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_CONTROL_BASEBAND, OCF_READ_LOCAL_NAME));
+					cm1.header.clen = 0;					
+					ioctl(fd1, ISSUE_BT_COMMAND, &cm1, sizeof(cm1));	
+
+					cm1.size = sizeof(struct hci_command_header);
+					cm1.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_INFORMATIONAL_PARAM, OCF_READ_BD_ADDR));
+					cm1.header.clen = 0;					
+					ioctl(fd1, ISSUE_BT_COMMAND, &cm1, sizeof(cm1));	
+
+					cm2.size = sizeof(struct hci_command_header)+sizeof(struct hci_cp_inquiry);
+					cm2.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_LINK_CTL, OCF_INQUIRY));
+					cm2.body.lap[0] = ((B_BT_GIAC & 0x000000FF));
+					cm2.body.lap[1] = ((B_BT_GIAC & 0x0000FF00) >> 8);
+					cm2.body.lap[2] = ((B_BT_GIAC & 0x00FF0000) >> 16);	
+					cm2.body.length = 0x15;
+					cm2.body.num_rsp = 8;
+					cm2.header.clen = 5;					
+					ioctl(fd1, ISSUE_BT_COMMAND, &cm2, sizeof(cm1));	
+					snooze(60*1000*1000);*/
+					cm3.size = sizeof(struct hci_command_header)+sizeof(struct hci_remote_name_request);
+					cm3.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_LINK_CONTROL, OCF_REMOTE_NAME_REQUEST));
+					cm3.body.bdaddr.b[0] = 0x92;
+					cm3.body.bdaddr.b[1] = 0xd3;
+					cm3.body.bdaddr.b[2] = 0xaf;
+					cm3.body.bdaddr.b[3] = 0xd9;
+					cm3.body.bdaddr.b[4] = 0x0a;
+					cm3.body.bdaddr.b[5] = 0x00;
+					cm3.body.pscan_rep_mode = 1;
+					cm3.body.clock_offset = 0xc7;
+					cm3.header.clen = 10;					
+					ioctl(fd1, ISSUE_BT_COMMAND, &cm3, sizeof(cm3));
+					/*
+					cm4.size = sizeof(struct hci_command_header)+sizeof(struct hci_cp_create_conn);
+					cm4.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_LINK_CTL, OCF_CREATE_CONN));
+					cm4.body.bdaddr.b[0] = 0x92;
+					cm4.body.bdaddr.b[1] = 0xd3;
+					cm4.body.bdaddr.b[2] = 0xaf;
+					cm4.body.bdaddr.b[3] = 0xd9;
+					cm4.body.bdaddr.b[4] = 0x0a;
+					cm4.body.bdaddr.b[5] = 0x00;
+					cm4.body.pkt_type = 0xFFFF;
+					cm4.body.pscan_rep_mode = 1;
+					cm4.body.pscan_mode = 0;
+					cm4.body.clock_offset = 0xc7;
+					cm4.body.role_switch = 1;
+					cm4.header.clen = 13;					
+					ioctl(fd1, ISSUE_BT_COMMAND, &cm4, sizeof(cm4));
+					*/
+				}		
+			}
+		}
+	}
+
+	syslog(LOG_ALERT,BT "All devices registered\n");	
+	fprintf(stderr, "Waiting with opened devices\n");
+
+}
+#endif
+
+void
+BluetoothServer::ShowWindow(BWindow* pWindow)
+{
+	pWindow->Lock();
+	if (pWindow->IsHidden())
+		pWindow->Show();
+	else
+		pWindow->Activate();
+	pWindow->Unlock();
+}
+
+
+#if 0
+#pragma mark -
+#endif
+
+int
+main(int /*argc*/, char** /*argv*/)
+{
+	setbuf(stdout,NULL);
+
+	BluetoothServer* bluetoothServer = new BluetoothServer;
+
+	bluetoothServer->Run();
+	delete bluetoothServer;
+
+	return 0;
+}
+

Added: haiku/trunk/src/servers/bluetooth/BluetoothServer.h
===================================================================
--- haiku/trunk/src/servers/bluetooth/BluetoothServer.h	2008-03-06 20:46:17 UTC (rev 24281)
+++ haiku/trunk/src/servers/bluetooth/BluetoothServer.h	2008-03-06 21:02:08 UTC (rev 24282)
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+#ifndef _BLUETOOTH_SERVER_APP_H
+#define _BLUETOOTH_SERVER_APP_H
+
+#include <stdlib.h>
+#include <Application.h>
+#include <OS.h>
+#include <ObjectList.h>
+
+#include "BPortNot.h"
+#include "HCIDelegate.h"
+#include "DeviceManager.h"
+#include "LocalDeviceImpl.h"
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/HCI/btHCI.h>
+#include <bluetooth/HCI/btHCI_transport.h>
+#include <bluetooth/HCI/btHCI_command.h>
+
+
+#define BT "bluetooth_server: "
+
+#define BLACKBOARD_GENERAL 		 0
+#define BLACKBOARD_DEVICEMANAGER 1
+#define BLACKBOARD_EVENTS        2
+#define BLACKBOARD_KIT           3
+#define BLACKBOARD_LD_OFFSET     4
+
+typedef BObjectList<LocalDeviceImpl> LocalDevicesList;
+
+
+class BluetoothServer : public BApplication
+{
+public:
+
+	BluetoothServer();
+
+	virtual bool QuitRequested(void);
+	virtual void ArgvReceived(int32 argc, char **argv);
+	virtual void ReadyToRun(void);
+
+
+	virtual void AppActivated(bool act);
+	virtual void MessageReceived(BMessage *message);
+	
+	
+	static int32 notification_Thread(void* data);
+	static int32 sdp_server_Thread(void* data);
+	
+	/* Messages reply */
+	status_t	HandleLocalDevicesCount(BMessage* message, BMessage* reply);
+	status_t    HandleAcquireLocalDevice(BMessage* message, BMessage* reply);
+	status_t    HandleGetFriendlyName(BMessage* message, BMessage* reply);
+	status_t    HandleGetAddress(BMessage* message, BMessage* reply);
+
+	status_t    HandleSimpleRequest(BMessage* message, BMessage* reply);
+
+
+    LocalDeviceImpl*    LocateLocalDeviceImpl(hci_id hid);
+
+private:
+
+	LocalDeviceImpl*	LocateDelegateFromMessage(BMessage* message);
+
+	void 				ShowWindow(BWindow* pWindow);
+
+	LocalDevicesList   	fLocalDevicesList;
+	// UI
+
+	// Notification system
+	thread_id				fEventListener;
+	DeviceManager*			fDeviceManager;
+
+	BPoint 					fCenter;
+};
+
+#endif

Added: haiku/trunk/src/servers/bluetooth/CommandManager.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/CommandManager.cpp	2008-03-06 20:46:17 UTC (rev 24281)
+++ haiku/trunk/src/servers/bluetooth/CommandManager.cpp	2008-03-06 21:02:08 UTC (rev 24282)
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/HCI/btHCI_command.h>
+
+#include <malloc.h>
+
+#include "CommandManager.h"
+
+
+inline void* buildCommand(uint8 ogf, uint8 ocf, void** param, size_t psize, size_t* outsize)
+{
+	struct hci_command_header* header;
+	
+#ifdef BT_IOCTLS_PASS_SIZE
+    header = (struct hci_command_header*) malloc(psize + sizeof(struct hci_command_header));
+	*outsize = psize + sizeof(struct hci_command_header);
+#else
+	size_t* size = (size_t*)malloc(psize + sizeof(struct hci_command_header) + sizeof(size_t));
+	*outsize = psize + sizeof(struct hci_command_header) + sizeof(size_t);
+	    
+    *size = psize + sizeof(struct hci_command_header);
+    header = (struct hci_command_header*) (((uint8*)size)+4);
+#endif
+
+    
+    if (header != NULL) {
+        
+        header->opcode = B_HOST_TO_LENDIAN_INT16(PACK_OPCODE(ogf, ocf));
+        header->clen = psize;
+        
+        if (param != NULL && psize != 0) {
+            *param = ((uint8*)header) + sizeof(struct hci_command_header);
+        }
+    }
+#ifdef BT_IOCTLS_PASS_SIZE        
+    return header;
+#else
+    return (void*)size;
+#endif
+}
+
+
+/* CONTROL BASEBAND */
+void* buildReset(size_t* outsize)
+{
+    return buildCommand(OGF_CONTROL_BASEBAND, OCF_RESET, NULL, 0, outsize);
+}
+
+
+void* buildReadLocalName(size_t* outsize)
+{
+    return buildCommand(OGF_CONTROL_BASEBAND, OCF_READ_LOCAL_NAME, NULL, 0, outsize);
+}
+
+
+/* LINK CONTROL */
+void* buildRemoteNameRequest(bdaddr_t bdaddr,uint8 pscan_rep_mode, uint16 clock_offset, size_t* outsize)
+{
+    
+    struct hci_remote_name_request* param;
+    void* command = buildCommand(OGF_LINK_CONTROL, OCF_REMOTE_NAME_REQUEST, (void**) &param, sizeof(struct hci_remote_name_request), outsize);
+    
+    if (command != NULL) {
+        param->bdaddr = bdaddr;
+        param->pscan_rep_mode = pscan_rep_mode;
+        param->clock_offset = clock_offset;
+    }
+
+    return command;
+}
+
+
+void* buildInquiry(uint32 lap, uint8 length, uint8 num_rsp, size_t* outsize)
+{
+
+    struct hci_cp_inquiry* param;
+    void* command = buildCommand(OGF_LINK_CONTROL, OCF_INQUIRY, (void**) &param, sizeof(struct hci_cp_inquiry), outsize);
+
+    if (command != NULL) {    
+	    
+	    param->lap[2] = (lap >> 16) & 0xFF;
+   		param->lap[1] = (lap >>  8) & 0xFF;
+    	param->lap[0] = (lap >>  0) & 0xFF;
+    	param->length = length;
+    	param->num_rsp = num_rsp;
+    }
+
+    return command;
+}
+
+
+/* OGF_INFORMATIONAL_PARAM */
+void* buildReadBufferSize(size_t* outsize)
+{
+    return buildCommand(OGF_INFORMATIONAL_PARAM, OCF_READ_BUFFER_SIZE, NULL, 0, outsize);
+}    
+
+
+void* buildReadBdAddr(size_t* outsize)
+{
+	return buildCommand(OGF_INFORMATIONAL_PARAM, OCF_READ_BD_ADDR, NULL, 0, outsize);
+}    

Added: haiku/trunk/src/servers/bluetooth/CommandManager.h
===================================================================
--- haiku/trunk/src/servers/bluetooth/CommandManager.h	2008-03-06 20:46:17 UTC (rev 24281)
+++ haiku/trunk/src/servers/bluetooth/CommandManager.h	2008-03-06 21:02:08 UTC (rev 24282)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+#ifndef _COMMAND_MANAGER_H
+#define _COMMAND_MANAGER_H
+
+#include <bluetooth/bluetooth.h>
+
+/* CONTROL BASEBAND */
+void* buildReset(size_t* outsize);
+void* buildReadLocalName(size_t* outsize);
+
+/* LINK CONTROL */
+void* buildRemoteNameRequest(bdaddr_t bdaddr,uint8 pscan_rep_mode, uint16 clock_offset, size_t* outsize);
+void* buildInquiry(uint32 lap, uint8 length, uint8 num_rsp, size_t* outsize);
+
+/* OGF_INFORMATIONAL_PARAM */
+void* buildReadBufferSize(size_t* outsize);
+void* buildReadBdAddr(size_t* outsize);
+
+#endif
\ No newline at end of file

Added: haiku/trunk/src/servers/bluetooth/DeviceManager.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/DeviceManager.cpp	2008-03-06 20:46:17 UTC (rev 24281)
+++ haiku/trunk/src/servers/bluetooth/DeviceManager.cpp	2008-03-06 21:02:08 UTC (rev 24282)
@@ -0,0 +1,329 @@
+/*
+** Copyright 2004, the Haiku project. All rights reserved.
+** Distributed under the terms of the Haiku License.
+**
+**
+** Author : J?r?me Duval
+** Original authors: Marcus Overhagen, Axel D?rfler
+**
+** Bluetooth adaptation: Oliver Ruiz Dorantes
+**
+*/
+
+
+#include <Application.h>
+#include <Autolock.h>
+#include <String.h>
+
+#include <Directory.h>
+#include <Entry.h>
+#include <FindDirectory.h>
+#include <Path.h>
+#include <NodeMonitor.h>
+
+
+#include <image.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "DeviceManager.h"
+#include "LocalDeviceImpl.h"
+
+#include "Output.h"
+#include "BluetoothServer.h"
+
+#include <bluetoothserver_p.h>
+
+
+void
+DeviceManager::MessageReceived(BMessage * msg)
+{
+	if (msg->what == B_NODE_MONITOR) {
+		int32 opcode;
+		if (msg->FindInt32("opcode", &opcode) == B_OK) {
+			switch (opcode) {
+			case B_ENTRY_CREATED:
+			case B_ENTRY_REMOVED:
+			case B_ENTRY_MOVED:
+			{
+				node_ref dir_nref;
+				const char *name;				
+				BDirectory dir;
+
+				(Output::Instance()->Post("Bus changing ...\n", BLACKBOARD_DEVICEMANAGER));	
+				
+				if ((msg->FindInt32("device", &dir_nref.device)!=B_OK)
+					|| (msg->FindInt64("directory", &dir_nref.node)!=B_OK)
+					|| (msg->FindString("name", &name) != B_OK))
+					return;
+					
+				// Check if the entry is a File or a directory
+				if (dir.SetTo(&dir_nref) == B_OK) {				    

[... truncated: 1588 lines follow ...]


From mmu_man at mail.berlios.de  Thu Mar  6 23:27:36 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 23:27:36 +0100
Subject: [Haiku-commits] r24283 - in
	haiku/branches/developer/mmu_man/distro: . links vncviewer
Message-ID: <200803062227.m26MRaOn007695@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 23:27:36 +0100 (Thu, 06 Mar 2008)
New Revision: 24283
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24283&view=rev

Modified:
   haiku/branches/developer/mmu_man/distro/DistroRules
   haiku/branches/developer/mmu_man/distro/links/Jamfile
   haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile
Log:
Rule to use a tgz source from the web.
Added links; unfinished.


Modified: haiku/branches/developer/mmu_man/distro/DistroRules
===================================================================
--- haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 21:02:08 UTC (rev 24282)
+++ haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 22:27:36 UTC (rev 24283)
@@ -66,8 +66,93 @@
 	fi
 }
 
+# source zip file to download
+rule DistroZipRepos
+{
+	# Usage: DistroZipRepos reposname : url [ : patchurl ]
+	# reposname is (uppercase) name of app (part of DISTRO_*_SOURCES)
+	local srcPath = <$(SOURCE_GRIST)>sources ;
+	DistroLocalRepos $(1) ;
+	if ! $(DISTRO_$(1)_SOURCES) {
+		local package = $(1) ;
+		local url = $(2) ;
+		NotFile $(2) ;
+		local zipFile = $(package:S=.zip:G=download) ;
+		MakeLocate $(zipFile) : $(HAIKU_DOWNLOAD_DIR) ;
+		DownloadFile $(zipFile) : $(url) ;
+		UNZIP_OPTS on $(srcPath) = $(DISTRO_$(1)_UNZIP_OPTS) ;
+		DistroZipReposCheckout1 $(srcPath) : $(zipFile) ;
+		# avoid rebuilding all object files each time !?
+		NoUpdate $(srcPath) ;
+	}
+}
 
+# source zip file to download
+rule DistroDownloadRepos
+{
+	# Usage: DistroZipRepos reposname : url : ziptype [ : foldername [ : patchurl ] ]
+	# reposname is (uppercase) name of app (part of DISTRO_*_SOURCES)
+	# foldername is the name of the folder unzipped, which gets renamed to sources
+	# ziptype is either zip or tgz
+	local srcPath = <$(SOURCE_GRIST)>sources ;
+	DistroLocalRepos $(1) ;
+	if ! $(DISTRO_$(1)_SOURCES) {
+		local package = $(1) ;
+		local url = $(2) ;
+		local ziptype = $(3) ;
+		local foldername = $(4) ;
+		local patchurl = $(5) ;
+		NotFile $(url) ;
+		NotFile $(foldername) ;
+		NoUpdate $(foldername) ;
+		NotFile $(patchurl) ;
+		local zipFile = $(package:S=.$(ziptype):G=download) ;
+		MakeLocate $(zipFile) : $(HAIKU_DOWNLOAD_DIR) ;
+		DownloadFile $(zipFile) : $(url) ;
+		Depends $(srcPath) : $(zipFile) ;
+		UNZIP_OPTS on $(srcPath) = $(DISTRO_$(1)_UNZIP_OPTS) ;
+		UNZIP_WHERE on $(srcPath) = $(SUBDIR) ;
+		UNZIP_RENAME on $(srcPath) = [ FDirName $(SUBDIR) $(foldername) ] ;
+		if ! $(foldername) {
+			MkDir $(srcPath) ;
+		}
+		switch $(ziptype) {
+			case zip :	DistroZipReposCheckout1 $(srcPath) : $(zipFile) ;
+			case tgz :	DistroTarGzReposCheckout1 $(srcPath) : $(zipFile) ;
+			case tar.gz :	DistroTarGzReposCheckout1 $(srcPath) : $(zipFile) ;
+		}
+		if $(foldername) {
+			#MakeLocate $(foldername) : $(SUBDIR) ;
+			DistroMv $(srcPath) : $(foldername:D=) ;
+		}
+		if $(patchurl) {
+			local patchFile = $(package:S=.diff:G=download) ;
+			MakeLocate $(patchFile) : $(HAIKU_DOWNLOAD_DIR) ;
+			DownloadFile $(patchFile) : $(patchurl) ;
+			Depends $(srcPath) : $(patchFile) ;
+		}
+		# avoid rebuilding all object files each time !?
+		NoUpdate $(srcPath) ;
+	}
+}
 
+# 
+actions DistroZipReposCheckout1
+{
+	unzip -v -d "$(1)" $(UNZIP_OPTS) "$(2)"
+}
+
+# 
+actions DistroTarGzReposCheckout1
+{
+	tar zxvf "$(2)" $(UNZIP_OPTS) -C "$(UNZIP_WHERE)"
+}
+
+actions DistroMv
+{
+	mv "$(UNZIP_RENAME)" "$(1)"
+}
+
 rule DistroApplication
 {
 	# Application <name> : <sources> : <libraries> : <res> ;

Modified: haiku/branches/developer/mmu_man/distro/links/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/links/Jamfile	2008-03-06 21:02:08 UTC (rev 24282)
+++ haiku/branches/developer/mmu_man/distro/links/Jamfile	2008-03-06 22:27:36 UTC (rev 24283)
@@ -1,2 +1,36 @@
 DistroSubDir links ;
+	
+SetSubDirSupportedPlatformsBeOSCompatible ;
 
+DistroDownloadRepos LINKS 
+	: http://links.twibright.com/download/links-2.1pre33.tar.gz
+	: tgz
+	: links-2.1pre33
+	: http://revolf.free.fr/beos/patches/links-2.1pre31.beos.003.diff.txt
+;
+
+local networkLibs ;
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
+	networkLibs = $(HOST_NETWORK_LIBS) ;
+} else {
+	networkLibs = $(HAIKU_NETWORK_LIBS) ;
+	UseHeaders [ FDirName $(HAIKU_TOP) headers libs zlib ] : true ;
+}
+
+DistroApplication links :
+	
+	: be game $(networkLibs) textencoding z
+	: 
+;
+
+#
+# Add binaries to the image
+# 
+
+# note the <distro> grist (we reuse haiku rules).
+
+AddFilesToHaikuImage apps Links : <distro>links ;
+AddSymlinkToHaikuImage home config be Applications
+					: /boot/apps/Links/links : Links ;
+
+

Modified: haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile	2008-03-06 21:02:08 UTC (rev 24282)
+++ haiku/branches/developer/mmu_man/distro/vncviewer/Jamfile	2008-03-06 22:27:36 UTC (rev 24283)
@@ -37,3 +37,5 @@
 # note the <distro> grist (we reuse haiku rules).
 
 AddFilesToHaikuImage apps VNCViewer : <distro>VNCViewer ;
+AddSymlinkToHaikuImage home config be Applications
+					: /boot/apps/VNCViewer/VNCViewer : VNCViewer ;



From superstippi at gmx.de  Thu Mar  6 23:29:01 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Thu, 06 Mar 2008 23:29:01 +0100
Subject: [Haiku-commits] r24280 - haiku/trunk/src/preferences/screen
In-Reply-To: <47D05865.5000608@zappotek.com>
References: <200803062017.m26KHKv1027622@sheep.berlios.de>
	<47D05865.5000608@zappotek.com>
Message-ID: <20080306232901.707.1@stippis2.1204842203.fake>


Alexandre Deckner wrote:
> Btw, tomorrow night, i'll be in vacation for 10 days! I won't answer to 
> emails so feel free to mess with my changes if needed :-) (not that i 
> mind in normal time)

Thanks for your work and have fun! :-)

Best regards,
-Stephan


From mmu_man at mail.berlios.de  Thu Mar  6 23:30:41 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 23:30:41 +0100
Subject: [Haiku-commits] r24284 - in
	haiku/branches/developer/mmu_man/distro: . sumit
Message-ID: <200803062230.m26MUfTX008538@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 23:30:41 +0100 (Thu, 06 Mar 2008)
New Revision: 24284
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24284&view=rev

Added:
   haiku/branches/developer/mmu_man/distro/sumit/
   haiku/branches/developer/mmu_man/distro/sumit/Jamfile
Modified:
   haiku/branches/developer/mmu_man/distro/Jamfile
Log:
Add placeholder for sumit.


Modified: haiku/branches/developer/mmu_man/distro/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/Jamfile	2008-03-06 22:27:36 UTC (rev 24283)
+++ haiku/branches/developer/mmu_man/distro/Jamfile	2008-03-06 22:30:41 UTC (rev 24284)
@@ -14,6 +14,7 @@
 	SubInclude DISTRO_TOP links ;
 	SubInclude DISTRO_TOP opensound ;
 	SubInclude DISTRO_TOP pe ;
+	SubInclude DISTRO_TOP sumit ;
 	SubInclude DISTRO_TOP vncviewer ;
 
 	NotFile <distro>checkout ;

Added: haiku/branches/developer/mmu_man/distro/sumit/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/sumit/Jamfile	2008-03-06 22:27:36 UTC (rev 24283)
+++ haiku/branches/developer/mmu_man/distro/sumit/Jamfile	2008-03-06 22:30:41 UTC (rev 24284)
@@ -0,0 +1,2 @@
+DistroSubDir sumit ;
+



From mmu_man at mail.berlios.de  Thu Mar  6 23:47:43 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 23:47:43 +0100
Subject: [Haiku-commits] r24285 - haiku/branches/developer/mmu_man/distro
Message-ID: <200803062247.m26MlhU2011464@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 23:47:43 +0100 (Thu, 06 Mar 2008)
New Revision: 24285
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24285&view=rev

Modified:
   haiku/branches/developer/mmu_man/distro/DistroRules
Log:
Actually apply the patch file.


Modified: haiku/branches/developer/mmu_man/distro/DistroRules
===================================================================
--- haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 22:30:41 UTC (rev 24284)
+++ haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 22:47:43 UTC (rev 24285)
@@ -90,7 +90,7 @@
 # source zip file to download
 rule DistroDownloadRepos
 {
-	# Usage: DistroZipRepos reposname : url : ziptype [ : foldername [ : patchurl ] ]
+	# Usage: DistroZipRepos reposname : url : ziptype [ : foldername [ : patchurl [ : patchopts ] ] ]
 	# reposname is (uppercase) name of app (part of DISTRO_*_SOURCES)
 	# foldername is the name of the folder unzipped, which gets renamed to sources
 	# ziptype is either zip or tgz
@@ -102,6 +102,7 @@
 		local ziptype = $(3) ;
 		local foldername = $(4) ;
 		local patchurl = $(5) ;
+		local patchopts = $(6) ;
 		NotFile $(url) ;
 		NotFile $(foldername) ;
 		NoUpdate $(foldername) ;
@@ -130,6 +131,9 @@
 			MakeLocate $(patchFile) : $(HAIKU_DOWNLOAD_DIR) ;
 			DownloadFile $(patchFile) : $(patchurl) ;
 			Depends $(srcPath) : $(patchFile) ;
+			#PATCH_FILE on $(srcPath) = $(patchFile) ;
+			PATCH_OPTS on $(srcPath) = $(patchopts) ;
+			DistroPatchRepos $(srcPath) : $(patchFile) ;
 		}
 		# avoid rebuilding all object files each time !?
 		NoUpdate $(srcPath) ;
@@ -153,6 +157,11 @@
 	mv "$(UNZIP_RENAME)" "$(1)"
 }
 
+actions DistroPatchRepos
+{
+	cd "$(1)" && patch $(PATCH_OPTS) -i "$(2)"
+}
+
 rule DistroApplication
 {
 	# Application <name> : <sources> : <libraries> : <res> ;



From mmu_man at mail.berlios.de  Thu Mar  6 23:52:36 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 23:52:36 +0100
Subject: [Haiku-commits] r24286 - haiku/branches/developer/mmu_man/distro
Message-ID: <200803062252.m26MqaUU011693@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 23:52:36 +0100 (Thu, 06 Mar 2008)
New Revision: 24286
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24286&view=rev

Modified:
   haiku/branches/developer/mmu_man/distro/DistroRules
Log:
* cleanup leftover.
* patch -d should work better.


Modified: haiku/branches/developer/mmu_man/distro/DistroRules
===================================================================
--- haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 22:47:43 UTC (rev 24285)
+++ haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 22:52:36 UTC (rev 24286)
@@ -67,27 +67,6 @@
 }
 
 # source zip file to download
-rule DistroZipRepos
-{
-	# Usage: DistroZipRepos reposname : url [ : patchurl ]
-	# reposname is (uppercase) name of app (part of DISTRO_*_SOURCES)
-	local srcPath = <$(SOURCE_GRIST)>sources ;
-	DistroLocalRepos $(1) ;
-	if ! $(DISTRO_$(1)_SOURCES) {
-		local package = $(1) ;
-		local url = $(2) ;
-		NotFile $(2) ;
-		local zipFile = $(package:S=.zip:G=download) ;
-		MakeLocate $(zipFile) : $(HAIKU_DOWNLOAD_DIR) ;
-		DownloadFile $(zipFile) : $(url) ;
-		UNZIP_OPTS on $(srcPath) = $(DISTRO_$(1)_UNZIP_OPTS) ;
-		DistroZipReposCheckout1 $(srcPath) : $(zipFile) ;
-		# avoid rebuilding all object files each time !?
-		NoUpdate $(srcPath) ;
-	}
-}
-
-# source zip file to download
 rule DistroDownloadRepos
 {
 	# Usage: DistroZipRepos reposname : url : ziptype [ : foldername [ : patchurl [ : patchopts ] ] ]
@@ -159,7 +138,7 @@
 
 actions DistroPatchRepos
 {
-	cd "$(1)" && patch $(PATCH_OPTS) -i "$(2)"
+	patch $(PATCH_OPTS) -d "$(1)" -i "$(2)"
 }
 
 rule DistroApplication



From mmu_man at mail.berlios.de  Thu Mar  6 23:55:48 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Mar 2008 23:55:48 +0100
Subject: [Haiku-commits] r24287 - in
	haiku/branches/developer/mmu_man/distro: . links
Message-ID: <200803062255.m26MtmRr011879@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-06 23:55:48 +0100 (Thu, 06 Mar 2008)
New Revision: 24287
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24287&view=rev

Added:
   haiku/branches/developer/mmu_man/distro/links/config.h
Modified:
   haiku/branches/developer/mmu_man/distro/DistroRules
   haiku/branches/developer/mmu_man/distro/links/Jamfile
Log:
* patch works now
* add config.h from beos build
* use a version matching the patch


Modified: haiku/branches/developer/mmu_man/distro/DistroRules
===================================================================
--- haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 22:52:36 UTC (rev 24286)
+++ haiku/branches/developer/mmu_man/distro/DistroRules	2008-03-06 22:55:48 UTC (rev 24287)
@@ -138,7 +138,7 @@
 
 actions DistroPatchRepos
 {
-	patch $(PATCH_OPTS) -d "$(1)" -i "$(2)"
+	cat "$(2)" | patch $(PATCH_OPTS) -d "$(1)"
 }
 
 rule DistroApplication

Modified: haiku/branches/developer/mmu_man/distro/links/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/links/Jamfile	2008-03-06 22:52:36 UTC (rev 24286)
+++ haiku/branches/developer/mmu_man/distro/links/Jamfile	2008-03-06 22:55:48 UTC (rev 24287)
@@ -3,9 +3,10 @@
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 DistroDownloadRepos LINKS 
-	: http://links.twibright.com/download/links-2.1pre33.tar.gz
+	: http://links.twibright.com/download/links-2.1pre31.tar.gz
+	 #http://links.twibright.com/download/links-2.1pre33.tar.gz
 	: tgz
-	: links-2.1pre33
+	: links-2.1pre31
 	: http://revolf.free.fr/beos/patches/links-2.1pre31.beos.003.diff.txt
 ;
 

Added: haiku/branches/developer/mmu_man/distro/links/config.h
===================================================================
--- haiku/branches/developer/mmu_man/distro/links/config.h	2008-03-06 22:52:36 UTC (rev 24286)
+++ haiku/branches/developer/mmu_man/distro/links/config.h	2008-03-06 22:55:48 UTC (rev 24287)
@@ -0,0 +1,565 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
+
+
+/* Define to 1 if you have the <app/Application.h> header file. */
+#define HAVE_APP_APPLICATION_H 1
+
+/* Define to 1 if you have the <atheos/threads.h> header file. */
+/* #undef HAVE_ATHEOS_THREADS_H */
+
+/* Define to 1 if you have the <bzlib.h> header file. */
+/* #undef HAVE_BZLIB_H */
+
+/* Define to 1 if you have the `calloc' function. */
+#define HAVE_CALLOC 1
+
+/* Define to 1 if you have the `chmod' function. */
+#define HAVE_CHMOD 1
+
+/* Define to 1 if you have the `cygwin_conv_to_full_win32_path' function. */
+/* #undef HAVE_CYGWIN_CONV_TO_FULL_WIN32_PATH */
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* Define to 1 if you have the <endian.h> header file. */
+#define HAVE_ENDIAN_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `getpagesize' function. */
+/* #undef HAVE_GETPAGESIZE */
+
+/* Define to 1 if you have the `getpid' function. */
+#define HAVE_GETPID 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the <gpm.h> header file. */
+/* #undef HAVE_GPM_H */
+
+/* Define to 1 if you have the <gui/bitmap.h> header file. */
+/* #undef HAVE_GUI_BITMAP_H */
+
+/* Define to 1 if you have the <gui/desktop.h> header file. */
+/* #undef HAVE_GUI_DESKTOP_H */
+
+/* Define to 1 if you have the <gui/view.h> header file. */
+/* #undef HAVE_GUI_VIEW_H */
+
+/* Define to 1 if you have the <gui/window.h> header file. */
+/* #undef HAVE_GUI_WINDOW_H */
+
+/* Define to 1 if you have the <ieee.h> header file. */
+/* #undef HAVE_IEEE_H */
+
+/* Define to 1 if you have the <interface/Bitmap.h> header file. */
+#define HAVE_INTERFACE_BITMAP_H 1
+
+/* Define to 1 if you have the <interface/Screen.h> header file. */
+#define HAVE_INTERFACE_SCREEN_H 1
+
+/* Define to 1 if you have the <interface/View.h> header file. */
+#define HAVE_INTERFACE_VIEW_H 1
+
+/* Define to 1 if you have the <interface/Window.h> header file. */
+#define HAVE_INTERFACE_WINDOW_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
+
+/* Define to 1 if you have the <jpeglib.h> header file. */
+/* #undef HAVE_JPEGLIB_H */
+
+/* Define to 1 if you have the <kernel/OS.h> header file. */
+#define HAVE_KERNEL_OS_H 1
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+/* #undef HAVE_LANGINFO_H */
+
+/* Define to 1 if you have the `atheos' library (-latheos). */
+/* #undef HAVE_LIBATHEOS */
+
+/* Define to 1 if you have the `bind' library (-lbind). */
+#define HAVE_LIBBIND 1
+
+/* Define to 1 if you have the `bz2' library (-lbz2). */
+/* #undef HAVE_LIBBZ2 */
+
+/* Define to 1 if you have the `dl' library (-ldl). */
+/* #undef HAVE_LIBDL */
+
+/* Define to 1 if you have the `gpm' library (-lgpm). */
+/* #undef HAVE_LIBGPM */
+
+/* Define to 1 if you have the `jpeg' library (-ljpeg). */
+/* #undef HAVE_LIBJPEG */
+
+/* Define to 1 if you have the `m' library (-lm). */
+/* #undef HAVE_LIBM */
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+/* #undef HAVE_LIBNSL */
+
+/* Define to 1 if you have the `png' library (-lpng). */
+#define HAVE_LIBPNG 1
+
+/* Define to 1 if you have the <libpng/png.h> header file. */
+/* #undef HAVE_LIBPNG_PNG_H */
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+#define HAVE_LIBSOCKET 1
+
+/* Define to 1 if you have the `stdc++' library (-lstdc++). */
+/* #undef HAVE_LIBSTDC__ */
+
+/* Define to 1 if you have the `tiff' library (-ltiff). */
+/* #undef HAVE_LIBTIFF */
+
+/* Define to 1 if you have the `X11' library (-lX11). */
+/* #undef HAVE_LIBX11 */
+
+/* Define to 1 if you have the `z' library (-lz). */
+#define HAVE_LIBZ 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <linux/fb.h> header file. */
+/* #undef HAVE_LINUX_FB_H */
+
+/* Define to 1 if you have the <linux/kd.h> header file. */
+/* #undef HAVE_LINUX_KD_H */
+
+/* Define to 1 if you have the <linux/vt.h> header file. */
+/* #undef HAVE_LINUX_VT_H */
+
+/* Define to 1 if you have the <math.h> header file. */
+#define HAVE_MATH_H 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkdir' function. */
+#define HAVE_MKDIR 1
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the <netinet/dhcp.h> header file. */
+/* #undef HAVE_NETINET_DHCP_H */
+
+/* Define to 1 if you have the <netinet/in_system.h> header file. */
+/* #undef HAVE_NETINET_IN_SYSTEM_H */
+
+/* Define to 1 if you have the <netinet/in_systm.h> header file. */
+#define HAVE_NETINET_IN_SYSTM_H 1
+
+/* Define to 1 if you have the <netinet/ip.h> header file. */
+#define HAVE_NETINET_IP_H 1
+
+/* Define to 1 if you have the `nl_langinfo' function. */
+/* #undef HAVE_NL_LANGINFO */
+
+/* Define to 1 if you have the `png_create_info_struct' function. */
+/* #undef HAVE_PNG_CREATE_INFO_STRUCT */
+
+/* Define to 1 if you have the `png_get_bit_depth' function. */
+#define HAVE_PNG_GET_BIT_DEPTH 1
+
+/* Define to 1 if you have the `png_get_color_type' function. */
+#define HAVE_PNG_GET_COLOR_TYPE 1
+
+/* Define to 1 if you have the `png_get_gAMA' function. */
+#define HAVE_PNG_GET_GAMA 1
+
+/* Define to 1 if you have the `png_get_image_height' function. */
+#define HAVE_PNG_GET_IMAGE_HEIGHT 1
+
+/* Define to 1 if you have the `png_get_image_width' function. */
+#define HAVE_PNG_GET_IMAGE_WIDTH 1
+
+/* Define to 1 if you have the `png_get_sRGB' function. */
+#define HAVE_PNG_GET_SRGB 1
+
+/* Define to 1 if you have the `png_get_valid' function. */
+#define HAVE_PNG_GET_VALID 1
+
+/* Define to 1 if you have the <png.h> header file. */
+#define HAVE_PNG_H 1
+
+/* Define to 1 if you have the `png_set_rgb_to_gray' function. */
+#define HAVE_PNG_SET_RGB_TO_GRAY 1
+
+/* Define to 1 if you have the `png_set_strip_alpha' function. */
+#define HAVE_PNG_SET_STRIP_ALPHA 1
+
+/* Define to 1 if you have the `popen' function. */
+#define HAVE_POPEN 1
+
+/* Define to 1 if you have the `raise' function. */
+#define HAVE_RAISE 1
+
+/* Define to 1 if you have the `resume_thread' function. */
+#define HAVE_RESUME_THREAD 1
+
+/* Define to 1 if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the <setjmp.h> header file. */
+#define HAVE_SETJMP_H 1
+
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define to 1 if you have the `setpgid' function. */
+#define HAVE_SETPGID 1
+
+/* Define to 1 if you have the <sigaction.h> header file. */
+/* #undef HAVE_SIGACTION_H */
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* Define to 1 if you have the `spawn_thread' function. */
+#define HAVE_SPAWN_THREAD 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strcspn' function. */
+#define HAVE_STRCSPN 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strptime' function. */
+/* #undef HAVE_STRPTIME */
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the `strtoll' function. */
+#define HAVE_STRTOLL 1
+
+/* Define to 1 if you have the `strtoq' function. */
+#define HAVE_STRTOQ 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define to 1 if you have the <support/Locker.h> header file. */
+#define HAVE_SUPPORT_LOCKER_H 1
+
+/* Define to 1 if you have the <sys/cygwin.h> header file. */
+/* #undef HAVE_SYS_CYGWIN_H */
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/fmutex.h> header file. */
+/* #undef HAVE_SYS_FMUTEX_H */
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+/* #undef HAVE_SYS_MMAN_H */
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+/* #undef HAVE_SYS_UN_H */
+
+/* Define to 1 if you have the <sys/utsname.h> header file. */
+#define HAVE_SYS_UTSNAME_H 1
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the `tempnam' function. */
+#define HAVE_TEMPNAM 1
+
+/* Define to 1 if you have the <tiffio.h> header file. */
+/* #undef HAVE_TIFFIO_H */
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have the `uname' function. */
+#define HAVE_UNAME 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <util/application.h> header file. */
+/* #undef HAVE_UTIL_APPLICATION_H */
+
+/* Define to 1 if you have the <util/locker.h> header file. */
+/* #undef HAVE_UTIL_LOCKER_H */
+
+/* Define to 1 if you have the <values.h> header file. */
+/* #undef HAVE_VALUES_H */
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if you have the <X11/Xlib.h> header file. */
+/* #undef HAVE_X11_XLIB_H */
+
+/* Define to 1 if you have the <X11/Xlocale.h> header file. */
+/* #undef HAVE_X11_XLOCALE_H */
+
+/* Define to 1 if you have the <X11/Xutil.h> header file. */
+/* #undef HAVE_X11_XUTIL_H */
+
+/* Define to 1 if you have the <X11/X.h> header file. */
+/* #undef HAVE_X11_X_H */
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#define HAVE_ZLIB_H 1
+
+/* Name of package */
+#define PACKAGE "links"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `unsigned', as computed by sizeof. */
+#define SIZEOF_UNSIGNED 4
+
+/* The size of `unsigned long', as computed by sizeof. */
+#define SIZEOF_UNSIGNED_LONG 4
+
+/* The size of `unsigned short', as computed by sizeof. */
+#define SIZEOF_UNSIGNED_SHORT 2
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Version number of package */
+#define VERSION "2.1pre31"
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to 1 if NLS is requested.  */
+/* #undef ENABLE_NLS */
+
+/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
+/* #undef HAVE_CATGETS */
+
+/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
+/* #undef HAVE_GETTEXT */
+
+/* Define if your locale.h file contains LC_MESSAGES.  */
+/* #undef HAVE_LC_MESSAGES */
+
+/* Define to 1 if you have the stpcpy function.  */
+/* #undef HAVE_STPCPY */
+
+/* */
+#define HAVE_TYPEOF 1
+
+/* */
+#define HAVE_LONG_LONG 1
+
+/* */
+#define HAVE_SIGSETJMP 1
+
+/* */
+#define HAVE_CHMOD 1
+
+/* */
+/* #undef HAVE_ALARM */
+
+/* */
+/* #undef HAVE_CFMAKERAW */
+
+/* */
+#define HAVE_GETHOSTBYADDR 1
+
+/* */
+/* #undef HAVE_DHCP_OPTION */
+
+/* */
+#define HAVE_HERROR 1
+
+/* */
+/* #undef HAVE_BEGINTHREAD */
+
+/* */
+/* #undef HAVE_MOUOPEN */
+
+/* */
+/* #undef HAVE_READ_KBD */
+
+/* */
+/* #undef HAVE_CLONE */
+
+/* */
+/* #undef HAVE_PTHREADS */
+
+/* */
+/* #undef HAVE_SSL */
+
+/* */
+#define HAVE_ZLIB 1
+
+/* */
+/* #undef HAVE_BZIP2 */
+
+/* */
+/* #undef X2 */
+
+/* */
+#define DEBUGLEVEL 2
+
+/* */
+/* #undef JS */
+
+/* */
+/* #undef HAVE_PCRE */
+
+/* */
+/* #undef HAVE_REGEX */
+
+/* */
+/* #undef CHCEME_FLEXI_LIBU */
+
+/* By PerM's ideological comittee */
+#define VERSION "2.1pre31"
+
+/* */
+#define G 1
+
+/* */
+/* #undef GRDRV_SVGALIB */
+
+/* */
+/* #undef GRDRV_FB */
+
+/* */
+/* #undef GRDRV_DIRECTFB */
+
+/* */
+/* #undef GRDRV_PMSHELL */
+
+/* */
+/* #undef GRDRV_X */
+
+/* */
+/* #undef GRDRV_SDL */
+
+/* */
+/* #undef GRDRV_ATHEOS */
+
+/* */
+#define GRDRV_BEOS 1
+
+/* */
+/* #undef DONT_INCLUDE_SETJMP */
+
+/* Tiff by Brain */
+/* #undef HAVE_TIFF */
+
+/* Jpeg by Clock */
+/* #undef HAVE_JPEG */
+
+/* */
+/* #undef C_BIG_ENDIAN */
+
+/* */
+#define C_LITTLE_ENDIAN 1
+
+/* */
+#define RENAME_OVER_EXISTING_FILES 1
+
+/* */
+/* #undef HAVE_SOCKLEN_T */
+



From alex at zappotek.com  Fri Mar  7 00:01:35 2008
From: alex at zappotek.com (Alexandre Deckner)
Date: Fri, 07 Mar 2008 00:01:35 +0100
Subject: [Haiku-commits] r24280 - haiku/trunk/src/preferences/screen
In-Reply-To: <200803062017.m26KHKv1027622@sheep.berlios.de>
References: <200803062017.m26KHKv1027622@sheep.berlios.de>
Message-ID: <47D077CF.8040806@zappotek.com>

aldeck at BerliOS a ?crit :
> * disabled current workspace menu item for now since it is not 
> implemented. see ticket #696
Oops, typo, it's ticket #693, i'll change the comment in code.


From alex at zappotek.com  Fri Mar  7 00:14:47 2008
From: alex at zappotek.com (Alexandre Deckner)
Date: Fri, 07 Mar 2008 00:14:47 +0100
Subject: [Haiku-commits] r24280 - haiku/trunk/src/preferences/screen
In-Reply-To: <47D077CF.8040806@zappotek.com>
References: <200803062017.m26KHKv1027622@sheep.berlios.de>
	<47D077CF.8040806@zappotek.com>
Message-ID: <47D07AE7.3090905@zappotek.com>

Alexandre Deckner wrote :
> aldeck at BerliOS a ?crit :
>   
>> * disabled current workspace menu item for now since it is not 
>> implemented. see ticket #696
>>     
> Oops, typo, it's ticket #693, i'll change the comment in code.
>
>
>   
Eh! Actually, nothing to do, the comment in code was ok :-P

Night,
Alex




From mmu_man at mail.berlios.de  Fri Mar  7 00:37:25 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Fri, 7 Mar 2008 00:37:25 +0100
Subject: [Haiku-commits] r24288 -
	haiku/branches/developer/mmu_man/distro/links
Message-ID: <200803062337.m26NbPST029175@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-07 00:37:24 +0100 (Fri, 07 Mar 2008)
New Revision: 24288
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24288&view=rev

Modified:
   haiku/branches/developer/mmu_man/distro/links/Jamfile
Log:
This makes links cross buildable (with some tweaks required: remove "be/kernel" in some places).


Modified: haiku/branches/developer/mmu_man/distro/links/Jamfile
===================================================================
--- haiku/branches/developer/mmu_man/distro/links/Jamfile	2008-03-06 22:55:48 UTC (rev 24287)
+++ haiku/branches/developer/mmu_man/distro/links/Jamfile	2008-03-06 23:37:24 UTC (rev 24288)
@@ -15,12 +15,78 @@
 	networkLibs = $(HOST_NETWORK_LIBS) ;
 } else {
 	networkLibs = $(HAIKU_NETWORK_LIBS) ;
+	UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
+	UseHeaders [ FDirName $(HAIKU_TOP) headers libs png ] : true ;
 	UseHeaders [ FDirName $(HAIKU_TOP) headers libs zlib ] : true ;
 }
 
+#SYSHDRS on links_icon.c += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+SUBDIRSYSHDRS += [ FDirName $(SUBDIR_TOKENS) sources ] ;
+SubDirCcFlags -DHAVE_CONFIG_H ;
+SubDirC++Flags -DHAVE_CONFIG_H ;
+
 DistroApplication links :
-	
-	: be game $(networkLibs) textencoding z
+	af_unix.c
+	auth.c
+	beos.c
+	bfu.c
+	block.c
+	bookmarks.c
+	cache.c
+	charsets.c
+	connect.c
+	cookies.c
+	default.c
+	dip.c
+	directfb.c
+	dither.c
+	dns.c
+	drivers.c
+	error.c
+	file.c
+	finger.c
+	font_include.c
+	framebuffer.c
+	ftp.c
+	gif.c
+	html_gr.c
+	html.c
+	html_r.c
+	html_tbl.c
+	http.c
+	https.c
+	imgcache.c
+	img.c
+	jpeg.c
+	jsint.c
+	kbd.c
+	language.c
+	links_icon.c
+	listedit.c
+	lru.c
+	mailto.c
+	main.c
+	memory.c
+	menu.c
+	objreq.c
+	os_dep.c
+	pmshell.c
+	png.c
+	sched.c
+	select.c
+	session.c
+	smb.c
+	svgalib.c
+	terminal.c
+	tiff.c
+	types.c
+	url.c
+	view_gr.c
+	view.c
+	xbm.c
+	x.c
+	beosgui.cpp
+	: be $(networkLibs) libpng.a z
 	: 
 ;
 
@@ -34,4 +100,3 @@
 AddSymlinkToHaikuImage home config be Applications
 					: /boot/apps/Links/links : Links ;
 
-



From anevilyak at mail.berlios.de  Fri Mar  7 02:18:30 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Fri, 7 Mar 2008 02:18:30 +0100
Subject: [Haiku-commits] r24289 - haiku/trunk/build/jam
Message-ID: <200803070118.m271IUmU011913@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-07 02:18:29 +0100 (Fri, 07 Mar 2008)
New Revision: 24289
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24289&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Updated optional Vision package to point to a new build which is a) 
built directly out of Haiku's build sys, which is to say against haiku's 
headers, etc. directly, and b) includes Stephan's HVIF icon (thanks!).



Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2008-03-06 23:37:24 UTC (rev 24288)
+++ haiku/trunk/build/jam/HaikuImage	2008-03-07 01:18:29 UTC (rev 24289)
@@ -519,11 +519,11 @@
 		Echo "No optional package Vision available for gcc4" ;
 	} else {
 		InstallOptionalHaikuImagePackage Vision
-			: http://vision.sf.net/Vision-0.9.7-H-26012008.zip
+			: http://vision.sf.net/Vision-0.9.7-H-06032008.zip
 			: apps
 		;
 		AddSymlinkToHaikuImage home config be Applications
-			: /boot/apps/Vision-0.9.7-H-26012008/Vision ;
+			: /boot/apps/Vision-0.9.7-H-06032008/Vision ;
 	}
 }
 



From anevilyak at mail.berlios.de  Fri Mar  7 02:37:01 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Fri, 7 Mar 2008 02:37:01 +0100
Subject: [Haiku-commits] r24290 - haiku/trunk/src/kits/interface
Message-ID: <200803070137.m271b16c013210@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-07 02:37:00 +0100 (Fri, 07 Mar 2008)
New Revision: 24290
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24290&view=rev

Modified:
   haiku/trunk/src/kits/interface/Window.cpp
Log:
As per discussion on haiku-dev, BWindow now always forces the 
B_ASYNCHRONOUS_CONTROLS flag. If anyone does encounter an app that 
breaks because of this, please let me know, but a few tests with various 
apps seem to show no issues.



Modified: haiku/trunk/src/kits/interface/Window.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Window.cpp	2008-03-07 01:18:29 UTC (rev 24289)
+++ haiku/trunk/src/kits/interface/Window.cpp	2008-03-07 01:37:00 UTC (rev 24290)
@@ -2431,7 +2431,7 @@
 
 	fFeel = feel;
 	fLook = look;
-	fFlags = flags;
+	fFlags = flags | B_ASYNCHRONOUS_CONTROLS;
 
 	fInTransaction = false;
 	fActive = false;



From stefano.ceccherini at gmail.com  Fri Mar  7 08:36:27 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Fri, 7 Mar 2008 08:36:27 +0100
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <20080306183818.M3967@mlotz.ch>
References: <894b9700803060228o37284e91h9a923141f96478e@mail.gmail.com>
	<1085715028-BeMail@kirilla> <20080306183818.M3967@mlotz.ch>
Message-ID: <894b9700803062336r7c42602bqc94c41617d0ddebe@mail.gmail.com>

2008/3/6, Michael Lotz <mmlr at mlotz.ch>:
> On Thu, 06 Mar 2008 19:25:30 +0100 CET, Jonas Sundstr?m wrote
>
> > Anyway, I think being able to manually select and copy URLs
>  > is a weak reason for keeping this view selectable. Clickable
>  > URLs should replace it, IMO. I don't think this kind of text
>  > usually is selectable.
>
>
> IMO it should definitely be selectable. Not necessarily because of the URLs
>  but to maybe copy over names or text from it. It _usually_ is not selectable
>  and a few times I have been annoyed by that since I had to type something in
>  manually just because someone else thought it does not need to be selectable.
>  It also makes for a nice demo for drag & drop and clipping of styled text.
>  Besides as long as it is not editable it doesn't hurt anyone to have it
>  selectable.

+1
Stefano


From stefano.ceccherini at gmail.com  Fri Mar  7 12:23:19 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Fri, 7 Mar 2008 12:23:19 +0100
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <981563427-BeMail@kirilla>
References: <33081970468-BeMail@zon> <981563427-BeMail@kirilla>
Message-ID: <894b9700803070323m185d191bwe396fc047298f226@mail.gmail.com>

2008/3/6, Jonas Sundstr?m <jonas at kirilla.com>:
> "Axel D?rfler" <axeld at pinc-software.de> wrote:

> One might consider this one exception harmless.
>  I just hope it won't spread. There must be reasons
>  non-interactive text isn't selectable in the major GUIs,
>  browser content aside.

I can't see why it shouldn't spread.
Selecting any text is always useful.
Let's see a common problem I just encountered on windows:
I have to download the drivers for my graphics card (at work). Since I
dont' know which card this computer has, I open the screen properties.
There it says I have a Nvidia Quadro NVS 280 PCI.
Since I can't select this text, I'm forced to remember this when I go
to the nvidia site.
If I could select the text, I could just paste it in my browser, add
"driver" to it and do a google search.
I really can't see any reason against being able to select any text. I
would even make the BAlert text selectable.


From stippi at mail.berlios.de  Fri Mar  7 15:12:06 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 7 Mar 2008 15:12:06 +0100
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
Message-ID: <200803071412.m27EC6Gh012783@sheep.berlios.de>

Author: stippi
Date: 2008-03-07 15:12:05 +0100 (Fri, 07 Mar 2008)
New Revision: 24291
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24291&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
* Added Firefox optional package.
* Added VLC optional package. (I repackaged the latest BeBits version and
  put it on www.yellowbites.com, which is a) much faster to download at
  least from Germany and b) has the Haiku vector icon.)
* Exchanged the Pe package for a recent SVN build which also has the Haiku
  vector icon.

Going to test all these changes on a Linux host soon, seems to work fine
on a BeOS host.

NOTE: The WonderBrush package has gotten a silent update, it includes the
icon in the resources now too, like the other packages with Haiku icon and
also fixes a problem in the Navigation view.

NOTE 2: The build system does not download packages again if generated/download
already contains a .zip with the name of the optional package. So you need 
to delete those to get the recently updated Vision, Pe and WonderBrush
packages.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2008-03-07 01:37:00 UTC (rev 24290)
+++ haiku/trunk/build/jam/HaikuImage	2008-03-07 14:12:05 UTC (rev 24291)
@@ -574,7 +574,8 @@
 		Echo "No optional package Pe available for gcc4" ;
 	} else {
 		InstallOptionalHaikuImagePackage Pe
-			: http://dl.hirschkaefer.de/beos/pe-2.4-x86.zip
+#			: http://dl.hirschkaefer.de/beos/pe-2.4-x86.zip
+			: http://www.yellowbites.com/downloads/pe-2.4-x86.zip
 			: apps
 		;
 		AddSymlinkToHaikuImage home config be Applications
@@ -584,6 +585,35 @@
 	}
 }
 
+# VLC media player
+if [ IsOptionalHaikuImagePackageAdded VLC ] {
+	if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		Echo "No optional package VLC available for gcc4" ;
+	} else {
+		InstallOptionalHaikuImagePackage VLC
+			: http://www.yellowbites.com/downloads/vlc-0.8.6c.zip
+			: apps
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/vlc-0.8.6c/vlc ;
+	}
+}
+
+# Firefox web browser
+if [ IsOptionalHaikuImagePackageAdded Firefox ] {
+	if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		Echo "No optional package Firefox available for gcc4" ;
+	} else {
+		InstallOptionalHaikuImagePackage Firefox
+			: http://www.sheltonfamily.org/firefoxbuilds/firefox-2.0.0.12.en-US.beosR5-i586.zip
+			: apps
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/firefox/firefox ;
+	}
+}
+
+
 #pragma mark - Build The Image
 
 



From revol at free.fr  Fri Mar  7 15:20:15 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Fri, 07 Mar 2008 15:20:15 +0100 CET
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <200803071412.m27EC6Gh012783@sheep.berlios.de>
Message-ID: <761563402-BeMail@laptop>

> Log:
> * Added Firefox optional package.
> * Added VLC optional package. (I repackaged the latest BeBits version 
> and
>   put it on www.yellowbites.com, which is a) much faster to download 
> at
>   least from Germany and b) has the Haiku vector icon.)
> * Exchanged the Pe package for a recent SVN build which also has the 
> Haiku
>   vector icon.

Nice,
however we might want to bump the image size when those are enabled, 
at least firefox won't fit 100MB...
Maybe an approx size as argument tothe pkg could be added.

Fran?ois.



From bga at bug-br.org.br  Fri Mar  7 15:32:19 2008
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Fri, 07 Mar 2008 11:32:19 -0300
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <200803071412.m27EC6Gh012783@sheep.berlios.de>
References: <200803071412.m27EC6Gh012783@sheep.berlios.de>
Message-ID: <47D151F3.4020406@bug-br.org.br>

There is definitely something wrong with mimeset. When booting to a 
clean haiku image with these changes, several object files inside the 
firefox dir (including the firefox launcher script) have the type 
"Folder" and even show the folder icon although they are object files or 
scripts or even application executables.

Maybe it is a good idea to remove the mimeset call on first boot until 
this is resolved?

-Bruno

stippi at BerliOS wrote:
> Author: stippi
> Date: 2008-03-07 15:12:05 +0100 (Fri, 07 Mar 2008)
> New Revision: 24291
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24291&view=rev
> 
> Modified:
>    haiku/trunk/build/jam/HaikuImage
> Log:
> * Added Firefox optional package.
> * Added VLC optional package. (I repackaged the latest BeBits version and
>   put it on www.yellowbites.com, which is a) much faster to download at
>   least from Germany and b) has the Haiku vector icon.)
> * Exchanged the Pe package for a recent SVN build which also has the Haiku
>   vector icon.
> 
> Going to test all these changes on a Linux host soon, seems to work fine
> on a BeOS host.
> 
> NOTE: The WonderBrush package has gotten a silent update, it includes the
> icon in the resources now too, like the other packages with Haiku icon and
> also fixes a problem in the Navigation view.
> 
> NOTE 2: The build system does not download packages again if generated/download
> already contains a .zip with the name of the optional package. So you need 
> to delete those to get the recently updated Vision, Pe and WonderBrush
> packages.
> 
> 
> Modified: haiku/trunk/build/jam/HaikuImage
> ===================================================================
> --- haiku/trunk/build/jam/HaikuImage	2008-03-07 01:37:00 UTC (rev 24290)
> +++ haiku/trunk/build/jam/HaikuImage	2008-03-07 14:12:05 UTC (rev 24291)
> @@ -574,7 +574,8 @@
>  		Echo "No optional package Pe available for gcc4" ;
>  	} else {
>  		InstallOptionalHaikuImagePackage Pe
> -			: http://dl.hirschkaefer.de/beos/pe-2.4-x86.zip
> +#			: http://dl.hirschkaefer.de/beos/pe-2.4-x86.zip
> +			: http://www.yellowbites.com/downloads/pe-2.4-x86.zip
>  			: apps
>  		;
>  		AddSymlinkToHaikuImage home config be Applications
> @@ -584,6 +585,35 @@
>  	}
>  }
>  
> +# VLC media player
> +if [ IsOptionalHaikuImagePackageAdded VLC ] {
> +	if $(HAIKU_GCC_VERSION[1]) >= 4 {
> +		Echo "No optional package VLC available for gcc4" ;
> +	} else {
> +		InstallOptionalHaikuImagePackage VLC
> +			: http://www.yellowbites.com/downloads/vlc-0.8.6c.zip
> +			: apps
> +		;
> +		AddSymlinkToHaikuImage home config be Applications
> +			: /boot/apps/vlc-0.8.6c/vlc ;
> +	}
> +}
> +
> +# Firefox web browser
> +if [ IsOptionalHaikuImagePackageAdded Firefox ] {
> +	if $(HAIKU_GCC_VERSION[1]) >= 4 {
> +		Echo "No optional package Firefox available for gcc4" ;
> +	} else {
> +		InstallOptionalHaikuImagePackage Firefox
> +			: http://www.sheltonfamily.org/firefoxbuilds/firefox-2.0.0.12.en-US.beosR5-i586.zip
> +			: apps
> +		;
> +		AddSymlinkToHaikuImage home config be Applications
> +			: /boot/apps/firefox/firefox ;
> +	}
> +}
> +
> +
>  #pragma mark - Build The Image
>  
>  
> 
> _______________________________________________
> Haiku-commits mailing list
> Haiku-commits at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/haiku-commits
> 



From bga at bug-br.org.br  Fri Mar  7 15:36:00 2008
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Fri, 07 Mar 2008 11:36:00 -0300
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <47D151F3.4020406@bug-br.org.br>
References: <200803071412.m27EC6Gh012783@sheep.berlios.de>
	<47D151F3.4020406@bug-br.org.br>
Message-ID: <47D152D0.20600@bug-br.org.br>

Bruno Albuquerque wrote:
> There is definitely something wrong with mimeset. When booting to a 
> clean haiku image with these changes, several object files inside the 
> firefox dir (including the firefox launcher script) have the type 
> "Folder" and even show the folder icon although they are object files or 
> scripts or even application executables.
> 
> Maybe it is a good idea to remove the mimeset call on first boot until 
> this is resolved?

just did a quick test and ran:

"mimeset -F firefox"

And it correctly set the type of the file to text/plain so even if it is 
a mimeset problem, seems to be triggered only on specific cases.

-Bruno



From superstippi at gmx.de  Fri Mar  7 15:44:51 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Fri, 07 Mar 2008 15:44:51 +0100
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <47D152D0.20600@bug-br.org.br>
References: <200803071412.m27EC6Gh012783@sheep.berlios.de>
	<47D151F3.4020406@bug-br.org.br> <47D152D0.20600@bug-br.org.br>
Message-ID: <20080307154451.9028.6@stippis2.1204883825.fake>


Bruno Albuquerque wrote:
> Bruno Albuquerque wrote:
> > There is definitely something wrong with mimeset. When booting to a 
> > clean haiku image with these changes, several object files inside the 
> > firefox dir (including the firefox launcher script) have the type 
> > "Folder" and even show the folder icon although they are object files 
> > or scripts or even application executables.
> > 
> > Maybe it is a good idea to remove the mimeset call on first boot until 
> > this is resolved?
> 
> just did a quick test and ran:
> 
> "mimeset -F firefox"
> 
> And it correctly set the type of the file to text/plain so even if it is 
> a mimeset problem, seems to be triggered only on specific cases.

It is probably a problem with the "-all" option. I may not have checked all 
possible options, but the effect I want to achieve is not that the 
resources are transfered to attributes, but that the mime database is 
updated. I will experiment with the -F option now.

Best regards,
-Stephan


From superstippi at gmx.de  Fri Mar  7 15:50:09 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Fri, 07 Mar 2008 15:50:09 +0100
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <761563402-BeMail@laptop>
References: <761563402-BeMail@laptop>
Message-ID: <20080307155009.9077.7@stippis2.1204883825.fake>


Fran?ois Revol wrote:
> > Log:
> > * Added Firefox optional package.
> > * Added VLC optional package. (I repackaged the latest BeBits version 
> > and
> >   put it on www.yellowbites.com, which is a) much faster to download 
> > at
> >   least from Germany and b) has the Haiku vector icon.)
> > * Exchanged the Pe package for a recent SVN build which also has the 
> > Haiku
> >   vector icon.
> 
> Nice,
> however we might want to bump the image size when those are enabled, at 
> least firefox won't fit 100MB...
> Maybe an approx size as argument tothe pkg could be added.

All of this has to be configured in UserBuildConfig anyways. So one should 
just adjust the image size there according to the optional packages that 
one choses. For example for me, this doesn't even apply, since I am 
installing directly to a partition from Linux.

Best regards,
-Stephan


From axeld at pinc-software.de  Fri Mar  7 16:01:35 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Fri, 07 Mar 2008 16:01:35 +0100 CET
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <20080307155009.9077.7@stippis2.1204883825.fake>
Message-ID: <18605552950-BeMail@zon>

Stephan Assmus <superstippi at gmx.de> wrote:
> > Nice,
> > however we might want to bump the image size when those are 
> > enabled, at 
> > least firefox won't fit 100MB...
> > Maybe an approx size as argument tothe pkg could be added.
> All of this has to be configured in UserBuildConfig anyways. So one 
> should 
> just adjust the image size there according to the optional packages 
> that 
> one choses. For example for me, this doesn't even apply, since I am 
> installing directly to a partition from Linux.

Agreed, I don't think this is necessary. We could mention estimates as 
comments in the HaikuImage file, but I wouldn't go beyond that.

Bye,
   Axel.



From axeld at pinc-software.de  Fri Mar  7 16:18:49 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Fri, 07 Mar 2008 16:18:49 +0100 CET
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <200803071412.m27EC6Gh012783@sheep.berlios.de>
Message-ID: <19639113840-BeMail@zon>

stippi at BerliOS <stippi at mail.berlios.de> wrote:
> +			: http://www.yellowbites.com/downloads/vlc-0.8.6c.zip

This one doesn't seem to include the vector icon.

Bye,
   Axel.



From superstippi at gmx.de  Fri Mar  7 16:21:11 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Fri, 07 Mar 2008 16:21:11 +0100
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <19639113840-BeMail@zon>
References: <19639113840-BeMail@zon>
Message-ID: <20080307162111.9222.9@stippis2.1204883825.fake>


Axel D?rfler wrote:
> stippi at BerliOS <stippi at mail.berlios.de> wrote:
> > +            : http://www.yellowbites.com/downloads/vlc-0.8.6c.zip
> 
> This one doesn't seem to include the vector icon.

Yes, already noticed. Either I messed up the package or QuickRes didn't 
work the way I thought it would. ;-)

Best regards,
-Stephan


From koki at digintrans.com  Fri Mar  7 15:44:25 2008
From: koki at digintrans.com (Jorge G. Mare)
Date: Fri, 07 Mar 2008 06:44:25 -0800
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <200803071412.m27EC6Gh012783@sheep.berlios.de>
References: <200803071412.m27EC6Gh012783@sheep.berlios.de>
Message-ID: <1204901065.10986.1.camel@jorge-desktop>

On Fri, 2008-03-07 at 15:12 +0100, stippi at BerliOS wrote:
> Author: stippi
> Date: 2008-03-07 15:12:05 +0100 (Fri, 07 Mar 2008)
> New Revision: 24291
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24291&view=rev
> 
> Modified:
>    haiku/trunk/build/jam/HaikuImage
> Log:
> * Added Firefox optional package.
> * Added VLC optional package. (I repackaged the latest BeBits version and
>   put it on www.yellowbites.com, which is a) much faster to download at
>   least from Germany and b) has the Haiku vector icon.)

How about using haiku-files.org as a centralized place for optional
packages? We have plenty of space and bandwidth there.

Just a thought. Cheers,

Koki




From axeld at pinc-software.de  Fri Mar  7 16:24:03 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Fri, 07 Mar 2008 16:24:03 +0100 CET
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <894b9700803070323m185d191bwe396fc047298f226@mail.gmail.com>
Message-ID: <19953043721-BeMail@zon>

"Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
> I really can't see any reason against being able to select any text. 
> I
> would even make the BAlert text selectable.

+1
This has also annoyed me a couple of times. Also, I think I've seen it 
in Gnome as well in some alert-like windows.

Bye,
   Axel.



From anevilyak at gmail.com  Fri Mar  7 16:35:52 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Fri, 7 Mar 2008 09:35:52 -0600
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <19953043721-BeMail@zon>
References: <894b9700803070323m185d191bwe396fc047298f226@mail.gmail.com>
	<19953043721-BeMail@zon>
Message-ID: <f019d2f30803070735u4d08b03ck46f0a25f3865c479@mail.gmail.com>

On Fri, Mar 7, 2008 at 9:24 AM, Axel D?rfler <axeld at pinc-software.de> wrote:
> "Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
>
> > I really can't see any reason against being able to select any text.
>  > I
>  > would even make the BAlert text selectable.
>
>  +1
>  This has also annoyed me a couple of times. Also, I think I've seen it
>  in Gnome as well in some alert-like windows.

+1 here too, it'd be especially useful when trying to help people
troubleshoot things since you can ask them to just copy the text and
email it to you or whatnot instead of having to rely on them telling
you the message accurately.

Regards,

Rene


From superstippi at gmx.de  Fri Mar  7 16:39:17 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Fri, 07 Mar 2008 16:39:17 +0100
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <1204901065.10986.1.camel@jorge-desktop>
References: <200803071412.m27EC6Gh012783@sheep.berlios.de>
	<1204901065.10986.1.camel@jorge-desktop>
Message-ID: <20080307163917.9377.12@stippis2.1204883825.fake>


Jorge G. Mare wrote:
> On Fri, 2008-03-07 at 15:12 +0100, stippi at BerliOS wrote:
> > Author: stippi
> > Date: 2008-03-07 15:12:05 +0100 (Fri, 07 Mar 2008) New Revision: 24291
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24291&view=rev
> > 
> > Modified:
> >    haiku/trunk/build/jam/HaikuImage
> > Log:
> > * Added Firefox optional package.
> > * Added VLC optional package. (I repackaged the latest BeBits version 
> > and
> >   put it on www.yellowbites.com, which is a) much faster to download at 
> >   least from Germany and b) has the Haiku vector icon.)
> 
> How about using haiku-files.org as a centralized place for optional 
> packages? We have plenty of space and bandwidth there.

Yes, good idea.

Best regards,
-Stephan


From superstippi at gmx.de  Fri Mar  7 16:42:01 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Fri, 07 Mar 2008 16:42:01 +0100
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <19639113840-BeMail@zon>
References: <19639113840-BeMail@zon>
Message-ID: <20080307164201.9849.13@stippis2.1204883825.fake>


Axel D?rfler wrote:
> stippi at BerliOS <stippi at mail.berlios.de> wrote:
> > +            : http://www.yellowbites.com/downloads/vlc-0.8.6c.zip
> 
> This one doesn't seem to include the vector icon.

Should be fixed in a minute... uploading. (I forgot to set the correct 
resource name for the VICN resource (BEOS:ICON).)

Best regards,
-Stephan


From anevilyak at gmail.com  Fri Mar  7 16:43:23 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Fri, 7 Mar 2008 09:43:23 -0600
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <1204901065.10986.1.camel@jorge-desktop>
References: <200803071412.m27EC6Gh012783@sheep.berlios.de>
	<1204901065.10986.1.camel@jorge-desktop>
Message-ID: <f019d2f30803070743i48eea55cmd67554d3435affb1@mail.gmail.com>

On Fri, Mar 7, 2008 at 8:44 AM, Jorge G. Mare <koki at digintrans.com> wrote:
>  How about using haiku-files.org as a centralized place for optional
>  packages? We have plenty of space and bandwidth there.
>
>  Just a thought. Cheers,
>

Good idea, though for the Vision package at least I have no shortage
of space or bandwidth on SourceForge so that one should be fine to
leave as is.

Regards,

Rene


From stippi at mail.berlios.de  Fri Mar  7 17:07:06 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 7 Mar 2008 17:07:06 +0100
Subject: [Haiku-commits] r24292 - haiku/trunk/src/bin
Message-ID: <200803071607.m27G76jl029818@sheep.berlios.de>

Author: stippi
Date: 2008-03-07 17:07:06 +0100 (Fri, 07 Mar 2008)
New Revision: 24292
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24292&view=rev

Modified:
   haiku/trunk/src/bin/mimeset.cpp
Log:
* Check the return code of the functions that trigger the work in the
  registrar.
* Added the constant names to the force parameter (as comments for now).


Modified: haiku/trunk/src/bin/mimeset.cpp
===================================================================
--- haiku/trunk/src/bin/mimeset.cpp	2008-03-07 14:12:05 UTC (rev 24291)
+++ haiku/trunk/src/bin/mimeset.cpp	2008-03-07 16:07:06 UTC (rev 24292)
@@ -18,7 +18,7 @@
 // options
 bool gFiles = true;
 bool gApps = false;
-int gForce = 0;
+int gForce = 0; // B_UPDATE_MIME_INFO_NO_FORCE;
 
 
 void
@@ -49,9 +49,9 @@
 		status = B_ENTRY_NOT_FOUND;
 
 	if (gFiles && status >= B_OK)
-		update_mime_info(path, true, true, gForce);
+		status = update_mime_info(path, true, true, gForce);
 	if (gApps && status >= B_OK)
-		create_app_meta_mime(path, true, true, gForce);
+		status = create_app_meta_mime(path, true, true, gForce);
 
 	if (status < B_OK) {
 		fprintf(stderr, "%s: \"%s\": %s\n",
@@ -80,9 +80,9 @@
 			gApps = true;
 			gFiles = false;
 		} else if (!strcmp(arg, "-f"))
-			gForce = 1;
+			gForce = 1; // B_UPDATE_MIME_INFO_FORCE_KEEP_TYPE;
 		else if (!strcmp(arg, "-F"))
-			gForce = 2;
+			gForce = 2; // B_UPDATE_MIME_INFO_FORCE_UPDATE_ALL;
 		else if (!strcmp(arg, "--help"))
 			usage(0);
 		else {



From revol at free.fr  Fri Mar  7 17:59:32 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Fri, 07 Mar 2008 17:59:32 +0100 CET
Subject: [Haiku-commits] r24291 - haiku/trunk/build/jam
In-Reply-To: <1204901065.10986.1.camel@jorge-desktop>
Message-ID: <1031274462-BeMail@laptop>

> On Fri, 2008-03-07 at 15:12 +0100, stippi at BerliOS wrote:
> > Author: stippi
> > Date: 2008-03-07 15:12:05 +0100 (Fri, 07 Mar 2008)
> > New Revision: 24291
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24291&view=rev
> > 
> > Modified:
> >    haiku/trunk/build/jam/HaikuImage
> > Log:
> > * Added Firefox optional package.
> > * Added VLC optional package. (I repackaged the latest BeBits 
> > version and
> >   put it on www.yellowbites.com, which is a) much faster to 
> > download at
> >   least from Germany and b) has the Haiku vector icon.)
> 
> How about using haiku-files.org as a centralized place for optional
> packages? We have plenty of space and bandwidth there.
> 

Alternatively, some applications can already be built from external 
sources using the distro stuff I added to my own branch.
I wanted to see how well it would work to grab sources from a zip or 
svn, apply an optional patch, and build using custom jamfiles.
Patches could be centralized on BePorts or something else...

I took the opposite way of what I made in the zeta build system, that 
is use the app's own ./configure and makefiles. While that worked for 
zeta almost well, some apps had weird build systems (openssl and its 
wonderful perl Configure, or sometimes no DESTDIR support). Moreover it 
only worked from Zeta and didn't allow cross builds. Some autoconf 
based apps are able to do crossbuilds, but it's probably not much 
tested and definitely not widespread.

So I tried to go the other way, by crafting native Jamfiles for each of 
them.
While it works for small apps (VNCViewer, links), it obviously would be 
much harder for things like firefox or vlc as one would have to 
generate complex Jamfile to support all the addons, libs and options.
It also requires much more disk space to checkout all the different 
repos (there is an override feature so one can point to existing repos 
elsewhere to avoid having it twice and using in-progress ports).

On the other hand it would allow to build a full distro entirely 
without binaries, for all supported platforms and compilers. It would 
work for ppc target, and already works for gcc4.

Currently the checkouts must be done before trying to build, as though 
it does it anyway it fails to find the sources then.
It should be possible to also use svn:external properties to refer to 
external svn repos like osdrawer, but it seems that feature is not part 
of the versionning, so it would get out of sync if you svn up to a 
specific rev.
(ie. you can refer to a specific rev of an external svn, but you cannot 
bind that mapping to a specific revision of your own svn).

Fran?ois.


From revol at free.fr  Fri Mar  7 18:11:10 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Fri, 07 Mar 2008 18:11:10 +0100 CET
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <19953043721-BeMail@zon>
Message-ID: <1729494218-BeMail@laptop>

> "Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
> > I really can't see any reason against being able to select any 
> > text. 
> > I
> > would even make the BAlert text selectable.
> 
> +1
> This has also annoyed me a couple of times. Also, I think I've seen 
> it 
> in Gnome as well in some alert-like windows.
> 

+1
I think the primary reason beside laziness is just because vendors are 
afraid someone would rip off their copyrighted strings :)
I find it lame also.

Fran?ois.


From jonas at kirilla.com  Fri Mar  7 21:31:07 2008
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Fri, 07 Mar 2008 21:31:07 +0100 CET
Subject: [Haiku-commits] r24257 - haiku/trunk/src/apps/aboutsystem
In-Reply-To: <1248409612-BeMail@kirilla>
Message-ID: <4369915384-BeMail@kirilla>

"Jonas Sundstr?m" <jonas at kirilla.com> wrote:
>  ...
> I think would be possible to support clicking a link.
 ...
> I'll see what I can do tonight, unless of course 
> someone beats me to it.

I'm still working on making the links clickable. It currently works and 
all text is selectable. I don't intend to change that. I'd like to get 
it polished and on par with the functionality of Vision. So if anyone 
is itching, please give me a little more time.

TIA.
/Jonas.



From stippi at mail.berlios.de  Fri Mar  7 21:59:00 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 7 Mar 2008 21:59:00 +0100
Subject: [Haiku-commits] r24293 - haiku/trunk/src/kits/interface
Message-ID: <200803072059.m27Kx0n0014149@sheep.berlios.de>

Author: stippi
Date: 2008-03-07 21:58:59 +0100 (Fri, 07 Mar 2008)
New Revision: 24293
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24293&view=rev

Modified:
   haiku/trunk/src/kits/interface/View.cpp
Log:
Make sure that a detached view is really no longer the focus view.
MakeFocus(false) can not be trusted, since it is virtual and might not call
the BView version.  


Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2008-03-07 16:07:06 UTC (rev 24292)
+++ haiku/trunk/src/kits/interface/View.cpp	2008-03-07 20:58:59 UTC (rev 24293)
@@ -4608,8 +4608,15 @@
 
 		// make sure our owner doesn't need us anymore
 
-		if (fOwner->CurrentFocus() == this)
+		if (fOwner->CurrentFocus() == this) {
 			MakeFocus(false);
+			// MakeFocus() is virtual and might not be
+			// passing through to the BView version,
+			// but we need to make sure at this point
+			// that we are not the focus view anymore.
+			if (fOwner->CurrentFocus() == this)
+				fOwner->_SetFocus(NULL, true);
+		}
 
 		if (fOwner->fDefaultButton == this)
 			fOwner->SetDefaultButton(NULL);



From jackburton at mail.berlios.de  Fri Mar  7 22:00:47 2008
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Fri, 7 Mar 2008 22:00:47 +0100
Subject: [Haiku-commits] r24294 - haiku/trunk/src/kits/interface
Message-ID: <200803072100.m27L0l0a014646@sheep.berlios.de>

Author: jackburton
Date: 2008-03-07 22:00:46 +0100 (Fri, 07 Mar 2008)
New Revision: 24294
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24294&view=rev

Modified:
   haiku/trunk/src/kits/interface/Menu.cpp
Log:
If a NULL menuitem was supplied to BMenu::_NextItem(), the function 
would have returned the second item in place of the first. Also return 
NULL, not false, when there are no "next items". 


Modified: haiku/trunk/src/kits/interface/Menu.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Menu.cpp	2008-03-07 20:58:59 UTC (rev 24293)
+++ haiku/trunk/src/kits/interface/Menu.cpp	2008-03-07 21:00:46 UTC (rev 24294)
@@ -2354,10 +2354,13 @@
 {
 	// go to next item, and skip over disabled items such as separators
  	int32 index = fItems.IndexOf(item);
-	if (index < 0)
-		index = 0;
-
 	const int32 numItems = fItems.CountItems();
+	if (index < 0) {
+		if (forward)
+			index = -1;
+		else
+			index = numItems;
+	}	
 	int32 startIndex = index;
 	do {
 		if (forward)
@@ -2373,7 +2376,7 @@
 	} while (!ItemAt(index)->IsEnabled() && index != startIndex);
 
 	if (index == startIndex) // we are back where we started and no item was enabled
-		return false;
+		return NULL;
 
 	return ItemAt(index);
 }



From stippi at mail.berlios.de  Fri Mar  7 22:06:24 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 7 Mar 2008 22:06:24 +0100
Subject: [Haiku-commits] r24295 - haiku/trunk/data/system/boot
Message-ID: <200803072106.m27L6O7b015089@sheep.berlios.de>

Author: stippi
Date: 2008-03-07 22:06:23 +0100 (Fri, 07 Mar 2008)
New Revision: 24295
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24295&view=rev

Modified:
   haiku/trunk/data/system/boot/Bootscript
Log:
Disabled the mimeset trick for now, since it causes too many other
problems at the moment.


Modified: haiku/trunk/data/system/boot/Bootscript
===================================================================
--- haiku/trunk/data/system/boot/Bootscript	2008-03-07 21:00:46 UTC (rev 24294)
+++ haiku/trunk/data/system/boot/Bootscript	2008-03-07 21:06:23 UTC (rev 24295)
@@ -132,10 +132,10 @@
 # Check for fresh install and register all bundled app mimetypes
 FRESH_INSTALL_INDICATOR_FILE=$HOME/config/settings/fresh_install
 if [ -e $FRESH_INSTALL_INDICATOR_FILE ]; then
-	mimeset -all -f /boot/beos/apps
-	mimeset -all -f /boot/beos/preferences
-	mimeset -all -f /boot/beos/system/servers
-	mimeset -all -f /boot/apps
+#	mimeset -all -f /boot/beos/apps
+#	mimeset -all -f /boot/beos/preferences
+#	mimeset -all -f /boot/beos/system/servers
+#	mimeset -all -f /boot/apps
 	rm $FRESH_INSTALL_INDICATOR_FILE
 fi
 



From jackburton at mail.berlios.de  Fri Mar  7 22:26:36 2008
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Fri, 7 Mar 2008 22:26:36 +0100
Subject: [Haiku-commits] r24296 - haiku/trunk/src/kits/interface
Message-ID: <200803072126.m27LQaQ0016530@sheep.berlios.de>

Author: jackburton
Date: 2008-03-07 22:26:36 +0100 (Fri, 07 Mar 2008)
New Revision: 24296
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24296&view=rev

Modified:
   haiku/trunk/src/kits/interface/MenuBar.cpp
Log:
In the menubar tracking function, loop indefinitely if mouse stands 
still. This way keyboard menu navigation works much better. 
Unfortunately I can't apply the same trick for BMenu since it opens the 
submenu with a delay, and that won't work anymore.


Modified: haiku/trunk/src/kits/interface/MenuBar.cpp
===================================================================
--- haiku/trunk/src/kits/interface/MenuBar.cpp	2008-03-07 21:06:23 UTC (rev 24295)
+++ haiku/trunk/src/kits/interface/MenuBar.cpp	2008-03-07 21:26:36 UTC (rev 24296)
@@ -531,14 +531,22 @@
 
 		window->Unlock();
 		
-		if (fState != MENU_STATE_CLOSED) {
-			if (snoozeAmount > 0)
-				snooze(snoozeAmount);	
+		if (fState != MENU_STATE_CLOSED) {	
+			// if user doesn't move the mouse, loop here,
+			// so we don't interfer with keyboard menu navigation
+			BPoint newLocation;
+			uint32 newButtons;
+			do {
+				snooze(snoozeAmount);
+				if (!LockLooper())
+					break;
+				GetMouse(&newLocation, &newButtons, true);
+				UnlockLooper();
+			} while (newLocation == where 
+					&& newButtons == buttons);
 			
-			if (window->Lock()) {
-				GetMouse(&where, &buttons, true);
-				window->Unlock();
-			}
+			where = newLocation;
+			buttons = newButtons;
 
 			if (buttons != 0 && _IsStickyMode()) {
 				if (menuItem == NULL)



From anevilyak at mail.berlios.de  Sat Mar  8 01:18:52 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 8 Mar 2008 01:18:52 +0100
Subject: [Haiku-commits] r24297 - haiku/trunk/src/kits/app
Message-ID: <200803080018.m280Iq5Y027156@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-08 01:18:51 +0100 (Sat, 08 Mar 2008)
New Revision: 24297
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24297&view=rev

Modified:
   haiku/trunk/src/kits/app/Message.cpp
Log:
Team debug effort with Michael Lotz:

Tracked down the root cause of the issue worked around in r24228.
The behavior that was occurring in this case was as follows:
Vision created a BInvoker off the heap, containing a BMessage likewise
off the heap. It then called BAlert::Go with this invoker. When any of
the buttons in the BAlert were pushed, _SendMessage would enqueue the
message into the target looper (in this case, Vision's window) and wake
it up with write_port_etc. However, in some cases this would result in
a reschedule such that Vision's looper executed before _SendMessage() was
able to complete all its processing. Upon receiving this message, Vision
destroyed the BInvoker in question, which in turn deleted its owned
BMessage -- which was the message that was still in the middle of _SendMessage()!.
Consequently it would crash a few lines later when it hit IsSourceWaiting() and
tried to check flags off its header off the already destroyed this. To fix this,
we now do the AddMessage/write_port_etc last before returning. Also removed the
sanity checks added in r24228 so we don't mask other problems of similar nature.



Modified: haiku/trunk/src/kits/app/Message.cpp
===================================================================
--- haiku/trunk/src/kits/app/Message.cpp	2008-03-07 21:26:36 UTC (rev 24296)
+++ haiku/trunk/src/kits/app/Message.cpp	2008-03-08 00:18:51 UTC (rev 24297)
@@ -613,7 +613,7 @@
 BMessage::IsSourceWaiting() const
 {
 	DEBUG_FUNCTION_ENTER;
-	return fHeader && (fHeader->flags & MESSAGE_FLAG_REPLY_REQUIRED)
+	return (fHeader->flags & MESSAGE_FLAG_REPLY_REQUIRED)
 		&& !(fHeader->flags & MESSAGE_FLAG_REPLY_DONE);
 }
 
@@ -622,7 +622,7 @@
 BMessage::IsSourceRemote() const
 {
 	DEBUG_FUNCTION_ENTER;
-	return fHeader && (fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED)
+	return (fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED)
 		&& (fHeader->reply_team != BPrivate::current_team());
 }
 
@@ -1953,21 +1953,7 @@
 	header->reply_target = replyToPrivate.Token();
 	header->flags |= MESSAGE_FLAG_WAS_DELIVERED;
 
-	if (direct != NULL) {
-		KTRACE("BMessage send direct: port: %ld, token: %ld, "
-			"message: '%c%c%c%c'", port, token,
-			char(what >> 24), char(what >> 16), char(what >> 8), (char)what);
-
-		// this is a local message transmission
-		direct->AddMessage(copy);
-
-		if (direct->Queue()->IsNextMessage(copy) && port_count(port) <= 0) {
-			// there is currently no message waiting, and we need to wakeup the looper
-			write_port_etc(port, 0, NULL, 0, B_RELATIVE_TIMEOUT, 0);
-		}
-
-		direct->Release();
-	} else {
+	if (direct == NULL) {
 		KTRACE("BMessage send remote: team: %ld, port: %ld, token: %ld, "
 			"message: '%c%c%c%c'", portOwner, port, token,
 			char(what >> 24), char(what >> 16), char(what >> 8), (char)what);
@@ -1984,6 +1970,24 @@
 		fHeader->flags |= MESSAGE_FLAG_REPLY_DONE;
 	}
 
+	// we need to do this last because it is possible our 
+	// message might be destroyed after it's enqueued in the 
+	// target looper. Thus we don't want to do any ops that depend on
+	// members of this after the enqueue.
+	if (direct != NULL) {
+		KTRACE("BMessage send direct: port: %ld, token: %ld, "
+			"message: '%c%c%c%c'", port, token,
+			char(what >> 24), char(what >> 16), char(what >> 8), (char)what);
+
+		// this is a local message transmission
+		direct->AddMessage(copy);
+		if (direct->Queue()->IsNextMessage(copy) && port_count(port) <= 0) {
+			// there is currently no message waiting, and we need to wakeup the looper
+			write_port_etc(port, 0, NULL, 0, B_RELATIVE_TIMEOUT, 0);
+		}
+		direct->Release();
+	}
+
 	free(buffer);
 	return result;
 }



From stippi at mail.berlios.de  Sat Mar  8 11:12:15 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 8 Mar 2008 11:12:15 +0100
Subject: [Haiku-commits] r24298 - haiku/trunk/build/jam
Message-ID: <200803081012.m28ACFPp017729@sheep.berlios.de>

Author: stippi
Date: 2008-03-08 11:12:15 +0100 (Sat, 08 Mar 2008)
New Revision: 24298
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24298&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/build/jam/UserBuildConfig.sample
Log:
* Removed explicit timezone and keymap settings file generation. The system
  works fine without those, the keymap file will be generated.
* Supplied the removed lines as example in UserBuildConfig.sample for how
  to supply these settings during image generation.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2008-03-08 00:18:51 UTC (rev 24297)
+++ haiku/trunk/build/jam/HaikuImage	2008-03-08 10:12:15 UTC (rev 24298)
@@ -349,11 +349,6 @@
 	= [ FDirName $(HAIKU_TOP) data settings network ] ;
 AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
 
-AddSymlinkToHaikuImage home config settings
-	: /boot/beos/etc/timezones/Europe/Paris : timezone ;
-
-AddFilesToHaikuImage home config settings : <keymap>US-International : Key_map ;
-
 # bison files
 SEARCH on <bison>m4sugar.m4
 	= [ FDirName $(HAIKU_TOP) src bin bison data m4sugar ] ;

Modified: haiku/trunk/build/jam/UserBuildConfig.sample
===================================================================
--- haiku/trunk/build/jam/UserBuildConfig.sample	2008-03-08 00:18:51 UTC (rev 24297)
+++ haiku/trunk/build/jam/UserBuildConfig.sample	2008-03-08 10:12:15 UTC (rev 24298)
@@ -2,7 +2,14 @@
 # If existent it is included by the build system, but it is ignored by svn.
 # This file documents a few examples, what can be done.
 
+# Adding timezone and keymap settings
+#AddSymlinkToHaikuImage home config settings
+#	: /boot/beos/etc/timezones/Europe/Paris : timezone ;
 
+#AddFilesToHaikuImage home config settings : <keymap>US-International 
+#	: Key_map ;
+
+
 # Adjusting Build Variables
 
 # The following variables can be configured per subdirectory (or subtree) or



From axeld at mail.berlios.de  Sat Mar  8 12:36:11 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 8 Mar 2008 12:36:11 +0100
Subject: [Haiku-commits] r24299 - haiku/trunk/src/servers/app
Message-ID: <200803081136.m28BaBET002048@sheep.berlios.de>

Author: axeld
Date: 2008-03-08 12:36:10 +0100 (Sat, 08 Mar 2008)
New Revision: 24299
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24299&view=rev

Modified:
   haiku/trunk/src/servers/app/DesktopSettings.cpp
Log:
Fixed warnings.


Modified: haiku/trunk/src/servers/app/DesktopSettings.cpp
===================================================================
--- haiku/trunk/src/servers/app/DesktopSettings.cpp	2008-03-08 10:12:15 UTC (rev 24298)
+++ haiku/trunk/src/servers/app/DesktopSettings.cpp	2008-03-08 11:36:10 UTC (rev 24299)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007, Haiku.
+ * Copyright 2005-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -216,11 +216,12 @@
 			bool triggersAlwaysShown;
 			if (settings.FindBool("triggers always shown", &triggersAlwaysShown) == B_OK)
 				fMenuInfo.triggers_always_shown = triggersAlwaysShown;
-			
-			char colorName[12];	
-			
+
 			for (int32 i = 0; i < kNumColors; i++) {
-				snprintf(colorName, sizeof(colorName), "color%ld", index_to_color_which(i));
+				char colorName[12];
+				snprintf(colorName, sizeof(colorName), "color%ld",
+					(int32)index_to_color_which(i));
+
 				settings.FindInt32(colorName, (int32*)&fShared.colors[i]);
 			}
 		}
@@ -321,10 +322,10 @@
 			settings.AddBool("click to open", fMenuInfo.click_to_open);
 			settings.AddBool("triggers always shown", fMenuInfo.triggers_always_shown);
 
-			char colorName[12];
-
 			for (int32 i = 0; i < kNumColors; i++) {
-				snprintf(colorName, sizeof(colorName), "color%ld", index_to_color_which(i));
+				char colorName[12];
+				snprintf(colorName, sizeof(colorName), "color%ld",
+					(int32)index_to_color_which(i));
 				settings.AddInt32(colorName, (const int32&)fShared.colors[i]);
 			}
 



From axeld at mail.berlios.de  Sat Mar  8 12:42:34 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 8 Mar 2008 12:42:34 +0100
Subject: [Haiku-commits] r24300 - haiku/trunk/src/servers/app
Message-ID: <200803081142.m28BgYiR011608@sheep.berlios.de>

Author: axeld
Date: 2008-03-08 12:42:20 +0100 (Sat, 08 Mar 2008)
New Revision: 24300
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24300&view=rev

Modified:
   haiku/trunk/src/servers/app/Desktop.cpp
   haiku/trunk/src/servers/app/Desktop.h
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/ViewLayer.cpp
   haiku/trunk/src/servers/app/ViewLayer.h
   haiku/trunk/src/servers/app/WindowLayer.cpp
   haiku/trunk/src/servers/app/WindowLayer.h
   haiku/trunk/src/servers/app/WorkspacesLayer.cpp
   haiku/trunk/src/servers/app/WorkspacesLayer.h
Log:
* The Desktop is now maintaining a list of workspaces views, and supports
  more than one of them at the time.
* Changed ViewLayer::FindView() to FindViews() that collects all views
  with the given flag set, not just the first one.
* Made ViewLayer::AttachedToWindow() and DetachFromWindow() virtual,
  WorkspacesLayer now overloads them to register itself with the window and
  the desktop.


Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2008-03-08 11:36:10 UTC (rev 24299)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2008-03-08 11:42:20 UTC (rev 24300)
@@ -317,7 +317,7 @@
 	fAllWindows(kAllWindowList),
 	fSubsetWindows(kSubsetList),
 	fFocusList(kFocusList),
-	fWorkspacesLayer(NULL),
+	fWorkspacesViews(false),
 	fActiveScreen(NULL),
 
 	fWindowLock("window lock"),
@@ -1255,13 +1255,52 @@
 void
 Desktop::_WindowChanged(WindowLayer* window)
 {
-	if (fWorkspacesLayer == NULL)
+	for (uint32 i = fWorkspacesViews.CountItems(); i-- > 0;) {
+		WorkspacesLayer* view = fWorkspacesViews.ItemAt(i);
+		view->WindowChanged(window);
+	}
+}
+
+
+/*!
+	You must at least hold a single window lock when calling this method.
+*/
+void
+Desktop::_WindowRemoved(WindowLayer* window)
+{
+	for (uint32 i = fWorkspacesViews.CountItems(); i-- > 0;) {
+		WorkspacesLayer* view = fWorkspacesViews.ItemAt(i);
+		view->WindowRemoved(window);
+	}
+}
+
+
+void
+Desktop::AddWorkspacesView(WorkspacesLayer* view)
+{
+	if (view->Window() == NULL || view->Window()->IsHidden())
 		return;
 
-	fWorkspacesLayer->WindowChanged(window);
+	if (!LockAllWindows())
+		return;
+
+	if (!fWorkspacesViews.HasItem(view))
+		fWorkspacesViews.AddItem(view);
+	UnlockAllWindows();	
 }
 
 
+void
+Desktop::RemoveWorkspacesView(WorkspacesLayer* view)
+{
+	if (!LockAllWindows())
+		return;
+
+	fWorkspacesViews.RemoveItem(view);
+	UnlockAllWindows();	
+}
+
+
 /*!
 	\brief Sends a fake B_MOUSE_MOVED event to the window under the mouse,
 		and also updates the current view under the mouse.
@@ -1621,10 +1660,9 @@
 		return;
 	}
 
-	if ((window->Flags() & kWorkspacesWindowFlag) != 0) {
+	if (window->HasWorkspacesViews()) {
 		// find workspaces layer in view hierarchy
-		fWorkspacesLayer = dynamic_cast<WorkspacesLayer*>(
-			window->TopLayer()->FindView(kWorkspacesViewFlag));
+		window->FindWorkspacesViews(fWorkspacesViews);
 	}
 
 	UnlockAllWindows();
@@ -1662,12 +1700,18 @@
 	} else
 		_WindowChanged(window);
 
-	if (fWorkspacesLayer != NULL)
-		fWorkspacesLayer->WindowRemoved(window);
+	_WindowRemoved(window);
 
-	if ((window->Flags() & kWorkspacesWindowFlag) != 0)
-		fWorkspacesLayer = NULL;
+	if (window->HasWorkspacesViews()) {
+		// remove workspaces views from this window
+		BObjectList<WorkspacesLayer> list(false);
+		window->FindWorkspacesViews(list);
 
+		while (WorkspacesLayer* view = list.RemoveItemAt(0)) {
+			fWorkspacesViews.RemoveItem(view);
+		}
+	}
+
 	UnlockAllWindows();
 
 	if (window == fWindowUnderMouse)

Modified: haiku/trunk/src/servers/app/Desktop.h
===================================================================
--- haiku/trunk/src/servers/app/Desktop.h	2008-03-08 11:36:10 UTC (rev 24299)
+++ haiku/trunk/src/servers/app/Desktop.h	2008-03-08 11:42:20 UTC (rev 24300)
@@ -181,6 +181,9 @@
 		void					RedrawBackground();
 		void					StoreWorkspaceConfiguration(int32 index);
 
+		void					AddWorkspacesView(WorkspacesLayer* view);
+		void					RemoveWorkspacesView(WorkspacesLayer* view);
+
 		void					MinimizeApplication(team_id team);
 		void					BringApplicationToFront(team_id team);
 		void					WindowAction(int32 windowToken, int32 action);
@@ -220,6 +223,7 @@
 		bool					_WindowHasModal(WindowLayer* window);
 
 		void					_WindowChanged(WindowLayer* window);
+		void					_WindowRemoved(WindowLayer* window);
 
 		void					_GetLooperName(char* name, size_t size);
 		void					_PrepareQuit();
@@ -254,7 +258,7 @@
 		WindowList				fAllWindows;
 		WindowList				fSubsetWindows;
 		WindowList				fFocusList;
-		WorkspacesLayer*		fWorkspacesLayer;
+		BObjectList<WorkspacesLayer> fWorkspacesViews;
 
 		Screen*					fActiveScreen;
 

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-08 11:36:10 UTC (rev 24299)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-08 11:42:20 UTC (rev 24300)
@@ -562,10 +562,7 @@
 
 	ViewLayer* newLayer;
 
-	if ((fWindowLayer->Flags() & kWorkspacesWindowFlag) != 0
-		&& (flags & kWorkspacesViewFlag) != 0) {
-		// TODO: there can currently only be one of these views per desktop!
-		// TODO: get rid of the kWorkspacesWindowFlag
+	if ((flags & kWorkspacesViewFlag) != 0) {
 		newLayer = new (nothrow) WorkspacesLayer(frame, scrollingOffset, name,
 			token, resizeMask, flags);
 	} else {

Modified: haiku/trunk/src/servers/app/ViewLayer.cpp
===================================================================
--- haiku/trunk/src/servers/app/ViewLayer.cpp	2008-03-08 11:36:10 UTC (rev 24299)
+++ haiku/trunk/src/servers/app/ViewLayer.cpp	2008-03-08 11:42:20 UTC (rev 24300)
@@ -206,9 +206,9 @@
 		printf("ViewLayer::AddChild() - ViewLayer already has a parent\n");
 		return;
 	}
-	
+
 	layer->fParent = this;
-	
+
 	if (!fLastChild) {
 		// no children yet
 		fFirstChild = layer;
@@ -376,19 +376,20 @@
 #endif
 
 
-ViewLayer*
-ViewLayer::FindView(uint32 flags)
+void
+ViewLayer::FindViews(uint32 flags, BObjectList<ViewLayer>& list, int32& left)
 {
-	if ((Flags() & flags) == flags)
-		return this;
+	if ((Flags() & flags) == flags) {
+		list.AddItem(this);
+		left--;
+		return;
+	}
 
 	for (ViewLayer* child = FirstChild(); child; child = child->NextSibling()) {
-		ViewLayer* layer = child->FindView(flags);
-		if (layer != NULL)
-			return layer;
+		child->FindViews(flags, list, left);
+		if (left == 0)
+			break;
 	}
-
-	return NULL;
 }
 
 

Modified: haiku/trunk/src/servers/app/ViewLayer.h
===================================================================
--- haiku/trunk/src/servers/app/ViewLayer.h	2008-03-08 11:36:10 UTC (rev 24299)
+++ haiku/trunk/src/servers/app/ViewLayer.h	2008-03-08 11:42:20 UTC (rev 24300)
@@ -16,6 +16,7 @@
 #include "IntRect.h"
 
 #include <GraphicsDefs.h>
+#include <ObjectList.h>
 #include <Region.h>
 #include <String.h>
 
@@ -76,8 +77,8 @@
 			// clips to each views bounds
 			void			ConvertToVisibleInTopView(IntRect* bounds) const;
 
-			void			AttachedToWindow(WindowLayer* window);
-			void			DetachedFromWindow();
+	virtual	void			AttachedToWindow(WindowLayer* window);
+	virtual void			DetachedFromWindow();
 			WindowLayer*	Window() const { return fWindow; }
 
 			// tree stuff
@@ -100,7 +101,8 @@
 
 			uint32			CountChildren(bool deep = false) const;
 			void			CollectTokensForChildren(BList* tokenMap) const;
-			ViewLayer*		FindView(uint32 flags);
+			void			FindViews(uint32 flags,
+								BObjectList<ViewLayer>& list, int32& left);
 
 			ViewLayer*		ViewAt(const BPoint& where);
 

Modified: haiku/trunk/src/servers/app/WindowLayer.cpp
===================================================================
--- haiku/trunk/src/servers/app/WindowLayer.cpp	2008-03-08 11:36:10 UTC (rev 24299)
+++ haiku/trunk/src/servers/app/WindowLayer.cpp	2008-03-08 11:42:20 UTC (rev 24300)
@@ -25,6 +25,7 @@
 #include "Workspace.h"
 #include "WorkspacesLayer.h"
 
+#include <ViewPrivate.h>
 #include <WindowPrivate.h>
 
 #include <Debug.h>
@@ -126,7 +127,9 @@
 	fMinWidth(1),
 	fMaxWidth(32768),
 	fMinHeight(1),
-	fMaxHeight(32768)
+	fMaxHeight(32768),
+
+	fWorkspacesViewCount(0)
 {
 	// make sure our arguments are valid
 	if (!IsValidLook(fLook))
@@ -1525,6 +1528,17 @@
 }
 
 
+/*!	\brief Collects all workspaces views in this window and puts it into \a list
+*/
+void
+WindowLayer::FindWorkspacesViews(BObjectList<WorkspacesLayer>& list) const
+{
+	int32 count = fWorkspacesViewCount;
+	TopLayer()->FindViews(kWorkspacesViewFlag, (BObjectList<ViewLayer>&)list,
+		count);
+}
+
+
 /*!	\brief Returns on which workspaces the window should be visible.
 
 	A modal or floating window may be visible on a workscreen if one

Modified: haiku/trunk/src/servers/app/WindowLayer.h
===================================================================
--- haiku/trunk/src/servers/app/WindowLayer.h	2008-03-08 11:36:10 UTC (rev 24299)
+++ haiku/trunk/src/servers/app/WindowLayer.h	2008-03-08 11:42:20 UTC (rev 24300)
@@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2001-2006, Haiku, Inc.
+ * Copyright (c) 2001-2008, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
- * Author:  DarkWyrm <bpmagic at columbus.rr.com>
- *			Adi Oanca <adioanca at gmail.com>
- *			Stephan A?mus <superstippi at gmx.de>
- *			Axel D?rfler, axeld at pinc-software.de
+ * Authors:
+ *		DarkWyrm <bpmagic at columbus.rr.com>
+ *		Adi Oanca <adioanca at gmail.com>
+ *		Stephan A?mus <superstippi at gmx.de>
+ *		Axel D?rfler, axeld at pinc-software.de
  */
 #ifndef WINDOW_LAYER_H
 #define WINDOW_LAYER_H
@@ -30,7 +31,7 @@
 class Desktop;
 class DrawingEngine;
 class EventDispatcher;
-class WindowLayer;
+class WorkspacesLayer;
 
 // TODO: move this into a proper place
 #define AS_REDRAW 'rdrw'
@@ -41,7 +42,7 @@
 };
 
 class WindowLayer {
- public:
+public:
 								WindowLayer(const BRect& frame,
 											const char *name, window_look look,
 											window_feel feel, uint32 flags,
@@ -208,6 +209,15 @@
 			bool				SameSubset(WindowLayer* window);
 			uint32				SubsetWorkspaces() const;
 
+			bool				HasWorkspacesViews() const
+									{ return fWorkspacesViewCount != 0; }
+			void				AddWorkspacesView()
+									{ fWorkspacesViewCount++; }
+			void				RemoveWorkspacesView()
+									{ fWorkspacesViewCount--; }
+			void				FindWorkspacesViews(
+									BObjectList<WorkspacesLayer>& list) const;
+
 	static bool					IsValidLook(window_look look);
 	static bool					IsValidFeel(window_feel feel);
 	static bool					IsModalFeel(window_feel feel);
@@ -216,7 +226,7 @@
 	static uint32				ValidWindowFlags();
 	static uint32				ValidWindowFlags(window_feel feel);
 
- protected:
+protected:
  	friend class Desktop;
  		// TODO: for now (list management)
 
@@ -298,7 +308,7 @@
 			// redraw requests from the Desktop will go
 			// into the pending update session.
 	class UpdateSession {
-	 public:
+	public:
 									UpdateSession();
 		virtual						~UpdateSession();
 	
@@ -320,7 +330,7 @@
 		inline	bool				IsRequest() const
 										{ return fCause & UPDATE_REQUEST; }
 	
-	 private:
+	private:
 				BRegion				fDirtyRegion;
 				bool				fInUse;
 				uint8				fCause;
@@ -352,6 +362,8 @@
 			int32				fMaxWidth;
 			int32				fMinHeight;
 			int32				fMaxHeight;
+
+			int32				fWorkspacesViewCount;
 };
 
 #endif // WINDOW_LAYER_H

Modified: haiku/trunk/src/servers/app/WorkspacesLayer.cpp
===================================================================
--- haiku/trunk/src/servers/app/WorkspacesLayer.cpp	2008-03-08 11:36:10 UTC (rev 24299)
+++ haiku/trunk/src/servers/app/WorkspacesLayer.cpp	2008-03-08 11:42:20 UTC (rev 24300)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007, Haiku Inc.
+ * Copyright 2005-2008, Haiku Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -33,11 +33,30 @@
 
 WorkspacesLayer::~WorkspacesLayer()
 {
-	// TODO: we actually need to tell the Desktop that we're gone
 }
 
 
 void
+WorkspacesLayer::AttachedToWindow(WindowLayer* window)
+{
+	ViewLayer::AttachedToWindow(window);
+
+	window->AddWorkspacesView();
+	window->Desktop()->AddWorkspacesView(this);
+}
+
+
+void
+WorkspacesLayer::DetachedFromWindow()
+{
+	fWindow->Desktop()->RemoveWorkspacesView(this);
+	fWindow->RemoveWorkspacesView();
+
+	ViewLayer::DetachedFromWindow();
+}
+
+
+void
 WorkspacesLayer::_GetGrid(int32& columns, int32& rows)
 {
 	DesktopSettings settings(Window()->Desktop());

Modified: haiku/trunk/src/servers/app/WorkspacesLayer.h
===================================================================
--- haiku/trunk/src/servers/app/WorkspacesLayer.h	2008-03-08 11:36:10 UTC (rev 24299)
+++ haiku/trunk/src/servers/app/WorkspacesLayer.h	2008-03-08 11:42:20 UTC (rev 24300)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2006, Haiku Inc.
+ * Copyright 2005-2008, Haiku Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -15,47 +15,50 @@
 
 
 class WorkspacesLayer : public ViewLayer {
-	public:
-		WorkspacesLayer(BRect frame, BPoint scrollingOffset, const char* name,
-			int32 token, uint32 resize, uint32 flags);
-		virtual ~WorkspacesLayer();
+public:
+					WorkspacesLayer(BRect frame, BPoint scrollingOffset,
+						const char* name, int32 token, uint32 resize,
+						uint32 flags);
+	virtual			~WorkspacesLayer();
 
-		virtual	void Draw(DrawingEngine* drawingEngine,
+	virtual	void	AttachedToWindow(WindowLayer* window);
+	virtual	void	DetachedFromWindow();
+
+	virtual	void	Draw(DrawingEngine* drawingEngine,
 						BRegion* effectiveClipping,
-						BRegion* windowContentClipping,
-						bool deep = false);
+						BRegion* windowContentClipping, bool deep = false);
 
-		virtual void MouseDown(BMessage* message, BPoint where);
-		virtual void MouseUp(BMessage* message, BPoint where);
-		virtual void MouseMoved(BMessage* message, BPoint where);
+	virtual	void	MouseDown(BMessage* message, BPoint where);
+	virtual	void	MouseUp(BMessage* message, BPoint where);
+	virtual	void	MouseMoved(BMessage* message, BPoint where);
 
-		void WindowChanged(WindowLayer* window);
-		void WindowRemoved(WindowLayer* window);
+			void	WindowChanged(WindowLayer* window);
+			void	WindowRemoved(WindowLayer* window);
 
-	private:
-		void _GetGrid(int32& columns, int32& rows);
-		BRect _ScreenFrame(int32 index);
-		BRect _WorkspaceAt(int32 index);
-		BRect _WorkspaceAt(BPoint where, int32& index);
-		BRect _WindowFrame(const BRect& workspaceFrame,
-					const BRect& screenFrame, const BRect& windowFrame,
-					BPoint windowPosition);
+private:
+			void	_GetGrid(int32& columns, int32& rows);
+			BRect	_ScreenFrame(int32 index);
+			BRect	_WorkspaceAt(int32 index);
+			BRect	_WorkspaceAt(BPoint where, int32& index);
+			BRect	_WindowFrame(const BRect& workspaceFrame,
+						const BRect& screenFrame, const BRect& windowFrame,
+						BPoint windowPosition);
 
-		void _DrawWindow(DrawingEngine* drawingEngine, const BRect& workspaceFrame,
-					const BRect& screenFrame, WindowLayer* window,
-					BPoint windowPosition, BRegion& backgroundRegion,
-					bool active);
-		void _DrawWorkspace(DrawingEngine* drawingEngine, BRegion& redraw,
-					int32 index);
+			void	_DrawWindow(DrawingEngine* drawingEngine,
+						const BRect& workspaceFrame, const BRect& screenFrame,
+						WindowLayer* window, BPoint windowPosition,
+						BRegion& backgroundRegion, bool active);
+			void	_DrawWorkspace(DrawingEngine* drawingEngine,
+						BRegion& redraw, int32 index);
 
-		void _DarkenColor(rgb_color& color) const;
-		void _Invalidate() const;
+			void	_DarkenColor(rgb_color& color) const;
+			void	_Invalidate() const;
 
-	private:
-		WindowLayer*	fSelectedWindow;
-		int32			fSelectedWorkspace;
-		bool			fHasMoved;
-		BPoint			fLeftTopOffset;
+private:
+	WindowLayer*	fSelectedWindow;
+	int32			fSelectedWorkspace;
+	bool			fHasMoved;
+	BPoint			fLeftTopOffset;
 };
 
 #endif	// WORKSPACES_LAYER_H



From andrewbachmann at mail.berlios.de  Sat Mar  8 13:14:13 2008
From: andrewbachmann at mail.berlios.de (andrewbachmann at BerliOS)
Date: Sat, 8 Mar 2008 13:14:13 +0100
Subject: [Haiku-commits] r24301 - haiku/trunk/src/kits/network
Message-ID: <200803081214.m28CEDbe018321@sheep.berlios.de>

Author: andrewbachmann
Date: 2008-03-08 13:14:13 +0100 (Sat, 08 Mar 2008)
New Revision: 24301
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24301&view=rev

Modified:
   haiku/trunk/src/kits/network/r5_compatibility.cpp
Log:
missing this symbol caused a library to not load.  implementation taken from old/compat/libnet/netconfig.c, after removing printf.

Modified: haiku/trunk/src/kits/network/r5_compatibility.cpp
===================================================================
--- haiku/trunk/src/kits/network/r5_compatibility.cpp	2008-03-08 11:42:20 UTC (rev 24300)
+++ haiku/trunk/src/kits/network/r5_compatibility.cpp	2008-03-08 12:14:13 UTC (rev 24301)
@@ -30,6 +30,7 @@
 		const char* name, const char* value);
 	int getusername(char *user, size_t bufferLength);
 	int getpassword(char *password, size_t bufferLength);
+	char *_netconfig_find(const char *heaading, const char *name, char *value, int nbytes);
 }
 
 
@@ -118,3 +119,9 @@
 
 	return strlen(password);
 }
+
+char *
+_netconfig_find(const char *heading, const char *name, char *value, int nbytes)
+{
+	return find_net_setting(NULL, heading, name, value, nbytes);
+}



From axeld at mail.berlios.de  Sat Mar  8 13:26:59 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 8 Mar 2008 13:26:59 +0100
Subject: [Haiku-commits] r24302 - haiku/trunk/src/servers/app/drawing
Message-ID: <200803081226.m28CQx3s016337@sheep.berlios.de>

Author: axeld
Date: 2008-03-08 13:26:59 +0100 (Sat, 08 Mar 2008)
New Revision: 24302
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24302&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
   haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.h
Log:
AccelerantHWInterface::_DrawCursor() did not override its parent method, but
hide it (because of different argument types, BRect vs. IntRect).


Modified: haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp	2008-03-08 12:14:13 UTC (rev 24301)
+++ haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp	2008-03-08 12:26:59 UTC (rev 24302)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -1324,7 +1324,7 @@
 
 // _DrawCursor
 void
-AccelerantHWInterface::_DrawCursor(BRect area) const
+AccelerantHWInterface::_DrawCursor(IntRect area) const
 {
 	// use the default implementation for now,
 	// until we have a hardware cursor

Modified: haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.h	2008-03-08 12:14:13 UTC (rev 24301)
+++ haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.h	2008-03-08 12:26:59 UTC (rev 24302)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2006, Haiku.
+ * Copyright 2005-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -95,7 +95,7 @@
 	virtual	bool				IsDoubleBuffered() const;
 
 protected:
-	virtual	void				_DrawCursor(BRect area) const;
+	virtual	void				_DrawCursor(IntRect area) const;
 
 private:
 		int						_OpenGraphicsDevice(int deviceNumber);



From axeld at mail.berlios.de  Sat Mar  8 13:45:59 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 8 Mar 2008 13:45:59 +0100
Subject: [Haiku-commits] r24303 - haiku/trunk/src/servers/app
Message-ID: <200803081245.m28CjxFT018468@sheep.berlios.de>

Author: axeld
Date: 2008-03-08 13:45:54 +0100 (Sat, 08 Mar 2008)
New Revision: 24303
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24303&view=rev

Added:
   haiku/trunk/src/servers/app/OffscreenWindow.cpp
   haiku/trunk/src/servers/app/OffscreenWindow.h
   haiku/trunk/src/servers/app/Screen.cpp
   haiku/trunk/src/servers/app/Screen.h
   haiku/trunk/src/servers/app/View.cpp
   haiku/trunk/src/servers/app/View.h
   haiku/trunk/src/servers/app/Window.cpp
   haiku/trunk/src/servers/app/Window.h
   haiku/trunk/src/servers/app/WorkspacesView.cpp
   haiku/trunk/src/servers/app/WorkspacesView.h
Removed:
   haiku/trunk/src/servers/app/OffscreenWindowLayer.cpp
   haiku/trunk/src/servers/app/OffscreenWindowLayer.h
   haiku/trunk/src/servers/app/ServerScreen.cpp
   haiku/trunk/src/servers/app/ServerScreen.h
   haiku/trunk/src/servers/app/ViewLayer.cpp
   haiku/trunk/src/servers/app/ViewLayer.h
   haiku/trunk/src/servers/app/WindowLayer.cpp
   haiku/trunk/src/servers/app/WindowLayer.h
   haiku/trunk/src/servers/app/WorkspacesLayer.cpp
   haiku/trunk/src/servers/app/WorkspacesLayer.h
Modified:
   haiku/trunk/src/servers/app/Desktop.cpp
   haiku/trunk/src/servers/app/Desktop.h
   haiku/trunk/src/servers/app/Jamfile
   haiku/trunk/src/servers/app/OffscreenServerWindow.cpp
   haiku/trunk/src/servers/app/OffscreenServerWindow.h
   haiku/trunk/src/servers/app/ScreenManager.cpp
   haiku/trunk/src/servers/app/ServerApp.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerPicture.h
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/ServerWindow.h
   haiku/trunk/src/servers/app/WindowList.cpp
   haiku/trunk/src/servers/app/WindowList.h
   haiku/trunk/src/servers/app/Workspace.cpp
   haiku/trunk/src/servers/app/Workspace.h
   haiku/trunk/src/servers/app/WorkspacePrivate.h
Log:
* Got rid of the "Layer" part of WindowLayer, ViewLayer, WorkspacesLayer
  (now WorkspacesView), OffscreenWindowLayer.
* Renamed ServerScreen.cpp/h to Screen.cpp/h (the class was already called
  Screen).


Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2008-03-08 12:26:59 UTC (rev 24302)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2008-03-08 12:45:54 UTC (rev 24303)
@@ -18,16 +18,16 @@
 #include "DrawingEngine.h"
 #include "HWInterface.h"
 #include "InputManager.h"
+#include "Screen.h"
 #include "ServerApp.h"
 #include "ServerConfig.h"
 #include "ServerCursor.h"
-#include "ServerScreen.h"
 #include "ServerWindow.h"
 #include "SystemPalette.h"
 #include "WindowPrivate.h"
-#include "WindowLayer.h"
+#include "Window.h"
 #include "Workspace.h"
-#include "WorkspacesLayer.h"
+#include "WorkspacesView.h"
 
 #include <ViewPrivate.h>
 #include <WindowInfo.h>
@@ -239,7 +239,7 @@
 
 	int32 viewToken = B_NULL_TOKEN;
 
-	WindowLayer* window = fDesktop->MouseEventWindow();
+	Window* window = fDesktop->MouseEventWindow();
 	if (window == NULL)
 		window = fDesktop->WindowAt(where);
 
@@ -667,7 +667,7 @@
 
 	// search for an unhidden window to give focus to
 
-	for (WindowLayer* window = fAllWindows.FirstWindow(); window != NULL;
+	for (Window* window = fAllWindows.FirstWindow(); window != NULL;
 			window = window->NextWindow(kAllWindowList)) {
 		// if window is a normal window of the team, and not hidden,
 		// we've found our target
@@ -752,13 +752,13 @@
 
 	BRegion redraw;
 
-	WindowLayer* window = _CurrentWindows().FirstWindow();
+	Window* window = _CurrentWindows().FirstWindow();
 	if (window->Feel() == kDesktopWindowFeel) {
 		redraw = window->VisibleContentRegion();
 
 		// look for desktop background view, and update its background color
 		// TODO: is there a better way to do this?
-		ViewLayer* view = window->TopLayer();
+		View* view = window->TopLayer();
 		if (view != NULL)
 			view = view->FirstChild();
 
@@ -909,7 +909,7 @@
 
 	BRegion dirty;
 
-	for (WindowLayer* window = _CurrentWindows().FirstWindow();
+	for (Window* window = _CurrentWindows().FirstWindow();
 			window != NULL; window = window->NextWindow(previousIndex)) {
 		// store current position in Workspace anchor
 		window->Anchor(previousIndex).position = window->Frame().LeftTop();
@@ -935,7 +935,7 @@
 	WindowList windows(kWorkingList);
 	BList previousRegions;
 
-	for (WindowLayer* window = _Windows(index).FirstWindow();
+	for (Window* window = _Windows(index).FirstWindow();
 			window != NULL; window = window->NextWindow(index)) {
 		BPoint position = window->Anchor(index).position;
 
@@ -989,7 +989,7 @@
 	_RebuildClippingForAllWindows(stillAvailableOnScreen);
 	_SetBackground(stillAvailableOnScreen);
 
-	for (WindowLayer* window = _Windows(index).FirstWindow(); window != NULL;
+	for (Window* window = _Windows(index).FirstWindow(); window != NULL;
 			window = window->NextWindow(index)) {
 		// send B_WORKSPACE_ACTIVATED message
 		window->WorkspaceActivated(index, true);
@@ -1006,7 +1006,7 @@
 
 	// Catch order changes in the new workspaces window list
 	int32 i = 0;
-	for (WindowLayer* window = windows.FirstWindow(); window != NULL;
+	for (Window* window = windows.FirstWindow(); window != NULL;
 			window = window->NextWindow(kWorkingList), i++) {
 		BRegion* region = (BRegion*)previousRegions.ItemAt(i);
 		region->ExclusiveInclude(&window->VisibleRegion());
@@ -1066,7 +1066,7 @@
 	update.AddInt32("mode", screen->ColorSpace());
 
 	// TODO: currently ignores the screen argument!
-	for (WindowLayer* window = fAllWindows.FirstWindow(); window != NULL;
+	for (Window* window = fAllWindows.FirstWindow(); window != NULL;
 			window = window->NextWindow(kAllWindowList)) {
 		window->ServerWindow()->SendMessageToClient(&update);
 	}
@@ -1085,7 +1085,7 @@
 }
 
 
-//	#pragma mark - Methods for WindowLayer manipulation
+//	#pragma mark - Methods for Window manipulation
 
 
 WindowList&
@@ -1104,14 +1104,14 @@
 
 void
 Desktop::_UpdateFloating(int32 previousWorkspace, int32 nextWorkspace,
-	WindowLayer* mouseEventWindow)
+	Window* mouseEventWindow)
 {
 	if (previousWorkspace == -1)
 		previousWorkspace = fCurrentWorkspace;
 	if (nextWorkspace == -1)
 		nextWorkspace = previousWorkspace;
 
-	for (WindowLayer* floating = fSubsetWindows.FirstWindow(); floating != NULL;
+	for (Window* floating = fSubsetWindows.FirstWindow(); floating != NULL;
 			floating = floating->NextWindow(kSubsetList)) {
 		// we only care about app/subset floating windows
 		if (floating->Feel() != B_FLOATING_SUBSET_WINDOW_FEEL
@@ -1161,7 +1161,7 @@
 {
 	fBack = NULL;
 
-	for (WindowLayer* window = _CurrentWindows().FirstWindow();
+	for (Window* window = _CurrentWindows().FirstWindow();
 			window != NULL; window = window->NextWindow(fCurrentWorkspace)) {
 		if (window->IsHidden() || window->Feel() == kDesktopWindowFeel)
 			continue;
@@ -1185,7 +1185,7 @@
 {
 	fFront = NULL;
 
-	for (WindowLayer* window = _CurrentWindows().LastWindow();
+	for (Window* window = _CurrentWindows().LastWindow();
 			window != NULL; window = window->PreviousWindow(fCurrentWorkspace)) {
 		if (window->IsHidden() || window->IsFloating() || !window->SupportsFront())
 			continue;
@@ -1215,7 +1215,7 @@
 EventTarget*
 Desktop::KeyboardEventTarget()
 {
-	WindowLayer* window = _CurrentWindows().LastWindow();
+	Window* window = _CurrentWindows().LastWindow();
 	while (window != NULL && window->IsHidden()) {
 		window = window->PreviousWindow(fCurrentWorkspace);
 	}
@@ -1230,12 +1230,12 @@
 
 
 bool
-Desktop::_WindowHasModal(WindowLayer* window)
+Desktop::_WindowHasModal(Window* window)
 {
 	if (window == NULL)
 		return false;
 
-	for (WindowLayer* modal = fSubsetWindows.FirstWindow(); modal != NULL;
+	for (Window* modal = fSubsetWindows.FirstWindow(); modal != NULL;
 			modal = modal->NextWindow(kSubsetList)) {
 		// only visible modal windows count
 		if (!modal->IsModal() || modal->IsHidden())
@@ -1253,10 +1253,10 @@
 	You must at least hold a single window lock when calling this method.
 */
 void
-Desktop::_WindowChanged(WindowLayer* window)
+Desktop::_WindowChanged(Window* window)
 {
 	for (uint32 i = fWorkspacesViews.CountItems(); i-- > 0;) {
-		WorkspacesLayer* view = fWorkspacesViews.ItemAt(i);
+		WorkspacesView* view = fWorkspacesViews.ItemAt(i);
 		view->WindowChanged(window);
 	}
 }
@@ -1266,17 +1266,17 @@
 	You must at least hold a single window lock when calling this method.
 */
 void
-Desktop::_WindowRemoved(WindowLayer* window)
+Desktop::_WindowRemoved(Window* window)
 {
 	for (uint32 i = fWorkspacesViews.CountItems(); i-- > 0;) {
-		WorkspacesLayer* view = fWorkspacesViews.ItemAt(i);
+		WorkspacesView* view = fWorkspacesViews.ItemAt(i);
 		view->WindowRemoved(window);
 	}
 }
 
 
 void
-Desktop::AddWorkspacesView(WorkspacesLayer* view)
+Desktop::AddWorkspacesView(WorkspacesView* view)
 {
 	if (view->Window() == NULL || view->Window()->IsHidden())
 		return;
@@ -1291,7 +1291,7 @@
 
 
 void
-Desktop::RemoveWorkspacesView(WorkspacesLayer* view)
+Desktop::RemoveWorkspacesView(WorkspacesView* view)
 {
 	if (!LockAllWindows())
 		return;
@@ -1311,7 +1311,7 @@
 	Windows must not be locked when calling this method.
 */
 void
-Desktop::_SendFakeMouseMoved(WindowLayer* window)
+Desktop::_SendFakeMouseMoved(Window* window)
 {
 	int32 viewToken = B_NULL_TOKEN;
 	EventTarget* target = NULL;
@@ -1346,7 +1346,7 @@
 
 
 void
-Desktop::SetFocusWindow(WindowLayer* focus)
+Desktop::SetFocusWindow(Window* focus)
 {
 	if (!LockAllWindows())
 		return;
@@ -1445,7 +1445,7 @@
 	// visible of the window
 	BRegion clean;
 
-	for (WindowLayer* window = windows.FirstWindow(); window != NULL;
+	for (Window* window = windows.FirstWindow(); window != NULL;
 			window = window->NextWindow(list)) {
 		if (wereVisible)
 			clean.Include(&window->VisibleRegion());
@@ -1463,7 +1463,7 @@
 	// redraw what became visible of the window(s)
 
 	BRegion dirty;
-	for (WindowLayer* window = windows.FirstWindow(); window != NULL;
+	for (Window* window = windows.FirstWindow(); window != NULL;
 			window = window->NextWindow(list)) {
 		dirty.Include(&window->VisibleRegion());
 	}
@@ -1487,7 +1487,7 @@
 	of their subset.
 */
 void
-Desktop::ActivateWindow(WindowLayer* window)
+Desktop::ActivateWindow(Window* window)
 {
 	STRACE(("ActivateWindow(%p, %s)\n", window, window ? window->Title() : "<none>"));
 
@@ -1533,7 +1533,7 @@
 
 	if (window == FrontWindow()) {
 		// see if there is a normal B_AVOID_FRONT window still in front of us
-		WindowLayer* avoidsFront = window->NextWindow(fCurrentWorkspace);
+		Window* avoidsFront = window->NextWindow(fCurrentWorkspace);
 		while (avoidsFront && avoidsFront->IsNormal()
 			&& (avoidsFront->Flags() & B_AVOID_FRONT) == 0) {
 			avoidsFront = avoidsFront->NextWindow(fCurrentWorkspace);
@@ -1554,7 +1554,7 @@
 	BRegion clean(window->VisibleRegion());
 	WindowList windows(kWorkingList);
 
-	WindowLayer* frontmost = window->Frontmost();
+	Window* frontmost = window->Frontmost();
 
 	_CurrentWindows().RemoveWindow(window);
 	windows.AddWindow(window);
@@ -1564,8 +1564,8 @@
 		// (ie. they are staying in front of them, but they are
 		// not supposed to change their order because of that)
 
-		WindowLayer* nextModal;
-		for (WindowLayer* modal = frontmost; modal != NULL; modal = nextModal) {
+		Window* nextModal;
+		for (Window* modal = frontmost; modal != NULL; modal = nextModal) {
 			// get the next modal window
 			nextModal = modal->NextWindow(fCurrentWorkspace);
 			while (nextModal != NULL && !nextModal->IsModal()) {
@@ -1588,7 +1588,7 @@
 
 
 void
-Desktop::SendWindowBehind(WindowLayer* window, WindowLayer* behindOf)
+Desktop::SendWindowBehind(Window* window, Window* behindOf)
 {
 	// TODO: should the "not in current workspace" be handled anyway?
 	//	(the code below would have to be changed then, though)
@@ -1607,7 +1607,7 @@
 	BRegion dirty(window->VisibleRegion());
 
 	// detach window and re-attach at desired position
-	WindowLayer* backmost = window->Backmost(behindOf);
+	Window* backmost = window->Backmost(behindOf);
 
 	_CurrentWindows().RemoveWindow(window);
 	_CurrentWindows().AddWindow(window, backmost
@@ -1639,7 +1639,7 @@
 
 
 void
-Desktop::ShowWindow(WindowLayer* window)
+Desktop::ShowWindow(Window* window)
 {
 	if (!window->IsHidden())
 		return;
@@ -1676,7 +1676,7 @@
 
 
 void
-Desktop::HideWindow(WindowLayer* window)
+Desktop::HideWindow(Window* window)
 {
 	if (window->IsHidden())
 		return;
@@ -1704,10 +1704,10 @@
 
 	if (window->HasWorkspacesViews()) {
 		// remove workspaces views from this window
-		BObjectList<WorkspacesLayer> list(false);
+		BObjectList<WorkspacesView> list(false);
 		window->FindWorkspacesViews(list);
 
-		while (WorkspacesLayer* view = list.RemoveItemAt(0)) {
+		while (WorkspacesView* view = list.RemoveItemAt(0)) {
 			fWorkspacesViews.RemoveItem(view);
 		}
 	}
@@ -1721,10 +1721,10 @@
 
 /*!
 	Shows the window on the screen - it does this independently of the
-	WindowLayer::IsHidden() state.
+	Window::IsHidden() state.
 */
 void
-Desktop::_ShowWindow(WindowLayer* window, bool affectsOtherWindows)
+Desktop::_ShowWindow(Window* window, bool affectsOtherWindows)
 {
 	BRegion background;
 	_RebuildClippingForAllWindows(background);
@@ -1746,10 +1746,10 @@
 
 /*!
 	Hides the window from the screen - it does this independently of the
-	WindowLayer::IsHidden() state.
+	Window::IsHidden() state.
 */
 void
-Desktop::_HideWindow(WindowLayer* window)
+Desktop::_HideWindow(Window* window)
 {
 	// after rebuilding the clipping,
 	// this window will not have a visible
@@ -1770,7 +1770,7 @@
 
 
 void
-Desktop::MoveWindowBy(WindowLayer* window, float x, float y, int32 workspace)
+Desktop::MoveWindowBy(Window* window, float x, float y, int32 workspace)
 {
 	if (!LockAllWindows())
 		return;
@@ -1836,7 +1836,7 @@
 
 
 void
-Desktop::ResizeWindowBy(WindowLayer* window, float x, float y)
+Desktop::ResizeWindowBy(Window* window, float x, float y)
 {
 	if (!LockAllWindows())
 		return;
@@ -1877,7 +1877,7 @@
 
 
 bool
-Desktop::SetWindowTabLocation(WindowLayer* window, float location)
+Desktop::SetWindowTabLocation(Window* window, float location)
 {
 	if (!LockAllWindows())
 		return false;
@@ -1901,8 +1901,7 @@
 
 
 bool
-Desktop::SetWindowDecoratorSettings(WindowLayer* window,
-									const BMessage& settings)
+Desktop::SetWindowDecoratorSettings(Window* window, const BMessage& settings)
 {
 	// TODO: almost exact code duplication to above function...
 
@@ -1934,7 +1933,7 @@
 	SetWorkspace().
 */
 void
-Desktop::_UpdateSubsetWorkspaces(WindowLayer* window, int32 previousIndex,
+Desktop::_UpdateSubsetWorkspaces(Window* window, int32 previousIndex,
 	int32 newIndex)
 {
 	STRACE(("_UpdateSubsetWorkspaces(window %p, %s)\n", window, window->Title()));
@@ -1943,7 +1942,7 @@
 	if (!window->IsNormal() || window->IsHidden())
 		return;
 
-	for (WindowLayer* subset = fSubsetWindows.FirstWindow(); subset != NULL;
+	for (Window* subset = fSubsetWindows.FirstWindow(); subset != NULL;
 			subset = subset->NextWindow(kSubsetList)) {
 		if (subset->Feel() == B_MODAL_ALL_WINDOW_FEEL
 			|| subset->Feel() == B_FLOATING_ALL_WINDOW_FEEL) {
@@ -1975,7 +1974,7 @@
 	\brief Adds or removes the window to or from the workspaces it's on.
 */
 void
-Desktop::_ChangeWindowWorkspaces(WindowLayer* window, uint32 oldWorkspaces,
+Desktop::_ChangeWindowWorkspaces(Window* window, uint32 oldWorkspaces,
 	uint32 newWorkspaces)
 {
 	// apply changes to the workspaces' window lists
@@ -2025,7 +2024,7 @@
 
 
 void
-Desktop::SetWindowWorkspaces(WindowLayer* window, uint32 workspaces)
+Desktop::SetWindowWorkspaces(Window* window, uint32 workspaces)
 {
 	LockAllWindows();
 
@@ -2046,7 +2045,7 @@
 	via ShowWindow().
 */
 void
-Desktop::AddWindow(WindowLayer *window)
+Desktop::AddWindow(Window *window)
 {
 	LockAllWindows();
 
@@ -2068,7 +2067,7 @@
 
 
 void
-Desktop::RemoveWindow(WindowLayer *window)
+Desktop::RemoveWindow(Window *window)
 {
 	LockAllWindows();
 
@@ -2089,7 +2088,7 @@
 
 
 bool
-Desktop::AddWindowToSubset(WindowLayer* subset, WindowLayer* window)
+Desktop::AddWindowToSubset(Window* subset, Window* window)
 {
 	if (!subset->AddToSubset(window))
 		return false;
@@ -2100,7 +2099,7 @@
 
 
 void
-Desktop::RemoveWindowFromSubset(WindowLayer* subset, WindowLayer* window)
+Desktop::RemoveWindowFromSubset(Window* subset, Window* window)
 {
 	subset->RemoveFromSubset(window);
 	_ChangeWindowWorkspaces(subset, subset->Workspaces(), subset->SubsetWorkspaces());
@@ -2108,7 +2107,7 @@
 
 
 void
-Desktop::SetWindowLook(WindowLayer *window, window_look newLook)
+Desktop::SetWindowLook(Window *window, window_look newLook)
 {
 	if (window->Look() == newLook)
 		return;
@@ -2133,7 +2132,7 @@
 
 
 void
-Desktop::SetWindowFeel(WindowLayer *window, window_feel newFeel)
+Desktop::SetWindowFeel(Window *window, window_feel newFeel)
 {
 	if (window->Feel() == newFeel)
 		return;
@@ -2168,10 +2167,10 @@
 		if (i == fCurrentWorkspace && window->IsVisible())
 			visibleBefore = window->VisibleRegion();
 
-		WindowLayer* backmost = window->Backmost(_Windows(i).LastWindow(), i);
+		Window* backmost = window->Backmost(_Windows(i).LastWindow(), i);
 		if (backmost != NULL) {
 			// check if the backmost window is really behind it
-			WindowLayer* previous = window->PreviousWindow(i);
+			Window* previous = window->PreviousWindow(i);
 			while (previous != NULL) {
 				if (previous == backmost)
 					break;
@@ -2187,10 +2186,10 @@
 			}
 		}
 
-		WindowLayer* frontmost = window->Frontmost(_Windows(i).FirstWindow(), i);
+		Window* frontmost = window->Frontmost(_Windows(i).FirstWindow(), i);
 		if (frontmost != NULL) {
 			// check if the frontmost window is really in front of it
-			WindowLayer* next = window->NextWindow(i);
+			Window* next = window->NextWindow(i);
 			while (next != NULL) {
 				if (next == frontmost)
 					break;
@@ -2232,7 +2231,7 @@
 
 
 void
-Desktop::SetWindowFlags(WindowLayer *window, uint32 newFlags)
+Desktop::SetWindowFlags(Window *window, uint32 newFlags)
 {
 	if (window->Flags() == newFlags)
 		return;
@@ -2257,7 +2256,7 @@
 
 
 void
-Desktop::SetWindowTitle(WindowLayer *window, const char* title)
+Desktop::SetWindowTitle(Window *window, const char* title)
 {
 	if (!LockAllWindows())
 		return;
@@ -2281,10 +2280,10 @@
 	Returns the window under the mouse cursor.
 	You need to have acquired the All Windows lock when calling this method.
 */
-WindowLayer*
+Window*
 Desktop::WindowAt(BPoint where)
 {
-	for (WindowLayer* window = _CurrentWindows().LastWindow(); window;
+	for (Window* window = _CurrentWindows().LastWindow(); window;
 			window = window->PreviousWindow(fCurrentWorkspace)) {
 		if (window->IsVisible() && window->VisibleRegion().Contains(where))
 			return window;
@@ -2295,14 +2294,14 @@
 
 
 void
-Desktop::SetMouseEventWindow(WindowLayer* window)
+Desktop::SetMouseEventWindow(Window* window)
 {
 	fMouseEventWindow = window;
 }
 
 
 void
-Desktop::SetViewUnderMouse(const WindowLayer* window, int32 viewToken)
+Desktop::SetViewUnderMouse(const Window* window, int32 viewToken)
 {
 	fWindowUnderMouse = window;
 	fViewUnderMouse = viewToken;
@@ -2310,7 +2309,7 @@
 
 
 int32
-Desktop::ViewUnderMouse(const WindowLayer* window)
+Desktop::ViewUnderMouse(const Window* window)
 {
 	if (window != NULL && fWindowUnderMouse == window)
 		return fViewUnderMouse;
@@ -2319,10 +2318,10 @@
 }
 
 
-WindowLayer *
-Desktop::FindWindowLayerByClientToken(int32 token, team_id teamID)
+Window *
+Desktop::FindWindowByClientToken(int32 token, team_id teamID)
 {
-	for (WindowLayer *window = fAllWindows.FirstWindow(); window != NULL;
+	for (Window *window = fAllWindows.FirstWindow(); window != NULL;
 			window = window->NextWindow(kAllWindowList)) {
 		if (window->ServerWindow()->ClientToken() == token
 			&& window->ServerWindow()->ClientTeam() == teamID) {
@@ -2341,7 +2340,7 @@
 
 	// Just minimize all windows of that application
 
-	for (WindowLayer *window = fAllWindows.FirstWindow(); window != NULL;
+	for (Window *window = fAllWindows.FirstWindow(); window != NULL;
 			window = window->NextWindow(kAllWindowList)) {
 		if (window->ServerWindow()->ClientTeam() != team)
 			continue;
@@ -2358,7 +2357,7 @@
 
 	// TODO: for now, just maximize all windows of that application
 
-	for (WindowLayer *window = fAllWindows.FirstWindow(); window != NULL;
+	for (Window *window = fAllWindows.FirstWindow(); window != NULL;
 			window = window->NextWindow(kAllWindowList)) {
 		if (window->ServerWindow()->ClientTeam() != team)
 			continue;
@@ -2377,7 +2376,7 @@
 	LockAllWindows();
 
 	::ServerWindow* serverWindow;
-	WindowLayer* window;
+	Window* window;
 	if (BPrivate::gDefaultTokens.GetToken(windowToken,
 			B_SERVER_TOKEN, (void**)&serverWindow) != B_OK
 		|| (window = serverWindow->Window()) == NULL) {
@@ -2405,7 +2404,7 @@
 
 	int32 count = 0;
 
-	for (WindowLayer *window = fAllWindows.FirstWindow(); window != NULL;
+	for (Window *window = fAllWindows.FirstWindow(); window != NULL;
 			window = window->NextWindow(kAllWindowList)) {
 		if (team < B_OK || window->ServerWindow()->ClientTeam() == team)
 			count++;
@@ -2416,7 +2415,7 @@
 	sender.StartMessage(B_OK);
 	sender.Attach<int32>(count);
 
-	for (WindowLayer *window = fAllWindows.FirstWindow(); window != NULL;
+	for (Window *window = fAllWindows.FirstWindow(); window != NULL;
 			window = window->NextWindow(kAllWindowList)) {
 		if (team >= B_OK && window->ServerWindow()->ClientTeam() != team)
 			continue;
@@ -2483,7 +2482,7 @@
 	stillAvailableOnScreen = fScreenRegion;
 
 	// set clipping of each window
-	for (WindowLayer* window = _CurrentWindows().LastWindow(); window != NULL;
+	for (Window* window = _CurrentWindows().LastWindow(); window != NULL;
 			window = window->PreviousWindow(fCurrentWorkspace)) {
 		if (!window->IsHidden()) {
 			window->SetClipping(&stillAvailableOnScreen);
@@ -2498,7 +2497,7 @@
 Desktop::_TriggerWindowRedrawing(BRegion& newDirtyRegion)
 {
 	// send redraw messages to all windows intersecting the dirty region
-	for (WindowLayer* window = _CurrentWindows().LastWindow(); window != NULL;
+	for (Window* window = _CurrentWindows().LastWindow(); window != NULL;
 			window = window->PreviousWindow(fCurrentWorkspace)) {
 		if (!window->IsHidden()
 			&& newDirtyRegion.Intersects(window->VisibleRegion().Frame()))

Modified: haiku/trunk/src/servers/app/Desktop.h
===================================================================
--- haiku/trunk/src/servers/app/Desktop.h	2008-03-08 12:26:59 UTC (rev 24302)
+++ haiku/trunk/src/servers/app/Desktop.h	2008-03-08 12:45:54 UTC (rev 24303)
@@ -13,8 +13,8 @@
 
 #include "CursorManager.h"
 #include "EventDispatcher.h"
+#include "Screen.h"
 #include "ScreenManager.h"
-#include "ServerScreen.h"
 #include "VirtualScreen.h"
 #include "DesktopSettings.h"
 #include "MessageLooper.h"
@@ -44,7 +44,8 @@
 class DrawingEngine;
 class HWInterface;
 class ServerApp;
-class WorkspacesLayer;
+class Window;
+class WorkspacesView;
 struct server_read_only_memory;
 
 namespace BPrivate {
@@ -109,55 +110,55 @@
 									{ return fWorkspaces[index]; }
 		status_t				SetWorkspacesCount(int32 newCount);
 
-		// WindowLayer methods
+		// Window methods
 
-		void					ActivateWindow(WindowLayer* window);
-		void					SendWindowBehind(WindowLayer* window,
-									WindowLayer* behindOf = NULL);
+		void					ActivateWindow(Window* window);
+		void					SendWindowBehind(Window* window,
+									Window* behindOf = NULL);
 
-		void					ShowWindow(WindowLayer* window);
-		void					HideWindow(WindowLayer* window);
+		void					ShowWindow(Window* window);
+		void					HideWindow(Window* window);
 
-		void					MoveWindowBy(WindowLayer* window, float x, float y,
+		void					MoveWindowBy(Window* window, float x, float y,
 									int32 workspace = -1);
-		void					ResizeWindowBy(WindowLayer* window, float x, float y);
-		bool					SetWindowTabLocation(WindowLayer* window, float location);
-		bool					SetWindowDecoratorSettings(WindowLayer* window,
+		void					ResizeWindowBy(Window* window, float x, float y);
+		bool					SetWindowTabLocation(Window* window, float location);
+		bool					SetWindowDecoratorSettings(Window* window,
 														   const BMessage& settings);
 
-		void					SetWindowWorkspaces(WindowLayer* window,
+		void					SetWindowWorkspaces(Window* window,
 									uint32 workspaces);
 
-		void					AddWindow(WindowLayer* window);
-		void					RemoveWindow(WindowLayer* window);
+		void					AddWindow(Window* window);
+		void					RemoveWindow(Window* window);
 
-		bool					AddWindowToSubset(WindowLayer* subset,
-									WindowLayer* window);
-		void					RemoveWindowFromSubset(WindowLayer* subset,
-									WindowLayer* window);
+		bool					AddWindowToSubset(Window* subset,
+									Window* window);
+		void					RemoveWindowFromSubset(Window* subset,
+									Window* window);
 
-		void					SetWindowLook(WindowLayer* window, window_look look);
-		void					SetWindowFeel(WindowLayer* window, window_feel feel);
-		void					SetWindowFlags(WindowLayer* window, uint32 flags);
-		void					SetWindowTitle(WindowLayer* window, const char* title);
+		void					SetWindowLook(Window* window, window_look look);
+		void					SetWindowFeel(Window* window, window_feel feel);
+		void					SetWindowFlags(Window* window, uint32 flags);
+		void					SetWindowTitle(Window* window, const char* title);
 
-		WindowLayer*			FocusWindow() const { return fFocus; }
-		WindowLayer*			FrontWindow() const { return fFront; }
-		WindowLayer*			BackWindow() const { return fBack; }
+		Window*					FocusWindow() const { return fFocus; }
+		Window*					FrontWindow() const { return fFront; }
+		Window*					BackWindow() const { return fBack; }
 
-		WindowLayer*			WindowAt(BPoint where);
+		Window*					WindowAt(BPoint where);
 
-		WindowLayer*			MouseEventWindow() const { return fMouseEventWindow; }
-		void					SetMouseEventWindow(WindowLayer* window);
+		Window*					MouseEventWindow() const { return fMouseEventWindow; }
+		void					SetMouseEventWindow(Window* window);
 
-		void					SetViewUnderMouse(const WindowLayer* window, int32 viewToken);
-		int32					ViewUnderMouse(const WindowLayer* window);
+		void					SetViewUnderMouse(const Window* window, int32 viewToken);
+		int32					ViewUnderMouse(const Window* window);
 
-		void					SetFocusWindow(WindowLayer* window = NULL);
+		void					SetFocusWindow(Window* window = NULL);
 		EventTarget*			KeyboardEventTarget();
 
-		WindowLayer*			FindWindowLayerByClientToken(int32 token, team_id teamID);
-		//WindowLayer*			FindWindowLayerByServerToken(int32 token);
+		Window*					FindWindowByClientToken(int32 token,
+									team_id teamID);
 
 #if USE_MULTI_LOCKER
 		bool					LockSingleWindow() { return fWindowLock.ReadLock(); }
@@ -181,8 +182,8 @@
 		void					RedrawBackground();
 		void					StoreWorkspaceConfiguration(int32 index);
 
-		void					AddWorkspacesView(WorkspacesLayer* view);
-		void					RemoveWorkspacesView(WorkspacesLayer* view);
+		void					AddWorkspacesView(WorkspacesView* view);
+		void					RemoveWorkspacesView(WorkspacesView* view);
 
 		void					MinimizeApplication(team_id team);
 		void					BringApplicationToFront(team_id team);
@@ -196,19 +197,19 @@
 	private:
 		void					_LaunchInputServer();
 		void					_SetWorkspace(int32 index);
-		void					_ShowWindow(WindowLayer* window,
+		void					_ShowWindow(Window* window,
 									bool affectsOtherWindows = true);
-		void					_HideWindow(WindowLayer* window);
+		void					_HideWindow(Window* window);
 
-		void					_UpdateSubsetWorkspaces(WindowLayer* window,
+		void					_UpdateSubsetWorkspaces(Window* window,
 									int32 previousIndex = -1,
 									int32 newIndex = -1);
-		void					_ChangeWindowWorkspaces(WindowLayer* window,
+		void					_ChangeWindowWorkspaces(Window* window,
 									uint32 oldWorkspaces, uint32 newWorkspaces);
 		void					_BringWindowsToFront(WindowList& windows,
 									int32 list, bool wereVisible);
  		status_t				_ActivateApp(team_id team);
- 		void					_SendFakeMouseMoved(WindowLayer* window = NULL);
+ 		void					_SendFakeMouseMoved(Window* window = NULL);
 
 		void					_RebuildClippingForAllWindows(BRegion& stillAvailableOnScreen);
 		void					_TriggerWindowRedrawing(BRegion& newDirtyRegion);
@@ -216,14 +217,14 @@
 
 		void					_UpdateFloating(int32 previousWorkspace = -1,
 									int32 nextWorkspace = -1,
-									WindowLayer* mouseEventWindow = NULL);
+									Window* mouseEventWindow = NULL);
 		void					_UpdateBack();
 		void					_UpdateFront(bool updateFloating = true);
 		void					_UpdateFronts(bool updateFloating = true);
-		bool					_WindowHasModal(WindowLayer* window);
+		bool					_WindowHasModal(Window* window);
 
-		void					_WindowChanged(WindowLayer* window);
-		void					_WindowRemoved(WindowLayer* window);
+		void					_WindowChanged(Window* window);
+		void					_WindowRemoved(Window* window);
 
 		void					_GetLooperName(char* name, size_t size);
 		void					_PrepareQuit();
@@ -258,7 +259,7 @@
 		WindowList				fAllWindows;
 		WindowList				fSubsetWindows;
 		WindowList				fFocusList;
-		BObjectList<WorkspacesLayer> fWorkspacesViews;
+		BObjectList<WorkspacesView> fWorkspacesViews;
 
 		Screen*					fActiveScreen;
 
@@ -273,15 +274,15 @@
 		BRegion					fBackgroundRegion;
 		BRegion					fScreenRegion;
 
-		WindowLayer*			fMouseEventWindow;
-		const WindowLayer*		fWindowUnderMouse;
+		Window*					fMouseEventWindow;
+		const Window*			fWindowUnderMouse;
 		int32					fViewUnderMouse;
 		BPoint					fLastMousePosition;
 		int32					fLastMouseButtons;
 
-		WindowLayer*			fFocus;
-		WindowLayer*			fFront;
-		WindowLayer*			fBack;
+		Window*			fFocus;
+		Window*			fFront;
+		Window*			fBack;
 };
 
 #endif	// DESKTOP_H

Modified: haiku/trunk/src/servers/app/Jamfile
===================================================================
--- haiku/trunk/src/servers/app/Jamfile	2008-03-08 12:26:59 UTC (rev 24302)
+++ haiku/trunk/src/servers/app/Jamfile	2008-03-08 12:45:54 UTC (rev 24303)
@@ -39,27 +39,27 @@
 	MessageLooper.cpp
 	MultiLocker.cpp
 	OffscreenServerWindow.cpp
-	OffscreenWindowLayer.cpp
+	OffscreenWindow.cpp
 	PNGDump.cpp
 	ProfileMessageSupport.cpp
 	RAMLinkMsgReader.cpp
 	RGBColor.cpp
 	RegionPool.cpp
+	Screen.cpp
 	ScreenManager.cpp
 	ServerApp.cpp
 	ServerBitmap.cpp
 	ServerCursor.cpp
 	ServerFont.cpp
 	ServerPicture.cpp
-	ServerScreen.cpp
 	ServerWindow.cpp
 	SystemPalette.cpp
-	ViewLayer.cpp
+	View.cpp
 	VirtualScreen.cpp
-	WindowLayer.cpp
+	Window.cpp
 	WindowList.cpp
 	Workspace.cpp
-	WorkspacesLayer.cpp
+	WorkspacesView.cpp
 
 	# libraries
 	:

Modified: haiku/trunk/src/servers/app/OffscreenServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/OffscreenServerWindow.cpp	2008-03-08 12:26:59 UTC (rev 24302)
+++ haiku/trunk/src/servers/app/OffscreenServerWindow.cpp	2008-03-08 12:45:54 UTC (rev 24303)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005, Haiku, Inc. All rights reserved.
+ * Copyright 2005-2008, Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -7,32 +7,29 @@
  */
 
 
-#include "OffscreenWindowLayer.h"
+#include "OffscreenWindow.h"
 #include "ServerBitmap.h"
 
 #include "OffscreenServerWindow.h"
 
 
-OffscreenServerWindow::OffscreenServerWindow(const char *title,
-											 ServerApp *app,
-											 port_id clientPort,
-											 port_id looperPort,
-											 int32 handlerID,
-											 ServerBitmap* bitmap)
+OffscreenServerWindow::OffscreenServerWindow(const char *title, ServerApp *app,
+		port_id clientPort, port_id looperPort, int32 handlerID,
+		ServerBitmap* bitmap)
 	: ServerWindow(title, app, clientPort, looperPort, handlerID),
-	  fBitmap(bitmap)
+	fBitmap(bitmap)
 {
 }
 
-// destructor
+
 OffscreenServerWindow::~OffscreenServerWindow()
 {
 }
 
-// SendMessageToClient
+
 void
 OffscreenServerWindow::SendMessageToClient(const BMessage* msg, int32 target,
-								  bool usePreferred) const
+	bool usePreferred) const
 {
 	// We're a special kind of window. The client BWindow thread is not running,
 	// so we cannot post messages to the client. In order to not mess arround
@@ -41,9 +38,9 @@
 }
 
 
-WindowLayer*
-OffscreenServerWindow::MakeWindowLayer(BRect frame, const char* name,
+Window*
+OffscreenServerWindow::MakeWindow(BRect frame, const char* name,
 	window_look look, window_feel feel, uint32 flags, uint32 workspace)
 {
-	return new OffscreenWindowLayer(fBitmap, name, this);
+	return new OffscreenWindow(fBitmap, name, this);
 }

Modified: haiku/trunk/src/servers/app/OffscreenServerWindow.h
===================================================================
--- haiku/trunk/src/servers/app/OffscreenServerWindow.h	2008-03-08 12:26:59 UTC (rev 24302)
+++ haiku/trunk/src/servers/app/OffscreenServerWindow.h	2008-03-08 12:45:54 UTC (rev 24303)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005, Haiku, Inc. All rights reserved.
+ * Copyright 2005-2008, Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -13,26 +13,23 @@
 
 
 class OffscreenServerWindow : public ServerWindow {
- public:
-								OffscreenServerWindow(const char *title,
-													  ServerApp *app,
-													  port_id clientPort,
-													  port_id looperPort,
-													  int32 handlerID,
-													  ServerBitmap* bitmap);
-	virtual						~OffscreenServerWindow();
+public:
+						OffscreenServerWindow(const char *title, ServerApp *app,
+							port_id clientPort, port_id looperPort,
+							int32 handlerID, ServerBitmap* bitmap);
+	virtual				~OffscreenServerWindow();
 
 			// util methods.	
-	virtual	void				SendMessageToClient(const BMessage* msg,
-													int32 target = B_NULL_TOKEN,
-													bool usePreferred = false) const;
+	virtual	void		SendMessageToClient(const BMessage* msg,
+							int32 target = B_NULL_TOKEN,
+							bool usePreferred = false) const;
 
-	virtual	WindowLayer*		MakeWindowLayer(BRect frame, const char* name,
-									window_look look, window_feel feel, uint32 flags,
-									uint32 workspace);
+	virtual	::Window*	MakeWindow(BRect frame, const char* name,
+							window_look look, window_feel feel, uint32 flags,
+							uint32 workspace);
 
- private:
-			ServerBitmap*		fBitmap;
+private:

[... truncated: 8233 lines follow ...]


From anevilyak at gmail.com  Sat Mar  8 15:44:15 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Sat, 8 Mar 2008 08:44:15 -0600
Subject: [Haiku-commits] r24299 - haiku/trunk/src/servers/app
In-Reply-To: <200803081136.m28BaBET002048@sheep.berlios.de>
References: <200803081136.m28BaBET002048@sheep.berlios.de>
Message-ID: <f019d2f30803080644t65853373ke5136763208d0b3d@mail.gmail.com>

On Sat, Mar 8, 2008 at 5:36 AM, axeld at BerliOS <axeld at mail.berlios.de> wrote:
> Author: axeld
>  Date: 2008-03-08 12:36:10 +0100 (Sat, 08 Mar 2008)
>  New Revision: 24299
>  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24299&view=rev
>
>  Modified:
>    haiku/trunk/src/servers/app/DesktopSettings.cpp
>  Log:
>  Fixed warnings.
>

Just curious, what compiler gave you a warning on that, and what was
it? Neither gcc2 nor gcc4 on linux said anything for me.

Regards,

Rene


From revol at free.fr  Sat Mar  8 15:49:19 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sat, 08 Mar 2008 15:49:19 +0100 CET
Subject: [Haiku-commits] r24298 - haiku/trunk/build/jam
In-Reply-To: <200803081012.m28ACFPp017729@sheep.berlios.de>
Message-ID: <3377441899-BeMail@laptop>

> * Removed explicit timezone and keymap settings file generation. The 
> system
>   works fine without those, the keymap file will be generated.
> * Supplied the removed lines as example in UserBuildConfig.sample for 
> how
>   to supply these settings during image generation.
> 

Btw, while I didn't find any provision in the PS/2 protocol to pass the 
keyboard language, the USB HID has a way to give the localization of 
the device:

"The value bCountryCode identifies which country the hardware is 
localized
for. Most hardware is not localized and thus this value would be zero 
(0).
However, keyboards may use the field to indicate the language of the 
key caps.
Devices are not required to place a value other than zero in this 
field, but some operating environments may require this information. 
The following 
table specifies the valid country codes."

p32, http://www.usb.org/developers/devclass_docs/HID1_11.pdf

While people can still reorder caps (dvorak...) it might be nice to use 
that if present to select the default keymap.

Fran?ois.


From nielx at mail.berlios.de  Sat Mar  8 16:11:39 2008
From: nielx at mail.berlios.de (nielx at BerliOS)
Date: Sat, 8 Mar 2008 16:11:39 +0100
Subject: [Haiku-commits] r24304 - haiku/trunk/docs/user/app
Message-ID: <200803081511.m28FBd3B004931@sheep.berlios.de>

Author: nielx
Date: 2008-03-08 16:11:39 +0100 (Sat, 08 Mar 2008)
New Revision: 24304
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24304&view=rev

Added:
   haiku/trunk/docs/user/app/Looper.dox
Modified:
   haiku/trunk/docs/user/app/Handler.dox
Log:
Handler.dox:
- Small link fix
- Clean up the titles of the subsections a bit: these are reused in the looper documentation and they sort of clashed before.

Also, new documentation for Looper.dox!

Modified: haiku/trunk/docs/user/app/Handler.dox
===================================================================
--- haiku/trunk/docs/user/app/Handler.dox	2008-03-08 12:45:54 UTC (rev 24303)
+++ haiku/trunk/docs/user/app/Handler.dox	2008-03-08 15:11:39 UTC (rev 24304)
@@ -135,6 +135,10 @@
 	This method does not remove the handler from the looper to which this
 	handler is associated. You should do this yourself, using
 	BLooper::RemoveHandler().
+	
+	\warning This constructor does no type check whatsoever. Since you can pass
+		any BMessage, you should - if you are not sure about the exact type -
+		use the Instantiate() method, which does check the type.
 */
 
 
@@ -193,7 +197,7 @@
 
 
 /*!
-	\name Core Functionality
+	\name Core Handler Functionality
 */
 
 
@@ -240,8 +244,8 @@
 	will reply with a \c B_MESSAGE_NOT_UNDERSTOOD constant. 
 	
 	\attention If you want to keep or manipulate the \a message, have a look
-		at the \link BLooper::DetachMessage() DetachMessage() \endlink method
-		to get ownership of the message.
+		at the \link BLooper::DetachCurrentMessage() DetachCurrentMessage() \endlink
+		method to get ownership of the message.
 	
 	\param message The message that needs to be handled.
 */

Added: haiku/trunk/docs/user/app/Looper.dox
===================================================================
--- haiku/trunk/docs/user/app/Looper.dox	2008-03-08 12:45:54 UTC (rev 24303)
+++ haiku/trunk/docs/user/app/Looper.dox	2008-03-08 15:11:39 UTC (rev 24304)
@@ -0,0 +1,791 @@
+/*
+ * Copyright 2007, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Niels Sascha Reedijk, niels.reedijk at gmail.com
+ * 
+ * Corresponds to:
+ *		/trunk/headers/os/app/Looper.h  rev 21863
+ *		/trunk/src/kits/app/Looper.cpp  rev 21864
+ */
+
+/*!
+	\file Looper.h
+	\brief Provides the BLooper class.
+*/
+
+
+/*!
+	\def B_LOOPER_PORT_DEFAULT_CAPACITY
+	\brief The default size of the port of a BLooper.
+*/
+
+
+/*!
+	\class BLooper
+	\ingroup app
+	\brief Receive and process messages in a separate thread.
+	
+	When an object of this class is created, the message loop can be started
+	with Run(). This spawns the thread that receives messages and processes
+	messages. Messages are actually passed on to \link BHandler handlers \endlink
+	that are associated with this looper. By default there is always one
+	handler available: the looper itself. To 'quit' a looper, you should pass
+	a \c B_QUIT_REQUESTED message using one of the message post functions. Do
+	not call Quit() directly! When a looper receives such a request, it will 
+	\b delete itself. As such, looper should <em>always be created on the
+	heap</em> (with \c new), and never on the stack. 
+	
+	Posting messages can be done using the various PostMessage() methods.
+	Whenever a message is posted, it will be added through to the message
+	queue. It is possible to apply filters (see AddCommonFilter()) to filter
+	out any messages that correspond with certain criteria. Whenever you post
+	a message, you \e lose ownership. The looper will dispose of it when it is 
+	processed. The handler for the message is chosen using the following
+	criteria:
+	
+	-# If PostMessage() or the BMessenger is set to a specific handler, and
+		this handler is associated with this looper, than the message is
+		processed by that handler.
+	-# Else, the preferred handler is used. You can set this using
+		SetPreferredHandler().
+	-# If there is no preferred handler, then the looper itself will process
+		the message.
+	
+	Because a looper usually is used in multiple threads, you should make sure
+	you Lock() and Unlock() it during most operations. Locking calls can be
+	recursive (so multiple locks can come from a single thread), but make sure
+	you pair every Lock() with an Unlock() call. Failing to do so will
+	inevitably cause a deadlock.
+	
+	Because a looper provides a separate thread, and the inherited handler is
+	usually a default handler, you will most often use this class by
+	subclassing it. For example, you are likely to subclass BWindow (which is
+	derived from BLooper) to customize your window and handle the messages
+	sent to that window. You can override Run() in case you want to perform
+	additional tasks before (or right after) starting the message loop. You can
+	override QuitRequested() if you want to decline quitting in certain 
+	circumstances. You can override Quit() in case you want to perform
+	additional procedures during closing time. You can also override
+	DispatchMessage() if you want to do something with all incoming messages
+	before they are dispatched to a handler.
+	
+	BLooper is one of the major base classes of the Haiku application
+	programmers interface. Closely related classes are BMessage, BHandler and 
+	BMessenger. It is used in the interface kit, for example by the BWindow
+	class, which makes sure every window runs it its own thread.
+	
+	BLooper is a part of the chain in the eloquent messaging structure. For a
+	proper understanding of all its facets, have a look at the \ref app_messaging
+	"messaging overview".
+*/
+
+
+/*!
+	\fn BLooper::BLooper(const char* name, int32 priority, int32 port_capacity)
+	\brief Construct a new BLooper with a \a priority and an \a capacity.
+	
+	The new looper is, by default, not running yet. If you have set up
+	everything properly, you may call Run().
+	
+	\attention Remember that loopers should be created on the heap, because
+		they will \c delete themselves in the Quit() method.
+	
+	\param name The name of the looper.
+	\param priority The priority of the message thread of this looper. The
+		default priority should be good enough for most tasks. Also, some
+		derived versions of BLooper will use a specialized priority. So it is
+		advised to leave this setting at the default, unless you know why you
+		would like another setting.
+	\param port_capacity Loopers use ports to send and receive messages (see
+		the kernel kit). Ports have a maximum capacity; if there are so many
+		messages queued that the port is full, all other incoming messages are
+		dropped. There are situations where the size of the port should be
+		different from the default. This might be when your looper receives
+		a lot of messages, or if the message handling thread runs at a lower
+		priority than normal, which would decrease the processing speed.
+		Finding a suitable value for these custom scenarios would be done by
+		testing. 
+	
+	\see Run()
+*/
+
+
+/*!
+	\fn BLooper::~BLooper()
+	\brief Destruct the looper.
+	
+	You will never delete a looper yourself. You should pass a 
+	\c B_QUIT_REQUESTED message, or if you are destroying the looper from
+	inside its own message handling thread, you should call Quit().
+	
+	\see Quit()
+*/
+
+
+///// Archiving /////
+
+
+/*!
+	\name Archiving
+*/
+
+
+//! @{
+	
+
+/*!
+	\fn BLooper::BLooper(BMessage *data)
+	\brief Construct a looper from an archived message.
+	
+	The \a data message has to be constructed by a BLooper::Archive() call.
+	Note that the data that is restored, is merely the port capacity and the
+	name of the looper/handler. Other data, such as filters, is not archived by
+	the default archiver.
+	
+	\warning This constructor does no type check whatsoever. Since you can pass
+		any BMessage, you should - if you are not sure about the exact type -
+		use the Instantiate() method, which does check the type.
+	
+	\see Instantiate()
+	\see Archive()
+*/
+
+
+/*!
+	\fn BArchivable *BLooper::Instantiate(BMessage *data)
+	\brief Static method to instantiate a looper from an archived message.
+
+	\return A pointer to the instantiated looper, or \c NULL if the \a data
+		is not a valid archived BLooper object.
+	\see BLooper(BMessage* data)
+*/
+
+
+/*!
+	\fn status_t BLooper::Archive(BMessage *data, bool deep) const
+	\brief Archive a looper to a message
+	
+	Currently, only the name and the port capacity are archived. Any other
+	data, such as the filters, is not stored. 
+	
+	\param data The message to archive the object in.
+	\param deep This parameter is ignored, as BLooper does not have children.
+	\retval B_OK Archiving succeeded.
+	\retval B_BAD_VALUE The \a data parameter is not a valid message.
+	\see BLooper::Instantiate(BMessage *data)
+*/
+
+
+//! @}
+
+
+/*!
+	\name Message Mechanics
+*/
+
+
+//! @{
+	
+
+/*!
+	\fn status_t BLooper::PostMessage(uint32 command)
+	\brief Post a message with the \a command as \c what identifier to this
+		looper.
+	
+	Posting a message puts it in the message queue. The message passes through
+	the default handler chain.
+	
+	\param command The \c what identifier of the message that needs to be sent.
+	
+	\retval B_OK The operation succeeded, and the message is sent to the port.
+	\retval B_ERROR There was a general operation error.
+	\retval B_BAD_VALUE This looper is not yet running and therefore cannot
+		receive messages.
+	
+	\see PostMessage(BMessage *) if you want to send a message with data
+		members.
+	\see PostMessage(uint32, BHandler *, BHandler *) if you want to send a
+		message to a specific handler, and request a reply.
+	\see PostMessage(BMessage *, BHandler *, BHandler *) for the same thing,
+		but with a complete message.
+*/
+
+
+/*!
+	\fn status_t BLooper::PostMessage(BMessage *message)
+	\brief Post a \a message to this looper.
+	
+	Posting a message puts it in the message queue. The message passes through
+	the default handler chain.
+	
+	\param message The message you would like to pass to this method.
+	
+	\retval B_OK The operation succeeded, and the message is sent to the port.
+	\retval B_ERROR There was a general operation error.
+	\retval B_BAD_VALUE This looper is not yet running and therefore cannot
+		receive messages.
+	
+	\see PostMessage(uint32) if you want to send a message without data
+		members.
+	\see PostMessage(uint32, BHandler *, BHandler *) if you want to send a
+		message to a specific handler, and request a reply.
+	\see PostMessage(BMessage *, BHandler *, BHandler *) for the same thing,
+		but with a complete message.
+*/
+
+
+/*!
+	\fn status_t BLooper::PostMessage(uint32 command, BHandler *handler,
+		BHandler *replyTo)
+	\brief Send a message with the \a command as \c what identifier to the
+		\a handler associated with this looper, and (optionally) request a
+		reply.
+		
+	The target \a handler should be associated with this looper. This method
+	bypasses the default message queue.
+	
+	\param command The value you want as the message's \c what identifier.
+	\param handler The handler you would like to pass this message to.
+	\param replyTo If you would like to request a reply, pass the handler to
+		which this reply should be directed to. If you pass \c NULL, you will
+		not receive a reply.
+	
+	\retval B_OK The operation succeeded, and the message is sent to the port.
+	\retval B_ERROR There was a general operation error.
+	\retval B_BAD_VALUE This looper is not yet running and therefore cannot
+		receive messages.	
+	\retval B_MISMATCHED_VALUES The \a handler is not associated with this
+		looper.
+	
+	\see PostMessage(uint32) if you want to send a message without data
+		members.
+	\see PostMessage(BMessage *) if you want to send a message with data
+		members.
+	\see PostMessage(BMessage *, BHandler *, BHandler *) if you want to send a
+		message to a specific handler, and request a reply.
+*/
+
+
+/*!
+	\fn status_t BLooper::PostMessage(BMessage *message, BHandler *handler,
+		BHandler *replyTo)
+	\brief Send a \a message to the \a handler associated with this looper, 
+		and (optionally) request a reply.
+		
+	The target \a handler should be associated with this looper. This method
+	bypasses the default message queue.
+	
+	\param message The message you want to pass.
+	\param handler The handler you would like to pass this message to.
+	\param replyTo If you would like to request a reply, pass the handler to
+		which this reply should be directed to. If you pass \c NULL, you will
+		not receive a reply.
+	
+	\retval B_OK The operation succeeded, and the message is sent to the port.
+	\retval B_ERROR There was a general operation error.
+	\retval B_BAD_VALUE This looper is not yet running and therefore cannot
+		receive messages.	
+	\retval B_MISMATCHED_VALUES The \a handler is not associated with this
+		looper.
+	
+	\see PostMessage(uint32) if you want to send a message without data
+		members.
+	\see PostMessage(BMessage *) if you want to send a message with data
+		members.
+	\see PostMessage(uint32, BHandler *, BHandler *) if you want to send a
+		message without data to a specific handler, and request a reply.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Message Processing
+*/
+
+
+//! @{
+
+
+/*!
+	\fn void BLooper::DispatchMessage(BMessage *message, BHandler *handler)
+	\brief Dispatch a message to a handler. Override if there are messages that
+		you want to catch before they are sent to the handlers.
+	
+	This method is called by the message looping thread to dispatch a message
+	to \a handler. If you implement the BLooper class and your looper receives
+	messages that absolutely have to be processed by the looper instead of any
+	of the handlers, override this method. For example, the default
+	implementation catches B_QUIT_REQUESTED messages before they are sent to
+	the handlers, so that the looper will quit at those messages.
+	
+	You are discouraged from using this method to filter out any messages you
+	do not want to process. For this, there is a more generic method using
+	the BMessageFilter class. If you want to skip messages with certain
+	patterns, have a look at the AddCommonFilter() and SetCommonFilterList()
+	methods.
+	
+	If you do override this method, please remember to call the
+	DispatchMessage() method of the parent class.
+*/
+
+
+/*!
+	\fn void BLooper::MessageReceived(BMessage *msg)
+	\brief Process a message received by the internal handler of this looper.
+	
+	Reimplemented from BHandler::MessageReceived();
+*/
+
+
+/*!
+	\fn BMessage* BLooper::CurrentMessage() const
+	\brief Retrieve the current message.
+	
+	\attention Only call this method from within the thread that processes the
+		messages. It contains a pointer to the message that is currently being
+		handled. Due to the multithreaded nature of the operating system, this
+		method will not safely let you read the message that is being processed
+		by this handler from outside the context of the processing. If you do
+		want to use a message outside of the processing thread, have a look at
+		DetachCurrentMessage() to safely retrieve a message.
+	
+	\return A pointer to the message that is currently being processed. Note
+		that calling it from outside the thread that processes the message,
+		could give you a \c NULL pointer or an invalid pointer.
+*/
+
+
+/*!
+	\fn BMessage* BLooper::DetachCurrentMessage()
+	\brief Get ownership of the message currently being processed.
+	
+	Retrieve the current message and gain ownership of it. This means that the
+	message will not be deleted as soon as the looper is done processing it.
+	You can then use it for different purposes.
+	
+	\attention Only call this method from within the thread that processes the
+	messages. Due to the multithreaded nature of the operating system, calling
+	it from another thread is very likely to give you an invalid or a \c NULL
+	pointer.
+*/
+
+
+/*!
+	\fn BMessageQueue* BLooper::MessageQueue() const
+	\brief Get a pointer to the internal message queue of this looper.
+	
+	You can use this pointer to manipulate the message queue. Note that the
+	message that is being processed is already detached from this queue.
+	
+	\return A pointer to the internal message queue.
+*/
+
+
+/*!
+	\fn bool BLooper::IsMessageWaiting() const
+	\brief Check if there is a message waiting.
+	
+	\retval true There are still messages to be processed.
+	\retval false There is no message waiting.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Handler Management
+*/
+
+
+//! @{
+
+
+/*!
+	\fn void BLooper::AddHandler(BHandler* handler)
+	\brief Associate a \a handler to this looper.
+	
+	The \a handler will be associated to this looper. By default, the handler
+	in this looper will be chained to the supplied \a handler.
+	
+	\param handler The handler to associate with this looper. If the handler is
+		already associated to another looper, the operation will fail silently.
+		Check beforehand if you cannot be sure that the \a handler is
+		unassociated.
+	
+	\see RemoveHandler()
+*/
+
+
+/*!
+	\fn bool BLooper::RemoveHandler(BHandler* handler)
+	\brief Disassociate a \a handler from this looper.
+	
+	If the handler is disassociated, it can be reassociated to another looper.
+	
+	\retval true The \a handler has been removed from this looper.
+	\retval false The \a handler was invalid. or the handler was not
+		associated to this looper.
+	\see AddHandler()
+*/
+
+
+/*!
+	\fn int32 BLooper::CountHandlers() const
+	\brief Get the number of handlers associated with this looper.
+	
+	\see HandlerAt(), IndexOf()
+*/
+
+
+/*!
+	\fn BHandler* BLooper::HandlerAt(int32 index) const
+	\brief Get the handler at an \a index of the list of associated handlers.
+	
+	\return A pointer to the handler at that \a index, or \c NULL if the
+		\a index is out of range.
+
+	\see CountHandlers(), IndexOf()
+*/
+
+
+/*!
+	\fn int32 BLooper::IndexOf(BHandler* handler) const
+	\brief Get the index of the \a handler that is in the associated handler
+		list.
+	
+	\return If the \a handler is not in the list, this method will return -1.
+		Else, you will get the index of the handler in the list.
+*/
+
+
+/*!
+	\fn BHandler* BLooper::PreferredHandler() const
+	\brief Get the preferred handler.
+	
+	\return A pointer to the preferred handler, or \c NULL if none is set.
+	\see SetPreferredHandler()
+*/
+
+
+/*!
+	\fn void BLooper::SetPreferredHandler(BHandler* handler)
+	\brief Set a preferred handler.
+	
+	If messages are posted to this looper using one of the PostMessage()
+	methods without a specific BHandler argument, the messages will be handled
+	by the looper itself (since a looper is a subclass of BHandler, this is
+	perfectly possible). If you want to override that behavior, you should set
+	a preferred handler. This handler will be called if incoming messages do
+	not ask to be directly passed on to a specific handler.
+	
+	\param handler The preferred handler you want undesignated messages to be
+		handled by. If you want to unset the preferred handler, pass \c NULL.
+		If the supplied \a handler is not associated with this looper, this
+		call will fail silently and the current preferred handler will be unset.
+	\see PreferredHandler()
+*/
+
+
+//! @}
+
+
+/*!
+	\name Loop Control
+*/
+
+
+//! @{
+
+
+/*!
+	\fn thread_id BLooper::Run()
+	\brief Start the event loop.
+	
+	After the looper has been constructed, it needs to be started using this
+	method. A thread will be spawned, which will receive messages.
+	
+	Make sure the looper is not yet running before you call this method.
+	
+	\return A (positive) thread id if spawning the thread succeeded, or an
+		error code.
+*/
+
+
+/*!
+	\fn void BLooper::Quit()
+	\brief Hook method that is called after a \c B_QUIT_REQUESTED message.
+	
+	If you want to quit and delete the looper, do \b not call this method
+	directly, rather, post a \c B_QUIT_REQUESTED message to the looper.
+	
+	Override this method if your subclass needs to perform specific clean-up
+	tasks. Remember to call the base class implementation when you're done.
+	
+	\attention You will not have to delete the looper object, if a looper quits
+		it will delete itself.
+*/
+
+
+/*!
+	\fn bool BLooper::QuitRequested()
+	\brief Hook method that is called during a \c B_QUIT_REQUESTED message.
+	
+	This hook function is called by the looper thread when a
+	\c B_QUIT_REQUESTED is received. The default implementation always accepts
+	the message, but if your subclass needs a special condition to be met
+	before actually accepting a quit message, you can test for that condition
+	in this hook method. A good example is a window (which is a derivative of
+	BLooper), which contains a modified document. The condition may be that a
+	modal dialog requesting a path of action is closed.
+	
+	\retval true The looper can be quit and destroyed.
+	\retval false Do not accept the quit message and continue processing
+		messages.
+*/
+
+
+/*!
+	\fn bool BLooper::Lock()
+	\brief Lock the looper. 
+	
+	For most operations involving the internal data of the looper, you need to
+	hold the lock. Each looper implements a global lock, which you can use to
+	perform operations on internal data in a thread-safe manner.
+	
+	Do not forget to pair each Lock() request with an Unlock() request. Lock()
+	requests can be stacked, which means that recursively locking a looper from
+	a thread that actually holds the lock, will not cause a deadlock. See
+	BLocker for more information on locking internals.
+	
+	\retval true The locking request succeeded.
+	\retval false The locking request could not be completed. There are a
+		variety of reasons for this to happen, for example when the looper is
+		destroyed.
+	\see Unlock(), LockWithTimeout(), IsLocked()
+*/
+
+
+/*!
+	\fn void BLooper::Unlock()
+	\brief Unlock a locked looper.
+	
+	Use this method paired with Lock() calls, to release a lock. Make sure that
+	this method is only called on a locked looper.
+	
+	\see Lock(), LockWithTimeout(), IsLocked()
+*/
+
+
+/*!
+	\fn bool BLooper::IsLocked() const
+	\brief Check if a looper is locked.
+	
+	\retval true The looper is locked.
+	\retval false The looper is not locked, or the looper has been deleted.
+	\see Lock(), Unlock(), LockWithTimeout()
+*/
+
+
+/*!
+	\fn status_t BLooper::LockWithTimeout(bigtime_t timeout)
+	\brief Lock a looper with a \a timeout.
+	
+	This method locks the looper like Lock(), but if the locking request does
+	not succeed within the provided \a timeout, the method will return.
+	
+	\param timeout The maximum time to wait for the lock request to succeed.
+	
+	\retval B_OK The lock is acquired.
+	\retval B_BAD_VALUE The looper has been destroyed.
+	\retval "other errors" There was an error acquiring the lock.
+	\see Lock(), Unlock(), IsLocked()
+*/
+
+
+/*!
+	\fn thread_id BLooper::Thread() const
+	\brief Return the thread id of the internal message looper thread.
+	
+	If the looper is not yet running, this method will return 0.
+	
+	\see Run()
+*/
+
+
+/*!
+	\fn team_id BLooper::Team() const
+	\brief Return the team id in which this looper exists.
+*/
+
+
+/*!
+	\fn BLooper* BLooper::LooperForThread(thread_id thread)
+	\brief Static method to retrieve a BLooper for a specified \a thread.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Loop debugging
+	
+	These methods may aid you in debugging problems when they occur, but do not
+	use these in actual production code. These methods are unrealiable because
+	they are not thread-safe, and as such are only useful in specific debugging
+	situations. Handle with care.
+*/
+
+
+//! @{
+	
+
+/*!
+	\fn thread_id BLooper::LockingThread() const
+	\brief Return the thread id of the thread that currenty holds the lock.
+*/
+
+
+/*!
+	\fn int32 BLooper::CountLocks() const
+	\brief Return the number of recursive locks that are currently being held
+	on this looper
+*/
+
+
+/*!
+	\fn int32 BLooper::CountLockRequests() const
+	\brief Return the number of pending locks.
+*/
+
+
+/*!
+	\fn sem_id BLooper::Sem() const
+	\brief Return the id of the semaphore that is used to lock this looper.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Scripting Functions
+*/
+
+
+//! @{
+	
+
+/*!
+	\fn BHandler* BLooper::ResolveSpecifier(BMessage* msg, int32 index,
+		BMessage* specifier, int32 form, const char* property)
+	\brief Undocumented.
+*/
+
+
+/*!
+	\fn status_t BLooper::GetSupportedSuites(BMessage* data)
+	\brief Undocumented.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Looper Message Filters
+	Note that filters added with these methods will be applied to all
+	associated handlers. Have a look at the filtering methods of the BHandler
+	class to see how filters can be applied to the inherited handler of this
+	looper specifically.
+*/
+
+
+//! @{
+
+
+/*!
+	\fn void BLooper::AddCommonFilter(BMessageFilter* filter)
+	\brief Add a common filter to the list of filters that are applied to all
+		incoming messages.
+		
+	Filters can only be applied once, so they cannot be shared between loopers,
+	a handler and a looper or between two handlers.
+	
+	The \a filter is not copied; rather a pointer is stored. Keep the \a filter
+	alive as long as it is used by a looper.
+	
+	\see RemoveCommonFilter(), SetCommonFilterList(), CommonFilterList()
+*/
+
+
+/*!
+	\fn bool BLooper::RemoveCommonFilter(BMessageFilter* filter)
+	\brief Remove a \a filter from the common message filter list.
+	
+	Note that this will not free the memory used by the \a filter, so you
+	should dispose of it yourself. 
+	
+	\see AddCommonFilter(), SetCommonFilterList(), CommonFilterList()
+*/
+
+
+/*!
+	\fn void BLooper::SetCommonFilterList(BList* filters)
+	\brief Set a new list of \a filters that need to be applied to all
+		incoming messages.
+	
+	You are responsible for validating that all the items in the list of
+	\a filters are actual filters. The old list is discarded; all the filters
+	are \b destroyed.
+	
+	Note that filters can only be applied to one looper or handler. If any
+	of the filters is already associated with another one, this call will fail.
+	
+	\see AddCommonFilter(), RemoveCommonFilter(), CommonFilterList()
+*/
+
+
+/*!
+	\fn BList* BLooper::CommonFilterList() const
+	\brief Return a list of filters applied to all incoming messages.
+	
+	\return A pointer to the internal filter list, or \c NULL if such a list
+		has not yet been created. Please note that you should use the internal
+		list management functions to manipulate the internal filter list, in
+		order to maintain internal consistency.
+	\see AddCommonFilter(), RemoveCommonFilter(), SetCommonFilterList()
+*/
+
+//! @}
+
+
+/*!
+	\fn status_t BLooper::Perform(perform_code d, void* arg)
+	\brief Internal method.
+*/
+
+
+/*!
+	\fn BMessage* BLooper::MessageFromPort(bigtime_t timeout)
+	\brief Hook function to retrieve a message from the looper's port.
+	
+	The default implementation is called by the internal message looping thread
+	and retrieves the next message from the port that belongs to this looper.
+	
+	If you use a looper in a context where it might receive messages from other
+	sources, you can override this method in order to insert these methods into
+	the message processing. Note that any messages that are returned by this
+	method will be deleted by this looper, so make sure you have ownership of
+	the message. If you override this method, remember to call the base
+	implementation every now and then, in order to retrieve the messages
+	arriving at the default port.
+*/
+
+
+	
\ No newline at end of file



From axeld at mail.berlios.de  Sat Mar  8 16:28:33 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 8 Mar 2008 16:28:33 +0100
Subject: [Haiku-commits] r24305 - in haiku/trunk/src: servers/app
	tests/servers/app
Message-ID: <200803081528.m28FSXB9006289@sheep.berlios.de>

Author: axeld
Date: 2008-03-08 16:28:31 +0100 (Sat, 08 Mar 2008)
New Revision: 24305
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24305&view=rev

Removed:
   haiku/trunk/src/servers/app/DebugInfoManager.cpp
   haiku/trunk/src/servers/app/DebugInfoManager.h
Modified:
   haiku/trunk/src/servers/app/DefaultDecorator.cpp
   haiku/trunk/src/servers/app/Desktop.cpp
   haiku/trunk/src/servers/app/DrawState.h
   haiku/trunk/src/servers/app/Jamfile
   haiku/trunk/src/servers/app/OffscreenWindow.cpp
   haiku/trunk/src/servers/app/ProfileMessageSupport.cpp
   haiku/trunk/src/servers/app/ServerApp.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/View.cpp
   haiku/trunk/src/servers/app/View.h
   haiku/trunk/src/servers/app/Window.cpp
   haiku/trunk/src/servers/app/Window.h
   haiku/trunk/src/servers/app/Workspace.cpp
   haiku/trunk/src/servers/app/WorkspacesView.cpp
   haiku/trunk/src/tests/servers/app/Jamfile
Log:
* Removed severly outdated DebugInfoManager.
* More "layer" cleanup.


Deleted: haiku/trunk/src/servers/app/DebugInfoManager.cpp

Deleted: haiku/trunk/src/servers/app/DebugInfoManager.h

Modified: haiku/trunk/src/servers/app/DefaultDecorator.cpp
===================================================================
--- haiku/trunk/src/servers/app/DefaultDecorator.cpp	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/DefaultDecorator.cpp	2008-03-08 15:28:31 UTC (rev 24305)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -7,7 +7,7 @@
  *		Stephan A?mus <superstippi at gmx.de>
  */
 
-/**	Default and fallback decorator for the app_server - the yellow tabs */
+/*!	Default and fallback decorator for the app_server - the yellow tabs */
 
 
 #include "DefaultDecorator.h"
@@ -464,7 +464,7 @@
 {
 	STRACE(("DefaultDecorator: Get Footprint\n"));
 	// This function calculates the decorator's footprint in coordinates
-	// relative to the layer. This is most often used to set a WindowLayer
+	// relative to the view. This is most often used to set a Window
 	// object's visible region.
 	if (!region)
 		return;
@@ -487,7 +487,7 @@
 	if (fLook == B_DOCUMENT_WINDOW_LOOK) {
 		// include the rectangular resize knob on the bottom right
 		region->Include(BRect(fFrame.right - 13.0f, fFrame.bottom - 13.0f,
-							  fFrame.right, fFrame.bottom));
+			fFrame.right, fFrame.bottom));
 	}
 }
 

Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2008-03-08 15:28:31 UTC (rev 24305)
@@ -244,7 +244,7 @@
 		window = fDesktop->WindowAt(where);
 
 	if (window != NULL) {
-		// dispatch event in the window layers
+		// dispatch event to the window
 		switch (message->what) {
 			case B_MOUSE_DOWN:
 				window->MouseDown(message, where, &viewToken);
@@ -758,7 +758,7 @@
 
 		// look for desktop background view, and update its background color
 		// TODO: is there a better way to do this?
-		View* view = window->TopLayer();
+		View* view = window->TopView();
 		if (view != NULL)
 			view = view->FirstChild();
 
@@ -1661,7 +1661,7 @@
 	}
 
 	if (window->HasWorkspacesViews()) {
-		// find workspaces layer in view hierarchy
+		// find workspaces views in view hierarchy
 		window->FindWorkspacesViews(fWorkspacesViews);
 	}
 

Modified: haiku/trunk/src/servers/app/DrawState.h
===================================================================
--- haiku/trunk/src/servers/app/DrawState.h	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/DrawState.h	2008-03-08 15:28:31 UTC (rev 24305)
@@ -162,7 +162,7 @@
 		bool				fFontAliasing;
 
 		// This is not part of the normal state stack.
-		// Layer will update it in PushState/PopState.
+		// The view will update it in PushState/PopState.
 		// A BView can have a flag "B_SUBPIXEL_PRECISE",
 		// I never knew what it does on R5, but I can use
 		// it in Painter to actually draw stuff with

Modified: haiku/trunk/src/servers/app/Jamfile
===================================================================
--- haiku/trunk/src/servers/app/Jamfile	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/Jamfile	2008-03-08 15:28:31 UTC (rev 24305)
@@ -17,7 +17,6 @@
 	CursorData.cpp
 	CursorManager.cpp
 	CursorSet.cpp
-	DebugInfoManager.cpp
 	DecorManager.cpp
 	Decorator.cpp
 	DefaultDecorator.cpp

Modified: haiku/trunk/src/servers/app/OffscreenWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/OffscreenWindow.cpp	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/OffscreenWindow.cpp	2008-03-08 15:28:31 UTC (rev 24305)
@@ -14,7 +14,6 @@
 #include <Debug.h>
 
 #include "BitmapHWInterface.h"
-#include "DebugInfoManager.h"
 #include "DrawingEngine.h"
 #include "ServerBitmap.h"
 
@@ -41,7 +40,7 @@
 OffscreenWindow::~OffscreenWindow()
 {
 	fHWInterface->LockExclusiveAccess();
-	// Unlike normal Layers, we own the DrawingEngine instance
+	// Unlike normal windows, we own the DrawingEngine instance
 	delete GetDrawingEngine();
 	fHWInterface->Shutdown();
 	fHWInterface->UnlockExclusiveAccess();

Modified: haiku/trunk/src/servers/app/ProfileMessageSupport.cpp
===================================================================
--- haiku/trunk/src/servers/app/ProfileMessageSupport.cpp	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/ProfileMessageSupport.cpp	2008-03-08 15:28:31 UTC (rev 24305)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007: string = ""; break; Haiku: string = ""; break; Inc. All rights reserved.
+ * Copyright 2007-2008, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -215,7 +215,7 @@
 		case AS_LAYER_RESIZE: string = "AS_LAYER_RESIZE"; break;
 		case AS_LAYER_DRAW: string = "AS_LAYER_DRAW"; break;
 
-		// View/Layer definitions
+		// View definitions
 		case AS_LAYER_GET_COORD: string = "AS_LAYER_GET_COORD"; break;
 		case AS_LAYER_SET_FLAGS: string = "AS_LAYER_SET_FLAGS"; break;
 		case AS_LAYER_SET_ORIGIN: string = "AS_LAYER_SET_ORIGIN"; break;

Modified: haiku/trunk/src/servers/app/ServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.cpp	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/ServerApp.cpp	2008-03-08 15:28:31 UTC (rev 24305)
@@ -21,7 +21,6 @@
 #include "CursorManager.h"
 #include "CursorSet.h"
 #include "Desktop.h"
-#include "DebugInfoManager.h"
 #include "DecorManager.h"
 #include "DrawingEngine.h"
 #include "EventStream.h"
@@ -132,10 +131,8 @@
 ServerApp::~ServerApp()
 {
 	STRACE(("*ServerApp %s:~ServerApp()\n", Signature()));
+	ASSERT(fQuitting);
 
-	if (!fQuitting)
-		CRITICAL("ServerApp: destructor called after Run()!\n");
-
 	// quit all server windows
 
 	fWindowListLock.Lock();

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-08 15:28:31 UTC (rev 24305)
@@ -24,7 +24,6 @@
 #include "ServerWindow.h"
 
 #include "AppServer.h"
-#include "DebugInfoManager.h"
 #include "Desktop.h"
 #include "DrawingEngine.h"
 #include "HWInterface.h"
@@ -345,7 +344,7 @@
 }
 
 
-//! Forces the window layer to update its decorator
+//! Forces the window to update its decorator
 void
 ServerWindow::ReplaceDecorator()
 {
@@ -557,28 +556,28 @@
 	link.Read<rgb_color>(&viewColor);
 	link.Read<int32>(&parentToken);
 
-	STRACE(("ServerWindow(%s)::_CreateView()-> layer %s, token %ld\n",
+	STRACE(("ServerWindow(%s)::_CreateView()-> view %s, token %ld\n",
 		fTitle, name, token));
 
-	View* newLayer;
+	View* newView;
 
 	if ((flags & kWorkspacesViewFlag) != 0) {
-		newLayer = new (nothrow) WorkspacesView(frame, scrollingOffset, name,
+		newView = new (nothrow) WorkspacesView(frame, scrollingOffset, name,
 			token, resizeMask, flags);
 	} else {
-		newLayer = new (nothrow) View(frame, scrollingOffset, name, token,
+		newView = new (nothrow) View(frame, scrollingOffset, name, token,
 			resizeMask, flags);
 	}
 
 	free(name);
 
-	if (newLayer == NULL)
+	if (newView == NULL)
 		return NULL;
 
 	// there is no way of setting this, other than manually :-)
-	newLayer->SetViewColor(viewColor);
-	newLayer->SetHidden(hidden);
-	newLayer->SetEventMask(eventMask, eventOptions);
+	newView->SetViewColor(viewColor);
+	newView->SetHidden(hidden);
+	newView->SetEventMask(eventMask, eventOptions);
 
 	if (eventMask != 0 || eventOptions != 0) {
 //		fDesktop->UnlockSingleWindow();
@@ -586,7 +585,7 @@
 fDesktop->UnlockAllWindows();
 		// TODO: possible deadlock
 		fDesktop->EventDispatcher().AddListener(EventTarget(),
-			newLayer->Token(), eventMask, eventOptions);
+			newView->Token(), eventMask, eventOptions);
 fDesktop->LockAllWindows();
 //		fDesktop->UnlockAllWindows();
 //		fDesktop->LockSingleWindow();
@@ -596,27 +595,27 @@
 	DesktopSettings settings(fDesktop);
 	ServerFont font;
 	settings.GetDefaultPlainFont(font);
-	newLayer->CurrentState()->SetFont(font);
+	newView->CurrentState()->SetFont(font);
 
 	if (_parent) {
 		View *parent;
 		if (App()->ViewTokens().GetToken(parentToken, B_HANDLER_TOKEN,
 				(void**)&parent) != B_OK
 			|| parent->Window()->ServerWindow() != this) {
-			CRITICAL("View token not found!\n");
+			debug_printf("View token not found!\n");
 			parent = NULL;
 		}
 
 		*_parent = parent;
 	}
 
-	return newLayer;
+	return newView;
 }
 
 
 /*!
 	Dispatches all window messages, and those view messages that
-	don't need a valid fCurrentView (ie. layer creation).
+	don't need a valid fCurrentView (ie. view creation).
 */
 void
 ServerWindow::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
@@ -1127,7 +1126,7 @@
 					(void**)&current) != B_OK
 				|| current->Window()->ServerWindow() != this) {
 				// ToDo: if this happens, we probably want to kill the app and clean up
-				fprintf(stderr, "ServerWindow %s: Message AS_SET_CURRENT_LAYER: layer not found, token %ld\n", fTitle, token);
+				fprintf(stderr, "ServerWindow %s: Message AS_SET_CURRENT_LAYER: view not found, token %ld\n", fTitle, token);
 				current = NULL;
 			} else {
 				DTRACE(("ServerWindow %s: Message AS_SET_CURRENT_LAYER: %s, token %ld\n", fTitle, current->Name(), token));
@@ -1148,7 +1147,7 @@
 			}
 
 			_SetCurrentView(_CreateView(link, NULL));
-			fWindow->SetTopLayer(fCurrentView);
+			fWindow->SetTopView(fCurrentView);
 			break;
 		}
 
@@ -1157,11 +1156,11 @@
 			STRACE(("ServerWindow %s: Message AS_LAYER_CREATE: View name: %s\n", fTitle, fCurrentView->Name()));
 
 			View* parent = NULL;
-			View* newLayer = _CreateView(link, &parent);
-			if (parent != NULL && newLayer != NULL)
-				parent->AddChild(newLayer);
+			View* newView = _CreateView(link, &parent);
+			if (parent != NULL && newView != NULL)
+				parent->AddChild(newView);
 			else
-				fprintf(stderr, "ServerWindow %s: Message AS_LAYER_CREATE: parent or newLayer NULL!!\n", fTitle);
+				fprintf(stderr, "ServerWindow %s: Message AS_LAYER_CREATE: parent or newView NULL!!\n", fTitle);
 			break;
 		}
 
@@ -2890,9 +2889,7 @@
 				quitLoop = true;
 
 				// ServerWindow's destructor takes care of pulling this object off the desktop.
-				if (!fWindow->IsHidden())
-					CRITICAL("ServerWindow: a window must be hidden before it's deleted\n");
-				
+				ASSERT(fWindow->IsHidden());				
 				break;
 			}
 
@@ -3132,12 +3129,12 @@
 
 
 void
-ServerWindow::_SetCurrentView(View* layer)
+ServerWindow::_SetCurrentView(View* view)
 {
-	if (fCurrentView == layer)
+	if (fCurrentView == view)
 		return;
 
-	fCurrentView = layer;
+	fCurrentView = view;
 	fCurrentDrawingRegionValid = false;
 	_UpdateDrawState(fCurrentView);
 
@@ -3166,17 +3163,17 @@
 
 
 void
-ServerWindow::_UpdateDrawState(View* layer)
+ServerWindow::_UpdateDrawState(View* view)
 {
 	// switch the drawing state
 	// TODO: is it possible to scroll a view while it
 	// is being drawn? probably not... otherwise the
 	// "offsets" passed below would need to be updated again
 	DrawingEngine* drawingEngine = fWindow->GetDrawingEngine();
-	if (layer && drawingEngine) {
+	if (view && drawingEngine) {
 		BPoint p(0, 0);
-		layer->ConvertToScreenForDrawing(&p);
-		drawingEngine->SetDrawState(layer->CurrentState(), p.x, p.y);
+		view->ConvertToScreenForDrawing(&p);
+		drawingEngine->SetDrawState(view->CurrentState(), p.x, p.y);
 	}
 }
 

Modified: haiku/trunk/src/servers/app/View.cpp
===================================================================
--- haiku/trunk/src/servers/app/View.cpp	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/View.cpp	2008-03-08 15:28:31 UTC (rev 24305)
@@ -87,7 +87,7 @@
 	fResizeMode(resizeMode),
 	fFlags(flags),
 
-	// ViewLayers start visible by default
+	// Views start visible by default
 	fHidden(false),
 	fVisible(true),
 	fBackgroundDirty(true),
@@ -123,17 +123,17 @@
 
 	delete fDrawState;
 
-//	if (fWindow && this == fWindow->TopLayer())
-//		fWindow->SetTopLayer(NULL);
+//	if (fWindow && this == fWindow->TopView())
+//		fWindow->SetTopView(NULL);
 
 	if (fCursor)
 		fCursor->Release();
 
 	// iterate over children and delete each one
-	View* layer = fFirstChild;
-	while (layer) {
-		View* toast = layer;
-		layer = layer->fNextSibling;
+	View* view = fFirstChild;
+	while (view) {
+		View* toast = view;
+		view = view->fNextSibling;
 		delete toast;
 	}
 }
@@ -167,7 +167,7 @@
 	fWindow = window;
 
 	// an ugly hack to detect the desktop background
-	if (window->Feel() == kDesktopWindowFeel && Parent() == TopLayer())
+	if (window->Feel() == kDesktopWindowFeel && Parent() == TopView())
 		fIsDesktopBackground = true;
 
 	// insert view into local token space
@@ -200,36 +200,36 @@
 
 
 void
-View::AddChild(View* layer)
+View::AddChild(View* view)
 {
-	if (layer->fParent) {
+	if (view->fParent) {
 		printf("View::AddChild() - View already has a parent\n");
 		return;
 	}
 
-	layer->fParent = this;
+	view->fParent = this;
 
 	if (!fLastChild) {
 		// no children yet
-		fFirstChild = layer;
+		fFirstChild = view;
 	} else {
-		// append layer to formerly last child
-		fLastChild->fNextSibling = layer;
-		layer->fPreviousSibling = fLastChild;
+		// append view to formerly last child
+		fLastChild->fNextSibling = view;
+		view->fPreviousSibling = fLastChild;
 	}
-	fLastChild = layer;
+	fLastChild = view;
 
-	layer->UpdateVisibleDeep(fVisible);
+	view->UpdateVisibleDeep(fVisible);
 
-	if (layer->IsVisible())
+	if (view->IsVisible())
 		RebuildClipping(false);
 
 	if (fWindow) {
-		layer->AttachedToWindow(fWindow);
+		view->AttachedToWindow(fWindow);
 
-		if (layer->IsVisible()) {
+		if (view->IsVisible()) {
 			// trigger redraw
-			IntRect clippedFrame = layer->Frame();
+			IntRect clippedFrame = view->Frame();
 			ConvertToVisibleInTopView(&clippedFrame);
 			BRegion* dirty = fWindow->GetRegion();
 			if (dirty) {
@@ -243,37 +243,37 @@
 
 
 bool
-View::RemoveChild(View* layer)
+View::RemoveChild(View* view)
 {
-	if (layer->fParent != this) {
+	if (view->fParent != this) {
 		printf("View::RemoveChild(%p - %s) - View is not child of "
-			"this (%p) layer!\n", layer, layer ? layer->Name() : NULL, this);
+			"this (%p) view!\n", view, view ? view->Name() : NULL, this);
 		return false;
 	}
 
-	layer->fParent = NULL;
+	view->fParent = NULL;
 
-	if (fLastChild == layer)
-		fLastChild = layer->fPreviousSibling;
-		// layer->fNextSibling would be NULL
+	if (fLastChild == view)
+		fLastChild = view->fPreviousSibling;
+		// view->fNextSibling would be NULL
 
-	if (fFirstChild == layer )
-		fFirstChild = layer->fNextSibling;
-		// layer->fPreviousSibling would be NULL
+	if (fFirstChild == view )
+		fFirstChild = view->fNextSibling;
+		// view->fPreviousSibling would be NULL
 
-	// connect child before and after layer
-	if (layer->fPreviousSibling)
-		layer->fPreviousSibling->fNextSibling = layer->fNextSibling;
+	// connect child before and after view
+	if (view->fPreviousSibling)
+		view->fPreviousSibling->fNextSibling = view->fNextSibling;
 
-	if (layer->fNextSibling)
-		layer->fNextSibling->fPreviousSibling = layer->fPreviousSibling;
+	if (view->fNextSibling)
+		view->fNextSibling->fPreviousSibling = view->fPreviousSibling;
 
-	// layer has no siblings anymore
-	layer->fPreviousSibling = NULL;
-	layer->fNextSibling = NULL;
+	// view has no siblings anymore
+	view->fPreviousSibling = NULL;
+	view->fNextSibling = NULL;
 
-	if (layer->IsVisible()) {
-		Overlay* overlay = layer->_Overlay();
+	if (view->IsVisible()) {
+		Overlay* overlay = view->_Overlay();
 		if (overlay != NULL)
 			overlay->Hide();
 
@@ -281,11 +281,11 @@
 	}
 
 	if (fWindow) {
-		layer->DetachedFromWindow();
+		view->DetachedFromWindow();
 
-		if (fVisible && layer->IsVisible()) {
+		if (fVisible && view->IsVisible()) {
 			// trigger redraw
-			IntRect clippedFrame = layer->Frame();
+			IntRect clippedFrame = view->Frame();
 			ConvertToVisibleInTopView(&clippedFrame);
 			BRegion* dirty = fWindow->GetRegion();
 			if (dirty) {
@@ -301,13 +301,13 @@
 
 
 View*
-View::TopLayer()
+View::TopView()
 {
 	// returns the top level view of the hirarchy,
 	// it doesn't have to be the top level of a window
 
 	if (fParent)
-		return fParent->TopLayer();
+		return fParent->TopView();
 
 	return this;
 }
@@ -407,9 +407,9 @@
 		return NULL;
 
 	for (View* child = FirstChild(); child; child = child->NextSibling()) {
-		View* layer = child->ViewAt(where);
-		if (layer != NULL)
-			return layer;
+		View* view = child->ViewAt(where);
+		if (view != NULL)
+			return view;
 	}
 
 	return this;
@@ -1469,7 +1469,7 @@
 
 
 void
-View::AddTokensForLayersInRegion(BMessage* message, BRegion& region,
+View::AddTokensForViewsInRegion(BMessage* message, BRegion& region,
 	BRegion* windowContentClipping)
 {
 	if (!fVisible)
@@ -1479,14 +1479,14 @@
 		message->AddInt32("_token", fToken);
 
 	for (View* child = FirstChild(); child; child = child->NextSibling()) {
-		child->AddTokensForLayersInRegion(message, region,
+		child->AddTokensForViewsInRegion(message, region,
 			windowContentClipping);
 	}
 }
 
 
 void
-View::AddTokensForLayersInRegion(BPrivate::PortLink& link, BRegion& region,
+View::AddTokensForViewsInRegion(BPrivate::PortLink& link, BRegion& region,
 	BRegion* windowContentClipping)
 {
 	if (!fVisible)
@@ -1501,7 +1501,7 @@
 		link.Attach<int32>(fToken);
 
 	for (View* child = FirstChild(); child; child = child->NextSibling()) {
-		child->AddTokensForLayersInRegion(link, region, windowContentClipping);
+		child->AddTokensForViewsInRegion(link, region, windowContentClipping);
 	}
 }
 

Modified: haiku/trunk/src/servers/app/View.h
===================================================================
--- haiku/trunk/src/servers/app/View.h	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/View.h	2008-03-08 15:28:31 UTC (rev 24305)
@@ -70,7 +70,7 @@
 			float			Scale() const;
 
 			void			SetUserClipping(const BRegion* region);
-				// region is expected in layer coordinates
+				// region is expected in view coordinates
 
 			// converts the given frame up the view hierarchy and
 			// clips to each views bounds
@@ -81,8 +81,8 @@
 			::Window*		Window() const { return fWindow; }
 
 			// tree stuff
-			void			AddChild(View* layer);
-			bool			RemoveChild(View* layer);
+			void			AddChild(View* view);
+			bool			RemoveChild(View* view);
 
 	inline	View*			Parent() const
 								{ return fParent; }
@@ -96,7 +96,7 @@
 	inline	View*			NextSibling() const
 								{ return fNextSibling; }
 
-			View*			TopLayer();
+			View*			TopView();
 
 			uint32			CountChildren(bool deep = false) const;
 			void			CollectTokensForChildren(BList* tokenMap) const;
@@ -215,11 +215,11 @@
 			bool			IsDesktopBackground() const
 								{ return fIsDesktopBackground; }
 
-			void			AddTokensForLayersInRegion(BMessage* message,
+			void			AddTokensForViewsInRegion(BMessage* message,
 								BRegion& region,
 								BRegion* windowContentClipping);
 
-			void			AddTokensForLayersInRegion(BPrivate::PortLink& link,
+			void			AddTokensForViewsInRegion(BPrivate::PortLink& link,
 								BRegion& region,
 								BRegion* windowContentClipping);
 

Modified: haiku/trunk/src/servers/app/Window.cpp
===================================================================
--- haiku/trunk/src/servers/app/Window.cpp	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/Window.cpp	2008-03-08 15:28:31 UTC (rev 24305)
@@ -12,7 +12,6 @@
 
 #include "Window.h"
 
-#include "DebugInfoManager.h"
 #include "Decorator.h"
 #include "DecorManager.h"
 #include "Desktop.h"
@@ -38,16 +37,16 @@
 
 
 // Toggle debug output
-//#define DEBUG_WINDOW_LAYER
-//#define DEBUG_WINDOW_LAYER_CLICK
+//#define DEBUG_WINDOW
+//#define DEBUG_WINDOW_CLICK
 
-#ifdef DEBUG_WINDOW_LAYER
+#ifdef DEBUG_WINDOW
 #	define STRACE(x) printf x
 #else
 #	define STRACE(x) ;
 #endif
 
-#ifdef DEBUG_WINDOW_LAYER_CLICK
+#ifdef DEBUG_WINDOW_CLICK
 #	define STRACE_CLICK(x) printf x
 #else
 #	define STRACE_CLICK(x) ;
@@ -100,7 +99,7 @@
 	fActivateOnMouseUp(false),
 
 	fDecorator(NULL),
-	fTopLayer(NULL),
+	fTopView(NULL),
 	fWindow(window),
 	fDrawingEngine(drawingEngine),
 	fDesktop(window->Desktop()),
@@ -161,7 +160,7 @@
 			fDesktop->ScreenAt(0)->GetMode(width, height,
 				colorSpace, frequency);
 // TODO: MOVE THIS AWAY!!! ResizeBy contains calls to virtual methods!
-// Also, there is no TopLayer()!
+// Also, there is no TopView()!
 			fFrame.OffsetTo(B_ORIGIN);
 //			ResizeBy(width - frame.Width(), height - frame.Height(), NULL);
 		}
@@ -176,10 +175,10 @@
 
 Window::~Window()
 {
-	if (fTopLayer)
-		fTopLayer->DetachedFromWindow();
+	if (fTopView)
+		fTopView->DetachedFromWindow();
 
-	delete fTopLayer;
+	delete fTopView;
 	delete fDecorator;
 }
 
@@ -307,9 +306,9 @@
 	if (fDecorator)
 		fDecorator->MoveBy(x, y);
 
-	if (fTopLayer != NULL) {
-		fTopLayer->MoveBy(x, y, NULL);
-		fTopLayer->UpdateOverlay();
+	if (fTopView != NULL) {
+		fTopView->MoveBy(x, y, NULL);
+		fTopView->UpdateOverlay();
 	}
 
 	// the desktop will take care of dirty regions
@@ -366,9 +365,9 @@
 //}
 	}
 
-	if (fTopLayer != NULL) {
-		fTopLayer->ResizeBy(x, y, dirtyRegion);
-		fTopLayer->UpdateOverlay();
+	if (fTopView != NULL) {
+		fTopView->ResizeBy(x, y, dirtyRegion);
+		fTopView->UpdateOverlay();
 	}
 
 //if (dirtyRegion)
@@ -390,7 +389,7 @@
 	// this is executed in ServerWindow with the Readlock
 	// held
 
-	if (!view || view == fTopLayer || (dx == 0 && dy == 0))
+	if (!view || view == fTopView || (dx == 0 && dy == 0))
 		return;
 
 	BRegion* dirty = fRegionPool.GetRegion();
@@ -485,26 +484,26 @@
 
 
 void
-Window::SetTopLayer(View* topLayer)
+Window::SetTopView(View* topView)
 {
-	fTopLayer = topLayer;
+	fTopView = topView;
 
-	if (fTopLayer) {
-		// the top layer is special, it has a coordinate system
+	if (fTopView) {
+		// the top view is special, it has a coordinate system
 		// as if it was attached directly to the desktop, therefor,
-		// the coordinate conversion through the layer tree works
-		// as expected, since the top layer has no "parent" but has
+		// the coordinate conversion through the view tree works
+		// as expected, since the top view has no "parent" but has
 		// fFrame as if it had
 
-		// make sure the location of the top layer on screen matches ours
-		fTopLayer->MoveBy(fFrame.left - fTopLayer->Frame().left,
-			fFrame.top - fTopLayer->Frame().top, NULL);
+		// make sure the location of the top view on screen matches ours
+		fTopView->MoveBy(fFrame.left - fTopView->Frame().left,
+			fFrame.top - fTopView->Frame().top, NULL);
 
-		// make sure the size of the top layer matches ours
-		fTopLayer->ResizeBy(fFrame.Width() - fTopLayer->Frame().Width(),
-			fFrame.Height() - fTopLayer->Frame().Height(), NULL);
+		// make sure the size of the top view matches ours
+		fTopView->ResizeBy(fFrame.Width() - fTopView->Frame().Width(),
+			fFrame.Height() - fTopView->Frame().Height(), NULL);
 
-		fTopLayer->AttachedToWindow(this);
+		fTopView->AttachedToWindow(this);
 	}
 }
 
@@ -512,7 +511,7 @@
 View*
 Window::ViewAt(const BPoint& where)
 {
-	return fTopLayer->ViewAt(where);
+	return fTopView->ViewAt(where);
 }
 
 
@@ -541,7 +540,7 @@
 
 
 void
-Window::GetEffectiveDrawingRegion(View* layer, BRegion& region)
+Window::GetEffectiveDrawingRegion(View* view, BRegion& region)
 {
 	if (!fEffectiveDrawingRegionValid) {
 		fEffectiveDrawingRegion = VisibleContentRegion();
@@ -554,29 +553,29 @@
 			fEffectiveDrawingRegion.IntersectWith(&fCurrentUpdateSession->DirtyRegion());
 		} else {
 			// not in update, the view can draw everywhere
-//printf("Window(%s)::GetEffectiveDrawingRegion(for %s) - outside update\n", Title(), layer->Name());
+//printf("Window(%s)::GetEffectiveDrawingRegion(for %s) - outside update\n", Title(), view->Name());
 		}
 
 		fEffectiveDrawingRegionValid = true;
 	}
 
 	// TODO: this is a region that needs to be cached later in the server
-	// when the current layer in ServerWindow is set, and we are currently
+	// when the current view in ServerWindow is set, and we are currently
 	// in an update (fInUpdate), than we can set this region and remember
-	// it for the comming drawing commands until the current layer changes
+	// it for the comming drawing commands until the current view changes
 	// again or fEffectiveDrawingRegionValid is suddenly false.
 	region = fEffectiveDrawingRegion;
 	if (!fContentRegionValid)
 		_UpdateContentRegion();
 
-	region.IntersectWith(&layer->ScreenClipping(&fContentRegion));
+	region.IntersectWith(&view->ScreenClipping(&fContentRegion));
 }
 
 
 bool
-Window::DrawingRegionChanged(View* layer) const
+Window::DrawingRegionChanged(View* view) const
 {
-	return !fEffectiveDrawingRegionValid || !layer->IsScreenClippingValid();
+	return !fEffectiveDrawingRegionValid || !view->IsScreenClippingValid();
 }
 
 
@@ -685,22 +684,21 @@
 
 
 void
-Window::InvalidateView(View* layer, BRegion& layerRegion)
+Window::InvalidateView(View* view, BRegion& viewRegion)
 {
-	if (layer && IsVisible() && layer->IsVisible()) {
-
+	if (view && IsVisible() && view->IsVisible()) {
 		if (!fContentRegionValid)
 			_UpdateContentRegion();
 
-		layer->ConvertToScreen(&layerRegion);
-		layerRegion.IntersectWith(&VisibleContentRegion());
-		if (layerRegion.CountRects() > 0) {
-			layerRegion.IntersectWith(&layer->ScreenClipping(&fContentRegion));
+		view->ConvertToScreen(&viewRegion);
+		viewRegion.IntersectWith(&VisibleContentRegion());
+		if (viewRegion.CountRects() > 0) {
+			viewRegion.IntersectWith(&view->ScreenClipping(&fContentRegion));
 
-//fDrawingEngine->FillRegion(layerRegion, rgb_color{ 0, 255, 0, 255 });
+//fDrawingEngine->FillRegion(viewRegion, rgb_color{ 0, 255, 0, 255 });
 //snooze(10000);
 			fDirtyCause |= UPDATE_REQUEST;
-			_TriggerContentRedraw(layerRegion);
+			_TriggerContentRedraw(viewRegion);
 		}
 	}
 }
@@ -939,12 +937,12 @@
 	bool isLatestMouseMoved)
 {
 #if 0
-	if (fDecorator != NULL && fTopLayer != NULL) {
+	if (fDecorator != NULL && fTopView != NULL) {
 		DrawingEngine* engine = fDecorator->GetDrawingEngine();
 		engine->LockParallelAccess();
 		engine->ConstrainClippingRegion(&VisibleRegion());
 
-		fTopLayer->MarkAt(engine, where);
+		fTopView->MarkAt(engine, where);
 		engine->UnlockParallelAccess();
 	}
 #endif
@@ -1160,7 +1158,7 @@
 	if (fHidden != hidden) {
 		fHidden = hidden;
 
-		fTopLayer->SetHidden(hidden);
+		fTopView->SetHidden(hidden);
 
 		// TODO: anything else?
 	}
@@ -1534,7 +1532,7 @@
 Window::FindWorkspacesViews(BObjectList<WorkspacesView>& list) const
 {
 	int32 count = fWorkspacesViewCount;
-	fTopLayer->FindViews(kWorkspacesViewFlag, (BObjectList<View>&)list, count);
+	fTopView->FindViews(kWorkspacesViewFlag, (BObjectList<View>&)list, count);
 }
 
 
@@ -1680,9 +1678,9 @@
 }
 
 
-
 // #pragma mark - private
 
+
 // _ShiftPartOfRegion
 void
 Window::_ShiftPartOfRegion(BRegion* region, BRegion* regionToShift,
@@ -1723,14 +1721,15 @@
 				// there was suddenly added a dirty region
 				// caused by exposing content, we need to clear
 				// the entire background
-				backgroundClearingRegion = &(fPendingUpdateSession->DirtyRegion());
+				backgroundClearingRegion
+					= &(fPendingUpdateSession->DirtyRegion());
 			}
 
 			if (fDrawingEngine->LockParallelAccess()) {
 				fDrawingEngine->SuspendAutoSync();
 
-				fTopLayer->Draw(fDrawingEngine, backgroundClearingRegion,
-								&fContentRegion, true);
+				fTopView->Draw(fDrawingEngine, backgroundClearingRegion,
+					&fContentRegion, true);
 
 				fDrawingEngine->Sync();
 				fDrawingEngine->UnlockParallelAccess();
@@ -1806,7 +1805,7 @@
 	// clip pending update session from current
 	// update session, it makes no sense to draw stuff
 	// already needing a redraw anyways. Theoretically,
-	// this could be done smarter (clip layers from pending
+	// this could be done smarter (clip views from pending
 	// that have not yet been redrawn in the current update
 	// session)
 	// NOTE: appearently the R5 app_server does not do that, it just
@@ -1905,7 +1904,7 @@
 		link.Attach<BRect>(dirty->Frame());
 		// find and attach all views that intersect with
 		// the dirty region
-		fTopLayer->AddTokensForLayersInRegion(link, *dirty, &fContentRegion);
+		fTopView->AddTokensForViewsInRegion(link, *dirty, &fContentRegion);
 		// mark the end of the token "list"
 		link.Attach<int32>(B_NULL_TOKEN);
 		link.Flush();
@@ -1914,8 +1913,7 @@
 //fDrawingEngine->FillRegion(dirty, (rgb_color){ 255, 0, 0, 255 });
 			fDrawingEngine->SuspendAutoSync();
 
-			fTopLayer->Draw(fDrawingEngine, dirty,
-							&fContentRegion, true);
+			fTopView->Draw(fDrawingEngine, dirty, &fContentRegion, true);
 
 			fDrawingEngine->Sync();
 			fDrawingEngine->UnlockParallelAccess();

Modified: haiku/trunk/src/servers/app/Window.h
===================================================================
--- haiku/trunk/src/servers/app/Window.h	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/Window.h	2008-03-08 15:28:31 UTC (rev 24305)
@@ -80,14 +80,14 @@
 
 			void				ScrollViewBy(View* view, int32 dx, int32 dy);
 
-			void				SetTopLayer(View* topLayer);
-			View*				TopLayer() const { return fTopLayer; }
+			void				SetTopView(View* topView);
+			View*				TopView() const { return fTopView; }
 			View*				ViewAt(const BPoint& where);
 
 	virtual	bool				IsOffscreenWindow() const { return false; }
 
-			void				GetEffectiveDrawingRegion(View* layer, BRegion& region);
-			bool				DrawingRegionChanged(View* layer) const;
+			void				GetEffectiveDrawingRegion(View* view, BRegion& region);
+			bool				DrawingRegionChanged(View* view) const;
 
 			// generic version, used by the Desktop
 			void				ProcessDirtyRegion(BRegion& regionOnScreen);
@@ -100,7 +100,7 @@
 			void				MarkContentDirty(BRegion& regionOnScreen);
 			void				MarkContentDirtyAsync(BRegion& regionOnScreen);
 			// shortcut for invalidating just one view
-			void				InvalidateView(View* view, BRegion& layerRegion);
+			void				InvalidateView(View* view, BRegion& viewRegion);
 
 			void				DisableUpdateRequests();
 			void				EnableUpdateRequests();
@@ -292,7 +292,7 @@
 			bool				fActivateOnMouseUp : 1;
 
 			::Decorator*		fDecorator;
-			View*				fTopLayer;
+			View*				fTopView;
 			::ServerWindow*		fWindow;
 			DrawingEngine*		fDrawingEngine;
 			::Desktop*			fDesktop;

Modified: haiku/trunk/src/servers/app/Workspace.cpp
===================================================================
--- haiku/trunk/src/servers/app/Workspace.cpp	2008-03-08 15:11:39 UTC (rev 24304)
+++ haiku/trunk/src/servers/app/Workspace.cpp	2008-03-08 15:28:31 UTC (rev 24305)
@@ -83,7 +83,7 @@
 //	fDesktop.LockSingleWindow();

[... truncated: 56 lines follow ...]


From superstippi at gmx.de  Sat Mar  8 17:36:49 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Sat, 08 Mar 2008 17:36:49 +0100
Subject: [Haiku-commits] r24304 - haiku/trunk/docs/user/app
In-Reply-To: <200803081511.m28FBd3B004931@sheep.berlios.de>
References: <200803081511.m28FBd3B004931@sheep.berlios.de>
Message-ID: <20080308173649.9186.2@stippis2.1204981284.fake>


Hi Niels,

a few comments...

nielx at BerliOS wrote:
> Author: nielx
> Date: 2008-03-08 16:11:39 +0100 (Sat, 08 Mar 2008) New Revision: 24304
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24304&view=rev
> 
> Added:
>    haiku/trunk/docs/user/app/Looper.dox
> Modified:
>    haiku/trunk/docs/user/app/Handler.dox
> Log:
> Handler.dox:
> - Small link fix
> - Clean up the titles of the subsections a bit: these are reused in the 
> looper documentation and they sort of clashed before.
> 
> Also, new documentation for Looper.dox!

...

> Added: haiku/trunk/docs/user/app/Looper.dox
> ===================================================================
> --- haiku/trunk/docs/user/app/Looper.dox    2008-03-08 12:45:54 UTC (rev 
> 24303)
> +++ haiku/trunk/docs/user/app/Looper.dox    2008-03-08 15:11:39 UTC (rev 
> 24304)
> @@ -0,0 +1,791 @@
> +/*
> + * Copyright 2007, Haiku, Inc. All Rights Reserved.
> + * Distributed under the terms of the MIT License.

We have 2008 already! :-)

...
> +    When an object of this class is created, the message loop can be 
> started
> +    with Run(). This spawns the thread that receives messages and 
> processes
> +    messages. Messages are actually passed on to \link BHandler handlers 
> \endlink
> +    that are associated with this looper. By default there is always one
> +    handler available: the looper itself. To 'quit' a looper, you should 
> pass
> +    a \c B_QUIT_REQUESTED message using one of the message post 
> functions. Do
> +    not call Quit() directly!

It is ok to first Lock() the looper and then call Quit(), after which the 
object must not be used anymore.


> When a looper receives such a request, it 
> will 
> +    \b delete itself. As such, looper should <em>always be created on the
> +    heap</em> (with \c new), and never on the stack. 
> +    
> +    Posting messages can be done using the various PostMessage() methods.
> +    Whenever a message is posted, it will be added through to the message
> +    queue. It is possible to apply filters (see AddCommonFilter()) to 
> filter
> +    out any messages that correspond with certain criteria. Whenever you 
> post
> +    a message, you \e lose ownership. The looper will dispose of it when 
> it is 
> +    processed.

NO! The message is always copied. The API is confusing, it should take 
"const BMessage*" to make this clear, it's a very common source of memory 
leaks. You should send messages like this:

BMessage message;
message.Add...(...);
looper->PostMessage(&message);

Maybe there are a few more cases, but the only one I am aware of, where 
objects obtain ownership of passed messages, is when you set notification 
messages for BControls and similar stuff.


> +    \fn status_t BLooper::PostMessage(BMessage *message)
> +    \brief Post a \a message to this looper.
> +    
> +    Posting a message puts it in the message queue. The message passes 
> through
> +    the default handler chain.
> +    
> +    \param message The message you would like to pass to this method.
> +    
> +    \retval B_OK The operation succeeded, and the message is sent to the 
> port.
> +    \retval B_ERROR There was a general operation error.
> +    \retval B_BAD_VALUE This looper is not yet running and therefore 
> cannot
> +        receive messages.
> +    
> +    \see PostMessage(uint32) if you want to send a message without data
> +        members.
> +    \see PostMessage(uint32, BHandler *, BHandler *) if you want to send 
> a
> +        message to a specific handler, and request a reply.
> +    \see PostMessage(BMessage *, BHandler *, BHandler *) for the same 
> thing,
> +        but with a complete message.
> +*/
> +
> +
> +/*!
> +    \fn status_t BLooper::PostMessage(uint32 command, BHandler *handler,
> +        BHandler *replyTo)
> +    \brief Send a message with the \a command as \c what identifier to 
> the
> +        \a handler associated with this looper, and (optionally) request 
> a
> +        reply.
> +        
> +    The target \a handler should be associated with this looper. This 
> method
> +    bypasses the default message queue.
> +    
> +    \param command The value you want as the message's \c what 
> identifier.
> +    \param handler The handler you would like to pass this message to.
> +    \param replyTo If you would like to request a reply, pass the 
> handler to
> +        which this reply should be directed to. If you pass \c NULL, you 
> will
> +        not receive a reply.
> +    
> +    \retval B_OK The operation succeeded, and the message is sent to the 
> port.
> +    \retval B_ERROR There was a general operation error.
> +    \retval B_BAD_VALUE This looper is not yet running and therefore 
> cannot
> +        receive messages.    
> +    \retval B_MISMATCHED_VALUES The \a handler is not associated with 
> this
> +        looper.
> +    
> +    \see PostMessage(uint32) if you want to send a message without data
> +        members.
> +    \see PostMessage(BMessage *) if you want to send a message with data
> +        members.
> +    \see PostMessage(BMessage *, BHandler *, BHandler *) if you want to 
> send a
> +        message to a specific handler, and request a reply.
> +*/
> +
> +
> +/*!
> +    \fn status_t BLooper::PostMessage(BMessage *message, BHandler 
> *handler,
> +        BHandler *replyTo)
> +    \brief Send a \a message to the \a handler associated with this 
> looper, 
> +        and (optionally) request a reply.
> +        
> +    The target \a handler should be associated with this looper. This 
> method
> +    bypasses the default message queue.
> +    
> +    \param message The message you want to pass.
> +    \param handler The handler you would like to pass this message to.
> +    \param replyTo If you would like to request a reply, pass the 
> handler to
> +        which this reply should be directed to. If you pass \c NULL, you 
> will
> +        not receive a reply.
> +    
> +    \retval B_OK The operation succeeded, and the message is sent to the 
> port.
> +    \retval B_ERROR There was a general operation error.
> +    \retval B_BAD_VALUE This looper is not yet running and therefore 
> cannot
> +        receive messages.    
> +    \retval B_MISMATCHED_VALUES The \a handler is not associated with 
> this
> +        looper.
> +    
> +    \see PostMessage(uint32) if you want to send a message without data
> +        members.
> +    \see PostMessage(BMessage *) if you want to send a message with data
> +        members.
> +    \see PostMessage(uint32, BHandler *, BHandler *) if you want to send 
> a
> +        message without data to a specific handler, and request a reply.


I would added comments to the PostMessage(BMessage*...) versions that the 
BMessage is copied. The caller retains ownership.


Best regards,
-Stephan


From axeld at mail.berlios.de  Sat Mar  8 17:44:19 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 8 Mar 2008 17:44:19 +0100
Subject: [Haiku-commits] r24306 - in haiku/trunk: headers/private/app
	src/kits/interface src/servers/app
Message-ID: <200803081644.m28GiJPE015352@sheep.berlios.de>

Author: axeld
Date: 2008-03-08 17:44:18 +0100 (Sat, 08 Mar 2008)
New Revision: 24306
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24306&view=rev

Modified:
   haiku/trunk/headers/private/app/ServerProtocol.h
   haiku/trunk/src/kits/interface/View.cpp
   haiku/trunk/src/servers/app/ProfileMessageSupport.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Renamed all *LAYER* constants to *VIEW*.


Modified: haiku/trunk/headers/private/app/ServerProtocol.h
===================================================================
--- haiku/trunk/headers/private/app/ServerProtocol.h	2008-03-08 15:28:31 UTC (rev 24305)
+++ haiku/trunk/headers/private/app/ServerProtocol.h	2008-03-08 16:44:18 UTC (rev 24306)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -23,7 +23,7 @@
 #endif
 
 #define AS_REQUEST_COLOR_KEY 0x00010000
-	// additional option for AS_LAYER_SET_VIEW_BITMAP
+	// additional option for AS_VIEW_SET_VIEW_BITMAP
 
 enum {
 	// NOTE: all defines have to start with "AS_" to let the "code_to_name"
@@ -218,73 +218,73 @@
 
 	AS_SYNC,
 
-	AS_LAYER_CREATE,
-	AS_LAYER_DELETE,
-	AS_LAYER_CREATE_ROOT,
-	AS_LAYER_SHOW,
-	AS_LAYER_HIDE,
-	AS_LAYER_MOVE,
-	AS_LAYER_RESIZE,
-	AS_LAYER_DRAW,
+	AS_VIEW_CREATE,
+	AS_VIEW_DELETE,
+	AS_VIEW_CREATE_ROOT,
+	AS_VIEW_SHOW,
+	AS_VIEW_HIDE,
+	AS_VIEW_MOVE,
+	AS_VIEW_RESIZE,
+	AS_VIEW_DRAW,
 
 	// View/Layer definitions
-	AS_LAYER_GET_COORD,
-	AS_LAYER_SET_FLAGS,
-	AS_LAYER_SET_ORIGIN,
-	AS_LAYER_GET_ORIGIN,
-	AS_LAYER_RESIZE_MODE,
-	AS_LAYER_SET_CURSOR,
-	AS_LAYER_BEGIN_RECT_TRACK,
-	AS_LAYER_END_RECT_TRACK,
-	AS_LAYER_DRAG_RECT,
-	AS_LAYER_DRAG_IMAGE,
-	AS_LAYER_SCROLL,
-	AS_LAYER_SET_LINE_MODE,
-	AS_LAYER_GET_LINE_MODE,
-	AS_LAYER_PUSH_STATE,
-	AS_LAYER_POP_STATE,
-	AS_LAYER_SET_SCALE,
-	AS_LAYER_GET_SCALE,
-	AS_LAYER_SET_DRAWING_MODE,
-	AS_LAYER_GET_DRAWING_MODE,
-	AS_LAYER_SET_BLENDING_MODE,
-	AS_LAYER_GET_BLENDING_MODE,
-	AS_LAYER_SET_PEN_LOC,
-	AS_LAYER_GET_PEN_LOC,
-	AS_LAYER_SET_PEN_SIZE,
-	AS_LAYER_GET_PEN_SIZE,
-	AS_LAYER_SET_HIGH_COLOR,
-	AS_LAYER_SET_LOW_COLOR,
-	AS_LAYER_SET_VIEW_COLOR,
-	AS_LAYER_GET_HIGH_COLOR,
-	AS_LAYER_GET_LOW_COLOR,
-	AS_LAYER_GET_VIEW_COLOR,
-	AS_LAYER_PRINT_ALIASING,
-	AS_LAYER_CLIP_TO_PICTURE,
-	AS_LAYER_GET_CLIP_REGION,
-	AS_LAYER_DRAW_BITMAP,
-	AS_LAYER_SET_EVENT_MASK,
-	AS_LAYER_SET_MOUSE_EVENT_MASK,
+	AS_VIEW_GET_COORD,
+	AS_VIEW_SET_FLAGS,
+	AS_VIEW_SET_ORIGIN,
+	AS_VIEW_GET_ORIGIN,
+	AS_VIEW_RESIZE_MODE,
+	AS_VIEW_SET_CURSOR,
+	AS_VIEW_BEGIN_RECT_TRACK,
+	AS_VIEW_END_RECT_TRACK,
+	AS_VIEW_DRAG_RECT,
+	AS_VIEW_DRAG_IMAGE,
+	AS_VIEW_SCROLL,
+	AS_VIEW_SET_LINE_MODE,
+	AS_VIEW_GET_LINE_MODE,
+	AS_VIEW_PUSH_STATE,
+	AS_VIEW_POP_STATE,
+	AS_VIEW_SET_SCALE,
+	AS_VIEW_GET_SCALE,
+	AS_VIEW_SET_DRAWING_MODE,
+	AS_VIEW_GET_DRAWING_MODE,
+	AS_VIEW_SET_BLENDING_MODE,
+	AS_VIEW_GET_BLENDING_MODE,
+	AS_VIEW_SET_PEN_LOC,
+	AS_VIEW_GET_PEN_LOC,
+	AS_VIEW_SET_PEN_SIZE,
+	AS_VIEW_GET_PEN_SIZE,
+	AS_VIEW_SET_HIGH_COLOR,
+	AS_VIEW_SET_LOW_COLOR,
+	AS_VIEW_SET_VIEW_COLOR,
+	AS_VIEW_GET_HIGH_COLOR,
+	AS_VIEW_GET_LOW_COLOR,
+	AS_VIEW_GET_VIEW_COLOR,
+	AS_VIEW_PRINT_ALIASING,
+	AS_VIEW_CLIP_TO_PICTURE,
+	AS_VIEW_GET_CLIP_REGION,
+	AS_VIEW_DRAW_BITMAP,
+	AS_VIEW_SET_EVENT_MASK,
+	AS_VIEW_SET_MOUSE_EVENT_MASK,
 
-	AS_LAYER_DRAW_STRING,
-	AS_LAYER_SET_CLIP_REGION,
-	AS_LAYER_LINE_ARRAY,
-	AS_LAYER_BEGIN_PICTURE,
-	AS_LAYER_APPEND_TO_PICTURE,
-	AS_LAYER_END_PICTURE,
-	AS_LAYER_COPY_BITS,
-	AS_LAYER_DRAW_PICTURE,
-	AS_LAYER_INVALIDATE_RECT,
-	AS_LAYER_INVALIDATE_REGION,
-	AS_LAYER_INVERT_RECT,
-	AS_LAYER_MOVE_TO,
-	AS_LAYER_RESIZE_TO,
-	AS_LAYER_SET_STATE,
-	AS_LAYER_SET_FONT_STATE,
-	AS_LAYER_GET_STATE,
-	AS_LAYER_SET_VIEW_BITMAP,
-	AS_LAYER_SET_PATTERN,
-	AS_SET_CURRENT_LAYER,
+	AS_VIEW_DRAW_STRING,
+	AS_VIEW_SET_CLIP_REGION,
+	AS_VIEW_LINE_ARRAY,
+	AS_VIEW_BEGIN_PICTURE,
+	AS_VIEW_APPEND_TO_PICTURE,
+	AS_VIEW_END_PICTURE,
+	AS_VIEW_COPY_BITS,
+	AS_VIEW_DRAW_PICTURE,
+	AS_VIEW_INVALIDATE_RECT,
+	AS_VIEW_INVALIDATE_REGION,
+	AS_VIEW_INVERT_RECT,
+	AS_VIEW_MOVE_TO,
+	AS_VIEW_RESIZE_TO,
+	AS_VIEW_SET_STATE,
+	AS_VIEW_SET_FONT_STATE,
+	AS_VIEW_GET_STATE,
+	AS_VIEW_SET_VIEW_BITMAP,
+	AS_VIEW_SET_PATTERN,
+	AS_SET_CURRENT_VIEW,
 
 	// BDirectWindow codes
 	AS_DIRECT_WINDOW_GET_SYNC_DATA,

Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2008-03-08 15:28:31 UTC (rev 24305)
+++ haiku/trunk/src/kits/interface/View.cpp	2008-03-08 16:44:18 UTC (rev 24306)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -156,7 +156,7 @@
 void
 ViewState::UpdateServerFontState(BPrivate::PortLink &link)
 {
-	link.StartMessage(AS_LAYER_SET_FONT_STATE);
+	link.StartMessage(AS_VIEW_SET_FONT_STATE);
 	link.Attach<uint16>(font_flags);
 		// always present
 
@@ -194,7 +194,7 @@
 {
 	UpdateServerFontState(link);
 
-	link.StartMessage(AS_LAYER_SET_STATE);
+	link.StartMessage(AS_VIEW_SET_STATE);
 	link.Attach<BPoint>(pen_location);
 	link.Attach<float>(pen_size);
 	link.Attach<rgb_color>(high_color);
@@ -232,7 +232,7 @@
 void
 ViewState::UpdateFrom(BPrivate::PortLink &link)
 {
-	link.StartMessage(AS_LAYER_GET_STATE);
+	link.StartMessage(AS_VIEW_GET_STATE);
 
 	int32 code;
 	if (link.FlushWithReply(code) != B_OK
@@ -612,7 +612,7 @@
 	if (!fState->IsValid(B_VIEW_FRAME_BIT) && fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_COORD);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_COORD);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -865,7 +865,7 @@
 					| B_FRAME_EVENTS | B_SUBPIXEL_PRECISE)) {
 			_CheckLockAndSwitchCurrent();
 
-			fOwner->fLink->StartMessage(AS_LAYER_SET_FLAGS);
+			fOwner->fLink->StartMessage(AS_VIEW_SET_FLAGS);
 			fOwner->fLink->Attach<uint32>(flags);
 		}
 	}
@@ -897,7 +897,7 @@
 {
 	if (fOwner && fShowLevel == 0) {
 		_CheckLockAndSwitchCurrent();
-		fOwner->fLink->StartMessage(AS_LAYER_HIDE);
+		fOwner->fLink->StartMessage(AS_VIEW_HIDE);
 	}
 	fShowLevel++;
 
@@ -912,7 +912,7 @@
 	fShowLevel--;
 	if (fOwner && fShowLevel == 0) {
 		_CheckLockAndSwitchCurrent();
-		fOwner->fLink->StartMessage(AS_LAYER_SHOW);
+		fOwner->fLink->StartMessage(AS_VIEW_SHOW);
 	}
 
 	if (fShowLevel == 0 && fParent)
@@ -995,7 +995,7 @@
 	fState->origin.y = y;
 
 	if (_CheckOwnerLockAndSwitchCurrent()) {
-		fOwner->fLink->StartMessage(AS_LAYER_SET_ORIGIN);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_ORIGIN);
 		fOwner->fLink->Attach<float>(x);
 		fOwner->fLink->Attach<float>(y);
 
@@ -1015,7 +1015,7 @@
 		// we need to ask the server for the origin after PopState()
 		_CheckOwnerLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_ORIGIN);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_ORIGIN);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -1036,7 +1036,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_RESIZE_MODE);
+		fOwner->fLink->StartMessage(AS_VIEW_RESIZE_MODE);
 		fOwner->fLink->Attach<uint32>(mode);
 	}
 
@@ -1060,7 +1060,7 @@
 
 	_CheckLockAndSwitchCurrent();
 
-	fOwner->fLink->StartMessage(AS_LAYER_SET_CURSOR);
+	fOwner->fLink->StartMessage(AS_VIEW_SET_CURSOR);
 	fOwner->fLink->Attach<int32>(cursor->fServerToken);
 	fOwner->fLink->Attach<bool>(sync);
 
@@ -1273,7 +1273,7 @@
 BView::BeginRectTracking(BRect startRect, uint32 style)
 {
 	if (_CheckOwnerLockAndSwitchCurrent()) {
-		fOwner->fLink->StartMessage(AS_LAYER_BEGIN_RECT_TRACK);
+		fOwner->fLink->StartMessage(AS_VIEW_BEGIN_RECT_TRACK);
 		fOwner->fLink->Attach<BRect>(startRect);
 		fOwner->fLink->Attach<uint32>(style);
 	}
@@ -1284,7 +1284,7 @@
 BView::EndRectTracking()
 {
 	if (_CheckOwnerLockAndSwitchCurrent())
-		fOwner->fLink->StartMessage(AS_LAYER_END_RECT_TRACK);
+		fOwner->fLink->StartMessage(AS_VIEW_END_RECT_TRACK);
 }
 
 
@@ -1395,7 +1395,7 @@
 	if (buffer) {
 		privateMessage.NativeFlatten(buffer, bufferSize);
 
-		fOwner->fLink->StartMessage(AS_LAYER_DRAG_IMAGE);
+		fOwner->fLink->StartMessage(AS_VIEW_DRAG_IMAGE);
 		fOwner->fLink->Attach<int32>(image->_ServerToken());
 		fOwner->fLink->Attach<int32>((int32)dragMode);
 		fOwner->fLink->Attach<BPoint>(offset);
@@ -1556,7 +1556,7 @@
 
 	// if we're attached to a window tell app_server about this change
 	if (fOwner) {
-		fOwner->fLink->StartMessage(AS_LAYER_SCROLL);
+		fOwner->fLink->StartMessage(AS_VIEW_SCROLL);
 		fOwner->fLink->Attach<float>(deltaX);
 		fOwner->fLink->Attach<float>(deltaY);
 
@@ -1597,7 +1597,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_EVENT_MASK);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_EVENT_MASK);
 		fOwner->fLink->Attach<uint32>(mask);
 		fOwner->fLink->Attach<uint32>(options);
 		fOwner->fLink->Flush();
@@ -1625,7 +1625,7 @@
 		_CheckLockAndSwitchCurrent();
 		fMouseEventOptions = options;
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_MOUSE_EVENT_MASK);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_MOUSE_EVENT_MASK);
 		fOwner->fLink->Attach<uint32>(mask);
 		fOwner->fLink->Attach<uint32>(options);
 		fOwner->fLink->Flush();
@@ -1650,7 +1650,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_LINE_MODE);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_LINE_MODE);
 		fOwner->fLink->Attach<int8>((int8)lineCap);
 		fOwner->fLink->Attach<int8>((int8)lineJoin);
 		fOwner->fLink->Attach<float>(miterLimit);
@@ -1694,7 +1694,7 @@
 	if (!fState->IsValid(B_VIEW_LINE_MODES_BIT) && fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_LINE_MODE);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_LINE_MODE);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -1720,7 +1720,7 @@
 {
 	_CheckOwnerLockAndSwitchCurrent();
 
-	fOwner->fLink->StartMessage(AS_LAYER_PUSH_STATE);
+	fOwner->fLink->StartMessage(AS_VIEW_PUSH_STATE);
 
 	// initialize origin and scale
 	fState->valid_flags |= B_VIEW_SCALE_BIT | B_VIEW_ORIGIN_BIT;
@@ -1734,7 +1734,7 @@
 {
 	_CheckOwnerLockAndSwitchCurrent();
 
-	fOwner->fLink->StartMessage(AS_LAYER_POP_STATE);
+	fOwner->fLink->StartMessage(AS_VIEW_POP_STATE);
 
 	// invalidate all flags (except those that are not part of pop/push)
 	fState->valid_flags = B_VIEW_VIEW_COLOR_BIT;
@@ -1750,7 +1750,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_SCALE);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_SCALE);
 		fOwner->fLink->Attach<float>(scale);
 
 		fState->valid_flags |= B_VIEW_SCALE_BIT;
@@ -1767,7 +1767,7 @@
 	if (!fState->IsValid(B_VIEW_SCALE_BIT) && fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_SCALE);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_SCALE);
 
  		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -1791,7 +1791,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_DRAWING_MODE);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_DRAWING_MODE);
 		fOwner->fLink->Attach<int8>((int8)mode);
 
 		fState->valid_flags |= B_VIEW_DRAWING_MODE_BIT;
@@ -1808,7 +1808,7 @@
 	if (!fState->IsValid(B_VIEW_DRAWING_MODE_BIT) && fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_DRAWING_MODE);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_DRAWING_MODE);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -1836,7 +1836,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_BLENDING_MODE);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_BLENDING_MODE);
 		fOwner->fLink->Attach<int8>((int8)sourceAlpha);
 		fOwner->fLink->Attach<int8>((int8)alphaFunction);
 
@@ -1857,7 +1857,7 @@
 	if (!fState->IsValid(B_VIEW_BLENDING_BIT) && fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_BLENDING_MODE);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_BLENDING_MODE);
 
 		int32 code;
  		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -1898,7 +1898,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_PEN_LOC);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_PEN_LOC);
 		fOwner->fLink->Attach<float>(x);
 		fOwner->fLink->Attach<float>(y);
 
@@ -1929,7 +1929,7 @@
 	if (!fState->IsValid(B_VIEW_PEN_LOCATION_BIT) && fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_PEN_LOC);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_PEN_LOC);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -1953,7 +1953,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_PEN_SIZE);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_PEN_SIZE);
 		fOwner->fLink->Attach<float>(size);
 
 		fState->valid_flags |= B_VIEW_PEN_SIZE_BIT;	
@@ -1970,7 +1970,7 @@
 	if (!fState->IsValid(B_VIEW_PEN_SIZE_BIT) && fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_PEN_SIZE);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_PEN_SIZE);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -1996,7 +1996,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_HIGH_COLOR);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_HIGH_COLOR);
 		fOwner->fLink->Attach<rgb_color>(color);
 
 		fState->valid_flags |= B_VIEW_HIGH_COLOR_BIT;	
@@ -2014,7 +2014,7 @@
 	if (!fState->IsValid(B_VIEW_HIGH_COLOR_BIT) && fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_HIGH_COLOR);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_HIGH_COLOR);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -2039,7 +2039,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_LOW_COLOR);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_LOW_COLOR);
 		fOwner->fLink->Attach<rgb_color>(color);
 
 		fState->valid_flags |= B_VIEW_LOW_COLOR_BIT;
@@ -2057,7 +2057,7 @@
 	if (!fState->IsValid(B_VIEW_LOW_COLOR_BIT) && fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_LOW_COLOR);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_LOW_COLOR);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -2081,7 +2081,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_VIEW_COLOR);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_VIEW_COLOR);
 		fOwner->fLink->Attach<rgb_color>(color);
 
 		fState->valid_flags |= B_VIEW_VIEW_COLOR_BIT;
@@ -2099,7 +2099,7 @@
 	if (!fState->IsValid(B_VIEW_VIEW_COLOR_BIT) && fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_GET_VIEW_COLOR);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_VIEW_COLOR);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -2123,7 +2123,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_PRINT_ALIASING);
+		fOwner->fLink->StartMessage(AS_VIEW_PRINT_ALIASING);
 		fOwner->fLink->Attach<bool>(enable);
 
 		fState->valid_flags |= B_VIEW_FONT_ALIASING_BIT;
@@ -2263,7 +2263,7 @@
 
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
-		fOwner->fLink->StartMessage(AS_LAYER_GET_CLIP_REGION);
+		fOwner->fLink->StartMessage(AS_VIEW_GET_CLIP_REGION);
 
  		int32 code;
  		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -2279,7 +2279,7 @@
 BView::ConstrainClippingRegion(BRegion* region)
 {
 	if (_CheckOwnerLockAndSwitchCurrent()) {
-		fOwner->fLink->StartMessage(AS_LAYER_SET_CLIP_REGION);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_CLIP_REGION);
 
 		if (region) {
 			int32 count = region->CountRects();
@@ -2313,7 +2313,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_DRAW_BITMAP);
+		fOwner->fLink->StartMessage(AS_VIEW_DRAW_BITMAP);
 		fOwner->fLink->Attach<int32>(bitmap->_ServerToken());
 		fOwner->fLink->Attach<BRect>(dstRect);
 		fOwner->fLink->Attach<BRect>(srcRect);
@@ -2346,7 +2346,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_DRAW_BITMAP);
+		fOwner->fLink->StartMessage(AS_VIEW_DRAW_BITMAP);
 		fOwner->fLink->Attach<int32>(bitmap->_ServerToken());
 		BRect src = bitmap->Bounds().OffsetToCopy(B_ORIGIN);
 		BRect dst = src.OffsetToCopy(where);
@@ -3098,7 +3098,7 @@
 		picture->Usurp(cpicture);
 		cpicture = picture;
 
-		fOwner->fLink->StartMessage(AS_LAYER_BEGIN_PICTURE);
+		fOwner->fLink->StartMessage(AS_VIEW_BEGIN_PICTURE);
 	}
 }
 
@@ -3117,7 +3117,7 @@
 			picture->SetToken(-1);
 			picture->Usurp(cpicture);
 			cpicture = picture;			
-			fOwner->fLink->StartMessage(AS_LAYER_APPEND_TO_PICTURE);
+			fOwner->fLink->StartMessage(AS_VIEW_APPEND_TO_PICTURE);
 			fOwner->fLink->Attach<int32>(token);
 		}
 	}
@@ -3130,7 +3130,7 @@
 	if (_CheckOwnerLockAndSwitchCurrent() && cpicture) {
 		int32 token;
 
-		fOwner->fLink->StartMessage(AS_LAYER_END_PICTURE);
+		fOwner->fLink->StartMessage(AS_VIEW_END_PICTURE);
 
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -3226,7 +3226,7 @@
 
 	_CheckLockAndSwitchCurrent();
 
-	fOwner->fLink->StartMessage(AS_LAYER_COPY_BITS);
+	fOwner->fLink->StartMessage(AS_VIEW_COPY_BITS);
 	fOwner->fLink->Attach<BRect>(src);
 	fOwner->fLink->Attach<BRect>(dst);
 
@@ -3284,7 +3284,7 @@
 		return;
 
 	if (_CheckOwnerLockAndSwitchCurrent() && picture->Token() > 0) {
-		fOwner->fLink->StartMessage(AS_LAYER_DRAW_PICTURE);
+		fOwner->fLink->StartMessage(AS_VIEW_DRAW_PICTURE);
 		fOwner->fLink->Attach<int32>(picture->Token());
 		fOwner->fLink->Attach<BPoint>(where);
 
@@ -3335,7 +3335,7 @@
 
 	_CheckLockAndSwitchCurrent();
 
-	fOwner->fLink->StartMessage(AS_LAYER_INVALIDATE_RECT);
+	fOwner->fLink->StartMessage(AS_VIEW_INVALIDATE_RECT);
 	fOwner->fLink->Attach<BRect>(invalRect);
 	fOwner->fLink->Flush();
 }
@@ -3349,7 +3349,7 @@
 
 	_CheckLockAndSwitchCurrent();
 
-	fOwner->fLink->StartMessage(AS_LAYER_INVALIDATE_REGION);
+	fOwner->fLink->StartMessage(AS_VIEW_INVALIDATE_REGION);
 	fOwner->fLink->AttachRegion(*region);
 
 	fOwner->fLink->Flush();
@@ -3369,7 +3369,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_INVERT_RECT);
+		fOwner->fLink->StartMessage(AS_VIEW_INVERT_RECT);
 		fOwner->fLink->Attach<BRect>(rect);
 
 		_FlushIfNotInTransaction();
@@ -3533,7 +3533,7 @@
 
 	if (owner != NULL && !fTopLevelView) {
 		// the top level view is deleted by the app_server automatically
-		owner->fLink->StartMessage(AS_LAYER_DELETE);
+		owner->fLink->StartMessage(AS_VIEW_DELETE);
 		owner->fLink->Attach<int32>(_get_object_token_(this));
 	}
 
@@ -3603,7 +3603,7 @@
 
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
-		fOwner->fLink->StartMessage(AS_LAYER_MOVE_TO);
+		fOwner->fLink->StartMessage(AS_VIEW_MOVE_TO);
 		fOwner->fLink->Attach<float>(x);
 		fOwner->fLink->Attach<float>(y);
 
@@ -3628,7 +3628,7 @@
 
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
-		fOwner->fLink->StartMessage(AS_LAYER_RESIZE_TO);
+		fOwner->fLink->StartMessage(AS_VIEW_RESIZE_TO);
 
 		fOwner->fLink->Attach<float>(fBounds.Width() + deltaWidth);
 		fOwner->fLink->Attach<float>(fBounds.Height() + deltaHeight);
@@ -4300,7 +4300,7 @@
 		return;
 
 	if (_CheckOwnerLockAndSwitchCurrent()) {
-		fOwner->fLink->StartMessage(AS_LAYER_CLIP_TO_PICTURE);
+		fOwner->fLink->StartMessage(AS_VIEW_CLIP_TO_PICTURE);
 		fOwner->fLink->Attach<int32>(picture->Token());
 		fOwner->fLink->Attach<BPoint>(where);
 		fOwner->fLink->Attach<bool>(invert);
@@ -4397,14 +4397,14 @@
 bool
 BView::_CreateSelf()
 {
-	// AS_LAYER_CREATE & AS_LAYER_CREATE_ROOT do not use the
+	// AS_VIEW_CREATE & AS_VIEW_CREATE_ROOT do not use the
 	// current view mechanism via _CheckLockAndSwitchCurrent() - the token
 	// of the view and its parent are both send to the server.
 
 	if (fTopLevelView)
-		fOwner->fLink->StartMessage(AS_LAYER_CREATE_ROOT);
+		fOwner->fLink->StartMessage(AS_VIEW_CREATE_ROOT);
 	else
- 		fOwner->fLink->StartMessage(AS_LAYER_CREATE);
+ 		fOwner->fLink->StartMessage(AS_VIEW_CREATE);
 
 	fOwner->fLink->Attach<int32>(_get_object_token_(this));
 	fOwner->fLink->AttachString(Name());
@@ -4700,7 +4700,7 @@
 
 	fState->UpdateFrom(*fOwner->fLink);
 //	if (!fState->IsValid(B_VIEW_FRAME_BIT)) {
-//		fOwner->fLink->StartMessage(AS_LAYER_GET_COORD);
+//		fOwner->fLink->StartMessage(AS_VIEW_GET_COORD);
 //
 //		status_t code;
 //		if (fOwner->fLink->FlushWithReply(code) == B_OK
@@ -4729,7 +4729,7 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
-		fOwner->fLink->StartMessage(AS_LAYER_SET_PATTERN);
+		fOwner->fLink->StartMessage(AS_VIEW_SET_PATTERN);
 		fOwner->fLink->Attach< ::pattern>(pattern);
 
 		fState->valid_flags |= B_VIEW_PATTERN_BIT;
@@ -4777,7 +4777,7 @@
 
 	int32 serverToken = bitmap ? bitmap->_ServerToken() : -1;
 
-	fOwner->fLink->StartMessage(AS_LAYER_SET_VIEW_BITMAP);
+	fOwner->fLink->StartMessage(AS_VIEW_SET_VIEW_BITMAP);
 	fOwner->fLink->Attach<int32>(serverToken);
 	fOwner->fLink->Attach<BRect>(srcRect);
 	fOwner->fLink->Attach<BRect>(dstRect);
@@ -4849,7 +4849,7 @@
 
 	if (fOwner->fLastViewToken != serverToken) {
 		STRACE(("contacting app_server... sending token: %ld\n", serverToken));
-		fOwner->fLink->StartMessage(AS_SET_CURRENT_LAYER);
+		fOwner->fLink->StartMessage(AS_SET_CURRENT_VIEW);
 		fOwner->fLink->Attach<int32>(serverToken);
 
 		fOwner->fLastViewToken = serverToken;

Modified: haiku/trunk/src/servers/app/ProfileMessageSupport.cpp
===================================================================
--- haiku/trunk/src/servers/app/ProfileMessageSupport.cpp	2008-03-08 15:28:31 UTC (rev 24305)
+++ haiku/trunk/src/servers/app/ProfileMessageSupport.cpp	2008-03-08 16:44:18 UTC (rev 24306)
@@ -206,73 +206,73 @@
 
 		case AS_SYNC: string = "AS_SYNC"; break;
 
-		case AS_LAYER_CREATE: string = "AS_LAYER_CREATE"; break;
-		case AS_LAYER_DELETE: string = "AS_LAYER_DELETE"; break;
-		case AS_LAYER_CREATE_ROOT: string = "AS_LAYER_CREATE_ROOT"; break;
-		case AS_LAYER_SHOW: string = "AS_LAYER_SHOW"; break;
-		case AS_LAYER_HIDE: string = "AS_LAYER_HIDE"; break;
-		case AS_LAYER_MOVE: string = "AS_LAYER_MOVE"; break;
-		case AS_LAYER_RESIZE: string = "AS_LAYER_RESIZE"; break;
-		case AS_LAYER_DRAW: string = "AS_LAYER_DRAW"; break;
+		case AS_VIEW_CREATE: string = "AS_VIEW_CREATE"; break;
+		case AS_VIEW_DELETE: string = "AS_VIEW_DELETE"; break;
+		case AS_VIEW_CREATE_ROOT: string = "AS_VIEW_CREATE_ROOT"; break;
+		case AS_VIEW_SHOW: string = "AS_VIEW_SHOW"; break;
+		case AS_VIEW_HIDE: string = "AS_VIEW_HIDE"; break;
+		case AS_VIEW_MOVE: string = "AS_VIEW_MOVE"; break;
+		case AS_VIEW_RESIZE: string = "AS_VIEW_RESIZE"; break;
+		case AS_VIEW_DRAW: string = "AS_VIEW_DRAW"; break;
 
 		// View definitions
-		case AS_LAYER_GET_COORD: string = "AS_LAYER_GET_COORD"; break;
-		case AS_LAYER_SET_FLAGS: string = "AS_LAYER_SET_FLAGS"; break;
-		case AS_LAYER_SET_ORIGIN: string = "AS_LAYER_SET_ORIGIN"; break;
-		case AS_LAYER_GET_ORIGIN: string = "AS_LAYER_GET_ORIGIN"; break;
-		case AS_LAYER_RESIZE_MODE: string = "AS_LAYER_RESIZE_MODE"; break;
-		case AS_LAYER_SET_CURSOR: string = "AS_LAYER_SET_CURSOR"; break;
-		case AS_LAYER_BEGIN_RECT_TRACK: string = "AS_LAYER_BEGIN_RECT_TRACK"; break;
-		case AS_LAYER_END_RECT_TRACK: string = "AS_LAYER_END_RECT_TRACK"; break;
-		case AS_LAYER_DRAG_RECT: string = "AS_LAYER_DRAG_RECT"; break;
-		case AS_LAYER_DRAG_IMAGE: string = "AS_LAYER_DRAG_IMAGE"; break;
-		case AS_LAYER_SCROLL: string = "AS_LAYER_SCROLL"; break;
-		case AS_LAYER_SET_LINE_MODE: string = "AS_LAYER_SET_LINE_MODE"; break;
-		case AS_LAYER_GET_LINE_MODE: string = "AS_LAYER_GET_LINE_MODE"; break;
-		case AS_LAYER_PUSH_STATE: string = "AS_LAYER_PUSH_STATE"; break;
-		case AS_LAYER_POP_STATE: string = "AS_LAYER_POP_STATE"; break;
-		case AS_LAYER_SET_SCALE: string = "AS_LAYER_SET_SCALE"; break;
-		case AS_LAYER_GET_SCALE: string = "AS_LAYER_GET_SCALE"; break;
-		case AS_LAYER_SET_DRAWING_MODE: string = "AS_LAYER_SET_DRAWING_MODE"; break;
-		case AS_LAYER_GET_DRAWING_MODE: string = "AS_LAYER_GET_DRAWING_MODE"; break;
-		case AS_LAYER_SET_BLENDING_MODE: string = "AS_LAYER_SET_BLENDING_MODE"; break;
-		case AS_LAYER_GET_BLENDING_MODE: string = "AS_LAYER_GET_BLENDING_MODE"; break;
-		case AS_LAYER_SET_PEN_LOC: string = "AS_LAYER_SET_PEN_LOC"; break;
-		case AS_LAYER_GET_PEN_LOC: string = "AS_LAYER_GET_PEN_LOC"; break;
-		case AS_LAYER_SET_PEN_SIZE: string = "AS_LAYER_SET_PEN_SIZE"; break;
-		case AS_LAYER_GET_PEN_SIZE: string = "AS_LAYER_GET_PEN_SIZE"; break;
-		case AS_LAYER_SET_HIGH_COLOR: string = "AS_LAYER_SET_HIGH_COLOR"; break;
-		case AS_LAYER_SET_LOW_COLOR: string = "AS_LAYER_SET_LOW_COLOR"; break;
-		case AS_LAYER_SET_VIEW_COLOR: string = "AS_LAYER_SET_VIEW_COLOR"; break;
-		case AS_LAYER_GET_HIGH_COLOR: string = "AS_LAYER_GET_HIGH_COLOR"; break;
-		case AS_LAYER_GET_LOW_COLOR: string = "AS_LAYER_GET_LOW_COLOR"; break;
-		case AS_LAYER_GET_VIEW_COLOR: string = "AS_LAYER_GET_VIEW_COLOR"; break;
-		case AS_LAYER_PRINT_ALIASING: string = "AS_LAYER_PRINT_ALIASING"; break;
-		case AS_LAYER_CLIP_TO_PICTURE: string = "AS_LAYER_CLIP_TO_PICTURE"; break;
-		case AS_LAYER_GET_CLIP_REGION: string = "AS_LAYER_GET_CLIP_REGION"; break;
-		case AS_LAYER_DRAW_BITMAP: string = "AS_LAYER_DRAW_BITMAP"; break;
-		case AS_LAYER_SET_EVENT_MASK: string = "AS_LAYER_SET_EVENT_MASK"; break;
-		case AS_LAYER_SET_MOUSE_EVENT_MASK: string = "AS_LAYER_SET_MOUSE_EVENT_MASK"; break;
+		case AS_VIEW_GET_COORD: string = "AS_VIEW_GET_COORD"; break;
+		case AS_VIEW_SET_FLAGS: string = "AS_VIEW_SET_FLAGS"; break;
+		case AS_VIEW_SET_ORIGIN: string = "AS_VIEW_SET_ORIGIN"; break;
+		case AS_VIEW_GET_ORIGIN: string = "AS_VIEW_GET_ORIGIN"; break;
+		case AS_VIEW_RESIZE_MODE: string = "AS_VIEW_RESIZE_MODE"; break;
+		case AS_VIEW_SET_CURSOR: string = "AS_VIEW_SET_CURSOR"; break;
+		case AS_VIEW_BEGIN_RECT_TRACK: string = "AS_VIEW_BEGIN_RECT_TRACK"; break;
+		case AS_VIEW_END_RECT_TRACK: string = "AS_VIEW_END_RECT_TRACK"; break;
+		case AS_VIEW_DRAG_RECT: string = "AS_VIEW_DRAG_RECT"; break;
+		case AS_VIEW_DRAG_IMAGE: string = "AS_VIEW_DRAG_IMAGE"; break;
+		case AS_VIEW_SCROLL: string = "AS_VIEW_SCROLL"; break;
+		case AS_VIEW_SET_LINE_MODE: string = "AS_VIEW_SET_LINE_MODE"; break;
+		case AS_VIEW_GET_LINE_MODE: string = "AS_VIEW_GET_LINE_MODE"; break;
+		case AS_VIEW_PUSH_STATE: string = "AS_VIEW_PUSH_STATE"; break;
+		case AS_VIEW_POP_STATE: string = "AS_VIEW_POP_STATE"; break;
+		case AS_VIEW_SET_SCALE: string = "AS_VIEW_SET_SCALE"; break;
+		case AS_VIEW_GET_SCALE: string = "AS_VIEW_GET_SCALE"; break;
+		case AS_VIEW_SET_DRAWING_MODE: string = "AS_VIEW_SET_DRAWING_MODE"; break;
+		case AS_VIEW_GET_DRAWING_MODE: string = "AS_VIEW_GET_DRAWING_MODE"; break;
+		case AS_VIEW_SET_BLENDING_MODE: string = "AS_VIEW_SET_BLENDING_MODE"; break;
+		case AS_VIEW_GET_BLENDING_MODE: string = "AS_VIEW_GET_BLENDING_MODE"; break;
+		case AS_VIEW_SET_PEN_LOC: string = "AS_VIEW_SET_PEN_LOC"; break;
+		case AS_VIEW_GET_PEN_LOC: string = "AS_VIEW_GET_PEN_LOC"; break;
+		case AS_VIEW_SET_PEN_SIZE: string = "AS_VIEW_SET_PEN_SIZE"; break;
+		case AS_VIEW_GET_PEN_SIZE: string = "AS_VIEW_GET_PEN_SIZE"; break;
+		case AS_VIEW_SET_HIGH_COLOR: string = "AS_VIEW_SET_HIGH_COLOR"; break;
+		case AS_VIEW_SET_LOW_COLOR: string = "AS_VIEW_SET_LOW_COLOR"; break;
+		case AS_VIEW_SET_VIEW_COLOR: string = "AS_VIEW_SET_VIEW_COLOR"; break;
+		case AS_VIEW_GET_HIGH_COLOR: string = "AS_VIEW_GET_HIGH_COLOR"; break;
+		case AS_VIEW_GET_LOW_COLOR: string = "AS_VIEW_GET_LOW_COLOR"; break;
+		case AS_VIEW_GET_VIEW_COLOR: string = "AS_VIEW_GET_VIEW_COLOR"; break;
+		case AS_VIEW_PRINT_ALIASING: string = "AS_VIEW_PRINT_ALIASING"; break;
+		case AS_VIEW_CLIP_TO_PICTURE: string = "AS_VIEW_CLIP_TO_PICTURE"; break;
+		case AS_VIEW_GET_CLIP_REGION: string = "AS_VIEW_GET_CLIP_REGION"; break;
+		case AS_VIEW_DRAW_BITMAP: string = "AS_VIEW_DRAW_BITMAP"; break;
+		case AS_VIEW_SET_EVENT_MASK: string = "AS_VIEW_SET_EVENT_MASK"; break;
+		case AS_VIEW_SET_MOUSE_EVENT_MASK: string = "AS_VIEW_SET_MOUSE_EVENT_MASK"; break;
 
-		case AS_LAYER_DRAW_STRING: string = "AS_LAYER_DRAW_STRING"; break;
-		case AS_LAYER_SET_CLIP_REGION: string = "AS_LAYER_SET_CLIP_REGION"; break;
-		case AS_LAYER_LINE_ARRAY: string = "AS_LAYER_LINE_ARRAY"; break;
-		case AS_LAYER_BEGIN_PICTURE: string = "AS_LAYER_BEGIN_PICTURE"; break;
-		case AS_LAYER_APPEND_TO_PICTURE: string = "AS_LAYER_APPEND_TO_PICTURE"; break;
-		case AS_LAYER_END_PICTURE: string = "AS_LAYER_END_PICTURE"; break;
-		case AS_LAYER_COPY_BITS: string = "AS_LAYER_COPY_BITS"; break;
-		case AS_LAYER_DRAW_PICTURE: string = "AS_LAYER_DRAW_PICTURE"; break;
-		case AS_LAYER_INVALIDATE_RECT: string = "AS_LAYER_INVALIDATE_RECT"; break;
-		case AS_LAYER_INVALIDATE_REGION: string = "AS_LAYER_INVALIDATE_REGION"; break;
-		case AS_LAYER_INVERT_RECT: string = "AS_LAYER_INVERT_RECT"; break;
-		case AS_LAYER_MOVE_TO: string = "AS_LAYER_MOVE_TO"; break;
-		case AS_LAYER_RESIZE_TO: string = "AS_LAYER_RESIZE_TO"; break;
-		case AS_LAYER_SET_STATE: string = "AS_LAYER_SET_STATE"; break;
-		case AS_LAYER_SET_FONT_STATE: string = "AS_LAYER_SET_FONT_STATE"; break;
-		case AS_LAYER_GET_STATE: string = "AS_LAYER_GET_STATE"; break;
-		case AS_LAYER_SET_VIEW_BITMAP: string = "AS_LAYER_SET_VIEW_BITMAP"; break;
-		case AS_LAYER_SET_PATTERN: string = "AS_LAYER_SET_PATTERN"; break;
-		case AS_SET_CURRENT_LAYER: string = "AS_SET_CURRENT_LAYER"; break;
+		case AS_VIEW_DRAW_STRING: string = "AS_VIEW_DRAW_STRING"; break;
+		case AS_VIEW_SET_CLIP_REGION: string = "AS_VIEW_SET_CLIP_REGION"; break;
+		case AS_VIEW_LINE_ARRAY: string = "AS_VIEW_LINE_ARRAY"; break;
+		case AS_VIEW_BEGIN_PICTURE: string = "AS_VIEW_BEGIN_PICTURE"; break;
+		case AS_VIEW_APPEND_TO_PICTURE: string = "AS_VIEW_APPEND_TO_PICTURE"; break;
+		case AS_VIEW_END_PICTURE: string = "AS_VIEW_END_PICTURE"; break;
+		case AS_VIEW_COPY_BITS: string = "AS_VIEW_COPY_BITS"; break;
+		case AS_VIEW_DRAW_PICTURE: string = "AS_VIEW_DRAW_PICTURE"; break;
+		case AS_VIEW_INVALIDATE_RECT: string = "AS_VIEW_INVALIDATE_RECT"; break;
+		case AS_VIEW_INVALIDATE_REGION: string = "AS_VIEW_INVALIDATE_REGION"; break;
+		case AS_VIEW_INVERT_RECT: string = "AS_VIEW_INVERT_RECT"; break;
+		case AS_VIEW_MOVE_TO: string = "AS_VIEW_MOVE_TO"; break;
+		case AS_VIEW_RESIZE_TO: string = "AS_VIEW_RESIZE_TO"; break;
+		case AS_VIEW_SET_STATE: string = "AS_VIEW_SET_STATE"; break;
+		case AS_VIEW_SET_FONT_STATE: string = "AS_VIEW_SET_FONT_STATE"; break;
+		case AS_VIEW_GET_STATE: string = "AS_VIEW_GET_STATE"; break;
+		case AS_VIEW_SET_VIEW_BITMAP: string = "AS_VIEW_SET_VIEW_BITMAP"; break;
+		case AS_VIEW_SET_PATTERN: string = "AS_VIEW_SET_PATTERN"; break;
+		case AS_SET_CURRENT_VIEW: string = "AS_SET_CURRENT_VIEW"; break;
 
 		// BDirectWindow codes
 		case AS_DIRECT_WINDOW_GET_SYNC_DATA: string = "AS_DIRECT_WINDOW_GET_SYNC_DATA"; break;

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-08 15:28:31 UTC (rev 24305)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-08 16:44:18 UTC (rev 24306)
@@ -1115,7 +1115,7 @@
 
 		// View creation and destruction (don't need a valid fCurrentView)
 
-		case AS_SET_CURRENT_LAYER:
+		case AS_SET_CURRENT_VIEW:
 		{
 			int32 token;
 			if (link.Read<int32>(&token) != B_OK)
@@ -1126,23 +1126,23 @@
 					(void**)&current) != B_OK
 				|| current->Window()->ServerWindow() != this) {
 				// ToDo: if this happens, we probably want to kill the app and clean up
-				fprintf(stderr, "ServerWindow %s: Message AS_SET_CURRENT_LAYER: view not found, token %ld\n", fTitle, token);
+				fprintf(stderr, "ServerWindow %s: Message AS_SET_CURRENT_VIEW: view not found, token %ld\n", fTitle, token);
 				current = NULL;
 			} else {
-				DTRACE(("ServerWindow %s: Message AS_SET_CURRENT_LAYER: %s, token %ld\n", fTitle, current->Name(), token));
+				DTRACE(("ServerWindow %s: Message AS_SET_CURRENT_VIEW: %s, token %ld\n", fTitle, current->Name(), token));
 				_SetCurrentView(current);
 			}
 			break;
 		}
 
-		case AS_LAYER_CREATE_ROOT:
+		case AS_VIEW_CREATE_ROOT:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_CREATE_ROOT\n", fTitle));
+			STRACE(("ServerWindow %s: Message AS_VIEW_CREATE_ROOT\n", fTitle));
 
 			// Start receiving top_view data -- pass NULL as the parent view.
 			// This should be the *only* place where this happens.
 			if (fCurrentView != NULL) {
-				fprintf(stderr, "ServerWindow %s: Message AS_LAYER_CREATE_ROOT: fCurrentView already set!!\n", fTitle);
+				fprintf(stderr, "ServerWindow %s: Message AS_VIEW_CREATE_ROOT: fCurrentView already set!!\n", fTitle);
 				break;
 			}
 
@@ -1151,16 +1151,16 @@
 			break;
 		}
 
-		case AS_LAYER_CREATE:
+		case AS_VIEW_CREATE:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_CREATE: View name: %s\n", fTitle, fCurrentView->Name()));
+			STRACE(("ServerWindow %s: Message AS_VIEW_CREATE: View name: %s\n", fTitle, fCurrentView->Name()));
 
 			View* parent = NULL;
 			View* newView = _CreateView(link, &parent);
 			if (parent != NULL && newView != NULL)
 				parent->AddChild(newView);
 			else
-				fprintf(stderr, "ServerWindow %s: Message AS_LAYER_CREATE: parent or newView NULL!!\n", fTitle);
+				fprintf(stderr, "ServerWindow %s: Message AS_VIEW_CREATE: parent or newView NULL!!\n", fTitle);
 			break;
 		}
 
@@ -1198,9 +1198,9 @@
 		return;
 
 	switch (code) {
-		case AS_LAYER_SCROLL:
+		case AS_VIEW_SCROLL:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SCROLL: View name: %s\n", fTitle, fCurrentView->Name()));
+			DTRACE(("ServerWindow %s: Message AS_VIEW_SCROLL: View name: %s\n", fTitle, fCurrentView->Name()));
 			float dh;
 			float dv;
 
@@ -1209,7 +1209,7 @@
 			fWindow->ScrollViewBy(fCurrentView, dh, dv);
 			break;
 		}
-		case AS_LAYER_COPY_BITS:
+		case AS_VIEW_COPY_BITS:
 		{
 			BRect src;
 			BRect dst;
@@ -1223,7 +1223,7 @@
 			fCurrentView->CopyBits(src, dst, contentRegion);
 			break;
 		}
-		case AS_LAYER_DELETE:
+		case AS_VIEW_DELETE:
 		{
 			// Received when a view is detached from a window
 
@@ -1237,7 +1237,7 @@
 				&& view->Window()->ServerWindow() == this) {
 				View* parent = view->Parent();
 
-				STRACE(("ServerWindow %s: AS_LAYER_DELETE view: %p, parent: %p\n",
+				STRACE(("ServerWindow %s: AS_VIEW_DELETE view: %p, parent: %p\n",
 					fTitle, view, parent));
 
 				if (parent != NULL) {
@@ -1260,9 +1260,9 @@
 			}
 			break;
 		}
-		case AS_LAYER_SET_STATE:
+		case AS_VIEW_SET_STATE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_STATE: View name: %s\n", fTitle, fCurrentView->Name()));
+			DTRACE(("ServerWindow %s: Message AS_VIEW_SET_STATE: View name: %s\n", fTitle, fCurrentView->Name()));
 
 			fCurrentView->CurrentState()->ReadFromLink(link);
 			// TODO: When is this used?!?
@@ -1271,17 +1271,17 @@
 
 			break;
 		}
-		case AS_LAYER_SET_FONT_STATE:
+		case AS_VIEW_SET_FONT_STATE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_FONT_STATE: View name: %s\n", fTitle, fCurrentView->Name()));
+			DTRACE(("ServerWindow %s: Message AS_VIEW_SET_FONT_STATE: View name: %s\n", fTitle, fCurrentView->Name()));
 			fCurrentView->CurrentState()->ReadFontFromLink(link);
 			fWindow->GetDrawingEngine()->SetFont(
 				fCurrentView->CurrentState());
 			break;
 		}
-		case AS_LAYER_GET_STATE:
+		case AS_VIEW_GET_STATE:
 		{
-			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_STATE: View name: %s\n", fTitle, fCurrentView->Name()));
+			DTRACE(("ServerWindow %s: Message AS_VIEW_GET_STATE: View name: %s\n", fTitle, fCurrentView->Name()));
 
 			fLink.StartMessage(B_OK);
 
@@ -1290,9 +1290,9 @@
 			fLink.Flush();
 			break;
 		}
-		case AS_LAYER_SET_EVENT_MASK:
+		case AS_VIEW_SET_EVENT_MASK:
 		{
-			STRACE(("ServerWindow %s: Message AS_LAYER_SET_EVENT_MASK: View name: %s\n", fTitle, fCurrentView->Name()));			
+			STRACE(("ServerWindow %s: Message AS_VIEW_SET_EVENT_MASK: View name: %s\n", fTitle, fCurrentView->Name()));			
 			uint32 eventMask, options;
 

[... truncated: 764 lines follow ...]


From axeld at pinc-software.de  Sat Mar  8 17:49:04 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sat, 08 Mar 2008 17:49:04 +0100 CET
Subject: [Haiku-commits] r24299 - haiku/trunk/src/servers/app
In-Reply-To: <f019d2f30803080644t65853373ke5136763208d0b3d@mail.gmail.com>
Message-ID: <27420712325-BeMail@zon>

"Rene Gollent" <anevilyak at gmail.com> wrote:
> >  Log:
> >  Fixed warnings.
> Just curious, what compiler gave you a warning on that, and what was
> it? Neither gcc2 nor gcc4 on linux said anything for me.

Ahh, compilers :-)
GCC 2 on BeOS gave me that warning; it seems to be quite usual that 
different GCC compilers on different platforms give different warnings. 
That's very annoying if you ask me.

Bye,
   Axel.



From stippi at mail.berlios.de  Sat Mar  8 18:36:21 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 8 Mar 2008 18:36:21 +0100
Subject: [Haiku-commits] r24307 - haiku/trunk/src/servers/app
Message-ID: <200803081736.m28HaLUq002864@sheep.berlios.de>

Author: stippi
Date: 2008-03-08 18:36:15 +0100 (Sat, 08 Mar 2008)
New Revision: 24307
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24307&view=rev

Modified:
   haiku/trunk/src/servers/app/RenderingBuffer.h
Log:
RenderingBuffer returns IntRect in Bounds() now. Should have been
part of an earlier commit...


Modified: haiku/trunk/src/servers/app/RenderingBuffer.h
===================================================================
--- haiku/trunk/src/servers/app/RenderingBuffer.h	2008-03-08 16:44:18 UTC (rev 24306)
+++ haiku/trunk/src/servers/app/RenderingBuffer.h	2008-03-08 17:36:15 UTC (rev 24307)
@@ -4,7 +4,7 @@
 #define RENDERING_BUFFER_H
 
 #include <GraphicsDefs.h>
-#include <Rect.h>
+#include "IntRect.h"
 
 class RenderingBuffer {
  public:
@@ -24,10 +24,9 @@
 	inline	uint32				BitsLength() const
 									{ return Height() * BytesPerRow(); }
 
-	inline	BRect				Bounds() const
-									{ return BRect(0.0, 0.0,
-												   Width() - 1,
-												   Height() - 1); }
+	inline	IntRect				Bounds() const
+									{ return IntRect(0, 0, Width() - 1,
+										Height() - 1); }
 };
 
 #endif // RENDERING_BUFFER_H



From stippi at mail.berlios.de  Sat Mar  8 18:41:41 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 8 Mar 2008 18:41:41 +0100
Subject: [Haiku-commits] r24308 - haiku/trunk/src/servers/app
Message-ID: <200803081741.m28Hff1P011405@sheep.berlios.de>

Author: stippi
Date: 2008-03-08 18:41:24 +0100 (Sat, 08 Mar 2008)
New Revision: 24308
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24308&view=rev

Modified:
   haiku/trunk/src/servers/app/OffscreenWindow.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/Window.cpp
   haiku/trunk/src/servers/app/Window.h
Log:
* When allocating a new Window, check the allocation of the DrawingEngine
  instance by introducing Window::InitCheck(), use new (nothrow).
* Window is responsible for the DrawingEngine instance, but forgot to delete
  it.
* OffscreenWindow is no longer special, every Window owns a DrawingEngine,
  no need to delete it anymore, but since it already deletes the HWInterface
  instance, it needs to detach the DrawingEngine from it.
* Use new (nothrow) in OffscreenWindow as well.


Modified: haiku/trunk/src/servers/app/OffscreenWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/OffscreenWindow.cpp	2008-03-08 17:36:15 UTC (rev 24307)
+++ haiku/trunk/src/servers/app/OffscreenWindow.cpp	2008-03-08 17:41:24 UTC (rev 24308)
@@ -9,6 +9,7 @@
 
 #include "OffscreenWindow.h"
 
+#include <new>
 #include <stdio.h>
 
 #include <Debug.h>
@@ -17,15 +18,20 @@
 #include "DrawingEngine.h"
 #include "ServerBitmap.h"
 
+using std::nothrow;
 
+
 OffscreenWindow::OffscreenWindow(ServerBitmap* bitmap,
 		const char* name, ::ServerWindow* window)
 	: Window(bitmap->Bounds(), name,
 			B_NO_BORDER_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
-			0, 0, window, new DrawingEngine()),
+			0, 0, window, new (nothrow) DrawingEngine()),
 	fBitmap(bitmap),
-	fHWInterface(new BitmapHWInterface(fBitmap))
+	fHWInterface(new (nothrow) BitmapHWInterface(fBitmap))
 {
+	if (!fHWInterface || !GetDrawingEngine())
+		return;
+
 	fHWInterface->Initialize();
 	GetDrawingEngine()->SetHWInterface(fHWInterface);
 
@@ -39,11 +45,14 @@
 
 OffscreenWindow::~OffscreenWindow()
 {
-	fHWInterface->LockExclusiveAccess();
-	// Unlike normal windows, we own the DrawingEngine instance
-	delete GetDrawingEngine();
-	fHWInterface->Shutdown();
-	fHWInterface->UnlockExclusiveAccess();
-	delete fHWInterface;
+	if (GetDrawingEngine())
+		GetDrawingEngine()->SetHWInterface(NULL);
+
+	if (fHWInterface) {
+		fHWInterface->LockExclusiveAccess();
+		fHWInterface->Shutdown();
+		fHWInterface->UnlockExclusiveAccess();
+		delete fHWInterface;
+	}
 }
 

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-08 17:36:15 UTC (rev 24307)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-08 17:41:24 UTC (rev 24308)
@@ -282,8 +282,11 @@
 	// We cannot call MakeWindow in the constructor, since it
 	// is a virtual function!
 	fWindow = MakeWindow(frame, fTitle, look, feel, flags, workspace);
-	if (!fWindow)
+	if (!fWindow || fWindow->InitCheck() != B_OK) {
+		delete fWindow;
+		fWindow = NULL;
 		return B_NO_MEMORY;
+	}
 
 	if (!fWindow->IsOffscreenWindow()) {
 		fDesktop->AddWindow(fWindow);
@@ -2999,7 +3002,7 @@
 	// The non-offscreen ServerWindow uses the DrawingEngine instance from
 	// the desktop.
 	return new (nothrow) ::Window(frame, name, look, feel, flags,
-		workspace, this, new DrawingEngine(fDesktop->HWInterface()));
+		workspace, this, new (nothrow) DrawingEngine(fDesktop->HWInterface()));
 }
 
 

Modified: haiku/trunk/src/servers/app/Window.cpp
===================================================================
--- haiku/trunk/src/servers/app/Window.cpp	2008-03-08 17:36:15 UTC (rev 24307)
+++ haiku/trunk/src/servers/app/Window.cpp	2008-03-08 17:41:24 UTC (rev 24308)
@@ -175,14 +175,27 @@
 
 Window::~Window()
 {
-	if (fTopView)
+	if (fTopView) {
 		fTopView->DetachedFromWindow();
+		delete fTopView;
+	}
 
-	delete fTopView;
 	delete fDecorator;
+
+	delete fDrawingEngine;
 }
 
 
+status_t
+Window::InitCheck() const
+{
+	if (!fDrawingEngine)
+		return B_NO_MEMORY;
+	// TODO: anything else?
+	return B_OK;
+}
+
+
 void
 Window::SetClipping(BRegion* stillAvailableOnScreen)
 {

Modified: haiku/trunk/src/servers/app/Window.h
===================================================================
--- haiku/trunk/src/servers/app/Window.h	2008-03-08 17:36:15 UTC (rev 24307)
+++ haiku/trunk/src/servers/app/Window.h	2008-03-08 17:41:24 UTC (rev 24308)
@@ -50,6 +50,8 @@
 									DrawingEngine* drawingEngine);
 	virtual						~Window();
 
+			status_t			InitCheck() const;
+
 			BRect				Frame() const { return fFrame; }
 			const char*			Title() const { return fTitle.String(); }
 



From axeld at mail.berlios.de  Sat Mar  8 18:44:41 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 8 Mar 2008 18:44:41 +0100
Subject: [Haiku-commits] r24309 - haiku/trunk/src/kits/network
Message-ID: <200803081744.m28Hif1I015782@sheep.berlios.de>

Author: axeld
Date: 2008-03-08 18:44:39 +0100 (Sat, 08 Mar 2008)
New Revision: 24309
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24309&view=rev

Modified:
   haiku/trunk/src/kits/network/socket.cpp
Log:
Minor cleanup.


Modified: haiku/trunk/src/kits/network/socket.cpp
===================================================================
--- haiku/trunk/src/kits/network/socket.cpp	2008-03-08 17:41:24 UTC (rev 24308)
+++ haiku/trunk/src/kits/network/socket.cpp	2008-03-08 17:44:39 UTC (rev 24309)
@@ -63,8 +63,8 @@
 	const r5_sockaddr_in *from = (r5_sockaddr_in *)_from;
 	sockaddr_in *to = (sockaddr_in *)_to;
 
-	memset(to, 0, sizeof(*to));
-	to->sin_len = sizeof(*to);
+	memset(to, 0, sizeof(sockaddr));
+	to->sin_len = sizeof(sockaddr);
 
 	if (from == NULL)
 		return;
@@ -80,7 +80,8 @@
 
 
 static void
-convert_to_r5_sockaddr(struct sockaddr *_to, const struct sockaddr *_from)
+convert_to_r5_sockaddr(struct sockaddr *_to,
+	const struct sockaddr *_from)
 {
 	const sockaddr_in *from = (sockaddr_in *)_from;
 	r5_sockaddr_in *to = (r5_sockaddr_in *)_to;
@@ -88,7 +89,8 @@
 	if (to == NULL)
 		return;
 
-	memset(to, 0, sizeof(*to));
+	memset(to, 0, sizeof(r5_sockaddr_in));
+
 	if (from->sin_family == AF_INET)
 		to->sin_family = R5_AF_INET;
 	else



From axeld at mail.berlios.de  Sat Mar  8 18:51:26 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 8 Mar 2008 18:51:26 +0100
Subject: [Haiku-commits] r24310 -
	haiku/trunk/src/add-ons/kernel/drivers/network/stack
Message-ID: <200803081751.m28HpQUk026527@sheep.berlios.de>

Author: axeld
Date: 2008-03-08 18:51:23 +0100 (Sat, 08 Mar 2008)
New Revision: 24310
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24310&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/network/stack/kernel_stack.cpp
Log:
* return_address() did not take the original sockaddr length into account;
  it always copied the whole new address, no matter how large the original
  buffer was. That fixes bug #1898.
* Minor cleanup.


Modified: haiku/trunk/src/add-ons/kernel/drivers/network/stack/kernel_stack.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/stack/kernel_stack.cpp	2008-03-08 17:44:39 UTC (rev 24309)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/stack/kernel_stack.cpp	2008-03-08 17:51:23 UTC (rev 24310)
@@ -60,15 +60,21 @@
 return_address(ArgType &args, void *data)
 {
 	sockaddr_storage *target;
+	socklen_t length;
 
-	if (user_memcpy(&target, &((ArgType *)data)->address, sizeof(void *)) < B_OK)
+	if (user_memcpy(&target, &((ArgType *)data)->address, sizeof(void *))
+			< B_OK
+		|| user_memcpy(&length, &((ArgType *)data)->address_length,
+			sizeof(socklen_t)) < B_OK)
 		return B_BAD_ADDRESS;
 
 	if (target == NULL)
 		return B_OK;
 
-	if (user_memcpy(&((ArgType *)data)->address_length, &args.address_length, sizeof(socklen_t)) < B_OK
-		|| user_memcpy(target, args.address, args.address_length) < B_OK)
+	if (user_memcpy(&((ArgType *)data)->address_length, &args.address_length,
+			sizeof(socklen_t)) < B_OK
+		|| user_memcpy(target, args.address, min_c(length, args.address_length))
+			< B_OK)
 		return B_BAD_ADDRESS;
 
 	return B_OK;
@@ -76,8 +82,8 @@
 
 
 template<typename ArgType> status_t
-check_args_and_address(ArgType &args, sockaddr_storage &address, void *data, size_t length,
-	bool copyAddress = true)
+check_args_and_address(ArgType &args, sockaddr_storage &address, void *data,
+	size_t length, bool copyAddress = true)
 {
 	if (data == NULL || length != sizeof(ArgType))
 		return B_BAD_VALUE;
@@ -88,7 +94,8 @@
 	if (copyAddress && args.address_length > sizeof(sockaddr_storage))
 		return B_BAD_VALUE;
 
-	if (copyAddress && user_memcpy(&address, args.address, args.address_length) < B_OK)
+	if (copyAddress
+		&& user_memcpy(&address, args.address, args.address_length) < B_OK)
 		return B_BAD_ADDRESS;
 
 	args.address = (sockaddr *)&address;
@@ -121,7 +128,8 @@
 				return B_BAD_VALUE;
 
 			if (header.msg_name != NULL) {
-				status = user_memcpy(&address, header.msg_name, header.msg_namelen);
+				status = user_memcpy(&address, header.msg_name,
+					header.msg_namelen);
 				if (status < B_OK)
 					return B_BAD_ADDRESS;
 			}
@@ -347,7 +355,8 @@
 				if (status < B_OK)
 					return status;
 
-				status = sSocket->get_next_stat(&args.cookie, args.family, &args.stat);
+				status = sSocket->get_next_stat(&args.cookie, args.family,
+					&args.stat);
 				if (status < B_OK)
 					return status;
 
@@ -381,7 +390,8 @@
 				if (status < B_OK)
 					return status;
 
-				return sSocket->bind(cookie->socket, args.address, args.address_length);
+				return sSocket->bind(cookie->socket, args.address,
+					args.address_length);
 			}
 
 			case NET_STACK_LISTEN:
@@ -582,7 +592,8 @@
 	if (cookie->socket == NULL)
 		return B_BAD_VALUE;
 
-	ssize_t bytesRead = sSocket->receive(cookie->socket, NULL, buffer, *_length, 0);
+	ssize_t bytesRead = sSocket->receive(cookie->socket, NULL, buffer, *_length,
+		0);
 	if (bytesRead < 0) {
 		*_length = 0;
 		return bytesRead;
@@ -609,7 +620,8 @@
 
 
 static status_t
-net_stack_write(void *_cookie, off_t /*offset*/, const void *buffer, size_t *_length)
+net_stack_write(void *_cookie, off_t /*offset*/, const void *buffer,
+	size_t *_length)
 {
 	net_stack_cookie *cookie = (net_stack_cookie *)_cookie;
 
@@ -618,7 +630,8 @@
 	if (cookie->socket == NULL)
 		return B_BAD_VALUE;
 
-	ssize_t bytesWritten = sSocket->send(cookie->socket, NULL, buffer, *_length, 0);
+	ssize_t bytesWritten = sSocket->send(cookie->socket, NULL, buffer, *_length,
+		0);
 	if (bytesWritten < 0) {
 		*_length = 0;
 		return bytesWritten;



From mmu_man at mail.berlios.de  Sat Mar  8 19:16:50 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sat, 8 Mar 2008 19:16:50 +0100
Subject: [Haiku-commits] r24311 - haiku/trunk/src/bin/network/ifconfig
Message-ID: <200803081816.m28IGoht021332@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-08 19:16:49 +0100 (Sat, 08 Mar 2008)
New Revision: 24311
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24311&view=rev

Modified:
   haiku/trunk/src/bin/network/ifconfig/ifconfig.cpp
Log:
On request implemented setting media type.


Modified: haiku/trunk/src/bin/network/ifconfig/ifconfig.cpp
===================================================================
--- haiku/trunk/src/bin/network/ifconfig/ifconfig.cpp	2008-03-08 17:51:23 UTC (rev 24310)
+++ haiku/trunk/src/bin/network/ifconfig/ifconfig.cpp	2008-03-08 18:16:49 UTC (rev 24311)
@@ -88,6 +88,89 @@
 //	#pragma mark -
 
 
+struct media_type {
+	int			type;
+	const char*	name;
+	const char* pretty;
+	struct {
+		int subtype;
+		const char* name;
+		const char* pretty;
+	} subtypes [6];
+	struct {
+		int option;
+		bool ro;
+		const char* name;
+		const char* pretty;
+	} options [6];
+};
+
+
+static const media_type kMediaTypes[] = {
+	{
+		0, // for generic options
+		"all",
+		"All",
+		{
+			{ IFM_AUTO, "auto", "Auto-select" },
+			{ -1, NULL, NULL }
+		},
+		{
+			{ IFM_FULL_DUPLEX, true, "fullduplex", "Full Duplex" },
+			{ IFM_HALF_DUPLEX, true, "halfduplex", "Half Duplex" },
+			{ IFM_LOOP, true, "loop", "Loop" },
+			//{ IFM_ACTIVE, false, "active", "Active" },
+			{ -1, false, NULL, NULL }
+		}
+	},
+	{
+		IFM_ETHER,
+		"ether",
+		"Ethernet",
+		{
+			//{ IFM_AUTO, "auto", "Auto-select" },
+			//{ IFM_AUI, "AUI", "10 MBit, AUI" },
+			//{ IFM_10_2, "10base2", "10 MBit, 10BASE-2" },
+			{ IFM_10_T, "10baseT", "10 MBit, 10BASE-T" },
+			{ IFM_100_TX, "100baseTX", "100 MBit, 100BASE-TX" },
+			{ IFM_1000_T, "1000baseT", "1 GBit, 1000BASE-T" },
+			{ IFM_1000_SX, "1000baseSX", "1 GBit, 1000BASE-SX" },
+			{ -1, NULL, NULL }
+		},
+		{
+			{ -1, false, NULL, NULL }
+		}
+	},
+	{ -1, NULL, NULL, {{ -1, NULL, NULL }}, {{ -1, false, NULL, NULL }} }
+};
+
+
+static bool media_parse_subtype(const char* string, int media, int* type);
+
+
+static bool
+media_parse_subtype(const char* string, int media, int* type)
+{
+	for (int32 i = 0; kMediaTypes[i].type >= 0; i++) {
+		// only check for generic or correct subtypes
+		if (kMediaTypes[i].type && 
+			kMediaTypes[i].type != media)
+			continue;
+		for (int32 j = 0; kMediaTypes[i].subtypes[j].subtype >= 0; j++) {
+			if (strcmp(kMediaTypes[i].subtypes[j].name, string) == 0) {
+				// found a match
+				*type = kMediaTypes[i].subtypes[j].subtype;
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+
+//	#pragma mark -
+
+
 void
 usage(int status)
 {
@@ -99,10 +182,18 @@
 		"  peer <addr>      - ppp-peer address\n"
 		"  mtu <bytes>      - maximal transfer unit\n"
 		"  metric <number>  - metric number to use (defaults to 0)\n"
-		"And <flags> can be: up, down, [-]promisc, [-]allmulti, [-]bcast, loopback\n\n"
+		"  media <media>    - media type to use (defaults to auto)\n",
+		kProgramName, kProgramName);
+	for (int32 i = 0; kMediaTypes[i].type >= 0; i++) {
+		printf("For %s <media> can be one of: ", kMediaTypes[i].pretty);
+		for (int32 j = 0; kMediaTypes[i].subtypes[j].subtype >= 0; j++)
+			printf("%s ", kMediaTypes[i].subtypes[j].name);
+		printf("\n");
+	}
+	printf("And <flags> can be: up, down, [-]promisc, [-]allmulti, [-]bcast, loopback\n\n"
 		"Example:\n"
 		"\t%s loop 127.0.0.1 255.0.0.0 up\n",
-		kProgramName, kProgramName, kProgramName);
+		kProgramName);
 
 	exit(status);
 }
@@ -218,32 +309,24 @@
 		&& (request.ifr_media & IFM_ACTIVE) != 0) {
 		// dump media state in case we're linked
 		const char* type = "unknown";
-		bool show = true;
+		bool show = false;
 
-		switch (IFM_TYPE(request.ifr_media)) {
-			case IFM_ETHER:
-				switch (IFM_SUBTYPE(request.ifr_media)) {
-					case IFM_AUTO:
-						type = "Auto-select";
-						break;
-					case IFM_10_T:
-						type = "10 MBit, 10BASE-T";
-						break;
-					case IFM_100_TX:
-						type = "100 MBit, 100BASE-TX";
-						break;
-					case IFM_1000_T:
-						type = "1 GBit, 1000BASE-T";
-						break;
-					case IFM_1000_SX:
-						type = "1 GBit, 1000BASE-SX";
-						break;
+		for (int32 i = 0; kMediaTypes[i].type >= 0; i++) {
+			// loopback don't really have a media anyway
+			if (IFM_TYPE(request.ifr_media) == 0/*IFT_LOOP*/)
+				break;
+			// only check for generic or correct subtypes
+			if (kMediaTypes[i].type && 
+				kMediaTypes[i].type != IFM_TYPE(request.ifr_media))
+				continue;
+			for (int32 j = 0; kMediaTypes[i].subtypes[j].subtype >= 0; j++) {
+				if (kMediaTypes[i].subtypes[j].subtype == IFM_SUBTYPE(request.ifr_media)) {
+					// found a match
+					type = kMediaTypes[i].subtypes[j].pretty;
+					show = true;
+					break;
 				}
-				break;
-
-			default:
-				show = false;
-				break;
+			}
 		}
 
 		if (show)
@@ -416,7 +499,8 @@
 
 	bool hasAddress = false, hasMask = false, hasPeer = false, hasBroadcast = false;
 	struct sockaddr address, mask, peer, broadcast;
-	int mtu = -1, metric = -1, addFlags = 0, removeFlags = 0, currentFlags = 0;
+	int mtu = -1, metric = -1, media = -1;
+	int addFlags = 0, removeFlags = 0, currentFlags = 0;
 
 	// try to parse address family
 
@@ -517,6 +601,23 @@
 			}
 			metric = strtol(args[i + 1], NULL, 0);
 			i++;
+		} else if (!strcmp(args[i], "media")) {
+			if (ioctl(socket, SIOCGIFMEDIA, &request, sizeof(struct ifreq)) < 0) {
+				fprintf(stderr, "%s: Unable to detect media type\n",
+					kProgramName);
+				exit(1);
+			}
+			if (i + 1 >= argCount) {
+				fprintf(stderr, "%s: Option 'media' exptected parameter\n",
+					kProgramName);
+				exit(1);
+			}
+			if (!media_parse_subtype(args[i + 1], IFM_TYPE(request.ifr_media), &media)) {
+				fprintf(stderr, "%s: Invalid parameter for option 'media': '%s'\n",
+					kProgramName, args[i + 1]);
+				exit(1);
+			}
+			i++;
 		} else if (!strcmp(args[i], "up") || !strcmp(args[i], "-down")) {
 			addFlags |= IFF_UP;
 		} else if (!strcmp(args[i], "down") || !strcmp(args[i], "-up")) {
@@ -611,6 +712,12 @@
 		if (ioctl(socket, SIOCSIFMETRIC, &request, sizeof(struct ifreq)) < 0)
 			fprintf(stderr, "%s: Setting metric failed: %s\n", kProgramName, strerror(errno));
 	}
+
+	if (media != -1) {
+		request.ifr_media = media;
+		if (ioctl(socket, SIOCSIFMEDIA, &request, sizeof(struct ifreq)) < 0)
+			fprintf(stderr, "%s: Setting media failed: %s\n", kProgramName, strerror(errno));
+	}
 }
 
 



From axeld at mail.berlios.de  Sat Mar  8 20:05:10 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 8 Mar 2008 20:05:10 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
Message-ID: <200803081905.m28J5Aec018941@sheep.berlios.de>

Author: axeld
Date: 2008-03-08 20:05:09 +0100 (Sat, 08 Mar 2008)
New Revision: 24312
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24312&view=rev

Modified:
   haiku/trunk/headers/os/support/String.h
   haiku/trunk/src/kits/support/String.cpp
Log:
* Fixed a bunch or concurreny bugs and memory leaks of the new reference
  string stuff.
* It's still not thread-safe for all usage patterns, though, so we might want
  to remove or disable it: if a string is shared between several threads, and
  one of those starts to use a reference, all kinds of problems can happen.
* Some cleanup.


Modified: haiku/trunk/headers/os/support/String.h
===================================================================
--- haiku/trunk/headers/os/support/String.h	2008-03-08 18:16:49 UTC (rev 24311)
+++ haiku/trunk/headers/os/support/String.h	2008-03-08 19:05:09 UTC (rev 24312)
@@ -26,7 +26,6 @@
 	const char*	String() const;
 	int32 		Length() const;
 	int32		CountChars() const;
-	int32 		ReferenceCount() const;
 
 	// Assignment
 	BString&	operator=(const BString& string);
@@ -231,7 +230,6 @@
 
 	// Data
 	void		_SetLength(int32 length);
-	void		_SetReferenceCount(int32 count);
 	bool		_DoAppend(const char* string, int32 length);
 	bool		_DoPrepend(const char* string, int32 length);
 	bool		_DoInsert(const char* string, int32 offset, int32 length);
@@ -256,7 +254,11 @@
 					const char* with, int32 withLen);
 
 private:
-	char*	            fPrivateData;
+	inline int32& 	_ReferenceCount();
+	bool			_IsShareable();
+	void			_FreePrivateData();
+
+	char*			fPrivateData;
 };
 
 
@@ -294,13 +296,6 @@
 }
 
 
-inline int32
-BString::ReferenceCount() const
-{
-	return fPrivateData ? (*(((int32 *)fPrivateData) - 2)) : 1;
-}
-
-
 inline BString &
 BString::SetTo(const char* string)
 {
@@ -441,8 +436,7 @@
 //	#pragma mark - BStringRef
 
 
-class BStringRef
-{
+class BStringRef {
 public:
 	BStringRef(BString& string, int32 position);
 	~BStringRef() {}
@@ -453,7 +447,7 @@
 	const char* operator&() const;
 
 	BStringRef& operator=(char c);
-	BStringRef &operator=(const BStringRef &rc);
+	BStringRef& operator=(const BStringRef& rc);
 
 private:
 	BString&	fString;

Modified: haiku/trunk/src/kits/support/String.cpp
===================================================================
--- haiku/trunk/src/kits/support/String.cpp	2008-03-08 18:16:49 UTC (rev 24311)
+++ haiku/trunk/src/kits/support/String.cpp	2008-03-08 19:05:09 UTC (rev 24312)
@@ -6,11 +6,11 @@
 *		Marc Flerackers (mflerackers at androme.be)
 *		Stefano Ceccherini (burton666 at libero.it)
 *		Oliver Tappe (openbeos at hirschkaefer.de)
-*		Axel D?rfler, axeld at pinc-software.de
+*		Axel D??rfler, axeld at pinc-software.de
 *		Julun <host.haiku at gmx.de>
 */
 
-/* String class supporting common string operations. */
+/*! String class supporting common string operations. */
 
 
 #include <Debug.h>
@@ -32,6 +32,8 @@
 #define REPLACE_ALL 0x7FFFFFFF
 
 
+const uint32 kPrivateDataOffset = 2 * sizeof(int32);
+
 const char *B_EMPTY_STRING = "";
 
 
@@ -146,7 +148,7 @@
 const char*
 BStringRef::operator&() const
 {
-	return &(fString.fPrivateData[fPosition]);
+	return &fString.fPrivateData[fPosition];
 }
 
 
@@ -154,8 +156,9 @@
 BStringRef::operator&()
 {
 	fString._Detach();
-	fString._SetReferenceCount(-1);
-	return &(fString.fPrivateData[fPosition]);
+	fString._ReferenceCount() = -1;
+		// mark as unsharable
+	return &fString.fPrivateData[fPosition];
 }
 
 
@@ -180,11 +183,12 @@
 	: fPrivateData(NULL)
 {
 	// check if source is sharable - if so, share else clone
-	if (atomic_get(&(*(((vint32*)string.fPrivateData) - 2))) >= 0) {
+	if (_IsShareable()) {
 		fPrivateData = string.fPrivateData;
-		atomic_add(&(*(((vint32*)fPrivateData) - 2)), 1);
+		atomic_add(&_ReferenceCount(), 1);
+			// string cannot go away right now
 	} else
-		fPrivateData = _Clone(string.fPrivateData, string.Length());
+		_Init(string.String(), string.Length());
 }
 
 
@@ -197,8 +201,8 @@
 
 BString::~BString()
 {
-	if (atomic_add(&(*(((vint32*)fPrivateData) - 2)), -1) < 1)
-		free(fPrivateData - (2 * sizeof(int32)));
+	if (!_IsShareable() || atomic_add(&_ReferenceCount(), -1) == 1)
+		_FreePrivateData();
 }
 
 
@@ -268,27 +272,23 @@
 	if (fPrivateData == string.fPrivateData)
 		return *this;
 
-	// check if we are shared by someone else
-	if (atomic_get(&(*(((vint32*)fPrivateData) - 2))) > 1) {
-		// we share our data with someone else
-		if (atomic_add(&(*((vint32*)fPrivateData - 2)), -1) < 1) {
-			// someone else decrement, we are the last owner
-			free(fPrivateData - (2 * sizeof(int32)));
-		} else {
-			; // there is still someone who shares our data
-		}
-	} else {
-		// we don't share our data with someone else
-		// or we are marked as unsharable, but this will go away
-		free(fPrivateData - (2 * sizeof(int32)));
+	bool freeData = true;
+
+	if (_IsShareable() && atomic_add(&_ReferenceCount(), -1) > 1) {
+		// there is still someone who shares our data
+		freeData = false;
 	}
 
+	if (freeData)
+		_FreePrivateData();
+
 	// if source is sharable share, otherwise clone
-	if (atomic_get(&(*(((vint32*)string.fPrivateData) - 2))) >= 0) {
+	if (_IsShareable()) {
 		fPrivateData = string.fPrivateData;
-		atomic_add(&(*(((vint32*)fPrivateData) - 2)), 1);
+		atomic_add(&_ReferenceCount(), 1);
+			// the string cannot go away right now
 	} else
-		fPrivateData = _Clone(string.fPrivateData, string.Length());
+		_Init(string.String(), string.Length());
 
 	return *this;
 }
@@ -309,10 +309,10 @@
 {
 	if (fPrivateData != string.fPrivateData
 		// make sure we reassing in case length is different
-		|| (fPrivateData == string.fPrivateData && Length() != maxLength)) {
-			maxLength = min_clamp0(maxLength, string.Length());
-			if (_DetachWith("", maxLength) == B_OK)
-				memcpy(fPrivateData, string.fPrivateData, maxLength);
+		|| (fPrivateData == string.fPrivateData && Length() > maxLength)) {
+		maxLength = min_clamp0(maxLength, string.Length());
+		if (_DetachWith("", maxLength) == B_OK)
+			memcpy(fPrivateData, string.String(), maxLength);
 	}
 	return *this;
 }
@@ -1384,7 +1384,7 @@
 BString::operator[](int32 index)
 {
 	_Detach();
-	_SetReferenceCount(-1);
+	_ReferenceCount() = -1;
 
 	return fPrivateData[index];
 }
@@ -1643,24 +1643,27 @@
 //	#pragma mark - Private or reserved
 
 
+/*!	Detaches this string from an eventually shared fPrivateData.
+*/
 status_t
 BString::_Detach()
 {
 	char* newData = fPrivateData;
-	if (atomic_get(&(*(((vint32*)fPrivateData - 2)))) > 1) {
-		// we share our data with someone else
-		if (atomic_add(&(*(((vint32*)fPrivateData) - 2)), -1) < 1) {
-			; // someone else decrement, we are the last owner
-		} else {
-			// there is still someone who shares our data
-			newData = _Clone(fPrivateData, Length());
+
+	// TODO: this is not thread safe! A string could be used in than one
+	// thread at a time (and one of those threads could create a ref)
+	if (atomic_get(&_ReferenceCount()) > 1) {
+		// It might be shared, and this requires special treatment
+		newData = _Clone(fPrivateData, Length());
+		if (atomic_add(&_ReferenceCount(), -1) == 1) {
+			// someone else left, we were the last owner
+			_FreePrivateData();
 		}
-	} else {
-		; // we don't share our data with someone else
 	}
 
 	if (newData)
 		fPrivateData = newData;
+
 	return newData != NULL ? B_OK : B_NO_MEMORY;
 }
 
@@ -1671,20 +1674,18 @@
 	if (length == Length())
 		return fPrivateData;
 
-	int32 offset = 2 * sizeof(int32);
-	char *dataPtr = fPrivateData ? fPrivateData - offset : NULL;
+	char *dataPtr = fPrivateData ? fPrivateData - kPrivateDataOffset : NULL;
 	if (length < 0)
 		length = 0;
 
-	dataPtr = (char*)realloc(dataPtr, length + offset + 1);
+	dataPtr = (char*)realloc(dataPtr, length + kPrivateDataOffset + 1);
 	if (dataPtr) {
-		dataPtr += offset;
+		dataPtr += kPrivateDataOffset;
 
 		fPrivateData = dataPtr;
 		fPrivateData[length] = '\0';
 
 		_SetLength(length);
-		_SetReferenceCount(1);
 	}
 	return dataPtr;
 }
@@ -1694,41 +1695,33 @@
 BString::_Init(const char* src, int32 length)
 {
 	fPrivateData = _Clone(src, length);
-	if (!fPrivateData) {
-		int32 offset = 2 * sizeof(int32);
-		fPrivateData = (char *)realloc(fPrivateData, offset + 1);
-
-		fPrivateData += offset;
-		fPrivateData[0] = '\0';
-
-		_SetLength(0);
-		_SetReferenceCount(1);
-	}
+	if (fPrivateData == NULL)
+		fPrivateData = _Clone(NULL, 0);
 }
 
 
 char*
 BString::_Clone(const char* data, int32 length)
 {
-	char* newData = NULL;
-	int32 offset = 2 * sizeof(int32);
-	newData = (char *)realloc(newData, length + offset + 1);
+	char* newData = (char *)malloc(length + kPrivateDataOffset + 1);
+	if (newData == NULL)
+		return NULL;
 
-	if (newData) {
-		newData += offset;
-		newData[length] = '\0';
+	newData += kPrivateDataOffset;
+	newData[length] = '\0';
 
-		*(((vint32*)newData) - 2) = 1;
-		*(((int32*)newData) - 1) = length & 0x7fffffff;
+	// initialize reference count & length
+	*(((vint32*)newData) - 2) = 1;
+	*(((int32*)newData) - 1) = length & 0x7fffffff;
 
-		if (data && length)
-			memcpy(newData, data, length);
-	}
+	if (data && length)
+		memcpy(newData, data, length);
+
 	return newData;
 }
 
 
-char *
+char*
 BString::_OpenAtBy(int32 offset, int32 length)
 {
 	int32 oldLength = Length();
@@ -1759,14 +1752,14 @@
 BString::_DetachWith(const char* string, int32 length)
 {
 	char* newData = NULL;
-	if (atomic_get(&(*(((vint32*)fPrivateData) - 2))) > 1) {
-		// we share our data with someone else
-		if (atomic_add(&(*(((vint32*)fPrivateData) - 2)), -1) < 1) {
-			// someone else decrement, we are the last owner
-			newData = _Realloc(length);
-		} else {
-			// there is still someone who shares our data
-			newData = _Clone(string, length);
+	// TODO: this is not thread safe! A string could be used in than one
+	// thread at a time (and one of those threads could create a ref)
+	if (atomic_get(&_ReferenceCount()) > 1) {
+		// we might share our data with someone else
+		newData = _Clone(string, length);
+		if (atomic_add(&_ReferenceCount(), -1) == 1) {
+			// someone else left, we were the last owner
+			_FreePrivateData();
 		}
 	} else {
 		// we don't share our data with someone else
@@ -1775,6 +1768,7 @@
 
 	if (newData)
 		fPrivateData = newData;
+
 	return newData != NULL ? B_OK : B_NO_MEMORY;
 }
 
@@ -1786,20 +1780,34 @@
 }
 
 
+inline int32&
+BString::_ReferenceCount()
+{
+	return *(((int32 *)fPrivateData) - 2);
+}
+
+
+inline bool
+BString::_IsShareable()
+{
+	return fPrivateData != NULL && _ReferenceCount() >= 0;
+}
+
+
 void
-BString::_SetReferenceCount(int32 count)
+BString::_FreePrivateData()
 {
-	*(((vint32*)fPrivateData) - 2) = count;
+	free(fPrivateData - (2 * sizeof(int32)));
 }
 
 
 bool
 BString::_DoAppend(const char* string, int32 length)
 {
-	int32 len = Length();
-	if (_DetachWith(fPrivateData, len + length) == B_OK) {
+	int32 oldLength = Length();
+	if (_DetachWith(fPrivateData, oldLength + length) == B_OK) {
 		if (string && length)
-			memcpy(fPrivateData + len, string, length);
+			memcpy(fPrivateData + oldLength, string, length);
 		return true;
 	}
 	return false;
@@ -1809,9 +1817,9 @@
 bool
 BString::_DoPrepend(const char* string, int32 length)
 {
-	int32 len = Length();
-	if (_DetachWith(fPrivateData, len + length) == B_OK) {
-		memmove(fPrivateData + length, fPrivateData, len);
+	int32 oldLength = Length();
+	if (_DetachWith(fPrivateData, oldLength + length) == B_OK) {
+		memmove(fPrivateData + length, fPrivateData, oldLength);
 		if (string && length)
 			memcpy(fPrivateData, string, length);
 		return true;
@@ -1823,9 +1831,10 @@
 bool
 BString::_DoInsert(const char* string, int32 offset, int32 length)
 {
-	int32 len = Length();
-	if (_DetachWith(fPrivateData, len + length) == B_OK) {
-		memmove(fPrivateData + offset + length, fPrivateData + offset, len - offset);
+	int32 oldLength = Length();
+	if (_DetachWith(fPrivateData, oldLength + length) == B_OK) {
+		memmove(fPrivateData + offset + length, fPrivateData + offset,
+			oldLength - offset);
 		if (string && length)
 			memcpy(fPrivateData + offset, string, length);
 		return true;
@@ -1903,8 +1912,8 @@
 
 
 BString&
-BString::_DoCharacterEscape(const char* string,
-							const char *setOfCharsToEscape, char escapeChar)
+BString::_DoCharacterEscape(const char* string, const char *setOfCharsToEscape,
+	char escapeChar)
 {
 	if (_DetachWith(string, strlen(safestr(string))) != B_OK)
 		return *this;
@@ -1930,11 +1939,10 @@
 
 	int32 lastPos = 0;
 	char* oldAdr = fPrivateData;
-	int32 offset = 2 * sizeof(int32);
 
-	char* newData = (char*)malloc(newLength + offset + 1);
+	char* newData = (char*)malloc(newLength + kPrivateDataOffset + 1);
 	if (newData) {
-		newData += offset;
+		newData += kPrivateDataOffset;
 		char* newAdr = newData;
 		for (uint32 i = 0; i < count; ++i) {
 			pos = positions.ItemAt(i);
@@ -1952,7 +1960,7 @@
 		if (len > 0)
 			memcpy(newAdr, oldAdr, len);
 
-		free(fPrivateData - offset);
+		_FreePrivateData();
 
 		fPrivateData = newData;
 		_SetLength(newLength);
@@ -1976,7 +1984,7 @@
 
 BString&
 BString::_DoReplace(const char* findThis, const char* replaceWith,
-					int32 maxReplaceCount, int32 fromOffset, bool ignoreCase)
+	int32 maxReplaceCount, int32 fromOffset, bool ignoreCase)
 {
 	if (findThis == NULL || maxReplaceCount <= 0
 		|| fromOffset < 0 || fromOffset >= Length())
@@ -2006,7 +2014,7 @@
 
 void
 BString::_ReplaceAtPositions(const PosVect* positions, int32 searchLen,
-							 const char* with, int32 withLen)
+	const char* with, int32 withLen)
 {
 	int32 len = Length();
 	uint32 count = positions->CountItems();
@@ -2020,10 +2028,9 @@
 	int32 lastPos = 0;
 	char *oldAdr = fPrivateData;
 
-	int32 offset = 2 * sizeof(int32);
-	char *newData = (char *)malloc(newLength + offset + 1);
+	char *newData = (char *)malloc(newLength + kPrivateDataOffset + 1);
 	if (newData) {
-		newData += offset;
+		newData += kPrivateDataOffset;
 		char *newAdr = newData;
 		for (uint32 i = 0; i < count; ++i) {
 			pos = positions->ItemAt(i);
@@ -2042,7 +2049,7 @@
 		if (len > 0)
 			memcpy(newAdr, oldAdr, len);
 
-		free(fPrivateData - offset);
+		_FreePrivateData();
 
 		fPrivateData = newData;
 		_SetLength(newLength);



From superstippi at gmx.de  Sat Mar  8 20:44:26 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Sat, 08 Mar 2008 20:44:26 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
 src/kits/support
In-Reply-To: <200803081905.m28J5Aec018941@sheep.berlios.de>
References: <200803081905.m28J5Aec018941@sheep.berlios.de>
Message-ID: <20080308204426.30721.4@stippis2.1204981284.fake>


axeld at BerliOS wrote:
> Modified:
>    haiku/trunk/headers/os/support/String.h
>    haiku/trunk/src/kits/support/String.cpp
> Log:
> * Fixed a bunch or concurreny bugs and memory leaks of the new reference
>   string stuff.

Oh cool! Your patch turned out much nicer than mine! :-)

> * It's still not thread-safe for all usage patterns, though, so we might 
> want
>   to remove or disable it: if a string is shared between several threads, 
>   and one of those starts to use a reference, all kinds of problems can 
>   happen.

Can it be made threadsafe somehow? It sure has some potential for drastic 
memory usage decrease in some situations.

Just one comment:

> +BString::_FreePrivateData()
>  {
> -    *(((vint32*)fPrivateData) - 2) = count;
> +    free(fPrivateData - (2 * sizeof(int32)));
>  }

...should be kPrivateDataOffset.

Best regards,
-Stephan




From host.haiku at gmx.de  Sat Mar  8 21:03:09 2008
From: host.haiku at gmx.de (julun)
Date: Sat, 08 Mar 2008 21:03:09 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <20080308204426.30721.4@stippis2.1204981284.fake>
References: <200803081905.m28J5Aec018941@sheep.berlios.de>
	<20080308204426.30721.4@stippis2.1204981284.fake>
Message-ID: <47D2F0FD.8060209@gmx.de>

Hi,

Stephan Assmus schrieb:
> axeld at BerliOS wrote:
>> Modified:
>>    haiku/trunk/headers/os/support/String.h
>>    haiku/trunk/src/kits/support/String.cpp
>> Log:
>> * Fixed a bunch or concurreny bugs and memory leaks of the new reference
>>   string stuff.
> 
> Oh cool! Your patch turned out much nicer than mine! :-)
> 
>> * It's still not thread-safe for all usage patterns, though, so we might 
>> want
>>   to remove or disable it: if a string is shared between several threads, 
>>   and one of those starts to use a reference, all kinds of problems can 
>>   happen.
> 
> Can it be made threadsafe somehow? It sure has some potential for drastic 
> memory usage decrease in some situations.
> 
> Just one comment:
> 
>> +BString::_FreePrivateData()
>>  {
>> -    *(((vint32*)fPrivateData) - 2) = count;
>> +    free(fPrivateData - (2 * sizeof(int32)));
>>  }
> 
> ...should be kPrivateDataOffset.
> 
> Best regards,
> -Stephan
> 

basically the whole thing isn't thread save at all. To achieve this you 
would need to lock every function that writes to the private data section. 
This would drastically reduce the performance of that class. What we where 
talking about here is reentrance, just to make sure the string detaches in 
case an other thread is going to manipulate the reference.

While testing the class in VS i tested it several times with it's leak 
checker and it didn't report anything, but anyway...

Regards,
Julun


From kirilla at mail.berlios.de  Sat Mar  8 21:06:50 2008
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Sat, 8 Mar 2008 21:06:50 +0100
Subject: [Haiku-commits] r24313 - haiku/trunk/src/apps/pulse
Message-ID: <200803082006.m28K6oPs023835@sheep.berlios.de>

Author: kirilla
Date: 2008-03-08 21:06:50 +0100 (Sat, 08 Mar 2008)
New Revision: 24313
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24313&view=rev

Modified:
   haiku/trunk/src/apps/pulse/ProgressBar.cpp
   haiku/trunk/src/apps/pulse/ProgressBar.h
Log:
Show popup menu also when right-clicking the load meter. It was a blind spot. Added the virtual keyword to the other two load meter view hooks.

Modified: haiku/trunk/src/apps/pulse/ProgressBar.cpp
===================================================================
--- haiku/trunk/src/apps/pulse/ProgressBar.cpp	2008-03-08 19:05:09 UTC (rev 24312)
+++ haiku/trunk/src/apps/pulse/ProgressBar.cpp	2008-03-08 20:06:50 UTC (rev 24313)
@@ -69,6 +69,14 @@
 
 
 void
+ProgressBar::MouseDown(BPoint point)
+{
+	point = ConvertToParent(point);
+	Parent()->MouseDown(point);
+}
+
+
+void
 ProgressBar::Set(int32 value)
 {
 	// How many segments to light up

Modified: haiku/trunk/src/apps/pulse/ProgressBar.h
===================================================================
--- haiku/trunk/src/apps/pulse/ProgressBar.h	2008-03-08 19:05:09 UTC (rev 24312)
+++ haiku/trunk/src/apps/pulse/ProgressBar.h	2008-03-08 20:06:50 UTC (rev 24313)
@@ -24,10 +24,11 @@
 class ProgressBar : public BView {
 	public:
 		ProgressBar(BRect r, char* name);
-		void Draw(BRect rect);
+		virtual void Draw(BRect rect);
 		void Set(int32 value);
 		void UpdateColors(int32 color, bool fade);
-		void AttachedToWindow();
+		virtual void AttachedToWindow();
+		virtual void MouseDown(BPoint point);
 
 		enum {
 			PROGRESS_WIDTH	= 146,



From superstippi at gmx.de  Sat Mar  8 21:16:28 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Sat, 08 Mar 2008 21:16:28 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
 src/kits/support
In-Reply-To: <47D2F0FD.8060209@gmx.de>
References: <200803081905.m28J5Aec018941@sheep.berlios.de>
	<20080308204426.30721.4@stippis2.1204981284.fake>
	<47D2F0FD.8060209@gmx.de>
Message-ID: <20080308211628.30849.6@stippis2.1204981284.fake>

Hi Julun,

julun wrote:
> basically the whole thing isn't thread save at all. To achieve this you 
> would need to lock every function that writes to the private data 
> section. This would drastically reduce the performance of that class. 
> What we where talking about here is reentrance, just to make sure the 
> string detaches in case an other thread is going to manipulate the 
> reference.

The point is this: As a programmer, you have no influence on the behaviour. 
If you use strings in certain ways, the new code will make use of 
refernces. But if the programm happens to use the strings in different 
threads, then suddenly things can go wrong, while everything was fine on 
BeOS.

> While testing the class in VS i tested it several times with it's leak 
> checker and it didn't report anything, but anyway...

You checked against the wrong reference count. atomic_add() returns the 
previous value. If a string without any references has a reference count of 
1 (by definition), then you need to free() the data if atomic_add(..., -1) 
== 1. Also, you should not free in case <= 1, since that could result in 
double frees. Although if you have /this/ threading issue, things go wrong 
anyways, that's one of the aspects that Axel means.

Don't get me wrong, the new reference counting is nice and I know more than 
one app that would benefit _greatly_. We just need to find ways to make 
BString behaviorally compatible with BeOS.

One more thing that pops into my mind: atomic_XX() take volatile ints for a 
reason. Will everything work like it is supposed to if one just casts some 
memory buffer offset to vint32?

Best regards,
-Stephan


From axeld at mail.berlios.de  Sat Mar  8 21:49:30 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 8 Mar 2008 21:49:30 +0100
Subject: [Haiku-commits] r24314 - haiku/trunk/src/kits/support
Message-ID: <200803082049.m28KnUkP027235@sheep.berlios.de>

Author: axeld
Date: 2008-03-08 21:49:30 +0100 (Sat, 08 Mar 2008)
New Revision: 24314
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24314&view=rev

Modified:
   haiku/trunk/src/kits/support/String.cpp
Log:
Followed suggestion by Stephan.


Modified: haiku/trunk/src/kits/support/String.cpp
===================================================================
--- haiku/trunk/src/kits/support/String.cpp	2008-03-08 20:06:50 UTC (rev 24313)
+++ haiku/trunk/src/kits/support/String.cpp	2008-03-08 20:49:30 UTC (rev 24314)
@@ -1797,7 +1797,7 @@
 void
 BString::_FreePrivateData()
 {
-	free(fPrivateData - (2 * sizeof(int32)));
+	free(fPrivateData - kPrivateDataOffset);
 }
 
 



From axeld at pinc-software.de  Sat Mar  8 21:54:31 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sat, 08 Mar 2008 21:54:31 +0100 CET
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
 src/kits/support
In-Reply-To: <20080308211628.30849.6@stippis2.1204981284.fake>
Message-ID: <42147213946-BeMail@zon>

Stephan Assmus <superstippi at gmx.de> wrote:
> One more thing that pops into my mind: atomic_XX() take volatile ints 
> for a 
> reason. Will everything work like it is supposed to if one just casts 
> some 
> memory buffer offset to vint32?

The volatile attribute only means that the compiler won't cache the 
value in a register for faster access, but always references it from 
its memory location. As long you don't access the value directly, you 
don't need to specify it (ie. if you only use atomic functions).

Bye,
   Axel.



From axeld at pinc-software.de  Sat Mar  8 22:06:12 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sat, 08 Mar 2008 22:06:12 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24312_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/os/support_src/kits/support?=
In-Reply-To: <47D2F0FD.8060209@gmx.de>
Message-ID: <42848157065-BeMail@zon>

julun <host.haiku at gmx.de> wrote:
> basically the whole thing isn't thread save at all. To achieve this 
> you 
> would need to lock every function that writes to the private data 
> section. 
> This would drastically reduce the performance of that class. What we 
> where 
[...]

To make this class truely thread-safe, we would only need to make the 
detach process safe. That will probably require some locking, but would 
therefore also make the memory footprint a bit higher.
When using benaphores, the performance is probably not that bad.
Another way would be to have all threads go through a single lock on 
detach, but depending on the usage pattern, this potentially degrades 
performance a lot.

> While testing the class in VS i tested it several times with it's 
> leak 
> checker and it didn't report anything, but anyway...

Testing is always good, but you don't necessarily cover all cases :-)

Bye,
   Axel.



From axeld at pinc-software.de  Sat Mar  8 22:11:04 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sat, 08 Mar 2008 22:11:04 +0100 CET
Subject: [Haiku-commits] r24311 - haiku/trunk/src/bin/network/ifconfig
In-Reply-To: <200803081816.m28IGoht021332@sheep.berlios.de>
Message-ID: <43140969584-BeMail@zon>

mmu_man at BerliOS <mmu_man at mail.berlios.de> wrote:
> Log:
> On request implemented setting media type.

See src/add-ons/kernel/network/devices/ethernet/ethernet.cpp:

status_t
ethernet_set_media(net_device *device, uint32 media)
{
	return EOPNOTSUPP;
}

We currently do not support to set this in any way, so why bother? :-)

Bye,
   Axel.



From revol at free.fr  Sat Mar  8 23:29:43 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sat, 08 Mar 2008 23:29:43 +0100 CET
Subject: [Haiku-commits] r24311 - haiku/trunk/src/bin/network/ifconfig
In-Reply-To: <43140969584-BeMail@zon>
Message-ID: <914617734-BeMail@laptop>

> mmu_man at BerliOS <mmu_man at mail.berlios.de> wrote:
> > Log:
> > On request implemented setting media type.
> 
> See src/add-ons/kernel/network/devices/ethernet/ethernet.cpp:
> 
> status_t
> ethernet_set_media(net_device *device, uint32 media)
> {
> 	return EOPNOTSUPP;
> }
> 
> We currently do not support to set this in any way, so why bother? :-
> )

Siarzhuk asked on IRC because his DSL modem doesn't like 100Mb...
one can always add an ioctl to ether_driver.h... 
(didn't we have one at some point ?)

Fran?ois.


From axeld at pinc-software.de  Sat Mar  8 23:28:16 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sat, 08 Mar 2008 23:28:16 +0100 CET
Subject: [Haiku-commits] r24298 - haiku/trunk/build/jam
In-Reply-To: <3377441899-BeMail@laptop>
Message-ID: <47772045325-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> Btw, while I didn't find any provision in the PS/2 protocol to pass 
> the 
> keyboard language, the USB HID has a way to give the localization of 
> the device:

Nice idea, didn't think of that!

Bye,
   Axel.



From axeld at mail.berlios.de  Sun Mar  9 00:12:47 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 9 Mar 2008 00:12:47 +0100
Subject: [Haiku-commits] r24315 - in haiku/trunk: headers/private/kernel
	src/system/kernel src/system/kernel/device_manager
Message-ID: <200803082312.m28NCljl005948@sheep.berlios.de>

Author: axeld
Date: 2008-03-09 00:12:46 +0100 (Sun, 09 Mar 2008)
New Revision: 24315
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24315&view=rev

Modified:
   haiku/trunk/headers/private/kernel/safemode.h
   haiku/trunk/src/system/kernel/device_manager/settings.cpp
   haiku/trunk/src/system/kernel/module.cpp
Log:
* Added a get_safemode_boolean() function for easy access to the safemode
  options.
* module_init() now sets sDisableUserAddOns to whatever the safemode settings
  say, ie. the B_SAFEMODE_DISABLE_USER_ADD_ONS setting is now respected by
  the module code.
* Minor cleanup.


Modified: haiku/trunk/headers/private/kernel/safemode.h
===================================================================
--- haiku/trunk/headers/private/kernel/safemode.h	2008-03-08 20:49:30 UTC (rev 24314)
+++ haiku/trunk/headers/private/kernel/safemode.h	2008-03-08 23:12:46 UTC (rev 24315)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2004-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _KERNEL_SAFEMODE_H
@@ -25,6 +25,7 @@
 #endif
 
 status_t get_safemode_option(const char *parameter, char *buffer, size_t *_bufferSize);
+bool get_safemode_boolean(const char *parameter, bool defaultValue);
 status_t _user_get_safemode_option(const char *parameter, char *buffer, size_t *_bufferSize);
 
 #ifdef __cplusplus

Modified: haiku/trunk/src/system/kernel/device_manager/settings.cpp
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/settings.cpp	2008-03-08 20:49:30 UTC (rev 24314)
+++ haiku/trunk/src/system/kernel/device_manager/settings.cpp	2008-03-08 23:12:46 UTC (rev 24315)
@@ -33,6 +33,20 @@
 }
 
 
+extern "C" bool
+get_safemode_boolean(const char *parameter, bool defaultValue)
+{
+	char value[16];
+	size_t length = sizeof(value);
+
+	if (get_safemode_option(parameter, value, &length) != B_OK)
+		return defaultValue;
+
+	return !strcmp(value, "on") || !strcmp(value, "true") || !strcmp(value, "1")
+		|| !strcmp(value, "yes") || !strcmp(value, "enabled");
+}
+
+
 //	#pragma mark -
 
 

Modified: haiku/trunk/src/system/kernel/module.cpp
===================================================================
--- haiku/trunk/src/system/kernel/module.cpp	2008-03-08 20:49:30 UTC (rev 24314)
+++ haiku/trunk/src/system/kernel/module.cpp	2008-03-08 23:12:46 UTC (rev 24315)
@@ -1,12 +1,12 @@
 /*
- * Copyright 2002-2007, Haiku Inc. All rights reserved.
+ * Copyright 2002-2008, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001, Thomas Kurschel. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
 
-/** Manages kernel add-ons and their exported modules. */
+/*!	Manages kernel add-ons and their exported modules. */
 
 
 #include <kmodule.h>
@@ -22,6 +22,7 @@
 #include <vfs.h>
 #include <boot/elf.h>
 #include <fs/KPath.h>
+#include <safemode.h>
 #include <util/AutoLock.h>
 #include <util/khash.h>
 
@@ -37,10 +38,9 @@
 
 #define MODULE_HASH_SIZE 16
 
-/** The modules referenced by this structure are built-in
- *	modules that can't be loaded from disk.
- */
-
+/*! The modules referenced by this structure are built-in
+	modules that can't be loaded from disk.
+*/
 extern module_info gDeviceManagerModule;
 extern module_info gDeviceRootModule;
 extern module_info gDeviceForDriversModule;
@@ -157,15 +157,14 @@
 #define NUM_MODULE_PATHS (sizeof(sModulePaths) / sizeof(sModulePaths[0]))
 #define FIRST_USER_MODULE_PATH (NUM_MODULE_PATHS - 1)	/* first user path */
 
-/* we store the loaded modules by directory path, and all known modules by module name
- * in a hash table for quick access
+/* We store the loaded modules by directory path, and all known modules
+ * by module name in a hash table for quick access
  */
 static hash_table *sModuleImagesHash;
 static hash_table *sModulesHash;
 
 
-/** calculates hash for a module using its name */
-
+/*!	Calculates hash for a module using its name */
 static uint32
 module_hash(void *_module, const void *_key, uint32 range)
 {
@@ -182,8 +181,7 @@
 }
 
 
-/** compares a module to a given name */
-
+/*!	Compares a module to a given name */
 static int
 module_compare(void *_module, const void *_key)
 {
@@ -196,8 +194,7 @@
 }
 
 
-/** calculates the hash of a module image using its path */
-
+/*!	Calculates the hash of a module image using its path */
 static uint32
 module_image_hash(void *_module, const void *_key, uint32 range)
 {
@@ -214,8 +211,7 @@
 }
 
 
-/** compares a module image to a path */
-
+/*!	Compares a module image to a path */
 static int
 module_image_compare(void *_module, const void *_key)
 {
@@ -228,11 +224,10 @@
 }
 
 
-/** Try to load the module image at the specified location.
- *	If it could be loaded, it returns B_OK, and stores a pointer
- *	to the module_image object in "_moduleImage".
- */
-
+/*!	Try to load the module image at the specified location.
+	If it could be loaded, it returns B_OK, and stores a pointer
+	to the module_image object in "_moduleImage".
+*/
 static status_t
 load_module_image(const char *path, module_image **_moduleImage)
 {
@@ -361,10 +356,9 @@
 }
 
 
-/** Extract the information from the module_info structure pointed at
- *	by "info" and create the entries required for access to it's details.
- */
-
+/*!	Extract the information from the module_info structure pointed at
+	by "info" and create the entries required for access to it's details.
+*/
 static status_t
 create_module(module_info *info, const char *file, int offset, module **_module)
 {
@@ -419,13 +413,12 @@
 }
 
 
-/** Loads the file at "path" and scans all modules contained therein.
- *	Returns B_OK if "searchedName" could be found under those modules,
- *	B_ENTRY_NOT_FOUND if not.
- *	Must only be called for files that haven't been scanned yet.
- *	"searchedName" is allowed to be NULL (if all modules should be scanned)
- */
-
+/*!	Loads the file at "path" and scans all modules contained therein.
+	Returns B_OK if "searchedName" could be found under those modules,
+	B_ENTRY_NOT_FOUND if not.
+	Must only be called for files that haven't been scanned yet.
+	"searchedName" is allowed to be NULL (if all modules should be scanned)
+*/
 static status_t
 check_module_image(const char *path, const char *searchedName)
 {
@@ -463,10 +456,9 @@
 }
 
 
-/** This is only called if we fail to find a module already in our cache...
- *	saves us some extra checking here :)
- */
-
+/*!	This is only called if we fail to find a module already in our cache...
+	saves us some extra checking here :)
+*/
 static module *
 search_module(const char *name)
 {
@@ -546,8 +538,7 @@
 }
 
 
-/** Initializes a loaded module depending on its state */
-
+/*!	Initializes a loaded module depending on its state */
 static inline status_t
 init_module(module *module)
 {
@@ -604,8 +595,7 @@
 }
 
 
-/** Uninitializes a module depeding on its state */
-
+/*!	Uninitializes a module depeding on its state */
 static inline int
 uninit_module(module *module)
 {
@@ -999,14 +989,12 @@
 }
 
 
-//	#pragma mark -
-//	Exported Kernel API (private part)
+//	#pragma mark - Exported Kernel API (private part)
 
 
-/**	Unloads a module in case it's not in use. This is the counterpart
- *	to load_module().
- */
-
+/*!	Unloads a module in case it's not in use. This is the counterpart
+	to load_module().
+*/
 status_t
 unload_module(const char *path)
 {
@@ -1024,15 +1012,14 @@
 }
 
 
-/**	Unlike get_module(), this function lets you specify the add-on to
- *	be loaded by path.
- *	However, you must not use the exported modules without having called
- *	get_module() on them. When you're done with the NULL terminated
- *	\a modules array, you have to call unload_module(), no matter if
- *	you're actually using any of the modules or not - of course, the
- *	add-on won't be unloaded until the last put_module().
- */
-
+/*!	Unlike get_module(), this function lets you specify the add-on to
+	be loaded by path.
+	However, you must not use the exported modules without having called
+	get_module() on them. When you're done with the NULL terminated
+	\a modules array, you have to call unload_module(), no matter if
+	you're actually using any of the modules or not - of course, the
+	add-on won't be unloaded until the last put_module().
+*/
 status_t
 load_module(const char *path, module_info ***_modules)
 {
@@ -1046,10 +1033,9 @@
 }
 
 
-/** Setup the module structures and data for use - must be called
- *	before any other module call.
- */
-
+/*! Setup the module structures and data for use - must be called
+	before any other module call.
+*/
 status_t
 module_init(kernel_args *args)
 {
@@ -1081,7 +1067,8 @@
 		}
 	}
 
-	// ToDo: set sDisableUserAddOns from kernel_args!
+	sDisableUserAddOns = get_safemode_boolean(B_SAFEMODE_DISABLE_USER_ADD_ONS,
+		false);
 
 	add_debugger_command("modules", &dump_modules,
 		"list all known & loaded modules");
@@ -1090,19 +1077,17 @@
 }
 
 
-//	#pragma mark -
-//	Exported Kernel API (public part)
+//	#pragma mark - Exported Kernel API (public part)
 
 
-/** This returns a pointer to a structure that can be used to
- *	iterate through a list of all modules available under
- *	a given prefix.
- *	All paths will be searched and the returned list will
- *	contain all modules available under the prefix.
- *	The structure is then used by read_next_module_name(), and
- *	must be freed by calling close_module_list().
- */
-
+/*! This returns a pointer to a structure that can be used to
+	iterate through a list of all modules available under
+	a given prefix.
+	All paths will be searched and the returned list will
+	contain all modules available under the prefix.
+	The structure is then used by read_next_module_name(), and
+	must be freed by calling close_module_list().
+*/
 void *
 open_module_list(const char *prefix)
 {
@@ -1180,9 +1165,7 @@
 }
 
 
-/** Frees the cookie allocated by open_module_list()
- */
-
+/*!	Frees the cookie allocated by open_module_list() */
 status_t
 close_module_list(void *cookie)
 {
@@ -1216,12 +1199,11 @@
 }
 
 
-/** Return the next module name from the available list, using
- *	a structure previously created by a call to open_module_list().
- *	Returns B_OK as long as it found another module, B_ENTRY_NOT_FOUND
- *	when done.
- */
-
+/*!	Return the next module name from the available list, using
+	a structure previously created by a call to open_module_list().
+	Returns B_OK as long as it found another module, B_ENTRY_NOT_FOUND
+	when done.
+*/
 status_t
 read_next_module_name(void *cookie, char *buffer, size_t *_bufferSize)
 {
@@ -1250,12 +1232,11 @@
 }
 
 
-/** Iterates through all loaded modules, and stores its path in "buffer".
- *	ToDo: check if the function in BeOS really does that (could also mean:
- *		iterate through all modules that are currently loaded; have a valid
- *		module_image pointer, which would be hard to test for)
- */
-
+/*!	Iterates through all loaded modules, and stores its path in "buffer".
+	ToDo: check if the function in BeOS really does that (could also mean:
+		iterate through all modules that are currently loaded; have a valid
+		module_image pointer, which would be hard to test for)
+*/
 status_t 
 get_next_loaded_module_name(uint32 *_cookie, char *buffer, size_t *_bufferSize)
 {



From axeld at mail.berlios.de  Sun Mar  9 00:14:06 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 9 Mar 2008 00:14:06 +0100
Subject: [Haiku-commits] r24316 -
	haiku/trunk/src/system/kernel/device_manager
Message-ID: <200803082314.m28NE64Y006070@sheep.berlios.de>

Author: axeld
Date: 2008-03-09 00:14:06 +0100 (Sun, 09 Mar 2008)
New Revision: 24316
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24316&view=rev

Modified:
   haiku/trunk/src/system/kernel/device_manager/device_manager_private.h
   haiku/trunk/src/system/kernel/device_manager/probe.cpp
Log:
* Driver probe code now uses find_directory() to get the directories to
  look for drivers (also added common directory).
* Now also honours the B_SAFEMODE_DISABLE_USER_ADD_ONS setting.


Modified: haiku/trunk/src/system/kernel/device_manager/device_manager_private.h
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/device_manager_private.h	2008-03-08 23:12:46 UTC (rev 24315)
+++ haiku/trunk/src/system/kernel/device_manager/device_manager_private.h	2008-03-08 23:14:06 UTC (rev 24316)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2005, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2004-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Copyright 2002-04, Thomas Kurschel. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
@@ -26,11 +26,6 @@
 #define SYSTEM_DRIVER_REGISTRATION "/boot/beos/system/add-ons/kernel/"PNP_DIR"registration/"
 #define COMMON_DRIVER_REGISTRATION "/boot/home/config/add-ons/kernel/"PNP_DIR"registration/"
 
-// module directories
-#define SYSTEM_MODULES_DIR "/boot/beos/add-ons/kernel/"
-#define COMMON_MODULES_DIR "/boot/home/config/add-ons/kernel/"
-
-
 // info about ID generator
 typedef struct id_generator {
 	struct list_link link;

Modified: haiku/trunk/src/system/kernel/device_manager/probe.cpp
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/probe.cpp	2008-03-08 23:12:46 UTC (rev 24315)
+++ haiku/trunk/src/system/kernel/device_manager/probe.cpp	2008-03-08 23:14:06 UTC (rev 24316)
@@ -20,12 +20,14 @@
 #include <fs/node_monitor.h>
 #include <kmodule.h>
 #include <Notifications.h>
+#include <safemode.h>
 #include <util/kernel_cpp.h>
 #include <util/OpenHashTable.h>
 #include <util/Stack.h>
 #include <vfs.h>
 
 #include <image.h>
+#include <FindDirectory.h>
 #include <KernelExport.h>
 #include <NodeMonitor.h>
 
@@ -91,26 +93,14 @@
 };
 
 
-// list of module directories
-static const char *kModulePaths[] = {
-	COMMON_MODULES_DIR,
-	"/boot/beos/system/add-ons/kernel",//SYSTEM_MODULES_DIR,
-	NULL
-};
-
-
 class DirectoryIterator {
 	public:
 		DirectoryIterator(const char *path, const char *subPath = NULL,
 			bool recursive = false);
-		DirectoryIterator(const char **paths, const char *subPath = NULL,
-			bool recursive = false);
 		~DirectoryIterator();
 
 		void SetTo(const char *path, const char *subPath = NULL,
 			bool recursive = false);
-		void SetTo(const char **paths, const char *subPath = NULL,
-			bool recursive = false);
 
 		status_t GetNext(KPath &path, struct stat &stat);
 		const char *CurrentName() const { return fCurrentName; }
@@ -153,16 +143,6 @@
 }
 
 
-DirectoryIterator::DirectoryIterator(const char **paths, const char *subPath,
-		bool recursive)
-	:
-	fDirectory(NULL),
-	fBasePath(NULL)
-{
-	SetTo(paths, subPath, recursive);
-}
-
-
 DirectoryIterator::~DirectoryIterator()
 {
 	Unset();
@@ -175,20 +155,31 @@
 	Unset();
 	fRecursive = recursive;
 
-	AddPath(path, subPath);
-}
+	if (path == NULL) {
+		// add default paths
+		const directory_which whichPath[] = {
+			B_USER_ADDONS_DIRECTORY,
+			B_COMMON_ADDONS_DIRECTORY,
+			B_BEOS_ADDONS_DIRECTORY
+		};
+		KPath pathBuffer;
 
+		bool disableUserAddOns = get_safemode_boolean(
+			B_SAFEMODE_DISABLE_USER_ADD_ONS, false);
 
-void 
-DirectoryIterator::SetTo(const char **paths, const char *subPath,
-	bool recursive)
-{
-	Unset();
-	fRecursive = recursive;
+		for (uint32 i = 0; i < sizeof(whichPath) / sizeof(whichPath[0]); i++) {
+			if (i < 2 && disableUserAddOns)
+				continue;
 
-	for (int32 i = 0; paths[i] != NULL; i++) {
-		AddPath(paths[i], subPath);
-	}
+			if (find_directory(whichPath[i], gBootDevice, true,
+					pathBuffer.LockBuffer(), pathBuffer.BufferSize()) == B_OK) {
+				pathBuffer.UnlockBuffer();
+				pathBuffer.Append("kernel");
+				AddPath(pathBuffer.Path(), subPath);
+			}
+		}
+	} else
+		AddPath(path, subPath);
 }
 
 
@@ -1357,7 +1348,7 @@
 
 	// build list of potential drivers for that type
 
-	DirectoryIterator iterator(kModulePaths, type, false);
+	DirectoryIterator iterator(NULL, type, false);
 	struct stat stat;
 	KPath path;
 
@@ -1401,7 +1392,7 @@
 	// Iterate through bus managers to shrink the list (let them publish
 	// their own devices)
 
-	iterator.SetTo(kModulePaths, "drivers/bus", false);
+	iterator.SetTo(NULL, "drivers/bus", false);
 
 	while (iterator.GetNext(path, stat) == B_OK) {
 		DirectoryIterator busIterator(path.Path(), NULL, true);
@@ -1455,12 +1446,32 @@
 	if (!sWatching && gBootDevice > 0) {
 		// We're probing the actual boot volume for the first time,
 		// let's watch its driver directories for changes
+		const directory_which whichPath[] = {
+			B_USER_ADDONS_DIRECTORY,
+			B_COMMON_ADDONS_DIRECTORY,
+			B_BEOS_ADDONS_DIRECTORY
+		};
+		KPath path;
 
 		new(&sDirectoryWatcher) DirectoryWatcher;
-		for (uint32 i = 0; kModulePaths[i] != NULL; i++) {
-			start_watching(kModulePaths[i], "drivers/dev");
-			start_watching(kModulePaths[i], "drivers/bin");
+
+		bool disableUserAddOns = get_safemode_boolean(
+			B_SAFEMODE_DISABLE_USER_ADD_ONS, false);
+
+		for (uint32 i = 0; i < sizeof(whichPath) / sizeof(whichPath[0]); i++) {
+			if (i < 2 && disableUserAddOns)
+				continue;
+
+			if (find_directory(whichPath[i], gBootDevice, true,
+					path.LockBuffer(), path.BufferSize()) == B_OK) {
+				path.UnlockBuffer();
+				path.Append("kernel/drivers");
+
+				start_watching(path.Path(), "dev");
+				start_watching(path.Path(), "bin");
+			}
 		}
+
 		sWatching = true;
 	}
 



From axeld at pinc-software.de  Sun Mar  9 00:24:41 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 09 Mar 2008 00:24:41 +0100 CET
Subject: [Haiku-commits] r24311 - haiku/trunk/src/bin/network/ifconfig
In-Reply-To: <914617734-BeMail@laptop>
Message-ID: <51157494996-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> Siarzhuk asked on IRC because his DSL modem doesn't like 100Mb...
> one can always add an ioctl to ether_driver.h... 

At least many FreeBSD drivers could support this with little effort I 
guess.

> (didn't we have one at some point ?)

Nope.

Bye,
   Axel.



From oruizdorantes at mail.berlios.de  Sun Mar  9 01:04:26 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Sun, 9 Mar 2008 01:04:26 +0100
Subject: [Haiku-commits] r24317 - haiku/trunk/src/servers/bluetooth
Message-ID: <200803090004.m2904Qpj017404@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-09 01:04:16 +0100 (Sun, 09 Mar 2008)
New Revision: 24317
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24317&view=rev

Modified:
   haiku/trunk/src/servers/bluetooth/BPortNot.cpp
   haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp
   haiku/trunk/src/servers/bluetooth/CommandManager.cpp
   haiku/trunk/src/servers/bluetooth/CommandManager.h
   haiku/trunk/src/servers/bluetooth/HCIControllerAccessor.cpp
   haiku/trunk/src/servers/bluetooth/HCIControllerAccessor.h
   haiku/trunk/src/servers/bluetooth/HCIDelegate.h
   haiku/trunk/src/servers/bluetooth/HCITransportAccessor.cpp
   haiku/trunk/src/servers/bluetooth/HCITransportAccessor.h
   haiku/trunk/src/servers/bluetooth/LocalDeviceHandler.cpp
   haiku/trunk/src/servers/bluetooth/LocalDeviceImpl.cpp
Log:
Code & text output cleaning

Modified: haiku/trunk/src/servers/bluetooth/BPortNot.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/BPortNot.cpp	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/BPortNot.cpp	2008-03-09 00:04:16 UTC (rev 24317)
@@ -63,19 +63,7 @@
 		    Output::Instance()->Post("Wrong type frame code", BLACKBOARD_GENERAL);
 		    continue;
 		 }
-		 
-#if 0		 
-		 for (int i=0 ; i<ssize ; i++ ) {		 
-		 	printf("%x:",((uint8*)hdr)[i]);
-		 }
- 		 printf("$\n");
-
-		 for (int i=0 ; i<ssize ; i++) {		 
-		 	printf("%c",((uint8*)hdr)[i]);
-		 }
-		 printf("$\n");
-#endif
-		    
+		 	    
          ld = ourapp->LocateLocalDeviceImpl(GET_PORTCODE_HID(code));
 		 if (ld == NULL) {
 		    Output::Instance()->Post("LocalDevice could not be fetched", BLACKBOARD_EVENTS);

Modified: haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp	2008-03-09 00:04:16 UTC (rev 24317)
@@ -158,7 +158,7 @@
         break;
 
 
-		/* Handle if the bluetooth preferences is running */
+		/* Handle if the bluetooth preferences is running?? */
 		case B_SOME_APP_LAUNCHED:
    		{
 			const char *signature;
@@ -178,7 +178,8 @@
 		break;
 	}
 	
-	/* Can we reply right now? */
+	// Can we reply right now? 
+	// TOD: review this condition
     if (status != B_WOULD_BLOCK) {
 	    reply.AddInt32("status", status);
 	    message->SendReply(&reply);
@@ -391,50 +392,6 @@
 
 #if 0
 
-void BluetoothServer::DevicesWatching(void) {
-
-	BDirectory* hdoses;
-	BEntry entrada;
-	BPath path;
-
-	//status_t err;
-	int fd1 = -1;
-
-	// only cheks the actual driver which we have
-	hdoses = new BDirectory("/dev/bus/bluetooth/h2/");
-//	hdoses = new BDirectory("/dev/bus/bluetooth/h3/...");
-//	hdoses = new BDirectory("/dev/bus/bluetooth/h4/...");
-	Output::Instance()->Post("Exploring present devices ...\n",1);
-	
-	while (hdoses->GetNextEntry(&entrada,true) == B_OK) {
-	Output::Instance()->Post((char*)path.Path(), 1);		
-		entrada.GetPath(&path);
-		if (entrada.IsDirectory()) {
-			Output::Instance()->Post((char*)path.Path(),1);
-			BDirectory* driver_directory = new BDirectory(path.Path());					
-			BEntry driver_entry;
-
-			syslog(LOG_ALERT, "Bluetooth driver %s\n",path.Path());
-			fprintf(stderr, "Bluetooth driver %s\n",path.Path());
-						
-			while (driver_directory->GetNextEntry(&driver_entry,true) == B_OK) {
-				Output::Instance()->Post((char*)path.Path(),1);
-				driver_entry.GetPath(&path);
-				fd1 = open(path.Path(), O_RDWR);
-				
-
-			
-				// TODO: Watching all folders under and set some kind of internal structure that hold all
-				//		 LocalDevices. 
-				// devloop = new DeviceLooper();
-				// devloop->StartMonitoringDevice("bus/bluetooth/h2");
-
-				if (fd1 < 0) {
-					syslog(LOG_ALERT,BT "Error opening device %s\n",path.Path());
-					fprintf(stderr, "Error opening device %s\n",path.Path());
-				} 
-				else 
-				{
 					struct  {
 						size_t	size;
 						struct hci_command_header header;
@@ -468,7 +425,7 @@
 					cm1.header.clen = 0;					
 					ioctl(fd1, ISSUE_BT_COMMAND, &cm1, sizeof(cm1));	
 
-					/*cm1.size = sizeof(struct hci_command_header);
+					cm1.size = sizeof(struct hci_command_header);
 					cm1.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_CONTROL_BASEBAND, OCF_READ_LOCAL_NAME));
 					cm1.header.clen = 0;					
 					ioctl(fd1, ISSUE_BT_COMMAND, &cm1, sizeof(cm1));	
@@ -487,6 +444,7 @@
 					cm2.body.num_rsp = 8;
 					cm2.header.clen = 5;					
 					ioctl(fd1, ISSUE_BT_COMMAND, &cm2, sizeof(cm1));	
+					
 					snooze(60*1000*1000);*/
 					cm3.size = sizeof(struct hci_command_header)+sizeof(struct hci_remote_name_request);
 					cm3.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_LINK_CONTROL, OCF_REMOTE_NAME_REQUEST));
@@ -518,14 +476,7 @@
 					ioctl(fd1, ISSUE_BT_COMMAND, &cm4, sizeof(cm4));
 					*/
 				}		
-			}
-		}
-	}
 
-	syslog(LOG_ALERT,BT "All devices registered\n");	
-	fprintf(stderr, "Waiting with opened devices\n");
-
-}
 #endif
 
 void

Modified: haiku/trunk/src/servers/bluetooth/CommandManager.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/CommandManager.cpp	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/CommandManager.cpp	2008-03-09 00:04:16 UTC (rev 24317)
@@ -47,7 +47,11 @@
 }
 
 
-/* CONTROL BASEBAND */
+#if 0
+#pragma mark - CONTROL BASEBAND -
+#endif
+
+
 void* buildReset(size_t* outsize)
 {
     return buildCommand(OGF_CONTROL_BASEBAND, OCF_RESET, NULL, 0, outsize);
@@ -60,7 +64,11 @@
 }
 
 
-/* LINK CONTROL */
+#if 0
+#pragma mark - LINK CONTROL -
+#endif
+
+
 void* buildRemoteNameRequest(bdaddr_t bdaddr,uint8 pscan_rep_mode, uint16 clock_offset, size_t* outsize)
 {
     
@@ -96,7 +104,11 @@
 }
 
 
-/* OGF_INFORMATIONAL_PARAM */
+#if 0
+#pragma mark - INFORMATIONAL_PARAM -
+#endif
+
+
 void* buildReadBufferSize(size_t* outsize)
 {
     return buildCommand(OGF_INFORMATIONAL_PARAM, OCF_READ_BUFFER_SIZE, NULL, 0, outsize);

Modified: haiku/trunk/src/servers/bluetooth/CommandManager.h
===================================================================
--- haiku/trunk/src/servers/bluetooth/CommandManager.h	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/CommandManager.h	2008-03-09 00:04:16 UTC (rev 24317)
@@ -22,4 +22,4 @@
 void* buildReadBufferSize(size_t* outsize);
 void* buildReadBdAddr(size_t* outsize);
 
-#endif
\ No newline at end of file
+#endif

Modified: haiku/trunk/src/servers/bluetooth/HCIControllerAccessor.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/HCIControllerAccessor.cpp	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/HCIControllerAccessor.cpp	2008-03-09 00:04:16 UTC (rev 24317)
@@ -1,4 +1,11 @@
+/*
+ * Copyright 2007-2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
 
+
 #include "HCIControllerAccessor.h"
 
 HCIControllerAccessor::HCIControllerAccessor(BPath* path) : HCIDelegate(path)

Modified: haiku/trunk/src/servers/bluetooth/HCIControllerAccessor.h
===================================================================
--- haiku/trunk/src/servers/bluetooth/HCIControllerAccessor.h	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/HCIControllerAccessor.h	2008-03-09 00:04:16 UTC (rev 24317)
@@ -1,5 +1,12 @@
-/*  */
+/*
+ * Copyright 2007-2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
 
+
+
 #ifndef _HCICONTROLLER_ACCESSOR_H_
 #define _HCICONTROLLER_ACCESSOR_H_
 

Modified: haiku/trunk/src/servers/bluetooth/HCIDelegate.h
===================================================================
--- haiku/trunk/src/servers/bluetooth/HCIDelegate.h	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/HCIDelegate.h	2008-03-09 00:04:16 UTC (rev 24317)
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2007-2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
 #ifndef _HCIDELEGATE_H_
 #define _HCIDELEGATE_H_
 
@@ -20,14 +27,13 @@
 			status_t status;
 				
 			fFD = open (path->Path(), O_RDWR);
-			printf("## fdesc %d\n", fFD);
 			if (fFD > 0) {
 				// find out which ID was assigned
 				status = ioctl(fFD, GET_HCI_ID, &fHID, 0);
-				printf("## id fdesc %ld ### %ld\n", fHID, status);									
-
+				printf("%s: hid retrieved %ld status=%ld\n", __FUNCTION__, fHID, status);
 			}
 			else {
+				printf("%s: Device driver could not be opened %ld\n", __FUNCTION__, fHID);
 				fHID = B_ERROR;
 			}
 	    

Modified: haiku/trunk/src/servers/bluetooth/HCITransportAccessor.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/HCITransportAccessor.cpp	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/HCITransportAccessor.cpp	2008-03-09 00:04:16 UTC (rev 24317)
@@ -1,4 +1,11 @@
+/*
+ * Copyright 2007-2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
 
+
 #include <String.h>
 
 #include "BluetoothServer.h"
@@ -17,11 +24,11 @@
 	if (GetID() < 0 || fFD < 0)
 		return B_ERROR;
 
-printf("Command going: len = %d\n", size);
-for (int16 index = 0 ; index < size; index++ ) {
+printf("### Command going: len = %ld\n", size);
+for (uint16 index = 0 ; index < size; index++ ) {
 	printf("%x:",((uint8*)rc)[index]);
 }
-printf("\n");
+printf("### \n");
 
 
 	return ioctl(fFD, ISSUE_BT_COMMAND, rc, size);

Modified: haiku/trunk/src/servers/bluetooth/HCITransportAccessor.h
===================================================================
--- haiku/trunk/src/servers/bluetooth/HCITransportAccessor.h	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/HCITransportAccessor.h	2008-03-09 00:04:16 UTC (rev 24317)
@@ -1,5 +1,11 @@
-/*  */
+/*
+ * Copyright 2007-2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
 
+
 #ifndef _HCITRANSPORT_ACCESSOR_H_
 #define _HCITRANSPORT_ACCESSOR_H_
 

Modified: haiku/trunk/src/servers/bluetooth/LocalDeviceHandler.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/LocalDeviceHandler.cpp	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/LocalDeviceHandler.cpp	2008-03-09 00:04:16 UTC (rev 24317)
@@ -110,9 +110,10 @@
     }
             
 bail:    */
+    fEventsWanted.RemoveMessage(msg);
+    
     fEventsWanted.Unlock();
-    
-    fEventsWanted.RemoveMessage(msg);
+
 }
 
 

Modified: haiku/trunk/src/servers/bluetooth/LocalDeviceImpl.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/LocalDeviceImpl.cpp	2008-03-08 23:14:06 UTC (rev 24316)
+++ haiku/trunk/src/servers/bluetooth/LocalDeviceImpl.cpp	2008-03-09 00:04:16 UTC (rev 24317)
@@ -15,9 +15,14 @@
 #include <bluetooth/bluetooth_error.h>
 #include <bluetooth/HCI/btHCI_event.h>
 
-
 #include <stdio.h>
 
+
+#if 0
+#pragma mark - Class methods -
+#endif
+
+
 // Factory methods
 LocalDeviceImpl* 
 LocalDeviceImpl::CreateControllerAccessor(BPath* path)
@@ -49,27 +54,33 @@
 }
 
 #if 0
-#pragma mark - Class methods -
+#pragma mark - Event handling methods -
 #endif
 
 void 
 LocalDeviceImpl::HandleEvent(struct hci_event_header* event)
 {
-	// Check if it was a non requested events
+
+printf("### Event comming: len = %d\n", event->elen);
+for (int16 index = 0 ; index < event->elen + 2; index++ ) {
+	printf("%x:",((uint8*)event)[index]);
+}
+printf("### \n");
+
+	// Events here might have not been initated by us
     switch (event->ecode) {
 	        case HCI_EVENT_HARDWARE_ERROR:
    				//HardwareError(event);    	
    			return;
+			case HCI_EVENT_CONN_REQUEST:
+	
+			break;
+
    			default:
    				// lets go on
    			break;        
 	}
 
-printf("Event comming: len = %d\n", event->elen);
-for (int16 index = 0 ; index < event->elen + 2; index++ ) {
-	printf("%x:",((uint8*)event)[index]);
-}
-printf("\n");
 	
 
 	BMessage* request = NULL;
@@ -101,10 +112,7 @@
  	
 		case HCI_EVENT_CONN_COMPLETE:
 		break;
- 	
-		case HCI_EVENT_CONN_REQUEST:
-		break;
- 	
+ 	 	
 		case HCI_EVENT_DISCONNECTION_COMPLETE:
 		break;
  	
@@ -216,15 +224,9 @@
 	// Handle command complete information
     request->FindInt16("opcodeExpected", 0 /*REVIEW!*/, &opcodeExpected);
 
-printf("Command complete ...%p\n",event);
-for (int16 index = 0 ; index < 10; index++ ) {
-	printf("%x:",((uint8*)event)[index]);
-}
-printf("\n");
 
-
 	if (request->IsSourceWaiting() == false)
-		Output::Instance()->Post("nobody waiting\n", BLACKBOARD_KIT);                	
+		Output::Instance()->Post("Nobody waiting for the event\n", BLACKBOARD_KIT);                	
     
     
     switch (opcodeExpected) {
@@ -232,14 +234,7 @@
         case PACK_OPCODE(OGF_INFORMATIONAL_PARAM, OCF_READ_BD_ADDR):
         {    
         	struct hci_rp_read_bd_addr* readbdaddr = (struct hci_rp_read_bd_addr*)(event+1);
-        	
-			printf("read bdaddr ...%p\n", readbdaddr);
-			for (int16 index = 0 ; index < 10; index++ ) {
-				printf("%x:",((uint8*)readbdaddr)[index]);
-			}
-			printf("\n");
-
-        	
+        	       	
             if (readbdaddr->status == BT_OK) {
                 
                                 
@@ -266,12 +261,6 @@
         {    
         	struct hci_rp_read_local_name* readLocalName = (struct hci_rp_read_local_name*)(event+1);
         	
-			printf("read bdaddr ...%p\n", readLocalName);
-			for (int16 index = 0 ; index < 10; index++ ) {
-				printf("%x:",((uint8*)readLocalName)[index]);
-			}
-			printf("\n");
-
         	reply.AddInt8("status", readLocalName->status);
         	
             if (readLocalName->status == BT_OK) {



From oruizdorantes at mail.berlios.de  Sun Mar  9 01:39:33 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Sun, 9 Mar 2008 01:39:33 +0100
Subject: [Haiku-commits] r24318 - haiku/trunk/src/kits/bluetooth
Message-ID: <200803090039.m290dXaH031939@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-09 01:39:32 +0100 (Sun, 09 Mar 2008)
New Revision: 24318
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24318&view=rev

Added:
   haiku/trunk/src/kits/bluetooth/DiscoveryAgent.cpp
Modified:
   haiku/trunk/src/kits/bluetooth/Jamfile
Log:
Add DiscoveryAgent skeleton



Added: haiku/trunk/src/kits/bluetooth/DiscoveryAgent.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/DiscoveryAgent.cpp	2008-03-09 00:04:16 UTC (rev 24317)
+++ haiku/trunk/src/kits/bluetooth/DiscoveryAgent.cpp	2008-03-09 00:39:32 UTC (rev 24318)
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2007-2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+#include <bluetooth/DiscoveryAgent.h>
+#include <bluetooth/DiscoveryListener.h>
+
+#include <bluetooth/RemoteDevice.h>
+
+namespace Bluetooth {
+
+
+RemoteDevice**
+DiscoveryAgent::RetrieveDevices(int option)
+{
+	return NULL;
+
+}
+
+
+bool
+DiscoveryAgent::StartInquiry(int accessCode, DiscoveryListener listener)
+{
+	return false;
+
+}
+
+
+bool
+DiscoveryAgent::CancelInquiry(DiscoveryListener listener)
+{
+	return false;
+}
+        
+
+DiscoveryAgent::DiscoveryAgent()
+{
+
+}
+
+}

Modified: haiku/trunk/src/kits/bluetooth/Jamfile
===================================================================
--- haiku/trunk/src/kits/bluetooth/Jamfile	2008-03-09 00:04:16 UTC (rev 24317)
+++ haiku/trunk/src/kits/bluetooth/Jamfile	2008-03-09 00:39:32 UTC (rev 24318)
@@ -10,6 +10,7 @@
 
 SharedLibrary libbluetooth.so :
 	LocalDevice.cpp
+	DiscoveryAgent.cpp
 	DiscoveryListener.cpp
 	: be
 ;



From mmu_man at mail.berlios.de  Sun Mar  9 03:38:10 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 9 Mar 2008 03:38:10 +0100
Subject: [Haiku-commits] r24319 - in
	haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam: .
	addons/sonix
Message-ID: <200803090238.m292cAHZ009629@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-09 03:38:09 +0100 (Sun, 09 Mar 2008)
New Revision: 24319
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24319&view=rev

Modified:
   haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/AddOn.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamBufferingDeframer.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamDeframer.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamStreamingDeframer.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/addons/sonix/SonixCamDevice.cpp
Log:
Fix warnings.


Modified: haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/AddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/AddOn.cpp	2008-03-09 00:39:32 UTC (rev 24318)
+++ haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/AddOn.cpp	2008-03-09 02:38:09 UTC (rev 24319)
@@ -109,7 +109,7 @@
 		return NULL;
 
 	fRoster->Lock();
-	for (int i = 0; i < fRoster->CountCameras(); i++) {
+	for (uint32 i = 0; i < fRoster->CountCameras(); i++) {
 		CamDevice *c;
 		c = fRoster->CameraAt(i);
 		PRINT((CH ": cam[%d]: %d, %s" CT, i, c->FlavorInfo()->internal_id, c->BrandName()));
@@ -147,6 +147,7 @@
 {
 	PRINT((CH "()" CT));
 	NotifyFlavorChange();
+	return B_OK;
 }
 
 status_t
@@ -154,6 +155,7 @@
 {
 	PRINT((CH "()" CT));
 	NotifyFlavorChange();
+	return B_OK;
 }
 
 void

Modified: haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamBufferingDeframer.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamBufferingDeframer.cpp	2008-03-09 00:39:32 UTC (rev 24318)
+++ haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamBufferingDeframer.cpp	2008-03-09 02:38:09 UTC (rev 24319)
@@ -40,7 +40,7 @@
 
 	PRINT((CH "(%p, %d), IB: %d" CT, buffer, size, IB.BufferLength()));
 
-	if (l < fMinFrameSize + fSkipSOFTags + fSkipEOFTags)
+	if (l < (int)(fMinFrameSize + fSkipSOFTags + fSkipEOFTags))
 		return size; // not enough data anyway
 
 	if (!fCurrentFrame) {
@@ -53,9 +53,9 @@
 		}
 	}
 
-	for (s = 0; (l - s > fMinFrameSize) && ((i = FindSOF(b + s, l - fMinFrameSize - s, &which)) > -1); s++) {
+	for (s = 0; (l - s > (int)fMinFrameSize) && ((i = FindSOF(b + s, l - fMinFrameSize - s, &which)) > -1); s++) {
 		s += i;
-		if (s + fSkipSOFTags + fMinFrameSize + fSkipEOFTags > l)
+		if ((int)(s + fSkipSOFTags + fMinFrameSize + fSkipEOFTags) > l)
 			break;
 		if (!fDevice->ValidateStartOfFrameTag(b + s, fSkipSOFTags))
 			continue;
@@ -64,7 +64,7 @@
 		PRINT((CH ": SOF: ... %02x %02x %02x %02x %02x %02x" CT, b[s+6], b[s+7], b[s+8], b[s+9], b[s+10], b[s+11]));
 		
 		for (e = s + fSkipSOFTags + fMinFrameSize;
-			 ((e <= s + fSkipSOFTags + fMaxFrameSize) && 
+			 ((e <= (int)(s + fSkipSOFTags + fMaxFrameSize)) && 
 			  (e < l) && ((i = 0*FindEOF(b + e, l - e, &which)) > -1)); 
 			 e++) {
 			e += i;
@@ -115,6 +115,6 @@
 	IB.Seek(0LL, SEEK_SET);
 	IB.SetSize(0);
 	fInputBuffIndex = next;
-	
+	return size;
 }
 

Modified: haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamDeframer.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamDeframer.cpp	2008-03-09 00:39:32 UTC (rev 24318)
+++ haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamDeframer.cpp	2008-03-09 02:38:09 UTC (rev 24319)
@@ -101,7 +101,6 @@
 status_t
 CamDeframer::GetFrame(CamFrame **frame, bigtime_t *stamp)
 {
-	status_t err = EINTR;
 	PRINT((CH "()" CT));
 	BAutolock l(fLocker);
 	CamFrame *f = (CamFrame *)fFrames.RemoveItem((int32)0);
@@ -115,7 +114,6 @@
 status_t
 CamDeframer::DropFrame()
 {
-	status_t err = EINTR;
 	PRINT((CH "()" CT));
 	BAutolock l(fLocker);
 	CamFrame *f = (CamFrame *)fFrames.RemoveItem((int32)0);
@@ -161,7 +159,7 @@
 CamDeframer::FindTags(const uint8 *buf, size_t buflen, const uint8 **tags, int tagcount, size_t taglen, size_t skiplen, int *which)
 {
 	int i, t;
-	for (i = 0; i < buflen - skiplen + 1; i++) {
+	for (i = 0; i < (int)(buflen - skiplen + 1); i++) {
 		for (t = 0; t < tagcount; t++) {
 			if (!memcmp(buf+i, tags[t], taglen)) {
 				if (which)

Modified: haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp	2008-03-09 00:39:32 UTC (rev 24318)
+++ haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamDevice.cpp	2008-03-09 02:38:09 UTC (rev 24319)
@@ -29,12 +29,12 @@
 // -----------------------------------------------------------------------------
 CamDevice::CamDevice(CamDeviceAddon &_addon, BUSBDevice* _device)
 	: fInitStatus(B_NO_INIT),
+	  fSensor(NULL),
 	  fCamDeviceAddon(_addon),
 	  fDevice(_device),
 	  fSupportedDeviceIndex(-1),
 	  fTransferEnabled(false),
-	  fLocker("WebcamDeviceLock"),
-	  fSensor(NULL)
+	  fLocker("WebcamDeviceLock")
 {
 	// fill in the generic flavor
 	memset(&fFlavorInfo, 0, sizeof(fFlavorInfo));

Modified: haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp	2008-03-09 00:39:32 UTC (rev 24318)
+++ haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamRoster.cpp	2008-03-09 02:38:09 UTC (rev 24319)
@@ -61,7 +61,7 @@
 CamRoster::DeviceRemoved(BUSBDevice* _device)
 {
 	PRINT((CH "()" CT));
-	for(uint32 i = 0; i < fCameras.CountItems(); ++i)
+	for(int32 i = 0; i < fCameras.CountItems(); ++i)
 	{
 		CamDevice* cam = (CamDevice *)fCameras.ItemAt(i);
 		if( cam->Matches(_device) )

Modified: haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamStreamingDeframer.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamStreamingDeframer.cpp	2008-03-09 00:39:32 UTC (rev 24318)
+++ haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/CamStreamingDeframer.cpp	2008-03-09 02:38:09 UTC (rev 24319)
@@ -115,7 +115,7 @@
 		}
 		PRINT((CH ": checking for EOF; bufsize=%d i=%d" CT, bufsize, i));
 		
-		if (i + fSkipEOFTags > bufsize) { // not enough room to check for EOF, leave it for next time
+		if (i + (int)fSkipEOFTags > bufsize) { // not enough room to check for EOF, leave it for next time
 			end = i;
 			i = -1; // don't detach yet
 		} else {

Modified: haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp	2008-03-09 00:39:32 UTC (rev 24318)
+++ haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/Producer.cpp	2008-03-09 02:38:09 UTC (rev 24319)
@@ -762,8 +762,8 @@
 
 		// This is where we fill the video buffer.
 		
+#if 0
 		uint32 *p = (uint32 *)buffer->Data();
-#if 0
 		/* Fill in a pattern */
 		for (uint32 y=0;y<fConnectedFormat.display.line_count;y++)
 			for (uint32 x=0;x<fConnectedFormat.display.line_width;x++)

Modified: haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/addons/sonix/SonixCamDevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/addons/sonix/SonixCamDevice.cpp	2008-03-09 00:39:32 UTC (rev 24318)
+++ haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/addons/sonix/SonixCamDevice.cpp	2008-03-09 02:38:09 UTC (rev 24319)
@@ -62,7 +62,7 @@
 	const BUSBConfiguration *config = GetDevice()->ConfigurationAt(0);
 	if (config) {
 		const BUSBInterface *inter = config->InterfaceAt(0);
-		int i;
+		uint32 i;
 		
 		GetDevice()->SetConfiguration(config);
 
@@ -228,7 +228,6 @@
 SonixCamDevice::WriteIIC(uint8 address, uint8 *data, size_t count)
 {
 	status_t err;
-	uint8 status;
 	uint8 buffer[8];
 	if (!Sensor())
 		return B_NO_INIT;
@@ -265,7 +264,6 @@
 SonixCamDevice::ReadIIC(uint8 address, uint8 *data)
 {
 	status_t err, lasterr = B_OK;
-	uint8 status;
 	uint8 buffer[8];
 	if (!Sensor())
 		return B_NO_INIT;
@@ -431,8 +429,8 @@
 		return err;
 	PRINT((CH ": VideoFrame = %fx%f,%fx%f" CT, VideoFrame().left, VideoFrame().top, VideoFrame().right, VideoFrame().bottom));
 	
-	long int w = VideoFrame().right - VideoFrame().left + 1;
-	long int h = VideoFrame().bottom - VideoFrame().top + 1;
+	long int w = (long)(VideoFrame().right - VideoFrame().left + 1);
+	long int h = (long)(VideoFrame().bottom - VideoFrame().top + 1);
 	b = new BBitmap(VideoFrame().OffsetToSelf(0,0), 0, B_RGB32, w*4);
 	PRINT((CH ": Frame: %dx%d" CT, w, h));
 	
@@ -462,17 +460,17 @@
 	if (err < B_OK)
 		return err;
 
-	long int w = VideoFrame().right - VideoFrame().left + 1;
-	long int h = VideoFrame().bottom - VideoFrame().top + 1;
+	long int w = (long)(VideoFrame().right - VideoFrame().left + 1);
+	long int h = (long)(VideoFrame().bottom - VideoFrame().top + 1);
 	PRINT((CH ": VideoFrame = %fx%f,%fx%f Frame: %dx%d" CT, VideoFrame().left, VideoFrame().top, VideoFrame().right, VideoFrame().bottom, w, h));
 	
-	if (buffer->SizeAvailable() >= w*h*4)
+	if (buffer->SizeAvailable() >= (size_t)w*h*4)
 		bayer2rgb32le((unsigned char *)buffer->Data(), (unsigned char *)f->Buffer(), w, h);
 	
 	delete f;
 	
 	PRINT((CH ": available %d, required %d" CT, buffer->SizeAvailable(), w*h*4));
-	if (buffer->SizeAvailable() < w*h*4)
+	if (buffer->SizeAvailable() < (size_t)w*h*4)
 		return E2BIG;
 	PRINT((CH ": got 1 frame (len %d)" CT, buffer->SizeUsed()));
 	return B_OK;



From stefano.ceccherini at gmail.com  Sun Mar  9 06:26:17 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Sun, 9 Mar 2008 06:26:17 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <20080308204426.30721.4@stippis2.1204981284.fake>
References: <200803081905.m28J5Aec018941@sheep.berlios.de>
	<20080308204426.30721.4@stippis2.1204981284.fake>
Message-ID: <894b9700803082126m18349b2fucbf264edde471920@mail.gmail.com>

2008/3/8, Stephan Assmus <superstippi at gmx.de>:

>  > * It's still not thread-safe for all usage patterns, though, so we might
>  > want
>  >   to remove or disable it: if a string is shared between several threads,
>  >   and one of those starts to use a reference, all kinds of problems can
>  >   happen.
>

But BString wasn't thread safe on beos either.


From stefano.ceccherini at gmail.com  Sun Mar  9 06:52:39 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Sun, 9 Mar 2008 06:52:39 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <894b9700803082126m18349b2fucbf264edde471920@mail.gmail.com>
References: <200803081905.m28J5Aec018941@sheep.berlios.de>
	<20080308204426.30721.4@stippis2.1204981284.fake>
	<894b9700803082126m18349b2fucbf264edde471920@mail.gmail.com>
Message-ID: <894b9700803082152t2a31e505udb9c52873821ecd6@mail.gmail.com>

2008/3/9, Stefano Ceccherini <stefano.ceccherini at gmail.com>:

> But BString wasn't thread safe on beos either.
>
Also, std::string is refcounted, also in beos.


From axeld at pinc-software.de  Sun Mar  9 10:49:49 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 09 Mar 2008 10:49:49 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24312_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/os/support_src/kits/support?=
In-Reply-To: <894b9700803082126m18349b2fucbf264edde471920@mail.gmail.com>
Message-ID: <1430149723-BeMail@zon>

"Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
> 2008/3/8, Stephan Assmus <superstippi at gmx.de>:
> >  > * It's still not thread-safe for all usage patterns, though, so 
> > > we might
> >  > want
> >  >   to remove or disable it: if a string is shared between several 
> > > threads,
> >  >   and one of those starts to use a reference, all kinds of 
> > > problems can
> >  >   happen.
> But BString wasn't thread safe on beos either.

That's a completely different context. Consider you share one (static) 
BString in different threads, and then copy them into other strings and 
work with those.
In BeOS this is perfectly fine, with the current BString 
implementation, it might not.

And you're right, the STL string implementation on BeOS suffers from 
the same problems; but that's probably no different than on other 
platforms (one can only hope), ie. there is no change in behaviour.

IOW we might break existing BeOS applications with this change. We 
could try and see if this has any actual consequences - if it doesn't 
we could keep it as is, and just document the changed behaviour.

Bye,
   Axel.



From host.haiku at gmx.de  Sun Mar  9 13:21:16 2008
From: host.haiku at gmx.de (julun)
Date: Sun, 09 Mar 2008 13:21:16 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <1430149723-BeMail@zon>
References: <1430149723-BeMail@zon>
Message-ID: <47D3D63C.7040502@gmx.de>

Hi,

Axel D?rfler schrieb:
> "Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
>> 2008/3/8, Stephan Assmus <superstippi at gmx.de>:
>>>  > * It's still not thread-safe for all usage patterns, though, so 
>>>> we might
>>>  > want
>>>  >   to remove or disable it: if a string is shared between several 
>>>> threads,
>>>  >   and one of those starts to use a reference, all kinds of 
>>>> problems can
>>>  >   happen.
>> But BString wasn't thread safe on beos either.
> 
> That's a completely different context. Consider you share one (static) 
> BString in different threads, and then copy them into other strings and 
> work with those.
> In BeOS this is perfectly fine, with the current BString 
> implementation, it might not.

That's why i asked to review and comment on the code at least a month ago.

So it is not that i don't like the fixes, it's just a matter of how things 
are done. We could have discussed this and i would have changed it myself as 
i'm for sure able to do this. To speak a open word on this without any 
offense, if there is something wrong or needs to be adjusted with any code 
written by me - point me to it and i'm more than willing to fix it myself. 
No need to cleanup some tabs, whitespaces, adjust braces or whatever. Others 
might like this but i don't.

> IOW we might break existing BeOS applications with this change. We 
> could try and see if this has any actual consequences - if it doesn't 
> we could keep it as is, and just document the changed behaviour.

So we are lucky that there are not much killer apps out there who will 
break.   :)

Regards,
Karsten


From host.haiku at gmx.de  Sun Mar  9 13:32:42 2008
From: host.haiku at gmx.de (julun)
Date: Sun, 09 Mar 2008 13:32:42 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <20080308211628.30849.6@stippis2.1204981284.fake>
References: <200803081905.m28J5Aec018941@sheep.berlios.de>	<20080308204426.30721.4@stippis2.1204981284.fake>	<47D2F0FD.8060209@gmx.de>
	<20080308211628.30849.6@stippis2.1204981284.fake>
Message-ID: <47D3D8EA.9030704@gmx.de>

Hi,

Stephan Assmus schrieb:
> Hi Julun,
> 
> julun wrote:
>> basically the whole thing isn't thread save at all. To achieve this you 
>> would need to lock every function that writes to the private data 
>> section. This would drastically reduce the performance of that class. 
>> What we where talking about here is reentrance, just to make sure the 
>> string detaches in case an other thread is going to manipulate the 
>> reference.
> 
> The point is this: As a programmer, you have no influence on the behaviour. 
> If you use strings in certain ways, the new code will make use of 
> refernces. But if the programm happens to use the strings in different 
> threads, then suddenly things can go wrong, while everything was fine on 
> BeOS.
> 
>> While testing the class in VS i tested it several times with it's leak 
>> checker and it didn't report anything, but anyway...
> 
> You checked against the wrong reference count. atomic_add() returns the 
> previous value. If a string without any references has a reference count of 
> 1 (by definition), then you need to free() the data if atomic_add(..., -1) 
> == 1. Also, you should not free in case <= 1, since that could result in 
> double frees. Although if you have /this/ threading issue, things go wrong 
> anyways, that's one of the aspects that Axel means.

Thx for clarification of fact, i wasn't aware of that   :)

Regards,
Karsten



From mmlr at mail.berlios.de  Sun Mar  9 13:57:00 2008
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sun, 9 Mar 2008 13:57:00 +0100
Subject: [Haiku-commits] r24320 - in haiku/trunk:
	headers/build/private/kernel headers/private/kernel
	src/system/kernel/vm
Message-ID: <200803091257.m29Cv0Jk023808@sheep.berlios.de>

Author: mmlr
Date: 2008-03-09 13:56:59 +0100 (Sun, 09 Mar 2008)
New Revision: 24320
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24320&view=rev

Modified:
   haiku/trunk/headers/build/private/kernel/syscalls.h
   haiku/trunk/headers/private/kernel/syscalls.h
   haiku/trunk/headers/private/kernel/vm.h
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
Naive implementation of transfer_area(). It follows the suggested sematics
of the resolved ToDo, but could probably be made more efficient. Instead of
transfering the area, the area is cloned into the target teams' address space
and the original is deleted. This generates a new area_id for the transfered
area (as suggested by the ToDo). Updated syscall prototypes according to the
status_t to area_id return type change.

Modified: haiku/trunk/headers/build/private/kernel/syscalls.h
===================================================================
--- haiku/trunk/headers/build/private/kernel/syscalls.h	2008-03-09 02:38:09 UTC (rev 24319)
+++ haiku/trunk/headers/build/private/kernel/syscalls.h	2008-03-09 12:56:59 UTC (rev 24320)
@@ -207,7 +207,7 @@
 // extern status_t		_kern_get_area_info(area_id area, area_info *info);
 // extern status_t		_kern_get_next_area_info(team_id team, int32 *cookie, area_info *info);
 // extern status_t		_kern_resize_area(area_id area, size_t newSize);
-// extern status_t		_kern_transfer_area(area_id area, void **_address, uint32 addressSpec,
+// extern area_id		_kern_transfer_area(area_id area, void **_address, uint32 addressSpec,
 // 						team_id target);
 // extern status_t		_kern_set_area_protection(area_id area, uint32 newProtection);
 // extern area_id		_kern_clone_area(const char *name, void **_address, uint32 addressSpec, 

Modified: haiku/trunk/headers/private/kernel/syscalls.h
===================================================================
--- haiku/trunk/headers/private/kernel/syscalls.h	2008-03-09 02:38:09 UTC (rev 24319)
+++ haiku/trunk/headers/private/kernel/syscalls.h	2008-03-09 12:56:59 UTC (rev 24320)
@@ -234,7 +234,7 @@
 extern status_t		_kern_get_area_info(area_id area, area_info *info);
 extern status_t		_kern_get_next_area_info(team_id team, int32 *cookie, area_info *info);
 extern status_t		_kern_resize_area(area_id area, size_t newSize);
-extern status_t		_kern_transfer_area(area_id area, void **_address, uint32 addressSpec,
+extern area_id		_kern_transfer_area(area_id area, void **_address, uint32 addressSpec,
 						team_id target);
 extern status_t		_kern_set_area_protection(area_id area, uint32 newProtection);
 extern area_id		_kern_clone_area(const char *name, void **_address, uint32 addressSpec, 

Modified: haiku/trunk/headers/private/kernel/vm.h
===================================================================
--- haiku/trunk/headers/private/kernel/vm.h	2008-03-09 02:38:09 UTC (rev 24319)
+++ haiku/trunk/headers/private/kernel/vm.h	2008-03-09 12:56:59 UTC (rev 24320)
@@ -149,7 +149,7 @@
 status_t _user_get_area_info(area_id area, area_info *info);
 status_t _user_get_next_area_info(team_id team, int32 *cookie, area_info *info);
 status_t _user_resize_area(area_id area, size_t newSize);
-status_t _user_transfer_area(area_id area, void **_address, uint32 addressSpec, 
+area_id _user_transfer_area(area_id area, void **_address, uint32 addressSpec, 
 			team_id target);
 status_t _user_set_area_protection(area_id area, uint32 newProtection);
 area_id _user_clone_area(const char *name, void **_address, uint32 addressSpec, 

Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2008-03-09 02:38:09 UTC (rev 24319)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2008-03-09 12:56:59 UTC (rev 24320)
@@ -4978,113 +4978,26 @@
  *	only accessible using the _kern_transfer_area() syscall.
  */
 
-static status_t
+static area_id
 transfer_area(area_id id, void **_address, uint32 addressSpec, team_id target)
 {
-	// TODO: implement like clone_area(), just atomically (ie. hand out a new area ID)!
-	return B_ERROR;
-#if 0
-	vm_address_space *sourceAddressSpace;
-	vm_address_space *targetAddressSpace;
-	void *reservedAddress = NULL;
-	vm_area *reserved;
-	vm_area *area = vm_get_area(id);
-	if (area == NULL)
-		return B_BAD_VALUE;
-
-	// ToDo: check if the current team owns the area
-	status_t status = team_get_address_space(target, &targetAddressSpace);
-	if (status != B_OK)
-		goto err1;
-
-	// We will first remove the area, and then reserve its former
-	// address range so that we can later reclaim it if the
-	// transfer failed.
-
-	sourceAddressSpace = area->address_space;
-	reserved = create_reserved_area_struct(sourceAddressSpace, 0);
-	if (reserved == NULL) {
-		status = B_NO_MEMORY;
-		goto err2;
-	}
-
-	acquire_sem_etc(sourceAddressSpace->sem, WRITE_COUNT, 0, 0);
-
-	// unmap the area in the source address space
-	vm_unmap_pages(area, area->base, area->size);
-
-	// TODO: there might be additional page faults at this point!
-
-	reservedAddress = (void *)area->base;
-	remove_area_from_address_space(sourceAddressSpace, area);
-	status = insert_area(sourceAddressSpace, &reservedAddress, B_EXACT_ADDRESS,
-		area->size, reserved);
-		// famous last words: this cannot fail :)
-
-	release_sem_etc(sourceAddressSpace->sem, WRITE_COUNT, 0);
-
-	if (status != B_OK)
-		goto err3;
-
-	// insert the area into the target address space
-
-	acquire_sem_etc(targetAddressSpace->sem, WRITE_COUNT, 0, 0);
-	// check to see if this address space has entered DELETE state
-	if (targetAddressSpace->state == VM_ASPACE_STATE_DELETION) {
-		// okay, someone is trying to delete this adress space now, so we can't
-		// insert the area, so back out
-		status = B_BAD_TEAM_ID;
-		goto err4;
-	}
-
-	status = insert_area(targetAddressSpace, _address, addressSpec, area->size, area);
+	area_info info;	
+	status_t status = get_area_info(id, &info);
 	if (status < B_OK)
-		goto err4;
+		return status;
 
-	// The area was successfully transferred to the new team when we got here
-	area->address_space = targetAddressSpace;
+	area_id clonedArea = vm_clone_area(target, info.name, _address,
+		addressSpec, info.protection, REGION_NO_PRIVATE_MAP, id);
+	if (clonedArea < B_OK)
+		return clonedArea;
 
-	// TODO: take area lock/wiring into account!
-
-	release_sem_etc(targetAddressSpace->sem, WRITE_COUNT, 0);
-
-	vm_unreserve_address_range(sourceAddressSpace->id, reservedAddress,
-		area->size);
-	vm_put_address_space(sourceAddressSpace);
-		// we keep the reference of the target address space for the
-		// area, so we only have to put the one from the source
-	vm_put_area(area);
-
-	return B_OK;
-
-err4:
-	release_sem_etc(targetAddressSpace->sem, WRITE_COUNT, 0);
-err3:
-	// insert the area again into the source address space
-	acquire_sem_etc(sourceAddressSpace->sem, WRITE_COUNT, 0, 0);
-	// check to see if this address space has entered DELETE state
-	if (sourceAddressSpace->state == VM_ASPACE_STATE_DELETION
-		|| insert_area(sourceAddressSpace, &reservedAddress, B_EXACT_ADDRESS,
-				area->size, area) != B_OK) {
-		// We can't insert the area anymore - we have to delete it manually
-		vm_cache *cache = vm_area_get_locked_cache(area);
-		atomic_add(&area->no_cache_change, 1);
-		vm_area_put_locked_cache(cache);
-
-		vm_cache_remove_area(cache, area);
-		vm_cache_release_ref(cache);
-		free(area->name);
-		free(area);
-		area = NULL;
+	status = vm_delete_area(info.team, id);
+	if (status < B_OK) {
+		vm_delete_area(target, clonedArea);
+		return status;
 	}
-	release_sem_etc(sourceAddressSpace->sem, WRITE_COUNT, 0);
-err2:
-	vm_put_address_space(targetAddressSpace);
-err1:
-	if (area != NULL)
-		vm_put_area(area);
-	return status;
-#endif
+
+	return clonedArea;
 }
 
 
@@ -5272,7 +5185,7 @@
 }
 
 
-status_t
+area_id
 _user_transfer_area(area_id area, void **userAddress, uint32 addressSpec, team_id target)
 {
 	// filter out some unavailable values (for userland)
@@ -5287,14 +5200,14 @@
 		|| user_memcpy(&address, userAddress, sizeof(address)) < B_OK)
 		return B_BAD_ADDRESS;
 
-	status_t status = transfer_area(area, &address, addressSpec, target);
-	if (status < B_OK)
-		return status;
+	area_id newArea = transfer_area(area, &address, addressSpec, target);
+	if (newArea < B_OK)
+		return newArea;
 
 	if (user_memcpy(userAddress, &address, sizeof(address)) < B_OK)
 		return B_BAD_ADDRESS;
 
-	return status;
+	return newArea;
 }
 
 



From jonas at kirilla.com  Sun Mar  9 14:13:48 2008
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Sun, 09 Mar 2008 14:13:48 +0100 CET
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
 src/kits/support
In-Reply-To: <1430149723-BeMail@zon>
Message-ID: <1146021671-BeMail@kirilla>

"Axel D?rfler" <axeld at pinc-software.de> wrote:
 ... 
> IOW we might break existing BeOS applications
> with this change. 

I don't know if its related, but the following happens when trying to 
start NetPositive recently. There's a ~BString in the the gdb 
backtrace.

stdout:
"NetPositive copy: src/system/libroot/posix/malloc/
superblock.h:194:void BPrivate::superblock::putBlock(BPrivate::block *
): getNumAvailable() < getNumBlocks()"

gdb: 
GNU gdb 6.3
Copyright 2004 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and 
you are
welcome to change it and/or distribute copies of it under certain 
conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB.  Type "show warranty" for 
details.
This GDB was configured as "i586-pc-haiku"...(no debugging symbols 
found)

[tcsetpgrp failed in terminal_inferior: Invalid Argument]
Thread 368 called debugger(): getNumAvailable() < getNumBlocks()
Reading symbols from /boot/beos/system/lib/libbe.so...(no debugging 
symbols found)...done.
Loaded symbols for /boot/beos/system/lib/libbe.so
Reading symbols from /boot/beos/system/lib/libnetwork.so...(no 
debugging symbols found)...done.
Loaded symbols for /boot/beos/system/lib/libnetwork.so
Reading symbols from /boot/beos/system/lib/libtracker.so...
(no debugging symbols found)...done.
Loaded symbols for /boot/beos/system/lib/libtracker.so
Reading symbols from /boot/beos/system/lib/libtextencoding.so...(no 
debugging symbols found)...done.
Loaded symbols for /boot/beos/system/lib/libtextencoding.so
Reading symbols from /boot/beos/system/lib/libmidi.so...
(no debugging symbols found)...done.
Loaded symbols for /boot/beos/system/lib/libmidi.so
Reading symbols from /boot/beos/system/lib/libmail.so...(no debugging 
symbols found)...done.
Loaded symbols for /boot/beos/system/lib/libmail.so
Reading symbols from /boot/beos/system/lib/libtranslation.so...
(no debugging symbols found)...done.
Loaded symbols for /boot/beos/system/lib/libtranslation.so
Reading symbols from /boot/beos/system/lib/libgame.so...(no debugging 
symbols found)...done.
Loaded symbols for /boot/beos/system/lib/libgame.so
Reading symbols from /boot/beos/system/lib/libroot.so...done.
Loaded symbols for /boot/beos/system/lib/libroot.so
Reading symbols from /boot/beos/system/lib/libstdc++.r4.so...done.
Loaded symbols for /boot/beos/system/lib/libstdc++.r4.so
Reading symbols from /boot/beos/system/lib/libmidi2.so...done.
Loaded symbols for /boot/beos/system/lib/libmidi2.so
Reading symbols from /boot/beos/system/lib/libmedia.so...done.
Loaded symbols for /boot/beos/system/lib/libmedia.so
Reading symbols from /boot/beos/system/lib/libfluidsynth.so...done.
Loaded symbols for /boot/beos/system/lib/libfluidsynth.so
[tcsetpgrp failed in terminal_inferior: Invalid Argument]

[Switching to team /boot/home/Desktop/NetPositive copy (368) thread 
NetPositivecopy (368)]
0xffff0104 in ?? ()
(gdb) bt
#0  0xffff0104 in ?? ()
#1  0x00984aee in debugger () from /boot/beos/system/lib/libroot.so
#2  0x0098bfd1 in __assert_fail () from /boot/beos/system/lib/
libroot.so
#3  0x00990fb6 in BPrivate::hoardHeap::freeBlock ()
   from /boot/beos/system/lib/libroot.so
#4  0x00992049 in BPrivate::processHeap::free ()
   from /boot/beos/system/lib/libroot.so
#5  0x009936c9 in free () from /boot/beos/system/lib/libroot.so
#6  0x00514820 in BString::_FreePrivateData ()
   from /boot/beos/system/lib/libbe.so
#7  0x0051103b in BString::~BString () from /boot/beos/system/lib/
libbe.so
#8  0x002b4c05 in BuildMenuList ()
#9  0x0029b115 in NetPositive::Init ()
#10 0x0029ad9c in NetPositive::ReadyToRun ()
#11 0x0040b5ce in BApplication::DispatchMessage ()
   from /boot/beos/system/lib/libbe.so
#12 0x004154e5 in BLooper::task_looper () from /boot/beos/system/lib/
libbe.so
#13 0x00409f6e in BApplication::Run () from /boot/beos/system/lib/
libbe.so
#14 0x0029ac58 in main ()
(gdb)

/Jonas.


From axeld at pinc-software.de  Sun Mar  9 14:29:31 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 09 Mar 2008 14:29:31 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24312_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/os/support_src/kits/support?=
In-Reply-To: <47D3D63C.7040502@gmx.de>
Message-ID: <14612033641-BeMail@zon>

Hi Julun,

julun <host.haiku at gmx.de> wrote:
> > In BeOS this is perfectly fine, with the current BString 
> > implementation, it might not.
> That's why i asked to review and comment on the code at least a month 
> ago.

And that was the perfect way to go; Stefano reviewed your code and 
checked it in.

> So it is not that i don't like the fixes, it's just a matter of how 
> things 
> are done. We could have discussed this and i would have changed it 
> myself as 
> i'm for sure able to do this. To speak a open word on this without 
> any 
> offense, if there is something wrong or needs to be adjusted with any 
> code 
> written by me - point me to it and i'm more than willing to fix it 
> myself. 
> No need to cleanup some tabs, whitespaces, adjust braces or whatever. 
> Others 
> might like this but i don't.

Stephan pointed me to some possible problems in the code, and I had a 
look. And while I was at it, I cleaned up some odd things, too - I 
wouldn't even have reported this to you when I would have reviewed your 
code, but it does certainly improve the code quality.
In open source you cannot always wait for someone to fix a problem; it 
might never get done. If you prefer to get involved, that's perfectly 
okay, but you cannot expect this to happen every time.
Don't take it personally; try to be glad someone fixed a problem in 
Haiku, and you didn't need to spend any time on it.

> > IOW we might break existing BeOS applications with this change. We 
> > could try and see if this has any actual consequences - if it 
> > doesn't 
> > we could keep it as is, and just document the changed behaviour.
> So we are lucky that there are not much killer apps out there who 
> will 
> break.   :)

In a way 8-)

Bye,
   Axel.



From mmlr at mail.berlios.de  Sun Mar  9 14:35:42 2008
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sun, 9 Mar 2008 14:35:42 +0100
Subject: [Haiku-commits] r24321 - in haiku/trunk: headers/os/app
	headers/private/app src/kits/app
Message-ID: <200803091335.m29DZgX8027069@sheep.berlios.de>

Author: mmlr
Date: 2008-03-09 14:35:41 +0100 (Sun, 09 Mar 2008)
New Revision: 24321
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24321&view=rev

Modified:
   haiku/trunk/headers/os/app/Message.h
   haiku/trunk/headers/private/app/MessagePrivate.h
   haiku/trunk/src/kits/app/Message.cpp
Log:
Rewrite and activate message passing by area. Passing by area works now with
the new sematic of transfer_area so a message area is transfered into the right
teams' address space and it does not need to be cloned there anymore. Passing
by area is only used for messages bigger than a certain size (currently
hardcoded to 40KB) which should be somehow bound to the max port message size.
This makes passing large messages (i.e. > the port limit) possible, so for
example copy&paste of long text, image data, etc. should now work.
Got rid of the fClonedArea member as it is not necessary with the new design,
renamed shared_area to message_area in the private message_header, avoid
an unnecessary allocation of the header for the copy constructors, check
allocations in a few more places and some minor cleanup.

Modified: haiku/trunk/headers/os/app/Message.h
===================================================================
--- haiku/trunk/headers/os/app/Message.h	2008-03-09 12:56:59 UTC (rev 24320)
+++ haiku/trunk/headers/os/app/Message.h	2008-03-09 13:35:41 UTC (rev 24321)
@@ -257,7 +257,7 @@
 		friend class Private;
 		friend class BMessageQueue;
 
-		status_t		_InitCommon();
+		status_t		_InitCommon(bool initHeader);
 		status_t		_InitHeader();
 		status_t		_Clear();
 
@@ -284,14 +284,13 @@
 		message_header*	fHeader;
 		field_header*	fFields;
 		uint8*			fData;
-		area_id			fClonedArea;
 
 		mutable	BMessage* fOriginal;
 
 		BMessage*		fQueueLink;
 			// fQueueLink is used by BMessageQueue to build a linked list
 
-		uint32			fReserved[10];
+		uint32			fReserved[11];
 
 						// deprecated
 						BMessage(BMessage *message);

Modified: haiku/trunk/headers/private/app/MessagePrivate.h
===================================================================
--- haiku/trunk/headers/private/app/MessagePrivate.h	2008-03-09 12:56:59 UTC (rev 24320)
+++ haiku/trunk/headers/private/app/MessagePrivate.h	2008-03-09 13:35:41 UTC (rev 24321)
@@ -68,7 +68,7 @@
 
 	int32		target;
 	int32		current_specifier;
-	area_id		shared_area;
+	area_id		message_area;
 
 	// reply info
 	port_id		reply_port;

Modified: haiku/trunk/src/kits/app/Message.cpp
===================================================================
--- haiku/trunk/src/kits/app/Message.cpp	2008-03-09 12:56:59 UTC (rev 24320)
+++ haiku/trunk/src/kits/app/Message.cpp	2008-03-09 13:35:41 UTC (rev 24321)
@@ -100,6 +100,9 @@
 
 	status_t result;
 	char *buffer = (char *)malloc(size);
+	if (buffer == NULL)
+		return B_NO_MEMORY;
+
 	do {
 		result = read_port(replyPort, _code, buffer, size);
 	} while (result == B_INTERRUPTED);
@@ -121,14 +124,14 @@
 BMessage::BMessage()
 {
 	DEBUG_FUNCTION_ENTER;
-	_InitCommon();
+	_InitCommon(true);
 }
 
 
 BMessage::BMessage(BMessage *other)
 {
 	DEBUG_FUNCTION_ENTER;
-	_InitCommon();
+	_InitCommon(false);
 	*this = *other;
 }
 
@@ -136,7 +139,7 @@
 BMessage::BMessage(uint32 _what)
 {
 	DEBUG_FUNCTION_ENTER;
-	_InitCommon();
+	_InitCommon(true);
 	fHeader->what = what = _what;
 }
 
@@ -144,7 +147,7 @@
 BMessage::BMessage(const BMessage &other)
 {
 	DEBUG_FUNCTION_ENTER;
-	_InitCommon();
+	_InitCommon(false);
 	*this = other;
 }
 
@@ -152,7 +155,6 @@
 BMessage::~BMessage()
 {
 	DEBUG_FUNCTION_ENTER;
-
 	_Clear();
 }
 
@@ -184,7 +186,7 @@
 		memcpy(fData, other.fData, fHeader->data_size);
 	}
 
-	fHeader->shared_area = -1;
+	fHeader->message_area = -1;
 	fHeader->fields_available = 0;
 	fHeader->data_available = 0;
 	fHeader->what = what = other.what;
@@ -219,7 +221,7 @@
 
 
 status_t
-BMessage::_InitCommon()
+BMessage::_InitCommon(bool initHeader)
 {
 	DEBUG_FUNCTION_ENTER;
 	what = 0;
@@ -228,12 +230,14 @@
 	fFields = NULL;
 	fData = NULL;
 
-	fClonedArea = -1;
-
 	fOriginal = NULL;
 	fQueueLink = NULL;
 
-	return _InitHeader();
+	if (initHeader)
+		return _InitHeader();
+
+	fHeader = NULL;
+	return B_OK;
 }
 
 
@@ -248,7 +252,7 @@
 	fHeader->flags = MESSAGE_FLAG_VALID;
 	fHeader->what = what;
 	fHeader->current_specifier = -1;
-	fHeader->shared_area = -1;
+	fHeader->message_area = -1;
 
 	fHeader->target = B_NULL_TOKEN;
 	fHeader->reply_target = B_NULL_TOKEN;
@@ -266,17 +270,20 @@
 BMessage::_Clear()
 {
 	DEBUG_FUNCTION_ENTER;
-	// We're going to destroy all information of this message. If there's
-	// still someone waiting for a reply to this message, we have to send
-	// one now.
-	if (IsSourceWaiting())
-		SendReply(B_NO_REPLY);
+	if (fHeader) {
+		// We're going to destroy all information of this message. If there's
+		// still someone waiting for a reply to this message, we have to send
+		// one now.
+		if (IsSourceWaiting())
+			SendReply(B_NO_REPLY);
 
-	if (fClonedArea >= B_OK)
-		_Dereference();
+		if (fHeader->message_area >= 0)
+			_Dereference();
 
-	free(fHeader);
-	fHeader = NULL;
+		free(fHeader);
+		fHeader = NULL;
+	}
+
 	free(fFields);
 	fFields = NULL;
 	free(fData);
@@ -561,7 +568,7 @@
 	if (!oldEntry || !newEntry)
 		return B_BAD_VALUE;
 
-	if (fClonedArea >= B_OK)
+	if (fHeader->message_area >= 0)
 		_CopyForWrite();
 
 	uint32 hash = _HashName(oldEntry) % fHeader->hash_table_size;
@@ -926,6 +933,9 @@
 {
 	DEBUG_FUNCTION_ENTER;
 	message_header *header = (message_header *)malloc(sizeof(message_header));
+	if (header == NULL)
+		return B_NO_MEMORY;
+
 	memcpy(header, fHeader, sizeof(message_header));
 
 	header->what = what;
@@ -934,7 +944,7 @@
 	header->flags |= MESSAGE_FLAG_PASS_BY_AREA;
 	*_header = header;
 
-	if (header->shared_area >= B_OK)
+	if (header->message_area >= 0)
 		return B_OK;
 
 	if (header->fields_size == 0 && header->data_size == 0)
@@ -943,7 +953,7 @@
 	uint8 *address = NULL;
 	ssize_t size = header->fields_size + header->data_size;
 	size = (size + B_PAGE_SIZE) & ~(B_PAGE_SIZE - 1);
-	area_id area = create_area("Shared BMessage data", (void **)&address,
+	area_id area = create_area("BMessage data", (void **)&address,
 		B_ANY_ADDRESS, size, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA);
 
 	if (area < B_OK) {
@@ -963,7 +973,7 @@
 		header->data_checksum = BPrivate::CalculateChecksum((uint8 *)address, header->data_size);
 	}
 
-	header->shared_area = area;
+	header->message_area = area;
 	return B_OK;
 }
 
@@ -979,25 +989,37 @@
 	if (fHeader->fields_size == 0 && header->data_size == 0)
 		return B_OK;
 
+	area_info areaInfo;
+	status_t result = get_area_info(fHeader->message_area, &areaInfo);
+	if (result < B_OK)
+		return result;
+
 	uint8 *address = NULL;
-	area_id clone = clone_area("Cloned BMessage data", (void **)&address,
-		B_ANY_ADDRESS, B_READ_AREA, fHeader->shared_area);
+	thread_info threadInfo;
+	get_thread_info(find_thread(NULL), &threadInfo);
+	if (areaInfo.team != threadInfo.team) {
+#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
+		// we are accessing a message from a port not owned by us
+		area_id transfered = _kern_transfer_area(fHeader->message_area,
+			(void **)&address, B_ANY_ADDRESS, threadInfo.team);
+		if (transfered < 0) {
+			debug_printf("BMessage: failed to transfer area into current team\n");
+			return transfered;
+		}
 
-	if (clone < B_OK) {
-		free(fHeader);
-		fHeader = NULL;
-		_InitHeader();
-		return clone;
-	}
+		fHeader->message_area = transfered;
+#endif
+	} else
+		address = (uint8 *)areaInfo.address;
 
-	fClonedArea = clone;
 	fFields = (field_header *)address;
 	address += fHeader->fields_size;
 	fData = address;
 
+	// ToDo: once we fully trust this mechanism we might want to remove this
 	if (fHeader->fields_checksum != BPrivate::CalculateChecksum((uint8 *)fFields, fHeader->fields_size)
 		|| fHeader->data_checksum != BPrivate::CalculateChecksum((uint8 *)fData, fHeader->data_size)) {
-		debug_printf("checksum mismatch\n");
+		debug_printf("BMessage: checksum mismatch in message passed by area!\n");
 		_Clear();
 		_InitHeader();
 		return B_BAD_VALUE;
@@ -1011,8 +1033,8 @@
 BMessage::_Dereference()
 {
 	DEBUG_FUNCTION_ENTER;
-	delete_area(fClonedArea);
-	fClonedArea = -1;
+	delete_area(fHeader->message_area);
+	fHeader->message_area = -1;
 	fFields = NULL;
 	fData = NULL;
 	return B_OK;
@@ -1023,19 +1045,25 @@
 BMessage::_CopyForWrite()
 {
 	DEBUG_FUNCTION_ENTER;
-	if (fClonedArea < B_OK)
-		return B_OK;
 
 	field_header *newFields = NULL;
 	uint8 *newData = NULL;
 
 	if (fHeader->fields_size > 0) {
 		newFields = (field_header *)malloc(fHeader->fields_size);
+		if (newFields == NULL)
+			return B_NO_MEMORY;
+
 		memcpy(newFields, fFields, fHeader->fields_size);
 	}
 
 	if (fHeader->data_size > 0) {
 		newData = (uint8 *)malloc(fHeader->data_size);
+		if (newData == NULL) {
+			free(newFields);
+			return B_NO_MEMORY;
+		}
+
 		memcpy(newData, fData, fHeader->data_size);
 	}
 
@@ -1089,7 +1117,7 @@
 		if (result < B_OK)
 			return result;
 	} else {
-		fHeader->shared_area = -1;
+		fHeader->message_area = -1;
 
 		if (fHeader->fields_size > 0) {
 			fFields = (field_header *)malloc(fHeader->fields_size);
@@ -1102,8 +1130,11 @@
 
 		if (fHeader->data_size > 0) {
 			fData = (uint8 *)malloc(fHeader->data_size);
-			if (!fData)
+			if (!fData) {
+				free(fFields);
+				fFields = NULL;
 				return B_NO_MEMORY;
+			}
 
 			memcpy(fData, flatBuffer, fHeader->data_size);
 		}
@@ -1156,7 +1187,7 @@
 		if (result < B_OK)
 			return result;
 	} else {
-		fHeader->shared_area = -1;
+		fHeader->message_area = -1;
 
 		if (result == B_OK && fHeader->fields_size > 0) {
 			fFields = (field_header *)malloc(fHeader->fields_size);
@@ -1571,7 +1602,7 @@
 	if (numBytes <= 0 || !data)
 		return B_BAD_VALUE;
 
-	if (fClonedArea >= B_OK)
+	if (fHeader->message_area >= 0)
 		_CopyForWrite();
 
 	field_header *field = NULL;
@@ -1628,7 +1659,7 @@
 	if (index < 0)
 		return B_BAD_VALUE;
 
-	if (fClonedArea >= B_OK)
+	if (fHeader->message_area >= 0)
 		_CopyForWrite();
 
 	field_header *field = NULL;
@@ -1679,7 +1710,7 @@
 BMessage::RemoveName(const char *name)
 {
 	DEBUG_FUNCTION_ENTER;
-	if (fClonedArea >= B_OK)
+	if (fHeader->message_area >= 0)
 		_CopyForWrite();
 
 	field_header *field = NULL;
@@ -1751,9 +1782,6 @@
 	if (numBytes <= 0 || !data)
 		return B_BAD_VALUE;
 
-	if (fClonedArea >= B_OK)
-		_CopyForWrite();
-
 	field_header *field = NULL;
 	status_t result = _FindField(name, type, &field);
 
@@ -1766,6 +1794,9 @@
 	if (index >= field->count)
 		return B_BAD_INDEX;
 
+	if (fHeader->message_area >= 0)
+		_CopyForWrite();
+
 	if (field->flags & FIELD_FLAG_FIXED_SIZE) {
 		ssize_t size = field->data_size / field->count;
 		if (size != numBytes)
@@ -1885,7 +1916,7 @@
 	ssize_t size = 0;
 	char *buffer = NULL;
 	message_header *header = NULL;
-	status_t result;
+	status_t result = B_OK;
 
 	BPrivate::BDirectMessageTarget* direct = NULL;
 	BMessage* copy = NULL;
@@ -1900,38 +1931,56 @@
 		if (copy != NULL) {
 			header = copy->fHeader;
 			header->flags = fHeader->flags;
-			result = B_OK;
 		} else {
 			direct->Release();
-			result = B_NO_MEMORY;
+			return B_NO_MEMORY;
 		}
-	} else if (/*fHeader->fields_size + fHeader->data_size > B_PAGE_SIZE*/false) {
+#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
+	} else if (fHeader->fields_size + fHeader->data_size > B_PAGE_SIZE * 10) {
+		// ToDo: bind the above size to the max port message size
+		// use message passing by area for such a large message
 		result = _FlattenToArea(&header);
+		if (result < B_OK)
+			return result;
+
 		buffer = (char *)header;
 		size = sizeof(message_header);
 
-#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
-		// TODO: this is not yet finished - the target needs to get the
-		// address (and ID) of the area
-		port_info info;
-		get_port_info(port, &info);
+		team_id target = portOwner;
+		if (target < 0) {
+			port_info info;
+			result = get_port_info(port, &info);
+			if (result < B_OK)
+				return result;
+			target = info.team;
+		}
+
 		void *address = NULL;
-		_kern_transfer_area(header->shared_area, &address, B_ANY_ADDRESS,
-			info.team);
+		area_id transfered = _kern_transfer_area(header->message_area,
+			&address, B_ANY_ADDRESS, target);
+		if (transfered < B_OK) {
+			delete_area(header->message_area);
+			free(header);
+			return transfered;
+		}
+
+		header->message_area = transfered;
 #endif
 	} else {
 		size = _NativeFlattenedSize();
 		buffer = (char *)malloc(size);
-		if (buffer != NULL) {
-			result = _NativeFlatten(buffer, size);
-			header = (message_header *)buffer;
-		} else
-			result = B_NO_MEMORY;
+		if (buffer == NULL)
+			return B_NO_MEMORY;
+
+		result = _NativeFlatten(buffer, size);
+		if (result < B_OK) {
+			free(buffer);
+			return result;
+		}
+
+		header = (message_header *)buffer;
 	}
 
-	if (result < B_OK)
-		return result;
-
 	if (!replyTo.IsValid()) {
 		BMessenger::Private(replyTo).SetTo(fHeader->reply_team,
 			fHeader->reply_port, fHeader->reply_target);



From axeld at mail.berlios.de  Sun Mar  9 14:43:40 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 9 Mar 2008 14:43:40 +0100
Subject: [Haiku-commits] r24322 - in haiku/trunk: headers/private/fs_shell
	src/system/kernel/fs src/tools/fs_shell
Message-ID: <200803091343.m29DheS4028062@sheep.berlios.de>

Author: axeld
Date: 2008-03-09 14:43:38 +0100 (Sun, 09 Mar 2008)
New Revision: 24322
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24322&view=rev

Modified:
   haiku/trunk/headers/private/fs_shell/fssh_kernel_export.h
   haiku/trunk/src/system/kernel/fs/vfs.cpp
   haiku/trunk/src/tools/fs_shell/kernel_export.cpp
   haiku/trunk/src/tools/fs_shell/vfs.cpp
Log:
* Explained under which circumstances vnode_path_to_vnode() will clobber the
  buffer of the provided "path" argument.
* Applied patch by Vasilis to fix some warnings when build on Linux (missing
  const on certain functions). We should probably fix the original
  {add|remove}_debugger_command() functions in Haiku as well.


Modified: haiku/trunk/headers/private/fs_shell/fssh_kernel_export.h
===================================================================
--- haiku/trunk/headers/private/fs_shell/fssh_kernel_export.h	2008-03-09 13:35:41 UTC (rev 24321)
+++ haiku/trunk/headers/private/fs_shell/fssh_kernel_export.h	2008-03-09 13:43:38 UTC (rev 24322)
@@ -40,8 +40,8 @@
 
 typedef int (*fssh_debugger_command_hook)(int argc, char **argv);
 
-extern int			fssh_add_debugger_command(char *name,
-							fssh_debugger_command_hook hook, char *help);
+extern int			fssh_add_debugger_command(const char *name,
+							fssh_debugger_command_hook hook, const char *help);
 extern int			fssh_remove_debugger_command(char *name,
 							fssh_debugger_command_hook hook); 
 

Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-09 13:35:41 UTC (rev 24321)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-09 13:43:38 UTC (rev 24322)
@@ -1670,7 +1670,8 @@
 /*!	Returns the vnode for the relative path starting at the specified \a vnode.
 	\a path must not be NULL.
 	If it returns successfully, \a path contains the name of the last path
-	component.
+	component. This function clobbers the buffer pointed to by \a path only
+	if it does contain more than one component.
 	Note, this reduces the ref_count of the starting \a vnode, no matter if
 	it is successful or not!
 */
@@ -4561,9 +4562,10 @@
 		inc_vnode_ref_count(parent);
 			// vnode_path_to_vnode() puts the node
 
+		// ".." is guaranteed to to be clobbered by this call
 		struct vnode *vnode;
-		status_t status = vnode_path_to_vnode(parent, "..", false, 0, &vnode,
-			NULL, NULL);
+		status_t status = vnode_path_to_vnode(parent, (char*)"..", false, 0,
+			&vnode, NULL, NULL);
 
 		if (status == B_OK) {
 			entry->d_dev = vnode->device;

Modified: haiku/trunk/src/tools/fs_shell/kernel_export.cpp
===================================================================
--- haiku/trunk/src/tools/fs_shell/kernel_export.cpp	2008-03-09 13:35:41 UTC (rev 24321)
+++ haiku/trunk/src/tools/fs_shell/kernel_export.cpp	2008-03-09 13:43:38 UTC (rev 24322)
@@ -90,8 +90,8 @@
 
 
 int
-fssh_add_debugger_command(char *name, fssh_debugger_command_hook hook,
-	char *help)
+fssh_add_debugger_command(const char *name, fssh_debugger_command_hook hook,
+	const char *help)
 {
 	return 0;
 }

Modified: haiku/trunk/src/tools/fs_shell/vfs.cpp
===================================================================
--- haiku/trunk/src/tools/fs_shell/vfs.cpp	2008-03-09 13:35:41 UTC (rev 24321)
+++ haiku/trunk/src/tools/fs_shell/vfs.cpp	2008-03-09 13:43:38 UTC (rev 24322)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2002-2008, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -1050,14 +1050,14 @@
 }
 
 
-/**	Returns the vnode for the relative path starting at the specified \a vnode.
- *	\a path must not be NULL.
- *	If it returns successfully, \a path contains the name of the last path
- *	component.
- *	Note, this reduces the ref_count of the starting \a vnode, no matter if
- *	it is successful or not!
- */
-
+/*!	Returns the vnode for the relative path starting at the specified \a vnode.
+	\a path must not be NULL.
+	If it returns successfully, \a path contains the name of the last path
+	component. This function clobbers the buffer pointed to by \a path only
+	if it does contain more than one component.
+	Note, this reduces the ref_count of the starting \a vnode, no matter if
+	it is successful or not!
+*/
 static fssh_status_t
 vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink,
 	int count, struct vnode **_vnode, fssh_vnode_id *_parentID, int *_type)
@@ -3237,9 +3237,10 @@
 		inc_vnode_ref_count(parent);
 			// vnode_path_to_vnode() puts the node
 
+		// ".." is guaranteed to to be clobbered by this call
 		struct vnode *vnode;
-		fssh_status_t status = vnode_path_to_vnode(parent, "..", false, 0, &vnode,
-			NULL, NULL);
+		fssh_status_t status = vnode_path_to_vnode(parent, (char*)"..", false,
+			0, &vnode, NULL, NULL);
 
 		if (status == FSSH_B_OK) {
 			entry->d_dev = vnode->device;



From axeld at mail.berlios.de  Sun Mar  9 15:21:07 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 9 Mar 2008 15:21:07 +0100
Subject: [Haiku-commits] r24323 - in haiku/trunk/src/system/kernel: . fs
Message-ID: <200803091421.m29EL7jF000443@sheep.berlios.de>

Author: axeld
Date: 2008-03-09 15:21:04 +0100 (Sun, 09 Mar 2008)
New Revision: 24323
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24323&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/vfs.cpp
   haiku/trunk/src/system/kernel/module.cpp
Log:
* The module code now uses find_directory() and no hard-coded paths anymore.
* It now also supports the common directory path.
* search_module() checked the module paths in the wrong order, ie. it preferred
  modules in the system directory over the user directory.
* Clarified comment in vfs_get_module_path().


Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-09 13:43:38 UTC (rev 24322)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-09 14:21:04 UTC (rev 24323)
@@ -3304,6 +3304,7 @@
 	\c B_ENTRY_NOT_FOUNT if no file could be found.
 	\a pathBuffer is clobbered in any case and must not be relied on if this
 	functions returns unsuccessfully.
+	\a basePath and \a pathBuffer must not point to the same space.
 */
 status_t
 vfs_get_module_path(const char *basePath, const char *moduleName,
@@ -3314,7 +3315,8 @@
 	size_t length;
 	char *path;
 
-	if (bufferSize == 0 || strlcpy(pathBuffer, basePath, bufferSize) >= bufferSize)
+	if (bufferSize == 0
+		|| strlcpy(pathBuffer, basePath, bufferSize) >= bufferSize)
 		return B_BUFFER_OVERFLOW;
 
 	status = path_to_vnode(pathBuffer, true, &dir, NULL, true);

Modified: haiku/trunk/src/system/kernel/module.cpp
===================================================================
--- haiku/trunk/src/system/kernel/module.cpp	2008-03-09 13:43:38 UTC (rev 24322)
+++ haiku/trunk/src/system/kernel/module.cpp	2008-03-09 14:21:04 UTC (rev 24323)
@@ -16,6 +16,8 @@
 #include <string.h>
 #include <sys/stat.h>
 
+#include <FindDirectory.h>
+
 #include <boot_device.h>
 #include <elf.h>
 #include <lock.h>
@@ -147,15 +149,16 @@
 /* These are the standard base paths where we start to look for modules
  * to load. Order is important, the last entry here will be searched
  * first.
- * ToDo: these should probably be retrieved by using find_directory().
  */
-static const char * const sModulePaths[] = {
-	"/boot/beos/system/add-ons/kernel",
-	"/boot/home/config/add-ons/kernel",
+static const directory_which kModulePaths[] = {
+	B_BEOS_ADDONS_DIRECTORY,
+	B_COMMON_ADDONS_DIRECTORY,
+	B_USER_ADDONS_DIRECTORY,
 };
 
-#define NUM_MODULE_PATHS (sizeof(sModulePaths) / sizeof(sModulePaths[0]))
-#define FIRST_USER_MODULE_PATH (NUM_MODULE_PATHS - 1)	/* first user path */
+static const uint32 kNumModulePaths = sizeof(kModulePaths)
+	/ sizeof(kModulePaths[0]);
+static const uint32 kFirstNonSystemModulePath = 1;
 
 /* We store the loaded modules by directory path, and all known modules
  * by module name in a hash table for quick access
@@ -467,17 +470,26 @@
 
 	TRACE(("search_module(%s)\n", name));
 
-	for (i = 0; i < NUM_MODULE_PATHS; i++) {
-		char path[B_FILE_NAME_LENGTH];
+	for (i = kNumModulePaths; i-- > 0;) {
+		if (sDisableUserAddOns && i >= kFirstNonSystemModulePath)
+			continue;
 
-		if (sDisableUserAddOns && i >= FIRST_USER_MODULE_PATH)
-			return NULL;
-
 		// let the VFS find that module for us
 
-		status = vfs_get_module_path(sModulePaths[i], name, path, sizeof(path));
+		KPath basePath;
+		if (find_directory(kModulePaths[i], gBootDevice, true,
+				basePath.LockBuffer(), basePath.BufferSize()) != B_OK)
+			continue;
+
+		basePath.UnlockBuffer();
+		basePath.Append("kernel");
+
+		KPath path;
+		status = vfs_get_module_path(basePath.Path(), name, path.LockBuffer(),
+			path.BufferSize());
 		if (status == B_OK) {
-			status = check_module_image(path, name);
+			path.UnlockBuffer();
+			status = check_module_image(path.Path(), name);
 			if (status == B_OK)
 				break;
 		}
@@ -1122,15 +1134,23 @@
 		iterator->loaded_modules = false;
 
 		// put all search paths on the stack
-		for (i = 0; i < NUM_MODULE_PATHS; i++) {
-			if (sDisableUserAddOns && i >= FIRST_USER_MODULE_PATH)
+		for (i = 0; i < kNumModulePaths; i++) {
+			if (sDisableUserAddOns && i >= kFirstNonSystemModulePath)
 				break;
 
+			KPath pathBuffer;
+			if (find_directory(kModulePaths[i], gBootDevice, true,
+					pathBuffer.LockBuffer(), pathBuffer.BufferSize()) != B_OK)
+				continue;
+
+			pathBuffer.UnlockBuffer();
+			pathBuffer.Append("kernel");
+
 			// Copy base path onto the iterator stack
-			char *path = strdup(sModulePaths[i]);
+			char *path = strdup(pathBuffer.Path());
 			if (path == NULL)
 				continue;
-				
+
 			size_t length = strlen(path);
 
 			// TODO: it would currently be nicer to use the commented



From axeld at mail.berlios.de  Sun Mar  9 16:23:58 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 9 Mar 2008 16:23:58 +0100
Subject: [Haiku-commits] r24324 - haiku/trunk/src/tests/kits/net
Message-ID: <200803091523.m29FNw6M007469@sheep.berlios.de>

Author: axeld
Date: 2008-03-09 16:23:58 +0100 (Sun, 09 Mar 2008)
New Revision: 24324
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24324&view=rev

Added:
   haiku/trunk/src/tests/kits/net/getpeername.cpp
Modified:
   haiku/trunk/src/tests/kits/net/Jamfile
Log:
Added a program that tests how getpeername() behaves.


Modified: haiku/trunk/src/tests/kits/net/Jamfile
===================================================================
--- haiku/trunk/src/tests/kits/net/Jamfile	2008-03-09 14:21:04 UTC (rev 24323)
+++ haiku/trunk/src/tests/kits/net/Jamfile	2008-03-09 15:23:58 UTC (rev 24324)
@@ -9,6 +9,8 @@
 SimpleTest tcp_server : tcp_server.c : $(TARGET_NETWORK_LIBS) ;
 SimpleTest tcp_client : tcp_client.c : $(TARGET_NETWORK_LIBS) ;
 
+SimpleTest getpeername : getpeername.cpp : $(TARGET_NETWORK_LIBS) ;
+
 SubInclude HAIKU_TOP src tests kits net DialUpPreflet ;
 SubInclude HAIKU_TOP src tests kits net multicast ;
 SubInclude HAIKU_TOP src tests kits net netperf ;

Added: haiku/trunk/src/tests/kits/net/getpeername.cpp
===================================================================
--- haiku/trunk/src/tests/kits/net/getpeername.cpp	2008-03-09 14:21:04 UTC (rev 24323)
+++ haiku/trunk/src/tests/kits/net/getpeername.cpp	2008-03-09 15:23:58 UTC (rev 24324)
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2008, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT license.
+ */
+
+
+#include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+
+extern const char* __progname;
+
+
+int
+main(int argc, char** argv)
+{
+	if (argc < 2) {
+		printf("usage: %s <host> [port]\n"
+			"Connects to the host (default port 21, ftp), and calls\n"
+			"getpeername() to see if it works correctly with a short\n"
+			"buffer.\n", __progname);
+		return 0;
+	}
+
+	struct hostent* host = gethostbyname(argv[1]);
+	if (host == NULL) {
+		perror("gethostbyname");
+		return 1;
+	}
+
+	uint16_t port = 21;
+	if (argc > 2)
+		port = atol(argv[2]);
+
+	int socket = ::socket(AF_INET, SOCK_STREAM, 0);
+	if (socket < 0) {
+		perror("socket");
+		return 1;
+	}
+
+	sockaddr_in address;
+	memset(&address, 0, sizeof(sockaddr_in));
+
+	address.sin_family = AF_INET;
+	address.sin_port = htons(port);
+	address.sin_addr = *((struct in_addr*)host->h_addr);
+
+	socklen_t length = 14;
+	sockaddr buffer;
+	int result = getpeername(socket, &buffer, &length);
+	printf("getpeername() before connect(): %d (%s), length: %d\n", result,
+		strerror(errno), length);
+
+	if (connect(socket, (sockaddr*)&address, sizeof(sockaddr_in)) < 0) {
+		perror("connect");
+		return 1;
+	}
+
+	errno = 0;
+	length = 14;
+	result = getpeername(socket, &buffer, &length);
+	printf("getpeername() after connect(): %d (%s), length: %d\n", result,
+		strerror(errno), length);
+
+	close(socket);
+	return 0;
+}
+



From axeld at mail.berlios.de  Sun Mar  9 16:25:40 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 9 Mar 2008 16:25:40 +0100
Subject: [Haiku-commits] r24325 - haiku/trunk/src/servers/media
Message-ID: <200803091525.m29FPemC007564@sheep.berlios.de>

Author: axeld
Date: 2008-03-09 16:25:39 +0100 (Sun, 09 Mar 2008)
New Revision: 24325
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24325&view=rev

Modified:
   haiku/trunk/src/servers/media/AddOnManager.cpp
   haiku/trunk/src/servers/media/Jamfile
Log:
* Now checks and honours the "disable user add-ons" safemode setting.
* Minor cleanup.


Modified: haiku/trunk/src/servers/media/AddOnManager.cpp
===================================================================
--- haiku/trunk/src/servers/media/AddOnManager.cpp	2008-03-09 15:23:58 UTC (rev 24324)
+++ haiku/trunk/src/servers/media/AddOnManager.cpp	2008-03-09 15:25:39 UTC (rev 24325)
@@ -1,17 +1,18 @@
 /*
-** Copyright 2004, the OpenBeOS project. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
-**
-** Authors: Marcus Overhagen, Axel D?rfler
-*/
+ * Copyright 2004-2008, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Marcus Overhagen
+ *		Axel D?rfler
+ */
 
 
 #include "AddOnManager.h"
-#include "FormatManager.h"
-#include "MetaFormat.h"
-#include "media_server.h"
-#include "debug.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include <FindDirectory.h>
 #include <Path.h>
 #include <Entry.h>
@@ -19,16 +20,20 @@
 #include <Autolock.h>
 #include <image.h>
 
-#include <stdio.h>
-#include <string.h>
+#include <safemode.h>
+#include <syscalls.h>
 
+#include "FormatManager.h"
+#include "MetaFormat.h"
+#include "media_server.h"
+#include "debug.h"
 
+
 //	#pragma mark ImageLoader
 
-/** The ImageLoader class is a convenience class to temporarily load
- *	an image file, and unload it on deconstruction automatically.
- */
-
+/*!	The ImageLoader class is a convenience class to temporarily load
+	an image file, and unload it on deconstruction automatically.
+*/
 class ImageLoader {
 	public:
 		ImageLoader(BPath &path)
@@ -83,18 +88,17 @@
 	const media_format &format)
 {
 	if ((format.type == B_MEDIA_ENCODED_VIDEO
-		|| format.type == B_MEDIA_ENCODED_AUDIO
-		|| format.type == B_MEDIA_MULTISTREAM)
+			|| format.type == B_MEDIA_ENCODED_AUDIO
+			|| format.type == B_MEDIA_MULTISTREAM)
 		&& format.Encoding() == 0)
 		return B_MEDIA_BAD_FORMAT;
-	if (format.type == B_MEDIA_NO_TYPE
-		|| format.type == B_MEDIA_UNKNOWN_TYPE)
+	if (format.type == B_MEDIA_NO_TYPE || format.type == B_MEDIA_UNKNOWN_TYPE)
 		return B_MEDIA_BAD_FORMAT;
 
-
 	BAutolock locker(fLock);
 
-	printf("AddOnManager::GetDecoderForFormat: searching decoder for encoding %ld\n", format.Encoding());
+	printf("AddOnManager::GetDecoderForFormat: searching decoder for encoding "
+		"%ld\n", format.Encoding());
 
 	decoder_info *info;
 	for (fDecoderList.Rewind(); fDecoderList.GetNext(&info);) {
@@ -104,8 +108,8 @@
 			if (!decoderFormat->Matches(&format))
 				continue;
 
-			printf("AddOnManager::GetDecoderForFormat: found decoder %s for encoding %ld\n",
-				info->ref.name, decoderFormat->Encoding());
+			printf("AddOnManager::GetDecoderForFormat: found decoder %s for "
+				"encoding %ld\n", info->ref.name, decoderFormat->Encoding());
 
 			*_decoderRef = info->ref;
 			return B_OK;
@@ -116,16 +120,17 @@
 									
 
 status_t
-AddOnManager::GetReaders(xfer_entry_ref *out_res, int32 *out_count, int32 max_count)
+AddOnManager::GetReaders(xfer_entry_ref *outRefs, int32 *outCount,
+	int32 maxCount)
 {
 	BAutolock locker(fLock);
 
-	*out_count = 0;
-
 	fReaderList.Rewind();
 	reader_info *info;
-	for (*out_count = 0; fReaderList.GetNext(&info) && *out_count <= max_count; *out_count += 1)
-		out_res[*out_count] = info->ref;
+	for (*outCount = 0; fReaderList.GetNext(&info) && *outCount < maxCount;
+			(*outCount)++) {
+		outRefs[*outCount] = info->ref;
+	}
 
 	return B_OK;
 }
@@ -141,7 +146,8 @@
 	if (status < B_OK)
 		return status;
 
-	printf("AddOnManager::RegisterAddOn(): trying to load \"%s\"\n", path.Path());
+	printf("AddOnManager::RegisterAddOn(): trying to load \"%s\"\n",
+		path.Path());
 
 	ImageLoader loader(path);
 	if ((status = loader.InitCheck()) < B_OK)
@@ -151,15 +157,15 @@
 
 	if (get_image_symbol(loader.Image(), "instantiate_plugin",
 			B_SYMBOL_TYPE_TEXT, (void **)&instantiate_plugin_func) < B_OK) {
-		printf("AddOnManager::RegisterAddOn(): can't find instantiate_plugin in \"%s\"\n",
-			path.Path());
+		printf("AddOnManager::RegisterAddOn(): can't find instantiate_plugin "
+			"in \"%s\"\n", path.Path());
 		return B_BAD_TYPE;
 	}
 
 	MediaPlugin *plugin = (*instantiate_plugin_func)();
 	if (plugin == NULL) {
-		printf("AddOnManager::RegisterAddOn(): instantiate_plugin in \"%s\" returned NULL\n",
-			path.Path());
+		printf("AddOnManager::RegisterAddOn(): instantiate_plugin in \"%s\" "
+			"returned NULL\n", path.Path());
 		return B_ERROR;
 	}
 
@@ -185,22 +191,33 @@
 	class CodecHandler : public AddOnMonitorHandler {
 	private:
 		AddOnManager * fManager;
+
 	public:
-		CodecHandler(AddOnManager * manager) {
+		CodecHandler(AddOnManager *manager)
+		{
 			fManager = manager;
 		}
-		virtual void	AddOnCreated(const add_on_entry_info * entry_info) {
+
+		virtual void AddOnCreated(const add_on_entry_info *entryInfo)
+		{
 		}
-		virtual void	AddOnEnabled(const add_on_entry_info * entry_info) {
+
+		virtual void AddOnEnabled(const add_on_entry_info *entryInfo)
+		{
 			entry_ref ref;
-			make_entry_ref(entry_info->dir_nref.device, entry_info->dir_nref.node,
-			               entry_info->name, &ref);
+			make_entry_ref(entryInfo->dir_nref.device,
+				entryInfo->dir_nref.node, entryInfo->name, &ref);
 			BEntry entry(&ref, false);
-			fManager->RegisterAddOn(entry);
+			if (entry.InitCheck() == B_OK)
+				fManager->RegisterAddOn(entry);
 		}
-		virtual void	AddOnDisabled(const add_on_entry_info * entry_info) {
+
+		virtual void AddOnDisabled(const add_on_entry_info *entryInfo)
+		{
 		}
-		virtual void	AddOnRemoved(const add_on_entry_info * entry_info) {
+
+		virtual void AddOnRemoved(const add_on_entry_info *entryInfo)
+		{
 		}
 	};
 
@@ -209,17 +226,34 @@
 		B_COMMON_ADDONS_DIRECTORY,
 		B_BEOS_ADDONS_DIRECTORY,
 	};
+
 	fHandler = new CodecHandler(this);
 	fAddOnMonitor = new AddOnMonitor(fHandler);
 
+	// get safemode option for disabling user add-ons
+
+	char buffer[16];
+	size_t size = sizeof(buffer);
+
+	bool disableUserAddOns = _kern_get_safemode_option(B_SAFEMODE_SAFE_MODE,
+			buffer, &size) == B_OK
+		&& (!strcasecmp(buffer, "true")
+			|| !strcasecmp(buffer, "yes")
+			|| !strcasecmp(buffer, "on")
+			|| !strcasecmp(buffer, "enabled")
+			|| !strcmp(buffer, "1"));
+
 	node_ref nref;
 	BDirectory directory;
 	BPath path;
 	for (uint i = 0 ; i < sizeof(directories) / sizeof(directory_which) ; i++) {
-		if ((find_directory(directories[i], &path) == B_OK)
-			&& (path.Append("media/plugins") == B_OK)
-			&& (directory.SetTo(path.Path()) == B_OK) 
-			&& (directory.GetNodeRef(&nref) == B_OK)) {
+		if (disableUserAddOns && i <= 1)
+			continue;
+
+		if (find_directory(directories[i], &path) == B_OK
+			&& path.Append("media/plugins") == B_OK
+			&& directory.SetTo(path.Path()) == B_OK 
+			&& directory.GetNodeRef(&nref) == B_OK) {
 			fHandler->AddDirectory(&nref);
 		}
 	}
@@ -269,7 +303,8 @@
 	media_format * formats = 0;
 	size_t count = 0;
 	if (plugin->GetSupportedFormats(&formats,&count) != B_OK) {
-		printf("AddOnManager::RegisterDecoder(): plugin->GetSupportedFormats(...) failed!\n");
+		printf("AddOnManager::RegisterDecoder(): plugin->GetSupportedFormats"
+			"(...) failed!\n");
 		return;
 	}
 	for (uint i = 0 ; i < count ; i++) {

Modified: haiku/trunk/src/servers/media/Jamfile
===================================================================
--- haiku/trunk/src/servers/media/Jamfile	2008-03-09 15:23:58 UTC (rev 24324)
+++ haiku/trunk/src/servers/media/Jamfile	2008-03-09 15:25:39 UTC (rev 24325)
@@ -3,6 +3,7 @@
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders media shared storage ;
+UseHeaders $(TARGET_PRIVATE_KERNEL_HEADERS) : true ;
 
 AddResources media_server : media_server.rdef ;
 



From axeld at mail.berlios.de  Sun Mar  9 16:26:30 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 9 Mar 2008 16:26:30 +0100
Subject: [Haiku-commits] r24326 -
	haiku/trunk/src/system/kernel/device_manager
Message-ID: <200803091526.m29FQUd9007632@sheep.berlios.de>

Author: axeld
Date: 2008-03-09 16:26:29 +0100 (Sun, 09 Mar 2008)
New Revision: 24326
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24326&view=rev

Modified:
   haiku/trunk/src/system/kernel/device_manager/settings.cpp
Log:
* Accept case insensitive boolean values.
* Minor cleanup.


Modified: haiku/trunk/src/system/kernel/device_manager/settings.cpp
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/settings.cpp	2008-03-09 15:25:39 UTC (rev 24325)
+++ haiku/trunk/src/system/kernel/device_manager/settings.cpp	2008-03-09 15:26:29 UTC (rev 24326)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2005, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2004-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 
@@ -42,8 +42,9 @@
 	if (get_safemode_option(parameter, value, &length) != B_OK)
 		return defaultValue;
 
-	return !strcmp(value, "on") || !strcmp(value, "true") || !strcmp(value, "1")
-		|| !strcmp(value, "yes") || !strcmp(value, "enabled");
+	return !strcasecmp(value, "on") || !strcasecmp(value, "true")
+		|| !strcmp(value, "1") || !strcasecmp(value, "yes")
+		|| !strcasecmp(value, "enabled");
 }
 
 
@@ -51,7 +52,8 @@
 
 
 extern "C" status_t
-_user_get_safemode_option(const char *userParameter, char *userBuffer, size_t *_userBufferSize)
+_user_get_safemode_option(const char *userParameter, char *userBuffer,
+	size_t *_userBufferSize)
 {
 	char parameter[B_FILE_NAME_LENGTH];
 	char buffer[B_PATH_NAME_LENGTH];
@@ -71,7 +73,8 @@
 
 	if (status == B_OK
 		&& (user_strlcpy(userBuffer, buffer, originalBufferSize) < B_OK
-			|| user_memcpy(_userBufferSize, &bufferSize, sizeof(size_t)) < B_OK))
+			|| user_memcpy(_userBufferSize, &bufferSize, sizeof(size_t))
+				< B_OK))
 		return B_BAD_ADDRESS;
 
 	return status;



From superstippi at gmx.de  Sun Mar  9 16:49:30 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Sun, 09 Mar 2008 16:49:30 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk:
	headers/os/support	src/kits/support
In-Reply-To: <47D3D63C.7040502@gmx.de>
References: <1430149723-BeMail@zon> <47D3D63C.7040502@gmx.de>
Message-ID: <20080309154930.120340@gmx.net>

Hi Karsten,

first of all, please don't be disappointed! :-)

> Axel D?rfler schrieb:
> > "Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
> >> 2008/3/8, Stephan Assmus <superstippi at gmx.de>:
> >>>  > * It's still not thread-safe for all usage patterns, though, so 
> >>>> we might
> >>>  > want
> >>>  >   to remove or disable it: if a string is shared between several 
> >>>> threads,
> >>>  >   and one of those starts to use a reference, all kinds of 
> >>>> problems can
> >>>  >   happen.
> >> But BString wasn't thread safe on beos either.
> > 
> > That's a completely different context. Consider you share one (static) 
> > BString in different threads, and then copy them into other strings and 
> > work with those.
> > In BeOS this is perfectly fine, with the current BString 
> > implementation, it might not.
> 
> That's why i asked to review and comment on the code at least a
> month ago.

People just don't have time always. Stefano reviewed the code, back then, I had no time. I think, I even looked at the code, but nowhere deeply enough, and I didn't saw the necessity either, since you said you were running this code since a while and it worked fine, which I am sure it did for the things you tested. Yesterday, I was testing an application on Haiku and observed big memory leaks. The application only works with network, files, BMessages and BStrings pretty much. I know that it does not leak in R5 or ZETA. I observed that while downloading larger files, the memory stayed fixed, so I though it didn't have to do with network buffers or file writing. I wrote to Axel about the (good) behavior of the kernel caches and also about possible leaks in BMessage and BString. Then I looked at BString a little deeper, but I am not very experienced with atomic_add() and so on. While trying to understand it, I also saw a few things I could fix and prepared a patch. I couldn't have told you much, because I was learning it myself as I tried to understand what is going on. It would have been very inefficient to come to an understanding, but still tell *you* to do the changes. Then Axel already commited his patch, which improved more things then my patch.

Anyways, it's just how it went - I certainly didn't mean to bypass you or anything. It's like Axel said, try to view it from the point that the project improved and you didn't have to spend time on it. If you happen to look into an app_server problem or find something wrong in Icon-O-Matic, please go ahead and fix it. I think it is nice to discuss things when you know someone is already working on something. Then it isn't so nice to just commit something, since it might conflict with the other persons un-commited work.


> To speak a open word on this without any 
> offense, if there is something wrong or needs to be adjusted with
> any code written by me - point me to it and i'm more than willing
> to fix it myself.

Certainly, but it's not always most suitable. When I started to investigate, and I am sure this is what happened on Axel's side as well, I wasn't even sure *if* there is something wrong with the code. But while reading through it and trying to understand how it works, if I spot something already that I can improve, it is inefficient to contact another person to do the change instead, while I have the file open in my editor already.

Please don't take any of this as some kind of hint that you would have been incapable of fixing the code yourself. It's really not like that. We are all learning stuff and if you looked at my code I am sure you would find ways to improve it, and if you do, especially if you are investigating a problem, please go ahead and fix it, you don't have to wait for me, I might be busy. If there are deficiencies in any code, I am sure that 95% of the time, it is because the creator had too little time, especially to test in all kinds of circumstances, or was _yet_ inexperienced with the subject. When you visit something the second or third time, you will always find ways to improve things. So it really is never a matter of suggesting incompetence or anything if someone finds ways of improving things in other peoples code. It is really not good to look at it this way. We should always view ourselves as a team and not competition.

Best regards,
-Stephan


From axeld at pinc-software.de  Sun Mar  9 17:01:21 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 09 Mar 2008 17:01:21 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24312_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/os/support_src/kits/support?=
In-Reply-To: <20080309154930.120340@gmx.net>
Message-ID: <23722240273-BeMail@zon>

"Stephan Assmus" <superstippi at gmx.de> wrote:
> While trying to understand it, I also saw a few things I could fix 
> and prepared a patch.
> I couldn't have told you much, because I was learning it myself as I 
> tried to understand
> what is going on. It would have been very inefficient to come to an 
> understanding, but
> still tell *you* to do the changes. Then Axel already commited his 
> patch, which improved
> more things then my patch.

I hope you didn't mind too much that I wasted a bit of your time this 
way; I didn't come to the conclusion you would work on that, too, when 
reading your mail.

Bye,
   Axel.



From axeld at pinc-software.de  Sun Mar  9 17:05:39 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 09 Mar 2008 17:05:39 +0100 CET
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
 src/kits/support
In-Reply-To: <1146021671-BeMail@kirilla>
Message-ID: <23980507766-BeMail@zon>

"Jonas Sundstr?m" <jonas at kirilla.com> wrote:
> "Axel D?rfler" <axeld at pinc-software.de> wrote:
> > IOW we might break existing BeOS applications
> > with this change. 
> I don't know if its related, but the following happens when trying to 
> start NetPositive recently. There's a ~BString in the the gdb 
> backtrace.

So do you want to have a look into it, Julun?

Bye,
   Axel.



From host.haiku at gmx.de  Sun Mar  9 17:39:00 2008
From: host.haiku at gmx.de (julun)
Date: Sun, 09 Mar 2008 17:39:00 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <23980507766-BeMail@zon>
References: <23980507766-BeMail@zon>
Message-ID: <47D412A4.1030507@gmx.de>

Hi,

Axel D?rfler schrieb:
> "Jonas Sundstr?m" <jonas at kirilla.com> wrote:
>> "Axel D?rfler" <axeld at pinc-software.de> wrote:
>>> IOW we might break existing BeOS applications
>>> with this change. 
>> I don't know if its related, but the following happens when trying to 
>> start NetPositive recently. There's a ~BString in the the gdb 
>> backtrace.
> 
> So do you want to have a look into it, Julun?

unfortunately today, maybe even this week i wont be able to look into it. 
I'm leaving for TT headquarter at around nine, so i'm all for it if you can 
go and fix it.  :)

Regards,
Julun


From host.haiku at gmx.de  Sun Mar  9 18:00:19 2008
From: host.haiku at gmx.de (julun)
Date: Sun, 09 Mar 2008 18:00:19 +0100
Subject: [Haiku-commits] r24312 - in
	haiku/trunk:	headers/os/support	src/kits/support
In-Reply-To: <20080309154930.120340@gmx.net>
References: <1430149723-BeMail@zon> <47D3D63C.7040502@gmx.de>
	<20080309154930.120340@gmx.net>
Message-ID: <47D417A3.4000607@gmx.de>

Hi Stephan,

Stephan Assmus schrieb:
> Hi Karsten,
> 
> first of all, please don't be disappointed! :-)
> 
>> Axel D?rfler schrieb:
>>> "Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
>>>> 2008/3/8, Stephan Assmus <superstippi at gmx.de>:
>>>>>  > * It's still not thread-safe for all usage patterns, though, so 
>>>>>> we might
>>>>>  > want
>>>>>  >   to remove or disable it: if a string is shared between several 
>>>>>> threads,
>>>>>  >   and one of those starts to use a reference, all kinds of 
>>>>>> problems can
>>>>>  >   happen.
>>>> But BString wasn't thread safe on beos either.
>>> That's a completely different context. Consider you share one (static) 
>>> BString in different threads, and then copy them into other strings and 
>>> work with those.
>>> In BeOS this is perfectly fine, with the current BString 
>>> implementation, it might not.
>> That's why i asked to review and comment on the code at least a
>> month ago.
> 
> People just don't have time always. Stefano reviewed the code, back then, I had no time. I think, I even looked at the code, but nowhere deeply enough, and I didn't saw the necessity either, since you said you were running this code since a while and it worked fine, which I am sure it did for the things you tested. Yesterday, I was testing an application on Haiku and observed big memory leaks. The application only works with network, files, BMessages and BStrings pretty much. I know that it does not leak in R5 or ZETA. I observed that while downloading larger files, the memory stayed fixed, so I though it didn't have to do with network buffers or file writing. I wrote to Axel about the (good) behavior of the kernel caches and also about possible leaks in BMessage and BString. Then I looked at BString a little deeper, but I am not very experienced with atomic_add() and so on. While trying to understand it, I also saw a few things I could fix and prepared a patch. I couldn't 
have told you much, because I was learning it myself as I tried to understand what is going on. It would have been very inefficient to come to an understanding, but still tell *you* to do the changes. Then Axel already commited his patch, which improved more things then my patch.

Since i basically spend most of the time windows coding now, i wrote the 
thing under windows and used InterlockedIncrement/Decrement() which behaves 
slightly different and i failed to port it over to our api...

> Anyways, it's just how it went - I certainly didn't mean to bypass you or anything. It's like Axel said, try to view it from the point that the project improved and you didn't have to spend time on it. If you happen to look into an app_server problem or find something wrong in Icon-O-Matic, please go ahead and fix it. I think it is nice to discuss things when you know someone is already working on something. Then it isn't so nice to just commit something, since it might conflict with the other persons un-commited work.

It is not meant that way that i would always force one to ask me if there is 
something to change in the code. In case of this at least it would take an 
other persons time to get into the code whereas i would know most of what 
i've done.

> 
>> To speak a open word on this without any 
>> offense, if there is something wrong or needs to be adjusted with
>> any code written by me - point me to it and i'm more than willing
>> to fix it myself.
> 
> Certainly, but it's not always most suitable. When I started to investigate, and I am sure this is what happened on Axel's side as well, I wasn't even sure *if* there is something wrong with the code. But while reading through it and trying to understand how it works, if I spot something already that I can improve, it is inefficient to contact another person to do the change instead, while I have the file open in my editor already.
> 
> Please don't take any of this as some kind of hint that you would have been incapable of fixing the code yourself. It's really not like that. We are all learning stuff and if you looked at my code I am sure you would find ways to improve it, and if you do, especially if you are investigating a problem, please go ahead and fix it, you don't have to wait for me, I might be busy. If there are deficiencies in any code, I am sure that 95% of the time, it is because the creator had too little time, especially to test in all kinds of circumstances, or was _yet_ inexperienced with the subject. When you visit something the second or third time, you will always find ways to improve things. So it really is never a matter of suggesting incompetence or anything if someone finds ways of improving things in other peoples code. It is really not good to look at it this way. We should always view ourselves as a team and not competition.

I'm still see Haiku as a team effort and nothing has changed since i started 
to contribute some time and code. And for sure i want stop helping out :)

Regards,
Karsten


From axeld at mail.berlios.de  Sun Mar  9 18:01:40 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 9 Mar 2008 18:01:40 +0100
Subject: [Haiku-commits] r24327 - haiku/trunk/src/preferences/screen
Message-ID: <200803091701.m29H1e6O015414@sheep.berlios.de>

Author: axeld
Date: 2008-03-09 18:01:39 +0100 (Sun, 09 Mar 2008)
New Revision: 24327
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24327&view=rev

Modified:
   haiku/trunk/src/preferences/screen/AlertView.cpp
Log:
Followed Andreas' suggestion, and enlarged timeout to 12 seconds.


Modified: haiku/trunk/src/preferences/screen/AlertView.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/AlertView.cpp	2008-03-09 15:26:29 UTC (rev 24326)
+++ haiku/trunk/src/preferences/screen/AlertView.cpp	2008-03-09 17:01:39 UTC (rev 24327)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -26,8 +26,8 @@
 
 AlertView::AlertView(BRect frame, char *name)
 	: BView(frame, name, B_FOLLOW_ALL, B_WILL_DRAW | B_PULSE_NEEDED),
-	// we will wait 8 seconds until we send a message
-	fSeconds(8)
+	// we will wait 12 seconds until we send a message
+	fSeconds(12)
 {
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	fBitmap = InitIcon();



From superstippi at gmx.de  Sun Mar  9 18:07:44 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Sun, 09 Mar 2008 18:07:44 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
 src/kits/support
In-Reply-To: <23722240273-BeMail@zon>
References: <23722240273-BeMail@zon>
Message-ID: <20080309170744.191440@gmx.net>


-------- Original-Nachricht --------
> Datum: Sun, 09 Mar 2008 17:01:21 +0100 CET
> Von: "Axel D?rfler" <axeld at pinc-software.de>
> An: "SVN commits to the Haiku sourcerepository=?iso-8859-15?q?" <?=haiku-commits at lists.berlios.de>
> Betreff: Re: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support src/kits/support

> "Stephan Assmus" <superstippi at gmx.de> wrote:
> > While trying to understand it, I also saw a few things I could fix 
> > and prepared a patch.
> > I couldn't have told you much, because I was learning it myself as I 
> > tried to understand
> > what is going on. It would have been very inefficient to come to an 
> > understanding, but
> > still tell *you* to do the changes. Then Axel already commited his 
> > patch, which improved
> > more things then my patch.
> 
> I hope you didn't mind too much that I wasted a bit of your time this 
> way; I didn't come to the conclusion you would work on that, too, when 
> reading your mail.

No, not at all! I could compare the changes and learn a few things, or get reassurance on the same changes I did.

Best regards,
-Stephan


From revol at free.fr  Sun Mar  9 18:16:16 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sun, 09 Mar 2008 18:16:16 +0100 CET
Subject: [Haiku-commits] r24325 - haiku/trunk/src/servers/media
In-Reply-To: <200803091525.m29FPemC007564@sheep.berlios.de>
Message-ID: <1943165349-BeMail@laptop>

> +	bool disableUserAddOns = 
> _kern_get_safemode_option(B_SAFEMODE_SAFE_MODE,

Shouldn't it be B_SAFEMODE_DISABLE_USER_ADD_ONS ?

Fran?ois.


From bonefish at mail.berlios.de  Sun Mar  9 18:34:28 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 9 Mar 2008 18:34:28 +0100
Subject: [Haiku-commits] r24328 - haiku/trunk/build/scripts
Message-ID: <200803091734.m29HYSaX024317@sheep.berlios.de>

Author: bonefish
Date: 2008-03-09 18:34:26 +0100 (Sun, 09 Mar 2008)
New Revision: 24328
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24328&view=rev

Modified:
   haiku/trunk/build/scripts/build_haiku_image
Log:
Bail out early, when initializing or mounting an image via bfs_shell
fails.


Modified: haiku/trunk/build/scripts/build_haiku_image
===================================================================
--- haiku/trunk/build/scripts/build_haiku_image	2008-03-09 17:01:39 UTC (rev 24327)
+++ haiku/trunk/build/scripts/build_haiku_image	2008-03-09 17:34:26 UTC (rev 24328)
@@ -116,11 +116,13 @@
 		if [ ! -e $imagePath -o ! "$dontClearImage" ]; then
 			dd if=/dev/zero of=$imagePath bs=1048576 count=$imageSize $ddFlags
 		fi
-		$bfsShell --initialize $imageOffsetFlags $imagePath Haiku
+		$bfsShell --initialize $imageOffsetFlags $imagePath Haiku || exit 1
 		$makebootable $imageOffsetFlags $imagePath
 	fi
 	$bfsShell -n $imageOffsetFlags $imagePath > /dev/null &
 	sleep 1
+	# bail out, if mounting fails
+	$cd . || exit 1
 fi
 
 # create BEOS:APP_SIG index -- needed to launch apps via signature



From bonefish at mail.berlios.de  Sun Mar  9 18:39:08 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 9 Mar 2008 18:39:08 +0100
Subject: [Haiku-commits] r24329 - haiku/trunk/src/kits/storage
Message-ID: <200803091739.m29Hd8AK032575@sheep.berlios.de>

Author: bonefish
Date: 2008-03-09 18:38:55 +0100 (Sun, 09 Mar 2008)
New Revision: 24329
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24329&view=rev

Modified:
   haiku/trunk/src/kits/storage/Directory.cpp
Log:
CreateFile() didn't specify the B_ERASE_FILE, hence the file wouldn't be
truncated, if already existing. This problem could be experienced when
saving in Pe.


Modified: haiku/trunk/src/kits/storage/Directory.cpp
===================================================================
--- haiku/trunk/src/kits/storage/Directory.cpp	2008-03-09 17:34:26 UTC (rev 24328)
+++ haiku/trunk/src/kits/storage/Directory.cpp	2008-03-09 17:38:55 UTC (rev 24329)
@@ -791,8 +791,8 @@
 	if (!path)
 		return B_BAD_VALUE;
 	// Let BFile do the dirty job.
-	uint32 openMode = B_READ_WRITE | B_CREATE_FILE
-					  | (failIfExists ? B_FAIL_IF_EXISTS : 0);
+	uint32 openMode = B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE
+		| (failIfExists ? B_FAIL_IF_EXISTS : 0);
 	BFile tmpFile;
 	BFile *realFile = (file ? file : &tmpFile);
 	status_t error = B_OK;



From bonefish at mail.berlios.de  Sun Mar  9 18:40:16 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 9 Mar 2008 18:40:16 +0100
Subject: [Haiku-commits] r24330 - haiku/trunk/src/tools/fs_shell
Message-ID: <200803091740.m29HeGEc002101@sheep.berlios.de>

Author: bonefish
Date: 2008-03-09 18:40:04 +0100 (Sun, 09 Mar 2008)
New Revision: 24330
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24330&view=rev

Modified:
   haiku/trunk/src/tools/fs_shell/command_cp.cpp
Log:
Added "--ignore-attributes" switch to the "cp" command.


Modified: haiku/trunk/src/tools/fs_shell/command_cp.cpp
===================================================================
--- haiku/trunk/src/tools/fs_shell/command_cp.cpp	2008-03-09 17:38:55 UTC (rev 24329)
+++ haiku/trunk/src/tools/fs_shell/command_cp.cpp	2008-03-09 17:40:04 UTC (rev 24330)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007, Ingo Weinhold, bonefish at cs.tu-berlin.de.
+ * Copyright 2005-2008, Ingo Weinhold, ingo_weinhold at gmx.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -38,6 +38,7 @@
 struct Options {
 	Options()
 		: attributesOnly(false),
+		  ignoreAttributes(false),
 		  dereference(true),
 		  force(false),
 		  recursive(false)
@@ -45,6 +46,7 @@
 	}
 
 	bool	attributesOnly;
+	bool	ignoreAttributes;
 	bool	dereference;
 	bool	force;
 	bool	recursive;
@@ -1189,9 +1191,11 @@
 	targetDeleter.SetTo(targetNode);
 
 	// copy attributes
-	error = copy_attributes(source, sourceNode, target, targetNode);
-	if (error != FSSH_B_OK)
-		return error;
+	if (!options.ignoreAttributes) {
+		error = copy_attributes(source, sourceNode, target, targetNode);
+		if (error != FSSH_B_OK)
+			return error;
+	}
 
 	// copy contents
 	if (sourceNode->IsFile()) {
@@ -1224,28 +1228,37 @@
 		const char *arg = argv[argi];
 		if (arg[0] == '-') {
 			if (arg[1] == '\0') {
-				fprintf(stderr, "Error: Invalid option `-'\n");
+				fprintf(stderr, "Error: Invalid option '-'\n");
 				return FSSH_EINVAL;
 			}
 
-			for (int i = 1; arg[i]; i++) {
-				switch (arg[i]) {
-					case 'a':
-						options.attributesOnly = true;
-					case 'd':
-						options.dereference = false;
-						break;
-					case 'f':
-						options.force = true;
-						break;
-					case 'r':
-						options.recursive = true;
-						break;
-					default:
-						fprintf(stderr, "Error: Unknown option `-%c'\n",
-							arg[i]);
-						return FSSH_EINVAL;
+			if (arg[1] == '-') {
+				if (strcmp(arg, "--ignore-attributes") == 0) {
+					options.ignoreAttributes = true;
+				} else {
+					fprintf(stderr, "Error: Unknown option '%s'\n", arg);
+					return FSSH_EINVAL;
 				}
+			} else {
+				for (int i = 1; arg[i]; i++) {
+					switch (arg[i]) {
+						case 'a':
+							options.attributesOnly = true;
+						case 'd':
+							options.dereference = false;
+							break;
+						case 'f':
+							options.force = true;
+							break;
+						case 'r':
+							options.recursive = true;
+							break;
+						default:
+							fprintf(stderr, "Error: Unknown option '-%c'\n",
+								arg[i]);
+							return FSSH_EINVAL;
+					}
+				}
 			}
 		} else {
 			sources[sourceCount++] = arg;



From bonefish at mail.berlios.de  Sun Mar  9 18:41:43 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 9 Mar 2008 18:41:43 +0100
Subject: [Haiku-commits] r24331 - haiku/trunk/src/tools/fs_shell
Message-ID: <200803091741.m29HfhLX003924@sheep.berlios.de>

Author: bonefish
Date: 2008-03-09 18:41:42 +0100 (Sun, 09 Mar 2008)
New Revision: 24331
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24331&view=rev

Modified:
   haiku/trunk/src/tools/fs_shell/fssh.cpp
   haiku/trunk/src/tools/fs_shell/syscalls.h
   haiku/trunk/src/tools/fs_shell/vfs.cpp
Log:
Added "query" and "chmod" (octal, non-recursive only) commands.


Modified: haiku/trunk/src/tools/fs_shell/fssh.cpp
===================================================================
--- haiku/trunk/src/tools/fs_shell/fssh.cpp	2008-03-09 17:40:04 UTC (rev 24330)
+++ haiku/trunk/src/tools/fs_shell/fssh.cpp	2008-03-09 17:41:42 UTC (rev 24331)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, Ingo Weinhold, bonefish at cs.tu-berlin.de.
+ * Copyright 2007-2008, Ingo Weinhold, ingo_weinhold at gmx.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -278,7 +278,88 @@
 }
 
 
+static bool
+get_permissions(const char* modeString, fssh_mode_t& _permissions)
+{
+	// currently only octal mode is supported
+	if (strlen(modeString) != 3)
+		return false;
+
+	fssh_mode_t permissions = 0;
+	for (int i = 0; i < 3; i++) {
+		char c = modeString[i];
+		if (c < '0' || c > '7')
+			return false;
+		permissions = (permissions << 3) | (c - '0');
+	}
+
+	_permissions = permissions;
+	return true;
+}
+
+
 static fssh_status_t
+command_chmod(int argc, const char* const* argv)
+{
+	bool recursive = false;
+
+	// parse parameters
+	int argi = 1;
+	for (argi = 1; argi < argc; argi++) {
+		const char *arg = argv[argi];
+		if (arg[0] != '-')
+			break;
+
+		if (arg[1] == '\0') {
+			fprintf(stderr, "Error: Invalid option \"-\"\n");
+			return FSSH_B_BAD_VALUE;
+		}
+
+		for (int i = 1; arg[i]; i++) {
+			switch (arg[i]) {
+				case 'R':
+					recursive = true;
+					fprintf(stderr, "Sorry, recursive mode not supported "
+						"yet.\n");
+					return FSSH_B_BAD_VALUE;
+				default:
+					fprintf(stderr, "Error: Unknown option \"-%c\"\n", arg[i]);
+					return FSSH_B_BAD_VALUE;
+			}
+		}
+	}
+
+	// get mode
+	fssh_mode_t permissions;
+	if (argi + 1 >= argc || !get_permissions(argv[argi++], permissions)) {
+		printf("Usage: %s [ -R ] <octal mode> <file>...\n", argv[0]);
+		return FSSH_B_BAD_VALUE;
+	}
+
+	fssh_struct_stat st;
+	st.fssh_st_mode = permissions;
+
+	// chmod loop
+	for (; argi < argc; argi++) {
+		const char *file = argv[argi];
+		if (strlen(file) == 0) {
+			fprintf(stderr, "Error: An empty path is not a valid argument!\n");
+			return FSSH_B_BAD_VALUE;
+		}
+
+		fssh_status_t error = _kern_write_stat(-1, file, false, &st, sizeof(st),
+			FSSH_FS_WRITE_STAT_MODE);
+		if (error != FSSH_B_OK) {
+			fprintf(stderr, "Error: Failed to change mode of \"%s\"!\n", file);
+			return error;
+		}
+	}
+
+	return FSSH_B_OK;
+}
+
+
+static fssh_status_t
 command_help(int argc, const char* const* argv)
 {
 	printf("supported commands:\n");
@@ -539,7 +620,6 @@
 					"%s\n", file, fd, fssh_strerror(error));
 				continue;
 			}
-
 		} else
 			list_entry(file);
 	}
@@ -667,6 +747,22 @@
 }
 
 
+static fssh_dev_t
+get_volume_id()
+{
+	struct fssh_stat st;
+	fssh_status_t error = _kern_read_stat(-1, kMountPoint, false, &st,
+		sizeof(st));
+	if (error != FSSH_B_OK) {
+		fprintf(stderr, "Error: Failed to stat() mount point: %s\n",
+			fssh_strerror(error));
+		return error;
+	}
+
+	return st.fssh_st_dev;
+}
+
+
 static fssh_status_t
 command_mkindex(int argc, const char* const* argv)
 {
@@ -677,18 +773,14 @@
 
 	const char* indexName = argv[1];
 
-	// get the device ID
-	struct fssh_stat st;
-	fssh_status_t error = _kern_read_stat(-1, kMountPoint, false, &st,
-		sizeof(st));
-	if (error != FSSH_B_OK) {
-		fprintf(stderr, "Error: Failed to stat() mount point: %s\n",
-			fssh_strerror(error));
-		return error;
-	}
+	// get the volume ID
+	fssh_dev_t volumeID = get_volume_id();
+	if (volumeID < 0)
+		return volumeID;
 	
 	// create the index
-	error =_kern_create_index(st.fssh_st_dev, indexName, FSSH_B_STRING_TYPE, 0);
+	fssh_status_t error =_kern_create_index(volumeID, indexName,
+		FSSH_B_STRING_TYPE, 0);
 	if (error != FSSH_B_OK) {
 		fprintf(stderr, "Error: Failed to create index \"%s\": %s\n",
 			indexName, fssh_strerror(error));
@@ -700,6 +792,61 @@
 
 
 static fssh_status_t
+command_query(int argc, const char* const* argv)
+{
+	if (argc != 2) {
+		fprintf(stderr, "Usage: %s <query string>\n", argv[0]);
+		return FSSH_B_BAD_VALUE;
+	}
+
+	const char* query = argv[1];
+
+	// get the volume ID
+	fssh_dev_t volumeID = get_volume_id();
+	if (volumeID < 0)
+		return volumeID;
+	
+	// open query
+	int fd = _kern_open_query(volumeID, query, strlen(query), 0, -1, -1);
+	if (fd < 0) {
+		fprintf(stderr, "Error: Failed to open query: %s\n", fssh_strerror(fd));
+		return fd;
+	}
+
+	// iterate through the entries
+	fssh_status_t error = FSSH_B_OK;
+	char buffer[sizeof(fssh_dirent) + FSSH_B_FILE_NAME_LENGTH];
+	fssh_dirent* entry = (fssh_dirent*)buffer;
+	fssh_ssize_t entriesRead = 0;
+	while ((entriesRead = _kern_read_dir(fd, entry, sizeof(buffer), 1)) == 1) {
+		char path[FSSH_B_PATH_NAME_LENGTH];
+		error = _kern_entry_ref_to_path(volumeID, entry->d_pino, entry->d_name,
+			path, sizeof(path));
+		if (error == FSSH_B_OK) {
+			printf("  %s\n", path);
+		} else {
+			fprintf(stderr, "  failed to resolve entry (%8lld, \"%s\")\n",
+				entry->d_pino, entry->d_name);
+		}
+	}
+
+	if (entriesRead < 0) {
+		fprintf(stderr, "Error: reading query failed: %s\n",
+			fssh_strerror(entriesRead));
+	}
+
+	// close query
+	error = _kern_close(fd);
+	if (error != FSSH_B_OK) {
+		fprintf(stderr, "Error: Closing query (fd: %d) failed: %s\n",
+			fd, fssh_strerror(error));
+	}
+
+	return error;
+}
+
+
+static fssh_status_t
 command_quit(int argc, const char* const* argv)
 {
 	return COMMAND_RESULT_EXIT;
@@ -866,12 +1013,14 @@
 {
 	CommandManager::Default()->AddCommands(
 		command_cd,			"cd",			"change current directory",
+		command_chmod,		"chmod",		"change file permissions",
 		command_cp,			"cp",			"copy files and directories",
 		command_help,		"help",			"list supported commands",
 		command_ln,			"ln",			"create a hard or symbolic link",
 		command_ls,			"ls",			"list files or directories",
 		command_mkdir,		"mkdir",		"create directories",
 		command_mkindex,	"mkindex",		"create an index",
+		command_query,		"query",		"query for files",
 		command_quit,		"quit/exit",	"quit the shell",
 		command_rm,			"rm",			"remove files and directories",
 		command_sync,		"sync",			"syncs the file system",

Modified: haiku/trunk/src/tools/fs_shell/syscalls.h
===================================================================
--- haiku/trunk/src/tools/fs_shell/syscalls.h	2008-03-09 17:40:04 UTC (rev 24330)
+++ haiku/trunk/src/tools/fs_shell/syscalls.h	2008-03-09 17:41:42 UTC (rev 24331)
@@ -6,6 +6,7 @@
 #define _FSSH_SYSCALLS_H
 
 #include "fssh_defs.h"
+#include "fssh_os.h"
 
 
 struct fssh_iovec;
@@ -24,6 +25,8 @@
 fssh_status_t	_kern_write_fs_info(fssh_dev_t device,
 					const struct fssh_fs_info *info, int mask);
 fssh_status_t	_kern_sync(void);
+fssh_status_t	_kern_entry_ref_to_path(fssh_dev_t device, fssh_ino_t inode,
+					const char *leaf, char *userPath, fssh_size_t pathLength);
 fssh_dev_t		_kern_next_device(int32_t *_cookie);
 int				_kern_open_entry_ref(fssh_dev_t device, fssh_ino_t inode,
 					const char *name, int openMode, int perms);
@@ -73,6 +76,10 @@
 					const char *partition, const char *name,
 					const char *parameters);
 
+extern int		_kern_open_query(fssh_dev_t device, const char* query,
+					fssh_size_t queryLength, uint32_t flags, fssh_port_id port,
+					int32_t token);
+
 // defined in fd.cpp
 fssh_ssize_t	_kern_read(int fd, fssh_off_t pos, void *buffer,
 					fssh_size_t length);

Modified: haiku/trunk/src/tools/fs_shell/vfs.cpp
===================================================================
--- haiku/trunk/src/tools/fs_shell/vfs.cpp	2008-03-09 17:40:04 UTC (rev 24330)
+++ haiku/trunk/src/tools/fs_shell/vfs.cpp	2008-03-09 17:41:42 UTC (rev 24331)
@@ -2587,6 +2587,49 @@
 }
 
 
+fssh_status_t
+vfs_entry_ref_to_path(fssh_dev_t device, fssh_ino_t inode, const char *leaf,
+	char *path, fssh_size_t pathLength)
+{
+	struct vnode *vnode;
+	fssh_status_t status;
+
+	// filter invalid leaf names
+	if (leaf != NULL && (leaf[0] == '\0' || fssh_strchr(leaf, '/')))
+		return FSSH_B_BAD_VALUE;
+
+	// get the vnode matching the dir's node_ref
+	if (leaf && (fssh_strcmp(leaf, ".") == 0 || fssh_strcmp(leaf, "..") == 0)) {
+		// special cases "." and "..": we can directly get the vnode of the
+		// referenced directory
+		status = entry_ref_to_vnode(device, inode, leaf, &vnode);
+		leaf = NULL;
+	} else
+		status = get_vnode(device, inode, &vnode, false);
+	if (status < FSSH_B_OK)
+		return status;
+
+	// get the directory path
+	status = dir_vnode_to_path(vnode, path, pathLength);
+	put_vnode(vnode);
+		// we don't need the vnode anymore
+	if (status < FSSH_B_OK)
+		return status;
+
+	// append the leaf name
+	if (leaf) {
+		// insert a directory separator if this is not the file system root
+		if ((fssh_strcmp(path, "/") && fssh_strlcat(path, "/", pathLength)
+				>= pathLength)
+			|| fssh_strlcat(path, leaf, pathLength) >= pathLength) {
+			return FSSH_B_NAME_TOO_LONG;
+		}
+	}
+
+	return FSSH_B_OK;
+}
+
+
 /**	If the given descriptor locked its vnode, that lock will be released.
  */
 
@@ -4283,6 +4326,48 @@
 }
 
 
+/*!	ToDo: the query FS API is still the pretty much the same as in R5.
+		It would be nice if the FS would find some more kernel support
+		for them.
+		For example, query parsing should be moved into the kernel.
+*/
+static int
+query_open(fssh_dev_t device, const char *query, uint32_t flags,
+	fssh_port_id port, int32_t token, bool kernel)
+{
+	struct fs_mount *mount;
+	fssh_fs_cookie cookie;
+
+	FUNCTION(("query_open(device = %ld, query = \"%s\", kernel = %d)\n", device, query, kernel));
+
+	fssh_status_t status = get_mount(device, &mount);
+	if (status < FSSH_B_OK)
+		return status;
+
+	if (FS_MOUNT_CALL(mount, open_query) == NULL) {
+		status = FSSH_EOPNOTSUPP;
+		goto out;
+	}
+
+	status = FS_MOUNT_CALL(mount, open_query)(mount->cookie, query, flags, port, token, &cookie);
+	if (status < FSSH_B_OK)
+		goto out;
+
+	// get fd for the index directory
+	status = get_new_fd(FDTYPE_QUERY, mount, NULL, cookie, 0, kernel);
+	if (status >= 0)
+		goto out;
+
+	// something went wrong
+	FS_MOUNT_CALL(mount, close_query)(mount->cookie, cookie);
+	FS_MOUNT_CALL(mount, free_query_cookie)(mount->cookie, cookie);
+
+out:
+	put_mount(mount);
+	return status;
+}
+
+
 static fssh_status_t
 query_close(struct file_descriptor *descriptor)
 {
@@ -5502,4 +5587,21 @@
 	return status;
 }
 
+
+fssh_status_t
+_kern_entry_ref_to_path(fssh_dev_t device, fssh_ino_t inode, const char *leaf,
+	char* path, fssh_size_t pathLength)
+{
+	return vfs_entry_ref_to_path(device, inode, leaf, path, pathLength);
+}
+
+
+int
+_kern_open_query(fssh_dev_t device, const char *query, fssh_size_t queryLength,
+	uint32_t flags, fssh_port_id port, int32_t token)
+{
+	return query_open(device, query, flags, port, token, false);
+}
+
+
 }	// namespace FSShell



From revol at free.fr  Sun Mar  9 18:45:26 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sun, 09 Mar 2008 18:45:26 +0100 CET
Subject: [Haiku-commits] r24328 - haiku/trunk/build/scripts
In-Reply-To: <200803091734.m29HYSaX024317@sheep.berlios.de>
Message-ID: <3693989347-BeMail@laptop>

> -		$bfsShell --initialize $imageOffsetFlags $imagePath Haiku
> +		$bfsShell --initialize $imageOffsetFlags $imagePath Haiku || 
> exit 1

How about also adding "block_size 2048" there ?
I'm not sure how faster it'd make CDs... nor how it would change 
regular use though.

Fran?ois.


From bonefish at mail.berlios.de  Sun Mar  9 18:44:57 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 9 Mar 2008 18:44:57 +0100
Subject: [Haiku-commits] r24332 - in haiku/trunk: headers/private/kernel
	src/system/kernel
Message-ID: <200803091744.m29Hivks010469@sheep.berlios.de>

Author: bonefish
Date: 2008-03-09 18:44:55 +0100 (Sun, 09 Mar 2008)
New Revision: 24332
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24332&view=rev

Modified:
   haiku/trunk/headers/private/kernel/heap.h
   haiku/trunk/src/system/kernel/heap.cpp
Log:
Added deferred_free() function, that can be used to free allocations
in code that has interrupts disabled. The chunks of memories are queued
and free()d periodically by a kernel daemon.


Modified: haiku/trunk/headers/private/kernel/heap.h
===================================================================
--- haiku/trunk/headers/private/kernel/heap.h	2008-03-09 17:41:42 UTC (rev 24331)
+++ haiku/trunk/headers/private/kernel/heap.h	2008-03-09 17:44:55 UTC (rev 24332)
@@ -24,6 +24,8 @@
 
 void *memalign(size_t alignment, size_t size);
 
+void deferred_free(void* block);
+
 status_t heap_init(addr_t heapBase, size_t heapSize);
 status_t heap_init_post_sem();
 status_t heap_init_post_thread();

Modified: haiku/trunk/src/system/kernel/heap.cpp
===================================================================
--- haiku/trunk/src/system/kernel/heap.cpp	2008-03-09 17:41:42 UTC (rev 24331)
+++ haiku/trunk/src/system/kernel/heap.cpp	2008-03-09 17:44:55 UTC (rev 24332)
@@ -19,6 +19,8 @@
 #include <team.h>
 #include <thread.h>
 #include <tracing.h>
+#include <util/AutoLock.h>
+#include <util/DoublyLinkedList.h>
 #include <vm.h>
 
 //#define TRACE_HEAP
@@ -81,6 +83,10 @@
 	heap_allocator_s *	next;
 } heap_allocator;
 
+struct DeferredFreeListEntry : DoublyLinkedListLinkImpl<DeferredFreeListEntry> {
+};
+typedef DoublyLinkedList<DeferredFreeListEntry> DeferredFreeList;
+
 static heap_allocator *sHeapList = NULL;
 static heap_allocator *sLastGrowRequest = NULL;
 static heap_allocator *sGrowHeap = NULL;
@@ -88,7 +94,11 @@
 static sem_id sHeapGrowSem = -1;
 static sem_id sHeapGrownNotify = -1;
 
+static DeferredFreeList sDeferredFreeList;
+static spinlock sDeferredFreeListLock;
 
+
+
 // #pragma mark - Tracing
 
 #ifdef KERNEL_HEAP_TRACING
@@ -962,6 +972,25 @@
 }
 
 
+static void
+deferred_deleter(void *arg, int iteration)
+{
+	// move entries to on-stack list
+	InterruptsSpinLocker locker(sDeferredFreeListLock);
+	if (sDeferredFreeList.IsEmpty())
+		return;
+
+	DeferredFreeList entries;
+	entries.MoveFrom(&sDeferredFreeList);
+
+	locker.Unlock();
+
+	// free the entries
+	while (DeferredFreeListEntry* entry = entries.RemoveHead())
+		free(entry);
+}
+
+
 //	#pragma mark -
 
 
@@ -1092,6 +1121,9 @@
 		return sHeapGrowThread;
 	}
 
+	if (register_kernel_daemon(deferred_deleter, NULL, 50) != B_OK)
+		panic("heap_init_post_thread(): failed to init deferred deleter");
+
 	send_signal_etc(sHeapGrowThread, SIGCONT, B_DO_NOT_RESCHEDULE);
 	return B_OK;
 }
@@ -1236,3 +1268,17 @@
 
 	return address;
 }
+
+
+void
+deferred_free(void* block)
+{
+	if (block == NULL)
+		return;
+
+	// TODO: Use SinglyLinkedList, so that we only need sizeof(void*).
+	DeferredFreeListEntry* entry = new(block) DeferredFreeListEntry;
+
+	InterruptsSpinLocker _(sDeferredFreeListLock);
+	sDeferredFreeList.Add(entry);
+}



From bonefish at mail.berlios.de  Sun Mar  9 18:45:56 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 9 Mar 2008 18:45:56 +0100
Subject: [Haiku-commits] r24333 - haiku/trunk/src/system/kernel
Message-ID: <200803091745.m29Hjugu012147@sheep.berlios.de>

Author: bonefish
Date: 2008-03-09 18:45:52 +0100 (Sun, 09 Mar 2008)
New Revision: 24333
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24333&view=rev

Modified:
   haiku/trunk/src/system/kernel/signal.cpp
Log:
Add a tracing entry when executing a signal handler.


Modified: haiku/trunk/src/system/kernel/signal.cpp
===================================================================
--- haiku/trunk/src/system/kernel/signal.cpp	2008-03-09 17:44:55 UTC (rev 24332)
+++ haiku/trunk/src/system/kernel/signal.cpp	2008-03-09 17:45:52 UTC (rev 24333)
@@ -83,6 +83,28 @@
 };
 
 
+class ExecuteSignalHandler : public AbstractTraceEntry {
+	public:
+		ExecuteSignalHandler(int signal, struct sigaction* handler)
+			:
+			fSignal(signal),
+			fHandler((void*)handler->sa_handler)
+		{
+			Initialized();
+		}
+
+		virtual void AddDump(TraceOutput& out)
+		{
+			out.Print("signal exec handler: signal: %d, handler: %p",
+				fSignal, fHandler);
+		}
+
+	private:
+		int		fSignal;
+		void*	fHandler;
+};
+
+
 class SendSignal : public AbstractTraceEntry {
 	public:
 		SendSignal(pid_t target, uint32 signal, uint32 flags)
@@ -388,6 +410,8 @@
 		if (!restart || (handler->sa_flags & SA_RESTART) == 0)
 			atomic_and(&thread->flags, ~THREAD_FLAGS_RESTART_SYSCALL);
 
+		T(ExecuteSignalHandler(signal, handler));
+
 		TRACE(("### Setting up custom signal handler frame...\n"));
 		arch_setup_signal_frame(thread, handler, signal,
 			atomic_get(&thread->sig_block_mask));



From bonefish at mail.berlios.de  Sun Mar  9 18:56:29 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 9 Mar 2008 18:56:29 +0100
Subject: [Haiku-commits] r24335 - in haiku/trunk: headers/private/kernel
	src/system/kernel
Message-ID: <200803091756.m29HuTkY023675@sheep.berlios.de>

Author: bonefish
Date: 2008-03-09 18:56:27 +0100 (Sun, 09 Mar 2008)
New Revision: 24335
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24335&view=rev

Modified:
   haiku/trunk/headers/private/kernel/team.h
   haiku/trunk/headers/private/kernel/thread_types.h
   haiku/trunk/src/system/kernel/team.cpp
   haiku/trunk/src/system/kernel/thread.cpp
Log:
Process groups are now reference-counted. Processes in a group as well
as the death entries of a deceased processes that were in this group
and have not yet been reaped hold references to the group, so that it
won't be deleted until the group is empty and all gone group members
have been reaped. This fixes #1799 at last.


Modified: haiku/trunk/headers/private/kernel/team.h
===================================================================
--- haiku/trunk/headers/private/kernel/team.h	2008-03-09 17:47:52 UTC (rev 24334)
+++ haiku/trunk/headers/private/kernel/team.h	2008-03-09 17:56:27 UTC (rev 24335)
@@ -17,7 +17,7 @@
 team_id team_create_team(const char *path, const char *name, char **args,
 			int argc, char **envp, int envc, int priority);
 status_t wait_for_team(team_id id, status_t *returnCode);
-void team_remove_team(struct team *team, struct process_group **_freeGroup);
+void team_remove_team(struct team *team);
 void team_delete_team(struct team *team);
 struct process_group *team_get_process_group_locked(
 			struct process_session *session, pid_t id);

Modified: haiku/trunk/headers/private/kernel/thread_types.h
===================================================================
--- haiku/trunk/headers/private/kernel/thread_types.h	2008-03-09 17:47:52 UTC (rev 24334)
+++ haiku/trunk/headers/private/kernel/thread_types.h	2008-03-09 17:56:27 UTC (rev 24335)
@@ -80,6 +80,7 @@
 	struct process_group *next;		// next in hash
 	struct process_session *session;
 	pid_t				id;
+	int32				refs;
 	struct team			*teams;
 	bool				orphaned;
 };
@@ -115,6 +116,7 @@
 struct job_control_entry : DoublyLinkedListLinkImpl<job_control_entry> {
 	job_control_state	state;		// current team job control state
 	thread_id			thread;		// main thread ID == team ID
+	bool				has_group_ref;
 
 	// valid while state != JOB_CONTROL_STATE_DEAD
 	struct team*		team;
@@ -124,6 +126,13 @@
 	status_t			status;
 	uint16				reason;
 	uint16				signal;
+
+	job_control_entry();
+	~job_control_entry();
+
+	void InitDeadState();
+
+	job_control_entry& operator=(const job_control_entry& other);
 };
 
 typedef DoublyLinkedList<job_control_entry> JobControlEntryList;

Modified: haiku/trunk/src/system/kernel/team.cpp
===================================================================
--- haiku/trunk/src/system/kernel/team.cpp	2008-03-09 17:47:52 UTC (rev 24334)
+++ haiku/trunk/src/system/kernel/team.cpp	2008-03-09 17:56:27 UTC (rev 24335)
@@ -19,6 +19,7 @@
 
 #include <elf.h>
 #include <file_cache.h>
+#include <heap.h>
 #include <int.h>
 #include <kernel.h>
 #include <kimage.h>
@@ -620,29 +621,21 @@
 }
 
 
-/*!	You must hold the team lock when calling this function. */
 static void
-insert_group_into_session(struct process_session *session, struct process_group *group)
+deferred_delete_process_group(struct process_group *group)
 {
 	if (group == NULL)
 		return;
 
-	group->session = session;
-	hash_insert(sGroupHash, group);
-	session->group_count++;
-}
+	// remove_group_from_session() keeps this pointer around
+	// only if the session can be freed as well
+	if (group->session) {
+		TRACE(("deferred_delete_process_group(): frees session %ld\n",
+			group->session->id));
+		deferred_free(group->session);
+	}
 
-
-/*!	You must hold the team lock when calling this function. */
-static void
-insert_team_into_group(struct process_group *group, struct team *team)
-{
-	team->group = group;
-	team->group_id = group->id;
-	team->session_id = group->session->id;
-
-	team->group_next = group->teams;
-	group->teams = team;
+	deferred_free(group);
 }
 
 
@@ -668,23 +661,84 @@
 }
 
 
-/*!	Removes the team from the group. If that group becomes therefore
-	unused, it will set \a _freeGroup to point to the group - otherwise
-	it will be \c NULL.
-	It cannot be freed here because this function has to be called
-	with having the team lock held.
+/*!	Team lock must be held.
+*/
+static void
+acquire_process_group_ref(pid_t groupID)
+{
+	process_group* group = team_get_process_group_locked(NULL, groupID);
+	if (group == NULL) {
+		panic("acquire_process_group_ref(): unknown group ID: %ld", groupID);
+		return;
+	}
 
+	group->refs++;
+}
+
+
+/*!	Team lock must be held.
+*/
+static void
+release_process_group_ref(pid_t groupID)
+{
+	process_group* group = team_get_process_group_locked(NULL, groupID);
+	if (group == NULL) {
+		panic("release_process_group_ref(): unknown group ID: %ld", groupID);
+		return;
+	}
+
+	if (group->refs <= 0) {
+		panic("release_process_group_ref(%ld): ref count already 0", groupID);
+		return;
+	}
+
+	if (--group->refs > 0)
+		return;
+
+	// group is no longer used
+
+	remove_group_from_session(group);
+	deferred_delete_process_group(group);
+}
+
+
+/*!	You must hold the team lock when calling this function. */
+static void
+insert_group_into_session(struct process_session *session, struct process_group *group)
+{
+	if (group == NULL)
+		return;
+
+	group->session = session;
+	hash_insert(sGroupHash, group);
+	session->group_count++;
+}
+
+
+/*!	You must hold the team lock when calling this function. */
+static void
+insert_team_into_group(struct process_group *group, struct team *team)
+{
+	team->group = group;
+	team->group_id = group->id;
+	team->session_id = group->session->id;
+
+	team->group_next = group->teams;
+	group->teams = team;
+	acquire_process_group_ref(group->id);
+}
+
+
+/*!	Removes the team from the group.
+
 	\param team the team that'll be removed from it's group
-	\param _freeGroup points to the group to be freed or NULL
 */
 static void
-remove_team_from_group(struct team *team, struct process_group **_freeGroup)
+remove_team_from_group(struct team *team)
 {
 	struct process_group *group = team->group;
 	struct team *current, *last = NULL;
 
-	*_freeGroup = NULL;
-
 	// the team must be in any team to let this function have any effect
 	if  (group == NULL)
 		return;
@@ -705,13 +759,7 @@
 	team->group = NULL;
 	team->group_next = NULL;
 
-	if (group->teams != NULL)
-		return;
-
-	// we can remove this group as it is no longer used
-
-	remove_group_from_session(group);
-	*_freeGroup = group;
+	release_process_group_ref(group->id);
 }
 
 
@@ -723,6 +771,7 @@
 		return NULL;
 
 	group->id = id;
+	group->refs = 0;
 	group->session = NULL;
 	group->teams = NULL;
 	group->orphaned = true;
@@ -1095,7 +1144,6 @@
 	char * const *env, int32 priority, uint32 flags,
 	port_id errorPort, uint32 errorToken, bool kernel)
 {
-	struct process_group *group;
 	struct team *team, *parent;
 	const char *threadName;
 	thread_id thread;
@@ -1221,14 +1269,13 @@
 	state = disable_interrupts();
 	GRAB_TEAM_LOCK();
 
-	remove_team_from_group(team, &group);
+	remove_team_from_group(team);
 	remove_team_from_parent(parent, team);
 	hash_remove(sTeamHash, team);
 
 	RELEASE_TEAM_LOCK();
 	restore_interrupts(state);
 
-	team_delete_process_group(group);
 	delete_team_struct(team);
 
 	return status;
@@ -1381,7 +1428,6 @@
 {
 	struct thread *parentThread = thread_get_current_thread();
 	struct team *parentTeam = parentThread->team, *team;
-	struct process_group *group = NULL;
 	struct fork_arg *forkArgs;
 	struct area_info info;
 	thread_id threadID;
@@ -1490,14 +1536,13 @@
 	state = disable_interrupts();
 	GRAB_TEAM_LOCK();
 
-	remove_team_from_group(team, &group);
+	remove_team_from_group(team);
 	remove_team_from_parent(parentTeam, team);
 	hash_remove(sTeamHash, team);
 
 	RELEASE_TEAM_LOCK();
 	restore_interrupts(state);
 
-	team_delete_process_group(group);
 	delete_team_struct(team);
 
 	return status;
@@ -1565,6 +1610,57 @@
 }
 
 
+job_control_entry::job_control_entry()
+	:
+	has_group_ref(false)
+{
+}
+
+
+job_control_entry::~job_control_entry()
+{
+	if (has_group_ref) {
+		InterruptsSpinLocker locker(team_spinlock);
+		release_process_group_ref(group_id);
+	}
+}
+
+
+/*!	Team and thread lock must be held.
+*/
+void
+job_control_entry::InitDeadState()
+{
+	if (team != NULL) {
+		struct thread* thread = team->main_thread;
+		group_id = team->group_id;
+		this->thread = thread->id;
+		status = thread->exit.status;
+		reason = thread->exit.reason;
+		signal = thread->exit.signal;
+		team = NULL;
+		acquire_process_group_ref(group_id);
+		has_group_ref = true;
+	}
+}
+
+
+job_control_entry&
+job_control_entry::operator=(const job_control_entry& other)
+{
+	state = other.state;
+	thread = other.thread;
+	has_group_ref = false;
+	team = other.team;
+	group_id = other.group_id;
+	status = other.status;
+	reason = other.reason;
+	signal = other.signal;
+
+	return *this;
+}
+
+
 /*! This is the kernel backend for waitpid(). It is a bit more powerful when it
 	comes to the reason why a thread has died than waitpid() can be.
 */
@@ -2041,11 +2137,9 @@
 /*!	Removes the specified team from the global team hash, and from its parent.
 	It also moves all of its children up to the parent.
 	You must hold the team lock when you call this function.
-	If \a _freeGroup is set to a value other than \c NULL, it must be freed
-	from the calling function.
 */
 void
-team_remove_team(struct team *team, struct process_group **_freeGroup)
+team_remove_team(struct team *team)
 {
 	struct team *parent = team->parent;
 
@@ -2109,7 +2203,7 @@
 	reparent_children(team);
 
 	// remove us from our process group
-	remove_team_from_group(team, _freeGroup);
+	remove_team_from_group(team);
 
 	// remove us from our parent
 	remove_team_from_parent(parent, team);
@@ -2870,7 +2964,6 @@
 
 	status_t status = B_OK;
 	struct process_group *freeGroup = NULL;
-	struct process_group *freeGroup2 = NULL;
 
 	InterruptsSpinLocker locker(team_spinlock);
 
@@ -2893,7 +2986,7 @@
 			if (targetGroup != NULL) {
 				// In case of processID == groupID we have to free the
 				// allocated group.
-				freeGroup2 = group;
+				freeGroup = group;
 			} else if (processID == groupID) {
 				// We created a new process group, let us insert it into the
 				// team's session.
@@ -2905,7 +2998,7 @@
 				// we got a group, let's move the team there
 				process_group* oldGroup = team->group;
 
-				remove_team_from_group(team, &freeGroup);
+				remove_team_from_group(team);
 				insert_team_into_group(targetGroup, team);
 
 				// Update the "orphaned" flag of all potentially affected
@@ -2953,7 +3046,6 @@
 	}
 
 	team_delete_process_group(freeGroup);
-	team_delete_process_group(freeGroup2);
 
 	return status == B_OK ? groupID : status;
 }
@@ -2964,7 +3056,7 @@
 {
 	struct team *team = thread_get_current_thread()->team;
 	struct process_session *session;
-	struct process_group *group, *freeGroup = NULL;
+	struct process_group *group;
 	cpu_status state;
 	bool failed = false;
 
@@ -2987,7 +3079,7 @@
 
 	// this may have changed since the check above
 	if (!is_process_group_leader(team)) {
-		remove_team_from_group(team, &freeGroup);
+		remove_team_from_group(team);
 
 		insert_group_into_session(session, group);
 		insert_team_into_group(group, team);
@@ -3001,8 +3093,7 @@
 		team_delete_process_group(group);
 		free(session);
 		return B_NOT_ALLOWED;
-	} else
-		team_delete_process_group(freeGroup);
+	}
 
 	return team->group_id;
 }

Modified: haiku/trunk/src/system/kernel/thread.cpp
===================================================================
--- haiku/trunk/src/system/kernel/thread.cpp	2008-03-09 17:47:52 UTC (rev 24334)
+++ haiku/trunk/src/system/kernel/thread.cpp	2008-03-09 17:56:27 UTC (rev 24335)
@@ -1192,7 +1192,6 @@
 {
 	cpu_status state;
 	struct thread *thread = thread_get_current_thread();
-	struct process_group *freeGroup = NULL;
 	struct team *team = thread->team;
 	thread_id parentID = -1;
 	bool deleteTeam = false;
@@ -1261,12 +1260,7 @@
 			team->job_control_entry = NULL;
 
 			if (death != NULL) {
-				death->team = NULL;
-				death->group_id = team->group_id;
-				death->thread = thread->id;
-				death->status = thread->exit.status;
-				death->reason = thread->exit.reason;
-				death->signal = thread->exit.signal;
+				death->InitDeadState();
 
 				// team_set_job_control_state() already moved our entry
 				// into the parent's list. We just check the soft limit of
@@ -1281,7 +1275,7 @@
 			} else
 				RELEASE_THREAD_LOCK();
 
-			team_remove_team(team, &freeGroup);
+			team_remove_team(team);
 
 			send_signal_etc(parentID, SIGCHLD,
 				SIGNAL_FLAG_TEAMS_LOCKED | B_DO_NOT_RESCHEDULE);
@@ -1324,15 +1318,6 @@
 
 	// delete the team if we're its main thread
 	if (deleteTeam) {
-		// TODO: Deleting the process group is actually a problem. According to
-		// the POSIX standard the process should become a zombie and live on
-		// until it is reaped. Hence the process group would continue to exist
-		// for that time as well. That is moving processes to it (setpgid())
-		// should work. This can actually happen e.g. when executing something
-		// like "echo foobar | wc" in the shell. The built-in "echo" could
-		// exit() even before setpgid() has been invoked for the "wc" child.
-		// Cf. bug #1799.
-		team_delete_process_group(freeGroup);
 		team_delete_team(team);
 
 		// we need to delete any death entry that made it to here



From bonefish at mail.berlios.de  Sun Mar  9 19:00:20 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 9 Mar 2008 19:00:20 +0100
Subject: [Haiku-commits] r24336 - haiku/trunk/src/system/kernel/fs
Message-ID: <200803091800.m29I0K5U026830@sheep.berlios.de>

Author: bonefish
Date: 2008-03-09 19:00:17 +0100 (Sun, 09 Mar 2008)
New Revision: 24336
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24336&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/vfs.cpp
Log:
We didn't copy the close-on-exec flags on fork(), thus always leaving
all FDs in a fork()+exec()ed child open. Makes Perl test
t/run/cloexec.t pass.


Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-09 17:56:27 UTC (rev 24335)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-09 18:00:17 UTC (rev 24336)
@@ -3792,6 +3792,9 @@
 				context->num_used_fds++;
 				atomic_add(&descriptor->ref_count, 1);
 				atomic_add(&descriptor->open_count, 1);
+
+				if (fd_close_on_exec(parentContext, i))
+					fd_set_close_on_exec(context, i, true);
 			}
 		}
 



From bonefish at mail.berlios.de  Sun Mar  9 18:48:04 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 9 Mar 2008 18:48:04 +0100
Subject: [Haiku-commits] r24334 - haiku/trunk/src/system/libroot/posix/locale
Message-ID: <200803091748.m29Hm4cW014107@sheep.berlios.de>

Author: bonefish
Date: 2008-03-09 18:47:52 +0100 (Sun, 09 Mar 2008)
New Revision: 24334
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24334&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/locale/setlocale.c
Log:
Allow setting the local to "C" (i.e. not changing it at all). This makes
programs happy, that do that unconditionally (e.g. some Perl test).


Modified: haiku/trunk/src/system/libroot/posix/locale/setlocale.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/locale/setlocale.c	2008-03-09 17:45:52 UTC (rev 24333)
+++ haiku/trunk/src/system/libroot/posix/locale/setlocale.c	2008-03-09 17:47:52 UTC (rev 24334)
@@ -6,14 +6,16 @@
 
 #include <locale.h>
 #include <limits.h>
+#include <string.h>
 
 
 char *
 setlocale(int category, const char *locale)
 {
-	if (locale == NULL || !locale[0])
+	if (locale == NULL || !locale[0] || strcmp(locale, "C") == 0)
 		return "C";
 
-	// ToDo: this should check if liblocale.so is available and use its functions
+	// TODO: this should check if liblocale.so is available and use its
+	// functions.
 	return NULL;
 }



From revol at free.fr  Sun Mar  9 19:40:18 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Sun, 09 Mar 2008 19:40:18 +0100 CET
Subject: [Haiku-commits] r24336 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <200803091800.m29I0K5U026830@sheep.berlios.de>
Message-ID: <6985498616-BeMail@laptop>

> Log:
> We didn't copy the close-on-exec flags on fork(), thus always leaving
> all FDs in a fork()+exec()ed child open. Makes Perl test
> t/run/cloexec.t pass.

Btw, how do we handle queries ?
IIRC in BeOS they were not CLOEXEC by default, so any app launched by 
Tracker or something else would have their fds also, making it hard 
sometimes to locate what app(s) are keeping a disk busy...
Same goes for indices but we don't use that much often.

Fran?ois.


From axeld at pinc-software.de  Sun Mar  9 19:57:49 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 09 Mar 2008 19:57:49 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24332_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/private/kernel_src/system/kernel?=
In-Reply-To: <200803091744.m29Hivks010469@sheep.berlios.de>
Message-ID: <34310230374-BeMail@zon>

bonefish at BerliOS <bonefish at mail.berlios.de> wrote:
> +	// TODO: Use SinglyLinkedList, so that we only need sizeof(void*).
> +	DeferredFreeListEntry* entry = new(block) DeferredFreeListEntry;

The smallest allocation is currently 8 bytes, anyway.

Bye,
   Axel.



From axeld at pinc-software.de  Sun Mar  9 19:59:17 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 09 Mar 2008 19:59:17 +0100 CET
Subject: [Haiku-commits] r24329 - haiku/trunk/src/kits/storage
In-Reply-To: <200803091739.m29Hd8AK032575@sheep.berlios.de>
Message-ID: <34398339694-BeMail@zon>

bonefish at BerliOS <bonefish at mail.berlios.de> wrote:
> Log:
> CreateFile() didn't specify the B_ERASE_FILE, hence the file wouldn't 
> be
> truncated, if already existing. This problem could be experienced 
> when
> saving in Pe.

Very cool! But how come this wasn't easily reproducible?

Bye,
   Axel.



From mmu_man at mail.berlios.de  Sun Mar  9 20:42:21 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 9 Mar 2008 20:42:21 +0100
Subject: [Haiku-commits] r24337 - haiku/trunk/build/scripts
Message-ID: <200803091942.m29JgLgB016188@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-09 20:42:20 +0100 (Sun, 09 Mar 2008)
New Revision: 24337
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24337&view=rev

Modified:
   haiku/trunk/build/scripts/build_haiku_image
Log:
Check if /bin/stat supports the gnuish -c option, else fallback to BSD syntax.
This should fix ticket #1676, please try.


Modified: haiku/trunk/build/scripts/build_haiku_image
===================================================================
--- haiku/trunk/build/scripts/build_haiku_image	2008-03-09 18:00:17 UTC (rev 24336)
+++ haiku/trunk/build/scripts/build_haiku_image	2008-03-09 19:42:20 UTC (rev 24337)
@@ -65,7 +65,10 @@
 {
 	test -e "$1" || return
 	if [ -d "$outputDir/attributes" ]; then
-		find "$1" -print0 | xargs -0 stat -c %i | awk "{ print \"$outputDir/attributes/\" \$1 }" | xargs rm -rf
+		# test for gnu stat, else fallback to the bsd one.
+		statFormatOpt="-c"
+		stat -c '%i' . >/dev/null 2>&1 || statFormatOpt="-f"
+		find "$1" -print0 | xargs -0 stat $statFormatOpt %i | awk "{ print \"$outputDir/attributes/\" \$1 }" | xargs rm -rf
 	fi
 	rm -rf "$1"
 }



From niels.reedijk at gmail.com  Sun Mar  9 21:39:18 2008
From: niels.reedijk at gmail.com (Niels Reedijk)
Date: Sun, 9 Mar 2008 21:39:18 +0100
Subject: [Haiku-commits] r24304 - haiku/trunk/docs/user/app
In-Reply-To: <20080308173649.9186.2@stippis2.1204981284.fake>
References: <200803081511.m28FBd3B004931@sheep.berlios.de>
	<20080308173649.9186.2@stippis2.1204981284.fake>
Message-ID: <507d86c0803091339q58ce2425yd19fcb478e4e250c@mail.gmail.com>

2008/3/8, Stephan Assmus <superstippi at gmx.de>:
>
>  Hi Niels,
>
>  a few comments...

Thanks, applied!

N.


From nielx at mail.berlios.de  Sun Mar  9 21:39:57 2008
From: nielx at mail.berlios.de (nielx at BerliOS)
Date: Sun, 9 Mar 2008 21:39:57 +0100
Subject: [Haiku-commits] r24338 - haiku/trunk/docs/user/app
Message-ID: <200803092039.m29KdvOC026271@sheep.berlios.de>

Author: nielx
Date: 2008-03-09 21:39:57 +0100 (Sun, 09 Mar 2008)
New Revision: 24338
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24338&view=rev

Modified:
   haiku/trunk/docs/user/app/Looper.dox
Log:
Correct some mistakes pointed out by Stephan

Modified: haiku/trunk/docs/user/app/Looper.dox
===================================================================
--- haiku/trunk/docs/user/app/Looper.dox	2008-03-09 19:42:20 UTC (rev 24337)
+++ haiku/trunk/docs/user/app/Looper.dox	2008-03-09 20:39:57 UTC (rev 24338)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -32,18 +32,18 @@
 	messages. Messages are actually passed on to \link BHandler handlers \endlink
 	that are associated with this looper. By default there is always one
 	handler available: the looper itself. To 'quit' a looper, you should pass
-	a \c B_QUIT_REQUESTED message using one of the message post functions. Do
-	not call Quit() directly! When a looper receives such a request, it will 
-	\b delete itself. As such, looper should <em>always be created on the
-	heap</em> (with \c new), and never on the stack. 
+	a \c B_QUIT_REQUESTED message using one of the message post functions. When
+	a looper receives such a request, it will \b delete itself. As such, looper
+	should <em>always be created on the heap</em> (with \c new), and never on
+	the stack. 
 	
 	Posting messages can be done using the various PostMessage() methods.
 	Whenever a message is posted, it will be added through to the message
 	queue. It is possible to apply filters (see AddCommonFilter()) to filter
-	out any messages that correspond with certain criteria. Whenever you post
-	a message, you \e lose ownership. The looper will dispose of it when it is 
-	processed. The handler for the message is chosen using the following
-	criteria:
+	out any messages that correspond with certain criteria. The method will
+	copy the contents of the message and this copy is processed, so make sure
+	you delete the original messages in case you create them on the heap.
+	The handler for the message is chosen using the following criteria:
 	
 	-# If PostMessage() or the BMessenger is set to a specific handler, and
 		this handler is associated with this looper, than the message is
@@ -220,6 +220,17 @@
 	Posting a message puts it in the message queue. The message passes through
 	the default handler chain.
 	
+	The \a message is copied, and as such, you should make sure you will not
+	leak it. The best way to send messages is like this:
+
+\code
+	BMessage message;
+	message.what = B_DO_SOMETHING;
+	message.AddString("some_data", "This is data")
+	
+	aLooper->PostMessage(&message);
+\endcode
+	
 	\param message The message you would like to pass to this method.
 	
 	\retval B_OK The operation succeeded, and the message is sent to the port.
@@ -277,6 +288,17 @@
 	The target \a handler should be associated with this looper. This method
 	bypasses the default message queue.
 	
+	The \a message is copied, and as such, you should make sure you will not
+	leak it. The best way to send messages is like this:
+
+\code
+	BMessage message;
+	message.what = B_DO_SOMETHING;
+	message.AddString("some_data", "This is data")
+
+	aLooper->PostMessage(&message, aHandler);
+\endcode
+	
 	\param message The message you want to pass.
 	\param handler The handler you would like to pass this message to.
 	\param replyTo If you would like to request a reply, pass the handler to
@@ -520,8 +542,12 @@
 	\fn void BLooper::Quit()
 	\brief Hook method that is called after a \c B_QUIT_REQUESTED message.
 	
-	If you want to quit and delete the looper, do \b not call this method
-	directly, rather, post a \c B_QUIT_REQUESTED message to the looper.
+	If you want to quit and delete the looper, you should post a 
+	\c B_QUIT_REQUESTED message. This will first call the hook method
+	QuitRequested(), which can be overridden in child classes in case there
+	are conditions that would prevent the looper to be quit. If you really
+	know what you are doing, and you definitely want to quit this looper,
+	you may call this method, but only after performing a Lock() operation.
 	
 	Override this method if your subclass needs to perform specific clean-up
 	tasks. Remember to call the base class implementation when you're done.



From mmu_man at mail.berlios.de  Sun Mar  9 22:40:55 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 9 Mar 2008 22:40:55 +0100
Subject: [Haiku-commits] r24339 -
	haiku/trunk/src/add-ons/kernel/file_systems/googlefs
Message-ID: <200803092140.m29Letlw002294@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-09 22:40:54 +0100 (Sun, 09 Mar 2008)
New Revision: 24339
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24339&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/googlefs/Jamfile
Log:
Fix building for BeOS.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/googlefs/Jamfile	2008-03-09 20:39:57 UTC (rev 24338)
+++ haiku/trunk/src/add-ons/kernel/file_systems/googlefs/Jamfile	2008-03-09 21:40:54 UTC (rev 24339)
@@ -1,9 +1,12 @@
 SubDir HAIKU_TOP src add-ons kernel file_systems googlefs ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
 UsePrivateHeaders kernel ;
 
 #SubDirCcFlags -DTRACK_FILENAME ;
 #SubDirCcFlags -DDEBUG_GOOGLEFS=1 ;
+SubDirCcFlags -D_IMPEXP_KERNEL= ;
 
 KernelAddon googlefs :
 	attrs.c



From mmu_man at mail.berlios.de  Sun Mar  9 22:54:28 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 9 Mar 2008 22:54:28 +0100
Subject: [Haiku-commits] r24340 -
	haiku/trunk/src/add-ons/kernel/file_systems/googlefs
Message-ID: <200803092154.m29LsSc0003813@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-09 22:54:27 +0100 (Sun, 09 Mar 2008)
New Revision: 24340
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24340&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/googlefs/attrs.c
Log:
Some updates on trademarks, my IM contacts, and I'm not employed by yT anymore :))


Modified: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/attrs.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/googlefs/attrs.c	2008-03-09 21:40:54 UTC (rev 24339)
+++ haiku/trunk/src/add-ons/kernel/file_systems/googlefs/attrs.c	2008-03-09 21:54:27 UTC (rev 24340)
@@ -201,10 +201,10 @@
 char *readmestr = \
 "Welcome to the Google? FileSystem for BeOS?, Zeta? and Haiku?.\n"
 "Copyright? 2004, 2005, Fran?ois Revol.\n"
-"Google is a trademark of Google,Inc.\n"
-"BeOS is a trademark of PalmSource.\n"
+"Google is a trademark of Google, Inc.\n"
+"BeOS is a trademark of ACCESS.\n"
 "Zeta is a trademark of yellowTAB GmbH.\n"
-"Haiku is a trademark of Haiku Inc.\n"
+"Haiku is a trademark of Haiku, Inc.\n"
 "\n"
 "Use \"Search Google\" query template in this folder to ask google anything.\n"
 "\n";
@@ -215,10 +215,10 @@
 { "META:name", 'CSTR', SZSTR("Fran?ois Revol") },
 { "META:country", 'CSTR', SZSTR("France") },
 { "META:nickname", 'CSTR', SZSTR("mmu_man") },
-{ "META:company", 'CSTR', SZSTR("yellowTAB GmbH") },
-{ "META:url", 'CSTR', SZSTR("") },
+//{ "META:company", 'CSTR', SZSTR("yellowTAB GmbH") },
+{ "META:url", 'CSTR', SZSTR("http://revolf.free.fr/") },
 { "META:group", 'CSTR', SZSTR("") },
-{ "IM:connections", 'CSTR', SZSTR("icq:77792625") },
+{ "IM:connections", 'CSTR', SZSTR("icq:77792625;gtalk:revolf at gmail.com;yahoo:mmu_man;msn:revol at mail.com") },
 #if 0
 { "BEOS:TYPE", /*B_MIME_STRING_TYPE*/'MIMS', SZSTR("application/x-vnd.Be-bookmark") },
 { "META:title", 'CSTR', SZSTR("Report googlefs bugs") },



From axeld at mail.berlios.de  Sun Mar  9 23:21:22 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 9 Mar 2008 23:21:22 +0100
Subject: [Haiku-commits] r24341 - haiku/trunk/src/servers/media
Message-ID: <200803092221.m29MLMqh008457@sheep.berlios.de>

Author: axeld
Date: 2008-03-09 23:21:21 +0100 (Sun, 09 Mar 2008)
New Revision: 24341
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24341&view=rev

Modified:
   haiku/trunk/src/servers/media/AddOnManager.cpp
Log:
Disable user add-ons only if specifically set in the safemode settings,
thanks Fran?\195?\167ois!


Modified: haiku/trunk/src/servers/media/AddOnManager.cpp
===================================================================
--- haiku/trunk/src/servers/media/AddOnManager.cpp	2008-03-09 21:54:27 UTC (rev 24340)
+++ haiku/trunk/src/servers/media/AddOnManager.cpp	2008-03-09 22:21:21 UTC (rev 24341)
@@ -235,8 +235,8 @@
 	char buffer[16];
 	size_t size = sizeof(buffer);
 
-	bool disableUserAddOns = _kern_get_safemode_option(B_SAFEMODE_SAFE_MODE,
-			buffer, &size) == B_OK
+	bool disableUserAddOns = _kern_get_safemode_option(
+			B_SAFEMODE_DISABLE_USER_ADD_ONS, buffer, &size) == B_OK
 		&& (!strcasecmp(buffer, "true")
 			|| !strcasecmp(buffer, "yes")
 			|| !strcasecmp(buffer, "on")



From axeld at pinc-software.de  Sun Mar  9 23:21:10 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 09 Mar 2008 23:21:10 +0100 CET
Subject: [Haiku-commits] r24325 - haiku/trunk/src/servers/media
In-Reply-To: <1943165349-BeMail@laptop>
Message-ID: <46511742287-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> > +	bool disableUserAddOns = 
> > _kern_get_safemode_option(B_SAFEMODE_SAFE_MODE,
> Shouldn't it be B_SAFEMODE_DISABLE_USER_ADD_ONS ?

Absolutely!

Bye,
   Axel.



From stefano.ceccherini at gmail.com  Sun Mar  9 23:43:18 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Sun, 9 Mar 2008 23:43:18 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <23980507766-BeMail@zon>
References: <1146021671-BeMail@kirilla> <23980507766-BeMail@zon>
Message-ID: <894b9700803091543q749c9d86xa071dd05d4613f14@mail.gmail.com>

2008/3/9, Axel D?rfler <axeld at pinc-software.de>:
> "Jonas Sundstr?m" <jonas at kirilla.com> wrote:
>  > "Axel D?rfler" <axeld at pinc-software.de> wrote:
>  > > IOW we might break existing BeOS applications
>  > > with this change.
>  > I don't know if its related, but the following happens when trying to
>  > start NetPositive recently. There's a ~BString in the the gdb
>  > backtrace.
>
>
> So do you want to have a look into it, Julun?
>
>  Bye,
>
>    Axel.

Could be the same problem fixed in r16783  ?


From superstippi at gmx.de  Mon Mar 10 00:01:24 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 10 Mar 2008 00:01:24 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk:
	headers/os/support	src/kits/support
In-Reply-To: <894b9700803091543q749c9d86xa071dd05d4613f14@mail.gmail.com>
References: <1146021671-BeMail@kirilla> <23980507766-BeMail@zon>
	<894b9700803091543q749c9d86xa071dd05d4613f14@mail.gmail.com>
Message-ID: <20080309230124.309500@gmx.net>


> Von: "Stefano Ceccherini" <stefano.ceccherini at gmail.com>
> Could be the same problem fixed in r16783  ?

Doesn't look like it. I have another app which does nothing but use BNode::ReadAttrString()(BString::LockBuffer()/UnlockBuffer()) and BString::SetTo() and eventually crashes. It allocates two BString on the stack in a loop and compares them (results in strcmp()).

Best regards,
-Stephan


From mmu_man at mail.berlios.de  Mon Mar 10 00:26:39 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Mon, 10 Mar 2008 00:26:39 +0100
Subject: [Haiku-commits] r24342 -
	haiku/trunk/src/add-ons/kernel/file_systems/googlefs
Message-ID: <200803092326.m29NQdEH013301@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-10 00:26:38 +0100 (Mon, 10 Mar 2008)
New Revision: 24342
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24342&view=rev

Removed:
   haiku/trunk/src/add-ons/kernel/file_systems/googlefs/google_icon.c
Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/googlefs/Jamfile
   haiku/trunk/src/add-ons/kernel/file_systems/googlefs/attrs.c
   haiku/trunk/src/add-ons/kernel/file_systems/googlefs/makefile
   haiku/trunk/src/add-ons/kernel/file_systems/googlefs/makefile.ufs
Log:
Added HVIF and SVG icon for root folder, should look better :)
Added a custom volume id just in case (might be useful for queries to work between mounts).


Modified: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/googlefs/Jamfile	2008-03-09 22:21:21 UTC (rev 24341)
+++ haiku/trunk/src/add-ons/kernel/file_systems/googlefs/Jamfile	2008-03-09 23:26:38 UTC (rev 24342)
@@ -10,7 +10,6 @@
 
 KernelAddon googlefs :
 	attrs.c
-	google_icon.c
 	google_request.c
 	googlefs.c
 	http_cnx.c

Modified: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/attrs.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/googlefs/attrs.c	2008-03-09 22:21:21 UTC (rev 24341)
+++ haiku/trunk/src/add-ons/kernel/file_systems/googlefs/attrs.c	2008-03-09 23:26:38 UTC (rev 24342)
@@ -1,18 +1,362 @@
 #include <SupportDefs.h>
+#include <TypeConstants.h>
 #include "googlefs.h"
 
 #define SZSTR(s) sizeof(s), s
 #define SZTAB(s) sizeof(s), s
 
-extern const char google_icon_M[];
-extern const char google_icon_L[];
+// #pragma mark - root folder icons
 
+#if 0
+/* old one */
+const char google_icon_M[] = {
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1e, 0x1b, 0xd9, 0xd9, 0x1d, 0xff, 0xff, 
+0xff, 0xff, 0x1d, 0x82, 0x82, 0x19, 0xff, 0xff, 0x1e, 0xd8, 0x64, 0x63, 0x63, 0xd8, 0x1b, 0xff, 
+0xff, 0x1a, 0x2c, 0x2d, 0x2d, 0x2c, 0xc4, 0x1d, 0x62, 0x63, 0x1c, 0x3f, 0x1e, 0x63, 0xd8, 0x1d, 
+0x1a, 0x2c, 0xca, 0x1a, 0x1d, 0x82, 0x2d, 0xa3, 0xd8, 0x62, 0x3f, 0x3f, 0x3f, 0x1e, 0xd8, 0x1a, 
+0x82, 0x2d, 0x1a, 0x3f, 0x3f, 0x3f, 0xa3, 0x2d, 0xd8, 0x62, 0x0e, 0x1e, 0x3f, 0x1f, 0xd8, 0x62, 
+0x82, 0x2d, 0x1d, 0x3f, 0x3f, 0x0f, 0x82, 0x2e, 0x63, 0x83, 0x0a, 0x1e, 0x3f, 0xfd, 0x64, 0x1b, 
+0x19, 0x2c, 0x5a, 0x3f, 0x1e, 0x0b, 0xc4, 0xeb, 0x1a, 0x64, 0xd8, 0xd9, 0xd9, 0x64, 0x83, 0xff, 
+0xff, 0xca, 0x2c, 0xa3, 0x5a, 0xc4, 0x2e, 0x82, 0xff, 0x1b, 0x83, 0x8a, 0x89, 0x17, 0x17, 0xff, 
+0xff, 0x1a, 0xa9, 0x2e, 0x2e, 0xca, 0x82, 0x17, 0xff, 0xff, 0xff, 0x17, 0x17, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0x1a, 0x1a, 0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+const char google_icon_L[] = {
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x1b, 0x1c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0x1c, 0x62, 0x63, 0xd8, 0xd8, 0xd8, 0x63, 0x62, 0x1d, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1e, 0x1e, 0x1e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0x1a, 0xd8, 0xd8, 0xd8, 0xf8, 0xd8, 0xf8, 0xd8, 0xd8, 0x63, 0x1b, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0x1a, 0x18, 0xa3, 0xc4, 0xc4, 0xc4, 0xa9, 0x82, 0x1a, 0xff, 0xff, 0xff, 
+0xff, 0x1a, 0xd8, 0xd8, 0x64, 0x84, 0x83, 0x63, 0x63, 0x84, 0xf8, 0xd8, 0x63, 0x1b, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0x1c, 0xa3, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0xc4, 0x1a, 0xff, 0xff, 
+0x1c, 0x63, 0xf8, 0x84, 0x83, 0x1d, 0x1f, 0x3f, 0x1f, 0x1c, 0x63, 0x64, 0xd8, 0x63, 0x1d, 0xff, 
+0xff, 0xff, 0x1c, 0xc4, 0x2c, 0x2c, 0x2d, 0x2e, 0x2e, 0x2e, 0x2e, 0x2c, 0x2c, 0x2c, 0x19, 0xff, 
+0x62, 0xd8, 0x84, 0x63, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1e, 0x63, 0xf8, 0xd8, 0x62, 0xff, 
+0xff, 0x1a, 0xa3, 0x2c, 0x2d, 0x2e, 0xa3, 0x1a, 0x1c, 0x1a, 0x82, 0x2e, 0x2d, 0x2c, 0xc4, 0x1b, 
+0x63, 0xf8, 0x84, 0x1d, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1b, 0xf8, 0xd8, 0x63, 0x1a, 
+0xff, 0x18, 0x2c, 0x2d, 0x2f, 0x82, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1a, 0x2d, 0x2c, 0x2c, 0xa9, 
+0xd8, 0x64, 0x83, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1e, 0xd8, 0xd8, 0x83, 0x1a, 
+0x1a, 0xa3, 0x2c, 0xeb, 0xa9, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x82, 0x2d, 0x2c, 0xca, 
+0xd8, 0x64, 0x83, 0x1f, 0x19, 0x1b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0xd8, 0xd8, 0x83, 0x1a, 
+0x1a, 0xc4, 0x2c, 0x2f, 0x61, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1d, 0xc4, 0x2c, 0xeb, 
+0xd8, 0xf8, 0x83, 0x15, 0x01, 0x03, 0x1b, 0x3f, 0x3f, 0x3f, 0x3f, 0x1e, 0xd8, 0xf8, 0x83, 0x1a, 
+0x1a, 0xc4, 0x2c, 0x2f, 0x1c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1c, 0x1b, 0x1e, 0xc4, 0x2d, 0x2f, 
+0x83, 0xd8, 0x64, 0x0f, 0x00, 0x01, 0x19, 0x3f, 0x3f, 0x3f, 0x3f, 0xfd, 0xd8, 0x64, 0x14, 0x1a, 
+0x1a, 0xc4, 0x2c, 0x2d, 0xda, 0x3f, 0x3f, 0x3f, 0x3f, 0x1c, 0x04, 0x02, 0x16, 0xc4, 0x2d, 0x2f, 
+0x89, 0xf8, 0xd8, 0x63, 0x12, 0x15, 0x1f, 0x3f, 0x3f, 0x3f, 0xfe, 0xd8, 0xf8, 0x84, 0x18, 0xff, 
+0x1a, 0xa9, 0x2c, 0x2c, 0x82, 0x3f, 0x3f, 0x3f, 0x3f, 0x1b, 0x02, 0x00, 0xa9, 0x2c, 0x2e, 0x2f, 
+0x1a, 0x83, 0xf8, 0xf8, 0xd8, 0xfd, 0x1f, 0x1f, 0x1e, 0xfd, 0xd8, 0xf8, 0x84, 0x89, 0x1a, 0xff, 
+0xff, 0x82, 0x2d, 0x2c, 0x2c, 0xda, 0x3f, 0x3f, 0x3f, 0x3f, 0x17, 0x13, 0xc4, 0x2d, 0xeb, 0xa9, 
+0x1a, 0x1a, 0x83, 0x84, 0x64, 0xf8, 0xd8, 0xd8, 0xd8, 0xf8, 0xf8, 0x84, 0x89, 0x1b, 0xff, 0xff, 
+0xff, 0x1a, 0xca, 0x2d, 0x2c, 0x2c, 0x5a, 0x1e, 0x3f, 0x1f, 0xda, 0xc4, 0x2c, 0xeb, 0x2f, 0x18, 
+0xff, 0xff, 0x1a, 0x89, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x8a, 0x89, 0x1b, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0x19, 0xeb, 0x2d, 0x2c, 0x2c, 0x2c, 0xc4, 0x2c, 0x2c, 0x2c, 0x2e, 0x2f, 0x13, 0xff, 
+0xff, 0xff, 0xff, 0x1a, 0x17, 0x89, 0x89, 0x8a, 0x89, 0x89, 0x18, 0x1a, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0x19, 0xca, 0x2e, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0xeb, 0x2f, 0x13, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1a, 0x1a, 0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0x1c, 0xa9, 0xca, 0xeb, 0xeb, 0xeb, 0xca, 0xa9, 0x18, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1a, 0x1a, 0x18, 0x61, 0x1b, 0x1a, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+#endif
 
+// icons by ahwayakchih
+
+const char google_icon_M[] = {
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1b, 0xd9, 0xd9, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0x82, 0x82, 0x19, 0xff, 0xff, 0xff, 0xd8, 0x64, 0x63, 0x63, 0xd8, 0xff, 0xff, 
+0xff, 0xff, 0x2c, 0x2d, 0x2d, 0x2c, 0xc4, 0xff, 0x62, 0x63, 0x1c, 0x3f, 0x1e, 0x63, 0xd8, 0xff, 
+0xff, 0x2c, 0xca, 0x1a, 0x1d, 0x82, 0x2d, 0xa3, 0xd8, 0x62, 0x3f, 0x3f, 0x3f, 0x1e, 0xd8, 0x1a, 
+0x82, 0x2d, 0x1a, 0x3f, 0x3f, 0x3f, 0xa3, 0x2d, 0xd8, 0x62, 0x0e, 0x1e, 0x3f, 0x1f, 0xd8, 0x62, 
+0x82, 0x2d, 0x1d, 0x3f, 0x3f, 0x0f, 0x82, 0x2e, 0x63, 0x83, 0x0a, 0x1e, 0x3f, 0xfd, 0x64, 0xff, 
+0xff, 0x2c, 0x5a, 0x3f, 0x1e, 0x0b, 0xc4, 0xeb, 0xff, 0x64, 0xd8, 0xd9, 0xd9, 0x64, 0x83, 0xff, 
+0xff, 0xca, 0x2c, 0xa3, 0x5a, 0xc4, 0x2e, 0x82, 0xff, 0xff, 0x83, 0x8a, 0x89, 0x17, 0xff, 0xff, 
+0xff, 0xff, 0xa9, 0x2e, 0x2e, 0xca, 0x82, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+
+const char google_icon_L[] = {
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x1b, 
+0x09, 0x08, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x04, 0x1c, 
+0x1b, 0x1c, 0x08, 0x09, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x1b, 0x09, 0x08, 
+0x1c, 0x1c, 0x1b, 0x1c, 0x08, 0x09, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x04, 0x1c, 0x1b, 0x1c, 
+0x08, 0x09, 0x1c, 0x1b, 0x1c, 0x1b, 0x09, 0x08, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x1b, 0x09, 0x08, 0x1c, 0x1c, 
+0x1b, 0x1c, 0x08, 0x09, 0x1c, 0x1b, 0x1c, 0x1b, 0x09, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x04, 0x1c, 0x1b, 0x1c, 0x08, 0x09, 
+0x1c, 0x1b, 0x1c, 0x1b, 0x09, 0x08, 0x1c, 0x1c, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x1b, 0x09, 0x08, 0x1c, 0x1c, 0x1b, 0x1c, 
+0x08, 0x09, 0x1c, 0x1b, 0x1c, 0x1b, 0x09, 0x00, 0x1c, 0x00, 0xd9, 0x00, 0x00, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x04, 0x04, 0x1c, 0x1c, 0x1b, 0x09, 0x08, 0x1c, 0x1b, 
+0x1c, 0x1c, 0x08, 0x09, 0x1b, 0x1c, 0x1c, 0x00, 0x15, 0x00, 0xd1, 0xd9, 0xd9, 0x00, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x3f, 0x08, 0x09, 0x1b, 0x1c, 0x1b, 0x1c, 0x09, 0x08, 
+0x1c, 0x1b, 0x1c, 0x1c, 0x08, 0x00, 0x1c, 0x00, 0x15, 0x00, 0xd1, 0xd1, 0xd9, 0x00, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0x04, 0x04, 0x04, 0x1c, 0x3f, 0x3f, 0x08, 0x09, 0x1b, 0x1c, 0x1b, 0x1c, 
+0x09, 0x08, 0x1c, 0x1b, 0x1c, 0x00, 0x15, 0x00, 0x15, 0x00, 0xd1, 0xd9, 0xaa, 0x01, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0x04, 0x3f, 0x08, 0x09, 0x1b, 0x1c, 0x3f, 0x3f, 0x08, 0x09, 0x1b, 0x1c, 
+0x1b, 0x1c, 0x09, 0x00, 0x1b, 0x00, 0x15, 0x00, 0x0f, 0x00, 0xd9, 0xaa, 0xaa, 0x00, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0x04, 0x3f, 0x3f, 0x3f, 0x08, 0x09, 0x1b, 0x1c, 0x3f, 0x3f, 0x08, 0x09, 
+0x1b, 0x1c, 0x1b, 0x00, 0x16, 0x00, 0x15, 0x00, 0x0f, 0xd9, 0xaa, 0xaa, 0xaa, 0x00, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0x00, 0x04, 0x3f, 0x1b, 0x1c, 0x3f, 0x3f, 0x08, 0x09, 0x1b, 0x1c, 0x3f, 0x3f, 
+0x08, 0x00, 0x1c, 0x00, 0x15, 0x00, 0x0f, 0x00, 0xd9, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0xff, 0xff, 
+0xff, 0xff, 0x00, 0xd9, 0x04, 0x3f, 0x1b, 0x1c, 0x1b, 0x1c, 0x3f, 0x3f, 0x08, 0x09, 0x1b, 0x1c, 
+0x3f, 0x00, 0x15, 0x00, 0x15, 0x00, 0x0f, 0xd9, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x0f, 0xff, 
+0xff, 0x00, 0xd9, 0xd1, 0x04, 0x15, 0x1a, 0x19, 0x1c, 0x1b, 0x1c, 0x1c, 0x3f, 0x3f, 0x08, 0x00, 
+0x1c, 0x00, 0x15, 0x00, 0x0f, 0x00, 0x63, 0xd8, 0xd8, 0xd8, 0x63, 0x62, 0xaa, 0x00, 0x0f, 0xff, 
+0xff, 0x00, 0xd9, 0xd9, 0x04, 0x0f, 0x15, 0x15, 0x1a, 0x19, 0x1c, 0x1c, 0x1b, 0x1c, 0x3f, 0x00, 
+0x15, 0x00, 0x15, 0x00, 0xd8, 0xd8, 0xd8, 0xf8, 0xd8, 0xf8, 0xd8, 0xd8, 0x63, 0x0f, 0x0f, 0xff, 
+0xff, 0x00, 0x83, 0x83, 0xd9, 0xd9, 0x0f, 0xa3, 0xc4, 0xc4, 0xc4, 0xa9, 0x82, 0x1c, 0x1b, 0x00, 
+0x15, 0x00, 0x0f, 0xd8, 0xd8, 0x64, 0x84, 0x83, 0x63, 0x63, 0x84, 0xf8, 0xd8, 0x63, 0xff, 0xff, 
+0xff, 0x00, 0x83, 0x83, 0x83, 0xa3, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0xc4, 0x1c, 0x00, 
+0x15, 0x00, 0x63, 0xf8, 0x84, 0x83, 0x1d, 0x3f, 0x3f, 0x3f, 0x1c, 0x63, 0x64, 0xd8, 0x63, 0xff, 
+0xff, 0x00, 0x83, 0x83, 0xc4, 0x2c, 0x2c, 0x2d, 0xeb, 0xeb, 0xeb, 0xeb, 0x2c, 0x2c, 0x2c, 0x00, 
+0x0f, 0x62, 0xd8, 0x84, 0x63, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1e, 0x63, 0xf8, 0xd8, 0x62, 
+0xff, 0x00, 0x83, 0xa3, 0x2c, 0x2d, 0xeb, 0xa3, 0x1a, 0x1c, 0x1a, 0x82, 0xeb, 0x2d, 0x2c, 0xc4, 
+0x0f, 0x63, 0xf8, 0x84, 0x1d, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1b, 0xf8, 0xd8, 0x63, 
+0xff, 0x00, 0x83, 0x2c, 0x2d, 0x2f, 0x82, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1a, 0x2d, 0x2c, 0x2c, 
+0xa9, 0xd8, 0x64, 0x83, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1e, 0xd8, 0xd8, 0x83, 
+0xff, 0x00, 0xa3, 0x2c, 0xeb, 0xa9, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x82, 0x2d, 0x2c, 
+0xca, 0xd8, 0x64, 0x83, 0x3f, 0x19, 0x1b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xd8, 0xd8, 0x83, 
+0xff, 0x00, 0xc4, 0x2c, 0x2f, 0x19, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1d, 0xc4, 0x2c, 
+0xeb, 0xd8, 0xf8, 0x83, 0x15, 0x01, 0x03, 0x1b, 0x3f, 0x3f, 0x3f, 0x3f, 0x1e, 0xd8, 0xf8, 0x83, 
+0xff, 0x00, 0xc4, 0x2c, 0x2f, 0x1c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1c, 0x1b, 0x1e, 0xc4, 0x2d, 
+0x2f, 0x83, 0xd8, 0x64, 0x0f, 0x00, 0x01, 0x19, 0x3f, 0x3f, 0x3f, 0x3f, 0xfd, 0xd8, 0x64, 0x14, 
+0xff, 0x00, 0xc4, 0x2c, 0x2d, 0xda, 0x3f, 0x3f, 0x3f, 0x3f, 0x1c, 0x04, 0x02, 0x16, 0xc4, 0x2d, 
+0x2f, 0x89, 0xf8, 0xd8, 0x63, 0x12, 0x15, 0x3f, 0x3f, 0x3f, 0x3f, 0xfe, 0xd8, 0xf8, 0x84, 0x14, 
+0xff, 0xff, 0xa9, 0x2c, 0x2c, 0x82, 0x3f, 0x3f, 0x3f, 0x3f, 0x1b, 0x02, 0x00, 0xa9, 0x2c, 0xeb, 
+0x2f, 0xaa, 0x83, 0xf8, 0xf8, 0xd8, 0xfd, 0x3f, 0x3f, 0x1e, 0xfd, 0xd8, 0xf8, 0x84, 0x89, 0xff, 
+0xff, 0xff, 0x82, 0x2d, 0x2c, 0x2c, 0xda, 0x3f, 0x3f, 0x3f, 0x3f, 0x17, 0x13, 0xc4, 0x2d, 0xeb, 
+0xa9, 0x00, 0x0f, 0x83, 0x84, 0x64, 0xf8, 0xd8, 0xd8, 0xd8, 0xf8, 0xf8, 0x84, 0x89, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xca, 0x2d, 0x2c, 0x2c, 0x5a, 0x1e, 0x3f, 0x3f, 0xda, 0xc4, 0x2c, 0xeb, 0x2f, 
+0x00, 0x0f, 0x0f, 0xff, 0x89, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x8a, 0x89, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xeb, 0x2d, 0x2c, 0x2c, 0x2c, 0xc4, 0x2c, 0x2c, 0x2c, 0xeb, 0x2f, 0x00, 
+0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x89, 0x89, 0x8a, 0x89, 0x89, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xca, 0xeb, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0xeb, 0x2f, 0x00, 0x0f, 
+0x0e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa9, 0xca, 0xeb, 0xeb, 0xeb, 0xca, 0xa9, 0x00, 0x0e, 0x0f, 
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+
+const char google_icon_HVIF[] = {
+	0x6e, 0x63, 0x69, 0x66, 0x12, 0x03, 0x99, 0x66, 0x33, 0x02, 0x00, 0x06,
+	0x02, 0xb8, 0x7f, 0xa1, 0x3b, 0x71, 0xab, 0xbb, 0xc2, 0xa0, 0xb8, 0xba,
+	0x5d, 0x4b, 0x18, 0xa2, 0x49, 0x9b, 0x1d, 0x00, 0xff, 0xcc, 0x99, 0xff,
+	0xbd, 0x87, 0x52, 0x02, 0x00, 0x06, 0x02, 0x3b, 0x93, 0xe4, 0xb9, 0x93,
+	0xe4, 0x39, 0x93, 0xe4, 0x3b, 0x93, 0xe4, 0x49, 0xa8, 0x8a, 0x47, 0x9b,
+	0x06, 0x7c, 0x99, 0x66, 0x33, 0xc0, 0xb7, 0x87, 0x59, 0x02, 0x00, 0x06,
+	0x02, 0x37, 0xb8, 0xfe, 0x38, 0x79, 0x61, 0xbb, 0x32, 0x4b, 0x3a, 0x67,
+	0x9b, 0x4a, 0x8e, 0x15, 0x48, 0x6e, 0x2b, 0x00, 0xc8, 0x8c, 0x51, 0xff,
+	0xff, 0xcc, 0x99, 0x02, 0x00, 0x16, 0x02, 0x38, 0x00, 0x17, 0xb9, 0xff,
+	0xf7, 0x3a, 0x33, 0x30, 0x38, 0x33, 0x4f, 0x4a, 0x5e, 0xc6, 0x4a, 0x0f,
+	0x65, 0x00, 0x67, 0xff, 0xff, 0x02, 0x00, 0x06, 0x02, 0xbb, 0x12, 0xa8,
+	0x3a, 0x8f, 0x8c, 0xba, 0x8f, 0x8c, 0xbb, 0x12, 0xa8, 0x4b, 0x34, 0x46,
+	0x4a, 0xf0, 0x63, 0x00, 0x99, 0x66, 0x33, 0xff, 0x68, 0x3a, 0x0e, 0x02,
+	0x00, 0x06, 0x02, 0x3a, 0x0e, 0xd7, 0x3b, 0x6e, 0x12, 0xbb, 0x6e, 0x12,
+	0x3a, 0x0e, 0xd7, 0x49, 0x97, 0xce, 0x48, 0x60, 0xc5, 0x00, 0xff, 0xe6,
+	0xce, 0xff, 0xff, 0xcc, 0x99, 0x02, 0x00, 0x06, 0x02, 0x3a, 0x46, 0xde,
+	0x3b, 0x49, 0xec, 0xbb, 0x49, 0xec, 0x3a, 0x46, 0xde, 0x4a, 0x60, 0x61,
+	0x4a, 0x4d, 0xe6, 0x00, 0xad, 0x8a, 0x67, 0xff, 0x7e, 0x4e, 0x1e, 0x02,
+	0x00, 0x06, 0x02, 0x38, 0x0d, 0x6f, 0x3b, 0xdd, 0xb9, 0xbb, 0xdd, 0xb9,
+	0x38, 0x0d, 0x6f, 0x49, 0x75, 0xc0, 0x4a, 0x03, 0x71, 0x00, 0xee, 0xce,
+	0xae, 0xff, 0xcc, 0x99, 0x66, 0x03, 0x01, 0x00, 0x00, 0x04, 0x00, 0x75,
+	0x02, 0x00, 0x06, 0x03, 0x38, 0x00, 0x17, 0xb9, 0xff, 0xf7, 0x3a, 0x33,
+	0x30, 0x38, 0x33, 0x4f, 0x4a, 0x5e, 0xc6, 0x4a, 0x0f, 0x65, 0x00, 0x4b,
+	0x41, 0x16, 0xbd, 0xba, 0xb0, 0x88, 0xff, 0xfc, 0xf8, 0xe8, 0x03, 0x01,
+	0x00, 0x00, 0x05, 0x00, 0x02, 0x01, 0x06, 0x02, 0x3b, 0x40, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x40, 0x00, 0x48, 0x60, 0x00, 0x4a,
+	0xe0, 0x00, 0x00, 0xf3, 0xf8, 0xfa, 0xff, 0xbd, 0xdc, 0xe9, 0x03, 0x01,
+	0x00, 0x00, 0x02, 0x01, 0x06, 0x03, 0x3d, 0x04, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3d, 0x04, 0x00, 0x47, 0x58, 0x00, 0x4a, 0x50, 0x00,
+	0x00, 0xff, 0xff, 0xff, 0x7c, 0xff, 0x06, 0x06, 0xff, 0x3c, 0x25, 0x25,
+	0x02, 0x01, 0x06, 0x03, 0x3d, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3d, 0x04, 0x00, 0x47, 0x58, 0x00, 0x4a, 0x50, 0x00, 0x00, 0xff,
+	0xff, 0xff, 0x7c, 0xff, 0xea, 0x05, 0xff, 0x3c, 0x25, 0x25, 0x10, 0x0a,
+	0x04, 0x2c, 0x40, 0x3c, 0x47, 0x3c, 0x4c, 0x2c, 0x44, 0x0a, 0x06, 0x2a,
+	0x40, 0x2a, 0x4c, 0x42, 0x58, 0x5a, 0x40, 0x5a, 0x36, 0x42, 0x2c, 0x0a,
+	0x04, 0x2a, 0x40, 0x42, 0x4c, 0x5a, 0x36, 0x42, 0x2c, 0x0a, 0x06, 0xc6,
+	0x88, 0xbd, 0xf6, 0xc8, 0xa6, 0xbc, 0x05, 0xc0, 0xaf, 0xb8, 0xb3, 0xb8,
+	0x6e, 0xbf, 0x95, 0xba, 0x6c, 0xc0, 0x94, 0x42, 0x34, 0x0a, 0x04, 0xc6,
+	0x88, 0xbd, 0xf6, 0xc0, 0x69, 0xc3, 0x92, 0xba, 0x6c, 0xc0, 0x94, 0x42,
+	0x34, 0x0a, 0x04, 0x42, 0x58, 0x5a, 0x40, 0x5a, 0x36, 0x42, 0x4c, 0x0a,
+	0x06, 0x26, 0x32, 0x26, 0x4e, 0x42, 0x5c, 0x44, 0x5a, 0x44, 0x3c, 0x28,
+	0x30, 0x0a, 0x04, 0x26, 0x32, 0x42, 0x3e, 0x44, 0x3c, 0x28, 0x30, 0x0a,
+	0x04, 0x42, 0x5c, 0x44, 0x5a, 0x44, 0x3c, 0x42, 0x3e, 0x0a, 0x04, 0x26,
+	0x4e, 0x42, 0x5c, 0x42, 0x3e, 0x26, 0x32, 0x0a, 0x07, 0x42, 0x5e, 0x54,
+	0x5e, 0x56, 0x5c, 0x4b, 0x57, 0x62, 0x40, 0x5c, 0x3e, 0x42, 0x3e, 0x0a,
+	0x09, 0x58, 0x54, 0x50, 0x50, 0x5c, 0x50, 0x54, 0x4c, 0x60, 0x4c, 0x58,
+	0x48, 0x64, 0x48, 0x58, 0x42, 0x46, 0x54, 0x0a, 0x05, 0x46, 0x45, 0x46,
+	0x36, 0x36, 0x2f, 0x36, 0x43, 0xc0, 0x58, 0xc3, 0x3c, 0x0a, 0x0a, 0x23,
+	0x2f, 0x2d, 0x49, 0x4a, 0x5b, 0x5c, 0x2c, 0x50, 0x2a, 0x4c, 0x2c, 0x3a,
+	0x28, 0x38, 0x2d, 0x30, 0x2b, 0xb9, 0x57, 0xba, 0xa7, 0x02, 0x04, 0x32,
+	0x46, 0xbb, 0xee, 0x46, 0xb8, 0x69, 0x46, 0x2a, 0x4e, 0x2a, 0xc3, 0x91,
+	0x2a, 0xc7, 0x16, 0x32, 0x56, 0xb8, 0x69, 0x56, 0xbb, 0xee, 0x56, 0x3a,
+	0x4e, 0x3a, 0xc7, 0x16, 0x3a, 0xc3, 0x91, 0x08, 0x04, 0x23, 0xb3, 0xe5,
+	0xcb, 0x34, 0xb4, 0x18, 0xcb, 0x81, 0xcb, 0x5a, 0x24, 0xcb, 0xa7, 0x1a,
+	0x0a, 0x0a, 0x02, 0x0a, 0x0b, 0x20, 0x1c, 0x20, 0x0a, 0x09, 0x01, 0x01,
+	0x30, 0x1c, 0x20, 0x01, 0x17, 0x84, 0x10, 0x04, 0x0a, 0x01, 0x01, 0x02,
+	0x20, 0x1c, 0x20, 0x0a, 0x02, 0x01, 0x03, 0x20, 0x1c, 0x20, 0x0a, 0x03,
+	0x01, 0x04, 0x20, 0x1c, 0x20, 0x0a, 0x05, 0x01, 0x05, 0x20, 0x1c, 0x20,
+	0x0a, 0x0c, 0x01, 0x0c, 0x30, 0x28, 0x14, 0x01, 0x17, 0x84, 0x10, 0x04,
+	0x0a, 0x0b, 0x01, 0x0c, 0x20, 0x28, 0x14, 0x0a, 0x0c, 0x01, 0x0c, 0x30,
+	0x24, 0x18, 0x01, 0x17, 0x84, 0x10, 0x04, 0x0a, 0x0b, 0x01, 0x0c, 0x20,
+	0x24, 0x18, 0x0a, 0x0c, 0x01, 0x0c, 0x30, 0x20, 0x1c, 0x01, 0x17, 0x84,
+	0x10, 0x04, 0x0a, 0x0b, 0x01, 0x0c, 0x20, 0x20, 0x1c, 0x0a, 0x0c, 0x01,
+	0x0c, 0x30, 0x1c, 0x20, 0x01, 0x17, 0x84, 0x10, 0x04, 0x0a, 0x0b, 0x01,
+	0x0c, 0x20, 0x1c, 0x20, 0x0a, 0x09, 0x01, 0x06, 0x30, 0x1c, 0x20, 0x01,
+	0x17, 0x84, 0x00, 0x04, 0x0a, 0x06, 0x01, 0x07, 0x20, 0x1c, 0x20, 0x0a,
+	0x07, 0x01, 0x08, 0x20, 0x1c, 0x20, 0x0a, 0x08, 0x01, 0x09, 0x20, 0x1c,
+	0x20, 0x0a, 0x00, 0x01, 0x00, 0x20, 0x1e, 0x24, 0x0a, 0x0c, 0x01, 0x00,
+	0x20, 0x1c, 0x20, 0x0a, 0x10, 0x01, 0x0e, 0x30, 0xb0, 0x42, 0xb5, 0xbd,
+	0x01, 0x17, 0x84, 0x00, 0x04, 0x0a, 0x0e, 0x01, 0x0e, 0x20, 0xb0, 0x42,
+	0xb5, 0xbd, 0x0a, 0x0f, 0x01, 0x0e, 0x02, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x46, 0xe8, 0x00, 0x4a, 0xb6,
+	0x00, 0x0a, 0x11, 0x01, 0x0e, 0x30, 0xb7, 0xfb, 0xb3, 0x8c, 0x01, 0x17,
+	0x84, 0x00, 0x04, 0x0a, 0x0e, 0x01, 0x0e, 0x20, 0xb7, 0xfb, 0xb3, 0x8c,
+	0x0a, 0x0f, 0x01, 0x0e, 0x02, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3c, 0x00, 0x00, 0x48, 0xc0, 0x00, 0x4a, 0x6e, 0x00
+};
+
+const char google_icon_SVG[] = {
+	0x54, 0x1f, 0x00, 0x00, 0x78, 0xda, 0xed, 0x98, 0x5d, 0x6f, 0xdb, 0x36, 0x14, 0x86, 0xef, 0xf3,
+	0x2b, 0x08, 0xe5, 0xa6, 0x06, 0x6c, 0x86, 0x3c, 0xfc, 0x10, 0x95, 0xda, 0x29, 0xb0, 0x00, 0xab,
+	0x2f, 0x54, 0x0c, 0xd8, 0x1a, 0xdf, 0x2b, 0x32, 0xed, 0x08, 0x73, 0x24, 0x4f, 0x72, 0xb2, 0xb8,
+	0xbf, 0x7e, 0x87, 0xfa, 0x48, 0x6b, 0xc7, 0xcd, 0x58, 0xc3, 0xf5, 0x12, 0x2c, 0x32, 0x20, 0x91,
+	0x32, 0x25, 0x91, 0xef, 0x79, 0x78, 0xc8, 0x73, 0x86, 0x1f, 0x1e, 0x6e, 0x17, 0xe4, 0xde, 0x96,
+	0x55, 0x56, 0xe4, 0xa3, 0x80, 0x53, 0x16, 0x10, 0x9b, 0xa7, 0xc5, 0x34, 0xcb, 0xe7, 0xa3, 0xe0,
+	0xea, 0xf3, 0xaf, 0x03, 0x13, 0x90, 0x6a, 0x95, 0xe4, 0xd3, 0x64, 0x51, 0xe4, 0x76, 0x14, 0xac,
+	0x6d, 0x15, 0x7c, 0xb8, 0x38, 0x19, 0x56, 0xf7, 0x73, 0xf2, 0x77, 0x36, 0x5d, 0xdd, 0x8c, 0x02,
+	0x2d, 0x03, 0x72, 0x63, 0xb3, 0xf9, 0xcd, 0xaa, 0x29, 0xa7, 0xc5, 0xa2, 0x28, 0x07, 0x59, 0xbe,
+	0xb2, 0xe5, 0xb2, 0x58, 0x24, 0xab, 0xfa, 0xcd, 0x8b, 0x2c, 0xb7, 0x49, 0xf9, 0xfb, 0xc7, 0x5f,
+	0x82, 0x8b, 0x13, 0x32, 0x9c, 0xe3, 0x89, 0x0c, 0x97, 0xc9, 0xea, 0x06, 0x5f, 0xbe, 0x5e, 0xe0,
+	0x7b, 0x67, 0xd9, 0x62, 0x71, 0x7e, 0xca, 0xea, 0xe3, 0x3d, 0x71, 0xb5, 0x41, 0xb1, 0x4c, 0xd2,
+	0x6c, 0xb5, 0x3e, 0x67, 0x54, 0x2a, 0x63, 0x02, 0x7c, 0xa2, 0x39, 0xa6, 0xa3, 0xe0, 0x93, 0x90,
+	0x44, 0xc3, 0x58, 0x41, 0xac, 0xb0, 0xc0, 0x62, 0x29, 0x88, 0x52, 0xb1, 0xd6, 0x44, 0x40, 0xac,
+	0x19, 0x11, 0x6c, 0x2c, 0xe4, 0x44, 0xc3, 0x97, 0xc7, 0x67, 0xf0, 0xf8, 0xa4, 0x34, 0xc1, 0x07,
+	0xa4, 0x21, 0xd2, 0x8c, 0xf1, 0x19, 0x05, 0x44, 0xca, 0xb1, 0x96, 0x31, 0xde, 0x97, 0x6c, 0xac,
+	0x8d, 0x2b, 0x08, 0x19, 0x0b, 0x83, 0xcd, 0xc6, 0x4a, 0x7f, 0xf9, 0xfa, 0xc5, 0x55, 0x99, 0xe4,
+	0xd5, 0xac, 0x28, 0x6f, 0x47, 0xc1, 0x6d, 0xb2, 0x2a, 0xb3, 0x87, 0x77, 0xbc, 0xcf, 0xf0, 0xc7,
+	0xfb, 0x03, 0xd9, 0x67, 0x3d, 0xd7, 0xf0, 0x6c, 0xf7, 0x88, 0x72, 0x14, 0xed, 0x3d, 0xde, 0x29,
+	0x8b, 0x3f, 0x2d, 0x0e, 0x8f, 0x37, 0xc3, 0x6b, 0xea, 0x83, 0x5a, 0xbf, 0x73, 0xf9, 0x58, 0x77,
+	0x1a, 0xa5, 0xc9, 0xf2, 0xbc, 0xfa, 0xeb, 0x2e, 0x29, 0xed, 0xe6, 0x80, 0x39, 0x8e, 0x0a, 0x26,
+	0x12, 0xbb, 0x27, 0x89, 0xd2, 0xb1, 0x32, 0xae, 0x0a, 0xe0, 0xaa, 0x1c, 0xe2, 0xfa, 0xdf, 0x7d,
+	0x3a, 0xdc, 0x98, 0xe5, 0x63, 0x99, 0x4c, 0x33, 0x9b, 0xaf, 0x48, 0x86, 0x9f, 0x9a, 0xb7, 0x15,
+	0x24, 0xa1, 0x2b, 0x5e, 0xe5, 0xd9, 0xaa, 0x1a, 0x05, 0x77, 0x95, 0x2d, 0xff, 0x40, 0xa3, 0xd8,
+	0xdf, 0xf2, 0xab, 0xca, 0x06, 0xe4, 0x81, 0xa3, 0xc1, 0x23, 0xaa, 0xc2, 0x80, 0xac, 0xb1, 0x08,
+	0x8c, 0x2a, 0xc0, 0xbb, 0x30, 0x0a, 0x14, 0xde, 0x45, 0x70, 0xd6, 0x58, 0x94, 0x86, 0xb2, 0xd0,
+	0x19, 0x1d, 0xbf, 0x56, 0xad, 0x8a, 0x25, 0x29, 0x66, 0xb3, 0xca, 0x22, 0x2a, 0xcc, 0x81, 0x55,
+	0x2c, 0x07, 0x35, 0x2e, 0xa3, 0xe0, 0x74, 0x36, 0x4b, 0xd3, 0x28, 0x0a, 0xce, 0x76, 0x34, 0xe5,
+	0x5b, 0x4d, 0xaf, 0xa7, 0x26, 0xc4, 0x4f, 0x35, 0x43, 0x38, 0xdb, 0x1c, 0xc3, 0x6e, 0x3b, 0xdc,
+	0x95, 0x8b, 0x77, 0xa7, 0x8f, 0x23, 0xeb, 0xed, 0xd0, 0xd6, 0x29, 0x89, 0xf2, 0xa2, 0xb0, 0x3f,
+	0x55, 0x55, 0xee, 0xa5, 0x6a, 0x48, 0x4d, 0xa3, 0x69, 0x48, 0x41, 0x37, 0x92, 0x0a, 0x4d, 0x25,
+	0x34, 0x92, 0x0e, 0x42, 0xca, 0xe4, 0x4e, 0x49, 0xa9, 0x34, 0x46, 0x6f, 0x89, 0x15, 0x45, 0x5a,
+	0x0b, 0xb1, 0x53, 0x57, 0x46, 0x43, 0x25, 0xc2, 0x6d, 0x71, 0x43, 0x14, 0x37, 0xda, 0x5b, 0x5c,
+	0xbe, 0x25, 0xae, 0x8c, 0x28, 0x03, 0x02, 0x21, 0x55, 0x1c, 0x27, 0x2b, 0x15, 0x02, 0xf5, 0xa5,
+	0xda, 0x71, 0x4c, 0x9d, 0xca, 0x78, 0xe6, 0x31, 0x17, 0x54, 0x03, 0x11, 0x1c, 0x51, 0x8a, 0xb9,
+	0xa1, 0x5a, 0xe0, 0x3c, 0xa4, 0xcc, 0x38, 0x33, 0x00, 0x4e, 0xee, 0xaf, 0x6f, 0x38, 0xb0, 0x31,
+	0xc0, 0xcb, 0x18, 0xf8, 0xfd, 0x48, 0x36, 0xe6, 0x90, 0xd4, 0x84, 0x2d, 0xe1, 0x21, 0x15, 0x2d,
+	0xe1, 0x38, 0x86, 0xd0, 0x8b, 0xf0, 0xd4, 0x98, 0x54, 0x71, 0x2f, 0xc2, 0xbf, 0x9d, 0x0c, 0x7b,
+	0x18, 0x01, 0x9e, 0x31, 0x82, 0x40, 0xb1, 0xd1, 0xe3, 0xa1, 0xd8, 0xd1, 0x51, 0xc5, 0x16, 0x7e,
+	0xe4, 0x8b, 0x0e, 0x7d, 0xd7, 0x93, 0x56, 0x6c, 0x2c, 0x02, 0x6f, 0xc4, 0x76, 0xfe, 0x46, 0xf9,
+	0x88, 0xfd, 0x0c, 0xf6, 0xdb, 0x62, 0x6b, 0x23, 0x12, 0x66, 0xf7, 0x16, 0x5b, 0xf4, 0x9e, 0xac,
+	0x4d, 0x5b, 0x1e, 0x5a, 0xca, 0xc9, 0x4b, 0x5b, 0x4f, 0x70, 0x95, 0x13, 0xa1, 0xeb, 0x1e, 0x00,
+	0xe1, 0x6a, 0x22, 0x94, 0xe3, 0x42, 0x46, 0xb8, 0x12, 0xd2, 0xb0, 0x5e, 0x03, 0x45, 0xe8, 0xd5,
+	0x61, 0xd3, 0x1f, 0x70, 0xf0, 0x03, 0x40, 0x7a, 0x01, 0x00, 0x8a, 0x72, 0x68, 0x08, 0x40, 0x97,
+	0xa7, 0x3a, 0xef, 0x27, 0x9a, 0xbb, 0xd0, 0x2c, 0x33, 0xda, 0x87, 0x00, 0x79, 0x2d, 0x39, 0xd7,
+	0xdf, 0x73, 0x7c, 0x12, 0xe4, 0xb6, 0xe3, 0x4b, 0xae, 0x19, 0xee, 0x33, 0xbc, 0xa6, 0x67, 0x3a,
+	0x33, 0xd6, 0xec, 0x4d, 0x8c, 0xec, 0x1d, 0xc7, 0x18, 0x2f, 0x1f, 0x1f, 0xd9, 0x1f, 0x18, 0x3f,
+	0x7a, 0xd4, 0x1b, 0x3d, 0x9d, 0x12, 0xbd, 0xa3, 0xd8, 0xe2, 0xe5, 0xc3, 0xc3, 0xd0, 0x5d, 0xfa,
+	0xc1, 0xa3, 0xdf, 0xe0, 0xe9, 0x94, 0xe8, 0x1d, 0xc5, 0x16, 0x2f, 0x1f, 0x1e, 0xff, 0x8d, 0x4b,
+	0xf8, 0x06, 0x4f, 0xa7, 0x44, 0xef, 0x28, 0xb6, 0xd8, 0x0b, 0x9e, 0xcd, 0x9e, 0x69, 0xc2, 0xcd,
+	0x44, 0x6a, 0xb7, 0xf9, 0xc2, 0x50, 0x5f, 0x60, 0xe4, 0x6f, 0x26, 0x60, 0x62, 0x43, 0xb8, 0x8e,
+	0xdd, 0x7f, 0x07, 0x46, 0xc4, 0x78, 0x21, 0x82, 0xfb, 0x6c, 0x10, 0x0d, 0x22, 0x03, 0xa0, 0x51,
+	0x17, 0x2b, 0x33, 0xaa, 0xa3, 0x16, 0x11, 0x89, 0xdb, 0x6e, 0xbf, 0x58, 0xd9, 0xea, 0xd4, 0x1e,
+	0x23, 0x92, 0x30, 0xbd, 0xa7, 0xc2, 0x3a, 0x55, 0x45, 0xad, 0xea, 0x4f, 0x94, 0x34, 0xf2, 0x8b,
+	0xcd, 0xa0, 0x0e, 0x12, 0x9c, 0xa4, 0x18, 0x86, 0xb5, 0x93, 0x4e, 0x33, 0x0a, 0x5d, 0xf6, 0x81,
+	0xd1, 0xc8, 0x4b, 0xd1, 0x64, 0x6a, 0x12, 0x1d, 0x7a, 0x29, 0x1a, 0x5a, 0x69, 0xf9, 0xfe, 0xe1,
+	0x42, 0xf4, 0x34, 0x5c, 0xf8, 0x16, 0xd1, 0x5a, 0xdb, 0x89, 0x66, 0x87, 0xce, 0x3b, 0xf8, 0xa5,
+	0x73, 0x04, 0x06, 0x5d, 0x2d, 0xa2, 0xdc, 0x85, 0xe9, 0x6d, 0xfc, 0x15, 0x52, 0xe7, 0x75, 0x6a,
+	0x41, 0x85, 0xcb, 0xf7, 0x78, 0x08, 0x6a, 0x6d, 0x6a, 0x13, 0x3f, 0x44, 0x1d, 0xa0, 0x5a, 0xef,
+	0x9f, 0x71, 0x60, 0x4f, 0x18, 0xed, 0x66, 0xfe, 0x04, 0x31, 0x6d, 0x5d, 0xc1, 0x41, 0x1c, 0x51,
+	0x17, 0x55, 0x6e, 0xa6, 0x8f, 0xc0, 0xa5, 0x8f, 0x00, 0xbd, 0x5d, 0xe4, 0x12, 0x74, 0xae, 0xaa,
+	0x27, 0xbe, 0x89, 0x23, 0xe8, 0x3f, 0xbb, 0x6c, 0xb6, 0xce, 0xee, 0x80, 0x1f, 0xdc, 0x1c, 0xa1,
+	0x93, 0x30, 0x59, 0xec, 0x26, 0xe6, 0xdf, 0x53, 0x55, 0xe9, 0x43, 0x6d, 0xf7, 0x74, 0x5d, 0x5f,
+	0xca, 0x26, 0xfd, 0xdb, 0x3d, 0xf3, 0xf9, 0x49, 0x1f, 0x18, 0x15, 0xa1, 0x8e, 0xea, 0x8e, 0xb4,
+	0x45, 0x2e, 0xf0, 0xaa, 0xfa, 0x02, 0x17, 0x16, 0x2f, 0xaf, 0xe7, 0x8e, 0xef, 0x2c, 0x8c, 0xd2,
+	0x18, 0x78, 0xd2, 0x9e, 0x69, 0xa6, 0xbd, 0x10, 0x14, 0x29, 0x28, 0x50, 0x1d, 0x82, 0x9b, 0xaa,
+	0x78, 0xac, 0x49, 0x9b, 0x3c, 0xf2, 0xde, 0xf3, 0x8b, 0x13, 0x47, 0xcb, 0x99, 0x4b, 0x1c, 0xbb,
+	0xcb, 0x11, 0xa0, 0xff, 0x64, 0x75, 0x36, 0xa6, 0x29, 0xe8, 0x4b, 0x3c, 0xe3, 0x92, 0x20, 0x39,
+	0x69, 0x1a, 0x28, 0x89, 0xfc, 0xe2, 0xf9, 0x12, 0xc0, 0xdd, 0xc4, 0x2a, 0xe8, 0xb6, 0x01, 0x38,
+	0xd0, 0x2f, 0x41, 0xb7, 0x8f, 0x37, 0x0d, 0xdc, 0x0b, 0xdd, 0x6b, 0xfd, 0x68, 0xd0, 0xd4, 0xa0,
+	0xfe, 0xf5, 0xd9, 0x93, 0x0a, 0x38, 0x3c, 0x15, 0xc0, 0x04, 0x6f, 0xa9, 0xa8, 0x8b, 0x3c, 0xea,
+	0x4b, 0xed, 0x47, 0x84, 0x98, 0x99, 0x59, 0xe2, 0x99, 0x33, 0x9e, 0xa6, 0x36, 0xfa, 0x11, 0x0b,
+	0x6f, 0x1a, 0x75, 0x3b, 0xa5, 0xf6, 0xe2, 0x8d, 0xe8, 0xe9, 0x4b, 0xfe, 0xf3, 0x61, 0xa0, 0xd1,
+	0x55, 0x67, 0x7d, 0xd5, 0xe7, 0x9c, 0x6a, 0xbc, 0xc8, 0xda, 0x31, 0x78, 0x22, 0x29, 0x5e, 0xbf,
+	0xa3, 0xb2, 0x09, 0x53, 0xc7, 0x77, 0x54, 0xe2, 0xd5, 0x38, 0x2a, 0xdc, 0x8c, 0x20, 0x1b, 0x3f,
+	0xc0, 0x84, 0xfc, 0x9f, 0xba, 0x29, 0xd9, 0x7b, 0x55, 0x26, 0x7c, 0x9d, 0x4e, 0x0a, 0xa0, 0x2f,
+	0xcc, 0x86, 0xbb, 0x1d, 0x9e, 0xcd, 0x2f, 0x4e, 0x86, 0x67, 0xd5, 0x3d, 0x5e, 0xfe, 0x01, 0xe0,
+	0x04, 0x88, 0xf2
+};
+
+// #pragma mark - root folder attribute list
+//0x6949434F           7  "BEOS:D:STD_ICON"                   49 44 58 5A 05 53 00
+uint8 root_folder_attrs_1[] = { 0x49, 0x44, 0x58, 0x5A, 0x05, 0x53, 0x00 }; // needed for SVG icons in Zeta...
+uint64 root_folder_attrs_2 = 0xdeadbeef50385038LL; // volume id, just in case
+
 struct attr_entry root_folder_attrs[] = {
 { "BEOS:TYPE", /*B_MIME_STRING_TYPE*/'MIMS', SZSTR("application/x-vnd.Be-directory") },
 { "BEOS:M:STD_ICON", 'MICN', 16*16, google_icon_M },
 { "BEOS:L:STD_ICON", 'ICON', 32*32, google_icon_L },
+{ "BEOS:V:STD_ICON", 'zICO', sizeof(google_icon_SVG), google_icon_SVG },
+{ "BEOS:D:STD_ICON", 0x6949434F, sizeof(root_folder_attrs_1), &root_folder_attrs_1 },
+{ "BEOS:ICON", 'VICN', sizeof(google_icon_HVIF), google_icon_HVIF },
 //{ "BEOS:EMBLEMS", 'CSTR', SZSTR("palm") },
+{ "be:volume_id", B_UINT64_TYPE, sizeof(root_folder_attrs_2), &root_folder_attrs_2 },
 { NULL, 0, 0, NULL } /* end of list */
 };
 

Deleted: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/google_icon.c

Modified: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/makefile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/googlefs/makefile	2008-03-09 22:21:21 UTC (rev 24341)
+++ haiku/trunk/src/add-ons/kernel/file_systems/googlefs/makefile	2008-03-09 23:26:38 UTC (rev 24342)
@@ -37,7 +37,6 @@
 google_request.c \
 query.c \
 googlefs.c \
-google_icon.c \
 attrs.c \
 settings.c \
 string_utils.c

Modified: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/makefile.ufs
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/googlefs/makefile.ufs	2008-03-09 22:21:21 UTC (rev 24341)
+++ haiku/trunk/src/add-ons/kernel/file_systems/googlefs/makefile.ufs	2008-03-09 23:26:38 UTC (rev 24342)
@@ -37,7 +37,6 @@
 google_request.c \
 query.c \
 googlefs.c \
-google_icon.c \
 attrs.c \
 settings.c \
 string_utils.c



From bonefish at mail.berlios.de  Mon Mar 10 00:42:22 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 10 Mar 2008 00:42:22 +0100
Subject: [Haiku-commits] r24343 - haiku/trunk/src/bin/bash
Message-ID: <200803092342.m29NgMDo003705@sheep.berlios.de>

Author: bonefish
Date: 2008-03-10 00:42:21 +0100 (Mon, 10 Mar 2008)
New Revision: 24343
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24343&view=rev

Modified:
   haiku/trunk/src/bin/bash/config.h
Log:
Enable process group synchronization via a pipe. Not sure what
advantages that is supposed to yield, but at least under Linux that
option is enabled.


Modified: haiku/trunk/src/bin/bash/config.h
===================================================================
--- haiku/trunk/src/bin/bash/config.h	2008-03-09 23:26:38 UTC (rev 24342)
+++ haiku/trunk/src/bin/bash/config.h	2008-03-09 23:42:21 UTC (rev 24343)
@@ -404,7 +404,7 @@
 
 /* #undef OPENDIR_NOT_ROBUST */
 
-/* #undef PGRP_PIPE */
+#define PGRP_PIPE 1
 
 /* Define if the setvbuf function takes the buffering type as its second
    argument and the buffer pointer as the third, as on System V



From ingo_weinhold at gmx.de  Mon Mar 10 00:53:16 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Mon, 10 Mar 2008 00:53:16 +0100
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <200803051437.m25Eb2D5002683@sheep.berlios.de>
References: <200803051437.m25Eb2D5002683@sheep.berlios.de>
Message-ID: <20080310005316.389.1@knochen-vm.1205106033.fake>


On 2008-03-05 at 15:37:02 [+0100], bga at BerliOS <bga at mail.berlios.de> wrote:
> Author: bga
> Date: 2008-03-05 15:37:01 +0100 (Wed, 05 Mar 2008)
> New Revision: 24240
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24240&view=rev
> 
> Modified:
>    haiku/trunk/build/jam/UserBuildConfig.sample
> Log:
> - Commented out all entries as this is a template file. When copying it to
>   UserBuildConfig the user just have to uncomment whatever he/she wants. 
>   This
>   is easier than commenting out almost everything.

Actually this is not a template settings file. It's just a file with examples 
what can be done a the UserBuildConfig, serving as a kind of reference. 
Copying it doesn't make that much sense; just copy and adjust the bits you 
actually need. Since the sample file is changed from time to time, a full 
copy would get out of sync anyway. Furthermore by commenting everything all 
syntax highlighting is gone, which doesn't improve the readability

I'll revert this change.

CU, Ingo


From ingo_weinhold at gmx.de  Mon Mar 10 01:01:54 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Mon, 10 Mar 2008 01:01:54 +0100
Subject: [Haiku-commits] r24275 - in haiku/branches/developer/mmu_man: .
 distro distro/beshare distro/imkit distro/links distro/opensound distro/pe
 distro/vncviewer
In-Reply-To: <16788632573-BeMail@laptop>
References: <16788632573-BeMail@laptop>
Message-ID: <20080310010154.424.2@knochen-vm.1205106033.fake>


On 2008-03-06 at 20:01:08 [+0100], Fran?ois Revol <revol at free.fr> wrote:
> > Start of rules to (cross)build 3rd party apps as part of the image
> >  (like a distro).
> > For now vncviewer is automatically fetched from svn and built.
> 
> Actually it doesn't work in 1 pass, first time it doesn't find the
> checked out sources...
> Ingo ?

I haven't had a closer look at what you're doing yet (I find cross-building 
third-party apps not so interesting given that building under Haiku seems 
to work pretty well), but guessing from your comment, I'd say, it can't be 
done with jam in a single pass. You need to make all targets known to jam 
during the Jamfile parsing time (or during header scanning at the latest), 
but I suppose svn checkouts are done in actions, which are executed later.

CU, Ingo


From ingo_weinhold at gmx.de  Mon Mar 10 01:04:31 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Mon, 10 Mar 2008 01:04:31 +0100
Subject: [Haiku-commits] r24328 - haiku/trunk/build/scripts
In-Reply-To: <3693989347-BeMail@laptop>
References: <3693989347-BeMail@laptop>
Message-ID: <20080310010431.458.3@knochen-vm.1205106033.fake>


On 2008-03-09 at 18:45:26 [+0100], Fran?ois Revol <revol at free.fr> wrote:
> > -        $bfsShell --initialize $imageOffsetFlags $imagePath Haiku
> > +        $bfsShell --initialize $imageOffsetFlags $imagePath Haiku ||
> > exit 1
> 
> How about also adding "block_size 2048" there ?
> I'm not sure how faster it'd make CDs... nor how it would change
> regular use though.

I wouldn't mind changing that. Unless I'm mistaken 2048 byte blocks are a 
better choice in most cases anyway.

CU, Ingo


From ingo_weinhold at gmx.de  Mon Mar 10 01:09:39 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Mon, 10 Mar 2008 01:09:39 +0100
Subject: [Haiku-commits] r24336 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <6985498616-BeMail@laptop>
References: <6985498616-BeMail@laptop>
Message-ID: <20080310010939.487.4@knochen-vm.1205106033.fake>


On 2008-03-09 at 19:40:18 [+0100], Fran?ois Revol <revol at free.fr> wrote:
> > Log:
> > We didn't copy the close-on-exec flags on fork(), thus always leaving
> > all FDs in a fork()+exec()ed child open. Makes Perl test
> > t/run/cloexec.t pass.
> 
> Btw, how do we handle queries ?
> IIRC in BeOS they were not CLOEXEC by default, so any app launched by
> Tracker or something else would have their fds also, making it hard
> sometimes to locate what app(s) are keeping a disk busy...
> Same goes for indices but we don't use that much often.

In Haiku BQuery sets the close-on-exec flag, the libroot C functions (for 
queries and the index dir) don't, though. We might want to change that. Not 
sure...

CU, Ingo


From ingo_weinhold at gmx.de  Mon Mar 10 01:11:43 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Mon, 10 Mar 2008 01:11:43 +0100
Subject: [Haiku-commits] r24332 - in haiku/trunk: headers/private/kernel
 src/system/kernel
In-Reply-To: <34310230374-BeMail@zon>
References: <34310230374-BeMail@zon>
Message-ID: <20080310011143.516.5@knochen-vm.1205106033.fake>


On 2008-03-09 at 19:57:49 [+0100], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> bonefish at BerliOS <bonefish at mail.berlios.de> wrote:
> > +    // TODO: Use SinglyLinkedList, so that we only need sizeof(void*).
> > +    DeferredFreeListEntry* entry = new(block) DeferredFreeListEntry;
> 
> The smallest allocation is currently 8 bytes, anyway.

Yep, but for a 64 bit architecture this is not quite sufficient for two 
pointers. :-)

CU, Ingo


From ingo_weinhold at gmx.de  Mon Mar 10 01:15:12 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Mon, 10 Mar 2008 01:15:12 +0100
Subject: [Haiku-commits] r24329 - haiku/trunk/src/kits/storage
In-Reply-To: <34398339694-BeMail@zon>
References: <34398339694-BeMail@zon>
Message-ID: <20080310011512.550.6@knochen-vm.1205106033.fake>


On 2008-03-09 at 19:59:17 [+0100], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> bonefish at BerliOS <bonefish at mail.berlios.de> wrote:
> > Log:
> > CreateFile() didn't specify the B_ERASE_FILE, hence the file wouldn't
> > be
> > truncated, if already existing. This problem could be experienced
> > when
> > saving in Pe.
> 
> Very cool! But how come this wasn't easily reproducible?

I don't know, why we couldn't reproduce it, when we were having a look 
together, but it was reproducible well enough when I worked with the Perl 
sources. Maybe Pe has different code paths for saving a file.

CU, Ingo


From ingo_weinhold at gmx.de  Mon Mar 10 01:19:07 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Mon, 10 Mar 2008 01:19:07 +0100
Subject: [Haiku-commits] r24337 - haiku/trunk/build/scripts
In-Reply-To: <200803091942.m29JgLgB016188@sheep.berlios.de>
References: <200803091942.m29JgLgB016188@sheep.berlios.de>
Message-ID: <20080310011907.580.7@knochen-vm.1205106033.fake>


On 2008-03-09 at 20:42:21 [+0100], mmu_man at BerliOS 
<mmu_man at mail.berlios.de> wrote:
> Author: mmu_man
> Date: 2008-03-09 20:42:20 +0100 (Sun, 09 Mar 2008)
> New Revision: 24337
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24337&view=rev
> 
> Modified:
>    haiku/trunk/build/scripts/build_haiku_image
> Log:
> Check if /bin/stat supports the gnuish -c option, else fallback to BSD 
> syntax.
> This should fix ticket #1676, please try.

BTW, please don't invest too much energy into fixing this. The Right Solution 
(tm) is clearly to add a "rm" build tool, which cleans up the attributes of 
deleted files, too. Since I only use a Linux distribution which has xattr 
support enabled by default, I haven't really felt much motivation to do that, 
though. Feel encouraged to beat me to it. :-)

CU, Ingo


From revol at free.fr  Mon Mar 10 01:36:54 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Mon, 10 Mar 2008 01:36:54 +0100 CET
Subject: [Haiku-commits] r24328 - haiku/trunk/build/scripts
In-Reply-To: <20080310010431.458.3@knochen-vm.1205106033.fake>
Message-ID: <28381370156-BeMail@laptop>

> 
> On 2008-03-09 at 18:45:26 [+0100], Fran?ois Revol <revol at free.fr> 
> wrote:
> > > -        $bfsShell --initialize $imageOffsetFlags $imagePath 
> > > Haiku
> > > +        $bfsShell --initialize $imageOffsetFlags $imagePath 
> > > Haiku ||
> > > exit 1
> > 
> > How about also adding "block_size 2048" there ?
> > I'm not sure how faster it'd make CDs... nor how it would change
> > regular use though.
> 
> I wouldn't mind changing that. Unless I'm mistaken 2048 byte blocks 
> are a 
> better choice in most cases anyway.

That's the default I use too...

Fran?ois.


From revol at free.fr  Mon Mar 10 01:39:52 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Mon, 10 Mar 2008 01:39:52 +0100 CET
Subject: [Haiku-commits] r24336 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <20080310010939.487.4@knochen-vm.1205106033.fake>
Message-ID: <28559998473-BeMail@laptop>

> > IIRC in BeOS they were not CLOEXEC by default, so any app launched 
> > by
> > Tracker or something else would have their fds also, making it hard
> > sometimes to locate what app(s) are keeping a disk busy...
> > Same goes for indices but we don't use that much often.
> 
> In Haiku BQuery sets the close-on-exec flag, the libroot C functions 
> (for 
> queries and the index dir) don't, though. We might want to change 
> that. Not 
> sure...

Ah, didn't check BQuery. I suppose it's the most used API for that, so 
it should be ok.

Fran?ois.


From revol at free.fr  Mon Mar 10 01:43:14 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Mon, 10 Mar 2008 01:43:14 +0100 CET
Subject: [Haiku-commits] r24337 - haiku/trunk/build/scripts
In-Reply-To: <20080310011907.580.7@knochen-vm.1205106033.fake>
Message-ID: <28761942994-BeMail@laptop>

> > Modified:
> >    haiku/trunk/build/scripts/build_haiku_image
> > Log:
> > Check if /bin/stat supports the gnuish -c option, else fallback to 
> > BSD 
> > syntax.
> > This should fix ticket #1676, please try.
> 
> BTW, please don't invest too much energy into fixing this. The Right 
> Solution 
> (tm) is clearly to add a "rm" build tool, which cleans up the 
> attributes of 
> deleted files, too. Since I only use a Linux distribution which has 
> xattr 
> support enabled by default, I haven't really felt much motivation to 
> do that, 
> though. Feel encouraged to beat me to it. :-)
> 

Yeah I suppose it's ok.
I tried building with xattr once, but it broke at some point... I 
should try again.

Fran?ois.


From HOST.HAIKU at gmx.de  Mon Mar 10 01:52:21 2008
From: HOST.HAIKU at gmx.de (HOST Team)
Date: Mon, 10 Mar 2008 01:52:21 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk:
	headers/os/support	src/kits/support
Message-ID: <20080310005221.246070@gmx.net>

Hi,

i think the fix should look something like this, since if one creates i.e. an string while passing a BString to the copy constructor, we cant access the ref count as of fPrivateData == NULL, but that does not mean it is not shareable. Sorry for being unable to provide a proper diff.


inline bool
BString::_IsShareable()
{
//       return fPrivateData != NULL && _ReferenceCount() >= 0;
       if (fPrivateData == NULL)
               return true;

       return _ReferenceCount() >= 0;
}

Regards,
Karsten
-- 
GMX startet ShortView.de. Hier findest Du Leute mit Deinen Interessen!
Jetzt dabei sein: http://www.shortview.de/?mc=sv_ext_mf at gmx


From umccullough at gmail.com  Mon Mar 10 05:27:06 2008
From: umccullough at gmail.com (Urias McCullough)
Date: Sun, 9 Mar 2008 21:27:06 -0700
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <20080310005316.389.1@knochen-vm.1205106033.fake>
References: <200803051437.m25Eb2D5002683@sheep.berlios.de>
	<20080310005316.389.1@knochen-vm.1205106033.fake>
Message-ID: <1e80d8750803092127l992c281t134d7af7225c47cc@mail.gmail.com>

On 09/03/2008, Ingo Weinhold <ingo_weinhold at gmx.de> wrote:

> Actually this is not a template settings file. It's just a file with examples
>  what can be done a the UserBuildConfig, serving as a kind of reference.
>  Copying it doesn't make that much sense; just copy and adjust the bits you
>  actually need. Since the sample file is changed from time to time, a full
>  copy would get out of sync anyway. Furthermore by commenting everything all
>  syntax highlighting is gone, which doesn't improve the readability
>
>  I'll revert this change.

IMHO, of course, I think it's better in the end to keep it commented out.

I have seen quite a few newbies make the mistake of renaming
UserBuildConfig.sample to UserBuildConfig - without commenting out
anything... and thus, as BGA noted, it ends up becoming a template.

Whenever I setup a new build environment, I nearly always make a copy
of UserBuildConfig.sample and then edit it.

Furthermore, these same newbies usually neglect to use jam -q - making
it difficult to figure out what actually went wrong without
hand-holding. I believe it yields a somewhat frustrating first-time
building experience... not that it's anyone's fault but their own
(RTFM and all).

- Urias


From stefano.ceccherini at gmail.com  Mon Mar 10 08:30:39 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Mon, 10 Mar 2008 08:30:39 +0100
Subject: [Haiku-commits] r24343 - haiku/trunk/src/bin/bash
In-Reply-To: <200803092342.m29NgMDo003705@sheep.berlios.de>
References: <200803092342.m29NgMDo003705@sheep.berlios.de>
Message-ID: <894b9700803100030r1629e2f8m33ffda0b0098a6cb@mail.gmail.com>

2008/3/10, bonefish at BerliOS <bonefish at mail.berlios.de>:
> Author: bonefish
>  Date: 2008-03-10 00:42:21 +0100 (Mon, 10 Mar 2008)
>  New Revision: 24343
>  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24343&view=rev
>
>  Modified:
>    haiku/trunk/src/bin/bash/config.h
>  Log:
>  Enable process group synchronization via a pipe. Not sure what
>  advantages that is supposed to yield, but at least under Linux that
>  option is enabled.
>

If we drop support for building bash under beos (and we should, IMHO),
we could also enable some other stuff, like select() and some other
things.


From haiku at kaldience.com  Mon Mar 10 08:40:28 2008
From: haiku at kaldience.com (Maurice Kalinowski)
Date: Mon, 10 Mar 2008 08:40:28 +0100
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <1e80d8750803092127l992c281t134d7af7225c47cc@mail.gmail.com>
References: <200803051437.m25Eb2D5002683@sheep.berlios.de>	<20080310005316.389.1@knochen-vm.1205106033.fake>
	<1e80d8750803092127l992c281t134d7af7225c47cc@mail.gmail.com>
Message-ID: <47D4E5EC.7010607@kaldience.com>

Urias McCullough wrote:
> IMHO, of course, I think it's better in the end to keep it commented out.
>
> I have seen quite a few newbies make the mistake of renaming
> UserBuildConfig.sample to UserBuildConfig - without commenting out
> anything... and thus, as BGA noted, it ends up becoming a template.
>
> Whenever I setup a new build environment, I nearly always make a copy
> of UserBuildConfig.sample and then edit it.
>
> Furthermore, these same newbies usually neglect to use jam -q - making
> it difficult to figure out what actually went wrong without
> hand-holding. I believe it yields a somewhat frustrating first-time
> building experience... not that it's anyone's fault but their own
> (RTFM and all).
>
>   
I *very* much agree here. This is how I started too and I think this is 
how most unix sample files do that in addition.
If you have no clue of what you can configure, you will start in copying 
over the sample file and then investigate, which option you might want 
to use.

To be sure, which option you can safely disable (or even should disable 
as it is broken currently or for some other reason), it takes you much 
more time and experience with the build system.


Maurice



From stippi at mail.berlios.de  Mon Mar 10 11:51:58 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 10 Mar 2008 11:51:58 +0100
Subject: [Haiku-commits] r24344 - in haiku/trunk/src: kits/interface
	servers/app
Message-ID: <200803101051.m2AApweK016856@sheep.berlios.de>

Author: stippi
Date: 2008-03-10 11:51:56 +0100 (Mon, 10 Mar 2008)
New Revision: 24344
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24344&view=rev

Modified:
   haiku/trunk/src/kits/interface/Bitmap.cpp
   haiku/trunk/src/servers/app/BitmapManager.cpp
Log:
* Handle clearing to white on the client. This also makes sure that bitmaps are
  cleared which have no app_server link (B_BITMAP_NO_SERVER_LINK).
* Check the allocation of the BWindow in BBitmap for view accepting bitmaps.


Modified: haiku/trunk/src/kits/interface/Bitmap.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Bitmap.cpp	2008-03-09 23:42:21 UTC (rev 24343)
+++ haiku/trunk/src/kits/interface/Bitmap.cpp	2008-03-10 10:51:56 UTC (rev 24344)
@@ -949,12 +949,13 @@
 	if (!bounds.IsValid() || !bitmaps_support_space(colorSpace, NULL)) {
 		error = B_BAD_VALUE;
 	} else {
-		// bounds is in floats and might be valid but much larger than what we can handle
-		// the size could not be expressed in int32
+		// bounds is in floats and might be valid but much larger than what we
+		// can handle the size could not be expressed in int32
 		double realSize = bounds.Width() * bounds.Height();
 		if (realSize > (double)(INT_MAX / 4)) {
-			fprintf(stderr, "bitmap bounds is much too large: BRect(%.1f, %.1f, %.1f, %.1f)\n",
-					bounds.left, bounds.top, bounds.right, bounds.bottom);
+			fprintf(stderr, "bitmap bounds is much too large: "
+				"BRect(%.1f, %.1f, %.1f, %.1f)\n",
+				bounds.left, bounds.top, bounds.right, bounds.bottom);
 			error = B_BAD_VALUE;
 		}
 	}
@@ -1052,17 +1053,29 @@
 	}
 
 	fInitError = error;
-	// TODO: on success, handle clearing to white if the flags say so. Needs to be
-	// dependent on color space.
 
 	if (fInitError == B_OK) {
 		if (flags & B_BITMAP_ACCEPTS_VIEWS) {
-			fWindow = new BWindow(Bounds(), fServerToken);
-			// A BWindow starts life locked and is unlocked
-			// in Show(), but this window is never shown and
-			// it's message loop is never started.
-			fWindow->Unlock();
+			fWindow = new(std::nothrow) BWindow(Bounds(), fServerToken);
+			if (fWindow) {
+				// A BWindow starts life locked and is unlocked
+				// in Show(), but this window is never shown and
+				// it's message loop is never started.
+				fWindow->Unlock();
+			} else
+				fInitError = B_NO_MEMORY;
 		}
+		// clear to white if the flags say so.
+		if (flags & (B_BITMAP_CLEAR_TO_WHITE | B_BITMAP_ACCEPTS_VIEWS)) {
+			if (fColorSpace == B_CMAP8) {
+				// "255" is the "transparent magic" index for B_CMAP8 bitmaps
+				// use the correct index for "white"
+				memset(fBasePointer, 65, fSize);
+			} else {
+				// should work for most colorspaces
+				memset(fBasePointer, 0xff, fSize);
+			}
+		}
 	}
 }
 

Modified: haiku/trunk/src/servers/app/BitmapManager.cpp
===================================================================
--- haiku/trunk/src/servers/app/BitmapManager.cpp	2008-03-09 23:42:21 UTC (rev 24343)
+++ haiku/trunk/src/servers/app/BitmapManager.cpp	2008-03-10 10:51:56 UTC (rev 24344)
@@ -188,16 +188,8 @@
 	if (success) {
 		bitmap->fBuffer = buffer;
 		bitmap->fToken = gTokenSpace.NewToken(kBitmapToken, bitmap);
-
-		if (flags & (B_BITMAP_CLEAR_TO_WHITE | B_BITMAP_ACCEPTS_VIEWS)) {
-			if (space == B_CMAP8) {
-				// "255" is the "transparent magic" index for B_CMAP8 bitmaps
-				memset(bitmap->Bits(), 65, bitmap->BitsLength());
-			} else {
-				// should work for most colorspaces
-				memset(bitmap->Bits(), 0xff, bitmap->BitsLength());
-			}
-		}
+		// NOTE: the client handles clearing to white in case the flags
+		// indicate this is needed
 	} else {
 		// Allocation failed for buffer or bitmap list
 		delete bitmap;



From HOST.HAIKU at gmx.de  Mon Mar 10 11:55:05 2008
From: HOST.HAIKU at gmx.de (Julun)
Date: Mon, 10 Mar 2008 11:55:05 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <42848157065-BeMail@zon>
References: <42848157065-BeMail@zon>
Message-ID: <47D51389.60208@gmx.de>

Hi,

Axel D?rfler schrieb:
> julun <host.haiku at gmx.de> wrote:
>> basically the whole thing isn't thread save at all. To achieve this 
>> you 
>> would need to lock every function that writes to the private data 
>> section. 
>> This would drastically reduce the performance of that class. What we 
>> where 
> [...]
> 
> To make this class truely thread-safe, we would only need to make the 
> detach process safe. That will probably require some locking, but would 
> therefore also make the memory footprint a bit higher.

I need to go back to this topic since this is not entirely true, assume 
the following situation:

One might have a class with two worker threads, both got a pointer to a 
BString passed that the class holds. While Thread A executes a write 
operation on the string it gets hold in the middle of the function 
execution and Thread B starts writing to the string, now it would mess 
up the string completely. It that case it would be out of interest if 
detach is thread save or not! So BString has to have every writing 
function to be locked as well to be fully thread save.

Regards,
Karsten


From stefano.ceccherini at gmail.com  Mon Mar 10 12:01:33 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Mon, 10 Mar 2008 12:01:33 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <47D51389.60208@gmx.de>
References: <42848157065-BeMail@zon> <47D51389.60208@gmx.de>
Message-ID: <894b9700803100401r5a5952d8ub818537c586bbcc4@mail.gmail.com>

2008/3/10, Julun <HOST.HAIKU at gmx.de>:

>  One might have a class with two worker threads, both got a pointer to a
>  BString passed that the class holds. While Thread A executes a write
>  operation on the string it gets hold in the middle of the function
>  execution and Thread B starts writing to the string, now it would mess
>  up the string completely. It that case it would be out of interest if
>  detach is thread save or not! So BString has to have every writing
>  function to be locked as well to be fully thread save.

Yeah that's what I meant when I said that neither Beos's BString was
thread safe.


From axeld at pinc-software.de  Mon Mar 10 12:08:10 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 10 Mar 2008 12:08:10 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24312_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/os/support_src/kits/support?=
In-Reply-To: <47D51389.60208@gmx.de>
Message-ID: <3969951813-BeMail@zon>

Julun <HOST.HAIKU at gmx.de> wrote:
> Axel D?rfler schrieb:
> > To make this class truely thread-safe, we would only need to make 
> > the 
> > detach process safe. That will probably require some locking, but 
> > would 
> > therefore also make the memory footprint a bit higher.
> I need to go back to this topic since this is not entirely true, 
> assume 
> the following situation:
> 
> One might have a class with two worker threads, both got a pointer to 
> a 
> BString passed that the class holds. While Thread A executes a write 
> operation on the string it gets hold in the middle of the function 
> execution and Thread B starts writing to the string, now it would 
> mess 
> up the string completely. It that case it would be out of interest if 
> detach is thread save or not! So BString has to have every writing 
> function to be locked as well to be fully thread save.

You put my "truely thread-safe" out of context I wanted to have it in: 
I didn't mean to make the whole BString class thread-safe, but as 
thread-safe as the BeOS version of it is.
All write operations have to call Detach() before they actually write 
to the string. Hence, only this method needs to be thread safe.
In your example, there is only one BString involved, and for that, 
BString is known and documented to be unsafe.

Bye,
   Axel.



From HOST.HAIKU at gmx.de  Mon Mar 10 12:16:16 2008
From: HOST.HAIKU at gmx.de (Julun)
Date: Mon, 10 Mar 2008 12:16:16 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <3969951813-BeMail@zon>
References: <3969951813-BeMail@zon>
Message-ID: <47D51880.2020001@gmx.de>

Hi,

Axel D?rfler schrieb:
> Julun <HOST.HAIKU at gmx.de> wrote:
>> Axel D?rfler schrieb:
>>> To make this class truely thread-safe, we would only need to make 
>>> the 
>>> detach process safe. That will probably require some locking, but 
>>> would 
>>> therefore also make the memory footprint a bit higher.
>> I need to go back to this topic since this is not entirely true, 
>> assume 
>> the following situation:
>>
>> One might have a class with two worker threads, both got a pointer to 
>> a 
>> BString passed that the class holds. While Thread A executes a write 
>> operation on the string it gets hold in the middle of the function 
>> execution and Thread B starts writing to the string, now it would 
>> mess 
>> up the string completely. It that case it would be out of interest if 
>> detach is thread save or not! So BString has to have every writing 
>> function to be locked as well to be fully thread save.
> 
> You put my "truely thread-safe" out of context I wanted to have it in: 
> I didn't mean to make the whole BString class thread-safe, but as 
> thread-safe as the BeOS version of it is.
> All write operations have to call Detach() before they actually write 
> to the string. Hence, only this method needs to be thread safe.
> In your example, there is only one BString involved, and for that, 
> BString is known and documented to be unsafe.
> 

So then we have a different definition of truly thread save, good to know :)

Regards,
Karsten


Ps: What do you think about this read,

http://www.gotw.ca/gotw/045.htm

is his assumption of thread safety true because of the limited 
functionality the example has?


From bga at bug-br.org.br  Mon Mar 10 12:43:19 2008
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Mon, 10 Mar 2008 08:43:19 -0300
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <20080310005316.389.1@knochen-vm.1205106033.fake>
References: <200803051437.m25Eb2D5002683@sheep.berlios.de>
	<20080310005316.389.1@knochen-vm.1205106033.fake>
Message-ID: <47D51ED7.9050306@bug-br.org.br>

Ingo Weinhold wrote:

> Actually this is not a template settings file. It's just a file with examples 
> what can be done a the UserBuildConfig, serving as a kind of reference. 
> Copying it doesn't make that much sense; just copy and adjust the bits you 
> actually need. Since the sample file is changed from time to time, a full 
> copy would get out of sync anyway. Furthermore by commenting everything all 
> syntax highlighting is gone, which doesn't improve the readability

Hmmmmm? It *IS* a template file. Usually people will copy 
UserBootConfig.smaple to UserBootConfig and then edit this copy. The 
change I did was to make this process easier to most people as they do 
not need the dozens of options set by default on it.

> I'll revert this change.

Why?

-Bruno



From marcusoverhagen at arcor.de  Mon Mar 10 13:25:58 2008
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Mon, 10 Mar 2008 13:25:58 +0100 (CET)
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <47D51ED7.9050306@bug-br.org.br>
References: <47D51ED7.9050306@bug-br.org.br>
	<200803051437.m25Eb2D5002683@sheep.berlios.de>
	<20080310005316.389.1@knochen-vm.1205106033.fake>
Message-ID: <28217389.1205151958698.JavaMail.ngmail@webmail08>

Bruno Albuquerque <bga at bug-br.org.br> wrote:

> Ingo Weinhold wrote:
> 
> > copy would get out of sync anyway. Furthermore by commenting everything all 
> > syntax highlighting is gone, which doesn't improve the readability
I never noticed any syntax highlighting when opening the .sample file in Linux.

> Hmmmmm? It *IS* a template file. Usually people will copy 
> UserBootConfig.smaple to UserBootConfig and then edit this copy. The 
> change I did was to make this process easier to most people as they do 
> not need the dozens of options set by default on it.
I agree with Bruno on this point. Most users, including me, make a copy
of the sample file, and start editing it.

Some even don't remove lines they don't need, there have been a few 
looking for help in the IRC channel, because the default sample file
resulted in a lot errors when used verbatim.

> > I'll revert this change.
> 
> Why?
I think we should keep Brunos changes.

regards
Marcus

Jetzt komfortabel bei Arcor-Digital TV einsteigen: Mehr Happy Ends, mehr Herzschmerz, mehr Fernsehen! Erleben Sie 50 digitale TV Programme und optional 60 Pay TV Sender, einen elektronischen Programmf?hrer mit Movie Star Bewertungen von TV Movie. Au?erdem, aktuelle Filmhits und prickelnde Erotik in der Arcor-Videothek. Infos unter www.arcor.de/tv


From superstippi at gmx.de  Mon Mar 10 13:27:51 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 10 Mar 2008 13:27:51 +0100
Subject: [Haiku-commits] r24312 - in haiku/trunk: headers/os/support
 src/kits/support
In-Reply-To: <894b9700803100401r5a5952d8ub818537c586bbcc4@mail.gmail.com>
References: <42848157065-BeMail@zon> <47D51389.60208@gmx.de>
	<894b9700803100401r5a5952d8ub818537c586bbcc4@mail.gmail.com>
Message-ID: <20080310132751.2690.6@stippis2.1205142279.fake>


Stefano Ceccherini wrote:
> 2008/3/10, Julun <HOST.HAIKU at gmx.de>:
> 
> >  One might have a class with two worker threads, both got a pointer to 
> >  a BString passed that the class holds. While Thread A executes a write 
> >  operation on the string it gets hold in the middle of the function 
> >  execution and Thread B starts writing to the string, now it would mess 
> >  up the string completely. It that case it would be out of interest if 
> >  detach is thread save or not! So BString has to have every writing 
> >  function to be locked as well to be fully thread save.
> 
> Yeah that's what I meant when I said that neither Beos's BString was 
> thread safe.

This case/problam is perfectly fine and expected. No one wants to change 
BString in this regard. When Axel and I looked over the initial reference 
counting implementation, we spotted some *new* threading issues, with 
different BStrings objects, who share the same data internally. But Axel 
and I have gone over it again, and it looks like it should work fine now. 
Ie, the Haiku BString is now behaving the same as the BeOS BString, there 
shouldn't be hidden threading issues because of shared data. Maybe Ingo can 
have a look though, he is usually pretty good with this stuff.

Best regards,
-Stephan


From superstippi at gmx.de  Mon Mar 10 13:31:55 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 10 Mar 2008 13:31:55 +0100
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <47D51ED7.9050306@bug-br.org.br>
References: <200803051437.m25Eb2D5002683@sheep.berlios.de>
	<20080310005316.389.1@knochen-vm.1205106033.fake>
	<47D51ED7.9050306@bug-br.org.br>
Message-ID: <20080310133155.5188.7@stippis2.1205142279.fake>


Bruno Albuquerque wrote:
> Ingo Weinhold wrote:
> 
> > Actually this is not a template settings file. It's just a file with 
> > examples what can be done a the UserBuildConfig, serving as a kind of 
> > reference. Copying it doesn't make that much sense; just copy and 
> > adjust the bits you actually need. Since the sample file is changed 
> > from time to time, a full copy would get out of sync anyway. 
> > Furthermore by commenting everything all syntax highlighting is gone, 
> > which doesn't improve the readability
> 
> Hmmmmm? It *IS* a template file. Usually people will copy 
> UserBootConfig.smaple to UserBootConfig and then edit this copy. The 
> change I did was to make this process easier to most people as they do 
> not need the dozens of options set by default on it.
> 
> > I'll revert this change.
> 
> Why?

He explained why, you guys just disagree on the purpose of 
UserBuildConfig.sample. :-) But it seems more people run into the problem 
of just copying the file as UserBuildConfig, instead of copying only the 
stuff they need. Personally, I can agree with commenting out the samples, 
if it causes less problems. But the readability is seriously degraded 
because of it.

Best regards,
-Stephan


From axeld at pinc-software.de  Mon Mar 10 14:05:42 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 10 Mar 2008 14:05:42 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24312_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/os/support_src/kits/support?=
In-Reply-To: <47D51880.2020001@gmx.de>
Message-ID: <11021055979-BeMail@zon>

Hi Karsten,

Julun <HOST.HAIKU at gmx.de> wrote:
> So then we have a different definition of truly thread save, good to 
> know :)

Hehe, no I just expressed myself poorly, I guess :-)

> Ps: What do you think about this read,
> http://www.gotw.ca/gotw/045.htm
> 
> is his assumption of thread safety true because of the limited 
> functionality the example has?

As Stephan just mentioned, we've gone over the code again, and the only 
examples I could come up with where your reference implementation would 
fail was when the original BString implementation would fail, too.
IOW you and this Herb guy are right, the class does not expose any new 
threading issues with regards to the original BString class.

Bye,
   Axel.



From revol at free.fr  Mon Mar 10 14:13:42 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Mon, 10 Mar 2008 14:13:42 +0100 CET
Subject: [Haiku-commits] r24240 - haiku/trunk/build/jam
In-Reply-To: <20080310133155.5188.7@stippis2.1205142279.fake>
Message-ID: <2042364625-BeMail@laptop>

> > 
> > > I'll revert this change.
> > 
> > Why?
> 
> He explained why, you guys just disagree on the purpose of 
> UserBuildConfig.sample. :-) But it seems more people run into the 
> problem 
> of just copying the file as UserBuildConfig, instead of copying only 
> the 
> stuff they need. Personally, I can agree with commenting out the 
> samples, 
> if it causes less problems. But the readability is seriously degraded 
> because of it.


For what it's worth we could have enclose the content with a 

if 0 {

..

}

so jam wouldn't parse it, and it would require people to actually read 
the file to know what it can do with it before harming their build.

Fran?ois.


From axeld at mail.berlios.de  Mon Mar 10 15:14:44 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 10 Mar 2008 15:14:44 +0100
Subject: [Haiku-commits] r24345 - in haiku/trunk: headers/os/support
	src/kits/support
Message-ID: <200803101414.m2AEEicg027866@sheep.berlios.de>

Author: axeld
Date: 2008-03-10 15:14:44 +0100 (Mon, 10 Mar 2008)
New Revision: 24345
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24345&view=rev

Modified:
   haiku/trunk/headers/os/support/String.h
   haiku/trunk/src/kits/support/String.cpp
Log:
* After my last change, _IsShareable() was called on the wrong string in the
  copy constructors, effectively turning of references completely.
* Since that caused troubles (NetPositive now crashes when started), I
  temporarily disabled references by letting _IsShareable() always return
  false until the issue is resolved.
* _FreePrivateData() now sets the fPrivateData member to NULL, and is also
  safe to be called when fPrivateData is NULL.
* Removed my comment about the threading problem in _Detach() and _DetachWith()
  as that just couldn't happen.
* _Clone() must not use memcpy() as the string pointed to by "data" might not
  be as long as "length".
* LockBuffer() now marks a string as unshareable.
* Minor cleanup.


Modified: haiku/trunk/headers/os/support/String.h
===================================================================
--- haiku/trunk/headers/os/support/String.h	2008-03-10 10:51:56 UTC (rev 24344)
+++ haiku/trunk/headers/os/support/String.h	2008-03-10 14:14:44 UTC (rev 24345)
@@ -254,8 +254,9 @@
 					const char* with, int32 withLen);
 
 private:
-	inline int32& 	_ReferenceCount();
-	bool			_IsShareable();
+	int32& 			_ReferenceCount();
+	const int32& 	_ReferenceCount() const;
+	bool			_IsShareable() const;
 	void			_FreePrivateData();
 
 	char*			fPrivateData;

Modified: haiku/trunk/src/kits/support/String.cpp
===================================================================
--- haiku/trunk/src/kits/support/String.cpp	2008-03-10 10:51:56 UTC (rev 24344)
+++ haiku/trunk/src/kits/support/String.cpp	2008-03-10 14:14:44 UTC (rev 24345)
@@ -183,7 +183,7 @@
 	: fPrivateData(NULL)
 {
 	// check if source is sharable - if so, share else clone
-	if (_IsShareable()) {
+	if (string._IsShareable()) {
 		fPrivateData = string.fPrivateData;
 		atomic_add(&_ReferenceCount(), 1);
 			// string cannot go away right now
@@ -283,7 +283,7 @@
 		_FreePrivateData();
 
 	// if source is sharable share, otherwise clone
-	if (_IsShareable()) {
+	if (string._IsShareable()) {
 		fPrivateData = string.fPrivateData;
 		atomic_add(&_ReferenceCount(), 1);
 			// the string cannot go away right now
@@ -344,8 +344,7 @@
 
 
 BString&
-BString::CopyInto(BString& into, int32 fromOffset,
-				  int32 length) const
+BString::CopyInto(BString& into, int32 fromOffset, int32 length) const
 {
 	if (this != &into)
 		into.SetTo(fPrivateData + fromOffset, length);
@@ -501,7 +500,7 @@
 
 BString&
 BString::Insert(const char* string, int32 fromOffset, int32 length,
-				int32 position)
+	int32 position)
 {
 	if (string)
 		Insert(string + fromOffset, length, position);
@@ -519,8 +518,7 @@
 
 
 BString&
-BString::Insert(const BString& string, int32 length,
-				int32 position)
+BString::Insert(const BString& string, int32 length, int32 position)
 {
 	if ((fPrivateData != string.fPrivateData) && string.Length() > 0)
 		Insert(string.String(), length, position);
@@ -529,8 +527,8 @@
 
 
 BString&
-BString::Insert(const BString& string, int32 fromOffset,
-				int32 length, int32 position)
+BString::Insert(const BString& string, int32 fromOffset, int32 length,
+	int32 position)
 {
 	if ((fPrivateData != string.fPrivateData) && string.Length() > 0)
 		Insert(string.String() + fromOffset, length, position);
@@ -1078,7 +1076,7 @@
 
 BString&
 BString::Replace(char replaceThis, char withThis, int32 maxReplaceCount,
-				 int32 fromOffset)
+	int32 fromOffset)
 {
 	fromOffset = min_clamp0(fromOffset, Length());
 	int32 pos = FindFirst(replaceThis, fromOffset);
@@ -1142,7 +1140,7 @@
 
 BString&
 BString::ReplaceAll(const char* replaceThis, const char* withThis,
-					int32 fromOffset)
+	int32 fromOffset)
 {
 	if (!replaceThis || !withThis || FindFirst(replaceThis) < 0)
 		return *this;
@@ -1157,7 +1155,7 @@
 
 BString&
 BString::Replace(const char* replaceThis, const char* withThis,
-				 int32 maxReplaceCount, int32 fromOffset)
+	int32 maxReplaceCount, int32 fromOffset)
 {
 	if (!replaceThis || !withThis || maxReplaceCount <= 0
 		|| FindFirst(replaceThis) < 0)
@@ -1217,7 +1215,7 @@
 
 BString&
 BString::IReplace(char replaceThis, char withThis, int32 maxReplaceCount,
-				  int32 fromOffset)
+	int32 fromOffset)
 {
 	char tmp[2] = { replaceThis, '\0' };
 	fromOffset = min_clamp0(fromOffset, Length());
@@ -1282,7 +1280,7 @@
 
 BString&
 BString::IReplaceAll(const char* replaceThis, const char* withThis,
-					 int32 fromOffset)
+	int32 fromOffset)
 {
 	if (!replaceThis || !withThis || IFindFirst(replaceThis) < 0)
 		return *this;
@@ -1297,7 +1295,7 @@
 
 BString&
 BString::IReplace(const char* replaceThis, const char* withThis,
-				  int32 maxReplaceCount, int32 fromOffset)
+	int32 maxReplaceCount, int32 fromOffset)
 {
 	if (!replaceThis || !withThis || maxReplaceCount <= 0
 		|| FindFirst(replaceThis) < 0)
@@ -1402,6 +1400,8 @@
 		length += maxLength - length;
 
 	_DetachWith(fPrivateData, length);
+	_ReferenceCount() = -1;
+		// mark unshareable
 	return fPrivateData;
 }
 
@@ -1418,6 +1418,8 @@
 
 	_Realloc(length);
 	fPrivateData[length] = '\0';
+	_ReferenceCount() = 1;
+		// mark shareable again
 
 	return *this;
 }
@@ -1650,8 +1652,6 @@
 {
 	char* newData = fPrivateData;
 
-	// TODO: this is not thread safe! A string could be used in than one
-	// thread at a time (and one of those threads could create a ref)
 	if (atomic_get(&_ReferenceCount()) > 1) {
 		// It might be shared, and this requires special treatment
 		newData = _Clone(fPrivateData, Length());
@@ -1714,8 +1714,10 @@
 	*(((vint32*)newData) - 2) = 1;
 	*(((int32*)newData) - 1) = length & 0x7fffffff;
 
-	if (data && length)
-		memcpy(newData, data, length);
+	if (data && length) {
+		// "data" may not span over the whole length
+		strncpy(newData, data, length);
+	}
 
 	return newData;
 }
@@ -1752,8 +1754,7 @@
 BString::_DetachWith(const char* string, int32 length)
 {
 	char* newData = NULL;
-	// TODO: this is not thread safe! A string could be used in than one
-	// thread at a time (and one of those threads could create a ref)
+
 	if (atomic_get(&_ReferenceCount()) > 1) {
 		// we might share our data with someone else
 		newData = _Clone(string, length);
@@ -1787,17 +1788,28 @@
 }
 
 
+inline const int32&
+BString::_ReferenceCount() const
+{
+	return *(((int32 *)fPrivateData) - 2);
+}
+
+
 inline bool
-BString::_IsShareable()
+BString::_IsShareable() const
 {
-	return fPrivateData != NULL && _ReferenceCount() >= 0;
+	return false;
+//	return fPrivateData != NULL && _ReferenceCount() >= 0;
 }
 
 
 void
 BString::_FreePrivateData()
 {
-	free(fPrivateData - kPrivateDataOffset);
+	if (fPrivateData != NULL) {
+		free(fPrivateData - kPrivateDataOffset);
+		fPrivateData = NULL;
+	}
 }
 
 



From superstippi at gmx.de  Mon Mar 10 15:30:19 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 10 Mar 2008 15:30:19 +0100
Subject: [Haiku-commits] r24345 - in haiku/trunk: headers/os/support
 src/kits/support
In-Reply-To: <200803101414.m2AEEicg027866@sheep.berlios.de>
References: <200803101414.m2AEEicg027866@sheep.berlios.de>
Message-ID: <20080310153019.18757.10@stippis2.1205142279.fake>

Hi Axel,

axeld at BerliOS wrote:
> Author: axeld
> Date: 2008-03-10 15:14:44 +0100 (Mon, 10 Mar 2008) New Revision: 24345
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24345&view=rev
> 
> Modified:
>    haiku/trunk/headers/os/support/String.h
>    haiku/trunk/src/kits/support/String.cpp

> @@ -1402,6 +1400,8 @@
>          length += maxLength - length;
>  
>      _DetachWith(fPrivateData, length);
> +    _ReferenceCount() = -1;
> +        // mark unshareable
>      return fPrivateData;
>  }

You should check fPrivateData != NULL before using _ReferenceCount(). 
DetachWith() might have failed.


> @@ -1714,8 +1714,10 @@
>      *(((vint32*)newData) - 2) = 1;
>      *(((int32*)newData) - 1) = length & 0x7fffffff;
>  
> -    if (data && length)
> -        memcpy(newData, data, length);
> +    if (data && length) {
> +        // "data" may not span over the whole length
> +        strncpy(newData, data, length);
> +    }

I just found out that _DoAppend() suffers from the same problem. For 
example the Append(char, int32 count) uses it like this:

_DoAppend("", count);

Best regards,
-Stephan



From haiku at kaldience.com  Mon Mar 10 15:50:12 2008
From: haiku at kaldience.com (Maurice Kalinowski)
Date: Mon, 10 Mar 2008 15:50:12 +0100
Subject: [Haiku-commits] r24345 - in haiku/trunk:
	headers/os/support	src/kits/support
In-Reply-To: <200803101414.m2AEEicg027866@sheep.berlios.de>
References: <200803101414.m2AEEicg027866@sheep.berlios.de>
Message-ID: <47D54AA4.5080108@kaldience.com>

axeld at BerliOS wrote:
> Author: axeld
> Date: 2008-03-10 15:14:44 +0100 (Mon, 10 Mar 2008)
> New Revision: 24345
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24345&view=rev
>
> Modified:
>    haiku/trunk/headers/os/support/String.h
>    haiku/trunk/src/kits/support/String.cpp
> Log:
> * After my last change, _IsShareable() was called on the wrong string in the
>   copy constructors, effectively turning of references completely.
> * Since that caused troubles (NetPositive now crashes when started), I
>   temporarily disabled references by letting _IsShareable() always return
>   false until the issue is resolved.
> * _FreePrivateData() now sets the fPrivateData member to NULL, and is also
>   safe to be called when fPrivateData is NULL.
> * Removed my comment about the threading problem in _Detach() and _DetachWith()
>   as that just couldn't happen.
> * _Clone() must not use memcpy() as the string pointed to by "data" might not
>   be as long as "length".
> * LockBuffer() now marks a string as unshareable.
> * Minor cleanup.
>
>   
So proposed patch this night didn't work for you? Just curious...

Maurice



From superstippi at gmx.de  Mon Mar 10 15:59:38 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 10 Mar 2008 15:59:38 +0100
Subject: [Haiku-commits] r24345 - in haiku/trunk:
 headers/os/support	src/kits/support
In-Reply-To: <47D54AA4.5080108@kaldience.com>
References: <200803101414.m2AEEicg027866@sheep.berlios.de>
	<47D54AA4.5080108@kaldience.com>
Message-ID: <20080310155938.726.2@stippis2.1205160641.fake>


Maurice Kalinowski wrote:
> axeld at BerliOS wrote:
> > Author: axeld
> > Date: 2008-03-10 15:14:44 +0100 (Mon, 10 Mar 2008) New Revision: 24345
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24345&view=rev
> >
> > Modified:
> >    haiku/trunk/headers/os/support/String.h
> >    haiku/trunk/src/kits/support/String.cpp
> > Log:
> > * After my last change, _IsShareable() was called on the wrong string 
> > in the
> >   copy constructors, effectively turning of references completely.
> > * Since that caused troubles (NetPositive now crashes when started), I
> >   temporarily disabled references by letting _IsShareable() always 
> >   return false until the issue is resolved.
> > * _FreePrivateData() now sets the fPrivateData member to NULL, and is 
> > also
> >   safe to be called when fPrivateData is NULL.
> > * Removed my comment about the threading problem in _Detach() and 
> > _DetachWith()
> >   as that just couldn't happen.
> > * _Clone() must not use memcpy() as the string pointed to by "data" 
> > might not
> >   be as long as "length".
> > * LockBuffer() now marks a string as unshareable.
> > * Minor cleanup.
> >
> >   
> So proposed patch this night didn't work for you? Just curious...

You mean this one:

inline bool
BString::_IsShareable()
{
//       return fPrivateData != NULL && _ReferenceCount() >= 0;
       if (fPrivateData == NULL)
               return true;

       return _ReferenceCount() >= 0;
}

?

The problem was that _IsShareable() was called on the wrong string object 
in the first place. And also I am not sure that _IsShareable() should 
return true for non existing data. Wouldn't that break things in several 
places? I haven't looked for these cases yet.

Best regards,
-Stephan


From stippi at mail.berlios.de  Mon Mar 10 16:32:02 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 10 Mar 2008 16:32:02 +0100
Subject: [Haiku-commits] r24346 - haiku/trunk/src/servers/app/drawing
Message-ID: <200803101532.m2AFW2oh005813@sheep.berlios.de>

Author: stippi
Date: 2008-03-10 16:32:01 +0100 (Mon, 10 Mar 2008)
New Revision: 24346
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24346&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
Log:
Use the front buffer for screenshots always, otherwise we don't get the contents
of BDirectWindows for setups where the app_server uses double buffering mode.
I didn't test the change, but the way the cursor is optionally copied into
the bitmap (which might now be not 32 bpp) looks very flexible.


Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2008-03-10 14:14:44 UTC (rev 24345)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2008-03-10 15:32:01 UTC (rev 24346)
@@ -1123,7 +1123,7 @@
 {
 	CRASH_IF_NOT_EXCLUSIVE_LOCKED
 
-	RenderingBuffer *buffer = fGraphicsCard->DrawingBuffer();
+	RenderingBuffer *buffer = fGraphicsCard->FrontBuffer();
 	if (!buffer)
 		return B_ERROR;
 



From axeld at mail.berlios.de  Mon Mar 10 17:41:44 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 10 Mar 2008 17:41:44 +0100
Subject: [Haiku-commits] r24347 - haiku/trunk/src/kits/support
Message-ID: <200803101641.m2AGfiOM012830@sheep.berlios.de>

Author: axeld
Date: 2008-03-10 17:41:43 +0100 (Mon, 10 Mar 2008)
New Revision: 24347
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24347&view=rev

Modified:
   haiku/trunk/src/kits/support/String.cpp
Log:
The result of some more proof-reading caused by Stephan's comments:
* _Realloc(), and _Detach[With]() may fail, but that wasn't accounted for
  everywhere.
* The Append(), Prepend(), and Insert() char versions all caused their
  backends to access invalid data (must use strncpy() instead of memcpy()
  here). 
* All Append(), Prepend(), and Insert() BString variants used an invalid
  check, and would therefore just do nothing in certain situations like this
  one:
    BString a = "-";
    BString b = a;
    a.Append(b);


Modified: haiku/trunk/src/kits/support/String.cpp
===================================================================
--- haiku/trunk/src/kits/support/String.cpp	2008-03-10 15:32:01 UTC (rev 24346)
+++ haiku/trunk/src/kits/support/String.cpp	2008-03-10 16:41:43 UTC (rev 24347)
@@ -155,7 +155,9 @@
 char*
 BStringRef::operator&()
 {
-	fString._Detach();
+	if (fString._Detach() != B_OK)
+		return NULL;
+
 	fString._ReferenceCount() = -1;
 		// mark as unsharable
 	return &fString.fPrivateData[fPosition];
@@ -385,7 +387,8 @@
 BString&
 BString::Append(const BString& string, int32 length)
 {
-	_DoAppend(string.fPrivateData, min_clamp0(length, string.Length()));
+	if (&string != this)
+		_DoAppend(string.fPrivateData, min_clamp0(length, string.Length()));
 	return *this;
 }
 
@@ -424,8 +427,8 @@
 BString&
 BString::Prepend(const BString& string)
 {
-	if (fPrivateData != string.fPrivateData)
-		_DoPrepend(string.fPrivateData, string.Length());
+	if (&string != this)
+		_DoPrepend(string.String(), string.Length());
 	return *this;
 }
 
@@ -442,7 +445,7 @@
 BString&
 BString::Prepend(const BString& string, int32 length)
 {
-	if (fPrivateData != string.fPrivateData)
+	if (&string != this)
 		_DoPrepend(string.fPrivateData, min_clamp0(length, string.Length()));
 	return *this;
 }
@@ -511,7 +514,7 @@
 BString&
 BString::Insert(const BString& string, int32 position)
 {
-	if ((fPrivateData != string.fPrivateData) && string.Length() > 0)
+	if (&string != this && string.Length() > 0)
 		Insert(string.fPrivateData, position);
 	return *this;
 }
@@ -520,7 +523,7 @@
 BString&
 BString::Insert(const BString& string, int32 length, int32 position)
 {
-	if ((fPrivateData != string.fPrivateData) && string.Length() > 0)
+	if (&string != this && string.Length() > 0)
 		Insert(string.String(), length, position);
 	return *this;
 }
@@ -530,7 +533,7 @@
 BString::Insert(const BString& string, int32 fromOffset, int32 length,
 	int32 position)
 {
-	if ((fPrivateData != string.fPrivateData) && string.Length() > 0)
+	if (&string != this && string.Length() > 0)
 		Insert(string.String() + fromOffset, length, position);
 	return *this;
 }
@@ -1381,8 +1384,13 @@
 char&
 BString::operator[](int32 index)
 {
-	_Detach();
+	if (_Detach() != B_OK) {
+		static char invalid;
+		return invalid;
+	}
+
 	_ReferenceCount() = -1;
+		// mark string as unshareable
 
 	return fPrivateData[index];
 }
@@ -1399,9 +1407,10 @@
 	if (maxLength > length)
 		length += maxLength - length;
 
-	_DetachWith(fPrivateData, length);
-	_ReferenceCount() = -1;
-		// mark unshareable
+	if (_DetachWith(fPrivateData, length) == B_OK) {
+		_ReferenceCount() = -1;
+			// mark unshareable
+	}
 	return fPrivateData;
 }
 
@@ -1416,10 +1425,11 @@
 		length = (fPrivateData == NULL) ? 0 : strlen(fPrivateData);
 	}
 
-	_Realloc(length);
-	fPrivateData[length] = '\0';
-	_ReferenceCount() = 1;
-		// mark shareable again
+	if (_Realloc(length) != NULL) {
+		fPrivateData[length] = '\0';
+		_ReferenceCount() = 1;
+			// mark shareable again
+	}
 
 	return *this;
 }
@@ -1819,7 +1829,7 @@
 	int32 oldLength = Length();
 	if (_DetachWith(fPrivateData, oldLength + length) == B_OK) {
 		if (string && length)
-			memcpy(fPrivateData + oldLength, string, length);
+			strncpy(fPrivateData + oldLength, string, length);
 		return true;
 	}
 	return false;
@@ -1833,7 +1843,7 @@
 	if (_DetachWith(fPrivateData, oldLength + length) == B_OK) {
 		memmove(fPrivateData + length, fPrivateData, oldLength);
 		if (string && length)
-			memcpy(fPrivateData, string, length);
+			strncpy(fPrivateData, string, length);
 		return true;
 	}
 	return false;
@@ -1848,7 +1858,7 @@
 		memmove(fPrivateData + offset + length, fPrivateData + offset,
 			oldLength - offset);
 		if (string && length)
-			memcpy(fPrivateData + offset, string, length);
+			strncpy(fPrivateData + offset, string, length);
 		return true;
 	}
 	return false;



From axeld at pinc-software.de  Mon Mar 10 17:42:36 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 10 Mar 2008 17:42:36 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24345_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/os/support_src/kits/support?=
In-Reply-To: <20080310155938.726.2@stippis2.1205160641.fake>
Message-ID: <24035429966-BeMail@zon>

Stephan Assmus <superstippi at gmx.de> wrote:
> The problem was that _IsShareable() was called on the wrong string 
> object 
> in the first place. And also I am not sure that _IsShareable() should 
> return true for non existing data. Wouldn't that break things in 
> several 
> places? I haven't looked for these cases yet.

It certainly doesn't make sense to try to share a string whose 
initialization failed.
And yes, it would cause several other problems in the code which would 
then try to access memory pointed to by fPrivate unsafely.

Bye,
   Axel.



From HOST.HAIKU at gmx.de  Mon Mar 10 19:30:34 2008
From: HOST.HAIKU at gmx.de (Julun)
Date: Mon, 10 Mar 2008 19:30:34 +0100
Subject: [Haiku-commits] r24347 - haiku/trunk/src/kits/support
In-Reply-To: <200803101641.m2AGfiOM012830@sheep.berlios.de>
References: <200803101641.m2AGfiOM012830@sheep.berlios.de>
Message-ID: <47D57E4A.4020108@gmx.de>

Hi,

i found an other small one, diff attached. We need to preserve the 
refcount in case we call Replace...(). I can't apply as i have just read 
only svn here.

Index: String.cpp
===================================================================
--- String.cpp  (revision 24347)
+++ String.cpp  (working copy)
@@ -1982,11 +1982,15 @@
                 if (len > 0)
                         memcpy(newAdr, oldAdr, len);

+               const int32 refCount = _ReferenceCount();
+
                 _FreePrivateData();

                 fPrivateData = newData;
+               fPrivateData[newLength] = '\0';
+
                 _SetLength(newLength);
-               fPrivateData[newLength] = '\0';
+               _ReferenceCount() = refCount;
         }
         return *this;
  }
@@ -2036,7 +2040,7 @@

  void
  BString::_ReplaceAtPositions(const PosVect* positions, int32 searchLen,
-       const char* with, int32 withLen)
+                                                        const char* 
with, int32 withLen)
  {
         int32 len = Length();
         uint32 count = positions->CountItems();
@@ -2071,11 +2075,15 @@
                 if (len > 0)
                         memcpy(newAdr, oldAdr, len);

+               const int32 refCount = _ReferenceCount();
+
                 _FreePrivateData();

                 fPrivateData = newData;
+               fPrivateData[newLength] = '\0';
+
                 _SetLength(newLength);
-               fPrivateData[newLength] = '\0';
+               _ReferenceCount() = refCount;
         }
  }

Regards


From mmlr at mlotz.ch  Mon Mar 10 19:28:47 2008
From: mmlr at mlotz.ch (Michael Lotz)
Date: Mon, 10 Mar 2008 19:28:47 +0100
Subject: [Haiku-commits] r24346 - haiku/trunk/src/servers/app/drawing
In-Reply-To: <200803101532.m2AFW2oh005813@sheep.berlios.de>
Message-ID: <19068687859-BeMail@primary>

Hi Stephan

> New Revision: 24346
> Modified:
>    haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
> Log:
> Use the front buffer for screenshots always, otherwise we don't get 
> the contents
> of BDirectWindows for setups where the app_server uses double 
> buffering mode.
> I didn't test the change, but the way the cursor is optionally copied 
> into
> the bitmap (which might now be not 32 bpp) looks very flexible.

This does however break the ReadBitmap() function in some cases where 
drawCursor is set to false. When testing under QEMU with 16bit vesa, 
Magnify now shows the cursor even though it specifies false for 
drawCursor in its ReadBitmap() call (src/apps/magnify/
Magnify.cpp:1916). When using 32bit vesa Magnify still works as 
expected though.

Regards
Michael


From axeld at pinc-software.de  Mon Mar 10 20:14:15 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 10 Mar 2008 20:14:15 +0100 CET
Subject: [Haiku-commits] r24347 - haiku/trunk/src/kits/support
In-Reply-To: <47D57E4A.4020108@gmx.de>
Message-ID: <33134305372-BeMail@zon>

Julun <HOST.HAIKU at gmx.de> wrote:
> i found an other small one, diff attached. We need to preserve the 
> refcount in case we call Replace...(). I can't apply as i have just 
> read 
> only svn here.

Not preserve but initialize, but that was exactly the problem that kept 
NetPositive from working, thanks a lot!

Bye,
   Axel.



From axeld at mail.berlios.de  Mon Mar 10 20:14:06 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 10 Mar 2008 20:14:06 +0100
Subject: [Haiku-commits] r24348 - in haiku/trunk: headers/os/support
	src/kits/support
Message-ID: <200803101914.m2AJE6mm015124@sheep.berlios.de>

Author: axeld
Date: 2008-03-10 20:14:05 +0100 (Mon, 10 Mar 2008)
New Revision: 24348
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24348&view=rev

Modified:
   haiku/trunk/headers/os/support/String.h
   haiku/trunk/src/kits/support/String.cpp
Log:
* As found by Karsten, the reference count was not initialized in
  _ReplaceAtPositions(), and _DoCharacterEscape() (we don't need to preserve
  it, though, as it must be 1).
* Factored out an _Alloc() method which is now always called when the private
  data is allocated. It also takes care of correct initialization (and thus
  fixes the above problem).
* This fix finally allows turning on reference counting again, thanks Karsten!
* Minor cleanup, renamed "oldAdr"/"newAdr" to "oldString", resp. "newString".


Modified: haiku/trunk/headers/os/support/String.h
===================================================================
--- haiku/trunk/headers/os/support/String.h	2008-03-10 16:41:43 UTC (rev 24347)
+++ haiku/trunk/headers/os/support/String.h	2008-03-10 19:14:05 UTC (rev 24348)
@@ -221,6 +221,7 @@
 
 	// Management
 	status_t	_Detach();
+	char*		_Alloc(int32 length);
 	char*		_Realloc(int32 length);
 	void		_Init(const char* src, int32 length);
 	char*		_Clone(const char* data, int32 length);

Modified: haiku/trunk/src/kits/support/String.cpp
===================================================================
--- haiku/trunk/src/kits/support/String.cpp	2008-03-10 16:41:43 UTC (rev 24347)
+++ haiku/trunk/src/kits/support/String.cpp	2008-03-10 19:14:05 UTC (rev 24348)
@@ -1679,6 +1679,27 @@
 
 
 char*
+BString::_Alloc(int32 length)
+{
+	if (length < 0)
+		return NULL;
+
+	char* newData = (char *)malloc(length + kPrivateDataOffset + 1);
+	if (newData == NULL)
+		return NULL;
+
+	newData += kPrivateDataOffset;
+	newData[length] = '\0';
+
+	// initialize reference count & length
+	*(((vint32*)newData) - 2) = 1;
+	*(((int32*)newData) - 1) = length & 0x7fffffff;
+
+	return newData;
+}
+
+
+char*
 BString::_Realloc(int32 length)
 {
 	if (length == Length())
@@ -1713,18 +1734,11 @@
 char*
 BString::_Clone(const char* data, int32 length)
 {
-	char* newData = (char *)malloc(length + kPrivateDataOffset + 1);
+	char* newData = _Alloc(length);
 	if (newData == NULL)
 		return NULL;
 
-	newData += kPrivateDataOffset;
-	newData[length] = '\0';
-
-	// initialize reference count & length
-	*(((vint32*)newData) - 2) = 1;
-	*(((int32*)newData) - 1) = length & 0x7fffffff;
-
-	if (data && length) {
+	if (data != NULL && length > 0) {
 		// "data" may not span over the whole length
 		strncpy(newData, data, length);
 	}
@@ -1808,8 +1822,7 @@
 inline bool
 BString::_IsShareable() const
 {
-	return false;
-//	return fPrivateData != NULL && _ReferenceCount() >= 0;
+	return fPrivateData != NULL && _ReferenceCount() >= 0;
 }
 
 
@@ -1934,7 +1947,7 @@
 
 
 BString&
-BString::_DoCharacterEscape(const char* string, const char *setOfCharsToEscape,
+BString::_DoCharacterEscape(const char* string, const char* setOfCharsToEscape,
 	char escapeChar)
 {
 	if (_DetachWith(string, strlen(safestr(string))) != B_OK)
@@ -1943,50 +1956,48 @@
 	memcpy(fPrivateData, string, Length());
 
 	PosVect positions;
-	int32 len = Length();
+	int32 length = Length();
 	int32 pos = 0;
-	for (int32 offset = 0; offset < len; offset += pos + 1) {
-		if ((pos = strcspn(fPrivateData + offset, setOfCharsToEscape)) < len - offset) {
+	for (int32 offset = 0; offset < length; offset += pos + 1) {
+		if ((pos = strcspn(fPrivateData + offset, setOfCharsToEscape))
+				< length - offset) {
 			if (!positions.Add(offset + pos))
 				return *this;
 		}
 	}
 
 	uint32 count = positions.CountItems();
-	int32 newLength = len + count;
+	int32 newLength = length + count;
 	if (!newLength) {
 		_Realloc(0);
 		return *this;
 	}
 
-	int32 lastPos = 0;
-	char* oldAdr = fPrivateData;
+	char* newData = _Alloc(newLength);
+	if (newData) {
+		char* oldString = fPrivateData;
+		char* newString = newData;
+		int32 lastPos = 0;
 
-	char* newData = (char*)malloc(newLength + kPrivateDataOffset + 1);
-	if (newData) {
-		newData += kPrivateDataOffset;
-		char* newAdr = newData;
 		for (uint32 i = 0; i < count; ++i) {
 			pos = positions.ItemAt(i);
-			len = pos - lastPos;
-			if (len > 0) {
-				memcpy(newAdr, oldAdr, len);
-				oldAdr += len;
-				newAdr += len;
+			length = pos - lastPos;
+			if (length > 0) {
+				memcpy(newString, oldString, length);
+				oldString += length;
+				newString += length;
 			}
-			*newAdr++ = escapeChar;
-			*newAdr++ = *oldAdr++;
+			*newString++ = escapeChar;
+			*newString++ = *oldString++;
 			lastPos = pos + 1;
 		}
-		len = Length() + 1 - lastPos;
-		if (len > 0)
-			memcpy(newAdr, oldAdr, len);
 
+		length = Length() + 1 - lastPos;
+		if (length > 0)
+			memcpy(newString, oldString, length);
+
 		_FreePrivateData();
-
 		fPrivateData = newData;
-		_SetLength(newLength);
-		fPrivateData[newLength] = '\0';
 	}
 	return *this;
 }
@@ -1999,8 +2010,8 @@
 		return *this;
 
 	memcpy(fPrivateData, string, Length());
-	const char temp[2] = { escapeChar, '\0' };
-	return _DoReplace(temp, "", REPLACE_ALL, 0, KEEP_CASE);
+	const char escape[2] = { escapeChar, '\0' };
+	return _DoReplace(escape, "", REPLACE_ALL, 0, KEEP_CASE);
 }
 
 
@@ -2025,7 +2036,7 @@
 	PosVect positions;
 	for (int32 srcPos = 0; maxReplaceCount > 0
 		&& (srcPos = (this->*findMethod)(findThis, lastSrcPos, findLen)) >= 0;
-		maxReplaceCount--) {
+			maxReplaceCount--) {
 		positions.Add(srcPos);
 		lastSrcPos = srcPos + findLen;
 	}
@@ -2035,48 +2046,45 @@
 
 
 void
-BString::_ReplaceAtPositions(const PosVect* positions, int32 searchLen,
-	const char* with, int32 withLen)
+BString::_ReplaceAtPositions(const PosVect* positions, int32 searchLength,
+	const char* with, int32 withLength)
 {
-	int32 len = Length();
+	int32 length = Length();
 	uint32 count = positions->CountItems();
-	int32 newLength = len + count * (withLen - searchLen);
+	int32 newLength = length + count * (withLength - searchLength);
 	if (!newLength) {
 		_Realloc(0);
 		return;
 	}
 
-	int32 pos;
+	char *newData = _Alloc(newLength);
+	if (newData == NULL)
+		return;
+
+	char *oldString = fPrivateData;
+	char *newString = newData;
 	int32 lastPos = 0;
-	char *oldAdr = fPrivateData;
 
-	char *newData = (char *)malloc(newLength + kPrivateDataOffset + 1);
-	if (newData) {
-		newData += kPrivateDataOffset;
-		char *newAdr = newData;
-		for (uint32 i = 0; i < count; ++i) {
-			pos = positions->ItemAt(i);
-			len = pos - lastPos;
-			if (len > 0) {
-				memcpy(newAdr, oldAdr, len);
-				oldAdr += len;
-				newAdr += len;
-			}
-			memcpy(newAdr, with, withLen);
-			oldAdr += searchLen;
-			newAdr += withLen;
-			lastPos = pos+searchLen;
+	for (uint32 i = 0; i < count; ++i) {
+		int32 pos = positions->ItemAt(i);
+		length = pos - lastPos;
+		if (length > 0) {
+			memcpy(newString, oldString, length);
+			oldString += length;
+			newString += length;
 		}
-		len = Length() + 1 - lastPos;
-		if (len > 0)
-			memcpy(newAdr, oldAdr, len);
+		memcpy(newString, with, withLength);
+		oldString += searchLength;
+		newString += withLength;
+		lastPos = pos + searchLength;
+	}
 
-		_FreePrivateData();
+	length = Length() + 1 - lastPos;
+	if (length > 0)
+		memcpy(newString, oldString, length);
 
-		fPrivateData = newData;
-		_SetLength(newLength);
-		fPrivateData[newLength] = '\0';
-	}
+	_FreePrivateData();
+	fPrivateData = newData;
 }
 
 



From julun.skyos at gmx.net  Mon Mar 10 21:30:32 2008
From: julun.skyos at gmx.net (julun)
Date: Mon, 10 Mar 2008 21:30:32 +0100
Subject: [Haiku-commits] r24348 - in haiku/trunk:
	headers/os/supportsrc/kits/support
In-Reply-To: <200803101914.m2AJE6mm015124@sheep.berlios.de>
Message-ID: <20080310203213.71073132BFC@mail.berlios.de>

Hi, 

-----Urspr?ngliche Nachricht-----
Von: haiku-commits-bounces at lists.berlios.de
[mailto:haiku-commits-bounces at lists.berlios.de] Im Auftrag von axeld at
BerliOS
Gesendet: Montag, 10. M?rz 2008 20:14
An: haiku-commits at lists.berlios.de
Betreff: [Haiku-commits] r24348 - in haiku/trunk:
headers/os/supportsrc/kits/support

Author: axeld
Date: 2008-03-10 20:14:05 +0100 (Mon, 10 Mar 2008) New Revision: 24348
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24348&view=rev

Modified:
   haiku/trunk/headers/os/support/String.h
   haiku/trunk/src/kits/support/String.cpp
Log:
* As found by Karsten, the reference count was not initialized in
  _ReplaceAtPositions(), and _DoCharacterEscape() (we don't need to preserve
  it, though, as it must be 1).

I thought i mention preserved in case one has called operator[] on the
string and then is going to call ReplaceAll(..), like this:

BString foo("bar");
char &c = foo[0];
...
...
foo.ReplaceAll(.....)

Anyway, great work Axel and Stippi and thanks for spending your time.  :)

Regards,
Karsten



From mauricek at mail.berlios.de  Mon Mar 10 21:38:55 2008
From: mauricek at mail.berlios.de (mauricek at BerliOS)
Date: Mon, 10 Mar 2008 21:38:55 +0100
Subject: [Haiku-commits] r24349 - haiku/trunk/build/jam
Message-ID: <200803102038.m2AKct54024623@sheep.berlios.de>

Author: mauricek
Date: 2008-03-10 21:38:54 +0100 (Mon, 10 Mar 2008)
New Revision: 24349
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24349&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
* added video_window demo to the image
* reordered addons alphabetically like we do for all plugins



Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2008-03-10 19:14:05 UTC (rev 24348)
+++ haiku/trunk/build/jam/HaikuImage	2008-03-10 20:38:54 UTC (rev 24349)
@@ -90,12 +90,14 @@
 	RTF-Translator SGITranslator STXTTranslator TGATranslator
 	TIFFTranslator WonderBrushTranslator
 ;
-BEOS_ADD_ONS_MEDIA = mixer.media_addon 
-	hmulti_audio.media_addon tone_producer_demo.media_addon
+BEOS_ADD_ONS_MEDIA = dvb.media_addon
+	hmulti_audio.media_addon 
+	mixer.media_addon 
+	opensound.media_addon
+    tone_producer_demo.media_addon
+	usb_webcam.media_addon
 	video_producer_demo.media_addon
-	usb_webcam.media_addon
-	dvb.media_addon
-	opensound.media_addon
+	video_window_demo.media_addon
 	#legacy.media_addon
 ;
 BEOS_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder



From bonefish at mail.berlios.de  Mon Mar 10 21:54:00 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 10 Mar 2008 21:54:00 +0100
Subject: [Haiku-commits] r24350 - haiku/trunk/build/jam
Message-ID: <200803102054.m2AKs0D2026592@sheep.berlios.de>

Author: bonefish
Date: 2008-03-10 21:54:00 +0100 (Mon, 10 Mar 2008)
New Revision: 24350
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24350&view=rev

Added:
   haiku/trunk/build/jam/UserBuildConfig.ReadMe
   haiku/trunk/build/jam/UserBuildConfig.sample
Removed:
   haiku/trunk/build/jam/UserBuildConfig.sample
Log:
* Renamed UserBuildConfig.sample to UserBuildConfig.ReadMe and
  uncommented the meaty lines again. Added one or two more explaining
  sentences.
* Created a concise UserBuildConfig.sample with very few comments and
  only the most interesting (commented out) example lines for those
  people who don't read the UserBuildConfig.ReadMe.

I hope everyone can live with this solution.


Copied: haiku/trunk/build/jam/UserBuildConfig.ReadMe (from rev 24348, haiku/trunk/build/jam/UserBuildConfig.sample)
===================================================================
--- haiku/trunk/build/jam/UserBuildConfig.sample	2008-03-10 19:14:05 UTC (rev 24348)
+++ haiku/trunk/build/jam/UserBuildConfig.ReadMe	2008-03-10 20:54:00 UTC (rev 24350)
@@ -0,0 +1,165 @@
+# UserBuildConfig ReadMe
+# ----------------------
+
+# UserBuildConfig can be used to customize the build according to your needs.
+# If existent it is included by the build system, but it is ignored by svn.
+# This file documents a few examples, what can be done. Don't just rename it
+# to UserBuildConfig -- you don't want all the things to happen, that are
+# specified here. Rather create an empty UserBuildConfig and copy the lines
+# you really want, or start out with UserBuildConfig.sample.
+
+# Adding timezone and keymap settings
+AddSymlinkToHaikuImage home config settings
+	: /boot/beos/etc/timezones/Europe/Paris : timezone ;
+
+AddFilesToHaikuImage home config settings : <keymap>US-International 
+	: Key_map ;
+
+
+# Adjusting Build Variables
+
+# The following variables can be configured per subdirectory (or subtree) or
+# even per object file:
+#
+#	CCFLAGS C++FLAGS DEBUG DEFINES HDRS LINKFLAGS OPTIM OPTIMIZE SYSHDRS
+#	WARNINGS
+#	HOST_WARNING_CCFLAGS HOST_WARNING_C++FLAGS
+#	TARGET_WARNING_CCFLAGS TARGET_WARNING_C++FLAGS
+#	PLATFORM SUPPORTED_PLATFORMS
+#
+# The following examples would work analogously for any of these variables.
+
+# Turn off warnings in directory src/system/kernel. As fourth (scope) parameter
+# "local" is specified, which means, that this setting applies only to the
+# given directory, but not any of its subdirectories.
+SetConfigVar WARNINGS : HAIKU_TOP src system kernel : 0 : local ;
+
+# Set the debug level for directory src/system/boot/loader and recursively all
+# of its subdirectories (scope is "global") to 1. All affected generated files
+# will be put into another subtree of the "generated" directory, which allows
+# for fast switching between normal and debug builds.
+SetConfigVar DEBUG : HAIKU_TOP src system boot loader : 1 : global ;
+
+# Add "RUN_WITHOUT_REGISTRAR" to the DEFINES for the directory src/kits and
+# all of its subdirectories.
+AppendToConfigVar DEFINES : HAIKU_TOP src kits : RUN_WITHOUT_REGISTRAR
+	: global ;
+
+# Set the debug level for file src/bin/gdb/gdb/haiku-nat.c (note, that
+# the object file must be specified) to 1. It is worth mentioning, that the
+# executable the object file is linked into (gdb), will still be placed in
+# generated/objects/.../release/... Only when setting DEBUG for the executable,
+# too, it will be placed in .../debug_1/.... Apart from that, the DEBUG variable
+# has no effect on executables or other shared objects.
+DEBUG on <src!bin!gdb!gdb!>haiku-nat.o = 1 ;
+
+
+# Haiku Image Related Modifications
+
+# Create a 100 MB image at /tmp/walter.image.
+HAIKU_IMAGE_NAME	= walter.image ;
+HAIKU_IMAGE_DIR		= /tmp ;
+HAIKU_IMAGE_SIZE	= 100 ;
+
+# Name the VMWare image walter.vmdk (in directory $(HAIKU_IMAGE_DIR)).
+HAIKU_VMWARE_IMAGE_NAME	= walter.vmdk ;
+
+# Install Haiku in directory /Haiku.
+HAIKU_INSTALL_DIR = /Haiku ;
+
+# If the image does already exist it won't be zeroed out. It will nevertheless
+# freshly be initialized with BFS. Useful when installing Haiku on a partition.
+HAIKU_DONT_CLEAR_IMAGE = 1 ;
+
+
+# Affects the haiku-image, haiku-vmware-image, and install-haiku targets. Only
+# targets on which the HAIKU_INCLUDE_IN_IMAGE variable has been set will be
+# updated in the image file/installation directory.
+# The update-image, update-vmware-image, and update-install targets always invoke
+# this rule, so one likely doesn't ever need to do it manually.
+SetUpdateHaikuImageOnly 1 ;
+
+# libbe.so and the kernel will be updated on image updates. Note that this
+# generally doesn't work for pseudo targets (it does where special support
+# has been added, like for "kernel").
+HAIKU_INCLUDE_IN_IMAGE on libbe.so kernel = 1 ;
+
+# Add "crashing_app" to the beos/bin directory of the Haiku image/installation.
+# Note, that this also makes the image depend on the target, i.e. it is
+# automatically updated when the image is built.
+AddFilesToHaikuImage beos bin : crashing_app ;
+
+# Make a symlink to home/config/bin/crash.
+AddSymlinkToHaikuImage home config bin : /beos/bin/crashing_app : crash ;
+
+# Adds the source directories src/kits/storage and src/tests/servers/debug
+# (recursively) to the image (as /boot/home/HaikuSources/src/kits/storage
+# and /boot/home/HaikuSources/src/tests/servers/debug respectively).
+# Note that the second directory will also be copied, if the image will only
+# be updated; the first one won't in that case.
+AddSourceDirectoryToHaikuImage src/kits/storage ;
+AddSourceDirectoryToHaikuImage src/tests/servers/debug : 1 ;
+
+# Unzips the given zip archive onto the image under /boot/develop/tools.
+UnzipArchiveToHaikuImage develop tools
+	: /home/bonefish/develop/haiku/misc/gcc-2.95.3-beos-070218/gcc-2.95.3_binutils-2.17_rel-070218.zip ;
+
+# Add the optional package WonderBrush to the image. The package is downloaded
+# via wget (i.e. wget must be installed).
+AddOptionalHaikuImagePackages WonderBrush ;
+
+# Add all available optional packages.
+HAIKU_ADD_ALL_OPTIONAL_PACKAGES = 1 ;
+
+# Specify scripts that shall be run when populating the image/installation
+# directory. The "early" script is run before anything has been copied onto
+# the image/into the installation directory. The "late" script is run after
+# everything has been copied, but before the MIME database is installed.
+HAIKU_IMAGE_EARLY_USER_SCRIPTS	= $(HAIKU_TOP)/../early-image-script.sh ;
+HAIKU_IMAGE_LATE_USER_SCRIPTS	= $(HAIKU_TOP)/../late-image-script.sh ;
+
+
+# Creating Sourceable Shell Scripts
+
+# If you use shell scripts (e.g. for testing) that need to access targets or
+# build system properties, you can tell the build system to generate a
+# variables defining shell script you can source from your shell script.
+
+# General setup for the shell script to generate. Name is test.inc, located
+# in the output directory.
+MakeLocate test.inc : $(HAIKU_OUTPUT_DIR) ;
+Always test.inc ;
+
+# Define variable "outputDir" in the shell script, with the value of
+# HAIKU_OUTPUT_DIR.
+AddVariableToScript test.inc : outputDir : $(HAIKU_OUTPUT_DIR) ;
+
+# Define variables "bfsShell" and "fsShellCommand" referring to the
+# generated bfs_shell and fs_shell_command respectively.
+AddTargetVariableToScript test.inc : bfs_shell : bfsShell ;
+AddTargetVariableToScript test.inc : fs_shell_command : fsShellCommand ;
+
+# If no variable name is given, the name (without grist) of the target is
+# used, i.e. a variable "rc" referring to the rc command built for the host
+# platform is defined in the script.
+AddTargetVariableToScript test.inc : <build>rc ;
+
+
+# Optimizing Jamfile Parsing Times
+
+# Setting this variable will prevent the root Jamfile to include the Jamfile
+# in the src directory. Instead only the directories required for building the
+# build tools are included. Only useful in combination with DeferredSubInclude.
+HAIKU_DONT_INCLUDE_SRC = 1 ;
+
+# Schedule the given subdirectory for inclusion at the end of the root
+# Jamfile (directly using SubInclude here is not possible). Using this
+# feature together with HAIKU_DONT_INCLUDE_SRC allows developers working
+# only on a subproject to reduce Jamfile parsing times considerably.
+DeferredSubInclude HAIKU_TOP src tests add-ons kernel file_systems
+	userlandfs ;
+
+
+# Copy the posix test suite onto the image (or on the installation) into 
+# "home/posixtestsuite" directory, including the run script.
+HAIKU_ADD_POSIX_TEST_SUITE_TO_IMAGE = 1 ;

Deleted: haiku/trunk/build/jam/UserBuildConfig.sample

Added: haiku/trunk/build/jam/UserBuildConfig.sample
===================================================================
--- haiku/trunk/build/jam/UserBuildConfig.sample	2008-03-10 20:38:54 UTC (rev 24349)
+++ haiku/trunk/build/jam/UserBuildConfig.sample	2008-03-10 20:54:00 UTC (rev 24350)
@@ -0,0 +1,31 @@
+# Quick start file for UserBuildConfig. Copy it and uncomment and edit the
+# lines you want. See UserBuildConfig.ReadMe for details.
+
+# Specify image size in MB.
+#HAIKU_IMAGE_SIZE	= 100 ;
+
+# Install Haiku in directory /Haiku.
+#HAIKU_INSTALL_DIR = /Haiku ;
+
+# Install Haiku on device /dev/sda57. Be sure you know what you're doing!
+#HAIKU_IMAGE_DIR		= /dev ;
+#HAIKU_IMAGE_NAME	= sda57 ;
+#HAIKU_DONT_CLEAR_IMAGE = 1 ;
+
+
+# Enable debugging for directory src/system/boot/loader recursively.
+#SetConfigVar DEBUG : HAIKU_TOP src system boot loader : 1 : global ;
+
+
+# Add symlink/file (timezone and keymap settings) to the image.
+#AddSymlinkToHaikuImage home config settings
+#	: /boot/beos/etc/timezones/Europe/Paris : timezone ;
+#AddFilesToHaikuImage home config settings : <keymap>US-International 
+#	: Key_map ;
+
+
+# Add the optional package WonderBrush to the image.
+#AddOptionalHaikuImagePackages WonderBrush ;
+
+# Add all available optional packages.
+#HAIKU_ADD_ALL_OPTIONAL_PACKAGES = 1 ;



From bonefish at mail.berlios.de  Mon Mar 10 22:43:33 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 10 Mar 2008 22:43:33 +0100
Subject: [Haiku-commits] r24351 - in haiku/trunk: headers/libs/alm
	headers/libs/linprog src/libs/alm src/libs/linprog
	src/tests/libs/linprog
Message-ID: <200803102143.m2ALhXpE031288@sheep.berlios.de>

Author: bonefish
Date: 2008-03-10 22:43:32 +0100 (Mon, 10 Mar 2008)
New Revision: 24351
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24351&view=rev

Removed:
   haiku/trunk/headers/libs/linprog/ObjFunctionSummand.h
   haiku/trunk/src/libs/linprog/ObjFunctionSummand.cpp
Modified:
   haiku/trunk/headers/libs/alm/Area.h
   haiku/trunk/headers/libs/alm/BALMLayout.h
   haiku/trunk/headers/libs/linprog/Constraint.h
   haiku/trunk/headers/libs/linprog/LinearSpec.h
   haiku/trunk/headers/libs/linprog/PenaltyFunction.h
   haiku/trunk/headers/libs/linprog/Summand.h
   haiku/trunk/src/libs/alm/Area.cpp
   haiku/trunk/src/libs/alm/BALMLayout.cpp
   haiku/trunk/src/libs/linprog/Constraint.cpp
   haiku/trunk/src/libs/linprog/Jamfile
   haiku/trunk/src/libs/linprog/LinearSpec.cpp
   haiku/trunk/src/libs/linprog/PenaltyFunction.cpp
   haiku/trunk/src/libs/linprog/Variable.cpp
   haiku/trunk/src/tests/libs/linprog/Program.cpp
Log:
ALM/linprog patch by Christof Lutteroth:
* Got rid of class ObjFunctionSummand. Both the constraint summands and
  the objective function summands are now stored using class Summand.
* Some method names are more BeOS compliant now: SetX instead of ChangeX.
* linprog test code now uses new AddConstraint methods.
* CalculateMinSize and CalculateMaxSize did not free the memory they
  allocated.
* Removed inappropriate setter and getter methods.
* Memory allocated in class Constraint is freed now.
* Other small changes.



Modified: haiku/trunk/headers/libs/alm/Area.h
===================================================================
--- haiku/trunk/headers/libs/alm/Area.h	2008-03-10 20:54:00 UTC (rev 24350)
+++ haiku/trunk/headers/libs/alm/Area.h	2008-03-10 21:43:32 UTC (rev 24351)
@@ -32,6 +32,7 @@
 public:
 	bool				AutoPrefContentSize() const;
 	void				SetAutoPrefContentSize(bool value);
+	
 	XTab*				Left() const;
 	void				SetLeft(XTab* left);
 	XTab*				Right() const;
@@ -40,10 +41,12 @@
 	void				SetTop(YTab* top);
 	YTab*				Bottom() const;
 	void				SetBottom(YTab* bottom);
+
 	Row*				GetRow() const;
 	void				SetRow(Row* row);
 	Column*				GetColumn() const;
 	void				SetColumn(Column* column);
+
 	BView*				Content() const;
 	void				SetContent(BView* content);
 	XTab*				ContentLeft() const;
@@ -76,6 +79,7 @@
 	void				SetBottomInset(int32 bottom);
 	void				SetDefaultPrefContentSize();
 	//~ string			ToString();
+
 	Constraint*			HasSameWidthAs(Area* area);
 	Constraint*			HasSameHeightAs(Area* area);
 	BList*				HasSameSizetAs(Area* area);
@@ -92,18 +96,18 @@
 	void				DoLayout();
 	
 private:
-	void					InitChildArea();
-	void					UpdateHorizontal();
-	void					UpdateVertical();
-	void					Init(BALMLayout* ls, XTab* left, YTab* top, 
-								XTab* right, YTab* bottom, 
-								BView* content, 
-								BSize minContentSize);
+	void				InitChildArea();
+	void				UpdateHorizontal();
+	void				UpdateVertical();
+	void				Init(BALMLayout* ls, XTab* left, YTab* top, 
+							XTab* right, YTab* bottom, 
+							BView* content, 
+							BSize minContentSize);
 
 public:
-	static BSize			kMaxSize;
-	static BSize			kMinSize;
-	static BSize			kUndefinedSize;
+	static BSize		kMaxSize;
+	static BSize		kMinSize;
+	static BSize		kUndefinedSize;
 
 protected:
 	BView*				fContent;
@@ -152,3 +156,4 @@
 using BALM::Area;
 
 #endif	// AREA_H
+

Modified: haiku/trunk/headers/libs/alm/BALMLayout.h
===================================================================
--- haiku/trunk/headers/libs/alm/BALMLayout.h	2008-03-10 20:54:00 UTC (rev 24350)
+++ haiku/trunk/headers/libs/alm/BALMLayout.h	2008-03-10 21:43:32 UTC (rev 24351)
@@ -33,7 +33,7 @@
 		
 public:
 						BALMLayout();
-	void					SolveLayout();
+	void				SolveLayout();
 
 	XTab*				AddXTab();
 	YTab*				AddYTab();
@@ -41,6 +41,7 @@
 	Row*				AddRow(YTab* top, YTab* bottom);
 	Column*				AddColumn();
 	Column*				AddColumn(XTab* left, XTab* right);
+	
 	Area*				AddArea(XTab* left, YTab* top, XTab* right, YTab* bottom,
 								BView* content, BSize minContentSize);
 	Area*				AddArea(Row* row, Column* column, BView* content,
@@ -50,40 +51,37 @@
 	Area*				AddArea(Row* row, Column* column, BView* content);
 	Area*				AreaOf(BView* control);
 	BList*				Areas() const;
-	void					SetAreas(BList* areas);
+
 	XTab*				Left() const;
-	void					SetLeft(XTab* left);
 	XTab*				Right() const;
-	void					SetRight(XTab* right);
 	YTab*				Top() const;
-	void					SetTop(YTab* top);
 	YTab*				Bottom() const;
-	void					SetBottom(YTab* bottom);
 	
-	void					RecoverLayout(BView* parent);
+	void				RecoverLayout(BView* parent);
+	
 	LayoutStyleType		LayoutStyle() const;
-	void					SetLayoutStyle(LayoutStyleType style);
+	void				SetLayoutStyle(LayoutStyleType style);
 
-	BLayoutItem*			AddView(BView* child);
-	BLayoutItem*			AddView(int32 index, BView* child);
+	BLayoutItem*		AddView(BView* child);
+	BLayoutItem*		AddView(int32 index, BView* child);
 	bool				AddItem(BLayoutItem* item);
 	bool				AddItem(int32 index, BLayoutItem* item);
 	bool				RemoveView(BView* child);
 	bool				RemoveItem(BLayoutItem* item);
-	BLayoutItem*			RemoveItem(int32 index);
+	BLayoutItem*		RemoveItem(int32 index);
 
 	BSize				MinSize();
 	BSize				MaxSize();
 	BSize				PreferredSize();
 	BAlignment			Alignment();
 	bool				HasHeightForWidth();
-	void					GetHeightForWidth(float width, float* min,
+	void				GetHeightForWidth(float width, float* min,
 								float* max, float* preferred);
-	void					InvalidateLayout();
-	void					LayoutView();
+	void				InvalidateLayout();
+	void				LayoutView();
 	
 	char*				PerformancePath() const;
-	void					SetPerformancePath(char* path);
+	void				SetPerformancePath(char* path);
 
 private:
 	BSize				CalculateMinSize();

Modified: haiku/trunk/headers/libs/linprog/Constraint.h
===================================================================
--- haiku/trunk/headers/libs/linprog/Constraint.h	2008-03-10 20:54:00 UTC (rev 24350)
+++ haiku/trunk/headers/libs/linprog/Constraint.h	2008-03-10 21:43:32 UTC (rev 24351)
@@ -9,7 +9,7 @@
 
 #include "OperatorType.h"
 #include "Variable.h"
-#include "ObjFunctionSummand.h"
+#include "Summand.h"
 
 #include <List.h>
 #include <String.h>
@@ -29,18 +29,21 @@
 	
 public:
 	int32				Index();
-	BList*				Summands();
-	void				ChangeLeftSide(BList* summands);
-	void				ChangeLeftSide(double coeff1, Variable* var1);
-	void				ChangeLeftSide(double coeff1, Variable* var1, 
+	
+	BList*				LeftSide();
+	void				SetLeftSide(BList* summands);
+	void				UpdateLeftSide();
+	void				SetLeftSide(double coeff1, Variable* var1);
+	void				SetLeftSide(double coeff1, Variable* var1, 
 							double coeff2, Variable* var2);
-	void				ChangeLeftSide(double coeff1, Variable* var1, 
+	void				SetLeftSide(double coeff1, Variable* var1, 
 							double coeff2, Variable* var2,
 							double coeff3, Variable* var3);
-	void				ChangeLeftSide(double coeff1, Variable* var1, 
+	void				SetLeftSide(double coeff1, Variable* var1, 
 							double coeff2, Variable* var2,
 							double coeff3, Variable* var3,
 							double coeff4, Variable* var4);
+
 	OperatorType		Op();
 	void				SetOp(OperatorType value);
 	double				RightSide();
@@ -49,6 +52,7 @@
 	void				SetPenaltyNeg(double value);
 	double				PenaltyPos();
 	void				SetPenaltyPos(double value);
+
 	Variable*			DNeg() const;
 	Variable*			DPos() const;
 	
@@ -56,21 +60,17 @@
 						~Constraint();
 
 protected:
-						Constraint(LinearSpec* ls, BList* summands, 
+						Constraint(LinearSpec* ls, BList* summands,
 								OperatorType op, double rightSide,
 								double penaltyNeg, double penaltyPos);
 
 private:
 	LinearSpec*			fLS;
-	BList*				fSummands;
+	BList*				fLeftSide;
 	OperatorType		fOp;
 	double				fRightSide;
-	Variable*			fDNeg;
-	Variable*			fDPos;
-	ObjFunctionSummand*	fDNegSummand;
-	ObjFunctionSummand*	fDPosSummand;
-	
-	void				_UpdateLeftSide();
+	Summand*			fDNegObjSummand;
+	Summand*			fDPosObjSummand;
 
 public:
 	friend class		LinearSpec;
@@ -82,3 +82,4 @@
 using LinearProgramming::Constraint;
 
 #endif	// CONSTRAINT_H
+

Modified: haiku/trunk/headers/libs/linprog/LinearSpec.h
===================================================================
--- haiku/trunk/headers/libs/linprog/LinearSpec.h	2008-03-10 20:54:00 UTC (rev 24350)
+++ haiku/trunk/headers/libs/linprog/LinearSpec.h	2008-03-10 21:43:32 UTC (rev 24351)
@@ -7,6 +7,10 @@
 #ifndef	LINEAR_SPEC_H
 #define	LINEAR_SPEC_H
 
+#include "Variable.h"
+#include "Constraint.h"
+#include "Summand.h"
+#include "PenaltyFunction.h"
 #include "OperatorType.h"
 #include "ResultType.h"
 #include "OptimizationType.h"
@@ -34,9 +38,7 @@
 public:
 						LinearSpec();
 						~LinearSpec();
-	void				UpdateObjFunction();
-	void				SetObjFunction(BList* summands);
-	ObjFunctionSummand*	AddObjFunctionSummand(double coeff, Variable* var);
+
 	Variable*			AddVariable();
 
 	Constraint*			AddConstraint(BList* summands, 
@@ -79,47 +81,42 @@
 								double penaltyNeg, double penaltyPos);
 	
 	PenaltyFunction*	AddPenaltyFunction(Variable* var, BList* xs, BList* gs);
-	void				RemovePresolved();
+
+	BList*				ObjFunction();
+	void				SetObjFunction(BList* summands);
+	void				UpdateObjFunction();
+
 	ResultType			Presolve();
+	void				RemovePresolved();
 	ResultType			Solve();
 	void				Save(char* fname);
 
-	int32				Columns() const;
-	void				SetColumns(int32 value);
+	int32				CountColumns() const;
 	OptimizationType	Optimization() const;
 	void				SetOptimization(OptimizationType value);
-	lprec*				LP() const;
-	void				SetLP(lprec* value);
-	BList*				ObjFunctionSummands() const;
-	void				SetObjFunctionSummands(BList* value);
 	BList*				Variables() const;
-	void				SetVariables(BList* value);
 	BList*				Constraints() const;
-	void				SetConstraints(BList* value);
 	ResultType			Result() const;
-	void				SetResult(ResultType value);
 	double				ObjectiveValue() const;
-	void				SetObjectiveValue(double value);
 	double				SolvingTime() const;
-	void				SetSolvingTime(double value);
 
 protected:
-	int32 				fColumns;
+	int32 				fCountColumns;
 
 private:
 	lprec*				fLpPresolved;
 	OptimizationType	fOptimization;
 	lprec*				fLP;
-	BList*				fObjFunctionSummands;
+	BList*				fObjFunction;
 	BList*				fVariables;
 	BList*				fConstraints;
 	ResultType			fResult;
 	double 				fObjectiveValue;
-	double 				fSolvingTime;		// = Double.Nan
+	double 				fSolvingTime;
 
 public:
-	friend class		ObjFunctionSummand;
 	friend class		Constraint;
+	friend class		Variable;
 
 };
 

Deleted: haiku/trunk/headers/libs/linprog/ObjFunctionSummand.h

Modified: haiku/trunk/headers/libs/linprog/PenaltyFunction.h
===================================================================
--- haiku/trunk/headers/libs/linprog/PenaltyFunction.h	2008-03-10 20:54:00 UTC (rev 24350)
+++ haiku/trunk/headers/libs/linprog/PenaltyFunction.h	2008-03-10 21:43:32 UTC (rev 24351)
@@ -26,12 +26,12 @@
 public:
 						~PenaltyFunction();
 	const Variable*		Var() const;
-	const BList*			Xs() const;
-	const BList*			Gs() const;
+	const BList*		Xs() const;
+	const BList*		Gs() const;
 
 private:
 	LinearSpec*			fLS;
-	Variable*				fVar;
+	Variable*			fVar;
 	BList*				fXs;		// double
 	BList*				fGs;		// double
 	BList*				fConstraints;
@@ -47,3 +47,4 @@
 using LinearProgramming::PenaltyFunction;
 
 #endif	// PENALTY_FUNCTION_H
+

Modified: haiku/trunk/headers/libs/linprog/Summand.h
===================================================================
--- haiku/trunk/headers/libs/linprog/Summand.h	2008-03-10 20:54:00 UTC (rev 24350)
+++ haiku/trunk/headers/libs/linprog/Summand.h	2008-03-10 21:43:32 UTC (rev 24351)
@@ -37,3 +37,4 @@
 using LinearProgramming::Summand;
 
 #endif	// OBJ_FUNCTION_SUMMAND_H
+

Modified: haiku/trunk/src/libs/alm/Area.cpp
===================================================================
--- haiku/trunk/src/libs/alm/Area.cpp	2008-03-10 20:54:00 UTC (rev 24350)
+++ haiku/trunk/src/libs/alm/Area.cpp	2008-03-10 21:43:32 UTC (rev 24351)
@@ -77,10 +77,10 @@
 	fColumn = NULL;
 	
 	if (fChildArea == NULL) {
-		fMinContentWidth->ChangeLeftSide(-1.0, fLeft, 1.0, fRight);
+		fMinContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight);
 	
 		if (fMaxContentWidth != NULL)
-			fMaxContentWidth->ChangeLeftSide(-1.0, fLeft, 1.0, fRight);
+			fMaxContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight);
 	} else
 		UpdateHorizontal();
 	fLS->InvalidateLayout();
@@ -112,10 +112,10 @@
 	fColumn = NULL;
 	
 	if (fChildArea == NULL) {
-		fMinContentWidth->ChangeLeftSide(-1.0, fLeft, 1.0, fRight);
+		fMinContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight);
 	
 		if (fMaxContentWidth != NULL)
-			fMaxContentWidth->ChangeLeftSide(-1.0, fLeft, 1.0, fRight);
+			fMaxContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight);
 	} else
 		UpdateHorizontal();
 	fLS->InvalidateLayout();
@@ -143,10 +143,10 @@
 	fRow = NULL;
 	
 	if (fChildArea == NULL) {
-		fMinContentHeight->ChangeLeftSide(-1.0, fTop, 1.0, fBottom);
+		fMinContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom);
 		
 		if (fMaxContentHeight != NULL)
-			fMaxContentHeight->ChangeLeftSide(-1.0, fTop, 1.0, fBottom);
+			fMaxContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom);
 	} else
 		UpdateVertical();
 	fLS->InvalidateLayout();
@@ -174,10 +174,10 @@
 	fRow = NULL;
 	
 	if (fChildArea == NULL) {
-		fMinContentHeight->ChangeLeftSide(-1.0, fTop, 1.0, fBottom);
+		fMinContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom);
 		
 		if (fMaxContentHeight != NULL)
-			fMaxContentHeight->ChangeLeftSide(-1.0, fTop, 1.0, fBottom);
+			fMaxContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom);
 	} else
 		UpdateVertical();
 	fLS->InvalidateLayout();
@@ -471,7 +471,7 @@
 				OperatorType(EQ), 0.0);
 			fConstraints->AddItem(fContentAspectRatioC);
 		} else {
-			fContentAspectRatioC->ChangeLeftSide(
+			fContentAspectRatioC->SetLeftSide(
 				-1.0, fLeft, 1.0, fRight, ratio, fTop, -ratio, fBottom);
 		}
 	} else
@@ -855,10 +855,10 @@
 		fChildArea->fMaxContentSize = fMaxContentSize;
 		
 		fChildArea->fMaxContentWidth = fMaxContentWidth;
-		fMaxContentWidth->ChangeLeftSide(-1.0, fChildArea->Left(), 1.0, fChildArea->Right());
+		fMaxContentWidth->SetLeftSide(-1.0, fChildArea->Left(), 1.0, fChildArea->Right());
 		
 		fChildArea->fMaxContentHeight = fMaxContentHeight;
-		fMaxContentHeight->ChangeLeftSide(-1.0, fChildArea->Top(), 1.0, fChildArea->Bottom());
+		fMaxContentHeight->SetLeftSide(-1.0, fChildArea->Top(), 1.0, fChildArea->Bottom());
 	}
 	
 	// if there are preferred content size constraints on this area, 
@@ -870,10 +870,10 @@
 		fChildArea->fExpandRigidity = fExpandRigidity;
 		
 		fChildArea->fPrefContentWidth = fPrefContentWidth;
-		fPrefContentWidth->ChangeLeftSide(-1.0, fChildArea->Left(), 1.0, fChildArea->Right());
+		fPrefContentWidth->SetLeftSide(-1.0, fChildArea->Left(), 1.0, fChildArea->Right());
 		
 		fChildArea->fPrefContentHeight = fPrefContentHeight;
-		fPrefContentHeight->ChangeLeftSide(-1.0, fChildArea->Top(), 1.0, fChildArea->Bottom());
+		fPrefContentHeight->SetLeftSide(-1.0, fChildArea->Top(), 1.0, fChildArea->Bottom());
 	}
 }
 
@@ -891,43 +891,43 @@
 	// change the constraints leftConstraint and rightConstraint so that the horizontal 
 	// alignment and insets of the childArea within this area are as specified by the user
 	if (fAlignment.Horizontal() == B_ALIGN_LEFT) {
-		fLeftConstraint->ChangeLeftSide(-1.0, fLeft, 1.0, fChildArea->Left());
+		fLeftConstraint->SetLeftSide(-1.0, fLeft, 1.0, fChildArea->Left());
 		fLeftConstraint->SetOp(OperatorType(EQ));
 		fLeftConstraint->SetRightSide(fLeftInset);
 		
-		fRightConstraint->ChangeLeftSide(-1.0, fChildArea->Right(), 1.0, fRight);
+		fRightConstraint->SetLeftSide(-1.0, fChildArea->Right(), 1.0, fRight);
 		fRightConstraint->SetOp(OperatorType(GE));
 		fRightConstraint->SetRightSide(fRightInset);
 	} else if (fAlignment.Horizontal() == B_ALIGN_RIGHT) {
-		fLeftConstraint->ChangeLeftSide(-1.0, fLeft, 1.0, fChildArea->Left());
+		fLeftConstraint->SetLeftSide(-1.0, fLeft, 1.0, fChildArea->Left());
 		fLeftConstraint->SetOp(OperatorType(GE));
 		fLeftConstraint->SetRightSide(fLeftInset);
 		
-		fRightConstraint->ChangeLeftSide(-1.0, fChildArea->Right(), 1.0, fRight);
+		fRightConstraint->SetLeftSide(-1.0, fChildArea->Right(), 1.0, fRight);
 		fRightConstraint->SetOp(OperatorType(EQ));
 		fRightConstraint->SetRightSide(fRightInset);
 	} else if (fAlignment.Horizontal() == B_ALIGN_HORIZONTAL_CENTER) {
-		fLeftConstraint->ChangeLeftSide(-1.0, fLeft, 1.0, fChildArea->Left());
+		fLeftConstraint->SetLeftSide(-1.0, fLeft, 1.0, fChildArea->Left());
 		fLeftConstraint->SetOp(OperatorType(GE));
 		fLeftConstraint->SetRightSide(max(fLeftInset, fRightInset));
 		
-		fRightConstraint->ChangeLeftSide(-1.0, fLeft, 1.0, fChildArea->Left(), 1.0, fChildArea->Right(), -1.0, fRight);
+		fRightConstraint->SetLeftSide(-1.0, fLeft, 1.0, fChildArea->Left(), 1.0, fChildArea->Right(), -1.0, fRight);
 		fRightConstraint->SetOp(OperatorType(EQ));
 		fRightConstraint->SetRightSide(0);
 	} else if (fAlignment.Horizontal() == B_ALIGN_USE_FULL_WIDTH) {
-		fLeftConstraint->ChangeLeftSide(-1.0, fLeft, 1.0, fChildArea->Left());
+		fLeftConstraint->SetLeftSide(-1.0, fLeft, 1.0, fChildArea->Left());
 		fLeftConstraint->SetOp(OperatorType(EQ));
 		fLeftConstraint->SetRightSide(fLeftInset);
 		
-		fRightConstraint->ChangeLeftSide(-1.0, fChildArea->Right(), 1.0, fRight);
+		fRightConstraint->SetLeftSide(-1.0, fChildArea->Right(), 1.0, fRight);
 		fRightConstraint->SetOp(OperatorType(EQ));
 		fRightConstraint->SetRightSide(fRightInset);
 	} else if (fAlignment.Horizontal() == B_ALIGN_HORIZONTAL_UNSET) {
-		fLeftConstraint->ChangeLeftSide(-1.0, fLeft, 1.0, fChildArea->Left());
+		fLeftConstraint->SetLeftSide(-1.0, fLeft, 1.0, fChildArea->Left());
 		fLeftConstraint->SetOp(OperatorType(GE));
 		fLeftConstraint->SetRightSide(fLeftInset);
 		
-		fRightConstraint->ChangeLeftSide(-1.0, fChildArea->Right(), 1.0, fRight);
+		fRightConstraint->SetLeftSide(-1.0, fChildArea->Right(), 1.0, fRight);
 		fRightConstraint->SetOp(OperatorType(GE));
 		fRightConstraint->SetRightSide(fRightInset);
 	}
@@ -945,43 +945,43 @@
 	// change the constraints topConstraint and bottomConstraint so that the vertical 
 	// alignment and insets of the childArea within this area are as specified by the user
 	if (fAlignment.Vertical() == B_ALIGN_TOP) {
-		fTopConstraint->ChangeLeftSide(-1.0, fTop, 1.0, fChildArea->Top());
+		fTopConstraint->SetLeftSide(-1.0, fTop, 1.0, fChildArea->Top());
 		fTopConstraint->SetOp(OperatorType(EQ));
 		fTopConstraint->SetRightSide(fTopInset);
 		
-		fBottomConstraint->ChangeLeftSide(-1.0, fChildArea->Bottom(), 1.0, fBottom);
+		fBottomConstraint->SetLeftSide(-1.0, fChildArea->Bottom(), 1.0, fBottom);
 		fBottomConstraint->SetOp(OperatorType(GE));
 		fBottomConstraint->SetRightSide(fBottomInset);
 	} else if (fAlignment.Vertical() == B_ALIGN_BOTTOM) {
-		fTopConstraint->ChangeLeftSide(-1.0, fTop, 1.0, fChildArea->Top());
+		fTopConstraint->SetLeftSide(-1.0, fTop, 1.0, fChildArea->Top());
 		fTopConstraint->SetOp(OperatorType(GE));
 		fTopConstraint->SetRightSide(fTopInset);
 		
-		fBottomConstraint->ChangeLeftSide(-1.0, fChildArea->Bottom(), 1.0, fBottom);
+		fBottomConstraint->SetLeftSide(-1.0, fChildArea->Bottom(), 1.0, fBottom);
 		fBottomConstraint->SetOp(OperatorType(EQ));
 		fBottomConstraint->SetRightSide(fBottomInset);
 	} else if (fAlignment.Vertical() == B_ALIGN_VERTICAL_CENTER) {
-		fTopConstraint->ChangeLeftSide(-1.0, fTop, 1.0, fChildArea->Top());
+		fTopConstraint->SetLeftSide(-1.0, fTop, 1.0, fChildArea->Top());
 		fTopConstraint->SetOp(OperatorType(GE));
 		fTopConstraint->SetRightSide(max(fTopInset, fBottomInset));
 		
-		fBottomConstraint->ChangeLeftSide(-1.0, fTop, 1.0, fChildArea->Top(), 1.0, fChildArea->Bottom(), -1.0, fBottom);
+		fBottomConstraint->SetLeftSide(-1.0, fTop, 1.0, fChildArea->Top(), 1.0, fChildArea->Bottom(), -1.0, fBottom);
 		fBottomConstraint->SetOp(OperatorType(EQ));
 		fBottomConstraint->SetRightSide(0);
 	} else if (fAlignment.Vertical() == B_ALIGN_USE_FULL_HEIGHT) {
-		fTopConstraint->ChangeLeftSide(-1.0, fTop, 1.0, fChildArea->Top());
+		fTopConstraint->SetLeftSide(-1.0, fTop, 1.0, fChildArea->Top());
 		fTopConstraint->SetOp(OperatorType(EQ));
 		fTopConstraint->SetRightSide(fTopInset);
 		
-		fBottomConstraint->ChangeLeftSide(-1.0, fChildArea->Bottom(), 1.0, fBottom);
+		fBottomConstraint->SetLeftSide(-1.0, fChildArea->Bottom(), 1.0, fBottom);
 		fBottomConstraint->SetOp(OperatorType(EQ));
 		fBottomConstraint->SetRightSide(fBottomInset);
 	} else if (fAlignment.Vertical() == B_ALIGN_VERTICAL_UNSET) {
-		fTopConstraint->ChangeLeftSide(-1.0, fTop, 1.0, fChildArea->Top());
+		fTopConstraint->SetLeftSide(-1.0, fTop, 1.0, fChildArea->Top());
 		fTopConstraint->SetOp(OperatorType(GE));
 		fTopConstraint->SetRightSide(fTopInset);
 		
-		fBottomConstraint->ChangeLeftSide(-1.0, fChildArea->Bottom(), 1.0, fBottom);
+		fBottomConstraint->SetLeftSide(-1.0, fChildArea->Bottom(), 1.0, fBottom);
 		fBottomConstraint->SetOp(OperatorType(GE));
 		fBottomConstraint->SetRightSide(fBottomInset);
 	}

Modified: haiku/trunk/src/libs/alm/BALMLayout.cpp
===================================================================
--- haiku/trunk/src/libs/alm/BALMLayout.cpp	2008-03-10 20:54:00 UTC (rev 24350)
+++ haiku/trunk/src/libs/alm/BALMLayout.cpp	2008-03-10 21:43:32 UTC (rev 24351)
@@ -290,18 +290,6 @@
 
 
 /**
- * Sets the ares.
- *
- * @param areas	the areas
- */
-void
-BALMLayout::SetAreas(BList* areas)
-{
-	fAreas = areas;
-}
-
-
-/**
  * Gets the left variable.
  */
 XTab*
@@ -312,16 +300,6 @@
 
 
 /**
- * Sets the left variable.
- */
-void
-BALMLayout::SetLeft(XTab* left)
-{
-	fLeft = left;
-}
-
-
-/**
  * Gets the right variable.
  */
 XTab*
@@ -332,16 +310,6 @@
 
 
 /**
- * Sets the right variable.
- */
-void
-BALMLayout::SetRight(XTab* right)
-{
-	fRight = right;
-}
-
-
-/**
  * Gets the top variable.
  */
 YTab*
@@ -352,16 +320,6 @@
 
 
 /**
- * Sets the top variable.
- */
-void
-BALMLayout::SetTop(YTab* top)
-{
-	fTop = top;
-}
-
-
-/**
  * Gets the bottom variable.
  */
 YTab*
@@ -372,16 +330,6 @@
 
 
 /**
- * Sets the bottom variable.
- */
-void
-BALMLayout::SetBottom(YTab* bottom)
-{
-	fBottom = bottom;
-}
-
-
-/**
  * Reverse engineers a GUI and recovers an ALM specification.
  * @param parent	the parent container of the GUI
  */
@@ -641,14 +589,17 @@
 BSize
 BALMLayout::CalculateMinSize()
 {
-	printf("CalculateMinSize");
-	BList* buf = ObjFunctionSummands();
-	SetObjFunctionSummands(new BList(2));
-	AddObjFunctionSummand(1.0, fRight);
-	AddObjFunctionSummand(1.0, fBottom);
+	BList* oldObjFunction = ObjFunction();
+	BList* newObjFunction = new BList(2);
+	newObjFunction->AddItem(new Summand(1.0, fRight));
+	newObjFunction->AddItem(new Summand(1.0, fBottom));
+	SetObjFunction(newObjFunction);
 	SolveLayout();
-	SetObjFunctionSummands(buf);
+	SetObjFunction(oldObjFunction);
 	UpdateObjFunction();
+	delete (Summand*)newObjFunction->ItemAt(0);
+	delete (Summand*)newObjFunction->ItemAt(1);
+	delete newObjFunction;
 	
 	if (Result() == UNBOUNDED)
 		return Area::kMinSize;
@@ -667,14 +618,17 @@
 BSize
 BALMLayout::CalculateMaxSize()
 {
-	printf("CalculateMaxSize");
-	BList* buf = ObjFunctionSummands();
-	SetObjFunctionSummands(new BList(2));
-	AddObjFunctionSummand(-1.0, fRight);
-	AddObjFunctionSummand(-1.0, fBottom);
+	BList* oldObjFunction = ObjFunction();
+	BList* newObjFunction = new BList(2);
+	newObjFunction->AddItem(new Summand(-1.0, fRight));
+	newObjFunction->AddItem(new Summand(-1.0, fBottom));
+	SetObjFunction(newObjFunction);
 	SolveLayout();
-	SetObjFunctionSummands(buf);
+	SetObjFunction(oldObjFunction);
 	UpdateObjFunction();
+	delete (Summand*)newObjFunction->ItemAt(0);
+	delete (Summand*)newObjFunction->ItemAt(1);
+	delete newObjFunction;
 	
 	if (Result() == UNBOUNDED)
 		return Area::kMaxSize;
@@ -693,7 +647,6 @@
 BSize
 BALMLayout::CalculatePreferredSize()
 {
-	printf("CalculatePreferredSize");
 	SolveLayout();
 	if (Result() != OPTIMAL) {
 		Save("failed-layout.txt");

Modified: haiku/trunk/src/libs/linprog/Constraint.cpp
===================================================================
--- haiku/trunk/src/libs/linprog/Constraint.cpp	2008-03-10 20:54:00 UTC (rev 24350)
+++ haiku/trunk/src/libs/linprog/Constraint.cpp	2008-03-10 21:43:32 UTC (rev 24351)
@@ -27,107 +27,116 @@
 
 
 /**
- * Gets the summands of the constraint.
+ * Gets the left side of the constraint.
  * 
- * @return pointer to a BList containing the summands of the constraint
+ * @return pointer to a BList containing the summands on the left side of the constraint
  */
 BList*
-Constraint::Summands()
+Constraint::LeftSide()
 {
-	return fSummands;
+	return fLeftSide;
 }
 
 
+/**
+ * Sets the summands on the left side of the constraint.
+ * The old summands are NOT deleted.
+ * 
+ * @param summands	a BList containing the Summand objects that make up the new left side
+ */
 void
-Constraint::_UpdateLeftSide()
+Constraint::SetLeftSide(BList* summands)
 {
-	double coeffs[fSummands->CountItems() + 2];
-	int varIndexes[fSummands->CountItems() + 2];
+	fLeftSide = summands;
+	UpdateLeftSide();
+}
+
+
+void
+Constraint::UpdateLeftSide()
+{
+	double coeffs[fLeftSide->CountItems() + 2];
+	int varIndexes[fLeftSide->CountItems() + 2];
 	int32 i;
-	for (i = 0; i < fSummands->CountItems(); i++) {
-		Summand* s = (Summand*)fSummands->ItemAt(i);
+	for (i = 0; i < fLeftSide->CountItems(); i++) {
+		Summand* s = (Summand*)fLeftSide->ItemAt(i);
 		coeffs[i] = s->Coeff();
 		varIndexes[i] = s->Var()->Index();
 	}
 	
-	if (fDNegSummand != NULL && fOp != OperatorType(LE)) {
-		varIndexes[i] = fDNegSummand->Var()->Index();
+	if (fDNegObjSummand != NULL && fOp != OperatorType(LE)) {
+		varIndexes[i] = fDNegObjSummand->Var()->Index();
 		coeffs[i] = 1.0;
 		i++;
 	}
 	
-	if (fDPosSummand != NULL && fOp != OperatorType(GE)) {
-		varIndexes[i] = fDPosSummand->Var()->Index();
+	if (fDPosObjSummand != NULL && fOp != OperatorType(GE)) {
+		varIndexes[i] = fDPosObjSummand->Var()->Index();
 		coeffs[i] = -1.0;
 		i++;
 	}
 	
-	if (!set_rowex(fLS->LP(), this->Index(), i, &coeffs[0], &varIndexes[0]))
+	if (!set_rowex(fLS->fLP, this->Index(), i, &coeffs[0], &varIndexes[0]))
 		printf("Error in set_rowex.");
 	
+	fLS->UpdateObjFunction();
 	fLS->RemovePresolved();
 }
 
 
-/**
- * Changes the left side of the constraint, i.e.&nbsp;its coefficients and variables.
- * There must be exactly one coefficient for each variable.
- * 
- * @param summands	a BList containing the Summand objects that make up the new left side
- */
 void
-Constraint::ChangeLeftSide(BList* summands)
+Constraint::SetLeftSide(double coeff1, Variable* var1)
 {
-	fSummands = summands;
-	_UpdateLeftSide();
+	for (int i=0; i<fLeftSide->CountItems(); i++)
+		delete (Summand*)fLeftSide->ItemAt(i);
+	fLeftSide->MakeEmpty();
+	fLeftSide->AddItem(new Summand(coeff1, var1));
+	UpdateLeftSide();
 }
 
 
 void
-Constraint::ChangeLeftSide(double coeff1, Variable* var1)
-{
-	fSummands->MakeEmpty();
-	fSummands->AddItem(new Summand(coeff1, var1));
-	_UpdateLeftSide();
-}
-
-
-void
-Constraint::ChangeLeftSide(double coeff1, Variable* var1, 
+Constraint::SetLeftSide(double coeff1, Variable* var1, 
 	double coeff2, Variable* var2)
 {
-	fSummands->MakeEmpty();
-	fSummands->AddItem(new Summand(coeff1, var1));
-	fSummands->AddItem(new Summand(coeff2, var2));
-	_UpdateLeftSide();
+	for (int i=0; i<fLeftSide->CountItems(); i++)
+		delete (Summand*)fLeftSide->ItemAt(i);
+	fLeftSide->MakeEmpty();
+	fLeftSide->AddItem(new Summand(coeff1, var1));
+	fLeftSide->AddItem(new Summand(coeff2, var2));
+	UpdateLeftSide();
 }
 
 	
 void
-Constraint::ChangeLeftSide(double coeff1, Variable* var1, 
+Constraint::SetLeftSide(double coeff1, Variable* var1, 
 	double coeff2, Variable* var2,
 	double coeff3, Variable* var3)
 {
-	fSummands->MakeEmpty();
-	fSummands->AddItem(new Summand(coeff1, var1));
-	fSummands->AddItem(new Summand(coeff2, var2));
-	fSummands->AddItem(new Summand(coeff3, var3));
-	_UpdateLeftSide();
+	for (int i=0; i<fLeftSide->CountItems(); i++)
+		delete (Summand*)fLeftSide->ItemAt(i);
+	fLeftSide->MakeEmpty();
+	fLeftSide->AddItem(new Summand(coeff1, var1));
+	fLeftSide->AddItem(new Summand(coeff2, var2));
+	fLeftSide->AddItem(new Summand(coeff3, var3));
+	UpdateLeftSide();
 }
 
 
 void
-Constraint::ChangeLeftSide(double coeff1, Variable* var1,
+Constraint::SetLeftSide(double coeff1, Variable* var1,
 	double coeff2, Variable* var2,
 	double coeff3, Variable* var3,
 	double coeff4, Variable* var4)
 {
-	fSummands->MakeEmpty();
-	fSummands->AddItem(new Summand(coeff1, var1));
-	fSummands->AddItem(new Summand(coeff2, var2));
-	fSummands->AddItem(new Summand(coeff3, var3));
-	fSummands->AddItem(new Summand(coeff4, var4));
-	_UpdateLeftSide();
+	for (int i=0; i<fLeftSide->CountItems(); i++)
+		delete (Summand*)fLeftSide->ItemAt(i);
+	fLeftSide->MakeEmpty();
+	fLeftSide->AddItem(new Summand(coeff1, var1));
+	fLeftSide->AddItem(new Summand(coeff2, var2));
+	fLeftSide->AddItem(new Summand(coeff3, var3));
+	fLeftSide->AddItem(new Summand(coeff4, var4));
+	UpdateLeftSide();
 }
 
 
@@ -152,7 +161,7 @@
 Constraint::SetOp(OperatorType value)
 {
 	fOp = value;
-	if (!set_constr_type(fLS->LP(), this->Index(),
+	if (!set_constr_type(fLS->fLP, this->Index(),
 			((fOp == OperatorType(EQ)) ? EQ
 			: (fOp == OperatorType(GE)) ? GE
 			: LE)))
@@ -183,7 +192,7 @@
 Constraint::SetRightSide(double value)
 {
 	fRightSide = value;
-	if (!set_rh(fLS->LP(), Index(), fRightSide))
+	if (!set_rh(fLS->fLP, Index(), fRightSide))
 		printf("Error in set_rh.");
 	
 	fLS->RemovePresolved();
@@ -198,9 +207,9 @@
 double
 Constraint::PenaltyNeg()
 {
-	if (fDNegSummand == NULL)
+	if (fDNegObjSummand == NULL)
 		return INFINITY;
-	return fDNegSummand->Coeff();
+	return fDNegObjSummand->Coeff();
 }
 
 
@@ -213,16 +222,18 @@
 void
 Constraint::SetPenaltyNeg(double value)
 {
-	if (fDNegSummand == NULL) {
-		fDNegSummand = fLS->AddObjFunctionSummand(value, new Variable(fLS));
-		ChangeLeftSide(fSummands);
+	if (fDNegObjSummand == NULL) {
+		fDNegObjSummand = new Summand(value, new Variable(fLS));
+		fLS->ObjFunction()->AddItem(fDNegObjSummand);
+		UpdateLeftSide();
 		fLS->UpdateObjFunction();
 		return;
 	}
-	
-	if (value == fDNegSummand->Coeff())
+		
+	if (value == fDNegObjSummand->Coeff())
 		return;
-	fDNegSummand->SetCoeff(value);
+
+	fDNegObjSummand->SetCoeff(value);
 	fLS->UpdateObjFunction();
 }
 
@@ -235,9 +246,9 @@
 double
 Constraint::PenaltyPos()
 {
-	if (fDPosSummand == NULL)
+	if (fDPosObjSummand == NULL)
 		return INFINITY;
-	return fDPosSummand->Coeff();
+	return fDPosObjSummand->Coeff();
 }
 
 
@@ -250,16 +261,18 @@
 void
 Constraint::SetPenaltyPos(double value)
 {
-	if (fDPosSummand == NULL) {
-		fDPosSummand = fLS->AddObjFunctionSummand(value, new Variable(fLS));
-		ChangeLeftSide(fSummands);
+	if (fDPosObjSummand == NULL) {
+		fDPosObjSummand = new Summand(value, new Variable(fLS));
+		fLS->ObjFunction()->AddItem(fDPosObjSummand);
+		UpdateLeftSide();
 		fLS->UpdateObjFunction();
 		return;
 	}
 
-	if (value == fDPosSummand->Coeff())
+	if (value == fDPosObjSummand->Coeff())
 		return;
-	fDPosSummand->SetCoeff(value);
+
+	fDPosObjSummand->SetCoeff(value);
 	fLS->UpdateObjFunction();
 }
 
@@ -272,9 +285,9 @@
 Variable*
 Constraint::DNeg() const
 {
-	if (fDNegSummand == NULL)
+	if (fDNegObjSummand == NULL)
 		return NULL;
-	return fDNegSummand->Var();
+	return fDNegObjSummand->Var();
 }
 
 
@@ -286,9 +299,9 @@
 Variable*
 Constraint::DPos() const
 {
-	if (fDPosSummand == NULL)
+	if (fDPosObjSummand == NULL)
 		return NULL;
-	return fDPosSummand->Var();
+	return fDPosObjSummand->Var();
 }
 
 
@@ -299,7 +312,7 @@
 	double rightSide, double penaltyNeg, double penaltyPos)
 {
 	fLS = ls;
-	fSummands = summands;
+	fLeftSide = summands;
 	fOp = op;
 	fRightSide = rightSide;
 		
@@ -314,50 +327,57 @@
 	
 	if (penaltyNeg != INFINITY
 		&& fOp != OperatorType(LE)) {
-		fDNegSummand = ls->AddObjFunctionSummand(penaltyNeg, new Variable(ls));
-		varIndexes[i] = fDNegSummand->Var()->Index();
+		fDNegObjSummand = new Summand(penaltyNeg, new Variable(ls));
+		ls->fObjFunction->AddItem(fDNegObjSummand);
+		varIndexes[i] = fDNegObjSummand->Var()->Index();
 		coeffs[i] = 1.0;

[... truncated: 784 lines follow ...]


From stippi at mail.berlios.de  Mon Mar 10 23:22:12 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 10 Mar 2008 23:22:12 +0100
Subject: [Haiku-commits] r24352 - haiku/trunk/src/servers/app/drawing
Message-ID: <200803102222.m2AMMCuH003603@sheep.berlios.de>

Author: stippi
Date: 2008-03-10 23:22:11 +0100 (Mon, 10 Mar 2008)
New Revision: 24352
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24352&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/HWInterface.cpp
Log:
RenderingBuffer::Bounds() returns an IntRect, saves a conversion.


Modified: haiku/trunk/src/servers/app/drawing/HWInterface.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/HWInterface.cpp	2008-03-10 21:43:32 UTC (rev 24351)
+++ haiku/trunk/src/servers/app/drawing/HWInterface.cpp	2008-03-10 22:22:11 UTC (rev 24352)
@@ -314,7 +314,7 @@
 
 	// we need to mess with the area, but it is const
 	IntRect area(frame);
-	BRect bufferClip(backBuffer->Bounds());
+	IntRect bufferClip(backBuffer->Bounds());
 
 	if (area.IsValid() && area.Intersects(bufferClip)) {
 



From stippi at mail.berlios.de  Mon Mar 10 23:24:00 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 10 Mar 2008 23:24:00 +0100
Subject: [Haiku-commits] r24353 - haiku/trunk/src/servers/app/drawing
Message-ID: <200803102224.m2AMO0dW003727@sheep.berlios.de>

Author: stippi
Date: 2008-03-10 23:24:00 +0100 (Mon, 10 Mar 2008)
New Revision: 24353
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24353&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
   haiku/trunk/src/servers/app/drawing/DrawingEngine.h
Log:
* Made it possible to supress automatic back to front buffer copying of the
  rectangle area that is touched by a drawing command.
* Added a CopyToFront(BRegion) method which copies a complete region from
  the drawing/back buffer to the front buffer.


Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2008-03-10 22:22:11 UTC (rev 24352)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2008-03-10 22:24:00 UTC (rev 24353)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Haiku, Inc.
+ * Copyright 2001-2008, Haiku, Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -94,7 +94,8 @@
 	: fPainter(new Painter()),
 	  fGraphicsCard(NULL),
 	  fAvailableHWAccleration(0),
-	  fSuspendSyncLevel(0)
+	  fSuspendSyncLevel(0),
+	  fCopyToFront(true)
 {
 	SetHWInterface(interface);
 }
@@ -176,6 +177,23 @@
 	FrameBufferChanged();
 }
 
+
+void
+DrawingEngine::SetCopyToFrontEnabled(bool enable)
+{
+	fCopyToFront = enable;
+}
+
+
+void
+DrawingEngine::CopyToFront(/*const*/ BRegion& region)
+{
+	int32 count = region.CountRects();
+	for (int32 i = 0; i < count; i++)
+		fGraphicsCard->CopyBackToFront(region.RectAt(i));
+}
+
+
 // #pragma mark -
 
 //! the DrawingEngine needs to be locked!
@@ -526,7 +544,7 @@
 		} else {		
 			fPainter->InvertRect(r);
 
-			fGraphicsCard->Invalidate(r);
+			_CopyToFront(r);
 		}
 	}
 }
@@ -544,7 +562,7 @@
 
 		fPainter->DrawBitmap(bitmap, source, dest);
 
-		fGraphicsCard->Invalidate(clipped);
+		_CopyToFront(clipped);
 	}
 }
 
@@ -573,7 +591,7 @@
 		else
 			fPainter->StrokeArc(center, xRadius, yRadius, angle, span);
 
-		fGraphicsCard->Invalidate(clipped);
+		_CopyToFront(clipped);
 	}
 }
 
@@ -588,7 +606,7 @@
 
 	BRect touched = fPainter->DrawBezier(pts, filled);
 
-	fGraphicsCard->Invalidate(touched);
+	_CopyToFront(touched);
 }
 
 // DrawEllipse
@@ -616,7 +634,7 @@
 
 		fPainter->DrawEllipse(r, filled);
 
-		fGraphicsCard->Invalidate(clipped);
+		_CopyToFront(clipped);
 	}
 }
 
@@ -636,7 +654,7 @@
 
 		fPainter->DrawPolygon(ptlist, numpts, filled, closed);
 
-		fGraphicsCard->Invalidate(bounds);
+		_CopyToFront(bounds);
 	}
 }
 
@@ -669,7 +687,7 @@
 		fPainter->StrokeLine(start, end);
 	}
 
-	fGraphicsCard->Invalidate(touched);
+	_CopyToFront(touched);
 }
 
 // this function is used to draw a one pixel wide rect
@@ -685,7 +703,7 @@
 
 		fPainter->StrokeRect(r, color);
 
-		fGraphicsCard->Invalidate(clipped);
+		_CopyToFront(clipped);
 	}
 }
 
@@ -713,7 +731,7 @@
 		} else {
 			fPainter->FillRect(r, color);
 	
-			fGraphicsCard->Invalidate(r);
+			_CopyToFront(r);
 		}
 	}
 }
@@ -753,7 +771,7 @@
 			fPainter->FillRectNoClipping(r.RectAtInt(i), color);
 		}
 
-		fGraphicsCard->Invalidate(frame);
+		_CopyToFront(frame);
 	}
 }
 
@@ -774,7 +792,7 @@
 
 		fPainter->StrokeRect(r);
 
-		fGraphicsCard->Invalidate(clipped);
+		_CopyToFront(clipped);
 	}
 }
 
@@ -827,7 +845,7 @@
 		if (doInSoftware) {
 			fPainter->FillRect(r);
 
-			fGraphicsCard->Invalidate(r);
+			_CopyToFront(r);
 		}
 	}
 }
@@ -880,7 +898,7 @@
 				touched = touched | fPainter->FillRect(r.RectAt(i));
 			}
 
-			fGraphicsCard->Invalidate(touched);
+			_CopyToFront(touched);
 		}
 	}
 }
@@ -907,7 +925,7 @@
 		BRect touched = filled ? fPainter->FillRoundRect(r, xrad, yrad)
 							   : fPainter->StrokeRoundRect(r, xrad, yrad);
 
-		fGraphicsCard->Invalidate(touched);
+		_CopyToFront(touched);
 	}
 }
 
@@ -926,7 +944,7 @@
 										ptCount, ptList,
 										filled);
 
-	fGraphicsCard->Invalidate(touched);
+	_CopyToFront(touched);
 }
 
 
@@ -947,7 +965,7 @@
 		else
 			fPainter->StrokeTriangle(pts[0], pts[1], pts[2]);
 
-		fGraphicsCard->Invalidate(clipped);
+		_CopyToFront(clipped);
 	}
 }
 
@@ -966,7 +984,7 @@
 
 		fPainter->StrokeLine(start, end);
 
-		fGraphicsCard->Invalidate(touched);
+		_CopyToFront(touched);
 	}
 }
 
@@ -1021,7 +1039,7 @@
 		fPainter->SetHighColor(oldColor);
 		fPainter->SetPattern(pattern);
 
-		fGraphicsCard->Invalidate(touched);
+		_CopyToFront(touched);
 	}
 }
 
@@ -1069,7 +1087,7 @@
 			&cacheReference);
 //printf("drawing string: %lld ?s\n", system_time() - now);
 
-		fGraphicsCard->Invalidate(touched);
+		_CopyToFront(touched);
 	}
 
 	return penLocation;
@@ -1279,3 +1297,11 @@
 }
 
 
+inline void
+DrawingEngine::_CopyToFront(const BRect& frame)
+{
+	if (fCopyToFront)
+		fGraphicsCard->Invalidate(frame);
+}
+
+

Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.h	2008-03-10 22:22:11 UTC (rev 24352)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.h	2008-03-10 22:24:00 UTC (rev 24353)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Haiku, Inc.
+ * Copyright 2001-2008, Haiku, Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -46,6 +46,11 @@
 			// for "changing" hardware
 			void			SetHWInterface(HWInterface* interface);
 
+			void			SetCopyToFrontEnabled(bool enable);
+			bool			CopyToFrontEnabled() const
+								{ return fCopyToFront; }
+			void			CopyToFront(/*const*/ BRegion& region);
+
 			// locking
 			bool			LockParallelAccess();
 			bool			IsParallelAccessLocked();
@@ -161,10 +166,13 @@
 								uint32 height, uint32 bytesPerRow,
 								int32 xOffset, int32 yOffset) const;
 
+	inline	void			_CopyToFront(const BRect& frame);
+
 			Painter*		fPainter;
 			HWInterface*	fGraphicsCard;
 			uint32			fAvailableHWAccleration;
 			int32			fSuspendSyncLevel;
+			bool			fCopyToFront;
 };
 
 #endif // DRAWING_ENGINE_H_



From axeld at pinc-software.de  Mon Mar 10 23:28:51 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 10 Mar 2008 23:28:51 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24348_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/os/supportsrc/kits/support?=
In-Reply-To: <20080310203213.71073132BFC@mail.berlios.de>
Message-ID: <44810053263-BeMail@zon>

"julun" <julun.skyos at gmx.net> wrote:
> I thought i mention preserved in case one has called operator[] on 
> the
> string and then is going to call ReplaceAll(..), like this:
> 
> BString foo("bar");
> char &c = foo[0];
> ...
> ...
> foo.ReplaceAll(.....)

Yeah, I think you're right. I first only thought of the LockBuffer() 
semantics, but while that is discussible, I think the above example is 
a good reason to preserve rather than initializing it.

> Anyway, great work Axel and Stippi and thanks for spending your time.  
> :)

Be welcome! :-)

Bye,
   Axel.



From stippi at mail.berlios.de  Mon Mar 10 23:30:13 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 10 Mar 2008 23:30:13 +0100
Subject: [Haiku-commits] r24354 - haiku/trunk/src/servers/app
Message-ID: <200803102230.m2AMUDmg004400@sheep.berlios.de>

Author: stippi
Date: 2008-03-10 23:30:07 +0100 (Mon, 10 Mar 2008)
New Revision: 24354
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24354&view=rev

Modified:
   haiku/trunk/src/servers/app/Window.cpp
Log:
Used the new mechanism/options in the DrawingEngine with regard to
back to front copies in Window for updates. When in an update session,
any back to front copies are turned off. When the update session ends,
the whole region is copied at once. This has two effects: For once, it
avoids a lot of unnecessary copies (for example, rendering text copied
the background and then the same area for the text again). But even more
effective, it changes the entire drawing of any Haiku app to be completely
flicker free. Provided it happens in the normal Invalidate()/Draw() cycle.
And of course all this only works for double buffering mode, ie VESA.
Potentially, I might have overlooked something, so that this patch could
result in some drawing glitches, but in my testing, I have seen none yet.


Modified: haiku/trunk/src/servers/app/Window.cpp
===================================================================
--- haiku/trunk/src/servers/app/Window.cpp	2008-03-10 22:24:00 UTC (rev 24353)
+++ haiku/trunk/src/servers/app/Window.cpp	2008-03-10 22:30:07 UTC (rev 24354)
@@ -1739,12 +1739,15 @@
 			}
 
 			if (fDrawingEngine->LockParallelAccess()) {
+				bool copyToFrontEnabled = fDrawingEngine->CopyToFrontEnabled();
+				fDrawingEngine->SetCopyToFrontEnabled(true);
 				fDrawingEngine->SuspendAutoSync();
 
 				fTopView->Draw(fDrawingEngine, backgroundClearingRegion,
 					&fContentRegion, true);
 
 				fDrawingEngine->Sync();
+				fDrawingEngine->SetCopyToFrontEnabled(copyToFrontEnabled);
 				fDrawingEngine->UnlockParallelAccess();
 			}
 		}
@@ -1775,8 +1778,13 @@
 	DrawingEngine* engine = fDecorator->GetDrawingEngine();
 	if (dirtyBorderRegion->CountRects() > 0 && engine->LockParallelAccess()) {
 		engine->ConstrainClippingRegion(dirtyBorderRegion);
+		bool copyToFrontEnabled = engine->CopyToFrontEnabled();
+		engine->SetCopyToFrontEnabled(true);
+
 		fDecorator->Draw(dirtyBorderRegion->Frame());
 
+		engine->SetCopyToFrontEnabled(copyToFrontEnabled);
+
 // TODO: remove this once the DrawState stuff is handled
 // more cleanly. The reason why this is needed is that
 // when the decorator draws strings, a draw state is set
@@ -1815,23 +1823,6 @@
 	fPendingUpdateSession->AddCause(fDirtyCause);
 	fPendingUpdateSession->Include(contentDirtyRegion);
 
-	// clip pending update session from current
-	// update session, it makes no sense to draw stuff
-	// already needing a redraw anyways. Theoretically,
-	// this could be done smarter (clip views from pending
-	// that have not yet been redrawn in the current update
-	// session)
-	// NOTE: appearently the R5 app_server does not do that, it just
-	// keeps drawing until the screen is valid, without caring much
-	// for a consistent display while it does so, it just keeps drawing
-	// until everything settles down. Potentially, this could even give
-	// the impression of faster updates, even though they might look
-	// wrong when looked at closer, but will fix themselves shortly later
-//	if (fCurrentUpdateSession->IsUsed() && fCurrentUpdateSession->IsExpose()) {
-//		fCurrentUpdateSession->Exclude(contentDirtyRegion);
-//		fEffectiveDrawingRegionValid = false;
-//	}
-
 	if (!fUpdateRequested) {
 		// send this to client
 		_SendUpdateMessage();
@@ -1867,37 +1858,43 @@
 	// dirty regions are not messed with from the Desktop thread
 	// and ServerWindow thread at the same time.
 
-	if (fUpdateRequested) {
-		// make the pending update session the current update session
-		// (toggle the pointers)
-		UpdateSession* temp = fCurrentUpdateSession;
-		fCurrentUpdateSession = fPendingUpdateSession;
-		fPendingUpdateSession = temp;
-		fPendingUpdateSession->SetUsed(false);
-		// all drawing command from the client
-		// will have the dirty region from the update
-		// session enforced
-		fInUpdate = true;
-		fEffectiveDrawingRegionValid = false;
+	if (!fUpdateRequested) {
+		link.StartMessage(B_ERROR);
+		link.Flush();
+		fprintf(stderr, "Window::BeginUpdate() - no update requested!\n");
+		return;
+	}
 
-		// TODO: each view could be drawn individually
-		// right before carrying out the first drawing
-		// command from the client during an update
-		// (View::IsBackgroundDirty() can be used
-		// for this)
-		if (!fContentRegionValid)
-			_UpdateContentRegion();
+	// make the pending update session the current update session
+	// (toggle the pointers)
+	UpdateSession* temp = fCurrentUpdateSession;
+	fCurrentUpdateSession = fPendingUpdateSession;
+	fPendingUpdateSession = temp;
+	fPendingUpdateSession->SetUsed(false);
+	// all drawing command from the client
+	// will have the dirty region from the update
+	// session enforced
+	fInUpdate = true;
+	fEffectiveDrawingRegionValid = false;
 
-		BRegion* dirty = fRegionPool.GetRegion(
-			fCurrentUpdateSession->DirtyRegion());
-		if (!dirty) {
-			link.StartMessage(B_ERROR);
-			link.Flush();
-			return;
-		}
+	// TODO: each view could be drawn individually
+	// right before carrying out the first drawing
+	// command from the client during an update
+	// (View::IsBackgroundDirty() can be used
+	// for this)
+	if (!fContentRegionValid)
+		_UpdateContentRegion();
 
-		dirty->IntersectWith(&VisibleContentRegion());
+	BRegion* dirty = fRegionPool.GetRegion(
+		fCurrentUpdateSession->DirtyRegion());
+	if (!dirty) {
+		link.StartMessage(B_ERROR);
+		link.Flush();
+		return;
+	}
 
+	dirty->IntersectWith(&VisibleContentRegion());
+
 //sCurrentColor.red = rand() % 255;
 //sCurrentColor.green = rand() % 255;
 //sCurrentColor.blue = rand() % 255;
@@ -1907,39 +1904,35 @@
 //fDrawingEngine->FillRegion(*dirty, sCurrentColor);
 //snooze(10000);
 
-		link.StartMessage(B_OK);
-		// append the current window geometry to the
-		// message, the client will need it
-		link.Attach<BPoint>(fFrame.LeftTop());
-		link.Attach<float>(fFrame.Width());
-		link.Attach<float>(fFrame.Height());
-		// append he update rect in screen coords
-		link.Attach<BRect>(dirty->Frame());
-		// find and attach all views that intersect with
-		// the dirty region
-		fTopView->AddTokensForViewsInRegion(link, *dirty, &fContentRegion);
-		// mark the end of the token "list"
-		link.Attach<int32>(B_NULL_TOKEN);
-		link.Flush();
+	link.StartMessage(B_OK);
+	// append the current window geometry to the
+	// message, the client will need it
+	link.Attach<BPoint>(fFrame.LeftTop());
+	link.Attach<float>(fFrame.Width());
+	link.Attach<float>(fFrame.Height());
+	// append he update rect in screen coords
+	link.Attach<BRect>(dirty->Frame());
+	// find and attach all views that intersect with
+	// the dirty region
+	fTopView->AddTokensForViewsInRegion(link, *dirty, &fContentRegion);
+	// mark the end of the token "list"
+	link.Attach<int32>(B_NULL_TOKEN);
+	link.Flush();
 
-		if (!fCurrentUpdateSession->IsExpose() && fDrawingEngine->LockParallelAccess()) {
+	// supress back to front buffer copies in the drawing engine
+	fDrawingEngine->SetCopyToFrontEnabled(false);
+
+	if (!fCurrentUpdateSession->IsExpose() && fDrawingEngine->LockParallelAccess()) {
 //fDrawingEngine->FillRegion(dirty, (rgb_color){ 255, 0, 0, 255 });
-			fDrawingEngine->SuspendAutoSync();
+		fDrawingEngine->SuspendAutoSync();
 
-			fTopView->Draw(fDrawingEngine, dirty, &fContentRegion, true);
+		fTopView->Draw(fDrawingEngine, dirty, &fContentRegion, true);
 
-			fDrawingEngine->Sync();
-			fDrawingEngine->UnlockParallelAccess();
-		} // else the background was cleared already
+		fDrawingEngine->Sync();
+		fDrawingEngine->UnlockParallelAccess();
+	} // else the background was cleared already
 
-		fRegionPool.Recycle(dirty);
-
-	} else {
-printf("BeginUpdate() but no update requested!!\n");
-		link.StartMessage(B_ERROR);
-		link.Flush();
-		fprintf(stderr, "Window::BeginUpdate() - no update requested!\n");
-	}
+	fRegionPool.Recycle(dirty);
 }
 
 
@@ -1949,6 +1942,19 @@
 	// NOTE: see comment in _BeginUpdate()
 
 	if (fInUpdate) {
+		// reenable copy to front
+		fDrawingEngine->SetCopyToFrontEnabled(true);
+
+		BRegion* dirty = fRegionPool.GetRegion(
+			fCurrentUpdateSession->DirtyRegion());
+
+		if (dirty) {
+			dirty->IntersectWith(&VisibleContentRegion());
+
+			fDrawingEngine->CopyToFront(*dirty);
+			fRegionPool.Recycle(dirty);
+		}
+
 		fCurrentUpdateSession->SetUsed(false);
 
 		fInUpdate = false;



From axeld at mail.berlios.de  Mon Mar 10 23:56:27 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 10 Mar 2008 23:56:27 +0100
Subject: [Haiku-commits] r24355 - in haiku/trunk: headers/os/support
	src/kits/support
Message-ID: <200803102256.m2AMuRc7008340@sheep.berlios.de>

Author: axeld
Date: 2008-03-10 23:56:27 +0100 (Mon, 10 Mar 2008)
New Revision: 24355
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24355&view=rev

Modified:
   haiku/trunk/headers/os/support/String.h
   haiku/trunk/src/kits/support/String.cpp
Log:
* _Realloc() did not initialize the reference count either.
* _Alloc() can now preserve the original reference count, only _Clone()
  still initializes it to 1. As Karsten pointed out, this is necessary to
  preserve the "shareable" status of the private data.
* I hope that's finally it. What happened to our testing suite, anyway? :-)


Modified: haiku/trunk/headers/os/support/String.h
===================================================================
--- haiku/trunk/headers/os/support/String.h	2008-03-10 22:30:07 UTC (rev 24354)
+++ haiku/trunk/headers/os/support/String.h	2008-03-10 22:56:27 UTC (rev 24355)
@@ -221,7 +221,7 @@
 
 	// Management
 	status_t	_Detach();
-	char*		_Alloc(int32 length);
+	char*		_Alloc(int32 length, bool adoptReferenceCount = true);
 	char*		_Realloc(int32 length);
 	void		_Init(const char* src, int32 length);
 	char*		_Clone(const char* data, int32 length);

Modified: haiku/trunk/src/kits/support/String.cpp
===================================================================
--- haiku/trunk/src/kits/support/String.cpp	2008-03-10 22:30:07 UTC (rev 24354)
+++ haiku/trunk/src/kits/support/String.cpp	2008-03-10 22:56:27 UTC (rev 24355)
@@ -1679,7 +1679,7 @@
 
 
 char*
-BString::_Alloc(int32 length)
+BString::_Alloc(int32 length, bool adoptReferenceCount)
 {
 	if (length < 0)
 		return NULL;
@@ -1692,7 +1692,11 @@
 	newData[length] = '\0';
 
 	// initialize reference count & length
-	*(((vint32*)newData) - 2) = 1;
+	int32 referenceCount = 1;
+	if (adoptReferenceCount && fPrivateData != NULL)
+		referenceCount = _ReferenceCount();
+
+	*(((vint32*)newData) - 2) = referenceCount;
 	*(((int32*)newData) - 1) = length & 0x7fffffff;
 
 	return newData;
@@ -1711,12 +1715,15 @@
 
 	dataPtr = (char*)realloc(dataPtr, length + kPrivateDataOffset + 1);
 	if (dataPtr) {
+		int32 oldReferenceCount = _ReferenceCount();
+
 		dataPtr += kPrivateDataOffset;
 
 		fPrivateData = dataPtr;
 		fPrivateData[length] = '\0';
 
 		_SetLength(length);
+		_ReferenceCount() = oldReferenceCount;
 	}
 	return dataPtr;
 }
@@ -1734,7 +1741,7 @@
 char*
 BString::_Clone(const char* data, int32 length)
 {
-	char* newData = _Alloc(length);
+	char* newData = _Alloc(length, false);
 	if (newData == NULL)
 		return NULL;
 



From bonefish at mail.berlios.de  Tue Mar 11 02:35:33 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 11 Mar 2008 02:35:33 +0100
Subject: [Haiku-commits] r24356 - in haiku/trunk: headers/private/kernel
	src/system/libroot/posix/malloc
Message-ID: <200803110135.m2B1ZX4u011449@sheep.berlios.de>

Author: bonefish
Date: 2008-03-11 02:35:30 +0100 (Tue, 11 Mar 2008)
New Revision: 24356
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24356&view=rev

Modified:
   haiku/trunk/headers/private/kernel/tracing_config.h
   haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
Log:
Added optional kernel tracing for the userland memory allocator.


Modified: haiku/trunk/headers/private/kernel/tracing_config.h
===================================================================
--- haiku/trunk/headers/private/kernel/tracing_config.h	2008-03-10 22:56:27 UTC (rev 24355)
+++ haiku/trunk/headers/private/kernel/tracing_config.h	2008-03-11 01:35:30 UTC (rev 24356)
@@ -23,5 +23,6 @@
 //#define SIGNAL_TRACING
 //#define SYSCALL_TRACING
 //#define TEAM_TRACING
+//#define USER_MALLOC_TRACING
 
 #endif	// KERNEL_TRACING_CONFIG_H

Modified: haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
===================================================================
--- haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2008-03-10 22:56:27 UTC (rev 24355)
+++ haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2008-03-11 01:35:30 UTC (rev 24356)
@@ -24,6 +24,8 @@
 #include "processheap.h"
 #include "arch-specific.h"
 
+#include <tracing_config.h>
+
 #include <image.h>
 
 #include <errno.h>
@@ -32,6 +34,13 @@
 using namespace BPrivate;
 
 
+#ifdef USER_MALLOC_TRACING
+#	define KTRACE(format...)	ktrace_printf(format)
+#else
+#	define KTRACE(format...)	do {} while (false)
+#endif
+
+
 #if HEAP_LEAK_CHECK
 static block* sUsedList = NULL;
 static hoardLockType sUsedLock = 0;
@@ -259,6 +268,7 @@
 	void *addr = pHeap->getHeap(pHeap->getHeapIndex()).malloc(size);
 	if (addr == NULL) {
 		errno = B_NO_MEMORY;
+		KTRACE("malloc(%lu) -> NULL", size);
 		return NULL;
 	}
 
@@ -269,6 +279,8 @@
 	addr = set_wall(addr, size);
 #endif
 
+	KTRACE("malloc(%lu) -> %p", size, addr);
+
 	return addr;
 }
 
@@ -286,6 +298,7 @@
 	void *ptr = pHeap->getHeap(pHeap->getHeapIndex()).malloc(size);
 	if (ptr == NULL) {
 		errno = B_NO_MEMORY;
+		KTRACE("calloc(%lu, %lu) -> NULL", nelem, elsize);
 		return NULL;
 	}
 
@@ -299,6 +312,7 @@
 
 	// Zero out the malloc'd block.
 	memset(ptr, 0, size);
+	KTRACE("calloc(%lu, %lu) -> %p", nelem, elsize, ptr);
 	return ptr;
 }
 
@@ -310,6 +324,7 @@
 #if HEAP_WALL
 	if (ptr == NULL)
 		return;
+	KTRACE("free(%p)", ptr);
 	ptr = check_wall((uint8*)ptr);
 #endif
 #if HEAP_LEAK_CHECK
@@ -333,6 +348,7 @@
 		size);
 	if (addr == NULL) {
 		errno = B_NO_MEMORY;
+		KTRACE("memalign(%lu, %lu) -> NULL", alignment, size);
 		return NULL;
 	}
 
@@ -340,6 +356,7 @@
 	add_address(addr, size);
 #endif
 
+	KTRACE("memalign(%lu, %lu) -> %p", alignment, size, addr);
 	return addr;
 }
 
@@ -357,15 +374,20 @@
 	static processHeap *pHeap = getAllocator();
 	void *pointer = pHeap->getHeap(pHeap->getHeapIndex()).memalign(alignment,
 		size);
-	if (pointer == NULL)
+	if (pointer == NULL) {
+		KTRACE("posix_memalign(%p, %lu, %lu) -> NULL", _pointer, alignment,
+			size);
 		return B_NO_MEMORY;
+	}
 
 #if HEAP_LEAK_CHECK
 	add_address(pointer, size);
 #endif
 
 	*_pointer = pointer;
-	return 0;	
+	KTRACE("posix_memalign(%p, %lu, %lu) -> %p", _pointer, alignment, size,
+		pointer);
+	return 0;
 }
 
 
@@ -401,6 +423,7 @@
 		check_wall((uint8*)ptr + HEAP_WALL_SIZE);
 		ptr = set_wall(ptr, size);
 #endif
+		KTRACE("realloc(%p, %lu) -> %p", ptr, size, ptr);
 		return ptr;
 	}
 
@@ -415,6 +438,7 @@
 	if (buffer == NULL) {
 		// Allocation failed, leave old block and return
 		errno = B_NO_MEMORY;
+		KTRACE("realloc(%p, %lu) -> NULL", ptr, size);
 		return NULL;
 	}
 
@@ -428,6 +452,7 @@
 	free(ptr);
 
 	// Return a pointer to the new one.
+	KTRACE("realloc(%p, %lu) -> %p", ptr, size, buffer);
 	return buffer;
 }
 



From ingo_weinhold at gmx.de  Tue Mar 11 02:33:29 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Tue, 11 Mar 2008 02:33:29 +0100
Subject: [Haiku-commits] r24349 - haiku/trunk/build/jam
In-Reply-To: <200803102038.m2AKct54024623@sheep.berlios.de>
References: <200803102038.m2AKct54024623@sheep.berlios.de>
Message-ID: <20080311023329.410.1@knochen-vm.1205198350.fake>


On 2008-03-10 at 21:38:55 [+0100], mauricek at BerliOS 
<mauricek at mail.berlios.de> wrote:
> Author: mauricek
> Date: 2008-03-10 21:38:54 +0100 (Mon, 10 Mar 2008)
> New Revision: 24349
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24349&view=rev
> 
> Modified:
>    haiku/trunk/build/jam/HaikuImage
> Log:
> * added video_window demo to the image

Under VMware (image built from the scratch) the media_addon_server now 
crashes on startup:

vm_soft_fault: va 0x1a679000 not covered by area in address space
vm_page_fault: vm_soft_fault returned error 'Bad address' on fault at 
0x1a679000, ip 0x61d162, write 1, user 1, thread 0x74
vm_page_fault: sending team "media_addon_server" 0x74 SIGSEGV, ip 0x61d162 
("libroot.so_seg0ro" +0x79162)
[...]
debug_server: Thread 116 entered the debugger: Segment violation
stack trace, current PC 0x61d162  memset + 0x16:
  (0x7ffe666c)  0x529313  __12media_format + 0x27
  (0x7ffe669c)  0x5266e1  __as__19dormant_flavor_infoRC11flavor_info + 0x30d
  (0x7ffe67bc)  0x206ae7  ScanAddOnFlavors__16MediaAddonServerP11BMediaAddOn 
+ 0x1eb
  (0x7ffe696c)  0x206f3c  AddOnAdded__16MediaAddonServerPCcx + 0x2cc
  (0x7ffe69fc)  0x2083cd  MessageReceived__16MediaAddonServerP8BMessage + 
0x211
  (0x7ffe6abc)  0x208028  WatchDir__16MediaAddonServerP6BEntry + 0x140
  (0x7ffe6bec)  0x2065d1  ReadyToRun__16MediaAddonServer + 0x231
  (0x7ffe6c9c)  0x2e89a9  
DispatchMessage__12BApplicationP8BMessageP8BHandler + 0x369
  (0x7ffe6eac)  0x2f3f69  task_looper__7BLooper + 0x299
  (0x7ffe6f0c)  0x2e6e6e  Run__12BApplication + 0x8a
  (0x7ffe6f4c)  0x20896e  main + 0x7e
  (0x7ffe6f7c)  0x205c8b  _start + 0x5b
  (0x7ffe6fac)  0x1007ca  (runtime_loader_seg0ro + 0x7ca)

After some analysis the problem turns out to be that the "Video Window 
Consumer" flavor specifies an out_format_count of 402834064 which causes an 
integer overflow when the format array is allocated with new[]. In the end 
much less is malloc()ed and the media_format constructor for the first 
element that crosses the heap causes the crash.

CU, Ingo


From haiku at kaldience.com  Tue Mar 11 08:18:22 2008
From: haiku at kaldience.com (Maurice Kalinowski)
Date: Tue, 11 Mar 2008 08:18:22 +0100
Subject: [Haiku-commits] r24349 - haiku/trunk/build/jam
In-Reply-To: <20080311023329.410.1@knochen-vm.1205198350.fake>
References: <200803102038.m2AKct54024623@sheep.berlios.de>
	<20080311023329.410.1@knochen-vm.1205198350.fake>
Message-ID: <47D6323E.3020402@kaldience.com>

Ingo Weinhold wrote:
> On 2008-03-10 at 21:38:55 [+0100], mauricek at BerliOS 
> <mauricek at mail.berlios.de> wrote:
>   
>> Author: mauricek
>> Date: 2008-03-10 21:38:54 +0100 (Mon, 10 Mar 2008)
>> New Revision: 24349
>> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24349&view=rev
>>
>> Modified:
>>    haiku/trunk/build/jam/HaikuImage
>> Log:
>> * added video_window demo to the image
>>     
>
> Under VMware (image built from the scratch) the media_addon_server now 
> crashes on startup:
>
> vm_soft_fault: va 0x1a679000 not covered by area in address space
> vm_page_fault: vm_soft_fault returned error 'Bad address' on fault at 
> 0x1a679000, ip 0x61d162, write 1, user 1, thread 0x74
> vm_page_fault: sending team "media_addon_server" 0x74 SIGSEGV, ip 0x61d162 
> ("libroot.so_seg0ro" +0x79162)
> [...]
> debug_server: Thread 116 entered the debugger: Segment violation
> stack trace, current PC 0x61d162  memset + 0x16:
>   (0x7ffe666c)  0x529313  __12media_format + 0x27
>   (0x7ffe669c)  0x5266e1  __as__19dormant_flavor_infoRC11flavor_info + 0x30d
>   (0x7ffe67bc)  0x206ae7  ScanAddOnFlavors__16MediaAddonServerP11BMediaAddOn 
> + 0x1eb
>   (0x7ffe696c)  0x206f3c  AddOnAdded__16MediaAddonServerPCcx + 0x2cc
>   (0x7ffe69fc)  0x2083cd  MessageReceived__16MediaAddonServerP8BMessage + 
> 0x211
>   (0x7ffe6abc)  0x208028  WatchDir__16MediaAddonServerP6BEntry + 0x140
>   (0x7ffe6bec)  0x2065d1  ReadyToRun__16MediaAddonServer + 0x231
>   (0x7ffe6c9c)  0x2e89a9  
> DispatchMessage__12BApplicationP8BMessageP8BHandler + 0x369
>   (0x7ffe6eac)  0x2f3f69  task_looper__7BLooper + 0x299
>   (0x7ffe6f0c)  0x2e6e6e  Run__12BApplication + 0x8a
>   (0x7ffe6f4c)  0x20896e  main + 0x7e
>   (0x7ffe6f7c)  0x205c8b  _start + 0x5b
>   (0x7ffe6fac)  0x1007ca  (runtime_loader_seg0ro + 0x7ca)
>
> After some analysis the problem turns out to be that the "Video Window 
> Consumer" flavor specifies an out_format_count of 402834064 which causes an 
> integer overflow when the format array is allocated with new[]. In the end 
> much less is malloc()ed and the media_format constructor for the first 
> element that crosses the heap causes the crash.
>
>   
Thx for pointing this out. It happened once to me yesterday, but after a 
recompile it dissapeared. But there is a high probability as I didn't 
initialize that part.
This happens in VideoWindowAddOn::VideoWindowAddOn, where the 
flavor_info is initialized. But what concerns me more is, that though 
the addon says that it is consumer node, why should the media addon 
server then care about output formats, as it is not supposed to have any 
at all?
This might be something to fix on both sides, I guess.

I will commit a fix as soon as I get home tonight. For the meantime feel 
free to remove it from the image again, sorry.


Bye
Maurice



From axeld at mail.berlios.de  Tue Mar 11 16:51:48 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 11 Mar 2008 16:51:48 +0100
Subject: [Haiku-commits] r24357 -
	haiku/trunk/src/add-ons/kernel/drivers/audio/hda
Message-ID: <200803111551.m2BFpm3p021985@sheep.berlios.de>

Author: axeld
Date: 2008-03-11 16:51:48 +0100 (Tue, 11 Mar 2008)
New Revision: 24357
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24357&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
Log:
* Moved connection retrieval code into its own function.
* Extended it to support long format as well.
* Extended it to support ranges of widgets (I didn't find those in the standard,
  but the FreeBSD and Linux drivers implement them, and my laptop even makes
  use of them, too).


Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp	2008-03-11 01:35:30 UTC (rev 24356)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp	2008-03-11 15:51:48 UTC (rev 24357)
@@ -143,6 +143,81 @@
 }
 
 
+static status_t
+hda_widget_get_connections(hda_codec* codec, uint32 nodeID, hda_widget* widget)
+{
+	uint32 verb = MAKE_VERB(codec->addr, nodeID, VID_GET_PARAMETER,
+		PID_CONNECTION_LIST_LENGTH);
+	uint32 response;
+
+	if (hda_send_verbs(codec, &verb, &response, 1) != B_OK)
+		return B_ERROR;
+
+	uint32 listEntries = response & 0x7f;
+	bool longForm = (response & 0xf0) != 0;
+
+	if (listEntries == 0)
+		return B_OK;
+
+#if 1
+	if (widget->num_inputs > 1) {
+		// Get currently active connection
+		verb = MAKE_VERB(codec->addr, nodeID, VID_GET_CONNECTION_SELECT, 0);
+		if (hda_send_verbs(codec, &verb, &response, 1) == B_OK)
+			widget->active_input = response & 0xff;
+	}
+#endif
+
+	uint32 valuesPerEntry = longForm ? 2 : 4;
+	uint32 shift = 32 / valuesPerEntry;
+	uint32 rangeMask = (1 << (shift - 1));
+	int32 previousInput = -1;
+	uint32 numInputs = 0;
+
+	for (uint32 i = 0; i < listEntries; i++) {
+		if ((i % valuesPerEntry) == 0) {
+			// We get 2 or 4 answers per call depending on if we're
+			// in short or long list mode
+			verb = MAKE_VERB(codec->addr, nodeID,
+				VID_GET_CONNECTION_LIST_ENTRY, i);
+			if (hda_send_verbs(codec, &verb, &response, 1) != B_OK) {
+				dprintf("hda: Error parsing inputs for widget %ld!\n",
+					nodeID);
+				break;
+			}
+		}
+
+		int32 input = (response >> (shift * (i % valuesPerEntry)))
+			& ((1 << shift) - 1);
+
+		if (input & rangeMask) {
+			// found range
+			input &= ~rangeMask;
+
+			if (input < previousInput || previousInput == -1) {
+				dprintf("hda: invalid range from %ld to %ld\n", previousInput,
+					input);
+				continue;
+			}
+
+			for (int32 rangeInput = previousInput + 1; rangeInput <= input
+					&& numInputs < MAX_INPUTS; rangeInput++) {
+				widget->inputs[numInputs++] = rangeInput;
+			}
+
+			previousInput = -1;
+		} else if (numInputs < MAX_INPUTS) {
+			// standard value
+			widget->inputs[numInputs++] = input;
+			previousInput = input;
+		}
+	}
+
+	widget->num_inputs = numInputs;
+	return B_OK;
+}
+
+
 static const char*
 get_widget_type_name(hda_widget_type type)
 {
@@ -220,13 +295,11 @@
 
 		verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget, VID_GET_PARAMETER,
 			PID_AUDIO_WIDGET_CAP);
-		verbs[1] = MAKE_VERB(audioGroup->codec->addr, widget, VID_GET_PARAMETER,
-			PID_CONNECTION_LIST_LENGTH);
-		if (hda_send_verbs(audioGroup->codec, verbs, resp, 2) != B_OK)
+		if (hda_send_verbs(audioGroup->codec, verbs, resp, 1) != B_OK)
 			return B_ERROR;
 
 		audioGroup->widgets[i].type = (hda_widget_type)(resp[0] >> 20);
-		audioGroup->widgets[i].num_inputs = resp[1] & 0x7f;
+		audioGroup->widgets[i].active_input = -1;
 
 		dprintf("%ld: %s\n", widget,
 			get_widget_type_name(audioGroup->widgets[i].type));
@@ -326,48 +399,26 @@
 
 		hda_widget_get_pm_support(audioGroup->codec, widget,
 			&audioGroup->widgets[i].pm);
+		hda_widget_get_connections(audioGroup->codec, widget,
+			&audioGroup->widgets[i]);
 
-		if (audioGroup->widgets[i].num_inputs) {
-			if (audioGroup->widgets[i].num_inputs > 1) {
-				verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget,
-					VID_GET_CONNECTION_SELECT, 0);
-				if (hda_send_verbs(audioGroup->codec, verbs, resp, 1) == B_OK)
-					audioGroup->widgets[i].active_input = resp[0] & 0xff;
-				else
-					audioGroup->widgets[i].active_input = -1;
-			} else 
-				audioGroup->widgets[i].active_input = -1;
+		// dump connections
 
-			buf[0] = '\0';
-			off = 0;
+		buf[0] = '\0';
+		off = 0;
 
-			for (uint32 inputIndex = 0; inputIndex
-					< audioGroup->widgets[i].num_inputs; inputIndex++) {
-				if ((inputIndex % 4) == 0) {
-					// we get 4 answers per call in short list mode
-					verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget,
-						VID_GET_CONNECTION_LIST_ENTRY, inputIndex);
-					if (hda_send_verbs(audioGroup->codec, verbs, resp, 1)
-							!= B_OK) {
-						dprintf("hda: Error parsing inputs for widget %ld!\n",
-							widget);
-						break;
-					}
-				}
+		for (uint32 inputIndex = 0; inputIndex
+				< audioGroup->widgets[i].num_inputs; inputIndex++) {
+			int32 input = audioGroup->widgets[i].inputs[inputIndex];
 
-				uint32 input = (resp[0] >> (8 * (inputIndex % 4))) & 0xff;
+			if ((int32)inputIndex != audioGroup->widgets[i].active_input)
+				off += sprintf(buf + off, "%ld ", input);
+			else
+				off += sprintf(buf + off, "(%ld) ", input);
+		}
 
-				if ((int32)inputIndex != audioGroup->widgets[i].active_input)
-					off += sprintf(buf + off, "%ld ", input);
-				else
-					off += sprintf(buf + off, "(%ld) ", input);
-
-				audioGroup->widgets[i].inputs[inputIndex] = input;
-			}
-
-			if (off != 0)
-				dprintf("\tConnections: %s\n", buf);
-		}
+		if (off != 0)
+			dprintf("\tConnections: %s\n", buf);
 	}
 
 	return B_OK;



From bonefish at mail.berlios.de  Tue Mar 11 18:00:55 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 11 Mar 2008 18:00:55 +0100
Subject: [Haiku-commits] r24358 - haiku/trunk/src/tools/fs_shell
Message-ID: <200803111700.m2BH0tAO032524@sheep.berlios.de>

Author: bonefish
Date: 2008-03-11 18:00:55 +0100 (Tue, 11 Mar 2008)
New Revision: 24358
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24358&view=rev

Modified:
   haiku/trunk/src/tools/fs_shell/partition_support.cpp
Log:
Left over debug output.


Modified: haiku/trunk/src/tools/fs_shell/partition_support.cpp
===================================================================
--- haiku/trunk/src/tools/fs_shell/partition_support.cpp	2008-03-11 15:51:48 UTC (rev 24357)
+++ haiku/trunk/src/tools/fs_shell/partition_support.cpp	2008-03-11 17:00:55 UTC (rev 24358)
@@ -151,8 +151,6 @@
 	if (!restriction)
 		return;
 
-printf("restricted_file_restrict_stat(): startOffset: %lld, endOffset: %lld\n",
-restriction->startOffset, restriction->endOffset);
 	st->fssh_st_size = restriction->endOffset - restriction->startOffset;
 }
 



From bonefish at mail.berlios.de  Tue Mar 11 18:12:03 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 11 Mar 2008 18:12:03 +0100
Subject: [Haiku-commits] r24359 - in haiku/trunk: headers/posix
	headers/private/kernel src/system/kernel
	src/system/kernel/lib src/system/libroot/posix/unistd
Message-ID: <200803111712.m2BHC3Qg000978@sheep.berlios.de>

Author: bonefish
Date: 2008-03-11 18:12:02 +0100 (Tue, 11 Mar 2008)
New Revision: 24359
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24359&view=rev

Added:
   haiku/trunk/headers/private/kernel/usergroup.h
   haiku/trunk/src/system/kernel/usergroup.cpp
   haiku/trunk/src/system/libroot/posix/unistd/usergroup.cpp
Removed:
   haiku/trunk/src/system/libroot/posix/unistd/usergroup.c
Modified:
   haiku/trunk/headers/posix/unistd.h
   haiku/trunk/headers/private/kernel/syscalls.h
   haiku/trunk/headers/private/kernel/thread_types.h
   haiku/trunk/src/system/kernel/Jamfile
   haiku/trunk/src/system/kernel/lib/Jamfile
   haiku/trunk/src/system/kernel/syscalls.cpp
   haiku/trunk/src/system/kernel/team.cpp
   haiku/trunk/src/system/libroot/posix/unistd/Jamfile
Log:
* Added real, effective and saved set- user and group IDs to the team
  structure. They are properly inherited and updated on
  fork(), load_image(), and exec().
* Implemented the get[e]{u,g}id(), set[[r]e]{u,g}id() family for real.
* getgroups() also calls the kernel now, but only returns the effective
  group ID. Supplementary groups support is still missing.


Modified: haiku/trunk/headers/posix/unistd.h
===================================================================
--- haiku/trunk/headers/posix/unistd.h	2008-03-11 17:00:55 UTC (rev 24358)
+++ haiku/trunk/headers/posix/unistd.h	2008-03-11 17:12:02 UTC (rev 24359)
@@ -159,13 +159,15 @@
 extern gid_t	getegid(void);
 extern uid_t	geteuid(void);
 extern gid_t	getgid(void);
+extern uid_t	getuid(void);
 extern int		getgroups(int groupSize, gid_t groupList[]);
-extern uid_t	getuid(void);
 
 extern int		setgid(gid_t gid);
 extern int		setuid(uid_t uid);
 extern int		setegid(gid_t gid);
 extern int		seteuid(uid_t uid);
+extern int		setregid(gid_t rgid, gid_t egid);
+extern int		setreuid(uid_t ruid, uid_t euid);
 
 extern char		*getlogin(void);
 extern int		getlogin_r(char *name, size_t nameSize);

Modified: haiku/trunk/headers/private/kernel/syscalls.h
===================================================================
--- haiku/trunk/headers/private/kernel/syscalls.h	2008-03-11 17:00:55 UTC (rev 24358)
+++ haiku/trunk/headers/private/kernel/syscalls.h	2008-03-11 17:12:02 UTC (rev 24359)
@@ -113,6 +113,15 @@
 extern status_t		_kern_get_next_team_info(int32 *cookie, team_info *info);
 extern status_t		_kern_get_team_usage_info(team_id team, int32 who, team_usage_info *info, size_t size);
 
+// user/group functions
+extern gid_t		_kern_getgid(bool effective);
+extern uid_t		_kern_getuid(bool effective);
+extern ssize_t		_kern_getgroups(int groupSize, gid_t* groupList);
+extern status_t		_kern_setregid(gid_t rgid, gid_t egid,
+						bool setAllIfPrivileged);
+extern status_t		_kern_setreuid(uid_t ruid, uid_t euid,
+						bool setAllIfPrivileged);
+
 // signal functions
 extern status_t		_kern_send_signal(pid_t tid, uint sig);
 extern status_t		_kern_sigprocmask(int how, const sigset_t *set,

Modified: haiku/trunk/headers/private/kernel/thread_types.h
===================================================================
--- haiku/trunk/headers/private/kernel/thread_types.h	2008-03-11 17:00:55 UTC (rev 24358)
+++ haiku/trunk/headers/private/kernel/thread_types.h	2008-03-11 17:12:02 UTC (rev 24359)
@@ -189,6 +189,13 @@
 
 	bigtime_t		dead_threads_kernel_time;
 	bigtime_t		dead_threads_user_time;
+
+	uid_t			saved_set_uid;
+	uid_t			real_uid;
+	uid_t			effective_uid;
+	gid_t			saved_set_gid;
+	gid_t			real_gid;
+	gid_t			effective_gid;
 };
 
 typedef int32 (*thread_entry_func)(thread_func, void *);

Added: haiku/trunk/headers/private/kernel/usergroup.h
===================================================================
--- haiku/trunk/headers/private/kernel/usergroup.h	2008-03-11 17:00:55 UTC (rev 24358)
+++ haiku/trunk/headers/private/kernel/usergroup.h	2008-03-11 17:12:02 UTC (rev 24359)
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008, Ingo Weinhold, ingo_weinhold at gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _KERNEL_USERGROUP_H
+#define _KERNEL_USERGROUP_H
+
+#include <unistd.h>
+
+#include <SupportDefs.h>
+
+
+struct team;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// kernel private functions
+
+void		inherit_parent_user_and_group(struct team* team,
+				struct team* parent);
+status_t	update_set_id_user_and_group(struct team* team, const char* file);
+
+// syscalls
+
+gid_t		_user_getgid(bool effective);
+uid_t		_user_getuid(bool effective);
+ssize_t		_user_getgroups(int groupSize, gid_t* groupList);
+status_t	_user_setregid(gid_t rgid, gid_t egid, bool setAllIfPrivileged);
+status_t	_user_setreuid(uid_t ruid, uid_t euid, bool setAllIfPrivileged);
+
+#ifdef __cplusplus
+}	// extern "C"
+#endif
+
+
+#endif	// _KERNEL_USERGROUP_H

Modified: haiku/trunk/src/system/kernel/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/Jamfile	2008-03-11 17:00:55 UTC (rev 24358)
+++ haiku/trunk/src/system/kernel/Jamfile	2008-03-11 17:12:02 UTC (rev 24359)
@@ -42,6 +42,7 @@
 	team.cpp
 	thread.cpp
 	timer.c
+	usergroup.cpp
 	wait_for_objects.cpp
 
 	: $(TARGET_KERNEL_PIC_CCFLAGS)

Modified: haiku/trunk/src/system/kernel/lib/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/lib/Jamfile	2008-03-11 17:00:55 UTC (rev 24358)
+++ haiku/trunk/src/system/kernel/lib/Jamfile	2008-03-11 17:12:02 UTC (rev 24359)
@@ -80,7 +80,7 @@
 	read.c
 	sync.c
 	truncate.c
-	usergroup.c
+	usergroup.cpp
 	write.c
 	# string
 	memchr.c

Modified: haiku/trunk/src/system/kernel/syscalls.cpp
===================================================================
--- haiku/trunk/src/system/kernel/syscalls.cpp	2008-03-11 17:00:55 UTC (rev 24358)
+++ haiku/trunk/src/system/kernel/syscalls.cpp	2008-03-11 17:12:02 UTC (rev 24359)
@@ -33,6 +33,7 @@
 #include <arch/system_info.h>
 #include <messaging.h>
 #include <frame_buffer_console.h>
+#include <usergroup.h>
 #include <wait_for_objects.h>
 
 #include <malloc.h>

Modified: haiku/trunk/src/system/kernel/team.cpp
===================================================================
--- haiku/trunk/src/system/kernel/team.cpp	2008-03-11 17:00:55 UTC (rev 24358)
+++ haiku/trunk/src/system/kernel/team.cpp	2008-03-11 17:12:02 UTC (rev 24359)
@@ -34,6 +34,7 @@
 #include <tls.h>
 #include <tracing.h>
 #include <user_runtime.h>
+#include <usergroup.h>
 #include <vfs.h>
 #include <vm.h>
 #include <vm_address_space.h>
@@ -1171,6 +1172,11 @@
 		team->loading_info = &loadingInfo;
 	}
 
+	// Inherit the parent's user/group, but also check the executable's
+	// set-user/group-id permission
+	inherit_parent_user_and_group(team, parent);
+	update_set_id_user_and_group(team, args[0]);
+
 	state = disable_interrupts();
 	GRAB_TEAM_LOCK();
 
@@ -1377,6 +1383,10 @@
 
 	atomic_or(&team->flags, TEAM_FLAG_EXEC_DONE);
 
+	// Update user/group according to the executable's set-user/group-id
+	// permission.
+	update_set_id_user_and_group(team, path);
+
 	status = team_create_thread_start(teamArgs);
 		// this one usually doesn't return...
 
@@ -1449,6 +1459,9 @@
 
 	strlcpy(team->args, parentTeam->args, sizeof(team->args));
 
+	// Inherit the parent's user/group.
+	inherit_parent_user_and_group(team, parentTeam);
+
 	state = disable_interrupts();
 	GRAB_TEAM_LOCK();
 
@@ -1940,6 +1953,13 @@
 	strcpy(sKernelTeam->args, sKernelTeam->name);
 	sKernelTeam->state = TEAM_STATE_NORMAL;
 
+	sKernelTeam->saved_set_uid = 0;
+	sKernelTeam->real_uid = 0;
+	sKernelTeam->effective_uid = 0;
+	sKernelTeam->saved_set_gid = 0;
+	sKernelTeam->real_gid = 0;
+	sKernelTeam->effective_gid = 0;
+
 	insert_team_into_group(group, sKernelTeam);
 
 	sKernelTeam->io_context = vfs_new_io_context(NULL);

Added: haiku/trunk/src/system/kernel/usergroup.cpp
===================================================================
--- haiku/trunk/src/system/kernel/usergroup.cpp	2008-03-11 17:00:55 UTC (rev 24358)
+++ haiku/trunk/src/system/kernel/usergroup.cpp	2008-03-11 17:12:02 UTC (rev 24359)
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2008, Ingo Weinhold, ingo_weinhold at gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <usergroup.h>
+
+#include <errno.h>
+#include <sys/stat.h>
+
+#include <new.h>
+
+#include <kernel.h>
+#include <syscalls.h>
+#include <team.h>
+#include <thread.h>
+#include <thread_types.h>
+#include <util/AutoLock.h>
+
+#include <AutoDeleter.h>
+
+
+// #pragma mark - Implementation Private
+
+
+static bool
+is_privileged(struct team* team)
+{
+	// currently only the root user is privileged
+	return team->effective_uid == 0;
+}
+
+
+static status_t
+common_setregid(gid_t rgid, gid_t egid, bool setAllIfPrivileged, bool kernel)
+{
+	struct team* team = thread_get_current_thread()->team;
+
+	InterruptsSpinLocker _(team_spinlock);
+
+	bool privileged = kernel || is_privileged(team);
+
+	// real gid
+	if (rgid == (gid_t)-1) {
+		rgid = team->real_gid;
+	} else {
+		if (setAllIfPrivileged) {
+			// setgid() semantics: If privileged set both, real, effective and
+			// saved set-gid, otherwise set the effective gid.
+			if (privileged) {
+				team->saved_set_gid = rgid;
+				team->real_gid = rgid;
+				team->effective_gid = rgid;
+				return B_OK;
+			}
+
+			// not privileged -- set only the effective gid
+			egid = rgid;
+			rgid = team->real_gid;
+		} else {
+			// setregid() semantics: set the real gid, if allowed to
+			if (!privileged && rgid != team->real_gid)
+				return EPERM;
+		}
+	}
+
+	// effective gid
+	if (egid == (gid_t)-1) {
+		egid = team->effective_gid;
+	} else {
+		if (!privileged && egid != team->effective_gid
+			&& egid != team->real_gid && egid != team->saved_set_gid) {
+			return EPERM;
+		}
+	}
+
+	// Getting here means all checks were successful -- set the gids.
+	team->real_gid = rgid;
+	team->effective_gid = egid;
+
+	return B_OK;
+}
+
+
+static status_t
+common_setreuid(uid_t ruid, uid_t euid, bool setAllIfPrivileged, bool kernel)
+{
+	struct team* team = thread_get_current_thread()->team;
+
+	InterruptsSpinLocker _(team_spinlock);
+
+	bool privileged = kernel || is_privileged(team);
+
+	// real uid
+	if (ruid == (uid_t)-1) {
+		ruid = team->real_uid;
+	} else {
+		if (setAllIfPrivileged) {
+			// setuid() semantics: If privileged set both, real, effective and
+			// saved set-uid, otherwise set the effective uid.
+			if (privileged) {
+				team->saved_set_uid = ruid;
+				team->real_uid = ruid;
+				team->effective_uid = ruid;
+				return B_OK;
+			}
+
+			// not privileged -- set only the effective uid
+			euid = ruid;
+			ruid = team->real_uid;
+		} else {
+			// setreuid() semantics: set the real uid, if allowed to
+			// Note: We allow setting the real uid to the effective uid. This
+			// is unspecified by the specs, but is common practice.
+			if (!privileged && ruid != team->real_uid
+				&& ruid != team->effective_uid) {
+				return EPERM;
+			}
+		}
+	}
+
+	// effective uid
+	if (euid == (uid_t)-1) {
+		euid = team->effective_uid;
+	} else {
+		if (!privileged && euid != team->effective_uid
+			&& euid != team->real_uid && euid != team->saved_set_uid) {
+			return EPERM;
+		}
+	}
+
+	// Getting here means all checks were successful -- set the uids.
+	team->real_uid = ruid;
+	team->effective_uid = euid;
+
+	return B_OK;
+}
+
+
+// #pragma mark - Kernel Private
+
+
+void
+inherit_parent_user_and_group(struct team* team, struct team* parent)
+{
+	InterruptsSpinLocker _(team_spinlock);
+
+	team->saved_set_uid = parent->saved_set_uid;
+	team->real_uid = parent->real_uid;
+	team->effective_uid = parent->effective_uid;
+	team->saved_set_gid = parent->saved_set_gid;
+	team->real_gid = parent->real_gid;
+	team->effective_gid = parent->effective_gid;
+}
+
+
+status_t
+update_set_id_user_and_group(struct team* team, const char* file)
+{
+	struct stat st;
+	if (stat(file, &st) < 0)
+		return errno;
+
+	InterruptsSpinLocker _(team_spinlock);
+
+	if ((st.st_mode & S_ISUID) != 0) {
+		team->saved_set_uid = st.st_uid;
+		team->effective_uid = st.st_uid;
+	}
+
+	if ((st.st_mode & S_ISGID) != 0) {
+		team->saved_set_gid = st.st_gid;
+		team->effective_gid = st.st_gid;
+	}
+
+	return B_OK;
+}
+
+
+gid_t
+_kern_getgid(bool effective)
+{
+	struct team* team = thread_get_current_thread()->team;
+
+	return effective ? team->effective_gid : team->real_gid;
+}
+
+
+uid_t
+_kern_getuid(bool effective)
+{
+	struct team* team = thread_get_current_thread()->team;
+
+	return effective ? team->effective_uid : team->real_uid;
+}
+
+
+ssize_t
+_kern_getgroups(int groupSize, gid_t* groupList)
+{
+	// TODO: Implement proper supplementary group support!
+	// For now only return the effective group.
+
+	if (groupSize > 0)
+		groupList[0] = getegid();
+
+	return 1;
+}
+
+
+status_t
+_kern_setregid(gid_t rgid, gid_t egid, bool setAllIfPrivileged)
+{
+	return common_setregid(rgid, egid, setAllIfPrivileged, true);
+}
+
+
+status_t
+_kern_setreuid(uid_t ruid, uid_t euid, bool setAllIfPrivileged)
+{
+	return common_setreuid(ruid, euid, setAllIfPrivileged, true);
+}
+
+
+// #pragma mark - Syscalls
+
+
+gid_t
+_user_getgid(bool effective)
+{
+	struct team* team = thread_get_current_thread()->team;
+
+	return effective ? team->effective_gid : team->real_gid;
+}
+
+
+uid_t
+_user_getuid(bool effective)
+{
+	struct team* team = thread_get_current_thread()->team;
+
+	return effective ? team->effective_uid : team->real_uid;
+}
+
+
+ssize_t
+_user_getgroups(int groupSize, gid_t* userGroupList)
+{
+	gid_t* groupList = NULL;
+
+	if (groupSize < 0)
+		return B_BAD_VALUE;
+	if (groupSize > NGROUPS_MAX + 1)
+		groupSize = NGROUPS_MAX + 1;
+
+	if (groupSize > 0) {
+		if (userGroupList == NULL || !IS_USER_ADDRESS(userGroupList))
+			return B_BAD_VALUE;
+
+		groupList = new(nothrow) gid_t[groupSize];
+		if (groupList == NULL)
+			return B_NO_MEMORY;
+	}
+
+	ArrayDeleter<gid_t> _(groupList);
+
+	ssize_t result = _kern_getgroups(groupSize, groupList);
+	if (result < 0)
+		return result;
+
+	if (groupSize > 0) {
+		if (user_memcpy(userGroupList, groupList, sizeof(gid_t) * result)
+				!= B_OK) {
+			return B_BAD_ADDRESS;
+		}
+	}
+
+	return result;
+}
+
+
+status_t
+_user_setregid(gid_t rgid, gid_t egid, bool setAllIfPrivileged)
+{
+	return common_setregid(rgid, egid, setAllIfPrivileged, false);
+}
+
+
+status_t
+_user_setreuid(uid_t ruid, uid_t euid, bool setAllIfPrivileged)
+{
+	return common_setreuid(ruid, euid, setAllIfPrivileged, false);
+}

Modified: haiku/trunk/src/system/libroot/posix/unistd/Jamfile
===================================================================
--- haiku/trunk/src/system/libroot/posix/unistd/Jamfile	2008-03-11 17:00:55 UTC (rev 24358)
+++ haiku/trunk/src/system/libroot/posix/unistd/Jamfile	2008-03-11 17:12:02 UTC (rev 24359)
@@ -35,7 +35,7 @@
 	truncate.c
 	ttyname.c
 	ualarm.c
-	usergroup.c
+	usergroup.cpp
 	usleep.c
 	write.c
 ;

Deleted: haiku/trunk/src/system/libroot/posix/unistd/usergroup.c

Copied: haiku/trunk/src/system/libroot/posix/unistd/usergroup.cpp (from rev 24356, haiku/trunk/src/system/libroot/posix/unistd/usergroup.c)
===================================================================
--- haiku/trunk/src/system/libroot/posix/unistd/usergroup.c	2008-03-11 01:35:30 UTC (rev 24356)
+++ haiku/trunk/src/system/libroot/posix/unistd/usergroup.cpp	2008-03-11 17:12:02 UTC (rev 24359)
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2008, Ingo Weinhold, ingo_weinhold at gmx.de. All rights reserved.
+ * Copyright 2002-2006, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <syscalls.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <pwd.h>
+
+
+template<typename T>
+static inline T
+set_errno_if_necessary(const T& result)
+{
+	if (result < 0) {
+		errno = result;
+		return -1;
+	}
+
+	return result;
+}
+
+
+gid_t
+getegid(void)
+{
+	return _kern_getgid(true);
+}
+
+
+uid_t
+geteuid(void)
+{
+	return _kern_getuid(true);
+}
+
+
+gid_t
+getgid(void)
+{
+	return _kern_getgid(false);
+}
+
+
+uid_t 
+getuid(void)
+{
+	return _kern_getuid(false);
+}
+
+
+int
+getgroups(int groupSize, gid_t groupList[])
+{
+	return set_errno_if_necessary(_kern_getgroups(groupSize, groupList));
+}
+
+
+int
+setgid(gid_t gid)
+{
+	return set_errno_if_necessary(_kern_setregid(gid, (gid_t)-1, true));
+}
+
+
+int
+setuid(uid_t uid)
+{
+	return set_errno_if_necessary(_kern_setreuid(uid, (uid_t)-1, true));
+}
+
+
+int
+setegid(gid_t gid)
+{
+	return set_errno_if_necessary(_kern_setregid((gid_t)-1, gid, false));
+}
+
+
+int
+seteuid(uid_t uid)
+{
+	return set_errno_if_necessary(_kern_setreuid((uid_t)-1, uid, false));
+}
+
+
+int
+setregid(gid_t rgid, gid_t egid)
+{
+	return set_errno_if_necessary(_kern_setregid(rgid, egid, false));
+}
+
+
+int
+setreuid(uid_t ruid, uid_t euid)
+{
+	return set_errno_if_necessary(_kern_setreuid(ruid, euid, false));
+}



From axeld at mail.berlios.de  Tue Mar 11 18:19:56 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 11 Mar 2008 18:19:56 +0100
Subject: [Haiku-commits] r24360 -
	haiku/trunk/src/add-ons/kernel/drivers/audio/hda
Message-ID: <200803111719.m2BHJujA001611@sheep.berlios.de>

Author: axeld
Date: 2008-03-11 18:19:55 +0100 (Tue, 11 Mar 2008)
New Revision: 24360
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24360&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h
Log:
* Separated widget parsing and debug output a bit better.
* More generic supported parameter support, respect the
  AUDIO_CAP_AMPLIFIER_OVERRIDE, and AUDIO_CAP_FORMAT_OVERRIDE bits.
* More cleanups.


Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h	2008-03-11 17:12:02 UTC (rev 24359)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h	2008-03-11 17:19:55 UTC (rev 24360)
@@ -4,6 +4,7 @@
  *
  * Authors:
  *		Ithamar Adema, ithamar AT unet DOT nl
+ *		Axel D?rfler, axeld at pinc-software.de
  */
 #ifndef _HDA_H_
 #define _HDA_H_
@@ -87,6 +88,8 @@
 };
 
 struct hda_widget {
+	uint32			node_id;
+
 	uint32			num_inputs;
 	int32			active_input;
 	uint32			inputs[MAX_INPUTS];
@@ -95,6 +98,12 @@
 	hda_widget_type	type;
 	uint32			pm;
 
+	struct {
+		uint32		audio;
+		uint32		output_amplifier;
+		uint32		input_amplifier;
+	} capabilities;
+
 	union {
 		struct {
 			uint32	formats;
@@ -134,6 +143,9 @@
 	uint32			supported_rates;
 	uint32			supported_pm;
 
+	uint32			input_amplifier_capabilities;
+	uint32			output_amplifier_capabilities;
+
 	hda_widget*		widgets;
 };
 

Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp	2008-03-11 17:12:02 UTC (rev 24359)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp	2008-03-11 17:19:55 UTC (rev 24360)
@@ -4,6 +4,7 @@
  *
  * Authors:
  *		Ithamar Adema, ithamar AT unet DOT nl
+ *		Axel D?rfler, axeld at pinc-software.de
  */
 
 
@@ -33,22 +34,132 @@
 };
 
 
+static const char*
+get_widget_type_name(hda_widget_type type)
+{
+	switch (type) {
+		case WT_AUDIO_OUTPUT:
+			return "Audio Output";
+		case WT_AUDIO_INPUT:
+			return "Audio Input";
+		case WT_AUDIO_MIXER:
+			return "Audio Mixer";
+		case WT_AUDIO_SELECTOR:
+			return "Audio Selector";
+		case WT_PIN_COMPLEX:
+			return "Pin Complex";
+		case WT_POWER:
+			return "Power";
+		case WT_VOLUME_KNOB:
+			return "Volume Knob";
+		case WT_BEEP_GENERATOR:
+			return "Beep Generator";
+		case WT_VENDOR_DEFINED:
+			return "Vendor Defined";
+		default:
+			return "Unknown";
+	}
+}
+
+
+static void
+dump_widget_audio_capabilities(uint32 capabilities)
+{
+	const struct {
+		uint32		flag;
+		const char*	name;
+	} kFlags[] = {
+		{AUDIO_CAP_LEFT_RIGHT_SWAP, "L-R Swap"},
+		{AUDIO_CAP_POWER_CONTROL, "Power"},
+		{AUDIO_CAP_DIGITAL, "Digital"},
+		{AUDIO_CAP_CONNECTION_LIST, "Conn. List"},
+		{AUDIO_CAP_UNSOLICITED_RESPONSES, "Unsol. Responses"},
+		{AUDIO_CAP_PROCESSING_CONTROLS, "Proc Widget"},
+		{AUDIO_CAP_STRIPE, "Stripe"},
+		{AUDIO_CAP_FORMAT_OVERRIDE, "Format Override"},
+		{AUDIO_CAP_AMPLIFIER_OVERRIDE, "Amplifier Override"},
+		{AUDIO_CAP_OUTPUT_AMPLIFIER, "Out Amplifier"},
+		{AUDIO_CAP_INPUT_AMPLIFIER, "In Amplifier"},
+		{AUDIO_CAP_STEREO, "Stereo"},			
+	};
+
+	char buffer[256];
+	int offset = 0;
+
+	for (uint32 j = 0; j < sizeof(kFlags) / sizeof(kFlags[0]); j++) {
+		if (capabilities & kFlags[j].flag)
+			offset += sprintf(buffer + offset, "[%s] ", kFlags[j].name);
+	}
+
+	if (offset != 0)
+		dprintf("\t%s\n", buffer);
+}
+
+
+static void
+dump_widget_inputs(hda_widget& widget)
+{
+	// dump connections
+
+	char buffer[256];
+	int offset = 0;
+
+	for (uint32 i = 0; i < widget.num_inputs; i++) {
+		int32 input = widget.inputs[i];
+
+		if ((int32)i != widget.active_input)
+			offset += sprintf(buffer + offset, "%ld ", input);
+		else
+			offset += sprintf(buffer + offset, "<%ld> ", input);
+	}
+
+	if (offset != 0)
+		dprintf("\tConnections: %s\n", buffer);
+}
+
+
+static void
+dump_widget_amplifier_capabilities(hda_widget& widget, bool input)
+{
+	uint32 capabilities;
+	if (input)
+		capabilities = widget.capabilities.input_amplifier;
+	else
+		capabilities = widget.capabilities.output_amplifier;
+
+	if (capabilities == 0)
+		return;
+
+	dprintf("\t%s Amp: %sstep size: %ld dB, # steps: %ld, offset to 0 dB: "
+		"%ld\n", input ? "In" : "Out",
+		(capabilities & AMP_CAP_MUTE) != 0 ? "supports mute, " : "",
+		(((capabilities & AMP_CAP_STEP_SIZE_MASK)
+			>> AMP_CAP_STEP_SIZE_SHIFT) + 1) / 4,
+		(capabilities & AMP_CAP_NUM_STEPS_MASK) >> AMP_CAP_NUM_STEPS_SHIFT,
+		capabilities & AMP_CAP_OFFSET_MASK);
+}
+
+
+//	#pragma mark -
+
+
 static status_t
-hda_widget_get_pm_support(hda_codec* codec, uint32 nodeID, uint32* pm)
+hda_get_pm_support(hda_codec* codec, uint32 nodeID, uint32* pm)
 {
 	corb_t verb = MAKE_VERB(codec->addr, nodeID, VID_GET_PARAMETER,
 		PID_POWERSTATE_SUPPORT);
 	status_t rc;
-	uint32 resp;
+	uint32 response;
 
-	if ((rc = hda_send_verbs(codec, &verb, &resp, 1)) == B_OK) {
-		*pm = 0;
-
+	if ((rc = hda_send_verbs(codec, &verb, &response, 1)) == B_OK) {
+		*pm = response & 0xf;
+#if 0
 		/* FIXME: Define constants for powermanagement modes */
 		if (resp & (1 << 0))	;
 		if (resp & (1 << 1))	;
 		if (resp & (1 << 2))	;
 		if (resp & (1 << 3))	;
+#endif
 	}
 
 	return rc;
@@ -56,7 +167,7 @@
 
 
 static status_t
-hda_widget_get_stream_support(hda_codec* codec, uint32 nodeID, uint32* formats,
+hda_get_stream_support(hda_codec* codec, uint32 nodeID, uint32* formats,
 	uint32* rates)
 {
 	corb_t verbs[2];
@@ -121,36 +232,85 @@
 }
 
 
+//	#pragma mark - widget functions
+
+
 static status_t
-hda_widget_get_amplifier_capabilities(hda_codec* codec, uint32 nodeID)
+hda_widget_get_pm_support(hda_audio_group* audioGroup, hda_widget* widget)
 {
-	status_t rc;
+	return hda_get_pm_support(audioGroup->codec, widget->node_id,
+		&widget->pm);
+}
+
+
+static status_t
+hda_widget_get_stream_support(hda_audio_group* audioGroup, hda_widget* widget)
+{
+	if ((widget->capabilities.audio & AUDIO_CAP_FORMAT_OVERRIDE) == 0) {
+		// adopt capabilities of the audio group
+		widget->d.output.formats = audioGroup->supported_formats;
+		widget->d.output.rates = audioGroup->supported_rates;
+		return B_OK;
+	}
+
+	return hda_get_stream_support(audioGroup->codec, widget->node_id,
+		&widget->d.output.formats, &widget->d.output.rates);
+}
+
+
+static status_t
+hda_widget_get_amplifier_capabilities(hda_audio_group* audioGroup,
+	hda_widget* widget)
+{
+	uint32 response;
 	corb_t verb;
-	uint32 resp;
 
-	verb = MAKE_VERB(codec->addr, nodeID, VID_GET_PARAMETER,
-		PID_OUTPUT_AMPLIFIER_CAP);
-	rc = hda_send_verbs(codec, &verb, &resp, 1);
-	if (rc == B_OK && resp != 0) {
-		dprintf("\tAMP: Mute: %s, step size: %ld, # steps: %ld, offset: %ld\n",
-			(resp & (1 << 31)) ? "supported" : "N/A",
-			(resp >> 16) & 0x7F,
-			(resp >> 8) & 0x7F,
-			resp & 0x7F);
+	if ((widget->capabilities.audio & AUDIO_CAP_OUTPUT_AMPLIFIER) != 0) {
+		if ((widget->capabilities.audio & AUDIO_CAP_AMPLIFIER_OVERRIDE) != 0) {
+			verb = MAKE_VERB(audioGroup->codec->addr, widget->node_id,
+				VID_GET_PARAMETER, PID_OUTPUT_AMPLIFIER_CAP);
+			status_t status = hda_send_verbs(audioGroup->codec, &verb,
+				&response, 1);
+			if (status < B_OK)
+				return status;
+
+			widget->capabilities.output_amplifier = response;
+		} else {
+			// adopt capabilities from the audio function group
+			widget->capabilities.output_amplifier
+				= audioGroup->output_amplifier_capabilities;
+		}
 	}
 
-	return rc;
+	if ((widget->capabilities.audio & AUDIO_CAP_INPUT_AMPLIFIER) != 0) {
+		if ((widget->capabilities.audio & AUDIO_CAP_AMPLIFIER_OVERRIDE) != 0) {
+			verb = MAKE_VERB(audioGroup->codec->addr, widget->node_id,
+				VID_GET_PARAMETER, PID_INPUT_AMPLIFIER_CAP);
+			status_t status = hda_send_verbs(audioGroup->codec, &verb,
+				&response, 1);
+			if (status < B_OK)
+				return status;
+
+			widget->capabilities.input_amplifier = response;
+		} else {
+			// adopt capabilities from the audio function group
+			widget->capabilities.input_amplifier
+				= audioGroup->input_amplifier_capabilities;
+		}
+	}
+
+	return B_OK;
 }
 
 
 static status_t
-hda_widget_get_connections(hda_codec* codec, uint32 nodeID, hda_widget* widget)
+hda_widget_get_connections(hda_audio_group* audioGroup, hda_widget* widget)
 {
-	uint32 verb = MAKE_VERB(codec->addr, nodeID, VID_GET_PARAMETER,
-		PID_CONNECTION_LIST_LENGTH);
+	uint32 verb = MAKE_VERB(audioGroup->codec->addr, widget->node_id,
+		VID_GET_PARAMETER, PID_CONNECTION_LIST_LENGTH);
 	uint32 response;
 
-	if (hda_send_verbs(codec, &verb, &response, 1) != B_OK)
+	if (hda_send_verbs(audioGroup->codec, &verb, &response, 1) != B_OK)
 		return B_ERROR;
 
 	uint32 listEntries = response & 0x7f;
@@ -162,8 +322,9 @@
 #if 1
 	if (widget->num_inputs > 1) {
 		// Get currently active connection
-		verb = MAKE_VERB(codec->addr, nodeID, VID_GET_CONNECTION_SELECT, 0);
-		if (hda_send_verbs(codec, &verb, &response, 1) == B_OK)
+		verb = MAKE_VERB(audioGroup->codec->addr, widget->node_id,
+			VID_GET_CONNECTION_SELECT, 0);
+		if (hda_send_verbs(audioGroup->codec, &verb, &response, 1) == B_OK)
 			widget->active_input = response & 0xff;
 	}
 #endif
@@ -178,11 +339,12 @@
 		if ((i % valuesPerEntry) == 0) {
 			// We get 2 or 4 answers per call depending on if we're
 			// in short or long list mode
-			verb = MAKE_VERB(codec->addr, nodeID,
+			verb = MAKE_VERB(audioGroup->codec->addr, widget->node_id,
 				VID_GET_CONNECTION_LIST_ENTRY, i);
-			if (hda_send_verbs(codec, &verb, &response, 1) != B_OK) {
+			if (hda_send_verbs(audioGroup->codec, &verb, &response, 1)
+					!= B_OK) {
 				dprintf("hda: Error parsing inputs for widget %ld!\n",
-					nodeID);
+					widget->node_id);
 				break;
 			}
 		}
@@ -214,36 +376,15 @@
 	}
 
 	widget->num_inputs = numInputs;
+
+	if (widget->num_inputs == 1)
+		widget->active_input = widget->inputs[0];
+
 	return B_OK;
 }
 
 
-static const char*
-get_widget_type_name(hda_widget_type type)
-{
-	switch (type) {
-		case WT_AUDIO_OUTPUT:
-			return "Audio Output";
-		case WT_AUDIO_INPUT:
-			return "Audio Input";
-		case WT_AUDIO_MIXER:
-			return "Audio Mixer";
-		case WT_AUDIO_SELECTOR:
-			return "Audio Selector";
-		case WT_PIN_COMPLEX:
-			return "Pin Complex";
-		case WT_POWER:
-			return "Power";
-		case WT_VOLUME_KNOB:
-			return "Volume Knob";
-		case WT_BEEP_GENERATOR:
-			return "Beep Generator";
-		case WT_VENDOR_DEFINED:
-			return "Vendor Defined";
-		default:
-			return "Unknown";
-	}
-}
+//	#pragma mark - audio group functions
 
 
 static status_t
@@ -252,9 +393,9 @@
 	corb_t verbs[3];
 	uint32 resp[3];
 
-	hda_widget_get_stream_support(audioGroup->codec, audioGroup->root_node_id,
+	hda_get_stream_support(audioGroup->codec, audioGroup->root_node_id,
 		&audioGroup->supported_formats, &audioGroup->supported_rates);
-	hda_widget_get_pm_support(audioGroup->codec, audioGroup->root_node_id,
+	hda_get_pm_support(audioGroup->codec, audioGroup->root_node_id,
 		&audioGroup->supported_pm);
 
 	verbs[0] = MAKE_VERB(audioGroup->codec->addr, audioGroup->root_node_id,
@@ -291,134 +432,79 @@
 
 	/* Iterate over all Widgets and collect info */
 	for (uint32 i = 0; i < audioGroup->widget_count; i++) {
-		uint32 widget = audioGroup->widget_start + i;
+		hda_widget& widget = audioGroup->widgets[i];
+		uint32 nodeID = audioGroup->widget_start + i;
+		uint32 capabilities;
 
-		verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget, VID_GET_PARAMETER,
+		verbs[0] = MAKE_VERB(audioGroup->codec->addr, nodeID, VID_GET_PARAMETER,
 			PID_AUDIO_WIDGET_CAP);
-		if (hda_send_verbs(audioGroup->codec, verbs, resp, 1) != B_OK)
+		if (hda_send_verbs(audioGroup->codec, verbs, &capabilities, 1) != B_OK)
 			return B_ERROR;
 
-		audioGroup->widgets[i].type = (hda_widget_type)(resp[0] >> 20);
-		audioGroup->widgets[i].active_input = -1;
+		widget.type = (hda_widget_type)((capabilities & AUDIO_CAP_TYPE_MASK)
+			>> AUDIO_CAP_TYPE_SHIFT);
+		widget.active_input = -1;
+		widget.capabilities.audio = capabilities;
+		widget.node_id = nodeID;
 
-		dprintf("%ld: %s\n", widget,
-			get_widget_type_name(audioGroup->widgets[i].type));
-
-		char buf[256];
-		int off = 0;
-		buf[0] = '\0';
-
-		if (resp[0] & (1 << 11))
-			off += sprintf(buf + off, "[L-R Swap] ");
-
-		if (resp[0] & (1 << 10)) {
-			corb_t verb;
-			uint32 resp;
-
-			off += sprintf(buf + off, "[Power] ");
-
+		if ((capabilities & AUDIO_CAP_POWER_CONTROL) != 0) {
 			/* We support power; switch us on! */
-			verb = MAKE_VERB(audioGroup->codec->addr, widget,
+			verbs[0] = MAKE_VERB(audioGroup->codec->addr, nodeID,
 				VID_SET_POWER_STATE, 0);
-			hda_send_verbs(audioGroup->codec, &verb, &resp, 1);
+			hda_send_verbs(audioGroup->codec, verbs, NULL, 1);
+
+			snooze(1000);
 		}
+		if ((capabilities & (AUDIO_CAP_INPUT_AMPLIFIER
+				| AUDIO_CAP_OUTPUT_AMPLIFIER)) != 0) {
+			hda_widget_get_amplifier_capabilities(audioGroup, &widget);
+		}
 
-		if (resp[0] & (1 << 9))
-			off += sprintf(buf + off, "[Digital] ");
-		if (resp[0] & (1 << 7))
-			off += sprintf(buf + off, "[Unsol Capable] ");
-		if (resp[0] & (1 << 6))
-			off += sprintf(buf + off, "[Proc Widget] ");
-		if (resp[0] & (1 << 5))
-			off += sprintf(buf + off, "[Stripe] ");
-		if (resp[0] & (1 << 4))
-			off += sprintf(buf + off, "[Format Override] ");
-		if (resp[0] & (1 << 3))
-			off += sprintf(buf + off, "[Amp Param Override] ");
-		if (resp[0] & (1 << 2))
-			off += sprintf(buf + off, "[Out Amp] ");
-		if (resp[0] & (1 << 1))
-			off += sprintf(buf + off, "[In Amp] ");
-		if (resp[0] & (1 << 0))
-			off += sprintf(buf + off, "[Stereo] ");
+		dprintf("%ld: %s\n", nodeID, get_widget_type_name(widget.type));
 
-		switch (audioGroup->widgets[i].type) {
+		switch (widget.type) {
 			case WT_AUDIO_OUTPUT:
-				hda_widget_get_stream_support(audioGroup->codec, widget,
-					&audioGroup->widgets[i].d.input.formats,
-					&audioGroup->widgets[i].d.input.rates);
-				hda_widget_get_amplifier_capabilities(audioGroup->codec, widget);
-				break;
 			case WT_AUDIO_INPUT:
-				hda_widget_get_stream_support(audioGroup->codec, widget,
-					&audioGroup->widgets[i].d.input.formats,
-					&audioGroup->widgets[i].d.input.rates);
-				hda_widget_get_amplifier_capabilities(audioGroup->codec, widget);
+				hda_widget_get_stream_support(audioGroup, &widget);
 				break;
-			case WT_AUDIO_MIXER:
-				hda_widget_get_amplifier_capabilities(audioGroup->codec, widget);
-				break;
-			case WT_AUDIO_SELECTOR:
-				hda_widget_get_amplifier_capabilities(audioGroup->codec, widget);
-				break;
+
 			case WT_PIN_COMPLEX:
-				verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget,
+				verbs[0] = MAKE_VERB(audioGroup->codec->addr, nodeID,
 					VID_GET_PARAMETER, PID_PIN_CAP);
 				if (hda_send_verbs(audioGroup->codec, verbs, resp, 1) == B_OK) {
-					audioGroup->widgets[i].d.pin.input = resp[0] & (1 << 5);
-					audioGroup->widgets[i].d.pin.output = resp[0] & (1 << 4);
+					widget.d.pin.input = resp[0] & (1 << 5);
+					widget.d.pin.output = resp[0] & (1 << 4);
 
-					dprintf("\t%s%s\n", 
-						audioGroup->widgets[i].d.pin.input ? "[Input] " : "",
-						audioGroup->widgets[i].d.pin.output ? "[Output]" : "");
+					dprintf("\t%s%s\n", widget.d.pin.input ? "[Input] " : "",
+						widget.d.pin.output ? "[Output]" : "");
 				} else {
 					dprintf("%s: Error getting Pin Complex IO\n", __func__);
 				}
 
-				verbs[0] = MAKE_VERB(audioGroup->codec->addr, widget,
+				verbs[0] = MAKE_VERB(audioGroup->codec->addr, nodeID,
 					VID_GET_CONFIGURATION_DEFAULT, 0);
 				if (hda_send_verbs(audioGroup->codec, verbs, resp, 1) == B_OK) {
-					audioGroup->widgets[i].d.pin.device = (pin_dev_type)
+					widget.d.pin.device = (pin_dev_type)
 						((resp[0] >> 20) & 0xf);
 					dprintf("\t%s, %s, %s, %s\n",
 						kPortConnector[resp[0] >> 30],	
-						kDefaultDevice[audioGroup->widgets[i].d.pin.device],
+						kDefaultDevice[widget.d.pin.device],
 						kConnectionType[(resp[0] >> 16) & 0xF],
 						kJackColor[(resp[0] >> 12) & 0xF]);
 				}
-
-				hda_widget_get_amplifier_capabilities(audioGroup->codec, widget);
 				break;
 
 			default:
 				break;
 		}
 
-		if (off)
-			dprintf("\t%s\n", buf);
+		hda_widget_get_pm_support(audioGroup, &widget);
+		hda_widget_get_connections(audioGroup, &widget);
 
-		hda_widget_get_pm_support(audioGroup->codec, widget,
-			&audioGroup->widgets[i].pm);
-		hda_widget_get_connections(audioGroup->codec, widget,
-			&audioGroup->widgets[i]);
-
-		// dump connections
-
-		buf[0] = '\0';
-		off = 0;
-
-		for (uint32 inputIndex = 0; inputIndex
-				< audioGroup->widgets[i].num_inputs; inputIndex++) {
-			int32 input = audioGroup->widgets[i].inputs[inputIndex];
-
-			if ((int32)inputIndex != audioGroup->widgets[i].active_input)
-				off += sprintf(buf + off, "%ld ", input);
-			else
-				off += sprintf(buf + off, "(%ld) ", input);
-		}
-
-		if (off != 0)
-			dprintf("\tConnections: %s\n", buf);
+		dump_widget_audio_capabilities(capabilities);
+		dump_widget_amplifier_capabilities(widget, true);
+		dump_widget_amplifier_capabilities(widget, false);
+		dump_widget_inputs(widget);
 	}
 
 	return B_OK;

Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h	2008-03-11 17:12:02 UTC (rev 24359)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h	2008-03-11 17:19:55 UTC (rev 24360)
@@ -4,6 +4,7 @@
  *
  * Authors:
  *		Ithamar Adema, ithamar AT unet DOT nl
+ *		Axel D?rfler, axeld at pinc-software.de
  */
 #ifndef HDA_CODEC_H
 #define HDA_CODEC_H
@@ -118,57 +119,84 @@
 #define VID_FUNCTION_RESET					0x7ff00
 
 /* Parameter IDs */
-#define PID_VENDOR_ID				0x00
-#define PID_REVISION_ID				0x02
-#define PID_SUBORDINATE_NODE_COUNT	0x04
-#define PID_FUNCTION_GROUP_TYPE		0x05
-#define PID_AUDIO_GROUP_CAP			0x08
-#define PID_AUDIO_WIDGET_CAP		0x09
-#define PID_PCM_SUPPORT				0x0a
-#define PID_STREAM_SUPPORT			0x0b
-#define PID_PIN_CAP					0x0c
-#define PID_INPUT_AMPLIFIER_CAP		0x0d
-#define PID_CONNECTION_LIST_LENGTH	0x0e
-#define PID_POWERSTATE_SUPPORT		0x0f
-#define PID_PROCESSING_CAP			0x10
-#define PID_GPIO_COUNT				0x11
-#define PID_OUTPUT_AMPLIFIER_CAP	0x12
-#define PID_VOLUME_KNOB_CAP			0x13
+#define PID_VENDOR_ID					0x00
+#define PID_REVISION_ID					0x02
+#define PID_SUBORDINATE_NODE_COUNT		0x04
+#define PID_FUNCTION_GROUP_TYPE			0x05
+#define PID_AUDIO_GROUP_CAP				0x08
+#define PID_AUDIO_WIDGET_CAP			0x09
+#define PID_PCM_SUPPORT					0x0a
+#define PID_STREAM_SUPPORT				0x0b
+#define PID_PIN_CAP						0x0c
+#define PID_INPUT_AMPLIFIER_CAP			0x0d
+#define PID_CONNECTION_LIST_LENGTH		0x0e
+#define PID_POWERSTATE_SUPPORT			0x0f
+#define PID_PROCESSING_CAP				0x10
+#define PID_GPIO_COUNT					0x11
+#define PID_OUTPUT_AMPLIFIER_CAP		0x12
+#define PID_VOLUME_KNOB_CAP				0x13
 
+/* Audio widget capabilities */
+#define AUDIO_CAP_DELAY_MASK			0x000f0000
+#define AUDIO_CAP_DELAY_SHIFT			16
+#define AUDIO_CAP_TYPE_MASK				0x00f00000
+#define AUDIO_CAP_TYPE_SHIFT			20
+
+#define AUDIO_CAP_STEREO				(1L << 0)
+#define AUDIO_CAP_INPUT_AMPLIFIER		(1L << 1)
+#define AUDIO_CAP_OUTPUT_AMPLIFIER		(1L << 2)
+#define AUDIO_CAP_AMPLIFIER_OVERRIDE	(1L << 3)
+#define AUDIO_CAP_FORMAT_OVERRIDE		(1L << 4)
+#define AUDIO_CAP_STRIPE				(1L << 5)
+#define AUDIO_CAP_PROCESSING_CONTROLS	(1L << 6)
+#define AUDIO_CAP_UNSOLICITED_RESPONSES	(1L << 7)
+#define AUDIO_CAP_CONNECTION_LIST		(1L << 8)
+#define AUDIO_CAP_DIGITAL				(1L << 9)
+#define AUDIO_CAP_POWER_CONTROL			(1L << 10)
+#define AUDIO_CAP_LEFT_RIGHT_SWAP		(1L << 11)
+
+/* Amplifier capabilities */
+#define AMP_CAP_MUTE					0xf0000000
+#define AMP_CAP_STEP_SIZE_MASK			0x007f0000
+#define AMP_CAP_STEP_SIZE_SHIFT			16
+#define AMP_CAP_NUM_STEPS_MASK			0x00007f00
+#define AMP_CAP_NUM_STEPS_SHIFT			8
+#define AMP_CAP_OFFSET_MASK				0x0000007f
+
 /* PCM support */
-#define PCM_8_BIT					(1L << 16)
-#define PCM_16_BIT					(1L << 17)
-#define PCM_20_BIT					(1L << 18)
-#define PCM_24_BIT					(1L << 19)
-#define PCM_32_BIT					(1L << 20)
+#define PCM_8_BIT						(1L << 16)
+#define PCM_16_BIT						(1L << 17)
+#define PCM_20_BIT						(1L << 18)
+#define PCM_24_BIT						(1L << 19)
+#define PCM_32_BIT						(1L << 20)
 
 /* stream support */
-#define STREAM_AC3					0x00000004
-#define STREAM_FLOAT				0x00000002
-#define STREAM_PCM					0x00000001
+#define STREAM_AC3						0x00000004
+#define STREAM_FLOAT					0x00000002
+#define STREAM_PCM						0x00000001
 
 /* Amplifier Gain/Mute */
-#define AMP_GET_OUTPUT				(1L << 15)
-#define AMP_GET_INPUT				(0L << 15)
-#define AMP_GET_LEFT_CHANNEL		(1L << 13)
-#define AMP_GET_RIGHT_CHANNEL		(0L << 13)
-#define AMP_GET_INPUT_INDEX_MASK	0x0000000f
-#define AMP_GET_INPUT_INDEX_SHIFT	0
+#define AMP_GET_OUTPUT					(1L << 15)
+#define AMP_GET_INPUT					(0L << 15)
+#define AMP_GET_LEFT_CHANNEL			(1L << 13)
+#define AMP_GET_RIGHT_CHANNEL			(0L << 13)
+#define AMP_GET_INPUT_INDEX_MASK		0x0000000f
+#define AMP_GET_INPUT_INDEX_SHIFT		0
 
-#define AMP_SET_OUTPUT				(1L << 15)
-#define AMP_SET_INPUT				(1L << 14)
-#define AMP_SET_LEFT_CHANNEL		(1L << 13)
-#define AMP_SET_RIGHT_CHANNEL		(1L << 12)
-#define AMP_SET_INPUT_INDEX_MASK	0x00000f00
-#define AMP_SET_INPUT_INDEX_SHIFT	8
+#define AMP_SET_OUTPUT					(1L << 15)
+#define AMP_SET_INPUT					(1L << 14)
+#define AMP_SET_LEFT_CHANNEL			(1L << 13)
+#define AMP_SET_RIGHT_CHANNEL			(1L << 12)
+#define AMP_SET_INPUT_INDEX_MASK		0x00000f00
+#define AMP_SET_INPUT_INDEX_SHIFT		8
 
-#define AMP_GAIN_MASK				0x0000007f
-#define AMP_MUTE					(1L << 8)
+#define AMP_GAIN_MASK					0x0000007f
+#define AMP_MUTE						(1L << 8)
 
 /* Pin Widget Control */
-#define PIN_ENABLE_HEAD_PHONE		(1L << 7)
-#define PIN_ENABLE_OUTPUT			(1L << 6)
-#define PIN_ENABLE_INPUT			(1L << 5)
-#define PIN_ENABLE_VOLTAGE_REF_MASK	0x3
+#define PIN_ENABLE_HEAD_PHONE			(1L << 7)
+#define PIN_ENABLE_OUTPUT				(1L << 6)
+#define PIN_ENABLE_INPUT				(1L << 5)
+#define PIN_ENABLE_VOLTAGE_REF_MASK		0x3
 
 #endif /* HDA_CODEC_H */



From stippi at mail.berlios.de  Tue Mar 11 18:38:29 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 11 Mar 2008 18:38:29 +0100
Subject: [Haiku-commits] r24361 - haiku/trunk/src/servers/app
Message-ID: <200803111738.m2BHcTEu018258@sheep.berlios.de>

Author: stippi
Date: 2008-03-11 18:38:26 +0100 (Tue, 11 Mar 2008)
New Revision: 24361
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24361&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/ServerWindow.h
Log:
GetClippingRegion() was implemented wrongly on the app_server side. It needs
to take the current effective drawing region of the view, but converted to
local coordinate space. Untested as of yet.


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-11 17:19:55 UTC (rev 24360)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2008-03-11 17:38:26 UTC (rev 24361)
@@ -1787,8 +1787,10 @@
 				BRegion empty;
 				fLink.AttachRegion(empty);
 			} else {
-				BRegion drawingRegion = fCurrentView->LocalClipping();
-				fLink.AttachRegion(drawingRegion);
+				_UpdateCurrentDrawingRegion();
+				BRegion region(fCurrentDrawingRegion);
+				fCurrentView->ConvertFromScreen(&region);
+				fLink.AttachRegion(region);
 			}
 			fLink.Flush();
 
@@ -2047,11 +2049,7 @@
 		return;
 	}
 
-	if (!fCurrentDrawingRegionValid || fWindow->DrawingRegionChanged(fCurrentView)) {
-		fWindow->GetEffectiveDrawingRegion(fCurrentView, fCurrentDrawingRegion);
-		fCurrentDrawingRegionValid = true;
-	}
-
+	_UpdateCurrentDrawingRegion();
 	if (fCurrentDrawingRegion.CountRects() <= 0) {
 		if (link.NeedsReply()) {
 			// the client is now blocking and waiting for a reply!
@@ -3181,6 +3179,18 @@
 }
 
 
+void
+ServerWindow::_UpdateCurrentDrawingRegion()
+{
+	if (!fCurrentDrawingRegionValid
+		|| fWindow->DrawingRegionChanged(fCurrentView)) {
+		fWindow->GetEffectiveDrawingRegion(fCurrentView,
+			fCurrentDrawingRegion);
+		fCurrentDrawingRegionValid = true;
+	}
+}
+
+
 bool
 ServerWindow::_MessageNeedsAllWindowsLocked(uint32 code) const
 {

Modified: haiku/trunk/src/servers/app/ServerWindow.h
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.h	2008-03-11 17:19:55 UTC (rev 24360)
+++ haiku/trunk/src/servers/app/ServerWindow.h	2008-03-11 17:38:26 UTC (rev 24361)
@@ -128,6 +128,7 @@
 
 			void				_SetCurrentView(View* view);
 			void				_UpdateDrawState(View* view);
+			void				_UpdateCurrentDrawingRegion();
 
 			bool				_MessageNeedsAllWindowsLocked(uint32 code) const;
 



From revol at free.fr  Tue Mar 11 19:12:28 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Tue, 11 Mar 2008 19:12:28 +0100 CET
Subject: [Haiku-commits]
 =?windows-1252?q?r24359_-_in_haiku/trunk=3A_heade?=
 =?windows-1252?q?rs/posix_headers/private/kernel_src/system/kernel_src/sy?=
 =?windows-1252?q?stem/kernel/lib__src/system/libroot/posix/unistd?=
In-Reply-To: <200803111712.m2BHC3Qg000978@sheep.berlios.de>
Message-ID: <1510639499-BeMail@laptop>

> * Added real, effective and saved set- user and group IDs to the team
>   structure. They are properly inherited and updated on
>   fork(), load_image(), and exec().
> * Implemented the get[e]{u,g}id(), set[[r]e]{u,g}id() family for 
> real.
> * getgroups() also calls the kernel now, but only returns the 
> effective
>   group ID. Supplementary groups support is still missing.
> 

Great, I won't have to do it :)
Now I can test multiuser.

Fran?ois.


From mauricek at mail.berlios.de  Tue Mar 11 22:00:28 2008
From: mauricek at mail.berlios.de (mauricek at BerliOS)
Date: Tue, 11 Mar 2008 22:00:28 +0100
Subject: [Haiku-commits] r24362 -
	haiku/trunk/src/add-ons/media/media-add-ons/videowindow
Message-ID: <200803112100.m2BL0SUC011893@sheep.berlios.de>

Author: mauricek
Date: 2008-03-11 22:00:27 +0100 (Tue, 11 Mar 2008)
New Revision: 24362
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24362&view=rev

Modified:
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp
   haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h
Log:
* The flavor info needs to initialize the output format count to 0 too, as otherwise the addon server tries to allocate to much memory.
* Use a member variable for the input media_format
Thx to Ingo for pointing this out



Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp	2008-03-11 17:38:26 UTC (rev 24361)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.cpp	2008-03-11 21:00:27 UTC (rev 24362)
@@ -18,6 +18,10 @@
 		: BMediaAddOn(id)
 {
 	CALLED();
+
+	fInputFormat.type = B_MEDIA_RAW_VIDEO;
+	fInputFormat.u.raw_video = media_raw_video_format::wildcard;
+
 	fInfo.internal_id = 0;
 	fInfo.name = strdup("VideoWindow Consumer");
 	fInfo.info = strdup("This node displays a simple video window");
@@ -25,10 +29,11 @@
 	fInfo.flavor_flags = 0;
 	fInfo.possible_count = 0;
 	fInfo.in_format_count = 1;
-	media_format *inFormat = new media_format;
-	inFormat->type = B_MEDIA_RAW_VIDEO;
-	inFormat->u.raw_video = media_raw_video_format::wildcard;
-	fInfo.in_formats = inFormat;
+	fInfo.in_format_flags = 0;
+	fInfo.in_formats = &fInputFormat;
+	fInfo.out_format_count = 0;
+	fInfo.out_formats = 0;
+	fInfo.out_format_flags = 0;
 }
 
 

Modified: haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h	2008-03-11 17:38:26 UTC (rev 24361)
+++ haiku/trunk/src/add-ons/media/media-add-ons/videowindow/VideoAddOn.h	2008-03-11 21:00:27 UTC (rev 24362)
@@ -24,6 +24,7 @@
 
 private:
 	flavor_info					fInfo;
+	media_format				fInputFormat;
 };
 
 extern "C" BMediaAddOn *make_media_addon(image_id id);



From bonefish at mail.berlios.de  Tue Mar 11 22:27:01 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 11 Mar 2008 22:27:01 +0100
Subject: [Haiku-commits] r24363 - haiku/trunk/src/system/libroot/posix/sys
Message-ID: <200803112127.m2BLR18r014691@sheep.berlios.de>

Author: bonefish
Date: 2008-03-11 22:27:00 +0100 (Tue, 11 Mar 2008)
New Revision: 24363
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24363&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/sys/itimer.c
Log:
We only support real time timers. Pretending to support virtual timers
only gets the caller into trouble, since then another signal should be
sent.


Modified: haiku/trunk/src/system/libroot/posix/sys/itimer.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/sys/itimer.c	2008-03-11 21:00:27 UTC (rev 24362)
+++ haiku/trunk/src/system/libroot/posix/sys/itimer.c	2008-03-11 21:27:00 UTC (rev 24363)
@@ -24,11 +24,18 @@
 int
 setitimer(int which, const struct itimerval *value, struct itimerval *oldValue)
 {
-	// ToDo: implement me properly!
+	// TODO: implement me properly!
 	// We probably need a better internal set_alarm() implementation to do this
 
 	bigtime_t interval = value->it_interval.tv_sec * USEC_PER_SECOND + value->it_interval.tv_usec;
 	bigtime_t remaining;
+
+	// Only real time timers work at all.
+	if (which != ITIMER_REAL) {
+		errno = B_NOT_SUPPORTED;
+		return -1;
+	}
+
 	if (interval != 0)
 		remaining = set_alarm(interval, B_PERIODIC_ALARM);
 	else {



From bonefish at mail.berlios.de  Tue Mar 11 22:29:45 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 11 Mar 2008 22:29:45 +0100
Subject: [Haiku-commits] r24364 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200803112129.m2BLTjSL014913@sheep.berlios.de>

Author: bonefish
Date: 2008-03-11 22:29:44 +0100 (Tue, 11 Mar 2008)
New Revision: 24364
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24364&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_interrupts.S
Log:
With syscall kernel tracing enabled, the syscall return value (%eax,
%edx) was trashed before passing it to the user debugger. strace shows
the correct return values again.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_interrupts.S
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_interrupts.S	2008-03-11 21:27:00 UTC (rev 24363)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_interrupts.S	2008-03-11 21:29:44 UTC (rev 24364)
@@ -400,7 +400,9 @@
 	jz		1f
 	pushl	-4(%ebp)				// syscall start time
 	pushl	-8(%ebp)
-	push	%edx					// syscall return value
+	movl	IFRAME_edx(%ebp), %edx	// syscall return value
+	movl	IFRAME_eax(%ebp), %eax
+	push	%edx
 	push	%eax
 	lea		16(%esp), %eax			// syscall parameters
 	push	%eax



From mmu_man at mail.berlios.de  Tue Mar 11 22:53:40 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Tue, 11 Mar 2008 22:53:40 +0100
Subject: [Haiku-commits] r24365 - haiku/trunk/src/system/libroot/posix/sys
Message-ID: <200803112153.m2BLreQD017415@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-11 22:53:40 +0100 (Tue, 11 Mar 2008)
New Revision: 24365
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24365&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/sys/itimer.c
Log:
Missing include... at least for gcc4.


Modified: haiku/trunk/src/system/libroot/posix/sys/itimer.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/sys/itimer.c	2008-03-11 21:29:44 UTC (rev 24364)
+++ haiku/trunk/src/system/libroot/posix/sys/itimer.c	2008-03-11 21:53:40 UTC (rev 24365)
@@ -6,6 +6,7 @@
 
 #include <OS.h>
 
+#include <errno.h>
 #include <sys/time.h>
 #include <string.h>
 



From marcusoverhagen at mail.berlios.de  Wed Mar 12 00:24:40 2008
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Wed, 12 Mar 2008 00:24:40 +0100
Subject: [Haiku-commits] r24366 - haiku/trunk/src/kits/media
Message-ID: <200803112324.m2BNOevQ026686@sheep.berlios.de>

Author: marcusoverhagen
Date: 2008-03-12 00:24:40 +0100 (Wed, 12 Mar 2008)
New Revision: 24366
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24366&view=rev

Modified:
   haiku/trunk/src/kits/media/MediaAddOn.cpp
Log:
Removed a lot of unsave memory handling.
Check for memory allocation errors.
Added limit to maximum flavor format count (300).
No longer crashes when out_format_count is invalid for B_BUFFER_CONSUMER,
or in_format_count is invalid for B_BUFFER_PRODUCER.


Modified: haiku/trunk/src/kits/media/MediaAddOn.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaAddOn.cpp	2008-03-11 21:53:40 UTC (rev 24365)
+++ haiku/trunk/src/kits/media/MediaAddOn.cpp	2008-03-11 23:24:40 UTC (rev 24366)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003 Marcus Overhagen <Marcus at Overhagen.de>
+ * Copyright (c) 2002, 2003, 2008 Marcus Overhagen <Marcus at Overhagen.de>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files or portions
@@ -30,6 +30,7 @@
 #include <MediaAddOn.h>
 #include <string.h>
 #include <stdlib.h>
+#include <new>
 #include "debug.h"
 #include "DataExchange.h"
 
@@ -37,17 +38,21 @@
  * some little helper function
  */
 
-static inline char *newstrdup(const char *str);
-char *newstrdup(const char *str)
+static inline char *_newstrdup(const char *str);
+char *_newstrdup(const char *str)
 {
 	if (str == NULL)
 		return NULL;
 	int len = strlen(str) + 1;
-	char *p = new char[len];
-	memcpy(p, str, len);
+	char *p = new(std::nothrow) char[len];
+	if (p)
+		memcpy(p, str, len);
 	return p;
 }
 
+#define MAX_FLAVOR_IN_FORMAT_COUNT	300
+#define MAX_FLAVOR_OUT_FORMAT_COUNT	300
+
 #define FLATTEN_MAGIC 		'CODE'
 #define FLATTEN_TYPECODE	'DFIT'
 
@@ -129,47 +134,54 @@
 dormant_flavor_info &
 dormant_flavor_info::operator=(const flavor_info &clone)
 {
-	delete [] name;
-	delete [] info;
-	delete [] in_formats;
-	delete [] out_formats;
-
-	name = newstrdup(clone.name);
-	info = newstrdup(clone.info);
-	
 	kinds = clone.kinds;
 	flavor_flags = clone.flavor_flags;
 	internal_id = clone.internal_id;
 	possible_count = clone.possible_count;
 
-	in_format_count = clone.in_format_count;
+	delete [] info;
+	info = _newstrdup(clone.info);
+
+	delete [] name;
+	name = _newstrdup(clone.name);
+
+	delete [] in_formats;
+	in_formats = 0;
+	in_format_count = 0;
 	in_format_flags = clone.in_format_flags;
-	out_format_count = clone.out_format_count;
+	if (kinds & B_BUFFER_CONSUMER) {
+		if (clone.in_format_count >= 0 && clone.in_format_count <= MAX_FLAVOR_IN_FORMAT_COUNT) {
+			in_formats = new(std::nothrow) media_format[clone.in_format_count];
+			if (in_formats != NULL && clone.in_formats != NULL) {
+				in_format_count = clone.in_format_count;
+				for (int i = 0; i < in_format_count; i++)
+					const_cast<media_format &>(in_formats[i]) = clone.in_formats[i];
+			}
+		} else
+			fprintf(stderr, "error: dormant_flavor_info::operator= clone.in_format_count is invalid\n");
+	} else if (clone.in_format_count)
+		fprintf(stderr, "warning: dormant_flavor_info::operator= not B_BUFFER_CONSUMER and clone.in_format_count is != 0\n");
+
+	delete [] out_formats;
+	out_formats = 0;
+	out_format_count = 0;
 	out_format_flags = clone.out_format_flags;
+	if (kinds & B_BUFFER_PRODUCER) {
+		if (clone.out_format_count >= 0 && clone.out_format_count <= MAX_FLAVOR_OUT_FORMAT_COUNT) {
+			out_formats = new(std::nothrow) media_format[clone.out_format_count];
+			if (out_formats != NULL && clone.out_formats != NULL) {
+				out_format_count = clone.out_format_count;
+				for (int i = 0; i < out_format_count; i++)
+					const_cast<media_format &>(out_formats[i]) = clone.out_formats[i];
+			}
+		} else
+			fprintf(stderr, "error dormant_flavor_info::operator= clone.out_format_count is invalid\n");
+	} else if (clone.in_format_count)
+		fprintf(stderr, "warning: dormant_flavor_info::operator= not B_BUFFER_PRODUCER and clone.out_format_count is != 0\n");
 
-	if (in_format_count > 0) {
-		media_format *temp;
-		temp = new media_format[in_format_count];
-		for (int i = 0; i < in_format_count; i++)
-			temp[i] = clone.in_formats[i];
-		in_formats = temp;
-	} else {
-		in_formats = 0;
-	}
-		
-	if (out_format_count > 0) {
-		media_format *temp;
-		temp = new media_format[out_format_count];
-		for (int i = 0; i < out_format_count; i++)
-			temp[i] = clone.out_formats[i];
-		out_formats = temp;
-	} else {
-		out_formats = 0;
-	}
-	
 	// initialize node_info with default values from dormant_node_info constructor
-	dormant_node_info temp;
-	node_info = temp;
+	dormant_node_info defaultValues;
+	node_info = defaultValues;
 	
 	return *this;
 }
@@ -179,7 +191,7 @@
 dormant_flavor_info::set_name(const char *in_name)
 {
 	delete [] name;
-	name = newstrdup(in_name);
+	name = _newstrdup(in_name);
 }
 
 
@@ -187,35 +199,37 @@
 dormant_flavor_info::set_info(const char *in_info)
 {
 	delete [] info;
-	info = newstrdup(in_info);
+	info = _newstrdup(in_info);
 }
 
 
 void
 dormant_flavor_info::add_in_format(const media_format &in_format)
 {
-	media_format *temp;
-	temp = new media_format[in_format_count + 1];
-	for (int i = 0; i < in_format_count; i++)
-		temp[i] = in_formats[i];
-	temp[in_format_count] = in_format;
-	delete [] in_formats;
-	in_format_count += 1;
-	in_formats = temp;
+	media_format *p = new(std::nothrow) media_format[in_format_count + 1];
+	if (p) {
+		for (int i = 0; i < in_format_count; i++)
+			p[i] = in_formats[i];
+		p[in_format_count] = in_format;
+		delete [] in_formats;
+		in_formats = p;
+		in_format_count += 1;
+	}
 }
 
 
 void
 dormant_flavor_info::add_out_format(const media_format &out_format)
 {
-	media_format *temp;
-	temp = new media_format[out_format_count + 1];
-	for (int i = 0; i < out_format_count; i++)
-		temp[i] = out_formats[i];
-	temp[out_format_count] = out_format;
-	delete [] out_formats;
-	out_format_count += 1;
-	out_formats = temp;
+	media_format *p = new(std::nothrow) media_format[out_format_count + 1];
+	if (p) {
+		for (int i = 0; i < out_format_count; i++)
+			p[i] = out_formats[i];
+		p[out_format_count] = out_format;
+		delete [] out_formats;
+		out_formats = p;
+		out_format_count += 1;
+	}
 }
 
 
@@ -250,10 +264,12 @@
 	size += sizeof(possible_count);
 	size += sizeof(in_format_count);
 	size += sizeof(in_format_flags);
-	size += in_format_count * sizeof(media_format);
+	if (in_format_count > 0 && in_format_count <= MAX_FLAVOR_IN_FORMAT_COUNT && in_formats != NULL)
+		size += in_format_count * sizeof(media_format);
 	size += sizeof(out_format_count);
 	size += sizeof(out_format_flags);
-	size += out_format_count * sizeof(media_format);
+	if (out_format_count > 0 && out_format_count <= MAX_FLAVOR_OUT_FORMAT_COUNT && out_formats != NULL)
+		size += out_format_count * sizeof(media_format);
 	// struct dormant_node_info	node_info
 	size += sizeof(node_info);
 
@@ -269,9 +285,33 @@
 		return B_ERROR;
 
 	char *buf = (char *)buffer;	
-	int32 namelen = name ? (int32)strlen(name) : -1;
-	int32 infolen = info ? (int32)strlen(info) : -1;
+	int32 nameLength = name ? (int32)strlen(name) : -1;
+	int32 infoLength = info ? (int32)strlen(info) : -1;
+	int32 inFormatCount = 0;
+	size_t inFormatSize = 0;
+	int32 outFormatCount = 0;
+	size_t outFormatSize = 0;
 
+	if ((kinds & B_BUFFER_CONSUMER) && in_format_count > 0 && in_formats != NULL) {
+		if (in_format_count <= MAX_FLAVOR_IN_FORMAT_COUNT) {
+			inFormatCount = in_format_count;
+			inFormatSize = in_format_count * sizeof(media_format);
+		} else {
+			fprintf(stderr, "error dormant_flavor_info::Flatten: in_format_count is too large\n");
+			return B_ERROR;
+		}
+	}
+
+	if ((kinds & B_BUFFER_PRODUCER) && out_format_count > 0 && out_formats != NULL) {
+		if (out_format_count <= MAX_FLAVOR_OUT_FORMAT_COUNT) {
+			outFormatCount = out_format_count;
+			outFormatSize = out_format_count * sizeof(media_format);
+		} else {
+			fprintf(stderr, "error dormant_flavor_info::Flatten: out_format_count is too large\n");
+			return B_ERROR;
+		}
+	}
+
 	// magic
 	*(int32*)buf = FLATTEN_MAGIC; buf += sizeof(int32);
 
@@ -279,32 +319,32 @@
 	*(int32*)buf = FlattenedSize(); buf += sizeof(int32);
 
 	// struct flavor_info
-	*(int32*)buf = namelen; buf += sizeof(int32);
-	if (namelen > 0) {
-		memcpy(buf,name,namelen);
-		buf += namelen;
+	*(int32*)buf = nameLength; buf += sizeof(int32);
+	if (nameLength > 0) {
+		memcpy(buf, name, nameLength);
+		buf += nameLength;
 	}
-	*(int32*)buf = infolen; buf += sizeof(int32);
-	if (infolen > 0) {
-		memcpy(buf,info,infolen);
-		buf += infolen;
+	*(int32*)buf = infoLength; buf += sizeof(int32);
+	if (infoLength > 0) {
+		memcpy(buf, info, infoLength);
+		buf += infoLength;
 	}
 
 	*(uint64*)buf = kinds; buf += sizeof(uint64);
 	*(uint32*)buf = flavor_flags; buf += sizeof(uint32);
 	*(int32*)buf = internal_id; buf += sizeof(int32);
 	*(int32*)buf = possible_count; buf += sizeof(int32);
-	*(int32*)buf = in_format_count; buf += sizeof(int32);
+	*(int32*)buf = inFormatCount; buf += sizeof(int32);
 	*(uint32*)buf = in_format_flags; buf += sizeof(uint32);
 
 	// XXX FIXME! we should not!!! make flat copies	of media_format
-	memcpy(buf,in_formats,in_format_count * sizeof(media_format)); buf += in_format_count * sizeof(media_format);
+	memcpy(buf, in_formats, inFormatSize); buf += inFormatSize;
 
-	*(int32*)buf = out_format_count; buf += sizeof(int32);
+	*(int32*)buf = outFormatCount; buf += sizeof(int32);
 	*(uint32*)buf = out_format_flags; buf += sizeof(uint32);
 
 	// XXX FIXME! we should not!!! make flat copies	of media_format
-	memcpy(buf,out_formats,out_format_count * sizeof(media_format)); buf += out_format_count * sizeof(media_format);
+	memcpy(buf, out_formats, outFormatSize); buf += outFormatSize;
 
 	*(dormant_node_info*)buf = node_info; buf += sizeof(dormant_node_info);
 
@@ -323,69 +363,85 @@
 		return B_ERROR;
 
 	const char *buf = (const char *)buffer;	
-	int32 namelen;
-	int32 infolen;
+	int32 nameLength;
+	int32 infoLength;
 
-	// magic
+	// check magic
 	if (*(int32*)buf != FLATTEN_MAGIC)
 		return B_ERROR;
 	buf += sizeof(int32);
 
-	// size
-	if (*(int32*)buf > size)
+	// check size
+	if (*(uint32*)buf > (uint32)size)
 		return B_ERROR;
 	buf += sizeof(int32);
 
-
 	delete [] name;
+	name = NULL;
 	delete [] info;
+	info = NULL;
 	delete [] in_formats;
+	in_formats = NULL;
+	in_format_count = 0;
 	delete [] out_formats;
-	name = 0;
-	info = 0;
-	in_formats = 0;
-	out_formats = 0;
+	out_formats = NULL;
+	out_format_count = 0;
 
-
 	// struct flavor_info
-	namelen = *(int32*)buf; buf += sizeof(int32);
-	if (namelen >= 0) { // if namelen is -1, we leave name = 0
-		name = new char [namelen + 1];
-		memcpy(name,buf,namelen);
-		name[namelen] = 0;
-		buf += namelen;
+	nameLength = *(int32*)buf; buf += sizeof(int32);
+	if (nameLength >= 0) { // if nameLength is -1, we leave name = 0
+		name = new(std::nothrow) char [nameLength + 1];
+		if (name) {
+			memcpy(name, buf, nameLength);
+			name[nameLength] = 0;
+			buf += nameLength; // XXX not save
+		}
 	}
 
-	infolen = *(int32*)buf; buf += sizeof(int32);
-	if (infolen >= 0) { // if infolen is -1, we leave info = 0
-		info = new char [infolen + 1];
-		memcpy(info,buf,infolen);
-		info[infolen] = 0;
-		buf += infolen;
+	infoLength = *(int32*)buf; buf += sizeof(int32);
+	if (infoLength >= 0) { // if infoLength is -1, we leave info = 0
+		info = new(std::nothrow) char [infoLength + 1];
+		if (info) {
+			memcpy(info, buf, infoLength);
+			info[infoLength] = 0;
+			buf += infoLength; // XXX not save
+		}
 	}
+
+	int32 count;
 	
 	kinds = *(uint64*)buf; buf += sizeof(uint64);
 	flavor_flags = *(uint32*)buf; buf += sizeof(uint32);
 	internal_id = *(int32*)buf; buf += sizeof(int32);
 	possible_count = *(int32*)buf; buf += sizeof(int32);
-	in_format_count = *(int32*)buf; buf += sizeof(int32);
+	count = *(int32*)buf; buf += sizeof(int32);
 	in_format_flags = *(uint32*)buf; buf += sizeof(uint32);
 
-	// XXX FIXME! we should not!!! make flat copies	of media_format
-	if (in_format_count > 0) {
-		in_formats = new media_format[in_format_count];
-		memcpy((media_format *)in_formats,buf,in_format_count * sizeof(media_format)); 
-		buf += in_format_count * sizeof(media_format);
+	if (count > 0) {
+		if (count <= MAX_FLAVOR_IN_FORMAT_COUNT) {
+			in_formats = new(std::nothrow) media_format[count];
+			if (!in_formats)
+				return B_NO_MEMORY;
+			// XXX FIXME! we should not!!! make flat copies	of media_format
+			memcpy(const_cast<media_format *>(in_formats), buf, count * sizeof(media_format)); 
+			in_format_count = count;
+		}
+		buf += count * sizeof(media_format); // XXX not save
 	}
 	
-	out_format_count = *(int32*)buf; buf += sizeof(int32);
+	count = *(int32*)buf; buf += sizeof(int32);
 	out_format_flags = *(uint32*)buf; buf += sizeof(uint32);
 
-	// XXX FIXME! we should not!!! make flat copies	of media_format
-	if (out_format_count > 0) {
-		out_formats = new media_format[out_format_count];
-		memcpy((media_format *)out_formats,buf,out_format_count * sizeof(media_format)); 
-		buf += out_format_count * sizeof(media_format);
+	if (count > 0) {
+		if (count <= MAX_FLAVOR_OUT_FORMAT_COUNT) {
+			out_formats = new(std::nothrow) media_format[count];
+			if (!out_formats)
+				return B_NO_MEMORY;
+			// XXX FIXME! we should not!!! make flat copies	of media_format
+			memcpy(const_cast<media_format *>(out_formats), buf, count * sizeof(media_format)); 
+			out_format_count = count;
+		}
+		buf += count * sizeof(media_format); // XXX not save
 	}
 
 	node_info = *(dormant_node_info*)buf; buf += sizeof(dormant_node_info);



From axeld at mail.berlios.de  Wed Mar 12 11:18:25 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 12 Mar 2008 11:18:25 +0100
Subject: [Haiku-commits] r24367 - haiku/trunk/build/jam
Message-ID: <200803121018.m2CAIPuf028741@sheep.berlios.de>

Author: axeld
Date: 2008-03-12 11:18:25 +0100 (Wed, 12 Mar 2008)
New Revision: 24367
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24367&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Removed "hda" as long as I'm working on it - it doesn't yet work, anyway.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2008-03-11 23:24:40 UTC (rev 24366)
+++ haiku/trunk/build/jam/HaikuImage	2008-03-12 10:18:25 UTC (rev 24367)
@@ -116,7 +116,7 @@
 	Print\ To\ File Serial\ Port USB\ Port
 ;
 BEOS_ADD_ONS_SCREENSAVERS = Haiku IFS Spider ;
-BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia emuxki hda ;
+BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia emuxki ; #hda
 BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
 	$(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme
 	$(X86_ONLY)s3savage $(X86_ONLY)via vesa #$(X86_ONLY)vmware



From axeld at pinc-software.de  Wed Mar 12 12:49:30 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Wed, 12 Mar 2008 12:49:30 +0100 CET
Subject: [Haiku-commits] r24328 - haiku/trunk/build/scripts
In-Reply-To: <20080310010431.458.3@knochen-vm.1205106033.fake>
Message-ID: <7975590981-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> On 2008-03-09 at 18:45:26 [+0100], Fran?ois Revol <revol at free.fr> 
> wrote:
> > > -        $bfsShell --initialize $imageOffsetFlags $imagePath 
> > > Haiku
> > > +        $bfsShell --initialize $imageOffsetFlags $imagePath 
> > > Haiku ||
> > > exit 1
> > How about also adding "block_size 2048" there ?
> > I'm not sure how faster it'd make CDs... nor how it would change
> > regular use though.
> I wouldn't mind changing that. Unless I'm mistaken 2048 byte blocks 
> are a 
> better choice in most cases anyway.

+1

Bye,
   Axel.



From ingo_weinhold at gmx.de  Wed Mar 12 12:58:41 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Wed, 12 Mar 2008 12:58:41 +0100
Subject: [Haiku-commits] r24328 - haiku/trunk/build/scripts
In-Reply-To: <7975590981-BeMail@zon>
References: <7975590981-BeMail@zon>
Message-ID: <20080312125841.589.5@knochen-vm.1205319375.fake>


On 2008-03-12 at 12:49:30 [+0100], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > On 2008-03-09 at 18:45:26 [+0100], Fran?ois Revol <revol at free.fr>
> > wrote:
> > > > -        $bfsShell --initialize $imageOffsetFlags $imagePath
> > > > Haiku
> > > > +        $bfsShell --initialize $imageOffsetFlags $imagePath
> > > > Haiku ||
> > > > exit 1
> > > How about also adding "block_size 2048" there ?
> > > I'm not sure how faster it'd make CDs... nor how it would change
> > > regular use though.
> > I wouldn't mind changing that. Unless I'm mistaken 2048 byte blocks
> > are a
> > better choice in most cases anyway.
> 
> +1

Do we just want to make it BFS's default block size then?

CU, Ingo


From mmu_man at mail.berlios.de  Wed Mar 12 13:19:20 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Wed, 12 Mar 2008 13:19:20 +0100
Subject: [Haiku-commits] r24368 - haiku/trunk/build/scripts
Message-ID: <200803121219.m2CCJKdl011945@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-12 13:19:19 +0100 (Wed, 12 Mar 2008)
New Revision: 24368
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24368&view=rev

Modified:
   haiku/trunk/build/scripts/build_haiku_image
Log:
Use 2048 as block size.


Modified: haiku/trunk/build/scripts/build_haiku_image
===================================================================
--- haiku/trunk/build/scripts/build_haiku_image	2008-03-12 10:18:25 UTC (rev 24367)
+++ haiku/trunk/build/scripts/build_haiku_image	2008-03-12 12:19:19 UTC (rev 24368)
@@ -119,7 +119,7 @@
 		if [ ! -e $imagePath -o ! "$dontClearImage" ]; then
 			dd if=/dev/zero of=$imagePath bs=1048576 count=$imageSize $ddFlags
 		fi
-		$bfsShell --initialize $imageOffsetFlags $imagePath Haiku || exit 1
+		$bfsShell --initialize $imageOffsetFlags $imagePath Haiku "block_size 2048" || exit 1
 		$makebootable $imageOffsetFlags $imagePath
 	fi
 	$bfsShell -n $imageOffsetFlags $imagePath > /dev/null &



From axeld at pinc-software.de  Wed Mar 12 13:30:41 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Wed, 12 Mar 2008 13:30:41 +0100 CET
Subject: [Haiku-commits] r24328 - haiku/trunk/build/scripts
In-Reply-To: <20080312125841.589.5@knochen-vm.1205319375.fake>
Message-ID: <10446855307-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> Do we just want to make it BFS's default block size then?

Sounds like a plan. Shall I or do you want to? :-)

Bye,
   Axel.



From ingo_weinhold at gmx.de  Wed Mar 12 14:05:55 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Wed, 12 Mar 2008 14:05:55 +0100
Subject: [Haiku-commits] r24328 - haiku/trunk/build/scripts
In-Reply-To: <10446855307-BeMail@zon>
References: <10446855307-BeMail@zon>
Message-ID: <20080312140555.848.6@knochen-vm.1205319375.fake>


On 2008-03-12 at 13:30:41 [+0100], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > Do we just want to make it BFS's default block size then?
> 
> Sounds like a plan. Shall I or do you want to? :-)

Go ahead, BFS is your baby anyway. :-)

CU, Ingo


From ingo_weinhold at gmx.de  Wed Mar 12 14:06:43 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Wed, 12 Mar 2008 14:06:43 +0100
Subject: [Haiku-commits] r24368 - haiku/trunk/build/scripts
In-Reply-To: <200803121219.m2CCJKdl011945@sheep.berlios.de>
References: <200803121219.m2CCJKdl011945@sheep.berlios.de>
Message-ID: <20080312140643.878.7@knochen-vm.1205319375.fake>


On 2008-03-12 at 13:19:20 [+0100], mmu_man at BerliOS 
<mmu_man at mail.berlios.de> wrote:
> Author: mmu_man
> Date: 2008-03-12 13:19:19 +0100 (Wed, 12 Mar 2008)
> New Revision: 24368
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24368&view=rev
> 
> Modified:
>    haiku/trunk/build/scripts/build_haiku_image
> Log:
> Use 2048 as block size.

Should be superfluous as soon as BFS uses that default, but anyway...

CU, Ingo


From revol at free.fr  Wed Mar 12 15:09:41 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Wed, 12 Mar 2008 15:09:41 +0100 CET
Subject: [Haiku-commits] r24368 - haiku/trunk/build/scripts
In-Reply-To: <20080312140643.878.7@knochen-vm.1205319375.fake>
Message-ID: <666766086-BeMail@laptop>

> On 2008-03-12 at 13:19:20 [+0100], mmu_man at BerliOS 
> <mmu_man at mail.berlios.de> wrote:
> > Author: mmu_man
> > Date: 2008-03-12 13:19:19 +0100 (Wed, 12 Mar 2008)
> > New Revision: 24368
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24368&view=rev
> > 
> > Modified:
> >    haiku/trunk/build/scripts/build_haiku_image
> > Log:
> > Use 2048 as block size.
> 
> Should be superfluous as soon as BFS uses that default, but anyway...

Right, but it doesn't harm, and it hints that it's possible to change 
and how, as I had to dig the bfsShell code to find how to do it.

Fran?ois.


From axeld at mail.berlios.de  Wed Mar 12 16:36:56 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 12 Mar 2008 16:36:56 +0100
Subject: [Haiku-commits] r24369 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803121536.m2CFaugA024137@sheep.berlios.de>

Author: axeld
Date: 2008-03-12 16:36:56 +0100 (Wed, 12 Mar 2008)
New Revision: 24369
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24369&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/bfs_disk_system.cpp
Log:
Enlarged the default block size to 2048 bytes.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/bfs_disk_system.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/bfs_disk_system.cpp	2008-03-12 12:19:19 UTC (rev 24368)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/bfs_disk_system.cpp	2008-03-12 15:36:56 UTC (rev 24369)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, Ingo Weinhold, ingo_weinhold at gmx.de.
+ * Copyright 2007-2008, Ingo Weinhold, ingo_weinhold at gmx.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -27,7 +27,7 @@
 
 	const char *string = get_driver_parameter(handle, "block_size",
 		NULL, NULL);
-	uint32 blockSize = 1024;
+	uint32 blockSize = 2048;
 	if (string != NULL)
 		blockSize = strtoul(string, NULL, 0);
 



From axeld at mail.berlios.de  Wed Mar 12 18:23:02 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 12 Mar 2008 18:23:02 +0100
Subject: [Haiku-commits] r24370 - haiku/trunk/3rdparty/vmware
Message-ID: <200803121723.m2CHN2M9005855@sheep.berlios.de>

Author: axeld
Date: 2008-03-12 18:23:01 +0100 (Wed, 12 Mar 2008)
New Revision: 24370
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24370&view=rev

Modified:
   haiku/trunk/3rdparty/vmware/haiku.vmx
Log:
Remove execute bit.



Property changes on: haiku/trunk/3rdparty/vmware/haiku.vmx
___________________________________________________________________
Name: svn:executable
   - *



From axeld at mail.berlios.de  Wed Mar 12 19:01:33 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 12 Mar 2008 19:01:33 +0100
Subject: [Haiku-commits] r24371 - haiku/trunk/src/servers/app
Message-ID: <200803121801.m2CI1XlE015305@sheep.berlios.de>

Author: axeld
Date: 2008-03-12 19:01:32 +0100 (Wed, 12 Mar 2008)
New Revision: 24371
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24371&view=rev

Modified:
   haiku/trunk/src/servers/app/AppServer.cpp
   haiku/trunk/src/servers/app/Desktop.cpp
Log:
* Creating a Desktop can fail, in which case the app_server should not return B_OK,
  and an invalid desktop message port...
* Desktop::Init() now checks if VirtualScreen::fHWInterface is valid, and exits
  if not. This can happen if you don't have a graphics driver, and turn on on-screen
  debug mode in the boot loader (such that you already see the messages from the
  boot loader).


Modified: haiku/trunk/src/servers/app/AppServer.cpp
===================================================================
--- haiku/trunk/src/servers/app/AppServer.cpp	2008-03-12 17:23:01 UTC (rev 24370)
+++ haiku/trunk/src/servers/app/AppServer.cpp	2008-03-12 18:01:32 UTC (rev 24371)
@@ -188,8 +188,12 @@
 			}
 
 			BPrivate::LinkSender reply(replyPort);
-			reply.StartMessage(B_OK);
-			reply.Attach<port_id>(desktop->MessagePort());
+			if (desktop != NULL) {
+				reply.StartMessage(B_OK);
+				reply.Attach<port_id>(desktop->MessagePort());
+			} else
+				reply.StartMessage(B_ERROR);
+
 			reply.Flush();
 			break;
 		}

Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2008-03-12 17:23:01 UTC (rev 24370)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2008-03-12 18:01:32 UTC (rev 24371)
@@ -385,6 +385,11 @@
 	// TODO: temporary workaround, fActiveScreen will be removed
 	fActiveScreen = fVirtualScreen.ScreenAt(0);
 
+	if (fVirtualScreen.HWInterface() == NULL) {
+		debug_printf("Could not initialize graphics output. Exiting.\n");
+		return B_ERROR;
+	}
+
 	fVirtualScreen.HWInterface()->MoveCursorTo(fVirtualScreen.Frame().Width() / 2,
 		fVirtualScreen.Frame().Height() / 2);
 



From mauricek at mail.berlios.de  Wed Mar 12 20:36:07 2008
From: mauricek at mail.berlios.de (mauricek at BerliOS)
Date: Wed, 12 Mar 2008 20:36:07 +0100
Subject: [Haiku-commits] r24372 - in haiku/trunk/src/apps/cortex:
	DormantNodeView RouteApp ValControl support
Message-ID: <200803121936.m2CJa7Cq006887@sheep.berlios.de>

Author: mauricek
Date: 2008-03-12 20:36:06 +0100 (Wed, 12 Mar 2008)
New Revision: 24372
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24372&view=rev

Modified:
   haiku/trunk/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp
   haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp
   haiku/trunk/src/apps/cortex/ValControl/ValControlDigitSegment.cpp
   haiku/trunk/src/apps/cortex/support/ILockable.h
   haiku/trunk/src/apps/cortex/support/IObservable.h
   haiku/trunk/src/apps/cortex/support/MouseTrackingHelpers.h
   haiku/trunk/src/apps/cortex/support/ObservableHandler.cpp
   haiku/trunk/src/apps/cortex/support/TextControlFloater.cpp
Log:
warning fixes, one might also want to change hardcoded colors into system colors, but that's later on...




Modified: haiku/trunk/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp	2008-03-12 18:01:32 UTC (rev 24371)
+++ haiku/trunk/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp	2008-03-12 19:36:06 UTC (rev 24372)
@@ -69,12 +69,12 @@
 		r.right = r.left + B_MINI_ICON - 1.0;
 		r.bottom = r.top + B_MINI_ICON - 1.0;
 		if (IsSelected()) {
-			owner->SetHighColor(255.0, 255.0, 255.0, 255.0);
+			owner->SetHighColor(255, 255, 255, 255);
 			owner->FillRect(r);
 			owner->SetDrawingMode(B_OP_INVERT);
 			owner->DrawBitmap(m_icon, r.LeftTop());
 			owner->SetDrawingMode(B_OP_ALPHA);
-			owner->SetHighColor(0.0, 0.0, 0.0, 180.0);
+			owner->SetHighColor(0, 0, 0, 180);
 			owner->SetBlendingMode(B_CONSTANT_ALPHA, B_ALPHA_COMPOSITE);
 			owner->DrawBitmap(m_icon, r.LeftTop());
 			owner->SetDrawingMode(B_OP_OVER);
@@ -93,7 +93,7 @@
 	r.bottom = r.top + m_fontHeight.ascent + m_fontHeight.descent;		
 	if (IsSelected() || drawEverything) {
 		if (IsSelected()) {
-			owner->SetHighColor(16.0, 64.0, 96.0, 255.0);
+			owner->SetHighColor(16, 64, 96, 255);
 		}
 		else {
 			owner->SetHighColor(owner->ViewColor());
@@ -101,10 +101,10 @@
 		owner->FillRect(r);
 	}
 	if (IsSelected()) {
-		owner->SetHighColor(255.0, 255.0, 255.0, 255.0);
+		owner->SetHighColor(255, 255, 255, 255);
 	}
 	else {
-		owner->SetHighColor(0.0, 0.0, 0.0, 0.0);
+		owner->SetHighColor(0, 0, 0, 0);
 	}
 	BPoint labelOffset(r.left + 1.0, r.bottom - m_fontHeight.descent);
 	owner->DrawString(m_info.name, labelOffset);
@@ -199,10 +199,10 @@
 		BView *dragView = new BView(dragBitmap->Bounds(), "", B_FOLLOW_NONE, 0); 
 		dragBitmap->AddChild(dragView); 
 		dragView->SetOrigin(0.0, 0.0);
-		dragView->SetHighColor(0.0, 0.0, 0.0, 0.0);
+		dragView->SetHighColor(0, 0, 0, 0);
 		dragView->FillRect(dragView->Bounds()); 
 		dragView->SetDrawingMode(B_OP_ALPHA); 
-		dragView->SetHighColor(0.0, 0.0, 0.0, 128.0);       
+		dragView->SetHighColor(0, 0, 0, 128);       
 	    dragView->SetBlendingMode(B_CONSTANT_ALPHA, B_ALPHA_COMPOSITE); 
 		// Drawing code back again
 		if (m_icon) {

Modified: haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp	2008-03-12 18:01:32 UTC (rev 24371)
+++ haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp	2008-03-12 19:36:06 UTC (rev 24372)
@@ -288,7 +288,7 @@
 
 	r.InsetBy(2.0, 0.0);
 	v->SetDrawingMode(B_OP_ALPHA);
-	v->SetHighColor(0, 0, 0, 255 * m_opacity);
+	v->SetHighColor(0, 0, 0, uchar(255 * m_opacity));
 
 	// draw icon
 	if (m_icon) {

Modified: haiku/trunk/src/apps/cortex/ValControl/ValControlDigitSegment.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/ValControl/ValControlDigitSegment.cpp	2008-03-12 18:01:32 UTC (rev 24371)
+++ haiku/trunk/src/apps/cortex/ValControl/ValControlDigitSegment.cpp	2008-03-12 19:36:06 UTC (rev 24372)
@@ -316,7 +316,7 @@
 		case ValControl::M_SET_VALUE:
 			err = pMsg->FindDouble("value", &fVal);
 			ASSERT(err == B_OK);
-			setValue(fVal, fVal < 0);
+			setValue((int64)fVal, fVal < 0);
 			break;
 			
 		case ValControl::M_GET_VALUE: {

Modified: haiku/trunk/src/apps/cortex/support/ILockable.h
===================================================================
--- haiku/trunk/src/apps/cortex/support/ILockable.h	2008-03-12 18:01:32 UTC (rev 24371)
+++ haiku/trunk/src/apps/cortex/support/ILockable.h	2008-03-12 19:36:06 UTC (rev 24372)
@@ -32,6 +32,9 @@
 // the locking interface
 
 class ILockable {
+public:
+	ILockable() { }
+	virtual ~ILockable() { }
 public:						// constants
 	enum lock_t {
 		WRITE,

Modified: haiku/trunk/src/apps/cortex/support/IObservable.h
===================================================================
--- haiku/trunk/src/apps/cortex/support/IObservable.h	2008-03-12 18:01:32 UTC (rev 24371)
+++ haiku/trunk/src/apps/cortex/support/IObservable.h	2008-03-12 19:36:06 UTC (rev 24372)
@@ -14,6 +14,9 @@
 
 class IObservable {
 
+public:
+	IObservable() { }
+	virtual ~IObservable() { }
 public:											// *** deletion
 	// clients must call release() rather than deleting,
 	// to ensure that all observers are notified of the

Modified: haiku/trunk/src/apps/cortex/support/MouseTrackingHelpers.h
===================================================================
--- haiku/trunk/src/apps/cortex/support/MouseTrackingHelpers.h	2008-03-12 18:01:32 UTC (rev 24371)
+++ haiku/trunk/src/apps/cortex/support/MouseTrackingHelpers.h	2008-03-12 19:36:06 UTC (rev 24372)
@@ -25,6 +25,8 @@
 // interface for a mouse-tracking destination
 class IMouseTrackingDestination {
 public:							// operations
+	IMouseTrackingDestination() { }
+	virtual ~IMouseTrackingDestination() { }
 	// a MouseTrackingSourceView has started tracking the mouse
 	// (point is in pSource view coordinates)
 	virtual void mouseTrackingBegin(

Modified: haiku/trunk/src/apps/cortex/support/ObservableHandler.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/support/ObservableHandler.cpp	2008-03-12 18:01:32 UTC (rev 24371)
+++ haiku/trunk/src/apps/cortex/support/ObservableHandler.cpp	2008-03-12 19:36:06 UTC (rev 24372)
@@ -267,4 +267,4 @@
 }
 
 
-// END -- ObservableHandler.cpp --
\ No newline at end of file
+// END -- ObservableHandler.cpp --

Modified: haiku/trunk/src/apps/cortex/support/TextControlFloater.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/support/TextControlFloater.cpp	2008-03-12 18:01:32 UTC (rev 24371)
+++ haiku/trunk/src/apps/cortex/support/TextControlFloater.cpp	2008-03-12 19:36:06 UTC (rev 24372)
@@ -156,4 +156,4 @@
 	return true;
 }
 
-// END -- TextControlFloater.cpp --
\ No newline at end of file
+// END -- TextControlFloater.cpp --



From mauricek at mail.berlios.de  Wed Mar 12 20:59:33 2008
From: mauricek at mail.berlios.de (mauricek at BerliOS)
Date: Wed, 12 Mar 2008 20:59:33 +0100
Subject: [Haiku-commits] r24373 - in haiku/trunk/src/apps/cortex: . RouteApp
Message-ID: <200803121959.m2CJxXso009088@sheep.berlios.de>

Author: mauricek
Date: 2008-03-12 20:59:32 +0100 (Wed, 12 Mar 2008)
New Revision: 24373
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24373&view=rev

Modified:
   haiku/trunk/src/apps/cortex/Jamfile
   haiku/trunk/src/apps/cortex/RouteApp/Jamfile
Log:
* We already have libexpat inside of the Haiku branch. So there is no need to have a separate version inside of Cortex.
* Thus, remove it and link against the version in src/lib/expat instead
* Exporting/Importing MediaNode configuration works fluently still...



Modified: haiku/trunk/src/apps/cortex/Jamfile
===================================================================
--- haiku/trunk/src/apps/cortex/Jamfile	2008-03-12 19:36:06 UTC (rev 24372)
+++ haiku/trunk/src/apps/cortex/Jamfile	2008-03-12 19:59:32 UTC (rev 24373)
@@ -15,5 +15,4 @@
 SubInclude HAIKU_TOP src apps cortex TipManager ;
 SubInclude HAIKU_TOP src apps cortex TransportView ;
 SubInclude HAIKU_TOP src apps cortex ValControl ;
-SubInclude HAIKU_TOP src apps cortex expat ;
 SubInclude HAIKU_TOP src apps cortex support ;

Modified: haiku/trunk/src/apps/cortex/RouteApp/Jamfile
===================================================================
--- haiku/trunk/src/apps/cortex/RouteApp/Jamfile	2008-03-12 19:36:06 UTC (rev 24372)
+++ haiku/trunk/src/apps/cortex/RouteApp/Jamfile	2008-03-12 19:59:32 UTC (rev 24373)
@@ -38,10 +38,9 @@
 	cortex_transport_view.a
 	cortex_val_control.a
 	cortex_diagram_view.a
-	cortex_expat_xmlparse.a
-	cortex_expat_xmltok.a
 	cortex_support.a
 	be media tracker translation
+	libexpat.a
 	$(TARGET_LIBSTDC++)
 	: ../Resource.rdef
 ;



From mauricek at mail.berlios.de  Wed Mar 12 21:02:16 2008
From: mauricek at mail.berlios.de (mauricek at BerliOS)
Date: Wed, 12 Mar 2008 21:02:16 +0100
Subject: [Haiku-commits] r24374 - haiku/trunk/src/apps/cortex
Message-ID: <200803122002.m2CK2GWB009332@sheep.berlios.de>

Author: mauricek
Date: 2008-03-12 21:02:15 +0100 (Wed, 12 Mar 2008)
New Revision: 24374
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24374&view=rev

Removed:
   haiku/trunk/src/apps/cortex/expat/
Log:
remove superfluous libexpat of cortex





From bonefish at mail.berlios.de  Wed Mar 12 21:36:20 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 12 Mar 2008 21:36:20 +0100
Subject: [Haiku-commits] r24375 -
	haiku/trunk/src/add-ons/kernel/drivers/random
Message-ID: <200803122036.m2CKaKwm012704@sheep.berlios.de>

Author: bonefish
Date: 2008-03-12 21:36:19 +0100 (Wed, 12 Mar 2008)
New Revision: 24375
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24375&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/random/driver.c
Log:
The random driver story isn't over yet, it seems. The many
thread_yield() calls make reseed() really slow in a busy system, since
another thread will exhausts its full quantum between two thread_yield()
calls. And 257 * 8 * 8 quanta are about 49s.


Modified: haiku/trunk/src/add-ons/kernel/drivers/random/driver.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/random/driver.c	2008-03-12 20:02:15 UTC (rev 24374)
+++ haiku/trunk/src/add-ons/kernel/drivers/random/driver.c	2008-03-12 20:36:19 UTC (rev 24375)
@@ -191,8 +191,17 @@
 
 	for (j = initTimes; j; j--) {
 		for (i = NK * initTimes; i; i--) {
+			// TODO: Yielding sounds all nice in principle, but this will take
+			// ages (at least initTimes * initTimes * NK * quantum, i.e. ca. 49s
+			// for initTimes == 8) in a busy system. Since perl initializes its
+			// random seed on startup by reading from /dev/urandom, perl
+			// programs are all but unusable when at least one other thread
+			// hogs the CPU.
 			thread_yield(false);
 
+			// TODO: Introduce a clock_counter() function that directly returns
+			// the value of the hardware clock counter. This will be cheaper
+			// and will yield more randomness.
 			y.Q[0] += system_time();
 			attach(&x, &y, 0x52437EFFU, 0x026A4CEBU, 0xD9E66AC9U, 0x56E5A975U);
 			attach(&y, &x, 0xC70B8B41U, 0x9126B036U, 0x36CC6FDBU, 0x31D477F7U);



From oruizdorantes at mail.berlios.de  Wed Mar 12 22:18:24 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Wed, 12 Mar 2008 22:18:24 +0100
Subject: [Haiku-commits] r24376 - in haiku/trunk: headers/os/bluetooth
	headers/private/bluetooth src/kits/bluetooth
Message-ID: <200803122118.m2CLIOFp021078@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-12 22:18:23 +0100 (Wed, 12 Mar 2008)
New Revision: 24376
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24376&view=rev

Modified:
   haiku/trunk/headers/os/bluetooth/DiscoveryListener.h
   haiku/trunk/headers/os/bluetooth/RemoteDevice.h
   haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h
   haiku/trunk/src/kits/bluetooth/DiscoveryListener.cpp
Log:
* Add one more inquiry process hook function for notify when it has started
* Move Messages id to a private header
* New constructor for RemoteDevice



Modified: haiku/trunk/headers/os/bluetooth/DiscoveryListener.h
===================================================================
--- haiku/trunk/headers/os/bluetooth/DiscoveryListener.h	2008-03-12 20:36:19 UTC (rev 24375)
+++ haiku/trunk/headers/os/bluetooth/DiscoveryListener.h	2008-03-12 21:18:23 UTC (rev 24376)
@@ -42,6 +42,9 @@
         virtual void serviceSearchCompleted(int transID, int respCode);
         */
         virtual void InquiryCompleted(int discType);
+
+		/* JSR82 non-defined methods */
+		virtual void InquiryStarted(status_t status);
         
     private:                
         DiscoveryListener();

Modified: haiku/trunk/headers/os/bluetooth/RemoteDevice.h
===================================================================
--- haiku/trunk/headers/os/bluetooth/RemoteDevice.h	2008-03-12 20:36:19 UTC (rev 24375)
+++ haiku/trunk/headers/os/bluetooth/RemoteDevice.h	2008-03-12 21:18:23 UTC (rev 24376)
@@ -42,6 +42,7 @@
                 
     protected:
         RemoteDevice(BString address);
+        RemoteDevice(bdaddr_t address);        
     
     /* Instances of this class only will be done by Discovery[Listener|Agent] TODO */
     friend class DiscoveryListener;

Modified: haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h
===================================================================
--- haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h	2008-03-12 20:36:19 UTC (rev 24375)
+++ haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h	2008-03-12 21:18:23 UTC (rev 24376)
@@ -4,6 +4,9 @@
 
 #define BLUETOOTH_SIGNATURE "application/x-vnd.Be-bluetooth_server"
 
+/* Kit Comunication */
+
+// LocalDevice 
 #define BT_MSG_COUNT_LOCAL_DEVICES		'btCd'
 #define BT_MSG_ADQUIRE_LOCAL_DEVICE     'btAd'
 #define BT_MSG_GET_FRIENDLY_NAME        'btFn'
@@ -11,5 +14,12 @@
 #define BT_MSG_HANDLE_SIMPLE_REQUEST    'btsR'
 #define BT_MSG_ADD_DEVICE               'btDD'
 
+// Discovery
+#define BT_MSG_INQUIRY_STARTED    'IqSt'
+#define BT_MSG_INQUIRY_COMPLETED  'IqCM'
+#define BT_MSG_INQUIRY_TERMINATED 'IqTR'
+#define BT_MSG_INQUIRY_ERROR      'IqER'
+#define BT_MSG_INQUIRY_DEVICE     'IqDE'
 
+
 #endif

Modified: haiku/trunk/src/kits/bluetooth/DiscoveryListener.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/DiscoveryListener.cpp	2008-03-12 20:36:19 UTC (rev 24375)
+++ haiku/trunk/src/kits/bluetooth/DiscoveryListener.cpp	2008-03-12 21:18:23 UTC (rev 24376)
@@ -9,19 +9,14 @@
 #include <bluetooth/RemoteDevice.h>
 #include <bluetooth/DeviceClass.h>
 
+#include <bluetoothserver_p.h>
+
 #include <Message.h>
 
 namespace Bluetooth {
 
 
-/* Move to some private header */
-#define B_BT_INQUIRY_COMPLETED_MSG  'IqCM'
-#define B_BT_INQUIRY_TERMINATED_MSG 'IqTR'
-#define B_BT_INQUIRY_ERROR_MSG      'IqER'
-#define B_BT_INQUIRY_DEVICE_MSG     'IqDE'
-
 /* hooks */
-
 void 
 DiscoveryListener::DeviceDiscovered(RemoteDevice btDevice, DeviceClass cod)
 {
@@ -31,25 +26,33 @@
 
 
 void 
+DiscoveryListener::InquiryStarted(status_t status)
+{
+    
+}
+
+
+
+void 
 DiscoveryListener::InquiryCompleted(int discType)
 {
     
 }
 
 
-/* private */        
-    
+/* private */            
 DiscoveryListener::DiscoveryListener()
 {
 
 }
 
+
 void 
 DiscoveryListener::MessageReceived(BMessage* message)
 {
     switch (message->what) 
     {
-        case B_BT_INQUIRY_DEVICE_MSG:
+        case BT_MSG_INQUIRY_DEVICE:
             
             /* TODO: Extract info from BMessage to create a 
                proper RemoteDevice, message should be passed from Agent??? */
@@ -59,17 +62,17 @@
 
         break;
         
-        case B_BT_INQUIRY_COMPLETED_MSG:
+        case BT_MSG_INQUIRY_COMPLETED:
 
             InquiryCompleted(B_BT_INQUIRY_COMPLETED);
 
         break;
-        case B_BT_INQUIRY_TERMINATED_MSG:
+        case BT_MSG_INQUIRY_TERMINATED:
 
             InquiryCompleted(B_BT_INQUIRY_TERMINATED);
 
         break;
-        case B_BT_INQUIRY_ERROR_MSG:
+        case BT_MSG_INQUIRY_ERROR:
 
             InquiryCompleted(B_BT_INQUIRY_ERROR);            
 



From korli at users.berlios.de  Wed Mar 12 22:19:21 2008
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Wed, 12 Mar 2008 22:19:21 +0100
Subject: [Haiku-commits] r24373 - in haiku/trunk/src/apps/cortex: .
	RouteApp
In-Reply-To: <200803121959.m2CJxXso009088@sheep.berlios.de>
References: <200803121959.m2CJxXso009088@sheep.berlios.de>
Message-ID: <c47b1d430803121419y5a04852ah10bd765f127b4e72@mail.gmail.com>

2008/3/12, mauricek at BerliOS <mauricek at mail.berlios.de>:
>  Modified:
>    haiku/trunk/src/apps/cortex/Jamfile
>    haiku/trunk/src/apps/cortex/RouteApp/Jamfile
>  Log:
>  * We already have libexpat inside of the Haiku branch. So there is no need to have a separate version inside of Cortex.
>  * Thus, remove it and link against the version in src/lib/expat instead
>  * Exporting/Importing MediaNode configuration works fluently still...
>
>
>

Build broken for me :

src/apps/cortex/Persistence/ImportContext.cpp:5: xmlparse.h: Aucun
fichier ou r?pertoire de ce type
src/apps/cortex/Persistence/ImportContext.cpp: In method `void
ImportContext::reportWarning(const char *)':
src/apps/cortex/Persistence/ImportContext.cpp:57: `XML_Parser'
undeclared (first use this function)
src/apps/cortex/Persistence/ImportContext.cpp:57: (Each undeclared
identifier is reported only once
src/apps/cortex/Persistence/ImportContext.cpp:57: for each function it
appears in.)
src/apps/cortex/Persistence/ImportContext.cpp:57: parse error before `='
src/apps/cortex/Persistence/ImportContext.cpp:61: `p' undeclared
(first use this function)
src/apps/cortex/Persistence/ImportContext.cpp:63: implicit declaration
of function `int XML_GetCurrentLineNumber(...)'
src/apps/cortex/Persistence/ImportContext.cpp:64: implicit declaration
of function `int XML_GetCurrentColumnNumber(...)'
src/apps/cortex/Persistence/ImportContext.cpp: In method `void
ImportContext::reportError(const char *)':
src/apps/cortex/Persistence/ImportContext.cpp:76: parse error before `='

/home/korli/svnhaiku/haiku/generated_v2/cross-tools/bin/i586-pc-beos-gcc
-c "src/apps/cortex/Persistence/ImportContext.cpp" -O -Wall
-Wno-trigraphs -Wno-ctor-dtor-privacy -Woverloaded-virtual
-Wpointer-arith -Wcast-align -Wsign-compare -pipe -nostdinc
-Wno-multichar -D_ZETA_USING_DEPRECATED_API_=1 -D_ZETA_TS_FIND_DIR_=1
-D__HAIKU__ -DHAIKU_DISTRO_COMPATIBILITY_OFFICIAL -D__INTEL__
-DARCH_x86 -D_BEOS_R5_COMPATIBLE_ -DHAIKU_TARGET_PLATFORM_HAIKU
-Isrc/apps/cortex/Persistence
-I/home/korli/svnhaiku/haiku/generated_v2/objects/common/apps/cortex/Persistence
-I/home/korli/svnhaiku/haiku/generated_v2/objects/linux/x86/common/apps/cortex/Persistence
-I/home/korli/svnhaiku/haiku/generated_v2/objects/haiku/x86/common/apps/cortex/Persistence
-Isrc/apps/cortex/Persistence/..
-Isrc/apps/cortex/Persistence/../expat/xmlparse
-Isrc/apps/cortex/Persistence/../support -I- -Iheaders -Iheaders/posix
-Iheaders/gnu -Iheaders/glibc -Iheaders/os -Iheaders/os/add-ons
-Iheaders/os/add-ons/file_system -Iheaders/os/add-ons/graphics
-Iheaders/os/add-ons/input_server -Iheaders/os/add-ons/registrar
-Iheaders/os/add-ons/screen_saver -Iheaders/os/add-ons/tracker
-Iheaders/os/app -Iheaders/os/device -Iheaders/os/drivers
-Iheaders/os/game -Iheaders/os/interface -Iheaders/os/kernel
-Iheaders/os/media -Iheaders/os/mail -Iheaders/os/midi
-Iheaders/os/midi2 -Iheaders/os/net -Iheaders/os/opengl
-Iheaders/os/storage -Iheaders/os/support -Iheaders/os/translation
-Iheaders/private/. -Iheaders/cpp
-I/home/korli/svnhaiku/haiku/generated_v2/cross-tools/lib/gcc-lib/i586-pc-beos/2.95.3-beos-060710/include
-o "/home/korli/svnhaiku/haiku/generated_v2/objects/haiku/x86/release/apps/cortex/Persistence/ImportContext.o"
;

...failed C++ /home/korli/svnhaiku/haiku/generated_v2/objects/haiku/x86/release/apps/cortex/Persistence/ImportContext.o
...
...skipped cortex_persistence.a for lack of
cortex_persistence.a(ImportContext.o)...
...skipped Cortex for lack of cortex_persistence.a...

Bye,
J?r?me


From anevilyak at gmail.com  Wed Mar 12 22:27:02 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Wed, 12 Mar 2008 16:27:02 -0500
Subject: [Haiku-commits] r24373 - in haiku/trunk/src/apps/cortex: .
	RouteApp
In-Reply-To: <c47b1d430803121419y5a04852ah10bd765f127b4e72@mail.gmail.com>
References: <200803121959.m2CJxXso009088@sheep.berlios.de>
	<c47b1d430803121419y5a04852ah10bd765f127b4e72@mail.gmail.com>
Message-ID: <f019d2f30803121427s52d0f8c9s2071d7c560142e1c@mail.gmail.com>

On Wed, Mar 12, 2008 at 4:19 PM, J?r?me Duval <korli at users.berlios.de> wrote:
> 2008/3/12, mauricek at BerliOS <mauricek at mail.berlios.de>:
>
> >  Modified:
>  >    haiku/trunk/src/apps/cortex/Jamfile
>  >    haiku/trunk/src/apps/cortex/RouteApp/Jamfile
>  >  Log:
>  >  * We already have libexpat inside of the Haiku branch. So there is no need to have a separate version inside of Cortex.
>  >  * Thus, remove it and link against the version in src/lib/expat instead
>  >  * Exporting/Importing MediaNode configuration works fluently still...
>  >
>  >
>  >
>
>  Build broken for me :
>

Builds fine here on Linux/gcc2....

Regards,

Rene


From korli at mail.berlios.de  Wed Mar 12 22:29:50 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 12 Mar 2008 22:29:50 +0100
Subject: [Haiku-commits] r24377 - haiku/trunk/src/apps/cortex/Persistence
Message-ID: <200803122129.m2CLToCk021649@sheep.berlios.de>

Author: korli
Date: 2008-03-12 22:29:50 +0100 (Wed, 12 Mar 2008)
New Revision: 24377
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24377&view=rev

Modified:
   haiku/trunk/src/apps/cortex/Persistence/ImportContext.cpp
   haiku/trunk/src/apps/cortex/Persistence/Importer.h
   haiku/trunk/src/apps/cortex/Persistence/Jamfile
Log:
fix the build, hope it works :)


Modified: haiku/trunk/src/apps/cortex/Persistence/ImportContext.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/Persistence/ImportContext.cpp	2008-03-12 21:18:23 UTC (rev 24376)
+++ haiku/trunk/src/apps/cortex/Persistence/ImportContext.cpp	2008-03-12 21:29:50 UTC (rev 24377)
@@ -2,7 +2,7 @@
 // e.moon 1jul99
 
 #include "ImportContext.h"
-#include "xmlparse.h"
+#include "expat.h"
 
 using namespace std;
 

Modified: haiku/trunk/src/apps/cortex/Persistence/Importer.h
===================================================================
--- haiku/trunk/src/apps/cortex/Persistence/Importer.h	2008-03-12 21:18:23 UTC (rev 24376)
+++ haiku/trunk/src/apps/cortex/Persistence/Importer.h	2008-03-12 21:29:50 UTC (rev 24377)
@@ -18,7 +18,7 @@
 
 #include "ImportContext.h"
 #include "XML.h"
-#include "xmlparse.h"
+#include "expat.h"
 
 #include "cortex_defs.h"
 __BEGIN_CORTEX_NAMESPACE

Modified: haiku/trunk/src/apps/cortex/Persistence/Jamfile
===================================================================
--- haiku/trunk/src/apps/cortex/Persistence/Jamfile	2008-03-12 21:18:23 UTC (rev 24376)
+++ haiku/trunk/src/apps/cortex/Persistence/Jamfile	2008-03-12 21:29:50 UTC (rev 24377)
@@ -1,9 +1,10 @@
 SubDir HAIKU_TOP src apps cortex Persistence ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
-SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) expat xmlparse ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) support ] ;
 
+UseLibraryHeaders expat ;
+
 SubDirCcFlags -DCORTEX_NAMESPACE=cortex ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;



From korli at mail.berlios.de  Wed Mar 12 22:43:14 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 12 Mar 2008 22:43:14 +0100
Subject: [Haiku-commits] r24378 -
	haiku/trunk/src/add-ons/media/plugins/mp3_decoder
Message-ID: <200803122143.m2CLhEoM026398@sheep.berlios.de>

Author: korli
Date: 2008-03-12 22:43:13 +0100 (Wed, 12 Mar 2008)
New Revision: 24378
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24378&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/mp3_decoder/mp3DecoderPlugin.cpp
Log:
fix warnings


Modified: haiku/trunk/src/add-ons/media/plugins/mp3_decoder/mp3DecoderPlugin.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/mp3_decoder/mp3DecoderPlugin.cpp	2008-03-12 21:29:50 UTC (rev 24377)
+++ haiku/trunk/src/add-ons/media/plugins/mp3_decoder/mp3DecoderPlugin.cpp	2008-03-12 21:43:13 UTC (rev 24378)
@@ -277,7 +277,7 @@
 			return B_ERROR;
 		}
 		int len = GetFrameLength(chunkBuffer);
-		TRACE("mp3Decoder::DecodeNextChunk: chunkSize %d, first frame length %d\n", chunkSize, len);
+		TRACE("mp3Decoder::DecodeNextChunk: chunkSize %ld, first frame length %d\n", chunkSize, len);
 		// len == -1 when not at frame start
 		// len == chunkSize for mp3 reader (delivers single frames)
 		if (len < (int)chunkSize) {
@@ -295,7 +295,7 @@
 				TRACE("mp3Decoder::DecodeNextChunk: Sync failed\n");
 				return B_ERROR;
 			}
-			TRACE("mp3Decoder::DecodeNextChunk: new chunkSize %d, first frame length %d\n", chunkSize, GetFrameLength(chunkBuffer));
+			TRACE("mp3Decoder::DecodeNextChunk: new chunkSize %ld, first frame length %d\n", chunkSize, GetFrameLength(chunkBuffer));
 		}
 		fNeedSync = false;
 	}



From oruizdorantes at mail.berlios.de  Wed Mar 12 22:44:25 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Wed, 12 Mar 2008 22:44:25 +0100
Subject: [Haiku-commits] r24379 - in haiku/trunk: headers/private/bluetooth
	src/kits/bluetooth
Message-ID: <200803122144.m2CLiPbP027557@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-12 22:44:25 +0100 (Wed, 12 Mar 2008)
New Revision: 24379
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24379&view=rev

Added:
   haiku/trunk/headers/private/bluetooth/CommandManager.h
   haiku/trunk/src/kits/bluetooth/CommandManager.cpp
Modified:
   haiku/trunk/src/kits/bluetooth/Jamfile
Log:
Move the command builder module to the kit although meant to be kept private


Added: haiku/trunk/headers/private/bluetooth/CommandManager.h
===================================================================
--- haiku/trunk/headers/private/bluetooth/CommandManager.h	2008-03-12 21:43:13 UTC (rev 24378)
+++ haiku/trunk/headers/private/bluetooth/CommandManager.h	2008-03-12 21:44:25 UTC (rev 24379)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+#ifndef _COMMAND_MANAGER_H
+#define _COMMAND_MANAGER_H
+
+#include <bluetooth/bluetooth.h>
+
+/* CONTROL BASEBAND */
+void* buildReset(size_t* outsize);
+void* buildReadLocalName(size_t* outsize);
+
+/* LINK CONTROL */
+void* buildRemoteNameRequest(bdaddr_t bdaddr,uint8 pscan_rep_mode, uint16 clock_offset, size_t* outsize);
+void* buildInquiry(uint32 lap, uint8 length, uint8 num_rsp, size_t* outsize);
+
+/* OGF_INFORMATIONAL_PARAM */
+void* buildReadBufferSize(size_t* outsize);
+void* buildReadBdAddr(size_t* outsize);
+
+#endif

Added: haiku/trunk/src/kits/bluetooth/CommandManager.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/CommandManager.cpp	2008-03-12 21:43:13 UTC (rev 24378)
+++ haiku/trunk/src/kits/bluetooth/CommandManager.cpp	2008-03-12 21:44:25 UTC (rev 24379)
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/HCI/btHCI_command.h>
+
+#include <malloc.h>
+
+#include "CommandManager.h"
+
+
+inline void* buildCommand(uint8 ogf, uint8 ocf, void** param, size_t psize, size_t* outsize)
+{
+	struct hci_command_header* header;
+	
+#ifdef BT_IOCTLS_PASS_SIZE
+    header = (struct hci_command_header*) malloc(psize + sizeof(struct hci_command_header));
+	*outsize = psize + sizeof(struct hci_command_header);
+#else
+	size_t* size = (size_t*)malloc(psize + sizeof(struct hci_command_header) + sizeof(size_t));
+	*outsize = psize + sizeof(struct hci_command_header) + sizeof(size_t);
+	    
+    *size = psize + sizeof(struct hci_command_header);
+    header = (struct hci_command_header*) (((uint8*)size)+4);
+#endif
+
+    
+    if (header != NULL) {
+        
+        header->opcode = B_HOST_TO_LENDIAN_INT16(PACK_OPCODE(ogf, ocf));
+        header->clen = psize;
+        
+        if (param != NULL && psize != 0) {
+            *param = ((uint8*)header) + sizeof(struct hci_command_header);
+        }
+    }
+#ifdef BT_IOCTLS_PASS_SIZE        
+    return header;
+#else
+    return (void*)size;
+#endif
+}
+
+
+#if 0
+#pragma mark - CONTROL BASEBAND -
+#endif
+
+
+void* buildReset(size_t* outsize)
+{
+    return buildCommand(OGF_CONTROL_BASEBAND, OCF_RESET, NULL, 0, outsize);
+}
+
+
+void* buildReadLocalName(size_t* outsize)
+{
+    return buildCommand(OGF_CONTROL_BASEBAND, OCF_READ_LOCAL_NAME, NULL, 0, outsize);
+}
+
+
+#if 0
+#pragma mark - LINK CONTROL -
+#endif
+
+
+void* buildRemoteNameRequest(bdaddr_t bdaddr,uint8 pscan_rep_mode, uint16 clock_offset, size_t* outsize)
+{
+    
+    struct hci_remote_name_request* param;
+    void* command = buildCommand(OGF_LINK_CONTROL, OCF_REMOTE_NAME_REQUEST, (void**) &param, sizeof(struct hci_remote_name_request), outsize);
+    
+    if (command != NULL) {
+        param->bdaddr = bdaddr;
+        param->pscan_rep_mode = pscan_rep_mode;
+        param->clock_offset = clock_offset;
+    }
+
+    return command;
+}
+
+
+void* buildInquiry(uint32 lap, uint8 length, uint8 num_rsp, size_t* outsize)
+{
+
+    struct hci_cp_inquiry* param;
+    void* command = buildCommand(OGF_LINK_CONTROL, OCF_INQUIRY, (void**) &param, sizeof(struct hci_cp_inquiry), outsize);
+
+    if (command != NULL) {    
+	    
+	    param->lap[2] = (lap >> 16) & 0xFF;
+   		param->lap[1] = (lap >>  8) & 0xFF;
+    	param->lap[0] = (lap >>  0) & 0xFF;
+    	param->length = length;
+    	param->num_rsp = num_rsp;
+    }
+
+    return command;
+}
+
+
+#if 0
+#pragma mark - INFORMATIONAL_PARAM -
+#endif
+
+
+void* buildReadBufferSize(size_t* outsize)
+{
+    return buildCommand(OGF_INFORMATIONAL_PARAM, OCF_READ_BUFFER_SIZE, NULL, 0, outsize);
+}    
+
+
+void* buildReadBdAddr(size_t* outsize)
+{
+	return buildCommand(OGF_INFORMATIONAL_PARAM, OCF_READ_BD_ADDR, NULL, 0, outsize);
+}    

Modified: haiku/trunk/src/kits/bluetooth/Jamfile
===================================================================
--- haiku/trunk/src/kits/bluetooth/Jamfile	2008-03-12 21:43:13 UTC (rev 24378)
+++ haiku/trunk/src/kits/bluetooth/Jamfile	2008-03-12 21:44:25 UTC (rev 24379)
@@ -12,5 +12,6 @@
 	LocalDevice.cpp
 	DiscoveryAgent.cpp
 	DiscoveryListener.cpp
+	CommandManager.cpp
 	: be
 ;



From oruizdorantes at mail.berlios.de  Wed Mar 12 22:52:49 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Wed, 12 Mar 2008 22:52:49 +0100
Subject: [Haiku-commits] r24380 - haiku/trunk/src/servers/bluetooth
Message-ID: <200803122152.m2CLqnAl029120@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-12 22:52:49 +0100 (Wed, 12 Mar 2008)
New Revision: 24380
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24380&view=rev

Removed:
   haiku/trunk/src/servers/bluetooth/CommandManager.cpp
   haiku/trunk/src/servers/bluetooth/CommandManager.h
Modified:
   haiku/trunk/src/servers/bluetooth/Jamfile
Log:
Remove Command builder implementation from the server



Deleted: haiku/trunk/src/servers/bluetooth/CommandManager.cpp

Deleted: haiku/trunk/src/servers/bluetooth/CommandManager.h

Modified: haiku/trunk/src/servers/bluetooth/Jamfile
===================================================================
--- haiku/trunk/src/servers/bluetooth/Jamfile	2008-03-12 21:44:25 UTC (rev 24379)
+++ haiku/trunk/src/servers/bluetooth/Jamfile	2008-03-12 21:52:49 UTC (rev 24380)
@@ -10,13 +10,13 @@
  	:
 	BPortNot.cpp
 	BluetoothServer.cpp
-	CommandManager.cpp
+#	CommandManager.cpp
 	DeviceManager.cpp
 	HCIControllerAccessor.cpp
 	HCITransportAccessor.cpp
 	LocalDeviceHandler.cpp
 	LocalDeviceImpl.cpp  
 	Output.cpp
-	: be
+	: be libbluetooth.so
 	$(TARGET_LIBSTDC++)
 ;



From axeld at mail.berlios.de  Wed Mar 12 23:49:42 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 12 Mar 2008 23:49:42 +0100
Subject: [Haiku-commits] r24381 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803122249.m2CMngKI001281@sheep.berlios.de>

Author: axeld
Date: 2008-03-12 23:49:41 +0100 (Wed, 12 Mar 2008)
New Revision: 24381
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24381&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.h
Log:
The log replay code now checks if a super block is valid before the current
one gets overwritten; if the log contains invalid data, it will no longer
render the whole disk unreadable. This should have helped to prevent bug #1911
(but of course the problem that there is invalid data in the log in the first
place remains).


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp	2008-03-12 21:52:49 UTC (rev 24380)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp	2008-03-12 22:49:41 UTC (rev 24381)
@@ -419,12 +419,22 @@
 			if (data == NULL)
 				RETURN_ERROR(B_IO_ERROR);
 
-			ssize_t written = write_pos(fVolume->Device(),
-				offset + (i * blockSize), data, blockSize);
+			// TODO: eventually check other well known offsets, like the
+			// root and index dirs
+			if (offset == 0) {
+				// This log entry writes over the super block - check if
+				// it's valid!
+				if (Volume::CheckSuperBlock(data) != B_OK)
+					RETURN_ERROR(B_BAD_DATA);
+			}
+
+			ssize_t written = write_pos(fVolume->Device(), offset, data,
+				blockSize);
 			if (written != blockSize)
 				RETURN_ERROR(B_IO_ERROR);
 
 			blockNumber = (blockNumber + 1) % fLogSize;
+			offset += blockSize;
 			count++;
 		}
 	}

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp	2008-03-12 21:52:49 UTC (rev 24380)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp	2008-03-12 22:49:41 UTC (rev 24381)
@@ -558,25 +558,42 @@
 //	#pragma mark - Disk scanning and initialization
 
 
-status_t
+/*static*/ status_t
+Volume::CheckSuperBlock(const uint8* data, uint32* _offset)
+{
+	disk_super_block* superBlock = (disk_super_block*)(data + 512);
+	if (superBlock->IsValid()) {
+		if (_offset != NULL)
+			*_offset = 512;
+		return B_OK;
+	}
+
+#ifndef BFS_LITTLE_ENDIAN_ONLY
+	// For PPC, the super block might be located at offset 0
+	superBlock = (disk_super_block*)data;
+	if (superBlock->IsValid()) {
+		if (_offset != NULL)
+			*_offset = 0;
+		return B_OK;
+	}
+#endif
+
+	return B_BAD_VALUE;
+}
+
+
+/*static*/ status_t
 Volume::Identify(int fd, disk_super_block *superBlock)
 {
-	char buffer[1024];
+	uint8 buffer[1024];
 	if (read_pos(fd, 0, buffer, sizeof(buffer)) != sizeof(buffer))
 		return B_IO_ERROR;
 
-	memcpy(superBlock, buffer + 512, sizeof(disk_super_block));
-	if (!superBlock->IsValid()) {
-#ifndef BFS_LITTLE_ENDIAN_ONLY
-		// For PPC, the super block might be located at offset 0
-		memcpy(superBlock, buffer, sizeof(disk_super_block));
-		if (!superBlock->IsValid())
-			return B_BAD_VALUE;
-#else
+	uint32 offset;
+	if (CheckSuperBlock(buffer, &offset) != B_OK)
 		return B_BAD_VALUE;
-#endif
-	}
 
+	memcpy(superBlock, buffer + offset, sizeof(disk_super_block));
 	return B_OK;
 }
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.h	2008-03-12 21:52:49 UTC (rev 24380)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.h	2008-03-12 22:49:41 UTC (rev 24381)
@@ -102,6 +102,8 @@
 
 		uint32				GetUniqueID();
 
+		static status_t		CheckSuperBlock(const uint8* data,
+								uint32* _offset = NULL);
 		static status_t		Identify(int fd, disk_super_block *superBlock);
 
 	protected:



From marcusoverhagen at mail.berlios.de  Thu Mar 13 00:19:53 2008
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Thu, 13 Mar 2008 00:19:53 +0100
Subject: [Haiku-commits] r24382 - haiku/trunk/src/kits/media
Message-ID: <200803122319.m2CNJrXS005464@sheep.berlios.de>

Author: marcusoverhagen
Date: 2008-03-13 00:19:52 +0100 (Thu, 13 Mar 2008)
New Revision: 24382
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24382&view=rev

Modified:
   haiku/trunk/src/kits/media/MediaAddOn.cpp
Log:
Fixed harmless copy & paste bug.


Modified: haiku/trunk/src/kits/media/MediaAddOn.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaAddOn.cpp	2008-03-12 22:49:41 UTC (rev 24381)
+++ haiku/trunk/src/kits/media/MediaAddOn.cpp	2008-03-12 23:19:52 UTC (rev 24382)
@@ -176,7 +176,7 @@
 			}
 		} else
 			fprintf(stderr, "error dormant_flavor_info::operator= clone.out_format_count is invalid\n");
-	} else if (clone.in_format_count)
+	} else if (clone.out_format_count)
 		fprintf(stderr, "warning: dormant_flavor_info::operator= not B_BUFFER_PRODUCER and clone.out_format_count is != 0\n");
 
 	// initialize node_info with default values from dormant_node_info constructor



From umccullough at gmail.com  Thu Mar 13 00:54:43 2008
From: umccullough at gmail.com (Urias McCullough)
Date: Wed, 12 Mar 2008 16:54:43 -0700
Subject: [Haiku-commits] r24376 - in haiku/trunk: headers/os/bluetooth
	headers/private/bluetooth src/kits/bluetooth
In-Reply-To: <200803122118.m2CLIOFp021078@sheep.berlios.de>
References: <200803122118.m2CLIOFp021078@sheep.berlios.de>
Message-ID: <1e80d8750803121654q42f5967ey1a1089655f988f10@mail.gmail.com>

On 12/03/2008, oruizdorantes at BerliOS <oruizdorantes at mail.berlios.de> wrote:
>   #define BT_MSG_ADQUIRE_LOCAL_DEVICE     'btAd'

Off topic, for this particular commit, and somewhat petty as well but
shouldn't that be: BT_MSG_ACQUIRE_LOCAL_DEVICE ?


From oliver.ruiz.dorantes at gmail.com  Thu Mar 13 10:21:47 2008
From: oliver.ruiz.dorantes at gmail.com (Oliver Ruiz Dorantes)
Date: Thu, 13 Mar 2008 10:21:47 +0100
Subject: [Haiku-commits] r24376 - in haiku/trunk: headers/os/bluetooth
	headers/private/bluetooth src/kits/bluetooth
In-Reply-To: <1e80d8750803121654q42f5967ey1a1089655f988f10@mail.gmail.com>
References: <200803122118.m2CLIOFp021078@sheep.berlios.de>
	<1e80d8750803121654q42f5967ey1a1089655f988f10@mail.gmail.com>
Message-ID: <d953bae20803130221n658e7a07nd09132f52371a109@mail.gmail.com>

Hi Urias!

Thanks pointing the misspell ;) will correct in next commit

regards

2008/3/13, Urias McCullough <umccullough at gmail.com>:
>
> On 12/03/2008, oruizdorantes at BerliOS <oruizdorantes at mail.berlios.de>
> wrote:
> >   #define BT_MSG_ADQUIRE_LOCAL_DEVICE     'btAd'
>
>
> Off topic, for this particular commit, and somewhat petty as well but
> shouldn't that be: BT_MSG_ACQUIRE_LOCAL_DEVICE ?
>
> _______________________________________________
> Haiku-commits mailing list
> Haiku-commits at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/haiku-commits
>



-- 
Oliver,

http://urnenfeld.blogspot.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20080313/e539b72e/attachment.html>

From axeld at mail.berlios.de  Thu Mar 13 13:25:30 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 13 Mar 2008 13:25:30 +0100
Subject: [Haiku-commits] r24383 -
	haiku/trunk/src/add-ons/kernel/drivers/audio/hda
Message-ID: <200803131225.m2DCPUVh020051@sheep.berlios.de>

Author: axeld
Date: 2008-03-13 13:25:29 +0100 (Thu, 13 Mar 2008)
New Revision: 24383
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24383&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
   haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_multi_audio.cpp
Log:
* Rewrote widget output path discovery, it's now very similar to what the
  FreeBSD driver is doing.
* hda_codec_new_audio_group() did not free the audio group's widgets on
  failure.
* No longer create the input stream for now.
* Reworked multiaudio-support to work regardless if there is only a playback
  or record stream.
* With these changes, I hear nothing on my laptop anymore (before there was
  noise), but on another system, I can finally hear something that sounds very
  much like the sinus wave the multi_audio_test application produces; the
  sound quality is pretty bad though (lots of periodical noise and glitches).
* Made B_MULTI_GET_DESCRIPTION safe to be called from userland.
* Minor other cleanup.


Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h	2008-03-12 23:19:52 UTC (rev 24382)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/driver.h	2008-03-13 12:25:29 UTC (rev 24383)
@@ -37,6 +37,7 @@
 #define HDA_MAX_STREAMS			16
 #define MAX_CODEC_RESPONSES		10
 #define MAX_INPUTS				32
+#define MAX_IO_WIDGETS			8
 
 /* FIXME: Find out why we need so much! */
 #define DEFAULT_FRAMES_PER_BUFFER	4096
@@ -62,7 +63,8 @@
 	uint32		type;
 
 	uint32		pin_widget;			/* PIN Widget ID */
-	uint32		io_widget;			/* Input/Output Converter Widget ID */
+	uint32		io_widgets[MAX_IO_WIDGETS];	/* Input/Output Converter Widget ID */
+	uint32		num_io_widgets;
 
 	uint32		sample_rate;	
 	uint32		sample_format;
@@ -108,12 +110,8 @@
 		struct {
 			uint32	formats;
 			uint32	rates;
-		} output;
+		} io;
 		struct {
-			uint32	formats;
-			uint32	rates;
-		} input;
-		struct {
 		} mixer;
 		struct {
 			uint32	output;
@@ -123,6 +121,9 @@
 	} d;
 };
 
+#define WIDGET_FLAG_OUTPUT_PATH	0x01
+#define WIDGET_FLAG_INPUT_PATH	0x02
+
 /*!	This structure describes a single Audio Function Group. An AFG
 	is a group of audio widgets which can be used to configure multiple
 	streams of audio either from the HDA Link to an output device (= playback)
@@ -215,6 +216,8 @@
 extern uint32 gNumCards;
 
 /* hda_codec.c */
+status_t hda_audio_group_get_widgets(hda_audio_group* audioGroup,
+	hda_stream* stream);
 hda_codec* hda_codec_new(hda_controller* controller, uint32 cad);
 void hda_codec_delete(hda_codec* codec);
 
@@ -229,7 +232,7 @@
 	uint32 count);
 
 /* hda_controller.c: Stream support */
-hda_stream* hda_stream_new(hda_controller* controller, int type);
+hda_stream* hda_stream_new(hda_audio_group* audioGroup, int type);
 void hda_stream_delete(hda_stream* stream);
 status_t hda_stream_setup_buffers(hda_audio_group* audioGroup,
 	hda_stream* stream, const char* desc);

Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp	2008-03-12 23:19:52 UTC (rev 24382)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp	2008-03-13 12:25:29 UTC (rev 24383)
@@ -248,13 +248,13 @@
 {
 	if ((widget->capabilities.audio & AUDIO_CAP_FORMAT_OVERRIDE) == 0) {
 		// adopt capabilities of the audio group
-		widget->d.output.formats = audioGroup->supported_formats;
-		widget->d.output.rates = audioGroup->supported_rates;
+		widget->d.io.formats = audioGroup->supported_formats;
+		widget->d.io.rates = audioGroup->supported_rates;
 		return B_OK;
 	}
 
 	return hda_get_stream_support(audioGroup->codec, widget->node_id,
-		&widget->d.output.formats, &widget->d.output.rates);
+		&widget->d.io.formats, &widget->d.io.rates);
 }
 
 
@@ -303,6 +303,17 @@
 }
 
 
+static hda_widget*
+hda_audio_group_get_widget(hda_audio_group* audioGroup, uint32 nodeID)
+{
+	if (audioGroup->widget_start > nodeID
+		|| audioGroup->widget_start + audioGroup->widget_count < nodeID)
+		return NULL;
+
+	return &audioGroup->widgets[nodeID - audioGroup->widget_start];
+}
+
+
 static status_t
 hda_widget_get_connections(hda_audio_group* audioGroup, hda_widget* widget)
 {
@@ -378,7 +389,7 @@
 	widget->num_inputs = numInputs;
 
 	if (widget->num_inputs == 1)
-		widget->active_input = widget->inputs[0];
+		widget->active_input = 0;
 
 	return B_OK;
 }
@@ -403,7 +414,7 @@
 	verbs[1] = MAKE_VERB(audioGroup->codec->addr, audioGroup->root_node_id,
 		VID_GET_PARAMETER, PID_GPIO_COUNT);
 	verbs[2] = MAKE_VERB(audioGroup->codec->addr, audioGroup->root_node_id,
-		VID_GET_PARAMETER, PID_SUBORDINATE_NODE_COUNT);
+		VID_GET_PARAMETER, PID_SUB_NODE_COUNT);
 
 	if (hda_send_verbs(audioGroup->codec, verbs, resp, 3) != B_OK)
 		return B_ERROR;
@@ -511,51 +522,123 @@
 }
 
 
-/*! Find path from 'widget' to a widget of type \a widgetType, returning its
-	widget id.
-	Returns 0 if not found.
-*/
-static uint32
-hda_codec_audio_group_find_path(hda_audio_group* audioGroup, uint32 widget,
-	hda_widget_type widgetType, uint32 depth)
+/*! Find output path for widget */
+static bool
+hda_widget_find_output_path(hda_audio_group* audioGroup, hda_widget* widget,
+	uint32 depth)
 {
-	int groupIndex = widget - audioGroup->widget_start;
+	if (widget == NULL || depth > 16)
+		return false;
 
-	switch (audioGroup->widgets[groupIndex].type) {
+	switch (widget->type) {
+		case WT_AUDIO_OUTPUT:
+			widget->flags |= WIDGET_FLAG_OUTPUT_PATH;
+dprintf("      %*soutput: added output widget %ld\n", (int)depth * 2, "", widget->node_id);
+			return true;
+
 		case WT_AUDIO_MIXER:
-			for (uint32 i = 0; i < audioGroup->widgets[groupIndex].num_inputs; i++) {
-				if (hda_codec_audio_group_find_path(audioGroup,
-						audioGroup->widgets[groupIndex].inputs[i], widgetType,
+		case WT_AUDIO_SELECTOR:
+		{
+			// search for output in this path
+			bool found = false;
+			for (uint32 i = 0; i < widget->num_inputs; i++) {
+				hda_widget* inputWidget = hda_audio_group_get_widget(audioGroup,
+					widget->inputs[i]);
+
+				if (hda_widget_find_output_path(audioGroup, inputWidget,
 						depth + 1)) {
-					if (audioGroup->widgets[groupIndex].active_input == -1)
-						audioGroup->widgets[groupIndex].active_input = i;
+					if (widget->active_input == -1)
+						widget->active_input = i;
 
-					return audioGroup->widgets[groupIndex].inputs[i];
+					widget->flags |= WIDGET_FLAG_OUTPUT_PATH;
+dprintf("      %*soutput: added mixer/selector widget %ld\n", (int)depth * 2, "", widget->node_id);
+					found = true;
 				}
 			}
-			break;
+if (!found) dprintf("      %*soutput: not added mixer/selector widget %ld\n", (int)depth * 2, "", widget->node_id);
+			return found;
+		}
 
-		case WT_AUDIO_SELECTOR:
-		{
-			int32 i = audioGroup->widgets[groupIndex].active_input;
-			if (i != -1) {
-				widget = audioGroup->widgets[groupIndex].inputs[i];
-				if (hda_codec_audio_group_find_path(audioGroup, widget,
-						widgetType, depth + 1)) {
-					return widget;
-				}
+		default:
+			return false;
+	}
+}
+
+
+static bool
+hda_audio_group_build_output_tree(hda_audio_group* audioGroup, bool useMixer)
+{
+	bool found = false;
+
+dprintf("build output tree: %suse mixer\n", useMixer ? "" : "don't ");
+	for (uint32 i = 0; i < audioGroup->widget_count; i++) {
+		hda_widget& widget = audioGroup->widgets[i];
+
+		if (widget.type != WT_PIN_COMPLEX || !widget.d.pin.output
+			|| (widget.d.pin.device != PIN_DEV_HEAD_PHONE_OUT
+				&& widget.d.pin.device != PIN_DEV_SPEAKER
+				&& widget.d.pin.device != PIN_DEV_LINE_OUT))
+			continue;
+
+dprintf("  look at pin widget %ld (%ld inputs)\n", widget.node_id, widget.num_inputs);
+		for (uint32 j = 0; j < widget.num_inputs; j++) {
+			hda_widget* inputWidget = hda_audio_group_get_widget(audioGroup,
+				widget.inputs[j]);
+dprintf("    try widget %ld: %p\n", widget.inputs[j], inputWidget);
+			if (inputWidget == NULL)
+				continue;
+
+			if (useMixer && inputWidget->type != WT_AUDIO_MIXER
+				&& inputWidget->type != WT_AUDIO_SELECTOR)
+				continue;
+dprintf("    widget %ld is candidate\n", inputWidget->node_id);
+
+			if (hda_widget_find_output_path(audioGroup, inputWidget, 0)) {
+dprintf("    add pin widget %ld\n", widget.node_id);
+				if (widget.active_input == -1)
+					widget.active_input = j;
+				widget.flags |= WIDGET_FLAG_OUTPUT_PATH;
+				found = true;
 			}
-			break;
 		}
+	}
 
-		default:
-			if (audioGroup->widgets[groupIndex].type == widgetType)
-				return widget;
+	return found;
+}
 
-			break;
+
+static status_t
+hda_audio_group_build_tree(hda_audio_group* audioGroup)
+{
+	if (!hda_audio_group_build_output_tree(audioGroup, true)) {
+		// didn't find a mixer path, try again without
+dprintf("try without mixer!\n");
+		if (!hda_audio_group_build_output_tree(audioGroup, false))
+			return ENODEV;
 	}
 
-	return 0;
+dprintf("build tree!\n");
+	// TODO: input path!
+
+	// select active connections
+
+	for (uint32 i = 0; i < audioGroup->widget_count; i++) {
+		hda_widget& widget = audioGroup->widgets[i];
+
+		if (widget.active_input == -1)
+			widget.active_input = 0;
+		if (widget.num_inputs < 2)
+			continue;
+
+		corb_t verb = MAKE_VERB(audioGroup->codec->addr,
+			widget.node_id, VID_SET_CONNECTION_SELECT, widget.active_input);
+		if (hda_send_verbs(audioGroup->codec, &verb, NULL, 1) != B_OK) {
+			dprintf("hda: Setting output selector %ld failed on widget %ld!\n",
+				widget.active_input, widget.node_id);
+		}
+	}
+
+	return B_OK;
 }
 
 
@@ -596,143 +679,101 @@
 	/* Setup for worst-case scenario; we cannot find any output Pin Widgets */
 	status = ENODEV;
 
-	/* Try to locate all input/output channels */
-	for (uint32 i = 0; i < audioGroup->widget_count; i++) {
-		uint32 outputWidget = 0, inputWidget = 0;
+	if (hda_audio_group_build_tree(audioGroup) != B_OK)
+		goto err;
 
-		if (audioGroup->playback_stream == NULL
-			&& audioGroup->widgets[i].type == WT_PIN_COMPLEX
-			&& audioGroup->widgets[i].d.pin.output) {
-			if (audioGroup->widgets[i].d.pin.device == PIN_DEV_HEAD_PHONE_OUT
-				|| audioGroup->widgets[i].d.pin.device == PIN_DEV_SPEAKER
-				|| audioGroup->widgets[i].d.pin.device == PIN_DEV_LINE_OUT) {
-				int32 inputIndex = audioGroup->widgets[i].active_input;
-				if (inputIndex != -1) {
-					outputWidget = hda_codec_audio_group_find_path(audioGroup,
-						audioGroup->widgets[i].inputs[inputIndex],
-						WT_AUDIO_OUTPUT, 0);
-				} else {
-					// find and select output widget
-					for (inputIndex = 0; (uint32)inputIndex
-							< audioGroup->widgets[i].num_inputs; inputIndex++) {
-						outputWidget = hda_codec_audio_group_find_path(audioGroup,
-							audioGroup->widgets[i].inputs[inputIndex],
-							WT_AUDIO_OUTPUT, 0);
-						if (outputWidget) {
-							corb_t verb = MAKE_VERB(codec->addr,
-								i + audioGroup->widget_start,
-								VID_SET_CONNECTION_SELECT, inputIndex);
-							if (hda_send_verbs(codec, &verb, NULL, 1) != B_OK)
-								dprintf("%s: Setting output selector failed!\n", __func__);
-							break;
-						}
-					}
-				}
+	audioGroup->playback_stream = hda_stream_new(audioGroup, STREAM_PLAYBACK);
+	//audioGroup->record_stream = hda_stream_new(audioGroup, STREAM_RECORD);
 
-				if (outputWidget) {
-					if (!audioGroup->playback_stream) {
-						corb_t verb[2];
+	if (audioGroup->playback_stream != NULL
+		|| audioGroup->record_stream != NULL) {
+		codec->audio_groups[codec->num_audio_groups++] = audioGroup;
+		return B_OK;
+	}
 
-						/* Setup playback/record streams for Multi Audio API */
-						audioGroup->playback_stream = hda_stream_new(
-							audioGroup->codec->controller, STREAM_PLAYBACK);
-						audioGroup->record_stream = hda_stream_new(
-							audioGroup->codec->controller, STREAM_RECORD);
+err:
+	free(audioGroup->widgets);
+	free(audioGroup);
+	return status;
+}
 
-						audioGroup->playback_stream->pin_widget = i
-							+ audioGroup->widget_start;
-						audioGroup->playback_stream->io_widget = outputWidget;
 
-						/* FIXME: Force Pin Widget to unmute; enable hp/output */
-						verb[0] = MAKE_VERB(codec->addr,
-							audioGroup->playback_stream->pin_widget,
-							VID_SET_AMPLIFIER_GAIN_MUTE,
-							AMP_SET_OUTPUT | AMP_SET_LEFT_CHANNEL
-								| AMP_SET_RIGHT_CHANNEL);
-						verb[1] = MAKE_VERB(codec->addr,
-							audioGroup->playback_stream->pin_widget,
-							VID_SET_PIN_WIDGET_CONTROL,
-							PIN_ENABLE_HEAD_PHONE | PIN_ENABLE_OUTPUT);
-						hda_send_verbs(codec, verb, NULL, 2);
+//	#pragma mark -
 
-						dprintf("%s: Found output PIN (%s) connected to output "
-							"CONV wid:%ld\n", __func__,
-							kDefaultDevice[audioGroup->widgets[i].d.pin.device], outputWidget);
-					}	
-				}
-			}
-		}
 
-		if (audioGroup->widgets[i].type == WT_AUDIO_INPUT) {
-			int32 inputIndex = audioGroup->widgets[i].active_input;
-			if (inputIndex != -1) {
-				inputWidget = hda_codec_audio_group_find_path(audioGroup,
-					audioGroup->widgets[i].inputs[inputIndex], WT_PIN_COMPLEX,
-					0);
-			} else {
-				// find and select input widget
-				for (inputIndex = 0; (uint32)inputIndex
-						< audioGroup->widgets[i].num_inputs; inputIndex++) {
-					inputWidget = hda_codec_audio_group_find_path(audioGroup,
-						audioGroup->widgets[i].inputs[inputIndex],
-						WT_PIN_COMPLEX, 0);
-					if (inputWidget) {
-						corb_t verb = MAKE_VERB(codec->addr,
-							i + audioGroup->widget_start,
-							VID_SET_CONNECTION_SELECT, inputIndex);
-						if (hda_send_verbs(codec, &verb, NULL, 1) != B_OK) {
-							dprintf("%s: Setting input selector failed!\n",
-								__func__);
-						}
-						break;
-					}
-				}
-			}
+status_t
+hda_audio_group_get_widgets(hda_audio_group* audioGroup, hda_stream* stream)
+{
+	hda_widget_type type;
+	uint32 flags;
 
-			if (inputWidget) {
-				if (!audioGroup->record_stream) {
-					corb_t verb;
+	if (stream->type == STREAM_PLAYBACK) {
+		type = WT_AUDIO_OUTPUT;
+		flags = WIDGET_FLAG_OUTPUT_PATH;
+	} else {
+		// record
+		type = WT_AUDIO_INPUT;
+		flags = WIDGET_FLAG_INPUT_PATH;
+	}
 
-					/* Setup playback/record streams for Multi Audio API */
-					audioGroup->record_stream = hda_stream_new(
-						audioGroup->codec->controller, STREAM_RECORD);
+	uint32 count = 0;
 
-					audioGroup->record_stream->pin_widget = inputWidget;
-					audioGroup->record_stream->io_widget = i
-						+ audioGroup->widget_start;
+	for (uint32 i = 0; i < audioGroup->widget_count && count < MAX_IO_WIDGETS;
+			i++) {
+		hda_widget& widget = audioGroup->widgets[i];
 
-					/* FIXME: Force Pin Widget to unmute */
-					verb = MAKE_VERB(codec->addr,
-						audioGroup->record_stream->pin_widget,
-						VID_SET_AMPLIFIER_GAIN_MUTE,
-						AMP_SET_INPUT | AMP_SET_LEFT_CHANNEL
-							| AMP_SET_RIGHT_CHANNEL);
-					hda_send_verbs(codec, &verb, NULL, 1);
-				}
+		if ((widget.flags & flags) != 0) {
+			if (widget.type == WT_PIN_COMPLEX) {
+				stream->pin_widget = widget.node_id;
 
-				dprintf("%s: Found input PIN (%s) connected to input CONV "
-					"wid:%ld\n", __func__, kDefaultDevice[audioGroup->widgets[
-						inputWidget - audioGroup->widget_start].d.pin.device],
-					i + audioGroup->widget_start);
+dprintf("ENABLE pin widget %ld\n", widget.node_id);
+				/* FIXME: Force Pin Widget to unmute; enable hp/output */
+				uint32 verb = MAKE_VERB(audioGroup->codec->addr,
+					widget.node_id,
+					VID_SET_PIN_WIDGET_CONTROL,
+					PIN_ENABLE_HEAD_PHONE | PIN_ENABLE_OUTPUT);
+				hda_send_verbs(audioGroup->codec, &verb, NULL, 1);
 			}
+
+			if (widget.capabilities.output_amplifier != 0) {
+dprintf("UNMUTE/SET GAIN widget %ld (offset %ld)\n", widget.node_id,
+	widget.capabilities.output_amplifier & AMP_CAP_OFFSET_MASK);
+				uint32 verb = MAKE_VERB(audioGroup->codec->addr,
+					widget.node_id,
+					VID_SET_AMPLIFIER_GAIN_MUTE,
+					AMP_SET_OUTPUT | AMP_SET_LEFT_CHANNEL
+						| AMP_SET_RIGHT_CHANNEL
+						| (widget.capabilities.output_amplifier
+							& AMP_CAP_OFFSET_MASK));
+				hda_send_verbs(audioGroup->codec, &verb, NULL, 1);
+			}
 		}
-	}
 
-	/* If we found any valid output channels, we're in the clear */
-	if (audioGroup && audioGroup->playback_stream) {
-		codec->audio_groups[codec->num_audio_groups++] = audioGroup;
-		return B_OK;
+		if (widget.type != type || (widget.flags & flags) == 0
+			|| (widget.capabilities.audio
+				& (AUDIO_CAP_STEREO | AUDIO_CAP_DIGITAL)) != AUDIO_CAP_STEREO
+			|| widget.d.io.formats == 0)
+			continue;
+
+		if (count == 0) {
+			stream->sample_format = widget.d.io.formats;
+			stream->sample_rate = widget.d.io.rates;
+		} else {
+			stream->sample_format &= widget.d.io.formats;
+			stream->sample_rate &= widget.d.io.rates;
+		}
+
+		stream->io_widgets[count++] = widget.node_id;
 	}
 
-err:
-	free(audioGroup);
-	return status;
+	if (count == 0)
+		return B_ENTRY_NOT_FOUND;
+
+	stream->num_io_widgets = count;
+	return B_OK;
 }
 
 
-//	#pragma mark -
-
-
 void
 hda_codec_delete(hda_codec* codec)
 {
@@ -783,7 +824,7 @@
 	verbs[0] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_VENDOR_ID);
 	verbs[1] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_REVISION_ID);
 	verbs[2] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER,
-		PID_SUBORDINATE_NODE_COUNT);
+		PID_SUB_NODE_COUNT);
 
 	if (hda_send_verbs(codec, verbs, (uint32*)&response, 3) != B_OK)
 		goto err;

Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h	2008-03-12 23:19:52 UTC (rev 24382)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h	2008-03-13 12:25:29 UTC (rev 24383)
@@ -121,7 +121,7 @@
 /* Parameter IDs */
 #define PID_VENDOR_ID					0x00
 #define PID_REVISION_ID					0x02
-#define PID_SUBORDINATE_NODE_COUNT		0x04
+#define PID_SUB_NODE_COUNT				0x04
 #define PID_FUNCTION_GROUP_TYPE			0x05
 #define PID_AUDIO_GROUP_CAP				0x08
 #define PID_AUDIO_WIDGET_CAP			0x09

Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp	2008-03-12 23:19:52 UTC (rev 24382)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp	2008-03-13 12:25:29 UTC (rev 24383)
@@ -325,8 +325,10 @@
 
 
 hda_stream*
-hda_stream_new(hda_controller* controller, int type)
+hda_stream_new(hda_audio_group* audioGroup, int type)
 {
+	hda_controller* controller = audioGroup->codec->controller;
+
 	hda_stream* stream = (hda_stream*)calloc(1, sizeof(hda_stream));
 	if (stream == NULL)
 		return NULL;
@@ -339,7 +341,7 @@
 	switch (type) {
 		case STREAM_PLAYBACK:
 			stream->id = 1;
-			stream->off = (controller->num_input_streams * HDAC_SDSIZE);
+			stream->off = controller->num_input_streams * HDAC_SDSIZE;
 			controller->streams[controller->num_input_streams] = stream;
 			break;
 
@@ -356,7 +358,13 @@
 			break;
 	}
 
-	return stream;
+	// find I/O and Pin widgets for this stream
+
+	if (hda_audio_group_get_widgets(audioGroup, stream) == B_OK)
+		return stream;
+
+	free(stream);
+	return NULL;
 }
 
 
@@ -543,11 +551,16 @@
 	REG32(audioGroup->codec->controller, DMA_POSITION_BASE_LOWER)
 		|= DMA_POSITION_ENABLED;
 
-	verb[0] = MAKE_VERB(audioGroup->codec->addr, stream->io_widget,
-		VID_SET_CONVERTER_FORMAT, format);
-	verb[1] = MAKE_VERB(audioGroup->codec->addr, stream->io_widget,
-		VID_SET_CONVERTER_STREAM_CHANNEL, stream->id << 4);
-	return hda_send_verbs(audioGroup->codec, verb, response, 2);
+	for (uint32 i = 0; i < stream->num_io_widgets; i++) {
+		verb[0] = MAKE_VERB(audioGroup->codec->addr, stream->io_widgets[i],
+			VID_SET_CONVERTER_FORMAT, format);
+		verb[1] = MAKE_VERB(audioGroup->codec->addr, stream->io_widgets[i],
+			VID_SET_CONVERTER_STREAM_CHANNEL, stream->id << 4);
+		hda_send_verbs(audioGroup->codec, verb, response, 2);
+	}
+
+	snooze(1000);
+	return B_OK;
 }
 
 

Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_multi_audio.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_multi_audio.cpp	2008-03-12 23:19:52 UTC (rev 24382)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/hda/hda_multi_audio.cpp	2008-03-13 12:25:29 UTC (rev 24383)
@@ -4,6 +4,7 @@
  *
  * Authors:
  *		Ithamar Adema, ithamar AT unet DOT nl
+ *		Axel D?rfler, axeld at pinc-software.de
  */
 
 
@@ -67,10 +68,18 @@
 	strcpy(data->friendly_name, "HD Audio");
 	strcpy(data->vendor_info, "Haiku");
 
-	data->output_channel_count = 2;
-	data->input_channel_count = 2;
-	data->output_bus_channel_count = 2;
-	data->input_bus_channel_count = 2;
+	int32 inChannels = 0;
+	if (audioGroup->record_stream != NULL)
+		inChannels = 2;
+
+	int32 outChannels = 0;
+	if (audioGroup->playback_stream != NULL)
+		outChannels = 2;
+
+	data->output_channel_count = outChannels;
+	data->output_bus_channel_count = outChannels;
+	data->input_channel_count = inChannels;
+	data->input_bus_channel_count = inChannels;
 	data->aux_bus_channel_count = 0;
 
 	dprintf("%s: request_channel_count: %ld\n", __func__,
@@ -81,7 +90,7 @@
 		memcpy(data->channels, &sChannels, sizeof(sChannels));
 	}
 
-	/* determine output/input rates */	
+	/* determine output/input rates */
 	data->output_rates = audioGroup->supported_rates;
 	data->input_rates = audioGroup->supported_rates;
 
@@ -127,11 +136,21 @@
 	data->input_latency = 0;
 	data->timecode_kind = 0;
 
-	data->output.format = audioGroup->playback_stream->sample_format;
-	data->output.rate = audioGroup->playback_stream->sample_rate;
+	if (audioGroup->playback_stream != NULL) {
+		data->output.format = audioGroup->playback_stream->sample_format;
+		data->output.rate = audioGroup->playback_stream->sample_rate;
+	} else {
+		data->output.format = 0;
+		data->output.rate = 0;
+	}
 
-	data->input.format = audioGroup->record_stream->sample_format;
-	data->input.rate = audioGroup->record_stream->sample_format;
+	if (audioGroup->record_stream != NULL) {
+		data->input.format = audioGroup->record_stream->sample_format;
+		data->input.rate = audioGroup->record_stream->sample_format;
+	} else {
+		data->input.format = 0;
+		data->input.rate = 0;
+	}
 
 	return B_OK;
 }
@@ -147,15 +166,19 @@
 		return B_BAD_VALUE;
 #endif
 
-	audioGroup->playback_stream->sample_format = data->output.format;
-	audioGroup->playback_stream->sample_rate = data->output.rate;
-	audioGroup->playback_stream->sample_size = format2size(
-		audioGroup->playback_stream->sample_format);
+	if (audioGroup->playback_stream != NULL) {
+		audioGroup->playback_stream->sample_format = data->output.format;
+		audioGroup->playback_stream->sample_rate = data->output.rate;
+		audioGroup->playback_stream->sample_size = format2size(
+			audioGroup->playback_stream->sample_format);
+	}
 
-	audioGroup->record_stream->sample_rate = data->input.rate;
-	audioGroup->record_stream->sample_format = data->input.format;
-	audioGroup->record_stream->sample_size = format2size(
-		audioGroup->record_stream->sample_format);
+	if (audioGroup->record_stream != NULL) {
+		audioGroup->record_stream->sample_rate = data->input.rate;
+		audioGroup->record_stream->sample_format = data->input.format;
+		audioGroup->record_stream->sample_size = format2size(
+			audioGroup->record_stream->sample_format);
+	}
 
 	return B_OK;
 }
@@ -227,56 +250,66 @@
 	data->flags = B_MULTI_BUFFER_PLAYBACK;
 
 	/* Copy the settings into the streams */
-	audioGroup->playback_stream->num_buffers = data->return_playback_buffers;
-	audioGroup->playback_stream->num_channels = data->return_playback_channels;
-	audioGroup->playback_stream->buffer_length
-		= data->return_playback_buffer_size;
 
-	status_t status = hda_stream_setup_buffers(audioGroup,
-		audioGroup->playback_stream, "Playback");
-	if (status != B_OK) {
-		dprintf("hda: Error setting up playback buffers: %s\n",
-			strerror(status));
-		return status;
+	if (audioGroup->playback_stream != NULL) {
+		audioGroup->playback_stream->num_buffers = data->return_playback_buffers;
+		audioGroup->playback_stream->num_channels = data->return_playback_channels;
+		audioGroup->playback_stream->buffer_length
+			= data->return_playback_buffer_size;
+
+		status_t status = hda_stream_setup_buffers(audioGroup,
+			audioGroup->playback_stream, "Playback");
+		if (status != B_OK) {
+			dprintf("hda: Error setting up playback buffers: %s\n",
+				strerror(status));
+			return status;
+		}
 	}
 
-	audioGroup->record_stream->num_buffers = data->return_record_buffers;
-	audioGroup->record_stream->num_channels = data->return_record_channels;
-	audioGroup->record_stream->buffer_length
-		= data->return_record_buffer_size;
+	if (audioGroup->record_stream != NULL) {
+		audioGroup->record_stream->num_buffers = data->return_record_buffers;
+		audioGroup->record_stream->num_channels = data->return_record_channels;
+		audioGroup->record_stream->buffer_length
+			= data->return_record_buffer_size;
 
-	status = hda_stream_setup_buffers(audioGroup, audioGroup->record_stream,
-		"Recording");
-	if (status != B_OK) {
-		dprintf("hda: Error setting up recording buffers: %s\n",
-			strerror(status));
-		return status;
+		status_t status = hda_stream_setup_buffers(audioGroup,
+			audioGroup->record_stream, "Recording");
+		if (status != B_OK) {
+			dprintf("hda: Error setting up recording buffers: %s\n",
+				strerror(status));
+			return status;
+		}
 	}
 
 	/* Setup data structure for multi_audio API... */
 
-	uint32 playbackSampleSize = audioGroup->playback_stream->sample_size;
-	uint32 recordSampleSize = audioGroup->record_stream->sample_size;
+	if (audioGroup->playback_stream != NULL) {
+		uint32 playbackSampleSize = audioGroup->playback_stream->sample_size;
 
-	for (int32 i = 0; i < data->return_playback_buffers; i++) {
-		for (int32 channelIndex = 0;
-				channelIndex < data->return_playback_channels; channelIndex++) {
-			data->playback_buffers[i][channelIndex].base
-				= (char*)audioGroup->playback_stream->buffers[i]
-					+ playbackSampleSize * channelIndex;
-			data->playback_buffers[i][channelIndex].stride
-				= playbackSampleSize * data->return_playback_channels;
+		for (int32 i = 0; i < data->return_playback_buffers; i++) {
+			for (int32 channelIndex = 0;
+					channelIndex < data->return_playback_channels; channelIndex++) {
+				data->playback_buffers[i][channelIndex].base
+					= (char*)audioGroup->playback_stream->buffers[i]
+						+ playbackSampleSize * channelIndex;
+				data->playback_buffers[i][channelIndex].stride
+					= playbackSampleSize * data->return_playback_channels;
+			}
 		}
 	}
 
-	for (int32 i = 0; i < data->return_record_buffers; i++) {
-		for (int32 channelIndex = 0;
-				channelIndex < data->return_record_channels; channelIndex++) {
-			data->record_buffers[i][channelIndex].base
-				= (char*)audioGroup->record_stream->buffers[i]
-					+ recordSampleSize * channelIndex;
-			data->record_buffers[i][channelIndex].stride
-				= recordSampleSize * data->return_record_channels;
+	if (audioGroup->record_stream != NULL) {
+		uint32 recordSampleSize = audioGroup->record_stream->sample_size;
+
+		for (int32 i = 0; i < data->return_record_buffers; i++) {
+			for (int32 channelIndex = 0;
+					channelIndex < data->return_record_channels; channelIndex++) {
+				data->record_buffers[i][channelIndex].base
+					= (char*)audioGroup->record_stream->buffers[i]
+						+ recordSampleSize * channelIndex;
+				data->record_buffers[i][channelIndex].stride
+					= recordSampleSize * data->return_record_channels;
+			}
 		}
 	}
 
@@ -292,6 +325,10 @@
 	cpu_status status;
 	status_t rc;
 
+	// TODO: support recording!
+	if (audioGroup->playback_stream == NULL)
+		return B_ERROR;
+
 	if (!audioGroup->playback_stream->running) {
 		hda_stream_start(audioGroup->codec->controller,
 			audioGroup->playback_stream);
@@ -328,7 +365,10 @@
 static status_t
 buffer_force_stop(hda_audio_group* audioGroup)
 {
-	hda_stream_stop(audioGroup->codec->controller, audioGroup->playback_stream);
+	if (audioGroup->playback_stream != NULL) {
+		hda_stream_stop(audioGroup->codec->controller,
+			audioGroup->playback_stream);
+	}
 	//hda_stream_stop(audioGroup->codec->controller, audioGroup->record_stream);
 
 	return B_OK;
@@ -351,7 +391,34 @@
 
 	switch (op) {
 		case B_MULTI_GET_DESCRIPTION:
+		{
+#ifdef __HAIKU
+			multi_description description;
+			multi_channel_info channels[16];
+			multi_channel_info* originalChannels;
+
+			if (user_memcpy(&description, arg, sizeof(multi_description))
+					!= B_OK)
+				return B_BAD_ADDRESS;
+
+			originalChannels = description.channels;
+			description.channels = channels;
+			if (description.request_channel_count > 16)
+				description.request_channel_count = 16;
+
+			status_t status = get_description(audioGroup, &description);
+			if (status != B_OK)
+				return status;
+
+			description.channels = originalChannels;
+			return user_memcpy(arg, &description, sizeof(multi_description))
+				&& user_memcpy(originalChannels, channels,
+					sizeof(multi_channel_info)
+						* description.request_channel_count;
+#else
 			return get_description(audioGroup, (multi_description*)arg);
+#endif
+		}
 
 		case B_MULTI_GET_ENABLED_CHANNELS:
 			return get_enabled_channels(audioGroup, (multi_channel_enable*)arg);



From mmlr at mlotz.ch  Thu Mar 13 15:04:49 2008
From: mmlr at mlotz.ch (Michael Lotz)
Date: Thu, 13 Mar 2008 15:04:49 +0100
Subject: [Haiku-commits] r24383 -
	haiku/trunk/src/add-ons/kernel/drivers/audio/hda
In-Reply-To: <200803131225.m2DCPUVh020051@sheep.berlios.de>
References: <200803131225.m2DCPUVh020051@sheep.berlios.de>
Message-ID: <20080313135614.M42889@mlotz.ch>

On Thu, 13 Mar 2008 13:25:30 +0100, axeld at BerliOS wrote
> * With these changes, I 
> hear nothing on my laptop anymore (before there was  noise), but on 
> another system, I can finally hear something that sounds very  much 
> like the sinus wave the multi_audio_test application produces; the 
>  sound quality is pretty bad though (lots of periodical noise and 
> glitches).

By the way, with previous versions of the hda driver I could get real sound
out of my laptop under R5. But it only worked when the volume was set very
low. The sound was fine as long as the volume stayed low and as soon as it
reached a certain level it started to have distortions and crackles. When I
set the volume too high it would just produce just noise. I haven't tested
with this commit, but I can test again and report to you if you're interested
in that.
Hope you'll get it working sooner than later as both of my current systems
(desktop and laptop) are using HDA and I hope to be able to listen to music
again ;-)

Regards
Michael


From axeld at pinc-software.de  Thu Mar 13 17:59:18 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 13 Mar 2008 17:59:18 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24383_-_haiku/trunk/src/add-ons/?=
 =?iso-8859-15?q?kernel/drivers/audio/hda?=
In-Reply-To: <20080313135614.M42889@mlotz.ch>
Message-ID: <24330479164-BeMail@zon>

"Michael Lotz" <mmlr at mlotz.ch> wrote:
> On Thu, 13 Mar 2008 13:25:30 +0100, axeld at BerliOS wrote
> > * With these changes, I 
> > hear nothing on my laptop anymore (before there was  noise), but on 
> > another system, I can finally hear something that sounds very  much 
> > like the sinus wave the multi_audio_test application produces; the 
> >  sound quality is pretty bad though (lots of periodical noise and 
> > glitches).
> By the way, with previous versions of the hda driver I could get real 
> sound
> out of my laptop under R5. But it only worked when the volume was set 
> very
> low. The sound was fine as long as the volume stayed low and as soon 
> as it
> reached a certain level it started to have distortions and crackles. 
> When I
> set the volume too high it would just produce just noise. I haven't 
> tested
> with this commit, but I can test again and report to you if you're 
> interested
> in that.

Definitely! :-)
There still seems to be lots of problems to solve left, even though I 
already spent some hours with that driver :-/

> Hope you'll get it working sooner than later as both of my current 
> systems
> (desktop and laptop) are using HDA and I hope to be able to listen to 
> music
> again ;-)

Me too, I haven't given up yet :-)
In any way, it won't run on Haiku with our multi_audio add-on yet - 
while it does play (some) sound with my test application, it is silent 
when the media_server takes over. I guess it doesn't like that the 
device has no controls yet, but I'll see about that.

Bye,
   Axel.



From oruizdorantes at mail.berlios.de  Thu Mar 13 20:30:06 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Thu, 13 Mar 2008 20:30:06 +0100
Subject: [Haiku-commits] r24384 - in haiku/trunk: headers/private/bluetooth
	src/kits/bluetooth src/servers/bluetooth
Message-ID: <200803131930.m2DJU6JG018147@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-13 20:30:04 +0100 (Thu, 13 Mar 2008)
New Revision: 24384
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24384&view=rev

Modified:
   haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h
   haiku/trunk/src/kits/bluetooth/LocalDevice.cpp
   haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp
Log:
Correct misspell adquire->acquire


Modified: haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h
===================================================================
--- haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h	2008-03-13 12:25:29 UTC (rev 24383)
+++ haiku/trunk/headers/private/bluetooth/bluetoothserver_p.h	2008-03-13 19:30:04 UTC (rev 24384)
@@ -8,7 +8,7 @@
 
 // LocalDevice 
 #define BT_MSG_COUNT_LOCAL_DEVICES		'btCd'
-#define BT_MSG_ADQUIRE_LOCAL_DEVICE     'btAd'
+#define BT_MSG_ACQUIRE_LOCAL_DEVICE     'btAd'
 #define BT_MSG_GET_FRIENDLY_NAME        'btFn'
 #define BT_MSG_GET_ADDRESS              'btGa'
 #define BT_MSG_HANDLE_SIMPLE_REQUEST    'btsR'

Modified: haiku/trunk/src/kits/bluetooth/LocalDevice.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/LocalDevice.cpp	2008-03-13 12:25:29 UTC (rev 24383)
+++ haiku/trunk/src/kits/bluetooth/LocalDevice.cpp	2008-03-13 19:30:04 UTC (rev 24384)
@@ -70,7 +70,7 @@
     if (SRetrieveBluetoothMessenger() != B_OK)
         return NULL;
  
-    BMessage request(BT_MSG_ADQUIRE_LOCAL_DEVICE);
+    BMessage request(BT_MSG_ACQUIRE_LOCAL_DEVICE);
         
     return RequestLocalDeviceID(&request);
 }
@@ -82,7 +82,7 @@
     if (SRetrieveBluetoothMessenger() != B_OK)
         return NULL;
  
-    BMessage request(BT_MSG_ADQUIRE_LOCAL_DEVICE);    
+    BMessage request(BT_MSG_ACQUIRE_LOCAL_DEVICE);    
     request.AddInt32("hci_id", hid);
        
     return RequestLocalDeviceID(&request);
@@ -96,7 +96,7 @@
     if (SRetrieveBluetoothMessenger() != B_OK)
         return NULL;
  
-    BMessage request(BT_MSG_ADQUIRE_LOCAL_DEVICE);    
+    BMessage request(BT_MSG_ACQUIRE_LOCAL_DEVICE);    
     request.AddData("bdaddr", B_ANY_TYPE, &bdaddr, sizeof(bdaddr_t));
     
        

Modified: haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp	2008-03-13 12:25:29 UTC (rev 24383)
+++ haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp	2008-03-13 19:30:04 UTC (rev 24384)
@@ -141,7 +141,7 @@
 			status = HandleLocalDevicesCount(message, &reply);
     	break;	
     	
-		case BT_MSG_ADQUIRE_LOCAL_DEVICE:
+		case BT_MSG_ACQUIRE_LOCAL_DEVICE:
 			status = HandleAcquireLocalDevice(message, &reply);
 		break;
 



From oruizdorantes at mail.berlios.de  Thu Mar 13 21:13:40 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Thu, 13 Mar 2008 21:13:40 +0100
Subject: [Haiku-commits] r24385 - in haiku/trunk: headers/os/bluetooth
	src/kits/bluetooth
Message-ID: <200803132013.m2DKDea1022026@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-13 21:13:39 +0100 (Thu, 13 Mar 2008)
New Revision: 24385
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24385&view=rev

Added:
   haiku/trunk/src/kits/bluetooth/KitSupport.cpp
   haiku/trunk/src/kits/bluetooth/KitSupport.h
Modified:
   haiku/trunk/headers/os/bluetooth/LocalDevice.h
   haiku/trunk/src/kits/bluetooth/Jamfile
   haiku/trunk/src/kits/bluetooth/LocalDevice.cpp
Log:
Supply a supoprt file for functions used among all the kit
Move implementation from LocalDevice for retrieving the BluetoothServer Messenger



Modified: haiku/trunk/headers/os/bluetooth/LocalDevice.h
===================================================================
--- haiku/trunk/headers/os/bluetooth/LocalDevice.h	2008-03-13 19:30:04 UTC (rev 24384)
+++ haiku/trunk/headers/os/bluetooth/LocalDevice.h	2008-03-13 20:13:39 UTC (rev 24385)
@@ -51,8 +51,6 @@
     private:
         LocalDevice(hci_id hid);
         
-        static   status_t 		SRetrieveBluetoothMessenger(void);           
-                 status_t 		RetrieveBluetoothMessenger(void);
         static   LocalDevice*   RequestLocalDeviceID(BMessage* request);
         
         static BMessenger*      sfMessenger;

Modified: haiku/trunk/src/kits/bluetooth/Jamfile
===================================================================
--- haiku/trunk/src/kits/bluetooth/Jamfile	2008-03-13 19:30:04 UTC (rev 24384)
+++ haiku/trunk/src/kits/bluetooth/Jamfile	2008-03-13 20:13:39 UTC (rev 24385)
@@ -3,7 +3,7 @@
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-        UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
+       UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
 }
 
 UsePrivateHeaders bluetooth ;
@@ -13,5 +13,6 @@
 	DiscoveryAgent.cpp
 	DiscoveryListener.cpp
 	CommandManager.cpp
+	KitSupport.cpp
 	: be
 ;

Added: haiku/trunk/src/kits/bluetooth/KitSupport.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/KitSupport.cpp	2008-03-13 19:30:04 UTC (rev 24384)
+++ haiku/trunk/src/kits/bluetooth/KitSupport.cpp	2008-03-13 20:13:39 UTC (rev 24385)
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+
+#include <bluetooth/bluetooth.h>
+#include <bluetoothserver_p.h>
+
+#include "KitSupport.h"
+
+
+BMessenger* _RetrieveBluetoothMessenger(void)
+{
+	BMessenger* fMessenger = new BMessenger(BLUETOOTH_SIGNATURE);
+
+    if (fMessenger == NULL || !fMessenger->IsValid())
+    	return NULL;
+    else
+    	return fMessenger;
+}

Added: haiku/trunk/src/kits/bluetooth/KitSupport.h
===================================================================
--- haiku/trunk/src/kits/bluetooth/KitSupport.h	2008-03-13 19:30:04 UTC (rev 24384)
+++ haiku/trunk/src/kits/bluetooth/KitSupport.h	2008-03-13 20:13:39 UTC (rev 24385)
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ *
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ */
+
+
+#include <Messenger.h>
+
+
+BMessenger* _RetrieveBluetoothMessenger(void);

Modified: haiku/trunk/src/kits/bluetooth/LocalDevice.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/LocalDevice.cpp	2008-03-13 19:30:04 UTC (rev 24384)
+++ haiku/trunk/src/kits/bluetooth/LocalDevice.cpp	2008-03-13 20:13:39 UTC (rev 24385)
@@ -15,8 +15,10 @@
 
 #include <bluetooth/bdaddrUtils.h>
 
-#include "bluetoothserver_p.h"
+#include <bluetoothserver_p.h>
 
+#include "KitSupport.h"
+
 /* TODO: remove me */
 #include <stdio.h>
 
@@ -24,23 +26,7 @@
 
 BMessenger*  LocalDevice::sfMessenger = NULL;
 
-status_t
-LocalDevice::SRetrieveBluetoothMessenger(void)
-{
-    if (sfMessenger == NULL || !sfMessenger->IsValid() )
-        sfMessenger = new BMessenger(BLUETOOTH_SIGNATURE);
 
-    return (sfMessenger != NULL)?B_OK:B_ERROR;
-}
-
-status_t LocalDevice::RetrieveBluetoothMessenger(void)
-{
-    if (fMessenger == NULL || !fMessenger->IsValid())
-        fMessenger = new BMessenger(BLUETOOTH_SIGNATURE);
-
-    return (fMessenger != NULL)?B_OK:B_ERROR;
-}
-
 LocalDevice*
 LocalDevice::RequestLocalDeviceID(BMessage* request)
 {    
@@ -67,7 +53,7 @@
 LocalDevice*
 LocalDevice::GetLocalDevice()
 {          
-    if (SRetrieveBluetoothMessenger() != B_OK)
+    if ((sfMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return NULL;
  
     BMessage request(BT_MSG_ACQUIRE_LOCAL_DEVICE);
@@ -79,7 +65,7 @@
 LocalDevice*
 LocalDevice::GetLocalDevice(hci_id hid)
 {
-    if (SRetrieveBluetoothMessenger() != B_OK)
+    if ((sfMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return NULL;
  
     BMessage request(BT_MSG_ACQUIRE_LOCAL_DEVICE);    
@@ -93,7 +79,7 @@
 LocalDevice*
 LocalDevice::GetLocalDevice(bdaddr_t bdaddr)
 {
-    if (SRetrieveBluetoothMessenger() != B_OK)
+    if ((sfMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return NULL;
  
     BMessage request(BT_MSG_ACQUIRE_LOCAL_DEVICE);    
@@ -107,7 +93,7 @@
 uint32
 LocalDevice::GetLocalDeviceCount()
 {
-    if (SRetrieveBluetoothMessenger() != B_OK)
+    if ((sfMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return 0;
 
 	BMessage request(BT_MSG_COUNT_LOCAL_DEVICES);	
@@ -157,10 +143,9 @@
 status_t 
 LocalDevice::SetDiscoverable(int mode)
 {
-    if (RetrieveBluetoothMessenger() != B_OK)
-        return B_ERROR;            
+    if ((fMessenger = _RetrieveBluetoothMessenger()) == NULL)
+        return B_ERROR;
 
-
     BMessage request(BT_MSG_HANDLE_SIMPLE_REQUEST);
     BMessage reply;
 	int8	 bt_status = BT_ERROR;
@@ -186,7 +171,7 @@
 bdaddr_t 
 LocalDevice::GetBluetoothAddress()
 {
-    if (RetrieveBluetoothMessenger() != B_OK)
+    if ((fMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return bdaddrUtils::NullAddress();            
  
     const bdaddr_t* bdaddr;
@@ -216,7 +201,7 @@
 BString 
 LocalDevice::GetFriendlyName()
 {
-    if (RetrieveBluetoothMessenger() != B_OK)
+    if ((fMessenger = _RetrieveBluetoothMessenger()) == NULL)
         return NULL;            
  
     BString friendlyname;



From bonefish at mail.berlios.de  Fri Mar 14 00:41:16 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Fri, 14 Mar 2008 00:41:16 +0100
Subject: [Haiku-commits] r24386 - haiku/trunk/src/system/kernel/cache
Message-ID: <200803132341.m2DNfG0N000529@sheep.berlios.de>

Author: bonefish
Date: 2008-03-14 00:41:14 +0100 (Fri, 14 Mar 2008)
New Revision: 24386
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24386&view=rev

Modified:
   haiku/trunk/src/system/kernel/cache/vnode_store.cpp
Log:
store_acquire_unreferenced_ref() saves the pointer of the vnode it got
from the call to vfs_get_vnode() now. Only this way it is safe to call
store_release_ref() later (as the page writer does). We had a potential
race condition -- if called after vm_cache_remove_consumer() had
released the last reference, the old vnode might already have been
deleted.


Modified: haiku/trunk/src/system/kernel/cache/vnode_store.cpp
===================================================================
--- haiku/trunk/src/system/kernel/cache/vnode_store.cpp	2008-03-13 20:13:39 UTC (rev 24385)
+++ haiku/trunk/src/system/kernel/cache/vnode_store.cpp	2008-03-13 23:41:14 UTC (rev 24386)
@@ -88,7 +88,14 @@
 {
 	vnode_store *store = (vnode_store *)_store;
 	struct vnode *vnode;
-	return vfs_get_vnode(store->device, store->inode, false, &vnode);
+	status_t status = vfs_get_vnode(store->device, store->inode, false, &vnode);
+
+	// If successful, update the store's vnode pointer, so that release_ref()
+	// won't use a stale pointer.
+	if (status == B_OK)
+		store->vnode = vnode;
+
+	return status;
 }
 
 



From axeld at mail.berlios.de  Fri Mar 14 12:14:44 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 14 Mar 2008 12:14:44 +0100
Subject: [Haiku-commits] r24387 - haiku/trunk/src/apps/workspaces
Message-ID: <200803141114.m2EBEitC004951@sheep.berlios.de>

Author: axeld
Date: 2008-03-14 12:14:44 +0100 (Fri, 14 Mar 2008)
New Revision: 24387
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24387&view=rev

Modified:
   haiku/trunk/src/apps/workspaces/Workspaces.cpp
Log:
* Workspaces can now be a replicant.
* The view must be a follow all view since the workspaces are handled
  differently.
* No longer needs to use kWorkspacesWindowFlag; this makes it no longer
  work on BeOS.


Modified: haiku/trunk/src/apps/workspaces/Workspaces.cpp
===================================================================
--- haiku/trunk/src/apps/workspaces/Workspaces.cpp	2008-03-13 23:41:14 UTC (rev 24386)
+++ haiku/trunk/src/apps/workspaces/Workspaces.cpp	2008-03-14 11:14:44 UTC (rev 24387)
@@ -10,14 +10,10 @@
  *		Matt Madia
  */
 
-/*!
-	Workspaces window trick found by Michael "Minox" Paine.
-	(using B_ALL_WORKSPACES as flags in BWindow)
-*/
 
-
 #include <Alert.h>
 #include <Application.h>
+#include <Dragger.h>
 #include <Entry.h>
 #include <File.h>
 #include <FindDirectory.h>
@@ -36,7 +32,7 @@
 #include <WindowPrivate.h>
 
 
-static const char *kWorkspacesSignature = "application/x-vnd.Be-WORK";
+static const char *kSignature = "application/x-vnd.Be-WORK";
 static const char *kWorkspacesSettingFile = "Workspace_data";
 
 static const float kScreenBorderOffset = 10.0;
@@ -61,8 +57,12 @@
 class WorkspacesView : public BView {
 	public:
 		WorkspacesView(BRect frame);
+		WorkspacesView(BMessage* archive);
 		~WorkspacesView();
 
+		static	WorkspacesView* Instantiate(BMessage* archive);
+		virtual	status_t Archive(BMessage* archive, bool deep = true) const;
+
 		virtual void MouseMoved(BPoint where, uint32 transit,
 			const BMessage* dragMessage);
 		virtual void MouseDown(BPoint where);
@@ -133,7 +133,7 @@
 				&& screen.Frame().bottom + 5 >= fWindowFrame.bottom
 				&& screen.Frame().left - 5 <= fWindowFrame.left
 				&& screen.Frame().top - 5 <= fWindowFrame.top)
-				settingsValid = true;	
+				settingsValid = true;
 		}
 	}
 
@@ -204,16 +204,51 @@
 
 
 WorkspacesView::WorkspacesView(BRect frame)
-	: BView(frame, "workspaces", B_FOLLOW_NONE, kWorkspacesViewFlag)
+	: BView(frame, "workspaces", B_FOLLOW_ALL, kWorkspacesViewFlag)
 {
+	frame.OffsetTo(B_ORIGIN);
+	frame.top = frame.bottom - 7;
+	frame.left = frame.right - 7;
+	BDragger* dragger = new BDragger(frame, this,
+		B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
+	AddChild(dragger);
 }
 
 
+WorkspacesView::WorkspacesView(BMessage* archive)
+	: BView(archive)
+{
+}
+
+
 WorkspacesView::~WorkspacesView()
 {
 }
 
 
+/*static*/ WorkspacesView*
+WorkspacesView::Instantiate(BMessage* archive)
+{
+	if (!validate_instantiation(archive, "WorkspacesView"))
+		return NULL;
+
+	return new WorkspacesView(archive);
+}
+
+
+status_t
+WorkspacesView::Archive(BMessage* archive, bool deep) const
+{
+	status_t status = BView::Archive(archive, deep);
+	if (status == B_OK)
+		status = archive->AddString("add_on", kSignature);
+	if (status == B_OK)
+		status = archive->AddString("class", "WorkspacesView");
+
+	return status;
+}
+
+
 void
 WorkspacesView::MouseMoved(BPoint where, uint32 transit,
 	const BMessage* dragMessage)
@@ -254,8 +289,7 @@
 
 WorkspacesWindow::WorkspacesWindow(WorkspacesPreferences *preferences)
 	: BWindow(preferences->WindowFrame(), "Workspaces", B_TITLED_WINDOW_LOOK,
- 			B_NORMAL_WINDOW_FEEL,
-			kWorkspacesWindowFlag | B_AVOID_FRONT | B_WILL_ACCEPT_FIRST_CLICK,
+ 			B_NORMAL_WINDOW_FEEL, B_AVOID_FRONT | B_WILL_ACCEPT_FIRST_CLICK,
  			B_ALL_WORKSPACES),
  	fPreferences(preferences)
 {
@@ -303,7 +337,7 @@
 }
 
 
-void 
+void
 WorkspacesWindow::Zoom(BPoint origin, float width, float height)
 {
 	BScreen screen;
@@ -347,8 +381,8 @@
 
 
 WorkspacesApp::WorkspacesApp()
-	: BApplication(kWorkspacesSignature)
-{	
+	: BApplication(kSignature)
+{
 	fWindow = new WorkspacesWindow(new WorkspacesPreferences());
 }
 
@@ -372,7 +406,7 @@
 
 	view->GetFont(&font);
 	font.SetSize(18);
-	font.SetFace(B_BOLD_FACE); 			
+	font.SetFace(B_BOLD_FACE);
 	view->SetFontAndColor(0, 10, &font);
 
 	alert->Go();
@@ -408,7 +442,7 @@
 			// evaluate --arguments
 			if (!strcmp(argv[i], "--notitle"))
 				fWindow->SetLook(B_MODAL_WINDOW_LOOK);
-			else if (!strcmp(argv[i], "--noborder")) 
+			else if (!strcmp(argv[i], "--noborder"))
 				fWindow->SetLook(B_NO_BORDER_WINDOW_LOOK);
 			else if (!strcmp(argv[i], "--avoidfocus"))
 				fWindow->SetFlags(fWindow->Flags() | B_AVOID_FOCUS);



From axeld at mail.berlios.de  Fri Mar 14 12:19:58 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 14 Mar 2008 12:19:58 +0100
Subject: [Haiku-commits] r24388 - in haiku/trunk: headers/private/interface
	src/servers/app
Message-ID: <200803141119.m2EBJwOU005309@sheep.berlios.de>

Author: axeld
Date: 2008-03-14 12:19:57 +0100 (Fri, 14 Mar 2008)
New Revision: 24388
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24388&view=rev

Modified:
   haiku/trunk/headers/private/interface/WindowPrivate.h
   haiku/trunk/src/servers/app/Window.cpp
Log:
No need for the kWorkspacesWindow flag anymore.


Modified: haiku/trunk/headers/private/interface/WindowPrivate.h
===================================================================
--- haiku/trunk/headers/private/interface/WindowPrivate.h	2008-03-14 11:14:44 UTC (rev 24387)
+++ haiku/trunk/headers/private/interface/WindowPrivate.h	2008-03-14 11:19:57 UTC (rev 24388)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005, J?r?me Duval, jerome.duval at free.fr.
+ * Copyright 2005-2008, J?r?me Duval, jerome.duval at free.fr.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _WINDOW_PRIVATE_H
@@ -26,7 +26,6 @@
 
 /* Private window flags */
 
-const uint32 kWorkspacesWindowFlag = 0x8000;
 const uint32 kWindowScreenFlag = 0x10000;
 
 #endif // _WINDOW_PRIVATE_H

Modified: haiku/trunk/src/servers/app/Window.cpp
===================================================================
--- haiku/trunk/src/servers/app/Window.cpp	2008-03-14 11:14:44 UTC (rev 24387)
+++ haiku/trunk/src/servers/app/Window.cpp	2008-03-14 11:19:57 UTC (rev 24388)
@@ -1674,7 +1674,6 @@
 		| B_ASYNCHRONOUS_CONTROLS
 		| B_QUIT_ON_WINDOW_CLOSE
 		| B_SAME_POSITION_IN_ALL_WORKSPACES
-		| kWorkspacesWindowFlag
 		| kWindowScreenFlag;
 }
 



From superstippi at gmx.de  Fri Mar 14 12:46:41 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Fri, 14 Mar 2008 12:46:41 +0100
Subject: [Haiku-commits] r24388 - in haiku/trunk:
 headers/private/interface src/servers/app
In-Reply-To: <200803141119.m2EBJwOU005309@sheep.berlios.de>
References: <200803141119.m2EBJwOU005309@sheep.berlios.de>
Message-ID: <20080314124641.905.2@stippis2.1205482741.fake>

Hi Axel,

axeld at BerliOS wrote:
> - * Copyright 2005, J?r?me Duval, jerome.duval at free.fr.
> + * Copyright 2005-2008, J?r?me Duval, jerome.duval at free.fr.
>   * Distributed under the terms of the MIT License.
>   */

You keep doing this, but I think this is not correct, only in case the 
copyright is attributed to Haiku, Inc. For the above case, you should add 
your own copyright, but only in case your change is substantial enough to 
be copyrightable.

Best regards,
-Stephan


From axeld at mail.berlios.de  Fri Mar 14 14:14:24 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 14 Mar 2008 14:14:24 +0100
Subject: [Haiku-commits] r24389 - haiku/trunk/src/apps/workspaces
Message-ID: <200803141314.m2EDEO9F004517@sheep.berlios.de>

Author: axeld
Date: 2008-03-14 14:14:23 +0100 (Fri, 14 Mar 2008)
New Revision: 24389
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24389&view=rev

Modified:
   haiku/trunk/src/apps/workspaces/Workspaces.cpp
Log:
* Moved about window into the view and made it accessible from the 
  replicant as well.
* Added a context menu that allows you to change how Workspaces looks
  and behaves (previously accessible only using command line options).
* The settings changes are now remembered; we're now using a new 
  settings file (flattened BMessage), but can still read old settings 
  files if it exists.
* Renamed WorkspacesPreferences to WorkspacesSettings.


Modified: haiku/trunk/src/apps/workspaces/Workspaces.cpp
===================================================================
--- haiku/trunk/src/apps/workspaces/Workspaces.cpp	2008-03-14 11:19:57 UTC (rev 24388)
+++ haiku/trunk/src/apps/workspaces/Workspaces.cpp	2008-03-14 13:14:23 UTC (rev 24389)
@@ -17,7 +17,9 @@
 #include <Entry.h>
 #include <File.h>
 #include <FindDirectory.h>
+#include <MenuItem.h>
 #include <Path.h>
+#include <PopUpMenu.h>
 #include <Roster.h>
 #include <Screen.h>
 #include <TextView.h>
@@ -32,26 +34,50 @@
 #include <WindowPrivate.h>
 
 
-static const char *kSignature = "application/x-vnd.Be-WORK";
-static const char *kWorkspacesSettingFile = "Workspace_data";
+static const char* kSignature = "application/x-vnd.Be-WORK";
+static const char* kOldSettingFile = "Workspace_data";
+static const char* kSettingsFile = "Workspaces_settings";
 
+static const uint32 kMsgChangeCount = 'chWC';
+static const uint32 kMsgToggleTitle = 'tgTt';
+static const uint32 kMsgToggleBorder = 'tgBd';
+static const uint32 kMsgToggleAutoRaise = 'tgAR';
+static const uint32 kMsgToggleAlwaysOnTop = 'tgAT';
+
 static const float kScreenBorderOffset = 10.0;
 
 
-class WorkspacesPreferences {
+class WorkspacesSettings {
 	public:
-		WorkspacesPreferences();
-		virtual ~WorkspacesPreferences();
+		WorkspacesSettings();
+		virtual ~WorkspacesSettings();
 
 		BRect WindowFrame() const { return fWindowFrame; }
 		BRect ScreenFrame() const { return fScreenFrame; }
 
+		bool AutoRaising() const { return fAutoRaising; }
+		bool AlwaysOnTop() const { return fAlwaysOnTop; }
+		bool HasTitle() const { return fHasTitle; }
+		bool HasBorder() const { return fHasBorder; }
+
 		void UpdateFramesForScreen(BRect screenFrame);
 		void UpdateScreenFrame();
+
 		void SetWindowFrame(BRect);
+		void SetAutoRaising(bool enable) { fAutoRaising = enable; }
+		void SetAlwaysOnTop(bool enable) { fAlwaysOnTop = enable; }
+		void SetHasTitle(bool enable) { fHasTitle = enable; }
+		void SetHasBorder(bool enable) { fHasBorder = enable; }
 
 	private:
-		BRect	fWindowFrame, fScreenFrame;
+		status_t _Open(BFile& file, int mode);
+
+		BRect	fWindowFrame;
+		BRect	fScreenFrame;
+		bool	fAutoRaising;
+		bool	fAlwaysOnTop;
+		bool	fHasTitle;
+		bool	fHasBorder;
 };
 
 class WorkspacesView : public BView {
@@ -63,14 +89,18 @@
 		static	WorkspacesView* Instantiate(BMessage* archive);
 		virtual	status_t Archive(BMessage* archive, bool deep = true) const;
 
+		virtual void MessageReceived(BMessage* message);
 		virtual void MouseMoved(BPoint where, uint32 transit,
 			const BMessage* dragMessage);
 		virtual void MouseDown(BPoint where);
+
+	private:
+		void _AboutRequested();
 };
 
 class WorkspacesWindow : public BWindow {
 	public:
-		WorkspacesWindow(WorkspacesPreferences *fPreferences);
+		WorkspacesWindow(WorkspacesSettings *settings);
 		virtual ~WorkspacesWindow();
 
 		virtual void ScreenChanged(BRect frame, color_space mode);
@@ -81,11 +111,13 @@
 		virtual void MessageReceived(BMessage *msg);
 		virtual bool QuitRequested();
 
-		void SetAutoRaise();
+		void SetAutoRaise(bool enable);
+		bool IsAutoRaising() const { return fAutoRaising; }
 
 	private:
-		WorkspacesPreferences *fPreferences;
+		WorkspacesSettings *fSettings;
 		BRect	fPreviousFrame;
+		bool	fAutoRaising;
 };
 
 class WorkspacesApp : public BApplication {
@@ -104,40 +136,67 @@
 };
 
 
-WorkspacesPreferences::WorkspacesPreferences()
+WorkspacesSettings::WorkspacesSettings()
+	:
+	fAutoRaising(false),
+	fAlwaysOnTop(false),
+	fHasTitle(true),
+	fHasBorder(true)
 {
 	UpdateScreenFrame();
 
-	bool settingsValid = false;
-	BPath path;
+	bool loaded = false;
+	BScreen screen;
 
-	if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) {
-		path.Append(kWorkspacesSettingFile);
-		BFile file(path.Path(), B_READ_ONLY);
-		if (file.InitCheck() == B_OK
-			&& file.Read(&fWindowFrame, sizeof(BRect)) == sizeof(BRect)) {
-			// we now also store the frame of the screen to know
-			// in which context the window frame has been chosen
-			BScreen screen;
-			BRect frame;
-			if (file.Read(&frame, sizeof(BRect)) == sizeof(BRect)) {
-				fScreenFrame = frame;
-				// if the current screen frame is different from the one
-				// just loaded, we need to alter the window frame accordingly
-				if (fScreenFrame != screen.Frame())
-					UpdateFramesForScreen(screen.Frame());
-			}
+	BFile file;
+	if (_Open(file, B_READ_ONLY) == B_OK) {
+		BMessage settings;
+		if (settings.Unflatten(&file) == B_OK) {
+			if (settings.FindRect("window", &fWindowFrame) == B_OK
+				&& settings.FindRect("screen", &fScreenFrame) == B_OK)
+				loaded = true;
 
-			// check if loaded values are valid
-			if (screen.Frame().right + 5 >= fWindowFrame.right
-				&& screen.Frame().bottom + 5 >= fWindowFrame.bottom
-				&& screen.Frame().left - 5 <= fWindowFrame.left
-				&& screen.Frame().top - 5 <= fWindowFrame.top)
-				settingsValid = true;
+			settings.FindBool("auto-raise", &fAutoRaising);
+			settings.FindBool("always on top", &fAlwaysOnTop);
+
+			if (settings.FindBool("has title", &fHasTitle) != B_OK)
+				fHasTitle = true;
+			if (settings.FindBool("has border", &fHasBorder) != B_OK)
+				fHasBorder = true;
 		}
+	} else {
+		// try reading BeOS compatible settings
+		BPath path;
+		if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) {
+			path.Append(kOldSettingFile);
+			BFile file(path.Path(), B_READ_ONLY);
+			if (file.InitCheck() == B_OK
+				&& file.Read(&fWindowFrame, sizeof(BRect)) == sizeof(BRect)) {
+				// we now also store the frame of the screen to know
+				// in which context the window frame has been chosen
+				BRect frame;
+				if (file.Read(&frame, sizeof(BRect)) == sizeof(BRect))
+					fScreenFrame = frame;
+				else
+					fScreenFrame = screen.Frame();
+
+				loaded = true;
+			}
+		}
 	}
 
-	if (!settingsValid) {
+	if (loaded) {
+		// if the current screen frame is different from the one
+		// just loaded, we need to alter the window frame accordingly
+		if (fScreenFrame != screen.Frame())
+			UpdateFramesForScreen(screen.Frame());
+	}
+
+	if (!loaded
+		|| !(screen.Frame().right + 5 >= fWindowFrame.right
+			&& screen.Frame().bottom + 5 >= fWindowFrame.bottom
+			&& screen.Frame().left - 5 <= fWindowFrame.left
+			&& screen.Frame().top - 5 <= fWindowFrame.top)) {
 		// set to some usable defaults
 		fWindowFrame = fScreenFrame;
 		fWindowFrame.OffsetBy(-kScreenBorderOffset, -kScreenBorderOffset);
@@ -147,25 +206,51 @@
 }
 
 
-WorkspacesPreferences::~WorkspacesPreferences()
+WorkspacesSettings::~WorkspacesSettings()
 {
 	// write settings file
-	BPath path;
-	if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) < B_OK)
+	BFile file;
+	if (_Open(file, B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE) != B_OK)
 		return;
 
-	path.Append(kWorkspacesSettingFile);
+	BMessage settings('wksp');
 
-	BFile file(path.Path(), B_WRITE_ONLY | B_CREATE_FILE);
-	if (file.InitCheck() == B_OK) {
-		file.Write(&fWindowFrame, sizeof(BRect));
-		file.Write(&fScreenFrame, sizeof(BRect));
+	if (settings.AddRect("window", fWindowFrame) == B_OK
+		&& settings.AddRect("screen", fScreenFrame) == B_OK
+		&& settings.AddBool("auto-raise", fAutoRaising) == B_OK
+		&& settings.AddBool("always on top", fAlwaysOnTop) == B_OK
+		&& settings.AddBool("has title", fHasTitle) == B_OK
+		&& settings.AddBool("has border", fHasBorder) == B_OK)
+		settings.Flatten(&file);
+}
+
+
+status_t
+WorkspacesSettings::_Open(BFile& file, int mode)
+{
+	BPath path;
+	status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path);
+	 if (status != B_OK)
+		status = find_directory(B_COMMON_SETTINGS_DIRECTORY, &path);
+	 if (status != B_OK)
+		return status;
+
+	path.Append(kSettingsFile);
+
+	status = file.SetTo(path.Path(), mode);
+	if (mode == B_READ_ONLY && status == B_ENTRY_NOT_FOUND) {
+		if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) == B_OK) {
+			path.Append(kSettingsFile);
+			status = file.SetTo(path.Path(), mode);
+		}
 	}
+
+	return status;
 }
 
 
 void
-WorkspacesPreferences::UpdateFramesForScreen(BRect newScreenFrame)
+WorkspacesSettings::UpdateFramesForScreen(BRect newScreenFrame)
 {
 	// don't change the position if the screen frame hasn't changed
 	if (newScreenFrame == fScreenFrame)
@@ -186,7 +271,7 @@
 
 
 void
-WorkspacesPreferences::UpdateScreenFrame()
+WorkspacesSettings::UpdateScreenFrame()
 {
 	BScreen screen;
 	fScreenFrame = screen.Frame();
@@ -194,7 +279,7 @@
 
 
 void
-WorkspacesPreferences::SetWindowFrame(BRect frame)
+WorkspacesSettings::SetWindowFrame(BRect frame)
 {
 	fWindowFrame = frame;
 }
@@ -250,6 +335,47 @@
 
 
 void
+WorkspacesView::_AboutRequested()
+{
+	BAlert *alert = new BAlert("about", "Workspaces\n"
+		"written by Fran?ois Revol, Axel D?rfler, and Matt Madia.\n\n"
+		"Copyright 2002-2008, Haiku.\n\n"
+		"Send windows behind using the Option key. "
+		"Move windows to front using the Control key.\n", "Ok");
+	BTextView *view = alert->TextView();
+	BFont font;
+
+	view->SetStylable(true);
+
+	view->GetFont(&font);
+	font.SetSize(18);
+	font.SetFace(B_BOLD_FACE);
+	view->SetFontAndColor(0, 10, &font);
+
+	alert->Go();
+}
+
+
+void
+WorkspacesView::MessageReceived(BMessage* message)
+{
+	switch (message->what) {
+		case B_ABOUT_REQUESTED:
+			_AboutRequested();
+			break;
+
+		case kMsgChangeCount:
+			be_roster->Launch("application/x-vnd.Be-SCRN");
+			break;
+
+		default:
+			BView::MessageReceived(message);
+			break;
+	}
+}
+
+
+void
 WorkspacesView::MouseMoved(BPoint where, uint32 transit,
 	const BMessage* dragMessage)
 {
@@ -280,38 +406,92 @@
 	if ((buttons & B_SECONDARY_MOUSE_BUTTON) == 0)
 		return;
 
-	// TODO: open menu
+	// open context menu
+
+	BPopUpMenu *menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
+	menu->SetFont(be_plain_font);
+
+	// TODO: alternatively change the count here directly?
+	BMenuItem* changeItem = new BMenuItem("Change Workspace Count"
+		B_UTF8_ELLIPSIS, new BMessage(kMsgChangeCount));
+	menu->AddItem(changeItem);
+
+	WorkspacesWindow* window = dynamic_cast<WorkspacesWindow*>(Window());
+	if (window != NULL) {
+		BMenuItem* item;
+
+		menu->AddSeparatorItem();
+		menu->AddItem(item = new BMenuItem("No title",
+			new BMessage(kMsgToggleTitle)));
+		if (window->Look() == B_MODAL_WINDOW_LOOK)
+			item->SetMarked(true);
+		menu->AddItem(item = new BMenuItem("No Border",
+			new BMessage(kMsgToggleBorder)));
+		if (window->Look() == B_NO_BORDER_WINDOW_LOOK)
+			item->SetMarked(true);
+
+		menu->AddSeparatorItem();
+		menu->AddItem(item = new BMenuItem("Always On Top",
+			new BMessage(kMsgToggleAlwaysOnTop)));
+		if (window->Feel() == B_FLOATING_ALL_WINDOW_FEEL)
+			item->SetMarked(true);
+		menu->AddItem(item = new BMenuItem("Auto-Raise",
+			new BMessage(kMsgToggleAutoRaise)));
+		if (window->IsAutoRaising())
+			item->SetMarked(true);
+
+		menu->AddSeparatorItem();
+		menu->AddItem(new BMenuItem("About" B_UTF8_ELLIPSIS,
+			new BMessage(B_ABOUT_REQUESTED)));
+		menu->AddItem(new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED)));
+		menu->SetTargetForItems(window);
+	}
+
+	changeItem->SetTarget(this);
+	ConvertToScreen(&where);
+	menu->Go(where, true, false, true);
 }
 
 
 //	#pragma mark -
 
 
-WorkspacesWindow::WorkspacesWindow(WorkspacesPreferences *preferences)
-	: BWindow(preferences->WindowFrame(), "Workspaces", B_TITLED_WINDOW_LOOK,
+WorkspacesWindow::WorkspacesWindow(WorkspacesSettings *settings)
+	: BWindow(settings->WindowFrame(), "Workspaces", B_TITLED_WINDOW_LOOK,
  			B_NORMAL_WINDOW_FEEL, B_AVOID_FRONT | B_WILL_ACCEPT_FIRST_CLICK,
  			B_ALL_WORKSPACES),
- 	fPreferences(preferences)
+ 	fSettings(settings),
+ 	fAutoRaising(false)
 {
 	AddChild(new WorkspacesView(Bounds()));
 	fPreviousFrame = Frame();
+
+	if (!fSettings->HasTitle())
+		SetLook(B_MODAL_WINDOW_LOOK);
+	else if (!fSettings->HasBorder())
+		SetLook(B_NO_BORDER_WINDOW_LOOK);
+
+	if (fSettings->AlwaysOnTop())
+		SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
+	else
+		SetAutoRaise(fSettings->AutoRaising());
 }
 
 
 WorkspacesWindow::~WorkspacesWindow()
 {
-	delete fPreferences;
+	delete fSettings;
 }
 
 
 void
 WorkspacesWindow::ScreenChanged(BRect rect, color_space mode)
 {
-	fPreviousFrame = fPreferences->WindowFrame();
+	fPreviousFrame = fSettings->WindowFrame();
 		// work-around for a bug in BeOS, see explanation in FrameMoved()
 
-	fPreferences->UpdateFramesForScreen(rect);
-	MoveTo(fPreferences->WindowFrame().LeftTop());
+	fSettings->UpdateFramesForScreen(rect);
+	MoveTo(fSettings->WindowFrame().LeftTop());
 }
 
 
@@ -326,14 +506,14 @@
 		return;
 	}
 
-	fPreferences->SetWindowFrame(Frame());
+	fSettings->SetWindowFrame(Frame());
 }
 
 
 void
 WorkspacesWindow::FrameResized(float width, float height)
 {
-	fPreferences->SetWindowFrame(Frame());
+	fSettings->SetWindowFrame(Frame());
 }
 
 
@@ -342,23 +522,84 @@
 {
 	BScreen screen;
 	origin = screen.Frame().RightBottom();
-	origin.x -= kScreenBorderOffset + fPreferences->WindowFrame().Width();
-	origin.y -= kScreenBorderOffset + fPreferences->WindowFrame().Height();
+	origin.x -= kScreenBorderOffset + fSettings->WindowFrame().Width();
+	origin.y -= kScreenBorderOffset + fSettings->WindowFrame().Height();
 
 	MoveTo(origin);
 }
 
 
 void
-WorkspacesWindow::MessageReceived(BMessage *msg)
+WorkspacesWindow::MessageReceived(BMessage *message)
 {
-	if (msg->what == 'DATA') {
-		// Drop from Tracker
-		entry_ref ref;
-		for (int i = 0; (msg->FindRef("refs", i, &ref) == B_OK); i++)
-			be_roster->Launch(&ref);
-	} else
-		BWindow::MessageReceived(msg);
+	switch (message->what) {
+		case B_SIMPLE_DATA:
+		{
+			// Drop from Tracker
+			entry_ref ref;
+			for (int i = 0; (message->FindRef("refs", i, &ref) == B_OK); i++)
+				be_roster->Launch(&ref);
+			break;
+		}
+
+		case B_ABOUT_REQUESTED:
+			PostMessage(message, ChildAt(0));
+			break;
+
+		case kMsgToggleBorder:
+		{
+			bool enable = false;
+			if (Look() == B_NO_BORDER_WINDOW_LOOK)
+				enable = true;
+
+			if (enable)
+				SetLook(B_TITLED_WINDOW_LOOK);
+			else
+				SetLook(B_NO_BORDER_WINDOW_LOOK);
+
+			fSettings->SetHasBorder(enable);
+			break;
+		}
+
+		case kMsgToggleTitle:
+		{
+			bool enable = false;
+			if (Look() == B_MODAL_WINDOW_LOOK)
+				enable = true;
+
+			if (enable)
+				SetLook(B_TITLED_WINDOW_LOOK);
+			else
+				SetLook(B_MODAL_WINDOW_LOOK);
+
+			fSettings->SetHasTitle(enable);
+			break;
+		}
+
+		case kMsgToggleAutoRaise:
+			SetAutoRaise(!IsAutoRaising());
+			SetFeel(B_NORMAL_WINDOW_FEEL);
+			break;
+
+		case kMsgToggleAlwaysOnTop:
+		{
+			bool enable = false;
+			if (Feel() != B_FLOATING_ALL_WINDOW_FEEL)
+				enable = true;
+
+			if (enable)
+				SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
+			else
+				SetFeel(B_NORMAL_WINDOW_FEEL);
+
+			fSettings->SetAlwaysOnTop(enable);
+			break;
+		}
+
+		default:
+			BWindow::MessageReceived(message);
+			break;
+	}
 }
 
 
@@ -371,9 +612,18 @@
 
 
 void
-WorkspacesWindow::SetAutoRaise()
+WorkspacesWindow::SetAutoRaise(bool enable)
 {
-	ChildAt(0)->SetEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
+	if (enable == fAutoRaising)
+		return;
+
+	fAutoRaising = enable;
+	fSettings->SetAutoRaising(enable);
+
+	if (enable)
+		ChildAt(0)->SetEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
+	else
+		ChildAt(0)->SetEventMask(0);
 }
 
 
@@ -383,7 +633,7 @@
 WorkspacesApp::WorkspacesApp()
 	: BApplication(kSignature)
 {
-	fWindow = new WorkspacesWindow(new WorkspacesPreferences());
+	fWindow = new WorkspacesWindow(new WorkspacesSettings());
 }
 
 
@@ -395,21 +645,7 @@
 void
 WorkspacesApp::AboutRequested()
 {
-	BAlert *alert = new BAlert("about", "Workspaces\n"
-		"\twritten by Fran?ois Revol, Axel D?rfler,\n"
-		"\t\tand Matt Madia.\n"
-		"\tCopyright 2002-2007, Haiku.\n", "Ok");
-	BTextView *view = alert->TextView();
-	BFont font;
-
-	view->SetStylable(true);
-
-	view->GetFont(&font);
-	font.SetSize(18);
-	font.SetFace(B_BOLD_FACE);
-	view->SetFontAndColor(0, 10, &font);
-
-	alert->Go();
+	fWindow->PostMessage(B_ABOUT_REQUESTED);
 }
 
 
@@ -451,7 +687,7 @@
 			else if (!strcmp(argv[i], "--alwaysontop"))
 				fWindow->SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
 			else if (!strcmp(argv[i], "--autoraise"))
-				fWindow->SetAutoRaise();
+				fWindow->SetAutoRaise(true);
 			else {
 				const char *programName = strrchr(argv[0], '/');
 				programName = programName ? programName + 1 : argv[0];



From axeld at mail.berlios.de  Fri Mar 14 14:21:17 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 14 Mar 2008 14:21:17 +0100
Subject: [Haiku-commits] r24390 - haiku/trunk/src/servers/app
Message-ID: <200803141321.m2EDLHS3005254@sheep.berlios.de>

Author: axeld
Date: 2008-03-14 14:21:17 +0100 (Fri, 14 Mar 2008)
New Revision: 24390
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24390&view=rev

Modified:
   haiku/trunk/src/servers/app/Desktop.cpp
   haiku/trunk/src/servers/app/Desktop.h
Log:
The fWorkspacesViews list now gets its own lock which solves a deadlock
problem when deleting Workspaces replicants.


Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2008-03-14 13:14:23 UTC (rev 24389)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2008-03-14 13:21:17 UTC (rev 24390)
@@ -318,6 +318,7 @@
 	fSubsetWindows(kSubsetList),
 	fFocusList(kFocusList),
 	fWorkspacesViews(false),
+	fWorkspacesLock("workspaces list"),
 	fActiveScreen(NULL),
 
 	fWindowLock("window lock"),
@@ -1260,6 +1261,8 @@
 void
 Desktop::_WindowChanged(Window* window)
 {
+	BAutolock _(fWorkspacesLock);
+
 	for (uint32 i = fWorkspacesViews.CountItems(); i-- > 0;) {
 		WorkspacesView* view = fWorkspacesViews.ItemAt(i);
 		view->WindowChanged(window);
@@ -1273,6 +1276,8 @@
 void
 Desktop::_WindowRemoved(Window* window)
 {
+	BAutolock _(fWorkspacesLock);
+
 	for (uint32 i = fWorkspacesViews.CountItems(); i-- > 0;) {
 		WorkspacesView* view = fWorkspacesViews.ItemAt(i);
 		view->WindowRemoved(window);
@@ -1286,23 +1291,18 @@
 	if (view->Window() == NULL || view->Window()->IsHidden())
 		return;
 
-	if (!LockAllWindows())
-		return;
+	BAutolock _(fWorkspacesLock);
 
 	if (!fWorkspacesViews.HasItem(view))
 		fWorkspacesViews.AddItem(view);
-	UnlockAllWindows();	
 }
 
 
 void
 Desktop::RemoveWorkspacesView(WorkspacesView* view)
 {
-	if (!LockAllWindows())
-		return;
-
+	BAutolock _(fWorkspacesLock);
 	fWorkspacesViews.RemoveItem(view);
-	UnlockAllWindows();	
 }
 
 
@@ -1667,6 +1667,7 @@
 
 	if (window->HasWorkspacesViews()) {
 		// find workspaces views in view hierarchy
+		BAutolock _(fWorkspacesLock);
 		window->FindWorkspacesViews(fWorkspacesViews);
 	}
 
@@ -1712,6 +1713,8 @@
 		BObjectList<WorkspacesView> list(false);
 		window->FindWorkspacesViews(list);
 
+		BAutolock _(fWorkspacesLock);
+
 		while (WorkspacesView* view = list.RemoveItemAt(0)) {
 			fWorkspacesViews.RemoveItem(view);
 		}

Modified: haiku/trunk/src/servers/app/Desktop.h
===================================================================
--- haiku/trunk/src/servers/app/Desktop.h	2008-03-14 13:14:23 UTC (rev 24389)
+++ haiku/trunk/src/servers/app/Desktop.h	2008-03-14 13:21:17 UTC (rev 24390)
@@ -259,7 +259,9 @@
 		WindowList				fAllWindows;
 		WindowList				fSubsetWindows;
 		WindowList				fFocusList;
+
 		BObjectList<WorkspacesView> fWorkspacesViews;
+		BLocker					fWorkspacesLock;
 
 		Screen*					fActiveScreen;
 



From axeld at pinc-software.de  Fri Mar 14 14:48:26 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Fri, 14 Mar 2008 14:48:26 +0100 CET
Subject: [Haiku-commits] r24386 - haiku/trunk/src/system/kernel/cache
In-Reply-To: <200803132341.m2DNfG0N000529@sheep.berlios.de>
Message-ID: <19133636370-BeMail@zon>

bonefish at BerliOS <bonefish at mail.berlios.de> wrote:
> Log:
> store_acquire_unreferenced_ref() saves the pointer of the vnode it 
> got
> from the call to vfs_get_vnode() now. Only this way it is safe to 
> call
> store_release_ref() later (as the page writer does). We had a 
> potential
> race condition -- if called after vm_cache_remove_consumer() had
> released the last reference, the old vnode might already have been
> deleted.

Did you see an actual problem with that?
If something calls acquire_unreferenced_ref() on a store, it must 
already own a reference to the vm_cache, right?

Bye,
   Axel.



From axeld at pinc-software.de  Fri Mar 14 14:41:23 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Fri, 14 Mar 2008 14:41:23 +0100 CET
Subject: [Haiku-commits] r24388 - in haiku/trunk:
 headers/private/interface src/servers/app
In-Reply-To: <20080314124641.905.2@stippis2.1205482741.fake>
Message-ID: <18710747563-BeMail@zon>

Stephan Assmus <superstippi at gmx.de> wrote:
> axeld at BerliOS wrote:
> > - * Copyright 2005, J?r?me Duval, jerome.duval at free.fr.
> > + * Copyright 2005-2008, J?r?me Duval, jerome.duval at free.fr.
> >   * Distributed under the terms of the MIT License.
> >   */
> You keep doing this, but I think this is not correct, only in case 
> the 
> copyright is attributed to Haiku, Inc. For the above case, you should 
> add 
> your own copyright, but only in case your change is substantial 
> enough to 
> be copyrightable.

That's why I attribute it to the author in question. The document has 
changed so the copyright can be renewed or not? At least I update the 
copyright in files I touch (and have written) regardless of how 
substantial that change was.

Bye,
   Axel.



From ingo_weinhold at gmx.de  Fri Mar 14 15:55:31 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Fri, 14 Mar 2008 15:55:31 +0100
Subject: [Haiku-commits] r24386 - haiku/trunk/src/system/kernel/cache
In-Reply-To: <19133636370-BeMail@zon>
References: <19133636370-BeMail@zon>
Message-ID: <20080314155531.950.6@knochen-vm.1205489052.fake>


On 2008-03-14 at 14:48:26 [+0100], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> bonefish at BerliOS <bonefish at mail.berlios.de> wrote:
> > Log:
> > store_acquire_unreferenced_ref() saves the pointer of the vnode it
> > got
> > from the call to vfs_get_vnode() now. Only this way it is safe to
> > call
> > store_release_ref() later (as the page writer does). We had a
> > potential
> > race condition -- if called after vm_cache_remove_consumer() had
> > released the last reference, the old vnode might already have been
> > deleted.
> 
> Did you see an actual problem with that?
> If something calls acquire_unreferenced_ref() on a store, it must
> already own a reference to the vm_cache, right?

A reference to the cache, yes, but that doesn't mean, that the vnode can't 
go away. The whole reason for introducing acquire_unreferenced_ref() was 
that the store's vnode pointer can become invalid, wasn't it?

I didn't attach the KDL session in #1917, but it would have shown, that the 
page writer was already waiting for the cache lock, which might as well 
have been at the point just before calling acquire_unreferenced_ref(). If 
the file hadn't been removed but just normally unmapped, it would actually 
have gotten a pointer to a fresh vnode while the store still kept a 
reference to the old one.

CU, Ingo


From mmu_man at mail.berlios.de  Fri Mar 14 17:30:55 2008
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Fri, 14 Mar 2008 17:30:55 +0100
Subject: [Haiku-commits] r24391 - haiku/trunk/src/apps/terminal
Message-ID: <200803141630.m2EGUtgY029102@sheep.berlios.de>

Author: mmu_man
Date: 2008-03-14 17:30:52 +0100 (Fri, 14 Mar 2008)
New Revision: 24391
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24391&view=rev

Modified:
   haiku/trunk/src/apps/terminal/Shell.cpp
Log:
This should fix R5 BONE build, as it also lacks setenv(), unlike dano.


Modified: haiku/trunk/src/apps/terminal/Shell.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/Shell.cpp	2008-03-14 13:21:17 UTC (rev 24390)
+++ haiku/trunk/src/apps/terminal/Shell.cpp	2008-03-14 16:30:52 UTC (rev 24391)
@@ -58,10 +58,14 @@
 /*
  * Set environment variable.
  */
-#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
+#if defined(HAIKU_TARGET_PLATFORM_BEOS) || \
+	defined(HAIKU_TARGET_PLATFORM_BONE) || \
+	defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
 
 extern char **environ;
 
+static int setenv(const char *var, const char *value, bool overwrite);
+
 static int
 setenv(const char *var, const char *value, bool overwrite)
 {



From ingo_weinhold at gmx.de  Fri Mar 14 18:22:01 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Fri, 14 Mar 2008 18:22:01 +0100
Subject: [Haiku-commits] r24388 - in haiku/trunk:
 headers/private/interface src/servers/app
In-Reply-To: <18710747563-BeMail@zon>
References: <18710747563-BeMail@zon>
Message-ID: <20080314182201.1303.7@knochen-vm.1205489052.fake>


On 2008-03-14 at 14:41:23 [+0100], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> Stephan Assmus <superstippi at gmx.de> wrote:
> > axeld at BerliOS wrote:
> > > - * Copyright 2005, J?r?me Duval, jerome.duval at free.fr.
> > > + * Copyright 2005-2008, J?r?me Duval, jerome.duval at free.fr.
> > >   * Distributed under the terms of the MIT License.
> > >   */
> > You keep doing this, but I think this is not correct, only in case
> > the
> > copyright is attributed to Haiku, Inc. For the above case, you should
> > add
> > your own copyright, but only in case your change is substantial
> > enough to
> > be copyrightable.
> 
> That's why I attribute it to the author in question. The document has
> changed so the copyright can be renewed or not? At least I update the
> copyright in files I touch (and have written) regardless of how
> substantial that change was.

I believe Stippi's point was that you're not the copyright holder in this 
case, and therefore aren't allowed to change the copyright header at all 
(the license is pretty explicit in that respect). You can add your own 
header, though. I think you're always allowed to do that (regardless of how 
substantial your change was); you might just not be able to defend you 
copyright claim in court, if it came to that. So unless you just do some 
coding style cleanup or very small changes, it won't harm to add a header, 
I guess. Otherwise I'd simply leave the existing header alone.

CU, Ingo


From bonefish at mail.berlios.de  Fri Mar 14 23:03:27 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Fri, 14 Mar 2008 23:03:27 +0100
Subject: [Haiku-commits] r24393 - haiku/trunk/src/system/kernel/cache
Message-ID: <200803142203.m2EM3ROq020212@sheep.berlios.de>

Author: bonefish
Date: 2008-03-14 23:03:26 +0100 (Fri, 14 Mar 2008)
New Revision: 24393
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24393&view=rev

Modified:
   haiku/trunk/src/system/kernel/cache/block_cache.cpp
Log:
cached_block::Compare() was ignoring the upper 32 bit of the block
number. Was a problem only for partitions > 2^32 * block size (4TB
for 1KB blocks).


Modified: haiku/trunk/src/system/kernel/cache/block_cache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/cache/block_cache.cpp	2008-03-14 21:58:17 UTC (rev 24392)
+++ haiku/trunk/src/system/kernel/cache/block_cache.cpp	2008-03-14 22:03:26 UTC (rev 24393)
@@ -296,7 +296,11 @@
 	cached_block *cacheEntry = (cached_block *)_cacheEntry;
 	const off_t *block = (const off_t *)_block;
 
-	return cacheEntry->block_number - *block;
+	off_t diff = cacheEntry->block_number - *block;
+	if (diff > 0)
+		return 1;
+
+	return diff < 0 ? -1 : 0;	
 }
 
 



From bonefish at mail.berlios.de  Fri Mar 14 22:58:18 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Fri, 14 Mar 2008 22:58:18 +0100
Subject: [Haiku-commits] r24392 - in haiku/trunk: headers/private/kernel
	src/system/kernel
Message-ID: <200803142158.m2ELwIu9019447@sheep.berlios.de>

Author: bonefish
Date: 2008-03-14 22:58:17 +0100 (Fri, 14 Mar 2008)
New Revision: 24392
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24392&view=rev

Modified:
   haiku/trunk/headers/private/kernel/tracing_config.h
   haiku/trunk/src/system/kernel/syscalls.cpp
Log:
Added new macro SYSCALL_TRACING_IGNORE_KTRACE_OUTPUT to disable tracing
for the _kern_ktrace_output() syscall.


Modified: haiku/trunk/headers/private/kernel/tracing_config.h
===================================================================
--- haiku/trunk/headers/private/kernel/tracing_config.h	2008-03-14 16:30:52 UTC (rev 24391)
+++ haiku/trunk/headers/private/kernel/tracing_config.h	2008-03-14 21:58:17 UTC (rev 24392)
@@ -22,6 +22,7 @@
 //#define RUNTIME_LOADER_TRACING
 //#define SIGNAL_TRACING
 //#define SYSCALL_TRACING
+//#define SYSCALL_TRACING_IGNORE_KTRACE_OUTPUT
 //#define TEAM_TRACING
 //#define USER_MALLOC_TRACING
 

Modified: haiku/trunk/src/system/kernel/syscalls.cpp
===================================================================
--- haiku/trunk/src/system/kernel/syscalls.cpp	2008-03-14 16:30:52 UTC (rev 24391)
+++ haiku/trunk/src/system/kernel/syscalls.cpp	2008-03-14 21:58:17 UTC (rev 24392)
@@ -1,4 +1,5 @@
 /*
+ * Copyright 2008, Ingo Weinhold, ingo_weinhold at gmx.de.
  * Copyright 2004-2006, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
@@ -447,7 +448,12 @@
 void
 trace_pre_syscall(uint32 syscallNumber, const void* parameters)
 {
-	new(std::nothrow) SyscallTracing::PreSyscall(syscallNumber, parameters);
+#ifdef SYSCALL_TRACING_IGNORE_KTRACE_OUTPUT
+	if (syscallNumber != SYSCALL_KTRACE_OUTPUT)
+#endif
+	{
+		new(std::nothrow) SyscallTracing::PreSyscall(syscallNumber, parameters);
+	}
 }
 
 
@@ -456,7 +462,13 @@
 void
 trace_post_syscall(int syscallNumber, uint64 returnValue)
 {
-	new(std::nothrow) SyscallTracing::PostSyscall(syscallNumber, returnValue);
+#ifdef SYSCALL_TRACING_IGNORE_KTRACE_OUTPUT
+	if (syscallNumber != SYSCALL_KTRACE_OUTPUT)
+#endif
+	{
+		new(std::nothrow) SyscallTracing::PostSyscall(syscallNumber,
+			returnValue);
+	}
 }
 
 



From axeld at mail.berlios.de  Sat Mar 15 11:45:54 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 15 Mar 2008 11:45:54 +0100
Subject: [Haiku-commits] r24394 - in haiku/trunk: headers/build/os/storage
	src/build/libroot
Message-ID: <200803151045.m2FAjs6X014306@sheep.berlios.de>

Author: axeld
Date: 2008-03-15 11:45:53 +0100 (Sat, 15 Mar 2008)
New Revision: 24394
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24394&view=rev

Modified:
   haiku/trunk/headers/build/os/storage/Node.h
   haiku/trunk/src/build/libroot/NodeRef.h
Log:
Applied patch by Vasilis - thanks!
* fixed compilation warnings in Node.h and NodeRef.h.
* Added license header to NodeRef.h.


Modified: haiku/trunk/headers/build/os/storage/Node.h
===================================================================
--- haiku/trunk/headers/build/os/storage/Node.h	2008-03-14 22:03:26 UTC (rev 24393)
+++ haiku/trunk/headers/build/os/storage/Node.h	2008-03-15 10:45:53 UTC (rev 24394)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2002-2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _NODE_H
@@ -27,8 +27,8 @@
 
 	bool operator<(const node_ref &ref) const
 	{
-		return (device < ref.device
-			|| device == ref.device && node < ref.node);
+		return device < ref.device
+			|| (device == ref.device && node < ref.node);
 	}
 
 	dev_t device;

Modified: haiku/trunk/src/build/libroot/NodeRef.h
===================================================================
--- haiku/trunk/src/build/libroot/NodeRef.h	2008-03-14 22:03:26 UTC (rev 24393)
+++ haiku/trunk/src/build/libroot/NodeRef.h	2008-03-15 10:45:53 UTC (rev 24394)
@@ -1,3 +1,7 @@
+/*
+ * Copyright 2005-2008, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef NODE_REF_H
 #define NODE_REF_H
 
@@ -47,7 +51,7 @@
 	bool operator<(const NodeRef &other) const
 	{
 		return (device < other.device
-			|| device == other.device && node < other.node);
+			|| (device == other.device && node < other.node));
 	}
 
 };



From axeld at mail.berlios.de  Sat Mar 15 12:16:57 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 15 Mar 2008 12:16:57 +0100
Subject: [Haiku-commits] r24395 - haiku/trunk/src/bin/m4/lib
Message-ID: <200803151116.m2FBGvbk016358@sheep.berlios.de>

Author: axeld
Date: 2008-03-15 12:16:57 +0100 (Sat, 15 Mar 2008)
New Revision: 24395
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24395&view=rev

Modified:
   haiku/trunk/src/bin/m4/lib/config.h
Log:
Applied patch by Curtis Wanner: corrects wchar_t handling, and removes a
warning (SIZE_MAX was redefined).


Modified: haiku/trunk/src/bin/m4/lib/config.h
===================================================================
--- haiku/trunk/src/bin/m4/lib/config.h	2008-03-15 10:45:53 UTC (rev 24394)
+++ haiku/trunk/src/bin/m4/lib/config.h	2008-03-15 11:16:57 UTC (rev 24395)
@@ -252,7 +252,7 @@
 #define HAVE_SIGNED_SIG_ATOMIC_T 1
 
 /* Define to 1 if 'wchar_t' is a signed integer type. */
-#define HAVE_SIGNED_WCHAR_T 1
+/* #undef HAVE_SIGNED_WCHAR_T */
 
 /* Define to 1 if 'wint_t' is a signed integer type. */
 /* #undef HAVE_SIGNED_WINT_T */
@@ -421,9 +421,6 @@
 /* Define as the maximum value of type 'size_t', if the system doesn't define
    it. */
 /* #undef SIZE_MAX */
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
 
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'size_t'. */
@@ -459,7 +456,7 @@
 
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'wchar_t'. */
-#define WCHAR_T_SUFFIX 
+#define WCHAR_T_SUFFIX u
 
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'wint_t'. */



From axeld at mail.berlios.de  Sat Mar 15 16:20:50 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 15 Mar 2008 16:20:50 +0100
Subject: [Haiku-commits] r24396 - haiku/trunk/src/kits/tracker
Message-ID: <200803151520.m2FFKoqE025576@sheep.berlios.de>

Author: axeld
Date: 2008-03-15 16:20:49 +0100 (Sat, 15 Mar 2008)
New Revision: 24396
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24396&view=rev

Modified:
   haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp
Log:
* Changed the sorting order back to how it was done previously to r22113.
* This fixes bug #1915.


Modified: haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp	2008-03-15 11:16:57 UTC (rev 24395)
+++ haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp	2008-03-15 15:20:49 UTC (rev 24396)
@@ -61,6 +61,9 @@
 #include "WidgetAttributeText.h"
 
 
+const int32 kGenericReadBufferSize = 1024;
+
+
 template <class View>
 float
 TruncStringBase(BString *result, const char *str, int32 length,
@@ -663,7 +666,7 @@
 	if (fValueDirty)
 		fValue = ReadValue();
 
-	return fValue <= compareTo->Value() ? (fValue == compareTo->Value() ? 0 : -1) : 1 ;
+	return fValue >= compareTo->Value() ? (fValue == compareTo->Value() ? 0 : -1) : 1 ;
 }
 
 
@@ -671,7 +674,7 @@
 
 
 PathAttributeText::PathAttributeText(const Model *model, const BColumn *column)
-	:	StringAttributeText(model, column)
+	: StringAttributeText(model, column)
 {
 }
 
@@ -695,8 +698,9 @@
 //	#pragma mark -
 
 
-OriginalPathAttributeText::OriginalPathAttributeText(const Model *model, const BColumn *column)
-	:	StringAttributeText(model, column)
+OriginalPathAttributeText::OriginalPathAttributeText(const Model *model,
+		const BColumn *column)
+	: StringAttributeText(model, column)
 {
 }
 
@@ -720,7 +724,7 @@
 
 
 KindAttributeText::KindAttributeText(const Model *model, const BColumn *column)
-	:	StringAttributeText(model, column)
+	: StringAttributeText(model, column)
 {
 }
 
@@ -747,7 +751,7 @@
 
 
 NameAttributeText::NameAttributeText(const Model *model, const BColumn *column)
-	:	StringAttributeText(model, column)
+	: StringAttributeText(model, column)
 {
 }
 
@@ -823,8 +827,8 @@
 	if (fValueDirty)
 		ReadValue(&fFullValueText);
 	fOldWidth = fColumn->Width();
-	fTruncatedWidth = TruncString(result, fFullValueText.String(), fFullValueText.Length(),
-		view, fOldWidth, B_TRUNCATE_END);
+	fTruncatedWidth = TruncString(result, fFullValueText.String(),
+		fFullValueText.Length(), view, fOldWidth, B_TRUNCATE_END);
 	fDirty = false;
 }
 
@@ -911,7 +915,7 @@
 #ifdef OWNER_GROUP_ATTRIBUTES
 
 OwnerAttributeText::OwnerAttributeText(const Model *model, const BColumn *column)
-	:	StringAttributeText(model, column)
+	: StringAttributeText(model, column)
 {
 }
 
@@ -936,7 +940,7 @@
 
 
 GroupAttributeText::GroupAttributeText(const Model *model, const BColumn *column)
-	:	StringAttributeText(model, column)
+	: StringAttributeText(model, column)
 {
 }
 
@@ -962,7 +966,7 @@
 #endif  /* OWNER_GROUP_ATTRIBUTES */
 
 ModeAttributeText::ModeAttributeText(const Model *model, const BColumn *column)
-	:	StringAttributeText(model, column)
+	: StringAttributeText(model, column)
 {
 }
 
@@ -1003,7 +1007,7 @@
 
 
 SizeAttributeText::SizeAttributeText(const Model *model, const BColumn *column)
-	:	ScalarAttributeText(model, column)
+	: ScalarAttributeText(model, column)
 {
 }
 
@@ -1057,7 +1061,7 @@
 
 
 TimeAttributeText::TimeAttributeText(const Model *model, const BColumn *column)
-	:	ScalarAttributeText(model, column)
+	: ScalarAttributeText(model, column)
 {
 }
 
@@ -1083,8 +1087,8 @@
 
 
 CreationTimeAttributeText::CreationTimeAttributeText(const Model *model,
-	const BColumn *column)
-	:	TimeAttributeText(model, column)
+		const BColumn *column)
+	: TimeAttributeText(model, column)
 {
 }
 
@@ -1098,8 +1102,8 @@
 }
 
 ModificationTimeAttributeText::ModificationTimeAttributeText(const Model *model,
-	const BColumn *column)
-	:	TimeAttributeText(model, column)
+		const BColumn *column)
+	: TimeAttributeText(model, column)
 {
 }
 
@@ -1115,10 +1119,10 @@
 
 //	#pragma mark -
 
-const int32 kGenericReadBufferSize = 1024;
 
-GenericAttributeText::GenericAttributeText(const Model *model, const BColumn *column)
-	:	WidgetAttributeText(model, column),
+GenericAttributeText::GenericAttributeText(const Model *model,
+		const BColumn *column)
+	: WidgetAttributeText(model, column),
 	fValueDirty(true)
 {
 }
@@ -1445,52 +1449,52 @@
 			}
 
 		case B_FLOAT_TYPE:
-			return fValue.floatt <= compareTo->fValue.floatt ?
+			return fValue.floatt >= compareTo->fValue.floatt ?
 				(fValue.floatt == compareTo->fValue.floatt ? 0 : -1) : 1;
 
 		case B_DOUBLE_TYPE:
-			return fValue.doublet <= compareTo->fValue.doublet ?
+			return fValue.doublet >= compareTo->fValue.doublet ?
 				(fValue.doublet == compareTo->fValue.doublet ? 0 : -1) : 1;
 
 		case B_BOOL_TYPE:
-			return fValue.boolt <= compareTo->fValue.boolt ?
+			return fValue.boolt >= compareTo->fValue.boolt ?
 				(fValue.boolt == compareTo->fValue.boolt ? 0 : -1) : 1;
 
 		case B_UINT8_TYPE:
-			return fValue.uint8t <= compareTo->fValue.uint8t ?
+			return fValue.uint8t >= compareTo->fValue.uint8t ?
 				(fValue.uint8t == compareTo->fValue.uint8t ? 0 : -1) : 1;
 
 		case B_INT8_TYPE:
-			return fValue.int8t <= compareTo->fValue.int8t ?
+			return fValue.int8t >= compareTo->fValue.int8t ?
 					(fValue.int8t == compareTo->fValue.int8t ? 0 : -1) : 1;
 
 		case B_UINT16_TYPE:
-			return fValue.uint16t <= compareTo->fValue.uint16t ?
+			return fValue.uint16t >= compareTo->fValue.uint16t ?
 				(fValue.uint16t == compareTo->fValue.uint16t ? 0 : -1) : 1;
 
 		case B_INT16_TYPE:
-			return fValue.int16t <= compareTo->fValue.int16t ?
+			return fValue.int16t >= compareTo->fValue.int16t ?
 				(fValue.int16t == compareTo->fValue.int16t ? 0 : -1) : 1;
 
 		case B_UINT32_TYPE:
-			return fValue.uint32t <= compareTo->fValue.uint32t ?
+			return fValue.uint32t >= compareTo->fValue.uint32t ?
 				(fValue.uint32t == compareTo->fValue.uint32t ? 0 : -1) : 1;
 
 		case B_TIME_TYPE:
 			// time_t typedef'd to a long, i.e. a int32
 		case B_INT32_TYPE:
-			return fValue.int32t <= compareTo->fValue.int32t ?
+			return fValue.int32t >= compareTo->fValue.int32t ?
 				(fValue.int32t == compareTo->fValue.int32t ? 0 : -1) : 1;
 
 		case B_OFF_T_TYPE:
 			// off_t typedef'd to a long long, i.e. a int64
 		case B_INT64_TYPE:
-			return fValue.int64t <= compareTo->fValue.int64t ?
+			return fValue.int64t >= compareTo->fValue.int64t ?
 				(fValue.int64t == compareTo->fValue.int64t ? 0 : -1) : 1;
 
 		case B_UINT64_TYPE:
 		default:
-			return fValue.uint64t <= compareTo->fValue.uint64t ?
+			return fValue.uint64t >= compareTo->fValue.uint64t ?
 				(fValue.uint64t == compareTo->fValue.uint64t ? 0 : -1) : 1;
 	}
 	return 0;



From oruizdorantes at mail.berlios.de  Sat Mar 15 16:34:39 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Sat, 15 Mar 2008 16:34:39 +0100
Subject: [Haiku-commits] r24397 - haiku/trunk/src/kits/bluetooth
Message-ID: <200803151534.m2FFYdvt028130@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-15 16:34:39 +0100 (Sat, 15 Mar 2008)
New Revision: 24397
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24397&view=rev

Modified:
   haiku/trunk/src/kits/bluetooth/KitSupport.cpp
Log:
Mark to fix in some other moment

Modified: haiku/trunk/src/kits/bluetooth/KitSupport.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/KitSupport.cpp	2008-03-15 15:20:49 UTC (rev 24396)
+++ haiku/trunk/src/kits/bluetooth/KitSupport.cpp	2008-03-15 15:34:39 UTC (rev 24397)
@@ -12,8 +12,11 @@
 #include "KitSupport.h"
 
 
+
+
 BMessenger* _RetrieveBluetoothMessenger(void)
 {
+	// Fix/review: leaking memory here
 	BMessenger* fMessenger = new BMessenger(BLUETOOTH_SIGNATURE);
 
     if (fMessenger == NULL || !fMessenger->IsValid())



From oruizdorantes at mail.berlios.de  Sat Mar 15 16:46:58 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Sat, 15 Mar 2008 16:46:58 +0100
Subject: [Haiku-commits] r24398 - haiku/trunk/src/servers/bluetooth
Message-ID: <200803151546.m2FFkw6Z030542@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-15 16:46:58 +0100 (Sat, 15 Mar 2008)
New Revision: 24398
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24398&view=rev

Modified:
   haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp
Log:
Remove code references for commands

Modified: haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp	2008-03-15 15:34:39 UTC (rev 24397)
+++ haiku/trunk/src/servers/bluetooth/BluetoothServer.cpp	2008-03-15 15:46:58 UTC (rev 24398)
@@ -390,95 +390,7 @@
 	return B_NO_ERROR;	
 }
 
-#if 0
 
-					struct  {
-						size_t	size;
-						struct hci_command_header header;
-						//struct hci_rp_read_bd_addr body;
-					} __attribute__ ((packed)) cm1;
-
-					struct  {
-						size_t	size;
-						struct hci_command_header header;
-						struct hci_cp_inquiry body;
-					} __attribute__ ((packed)) cm2;
-
-					struct  {
-						size_t	size;
-						struct hci_command_header header;
-						struct hci_remote_name_request body;
-					} __attribute__ ((packed)) cm3;
-
-					struct  {
-						size_t	size;
-						struct hci_command_header header;
-						struct hci_cp_create_conn body;
-					} __attribute__ ((packed)) cm4;
-					
-					 
-					syslog(LOG_ALERT,BT "Registering device %s\n",path.Path());
-					fprintf(stderr, "Opening %s\n",path.Path());
-
-					cm1.size = sizeof(struct hci_command_header);
-					cm1.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_CONTROL_BASEBAND, OCF_RESET));
-					cm1.header.clen = 0;					
-					ioctl(fd1, ISSUE_BT_COMMAND, &cm1, sizeof(cm1));	
-
-					cm1.size = sizeof(struct hci_command_header);
-					cm1.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_CONTROL_BASEBAND, OCF_READ_LOCAL_NAME));
-					cm1.header.clen = 0;					
-					ioctl(fd1, ISSUE_BT_COMMAND, &cm1, sizeof(cm1));	
-
-					cm1.size = sizeof(struct hci_command_header);
-					cm1.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_INFORMATIONAL_PARAM, OCF_READ_BD_ADDR));
-					cm1.header.clen = 0;					
-					ioctl(fd1, ISSUE_BT_COMMAND, &cm1, sizeof(cm1));	
-
-					cm2.size = sizeof(struct hci_command_header)+sizeof(struct hci_cp_inquiry);
-					cm2.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_LINK_CTL, OCF_INQUIRY));
-					cm2.body.lap[0] = ((B_BT_GIAC & 0x000000FF));
-					cm2.body.lap[1] = ((B_BT_GIAC & 0x0000FF00) >> 8);
-					cm2.body.lap[2] = ((B_BT_GIAC & 0x00FF0000) >> 16);	
-					cm2.body.length = 0x15;
-					cm2.body.num_rsp = 8;
-					cm2.header.clen = 5;					
-					ioctl(fd1, ISSUE_BT_COMMAND, &cm2, sizeof(cm1));	
-					
-					snooze(60*1000*1000);*/
-					cm3.size = sizeof(struct hci_command_header)+sizeof(struct hci_remote_name_request);
-					cm3.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_LINK_CONTROL, OCF_REMOTE_NAME_REQUEST));
-					cm3.body.bdaddr.b[0] = 0x92;
-					cm3.body.bdaddr.b[1] = 0xd3;
-					cm3.body.bdaddr.b[2] = 0xaf;
-					cm3.body.bdaddr.b[3] = 0xd9;
-					cm3.body.bdaddr.b[4] = 0x0a;
-					cm3.body.bdaddr.b[5] = 0x00;
-					cm3.body.pscan_rep_mode = 1;
-					cm3.body.clock_offset = 0xc7;
-					cm3.header.clen = 10;					
-					ioctl(fd1, ISSUE_BT_COMMAND, &cm3, sizeof(cm3));
-					/*
-					cm4.size = sizeof(struct hci_command_header)+sizeof(struct hci_cp_create_conn);
-					cm4.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_LINK_CTL, OCF_CREATE_CONN));
-					cm4.body.bdaddr.b[0] = 0x92;
-					cm4.body.bdaddr.b[1] = 0xd3;
-					cm4.body.bdaddr.b[2] = 0xaf;
-					cm4.body.bdaddr.b[3] = 0xd9;
-					cm4.body.bdaddr.b[4] = 0x0a;
-					cm4.body.bdaddr.b[5] = 0x00;
-					cm4.body.pkt_type = 0xFFFF;
-					cm4.body.pscan_rep_mode = 1;
-					cm4.body.pscan_mode = 0;
-					cm4.body.clock_offset = 0xc7;
-					cm4.body.role_switch = 1;
-					cm4.header.clen = 13;					
-					ioctl(fd1, ISSUE_BT_COMMAND, &cm4, sizeof(cm4));
-					*/
-				}		
-
-#endif
-
 void
 BluetoothServer::ShowWindow(BWindow* pWindow)
 {



From anevilyak at mail.berlios.de  Sat Mar 15 17:19:03 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 15 Mar 2008 17:19:03 +0100
Subject: [Haiku-commits] r24399 - haiku/trunk/src/kits/tracker
Message-ID: <200803151619.m2FGJ3Br004038@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-15 17:19:03 +0100 (Sat, 15 Mar 2008)
New Revision: 24399
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24399&view=rev

Modified:
   haiku/trunk/src/kits/tracker/DeskWindow.cpp
Log:
Specify a umask when creating tracker_shelf file.



Modified: haiku/trunk/src/kits/tracker/DeskWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/DeskWindow.cpp	2008-03-15 15:46:58 UTC (rev 24398)
+++ haiku/trunk/src/kits/tracker/DeskWindow.cpp	2008-03-15 16:19:03 UTC (rev 24399)
@@ -125,7 +125,7 @@
 	BPath path;
 	if (!BootedInSafeMode() && FSFindTrackerSettingsDir(&path) == B_OK) {
 		path.Append(kShelfPath);
-		close(open(path.Path(), O_RDONLY | O_CREAT));
+		close(open(path.Path(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH));
 		if (get_ref_for_path(path.Path(), &ref) == B_OK)
 			fDeskShelf = new BShelf(&ref, fPoseView);
 		if (fDeskShelf)



From axeld at mail.berlios.de  Sat Mar 15 17:21:57 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 15 Mar 2008 17:21:57 +0100
Subject: [Haiku-commits] r24400 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803151621.m2FGLvHj004389@sheep.berlios.de>

Author: axeld
Date: 2008-03-15 17:21:57 +0100 (Sat, 15 Mar 2008)
New Revision: 24400
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24400&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
Log:
* Improved error reporting when mounting a volume failed, especially when
  the log couldn't be replayed.
* Minor cleanup.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp	2008-03-15 16:19:03 UTC (rev 24399)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp	2008-03-15 16:21:57 UTC (rev 24400)
@@ -359,15 +359,21 @@
 		return B_ERROR;
 
 	fJournal = new Journal(this);
+	if (fJournal == NULL)
+		return B_NO_MEMORY;
+
 	// replaying the log is the first thing we will do on this disk
-	if ((fJournal != NULL && fJournal->InitCheck() < B_OK)
-		|| fBlockAllocator.Initialize() < B_OK) {
-		// ToDo: improve error reporting for a bad journal
-		FATAL(("could not initialize journal/block bitmap allocator!\n"));
-		return B_NO_MEMORY;
+	status_t status = fJournal->InitCheck();
+	if (status < B_OK) {
+		FATAL(("could not initialize journal: %s!\n", strerror(status)));
+		return status;
 	}
 
-	status_t status = B_OK;
+	status = fBlockAllocator.Initialize();
+	if (status < B_OK) {
+		FATAL(("could not initialize block bitmap allocator!\n"));
+		return status;
+	}
 
 	fRootNode = new Inode(this, ToVnode(Root()));
 	if (fRootNode && fRootNode->InitCheck() == B_OK) {

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp	2008-03-15 16:19:03 UTC (rev 24399)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp	2008-03-15 16:21:57 UTC (rev 24400)
@@ -114,17 +114,18 @@
 	if (volume == NULL)
 		return B_NO_MEMORY;
 
-	status_t status;
-	if ((status = volume->Mount(device, flags)) == B_OK) {
-		*_data = volume;
-		*_rootID = volume->ToVnode(volume->Root());
-		INFORM(("mounted \"%s\" (root node at %Ld, device = %s)\n",
-			volume->Name(), *_rootID, device));
+	status_t status = volume->Mount(device, flags);
+	if (status != B_OK) {
+		delete volume;
+		RETURN_ERROR(status);
 	}
-	else
-		delete volume;
 
-	RETURN_ERROR(status);
+	*_data = volume;
+	*_rootID = volume->ToVnode(volume->Root());
+
+	INFORM(("mounted \"%s\" (root node at %Ld, device = %s)\n",
+		volume->Name(), *_rootID, device));
+	return B_OK;
 }
 
 



From axeld at mail.berlios.de  Sat Mar 15 17:25:55 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 15 Mar 2008 17:25:55 +0100
Subject: [Haiku-commits] r24401 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803151625.m2FGPtwt005081@sheep.berlios.de>

Author: axeld
Date: 2008-03-15 17:25:55 +0100 (Sat, 15 Mar 2008)
New Revision: 24401
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24401&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp
Log:
* For whatever weird reason, BFS apparently restricts a log entry to 126
  entries, even though many more could fit in the blog. This fixes mounting
  a dirty (original-)BFS volume with a block size larger than 1024 bytes,
  and probably vice versa.
* Minor cleanup.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp	2008-03-15 16:21:57 UTC (rev 24400)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp	2008-03-15 16:25:55 UTC (rev 24401)
@@ -24,8 +24,7 @@
 		// that -1 accounts for an off-by-one error in Be's BFS implementation
 	const block_run &RunAt(int32 i) const { return runs[i]; }
 
-	static int32 MaxRuns(int32 blockSize)
-		{ return (blockSize - sizeof(run_array)) / sizeof(block_run); }
+	static int32 MaxRuns(int32 blockSize);
 
 private:
 	static int _Compare(block_run &a, block_run &b);
@@ -152,6 +151,18 @@
 }
 
 
+/*static*/ int32
+run_array::MaxRuns(int32 blockSize)
+{
+	// For whatever reason, BFS restricts the maximum array size
+	uint32 maxCount = (blockSize - sizeof(run_array)) / sizeof(block_run);
+	if (maxCount < 128)
+		return maxCount;
+
+	return 127;
+}
+
+
 /*static*/ int
 run_array::_Compare(block_run &a, block_run &b)
 {
@@ -424,8 +435,10 @@
 			if (offset == 0) {
 				// This log entry writes over the super block - check if
 				// it's valid!
-				if (Volume::CheckSuperBlock(data) != B_OK)
+				if (Volume::CheckSuperBlock(data) != B_OK) {
+					FATAL(("Log contains invalid super block!\n"));
 					RETURN_ERROR(B_BAD_DATA);
+				}
 			}
 
 			ssize_t written = write_pos(fVolume->Device(), offset, data,
@@ -475,7 +488,7 @@
 		}
 		start = start % fLogSize;
 	}
-	
+
 	PRINT(("replaying worked fine!\n"));
 	fVolume->SuperBlock().log_start = fVolume->LogEnd();
 	fVolume->LogStart() = fVolume->LogEnd();
@@ -731,7 +744,7 @@
 }
 
 
-status_t 
+status_t
 Journal::FlushLogAndBlocks()
 {
 	status_t status = fLock.Lock();
@@ -861,7 +874,7 @@
 //	#pragma mark - Transaction
 
 
-status_t 
+status_t
 Transaction::Start(Volume *volume, off_t refBlock)
 {
 	// has it already been started?



From axeld at mail.berlios.de  Sat Mar 15 17:35:10 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 15 Mar 2008 17:35:10 +0100
Subject: [Haiku-commits] r24402 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803151635.m2FGZAVJ006222@sheep.berlios.de>

Author: axeld
Date: 2008-03-15 17:35:10 +0100 (Sat, 15 Mar 2008)
New Revision: 24402
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24402&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp
Log:
Divided the _ReplayRunArray() method into two passes: first, the integrity
of the blocks in the log entry will be checked, and only if this passed,
all log entries are written back together; if the whole run array contained
bad data, it's no longer written to disk at all if it's detectable.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp	2008-03-15 16:25:55 UTC (rev 24401)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp	2008-03-15 16:35:10 UTC (rev 24402)
@@ -367,6 +367,10 @@
 }
 
 
+/*!	\brief Does a very basic consistency check of the run array.
+	It will check the maximum run count as well as if all of the runs fall
+	within a the volume.
+*/
 status_t
 Journal::_CheckRunArray(const run_array *array)
 {
@@ -402,27 +406,28 @@
 	PRINT(("ReplayRunArray(start = %ld)\n", *_start));
 
 	off_t logOffset = fVolume->ToBlock(fVolume->Log());
-	off_t blockNumber = *_start % fLogSize;
-	int32 blockSize = fVolume->BlockSize();
-	int32 count = 1;
+	off_t firstBlockNumber = *_start % fLogSize;
 
 	CachedBlock cachedArray(fVolume);
 
 	const run_array *array = (const run_array *)cachedArray.SetTo(logOffset
-		+ blockNumber);
+		+ firstBlockNumber);
 	if (array == NULL)
 		return B_IO_ERROR;
 
 	if (_CheckRunArray(array) < B_OK)
 		return B_BAD_DATA;
 
-	blockNumber = (blockNumber + 1) % fLogSize;
+	// First pass: check integrity of the blocks in the run array
 
 	CachedBlock cached(fVolume);
+
+	firstBlockNumber = (firstBlockNumber + 1) % fLogSize;
+	off_t blockNumber = firstBlockNumber;
+	int32 blockSize = fVolume->BlockSize();
+
 	for (int32 index = 0; index < array->CountRuns(); index++) {
 		const block_run &run = array->RunAt(index);
-		INFORM(("replay block run %u:%u:%u in log at %Ld!\n",
-			(int)run.AllocationGroup(), run.Start(), run.Length(), blockNumber));
 
 		off_t offset = fVolume->ToOffset(run);
 		for (int32 i = 0; i < run.Length(); i++) {
@@ -441,6 +446,27 @@
 				}
 			}
 
+			blockNumber = (blockNumber + 1) % fLogSize;
+			offset += blockSize;
+		}
+	}
+
+	// Second pass: write back its blocks
+
+	blockNumber = firstBlockNumber;
+	int32 count = 1;
+
+	for (int32 index = 0; index < array->CountRuns(); index++) {
+		const block_run &run = array->RunAt(index);
+		INFORM(("replay block run %u:%u:%u in log at %Ld!\n",
+			(int)run.AllocationGroup(), run.Start(), run.Length(), blockNumber));
+
+		off_t offset = fVolume->ToOffset(run);
+		for (int32 i = 0; i < run.Length(); i++) {
+			const uint8 *data = cached.SetTo(logOffset + blockNumber);
+			if (data == NULL)
+				RETURN_ERROR(B_IO_ERROR);
+
 			ssize_t written = write_pos(fVolume->Device(), offset, data,
 				blockSize);
 			if (written != blockSize)



From axeld at pinc-software.de  Sat Mar 15 17:40:05 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sat, 15 Mar 2008 17:40:05 +0100 CET
Subject: [Haiku-commits] r24388 - in haiku/trunk:
 headers/private/interface src/servers/app
In-Reply-To: <20080314182201.1303.7@knochen-vm.1205489052.fake>
Message-ID: <22786067623-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > That's why I attribute it to the author in question. The document 
> > has
> > changed so the copyright can be renewed or not? At least I update 
> > the
> > copyright in files I touch (and have written) regardless of how
> > substantial that change was.
> I believe Stippi's point was that you're not the copyright holder in 
> this 
> case, and therefore aren't allowed to change the copyright header at 
> all 
> (the license is pretty explicit in that respect). You can add your 
> own 
> header, though. I think you're always allowed to do that (regardless 
> of how 
> substantial your change was); you might just not be able to defend 
> you 
> copyright claim in court, if it came to that. So unless you just do 
> some 
> coding style cleanup or very small changes, it won't harm to add a 
> header, 
> I guess. Otherwise I'd simply leave the existing header alone.

Okay, I try to adopt this in the future :-)

Bye,
   Axel.



From anevilyak at mail.berlios.de  Sat Mar 15 17:44:11 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 15 Mar 2008 17:44:11 +0100
Subject: [Haiku-commits] r24403 - in haiku/trunk/src: apps/deskbar
	preferences/time
Message-ID: <200803151644.m2FGiBhd007393@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-15 17:44:10 +0100 (Sat, 15 Mar 2008)
New Revision: 24403
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24403&view=rev

Modified:
   haiku/trunk/src/apps/deskbar/TimeView.cpp
   haiku/trunk/src/preferences/time/Time.cpp
   haiku/trunk/src/preferences/time/Time.rdef
Log:
Unify the app signature used everywhere for the time prefs. This fixes dstcheck being unable to actually invoke the 
time prefs if asked to adjust the clock.



Modified: haiku/trunk/src/apps/deskbar/TimeView.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/TimeView.cpp	2008-03-15 16:35:10 UTC (rev 24402)
+++ haiku/trunk/src/apps/deskbar/TimeView.cpp	2008-03-15 16:44:10 UTC (rev 24403)
@@ -227,7 +227,7 @@
 
 		case kMsgChangeClock:
 			// launch the time prefs app
-			be_roster->Launch("application/x-vnd.Be-TIME");
+			be_roster->Launch("application/x-vnd.Haiku-Time");
 			break;
 
 		case 'time':

Modified: haiku/trunk/src/preferences/time/Time.cpp
===================================================================
--- haiku/trunk/src/preferences/time/Time.cpp	2008-03-15 16:35:10 UTC (rev 24402)
+++ haiku/trunk/src/preferences/time/Time.cpp	2008-03-15 16:44:10 UTC (rev 24403)
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 
-const char* kAppSignature = "application/x-vnd.Be-TIME";
+const char* kAppSignature = "application/x-vnd.Haiku-Time";
 
 
 TimeApplication::TimeApplication()

Modified: haiku/trunk/src/preferences/time/Time.rdef
===================================================================
--- haiku/trunk/src/preferences/time/Time.rdef	2008-03-15 16:35:10 UTC (rev 24402)
+++ haiku/trunk/src/preferences/time/Time.rdef	2008-03-15 16:44:10 UTC (rev 24403)
@@ -1,5 +1,5 @@
 
-resource app_signature "application/x-vnd.Be-TIME";
+resource app_signature "application/x-vnd.Haiku-Time";
 
 resource app_flags B_SINGLE_LAUNCH;
 



From axeld at mail.berlios.de  Sat Mar 15 17:59:30 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 15 Mar 2008 17:59:30 +0100
Subject: [Haiku-commits] r24404 - haiku/trunk/src/system/kernel
Message-ID: <200803151659.m2FGxUfS008718@sheep.berlios.de>

Author: axeld
Date: 2008-03-15 17:59:30 +0100 (Sat, 15 Mar 2008)
New Revision: 24404
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24404&view=rev

Added:
   haiku/trunk/src/system/kernel/system_info.cpp
Removed:
   haiku/trunk/src/system/kernel/system_info.c
Modified:
   haiku/trunk/src/system/kernel/Jamfile
Log:
Applied patch by Vasilis:
* Fixed various warnings with GCC4 due to the double sHaikuRevision line.
* Turned system_info.c to a C++ file.
* Minor cleanup.


Modified: haiku/trunk/src/system/kernel/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/Jamfile	2008-03-15 16:44:10 UTC (rev 24403)
+++ haiku/trunk/src/system/kernel/Jamfile	2008-03-15 16:59:30 UTC (rev 24404)
@@ -36,7 +36,7 @@
 	sem.cpp
 	shutdown.c
 	signal.cpp
-	system_info.c
+	system_info.cpp
 	smp.c
 	syscalls.cpp
 	team.cpp

Deleted: haiku/trunk/src/system/kernel/system_info.c

Copied: haiku/trunk/src/system/kernel/system_info.cpp (from rev 24395, haiku/trunk/src/system/kernel/system_info.c)
===================================================================
--- haiku/trunk/src/system/kernel/system_info.c	2008-03-15 11:16:57 UTC (rev 24395)
+++ haiku/trunk/src/system/kernel/system_info.cpp	2008-03-15 16:59:30 UTC (rev 24404)
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2004-2008, Haiku, Inc.
+ * Distributed under the terms of the MIT license.
+ *
+ * Authors:
+ *		Stefano Ceccherini
+ *		Axel D?rfler, axeld at pinc-software.de
+ */
+
+
+#include <system_info.h>
+#include <arch/system_info.h>
+
+#include <string.h>
+
+#include <OS.h>
+#include <KernelExport.h>
+
+#include <cpu.h>
+#include <debug.h>
+#include <kernel.h>
+#include <port.h>
+#include <real_time_clock.h>
+#include <sem.h>
+#include <smp.h>
+#include <team.h>
+#include <thread.h>
+#include <vm.h>
+#include <vm_page.h>
+
+
+const static int64 kKernelVersion = 0x1;
+const static char *kKernelName = "kernel_" HAIKU_ARCH;
+
+
+// Haiku SVN revision. Will be set when copying the kernel to the image.
+// Lives in a separate section so that it can easily be found.
+static uint32 sHaikuRevision __attribute__((section("_haiku_revision")));
+
+
+static int
+dump_info(int argc, char **argv)
+{
+	kprintf("kernel build: %s %s\n\n", __DATE__, __TIME__);
+	kprintf("cpu count: %ld, active times:\n", smp_get_num_cpus());
+
+	for (int32 i = 0; i < smp_get_num_cpus(); i++)
+		kprintf("  [%ld] %Ld\n", i + 1, cpu_get_active_time(i));
+
+	// ToDo: Add page_faults
+	kprintf("pages:\t\t%ld (%ld max)\n", vm_page_num_pages() - vm_page_num_free_pages(),
+		vm_page_num_pages());
+
+	kprintf("sems:\t\t%ld (%ld max)\n", sem_used_sems(), sem_max_sems());
+	kprintf("ports:\t\t%ld (%ld max)\n", port_used_ports(), port_max_ports());
+	kprintf("threads:\t%ld (%ld max)\n", thread_used_threads(), thread_max_threads());
+	kprintf("teams:\t\t%ld (%ld max)\n", team_used_teams(), team_max_teams());
+
+	return 0;
+}
+
+
+//	#pragma mark -
+
+
+status_t
+_get_system_info(system_info *info, size_t size)
+{
+	if (size != sizeof(system_info))
+		return B_BAD_VALUE;
+
+	memset(info, 0, sizeof(system_info));
+
+	info->boot_time = rtc_boot_time();
+	info->cpu_count = smp_get_num_cpus();
+
+	for (int32 i = 0; i < info->cpu_count; i++)
+		info->cpu_infos[i].active_time = cpu_get_active_time(i);
+
+	// ToDo: Add page_faults
+	info->max_pages = vm_page_num_pages();
+	info->used_pages = vm_page_num_pages() - vm_page_num_free_pages();
+
+	info->used_threads = thread_used_threads();
+	info->max_threads = thread_max_threads();
+	info->used_teams = team_used_teams();
+	info->max_teams = team_max_teams();
+	info->used_ports = port_used_ports();
+	info->max_ports = port_max_ports();
+	info->used_sems = sem_used_sems();
+	info->max_sems = sem_max_sems();
+
+	info->kernel_version = kKernelVersion;
+	strlcpy(info->kernel_name, kKernelName, B_FILE_NAME_LENGTH);
+	strlcpy(info->kernel_build_date, __DATE__, B_OS_NAME_LENGTH);
+	strlcpy(info->kernel_build_time, __TIME__, B_OS_NAME_LENGTH);
+
+	// all other stuff is architecture specific
+	return arch_get_system_info(info, size);
+}
+
+
+status_t 
+system_info_init(struct kernel_args *args)
+{
+	add_debugger_command("info", &dump_info, "System info");
+
+	return arch_system_info_init(args);
+}
+
+
+uint32
+get_haiku_revision(void)
+{
+	return sHaikuRevision;
+}
+
+
+//	#pragma mark -
+
+
+status_t
+_user_get_system_info(system_info *userInfo, size_t size)
+{
+	// The BeBook says get_system_info() always returns B_OK,
+	// but that ain't true with invalid addresses
+	if (userInfo == NULL || !IS_USER_ADDRESS(userInfo))
+		return B_BAD_ADDRESS;
+
+	system_info info;
+	status_t status = _get_system_info(&info, size);
+	if (status == B_OK) {
+		if (user_memcpy(userInfo, &info, sizeof(system_info)) < B_OK)
+			return B_BAD_ADDRESS;
+
+		return B_OK;
+	}
+
+	return status;
+}



From mmlr at mail.berlios.de  Sat Mar 15 18:35:35 2008
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sat, 15 Mar 2008 18:35:35 +0100
Subject: [Haiku-commits] r24405 - haiku/trunk/src/system/kernel
Message-ID: <200803151735.m2FHZZs2020275@sheep.berlios.de>

Author: mmlr
Date: 2008-03-15 18:35:34 +0100 (Sat, 15 Mar 2008)
New Revision: 24405
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24405&view=rev

Modified:
   haiku/trunk/src/system/kernel/heap.cpp
Log:
Use the empty_index field as the allocation_id for large allocations and just
use the index of the first page of the allocation as an id. This removes the
need for separate id generation. This also fixes the possible problem of
multiple large allocations getting the same allocation_id (due to the limited
range of possible ids), which in the worst case (i.e. for adjacent allocations)
could cause pages to be freed that were still in use.

Modified: haiku/trunk/src/system/kernel/heap.cpp
===================================================================
--- haiku/trunk/src/system/kernel/heap.cpp	2008-03-15 16:59:30 UTC (rev 24404)
+++ haiku/trunk/src/system/kernel/heap.cpp	2008-03-15 17:35:34 UTC (rev 24405)
@@ -59,7 +59,7 @@
 } heap_page;
 
 // used for bin == bin_count allocations
-#define allocation_id free_count
+#define allocation_id empty_index
 
 typedef struct heap_bin_s {
 	uint32		element_size;
@@ -71,7 +71,6 @@
 	addr_t		base;
 	size_t		size;
 	mutex		lock;
-	vint32		large_alloc_id;
 
 	uint32		bin_count;
 	uint32		page_count;
@@ -536,13 +535,6 @@
 }
 
 
-static inline uint32
-heap_next_alloc_id(heap_allocator *heap)
-{
-	return atomic_add(&heap->large_alloc_id, 1) & ((1 << 9) - 1);
-}
-
-
 static inline void
 heap_link_page(heap_page *page, heap_page **list)
 {
@@ -672,7 +664,6 @@
 		return NULL;
 	}
 
-	uint32 allocationID = heap_next_alloc_id(heap);
 	uint32 pageCount = (size + B_PAGE_SIZE - 1) / B_PAGE_SIZE;
 	for (uint32 i = first; i < first + pageCount; i++) {
 		heap_page *page = &heap->page_table[i];
@@ -683,7 +674,7 @@
 
 		page->next = page->prev = NULL;
 		page->free_list = NULL;
-		page->allocation_id = allocationID;
+		page->allocation_id = (uint16)first;
 	}
 
 #if KERNEL_HEAP_LEAK_CHECK



From bonefish at mail.berlios.de  Sat Mar 15 19:41:47 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 15 Mar 2008 19:41:47 +0100
Subject: [Haiku-commits] r24406 - in haiku/trunk: build/jam headers/posix
Message-ID: <200803151841.m2FIflSq004614@sheep.berlios.de>

Author: bonefish
Date: 2008-03-15 19:41:46 +0100 (Sat, 15 Mar 2008)
New Revision: 24406
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24406&view=rev

Removed:
   haiku/trunk/headers/posix/stddef.h
Modified:
   haiku/trunk/build/jam/HeadersRules
   haiku/trunk/headers/posix/size_t.h
   haiku/trunk/headers/posix/wchar.h
   haiku/trunk/headers/posix/wchar_t.h
Log:
* Removed our stddef.h. We don't need it, since gcc comes with one that
  under Haiku overrides ours anyway.
* Adjusted size_t.h, wchar_t.h, wchar.h accordingly. This should fix the
  annoying "ssize_t redefined" warnings when compiling under Haiku.
* When building Haiku the gcc headers come first in the include
  search path now, as it should be. The respective TODO suggested that
  this might break the build depending on compiler version and host
  platform. I've tested with Linux gcc 2 and gcc 4, which work fine.


Modified: haiku/trunk/build/jam/HeadersRules
===================================================================
--- haiku/trunk/build/jam/HeadersRules	2008-03-15 17:35:34 UTC (rev 24405)
+++ haiku/trunk/build/jam/HeadersRules	2008-03-15 18:41:46 UTC (rev 24406)
@@ -365,8 +365,11 @@
 					   kernel media mail midi midi2 net opengl storage support
 					   translation ;
 
+	# GCC headers
+	local headers = $(HAIKU_GCC_HEADERS_DIR) ;
+
 	# Use headers directory, to allow to do things like include <posix/string.h>
-	local headers = [ FDirName $(HAIKU_TOP) headers ] ;
+	headers += [ FDirName $(HAIKU_TOP) headers ] ;
 
 	# Use posix headers directory
 	headers += [ FDirName $(HAIKU_TOP) headers posix ] ;
@@ -392,15 +395,6 @@
 		headers += [ FDirName $(HAIKU_TOP) headers cpp ] ;
 	}
 
-	# The compiler dependent headers.
-	# TODO: Actually these directory should be listed before the posix and cpp
-	# directories, since the headers found here are supposed to override some of
-	# the headers in the latter directories. Unfortunately some of our headers
-	# are a bit messy (e.g. stddef.h) and using the compiler headers causes
-	# trouble when using different compilers (gcc 2 vs. gcc 4) and different
-	# host platforms (BeOS vs. Linux).
-	headers += $(HAIKU_GCC_HEADERS_DIR) ;
-
 	return $(headers) ;
 }
 

Modified: haiku/trunk/headers/posix/size_t.h
===================================================================
--- haiku/trunk/headers/posix/size_t.h	2008-03-15 17:35:34 UTC (rev 24405)
+++ haiku/trunk/headers/posix/size_t.h	2008-03-15 18:41:46 UTC (rev 24406)
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2008, Haiku Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _SIZE_T_H_
 #define _SIZE_T_H_
 
-typedef unsigned long       size_t;
-typedef signed long         ssize_t;
+#include <stddef.h>
 
+// TODO: ATM gcc's stddef.h defines ssize_t for BeOS.h. We should fix this.
+//typedef long signed int		ssize_t;
+
 #endif /* _SIZE_T_H_ */

Deleted: haiku/trunk/headers/posix/stddef.h

Modified: haiku/trunk/headers/posix/wchar.h
===================================================================
--- haiku/trunk/headers/posix/wchar.h	2008-03-15 17:35:34 UTC (rev 24405)
+++ haiku/trunk/headers/posix/wchar.h	2008-03-15 18:41:46 UTC (rev 24406)
@@ -7,11 +7,22 @@
 #ifndef _WCHAR_H
 #define _WCHAR_H
 
-#include <wchar_t.h>
+#include <stddef.h>
 #include <stdio.h>
 
+// stddef.h is not supposed to define wint_t, but gcc 2.95.3's one does.
+// In all other cases we will do that.
+#ifndef _WINT_T
 #define _WINT_T
-typedef unsigned int wint_t;
+
+#ifndef __WINT_TYPE__
+#define __WINT_TYPE__ unsigned int
+#endif
+
+typedef __WINT_TYPE__ wint_t;
+
+#endif	// _WINT_T
+
 typedef int wctype_t;
 
 typedef struct {
@@ -19,7 +30,6 @@
 	wint_t	__value;
 } mbstate_t;
 
-#include <size_t.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: haiku/trunk/headers/posix/wchar_t.h
===================================================================
--- haiku/trunk/headers/posix/wchar_t.h	2008-03-15 17:35:34 UTC (rev 24405)
+++ haiku/trunk/headers/posix/wchar_t.h	2008-03-15 18:41:46 UTC (rev 24406)
@@ -1,15 +1,7 @@
 /*
- * Copyright (C) 2002 Marcus Overhagen
- * All rights reserved.
- *
- * Distributed under the terms of the MIT license
+ * Copyright 2008, Haiku Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
  */
-#ifndef _WCHAR_T_H
-#define _WCHAR_T_H
 
-#if !defined(__cplusplus) || __GNUC__ < 3
-typedef unsigned short wchar_t;
-#endif
-
-#endif	/* _WCHAR_T_H */
-
+// Include GCC's stddef.h. It defines wchar_t.
+#include <stddef.h>



From bonefish at mail.berlios.de  Sat Mar 15 19:49:48 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 15 Mar 2008 19:49:48 +0100
Subject: [Haiku-commits] r24407 - haiku/trunk/src/system/kernel
Message-ID: <200803151849.m2FInmWr005228@sheep.berlios.de>

Author: bonefish
Date: 2008-03-15 19:49:48 +0100 (Sat, 15 Mar 2008)
New Revision: 24407
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24407&view=rev

Modified:
   haiku/trunk/src/system/kernel/heap.cpp
Log:
Use a union instead of the macro.


Modified: haiku/trunk/src/system/kernel/heap.cpp
===================================================================
--- haiku/trunk/src/system/kernel/heap.cpp	2008-03-15 18:41:46 UTC (rev 24406)
+++ haiku/trunk/src/system/kernel/heap.cpp	2008-03-15 18:49:48 UTC (rev 24407)
@@ -54,13 +54,13 @@
 	uint16			in_use : 1;
 	heap_page_s *	next;
 	heap_page_s *	prev;
-	uint16			empty_index;
+	union {
+		uint16			empty_index;
+		uint16			allocation_id; // used for bin == bin_count allocations
+	};
 	addr_t *		free_list;
 } heap_page;
 
-// used for bin == bin_count allocations
-#define allocation_id empty_index
-
 typedef struct heap_bin_s {
 	uint32		element_size;
 	uint16		max_free_count;



From bonefish at mail.berlios.de  Sat Mar 15 20:23:05 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 15 Mar 2008 20:23:05 +0100
Subject: [Haiku-commits] r24408 - in haiku/trunk: build/jam headers/posix
Message-ID: <200803151923.m2FJN5F0008199@sheep.berlios.de>

Author: bonefish
Date: 2008-03-15 20:23:05 +0100 (Sat, 15 Mar 2008)
New Revision: 24408
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24408&view=rev

Added:
   haiku/trunk/headers/posix/stddef.h
Modified:
   haiku/trunk/build/jam/HeadersRules
   haiku/trunk/headers/posix/size_t.h
   haiku/trunk/headers/posix/wchar.h
   haiku/trunk/headers/posix/wchar_t.h
Log:
Reverted r24406. If it builds, it doesn't always work as well. The
change resulted in "version mismatch between boot loader and kernel". So
apparently the size of some type changed unintentionally.


Modified: haiku/trunk/build/jam/HeadersRules
===================================================================
--- haiku/trunk/build/jam/HeadersRules	2008-03-15 18:49:48 UTC (rev 24407)
+++ haiku/trunk/build/jam/HeadersRules	2008-03-15 19:23:05 UTC (rev 24408)
@@ -365,11 +365,8 @@
 					   kernel media mail midi midi2 net opengl storage support
 					   translation ;
 
-	# GCC headers
-	local headers = $(HAIKU_GCC_HEADERS_DIR) ;
-
 	# Use headers directory, to allow to do things like include <posix/string.h>
-	headers += [ FDirName $(HAIKU_TOP) headers ] ;
+	local headers = [ FDirName $(HAIKU_TOP) headers ] ;
 
 	# Use posix headers directory
 	headers += [ FDirName $(HAIKU_TOP) headers posix ] ;
@@ -395,6 +392,15 @@
 		headers += [ FDirName $(HAIKU_TOP) headers cpp ] ;
 	}
 
+	# The compiler dependent headers.
+	# TODO: Actually these directory should be listed before the posix and cpp
+	# directories, since the headers found here are supposed to override some of
+	# the headers in the latter directories. Unfortunately some of our headers
+	# are a bit messy (e.g. stddef.h) and using the compiler headers causes
+	# trouble when using different compilers (gcc 2 vs. gcc 4) and different
+	# host platforms (BeOS vs. Linux).
+	headers += $(HAIKU_GCC_HEADERS_DIR) ;
+
 	return $(headers) ;
 }
 

Modified: haiku/trunk/headers/posix/size_t.h
===================================================================
--- haiku/trunk/headers/posix/size_t.h	2008-03-15 18:49:48 UTC (rev 24407)
+++ haiku/trunk/headers/posix/size_t.h	2008-03-15 19:23:05 UTC (rev 24408)
@@ -1,13 +1,7 @@
-/*
- * Copyright 2008, Haiku Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
- */
 #ifndef _SIZE_T_H_
 #define _SIZE_T_H_
 
-#include <stddef.h>
+typedef unsigned long       size_t;
+typedef signed long         ssize_t;
 
-// TODO: ATM gcc's stddef.h defines ssize_t for BeOS.h. We should fix this.
-//typedef long signed int		ssize_t;
-
 #endif /* _SIZE_T_H_ */

Copied: haiku/trunk/headers/posix/stddef.h (from rev 24405, haiku/trunk/headers/posix/stddef.h)

Modified: haiku/trunk/headers/posix/wchar.h
===================================================================
--- haiku/trunk/headers/posix/wchar.h	2008-03-15 18:49:48 UTC (rev 24407)
+++ haiku/trunk/headers/posix/wchar.h	2008-03-15 19:23:05 UTC (rev 24408)
@@ -7,22 +7,11 @@
 #ifndef _WCHAR_H
 #define _WCHAR_H
 
-#include <stddef.h>
+#include <wchar_t.h>
 #include <stdio.h>
 
-// stddef.h is not supposed to define wint_t, but gcc 2.95.3's one does.
-// In all other cases we will do that.
-#ifndef _WINT_T
 #define _WINT_T
-
-#ifndef __WINT_TYPE__
-#define __WINT_TYPE__ unsigned int
-#endif
-
-typedef __WINT_TYPE__ wint_t;
-
-#endif	// _WINT_T
-
+typedef unsigned int wint_t;
 typedef int wctype_t;
 
 typedef struct {
@@ -30,6 +19,7 @@
 	wint_t	__value;
 } mbstate_t;
 
+#include <size_t.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: haiku/trunk/headers/posix/wchar_t.h
===================================================================
--- haiku/trunk/headers/posix/wchar_t.h	2008-03-15 18:49:48 UTC (rev 24407)
+++ haiku/trunk/headers/posix/wchar_t.h	2008-03-15 19:23:05 UTC (rev 24408)
@@ -1,7 +1,15 @@
 /*
- * Copyright 2008, Haiku Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
+ * Copyright (C) 2002 Marcus Overhagen
+ * All rights reserved.
+ *
+ * Distributed under the terms of the MIT license
  */
+#ifndef _WCHAR_T_H
+#define _WCHAR_T_H
 
-// Include GCC's stddef.h. It defines wchar_t.
-#include <stddef.h>
+#if !defined(__cplusplus) || __GNUC__ < 3
+typedef unsigned short wchar_t;
+#endif
+
+#endif	/* _WCHAR_T_H */
+



From anevilyak at mail.berlios.de  Sun Mar 16 06:55:28 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sun, 16 Mar 2008 06:55:28 +0100
Subject: [Haiku-commits] r24409 - haiku/trunk/src/kits/interface
Message-ID: <200803160555.m2G5tSj9015887@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-16 06:55:25 +0100 (Sun, 16 Mar 2008)
New Revision: 24409
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24409&view=rev

Modified:
   haiku/trunk/src/kits/interface/Shelf.cpp
Log:
Implement save/restoring replicants in BShelf. This results in
Tracker now persisting its desktop replicants across sessions.
This may not completely handle zombies properly though, I had
nothing to test that case with.



Modified: haiku/trunk/src/kits/interface/Shelf.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Shelf.cpp	2008-03-15 19:23:05 UTC (rev 24408)
+++ haiku/trunk/src/kits/interface/Shelf.cpp	2008-03-16 05:55:25 UTC (rev 24409)
@@ -116,6 +116,8 @@
 	static int32 IndexOf(BList const *list, BMessage const *msg);
 	static int32 IndexOf(BList const *list, BView const *view, bool allowZombie);
 	static int32 IndexOf(BList const *list, unsigned long id);
+	
+	status_t Archive(BMessage *msg);
 
 	BMessage*			message;
 	BView*				view;
@@ -228,7 +230,25 @@
 {
 }
 
+status_t
+replicant_data::Archive(BMessage* msg)
+{
+	status_t result = B_ERROR;
+	if (message) {
+		msg->AddMessage("message", message);
+		msg->AddInt32("uniqueid", id);
+		BPoint pos (0,0);
+		if (view) 
+			pos = view->Frame().LeftTop();
+		else if (zombie_view)
+			pos = zombie_view->Frame().LeftTop();
+		msg->AddPoint("position", pos);
+		result = B_OK;
+	}
 
+	return result;
+}
+
 //static
 replicant_data *
 replicant_data::Find(BList const *list, BMessage const *msg)
@@ -1012,10 +1032,14 @@
 	data->AddInt32("_sg_cnt", fGenCount);
 
 	BMessage archive('ARCV');
-
-	// TODO archive replicants
-
-	return B_ERROR;
+	
+	for (int32 i = 0; i < fReplicants.CountItems(); i++) {
+		if (((replicant_data *)fReplicants.ItemAt(i))->Archive(&archive) == B_OK)
+			data->AddMessage("replicant", &archive);
+		archive.MakeEmpty();
+	}
+	
+	return B_OK;
 }
 
 
@@ -1063,7 +1087,15 @@
 			if (!archive.FindInt32("_sg_cnt", &genCount))
 				genCount = 1;
 
-			// TODO find archived replicants
+			BMessage replicant;
+			BMessage *replmsg = NULL;
+			for (int32 i = 0; archive.FindMessage("replicant", i, &replicant) == B_OK; i++) {
+				BPoint point;
+				replmsg = new BMessage();
+				replicant.FindPoint("position", &point);
+				replicant.FindMessage("message", replmsg);
+				AddReplicant(replmsg, point);				
+			}
 		}
 	}
 }



From axeld at pinc-software.de  Sun Mar 16 11:09:23 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Sun, 16 Mar 2008 11:09:23 +0100 CET
Subject: [Haiku-commits] r24409 - haiku/trunk/src/kits/interface
In-Reply-To: <200803160555.m2G5tSj9015887@sheep.berlios.de>
Message-ID: <1395108830-BeMail@zon>

anevilyak at BerliOS <anevilyak at mail.berlios.de> wrote:
> Log:
> Implement save/restoring replicants in BShelf. This results in
> Tracker now persisting its desktop replicants across sessions.
> This may not completely handle zombies properly though, I had
> nothing to test that case with.

Just remove the "addon" and/or "class" fields of the archived BMessage, 
and you should get a zombie to play with :-)

Bye,
   Axel.



From jonas at kirilla.com  Sun Mar 16 12:00:10 2008
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Sun, 16 Mar 2008 12:00:10 +0100 CET
Subject: [Haiku-commits] r24408 - in haiku/trunk: build/jam headers/posix
In-Reply-To: <200803151923.m2FJN5F0008199@sheep.berlios.de>
Message-ID: <993141390-BeMail@kirilla>

bonefish at BerliOS <bonefish at mail.berlios.de> wrote:
> Author: bonefish
> Date: 2008-03-15 20:23:05 +0100 (Sat, 15 Mar 2008)
> New Revision: 24408
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24408&view=rev
> 
> Added:
>    haiku/trunk/headers/posix/stddef.h
> Modified:
>    haiku/trunk/build/jam/HeadersRules
>    haiku/trunk/headers/posix/size_t.h
>    haiku/trunk/headers/posix/wchar.h
>    haiku/trunk/headers/posix/wchar_t.h
> Log:
> Reverted r24406. If it builds, it doesn't always work as well.

FWIW r24408 un-breaks the build on R5/Bone.

/Jonas.



From ingo_weinhold at gmx.de  Sun Mar 16 15:38:37 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Sun, 16 Mar 2008 15:38:37 +0100
Subject: [Haiku-commits] r24408 - in haiku/trunk: build/jam headers/posix
In-Reply-To: <993141390-BeMail@kirilla>
References: <993141390-BeMail@kirilla>
Message-ID: <20080316153837.380.1@knochen-vm.1205678060.fake>


On 2008-03-16 at 12:00:10 [+0100], Jonas Sundstr?m <jonas at kirilla.com> 
wrote:
> bonefish at BerliOS <bonefish at mail.berlios.de> wrote:
> > Author: bonefish
> > Date: 2008-03-15 20:23:05 +0100 (Sat, 15 Mar 2008)
> > New Revision: 24408
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24408&view=rev
> > 
> > Added:
> >    haiku/trunk/headers/posix/stddef.h
> > Modified:
> >    haiku/trunk/build/jam/HeadersRules
> >    haiku/trunk/headers/posix/size_t.h
> >    haiku/trunk/headers/posix/wchar.h
> >    haiku/trunk/headers/posix/wchar_t.h
> > Log:
> > Reverted r24406. If it builds, it doesn't always work as well.
> 
> FWIW r24408 un-breaks the build on R5/Bone.

I didn't know it was still broken -- I though Axel fixed the problems I 
introduced. Or is that something new?

CU, Ingo


From anevilyak at gmail.com  Sun Mar 16 16:20:29 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Sun, 16 Mar 2008 10:20:29 -0500
Subject: [Haiku-commits] r24409 - haiku/trunk/src/kits/interface
In-Reply-To: <1395108830-BeMail@zon>
References: <200803160555.m2G5tSj9015887@sheep.berlios.de>
	<1395108830-BeMail@zon>
Message-ID: <f019d2f30803160820h60073390q1dfc2966b1d80366@mail.gmail.com>

> anevilyak at BerliOS <anevilyak at mail.berlios.de> wrote:
>  > Log:
>  > Implement save/restoring replicants in BShelf. This results in
>  > Tracker now persisting its desktop replicants across sessions.
>  > This may not completely handle zombies properly though, I had
>  > nothing to test that case with.
>
>  Just remove the "addon" and/or "class" fields of the archived BMessage,
>  and you should get a zombie to play with :-)
>

Oh? I thought that would fail to instantiate completely, the only time
I've seen a zombie in the past is when using a replicant that needed a
shared lib that wasn't in the correct spot (i.e. Soundplay if you
didn't move liblayout to config/lib).

Thanks for the tip :)

Rene


From jonas at kirilla.com  Sun Mar 16 16:33:53 2008
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Sun, 16 Mar 2008 16:33:53 +0100 CET
Subject: [Haiku-commits] r24408 - in haiku/trunk: build/jam headers/posix
In-Reply-To: <20080316153837.380.1@knochen-vm.1205678060.fake>
Message-ID: <3024966360-BeMail@kirilla>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
 ... 
> I didn't know it was still broken -- I though Axel fixed the
> problems I introduced. Or is that something new?

r24408 builds again. That's why I wrote un-break.

/Jonas.


From ingo_weinhold at gmx.de  Sun Mar 16 16:38:41 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Sun, 16 Mar 2008 16:38:41 +0100
Subject: [Haiku-commits] r24408 - in haiku/trunk: build/jam headers/posix
In-Reply-To: <3024966360-BeMail@kirilla>
References: <3024966360-BeMail@kirilla>
Message-ID: <20080316163841.496.2@knochen-vm.1205678060.fake>


On 2008-03-16 at 16:33:53 [+0100], Jonas Sundstr?m <jonas at kirilla.com> 
wrote:
> Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
>  ...
> > I didn't know it was still broken -- I though Axel fixed the
> > problems I introduced. Or is that something new?
> 
> r24408 builds again. That's why I wrote un-break.

Ah, sorry, misread you. I'm going to reintroduce r24406 with some more 
changes. Do you remember what it broke?

CU, Ingo


From jonas at kirilla.com  Sun Mar 16 16:51:26 2008
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Sun, 16 Mar 2008 16:51:26 +0100 CET
Subject: [Haiku-commits] r24408 - in haiku/trunk: build/jam headers/posix
In-Reply-To: <20080316163841.496.2@knochen-vm.1205678060.fake>
Message-ID: <4077430548-BeMail@kirilla>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> 
> On 2008-03-16 at 16:33:53 [+0100], Jonas Sundstr?m <jonas at kirilla.com
> > 
> wrote:
> > Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> >  ...
> > > I didn't know it was still broken -- I though Axel fixed the
> > > problems I introduced. Or is that something new?
> > 
> > r24408 builds again. That's why I wrote un-break.
> 
> Ah, sorry, misread you. I'm going to reintroduce r24406 with some 
> more 
> changes. Do you remember what it broke?

No, and I regret not saving the output. It's a bit of a hassle - in 
jamhours - but I can do it if it helps knowing.

/Jonas.



From axeld at mail.berlios.de  Sun Mar 16 16:53:42 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 16 Mar 2008 16:53:42 +0100
Subject: [Haiku-commits] r24410 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803161553.m2GFrgdN000913@sheep.berlios.de>

Author: axeld
Date: 2008-03-16 16:53:42 +0100 (Sun, 16 Mar 2008)
New Revision: 24410
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24410&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp
Log:
* Fixed another big bug in the logging code: I obviously got confused
  what RunArrays::Length() meant; it should have been the length of a
  log entry, but was only the block count.
* Now I've improved naming and fixed initializing the LogEntry with a 
  wrong size, causing subsequent log entries to lose track in the log
  (the log_start pointer got wrong, so BFS would not be able to replay
  such a log).
* This at least fixes one part of the problem of bug #1911.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp	2008-03-16 05:55:25 UTC (rev 24409)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp	2008-03-16 15:53:42 UTC (rev 24410)
@@ -36,13 +36,14 @@
 		RunArrays(Journal *journal);
 		~RunArrays();
 
-		uint32 Length() const { return fLength; }
-
 		status_t Insert(off_t blockNumber);
 
 		run_array *ArrayAt(int32 i) { return fArrays.Array()[i]; }
 		int32 CountArrays() const { return fArrays.CountItems(); }
 
+		uint32 CountBlocks() const { return fBlockCount; }
+		uint32 LogEntryLength() const { return CountBlocks() + CountArrays(); }
+
 		int32 MaxArrayLength();
 
 	private:
@@ -51,7 +52,7 @@
 		bool _AddRun(block_run &run);
 
 		Journal		*fJournal;
-		uint32		fLength;
+		uint32		fBlockCount;
 		Stack<run_array *> fArrays;
 		run_array	*fLastArray;
 };
@@ -213,7 +214,7 @@
 RunArrays::RunArrays(Journal *journal)
 	:
 	fJournal(journal),
-	fLength(0),
+	fBlockCount(0),
 	fArrays(),
 	fLastArray(NULL)
 {
@@ -266,7 +267,7 @@
 		return false;
 
 	fLastArray->Insert(run);
-	fLength++;
+	fBlockCount++;
 	return true;
 }
 
@@ -639,7 +640,7 @@
 		}
 	}
 
-	if (runArrays.Length() == 0) {
+	if (runArrays.CountBlocks() == 0) {
 		// nothing has changed during this transaction
 		if (detached) {
 			fTransactionID = cache_detach_sub_transaction(fVolume->BlockCache(),
@@ -729,7 +730,7 @@
 	free(vecs);
 
 	LogEntry *logEntry = new LogEntry(this, fVolume->LogEnd(),
-		runArrays.Length());
+		runArrays.LogEntryLength());
 	if (logEntry == NULL) {
 		FATAL(("no memory to allocate log entries!"));
 		return B_NO_MEMORY;



From axeld at mail.berlios.de  Sun Mar 16 17:26:05 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 16 Mar 2008 17:26:05 +0100
Subject: [Haiku-commits] r24411 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803161626.m2GGQ5ux003588@sheep.berlios.de>

Author: axeld
Date: 2008-03-16 17:26:05 +0100 (Sun, 16 Mar 2008)
New Revision: 24411
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24411&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
Log:
* _SeekDown() now checks if it has already reached the maximum tree
  depth, and will bail out if it hasn't reached the leaf level then.
* This should at least avoid the crash of bug #1911; there is not much
  more I can do about that.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp	2008-03-16 15:53:42 UTC (rev 24410)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp	2008-03-16 16:26:05 UTC (rev 24411)
@@ -59,7 +59,7 @@
 // Since BFS supports block sizes of 1024 bytes or greater, and the node size
 // is hard-coded to 1024 bytes, that's not an issue now.
 
-void 
+void
 CachedNode::UnsetUnchanged(Transaction &transaction)
 {
 	if (fTree == NULL || fTree->fStream == NULL)
@@ -75,7 +75,7 @@
 }
 
 
-void 
+void
 CachedNode::Unset()
 {
 	if (fTree == NULL || fTree->fStream == NULL)
@@ -504,7 +504,7 @@
 }
 
 
-int32 
+int32
 BPlusTree::TypeCodeToKeyType(type_code code)
 {
 	switch (code) {
@@ -530,7 +530,7 @@
 }
 
 
-int32 
+int32
 BPlusTree::ModeToKeyType(mode_t mode)
 {
 	switch (mode & (S_STR_INDEX | S_INT_INDEX | S_UINT_INDEX | S_LONG_LONG_INDEX
@@ -588,7 +588,7 @@
 }
 
 
-void 
+void
 BPlusTree::_RemoveIterator(TreeIterator *iterator)
 {
 	if (fIteratorLock.Lock() < B_OK)
@@ -723,13 +723,18 @@
 		if (status == B_ENTRY_NOT_FOUND && nextOffset == nodeAndKey.nodeOffset)
 			RETURN_ERROR(B_ERROR);
 
+		if ((uint32)stack.CountItems() > fHeader->MaxNumberOfLevels()) {
+			dprintf("BPlusTree::_SeekDown() node walked too deep.\n");
+			break;
+		}
+
 		// put the node offset & the correct keyIndex on the stack
 		stack.Push(nodeAndKey);
 
 		nodeAndKey.nodeOffset = nextOffset;
 	}
 
-	FATAL(("BPlusTree::SeekDown() could not open node %Ld\n",
+	FATAL(("BPlusTree::_SeekDown() could not open node %Ld\n",
 		nodeAndKey.nodeOffset));
 	return B_ERROR;
 }
@@ -814,7 +819,7 @@
 			if (array->count < NUM_FRAGMENT_VALUES) {
 				array->Insert(value);
 			} else {
-				// test if the fragment will be empty if we remove this key's values			
+				// test if the fragment will be empty if we remove this key's values
 				if (duplicate->FragmentsUsed(fNodeSize) < 2) {
 					// the node will be empty without our values, so let us
 					// reuse it as a duplicate node
@@ -1353,7 +1358,7 @@
 					otherOffset, &nodeAndKey.keyIndex, keyBuffer, &keyLength,
 					&value) < B_OK) {
 				// free root node & other node here
-				cachedOther.Free(transaction, otherOffset);					
+				cachedOther.Free(transaction, otherOffset);
 				cachedNewRoot.Free(transaction, newRoot);
 
 				RETURN_ERROR(B_ERROR);
@@ -1951,11 +1956,11 @@
 {
 	if (fTree == NULL)
 		return B_INTERRUPTED;
-	
+
 	bool forward = direction == BPLUSTREE_FORWARD;
 
 	if (fCurrentNodeOffset == BPLUSTREE_NULL
-		&& Goto(forward ? BPLUSTREE_BEGIN : BPLUSTREE_END) < B_OK) 
+		&& Goto(forward ? BPLUSTREE_BEGIN : BPLUSTREE_END) < B_OK)
 		RETURN_ERROR(B_ERROR);
 
 	// if the tree was emptied since the last call
@@ -2089,7 +2094,7 @@
 	sets the current position in the iterator, regardless of if the
 	key could be found or not.
 */
-status_t 
+status_t
 TreeIterator::Find(const uint8 *key, uint16 keyLength)
 {
 	if (fTree == NULL)
@@ -2126,14 +2131,14 @@
 }
 
 
-void 
+void
 TreeIterator::SkipDuplicates()
 {
 	fDuplicateNode = BPLUSTREE_NULL;
 }
 
 
-void 
+void
 TreeIterator::Update(off_t offset, off_t nextOffset, uint16 keyIndex, uint16 splitAt, int8 change)
 {
 	if (offset != fCurrentNodeOffset)
@@ -2157,7 +2162,7 @@
 }
 
 
-void 
+void
 TreeIterator::Stop()
 {
 	fTree = NULL;
@@ -2165,7 +2170,7 @@
 
 
 #ifdef DEBUG
-void 
+void
 TreeIterator::Dump()
 {
 	__out("TreeIterator at %p:\n", this);
@@ -2183,7 +2188,7 @@
 //	#pragma mark -
 
 
-void 
+void
 bplustree_node::Initialize()
 {
 	left_link = right_link = overflow_link = HOST_ENDIAN_TO_BFS_INT64((uint64)BPLUSTREE_NULL);



From ingo_weinhold at gmx.de  Sun Mar 16 17:28:04 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Sun, 16 Mar 2008 17:28:04 +0100
Subject: [Haiku-commits] r24408 - in haiku/trunk: build/jam headers/posix
In-Reply-To: <4077430548-BeMail@kirilla>
References: <4077430548-BeMail@kirilla>
Message-ID: <20080316172804.548.3@knochen-vm.1205678060.fake>


On 2008-03-16 at 16:51:26 [+0100], Jonas Sundstr?m <jonas at kirilla.com> 
wrote:
> Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > On 2008-03-16 at 16:33:53 [+0100], Jonas Sundstr?m <jonas at kirilla.com
> > wrote:
> > > Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > >  ...
> > > > I didn't know it was still broken -- I though Axel fixed the
> > > > problems I introduced. Or is that something new?
> > > 
> > > r24408 builds again. That's why I wrote un-break.
> > 
> > Ah, sorry, misread you. I'm going to reintroduce r24406 with some
> > more
> > changes. Do you remember what it broke?
> 
> No, and I regret not saving the output. It's a bit of a hassle - in
> jamhours - but I can do it if it helps knowing.

No, I think I've an idea what would go wrong: Haiku can't be compiled with 
BeOS's gcc headers. I think I'll just find a cozy place in the repository 
for Haiku's gcc headers and force them to be used instead.

CU, Ingo


From bonefish at mail.berlios.de  Sun Mar 16 17:39:06 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 16 Mar 2008 17:39:06 +0100
Subject: [Haiku-commits] r24412 - in haiku/trunk: build/scripts headers/posix
Message-ID: <200803161639.m2GGd6EX004693@sheep.berlios.de>

Author: bonefish
Date: 2008-03-16 17:39:06 +0100 (Sun, 16 Mar 2008)
New Revision: 24412
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24412&view=rev

Modified:
   haiku/trunk/build/scripts/build_cross_tools
   haiku/trunk/headers/posix/math.h
Log:
Define HUGE_VAL in <math.h> conditionally. That's what gcc's fixincludes
hack math_huge_val_ifndef does, anyway. We do it ourselves and remove
the therefore superfluous gcc math.h header.


Modified: haiku/trunk/build/scripts/build_cross_tools
===================================================================
--- haiku/trunk/build/scripts/build_cross_tools	2008-03-16 16:26:05 UTC (rev 24411)
+++ haiku/trunk/build/scripts/build_cross_tools	2008-03-16 16:39:06 UTC (rev 24412)
@@ -121,7 +121,12 @@
 	exit 1
 }
 
+# Remove the math.h gcc header. It has been generated by fixincludes
+# (unconditional hack: math_huge_val_ifndef) from ours and it is semantically
+# equivalent.
+rm $installDir/lib/gcc-lib/i586-pc-beos/$haikuRequiredLegacyGCCVersion/include/math.h
 
+
 # cleanup
 
 # remove the system headers from the installation dir

Modified: haiku/trunk/headers/posix/math.h
===================================================================
--- haiku/trunk/headers/posix/math.h	2008-03-16 16:26:05 UTC (rev 24411)
+++ haiku/trunk/headers/posix/math.h	2008-03-16 16:39:06 UTC (rev 24412)
@@ -26,7 +26,9 @@
 /* platform independent IEEE floating point special values */
 #define	__HUGE_VAL_v	0x7ff0000000000000LL
 #define __huge_val_t	union { unsigned char __c[8]; long long __ll; double __d; }
-#define HUGE_VAL		(((__huge_val_t) { __ll: __HUGE_VAL_v }).__d)
+#ifndef HUGE_VAL
+#	define HUGE_VAL		(((__huge_val_t) { __ll: __HUGE_VAL_v }).__d)
+#endif
 
 #define __HUGE_VALF_v	0x7f800000L
 #define __huge_valf_t	union { unsigned char __c[4]; long __l; float __f; }



From anevilyak at gmail.com  Sun Mar 16 17:44:48 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Sun, 16 Mar 2008 11:44:48 -0500
Subject: [Haiku-commits] r24409 - haiku/trunk/src/kits/interface
In-Reply-To: <f019d2f30803160820h60073390q1dfc2966b1d80366@mail.gmail.com>
References: <200803160555.m2G5tSj9015887@sheep.berlios.de>
	<1395108830-BeMail@zon>
	<f019d2f30803160820h60073390q1dfc2966b1d80366@mail.gmail.com>
Message-ID: <f019d2f30803160944p1dd281bdq1e294b4c497f1a03@mail.gmail.com>

>  >  Just remove the "addon" and/or "class" fields of the archived BMessage,
>  >  and you should get a zombie to play with :-)

Actually, how does R5 behave with respect to zombies anyways? are
those stores as well?

Rene


From bonefish at mail.berlios.de  Sun Mar 16 18:21:39 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 16 Mar 2008 18:21:39 +0100
Subject: [Haiku-commits] r24413 - in haiku/trunk: build/jam headers/build
	headers/build/gcc-2.95.3 headers/posix
Message-ID: <200803161721.m2GHLdxG009858@sheep.berlios.de>

Author: bonefish
Date: 2008-03-16 18:21:37 +0100 (Sun, 16 Mar 2008)
New Revision: 24413
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24413&view=rev

Added:
   haiku/trunk/headers/build/gcc-2.95.3/
   haiku/trunk/headers/build/gcc-2.95.3/README
   haiku/trunk/headers/build/gcc-2.95.3/exception
   haiku/trunk/headers/build/gcc-2.95.3/float.h
   haiku/trunk/headers/build/gcc-2.95.3/iso646.h
   haiku/trunk/headers/build/gcc-2.95.3/limits.h
   haiku/trunk/headers/build/gcc-2.95.3/new
   haiku/trunk/headers/build/gcc-2.95.3/new.h
   haiku/trunk/headers/build/gcc-2.95.3/proto.h
   haiku/trunk/headers/build/gcc-2.95.3/stdarg.h
   haiku/trunk/headers/build/gcc-2.95.3/stdbool.h
   haiku/trunk/headers/build/gcc-2.95.3/stddef.h
   haiku/trunk/headers/build/gcc-2.95.3/syslimits.h
   haiku/trunk/headers/build/gcc-2.95.3/typeinfo
   haiku/trunk/headers/build/gcc-2.95.3/va-alpha.h
   haiku/trunk/headers/build/gcc-2.95.3/va-arc.h
   haiku/trunk/headers/build/gcc-2.95.3/va-c4x.h
   haiku/trunk/headers/build/gcc-2.95.3/va-clipper.h
   haiku/trunk/headers/build/gcc-2.95.3/va-h8300.h
   haiku/trunk/headers/build/gcc-2.95.3/va-i860.h
   haiku/trunk/headers/build/gcc-2.95.3/va-i960.h
   haiku/trunk/headers/build/gcc-2.95.3/va-m32r.h
   haiku/trunk/headers/build/gcc-2.95.3/va-m88k.h
   haiku/trunk/headers/build/gcc-2.95.3/va-mips.h
   haiku/trunk/headers/build/gcc-2.95.3/va-mn10200.h
   haiku/trunk/headers/build/gcc-2.95.3/va-mn10300.h
   haiku/trunk/headers/build/gcc-2.95.3/va-pa.h
   haiku/trunk/headers/build/gcc-2.95.3/va-ppc.h
   haiku/trunk/headers/build/gcc-2.95.3/va-pyr.h
   haiku/trunk/headers/build/gcc-2.95.3/va-sh.h
   haiku/trunk/headers/build/gcc-2.95.3/va-sparc.h
   haiku/trunk/headers/build/gcc-2.95.3/va-spur.h
   haiku/trunk/headers/build/gcc-2.95.3/va-v850.h
   haiku/trunk/headers/build/gcc-2.95.3/varargs.h
Removed:
   haiku/trunk/headers/posix/stdarg.h
   haiku/trunk/headers/posix/stddef.h
Modified:
   haiku/trunk/build/jam/BuildSetup
   haiku/trunk/build/jam/HeadersRules
   haiku/trunk/headers/posix/size_t.h
   haiku/trunk/headers/posix/stdio.h
   haiku/trunk/headers/posix/wchar.h
   haiku/trunk/headers/posix/wchar_t.h
Log:
Second stab at reorganizing standard/gcc headers. This time it not only
builds on Linux with gcc 2 and 4, but the images do even run. :-) Not
tested on BeOS.

* Removed stddef.h and stdarg.h. They are provided by the compiler.
* Adjusted size_t.h, wchar_t.h, and wchar.h accordingly.
* Made stdio.h avoid gcc 2.95.3's fixincludes hack stdio_va_list
* Added gcc 2.95.3 headers to the repository. They are used instead of
  the headers of the gcc 2.95.3's we use to compile Haiku with. Should
  avoid build problems with the BeOS native compiler.

For sake of personal recreation you can rebuild the cross gcc 2.95.3,
but the only thing that changed is its header directory
(lib/gcc-lib/.../include), which isn't used anymore. Replacing it with
headers/build/gcc-2.95.3 should have the same effect as rebuilding, BTW.


Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/build/jam/BuildSetup	2008-03-16 17:21:37 UTC (rev 24413)
@@ -118,11 +118,21 @@
 
 # haiku target platform settings
 
+# analyze GCC version
+HAIKU_GCC_VERSION = [ FAnalyzeGCCVersion HAIKU_GCC_RAW_VERSION ] ;
+
 # enable GCC -pipe option, if requested
 if $(HAIKU_USE_GCC_PIPE) = 1 {
 	HAIKU_GCC_BASE_FLAGS = -pipe ;
 }
 
+# override gcc 2.95.3's header directory -- strictly necessary only when using
+# the BeOS native compiler (since its headers are incompatible), but it doesn't
+# harm for the cross-compiler either.
+if $(HAIKU_GCC_VERSION[1]) = 2 {
+	HAIKU_GCC_HEADERS_DIR = [ FDirName $(HAIKU_TOP) headers build gcc-2.95.3 ] ;
+}
+
 # initial state for flags etc.
 HAIKU_C++ ?= $(HAIKU_CC) ;
 HAIKU_LINK = $(HAIKU_CC) ;
@@ -192,9 +202,6 @@
 		= [ FDirName $(HAIKU_ARCH_OBJECT_DIR) debug_$(level) ] ;
 }
 
-# analyze GCC version
-HAIKU_GCC_VERSION = [ FAnalyzeGCCVersion HAIKU_GCC_RAW_VERSION ] ;
-
 # set variables for gcc header options
 SetIncludePropertiesVariables HAIKU ;
 

Modified: haiku/trunk/build/jam/HeadersRules
===================================================================
--- haiku/trunk/build/jam/HeadersRules	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/build/jam/HeadersRules	2008-03-16 17:21:37 UTC (rev 24413)
@@ -365,8 +365,11 @@
 					   kernel media mail midi midi2 net opengl storage support
 					   translation ;
 
+	# GCC headers
+	local headers = $(HAIKU_GCC_HEADERS_DIR) ;
+
 	# Use headers directory, to allow to do things like include <posix/string.h>
-	local headers = [ FDirName $(HAIKU_TOP) headers ] ;
+	headers += [ FDirName $(HAIKU_TOP) headers ] ;
 
 	# Use posix headers directory
 	headers += [ FDirName $(HAIKU_TOP) headers posix ] ;
@@ -392,15 +395,6 @@
 		headers += [ FDirName $(HAIKU_TOP) headers cpp ] ;
 	}
 
-	# The compiler dependent headers.
-	# TODO: Actually these directory should be listed before the posix and cpp
-	# directories, since the headers found here are supposed to override some of
-	# the headers in the latter directories. Unfortunately some of our headers
-	# are a bit messy (e.g. stddef.h) and using the compiler headers causes
-	# trouble when using different compilers (gcc 2 vs. gcc 4) and different
-	# host platforms (BeOS vs. Linux).
-	headers += $(HAIKU_GCC_HEADERS_DIR) ;
-
 	return $(headers) ;
 }
 

Added: haiku/trunk/headers/build/gcc-2.95.3/README
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/README	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/README	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,9 @@
+This README file is copied into the directory for GCC-only header files
+when fixincludes is run by the makefile for GCC.
+
+Many of the files in this directory were made from the standard system
+header files of this system by the shell script `fixincludes'.
+They are system-specific, and will not work on any other kind of system.
+They are also not part of GCC.  The reason for making the files here
+is to fix the places in the header files which use constructs
+that are incompatible with ANSI C.

Added: haiku/trunk/headers/build/gcc-2.95.3/exception
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/exception	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/exception	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,39 @@
+// Exception Handling support header for -*- C++ -*-
+// Copyright (C) 1995, 96-97, 1998 Free Software Foundation
+
+#ifndef __EXCEPTION__
+#define __EXCEPTION__
+
+#pragma interface "exception"
+
+extern "C++" {
+
+namespace std {
+
+class exception {
+public:
+  exception () { }
+  virtual ~exception () { }
+  virtual const char* what () const;
+};
+
+class bad_exception : public exception {
+public:
+  bad_exception () { }
+  virtual ~bad_exception () { }
+};
+
+typedef void (*terminate_handler) ();
+typedef void (*unexpected_handler) ();
+
+terminate_handler set_terminate (terminate_handler);
+void terminate () __attribute__ ((__noreturn__));
+unexpected_handler set_unexpected (unexpected_handler);
+void unexpected () __attribute__ ((__noreturn__));
+bool uncaught_exception ();
+
+} // namespace std
+
+} // extern "C++"
+
+#endif

Added: haiku/trunk/headers/build/gcc-2.95.3/float.h
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/float.h	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/float.h	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,104 @@
+/* float.h for target with IEEE 32/64 bit and Intel 386 style 80 bit
+   floating point formats */
+#ifndef _FLOAT_H_
+#define _FLOAT_H_
+/* Produced by enquire version 4.3, CWI, Amsterdam */
+
+   /* Radix of exponent representation */
+#undef FLT_RADIX
+#define FLT_RADIX 2
+   /* Number of base-FLT_RADIX digits in the significand of a float */
+#undef FLT_MANT_DIG
+#define FLT_MANT_DIG 24
+   /* Number of decimal digits of precision in a float */
+#undef FLT_DIG
+#define FLT_DIG 6
+   /* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown */
+#undef FLT_ROUNDS
+#define FLT_ROUNDS 1
+   /* Difference between 1.0 and the minimum float greater than 1.0 */
+#undef FLT_EPSILON
+#define FLT_EPSILON 1.19209290e-07F
+   /* Minimum int x such that FLT_RADIX**(x-1) is a normalised float */
+#undef FLT_MIN_EXP
+#define FLT_MIN_EXP (-125)
+   /* Minimum normalised float */
+#undef FLT_MIN
+#define FLT_MIN 1.17549435e-38F
+   /* Minimum int x such that 10**x is a normalised float */
+#undef FLT_MIN_10_EXP
+#define FLT_MIN_10_EXP (-37)
+   /* Maximum int x such that FLT_RADIX**(x-1) is a representable float */
+#undef FLT_MAX_EXP
+#define FLT_MAX_EXP 128
+   /* Maximum float */
+#undef FLT_MAX
+#define FLT_MAX 3.40282347e+38F
+   /* Maximum int x such that 10**x is a representable float */
+#undef FLT_MAX_10_EXP
+#define FLT_MAX_10_EXP 38
+
+   /* Number of base-FLT_RADIX digits in the significand of a double */
+#undef DBL_MANT_DIG
+#define DBL_MANT_DIG 53
+   /* Number of decimal digits of precision in a double */
+#undef DBL_DIG
+#define DBL_DIG 15
+   /* Difference between 1.0 and the minimum double greater than 1.0 */
+#undef DBL_EPSILON
+#define DBL_EPSILON 2.2204460492503131e-16
+   /* Minimum int x such that FLT_RADIX**(x-1) is a normalised double */
+#undef DBL_MIN_EXP
+#define DBL_MIN_EXP (-1021)
+   /* Minimum normalised double */
+#undef DBL_MIN
+#define DBL_MIN 2.2250738585072014e-308
+   /* Minimum int x such that 10**x is a normalised double */
+#undef DBL_MIN_10_EXP
+#define DBL_MIN_10_EXP (-307)
+   /* Maximum int x such that FLT_RADIX**(x-1) is a representable double */
+#undef DBL_MAX_EXP
+#define DBL_MAX_EXP 1024
+   /* Maximum double */
+#undef DBL_MAX
+#define DBL_MAX 1.7976931348623157e+308
+   /* Maximum int x such that 10**x is a representable double */
+#undef DBL_MAX_10_EXP
+#define DBL_MAX_10_EXP 308
+
+   /* Number of base-FLT_RADIX digits in the significand of a long double */
+#undef LDBL_MANT_DIG
+#define LDBL_MANT_DIG 64
+   /* Number of decimal digits of precision in a long double */
+#undef LDBL_DIG
+#define LDBL_DIG 18
+   /* Difference between 1.0 and the minimum long double greater than 1.0 */
+#undef LDBL_EPSILON
+#ifndef __LDBL_UNION__
+#define __LDBL_UNION__
+union __convert_long_double {
+  unsigned __convert_long_double_i[4];
+  long double __convert_long_double_d;
+};
+#endif
+#define LDBL_EPSILON (__extension__ ((union __convert_long_double) {__convert_long_double_i: {0x0, 0x80000000, 0x3fc0, 0x0}}).__convert_long_double_d)
+   /* Minimum int x such that FLT_RADIX**(x-1) is a normalised long double */
+#undef LDBL_MIN_EXP
+#define LDBL_MIN_EXP (-16381)
+   /* Minimum normalised long double */
+#undef LDBL_MIN
+#define LDBL_MIN (__extension__ ((union __convert_long_double) {__convert_long_double_i: {0x0, 0x80000000, 0x1, 0x0}}).__convert_long_double_d)
+   /* Minimum int x such that 10**x is a normalised long double */
+#undef LDBL_MIN_10_EXP
+#define LDBL_MIN_10_EXP (-4931)
+   /* Maximum int x such that FLT_RADIX**(x-1) is a representable long double */
+#undef LDBL_MAX_EXP
+#define LDBL_MAX_EXP 16384
+   /* Maximum long double */
+#undef LDBL_MAX
+#define LDBL_MAX (__extension__ ((union __convert_long_double) {__convert_long_double_i: {0xffffffff, 0xffffffff, 0x107ffe, 0x0}}).__convert_long_double_d)
+   /* Maximum int x such that 10**x is a representable long double */
+#undef LDBL_MAX_10_EXP
+#define LDBL_MAX_10_EXP 4932
+
+#endif /*  _FLOAT_H___ */

Added: haiku/trunk/headers/build/gcc-2.95.3/iso646.h
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/iso646.h	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/iso646.h	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,15 @@
+/* Macros for C programs written in national variants of ISO 646.  */
+
+#ifndef __cplusplus
+#define and	&&
+#define and_eq	&=
+#define bitand	&
+#define bitor	|
+#define compl	~
+#define not	!
+#define not_eq	!=
+#define or	||
+#define or_eq	|=
+#define xor	^
+#define xor_eq	^=
+#endif

Added: haiku/trunk/headers/build/gcc-2.95.3/limits.h
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/limits.h	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/limits.h	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,120 @@
+/* This administrivia gets added to the beginning of limits.h
+   if the system has its own version of limits.h.  */
+
+/* We use _GCC_LIMITS_H_ because we want this not to match
+   any macros that the system's limits.h uses for its own purposes.  */
+#ifndef _GCC_LIMITS_H_  /* Terminated in limity.h.  */
+#define _GCC_LIMITS_H_
+
+#ifndef _LIBC_LIMITS_H_
+/* Use "..." so that we find syslimits.h only in this same directory.  */
+#include "syslimits.h"
+#endif
+#ifndef _LIMITS_H___
+#ifndef _MACH_MACHLIMITS_H_
+
+/* _MACH_MACHLIMITS_H_ is used on OSF/1.  */
+#define _LIMITS_H___
+#define _MACH_MACHLIMITS_H_
+
+/* Number of bits in a `char'.  */
+#undef CHAR_BIT
+#define CHAR_BIT 8
+
+/* Maximum length of a multibyte character.  */
+#ifndef MB_LEN_MAX
+#define MB_LEN_MAX 1
+#endif
+
+/* Minimum and maximum values a `signed char' can hold.  */
+#undef SCHAR_MIN
+#define SCHAR_MIN (-128)
+#undef SCHAR_MAX
+#define SCHAR_MAX 127
+
+/* Maximum value an `unsigned char' can hold.  (Minimum is 0).  */
+#undef UCHAR_MAX
+#define UCHAR_MAX 255
+
+/* Minimum and maximum values a `char' can hold.  */
+#ifdef __CHAR_UNSIGNED__
+#undef CHAR_MIN
+#define CHAR_MIN 0
+#undef CHAR_MAX
+#define CHAR_MAX 255
+#else
+#undef CHAR_MIN
+#define CHAR_MIN (-128)
+#undef CHAR_MAX
+#define CHAR_MAX 127
+#endif
+
+/* Minimum and maximum values a `signed short int' can hold.  */
+#undef SHRT_MIN
+/* For the sake of 16 bit hosts, we may not use -32768 */
+#define SHRT_MIN (-32767-1)
+#undef SHRT_MAX
+#define SHRT_MAX 32767
+
+/* Maximum value an `unsigned short int' can hold.  (Minimum is 0).  */
+#undef USHRT_MAX
+#define USHRT_MAX 65535
+
+/* Minimum and maximum values a `signed int' can hold.  */
+#ifndef __INT_MAX__
+#define __INT_MAX__ 2147483647
+#endif
+#undef INT_MIN
+#define INT_MIN (-INT_MAX-1)
+#undef INT_MAX
+#define INT_MAX __INT_MAX__
+
+/* Maximum value an `unsigned int' can hold.  (Minimum is 0).  */
+#undef UINT_MAX
+#define UINT_MAX (INT_MAX * 2U + 1)
+
+/* Minimum and maximum values a `signed long int' can hold.
+   (Same as `int').  */
+#ifndef __LONG_MAX__
+#if defined (__alpha__) || (defined (_ARCH_PPC) && defined (__64BIT__)) || defined (__sparc_v9__) || defined (__sparcv9)
+#define __LONG_MAX__ 9223372036854775807L
+#else
+#define __LONG_MAX__ 2147483647L
+#endif /* __alpha__ || sparc64 */
+#endif
+#undef LONG_MIN
+#define LONG_MIN (-LONG_MAX-1)
+#undef LONG_MAX
+#define LONG_MAX __LONG_MAX__
+
+/* Maximum value an `unsigned long int' can hold.  (Minimum is 0).  */
+#undef ULONG_MAX
+#define ULONG_MAX (LONG_MAX * 2UL + 1)
+
+#if defined (__GNU_LIBRARY__) ? defined (__USE_GNU) : !defined (__STRICT_ANSI__)
+/* Minimum and maximum values a `signed long long int' can hold.  */
+#ifndef __LONG_LONG_MAX__
+#define __LONG_LONG_MAX__ 9223372036854775807LL
+#endif
+#undef LONG_LONG_MIN
+#define LONG_LONG_MIN (-LONG_LONG_MAX-1)
+#undef LONG_LONG_MAX
+#define LONG_LONG_MAX __LONG_LONG_MAX__
+
+/* Maximum value an `unsigned long long int' can hold.  (Minimum is 0).  */
+#undef ULONG_LONG_MAX
+#define ULONG_LONG_MAX (LONG_LONG_MAX * 2ULL + 1)
+#endif
+
+#endif /* _MACH_MACHLIMITS_H_ */
+#endif /* _LIMITS_H___ */
+/* This administrivia gets added to the end of limits.h
+   if the system has its own version of limits.h.  */
+
+#else /* not _GCC_LIMITS_H_ */
+
+#ifdef _GCC_NEXT_LIMITS_H
+#include_next <limits.h>		/* recurse down to the real one */
+#endif
+
+#endif /* not _GCC_LIMITS_H_ */

Added: haiku/trunk/headers/build/gcc-2.95.3/new
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/new	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/new	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,42 @@
+// The -*- C++ -*- dynamic memory management header.
+// Copyright (C) 1994, 96-97, 1998 Free Software Foundation
+
+#ifndef __NEW__
+#define __NEW__
+
+#pragma interface "new"
+#include <stddef.h>
+#include <exception>
+
+extern "C++" {
+
+namespace std {
+
+  class bad_alloc : public exception {
+  public:
+    virtual const char* what() const throw() { return "bad_alloc"; }
+  };
+
+  struct nothrow_t {};
+  extern const nothrow_t nothrow;
+  typedef void (*new_handler)();
+  new_handler set_new_handler (new_handler);
+
+} // namespace std
+
+// replaceable signatures
+void *operator new (size_t) throw (std::bad_alloc);
+void *operator new[] (size_t) throw (std::bad_alloc);
+void operator delete (void *) throw();
+void operator delete[] (void *) throw();
+void *operator new (size_t, const std::nothrow_t&) throw();
+void *operator new[] (size_t, const std::nothrow_t&) throw();
+void operator delete (void *, const std::nothrow_t&) throw();
+void operator delete[] (void *, const std::nothrow_t&) throw();
+
+// default placement versions of operator new
+inline void *operator new(size_t, void *place) throw() { return place; }
+inline void *operator new[](size_t, void *place) throw() { return place; }
+} // extern "C++"
+
+#endif

Added: haiku/trunk/headers/build/gcc-2.95.3/new.h
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/new.h	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/new.h	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,11 @@
+// -*- C++ -*- forwarding header.
+
+#ifndef __NEW_H__
+#define __NEW_H__
+
+#include <new>
+
+using std::new_handler;
+using std::set_new_handler;
+
+#endif // __NEW_H__

Added: haiku/trunk/headers/build/gcc-2.95.3/proto.h
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/proto.h	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/proto.h	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,4 @@
+/* This header file is to avoid trouble with semi-ANSI header files
+   on the Convex in system version 8.0.  */
+
+#define _PROTO(list) ()

Added: haiku/trunk/headers/build/gcc-2.95.3/stdarg.h
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/stdarg.h	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/stdarg.h	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,215 @@
+/* stdarg.h for GNU.
+   Note that the type used in va_arg is supposed to match the
+   actual type **after default promotions**.
+   Thus, va_arg (..., short) is not valid.  */
+
+#ifndef _STDARG_H
+#ifndef _ANSI_STDARG_H_
+#ifndef __need___va_list
+#define _STDARG_H
+#define _ANSI_STDARG_H_
+#endif /* not __need___va_list */
+#undef __need___va_list
+
+#ifdef __clipper__
+#include "va-clipper.h"
+#else
+#ifdef __m88k__
+#include "va-m88k.h"
+#else
+#ifdef __i860__
+#include "va-i860.h"
+#else
+#ifdef __hppa__
+#include "va-pa.h"
+#else
+#ifdef __mips__
+#include "va-mips.h"
+#else
+#ifdef __sparc__
+#include "va-sparc.h"
+#else
+#ifdef __i960__
+#include "va-i960.h"
+#else
+#ifdef __alpha__
+#include "va-alpha.h"
+#else
+#if defined (__H8300__) || defined (__H8300H__) || defined (__H8300S__)
+#include "va-h8300.h"
+#else
+#if defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
+#include "va-ppc.h"
+#else
+#ifdef __arc__
+#include "va-arc.h"
+#else
+#ifdef __M32R__
+#include "va-m32r.h"
+#else
+#ifdef __sh__
+#include "va-sh.h"
+#else
+#ifdef __mn10300__
+#include "va-mn10300.h"
+#else
+#ifdef __mn10200__
+#include "va-mn10200.h"
+#else
+#ifdef __v850__
+#include "va-v850.h"
+#else
+#if defined (_TMS320C4x) || defined (_TMS320C3x)
+#include <va-c4x.h>
+#else
+
+/* Define __gnuc_va_list.  */
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__) || defined(__BEOS__)
+typedef char *__gnuc_va_list;
+#else
+typedef void *__gnuc_va_list;
+#endif
+#endif
+
+/* Define the standard macros for the user,
+   if this invocation was from the user program.  */
+#ifdef _STDARG_H
+
+/* Amount of space required in an argument list for an arg of type TYPE.
+   TYPE may alternatively be an expression whose type is used.  */
+
+#if defined(sysV68)
+#define __va_rounded_size(TYPE)  \
+  (((sizeof (TYPE) + sizeof (short) - 1) / sizeof (short)) * sizeof (short))
+#elif defined(_AIX)
+#define __va_rounded_size(TYPE)  \
+  (((sizeof (TYPE) + sizeof (long) - 1) / sizeof (long)) * sizeof (long))
+#else
+#define __va_rounded_size(TYPE)  \
+  (((sizeof (TYPE) + sizeof (int) - 1) / sizeof (int)) * sizeof (int))
+#endif
+
+#define va_start(AP, LASTARG) 						\
+ (AP = ((__gnuc_va_list) __builtin_next_arg (LASTARG)))
+
+#undef va_end
+void va_end (__gnuc_va_list);		/* Defined in libgcc.a */
+#define va_end(AP)	((void)0)
+
+/* We cast to void * and then to TYPE * because this avoids
+   a warning about increasing the alignment requirement.  */
+
+#if (defined (__arm__) && ! defined (__ARMEB__)) || defined (__i386__) || defined (__i860__) || defined (__ns32000__) || defined (__vax__)
+/* This is for little-endian machines; small args are padded upward.  */
+#define va_arg(AP, TYPE)						\
+ (AP = (__gnuc_va_list) ((char *) (AP) + __va_rounded_size (TYPE)),	\
+  *((TYPE *) (void *) ((char *) (AP) - __va_rounded_size (TYPE))))
+#else /* big-endian */
+/* This is for big-endian machines; small args are padded downward.  */
+#define va_arg(AP, TYPE)						\
+ (AP = (__gnuc_va_list) ((char *) (AP) + __va_rounded_size (TYPE)),	\
+  *((TYPE *) (void *) ((char *) (AP)					\
+		       - ((sizeof (TYPE) < __va_rounded_size (char)	\
+			   ? sizeof (TYPE) : __va_rounded_size (TYPE))))))
+#endif /* big-endian */
+
+/* Copy __gnuc_va_list into another variable of this type.  */
+#define __va_copy(dest, src) (dest) = (src)
+
+#endif /* _STDARG_H */
+
+#endif /* not TMS320C3x or TMS320C4x */
+#endif /* not v850 */
+#endif /* not mn10200 */
+#endif /* not mn10300 */
+#endif /* not sh */
+#endif /* not m32r */
+#endif /* not arc */
+#endif /* not powerpc with V.4 calling sequence */
+#endif /* not h8300 */
+#endif /* not alpha */
+#endif /* not i960 */
+#endif /* not sparc */
+#endif /* not mips */
+#endif /* not hppa */
+#endif /* not i860 */
+#endif /* not m88k */
+#endif /* not clipper */
+
+#ifdef _STDARG_H
+/* Define va_list, if desired, from __gnuc_va_list. */
+/* We deliberately do not define va_list when called from
+   stdio.h, because ANSI C says that stdio.h is not supposed to define
+   va_list.  stdio.h needs to have access to that data type, 
+   but must not use that name.  It should use the name __gnuc_va_list,
+   which is safe because it is reserved for the implementation.  */
+
+#ifdef _HIDDEN_VA_LIST  /* On OSF1, this means varargs.h is "half-loaded".  */
+#undef _VA_LIST
+#endif
+
+#ifdef _BSD_VA_LIST
+#undef _BSD_VA_LIST
+#endif
+
+#if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST))
+/* SVR4.2 uses _VA_LIST for an internal alias for va_list,
+   so we must avoid testing it and setting it here.
+   SVR4 uses _VA_LIST as a flag in stdarg.h, but we should
+   have no conflict with that.  */
+#ifndef _VA_LIST_
+#define _VA_LIST_
+#ifdef __i860__
+#ifndef _VA_LIST
+#define _VA_LIST va_list
+#endif
+#endif /* __i860__ */
+typedef __gnuc_va_list va_list;
+#ifdef _SCO_DS
+#define __VA_LIST
+#endif
+#endif /* _VA_LIST_ */
+#else /* not __svr4__ || _SCO_DS */
+
+/* The macro _VA_LIST_ is the same thing used by this file in Ultrix.
+   But on BSD NET2 we must not test or define or undef it.
+   (Note that the comments in NET 2's ansi.h
+   are incorrect for _VA_LIST_--see stdio.h!)  */
+#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) || defined(WINNT)
+/* The macro _VA_LIST_DEFINED is used in Windows NT 3.5  */
+#ifndef _VA_LIST_DEFINED
+/* The macro _VA_LIST is used in SCO Unix 3.2.  */
+#ifndef _VA_LIST
+/* The macro _VA_LIST_T_H is used in the Bull dpx2  */
+#ifndef _VA_LIST_T_H
+/* The macro __va_list__ is used by BeOS.  */
+#ifndef __va_list__
+typedef __gnuc_va_list va_list;
+#endif /* not __va_list__ */
+#endif /* not _VA_LIST_T_H */
+#endif /* not _VA_LIST */
+#endif /* not _VA_LIST_DEFINED */
+#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__))
+#define _VA_LIST_
+#endif
+#ifndef _VA_LIST
+#define _VA_LIST
+#endif
+#ifndef _VA_LIST_DEFINED
+#define _VA_LIST_DEFINED
+#endif
+#ifndef _VA_LIST_T_H
+#define _VA_LIST_T_H
+#endif
+
+#endif /* not _VA_LIST_, except on certain systems */
+
+#endif /* not __svr4__ */
+
+#endif /* _STDARG_H */
+
+#endif /* not _ANSI_STDARG_H_ */
+#endif /* not _STDARG_H */

Added: haiku/trunk/headers/build/gcc-2.95.3/stdbool.h
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/stdbool.h	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/stdbool.h	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,29 @@
+/* stdbool.h for GNU.  */
+#ifndef __STDBOOL_H__
+#define __STDBOOL_H__	1
+
+#ifdef __BEOS__
+	typedef unsigned char _Bool;
+	#define bool _Bool
+	#define false 0
+	#define true 1
+#else
+
+/* The type `bool' must promote to `int' or `unsigned int'.  The constants
+   `true' and `false' must have the value 0 and 1 respectively.  */
+typedef enum
+  {
+    false = 0,
+    true = 1
+  } bool;
+
+/* The names `true' and `false' must also be made available as macros.  */
+#define false	false
+#define true	true
+
+#endif
+
+/* Signal that all the definitions are present.  */
+#define __bool_true_false_are_defined	1
+
+#endif	/* stdbool.h */

Added: haiku/trunk/headers/build/gcc-2.95.3/stddef.h
===================================================================
--- haiku/trunk/headers/build/gcc-2.95.3/stddef.h	2008-03-16 16:39:06 UTC (rev 24412)
+++ haiku/trunk/headers/build/gcc-2.95.3/stddef.h	2008-03-16 17:21:37 UTC (rev 24413)
@@ -0,0 +1,338 @@
+#if (!defined(_STDDEF_H) && !defined(_STDDEF_H_) && !defined(_ANSI_STDDEF_H) \
+     && !defined(__STDDEF_H__)) \
+    || defined(__need_wchar_t) || defined(__need_size_t) \
+    || defined(__need_ptrdiff_t) || defined(__need_NULL) \
+    || defined(__need_wint_t)
+
+/* Any one of these symbols __need_* means that GNU libc
+   wants us just to define one data type.  So don't define
+   the symbols that indicate this file's entire job has been done.  */
+#if (!defined(__need_wchar_t) && !defined(__need_size_t)	\
+     && !defined(__need_ptrdiff_t) && !defined(__need_NULL)	\
+     && !defined(__need_wint_t))
+#define _STDDEF_H
+#define _STDDEF_H_
+/* snaroff at next.com says the NeXT needs this.  */
+#define _ANSI_STDDEF_H
+/* Irix 5.1 needs this.  */
+#define __STDDEF_H__
+#endif
+
+#ifndef __sys_stdtypes_h
+/* This avoids lossage on SunOS but only if stdtypes.h comes first.
+   There's no way to win with the other order!  Sun lossage.  */
+
+/* On 4.3bsd-net2, make sure ansi.h is included, so we have
+   one less case to deal with in the following.  */
+#if defined (__BSD_NET2__) || defined (____386BSD____) || defined (__FreeBSD__) || defined(__NetBSD__)
+#include <machine/ansi.h>
+#endif
+
+/* In 4.3bsd-net2, machine/ansi.h defines these symbols, which are
+   defined if the corresponding type is *not* defined.
+   FreeBSD-2.1 defines _MACHINE_ANSI_H_ instead of _ANSI_H_ */
+#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_)
+#if !defined(_SIZE_T_) && !defined(_BSD_SIZE_T_)
+#define _SIZE_T
+#endif
+#if !defined(_PTRDIFF_T_) && !defined(_BSD_PTRDIFF_T_)
+#define _PTRDIFF_T
+#endif
+/* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_
+   instead of _WCHAR_T_. */
+#if !defined(_WCHAR_T_) && !defined(_BSD_WCHAR_T_)
+#ifndef _BSD_WCHAR_T_
+#define _WCHAR_T
+#endif
+#endif
+/* Undef _FOO_T_ if we are supposed to define foo_t.  */
+#if defined (__need_ptrdiff_t) || defined (_STDDEF_H_)
+#undef _PTRDIFF_T_
+#undef _BSD_PTRDIFF_T_
+#endif
+#if defined (__need_size_t) || defined (_STDDEF_H_)
+#undef _SIZE_T_
+#undef _BSD_SIZE_T_
+#endif
+#if defined (__need_wchar_t) || defined (_STDDEF_H_)
+#undef _WCHAR_T_
+#undef _BSD_WCHAR_T_
+#endif
+#endif /* defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) */
+
+/* Sequent's header files use _PTRDIFF_T_ in some conflicting way.
+   Just ignore it.  */
+#if defined (__sequent__) && defined (_PTRDIFF_T_)
+#undef _PTRDIFF_T_
+#endif
+
+/* On VxWorks, <type/vxTypesBase.h> may have defined macros like
+   _TYPE_size_t which will typedef size_t.  fixincludes patched the
+   vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is
+   not defined, and so that defining this macro defines _GCC_SIZE_T.
+   If we find that the macros are still defined at this point, we must
+   invoke them so that the type is defined as expected.  */
+#if defined (_TYPE_ptrdiff_t) && (defined (__need_ptrdiff_t) || defined (_STDDEF_H_))
+_TYPE_ptrdiff_t;
+#undef _TYPE_ptrdiff_t
+#endif
+#if defined (_TYPE_size_t) && (defined (__need_size_t) || defined (_STDDEF_H_))
+_TYPE_size_t;
+#undef _TYPE_size_t
+#endif
+#if defined (_TYPE_wchar_t) && (defined (__need_wchar_t) || defined (_STDDEF_H_))
+_TYPE_wchar_t;
+#undef _TYPE_wchar_t
+#endif
+
+/* In case nobody has defined these types, but we aren't running under
+   GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE__TYPE__, and
+   __WCHAR_TYPE__ have reasonable values.  This can happen if the
+   parts of GCC is compiled by an older compiler, that actually
+   include gstddef.h, such as collect2.  */
+
+/* Signed type of difference of two pointers.  */
+
+/* Define this type if we are doing the whole job,
+   or if we want this type in particular.  */
+#if defined (_STDDEF_H) || defined (__need_ptrdiff_t)
+#ifndef _PTRDIFF_T	/* in case <sys/types.h> has defined it. */
+#ifndef _T_PTRDIFF_
+#ifndef _T_PTRDIFF
+#ifndef __PTRDIFF_T
+#ifndef _PTRDIFF_T_
+#ifndef _BSD_PTRDIFF_T_
+#ifndef ___int_ptrdiff_t_h
+#ifndef _GCC_PTRDIFF_T
+#define _PTRDIFF_T
+#define _T_PTRDIFF_
+#define _T_PTRDIFF
+#define __PTRDIFF_T
+#define _PTRDIFF_T_
+#define _BSD_PTRDIFF_T_
+#define ___int_ptrdiff_t_h
+#define _GCC_PTRDIFF_T
+#ifndef __PTRDIFF_TYPE__
+#define __PTRDIFF_TYPE__ long int
+#endif
+typedef __PTRDIFF_TYPE__ ptrdiff_t;
+#endif /* _GCC_PTRDIFF_T */
+#endif /* ___int_ptrdiff_t_h */
+#endif /* _BSD_PTRDIFF_T_ */
+#endif /* _PTRDIFF_T_ */
+#endif /* __PTRDIFF_T */
+#endif /* _T_PTRDIFF */
+#endif /* _T_PTRDIFF_ */
+#endif /* _PTRDIFF_T */
+
+/* If this symbol has done its job, get rid of it.  */
+#undef	__need_ptrdiff_t
+
+#endif /* _STDDEF_H or __need_ptrdiff_t.  */
+
+/* Unsigned type of `sizeof' something.  */
+
+/* Define this type if we are doing the whole job,
+   or if we want this type in particular.  */
+#if defined (_STDDEF_H) || defined (__need_size_t)
+#ifndef __size_t__	/* BeOS */
+#ifndef _SIZE_T	/* in case <sys/types.h> has defined it. */
+#ifndef _SYS_SIZE_T_H
+#ifndef _T_SIZE_
+#ifndef _T_SIZE
+#ifndef __SIZE_T
+#ifndef _SIZE_T_
+#ifndef _BSD_SIZE_T_
+#ifndef _SIZE_T_DEFINED_
+#ifndef _SIZE_T_DEFINED
+#ifndef ___int_size_t_h
+#ifndef _GCC_SIZE_T
+#ifndef _SIZET_
+#ifndef __size_t
+#define __size_t__	/* BeOS */
+#define _SIZE_T
+#define _SYS_SIZE_T_H
+#define _T_SIZE_
+#define _T_SIZE
+#define __SIZE_T
+#define _SIZE_T_
+#define _BSD_SIZE_T_
+#define _SIZE_T_DEFINED_
+#define _SIZE_T_DEFINED
+#define ___int_size_t_h
+#define _GCC_SIZE_T
+#define _SIZET_
+#define __size_t
+#ifndef __SIZE_TYPE__
+#define __SIZE_TYPE__ long unsigned int
+#endif
+#if !(defined (__GNUG__) && defined (size_t))
+typedef __SIZE_TYPE__ size_t;
+#ifdef __BEOS__
+typedef long ssize_t;
+#endif /* __BEOS__ */
+#endif /* !(defined (__GNUG__) && defined (size_t)) */
+#endif /* __size_t */
+#endif /* _SIZET_ */
+#endif /* _GCC_SIZE_T */
+#endif /* ___int_size_t_h */
+#endif /* _SIZE_T_DEFINED */
+#endif /* _SIZE_T_DEFINED_ */
+#endif /* _BSD_SIZE_T_ */
+#endif /* _SIZE_T_ */
+#endif /* __SIZE_T */
+#endif /* _T_SIZE */
+#endif /* _T_SIZE_ */
+#endif /* _SYS_SIZE_T_H */
+#endif /* _SIZE_T */
+#endif /* __size_t__ */
+#undef	__need_size_t
+#endif /* _STDDEF_H or __need_size_t.  */
+
+
+/* Wide character type.
+   Locale-writers should change this as necessary to
+   be big enough to hold unique values not between 0 and 127,
+   and not (wchar_t) -1, for each defined multibyte character.  */
+
+/* Define this type if we are doing the whole job,
+   or if we want this type in particular.  */
+#if defined (_STDDEF_H) || defined (__need_wchar_t)
+#ifndef __wchar_t__	/* BeOS */
+#ifndef _WCHAR_T
+#ifndef _T_WCHAR_
+#ifndef _T_WCHAR
+#ifndef __WCHAR_T
+#ifndef _WCHAR_T_
+#ifndef _BSD_WCHAR_T_
+#ifndef _WCHAR_T_DEFINED_
+#ifndef _WCHAR_T_DEFINED
+#ifndef _WCHAR_T_H
+#ifndef ___int_wchar_t_h
+#ifndef __INT_WCHAR_T_H
+#ifndef _GCC_WCHAR_T
+#define __wchar_t__	/* BeOS */
+#define _WCHAR_T
+#define _T_WCHAR_
+#define _T_WCHAR
+#define __WCHAR_T
+#define _WCHAR_T_
+#define _BSD_WCHAR_T_
+#define _WCHAR_T_DEFINED_
+#define _WCHAR_T_DEFINED
+#define _WCHAR_T_H
+#define ___int_wchar_t_h
+#define __INT_WCHAR_T_H
+#define _GCC_WCHAR_T
+
+/* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_
+   instead of _WCHAR_T_, and _BSD_RUNE_T_ (which, unlike the other
+   symbols in the _FOO_T_ family, stays defined even after its
+   corresponding type is defined).  If we define wchar_t, then we
+   must undef _WCHAR_T_; for BSD/386 1.1 (and perhaps others), if
+   we undef _WCHAR_T_, then we must also define rune_t, since 
+   headers like runetype.h assume that if machine/ansi.h is included,
+   and _BSD_WCHAR_T_ is not defined, then rune_t is available.
+   machine/ansi.h says, "Note that _WCHAR_T_ and _RUNE_T_ must be of
+   the same type." */
+#ifdef _BSD_WCHAR_T_
+#undef _BSD_WCHAR_T_
+#ifdef _BSD_RUNE_T_
+#if !defined (_ANSI_SOURCE) && !defined (_POSIX_SOURCE)
+typedef _BSD_RUNE_T_ rune_t;
+#endif
+#endif
+#endif
+
+#ifndef __WCHAR_TYPE__
+#define __WCHAR_TYPE__ int
+#endif
+#ifndef __cplusplus
+typedef __WCHAR_TYPE__ wchar_t;
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif /* __wchar_t__ */
+#undef	__need_wchar_t
+#endif /* _STDDEF_H or __need_wchar_t.  */
+
+#if defined (_STDDEF_H) || defined (__need_wint_t)
+#ifndef _WINT_T
+#define _WINT_T
+
+#ifndef __WINT_TYPE__
+#define __WINT_TYPE__ unsigned int
+#endif
+typedef __WINT_TYPE__ wint_t;

[... truncated: 2730 lines follow ...]


From mmlr at mlotz.ch  Sun Mar 16 20:33:27 2008
From: mmlr at mlotz.ch (Michael Lotz)
Date: Sun, 16 Mar 2008 20:33:27 +0100
Subject: [Haiku-commits]
 =?windows-1252?q?r24413_-_in_haiku/trunk=3A_build?=
 =?windows-1252?q?/jam_headers/build_headers/build/gcc-2=2E95=2E3_headers/?=
 =?windows-1252?q?posix?=
In-Reply-To: <200803161721.m2GHLdxG009858@sheep.berlios.de>
Message-ID: <25597949205-BeMail@primary>

> Author: bonefish
> Date: 2008-03-16 18:21:37 +0100 (Sun, 16 Mar 2008)
> New Revision: 24413
> Log:
> Second stab at reorganizing standard/gcc headers. This time it not 
> only
> builds on Linux with gcc 2 and 4, but the images do even run. :-) Not
> tested on BeOS.

Just to let you know: I can confirm that everything still works on BeOS 
R5 BONE. I just did a complete rebuild of an image and booted that 
successfully in QEMU.

Regards
Michael


From bga at mail.berlios.de  Sun Mar 16 23:18:33 2008
From: bga at mail.berlios.de (bga at BerliOS)
Date: Sun, 16 Mar 2008 23:18:33 +0100
Subject: [Haiku-commits] r24414 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200803162218.m2GMIXnd014284@sheep.berlios.de>

Author: bga
Date: 2008-03-16 23:18:32 +0100 (Sun, 16 Mar 2008)
New Revision: 24414
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24414&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp
Log:
- Fix building with TRACE enabled.



Modified: haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp	2008-03-16 17:21:37 UTC (rev 24413)
+++ haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp	2008-03-16 22:18:32 UTC (rev 24414)
@@ -170,8 +170,8 @@
 				continue;
 		} else if (!domain->address_module->equal_addresses(address,
 				route->destination))
-			continue
-
+			continue;
+		
 		TRACE(("  found route: %s, flags %lx\n",
 			AddressString(domain, route->destination).Data(), route->flags));
 



From bga at mail.berlios.de  Sun Mar 16 23:24:18 2008
From: bga at mail.berlios.de (bga at BerliOS)
Date: Sun, 16 Mar 2008 23:24:18 +0100
Subject: [Haiku-commits] r24415 - haiku/trunk/src/servers/net
Message-ID: <200803162224.m2GMOIex014719@sheep.berlios.de>

Author: bga
Date: 2008-03-16 23:24:18 +0100 (Sun, 16 Mar 2008)
New Revision: 24415
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24415&view=rev

Modified:
   haiku/trunk/src/servers/net/AutoconfigLooper.cpp
Log:
- Changed default address for failed DHCP requests from 192.168.0.x to
  169.254.0.x, as this is the IANA reserved address for default
  configuration.



Modified: haiku/trunk/src/servers/net/AutoconfigLooper.cpp
===================================================================
--- haiku/trunk/src/servers/net/AutoconfigLooper.cpp	2008-03-16 22:18:32 UTC (rev 24414)
+++ haiku/trunk/src/servers/net/AutoconfigLooper.cpp	2008-03-16 22:24:18 UTC (rev 24415)
@@ -90,12 +90,15 @@
 	}
 
 	char string[64];
-	snprintf(string, sizeof(string), "192.168.0.%u", last);
+	// IANA defined the default autoconfig network (for when a DHCP request
+	// fails for some reason) as being 169.254.0.0/255.255.0.0. We are only
+	// generating the last octet but we could also use the 2 last octets if
+	// wanted.
+	snprintf(string, sizeof(string), "169.254.0.%u", last);
 
 	BMessage address;
 	address.AddString("family", "inet");
 	address.AddString("address", string);
-	address.AddString("gateway", "192.168.0.254");
 	interface.AddMessage("address", &address);
 
 	fTarget.SendMessage(&interface);



From oruizdorantes at mail.berlios.de  Sun Mar 16 23:40:17 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Sun, 16 Mar 2008 23:40:17 +0100
Subject: [Haiku-commits] r24416 - haiku/trunk/src/kits/bluetooth
Message-ID: <200803162240.m2GMeHZq016761@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-16 23:40:16 +0100 (Sun, 16 Mar 2008)
New Revision: 24416
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24416&view=rev

Modified:
   haiku/trunk/src/kits/bluetooth/CommandManager.cpp
Log:
Add scan mode and authentication commands



Modified: haiku/trunk/src/kits/bluetooth/CommandManager.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/CommandManager.cpp	2008-03-16 22:24:18 UTC (rev 24415)
+++ haiku/trunk/src/kits/bluetooth/CommandManager.cpp	2008-03-16 22:40:16 UTC (rev 24416)
@@ -64,11 +64,64 @@
 }
 
 
+void* buildWriteScan(uint8 scanmode, size_t* outsize)
+{
+    struct hci_write_scan_enable* param;
+	void* command = buildCommand(OGF_CONTROL_BASEBAND, OCF_WRITE_SCAN_ENABLE, (void**) &param, sizeof(struct hci_write_scan_enable), outsize);
+     
+     
+    if (command != NULL) {
+        param->scan = scanmode;
+    }
+
+    return command;
+
+}
+
+
+void* buildAuthEnable(uint8 auth, size_t* outsize)
+{
+    struct hci_write_authentication_enable* param;
+	void* command = buildCommand(OGF_CONTROL_BASEBAND, OCF_WRITE_AUTH_ENABLE, (void**) &param, sizeof(struct hci_write_authentication_enable), outsize);
+     
+     
+    if (command != NULL) {
+        param->authentication = auth;
+    }
+
+    return command;
+
+}
+
+
 #if 0
 #pragma mark - LINK CONTROL -
 #endif
 
+void* buildCreateConnection(bdaddr_t bdaddr)
+{
+	/*
+	cm4.size = sizeof(struct hci_command_header)+sizeof(struct hci_cp_create_conn);
+	cm4.header.opcode = B_HOST_TO_LENDIAN_INT16(hci_opcode_pack(OGF_LINK_CONTROL, OCF_CREATE_CONN));
+	cm4.body.bdaddr.b[0] = 0x92;
+	cm4.body.bdaddr.b[1] = 0xd3;
+	cm4.body.bdaddr.b[2] = 0xaf;
+	cm4.body.bdaddr.b[3] = 0xd9;
+	cm4.body.bdaddr.b[4] = 0x0a;
+	cm4.body.bdaddr.b[5] = 0x00;
+	cm4.body.pkt_type = 0xFFFF;
+	cm4.body.pscan_rep_mode = 1;
+	cm4.body.pscan_mode = 0;
+	cm4.body.clock_offset = 0xc7;
+	cm4.body.role_switch = 1;
+	cm4.header.clen = 13;					
+	ioctl(fd1, ISSUE_BT_COMMAND, &cm4, sizeof(cm4));
+	*/
 
+	return NULL;
+}
+
+
 void* buildRemoteNameRequest(bdaddr_t bdaddr,uint8 pscan_rep_mode, uint16 clock_offset, size_t* outsize)
 {
     
@@ -119,3 +172,7 @@
 {
 	return buildCommand(OGF_INFORMATIONAL_PARAM, OCF_READ_BD_ADDR, NULL, 0, outsize);
 }    
+
+
+
+



From ingo_weinhold at gmx.de  Mon Mar 17 00:12:56 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Mon, 17 Mar 2008 00:12:56 +0100
Subject: [Haiku-commits] r24413 - in haiku/trunk: build/jam
 headers/build headers/build/gcc-2.95.3 headers/posix
In-Reply-To: <25597949205-BeMail@primary>
References: <25597949205-BeMail@primary>
Message-ID: <20080317001256.752.6@knochen-vm.1205678060.fake>


On 2008-03-16 at 20:33:27 [+0100], Michael Lotz <mmlr at mlotz.ch> wrote:
> > Author: bonefish
> > Date: 2008-03-16 18:21:37 +0100 (Sun, 16 Mar 2008)
> > New Revision: 24413
> > Log:
> > Second stab at reorganizing standard/gcc headers. This time it not
> > only
> > builds on Linux with gcc 2 and 4, but the images do even run. :-) Not
> > tested on BeOS.
> 
> Just to let you know: I can confirm that everything still works on BeOS
> R5 BONE. I just did a complete rebuild of an image and booted that
> successfully in QEMU.

Thanks, glad to hear.

CU, Ingo


From bonefish at mail.berlios.de  Mon Mar 17 00:45:11 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 17 Mar 2008 00:45:11 +0100
Subject: [Haiku-commits] r24417 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803162345.m2GNjBTr016650@sheep.berlios.de>

Author: bonefish
Date: 2008-03-17 00:45:10 +0100 (Mon, 17 Mar 2008)
New Revision: 24417
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24417&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp
Log:
Root is allowed to cd into any directory, regardless of the directory
permissions.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp	2008-03-16 22:40:16 UTC (rev 24416)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp	2008-03-16 23:45:10 UTC (rev 24417)
@@ -446,9 +446,14 @@
 	if (accessMode & W_OK && fVolume->IsReadOnly())
 		return B_READ_ONLY_DEVICE;
 
-	// root users always have full access (but they can't execute anything)
-	if (user == 0 && !((accessMode & X_OK) && (Mode() & S_IXUSR) == 0))
-		return B_OK;
+	// root users always have full access (but they can't execute files without
+	// any execute permissions set)
+	if (user == 0) {
+		if (!((accessMode & X_OK) != 0 && (Mode() & S_IXUSR) == 0)
+			|| (Mode() & S_DIRECTORY) != 0) {
+			return B_OK;
+		}
+	}
 
 	// shift mode bits, to check directly against accessMode
 	mode_t mode = Mode();



From anevilyak at mail.berlios.de  Mon Mar 17 02:20:51 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Mon, 17 Mar 2008 02:20:51 +0100
Subject: [Haiku-commits] r24418 - haiku/trunk/src/kits/interface
Message-ID: <200803170120.m2H1KphL019558@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-17 02:20:49 +0100 (Mon, 17 Mar 2008)
New Revision: 24418
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24418&view=rev

Modified:
   haiku/trunk/src/kits/interface/Shelf.cpp
Log:
Fix a case in BShelf where it wouldn't return the error correctly if the replicant was rejected by the shelf. This 
would cause various incorrect behavior, best observed in the form of Deskbar crashing if you tried to drag and drop 
a large replicant (i.e. Workspaces) onto it.



Modified: haiku/trunk/src/kits/interface/Shelf.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Shelf.cpp	2008-03-16 23:45:10 UTC (rev 24417)
+++ haiku/trunk/src/kits/interface/Shelf.cpp	2008-03-17 01:20:49 UTC (rev 24418)
@@ -1192,7 +1192,7 @@
 		const BPoint point = location ? *location : view->Frame().LeftTop();
 		replicant = _GetReplicant(data, view, point, dragger, relation);
 		if (replicant == NULL)
-			send_reply(data, B_ERROR, uniqueID);
+			return send_reply(data, B_ERROR, uniqueID);
 
 	} else if (fDisplayZombies && fAllowZombies)
 		zombie = _CreateZombie(data, dragger);



From revol at free.fr  Mon Mar 17 06:48:54 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Mon, 17 Mar 2008 06:48:54 +0100 CET
Subject: [Haiku-commits] r24418 - haiku/trunk/src/kits/interface
In-Reply-To: <200803170120.m2H1KphL019558@sheep.berlios.de>
Message-ID: <287567189-BeMail@laptop>

> Modified: haiku/trunk/src/kits/interface/Shelf.cpp
> ===================================================================
> --- haiku/trunk/src/kits/interface/Shelf.cpp	2008-03-16 23:45:10 UTC 
> (rev 24417)
> +++ haiku/trunk/src/kits/interface/Shelf.cpp	2008-03-17 01:20:49 UTC 
> (rev 24418)
> @@ -1192,7 +1192,7 @@
>  		const BPoint point = location ? *location : view->
> Frame().LeftTop();
>  		replicant = _GetReplicant(data, view, point, dragger, 
> relation);
>  		if (replicant == NULL)
> -			send_reply(data, B_ERROR, uniqueID);
> +			return send_reply(data, B_ERROR, uniqueID);
>  

shouldn't it return an error even if send_reply succeeds ?

Fran?ois.


From anevilyak at gmail.com  Mon Mar 17 06:53:25 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Mon, 17 Mar 2008 00:53:25 -0500
Subject: [Haiku-commits] r24418 - haiku/trunk/src/kits/interface
In-Reply-To: <287567189-BeMail@laptop>
References: <200803170120.m2H1KphL019558@sheep.berlios.de>
	<287567189-BeMail@laptop>
Message-ID: <f019d2f30803162253j7166ef6ehb7ed85537c007cf@mail.gmail.com>

>
>  shouldn't it return an error even if send_reply succeeds ?
>
>  Fran?ois.
>
send_reply returns the error code you pass in...it just checks if the
replicant was sent across by a synchronous messenger waiting for a
reply to see if it should send a response or not afaik.

Rene


From axeld at pinc-software.de  Mon Mar 17 09:31:07 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 17 Mar 2008 09:31:07 +0100 CET
Subject: [Haiku-commits] r24415 - haiku/trunk/src/servers/net
In-Reply-To: <200803162224.m2GMOIex014719@sheep.berlios.de>
Message-ID: <689503511-BeMail@zon>

bga at BerliOS <bga at mail.berlios.de> wrote:
> Log:
> - Changed default address for failed DHCP requests from 192.168.0.x 
> to
>   169.254.0.x, as this is the IANA reserved address for default
>   configuration.

Hey, now this configuration won't work automatically in my local 
network anymore ;-)

Bye,
   Axel.



From bga at bug-br.org.br  Mon Mar 17 11:46:03 2008
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Mon, 17 Mar 2008 07:46:03 -0300
Subject: [Haiku-commits] r24415 - haiku/trunk/src/servers/net
In-Reply-To: <689503511-BeMail@zon>
References: <689503511-BeMail@zon>
Message-ID: <47DE4BEB.2030201@bug-br.org.br>

Axel D?rfler escreveu:
>> Log:
>> - Changed default address for failed DHCP requests from 192.168.0.x 
>> to
>>   169.254.0.x, as this is the IANA reserved address for default
>>   configuration.
> 
> Hey, now this configuration won't work automatically in my local 
> network anymore ;-)

Maybe this explains why net_server works so well for you. ;)

-Bruno


From axeld at pinc-software.de  Mon Mar 17 11:53:29 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 17 Mar 2008 11:53:29 +0100 CET
Subject: [Haiku-commits] r24415 - haiku/trunk/src/servers/net
In-Reply-To: <47DE4BEB.2030201@bug-br.org.br>
Message-ID: <3133226451-BeMail@zon>

Bruno Albuquerque <bga at bug-br.org.br> wrote:
> Axel D?rfler escreveu:
> >> Log:
> >> - Changed default address for failed DHCP requests from 
> > > 192.168.0.x 
> >> to 169.254.0.x, as this is the IANA reserved address for default
> >> configuration.
> > Hey, now this configuration won't work automatically in my local 
> > network anymore ;-)
> Maybe this explains why net_server works so well for you. ;)

Hehe :-)

Bye,
   Axel.



From superstippi at gmx.de  Mon Mar 17 13:24:19 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 17 Mar 2008 13:24:19 +0100
Subject: [Haiku-commits] r24409 - haiku/trunk/src/kits/interface
In-Reply-To: <200803160555.m2G5tSj9015887@sheep.berlios.de>
References: <200803160555.m2G5tSj9015887@sheep.berlios.de>
Message-ID: <20080317132419.883.5@stippis2.1205755486.fake>

Hi Rene,

anevilyak at BerliOS wrote:
> Modified:
>    haiku/trunk/src/kits/interface/Shelf.cpp
> Log:
> Implement save/restoring replicants in BShelf. This results in Tracker 
> now persisting its desktop replicants across sessions. This may not 
> completely handle zombies properly though, I had nothing to test that 
> case with.

[...]

> @@ -1063,7 +1087,15 @@
>              if (!archive.FindInt32("_sg_cnt", &genCount))
>                  genCount = 1;
>  
> -            // TODO find archived replicants
> +            BMessage replicant;
> +            BMessage *replmsg = NULL;
> +            for (int32 i = 0; archive.FindMessage("replicant", i, 
> &replicant) == B_OK; i++) {
> +                BPoint point;
> +                replmsg = new BMessage();
> +                replicant.FindPoint("position", &point);
> +                replicant.FindMessage("message", replmsg);
> +                AddReplicant(replmsg, point);                
> +            }
>          }
>      }
>  }

I have checked the code, and I think you are leaking a BMessage above. The 
correct allocation should be like this:

+            BMessage replicant;
+            for (int32 i = 0; archive.FindMessage("replicant", i, 
&replicant) == B_OK; i++) {
+                BPoint point;
+                BMessage archivedReplicant;
+                replicant.FindPoint("position", &point);
+                replicant.FindMessage("message", &archivedReplicant);
+                AddReplicant(&archivedReplicant, point);
+            }

Though one code also check for return codes like this:

+            BMessage replicant;
+            for (int32 i = 0; archive.FindMessage("replicant", i, 
&replicant) == B_OK; i++) {
+                BPoint point;
+                BMessage archivedReplicant;
+                if (replicant.FindPoint("position", &point) == B_OK
+                    && replicant.FindMessage("message", 
&archivedReplicant) == B_OK) {
+                    AddReplicant(&archivedReplicant, point);
+                } else {
+                    fprintf(stderr, "BShelf::_InitData() - failed to 
restore replicant from archive at index %ld.\n", i);
+                }
+            }

Best regards,
-Stephan


From anevilyak at gmail.com  Mon Mar 17 13:26:52 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Mon, 17 Mar 2008 07:26:52 -0500
Subject: [Haiku-commits] r24409 - haiku/trunk/src/kits/interface
In-Reply-To: <20080317132419.883.5@stippis2.1205755486.fake>
References: <200803160555.m2G5tSj9015887@sheep.berlios.de>
	<20080317132419.883.5@stippis2.1205755486.fake>
Message-ID: <f019d2f30803170526v5dd9db43n76e5bef978ac8bbd@mail.gmail.com>

Hi Stephan,

>  I have checked the code, and I think you are leaking a BMessage above. The
>  correct allocation should be like this:
>

As far as I can tell that code's correct, doing it with a stack
alloc'd message results in a crash since BShelf stores
a pointer to the message in replicant_data without copying it. I did
it the way you described the first time because I hadn't noticed that,
and got crashes on exit as a result.

Regards,

Rene


From superstippi at gmx.de  Mon Mar 17 13:27:38 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 17 Mar 2008 13:27:38 +0100
Subject: [Haiku-commits] r24409 - haiku/trunk/src/kits/interface
In-Reply-To: <200803160555.m2G5tSj9015887@sheep.berlios.de>
References: <200803160555.m2G5tSj9015887@sheep.berlios.de>
Message-ID: <20080317132738.928.6@stippis2.1205755486.fake>

Hi Rene,

looking through the BShelf code, I see a lot more leaks, though. For 
example, it is leaking file handles (BFile). If you don't have the 
time/motivation to fix these, I can have a look... just tell me, don't want 
to step on your toes.

Best regards,
-Stephan


From superstippi at gmx.de  Mon Mar 17 13:30:14 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 17 Mar 2008 13:30:14 +0100
Subject: [Haiku-commits] r24409 - haiku/trunk/src/kits/interface
In-Reply-To: <f019d2f30803170526v5dd9db43n76e5bef978ac8bbd@mail.gmail.com>
References: <200803160555.m2G5tSj9015887@sheep.berlios.de>
	<20080317132419.883.5@stippis2.1205755486.fake>
	<f019d2f30803170526v5dd9db43n76e5bef978ac8bbd@mail.gmail.com>
Message-ID: <20080317133014.963.7@stippis2.1205755486.fake>


Rene Gollent wrote:
> Hi Stephan,
> 
> >  I have checked the code, and I think you are leaking a BMessage above. 
> >  The correct allocation should be like this:
> >
> 
> As far as I can tell that code's correct, doing it with a stack alloc'd 
> message results in a crash since BShelf stores a pointer to the message 
> in replicant_data without copying it. I did it the way you described the 
> first time because I hadn't noticed that, and got crashes on exit as a 
> result.

Ok, obviously I didn't look closely enough. I find it suspicious though, is 
the message freed later? What happens when a message is dropped? Is a copy 
made in this case, because it appears to have the same code path? Otherwise 
we delete it twice, leak it, or potentially use an invalid pointer.

Best regards,
-Stephan


From anevilyak at gmail.com  Mon Mar 17 13:40:41 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Mon, 17 Mar 2008 07:40:41 -0500
Subject: [Haiku-commits] r24409 - haiku/trunk/src/kits/interface
In-Reply-To: <20080317133014.963.7@stippis2.1205755486.fake>
References: <200803160555.m2G5tSj9015887@sheep.berlios.de>
	<20080317132419.883.5@stippis2.1205755486.fake>
	<f019d2f30803170526v5dd9db43n76e5bef978ac8bbd@mail.gmail.com>
	<20080317133014.963.7@stippis2.1205755486.fake>
Message-ID: <f019d2f30803170540u7f44caeaxe9a25d4af77b4b1a@mail.gmail.com>

Hi Stephan,

>  Ok, obviously I didn't look closely enough. I find it suspicious though, is
>  the message freed later? What happens when a message is dropped? Is a copy
>  made in this case, because it appears to have the same code path? Otherwise
>  we delete it twice, leak it, or potentially use an invalid pointer.
>

Ah...I must admit I hadn't actually looked at the rest of the shelf
code too closely for that kind of thing, I was mostly hunting down
what was needed to get save/restore working. Will look through to
check mem issues tonight after work, or if you're feeling motivated
right now you're welcome to as well :) Either is fine with me :)

Regards,

Rene


From axeld at mail.berlios.de  Mon Mar 17 13:53:17 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 17 Mar 2008 13:53:17 +0100
Subject: [Haiku-commits] r24419 - haiku/trunk/src/add-ons/disk_systems/bfs
Message-ID: <200803171253.m2HCrHqK001092@sheep.berlios.de>

Author: axeld
Date: 2008-03-17 13:53:17 +0100 (Mon, 17 Mar 2008)
New Revision: 24419
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24419&view=rev

Modified:
   haiku/trunk/src/add-ons/disk_systems/bfs/BFSAddOn.cpp
Log:
* Initialize() should also cause initializing the partition which would
  only happen if BPartition::SetContentType() set it (which set it 
  only if the original type differed).
* This fixes a part of bug #1928, but of course, it still won't work
  (now the partition reports to be busy).


Modified: haiku/trunk/src/add-ons/disk_systems/bfs/BFSAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/disk_systems/bfs/BFSAddOn.cpp	2008-03-17 01:20:49 UTC (rev 24418)
+++ haiku/trunk/src/add-ons/disk_systems/bfs/BFSAddOn.cpp	2008-03-17 12:53:17 UTC (rev 24419)
@@ -21,7 +21,7 @@
 using std::nothrow;
 
 
-static const uint32 kDiskSystemFlags = 
+static const uint32 kDiskSystemFlags =
 	0
 //	| B_DISK_SYSTEM_SUPPORTS_CHECKING
 //	| B_DISK_SYSTEM_SUPPORTS_REPAIRING
@@ -155,6 +155,7 @@
 	uint32 blockSize = parameters.blockSize;
 	partition->SetBlockSize(blockSize);
 	partition->SetContentSize(partition->Size() / blockSize * blockSize);
+	partition->Changed(B_PARTITION_CHANGED_INITIALIZATION);
 
 	*_handle = handleDeleter.Detach();
 



From ingo_weinhold at gmx.de  Mon Mar 17 14:00:12 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Mon, 17 Mar 2008 14:00:12 +0100
Subject: [Haiku-commits] r24419 -
 haiku/trunk/src/add-ons/disk_systems/bfs
In-Reply-To: <200803171253.m2HCrHqK001092@sheep.berlios.de>
References: <200803171253.m2HCrHqK001092@sheep.berlios.de>
Message-ID: <20080317140012.1201.1@knochen-vm.1205758452.fake>


On 2008-03-17 at 13:53:17 [+0100], axeld at BerliOS <axeld at mail.berlios.de> 
wrote:
> Author: axeld
> Date: 2008-03-17 13:53:17 +0100 (Mon, 17 Mar 2008)
> New Revision: 24419
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24419&view=rev
> 
> Modified:
>    haiku/trunk/src/add-ons/disk_systems/bfs/BFSAddOn.cpp
> Log:
> * Initialize() should also cause initializing the partition which would
>   only happen if BPartition::SetContentType() set it (which set it
>   only if the original type differed).
> * This fixes a part of bug #1928, but of course, it still won't work
>   (now the partition reports to be busy).

Supposedly one of the syscall functions doesn't mark it unbusy correctly. 
Usually they should mark all affected partitions busy before they start and 
clean the flag when they're done. So unless two threads try playing with 
partitions at the same time, the syscall shouldn't ever encounter busy 
partitions.

CU, Ingo


From axeld at mail.berlios.de  Mon Mar 17 14:07:57 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 17 Mar 2008 14:07:57 +0100
Subject: [Haiku-commits] r24420 -
	haiku/trunk/src/system/kernel/disk_device_manager
Message-ID: <200803171307.m2HD7vet003824@sheep.berlios.de>

Author: axeld
Date: 2008-03-17 14:07:57 +0100 (Mon, 17 Mar 2008)
New Revision: 24420
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24420&view=rev

Modified:
   haiku/trunk/src/system/kernel/disk_device_manager/KFileSystem.cpp
Log:
* Implemented SetContentName(), and SetContentParameters().
* Added license.
* Minor cleanup.


Modified: haiku/trunk/src/system/kernel/disk_device_manager/KFileSystem.cpp
===================================================================
--- haiku/trunk/src/system/kernel/disk_device_manager/KFileSystem.cpp	2008-03-17 12:53:17 UTC (rev 24419)
+++ haiku/trunk/src/system/kernel/disk_device_manager/KFileSystem.cpp	2008-03-17 13:07:57 UTC (rev 24420)
@@ -1,5 +1,13 @@
-// KFileSystem.cpp
+/*
+ * Copyright 2003-2008, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Ingo Weinhold, bonefish at cs.tu-berlin.de
+ */
 
+#include "KFileSystem.h"
+
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -7,9 +15,7 @@
 #include <fs_interface.h>
 
 #include "ddm_modules.h"
-//#include "KDiskDeviceJob.h"
 #include "KDiskDeviceUtils.h"
-#include "KFileSystem.h"
 #include "KPartition.h"
 
 
@@ -54,7 +60,7 @@
 	if (partition->Open(O_RDONLY, &fd) != B_OK)
 		return -1;
 	float result = fModule->identify_partition(fd, partition->PartitionData(),
-											   cookie);
+		cookie);
 	close(fd);
 	return result;
 }
@@ -82,8 +88,7 @@
 {
 	if (!partition || !fModule || !fModule->free_identify_partition_cookie)
 		return;
-	fModule->free_identify_partition_cookie(partition->PartitionData(),
-											cookie);
+	fModule->free_identify_partition_cookie(partition->PartitionData(), cookie);
 }
 
 
@@ -138,8 +143,24 @@
 KFileSystem::SetContentName(KPartition* partition, const char* name,
 	disk_job_id job)
 {
-	// to be implemented
-	return B_ERROR;
+	// check parameters
+	if (!partition || !fModule)
+		return B_BAD_VALUE;
+	if (!fModule->set_content_name)
+		return B_NOT_SUPPORTED;
+
+	// open partition device
+	int fd = -1;
+	status_t result = partition->Open(O_RDWR, &fd);
+	if (result != B_OK)
+		return result;
+
+	// let the module do its job
+	result = fModule->set_content_name(fd, partition->ID(), name, job);
+
+	// cleanup and return
+	close(fd);
+	return result;
 }
 
 
@@ -148,8 +169,25 @@
 KFileSystem::SetContentParameters(KPartition* partition,
 	const char* parameters, disk_job_id job)
 {
-	// to be implemented
-	return B_ERROR;
+	// check parameters
+	if (!partition || !fModule)
+		return B_BAD_VALUE;
+	if (!fModule->set_content_parameters)
+		return B_NOT_SUPPORTED;
+
+	// open partition device
+	int fd = -1;
+	status_t result = partition->Open(O_RDWR, &fd);
+	if (result != B_OK)
+		return result;
+
+	// let the module do its job
+	result = fModule->set_content_parameters(fd, partition->ID(), parameters,
+		job);
+
+	// cleanup and return
+	close(fd);
+	return result;
 }
 
 



From axeld at mail.berlios.de  Mon Mar 17 14:11:35 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 17 Mar 2008 14:11:35 +0100
Subject: [Haiku-commits] r24421 -
	haiku/trunk/src/system/kernel/disk_device_manager
Message-ID: <200803171311.m2HDBZcm004893@sheep.berlios.de>

Author: axeld
Date: 2008-03-17 14:11:35 +0100 (Mon, 17 Mar 2008)
New Revision: 24421
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24421&view=rev

Modified:
   haiku/trunk/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp
Log:
* _user_uninitialize_partition() never marked the partition unbusy
  again. This fixes bug #1928.
* Added license header.
* Minor cleanup.


Modified: haiku/trunk/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp
===================================================================
--- haiku/trunk/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp	2008-03-17 13:07:57 UTC (rev 24420)
+++ haiku/trunk/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp	2008-03-17 13:11:35 UTC (rev 24421)
@@ -1,8 +1,16 @@
-/** \file ddm_userland_interface.cpp
+/*
+ * Copyright 2003-2008, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
  *
- * 	\brief Interface for userspace calls.
+ * Authors:
+ *		Ingo Weinhold, bonefish at cs.tu-berlin.de
  */
 
+/*! \file ddm_userland_interface.cpp
+
+ 	\brief Interface for userspace calls.
+*/
+
 #include <stdlib.h>
 
 #include <AutoDeleter.h>
@@ -33,8 +41,8 @@
 // ddm_strlcpy
 /*! \brief Wrapper around user_strlcpy() that returns a status_t
 	indicating appropriate success or failure.
-	
-	\param allowTruncation If \c true, does not return an error if 
+
+	\param allowTruncation If \c true, does not return an error if
 	       \a from is longer than \to. If \c false, returns \c B_NAME_TOO_LONG
 	       if \a from is longer than \to.
 */
@@ -216,7 +224,7 @@
 		return B_BAD_VALUE;
 	int32 cookie;
 	user_memcpy(&cookie, _cookie, sizeof(cookie));
-	
+
 	partition_id id = B_ENTRY_NOT_FOUND;
 	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
 	// get the next device
@@ -250,7 +258,7 @@
 	status_t error = ddm_strlcpy(filename, _filename, B_PATH_NAME_LENGTH);
 	if (error)
 		return error;
-		
+
 	partition_id id = B_ENTRY_NOT_FOUND;
 	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
 	// find the device
@@ -425,7 +433,7 @@
 _user_unregister_file_device(partition_id deviceID, const char *_filename)
 {
 	if (deviceID < 0 && !_filename)
-		return B_BAD_VALUE;	
+		return B_BAD_VALUE;
 	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
 	if (deviceID >= 0) {
 		return manager->DeleteFileDevice(deviceID);
@@ -1232,6 +1240,9 @@
 
 	// uninitialize
 	error = partition->UninitializeContents(true);
+
+	partition->UnmarkBusy(true);
+
 	if (error != B_OK)
 		return error;
 



From leavengood at gmail.com  Mon Mar 17 15:21:16 2008
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 17 Mar 2008 10:21:16 -0400
Subject: [Haiku-commits] r24415 - haiku/trunk/src/servers/net
In-Reply-To: <200803162224.m2GMOIex014719@sheep.berlios.de>
References: <200803162224.m2GMOIex014719@sheep.berlios.de>
Message-ID: <a4855ac50803170721o229f7ba1r91e92b64009ecef3@mail.gmail.com>

On Sun, Mar 16, 2008 at 6:24 PM, bga at BerliOS <bga at mail.berlios.de> wrote:
>
>  - Changed default address for failed DHCP requests from 192.168.0.x to
>   169.254.0.x, as this is the IANA reserved address for default
>   configuration.

This reminds me, I just watched a Google Tech Talk on Bonjour, aka
Zeroconf, and it seems like a technology that would be useful for
Haiku. The 169.254.* range is the default for Bonjour. Apparently the
Apple code for it is open source with a friendly license (Apache v2)
and they have the platform-specific code nicely contained. So porting
shouldn't be too hard, especially with our decent POSIX layer. Maybe
this would make a good idea for the Summer of Code, though it
certainly isn't critical or even necessary for the alpha release.

But it could be an interesting project and could make for some neat
demos of Haiku machines cooperating without configuration.

For those curious, here is the Google Tech Talk (definitely worth watching):

http://video.google.com/videoplay?docid=-7398680103951126462

Here is the Apple developer page for it:

http://developer.apple.com/networking/bonjour/index.html

Regards,
Ryan


From stippi at mail.berlios.de  Mon Mar 17 15:28:14 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 17 Mar 2008 15:28:14 +0100
Subject: [Haiku-commits] r24422 - in haiku/trunk/src: build/libhaikucompat
	servers/app/drawing
Message-ID: <200803171428.m2HESEc4011202@sheep.berlios.de>

Author: stippi
Date: 2008-03-17 15:28:09 +0100 (Mon, 17 Mar 2008)
New Revision: 24422
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24422&view=rev

Modified:
   haiku/trunk/src/build/libhaikucompat/misc.cpp
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
Log:
* Fix build of app_server test environment by implementing atomic_get(),
  maybe this should be the assembler version we use for x86, but is probably
  fine for the purpose of the test environment (only BString uses this)
* Fix semantics of DrawingEngine::CopyToFront() which I recently introduced,
  for the fake accelerant of the test environment, we do need to call
  Invalidate(), not CopyBackToFront() directly.


Modified: haiku/trunk/src/build/libhaikucompat/misc.cpp
===================================================================
--- haiku/trunk/src/build/libhaikucompat/misc.cpp	2008-03-17 13:11:35 UTC (rev 24421)
+++ haiku/trunk/src/build/libhaikucompat/misc.cpp	2008-03-17 14:28:09 UTC (rev 24422)
@@ -35,3 +35,11 @@
 	return B_ERROR;
 }
 
+
+int32
+atomic_get(vint32 *value)
+{
+	return *value;
+}
+
+

Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2008-03-17 13:11:35 UTC (rev 24421)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2008-03-17 14:28:09 UTC (rev 24422)
@@ -190,7 +190,7 @@
 {
 	int32 count = region.CountRects();
 	for (int32 i = 0; i < count; i++)
-		fGraphicsCard->CopyBackToFront(region.RectAt(i));
+		fGraphicsCard->Invalidate(region.RectAt(i));
 }
 
 



From axeld at pinc-software.de  Mon Mar 17 16:05:30 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 17 Mar 2008 16:05:30 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24422_-_in_haiku/trunk/src=3A_bu?=
 =?iso-8859-15?q?ild/libhaikucompat_servers/app/drawing?=
In-Reply-To: <200803171428.m2HESEc4011202@sheep.berlios.de>
Message-ID: <12725900499-BeMail@zon>

stippi at BerliOS <stippi at mail.berlios.de> wrote:
> Log:
> * Fix build of app_server test environment by implementing 
> atomic_get(),
>   maybe this should be the assembler version we use for x86, but is 
> probably
>   fine for the purpose of the test environment (only BString uses 
> this)

4 byte read accesses are guaranteed to be atomic on x86, anyway - so 
for the test environment, it should really be fine :-)

Bye,
   Axel.



From koki at digintrans.com  Mon Mar 17 15:33:59 2008
From: koki at digintrans.com (Jorge G. Mare)
Date: Mon, 17 Mar 2008 07:33:59 -0700
Subject: [Haiku-commits] r24415 - haiku/trunk/src/servers/net
In-Reply-To: <a4855ac50803170721o229f7ba1r91e92b64009ecef3@mail.gmail.com>
References: <200803162224.m2GMOIex014719@sheep.berlios.de>
	<a4855ac50803170721o229f7ba1r91e92b64009ecef3@mail.gmail.com>
Message-ID: <1205764439.5811.4.camel@jorge-desktop>

On Mon, 2008-03-17 at 10:21 -0400, Ryan Leavengood wrote:
> On Sun, Mar 16, 2008 at 6:24 PM, bga at BerliOS <bga at mail.berlios.de> wrote:
> >
> >  - Changed default address for failed DHCP requests from 192.168.0.x to
> >   169.254.0.x, as this is the IANA reserved address for default
> >   configuration.
> 
> This reminds me, I just watched a Google Tech Talk on Bonjour, aka
> Zeroconf, and it seems like a technology that would be useful for
> Haiku. The 169.254.* range is the default for Bonjour. Apparently the
> Apple code for it is open source with a friendly license (Apache v2)
> and they have the platform-specific code nicely contained. So porting
> shouldn't be too hard, especially with our decent POSIX layer. Maybe
> this would make a good idea for the Summer of Code...

"Implement ZeroConf/Bonjour support" is already one of the Haiku
proposed ideas for GSoC 2008:

http://www.haiku-os.org/community/gsoc2008/ideas

Cheers,

Koki




From leavengood at gmail.com  Mon Mar 17 17:32:29 2008
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 17 Mar 2008 12:32:29 -0400
Subject: [Haiku-commits] r24415 - haiku/trunk/src/servers/net
In-Reply-To: <1205764439.5811.4.camel@jorge-desktop>
References: <200803162224.m2GMOIex014719@sheep.berlios.de>
	<a4855ac50803170721o229f7ba1r91e92b64009ecef3@mail.gmail.com>
	<1205764439.5811.4.camel@jorge-desktop>
Message-ID: <a4855ac50803170932n31877982i12a3a0b227dd0bdf@mail.gmail.com>

On Mon, Mar 17, 2008 at 10:33 AM, Jorge G. Mare <koki at digintrans.com> wrote:
>
>  "Implement ZeroConf/Bonjour support" is already one of the Haiku
>  proposed ideas for GSoC 2008:
>
>  http://www.haiku-os.org/community/gsoc2008/ideas

Ah yes, in fact I believe that was there last year too. I really
should read the Haiku web site occasionally ;)

One thing that maybe should be changed on that GSoC idea is that
apparently Hugo implemented IP Multicasting last year (according to
ticket #1077), so that is one less obstacle for implementing Zeroconf.
In fact, I went ahead and changed that and also added links to Apple's
Bonjour and Avahi.

Ryan


From axeld at mail.berlios.de  Mon Mar 17 18:31:52 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 17 Mar 2008 18:31:52 +0100
Subject: [Haiku-commits] r24423 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200803171731.m2HHVqsq002738@sheep.berlios.de>

Author: axeld
Date: 2008-03-17 18:31:51 +0100 (Mon, 17 Mar 2008)
New Revision: 24423
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24423&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp
Log:
* There can now be one default route per interface, not just one
  default route in the whole stack. The default routes are ordered by
  link speed, so faster interfaces are preferred.
* find_route() by net_route now also checks for the equality of the 
  RTF_DEFAULT flag
* find_route() by address now ignores routes that point to interfaces
  that have no link; if you have more than one configured interface in
  your system, the one with a link is now always chosen.
* get_route_internal() now recognizes AF_LINK addresses, and allows
  one to specify a route by interface this way.
* Implemented update_route_info().
* Minor cleanup, moved copy_address(), and fill_route_entry() into the
  private part of the file.


Modified: haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp	2008-03-17 14:28:09 UTC (rev 24422)
+++ haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp	2008-03-17 17:31:51 UTC (rev 24423)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -50,7 +50,7 @@
 }
 
 
-//	#pragma mark -
+//	#pragma mark - private functions
 
 
 #if 0
@@ -118,6 +118,7 @@
 	return B_OK;
 }
 
+
 static net_route_private *
 find_route(struct net_domain *_domain, const net_route *description)
 {
@@ -129,14 +130,18 @@
 
 		if ((route->flags & RTF_DEFAULT) != 0
 			&& (description->flags & RTF_DEFAULT) != 0) {
-			// there can only be one default route
-			return route;
+			// there can only be one default route per interface
+			if (route->interface == description->interface)
+				return route;
+
+			continue;
 		}
 
-		if ((route->flags & (RTF_GATEWAY | RTF_HOST | RTF_LOCAL)) ==
-				(description->flags & (RTF_GATEWAY | RTF_HOST | RTF_LOCAL))
-			&& domain->address_module->equal_masked_addresses(route->destination,
-				description->destination, description->mask)
+		if ((route->flags & (RTF_GATEWAY | RTF_HOST | RTF_LOCAL | RTF_DEFAULT))
+				== (description->flags
+					& (RTF_GATEWAY | RTF_HOST | RTF_LOCAL | RTF_DEFAULT))
+			&& domain->address_module->equal_masked_addresses(
+				route->destination, description->destination, description->mask)
 			&& domain->address_module->equal_addresses(route->mask,
 				description->mask)
 			&& domain->address_module->equal_addresses(route->gateway,
@@ -158,9 +163,15 @@
 	RouteList::Iterator iterator = domain->routes.GetIterator();
 	TRACE(("test address %s for routes...\n", AddressString(domain, address).Data()));
 
+	// TODO: alternate equal default routes
+
 	while (iterator.HasNext()) {
 		net_route_private *route = iterator.Next();
 
+		// ignore routes that point to devices that have no link
+		if ((route->interface->device->flags & IFF_LINK) == 0)
+			continue;
+
 		if (route->mask) {
 			sockaddr maskedAddress;
 			domain->address_module->mask_address(address, route->mask,
@@ -171,7 +182,7 @@
 		} else if (!domain->address_module->equal_addresses(address,
 				route->destination))
 			continue;
-		
+
 		TRACE(("  found route: %s, flags %lx\n",
 			AddressString(domain, route->destination).Data(), route->flags));
 
@@ -200,7 +211,29 @@
 get_route_internal(struct net_domain_private *domain,
 	const struct sockaddr *address)
 {
-	net_route_private *route = find_route(domain, address);
+	net_route_private *route = NULL;
+
+	if (address->sa_family == AF_LINK) {
+		// special address to find an interface directly
+		RouteList::Iterator iterator = domain->routes.GetIterator();
+		const sockaddr_dl* link = (const sockaddr_dl*)address;
+
+		while (iterator.HasNext()) {
+			route = iterator.Next();
+
+			net_device* device = route->interface->device;
+
+			if ((link->sdl_nlen > 0
+					&& !strncmp(device->name, (const char*)link->sdl_data,
+							IF_NAMESIZE))
+				|| (link->sdl_nlen == 0 && link->sdl_alen > 0
+					&& !memcmp(LLADDR(link), device->address.data,
+							device->address.length)))
+				break;
+		}
+	} else
+		route = find_route(domain, address);
+
 	if (route != NULL && atomic_add(&route->ref_count, 1) == 0) {
 		// route has been deleted already
 		route = NULL;
@@ -224,9 +257,37 @@
 }
 
 
-//	#pragma mark -
+static sockaddr *
+copy_address(UserBuffer &buffer, sockaddr *address)
+{
+	if (address == NULL)
+		return NULL;
 
+	return (sockaddr *)buffer.Copy(address, address->sa_len);
+}
 
+
+static status_t
+fill_route_entry(route_entry *target, void *_buffer, size_t bufferSize,
+		 net_route *route)
+{
+	UserBuffer buffer(((uint8 *)_buffer) + sizeof(route_entry),
+		bufferSize - sizeof(route_entry));
+
+	target->destination = copy_address(buffer, route->destination);
+	target->mask = copy_address(buffer, route->mask);
+	target->gateway = copy_address(buffer, route->gateway);
+	target->source = copy_address(buffer, route->interface->address);
+	target->flags = route->flags;
+	target->mtu = route->mtu;
+
+	return buffer.Status();
+}
+
+
+//	#pragma mark - exported functions
+
+
 /*!
 	Determines the size of a buffer large enough to contain the whole
 	routing table.
@@ -307,10 +368,15 @@
 		request.ifr_route.mtu = route->mtu;
 		request.ifr_route.flags = route->flags;
 
+		// copy data into userland buffer
 		if (user_memcpy(buffer, &request, size) < B_OK
-			|| (route->destination != NULL && user_memcpy(request.ifr_route.destination, route->destination, route->destination->sa_len) < B_OK)
-			|| (route->mask != NULL && user_memcpy(request.ifr_route.mask, route->mask, route->mask->sa_len) < B_OK)
-			|| (route->gateway != NULL && user_memcpy(request.ifr_route.gateway, route->gateway, route->gateway->sa_len) < B_OK))
+			|| (route->destination != NULL
+				&& user_memcpy(request.ifr_route.destination,
+					route->destination, route->destination->sa_len) < B_OK)
+			|| (route->mask != NULL && user_memcpy(request.ifr_route.mask,
+					route->mask, route->mask->sa_len) < B_OK)
+			|| (route->gateway != NULL && user_memcpy(request.ifr_route.gateway,
+					route->gateway, route->gateway->sa_len) < B_OK))
 			return B_BAD_ADDRESS;
 
 		buffer = (void *)next;
@@ -322,7 +388,8 @@
 
 
 status_t
-control_routes(struct net_interface *interface, int32 option, void *argument, size_t length)
+control_routes(struct net_interface *interface, int32 option, void *argument,
+	size_t length)
 {
 	net_domain_private *domain = (net_domain_private *)interface->domain;
 
@@ -335,14 +402,17 @@
 				return B_BAD_VALUE;
 
 			route_entry entry;
-			if (user_memcpy(&entry, &((ifreq *)argument)->ifr_route, sizeof(route_entry)) != B_OK)
+			if (user_memcpy(&entry, &((ifreq *)argument)->ifr_route,
+					sizeof(route_entry)) != B_OK)
 				return B_BAD_ADDRESS;
 
 			net_route_private route;
 			status_t status;
-			if ((status = user_copy_address(entry.destination, &route.destination)) != B_OK
+			if ((status = user_copy_address(entry.destination,
+					&route.destination)) != B_OK
 				|| (status = user_copy_address(entry.mask, &route.mask)) != B_OK
-				|| (status = user_copy_address(entry.gateway, &route.gateway)) != B_OK)
+				|| (status = user_copy_address(entry.gateway, &route.gateway))
+					!= B_OK)
 				return status;
 
 			route.mtu = entry.mtu;
@@ -416,6 +486,15 @@
 		if (domain->address_module->first_mask_bit(before->mask)
 				> domain->address_module->first_mask_bit(route->mask))
 			break;
+
+		if ((route->flags & RTF_DEFAULT) != 0
+			&& (before->flags & RTF_DEFAULT) != 0) {
+			// both routes are equal - let the link speed decide the
+			// order
+			if (before->interface->device->link_speed
+					< route->interface->device->link_speed)
+				break;
+		}
 	}
 
 	domain->routes.Insert(before, route);
@@ -451,33 +530,6 @@
 }
 
 
-static sockaddr *
-copy_address(UserBuffer &buffer, sockaddr *address)
-{
-	if (address == NULL)
-		return NULL;
-
-	return (sockaddr *)buffer.Copy(address, address->sa_len);
-}
-
-static status_t
-fill_route_entry(route_entry *target, void *_buffer, size_t bufferSize,
-		 net_route *route)
-{
-	UserBuffer buffer(((uint8 *)_buffer) + sizeof(route_entry),
-		bufferSize - sizeof(route_entry));
-
-	target->destination = copy_address(buffer, route->destination);
-	target->mask = copy_address(buffer, route->mask);
-	target->gateway = copy_address(buffer, route->gateway);
-	target->source = copy_address(buffer, route->interface->address);
-	target->flags = route->flags;
-	target->mtu = route->mtu;
-
-	return buffer.Status();
-}
-
-
 status_t
 get_route_information(struct net_domain *_domain, void *value, size_t length)
 {
@@ -598,8 +650,7 @@
 
 
 status_t
-register_route_info(struct net_domain *_domain,
-	struct net_route_info *info)
+register_route_info(struct net_domain *_domain, struct net_route_info *info)
 {
 	struct net_domain_private *domain = (net_domain_private *)_domain;
 	BenaphoreLocker locker(domain->lock);
@@ -612,8 +663,7 @@
 
 
 status_t
-unregister_route_info(struct net_domain *_domain,
-	struct net_route_info *info)
+unregister_route_info(struct net_domain *_domain, struct net_route_info *info)
 {
 	struct net_domain_private *domain = (net_domain_private *)_domain;
 	BenaphoreLocker locker(domain->lock);
@@ -627,9 +677,13 @@
 
 
 status_t
-update_route_info(struct net_domain *domain,
-	struct net_route_info *info)
+update_route_info(struct net_domain *_domain, struct net_route_info *info)
 {
-	return B_ERROR;
+	struct net_domain_private *domain = (net_domain_private *)_domain;
+	BenaphoreLocker locker(domain->lock);
+
+	put_route_internal(domain, info->route);
+	info->route = get_route_internal(domain, &info->address);
+	return B_OK;
 }
 



From axeld at pinc-software.de  Mon Mar 17 18:40:09 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 17 Mar 2008 18:40:09 +0100 CET
Subject: [Haiku-commits] r24415 - haiku/trunk/src/servers/net
In-Reply-To: <a4855ac50803170932n31877982i12a3a0b227dd0bdf@mail.gmail.com>
Message-ID: <22004842334-BeMail@zon>

"Ryan Leavengood" <leavengood at gmail.com> wrote:
> One thing that maybe should be changed on that GSoC idea is that
> apparently Hugo implemented IP Multicasting last year (according to
> ticket #1077), so that is one less obstacle for implementing 
> Zeroconf.
> In fact, I went ahead and changed that and also added links to 
> Apple's
> Bonjour and Avahi.

Thanks!

Bye,
   Axel.



From axeld at pinc-software.de  Mon Mar 17 18:41:02 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 17 Mar 2008 18:41:02 +0100 CET
Subject: [Haiku-commits] r24419 -
	haiku/trunk/src/add-ons/disk_systems/bfs
In-Reply-To: <20080317140012.1201.1@knochen-vm.1205758452.fake>
Message-ID: <22057493048-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > * This fixes a part of bug #1928, but of course, it still won't 
> > work
> >   (now the partition reports to be busy).
> Supposedly one of the syscall functions doesn't mark it unbusy 
> correctly. 
> Usually they should mark all affected partitions busy before they 
> start and 
> clean the flag when they're done. So unless two threads try playing 
> with 
> partitions at the same time, the syscall shouldn't ever encounter 
> busy 
> partitions.

That was exactly the reason - of course, I only read after I found out 
about this, but it didn't take long :-)

Bye,
   Axel.



From korli at mail.berlios.de  Mon Mar 17 20:50:47 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Mon, 17 Mar 2008 20:50:47 +0100
Subject: [Haiku-commits] r24424 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200803171950.m2HJolWg001560@sheep.berlios.de>

Author: korli
Date: 2008-03-17 20:50:46 +0100 (Mon, 17 Mar 2008)
New Revision: 24424
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24424&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
Log:
algorithm to find best suited mtrr values to match a memory region. tested ok with 3071MB.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-17 17:31:51 UTC (rev 24423)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-17 19:50:46 UTC (rev 24424)
@@ -31,7 +31,14 @@
 #	define TRACE(x) ;
 #endif
 
+#define TRACE_MTRR_ARCH_VM
+#ifdef TRACE_MTRR_ARCH_VM
+#	define TRACE_MTRR(x...) dprintf(x)
+#else
+#	define TRACE_MTRR(x...) 
+#endif
 
+
 #define kMaxMemoryTypeRegisters 32
 
 void *gDmaAddress;
@@ -83,6 +90,22 @@
 }
 
 
+static void
+nearest_powers(uint64 value, uint64 *lower, uint64 *upper)
+{
+	uint64 power = 1UL << 12;
+	*lower = power;
+		// 12 bits is the smallest supported alignment/length
+
+	while (value >= power) {
+		*lower = power;
+		power <<= 1;
+	}
+
+	*upper = power;
+}
+
+
 static status_t
 set_memory_type(int32 id, uint64 base, uint64 length, uint32 type)
 {
@@ -91,23 +114,21 @@
 	if (type == 0)
 		return B_OK;
 
-	uint32 newType;
-
 	switch (type) {
 		case B_MTR_UC:
-			newType = IA32_MTR_UNCACHED;
+			type = IA32_MTR_UNCACHED;
 			break;
 		case B_MTR_WC:
-			newType = IA32_MTR_WRITE_COMBINING;
+			type = IA32_MTR_WRITE_COMBINING;
 			break;
 		case B_MTR_WT:
-			newType = IA32_MTR_WRITE_THROUGH;
+			type = IA32_MTR_WRITE_THROUGH;
 			break;
 		case B_MTR_WP:
-			newType = IA32_MTR_WRITE_PROTECTED;
+			type = IA32_MTR_WRITE_PROTECTED;
 			break;
 		case B_MTR_WB:
-			newType = IA32_MTR_WRITE_BACK;
+			type = IA32_MTR_WRITE_BACK;
 			break;
 
 		default:
@@ -118,38 +139,96 @@
 		return B_NOT_SUPPORTED;
 
 	// length must be a power of 2; just round it up to the next value
-	uint64 newLength = nearest_power(length);
+	length = nearest_power(length); 	
 
-	// avoids more than 2GB slots
-	if (newLength > 0x80000000)
-		newLength = 0x80000000;
-
-	if (newLength + base <= base) {
+	if (length + base <= base) {
 		// 4GB overflow
 		return B_BAD_VALUE;
 	}
 
 	// base must be aligned to the length
-	if (base & (newLength - 1))
+	if (base & (length - 1))
 		return B_BAD_VALUE;
 
 	index = allocate_mtrr();
 	if (index < 0)
 		return B_ERROR;
 
-	TRACE(("allocate MTRR slot %ld, base = %Lx, length = %Lx\n", index,
-		base, newLength));
+	TRACE_MTRR("allocate MTRR slot %ld, base = %Lx, length = %Lx\n", index, base, length);
 
 	sMemoryTypeIDs[index] = id;
-	x86_set_mtrr(index, base, newLength, newType);
+	x86_set_mtrr(index, base, length, type);
 
-	// now handle remaining memory
-	if (length > newLength) {
-		// TODO iterate over smaller lengths to avoid the PCI hole after the physical memory.
-		set_memory_type(id, base + newLength, length - newLength, type);
+	return B_OK;
+}
+
+
+static int64 sols[5];
+static int solCount;
+static int64 props[5];
+
+
+static void
+find_nearest(uint64 value, int iteration)
+{
+	TRACE_MTRR("find_nearest %Lx %d\n", value, iteration);
+	if (iteration > 4 || (iteration + 1) >= solCount)
+		return;
+	uint64 down, up;
+	int i;
+	nearest_powers(value, &down, &up);
+	props[iteration] = down;
+	if (value - down < 0x100000) {
+		for (i=0; i<=iteration; i++)
+			sols[i] = props[i];
+		solCount = iteration + 1;
+		return;
 	}
+	find_nearest(value - down, iteration + 1);
+	props[iteration] = -up;
+	if (up - value < 0x100000) {
+		for (i=0; i<=iteration; i++)
+			sols[i] = props[i];
+		solCount = iteration + 1;
+		return;
+	}
+	find_nearest(up - value, iteration + 1);
+}
 
-	return B_OK;
+
+static status_t
+set_memory_write_back(int32 id, uint64 base, uint64 length)
+{
+	int i;
+	TRACE_MTRR("set_memory_write_back base %Lx length %Lx\n", base, length);
+	solCount = 5;
+	find_nearest(length, 0);
+
+#ifdef TRACE_MTRR
+	dprintf("sols: ");
+	for (i=0; i<solCount; i++) {
+                dprintf("0x%Lx ", sols[i]);
+        }
+        dprintf("\n");
+#endif
+
+	bool nextDown = false;
+	for (int i = 0; i < solCount; i++) {
+		if (sols[i] < 0) {
+			if (nextDown)
+				base += sols[i];
+			set_memory_type(id, base, -sols[i], nextDown ? B_MTR_UC : B_MTR_WB);
+			if (!nextDown)
+				base -= sols[i];
+			nextDown = !nextDown;
+		} else {
+			if (nextDown)
+				base -= sols[i];
+			set_memory_type(id, base, sols[i], nextDown ? B_MTR_UC : B_MTR_WB);
+			if (!nextDown)
+				base += sols[i];
+		}
+	}
 }
 
 
@@ -226,8 +305,8 @@
 	// set the physical memory ranges to write-back mode
 
 	for (uint32 i = 0; i < args->num_physical_memory_ranges; i++) {
-		set_memory_type(-1, args->physical_memory_range[i].start,
-			args->physical_memory_range[i].size, B_MTR_WB);
+		set_memory_write_back(-1, args->physical_memory_range[i].start,
+			args->physical_memory_range[i].size);
 	}
 
 	return B_OK;



From bonefish at mail.berlios.de  Mon Mar 17 22:37:42 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 17 Mar 2008 22:37:42 +0100
Subject: [Haiku-commits] r24425 - in haiku/trunk: docs/user/drivers
	src/add-ons/kernel/file_systems/bfs src/kits/storage
	src/system/kernel/fs src/system/libroot/posix/unistd
Message-ID: <200803172137.m2HLbg93013284@sheep.berlios.de>

Author: bonefish
Date: 2008-03-17 22:37:40 +0100 (Mon, 17 Mar 2008)
New Revision: 24425
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24425&view=rev

Modified:
   haiku/trunk/docs/user/drivers/fs_interface.dox
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
   haiku/trunk/src/kits/storage/Entry.cpp
   haiku/trunk/src/kits/storage/LibBeAdapter.cpp
   haiku/trunk/src/kits/storage/SymLink.cpp
   haiku/trunk/src/system/kernel/fs/devfs.cpp
   haiku/trunk/src/system/kernel/fs/rootfs.cpp
   haiku/trunk/src/system/kernel/fs/vfs.cpp
   haiku/trunk/src/system/libroot/posix/unistd/link.c
Log:
* Aligned the semantics of the read_symlink() FS module hook with the
  readlink() function. It is no longer required to null-terminate the
  string, shall not fail, if the buffer is too small, and shall return
  the length of the string actually written into the buffer.
* Adjusted rootfs, devfs, and bfs accordingly. Also adjusted their
  read_stat() hooks to return the correct symlink length in st_size.
* Our readlink() does now comply to the standard (and BeOS).
  Additionally if the buffer is big enough it is nice to non-conforming
  apps and null-terminates it.
* BSymLink::ReadLink() explicitly null-terminates the string now.


Modified: haiku/trunk/docs/user/drivers/fs_interface.dox
===================================================================
--- haiku/trunk/docs/user/drivers/fs_interface.dox	2008-03-17 19:50:46 UTC (rev 24424)
+++ haiku/trunk/docs/user/drivers/fs_interface.dox	2008-03-17 21:37:40 UTC (rev 24425)
@@ -1,9 +1,9 @@
 /*
- * Copyright 2007 Haiku Inc. All rights reserved.
+ * Copyright 2007-2008 Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *		Ingo Weinhold
+ *		Ingo Weinhold <ingo_weinhold at gmx.de>
  *		Niels Sascha Reedijk <niels.reedijk at gmail.com>
  *		Axel D?rfler <axeld at pinc-software.de>
  *
@@ -536,21 +536,24 @@
 			fs_vnode link, char *buffer, size_t *_bufferSize)
 	\brief Read the value of a symbolic link.
 
-	If the function is successful, the string written to the buffer shall be
-	null-terminated and the variable \a _bufferSize points to shall be set to
-	the length of that string, including the terminating null character.
+	If the function is successful, the symlink string shall be written to the
+	buffer. It does not need to be null-terminated. If the buffer is too small
+	to hold the complete string, only the first \c *_bufferSize bytes of the
+	string shall be written to the buffer; the buffer shall not be
+	null-terminated in this case. Furthermore the variable \a _bufferSize
+	points to shall be set to the length of the string written to the buffer,
+	not including any terminating null character (if written).
 
 	\param fs The volume handle.
 	\param link The node handle.
 	\param buffer Pointer to a pre-allocated buffer the link value shall be
 		written to.
-	\param buffer Pointer to a pre-allocated variable containing the size of the
-		buffer supplied to the function. Upon successful completion the hook shall
-		store the number of bytes actually written into the buffer in the variable.
+	\param _bufferSize Pointer to a pre-allocated variable containing the size
+		of the buffer supplied to the function. Upon successful completion the
+		hook shall store the number of bytes actually written into the buffer
+		in the variable.
 	\retval B_OK Everything went fine.
 	\retval B_BAD_VALUE \a link does not identify a symbolic link.
-	\retval B_BUFFER_OVERFLOW The supplied buffer is not big enough to contain
-		the complete link value.
 */
 
 /*!

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp	2008-03-17 19:50:46 UTC (rev 24424)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp	2008-03-17 21:37:40 UTC (rev 24425)
@@ -49,7 +49,7 @@
 
 	if (inode->IsSymLink() && (node.Flags() & INODE_LONG_SYMLINK) == 0) {
 		// symlinks report the size of the link here
-		stat.st_size = strlen(node.short_symlink) + 1;
+		stat.st_size = strlen(node.short_symlink);
 	} else
 		stat.st_size = inode->Size();
 }
@@ -1366,30 +1366,27 @@
 	FUNCTION();
 
 	Inode *inode = (Inode *)_node;
-	size_t bufferSize = *_bufferSize;
 
 	if (!inode->IsSymLink())
 		RETURN_ERROR(B_BAD_VALUE);
 
 	if (inode->Flags() & INODE_LONG_SYMLINK) {
-		// we also need space for the terminating null byte
-		if (inode->Size() >= bufferSize) {
-			*_bufferSize = inode->Size() + 1;
-			return B_BUFFER_OVERFLOW;
-		}
+		if (inode->Size() < *_bufferSize)
+			*_bufferSize = inode->Size();
 
 		status_t status = inode->ReadAt(0, (uint8 *)buffer, _bufferSize);
 		if (status < B_OK)
 			RETURN_ERROR(status);
 
-		buffer[++*_bufferSize] = '\0';
 		return B_OK;
 	}
 
-	*_bufferSize = strlcpy(buffer, inode->Node().short_symlink, bufferSize) + 1;
-	if (*_bufferSize > bufferSize)
-		return B_BUFFER_OVERFLOW;
+	size_t linkLen = strlen(inode->Node().short_symlink);
+	if (linkLen < *_bufferSize)
+		*_bufferSize = linkLen;
 
+	memcpy(buffer, inode->Node().short_symlink, *_bufferSize);
+
 	return B_OK;
 }
 

Modified: haiku/trunk/src/kits/storage/Entry.cpp
===================================================================
--- haiku/trunk/src/kits/storage/Entry.cpp	2008-03-17 19:50:46 UTC (rev 24424)
+++ haiku/trunk/src/kits/storage/Entry.cpp	2008-03-17 21:37:40 UTC (rev 24425)
@@ -928,10 +928,11 @@
 			// we need to traverse the symlink
 			if (--linkLimit < 0)
 				return B_LINK_LIMIT;
-			size_t bufferSize = B_PATH_NAME_LENGTH;
+			size_t bufferSize = B_PATH_NAME_LENGTH - 1;
 			error = _kern_read_link(dirFD, leafName, tmpPath, &bufferSize);
 			if (error < 0)
 				return error;
+			tmpPath[bufferSize] = '\0';
 			path = tmpPath;
 			// next round...
 		}

Modified: haiku/trunk/src/kits/storage/LibBeAdapter.cpp
===================================================================
--- haiku/trunk/src/kits/storage/LibBeAdapter.cpp	2008-03-17 19:50:46 UTC (rev 24424)
+++ haiku/trunk/src/kits/storage/LibBeAdapter.cpp	2008-03-17 21:37:40 UTC (rev 24425)
@@ -534,7 +534,6 @@
 	if (result < 0)
 		return result;
 
-	buffer[result] = '\0';
 	*_bufferSize = result;
 	return B_OK;
 }

Modified: haiku/trunk/src/kits/storage/SymLink.cpp
===================================================================
--- haiku/trunk/src/kits/storage/SymLink.cpp	2008-03-17 19:50:46 UTC (rev 24424)
+++ haiku/trunk/src/kits/storage/SymLink.cpp	2008-03-17 21:37:40 UTC (rev 24425)
@@ -93,7 +93,8 @@
 
 // ReadLink
 //! Reads the contents of the symbolic link into a buffer.
-/*!	\param buf the buffer
+/*!	The string written to the buffer will be null-terminated.
+	\param buf the buffer
 	\param size the size of the buffer
 	\return
 	- the number of bytes written into the buffer
@@ -110,11 +111,17 @@
 	if (InitCheck() != B_OK)
 		return B_FILE_ERROR;
 
-	status_t error = _kern_read_link(get_fd(), NULL, buffer, &size);
+	size_t linkLen = size;
+	status_t error = _kern_read_link(get_fd(), NULL, buffer, &linkLen);
 	if (error < B_OK)
 		return error;
 
-	return size;
+	// null-terminate
+	if (linkLen >= size)
+		return B_BUFFER_OVERFLOW;
+	buffer[linkLen] = '\0';
+
+	return linkLen;
 }
 
 // MakeLinkedPath

Modified: haiku/trunk/src/system/kernel/fs/devfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/devfs.cpp	2008-03-17 19:50:46 UTC (rev 24424)
+++ haiku/trunk/src/system/kernel/fs/devfs.cpp	2008-03-17 21:37:40 UTC (rev 24425)
@@ -1880,13 +1880,10 @@
 	if (!S_ISLNK(link->stream.type))
 		return B_BAD_VALUE;
 
-	*_bufferSize = link->stream.u.symlink.length + 1;
-		// we always need to return the number of bytes we intend to write!
+	if (link->stream.u.symlink.length < *_bufferSize)
+		*_bufferSize = link->stream.u.symlink.length;
 
-	if (bufferSize <= link->stream.u.symlink.length)
-		return B_BUFFER_OVERFLOW;
-
-	memcpy(buffer, link->stream.u.symlink.path, link->stream.u.symlink.length + 1);
+	memcpy(buffer, link->stream.u.symlink.path, *_bufferSize);
 	return B_OK;
 }
 
@@ -2478,6 +2475,8 @@
 		// is this a real block device? then let's have it reported like that
 		if (stat->st_size != 0)
 			stat->st_mode = S_IFBLK | (vnode->stream.type & S_IUMSK);
+	} else if (S_ISLNK(vnode->stream.type)) {
+		stat->st_size = vnode->stream.u.symlink.length;
 	}
 
 	return B_OK;

Modified: haiku/trunk/src/system/kernel/fs/rootfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/rootfs.cpp	2008-03-17 19:50:46 UTC (rev 24424)
+++ haiku/trunk/src/system/kernel/fs/rootfs.cpp	2008-03-17 21:37:40 UTC (rev 24425)
@@ -805,18 +805,14 @@
 rootfs_read_link(fs_volume _fs, fs_vnode _link, char *buffer, size_t *_bufferSize)
 {
 	struct rootfs_vnode *link = (rootfs_vnode*)_link;
-	size_t bufferSize = *_bufferSize;
 
 	if (!S_ISLNK(link->stream.type))
 		return B_BAD_VALUE;
 
-	*_bufferSize = link->stream.symlink.length + 1;
-		// we always need to return the number of bytes we intend to write!
+	if (link->stream.symlink.length < *_bufferSize)
+		*_bufferSize = link->stream.symlink.length;
 
-	if (bufferSize <= link->stream.symlink.length)
-		return B_BUFFER_OVERFLOW;
-
-	memcpy(buffer, link->stream.symlink.path, link->stream.symlink.length + 1);
+	memcpy(buffer, link->stream.symlink.path, *_bufferSize);
 	return B_OK;
 }
 
@@ -975,7 +971,10 @@
 	// stream exists, but we know to return size 0, since we can only hold directories
 	stat->st_dev = fs->id;
 	stat->st_ino = vnode->id;
-	stat->st_size = 0;
+	if (S_ISLNK(vnode->stream.type))
+		stat->st_size = vnode->stream.symlink.length;
+	else
+		stat->st_size = 0;
 	stat->st_mode = vnode->stream.type;
 
 	stat->st_nlink = 1;

Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-17 19:50:46 UTC (rev 24424)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-17 21:37:40 UTC (rev 24425)
@@ -1780,9 +1780,13 @@
 			}
 
 			if (FS_CALL(nextVnode, read_symlink) != NULL) {
+				bufferSize--;
 				status = FS_CALL(nextVnode, read_symlink)(
 					nextVnode->mount->cookie, nextVnode->private_node, buffer,
 					&bufferSize);
+				// null-terminate
+				if (status >= 0)
+					buffer[bufferSize] = '\0';
 			} else
 				status = B_BAD_VALUE;
 
@@ -7399,11 +7403,12 @@
 		// read link
 		struct stat st;
 		if (FS_CALL(fileVnode, read_symlink) != NULL) {
-			size_t bufferSize = B_PATH_NAME_LENGTH;
+			size_t bufferSize = B_PATH_NAME_LENGTH - 1;
 			error = FS_CALL(fileVnode, read_symlink)(fileVnode->mount->cookie,
 				fileVnode->private_node, path, &bufferSize);
 			if (error != B_OK)
 				return error;
+			path[bufferSize] = '\0';
 		} else
 			return B_BAD_VALUE;
 	}
@@ -7704,7 +7709,7 @@
 	if (status < B_OK)
 		return status;
 
-	if (user_strlcpy(userBuffer, buffer, bufferSize) < 0)
+	if (user_memcpy(userBuffer, buffer, bufferSize) != B_OK)
 		return B_BAD_ADDRESS;
 
 	return B_OK;

Modified: haiku/trunk/src/system/libroot/posix/unistd/link.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/unistd/link.c	2008-03-17 19:50:46 UTC (rev 24424)
+++ haiku/trunk/src/system/libroot/posix/unistd/link.c	2008-03-17 21:37:40 UTC (rev 24425)
@@ -20,13 +20,19 @@
 ssize_t
 readlink(const char *path, char *buffer, size_t bufferSize)
 {
-	status_t status = _kern_read_link(-1, path, buffer, &bufferSize);
-	if (status < B_OK && status != B_BUFFER_OVERFLOW) {
+	size_t linkLen = bufferSize;
+	status_t status = _kern_read_link(-1, path, buffer, &linkLen);
+	if (status < B_OK) {
 		errno = status;
 		return -1;
 	}
 
-	return bufferSize;
+	// If the buffer is big enough, null-terminate the string. That's not
+	// required by the standard, but helps non-conforming apps.
+	if (linkLen < bufferSize)
+		buffer[linkLen] = '\0';
+
+	return linkLen;
 }
 
 



From oruizdorantes at mail.berlios.de  Mon Mar 17 23:41:47 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Mon, 17 Mar 2008 23:41:47 +0100
Subject: [Haiku-commits] r24426 - haiku/trunk/src/servers/bluetooth
Message-ID: <200803172241.m2HMflog019419@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-17 23:41:47 +0100 (Mon, 17 Mar 2008)
New Revision: 24426
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24426&view=rev

Modified:
   haiku/trunk/src/servers/bluetooth/LocalDeviceImpl.cpp
Log:
Implement handling of the scan mode event reply

Modified: haiku/trunk/src/servers/bluetooth/LocalDeviceImpl.cpp
===================================================================
--- haiku/trunk/src/servers/bluetooth/LocalDeviceImpl.cpp	2008-03-17 21:37:40 UTC (rev 24425)
+++ haiku/trunk/src/servers/bluetooth/LocalDeviceImpl.cpp	2008-03-17 22:41:47 UTC (rev 24426)
@@ -280,6 +280,29 @@
             ClearWantedEvent(request, PACK_OPCODE(OGF_CONTROL_BASEBAND, OCF_READ_LOCAL_NAME));
      	}       
         break;
+
+        case PACK_OPCODE(OGF_CONTROL_BASEBAND, OCF_WRITE_SCAN_ENABLE):
+        {    
+        	uint8* statusReply = (uint8*)(event+1);
+        	
+        	reply.AddInt8("status", *statusReply);
+        	
+            if (*statusReply == BT_OK) {
+                                
+                Output::Instance()->Post("Positive reply for scanmode\n", BLACKBOARD_KIT);
+
+            } else {
+
+                Output::Instance()->Post("Negative reply for scanmode\n", BLACKBOARD_KIT);
+
+            }
+
+            printf("Sending reply ... %ld\n",request->SendReply(&reply));                                
+            reply.PrintToStream();
+                        
+            ClearWantedEvent(request, PACK_OPCODE(OGF_CONTROL_BASEBAND, OCF_WRITE_SCAN_ENABLE));
+     	}       
+        break;
 		
 		default:
 		    Output::Instance()->Post("Command Complete not handled\n", BLACKBOARD_KIT);                		
@@ -369,7 +392,7 @@
 	ssize_t size;
 	void* command = NULL;
 
-	if (request->FindData("raw command", B_ANY_TYPE, 0, (const void **)command, &size) == B_OK) 
+	if (request->FindData("raw command", B_ANY_TYPE, 0, (const void **)&command, &size) == B_OK) 
 	    if (((HCITransportAccessor*)fHCIDelegate)->IssueCommand(command, size) == B_ERROR)
 			(Output::Instance()->Post("Command issue error\n", BLACKBOARD_EVENTS));
 		else



From oruizdorantes at mail.berlios.de  Mon Mar 17 23:46:56 2008
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Mon, 17 Mar 2008 23:46:56 +0100
Subject: [Haiku-commits] r24427 - haiku/trunk/src/kits/bluetooth
Message-ID: <200803172246.m2HMkuvS020357@sheep.berlios.de>

Author: oruizdorantes
Date: 2008-03-17 23:46:56 +0100 (Mon, 17 Mar 2008)
New Revision: 24427
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24427&view=rev

Modified:
   haiku/trunk/src/kits/bluetooth/LocalDevice.cpp
Log:
SetDiscoverable method Implementation

Modified: haiku/trunk/src/kits/bluetooth/LocalDevice.cpp
===================================================================
--- haiku/trunk/src/kits/bluetooth/LocalDevice.cpp	2008-03-17 22:41:47 UTC (rev 24426)
+++ haiku/trunk/src/kits/bluetooth/LocalDevice.cpp	2008-03-17 22:46:56 UTC (rev 24427)
@@ -8,14 +8,17 @@
 
 #include <bluetooth/bluetooth_error.h>
 
+#include <bluetooth/HCI/btHCI_command.h>
+#include <bluetooth/HCI/btHCI_event.h>
+
 #include <bluetooth/LocalDevice.h>
 #include <bluetooth/RemoteDevice.h>
 #include <bluetooth/DeviceClass.h>
 #include <bluetooth/DiscoveryAgent.h>
 
 #include <bluetooth/bdaddrUtils.h>
-
 #include <bluetoothserver_p.h>
+#include <CommandManager.h>
 
 #include "KitSupport.h"
 
@@ -148,12 +151,23 @@
 
     BMessage request(BT_MSG_HANDLE_SIMPLE_REQUEST);
     BMessage reply;
+
+	size_t   size;
 	int8	 bt_status = BT_ERROR;
 	
     
     request.AddInt32("hci_id", hid);
+
+
+	void* command = buildWriteScan(mode, &size);
 	
-	// TODO: Add the raw command to the BMessage + expected event
+	if (command == NULL) {
+		return B_NO_MEMORY;		
+	}
+	
+	request.AddData("raw command", B_ANY_TYPE, command, size);
+    request.AddInt16("eventExpected",  HCI_EVENT_CMD_COMPLETE);
+    request.AddInt16("opcodeExpected", PACK_OPCODE(OGF_CONTROL_BASEBAND, OCF_WRITE_SCAN_ENABLE));
 
     if (fMessenger->SendMessage(&request, &reply) == B_OK) {
     	if (reply.FindInt8("status", &bt_status ) == B_OK ) {	    
@@ -163,7 +177,6 @@
 		
 	}    
 
-
 	return B_ERROR;
 }
 



From stippi at mail.berlios.de  Tue Mar 18 01:04:15 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 01:04:15 +0100
Subject: [Haiku-commits] r24428 - haiku/trunk/src/servers/app
Message-ID: <200803180004.m2I04FGl009150@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 01:04:12 +0100 (Tue, 18 Mar 2008)
New Revision: 24428
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24428&view=rev

Modified:
   haiku/trunk/src/servers/app/DrawState.cpp
   haiku/trunk/src/servers/app/DrawState.h
   haiku/trunk/src/servers/app/View.cpp
Log:
A test app revealed some bugs with regards to client provided clipping regions:
* It is necessary to store the local origin and scale of a view state, at
  least for the clipping region and especially because the scale affects the
  clipping region. Ie origin and scale of one state affect the clipping region,
  at the time the clipping is evaluated, ie
     SetOrigin(...);
     ConstrainClippingRegion(...);
  is equivalent to
     ConstrainClippingRegion(...);
     SetOrigin(...);
  The current client provided clipping region at the time of PushState()
  always constrains the region of the new state. The previous region
  and the current local clipping may have their own individual origin and
  scale.
  To support all this, I needed to store origin and scale of each state on
  the stack, but I do cache the combined origin and scale. Caching only
  the combined region is not possible though. So the new implementation
  is slower than the previous, but more correct.
* Refactored "copy constructor" from DrawState, which is not really a copy
  constructor anyways, made it private. It is only used by PushState().
* Removed some dead code from DrawState.

All this improves Firefox redraw issues a tiny bit, but does not fix them.
Either I am not covering Firefox needs with my test app, or the bug is
somewhere else. At least Haiku behaves like BeOS with regard to client
clipping regions and the state stack now...


Modified: haiku/trunk/src/servers/app/DrawState.cpp
===================================================================
--- haiku/trunk/src/servers/app/DrawState.cpp	2008-03-17 22:46:56 UTC (rev 24427)
+++ haiku/trunk/src/servers/app/DrawState.cpp	2008-03-18 00:04:12 UTC (rev 24428)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2005, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -10,9 +10,10 @@
  *		Michael Pfeiffer <laplace at users.sourceforge.net>
  */
 
-/**	Data classes for working with BView states and draw parameters */
+//!	Data classes for working with BView states and draw parameters
 
 
+#include <new>
 #include <stdio.h>
 
 #include <Region.h>
@@ -22,19 +23,27 @@
 
 #include "DrawState.h"
 
+using std::nothrow;
 
+
 DrawState::DrawState()
 	: fOrigin(0.0, 0.0),
+	  fCombinedOrigin(0.0, 0.0),
 	  fScale(1.0),
+	  fCombinedScale(1.0),
 	  fClippingRegion(NULL),
+
 	  fHighColor((rgb_color){ 0, 0, 0, 255 }),
 	  fLowColor((rgb_color){ 255, 255, 255, 255 }),
 	  fPattern(kSolidHigh),
+
 	  fDrawingMode(B_OP_COPY),
 	  fAlphaSrcMode(B_PIXEL_ALPHA),
 	  fAlphaFncMode(B_ALPHA_OVERLAY),
+
 	  fPenLocation(0.0, 0.0),
 	  fPenSize(1.0),
+
 	  fFontAliasing(false),
 	  fSubPixelPrecise(false),
 	  fLineCapMode(B_BUTT_CAP),
@@ -46,73 +55,53 @@
 }
 
 
-DrawState::DrawState(const DrawState& from)
-	: fClippingRegion(NULL)
-{
-	*this = from;
-}
+DrawState::DrawState(DrawState* from)
+	: fOrigin(0.0, 0.0),
+	  fCombinedOrigin(from->fCombinedOrigin),
+	  fScale(1.0),
+	  fCombinedScale(from->fCombinedScale),
+	  fClippingRegion(NULL),
 
+	  fHighColor(from->fHighColor),
+	  fLowColor(from->fLowColor),
+	  fPattern(from->fPattern),
 
-DrawState::~DrawState()
-{
-	delete fClippingRegion;
-	delete fPreviousState;
-}
+	  fDrawingMode(from->fDrawingMode),
+	  fAlphaSrcMode(from->fAlphaSrcMode),
+	  fAlphaFncMode(from->fAlphaFncMode),
 
+	  fPenLocation(from->fPenLocation),
+	  fPenSize(from->fPenSize),
 
-DrawState&
-DrawState::operator=(const DrawState& from)
-{
-	fOrigin	= from.fOrigin;
-	fScale	= from.fScale;
+	  fFont(from->fFont),
+	  fFontAliasing(from->fFontAliasing),
 
-	if (from.fClippingRegion) {
-		if (fClippingRegion)
-			*fClippingRegion = *from.fClippingRegion;
-		else
-			fClippingRegion = new BRegion(*from.fClippingRegion);
-	} else {
-		delete fClippingRegion;
-		fClippingRegion = NULL;
-	}
+	  fSubPixelPrecise(from->fSubPixelPrecise),
 
-	fHighColor			= from.fHighColor;
-	fLowColor			= from.fLowColor;
-	fPattern			= from.fPattern;
+	  fLineCapMode(from->fLineCapMode),
+	  fLineJoinMode(from->fLineJoinMode),
+	  fMiterLimit(from->fMiterLimit),
 
-	fDrawingMode		= from.fDrawingMode;
-	fAlphaSrcMode		= from.fAlphaSrcMode;
-	fAlphaFncMode		= from.fAlphaFncMode;
+	  // Since fScale is reset to 1.0, the unscaled
+	  // font size is the current size of the font
+	  // (which is from->fUnscaledFontSize * from->fCombinedScale)
+	  fUnscaledFontSize(from->fUnscaledFontSize),
+	  fPreviousState(from)
+{
+}
 
-	fPenLocation		= from.fPenLocation;
-	fPenSize			= from.fPenSize;
 
-	fFont				= from.fFont;
-	fFontAliasing		= from.fFontAliasing;
-
-	fSubPixelPrecise	= from.fSubPixelPrecise;
-
-	fLineCapMode		= from.fLineCapMode;
-	fLineJoinMode		= from.fLineJoinMode;
-	fMiterLimit			= from.fMiterLimit;
-
-	// Since fScale is reset to 1.0, the unscaled
-	// font size is the current size of the font
-	// (which is from->fUnscaledFontSize * from->fScale)
-	fUnscaledFontSize	= from.fUnscaledFontSize;
-	fPreviousState		= from.fPreviousState;
-
-	return *this;
+DrawState::~DrawState()
+{
+	delete fClippingRegion;
+	delete fPreviousState;
 }
 
 
 DrawState*
 DrawState::PushState()
 {
-	DrawState* next = new DrawState(*this);
-		// this may throw an exception that our caller should handle
-
-	next->fPreviousState = this;
+	DrawState* next = new (nothrow) DrawState(this);
 	return next;
 }
 
@@ -213,6 +202,14 @@
 	link.Read<float>(&fScale);
 	link.Read<bool>(&fFontAliasing);
 
+	if (fPreviousState) {
+		fCombinedOrigin = fPreviousState->fCombinedOrigin + fOrigin;
+		fCombinedScale = fPreviousState->fCombinedScale * fScale;
+	} else {
+		fCombinedOrigin = fOrigin;
+		fCombinedScale = fScale;
+	}
+
 	fHighColor = highColor;
 	fLowColor = lowColor;
 	fPattern = patt;
@@ -283,78 +280,115 @@
 DrawState::SetOrigin(const BPoint& origin)
 {
 	fOrigin = origin;
-	// origin is given as a point in the
-	// "outer" coordinate system, therefore
-	// it has to be transformed
-	if (PreviousState() != NULL)
-		PreviousState()->Transform(&fOrigin);
+
+	// NOTE: the origins of earlier states are never expected to
+	// change, only the topmost state ever changes
+	if (fPreviousState)
+		fCombinedOrigin = fPreviousState->fCombinedOrigin + fOrigin;
+	else
+		fCombinedOrigin = fOrigin;
 }
 
 
 void
-DrawState::OffsetOrigin(const BPoint& offset)
+DrawState::SetScale(float scale)
 {
-	if (PreviousState() == NULL)
-		fOrigin += offset;
-	else {
-		// TODO this is necessary only if offset 
-		// is in the "outer" coordinate system
-		float scale = PreviousState()->Scale();
-		fOrigin.x += offset.x * scale;
-		fOrigin.y += offset.y * scale;
-	}		
+	if (fScale != scale) {
+		fScale = scale;
+
+		// NOTE: the scales of earlier states are never expected to
+		// change, only the topmost state ever changes
+		if (fPreviousState)
+			fCombinedScale = fPreviousState->fCombinedScale * fScale;
+		else
+			fCombinedScale = fScale;
+
+		// update font size
+		fFont.SetSize(fUnscaledFontSize * fCombinedScale);
+	}
 }
 
 
 void
-DrawState::SetScale(float scale)
+DrawState::SetClippingRegion(const BRegion* region)
 {
-	// the scale is multiplied with the scale of the previous state if any
-	float localScale = scale;
-	if (PreviousState() != NULL)
-		localScale *= PreviousState()->Scale();
+	if (region) {
+		if (fClippingRegion)
+			*fClippingRegion = *region;
+		else
+			fClippingRegion = new (nothrow) BRegion(*region);
+	} else {
+		delete fClippingRegion;
+		fClippingRegion = NULL;
+	}
+}
 
-	if (fScale != localScale) {
-		fScale = localScale;
 
-		// update font size
-		// (pen size is currently calulated on the fly)
-		fFont.SetSize(fUnscaledFontSize * fScale);
+bool
+DrawState::HasClipping() const
+{
+	if (fClippingRegion)
+		return true;
+	if (fPreviousState)
+		return fPreviousState->HasClipping();
+	return false;
+}
+
+
+bool
+DrawState::GetCombinedClippingRegion(BRegion* region) const
+{
+	if (fClippingRegion) {
+		BRegion localTransformedClipping(*fClippingRegion);
+		Transform(&localTransformedClipping);
+
+		if (fPreviousState && fPreviousState->GetCombinedClippingRegion(region))
+			localTransformedClipping.IntersectWith(region);
+		*region = localTransformedClipping;
+		return true;
+	} else {
+		if (fPreviousState)
+			return fPreviousState->GetCombinedClippingRegion(region);
 	}
+	return false;
 }
 
-// Transform
+
+// #pragma mark -
+
+
 void
 DrawState::Transform(float* x, float* y) const
 {
 	// scale relative to origin, therefore
 	// scale first then translate to
 	// origin
-	*x *= fScale;
-	*y *= fScale;
-	*x += fOrigin.x;
-	*y += fOrigin.y;
+	*x *= fCombinedScale;
+	*y *= fCombinedScale;
+	*x += fCombinedOrigin.x;
+	*y += fCombinedOrigin.y;
 }
 
-// InverseTransform
+
 void
 DrawState::InverseTransform(float* x, float* y) const
 {
-	// TODO: watch out for fScale = 0?
-	*x -= fOrigin.x;
-	*y -= fOrigin.y;
-	*x /= fScale;
-	*y /= fScale;
+	*x -= fCombinedOrigin.x;
+	*y -= fCombinedOrigin.y;
+	if (fCombinedScale != 0.0) {
+		*x /= fCombinedScale;
+		*y /= fCombinedScale;
+	}
 }
 
-// Transform
+
 void
 DrawState::Transform(BPoint* point) const
 {
 	Transform(&(point->x), &(point->y));
 }
 
-// Transform
+
 void
 DrawState::Transform(BRect* rect) const
 {
@@ -362,13 +396,12 @@
 	Transform(&(rect->right), &(rect->bottom));
 }
 
-// Transform
+
 void
 DrawState::Transform(BRegion* region) const
 {
-	if (fScale == 1.0) {
-		if (fOrigin.x != 0.0 || fOrigin.y != 0.0)
-			region->OffsetBy((int32)fOrigin.x, (int32)fOrigin.y);
+	if (fCombinedScale == 1.0) {
+		region->OffsetBy(fCombinedOrigin.x, fCombinedOrigin.y);
 	} else {
 		// TODO: optimize some more
 		BRegion converted;
@@ -384,8 +417,8 @@
 			Transform(&lt.x, &lt.y);
 			Transform(&rb.x, &rb.y);
 			// reset bottom right to pixel "index"
-			rb.x++;
-			rb.y++;
+			rb.x--;
+			rb.y--;
 			// add rect to converted region
 			// NOTE/TODO: the rect would not have to go
 			// through the whole intersection test process,
@@ -405,34 +438,9 @@
 }
 
 
-void
-DrawState::SetClippingRegion(const BRegion* region)
-{
-	// reset clipping to that of previous state
-	// (that's the starting point)
-	if (PreviousState() != NULL && PreviousState()->ClippingRegion()) {
-		if (fClippingRegion)
-			*fClippingRegion = *(PreviousState()->ClippingRegion());
-		else
-			fClippingRegion = new BRegion(*(PreviousState()->ClippingRegion()));
-	} else {
-		delete fClippingRegion;
-		fClippingRegion = NULL;
-	}
+// #pragma mark -
 
-	// intersect with the clipping from the passed region
-	// (even if it is empty)
-	// passing NULL unsets this states additional region,
-	// it will then be the region of the previous state
-	if (region) {
-		if (fClippingRegion)
-			fClippingRegion->IntersectWith(region);
-		else 
-			fClippingRegion = new BRegion(*region);
-	}
-}
 
-
 void
 DrawState::SetHighColor(const rgb_color& color)
 {
@@ -490,8 +498,6 @@
 void
 DrawState::SetPenSize(float size)
 {
-	// NOTE: since pensize is calculated on the fly,
-	// it is ok to set it here regardless of previous state
 	fPenSize = size;
 }
 
@@ -500,7 +506,7 @@
 float
 DrawState::PenSize() const
 {
-	float penSize = fPenSize * fScale;
+	float penSize = fPenSize * fCombinedScale;
 	// NOTE: As documented in the BeBook,
 	// pen size is never smaller than 1.0.
 	// This is supposed to be the smallest
@@ -530,7 +536,7 @@
 	if (flags == B_FONT_ALL) {
 		fFont = font;
 		fUnscaledFontSize = font.Size();
-		fFont.SetSize(fUnscaledFontSize * fScale);
+		fFont.SetSize(fUnscaledFontSize * fCombinedScale);
 	} else {
 		// family & style
 		if (flags & B_FONT_FAMILY_AND_STYLE)
@@ -538,7 +544,7 @@
 		// size
 		if (flags & B_FONT_SIZE) {
 			fUnscaledFontSize = font.Size();
-			fFont.SetSize(fUnscaledFontSize * fScale);
+			fFont.SetSize(fUnscaledFontSize * fCombinedScale);
 		}
 		// shear
 		if (flags & B_FONT_SHEAR)

Modified: haiku/trunk/src/servers/app/DrawState.h
===================================================================
--- haiku/trunk/src/servers/app/DrawState.h	2008-03-17 22:46:56 UTC (rev 24427)
+++ haiku/trunk/src/servers/app/DrawState.h	2008-03-18 00:04:12 UTC (rev 24428)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2005, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -30,13 +30,13 @@
 
 
 class DrawState {
-	public:
+public:
 							DrawState();
-							DrawState(const DrawState& from);
+private:
+							DrawState(DrawState* from);
+public:
 		virtual				~DrawState();
 
-		DrawState&			operator=(const DrawState& from);
-
 		DrawState*			PushState();
 		DrawState*			PopState();
 		DrawState*			PreviousState() const { return fPreviousState; }
@@ -50,14 +50,23 @@
 
 							// coordinate transformation
 		void				SetOrigin(const BPoint& origin);
-		void				OffsetOrigin(const BPoint& offset);
 		const BPoint&		Origin() const
 								{ return fOrigin; }
+		const BPoint&		CombinedOrigin() const
+								{ return fCombinedOrigin; }
 
 		void				SetScale(float scale);
 		float				Scale() const
 								{ return fScale; }
+		float				CombinedScale() const
+								{ return fCombinedScale; }
 
+							// additional clipping as requested by client
+		void				SetClippingRegion(const BRegion* region);
+
+		bool				HasClipping() const;
+		bool				GetCombinedClippingRegion(BRegion* region) const;
+
 							// coordinate transformations
 				void		Transform(float* x, float* y) const;
 				void		InverseTransform(float* x, float* y) const;
@@ -68,14 +77,6 @@
 
 				void		InverseTransform(BPoint* point) const;
 
-							// additional clipping as requested by client
-		void				SetClippingRegion(const BRegion* region);
-		const BRegion*		ClippingRegion() const
-								{ return fClippingRegion; }
-/*	inline	int32				CountClippingRects() const
-									{ return fClippingRegion ? fClippingRegion.CountRects() : 0; }
-	inline	BRect				ClippingRectAt(int32 index) const;*/
-
 							// color
 		void				SetHighColor(const rgb_color& color);
 		const rgb_color&	HighColor() const
@@ -140,9 +141,11 @@
 		bool				SubPixelPrecise() const
 								{ return fSubPixelPrecise; }
 
-	protected:
+protected:
 		BPoint				fOrigin;
+		BPoint				fCombinedOrigin;
 		float				fScale;
+		float				fCombinedScale;
 
 		BRegion*			fClippingRegion;
 
@@ -182,19 +185,4 @@
 		DrawState*			fPreviousState;
 };
 
-
-// inline implementations
-
-/*
-// ClippingRectAt
-BRect
-DrawState::ClippingRectAt(int32 index) const
-{
-	BRect r;
-	if (fClippingRegion) {
-		r = fClippingRegion.RectAt(index);
-	}
-	return r;
-}*/
-
-#endif	/* _DRAW_STATE_H_ */
+#endif	// _DRAW_STATE_H_

Modified: haiku/trunk/src/servers/app/View.cpp
===================================================================
--- haiku/trunk/src/servers/app/View.cpp	2008-03-17 22:46:56 UTC (rev 24427)
+++ haiku/trunk/src/servers/app/View.cpp	2008-03-18 00:04:12 UTC (rev 24428)
@@ -440,7 +440,7 @@
 	fDrawState->SetOrigin(origin);
 
 	// rebuild clipping
-	if (fDrawState->ClippingRegion())
+	if (fDrawState->HasClipping())
 		RebuildClipping(false);
 }
 
@@ -464,7 +464,7 @@
 	fDrawState->SetScale(scale);
 
 	// rebuild clipping
-	if (fDrawState->ClippingRegion())
+	if (fDrawState->HasClipping())
 		RebuildClipping(false);
 }
 
@@ -1169,8 +1169,11 @@
 void
 View::PushState()
 {
-	fDrawState = fDrawState->PushState();
-	fDrawState->SetSubPixelPrecise(fFlags & B_SUBPIXEL_PRECISE);
+	DrawState* newState = fDrawState->PushState();
+	if (newState) {
+		fDrawState = newState;
+		fDrawState->SetSubPixelPrecise(fFlags & B_SUBPIXEL_PRECISE);
+	}
 }
 
 
@@ -1523,9 +1526,10 @@
 	fScreenClipping.PrintToStream();
 	printf("  valid:            %d\n", fScreenClippingValid);
 	printf("  state:\n");
-	printf("    user clipping:  %p\n", fDrawState->ClippingRegion());
-	printf("    origin:         BPoint(%.1f, %.1f)\n", fDrawState->Origin().x, fDrawState->Origin().y);
-	printf("    scale:          %.2f\n", fDrawState->Scale());
+	printf("    user clipping:  %d\n", fDrawState->HasClipping());
+	BPoint origin = fDrawState->CombinedOrigin();
+	printf("    origin:         BPoint(%.1f, %.1f)\n", origin.x, origin.y);
+	printf("    scale:          %.2f\n", fDrawState->CombinedScale());
 	printf("\n");
 }
 
@@ -1561,17 +1565,17 @@
 	}
 
 	// add the user clipping in case there is one
-	if (const BRegion* userClipping = fDrawState->ClippingRegion()) {
+	if (fDrawState->HasClipping()) {
 		// NOTE: in case the user sets a user defined clipping region,
 		// rebuilding the clipping is a bit more expensive because there
 		// is no separate "drawing region"... on the other
 		// hand, views for which this feature is actually used will
 		// probably not have any children, so it is not that expensive
 		// after all
-		BRegion* screenUserClipping = fWindow->GetRegion(*userClipping);
+		BRegion* screenUserClipping = fWindow->GetRegion();
 		if (!screenUserClipping)
 			return;
-		fDrawState->Transform(screenUserClipping);
+		fDrawState->GetCombinedClippingRegion(screenUserClipping);
 		fLocalClipping.IntersectWith(screenUserClipping);
 		fWindow->RecycleRegion(screenUserClipping);
 	}



From anevilyak at mail.berlios.de  Tue Mar 18 01:35:36 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 18 Mar 2008 01:35:36 +0100
Subject: [Haiku-commits] r24429 - haiku/trunk/src/kits/interface
Message-ID: <200803180035.m2I0Zaqp016520@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-18 01:35:36 +0100 (Tue, 18 Mar 2008)
New Revision: 24429
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24429&view=rev

Modified:
   haiku/trunk/src/kits/interface/Shelf.cpp
Log:
Plug various memleaks in BShelf.



Modified: haiku/trunk/src/kits/interface/Shelf.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Shelf.cpp	2008-03-18 00:04:12 UTC (rev 24428)
+++ haiku/trunk/src/kits/interface/Shelf.cpp	2008-03-18 00:35:36 UTC (rev 24429)
@@ -6,6 +6,7 @@
  *		Marc Flerackers (mflerackers at androme.be)
  *		Axel D?rfler, axeld at pinc-software.de
  *		J?r?me Duval
+ *		Ren? Gollent
  */
 
 /*!	BShelf stores replicant views that are dropped onto it */
@@ -108,6 +109,7 @@
 	replicant_data(BMessage *message, BView *view, BDragger *dragger,
 		BDragger::relation relation, unsigned long id, image_id image);
 	replicant_data();
+	~replicant_data();
 
 	static replicant_data* Find(BList const *list, BMessage const *msg);
 	static replicant_data* Find(BList const *list, BView const *view, bool allowZombie);
@@ -230,6 +232,17 @@
 {
 }
 
+replicant_data::~replicant_data()
+{
+	delete message;
+	// we can't delete the view or image here since 
+	// 1 - the view may already have been deleted and thus our pointer is invalid
+	// and 2 - we don't know what order they will be deleted in, so we can't unload the image yet
+	// since the destructor code for the view might still be needed if it has not been destroyed yet.
+	// this does mean we technically leak add-on images on exit, but I don't see a way around that,
+	// and in theory they should be unloaded by team cleanup on exit anyways.
+}
+
 status_t
 replicant_data::Archive(BMessage* msg)
 {
@@ -489,6 +502,13 @@
 	Save();
 
 	delete fEntry;
+	delete fStream;
+
+	while (fReplicants.CountItems() > 0) {
+		replicant_data *data = (replicant_data *)fReplicants.ItemAt(0);
+		fReplicants.RemoveItem(0L);
+		delete data;
+	}
 }
 
 
@@ -1104,7 +1124,7 @@
 status_t
 BShelf::_DeleteReplicant(replicant_data* item)
 {
-	bool loadedImage = item->message->FindBool("");
+	bool loadedImage = item->message->FindBool("_loaded_image_");
 
 	BView *view = item->view;
 	if (view == NULL)
@@ -1122,12 +1142,20 @@
 	
 	fReplicants.RemoveItem(item);	
 
+	if (item->relation == BDragger::TARGET_IS_PARENT
+		|| item->relation == BDragger::TARGET_IS_SIBLING) {			
+		delete view;			
+	}
+	if (item->relation == BDragger::TARGET_IS_CHILD
+		|| item->relation == BDragger::TARGET_IS_SIBLING) {	
+		delete item->dragger;
+	}
+
 	if (loadedImage && item->image >= 0)
 		unload_add_on(item->image);
 
 	delete item;
 
-	// TODO: Should we also delete the view ?
 
 	return B_OK;
 }
@@ -1206,6 +1234,9 @@
 	data->RemoveName("_drop_point_");
 	data->RemoveName("_drop_offset_");
 
+	if (image >= 0)
+		data->AddBool("_loaded_image_", true);
+
 	replicant_data *item = new replicant_data(data, replicant, dragger,
 		relation, uniqueID, image);
 



From bonefish at mail.berlios.de  Tue Mar 18 03:39:06 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 18 Mar 2008 03:39:06 +0100
Subject: [Haiku-commits] r24430 - haiku/trunk/src/system/kernel/vm
Message-ID: <200803180239.m2I2d6Om025835@sheep.berlios.de>

Author: bonefish
Date: 2008-03-18 03:39:04 +0100 (Tue, 18 Mar 2008)
New Revision: 24430
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24430&view=rev

Modified:
   haiku/trunk/src/system/kernel/vm/vm_page.cpp
Log:
Fixed race condition in the page writer: The state of the page we have
picked might have changed while we were locking its cache. Might fix
#1931.


Modified: haiku/trunk/src/system/kernel/vm/vm_page.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm_page.cpp	2008-03-18 00:35:36 UTC (rev 24429)
+++ haiku/trunk/src/system/kernel/vm/vm_page.cpp	2008-03-18 02:39:04 UTC (rev 24430)
@@ -965,6 +965,11 @@
 			}
 
 			InterruptsSpinLocker locker(sPageLock);
+
+			// state might have change while we were locking the cache
+			if (page->state != PAGE_STATE_MODIFIED)
+				continue;
+
 			remove_page_from_queue(&sModifiedPageQueue, page);
 			page->state = PAGE_STATE_BUSY;
 			page->busy_writing = true;



From anevilyak at gmail.com  Tue Mar 18 04:24:46 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Mon, 17 Mar 2008 22:24:46 -0500
Subject: [Haiku-commits] r24423 -
	haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <200803171731.m2HHVqsq002738@sheep.berlios.de>
References: <200803171731.m2HHVqsq002738@sheep.berlios.de>
Message-ID: <f019d2f30803172024r3d316330s886ce1d1b73a9c83@mail.gmail.com>

Hi,

On Mon, Mar 17, 2008 at 12:31 PM, axeld at BerliOS
<axeld at mail.berlios.de> wrote:
> Author: axeld
>  Date: 2008-03-17 18:31:51 +0100 (Mon, 17 Mar 2008)
>  New Revision: 24423
>  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24423&view=rev
>
>  Modified:
>    haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp
>  Log:
>  * There can now be one default route per interface, not just one

This change seems to have broken DHCP for me here (nforce
ethernet)...still works ok if I assign the IP statically though.

Regards,

Rene


From axeld at pinc-software.de  Tue Mar 18 09:12:35 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Tue, 18 Mar 2008 09:12:35 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24423_-_haiku/trunk/src/add-ons/?=
 =?iso-8859-15?q?kernel/network/stack?=
In-Reply-To: <f019d2f30803172024r3d316330s886ce1d1b73a9c83@mail.gmail.com>
Message-ID: <696619337-BeMail@zon>

"Rene Gollent" <anevilyak at gmail.com> wrote:
> On Mon, Mar 17, 2008 at 12:31 PM, axeld at BerliOS
> >  Log:
> >  * There can now be one default route per interface, not just one
> This change seems to have broken DHCP for me here (nforce
> ethernet)...still works ok if I assign the IP statically though.

Do you have more than one card in your system?
Does "ifconfig" show your card as having a link?

I don't have an nforce card, but I'll see if I can reproduce this on 
any of my systems here.

Bye,
   Axel.



From stippi at mail.berlios.de  Tue Mar 18 11:10:51 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 11:10:51 +0100
Subject: [Haiku-commits] r24431 - haiku/trunk/src/tools/fs_shell
Message-ID: <200803181010.m2IAApih009426@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 11:10:50 +0100 (Tue, 18 Mar 2008)
New Revision: 24431
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24431&view=rev

Modified:
   haiku/trunk/src/tools/fs_shell/unistd.cpp
Log:
patch by Artur Wyszynski (aljen):
Build fix for Darwin host platform.


Modified: haiku/trunk/src/tools/fs_shell/unistd.cpp
===================================================================
--- haiku/trunk/src/tools/fs_shell/unistd.cpp	2008-03-18 02:39:04 UTC (rev 24430)
+++ haiku/trunk/src/tools/fs_shell/unistd.cpp	2008-03-18 10:10:50 UTC (rev 24431)
@@ -25,7 +25,9 @@
 #		include <sys/ioctl.h>
 #		include <sys/stat.h>
 #		include <sys/disk.h>
-#		include <sys/disklabel.h>
+#		ifndef HAIKU_HOST_PLATFORM_DARWIN
+#			include <sys/disklabel.h>
+#		endif
 #	else
 		// the (POSIX) correct place of definition for ioctl()
 #		include <stropts.h>



From stippi at mail.berlios.de  Tue Mar 18 11:11:59 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 11:11:59 +0100
Subject: [Haiku-commits] r24432 - haiku/trunk/src/system/kernel
Message-ID: <200803181011.m2IABxxa009611@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 11:11:58 +0100 (Tue, 18 Mar 2008)
New Revision: 24432
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24432&view=rev

Modified:
   haiku/trunk/src/system/kernel/kernel.rdef
Log:
patch by Artur Wyszynski (aljen):
* update the kernel copyright string


Modified: haiku/trunk/src/system/kernel/kernel.rdef
===================================================================
--- haiku/trunk/src/system/kernel/kernel.rdef	2008-03-18 10:10:50 UTC (rev 24431)
+++ haiku/trunk/src/system/kernel/kernel.rdef	2008-03-18 10:11:58 UTC (rev 24432)
@@ -9,7 +9,7 @@
 	internal = 0,
 
 	short_info = "Kernel",
-	long_info = "Kernel ?2002-2007 Haiku Inc."
+	long_info = "Kernel ?2002-2008 Haiku Inc."
 };
 
 resource vector_icon {



From stippi at mail.berlios.de  Tue Mar 18 11:15:46 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 11:15:46 +0100
Subject: [Haiku-commits] r24433 - haiku/trunk/src/bin
Message-ID: <200803181015.m2IAFk5O009904@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 11:15:44 +0100 (Tue, 18 Mar 2008)
New Revision: 24433
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24433&view=rev

Added:
   haiku/trunk/src/bin/hbsg.cpp
Log:
patch by Artur Wyszynski (aljen):
* Added a tool to generate the "image.h" header from supplied PNGs,
  which is going to be used by the new boot splash code.

TODO: Integrate this whole thing as a build system tool, complete with
source PNGs in the artwork folder. I am also in favor of renaming it
to something like "splash_gen" or similar if it has to be short.


Added: haiku/trunk/src/bin/hbsg.cpp
===================================================================
--- haiku/trunk/src/bin/hbsg.cpp	2008-03-18 10:11:58 UTC (rev 24432)
+++ haiku/trunk/src/bin/hbsg.cpp	2008-03-18 10:15:44 UTC (rev 24433)
@@ -0,0 +1,205 @@
+//------------------------------------------------------------------------------
+//	Copyright (c) 2008, Haiku, Inc.
+//
+//	Permission is hereby granted, free of charge, to any person obtaining a
+//	copy of this software and associated documentation files (the "Software"),
+//	to deal in the Software without restriction, including without limitation
+//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+//	and/or sell copies of the Software, and to permit persons to whom the
+//	Software is furnished to do so, subject to the following conditions:
+//
+//	The above copyright notice and this permission notice shall be included in
+//	all copies or substantial portions of the Software.
+//
+//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+//	DEALINGS IN THE SOFTWARE.
+//
+//	File Name:		hbsg.cpp
+//	Author:			Artur Wyszynski <harakash at gmail.com>
+//	Description:	Haiku Boot Splash Generator
+//  
+//------------------------------------------------------------------------------
+
+#include <string>
+#include <iostream>
+#include <png.h>
+
+int x, y;
+int width, height;
+png_byte colorType;
+png_byte bpp;
+png_structp pngPtr;
+png_infop infoPtr;
+int noOfPasses;
+png_bytep* rowPtrs;
+FILE* finput = NULL;
+FILE* foutput = NULL;
+png_colorp palette;
+int paletteColors = 0;
+
+void
+cleanup()
+{
+	fclose(finput);
+	fclose(foutput);
+}
+
+void
+error(const char *s, ...)
+{
+	va_list args;
+	va_start(args, s);
+	vfprintf(stderr, s, args);
+	fprintf(stderr, "\n");
+	va_end(args);
+	cleanup();
+	exit(-1);
+}
+
+void
+readPNG(char *filename)
+{
+	printf("Reading file %s\n", filename);
+	char header[8];
+	finput = fopen(filename, "rb");
+	if (!finput)
+		error("[readPNG] File %s could not be opened for reading", filename);
+	
+	fread(header, 1, 8, finput);
+	if (png_sig_cmp((png_byte *)header, 0, 8 ))
+		error("[readPNG] File %s is not recognized as a PNG file", filename);
+	
+	pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+	if (!pngPtr)
+		error("[readPNG] png_create_read_struct failed");
+	
+	infoPtr = png_create_info_struct(pngPtr);
+	if (!infoPtr)
+		error("[readPNG] png_create_info_struct failed");
+	
+	if (setjmp(png_jmpbuf(pngPtr)))
+		error("[readPNG] Error during init_io");
+	
+	png_init_io(pngPtr, finput);
+	png_set_sig_bytes(pngPtr, 8);
+	png_read_info(pngPtr, infoPtr);
+	width = infoPtr->width;
+	height = infoPtr->height;
+	colorType = infoPtr->color_type;
+	bpp = infoPtr->bit_depth;
+	noOfPasses = png_set_interlace_handling(pngPtr);
+	png_read_update_info(pngPtr, infoPtr);
+	if (setjmp(png_jmpbuf(pngPtr)))
+		error("[readPNG] Error during read_image");
+
+	rowPtrs = (png_bytep*)malloc(sizeof(png_bytep) * height);
+	for ( y = 0; y < height; y++)
+		rowPtrs[y] = (png_byte*)malloc(infoPtr->rowbytes);
+	png_read_image(pngPtr, rowPtrs);
+	png_get_PLTE(pngPtr, infoPtr, &palette, &paletteColors);
+	fclose(finput);
+	printf("[PNG] width:\t%d\n", width);
+	printf("[PNG] height:\t%d\n", height);
+	printf("[PNG] bpp:\t%d\n", bpp);
+	printf("[PNG] palette:\t%d\n", paletteColors);
+}
+
+void
+writeHeader(char *filename)
+{
+	int length = strlen(filename) - 4;
+	char *varName = NULL;
+	varName = new char[length];
+	memset(varName, 0, sizeof(char) * length);
+	strncat(varName, filename, length);
+	printf("Exporting image %s\n", varName);
+
+	// dumping palette
+	char *line = new char[80];
+	sprintf(line, "static const uint8 %sPalette[] = {\n", varName);
+	fwrite(line, strlen(line), 1, foutput);
+	for (int i = 0; i < paletteColors; i++) {
+		if (i == paletteColors - 1)
+			sprintf(line, "\t0x%x, 0x%x, 0x%x\n", palette[i].red, palette[i].green, palette[i].blue);
+		else
+			sprintf(line, "\t0x%x, 0x%x, 0x%x,\n", palette[i].red, palette[i].green, palette[i].blue);
+		fwrite(line, strlen(line), 1, foutput);
+	}
+	fwrite("};\n\n", strlen("};\n\n"), 1, foutput);
+
+	sprintf(line, "static const uint %sWidth=%d;\n", varName, width);
+	fwrite(line, strlen(line), 1, foutput);
+	sprintf(line, "static const uint %sHeight=%d;\n", varName, height);
+	fwrite(line, strlen(line), 1, foutput);
+	sprintf(line, "static const uint8 %sImage[] = {\n\t", varName);
+	fwrite(line, strlen(line), 1, foutput);
+	int offset = 0;
+	unsigned char *data = new unsigned char[width * height];
+	for (y = 0; y < height; y++) {
+		png_byte* row = rowPtrs[y];
+		for (x = 0; x < width; x++) {
+			png_byte* ptr = &row[x];
+			offset = (y * width) + x;
+			data[offset] = ptr[0];
+		}
+	}
+	
+	bool end = false;
+	offset = 0;
+	while (!end) {
+		if (offset == (width * height)) {
+			sprintf(line, "0x%x", data[offset]);
+			end = true;
+		}
+		else
+			sprintf(line, "0x%x, ", data[offset]);
+		fwrite(line, strlen(line), 1, foutput);
+		if ((offset % 8) == 0) {
+			fwrite("\n\t", strlen("\n\t"), 1, foutput);
+		}
+		offset++;
+	}
+
+	fwrite("};\n\n", strlen("};\n\n"), 1, foutput);
+	delete varName;
+}
+
+void
+parseImage(char *filename)
+{
+	readPNG(filename);
+	writeHeader(filename);
+}
+
+int
+main(int argc, char *argv[])
+{
+	printf("Haiku Boot Splash Generator\n");
+	printf("Copyright 2008, Artur Wyszynski <harakash at gmail.com>\n");
+	printf("Distributed under the terms of the Haiku License. All rights reserved.\n");
+
+	if (argc < 4) {
+		printf("Usage:\n");
+		printf("\thbsg splash.png icons.png copyright.png\n");
+		return 0;
+	}
+	
+	foutput = fopen("images.h", "wb");
+	if (!foutput)
+		error("Could not open file images.h for writing");
+
+	fwrite("// This file was generated by Haiku Boot Splash Generator\n\n",
+		strlen("// This file was generated by Haiku Boot Splash Generator\n\n"), 1, foutput);
+
+	parseImage(argv[1]);
+	parseImage(argv[2]);
+	parseImage(argv[3]);
+
+	fclose(foutput);
+	return 0;
+}



From stippi at mail.berlios.de  Tue Mar 18 11:25:55 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 11:25:55 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
	headers/private/kernel/boot src/apps/aboutsystem
	src/system/boot/platform/bios_ia32 src/system/kernel
Message-ID: <200803181025.m2IAPtXJ010916@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 11:25:53 +0100 (Tue, 18 Mar 2008)
New Revision: 24434
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24434&view=rev

Added:
   haiku/trunk/headers/private/kernel/boot/images.h
   haiku/trunk/headers/private/kernel/boot/splash.h
   haiku/trunk/src/system/kernel/splash.cpp
Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
   haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp
   haiku/trunk/src/system/kernel/Jamfile
   haiku/trunk/src/system/kernel/main.c
Log:
patch by Artur Wyszynski (aljen):
* Added the feature of an animated boot screen (icons lighting up at
  different boot stages).
* Added first version of new boot splash images, generated by the new
  hsbg tool. (Also finally contains the "new" Haiku logo.)

changes by myself:
* Added Artur to the contributors list in About System.
* Fixed some left overs in the patch, kept tracing turned off.

TODO:
* Remove the need for hard coding the icon positions. (Maybe generate
  those from hsbg and put them into images.h? Have user provide icon
  spacing/offsets at the command line for hsbg?)
* Rename the stages to something meaningful.
* Use hsbg as a build system tool and generate images.h during build
  from PNGs provided in the artwork folder.


Added: haiku/trunk/headers/private/kernel/boot/images.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/images.h	2008-03-18 10:15:44 UTC (rev 24433)
+++ haiku/trunk/headers/private/kernel/boot/images.h	2008-03-18 10:25:53 UTC (rev 24434)
@@ -0,0 +1,7902 @@
+// This file was generated by Haiku Boot Splash Generator
+
+static const uint8 splashPalette[] = {
+	0x0, 0x1, 0x0,
+	0x0, 0x2, 0x0,
+	0x5, 0x6, 0x2,
+	0xa, 0x8, 0x2,
+	0x26, 0x9, 0x2,
+	0xf, 0x11, 0xd,
+	0x2c, 0x11, 0x0,
+	0x18, 0x19, 0x17,
+	0xe, 0x20, 0x4,
+	0x1c, 0x1d, 0x1b,
+	0x4a, 0x15, 0x0,
+	0x46, 0x1a, 0x0,
+	0x36, 0x20, 0x2,
+	0x13, 0x2a, 0x8,
+	0x25, 0x26, 0x24,
+	0x29, 0x2b, 0x28,
+	0x69, 0x1e, 0x0,
+	0x2d, 0x2e, 0x2c,
+	0x43, 0x2e, 0x9,
+	0x75, 0x24, 0x0,
+	0x32, 0x34, 0x31,
+	0x21, 0x3e, 0xc,
+	0x85, 0x23, 0x0,
+	0x38, 0x3a, 0x37,
+	0x27, 0x44, 0x8,
+	0x56, 0x3a, 0x0,
+	0x2a, 0x44, 0x2d,
+	0x3d, 0x3f, 0x3c,
+	0x26, 0x55, 0x13,
+	0xa2, 0x33, 0x4,
+	0x5f, 0x45, 0x18,
+	0x47, 0x49, 0x46,
+	0x4e, 0x50, 0x4d,
+	0xc0, 0x3b, 0x0,
+	0x55, 0x56, 0x54,
+	0xd7, 0x3c, 0x0,
+	0x3a, 0x6b, 0x11,
+	0x35, 0x6e, 0x26,
+	0xf6, 0x38, 0x5,
+	0x5c, 0x5e, 0x5b,
+	0x88, 0x5c, 0x12,
+	0x9a, 0x59, 0x1e,
+	0x33, 0x78, 0x1c,
+	0xf5, 0x41, 0x6,
+	0x64, 0x66, 0x63,
+	0xf3, 0x48, 0x6,
+	0x9e, 0x64, 0x0,
+	0xf6, 0x4a, 0x0,
+	0x6b, 0x6d, 0x6a,
+	0xea, 0x50, 0x1a,
+	0xf5, 0x4c, 0x2f,
+	0xf5, 0x52, 0x0,
+	0xb3, 0x63, 0x27,
+	0xf2, 0x52, 0x35,
+	0x91, 0x6c, 0x63,
+	0x73, 0x75, 0x72,
+	0xf6, 0x5a, 0x0,
+	0xcc, 0x61, 0x52,
+	0xe8, 0x5f, 0x15,
+	0x2e, 0x98, 0x2b,
+	0x9e, 0x77, 0x2a,
+	0xf6, 0x61, 0x3,
+	0x7b, 0x7d, 0x79,
+	0x35, 0x9b, 0x26,
+	0xf6, 0x67, 0x6,
+	0xf9, 0x69, 0x0,
+	0x76, 0x85, 0x6d,
+	0x39, 0x9e, 0x29,
+	0xc0, 0x7a, 0x2,
+	0x6f, 0x89, 0x60,
+	0x43, 0x9d, 0x2a,
+	0x46, 0x9b, 0x38,
+	0x56, 0x9a, 0x14,
+	0x59, 0x97, 0x2b,
+	0x7c, 0x87, 0x74,
+	0x58, 0x9b, 0x22,
+	0x40, 0xa2, 0x24,
+	0xf8, 0x6f, 0x0,
+	0x60, 0x96, 0x45,
+	0x4c, 0x9c, 0x46,
+	0x85, 0x86, 0x83,
+	0x4b, 0xa3, 0x27,
+	0x44, 0xa6, 0x29,
+	0xf8, 0x75, 0x0,
+	0x5f, 0xa1, 0x11,
+	0xbd, 0x84, 0x20,
+	0x4b, 0xaa, 0x23,
+	0x8c, 0x8e, 0x8b,
+	0xa0, 0x8a, 0x7c,
+	0x5e, 0xa5, 0x34,
+	0x72, 0x9a, 0x68,
+	0xf9, 0x7c, 0x4,
+	0x66, 0xa0, 0x62,
+	0x56, 0xab, 0x26,
+	0x4f, 0xad, 0x28,
+	0x5e, 0xa9, 0x26,
+	0x5a, 0xa9, 0x37,
+	0x81, 0x98, 0x7a,
+	0xf8, 0x81, 0x8,
+	0xf6, 0x79, 0x5e,
+	0x55, 0xb0, 0x21,
+	0xde, 0x8b, 0x0,
+	0xfa, 0x83, 0x0,
+	0x69, 0xa9, 0x3b,
+	0xb6, 0x8d, 0x73,
+	0xd2, 0x90, 0x18,
+	0x95, 0x96, 0x93,
+	0xf7, 0x82, 0x3c,
+	0x62, 0xaf, 0x35,
+	0x59, 0xb4, 0x25,
+	0xf4, 0x83, 0x4b,
+	0xf4, 0x7f, 0x76,
+	0xfb, 0x89, 0x0,
+	0x5e, 0xb7, 0x1e,
+	0xc6, 0x91, 0x66,
+	0xc3, 0x98, 0x37,
+	0xf3, 0x8d, 0x18,
+	0xfb, 0x8f, 0x0,
+	0x76, 0xae, 0x5b,
+	0x61, 0xbb, 0x22,
+	0x9d, 0x9f, 0x9c,
+	0xe2, 0x93, 0x4b,
+	0xd9, 0x95, 0x57,
+	0xfa, 0x94, 0x5,
+	0x93, 0xa7, 0x8d,
+	0xfd, 0x96, 0x0,
+	0xf8, 0x91, 0x49,
+	0x69, 0xc0, 0x1d,
+	0x8f, 0xab, 0x83,
+	0x84, 0xb0, 0x7c,
+	0xb8, 0x9f, 0x93,
+	0x78, 0xba, 0x4a,
+	0xef, 0x99, 0x36,
+	0xf8, 0x99, 0x1f,
+	0xfc, 0x9b, 0x0,
+	0x6d, 0xc4, 0x23,
+	0xa5, 0xa7, 0xa4,
+	0xc5, 0xa6, 0x5a,
+	0x71, 0xc7, 0x18,
+	0x8b, 0xb6, 0x74,
+	0xf3, 0x95, 0x89,
+	0xdc, 0x9b, 0x95,
+	0xd7, 0xa6, 0x3c,
+	0xfd, 0xa1, 0x0,
+	0xf7, 0x9b, 0x52,
+	0xf9, 0xa3, 0x0,
+	0xfa, 0xa0, 0x21,
+	0x84, 0xbd, 0x63,
+	0x7b, 0xc6, 0x39,
+	0xab, 0xad, 0xaa,
+	0xc9, 0xa8, 0x8a,
+	0xef, 0x9f, 0x76,
+	0xf6, 0xa7, 0x16,
+	0x77, 0xcc, 0x20,
+	0xa4, 0xb2, 0x9f,
+	0xff, 0xa8, 0x0,
+	0xeb, 0xa4, 0x66,
+	0x99, 0xb8, 0x92,
+	0xf0, 0xa6, 0x59,
+	0xf9, 0xa9, 0x28,
+	0xb0, 0xb2, 0xae,
+	0xd8, 0xab, 0x7e,
+	0x95, 0xbf, 0x8b,
+	0xc3, 0xb1, 0x91,
+	0x7e, 0xd2, 0x1a,
+	0xda, 0xaf, 0x6d,
+	0x88, 0xcb, 0x4a,
+	0xf8, 0xab, 0x41,
+	0xf7, 0xae, 0x29,
+	0xac, 0xb9, 0xab,
+	0xb5, 0xb7, 0xb4,
+	0xf8, 0xad, 0x53,
+	0xe8, 0xb5, 0x40,
+	0xf6, 0xb3, 0x2c,
+	0xbe, 0xb8, 0xa4,
+	0xef, 0xb3, 0x48,
+	0xf9, 0xa9, 0x92,
+	0xf8, 0xaa, 0x8c,
+	0xf8, 0xb5, 0x38,
+	0x88, 0xda, 0x15,
+	0x8e, 0xd1, 0x60,
+	0xc2, 0xbc, 0xa7,
+	0xf5, 0xb4, 0x63,
+	0xbb, 0xbd, 0xba,
+	0xf5, 0xb8, 0x59,
+	0xb0, 0xc6, 0xae,
+	0xf9, 0xbc, 0x3d,
+	0xf6, 0xb8, 0x77,
+	0xc0, 0xc2, 0xbf,
+	0xd1, 0xc1, 0x9c,
+	0xf8, 0xb4, 0xad,
+	0xdc, 0xbf, 0xaa,
+	0xf7, 0xbc, 0x84,
+	0xa1, 0xd6, 0x80,
+	0xaf, 0xcf, 0xa1,
+	0xd0, 0xc3, 0xbc,
+	0xc5, 0xc7, 0xc4,
+	0xf5, 0xbe, 0x92,
+	0xfa, 0xc4, 0x4a,
+	0xf6, 0xc5, 0x65,
+	0xee, 0xc3, 0x91,
+	0xf2, 0xc1, 0xa2,
+	0xba, 0xd0, 0xb7,
+	0xf3, 0xc5, 0x7d,
+	0xc9, 0xcb, 0xc8,
+	0xe2, 0xcb, 0x96,
+	0xfb, 0xcb, 0x4f,
+	0xea, 0xc8, 0xaa,
+	0xed, 0xcd, 0x83,
+	0xd7, 0xcf, 0xb8,
+	0xce, 0xd0, 0xcc,
+	0xc3, 0xd6, 0xc1,
+	0xfb, 0xd1, 0x53,
+	0xea, 0xce, 0xb9,
+	0xe9, 0xd3, 0x8f,
+	0xfc, 0xd3, 0x5c,
+	0xd3, 0xd4, 0xd1,
+	0xe4, 0xd0, 0xc8,
+	0xf8, 0xd4, 0x79,
+	0xf9, 0xce, 0xc7,
+	0xf9, 0xd8, 0x6a,
+	0xd6, 0xd8, 0xd5,
+	0xe9, 0xd6, 0xb1,
+	0xfd, 0xda, 0x61,
+	0xda, 0xdb, 0xc4,
+	0xd0, 0xdd, 0xce,
+	0xda, 0xdc, 0xd9,
+	0xf7, 0xdd, 0x7a,
+	0xfb, 0xe0, 0x6f,
+	0xf6, 0xe0, 0x92,
+	0xfe, 0xe2, 0x67,
+	0xf3, 0xdf, 0xa6,
+	0xde, 0xe0, 0xdd,
+	0xe8, 0xde, 0xda,
+	0xfb, 0xd9, 0xd5,
+	0xfc, 0xda, 0xc9,
+	0xf3, 0xe0, 0xbe,
+	0xf1, 0xe1, 0xcb,
+	0xef, 0xe2, 0xd5,
+	0xe3, 0xe5, 0xe2,
+	0xd8, 0xed, 0xcb,
+	0xf2, 0xe7, 0xda,
+	0xe8, 0xea, 0xe6,
+	0xfb, 0xe6, 0xe1,
+	0xf8, 0xe9, 0xd2,
+	0xf6, 0xeb, 0xde,
+	0xec, 0xee, 0xea,
+	0xef, 0xf1, 0xee,
+	0xfb, 0xf1, 0xd3,
+	0xf2, 0xf4, 0xf0,
+	0xf5, 0xf7, 0xf3,
+	0xf7, 0xfa, 0xf6,
+	0xf9, 0xfb, 0xf8,
+	0xfa, 0xfc, 0xf9,
+	0xfc, 0xfe, 0xfb,
+	0xfe, 0xff, 0xfc
+};
+
+static const uint splashWidth=381;
+static const uint splashHeight=96;
+static const uint8 splashImage[] = {
+	0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 

[... truncated: 7484 lines follow ...]


From korli at users.berlios.de  Tue Mar 18 11:33:50 2008
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Tue, 18 Mar 2008 11:33:50 +0100
Subject: [Haiku-commits] r24433 - haiku/trunk/src/bin
In-Reply-To: <200803181015.m2IAFk5O009904@sheep.berlios.de>
References: <200803181015.m2IAFk5O009904@sheep.berlios.de>
Message-ID: <c47b1d430803180333p366e1627j1a03ffd0f9796535@mail.gmail.com>

Hi Stephan,

2008/3/18, stippi at BerliOS <stippi at mail.berlios.de>:
> Author: stippi
>  Date: 2008-03-18 11:15:44 +0100 (Tue, 18 Mar 2008)
>  New Revision: 24433
>  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24433&view=rev
>
>  Added:
>    haiku/trunk/src/bin/hbsg.cpp

Maybe this should live in src/tools/

Bye,
J?r?me


From superstippi at gmx.de  Tue Mar 18 11:43:48 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 18 Mar 2008 11:43:48 +0100
Subject: [Haiku-commits] r24433 - haiku/trunk/src/bin
In-Reply-To: <c47b1d430803180333p366e1627j1a03ffd0f9796535@mail.gmail.com>
References: <200803181015.m2IAFk5O009904@sheep.berlios.de>
	<c47b1d430803180333p366e1627j1a03ffd0f9796535@mail.gmail.com>
Message-ID: <20080318114348.6018.6@stippis2.1205831954.fake>


J?r?me Duval wrote:
> Hi Stephan,
> 
> 2008/3/18, stippi at BerliOS <stippi at mail.berlios.de>:
> > Author: stippi
> >  Date: 2008-03-18 11:15:44 +0100 (Tue, 18 Mar 2008) New Revision: 24433
> >  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24433&view=rev
> >
> >  Added:
> >    haiku/trunk/src/bin/hbsg.cpp
> 
> Maybe this should live in src/tools/

Yes. I was a bit quick with "svn add". I am going to move it.

Best regards,
-Stephan


From emitrax at gmail.com  Tue Mar 18 11:59:21 2008
From: emitrax at gmail.com (Salvatore Benedetto)
Date: Tue, 18 Mar 2008 10:59:21 +0000
Subject: [Haiku-commits] r24434 - in haiku/trunk:
	headers/private/kernel/boot src/apps/aboutsystem
	src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
References: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
Message-ID: <b6b105e70803180359n5ba67f5fn4bf438b99d7f3add@mail.gmail.com>

On 18/03/2008, stippi at BerliOS <stippi at mail.berlios.de> wrote:
> Author: stippi
>  Date: 2008-03-18 11:25:53 +0100 (Tue, 18 Mar 2008)
>  New Revision: 24434
>  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24434&view=rev
>  Log:
>  patch by Artur Wyszynski (aljen):
>  * Added the feature of an animated boot screen (icons lighting up at
>   different boot stages).
>  * Added first version of new boot splash images, generated by the new
>   hsbg tool. (Also finally contains the "new" Haiku logo.)

I'm sorry, but didn't we say we were against this feature as the boot
is just very fast?
Did I loose anything? :)

-- 
Salvatore Benedetto (a.k.a. emitrax)
Student of Computer Engineer
University of Pisa
www.messinalug.org


From stippi at mail.berlios.de  Tue Mar 18 12:09:13 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 12:09:13 +0100
Subject: [Haiku-commits] r24435 - haiku/trunk/src/system/kernel
Message-ID: <200803181109.m2IB9D9f015987@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 12:09:13 +0100 (Tue, 18 Mar 2008)
New Revision: 24435
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24435&view=rev

Modified:
   haiku/trunk/src/system/kernel/splash.cpp
Log:
* Apply coding style a little more firmly.


Modified: haiku/trunk/src/system/kernel/splash.cpp
===================================================================
--- haiku/trunk/src/system/kernel/splash.cpp	2008-03-18 10:25:53 UTC (rev 24434)
+++ haiku/trunk/src/system/kernel/splash.cpp	2008-03-18 11:09:13 UTC (rev 24435)
@@ -20,6 +20,7 @@
 #	define TRACE(x...) ;
 #endif
 
+
 struct boot_splash_info {
 	mutex lock;
 	area_id area;
@@ -34,8 +35,10 @@
 
 static struct boot_splash_info sBootSplash;
 
+
 static void
-boot_splash_fb_vga_set_palette(const uint8 *palette, int32 firstIndex, int32 numEntries)
+boot_splash_fb_vga_set_palette(const uint8 *palette, int32 firstIndex,
+	int32 numEntries)
 {
 	out8(firstIndex, VGA_COLOR_WRITE_MODE);
 	// write VGA palette
@@ -47,6 +50,7 @@
 	}
 }
 
+
 static void
 boot_splash_fb_blit4(const uint8 *data, uint16 width,
 	uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -54,6 +58,7 @@
 	// ToDo: no blit yet in VGA mode
 }
 
+
 static void
 boot_splash_fb_blit8(const uint8 *data, uint16 width,
 	uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -69,6 +74,7 @@
 	}
 }
 
+
 static void
 boot_splash_fb_blit15(const uint8 *data, uint16 width,
 	uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -90,6 +96,7 @@
 	}
 }
 
+
 static void
 boot_splash_fb_blit16(const uint8 *data, uint16 width,
 	uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -111,6 +118,7 @@
 	}
 }
 
+
 static void
 boot_splash_fb_blit24(const uint8 *data, uint16 width,
 	uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -132,6 +140,7 @@
 	}
 }
 
+
 static void
 boot_splash_fb_blit32(const uint8 *data, uint16 width,
 	uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -152,30 +161,38 @@
 	}
 }
 
+
 static void
 boot_splash_fb_blit(const uint8 *data, uint16 width,
 	uint16 height, const uint8 *palette, uint16 left, uint16 top)
 {
 	switch (sBootSplash.depth) {
 		case 4:
-			return boot_splash_fb_blit4(data, width, height, palette, left, top);
+			boot_splash_fb_blit4(data, width, height, palette, left, top);
+			return;
 		case 8:
-			return boot_splash_fb_blit8(data, width, height, palette, left, top);
+			boot_splash_fb_blit8(data, width, height, palette, left, top);
+			return;
 		case 15:
-			return boot_splash_fb_blit15(data, width, height, palette, left, top);
+			boot_splash_fb_blit15(data, width, height, palette, left, top);
+			return;
 		case 16:
-			return boot_splash_fb_blit16(data, width, height, palette, left, top);
+			boot_splash_fb_blit16(data, width, height, palette, left, top);
+			return;
 		case 24:
-			return boot_splash_fb_blit24(data, width, height, palette, left, top);
+			boot_splash_fb_blit24(data, width, height, palette, left, top);
+			return;
 		case 32:
-			return boot_splash_fb_blit32(data, width, height, palette, left, top);
+			boot_splash_fb_blit32(data, width, height, palette, left, top);
+			return;
 	}
 }
 
 
 static void
-boot_splash_fb_blit16_cropped(const uint8 *data, uint16 imageLeft, uint16 imageTop, uint16 imageRight, uint16 imageBottom,
-	uint16 imageWidth, uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
+boot_splash_fb_blit16_cropped(const uint8 *data, uint16 imageLeft,
+	uint16 imageTop, uint16 imageRight, uint16 imageBottom, uint16 imageWidth,
+	uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
 {
 	int32 dataOffset = (imageWidth * imageTop) + imageLeft;
 
@@ -197,10 +214,11 @@
 	}
 }
 
+
 static void
-boot_splash_fb_blit_cropped(const uint8 *data, uint16 imageLeft, uint16 imageTop,
-	uint16 imageRight, uint16 imageBottom, uint16 imageWidth, uint16 imageHeight,
-	const uint8 *palette, uint16 left, uint16 top)
+boot_splash_fb_blit_cropped(const uint8 *data, uint16 imageLeft,
+	uint16 imageTop, uint16 imageRight, uint16 imageBottom, uint16 imageWidth,
+	uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
 {
 	switch (sBootSplash.depth) {
 		case 4:
@@ -208,19 +226,24 @@
 		case 15:
 			return;
 		case 16:
-			return boot_splash_fb_blit16_cropped(data, imageLeft, imageTop, imageRight,
-				imageBottom, imageWidth, imageHeight, palette, left, top);
+			boot_splash_fb_blit16_cropped(data, imageLeft, imageTop,
+				imageRight, imageBottom, imageWidth, imageHeight, palette,
+				left, top);
+			return;
 		case 24:
 		case 32:
 			return;
 	}
 }
 
+
 static status_t
-boot_splash_fb_update(addr_t baseAddress, int32 width, int32 height, int32 depth, int32 bytesPerRow)
+boot_splash_fb_update(addr_t baseAddress, int32 width, int32 height,
+	int32 depth, int32 bytesPerRow)
 {
-	TRACE("boot_splash_fb_update: buffer=%p, width=%ld, height=%ld, depth=%ld, bytesPerRow=%ld\n",
-		(void *)baseAddress, width, height, depth, bytesPerRow);
+	TRACE("boot_splash_fb_update: buffer=%p, width=%ld, height=%ld, depth=%ld, "
+		"bytesPerRow=%ld\n", (void *)baseAddress, width, height, depth,
+		bytesPerRow);
 	
 	mutex_lock(&sBootSplash.lock);
 	
@@ -231,12 +254,14 @@
 	sBootSplash.bytes_per_pixel = (depth + 7) / 8;
 	sBootSplash.bytes_per_row = bytesPerRow;
 
-	TRACE("boot_splash_fb_update: frame buffer mapped at %p\n", (void *)sBootSplash.frame_buffer);
+	TRACE("boot_splash_fb_update: frame buffer mapped at %p\n",
+		(void *)sBootSplash.frame_buffer);
 	
 	mutex_unlock(&sBootSplash.lock);
 	return B_OK;
 }
 
+
 bool
 boot_splash_fb_available(void)
 {
@@ -244,6 +269,7 @@
 	return sBootSplash.frame_buffer != (addr_t)NULL;
 }
 
+
 status_t
 boot_splash_fb_init(struct kernel_args *args)
 {
@@ -271,6 +297,7 @@
 	return B_OK;
 }
 
+
 void
 boot_splash_set_stage(int stage)
 {
@@ -304,12 +331,12 @@
 			stageOffset = 242;
 			break;
 		case BOOT_SPLASH_STAGE_7:
+		default:
 			stageOffset = iconsWidth;
 			break;
 	}
-	if (stage == BOOT_SPLASH_STAGE_7)
-		stageOffset = iconsWidth;
 
 	boot_splash_fb_blit_cropped(iconsImage, 0, 0, stageOffset, 32,
 		iconsWidth, iconsHeight, iconsPalette, x, y );
 }
+



From superstippi at gmx.de  Tue Mar 18 12:16:34 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 18 Mar 2008 12:16:34 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <b6b105e70803180359n5ba67f5fn4bf438b99d7f3add@mail.gmail.com>
References: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
	<b6b105e70803180359n5ba67f5fn4bf438b99d7f3add@mail.gmail.com>
Message-ID: <20080318121634.7886.8@stippis2.1205831954.fake>


Salvatore Benedetto wrote:
> On 18/03/2008, stippi at BerliOS <stippi at mail.berlios.de> wrote:
> > Author: stippi
> >  Date: 2008-03-18 11:25:53 +0100 (Tue, 18 Mar 2008) New Revision: 24434
> >  ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24434&view=rev Log:
> >  patch by Artur Wyszynski (aljen):
> >  * Added the feature of an animated boot screen (icons lighting up at
> >   different boot stages).
> >  * Added first version of new boot splash images, generated by the new
> >   hsbg tool. (Also finally contains the "new" Haiku logo.)
> 
> I'm sorry, but didn't we say we were against this feature as the boot is 
> just very fast?
> Did I loose anything? :)

We did say in a later post that CD booting is not as fast by any measure. 
Also if booting hangs, it is still nice for the user if s/he can say, it 
hangs at this and this icon. And finally the implementation of generating 
the boot image during the build process (eventually), is very nice and 
useful. Previously, it wasn't so easy to update the boot logo, which is the 
reason why it was the old logo for so long.

Best regards,
-Stephan


From stippi at mail.berlios.de  Tue Mar 18 12:18:39 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 12:18:39 +0100
Subject: [Haiku-commits] r24436 - haiku/trunk/src/system/kernel
Message-ID: <200803181118.m2IBId9F016465@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 12:18:38 +0100 (Tue, 18 Mar 2008)
New Revision: 24436
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24436&view=rev

Modified:
   haiku/trunk/src/system/kernel/splash.cpp
Log:
* Implemented 32 bit cropped blit. Untested. I am guessing that the functions
  could be refactored to avoid code duplication (ie only cropping
  implementations, with the non-cropping function being a special case of the
  cropping version)


Modified: haiku/trunk/src/system/kernel/splash.cpp
===================================================================
--- haiku/trunk/src/system/kernel/splash.cpp	2008-03-18 11:09:13 UTC (rev 24435)
+++ haiku/trunk/src/system/kernel/splash.cpp	2008-03-18 11:18:38 UTC (rev 24436)
@@ -216,6 +216,31 @@
 
 
 static void
+boot_splash_fb_blit32_cropped(const uint8 *data, uint16 imageLeft,
+	uint16 imageTop, uint16 imageRight, uint16 imageBottom, uint16 imageWidth,
+	uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
+{
+	int32 dataOffset = (imageWidth * imageTop) + imageLeft;
+
+	uint32 *start = (uint32 *)(sBootSplash.frame_buffer
+		+ sBootSplash.bytes_per_row * top + 4 * left);
+
+	for (int32 y = imageTop; y < imageBottom; y++) {
+		for (int32 x = imageLeft; x < imageRight; x++) {
+			uint16 color = data[(y * (imageWidth)) + x] * 3;
+
+			start[x] = (palette[color + 0] << 16) | (palette[color + 1] << 8)
+				| (palette[color + 2]);
+			dataOffset += imageWidth;
+		}
+
+
+		start = (uint32 *)((addr_t)start + sBootSplash.bytes_per_row);
+	}
+}
+
+
+static void
 boot_splash_fb_blit_cropped(const uint8 *data, uint16 imageLeft,
 	uint16 imageTop, uint16 imageRight, uint16 imageBottom, uint16 imageWidth,
 	uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
@@ -230,9 +255,13 @@
 				imageRight, imageBottom, imageWidth, imageHeight, palette,
 				left, top);
 			return;
-		case 24:
 		case 32:
+			boot_splash_fb_blit32_cropped(data, imageLeft, imageTop,
+				imageRight, imageBottom, imageWidth, imageHeight, palette,
+				left, top);
 			return;
+		case 24:
+			return;
 	}
 }
 



From superstippi at gmx.de  Tue Mar 18 12:21:34 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 18 Mar 2008 12:21:34 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <20080318121634.7886.8@stippis2.1205831954.fake>
References: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
	<b6b105e70803180359n5ba67f5fn4bf438b99d7f3add@mail.gmail.com>
	<20080318121634.7886.8@stippis2.1205831954.fake>
Message-ID: <20080318122134.9490.9@stippis2.1205831954.fake>


Stephan Assmus wrote:
> 
> Salvatore Benedetto wrote:
> > On 18/03/2008, stippi at BerliOS <stippi at mail.berlios.de> wrote:
> > > Author: stippi
> > >  Date: 2008-03-18 11:25:53 +0100 (Tue, 18 Mar 2008) New Revision: 
> > >  24434 ViewCVS: 
> > >  http://svn.berlios.de/viewcvs/haiku?rev=24434&view=rev Log: patch by 
> > >  Artur Wyszynski (aljen):
> > >  * Added the feature of an animated boot screen (icons lighting up at
> > >   different boot stages).
> > >  * Added first version of new boot splash images, generated by the new
> > >   hsbg tool. (Also finally contains the "new" Haiku logo.)
> > 
> > I'm sorry, but didn't we say we were against this feature as the boot 
> > is just very fast?
> > Did I loose anything? :)
> 
> We did say in a later post that CD booting is not as fast by any measure. 
> Also if booting hangs, it is still nice for the user if s/he can say, it 
> hangs at this and this icon. And finally the implementation of generating 
> the boot image during the build process (eventually), is very nice and 
> useful. Previously, it wasn't so easy to update the boot logo, which is 
> the reason why it was the old logo for so long.

And I forgot, the impression of "fast" is emphasized if you see a two 
second progress animation flashing by, than 2 seconds of a static image. :-)

Best regards,
-Stephan


From emitrax at gmail.com  Tue Mar 18 12:27:24 2008
From: emitrax at gmail.com (Salvatore Benedetto)
Date: Tue, 18 Mar 2008 11:27:24 +0000
Subject: [Haiku-commits] r24434 - in haiku/trunk:
	headers/private/kernel/boot src/apps/aboutsystem
	src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <20080318122134.9490.9@stippis2.1205831954.fake>
References: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
	<b6b105e70803180359n5ba67f5fn4bf438b99d7f3add@mail.gmail.com>
	<20080318121634.7886.8@stippis2.1205831954.fake>
	<20080318122134.9490.9@stippis2.1205831954.fake>
Message-ID: <b6b105e70803180427w45e1be82if44ae355565d20ae@mail.gmail.com>

On 18/03/2008, Stephan Assmus <superstippi at gmx.de> wrote:
>
>  Stephan Assmus wrote:
>  >
>  > Salvatore Benedetto wrote:
>  > > On 18/03/2008, stippi at BerliOS <stippi at mail.berlios.de> wrote:
>  > > > Author: stippi
>  > > >  Date: 2008-03-18 11:25:53 +0100 (Tue, 18 Mar 2008) New Revision:
>  > > >  24434 ViewCVS:
>  > > >  http://svn.berlios.de/viewcvs/haiku?rev=24434&view=rev Log: patch by
>  > > >  Artur Wyszynski (aljen):
>  > > >  * Added the feature of an animated boot screen (icons lighting up at
>  > > >   different boot stages).
>  > > >  * Added first version of new boot splash images, generated by the new
>  > > >   hsbg tool. (Also finally contains the "new" Haiku logo.)
>  > >
>  > > I'm sorry, but didn't we say we were against this feature as the boot
>  > > is just very fast?
>  > > Did I loose anything? :)
>  >
>  > We did say in a later post that CD booting is not as fast by any measure.
>  > Also if booting hangs, it is still nice for the user if s/he can say, it
>  > hangs at this and this icon. And finally the implementation of generating
>  > the boot image during the build process (eventually), is very nice and
>  > useful. Previously, it wasn't so easy to update the boot logo, which is
>  > the reason why it was the old logo for so long.
>
>
> And I forgot, the impression of "fast" is emphasized if you see a two
>  second progress animation flashing by, than 2 seconds of a static image. :-)
>

Actually the boot is so fast I couldn't even look at the icons, and
that's on vmware.
I honestly don't like it, especially the jump from the white color of
the bootsplash background to the blue of the desktop. But of course
that's just my opinion. :)

Why don't we enable it only when booting from cd?

Regards,
-- 
Salvatore Benedetto (a.k.a. emitrax)
Student of Computer Engineer
University of Pisa
www.messinalug.org


From superstippi at gmx.de  Tue Mar 18 12:36:57 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 18 Mar 2008 12:36:57 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <b6b105e70803180427w45e1be82if44ae355565d20ae@mail.gmail.com>
References: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
	<b6b105e70803180359n5ba67f5fn4bf438b99d7f3add@mail.gmail.com>
	<20080318121634.7886.8@stippis2.1205831954.fake>
	<20080318122134.9490.9@stippis2.1205831954.fake>
	<b6b105e70803180427w45e1be82if44ae355565d20ae@mail.gmail.com>
Message-ID: <20080318123657.9566.10@stippis2.1205831954.fake>


Salvatore Benedetto wrote:
> On 18/03/2008, Stephan Assmus <superstippi at gmx.de> wrote:
> >
> >  Stephan Assmus wrote:
> >  >
> >  > Salvatore Benedetto wrote:
> >  > > On 18/03/2008, stippi at BerliOS <stippi at mail.berlios.de> wrote:
> >  > > > Author: stippi
> >  > > >  Date: 2008-03-18 11:25:53 +0100 (Tue, 18 Mar 2008) New Revision:
> >  > > >  24434 ViewCVS:
> >  > > >  http://svn.berlios.de/viewcvs/haiku?rev=24434&view=rev Log: 
> >  > > >  patch by Artur Wyszynski (aljen):
> >  > > >  * Added the feature of an animated boot screen (icons lighting 
> >  > > >  up at
> >  > > >   different boot stages).
> >  > > >  * Added first version of new boot splash images, generated by 
> >  > > >  the new
> >  > > >   hsbg tool. (Also finally contains the "new" Haiku logo.)
> >  > >
> >  > > I'm sorry, but didn't we say we were against this feature as the 
> >  > > boot is just very fast?
> >  > > Did I loose anything? :)
> >  >
> >  > We did say in a later post that CD booting is not as fast by any 
> >  > measure. Also if booting hangs, it is still nice for the user if 
> >  > s/he can say, it hangs at this and this icon. And finally the 
> >  > implementation of generating the boot image during the build process 
> >  > (eventually), is very nice and useful. Previously, it wasn't so easy 
> >  > to update the boot logo, which is the reason why it was the old logo 
> >  > for so long.
> >
> >
> > And I forgot, the impression of "fast" is emphasized if you see a two
> >  second progress animation flashing by, than 2 seconds of a static 
> >  image. :-)
> >
> 
> Actually the boot is so fast I couldn't even look at the icons, and 
> that's on vmware.
> I honestly don't like it, especially the jump from the white color of the 
> bootsplash background to the blue of the desktop. But of course that's 
> just my opinion. :)
> 
> Why don't we enable it only when booting from cd?

Just give me a bit of time to improve it, I also don't like the clearing to 
white, since it is too slow, at least on real hardware. And the icon 
rendering does not yet work for me in 32 bit mode. However, booting on real 
hardwere, 2 GHz Core 2 Duo no less, is not as fast, it's definitely slower 
than just "flashing by" and the animation does come across for me.

Best regards,
-Stephan


From stippi at mail.berlios.de  Tue Mar 18 13:14:44 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 13:14:44 +0100
Subject: [Haiku-commits] r24437 -
	haiku/trunk/src/system/boot/platform/bios_ia32
Message-ID: <200803181214.m2ICEi58014007@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 13:14:43 +0100 (Tue, 18 Mar 2008)
New Revision: 24437
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24437&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp
Log:
Fixed initial rendering of the grayed out icons, depends on frame buffer
depth now. Removed now unused blit16_cropped().


Modified: haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp	2008-03-18 11:18:38 UTC (rev 24436)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp	2008-03-18 12:14:43 UTC (rev 24437)
@@ -238,7 +238,7 @@
 		return B_NOT_SUPPORTED;
 
 	// retrieved EDID - now parse it
-	dprintf("Got EDID!\n");	
+	dprintf("Got EDID!\n");
 	edid_decode(info, &edidRaw);
 	edid_dump(info);
 	return B_OK;
@@ -719,28 +719,6 @@
 	}
 }
 
-static void
-blit16_cropped(const uint8 *data, uint16 imageLeft, uint16 imageTop, uint16 imageRight,
-	uint16 imageBottom, uint16 imageWidth, uint16 imageHeight, const uint8 *palette,
-	uint16 left, uint16 top)
-{
-	int32 dataOffset = (imageWidth * imageTop) + imageLeft;
-	uint16 *start = (uint16 *)(sFrameBuffer
-		+ gKernelArgs.frame_buffer.bytes_per_row * top + 2 * left);
-
-	for (int32 y = imageTop; y < imageBottom; y++) {
-		for (int32 x = imageLeft; x < imageRight; x++) {
-			uint16 color = data[(y * (imageWidth)) + x] * 3;
-			start[x] = ((palette[color + 0] >> 3) << 11)
-				| ((palette[color + 1] >> 2) << 5)
-				| ((palette[color + 2] >> 3));
-			dataOffset += imageWidth;
-		}
-		start = (uint16 *)((addr_t)start
-			+ gKernelArgs.frame_buffer.bytes_per_row);
-	}
-}
-
 //	#pragma mark -
 
 extern "C" void
@@ -817,7 +795,9 @@
 
 	x = gKernelArgs.frame_buffer.width / 2 - iconsWidth / 2;
 	y = y + splashHeight;
-	blit16_cropped(iconsImage, 0, 32, iconsWidth, 64, iconsWidth, iconsHeight, iconsPalette, x, y);
+	uint16 iconsHalfHeight = iconsHeight / 2;
+	const uint8* lowerHalfIconImage = iconsImage + iconsWidth * iconsHalfHeight;
+	blit_8bit_image(lowerHalfIconImage, iconsWidth, iconsHalfHeight, iconsPalette, x, y);
 
 	x = gKernelArgs.frame_buffer.width / 2 - copyrightWidth / 2;
 	y = gKernelArgs.frame_buffer.height - copyrightHeight - 5;
@@ -840,7 +820,7 @@
 }
 
 
-extern "C" status_t 
+extern "C" status_t
 platform_init_video(void)
 {
 	gKernelArgs.frame_buffer.enabled = 0;



From ingo_weinhold at gmx.de  Tue Mar 18 13:20:43 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Tue, 18 Mar 2008 13:20:43 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
References: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
Message-ID: <20080318132043.505.2@knochen-vm.1205838844.fake>


On 2008-03-18 at 11:25:55 [+0100], stippi at BerliOS <stippi at mail.berlios.de> 
wrote:
> TODO:
> * Use hsbg as a build system tool and generate images.h during build
>   from PNGs provided in the artwork folder.

Unless you want to do that yourself, you can tell me how the tool is to be 
used and I can integrate it.

CU, Ingo


From bonefish at mail.berlios.de  Tue Mar 18 13:26:50 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 18 Mar 2008 13:26:50 +0100
Subject: [Haiku-commits] r24438 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200803181226.m2ICQolh012071@sheep.berlios.de>

Author: bonefish
Date: 2008-03-18 13:26:50 +0100 (Tue, 18 Mar 2008)
New Revision: 24438
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24438&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
Log:
Fixed warning.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-18 12:14:43 UTC (rev 24437)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-18 12:26:50 UTC (rev 24438)
@@ -196,7 +196,7 @@
 }
 
 
-static status_t
+static void
 set_memory_write_back(int32 id, uint64 base, uint64 length)
 {
 	int i;



From anevilyak at gmail.com  Tue Mar 18 13:27:54 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Tue, 18 Mar 2008 07:27:54 -0500
Subject: [Haiku-commits] r24423 -
	haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <696619337-BeMail@zon>
References: <f019d2f30803172024r3d316330s886ce1d1b73a9c83@mail.gmail.com>
	<696619337-BeMail@zon>
Message-ID: <f019d2f30803180527q4e9b80a3ofd272161f3acd575@mail.gmail.com>

>  Do you have more than one card in your system?
>  Does "ifconfig" show your card as having a link?
>

Nope, only /dev/net/nforce/0, no other ethernet interfaces on that motherboard.

Regards,

Rene


From stefano.ceccherini at gmail.com  Tue Mar 18 13:42:12 2008
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Tue, 18 Mar 2008 13:42:12 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
	headers/private/kernel/boot src/apps/aboutsystem
	src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <20080318123657.9566.10@stippis2.1205831954.fake>
References: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
	<b6b105e70803180359n5ba67f5fn4bf438b99d7f3add@mail.gmail.com>
	<20080318121634.7886.8@stippis2.1205831954.fake>
	<20080318122134.9490.9@stippis2.1205831954.fake>
	<b6b105e70803180427w45e1be82if44ae355565d20ae@mail.gmail.com>
	<20080318123657.9566.10@stippis2.1205831954.fake>
Message-ID: <894b9700803180542p73008d3eo22f41c94402248f3@mail.gmail.com>

2008/3/18, Stephan Assmus <superstippi at gmx.de>:

> Just give me a bit of time to improve it, I also don't like the clearing to
>  white, since it is too slow, at least on real hardware. And the icon
>  rendering does not yet work for me in 32 bit mode. However, booting on real
>  hardwere, 2 GHz Core 2 Duo no less, is not as fast, it's definitely slower
>  than just "flashing by" and the animation does come across for me.


I think in some cases, VMWare shows the boot screen for much less time
than on real hardware for some reason, although it's weird.


From superstippi at gmx.de  Tue Mar 18 13:50:11 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 18 Mar 2008 13:50:11 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <20080318132043.505.2@knochen-vm.1205838844.fake>
References: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
	<20080318132043.505.2@knochen-vm.1205838844.fake>
Message-ID: <20080318135011.12955.11@stippis2.1205831954.fake>


Ingo Weinhold wrote:
> 
> On 2008-03-18 at 11:25:55 [+0100], stippi at BerliOS 
> <stippi at mail.berlios.de> wrote:
> > TODO:
> > * Use hsbg as a build system tool and generate images.h during build
> >   from PNGs provided in the artwork folder.
> 
> Unless you want to do that yourself, you can tell me how the tool is to 
> be used and I can integrate it.

That would be great! I could work on tweaking the splash artwork and you 
could integrate the tool in parallel! :-)

I would like it to work like this:
* There are two PNG files in the data/artwork/boot_splash folder.
  One is the "background", also containing the logo, the other is the icons
  which light up. The upper part of the icons image has the icons in grayed
  out mode, the lower half has them lit up. (Just what Arthur already did.)
  The Jamrule would take the file names of these files as argument I guess.
* Extending on what Arthur did, I would also like to supply to the new Jam
  rule the "placement" of these images ([0..100] for percent, IIRC floats
  cannot be used?). Currently the images are centered. The placement would
  show up in the generated headers as constants that I can use in a modified
  splash.cpp.

Thank you very much!

Also, not immediately, just so that I note it:
* Hsbg generates two separate palettes for icons and logo, this cannot work
  for palette mode frame buffers.
* I couldn't figure out how to disable splash mode in case the user
  requested console debug output. (I didn't quite understand how platform
  args are passed to the kernel later.)

I would appreciate help with the second item.

Best regards,
-Stephan



From axeld at pinc-software.de  Tue Mar 18 13:53:05 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Tue, 18 Mar 2008 13:53:05 +0100 CET
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <20080318132043.505.2@knochen-vm.1205838844.fake>
Message-ID: <387983842-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> On 2008-03-18 at 11:25:55 [+0100], stippi at BerliOS <
> stippi at mail.berlios.de> 
> wrote:
> > TODO:
> > * Use hsbg as a build system tool and generate images.h during 
> > build
> >   from PNGs provided in the artwork folder.
> Unless you want to do that yourself, you can tell me how the tool is 
> to be 
> used and I can integrate it.

It's currently in src/bin/hbsg.cpp, but should be moved to src/tools/ 
IMO, we could also find a more expressive name for this thing then.

Bye,
   Axel.



From superstippi at gmx.de  Tue Mar 18 13:56:38 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 18 Mar 2008 13:56:38 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <387983842-BeMail@zon>
References: <387983842-BeMail@zon>
Message-ID: <20080318135638.13065.14@stippis2.1205831954.fake>


Axel D?rfler wrote:
> Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > On 2008-03-18 at 11:25:55 [+0100], stippi at BerliOS < 
> > stippi at mail.berlios.de> 
> > wrote:
> > > TODO:
> > > * Use hsbg as a build system tool and generate images.h during 
> > > build
> > >   from PNGs provided in the artwork folder.
> > Unless you want to do that yourself, you can tell me how the tool is to 
> > be 
> > used and I can integrate it.
> 
> It's currently in src/bin/hbsg.cpp, but should be moved to src/tools/ 
> IMO, we could also find a more expressive name for this thing then.

Yes, I guess Ingo will do that.

Best regards,
-Stephan


From axeld at pinc-software.de  Tue Mar 18 13:58:16 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Tue, 18 Mar 2008 13:58:16 +0100 CET
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <20080318123657.9566.10@stippis2.1205831954.fake>
Message-ID: <698434530-BeMail@zon>

Stephan Assmus <superstippi at gmx.de> wrote:
> > Why don't we enable it only when booting from cd?
> Just give me a bit of time to improve it, I also don't like the 
> clearing to 
> white, since it is too slow, at least on real hardware. And the icon 
> rendering does not yet work for me in 32 bit mode. However, booting 
> on real 
> hardwere, 2 GHz Core 2 Duo no less, is not as fast, it's definitely 
> slower 
> than just "flashing by" and the animation does come across for me.

With serial debug turned on? Also, currently booting is much slower due 
to the IDE problems on startup with current machines.
I'm not sure I like those icons either, but until Stephan has improved 
the looks, I wouldn't comment about that too much :-)
Also, if booting turns out to be very fast on real hardware (as it 
should), we can still fall back to a CD only version. I wouldn't mind 
having a progress bar instead of icons (that automatically starts to 
show if booting takes too long), but that's just an idea. At least we 
could then remove most support code from the boot loader.

BTW I guess you've seen the comments from Michael and me? Those issues 
should not be forgotten.

Bye,
   Axel.



From superstippi at gmx.de  Tue Mar 18 14:05:34 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 18 Mar 2008 14:05:34 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <698434530-BeMail@zon>
References: <698434530-BeMail@zon>
Message-ID: <20080318140534.13275.15@stippis2.1205831954.fake>


Axel D?rfler wrote:
> Stephan Assmus <superstippi at gmx.de> wrote:
> > > Why don't we enable it only when booting from cd?
> > Just give me a bit of time to improve it, I also don't like the 
> > clearing to 
> > white, since it is too slow, at least on real hardware. And the icon 
> > rendering does not yet work for me in 32 bit mode. However, booting on 
> > real 
> > hardwere, 2 GHz Core 2 Duo no less, is not as fast, it's definitely 
> > slower 
> > than just "flashing by" and the animation does come across for me.
> 
> With serial debug turned on? Also, currently booting is much slower due 
> to the IDE problems on startup with current machines. I'm not sure I like 
> those icons either, but until Stephan has improved the looks, I wouldn't 
> comment about that too much :-) Also, if booting turns out to be very 
> fast on real hardware (as it should), we can still fall back to a CD only 
> version. I wouldn't mind having a progress bar instead of icons (that 
> automatically starts to show if booting takes too long), but that's just 
> an idea. At least we could then remove most support code from the boot 
> loader.
> 
> BTW I guess you've seen the comments from Michael and me? Those issues 
> should not be forgotten.

AFAICT, only the double frame buffer mapping issue is left. I could use 
help with that one.

Best regards,
-Stephan




From stippi at mail.berlios.de  Tue Mar 18 14:14:18 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 14:14:18 +0100
Subject: [Haiku-commits] r24439 - in haiku/trunk:
	headers/private/kernel/boot src/system/kernel
Message-ID: <200803181314.m2IDEIv9019722@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 14:14:18 +0100 (Tue, 18 Mar 2008)
New Revision: 24439
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24439&view=rev

Modified:
   haiku/trunk/headers/private/kernel/boot/splash.h
   haiku/trunk/src/system/kernel/main.c
   haiku/trunk/src/system/kernel/splash.cpp
Log:
* Give boot stages a more meaningful name, make the max stage count known.
* Calculate icon offset from stage in splash.cpp, remove hard coded placement
  values. Draw only icon, not the whole image from top/left to right of
  icon.


Modified: haiku/trunk/headers/private/kernel/boot/splash.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/splash.h	2008-03-18 12:26:50 UTC (rev 24438)
+++ haiku/trunk/headers/private/kernel/boot/splash.h	2008-03-18 13:14:18 UTC (rev 24439)
@@ -35,13 +35,15 @@
 #endif
 
 enum {
-	BOOT_SPLASH_STAGE_1	= 0,
-	BOOT_SPLASH_STAGE_2,
-	BOOT_SPLASH_STAGE_3,
-	BOOT_SPLASH_STAGE_4,
-	BOOT_SPLASH_STAGE_5,
-	BOOT_SPLASH_STAGE_6,
-	BOOT_SPLASH_STAGE_7
+	BOOT_SPLASH_STAGE_1_INIT_MODULES	= 0,
+	BOOT_SPLASH_STAGE_2_BOOTSTRAP_FS,
+	BOOT_SPLASH_STAGE_3_INIT_DEVICES,
+	BOOT_SPLASH_STAGE_4_MOUNT_BOOT_FS,
+	BOOT_SPLASH_STAGE_5_INIT_CPU_MODULES,
+	BOOT_SPLASH_STAGE_6_INIT_VM_MODULES,
+	BOOT_SPLASH_STAGE_7_RUN_BOOT_SCRIPT,
+
+	BOOT_SPLASH_STAGE_MAX // keep this at the end
 };
 
 status_t boot_splash_fb_init(struct kernel_args *args);

Modified: haiku/trunk/src/system/kernel/main.c
===================================================================
--- haiku/trunk/src/system/kernel/main.c	2008-03-18 12:26:50 UTC (rev 24438)
+++ haiku/trunk/src/system/kernel/main.c	2008-03-18 13:14:18 UTC (rev 24439)
@@ -226,7 +226,7 @@
 	boot_splash_fb_init(&sKernelArgs);
 
 	TRACE("Init modules\n");
-	boot_splash_set_stage(BOOT_SPLASH_STAGE_1);
+	boot_splash_set_stage(BOOT_SPLASH_STAGE_1_INIT_MODULES);
 	module_init(&sKernelArgs);
 
 	// ToDo: the preloaded image debug data is placed in the kernel args, and
@@ -250,11 +250,11 @@
 
 	/* bootstrap all the filesystems */
 	TRACE("Bootstrap file systems\n");
-	boot_splash_set_stage(BOOT_SPLASH_STAGE_2);
+	boot_splash_set_stage(BOOT_SPLASH_STAGE_2_BOOTSTRAP_FS);
 	vfs_bootstrap_file_systems();
 
 	TRACE("Init Device Manager\n");
-	boot_splash_set_stage(BOOT_SPLASH_STAGE_3);
+	boot_splash_set_stage(BOOT_SPLASH_STAGE_3_INIT_DEVICES);
 	device_manager_init(&sKernelArgs);
 
 	TRACE("Add preloaded old-style drivers\n");
@@ -266,15 +266,15 @@
 	int_init_post_device_manager(&sKernelArgs);
 
 	TRACE("Mount boot file system\n");
-	boot_splash_set_stage(BOOT_SPLASH_STAGE_4);
+	boot_splash_set_stage(BOOT_SPLASH_STAGE_4_MOUNT_BOOT_FS);
 	vfs_mount_boot_file_system(&sKernelArgs);
 
 	// CPU specific modules may now be available
-	boot_splash_set_stage(BOOT_SPLASH_STAGE_5);
+	boot_splash_set_stage(BOOT_SPLASH_STAGE_5_INIT_CPU_MODULES);
 	cpu_init_post_modules(&sKernelArgs);
 
 	TRACE("vm_init_post_modules\n");
-	boot_splash_set_stage(BOOT_SPLASH_STAGE_6);
+	boot_splash_set_stage(BOOT_SPLASH_STAGE_6_INIT_VM_MODULES);
 	vm_init_post_modules(&sKernelArgs);
 	
 	TRACE("debug_init_post_modules\n");
@@ -283,7 +283,7 @@
 	TRACE("device_manager_init_post_modules\n");
 	device_manager_init_post_modules(&sKernelArgs);
 
-	boot_splash_set_stage(BOOT_SPLASH_STAGE_7);
+	boot_splash_set_stage(BOOT_SPLASH_STAGE_7_RUN_BOOT_SCRIPT);
 	// start the init process
 	{
 		const char *shellArgs[] = {"/bin/sh", "/boot/beos/system/boot/Bootscript", NULL};

Modified: haiku/trunk/src/system/kernel/splash.cpp
===================================================================
--- haiku/trunk/src/system/kernel/splash.cpp	2008-03-18 12:26:50 UTC (rev 24438)
+++ haiku/trunk/src/system/kernel/splash.cpp	2008-03-18 13:14:18 UTC (rev 24439)
@@ -335,37 +335,17 @@
 	if (!sBootSplash.enabled)
 		return;
 
+	if (stage < 0 || stage >= BOOT_SPLASH_STAGE_MAX)
+		return;
+
+	// TODO: Use placement info from images.h
 	int x = sBootSplash.width / 2 - iconsWidth / 2;
 	int y = sBootSplash.height / 2 - splashHeight / 2;
 	y = y + splashHeight;
-	
-	int stageOffset = 0;
-	switch (stage) {
-		case BOOT_SPLASH_STAGE_1:
-			stageOffset = 32;
-			break;
-		case BOOT_SPLASH_STAGE_2:
-			stageOffset = 74;
-			break;
-		case BOOT_SPLASH_STAGE_3:
-			stageOffset = 116;
-			break;
-		case BOOT_SPLASH_STAGE_4:
-			stageOffset = 158;
-			break;
-		case BOOT_SPLASH_STAGE_5:
-			stageOffset = 200;
-			break;
-		case BOOT_SPLASH_STAGE_6:
-			stageOffset = 242;
-			break;
-		case BOOT_SPLASH_STAGE_7:
-		default:
-			stageOffset = iconsWidth;
-			break;
-	}
 
-	boot_splash_fb_blit_cropped(iconsImage, 0, 0, stageOffset, 32,
-		iconsWidth, iconsHeight, iconsPalette, x, y );
+	int stageLeftEdge = iconsWidth * stage / BOOT_SPLASH_STAGE_MAX;
+	int stageRightEdge = iconsWidth * (stage + 1) / BOOT_SPLASH_STAGE_MAX;
+	boot_splash_fb_blit_cropped(iconsImage, stageLeftEdge, 0,
+		stageRightEdge, 32, iconsWidth, iconsHeight, iconsPalette, x, y );
 }
 



From ingo_weinhold at gmx.de  Tue Mar 18 14:59:35 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Tue, 18 Mar 2008 14:59:35 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <20080318135011.12955.11@stippis2.1205831954.fake>
References: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
	<20080318132043.505.2@knochen-vm.1205838844.fake>
	<20080318135011.12955.11@stippis2.1205831954.fake>
Message-ID: <20080318145935.625.3@knochen-vm.1205838844.fake>


On 2008-03-18 at 13:50:11 [+0100], Stephan Assmus <superstippi at gmx.de> wrote:
> 
> I would like it to work like this:
> * There are two PNG files in the data/artwork/boot_splash folder.

There's no such folder in the current revision (r24439).

CU, Ingo


From bonefish at mail.berlios.de  Tue Mar 18 15:06:58 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 18 Mar 2008 15:06:58 +0100
Subject: [Haiku-commits] r24440 - in haiku/trunk/src: bin tools
Message-ID: <200803181406.m2IE6wdA025309@sheep.berlios.de>

Author: bonefish
Date: 2008-03-18 15:06:57 +0100 (Tue, 18 Mar 2008)
New Revision: 24440
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24440&view=rev

Added:
   haiku/trunk/src/tools/generate_boot_screen.cpp
Removed:
   haiku/trunk/src/bin/hbsg.cpp
Modified:
   haiku/trunk/src/tools/Jamfile
Log:
* Renamed hbsg to generate_boot_screen and moved it to src/tools.
* Build generate_boot_screen as a build platform tool. It requires
  libpng to be installed.
* Added output file name as fourth argument.
* Replaced unnecessarily complicated
  fwrite(<string>, strlen(<string>),...) and sprintf()+fwrite()
  constructs by fputs() and fprintf() respectively.


Deleted: haiku/trunk/src/bin/hbsg.cpp

Modified: haiku/trunk/src/tools/Jamfile
===================================================================
--- haiku/trunk/src/tools/Jamfile	2008-03-18 13:14:18 UTC (rev 24439)
+++ haiku/trunk/src/tools/Jamfile	2008-03-18 14:06:57 UTC (rev 24440)
@@ -37,6 +37,9 @@
 BuildPlatformMain <build>data_to_source : data_to_source.cpp
 	: $(HOST_LIBSUPC++) ;
 
+BuildPlatformMain <build>generate_boot_screen : generate_boot_screen.cpp
+	: $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) png ;
+
 BuildPlatformMain <build>listattr : listattr.cpp : $(HOST_LIBBE) ;
 
 if $(HOST_PLATFORM_BEOS_COMPATIBLE) {

Copied: haiku/trunk/src/tools/generate_boot_screen.cpp (from rev 24437, haiku/trunk/src/bin/hbsg.cpp)
===================================================================
--- haiku/trunk/src/bin/hbsg.cpp	2008-03-18 12:14:43 UTC (rev 24437)
+++ haiku/trunk/src/tools/generate_boot_screen.cpp	2008-03-18 14:06:57 UTC (rev 24440)
@@ -0,0 +1,203 @@
+//------------------------------------------------------------------------------
+//	Copyright (c) 2008, Haiku, Inc.
+//
+//	Permission is hereby granted, free of charge, to any person obtaining a
+//	copy of this software and associated documentation files (the "Software"),
+//	to deal in the Software without restriction, including without limitation
+//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+//	and/or sell copies of the Software, and to permit persons to whom the
+//	Software is furnished to do so, subject to the following conditions:
+//
+//	The above copyright notice and this permission notice shall be included in
+//	all copies or substantial portions of the Software.
+//
+//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+//	DEALINGS IN THE SOFTWARE.
+//
+//	File Name:		hbsg.cpp
+//	Author:			Artur Wyszynski <harakash at gmail.com>
+//	Description:	Haiku Boot Splash Generator
+//  
+//------------------------------------------------------------------------------
+
+#include <string>
+#include <iostream>
+#include <png.h>
+
+int x, y;
+int width, height;
+png_byte colorType;
+png_byte bpp;
+png_structp pngPtr;
+png_infop infoPtr;
+int noOfPasses;
+png_bytep* rowPtrs;
+FILE* finput = NULL;
+FILE* foutput = NULL;
+png_colorp palette;
+int paletteColors = 0;
+
+void
+cleanup()
+{
+	fclose(finput);
+	fclose(foutput);
+}
+
+void
+error(const char *s, ...)
+{
+	va_list args;
+	va_start(args, s);
+	vfprintf(stderr, s, args);
+	fprintf(stderr, "\n");
+	va_end(args);
+	cleanup();
+	exit(-1);
+}
+
+void
+readPNG(char *filename)
+{
+	printf("Reading file %s\n", filename);
+	char header[8];
+	finput = fopen(filename, "rb");
+	if (!finput)
+		error("[readPNG] File %s could not be opened for reading", filename);
+	
+	fread(header, 1, 8, finput);
+	if (png_sig_cmp((png_byte *)header, 0, 8 ))
+		error("[readPNG] File %s is not recognized as a PNG file", filename);
+	
+	pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+	if (!pngPtr)
+		error("[readPNG] png_create_read_struct failed");
+	
+	infoPtr = png_create_info_struct(pngPtr);
+	if (!infoPtr)
+		error("[readPNG] png_create_info_struct failed");
+	
+	if (setjmp(png_jmpbuf(pngPtr)))
+		error("[readPNG] Error during init_io");
+	
+	png_init_io(pngPtr, finput);
+	png_set_sig_bytes(pngPtr, 8);
+	png_read_info(pngPtr, infoPtr);
+	width = infoPtr->width;
+	height = infoPtr->height;
+	colorType = infoPtr->color_type;
+	bpp = infoPtr->bit_depth;
+	noOfPasses = png_set_interlace_handling(pngPtr);
+	png_read_update_info(pngPtr, infoPtr);
+	if (setjmp(png_jmpbuf(pngPtr)))
+		error("[readPNG] Error during read_image");
+
+	rowPtrs = (png_bytep*)malloc(sizeof(png_bytep) * height);
+	for ( y = 0; y < height; y++)
+		rowPtrs[y] = (png_byte*)malloc(infoPtr->rowbytes);
+	png_read_image(pngPtr, rowPtrs);
+	png_get_PLTE(pngPtr, infoPtr, &palette, &paletteColors);
+	fclose(finput);
+	printf("[PNG] width:\t%d\n", width);
+	printf("[PNG] height:\t%d\n", height);
+	printf("[PNG] bpp:\t%d\n", bpp);
+	printf("[PNG] palette:\t%d\n", paletteColors);
+}
+
+void
+writeHeader(char *filename)
+{
+	int length = strlen(filename) - 4;
+	char *varName = NULL;
+	varName = new char[length];
+	memset(varName, 0, sizeof(char) * length);
+	strncat(varName, filename, length);
+	printf("Exporting image %s\n", varName);
+
+	// dumping palette
+	fprintf(foutput, "static const uint8 %sPalette[] = {\n", varName);
+	for (int i = 0; i < paletteColors; i++) {
+		if (i == paletteColors - 1) {
+			fprintf(foutput, "\t0x%x, 0x%x, 0x%x\n", palette[i].red,
+				palette[i].green, palette[i].blue);
+		} else {
+			fprintf(foutput, "\t0x%x, 0x%x, 0x%x,\n", palette[i].red,
+				palette[i].green, palette[i].blue);
+		}
+	}
+	fputs("};\n\n", foutput);
+
+	fprintf(foutput, "static const uint %sWidth=%d;\n", varName, width);
+	fprintf(foutput, "static const uint %sHeight=%d;\n", varName, height);
+	fprintf(foutput, "static const uint8 %sImage[] = {\n\t", varName);
+	int offset = 0;
+	unsigned char *data = new unsigned char[width * height];
+	for (y = 0; y < height; y++) {
+		png_byte* row = rowPtrs[y];
+		for (x = 0; x < width; x++) {
+			png_byte* ptr = &row[x];
+			offset = (y * width) + x;
+			data[offset] = ptr[0];
+		}
+	}
+	
+	bool end = false;
+	offset = 0;
+	while (!end) {
+		if (offset == (width * height)) {
+			fprintf(foutput, "0x%x", data[offset]);
+			end = true;
+		}
+		else
+			fprintf(foutput, "0x%x, ", data[offset]);
+		if ((offset % 8) == 0) {
+			fputs("\n\t", foutput);
+		}
+		offset++;
+	}
+
+	fputs("};\n\n", foutput);
+	delete varName;
+}
+
+void
+parseImage(char *filename)
+{
+	readPNG(filename);
+	writeHeader(filename);
+}
+
+int
+main(int argc, char *argv[])
+{
+	printf("Haiku Boot Splash Generator\n");
+	printf("Copyright 2008, Artur Wyszynski <harakash at gmail.com>\n");
+	printf("Distributed under the terms of the Haiku License. All rights reserved.\n");
+
+	if (argc < 5) {
+		printf("Usage:\n");
+		printf("\thbsg <splash.png> <icons.png> <copyright.png> <images.h>\n");
+		return 0;
+	}
+
+	const char* headerFileName = argv[4];
+
+	foutput = fopen(headerFileName, "wb");
+	if (!foutput)
+		error("Could not open file \"%s\" for writing", headerFileName);
+
+	fputs("// This file was generated by Haiku Boot Splash Generator\n\n",
+		foutput);
+
+	parseImage(argv[1]);
+	parseImage(argv[2]);
+	parseImage(argv[3]);
+
+	fclose(foutput);
+	return 0;
+}



From superstippi at gmx.de  Tue Mar 18 15:12:18 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 18 Mar 2008 15:12:18 +0100
Subject: [Haiku-commits] r24434 - in haiku/trunk:
 headers/private/kernel/boot src/apps/aboutsystem
 src/system/boot/platform/bios_ia32 src/system/kernel
In-Reply-To: <20080318145935.625.3@knochen-vm.1205838844.fake>
References: <200803181025.m2IAPtXJ010916@sheep.berlios.de>
	<20080318132043.505.2@knochen-vm.1205838844.fake>
	<20080318135011.12955.11@stippis2.1205831954.fake>
	<20080318145935.625.3@knochen-vm.1205838844.fake>
Message-ID: <20080318151218.15692.16@stippis2.1205831954.fake>


Ingo Weinhold wrote:
> 
> On 2008-03-18 at 13:50:11 [+0100], Stephan Assmus <superstippi at gmx.de> 
> wrote:
> > 
> > I would like it to work like this:
> > * There are two PNG files in the data/artwork/boot_splash folder.
> 
> There's no such folder in the current revision (r24439).

Oh yeah, I was talking future. :-)

Best regards,
-Stephan




From axeld at mail.berlios.de  Tue Mar 18 15:36:35 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 18 Mar 2008 15:36:35 +0100
Subject: [Haiku-commits] r24441 - haiku/trunk/src/bin/network/tcpdump/libpcap
Message-ID: <200803181436.m2IEaZ2n029041@sheep.berlios.de>

Author: axeld
Date: 2008-03-18 15:36:35 +0100 (Tue, 18 Mar 2008)
New Revision: 24441
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24441&view=rev

Modified:
   haiku/trunk/src/bin/network/tcpdump/libpcap/pcap-haiku.cpp
Log:
* pcap_platform_finddevs() was not implemented at all (and did not return an
  error string explaining the situation), causing bug #1934.
* When called without specifying an interface, it now chooses the first
  suitable interface from the list as documented.


Modified: haiku/trunk/src/bin/network/tcpdump/libpcap/pcap-haiku.cpp
===================================================================
--- haiku/trunk/src/bin/network/tcpdump/libpcap/pcap-haiku.cpp	2008-03-18 14:06:57 UTC (rev 24440)
+++ haiku/trunk/src/bin/network/tcpdump/libpcap/pcap-haiku.cpp	2008-03-18 14:36:35 UTC (rev 24441)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -17,6 +17,7 @@
 
 #include <net/if.h>
 #include <net/if_dl.h>
+#include <net/if_types.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -137,8 +138,8 @@
 
 
 extern "C" pcap_t *
-pcap_open_live(const char *device, int snapLength, int /*promisc*/, int /*timeout*/,
-    char *errorBuffer)
+pcap_open_live(const char *device, int snapLength, int /*promisc*/,
+	int /*timeout*/, char *errorBuffer)
 {
 	// TODO: handle promiscous mode!
 
@@ -247,7 +248,100 @@
 
 
 extern "C" int
-pcap_platform_finddevs(pcap_if_t **alldevsp, char *errbuf)
+pcap_platform_finddevs(pcap_if_t** _allDevices, char* errorBuffer)
 {
-	return -1;
+	// we need a socket to talk to the networking stack
+	int socket = ::socket(AF_INET, SOCK_DGRAM, 0);
+	if (socket < 0) {
+		snprintf(errorBuffer, PCAP_ERRBUF_SIZE,
+			"The networking stack doesn't seem to be available.\n");
+		return -1;
+	}
+
+	// get a list of all interfaces
+
+	ifconf config;
+	config.ifc_len = sizeof(config.ifc_value);
+	if (ioctl(socket, SIOCGIFCOUNT, &config, sizeof(struct ifconf)) < 0) {
+		close(socket);
+		return -1;
+	}
+
+	uint32 count = (uint32)config.ifc_value;
+	if (count == 0) {
+		snprintf(errorBuffer, PCAP_ERRBUF_SIZE,
+			"There are no interfaces defined!\n");
+		close(socket);
+		return -1;
+	}
+
+	void *buffer = malloc(count * sizeof(struct ifreq));
+	if (buffer == NULL) {
+		snprintf(errorBuffer, PCAP_ERRBUF_SIZE, "Out of memory.\n");
+		close(socket);
+		return -1;
+	}
+
+	config.ifc_len = count * sizeof(struct ifreq);
+	config.ifc_buf = buffer;
+	if (ioctl(socket, SIOCGIFCONF, &config, sizeof(struct ifconf)) < 0) {
+		close(socket);
+		return -1;
+	}
+
+	ifreq *interface = (ifreq *)buffer;
+	pcap_if_t* last = NULL;
+
+	for (uint32 i = 0; i < count; i++) {
+		pcap_if_t* pcapInterface = (pcap_if_t*)malloc(sizeof(pcap_if_t));
+		if (pcapInterface == NULL)
+			continue;
+
+		if (last == NULL)
+			*_allDevices = pcapInterface;
+		else
+			last->next = pcapInterface;
+
+		pcapInterface->next = NULL;
+		pcapInterface->name = strdup(interface->ifr_name);
+		pcapInterface->description = NULL;
+		pcapInterface->addresses = NULL;
+		pcapInterface->flags = 0;
+
+		// get interface type
+
+		int linkSocket = ::socket(AF_LINK, SOCK_DGRAM, 0);
+		if (linkSocket < 0) {
+			fprintf(stderr, "No link level: %s\n", strerror(errno));
+		} else {
+			struct ifreq request;
+			if (!prepare_request(request, interface->ifr_name)) {
+				snprintf(errorBuffer, PCAP_ERRBUF_SIZE,
+					"Interface name \"%s\" is too long.", interface->ifr_name);
+				close(linkSocket);
+				close(socket);
+				return -1;
+			}
+
+			if (ioctl(socket, SIOCGIFPARAM, &request, sizeof(struct ifreq))
+					== 0) {
+				prepare_request(request, request.ifr_parameter.device);
+				if (ioctl(linkSocket, SIOCGIFADDR, &request,
+						sizeof(struct ifreq)) == 0) {
+					sockaddr_dl &link = *(sockaddr_dl *)&request.ifr_addr;
+
+					if (link.sdl_type == IFT_LOOP)
+						pcapInterface->flags = PCAP_IF_LOOPBACK;
+				}
+			}
+			close(linkSocket);
+		}
+
+		interface = (ifreq *)((addr_t)interface + IF_NAMESIZE
+			+ interface->ifr_addr.sa_len);
+	}
+
+	free(buffer);
+	close(socket);
+	return 0;
 }



From axeld at mail.berlios.de  Tue Mar 18 17:10:05 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 18 Mar 2008 17:10:05 +0100
Subject: [Haiku-commits] r24442 - haiku/trunk/src/system/kernel/fs
Message-ID: <200803181610.m2IGA51r005992@sheep.berlios.de>

Author: axeld
Date: 2008-03-18 17:10:04 +0100 (Tue, 18 Mar 2008)
New Revision: 24442
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24442&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/vfs.cpp
Log:
* entry_ref_to_vnode() now gets a "traverse" argument, so that it is 
  able to resolve symlinks.
* file_open_entry_ref() now evaluates the openMode and passes the
  correct "traverse" argument to entry_ref_to_vnode(). This fixes bug
  #1932 (symlink refs wouldn't be resolved).
* dir_open_entry_ref() now always resolves symlinks, all other uses of
  entry_ref_to_vnode() keep their previous behaviour, though.
* Fixed warnings; since Ingo's header changes, NULL now causes a warning
  when it is used as int.


Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-18 14:36:35 UTC (rev 24441)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2008-03-18 16:10:04 UTC (rev 24442)
@@ -1071,7 +1071,7 @@
 	// else might set one at the same time
 	do {
 		if (atomic_test_and_set((vint32 *)&vnode->advisory_locking,
-				(addr_t)locking, NULL) == NULL)
+				(addr_t)locking, (addr_t)NULL) == (addr_t)NULL)
 			return B_OK;
 	} while (get_advisory_locking(vnode) == NULL);
 
@@ -1649,7 +1649,7 @@
 
 static status_t
 entry_ref_to_vnode(dev_t mountID, ino_t directoryID, const char *name,
-	struct vnode **_vnode)
+	bool traverse, struct vnode **_vnode)
 {
 	char clonedName[B_FILE_NAME_LENGTH + 1];
 	if (strlcpy(clonedName, name, B_FILE_NAME_LENGTH) >= B_FILE_NAME_LENGTH)
@@ -1662,7 +1662,7 @@
 	if (status < 0)
 		return status;
 
-	return vnode_path_to_vnode(directory, clonedName, false, 0, _vnode, NULL,
+	return vnode_path_to_vnode(directory, clonedName, traverse, 0, _vnode, NULL,
 		NULL);
 }
 
@@ -3225,7 +3225,7 @@
 vfs_entry_ref_to_vnode(dev_t mountID, ino_t directoryID,
 	const char *name, struct vnode **_vnode)
 {
-	return entry_ref_to_vnode(mountID, directoryID, name, _vnode);
+	return entry_ref_to_vnode(mountID, directoryID, name, false, _vnode);
 }
 
 
@@ -3661,7 +3661,7 @@
 	if (leaf && (strcmp(leaf, ".") == 0 || strcmp(leaf, "..") == 0)) {
 		// special cases "." and "..": we can directly get the vnode of the
 		// referenced directory
-		status = entry_ref_to_vnode(device, inode, leaf, &vnode);
+		status = entry_ref_to_vnode(device, inode, leaf, false, &vnode);
 		leaf = NULL;
 	} else
 		status = get_vnode(device, inode, &vnode, true, false);
@@ -4224,8 +4224,10 @@
 
 
 static int
-file_open_entry_ref(dev_t mountID, ino_t directoryID, const char *name, int openMode, bool kernel)
+file_open_entry_ref(dev_t mountID, ino_t directoryID, const char *name,
+	int openMode, bool kernel)
 {
+	bool traverse = ((openMode & O_NOTRAVERSE) == 0);
 	struct vnode *vnode;
 	int status;
 
@@ -4236,7 +4238,7 @@
 		mountID, directoryID, name, openMode));
 
 	// get the vnode matching the entry_ref
-	status = entry_ref_to_vnode(mountID, directoryID, name, &vnode);
+	status = entry_ref_to_vnode(mountID, directoryID, name, traverse, &vnode);
 	if (status < B_OK)
 		return status;
 
@@ -4244,7 +4246,8 @@
 	if (status < B_OK)
 		put_vnode(vnode);
 
-	cache_node_opened(vnode, FDTYPE_FILE, vnode->cache, mountID, directoryID, vnode->id, name);
+	cache_node_opened(vnode, FDTYPE_FILE, vnode->cache, mountID, directoryID,
+		vnode->id, name);
 	return status;
 }
 
@@ -4483,7 +4486,7 @@
 
 	// get the vnode matching the entry_ref/node_ref
 	if (name)
-		status = entry_ref_to_vnode(mountID, parentID, name, &vnode);
+		status = entry_ref_to_vnode(mountID, parentID, name, true, &vnode);
 	else
 		status = get_vnode(mountID, parentID, &vnode, true, false);
 	if (status < B_OK)
@@ -4493,7 +4496,8 @@
 	if (status < B_OK)
 		put_vnode(vnode);
 
-	cache_node_opened(vnode, FDTYPE_DIR, vnode->cache, mountID, parentID, vnode->id, name);
+	cache_node_opened(vnode, FDTYPE_DIR, vnode->cache, mountID, parentID,
+		vnode->id, name);
 	return status;
 }
 
@@ -4863,7 +4867,7 @@
 	// We need to set the locking atomically - someone
 	// else might set one at the same time
 	if (atomic_test_and_set((vint32 *)&vnode->mandatory_locked_by,
-			(addr_t)descriptor, NULL) != NULL)
+			(addr_t)descriptor, (addr_t)NULL) != (addr_t)NULL)
 		status = B_BUSY;
 
 	put_fd(descriptor);
@@ -4886,7 +4890,7 @@
 	// We need to set the locking atomically - someone
 	// else might set one at the same time
 	if (atomic_test_and_set((vint32 *)&vnode->mandatory_locked_by,
-			NULL, (addr_t)descriptor) != (int32)descriptor)
+			(addr_t)NULL, (addr_t)descriptor) != (int32)descriptor)
 		status = B_BAD_VALUE;
 
 	put_fd(descriptor);



From ingo_weinhold at gmx.de  Tue Mar 18 17:26:11 2008
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Tue, 18 Mar 2008 17:26:11 +0100
Subject: [Haiku-commits] r24442 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <200803181610.m2IGA51r005992@sheep.berlios.de>
References: <200803181610.m2IGA51r005992@sheep.berlios.de>
Message-ID: <20080318172611.12850.1@knochen-vm.1205857257.fake>


On 2008-03-18 at 17:10:05 [+0100], axeld at BerliOS <axeld at mail.berlios.de> 
wrote:
[...]
> * Fixed warnings; since Ingo's header changes, NULL now causes a warning
>   when it is used as int.
> 
> 
> Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
> ===================================================================
> --- haiku/trunk/src/system/kernel/fs/vfs.cpp    2008-03-18 14:36:35 UTC 
> (rev 24441)
> +++ haiku/trunk/src/system/kernel/fs/vfs.cpp    2008-03-18 16:10:04 UTC 
> (rev 24442)
> @@ -1071,7 +1071,7 @@
>      // else might set one at the same time
>      do {
>          if (atomic_test_and_set((vint32 *)&vnode->advisory_locking,
> -                (addr_t)locking, NULL) == NULL)
> +                (addr_t)locking, (addr_t)NULL) == (addr_t)NULL)

Why not simply use 0? Or even better, fix this not-64-bit-ready code?

CU, Ingo


From axeld at mail.berlios.de  Tue Mar 18 17:52:34 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 18 Mar 2008 17:52:34 +0100
Subject: [Haiku-commits] r24443 - haiku/trunk/src/servers/app
Message-ID: <200803181652.m2IGqYU4010038@sheep.berlios.de>

Author: axeld
Date: 2008-03-18 17:52:34 +0100 (Tue, 18 Mar 2008)
New Revision: 24443
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24443&view=rev

Modified:
   haiku/trunk/src/servers/app/FontFamily.cpp
   haiku/trunk/src/servers/app/FontFamily.h
   haiku/trunk/src/servers/app/FontManager.cpp
Log:
* FontFamily::GetStyle() now looks for alternative names when a specific
  style couldn't be found, ie. when looking for "Roman", "Regular", and
  "Book" are accepted, too, and "Italic"/"Oblique" are now synonyms as 
  well.
* This prevents StyledEdit from using the "Condensed" style when it does 
  not find a certain font.
* Minor cleanup.


Modified: haiku/trunk/src/servers/app/FontFamily.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontFamily.cpp	2008-03-18 16:10:04 UTC (rev 24442)
+++ haiku/trunk/src/servers/app/FontFamily.cpp	2008-03-18 16:52:34 UTC (rev 24443)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -64,7 +64,7 @@
 
 /*!
 	\brief Destructor
-	
+
 	Deletes all attached styles. Note that a FontFamily must only be deleted
 	by the font manager.
 */
@@ -102,7 +102,7 @@
 	if (!style)
 		return false;
 
-	// Don't add if it already is in the family.	
+	// Don't add if it already is in the family.
 	int32 count = fStyles.CountItems();
 	for (int32 i = 0; i < count; i++) {
 		FontStyle *item = fStyles.ItemAt(i);
@@ -157,6 +157,23 @@
 }
 
 
+FontStyle*
+FontFamily::_FindStyle(const char* name) const
+{
+	int32 count = fStyles.CountItems();
+	if (!name || count < 1)
+		return NULL;
+
+	for (int32 i = 0; i < count; i++) {
+		FontStyle *style = fStyles.ItemAt(i);
+		if (!strcmp(style->Name(), name))
+			return style;
+	}
+
+	return NULL;
+}
+
+
 /*!
 	\brief Determines whether the style belongs to the family
 	\param style Name of the style being checked
@@ -165,11 +182,11 @@
 bool
 FontFamily::HasStyle(const char *styleName) const
 {
-	return GetStyle(styleName) != NULL;
+	return _FindStyle(styleName) != NULL;
 }
 
 
-/*! 
+/*!
 	\brief Returns the name of a style in the family
 	\param index list index of the style to be found
 	\return name of the style or NULL if the index is not valid
@@ -185,22 +202,42 @@
 	\brief Get the FontStyle object for the name given
 	\param style Name of the style to be obtained
 	\return The FontStyle object or NULL if none was found.
-	
+
 	The object returned belongs to the family and must not be deleted.
 */
 FontStyle*
-FontFamily::GetStyle(const char *styleName) const
+FontFamily::GetStyle(const char *name) const
 {
-	int32 count = fStyles.CountItems();
-	if (!styleName || count < 1)
+	if (name == NULL || !name[0])
 		return NULL;
 
-	for (int32 i = 0; i < count; i++) {
-		FontStyle *style = fStyles.ItemAt(i);
-		if (!strcmp(style->Name(), styleName))
-			return style;
+	FontStyle* style = _FindStyle(name);
+	if (style != NULL)
+		return style;
+
+	// try alternative names
+
+	if (!strcmp(name, "Roman") || !strcmp(name, "Regular")
+		|| !strcmp(name, "Book")) {
+		style = _FindStyle("Roman");
+		if (style == NULL) {
+			style = _FindStyle("Regular");
+			if (style == NULL)
+				style = _FindStyle("Book");
+		}
+		return style;
 	}
 
+	BString alternative = name;
+	if (alternative.FindFirst("Italic") >= 0) {
+		alternative.ReplaceFirst("Italic", "Oblique");
+		return _FindStyle(alternative.String());
+	}
+	if (alternative.FindFirst("Oblique") >= 0) {
+		alternative.ReplaceFirst("Oblique", "Italic");
+		return _FindStyle(alternative.String());
+	}
+
 	return NULL;
 }
 
@@ -228,7 +265,7 @@
 	int32 count = fStyles.CountItems();
 	for (int32 i = 0; i < count; i++) {
 		FontStyle* style = fStyles.ItemAt(i);
-		
+
 		if (style->Face() == face)
 			return style;
 	}
@@ -253,6 +290,6 @@
 				fFlags |= B_HAS_TUNED_FONT;
 		}
 	}
-	
+
 	return fFlags;
 }

Modified: haiku/trunk/src/servers/app/FontFamily.h
===================================================================
--- haiku/trunk/src/servers/app/FontFamily.h	2008-03-18 16:10:04 UTC (rev 24442)
+++ haiku/trunk/src/servers/app/FontFamily.h	2008-03-18 16:52:34 UTC (rev 24443)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -19,38 +19,40 @@
 /*!
 	\class FontFamily FontFamily.h
 	\brief Class representing a collection of similar styles
-	
+
 	FontFamily objects bring together many styles of the same face, such as
 	Arial Roman, Arial Italic, Arial Bold, etc.
 */
 class FontFamily {
- public:
-								FontFamily(const char* name, uint16 id);
-		virtual					~FontFamily();
+public:
+						FontFamily(const char* name, uint16 id);
+	virtual				~FontFamily();
 
-				const char*		Name() const;
+			const char*	Name() const;
 
-				bool			AddStyle(FontStyle* style);
-				bool			RemoveStyle(FontStyle* style);
+			bool		AddStyle(FontStyle* style);
+			bool		RemoveStyle(FontStyle* style);
 
-				FontStyle*		GetStyle(const char* style) const;
-				FontStyle*		GetStyleMatchingFace(uint16 face) const;
-				FontStyle*		GetStyleByID(uint16 face) const;
+			FontStyle*	GetStyle(const char* style) const;
+			FontStyle*	GetStyleMatchingFace(uint16 face) const;
+			FontStyle*	GetStyleByID(uint16 face) const;
 
-				uint16			ID() const
-									{ return fID; }
-				uint32			Flags();
+			uint16		ID() const
+							{ return fID; }
+			uint32		Flags();
 
-				bool			HasStyle(const char* style) const;
-				int32			CountStyles() const;
-				FontStyle*		StyleAt(int32 index) const;
+			bool		HasStyle(const char* style) const;
+			int32		CountStyles() const;
+			FontStyle*	StyleAt(int32 index) const;
 
-	private:
-				BString			fName;
-				BObjectList<FontStyle> fStyles;
-				uint16			fID;
-				uint16			fNextID;
-				uint32			fFlags;
+private:
+			FontStyle*	_FindStyle(const char* name) const;
+
+			BString		fName;
+			BObjectList<FontStyle> fStyles;
+			uint16		fID;
+			uint16		fNextID;
+			uint32		fFlags;
 };
 
 #endif	// FONT_FAMILY_H_

Modified: haiku/trunk/src/servers/app/FontManager.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontManager.cpp	2008-03-18 16:10:04 UTC (rev 24442)
+++ haiku/trunk/src/servers/app/FontManager.cpp	2008-03-18 16:52:34 UTC (rev 24443)
@@ -317,11 +317,11 @@
 	// default known mappings
 	// TODO: load them for real, and use these as a fallback
 
-	_AddDefaultMapping("Bitstream Vera Sans", "Roman", 
+	_AddDefaultMapping("Bitstream Vera Sans", "Roman",
 		"/boot/beos/etc/fonts/ttfonts/Vera.ttf");
-	_AddDefaultMapping("Bitstream Vera Sans", "Bold", 
+	_AddDefaultMapping("Bitstream Vera Sans", "Bold",
 		"/boot/beos/etc/fonts/ttfonts/VeraBd.ttf");
-	_AddDefaultMapping("Bitstream Vera Sans Mono", "Roman", 
+	_AddDefaultMapping("Bitstream Vera Sans Mono", "Roman",
 		"/boot/beos/etc/fonts/ttfonts/VeraMono.ttf");
 
 	return false;
@@ -572,7 +572,7 @@
 	for (int32 i = fDirectories.CountItems(); i-- > 0;) {
 		font_directory* directory = fDirectories.ItemAt(i);
 
-		if (directory->directory == nodeRef) 
+		if (directory->directory == nodeRef)
 			return directory;
 	}
 
@@ -768,7 +768,7 @@
 
 /*!
 	\brief Finds and returns the first valid charmap in a font
-	
+
 	\param face Font handle obtained from FT_Load_Face()
 	\return An FT_CharMap or NULL if unsuccessful
 */
@@ -943,8 +943,8 @@
 	\return The FontStyle having those attributes or NULL if not available
 */
 FontStyle*
-FontManager::GetStyle(const char* familyName, const char* styleName, uint16 familyID,
-	uint16 styleID, uint16 face)
+FontManager::GetStyle(const char* familyName, const char* styleName,
+	uint16 familyID, uint16 styleID, uint16 face)
 {
 	FontFamily* family;
 



From axeld at pinc-software.de  Tue Mar 18 17:57:09 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Tue, 18 Mar 2008 17:57:09 +0100 CET
Subject: [Haiku-commits] r24442 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <20080318172611.12850.1@knochen-vm.1205857257.fake>
Message-ID: <15031888023-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> >          if (atomic_test_and_set((vint32 *)&vnode->
> > advisory_locking,
> > -                (addr_t)locking, NULL) == NULL)
> > +                (addr_t)locking, (addr_t)NULL) == (addr_t)NULL)
> Why not simply use 0?

That would have been an option, but it would hide the fact that these 
are pointers, and are therefore not ready for 64 bit :-))

> Or even better, fix this not-64-bit-ready code?

One more job for the brave soul who will port Haiku to 64 bit ;-)

Bye,
   Axel.



From bonefish at mail.berlios.de  Tue Mar 18 18:33:12 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 18 Mar 2008 18:33:12 +0100
Subject: [Haiku-commits] r24444 - in haiku/trunk: headers/posix
	headers/posix/sys src/system/libroot/posix/sys
Message-ID: <200803181733.m2IHXC0M017660@sheep.berlios.de>

Author: bonefish
Date: 2008-03-18 18:33:03 +0100 (Tue, 18 Mar 2008)
New Revision: 24444
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24444&view=rev

Modified:
   haiku/trunk/headers/posix/signal.h
   haiku/trunk/headers/posix/sys/wait.h
   haiku/trunk/src/system/libroot/posix/sys/wait.c
Log:
Commented out real-time signal related stuff (SA_SIGINFO, waitid()) to
prevent "configure" scripts from thinking we do actually support it.
Having real-time signals would be nice though (cf. #1935).


Modified: haiku/trunk/headers/posix/signal.h
===================================================================
--- haiku/trunk/headers/posix/signal.h	2008-03-18 16:52:34 UTC (rev 24443)
+++ haiku/trunk/headers/posix/signal.h	2008-03-18 17:33:03 UTC (rev 24444)
@@ -25,7 +25,10 @@
 #define SIG_ERR		((sighandler_t)-1)	/* an error occurred during signal processing */
 #define SIG_HOLD	((sighandler_t)3)	/* the signal was hold */
 
-// TODO: support this structure!
+// TODO: Support this structure, or more precisely the SA_SIGINFO flag. To do
+// this properly we need real-time signal support. Both are commented out for
+// the time being to not make "configure" scripts think we do support them.
+#if 0
 typedef struct {
 	int		si_signo;	/* signal number */
 	int		si_code;	/* signal code */
@@ -36,6 +39,7 @@
 	int		si_status;	/* exit value or signal */
 	long	si_band;	/* band event for SIGPOLL */
 } siginfo_t;
+#endif	/* 0 */
 
 /*
  * structure used by sigaction()
@@ -57,7 +61,7 @@
 #define SA_NODEFER		0x08
 #define SA_RESTART		0x10
 #define SA_ONSTACK		0x20
-#define SA_SIGINFO		0x40
+//#define SA_SIGINFO		0x40
 #define SA_NOMASK		SA_NODEFER
 #define SA_STACK		SA_ONSTACK
 #define SA_ONESHOT		SA_RESETHAND

Modified: haiku/trunk/headers/posix/sys/wait.h
===================================================================
--- haiku/trunk/headers/posix/sys/wait.h	2008-03-18 16:52:34 UTC (rev 24443)
+++ haiku/trunk/headers/posix/sys/wait.h	2008-03-18 17:33:03 UTC (rev 24444)
@@ -27,12 +27,16 @@
 #define WIFCORED(value)		((value) & 0x10000)
 #define WIFCONTINUED(value)	((value) & 0x20000)
 
+// TODO: waitid() is part of the real-time signal extension. Uncomment when
+// implemented!
+#if 0
 /* ID types for waitid() */
 typedef enum {
 	P_ALL,		/* wait for any children, ignore ID */
 	P_PID,		/* wait for the child whose process ID matches */
 	P_PGID		/* wait for any child whose process group ID matches */
 } idtype_t;
+#endif	// 0
 
 
 #ifdef __cplusplus
@@ -41,7 +45,7 @@
 
 extern pid_t wait(int *_status);
 extern pid_t waitpid(pid_t pid, int *_status, int options);
-extern int waitid(idtype_t idType, id_t id, siginfo_t *info, int options);
+//extern int waitid(idtype_t idType, id_t id, siginfo_t *info, int options);
 
 #ifdef __cplusplus
 }

Modified: haiku/trunk/src/system/libroot/posix/sys/wait.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/sys/wait.c	2008-03-18 16:52:34 UTC (rev 24443)
+++ haiku/trunk/src/system/libroot/posix/sys/wait.c	2008-03-18 17:33:03 UTC (rev 24444)
@@ -71,11 +71,12 @@
 }
 
 
-int
-waitid(idtype_t idType, id_t id, siginfo_t *info, int options)
-{
-	// waitid() is not available on BeOS so we may be lazy here and remove it...
-	fprintf(stderr, "waitid(): NOT IMPLEMENTED\n");
-	return -1;
-}
+// TODO: Implement as part of real-time signal support!
+//int
+//waitid(idtype_t idType, id_t id, siginfo_t *info, int options)
+//{
+//	// waitid() is not available on BeOS so we may be lazy here and remove it...
+//	fprintf(stderr, "waitid(): NOT IMPLEMENTED\n");
+//	return -1;
+//}
 



From axeld at mail.berlios.de  Tue Mar 18 18:34:57 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 18 Mar 2008 18:34:57 +0100
Subject: [Haiku-commits] r24445 - haiku/trunk/src/kits/app
Message-ID: <200803181734.m2IHYvbf021670@sheep.berlios.de>

Author: axeld
Date: 2008-03-18 18:34:56 +0100 (Tue, 18 Mar 2008)
New Revision: 24445
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24445&view=rev

Modified:
   haiku/trunk/src/kits/app/Looper.cpp
Log:
* Added a comment in _InitData() to make it more obvious when the looper is
  locked.
* Removed some long and useless comments.
* Other minor cleanup.


Modified: haiku/trunk/src/kits/app/Looper.cpp
===================================================================
--- haiku/trunk/src/kits/app/Looper.cpp	2008-03-18 17:33:03 UTC (rev 24444)
+++ haiku/trunk/src/kits/app/Looper.cpp	2008-03-18 17:34:56 UTC (rev 24445)
@@ -102,10 +102,10 @@
 //	#pragma mark -
 
 
-BLooper::BLooper(const char* name, int32 priority, int32 port_capacity)
-	:	BHandler(name)
+BLooper::BLooper(const char* name, int32 priority, int32 portCapacity)
+	: BHandler(name)
 {
-	_InitData(name, priority, port_capacity);
+	_InitData(name, priority, portCapacity);
 }
 
 
@@ -113,7 +113,7 @@
 {
 	if (fRunCalled && !fTerminating) {
 		debugger("You can't call delete on a BLooper object "
-				 "once it is running.");
+			"once it is running.");
 	}
 
 	Lock();
@@ -132,7 +132,7 @@
 	// us bogus info
 	fDirectTarget->Close();
 
-	BMessage *message;
+	BMessage* message;
 	while ((message = fDirectTarget->Queue()->NextMessage()) != NULL) {
 		delete message;
 			// msg will automagically post generic reply
@@ -153,7 +153,7 @@
 	RemoveHandler(this);
 
 	// Remove all the "child" handlers
-	BHandler *child;
+	BHandler* child;
 	while (CountHandlers()) {
 		child = HandlerAt(0);
 		if (child)
@@ -166,20 +166,19 @@
 }
 
 
-BLooper::BLooper(BMessage *data)
+BLooper::BLooper(BMessage* data)
 	: BHandler(data)
 {
 	int32 portCapacity;
-	if (data->FindInt32("_port_cap", &portCapacity) != B_OK
-		|| portCapacity < 0)
+	if (data->FindInt32("_port_cap", &portCapacity) != B_OK || portCapacity < 0)
 		portCapacity = B_LOOPER_PORT_DEFAULT_CAPACITY;
 
 	_InitData(Name(), B_NORMAL_PRIORITY, portCapacity);
 }
 
 
-BArchivable *
-BLooper::Instantiate(BMessage *data)
+BArchivable*
+BLooper::Instantiate(BMessage* data)
 {
 	if (validate_instantiation(data, "BLooper"))
 		return new BLooper(data);
@@ -189,7 +188,7 @@
 
 
 status_t
-BLooper::Archive(BMessage *data, bool deep) const
+BLooper::Archive(BMessage* data, bool deep) const
 {
 	status_t status = BHandler::Archive(data, deep);
 	if (status < B_OK)
@@ -215,15 +214,14 @@
 
 
 status_t
-BLooper::PostMessage(BMessage *message)
+BLooper::PostMessage(BMessage* message)
 {
 	return _PostMessage(message, this, NULL);
 }
 
 
 status_t
-BLooper::PostMessage(uint32 command, BHandler *handler,
-	BHandler *replyTo)
+BLooper::PostMessage(uint32 command, BHandler* handler, BHandler* replyTo)
 {
 	BMessage message(command);
 	return _PostMessage(&message, handler, replyTo);
@@ -231,15 +229,14 @@
 
 
 status_t
-BLooper::PostMessage(BMessage *message, BHandler *handler,
-	BHandler *replyTo)
+BLooper::PostMessage(BMessage* message, BHandler* handler, BHandler* replyTo)
 {
 	return _PostMessage(message, handler, replyTo);
 }
 
 
 void
-BLooper::DispatchMessage(BMessage *message, BHandler *handler)
+BLooper::DispatchMessage(BMessage* message, BHandler* handler)
 {
 	PRINT(("BLooper::DispatchMessage(%.4s)\n", (char*)&message->what));
 
@@ -270,10 +267,10 @@
 
 
 void
-BLooper::MessageReceived(BMessage *msg)
+BLooper::MessageReceived(BMessage* message)
 {
 	// TODO: implement scripting support
-	BHandler::MessageReceived(msg);
+	BHandler::MessageReceived(message);
 }
 
 
@@ -287,9 +284,9 @@
 BMessage*
 BLooper::DetachCurrentMessage()
 {
-	BMessage* msg = fLastMessage;
+	BMessage* message = fLastMessage;
 	fLastMessage = NULL;
-	return msg;
+	return message;
 }
 
 
@@ -436,7 +433,7 @@
 
 	if (!IsLocked()) {
 		printf("ERROR - you must Lock a looper before calling Quit(), "
-			   "team=%ld, looper=%s\n", Team(), Name() ? Name() : "unnamed");
+			"team=%ld, looper=%s\n", Team(), Name() ? Name() : "unnamed");
 	}
 
 	// Try to lock
@@ -474,7 +471,8 @@
 		// QuitRequested() will not be called in this case.
 		PostMessage(_QUIT_);
 
-		// We have to wait until the looper is done processing any remaining messages.
+		// We have to wait until the looper is done processing any remaining
+		// messages.
 		status_t status;
 		while (wait_for_thread(thread, &status) == B_INTERRUPTED)
 			;
@@ -601,8 +599,8 @@
 
 
 BHandler*
-BLooper::ResolveSpecifier(BMessage* msg, int32 index,
-	BMessage* specifier, int32 form, const char* property)
+BLooper::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier,
+	int32 form, const char* property)
 {
 /**
 	@note	When I was first dumping the results of GetSupportedSuites() from
@@ -620,7 +618,8 @@
 	uint32 data;
 	status_t err = B_OK;
 	const char* errMsg = "";
-	if (propertyInfo.FindMatch(msg, index, specifier, form, property, &data) >= 0) {
+	if (propertyInfo.FindMatch(msg, index, specifier, form, property, &data)
+			>= 0) {
 		switch (data) {
 			case BLOOPER_PROCESS_INTERNALLY:
 				return this;
@@ -720,18 +719,11 @@
 void
 BLooper::SetCommonFilterList(BList* filters)
 {
-	// We have a somewhat serious problem here.  It is entirely possible in R5
-	// to assign a given list of filters to *two* BLoopers simultaneously.  This
-	// becomes problematic when the loopers are destroyed: the last looper
-	// destroyed will have a problem when it tries to delete a filter list that
-	// has already been deleted.  In R5, this results in a general protection
-	// fault.  We fix this by checking the filter list for ownership issues.
-
 	AssertLocked();
 
 	BMessageFilter* filter;
 	if (filters) {
-		// Check for ownership issues
+		// Check for ownership issues - a filter can only have one owner
 		for (int32 i = 0; i < filters->CountItems(); ++i) {
 			filter = (BMessageFilter*)filters->ItemAt(i);
 			if (filter->Looper()) {
@@ -791,13 +783,14 @@
 void BLooper::_ReservedLooper6() {}
 
 
-BLooper::BLooper(const BLooper&)
+BLooper::BLooper(const BLooper& other)
 {
 	// Copy construction not allowed
 }
 
 
-BLooper& BLooper::operator=(const BLooper& )
+BLooper&
+BLooper::operator=(const BLooper& other)
 {
 	// Looper copying not allowed
 	return *this;
@@ -813,8 +806,7 @@
 
 
 status_t
-BLooper::_PostMessage(BMessage *msg, BHandler *handler,
-	BHandler *replyTo)
+BLooper::_PostMessage(BMessage *msg, BHandler *handler, BHandler *replyTo)
 {
 	AutoLocker<BLooperList> listLocker(gLooperList);
 	if (!listLocker.IsLocked())
@@ -958,6 +950,8 @@
 	fInitPriority = priority;
 
 	gLooperList.AddLooper(this);
+		// this will also lock this looper
+
 	AddHandler(this);
 }
 
@@ -969,28 +963,30 @@
 
 	// wakeup looper when being called from other threads if necessary
 	if (find_thread(NULL) != Thread()
-		&& fDirectTarget->Queue()->IsNextMessage(message) && port_count(fMsgPort) <= 0) {
-		// there is currently no message waiting, and we need to wakeup the looper
+		&& fDirectTarget->Queue()->IsNextMessage(message)
+		&& port_count(fMsgPort) <= 0) {
+		// there is currently no message waiting, and we need to wakeup the
+		// looper
 		write_port_etc(fMsgPort, 0, NULL, 0, B_RELATIVE_TIMEOUT, 0);
 	}
 }
 
 
 void
-BLooper::_AddMessagePriv(BMessage* msg)
+BLooper::_AddMessagePriv(BMessage* message)
 {
 	// ToDo: if no target token is specified, set to preferred handler
 	// Others may want to peek into our message queue, so the preferred
 	// handler must be set correctly already if no token was given
 
-	fDirectTarget->Queue()->AddMessage(msg);
+	fDirectTarget->Queue()->AddMessage(message);
 }
 
 
 status_t
-BLooper::_task0_(void *arg)
+BLooper::_task0_(void* arg)
 {
-	BLooper *looper = (BLooper *)arg;
+	BLooper* looper = (BLooper *)arg;
 
 	PRINT(("LOOPER: _task0_()\n"));
 
@@ -1007,7 +1003,7 @@
 
 
 void *
-BLooper::ReadRawFromPort(int32 *msgCode, bigtime_t timeout)
+BLooper::ReadRawFromPort(int32* msgCode, bigtime_t timeout)
 {
 	PRINT(("BLooper::ReadRawFromPort()\n"));
 	uint8 *buffer = NULL;
@@ -1042,7 +1038,7 @@
 }
 
 
-BMessage *
+BMessage*
 BLooper::ReadMessageFromPort(bigtime_t timeout)
 {
 	PRINT(("BLooper::ReadMessageFromPort()\n"));
@@ -1061,15 +1057,15 @@
 }
 
 
-BMessage *
-BLooper::ConvertToMessage(void *buffer, int32 code)
+BMessage*
+BLooper::ConvertToMessage(void* buffer, int32 code)
 {
 	PRINT(("BLooper::ConvertToMessage()\n"));
 	if (!buffer)
 		return NULL;
 
-	BMessage *message = new BMessage();
-	if (message->Unflatten((const char *)buffer) != B_OK) {
+	BMessage* message = new BMessage();
+	if (message->Unflatten((const char*)buffer) != B_OK) {
 		PRINT(("BLooper::ConvertToMessage(): unflattening message failed\n"));
 		delete message;
 		message = NULL;
@@ -1199,7 +1195,7 @@
 
 
 void
-BLooper::_QuitRequested(BMessage *msg)
+BLooper::_QuitRequested(BMessage* message)
 {
 	bool isQuitting = QuitRequested();
 
@@ -1208,12 +1204,12 @@
 	// true. In the latter case the message came from the registrar, asking
 	// the application to shut down.
 	bool shutdown;
-	if (msg->IsSourceWaiting()
-		|| (msg->FindBool("_shutdown_", &shutdown) == B_OK && shutdown)) {
+	if (message->IsSourceWaiting()
+		|| (message->FindBool("_shutdown_", &shutdown) == B_OK && shutdown)) {
 		BMessage replyMsg(B_REPLY);
 		replyMsg.AddBool("result", isQuitting);
 		replyMsg.AddInt32("thread", fThread);
-		msg->SendReply(&replyMsg);
+		message->SendReply(&replyMsg);
 	}
 
 	if (isQuitting)
@@ -1233,20 +1229,21 @@
 }
 
 
-BHandler *
-BLooper::_TopLevelFilter(BMessage* msg, BHandler* target)
+BHandler*
+BLooper::_TopLevelFilter(BMessage* message, BHandler* target)
 {
-	if (msg) {
-		// Apply the common filters first
-		target = _ApplyFilters(CommonFilterList(), msg, target);
-		if (target) {
-			if (target->Looper() != this) {
-				debugger("Targeted handler does not belong to the looper.");
-				target = NULL;
-			} else {
-				// Now apply handler-specific filters
-				target = _HandlerFilter(msg, target);
-			}
+	if (message == NULL)
+		return target;
+
+	// Apply the common filters first
+	target = _ApplyFilters(CommonFilterList(), message, target);
+	if (target) {
+		if (target->Looper() != this) {
+			debugger("Targeted handler does not belong to the looper.");
+			target = NULL;
+		} else {
+			// Now apply handler-specific filters
+			target = _HandlerFilter(message, target);
 		}
 	}
 
@@ -1254,8 +1251,8 @@
 }
 
 
-BHandler *
-BLooper::_HandlerFilter(BMessage* msg, BHandler* target)
+BHandler*
+BLooper::_HandlerFilter(BMessage* message, BHandler* target)
 {
 	// Keep running filters until our handler is NULL, or until the filtering
 	// handler returns itself as the designated handler
@@ -1263,7 +1260,7 @@
 	while (target != NULL && target != previousTarget) {
 		previousTarget = target;
 
-		target = _ApplyFilters(target->FilterList(), msg, target);
+		target = _ApplyFilters(target->FilterList(), message, target);
 		if (target != NULL && target->Looper() != this) {
 			debugger("Targeted handler does not belong to the looper.");
 			target = NULL;
@@ -1274,12 +1271,12 @@
 }
 
 
-BHandler *
-BLooper::_ApplyFilters(BList* list, BMessage* msg, BHandler* target)
+BHandler*
+BLooper::_ApplyFilters(BList* list, BMessage* message, BHandler* target)
 {
 	// This is where the action is!
 	// Check the parameters
-	if (!list || !msg)
+	if (!list || !message)
 		return target;
 
 	// For each filter in the provided list
@@ -1288,16 +1285,16 @@
 		filter = (BMessageFilter*)list->ItemAt(i);
 
 		// Check command conditions
-		if (filter->FiltersAnyCommand() || (filter->Command() == msg->what)) {
+		if (filter->FiltersAnyCommand() || filter->Command() == message->what) {
 			// Check delivery conditions
 			message_delivery delivery = filter->MessageDelivery();
-			bool dropped = msg->WasDropped();
+			bool dropped = message->WasDropped();
 			if (delivery == B_ANY_DELIVERY
 				|| (delivery == B_DROPPED_DELIVERY && dropped)
 				|| (delivery == B_PROGRAMMED_DELIVERY && !dropped)) {
 				// Check source conditions
 				message_source source = filter->MessageSource();
-				bool remote = msg->IsSourceRemote();
+				bool remote = message->IsSourceRemote();
 				if (source == B_ANY_SOURCE
 					|| (source == B_REMOTE_SOURCE && remote)
 					|| (source == B_LOCAL_SOURCE && !remote)) {
@@ -1305,9 +1302,9 @@
 					filter_result result;
 					filter_hook func = filter->FilterFunction();
 					if (func)
-						result = func(msg, &target, filter);
+						result = func(message, &target, filter);
 					else
-						result = filter->Filter(msg, &target);
+						result = filter->Filter(message, &target);
 
 					// Is further processing allowed?
 					if (result == B_SKIP_MESSAGE) {
@@ -1338,11 +1335,11 @@
 }
 
 
-BHandler *
-BLooper::resolve_specifier(BHandler* target, BMessage* msg)
+BHandler*
+BLooper::resolve_specifier(BHandler* target, BMessage* message)
 {
 	// Check params
-	if (!target || !msg)
+	if (!target || !message)
 		return NULL;
 
 	int32 index;
@@ -1351,48 +1348,42 @@
 	const char* property;
 	status_t err = B_OK;
 	BHandler* newTarget = target;
-	//	Loop to deal with nested specifiers
-	//	(e.g., the 3rd button on the 4th view)
+	// Loop to deal with nested specifiers
+	// (e.g., the 3rd button on the 4th view)
 	do {
-		err = msg->GetCurrentSpecifier(&index, &specifier, &form, &property);
+		err = message->GetCurrentSpecifier(&index, &specifier, &form, &property);
 		if (err) {
 			BMessage reply(B_REPLY);
 			reply.AddInt32("error", err);
-			msg->SendReply(&reply);
+			message->SendReply(&reply);
 			return NULL;
 		}
-		//	Current target gets what was the new target
+		// Current target gets what was the new target
 		target = newTarget;
-		newTarget = target->ResolveSpecifier(msg, index, &specifier, form,
+		newTarget = target->ResolveSpecifier(message, index, &specifier, form,
 			property);
-		//	Check that new target is owned by looper;
-		//	use IndexOf() to avoid dereferencing newTarget
-		//	(possible race condition with object destruction
-		//	by another looper)
+		// Check that new target is owned by looper; use IndexOf() to avoid
+		// dereferencing newTarget (possible race condition with object
+		// destruction by another looper)
 		if (!newTarget || IndexOf(newTarget) < 0)
 			return NULL;
 
-		//	Get current specifier index (may change in ResolveSpecifier())
-		err = msg->GetCurrentSpecifier(&index);
+		// Get current specifier index (may change in ResolveSpecifier())
+		err = message->GetCurrentSpecifier(&index);
 	} while (newTarget && newTarget != target && !err && index >= 0);
 
 	return newTarget;
 }
 
 
+/*!	Releases all eventually nested locks. Must be called with the lock
+	actually held.
+*/
 void
 BLooper::UnlockFully()
 {
 	AssertLocked();
 
-/**
-	@note	What we're doing here is completely undoing the current owner's lock
-			on the looper.  This is actually pretty easy, since the owner only
-			has a single aquisition on the semaphore; every subsequent "lock"
-			is just an increment to the owner count.  The whole thing is quite
-			similar to Unlock(), except that we clear the ownership variables,
-			rather than merely decrementing them.
- */
 	// Clear the owner count
 	fOwnerCount = 0;
 	// Nobody owns the lock now
@@ -1411,7 +1402,7 @@
 
 
 port_id
-_get_looper_port_(const BLooper *looper)
+_get_looper_port_(const BLooper* looper)
 {
 	return looper->fMsgPort;
 }



From stippi at mail.berlios.de  Tue Mar 18 19:15:59 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 19:15:59 +0100
Subject: [Haiku-commits] r24446 - haiku/trunk/src/tools
Message-ID: <200803181815.m2IIFxTe008784@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 19:15:58 +0100 (Tue, 18 Mar 2008)
New Revision: 24446
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24446&view=rev

Modified:
   haiku/trunk/src/tools/Jamfile
   haiku/trunk/src/tools/generate_boot_screen.cpp
Log:
* Removed almost all global variables.
* Release the resources needed for reading the PNGs and storing the image data.
* Change the semantics of the tool, previously it only supported palette mode
  PNGs. Now I am doing the opposite, the tool tries to set up the PNG lib to
  hand out RGB data, even stripping a potential alpha channel.
* Used standard Haiku license header.
* Improved output syntax.
* No longer depends on input image names, even with paths. The generated
  output needs to have fixed names, or else the other source code will break.
* Made the use of the setjmp feature optional, depending on the PNG lib version
  in use. This makes it possible to build the tool on BeOS without updating
  the installed PNG lib.
* Added a few TODOs. Most important is to generate a single palette for all
  three images, and storing the images in their palette representation along
  with the full quality versions, so that they are ready during boot without
  sucking up too many CPU cycles.

NOTE: The header which is now generated is not usable by the rest of the
source code yet, but that will come later. generate_boot_screen is not
integrated yet anyways.


Modified: haiku/trunk/src/tools/Jamfile
===================================================================
--- haiku/trunk/src/tools/Jamfile	2008-03-18 17:34:56 UTC (rev 24445)
+++ haiku/trunk/src/tools/Jamfile	2008-03-18 18:15:58 UTC (rev 24446)
@@ -38,7 +38,7 @@
 	: $(HOST_LIBSUPC++) ;
 
 BuildPlatformMain <build>generate_boot_screen : generate_boot_screen.cpp
-	: $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) png ;
+	: $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) png z ;
 
 BuildPlatformMain <build>listattr : listattr.cpp : $(HOST_LIBBE) ;
 

Modified: haiku/trunk/src/tools/generate_boot_screen.cpp
===================================================================
--- haiku/trunk/src/tools/generate_boot_screen.cpp	2008-03-18 17:34:56 UTC (rev 24445)
+++ haiku/trunk/src/tools/generate_boot_screen.cpp	2008-03-18 18:15:58 UTC (rev 24446)
@@ -1,55 +1,28 @@
-//------------------------------------------------------------------------------
-//	Copyright (c) 2008, Haiku, Inc.
-//
-//	Permission is hereby granted, free of charge, to any person obtaining a
-//	copy of this software and associated documentation files (the "Software"),
-//	to deal in the Software without restriction, including without limitation
-//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-//	and/or sell copies of the Software, and to permit persons to whom the
-//	Software is furnished to do so, subject to the following conditions:
-//
-//	The above copyright notice and this permission notice shall be included in
-//	all copies or substantial portions of the Software.
-//
-//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-//	DEALINGS IN THE SOFTWARE.
-//
-//	File Name:		hbsg.cpp
-//	Author:			Artur Wyszynski <harakash at gmail.com>
-//	Description:	Haiku Boot Splash Generator
-//  
-//------------------------------------------------------------------------------
+/*
+ *	Copyright (c) 2008, Haiku, Inc. All rights reserved.
+ *	Distributed under the terms of the MIT license. 
+ *
+ *	Authors:
+ *		Artur Wyszynski <harakash at gmail.com>
+ *		Stephan A?mus <superstippi at gmx.de>
+ */
 
-#include <string>
+//! Haiku boot splash image generator/converter
+
 #include <iostream>
 #include <png.h>
+#include <string>
 
-int x, y;
-int width, height;
-png_byte colorType;
-png_byte bpp;
-png_structp pngPtr;
-png_infop infoPtr;
-int noOfPasses;
-png_bytep* rowPtrs;
-FILE* finput = NULL;
-FILE* foutput = NULL;
-png_colorp palette;
-int paletteColors = 0;
+// TODO: Generate the single optimal palette for all three images,
+// store palette versions of these images as well, so that they are
+// ready to be used during boot in case we need to run in palette
+// VGA mode.
 
-void
-cleanup()
-{
-	fclose(finput);
-	fclose(foutput);
-}
 
-void
+FILE* sOutput = NULL;
+
+
+static void
 error(const char *s, ...)
 {
 	va_list args;
@@ -57,147 +30,161 @@
 	vfprintf(stderr, s, args);
 	fprintf(stderr, "\n");
 	va_end(args);
-	cleanup();
 	exit(-1);
 }
 
-void
-readPNG(char *filename)
+
+class AutoFileCloser {
+public:
+	AutoFileCloser(FILE* file)
+		: fFile(file)
+	{}
+	~AutoFileCloser()
+	{
+		fclose(fFile);
+	}
+private:
+	FILE* fFile;
+};
+
+
+static void
+readPNG(const char* filename, int& width, int& height, png_bytep*& rowPtrs,
+	png_structp& pngPtr, png_infop& infoPtr)
 {
-	printf("Reading file %s\n", filename);
 	char header[8];
-	finput = fopen(filename, "rb");
-	if (!finput)
+	FILE* input = fopen(filename, "rb");
+	if (!input)
 		error("[readPNG] File %s could not be opened for reading", filename);
-	
-	fread(header, 1, 8, finput);
+
+	AutoFileCloser _(input);
+
+	fread(header, 1, 8, input);
 	if (png_sig_cmp((png_byte *)header, 0, 8 ))
 		error("[readPNG] File %s is not recognized as a PNG file", filename);
 	
-	pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+	pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+		NULL, NULL, NULL);
 	if (!pngPtr)
 		error("[readPNG] png_create_read_struct failed");
 	
 	infoPtr = png_create_info_struct(pngPtr);
 	if (!infoPtr)
 		error("[readPNG] png_create_info_struct failed");
-	
+
+// TODO: I don't know which version of libpng introduced this feature:
+#if PNG_LIBPNG_VER > 10005
 	if (setjmp(png_jmpbuf(pngPtr)))
 		error("[readPNG] Error during init_io");
-	
-	png_init_io(pngPtr, finput);
+#endif
+
+	png_init_io(pngPtr, input);
 	png_set_sig_bytes(pngPtr, 8);
+
+	// make sure we automatically get RGB data with 8 bits per channel
+	// also make sure the alpha channel is stripped, in the end, we
+	// expect 24 bits BGR data
+	png_set_expand(pngPtr);
+	png_set_gray_1_2_4_to_8(pngPtr);
+	png_set_palette_to_rgb(pngPtr);
+	png_set_gray_to_rgb(pngPtr);
+	png_set_strip_alpha(pngPtr);
+	png_set_bgr(pngPtr);
+
 	png_read_info(pngPtr, infoPtr);
 	width = infoPtr->width;
 	height = infoPtr->height;
-	colorType = infoPtr->color_type;
-	bpp = infoPtr->bit_depth;
-	noOfPasses = png_set_interlace_handling(pngPtr);
+	if (infoPtr->bit_depth != 8)
+		error("[readPNG] File %s has wrong bit depth\n", filename);
+	if ((int)infoPtr->rowbytes < width * 3) {
+		error("[readPNG] File %s has wrong color type (RGB required)\n",
+			filename);
+	}
+
+
+	png_set_interlace_handling(pngPtr);
 	png_read_update_info(pngPtr, infoPtr);
+
+#if PNG_LIBPNG_VER > 10005
 	if (setjmp(png_jmpbuf(pngPtr)))
 		error("[readPNG] Error during read_image");
+#endif
 
 	rowPtrs = (png_bytep*)malloc(sizeof(png_bytep) * height);
-	for ( y = 0; y < height; y++)
+	for (int y = 0; y < height; y++)
 		rowPtrs[y] = (png_byte*)malloc(infoPtr->rowbytes);
+
 	png_read_image(pngPtr, rowPtrs);
-	png_get_PLTE(pngPtr, infoPtr, &palette, &paletteColors);
-	fclose(finput);
-	printf("[PNG] width:\t%d\n", width);
-	printf("[PNG] height:\t%d\n", height);
-	printf("[PNG] bpp:\t%d\n", bpp);
-	printf("[PNG] palette:\t%d\n", paletteColors);
 }
 
-void
-writeHeader(char *filename)
+
+static void
+writeHeader(const char* baseName, int width, int height, png_bytep* rowPtrs)
 {
-	int length = strlen(filename) - 4;
-	char *varName = NULL;
-	varName = new char[length];
-	memset(varName, 0, sizeof(char) * length);
-	strncat(varName, filename, length);
-	printf("Exporting image %s\n", varName);
+	fprintf(sOutput, "static const uint16 %sWidth = %d;\n", baseName, width);
+	fprintf(sOutput, "static const uint16 %sHeight = %d;\n", baseName, height);
+	fprintf(sOutput, "static const uint8 %sImage[] = {\n\t", baseName);
 
-	// dumping palette
-	fprintf(foutput, "static const uint8 %sPalette[] = {\n", varName);
-	for (int i = 0; i < paletteColors; i++) {
-		if (i == paletteColors - 1) {
-			fprintf(foutput, "\t0x%x, 0x%x, 0x%x\n", palette[i].red,
-				palette[i].green, palette[i].blue);
-		} else {
-			fprintf(foutput, "\t0x%x, 0x%x, 0x%x,\n", palette[i].red,
-				palette[i].green, palette[i].blue);
-		}
-	}
-	fputs("};\n\n", foutput);
-
-	fprintf(foutput, "static const uint %sWidth=%d;\n", varName, width);
-	fprintf(foutput, "static const uint %sHeight=%d;\n", varName, height);
-	fprintf(foutput, "static const uint8 %sImage[] = {\n\t", varName);
 	int offset = 0;
-	unsigned char *data = new unsigned char[width * height];
-	for (y = 0; y < height; y++) {
+	for (int y = 0; y < height; y++) {
 		png_byte* row = rowPtrs[y];
-		for (x = 0; x < width; x++) {
-			png_byte* ptr = &row[x];
-			offset = (y * width) + x;
-			data[offset] = ptr[0];
+		for (int x = 0; x < width * 3; x++) {
+			offset++;
+			if (x == width * 3 - 1 && y == height - 1) {
+				fprintf(sOutput, "0x%02x\n};\n\n", row[x]);
+				break;
+			} else if ((offset % 8) == 0)
+				fprintf(sOutput, "0x%02x,\n\t", row[x]);
+			else
+				fprintf(sOutput, "0x%02x, ", row[x]);
 		}
 	}
-	
-	bool end = false;
-	offset = 0;
-	while (!end) {
-		if (offset == (width * height)) {
-			fprintf(foutput, "0x%x", data[offset]);
-			end = true;
-		}
-		else
-			fprintf(foutput, "0x%x, ", data[offset]);
-		if ((offset % 8) == 0) {
-			fputs("\n\t", foutput);
-		}
-		offset++;
-	}
-
-	fputs("};\n\n", foutput);
-	delete varName;
 }
 
-void
-parseImage(char *filename)
+
+static void
+parseImage(const char* filename, const char* baseName)
 {
-	readPNG(filename);
-	writeHeader(filename);
+	int width;
+	int height;
+	png_bytep* rowPtrs = NULL;
+	png_structp pngPtr;
+	png_infop infoPtr;
+	readPNG(filename, width, height, rowPtrs, pngPtr, infoPtr);
+	writeHeader(baseName, width, height, rowPtrs);
+
+	// free resources
+	png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+	for (int y = 0; y < height; y++)
+		free(rowPtrs[y]);
+	free(rowPtrs);
 }
 
+
 int
-main(int argc, char *argv[])
+main(int argc, char* argv[])
 {
-	printf("Haiku Boot Splash Generator\n");
-	printf("Copyright 2008, Artur Wyszynski <harakash at gmail.com>\n");
-	printf("Distributed under the terms of the Haiku License. All rights reserved.\n");
-
 	if (argc < 5) {
 		printf("Usage:\n");
-		printf("\thbsg <splash.png> <icons.png> <copyright.png> <images.h>\n");
+		printf("\t%s <splash.png> <icons.png> <copyright.png> <images.h>\n",
+			argv[0]);
 		return 0;
 	}
 
 	const char* headerFileName = argv[4];
 
-	foutput = fopen(headerFileName, "wb");
-	if (!foutput)
+	sOutput = fopen(headerFileName, "wb");
+	if (!sOutput)
 		error("Could not open file \"%s\" for writing", headerFileName);
 
-	fputs("// This file was generated by Haiku Boot Splash Generator\n\n",
-		foutput);
+	fputs("// This file was generated by the generate_boot_screen build tool."
+		"\n\n", sOutput);
 
-	parseImage(argv[1]);
-	parseImage(argv[2]);
-	parseImage(argv[3]);
+	parseImage(argv[1], "kSplashLogo");
+	parseImage(argv[2], "kSplashIcons");
+	parseImage(argv[3], "kSplashCopyright");
 
-	fclose(foutput);
+	fclose(sOutput);
 	return 0;
 }
+



From stippi at mail.berlios.de  Tue Mar 18 19:21:11 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 19:21:11 +0100
Subject: [Haiku-commits] r24447 - in haiku/trunk/data/artwork: . boot_splash
Message-ID: <200803181821.m2IILBlt016903@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 19:21:08 +0100 (Tue, 18 Mar 2008)
New Revision: 24447
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24447&view=rev

Added:
   haiku/trunk/data/artwork/boot_splash/
   haiku/trunk/data/artwork/boot_splash/splash_copyright
   haiku/trunk/data/artwork/boot_splash/splash_copyright.png
   haiku/trunk/data/artwork/boot_splash/splash_icons
   haiku/trunk/data/artwork/boot_splash/splash_icons.png
   haiku/trunk/data/artwork/boot_splash/splash_logo
   haiku/trunk/data/artwork/boot_splash/splash_logo.png
Log:
Added new artwork for the boot screen (WonderBrush and PNG files). I am not
sure about the Copyright string. Should we really have that on the boot screen?


Added: haiku/trunk/data/artwork/boot_splash/splash_copyright
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/artwork/boot_splash/splash_copyright
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/artwork/boot_splash/splash_copyright.png
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/artwork/boot_splash/splash_copyright.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/artwork/boot_splash/splash_icons
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/artwork/boot_splash/splash_icons
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/artwork/boot_splash/splash_icons.png
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/artwork/boot_splash/splash_icons.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/artwork/boot_splash/splash_logo
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/artwork/boot_splash/splash_logo
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/artwork/boot_splash/splash_logo.png
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/artwork/boot_splash/splash_logo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream



From stippi at mail.berlios.de  Tue Mar 18 19:41:25 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 19:41:25 +0100
Subject: [Haiku-commits] r24448 - haiku/trunk/data/artwork/boot_splash
Message-ID: <200803181841.m2IIfPJ7011297@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 19:41:24 +0100 (Tue, 18 Mar 2008)
New Revision: 24448
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24448&view=rev

Modified:
   haiku/trunk/data/artwork/boot_splash/splash_icons
   haiku/trunk/data/artwork/boot_splash/splash_icons.png
Log:
Use LaunchBox icon for boot script stage... <smacks hand against forehead>


Modified: haiku/trunk/data/artwork/boot_splash/splash_icons
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/artwork/boot_splash/splash_icons.png
===================================================================
(Binary files differ)



From axeld at pinc-software.de  Tue Mar 18 20:11:36 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Tue, 18 Mar 2008 20:11:36 +0100 CET
Subject: [Haiku-commits] r24447 - in haiku/trunk/data/artwork: .
 boot_splash
In-Reply-To: <200803181821.m2IILBlt016903@sheep.berlios.de>
Message-ID: <23098036670-BeMail@zon>

stippi at BerliOS <stippi at mail.berlios.de> wrote:
> Log:
> Added new artwork for the boot screen (WonderBrush and PNG files). I 
> am not
> sure about the Copyright string. Should we really have that on the 
> boot screen?

If you think it detracts from an otherwise visually appealing boot 
process, then I'd just remove it :-)

Bye,
   Axel.



From stippi at mail.berlios.de  Tue Mar 18 21:28:49 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 21:28:49 +0100
Subject: [Haiku-commits] r24449 - in haiku/trunk: data/artwork/boot_splash
	headers/private/kernel/boot
	src/system/boot/platform/bios_ia32 src/system/kernel src/tools
Message-ID: <200803182028.m2IKSnnh025029@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 21:27:47 +0100 (Tue, 18 Mar 2008)
New Revision: 24449
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24449&view=rev

Removed:
   haiku/trunk/data/artwork/boot_splash/splash_copyright
   haiku/trunk/data/artwork/boot_splash/splash_copyright.png
Modified:
   haiku/trunk/data/artwork/boot_splash/splash_icons
   haiku/trunk/data/artwork/boot_splash/splash_icons.png
   haiku/trunk/headers/private/kernel/boot/images.h
   haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp
   haiku/trunk/src/system/kernel/splash.cpp
   haiku/trunk/src/tools/generate_boot_screen.cpp
Log:
* Removed the Copyright image/rendering.
* Fixed the icons image, it was upside down.
* Support the new 24 bit boot screen images in the boot_loader and the kernel.
* Prepare the code for future indexed versions of the boot screen images.
  But the generate_boot_screen tool currently does not generate those.


Deleted: haiku/trunk/data/artwork/boot_splash/splash_copyright

Deleted: haiku/trunk/data/artwork/boot_splash/splash_copyright.png

Modified: haiku/trunk/data/artwork/boot_splash/splash_icons
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/artwork/boot_splash/splash_icons.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/headers/private/kernel/boot/images.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/images.h	2008-03-18 18:41:24 UTC (rev 24448)
+++ haiku/trunk/headers/private/kernel/boot/images.h	2008-03-18 20:27:47 UTC (rev 24449)
@@ -1,7902 +1,21349 @@
-// This file was generated by Haiku Boot Splash Generator
+// This file was generated by the generate_boot_screen build tool.
 
-static const uint8 splashPalette[] = {
-	0x0, 0x1, 0x0,
-	0x0, 0x2, 0x0,
-	0x5, 0x6, 0x2,
-	0xa, 0x8, 0x2,
-	0x26, 0x9, 0x2,
-	0xf, 0x11, 0xd,
-	0x2c, 0x11, 0x0,
-	0x18, 0x19, 0x17,
-	0xe, 0x20, 0x4,
-	0x1c, 0x1d, 0x1b,
-	0x4a, 0x15, 0x0,
-	0x46, 0x1a, 0x0,
-	0x36, 0x20, 0x2,
-	0x13, 0x2a, 0x8,
-	0x25, 0x26, 0x24,
-	0x29, 0x2b, 0x28,
-	0x69, 0x1e, 0x0,
-	0x2d, 0x2e, 0x2c,
-	0x43, 0x2e, 0x9,
-	0x75, 0x24, 0x0,
-	0x32, 0x34, 0x31,
-	0x21, 0x3e, 0xc,
-	0x85, 0x23, 0x0,
-	0x38, 0x3a, 0x37,
-	0x27, 0x44, 0x8,
-	0x56, 0x3a, 0x0,
-	0x2a, 0x44, 0x2d,
-	0x3d, 0x3f, 0x3c,
-	0x26, 0x55, 0x13,
-	0xa2, 0x33, 0x4,
-	0x5f, 0x45, 0x18,
-	0x47, 0x49, 0x46,
-	0x4e, 0x50, 0x4d,
-	0xc0, 0x3b, 0x0,
-	0x55, 0x56, 0x54,
-	0xd7, 0x3c, 0x0,
-	0x3a, 0x6b, 0x11,
-	0x35, 0x6e, 0x26,
-	0xf6, 0x38, 0x5,
-	0x5c, 0x5e, 0x5b,
-	0x88, 0x5c, 0x12,
-	0x9a, 0x59, 0x1e,
-	0x33, 0x78, 0x1c,
-	0xf5, 0x41, 0x6,
-	0x64, 0x66, 0x63,
-	0xf3, 0x48, 0x6,
-	0x9e, 0x64, 0x0,
-	0xf6, 0x4a, 0x0,
-	0x6b, 0x6d, 0x6a,
-	0xea, 0x50, 0x1a,
-	0xf5, 0x4c, 0x2f,
-	0xf5, 0x52, 0x0,
-	0xb3, 0x63, 0x27,
-	0xf2, 0x52, 0x35,
-	0x91, 0x6c, 0x63,
-	0x73, 0x75, 0x72,
-	0xf6, 0x5a, 0x0,
-	0xcc, 0x61, 0x52,
-	0xe8, 0x5f, 0x15,
-	0x2e, 0x98, 0x2b,
-	0x9e, 0x77, 0x2a,
-	0xf6, 0x61, 0x3,
-	0x7b, 0x7d, 0x79,
-	0x35, 0x9b, 0x26,
-	0xf6, 0x67, 0x6,
-	0xf9, 0x69, 0x0,
-	0x76, 0x85, 0x6d,
-	0x39, 0x9e, 0x29,
-	0xc0, 0x7a, 0x2,
-	0x6f, 0x89, 0x60,
-	0x43, 0x9d, 0x2a,
-	0x46, 0x9b, 0x38,
-	0x56, 0x9a, 0x14,
-	0x59, 0x97, 0x2b,
-	0x7c, 0x87, 0x74,
-	0x58, 0x9b, 0x22,
-	0x40, 0xa2, 0x24,
-	0xf8, 0x6f, 0x0,
-	0x60, 0x96, 0x45,
-	0x4c, 0x9c, 0x46,
-	0x85, 0x86, 0x83,
-	0x4b, 0xa3, 0x27,
-	0x44, 0xa6, 0x29,
-	0xf8, 0x75, 0x0,
-	0x5f, 0xa1, 0x11,
-	0xbd, 0x84, 0x20,
-	0x4b, 0xaa, 0x23,
-	0x8c, 0x8e, 0x8b,
-	0xa0, 0x8a, 0x7c,
-	0x5e, 0xa5, 0x34,
-	0x72, 0x9a, 0x68,
-	0xf9, 0x7c, 0x4,
-	0x66, 0xa0, 0x62,
-	0x56, 0xab, 0x26,
-	0x4f, 0xad, 0x28,
-	0x5e, 0xa9, 0x26,
-	0x5a, 0xa9, 0x37,
-	0x81, 0x98, 0x7a,
-	0xf8, 0x81, 0x8,
-	0xf6, 0x79, 0x5e,
-	0x55, 0xb0, 0x21,
-	0xde, 0x8b, 0x0,
-	0xfa, 0x83, 0x0,
-	0x69, 0xa9, 0x3b,
-	0xb6, 0x8d, 0x73,
-	0xd2, 0x90, 0x18,
-	0x95, 0x96, 0x93,
-	0xf7, 0x82, 0x3c,
-	0x62, 0xaf, 0x35,
-	0x59, 0xb4, 0x25,
-	0xf4, 0x83, 0x4b,
-	0xf4, 0x7f, 0x76,
-	0xfb, 0x89, 0x0,
-	0x5e, 0xb7, 0x1e,
-	0xc6, 0x91, 0x66,
-	0xc3, 0x98, 0x37,
-	0xf3, 0x8d, 0x18,
-	0xfb, 0x8f, 0x0,
-	0x76, 0xae, 0x5b,
-	0x61, 0xbb, 0x22,
-	0x9d, 0x9f, 0x9c,
-	0xe2, 0x93, 0x4b,
-	0xd9, 0x95, 0x57,
-	0xfa, 0x94, 0x5,
-	0x93, 0xa7, 0x8d,
-	0xfd, 0x96, 0x0,
-	0xf8, 0x91, 0x49,
-	0x69, 0xc0, 0x1d,
-	0x8f, 0xab, 0x83,
-	0x84, 0xb0, 0x7c,
-	0xb8, 0x9f, 0x93,
-	0x78, 0xba, 0x4a,
-	0xef, 0x99, 0x36,
-	0xf8, 0x99, 0x1f,
-	0xfc, 0x9b, 0x0,
-	0x6d, 0xc4, 0x23,
-	0xa5, 0xa7, 0xa4,
-	0xc5, 0xa6, 0x5a,
-	0x71, 0xc7, 0x18,
-	0x8b, 0xb6, 0x74,
-	0xf3, 0x95, 0x89,
-	0xdc, 0x9b, 0x95,
-	0xd7, 0xa6, 0x3c,
-	0xfd, 0xa1, 0x0,
-	0xf7, 0x9b, 0x52,
-	0xf9, 0xa3, 0x0,
-	0xfa, 0xa0, 0x21,
-	0x84, 0xbd, 0x63,
-	0x7b, 0xc6, 0x39,
-	0xab, 0xad, 0xaa,
-	0xc9, 0xa8, 0x8a,
-	0xef, 0x9f, 0x76,
-	0xf6, 0xa7, 0x16,
-	0x77, 0xcc, 0x20,
-	0xa4, 0xb2, 0x9f,
-	0xff, 0xa8, 0x0,
-	0xeb, 0xa4, 0x66,
-	0x99, 0xb8, 0x92,
-	0xf0, 0xa6, 0x59,
-	0xf9, 0xa9, 0x28,
-	0xb0, 0xb2, 0xae,
-	0xd8, 0xab, 0x7e,
-	0x95, 0xbf, 0x8b,
-	0xc3, 0xb1, 0x91,
-	0x7e, 0xd2, 0x1a,
-	0xda, 0xaf, 0x6d,
-	0x88, 0xcb, 0x4a,
-	0xf8, 0xab, 0x41,
-	0xf7, 0xae, 0x29,
-	0xac, 0xb9, 0xab,
-	0xb5, 0xb7, 0xb4,
-	0xf8, 0xad, 0x53,
-	0xe8, 0xb5, 0x40,
-	0xf6, 0xb3, 0x2c,
-	0xbe, 0xb8, 0xa4,
-	0xef, 0xb3, 0x48,
-	0xf9, 0xa9, 0x92,
-	0xf8, 0xaa, 0x8c,
-	0xf8, 0xb5, 0x38,
-	0x88, 0xda, 0x15,
-	0x8e, 0xd1, 0x60,
-	0xc2, 0xbc, 0xa7,
-	0xf5, 0xb4, 0x63,
-	0xbb, 0xbd, 0xba,
-	0xf5, 0xb8, 0x59,
-	0xb0, 0xc6, 0xae,
-	0xf9, 0xbc, 0x3d,
-	0xf6, 0xb8, 0x77,
-	0xc0, 0xc2, 0xbf,
-	0xd1, 0xc1, 0x9c,
-	0xf8, 0xb4, 0xad,
-	0xdc, 0xbf, 0xaa,
-	0xf7, 0xbc, 0x84,
-	0xa1, 0xd6, 0x80,
-	0xaf, 0xcf, 0xa1,
-	0xd0, 0xc3, 0xbc,
-	0xc5, 0xc7, 0xc4,
-	0xf5, 0xbe, 0x92,
-	0xfa, 0xc4, 0x4a,
-	0xf6, 0xc5, 0x65,
-	0xee, 0xc3, 0x91,
-	0xf2, 0xc1, 0xa2,
-	0xba, 0xd0, 0xb7,
-	0xf3, 0xc5, 0x7d,
-	0xc9, 0xcb, 0xc8,
-	0xe2, 0xcb, 0x96,
-	0xfb, 0xcb, 0x4f,
-	0xea, 0xc8, 0xaa,
-	0xed, 0xcd, 0x83,
-	0xd7, 0xcf, 0xb8,
-	0xce, 0xd0, 0xcc,
-	0xc3, 0xd6, 0xc1,
-	0xfb, 0xd1, 0x53,
-	0xea, 0xce, 0xb9,
-	0xe9, 0xd3, 0x8f,
-	0xfc, 0xd3, 0x5c,
-	0xd3, 0xd4, 0xd1,
-	0xe4, 0xd0, 0xc8,
-	0xf8, 0xd4, 0x79,
-	0xf9, 0xce, 0xc7,
-	0xf9, 0xd8, 0x6a,
-	0xd6, 0xd8, 0xd5,
-	0xe9, 0xd6, 0xb1,
-	0xfd, 0xda, 0x61,
-	0xda, 0xdb, 0xc4,
-	0xd0, 0xdd, 0xce,
-	0xda, 0xdc, 0xd9,
-	0xf7, 0xdd, 0x7a,
-	0xfb, 0xe0, 0x6f,
-	0xf6, 0xe0, 0x92,
-	0xfe, 0xe2, 0x67,
-	0xf3, 0xdf, 0xa6,
-	0xde, 0xe0, 0xdd,
-	0xe8, 0xde, 0xda,
-	0xfb, 0xd9, 0xd5,
-	0xfc, 0xda, 0xc9,
-	0xf3, 0xe0, 0xbe,
-	0xf1, 0xe1, 0xcb,
-	0xef, 0xe2, 0xd5,
-	0xe3, 0xe5, 0xe2,
-	0xd8, 0xed, 0xcb,
-	0xf2, 0xe7, 0xda,
-	0xe8, 0xea, 0xe6,
-	0xfb, 0xe6, 0xe1,
-	0xf8, 0xe9, 0xd2,
-	0xf6, 0xeb, 0xde,
-	0xec, 0xee, 0xea,
-	0xef, 0xf1, 0xee,
-	0xfb, 0xf1, 0xd3,
-	0xf2, 0xf4, 0xf0,
-	0xf5, 0xf7, 0xf3,
-	0xf7, 0xfa, 0xf6,
-	0xf9, 0xfb, 0xf8,
-	0xfa, 0xfc, 0xf9,
-	0xfc, 0xfe, 0xfb,
-	0xfe, 0xff, 0xfc
+static const uint16 kSplashLogoWidth = 397;
+static const uint16 kSplashLogoHeight = 90;
+static const uint8 kSplashLogoImage[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

[... truncated: 28912 lines follow ...]


From stippi at mail.berlios.de  Tue Mar 18 21:45:08 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 21:45:08 +0100
Subject: [Haiku-commits] r24450 - in haiku/trunk/src/system:
	boot/platform/bios_ia32 kernel
Message-ID: <200803182045.m2IKj8DD026828@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 21:45:07 +0100 (Tue, 18 Mar 2008)
New Revision: 24450
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24450&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp
   haiku/trunk/src/system/kernel/splash.cpp
Log:
Fixed 32 bit versions of blit*.


Modified: haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp	2008-03-18 20:27:47 UTC (rev 24449)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp	2008-03-18 20:45:07 UTC (rev 24450)
@@ -556,7 +556,7 @@
 		const uint8* src = data;
 		uint32* dst = start;
 		for (int32 x = 0; x < width; x++) {
-			dst[0] = (src[0] << 16) | (src[1] << 8) | (src[2]);
+			dst[0] = (src[0] << 24) | (src[1] << 16) | (src[2] << 8);
 			dst++;
 			src += 3;
 		}

Modified: haiku/trunk/src/system/kernel/splash.cpp
===================================================================
--- haiku/trunk/src/system/kernel/splash.cpp	2008-03-18 20:27:47 UTC (rev 24449)
+++ haiku/trunk/src/system/kernel/splash.cpp	2008-03-18 20:45:07 UTC (rev 24450)
@@ -300,7 +300,7 @@
 		const uint8* src = data;
 		uint32* dst = start;
 		for (int32 x = imageLeft; x < imageRight; x++) {
-			dst[0] = (src[0] << 16) | (src[1] << 8) | (src[2]);
+			dst[0] = (src[0] << 24) | (src[1] << 16) | (src[2] << 8);
 			dst++;
 			src += 3;
 		}



From korli at mail.berlios.de  Tue Mar 18 21:59:23 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Tue, 18 Mar 2008 21:59:23 +0100
Subject: [Haiku-commits] r24451 - haiku/trunk/src/tests/system/kernel
Message-ID: <200803182059.m2IKxN0R027673@sheep.berlios.de>

Author: korli
Date: 2008-03-18 21:59:23 +0100 (Tue, 18 Mar 2008)
New Revision: 24451
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24451&view=rev

Added:
   haiku/trunk/src/tests/system/kernel/mtrr_power_test.c
Log:
added a test for the algorithm introduced for MTRRs


Added: haiku/trunk/src/tests/system/kernel/mtrr_power_test.c
===================================================================
--- haiku/trunk/src/tests/system/kernel/mtrr_power_test.c	2008-03-18 20:45:07 UTC (rev 24450)
+++ haiku/trunk/src/tests/system/kernel/mtrr_power_test.c	2008-03-18 20:59:23 UTC (rev 24451)
@@ -0,0 +1,85 @@
+#include <stdio.h>
+#include <stdbool.h>
+
+#define uint64 long long unsigned
+#define int64 long long
+
+static void
+nearest_powers(uint64 value, uint64 *lower, uint64 *upper)
+{
+        uint64 power = 1UL << 12;
+	if (lower)
+	        *lower = power;
+        while (value >= power) {
+		if (lower)
+	             *lower = power;
+             power <<= 1;
+        }
+	if (upper)
+	       *upper = power;
+}
+
+
+int64 sols[5];
+int solCount;
+int64 props[5];
+
+static void
+find_nearest(uint64 value, int iteration)
+{
+	if (iteration > 4 || (iteration + 1) >= solCount)
+		return;
+	uint64 down, up;
+	int i;
+	nearest_powers(value, &down, &up);
+	props[iteration] = down;
+	if (value - down < 0x100000) {
+		for (i=0; i<=iteration; i++)
+			sols[i] = props[i];
+		solCount = iteration + 1;
+		return;
+	}
+	find_nearest(value - down, iteration + 1);
+	props[iteration] = -up;
+	if (up - value < 0x100000) {
+		for (i=0; i<=iteration; i++)
+			sols[i] = props[i];
+		solCount = iteration + 1;
+		return;
+	}
+	find_nearest(up - value, iteration + 1);
+}
+
+int
+main()
+{
+	uint64 length = 0xbfee0000; // 0xdfee0000; // 0x9ffb0000; //0xa7f00000; //0x70000000; //0xbfee0000;
+	uint64 base = 0;
+	solCount = 5;
+	find_nearest(length, 0);
+	printf("sols ");
+	int i;
+	for (i=0; i<solCount; i++) {
+		printf("0x%Lx ", sols[i]);
+	}
+	printf("\n");
+
+	bool nextDown = false;
+	for (i = 0; i < solCount; i++) {
+		if (sols[i] < 0) {
+			if (nextDown)
+				base += sols[i];
+			printf("%Lx %Lx %s\n", base, -sols[i], nextDown ? "UC" : "WB");
+			if (!nextDown)
+				base -= sols[i];
+			nextDown = !nextDown;
+		} else {
+			if (nextDown)
+				base -= sols[i];
+			printf("%Lx %Lx %s\n", base, sols[i], nextDown ? "UC" : "WB");
+			if (!nextDown)
+				base += sols[i];
+		}
+		
+	}
+}



From korli at mail.berlios.de  Tue Mar 18 22:25:35 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Tue, 18 Mar 2008 22:25:35 +0100
Subject: [Haiku-commits] r24452 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200803182125.m2ILPZTh031608@sheep.berlios.de>

Author: korli
Date: 2008-03-18 22:25:34 +0100 (Tue, 18 Mar 2008)
New Revision: 24452
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24452&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
Log:
clean up, comments, header


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-18 20:59:23 UTC (rev 24451)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-18 21:25:34 UTC (rev 24452)
@@ -1,5 +1,6 @@
 /*
  * Copyright 2002-2007, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2008, J?r?me Duval.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001, Travis Geiselbrecht. All rights reserved.
@@ -163,22 +164,29 @@
 }
 
 
-static int64 sols[5];
+#define MTRR_MAX_SOLUTIONS 	5	// usually MTRR count is eight, keep a few for other needs
+#define MTRR_MIN_SIZE 		0x100000	// 1 MB
+static int64 sols[MTRR_MAX_SOLUTIONS];
 static int solCount;
-static int64 props[5];
+static int64 props[MTRR_MAX_SOLUTIONS];
 
 
+/*!	Find the nearest powers of two for a value, save current iteration,
+  	then make recursives calls for the remaining values.
+  	It uses at most MTRR_MAX_SOLUTIONS levels of recursion because
+  	only that count of MTRR registers are available to map the memory.
+*/
 static void
 find_nearest(uint64 value, int iteration)
 {
 	TRACE_MTRR("find_nearest %Lx %d\n", value, iteration);
-	if (iteration > 4 || (iteration + 1) >= solCount)
+	if (iteration > (MTRR_MAX_SOLUTIONS - 1) || (iteration + 1) >= solCount)
 		return;
 	uint64 down, up;
 	int i;
 	nearest_powers(value, &down, &up);
 	props[iteration] = down;
-	if (value - down < 0x100000) {
+	if (value - down < MTRR_MIN_SIZE) {
 		for (i=0; i<=iteration; i++)
 			sols[i] = props[i];
 		solCount = iteration + 1;
@@ -186,7 +194,7 @@
 	}
 	find_nearest(value - down, iteration + 1);
 	props[iteration] = -up;
-	if (up - value < 0x100000) {
+	if (up - value < MTRR_MIN_SIZE) {
 		for (i=0; i<=iteration; i++)
 			sols[i] = props[i];
 		solCount = iteration + 1;
@@ -196,17 +204,17 @@
 }
 
 
+/*!	Set up MTRR to map the memory to write-back using uncached if necessary */
 static void
 set_memory_write_back(int32 id, uint64 base, uint64 length)
 {
-	int i;
 	TRACE_MTRR("set_memory_write_back base %Lx length %Lx\n", base, length);
-	solCount = 5;
+	solCount = MTRR_MAX_SOLUTIONS;
 	find_nearest(length, 0);
 
 #ifdef TRACE_MTRR
 	dprintf("sols: ");
-	for (i=0; i<solCount; i++) {
+	for (int i=0; i<solCount; i++) {
                 dprintf("0x%Lx ", sols[i]);
         }
         dprintf("\n");



From stippi at mail.berlios.de  Tue Mar 18 22:41:03 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 18 Mar 2008 22:41:03 +0100
Subject: [Haiku-commits] r24453 - in haiku/trunk/src/system:
	boot/platform/bios_ia32 kernel
Message-ID: <200803182141.m2ILf3Zo001241@sheep.berlios.de>

Author: stippi
Date: 2008-03-18 22:41:02 +0100 (Tue, 18 Mar 2008)
New Revision: 24453
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24453&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp
   haiku/trunk/src/system/kernel/splash.cpp
Log:
Fixed 32 bit blit modes for real...


Modified: haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp	2008-03-18 21:25:34 UTC (rev 24452)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp	2008-03-18 21:41:02 UTC (rev 24453)
@@ -556,7 +556,7 @@
 		const uint8* src = data;
 		uint32* dst = start;
 		for (int32 x = 0; x < width; x++) {
-			dst[0] = (src[0] << 24) | (src[1] << 16) | (src[2] << 8);
+			dst[0] = (src[2] << 16) | (src[1] << 8) | (src[0]);
 			dst++;
 			src += 3;
 		}

Modified: haiku/trunk/src/system/kernel/splash.cpp
===================================================================
--- haiku/trunk/src/system/kernel/splash.cpp	2008-03-18 21:25:34 UTC (rev 24452)
+++ haiku/trunk/src/system/kernel/splash.cpp	2008-03-18 21:41:02 UTC (rev 24453)
@@ -300,7 +300,7 @@
 		const uint8* src = data;
 		uint32* dst = start;
 		for (int32 x = imageLeft; x < imageRight; x++) {
-			dst[0] = (src[0] << 24) | (src[1] << 16) | (src[2] << 8);
+			dst[0] = (src[2] << 16) | (src[1] << 8) | (src[0]);
 			dst++;
 			src += 3;
 		}



From korli at mail.berlios.de  Tue Mar 18 23:17:53 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Tue, 18 Mar 2008 23:17:53 +0100
Subject: [Haiku-commits] r24454 - in haiku/trunk: headers/libs/fluidsynth
	headers/libs/fluidsynth/fluidsynth src/libs/fluidsynth
	src/libs/fluidsynth/src
Message-ID: <200803182217.m2IMHr5o010239@sheep.berlios.de>

Author: korli
Date: 2008-03-18 23:17:50 +0100 (Tue, 18 Mar 2008)
New Revision: 24454
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24454&view=rev

Removed:
   haiku/trunk/src/libs/fluidsynth/src/fluid_dsp_core.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_dsp_sse.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_sse.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_strtok.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_strtok.h
Modified:
   haiku/trunk/headers/libs/fluidsynth/fluidsynth.h
   haiku/trunk/headers/libs/fluidsynth/fluidsynth/audio.h
   haiku/trunk/headers/libs/fluidsynth/fluidsynth/event.h
   haiku/trunk/headers/libs/fluidsynth/fluidsynth/gen.h
   haiku/trunk/headers/libs/fluidsynth/fluidsynth/log.h
   haiku/trunk/headers/libs/fluidsynth/fluidsynth/midi.h
   haiku/trunk/headers/libs/fluidsynth/fluidsynth/sfont.h
   haiku/trunk/headers/libs/fluidsynth/fluidsynth/version.h
   haiku/trunk/src/libs/fluidsynth/AUTHORS
   haiku/trunk/src/libs/fluidsynth/src/Jamfile
   haiku/trunk/src/libs/fluidsynth/src/fluid_adriver.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_adriver.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_aufile.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_chan.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_chan.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_chorus.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_chorus.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_cmd.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_cmd.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_conv.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_conv.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_defsfont.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_defsfont.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_dsp_float.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_dsp_simple.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_event.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_event_priv.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_gen.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_gen.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_hash.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_hash.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_io.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_io.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_ladspa.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_ladspa.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_lash.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_lash.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_list.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_mdriver.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_mdriver.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_midi.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_midi.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_midi_router.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_midi_router.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_mod.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_mod.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_phase.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_ramsfont.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_ramsfont.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_rev.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_rev.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_seq.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_seqbind.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_settings.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_settings.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_sfont.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_synth.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_synth.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_sys.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_sys.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_tuning.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_tuning.h
   haiku/trunk/src/libs/fluidsynth/src/fluid_voice.c
   haiku/trunk/src/libs/fluidsynth/src/fluid_voice.h
   haiku/trunk/src/libs/fluidsynth/src/fluidsynth.c
   haiku/trunk/src/libs/fluidsynth/src/fluidsynth_priv.h
Log:
updated fluidsynth to 1.0.8


Modified: haiku/trunk/headers/libs/fluidsynth/fluidsynth/audio.h
===================================================================
--- haiku/trunk/headers/libs/fluidsynth/fluidsynth/audio.h	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/headers/libs/fluidsynth/fluidsynth/audio.h	2008-03-18 22:17:50 UTC (rev 24454)
@@ -25,15 +25,29 @@
 extern "C" {
 #endif
 
+/**
+ * @file audio.h
+ * @brief Functions for audio driver output.
+ *
+ * Defines functions for creating audio driver output.  Use
+ * new_fluid_audio_driver() to create a new audio driver for a given synth
+ * and configuration settings.  The function new_fluid_audio_driver2() can be
+ * used if custom audio processing is desired before the audio is sent to the
+ * audio driver (although it is not as efficient).
+ */
 
-
-  /** Audio driver
-   *
-   *
-   */
-
-
-  /** The function should return non-zero if an error occured. */
+/**
+ * Callback function type used with new_fluid_audio_driver2() to allow for
+ * custom user audio processing before the audio is sent to the driver.  This
+ * function is responsible for rendering the audio to the buffers.
+ * @param data The user data parameter as passed to new_fluid_audio_driver2().
+ * @param len Length of the audio in frames.
+ * @param nin Count of buffers in 'in'
+ * @param in FIXME - Not used currently?
+ * @param nout Count of arrays in 'out' (i.e., channel count)
+ * @param out Output buffers, one for each channel
+ * @return Should return 0 on success, non-zero if an error occured.
+ */
 typedef int (*fluid_audio_func_t)(void* data, int len, 
 				 int nin, float** in, 
 				 int nout, float** out);

Modified: haiku/trunk/headers/libs/fluidsynth/fluidsynth/event.h
===================================================================
--- haiku/trunk/headers/libs/fluidsynth/fluidsynth/event.h	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/headers/libs/fluidsynth/fluidsynth/event.h	2008-03-18 22:17:50 UTC (rev 24454)
@@ -25,28 +25,37 @@
 extern "C" {
 #endif
 
+/**
+ * @file event.h
+ * @brief Sequencer event functions and defines.
+ *
+ * Functions and constants for creating/processing sequencer events.
+ */
 
+/**
+ * Sequencer event type enumeration.
+ */
 enum fluid_seq_event_type {
-  FLUID_SEQ_NOTE = 0,
-  FLUID_SEQ_NOTEON,
-  FLUID_SEQ_NOTEOFF,
-  FLUID_SEQ_ALLSOUNDSOFF,
-  FLUID_SEQ_ALLNOTESOFF,
-  FLUID_SEQ_BANKSELECT,
-  FLUID_SEQ_PROGRAMCHANGE,
-  FLUID_SEQ_PROGRAMSELECT,
-  FLUID_SEQ_PITCHBEND,
-  FLUID_SEQ_PITCHWHHELSENS,
-  FLUID_SEQ_MODULATION,
-  FLUID_SEQ_SUSTAIN,
-  FLUID_SEQ_CONTROLCHANGE,
-  FLUID_SEQ_PAN,
-  FLUID_SEQ_VOLUME,
-  FLUID_SEQ_REVERBSEND,
-  FLUID_SEQ_CHORUSSEND,
-  FLUID_SEQ_TIMER,
-  FLUID_SEQ_ANYCONTROLCHANGE,	// used for remove_events only
-  FLUID_SEQ_LASTEVENT  
+  FLUID_SEQ_NOTE = 0,		/**< Note event (DOCME) */
+  FLUID_SEQ_NOTEON,		/**< Note on event */
+  FLUID_SEQ_NOTEOFF,		/**< Note off event */
+  FLUID_SEQ_ALLSOUNDSOFF,	/**< All sounds off event */
+  FLUID_SEQ_ALLNOTESOFF,	/**< All notes off event */
+  FLUID_SEQ_BANKSELECT,		/**< Bank select message */
+  FLUID_SEQ_PROGRAMCHANGE,	/**< Program change message */
+  FLUID_SEQ_PROGRAMSELECT,	/**< Program select message (DOCME) */
+  FLUID_SEQ_PITCHBEND,		/**< Pitch bend message */
+  FLUID_SEQ_PITCHWHHELSENS,	/**< Pitch wheel sensitivity set message */
+  FLUID_SEQ_MODULATION,		/**< Modulation controller event */
+  FLUID_SEQ_SUSTAIN,		/**< Sustain controller event */
+  FLUID_SEQ_CONTROLCHANGE,	/**< MIDI control change event */
+  FLUID_SEQ_PAN,		/**< Stereo pan set event */
+  FLUID_SEQ_VOLUME,		/**< Volume set event */
+  FLUID_SEQ_REVERBSEND,		/**< Reverb send set event */
+  FLUID_SEQ_CHORUSSEND,		/**< Chorus send set event */
+  FLUID_SEQ_TIMER,		/**< Timer event (DOCME) */
+  FLUID_SEQ_ANYCONTROLCHANGE,	/**< DOCME (used for remove_events only) */
+  FLUID_SEQ_LASTEVENT		/**< Defines the count of event enums */
 };
 
 /* Event alloc/free */

Modified: haiku/trunk/headers/libs/fluidsynth/fluidsynth/gen.h
===================================================================
--- haiku/trunk/headers/libs/fluidsynth/fluidsynth/gen.h	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/headers/libs/fluidsynth/fluidsynth/gen.h	2008-03-18 22:17:50 UTC (rev 24454)
@@ -25,99 +25,105 @@
 extern "C" {
 #endif
 
+/**
+ * @file gen.h
+ * @brief Functions and defines for SoundFont generator effects.
+ */
 
-  /** List of generator numbers
-      Soundfont 2.01 specifications section 8.1.3 */
+/**
+ * Generator (effect) numbers (Soundfont 2.01 specifications section 8.1.3)
+ */
 enum fluid_gen_type {
-  GEN_STARTADDROFS,
-  GEN_ENDADDROFS,
-  GEN_STARTLOOPADDROFS,
-  GEN_ENDLOOPADDROFS,
-  GEN_STARTADDRCOARSEOFS,
-  GEN_MODLFOTOPITCH,
-  GEN_VIBLFOTOPITCH,
-  GEN_MODENVTOPITCH,
-  GEN_FILTERFC,
-  GEN_FILTERQ,
-  GEN_MODLFOTOFILTERFC,
-  GEN_MODENVTOFILTERFC,
-  GEN_ENDADDRCOARSEOFS,
-  GEN_MODLFOTOVOL,
-  GEN_UNUSED1,
-  GEN_CHORUSSEND,
-  GEN_REVERBSEND,
-  GEN_PAN,
-  GEN_UNUSED2,
-  GEN_UNUSED3,
-  GEN_UNUSED4,
-  GEN_MODLFODELAY,
-  GEN_MODLFOFREQ,
-  GEN_VIBLFODELAY,
-  GEN_VIBLFOFREQ,
-  GEN_MODENVDELAY,
-  GEN_MODENVATTACK,
-  GEN_MODENVHOLD,
-  GEN_MODENVDECAY,
-  GEN_MODENVSUSTAIN,
-  GEN_MODENVRELEASE,
-  GEN_KEYTOMODENVHOLD,
-  GEN_KEYTOMODENVDECAY,
-  GEN_VOLENVDELAY,
-  GEN_VOLENVATTACK,
-  GEN_VOLENVHOLD,
-  GEN_VOLENVDECAY,
-  GEN_VOLENVSUSTAIN,
-  GEN_VOLENVRELEASE,
-  GEN_KEYTOVOLENVHOLD,
-  GEN_KEYTOVOLENVDECAY,
-  GEN_INSTRUMENT,
-  GEN_RESERVED1,
-  GEN_KEYRANGE,
-  GEN_VELRANGE,
-  GEN_STARTLOOPADDRCOARSEOFS,
-  GEN_KEYNUM,
-  GEN_VELOCITY,
-  GEN_ATTENUATION,
-  GEN_RESERVED2,
-  GEN_ENDLOOPADDRCOARSEOFS,
-  GEN_COARSETUNE,
-  GEN_FINETUNE,
-  GEN_SAMPLEID,
-  GEN_SAMPLEMODE,
-  GEN_RESERVED3,
-  GEN_SCALETUNE,
-  GEN_EXCLUSIVECLASS,
-  GEN_OVERRIDEROOTKEY,
+  GEN_STARTADDROFS,		/**< Sample start address offset (0-32767) */
+  GEN_ENDADDROFS,		/**< Sample end address offset (-32767-0) */
+  GEN_STARTLOOPADDROFS,		/**< Sample loop start address offset (-32767-32767) */
+  GEN_ENDLOOPADDROFS,		/**< Sample loop end address offset (-32767-32767) */
+  GEN_STARTADDRCOARSEOFS,	/**< Sample start address coarse offset (X 32768) */
+  GEN_MODLFOTOPITCH,		/**< Modulation LFO to pitch */
+  GEN_VIBLFOTOPITCH,		/**< Vibrato LFO to pitch */
+  GEN_MODENVTOPITCH,		/**< Modulation envelope to pitch */
+  GEN_FILTERFC,			/**< Filter cutoff */
+  GEN_FILTERQ,			/**< Filter Q */
+  GEN_MODLFOTOFILTERFC,		/**< Modulation LFO to filter cutoff */
+  GEN_MODENVTOFILTERFC,		/**< Modulation envelope to filter cutoff */
+  GEN_ENDADDRCOARSEOFS,		/**< Sample end address coarse offset (X 32768) */
+  GEN_MODLFOTOVOL,		/**< Modulation LFO to volume */
+  GEN_UNUSED1,			/**< Unused */
+  GEN_CHORUSSEND,		/**< Chorus send amount */
+  GEN_REVERBSEND,		/**< Reverb send amount */
+  GEN_PAN,			/**< Stereo panning */
+  GEN_UNUSED2,			/**< Unused */
+  GEN_UNUSED3,			/**< Unused */
+  GEN_UNUSED4,			/**< Unused */
+  GEN_MODLFODELAY,		/**< Modulation LFO delay */
+  GEN_MODLFOFREQ,		/**< Modulation LFO frequency */
+  GEN_VIBLFODELAY,		/**< Vibrato LFO delay */
+  GEN_VIBLFOFREQ,		/**< Vibrato LFO frequency */
+  GEN_MODENVDELAY,		/**< Modulation envelope delay */
+  GEN_MODENVATTACK,		/**< Modulation envelope attack */
+  GEN_MODENVHOLD,		/**< Modulation envelope hold */
+  GEN_MODENVDECAY,		/**< Modulation envelope decay */
+  GEN_MODENVSUSTAIN,		/**< Modulation envelope sustain */
+  GEN_MODENVRELEASE,		/**< Modulation envelope release */
+  GEN_KEYTOMODENVHOLD,		/**< Key to modulation envelope hold */
+  GEN_KEYTOMODENVDECAY,		/**< Key to modulation envelope decay */
+  GEN_VOLENVDELAY,		/**< Volume envelope delay */
+  GEN_VOLENVATTACK,		/**< Volume envelope attack */
+  GEN_VOLENVHOLD,		/**< Volume envelope hold */
+  GEN_VOLENVDECAY,		/**< Volume envelope decay */
+  GEN_VOLENVSUSTAIN,		/**< Volume envelope sustain */
+  GEN_VOLENVRELEASE,		/**< Volume envelope release */
+  GEN_KEYTOVOLENVHOLD,		/**< Key to volume envelope hold */
+  GEN_KEYTOVOLENVDECAY,		/**< Key to volume envelope decay */
+  GEN_INSTRUMENT,		/**< Instrument ID (shouldn't be set by user) */
+  GEN_RESERVED1,		/**< Reserved */
+  GEN_KEYRANGE,			/**< MIDI note range */
+  GEN_VELRANGE,			/**< MIDI velocity range */
+  GEN_STARTLOOPADDRCOARSEOFS,	/**< Sample start loop address coarse offset (X 32768) */
+  GEN_KEYNUM,			/**< Fixed MIDI note number */
+  GEN_VELOCITY,			/**< Fixed MIDI velocity value */
+  GEN_ATTENUATION,		/**< Initial volume attenuation */
+  GEN_RESERVED2,		/**< Reserved */
+  GEN_ENDLOOPADDRCOARSEOFS,	/**< Sample end loop address coarse offset (X 32768) */
+  GEN_COARSETUNE,		/**< Coarse tuning */
+  GEN_FINETUNE,			/**< Fine tuning */
+  GEN_SAMPLEID,			/**< Sample ID (shouldn't be set by user) */
+  GEN_SAMPLEMODE,		/**< Sample mode flags */
+  GEN_RESERVED3,		/**< Reserved */
+  GEN_SCALETUNE,		/**< Scale tuning */
+  GEN_EXCLUSIVECLASS,		/**< Exclusive class number */
+  GEN_OVERRIDEROOTKEY,		/**< Sample root note override */
 
   /* the initial pitch is not a "standard" generator. It is not
    * mentioned in the list of generator in the SF2 specifications. It
    * is used, however, as the destination for the default pitch wheel
    * modulator. */
-  GEN_PITCH,
-  GEN_LAST 
+  GEN_PITCH,			/**< Pitch (NOTE: Not a real SoundFont generator) */
+  GEN_LAST			/**< Value defines the count of generators (#fluid_gen_type) */
 };
 
 
-  /*
-   *  fluid_gen_t
-   *  Sound font generator
-   */
+/**
+ * SoundFont generator structure.
+ */
 typedef struct _fluid_gen_t
 {
-  unsigned char flags; /* is it used or not */
-  double val;          /* The nominal value */
-  double mod;          /* Change by modulators */
-  double nrpn;         /* Change by NRPN messages */
+  unsigned char flags; /**< Is the generator set or not (#fluid_gen_flags) */
+  double val;          /**< The nominal value */
+  double mod;          /**< Change by modulators */
+  double nrpn;         /**< Change by NRPN messages */
 } fluid_gen_t;
 
+/**
+ * Enum value for 'flags' field of #_fluid_gen_t (not really flags).
+ */
 enum fluid_gen_flags
 {
-  GEN_UNUSED,
-  GEN_SET,
-  GEN_ABS_NRPN
+  GEN_UNUSED,		/**< Generator value is not set */
+  GEN_SET,		/**< Generator value is set */
+  GEN_ABS_NRPN		/**< DOCME */
 };
 
-  /** Reset an array of generators to the SF2.01 default values */
 FLUIDSYNTH_API int fluid_gen_set_default_values(fluid_gen_t* gen);
 
 

Modified: haiku/trunk/headers/libs/fluidsynth/fluidsynth/log.h
===================================================================
--- haiku/trunk/headers/libs/fluidsynth/fluidsynth/log.h	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/headers/libs/fluidsynth/fluidsynth/log.h	2008-03-18 22:17:50 UTC (rev 24454)
@@ -27,57 +27,55 @@
 #endif
 
 
-  /**
-   *
-   *  Logging interface
-   *
-   *  The default logging function of the fluidsynth prints its messages
-   *  to the stderr. The synthesizer uses four level of messages: FLUID_PANIC,
-   *  ERR, WARN, and FLUID_DBG. They are commented in the definition below.
-   *
-   *  A client application can install a new log function to handle the
-   *  messages differently. In the following example, the application
-   *  sets a callback function to display "FLUID_PANIC" messages in a dialog,
-   *  and ignores all other messages by setting the log function to
-   *  NULL:
-   *
-   *  ...
-   *  fluid_set_log_function(FLUID_PANIC, show_dialog, (void*) root_window);
-   *  fluid_set_log_function(ERR, NULL, NULL);
-   *  fluid_set_log_function(WARN, NULL, NULL);
-   *  fluid_set_log_function(FLUID_DBG, NULL, NULL);
-   *  ...
-   *
-   */
+/**
+ * @file log.h
+ * @brief Logging interface
+ *
+ * The default logging function of the fluidsynth prints its messages
+ * to the stderr. The synthesizer uses five level of messages: #FLUID_PANIC,
+ * #FLUID_ERR, #FLUID_WARN, #FLUID_INFO, and #FLUID_DBG.
+ *
+ * A client application can install a new log function to handle the
+ * messages differently. In the following example, the application
+ * sets a callback function to display #FLUID_PANIC messages in a dialog,
+ * and ignores all other messages by setting the log function to
+ * NULL:
+ *
+ * DOCME (formatting)
+ * fluid_set_log_function(FLUID_PANIC, show_dialog, (void*) root_window);
+ * fluid_set_log_function(FLUID_ERR, NULL, NULL);
+ * fluid_set_log_function(FLUID_WARN, NULL, NULL);
+ * fluid_set_log_function(FLUID_DBG, NULL, NULL);
+ */
 
+/**
+ * FluidSynth log levels.
+ */
 enum fluid_log_level { 
-  FLUID_PANIC,   /* the synth can't function correctly any more */
-  FLUID_ERR,     /* the synth can function, but with serious limitation */
-  FLUID_WARN,    /* the synth might not function as expected */
-  FLUID_INFO,    /* verbose messages */
-  FLUID_DBG,     /* debugging messages */
+  FLUID_PANIC,   /**< The synth can't function correctly any more */
+  FLUID_ERR,     /**< Serious error occurred */
+  FLUID_WARN,    /**< Warning */
+  FLUID_INFO,    /**< Verbose informational messages */
+  FLUID_DBG,     /**< Debugging messages */
   LAST_LOG_LEVEL
 };
 
+/**
+ * Log function handler callback type used by fluid_set_log_function().
+ * @param level Log level (#fluid_log_level)
+ * @param message Log message text
+ * @param data User data pointer supplied to fluid_set_log_function().
+ */
 typedef void (*fluid_log_function_t)(int level, char* message, void* data);
 
-  /** fluid_set_log_function installs a new log function for the
-   *  specified level. It returns the previously installed function. 
-   */
 FLUIDSYNTH_API 
 fluid_log_function_t fluid_set_log_function(int level, fluid_log_function_t fun, void* data);
 
-  
-  /** fluid_default_log_function is the fluid's default log function. It
-   *  prints to the stderr. */
 FLUIDSYNTH_API void fluid_default_log_function(int level, char* message, void* data);
 
-  /** print a message to the log */
 FLUIDSYNTH_API int fluid_log(int level, char * fmt, ...);
 
 
-
-
 #ifdef __cplusplus
 }
 #endif

Modified: haiku/trunk/headers/libs/fluidsynth/fluidsynth/midi.h
===================================================================
--- haiku/trunk/headers/libs/fluidsynth/fluidsynth/midi.h	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/headers/libs/fluidsynth/fluidsynth/midi.h	2008-03-18 22:17:50 UTC (rev 24454)
@@ -25,8 +25,11 @@
 extern "C" {
 #endif
 
+/**
+ * @file midi.h
+ * @brief Functions for MIDI events, drivers and MIDI file playback.
+ */
 
-
 FLUIDSYNTH_API fluid_midi_event_t* new_fluid_midi_event(void);
 FLUIDSYNTH_API int delete_fluid_midi_event(fluid_midi_event_t* event);
 
@@ -48,58 +51,41 @@
 FLUIDSYNTH_API int fluid_midi_event_set_pitch(fluid_midi_event_t* evt, int val);
 
 
-  /* Generic callback function for MIDI events.
-   * Will be used between
-   * - MIDI driver and MIDI router
-   * - MIDI router and synth
-   * to communicate events.
-   * In the not-so-far future...
-   */
+/**
+ * Generic callback function for MIDI events.
+ * @param data User defined data pointer
+ * @param event The MIDI event
+ * @return DOCME
+ *
+ * Will be used between
+ * - MIDI driver and MIDI router
+ * - MIDI router and synth
+ * to communicate events.
+ * In the not-so-far future...
+ */
 typedef int (*handle_midi_event_func_t)(void* data, fluid_midi_event_t* event);
 
-  /*
-   *
-   *  MIDI router
-   *
-   *  The MIDI handler forwards incoming MIDI events to the synthesizer
-   *
-   */
+/*
+ *  MIDI router
+ *
+ *  The MIDI handler forwards incoming MIDI events to the synthesizer
+ */
 
-  /** Create a new midi router. A midi handler connects to a midi input
-   *  device and forwards incoming midi events to the synthesizer. 
-   */
 FLUIDSYNTH_API fluid_midi_router_t* new_fluid_midi_router(fluid_settings_t* settings,
 						       handle_midi_event_func_t handler, 
 						       void* event_handler_data); 
 
-  /** Delete the midi router.  
-   *
-   * \param handler a pointer to the midi handler
-   * \return 0 if no error occured, -1 otherwise 
-   */
 FLUIDSYNTH_API int delete_fluid_midi_router(fluid_midi_router_t* handler); 
-
-  /** The standard handler function. Every MIDI event goes through
-      this. */
 FLUIDSYNTH_API int fluid_midi_router_handle_midi_event(void* data, fluid_midi_event_t* event);
-
-  /** An optional link in the MIDI chain to dump MIDI data between MIDI
-      driver and router */
 FLUIDSYNTH_API int fluid_midi_dump_prerouter(void* data, fluid_midi_event_t* event); 
-
-  /** An optional link in the MIDI chain to dump MIDI data between MIDI
-      router and the synthesizer */
 FLUIDSYNTH_API int fluid_midi_dump_postrouter(void* data, fluid_midi_event_t* event); 
 
 /*
- *
  *  MIDI driver
  *
  *  The MIDI handler forwards incoming MIDI events to the synthesizer
- *
  */
 
-
 FLUIDSYNTH_API 
 fluid_midi_driver_t* new_fluid_midi_driver(fluid_settings_t* settings, 
 					 handle_midi_event_func_t handler, 
@@ -110,11 +96,9 @@
 
 
 /*
- *
  *  MIDI file player
  *
  *  The MIDI player allows you to play MIDI files with the FLUID Synth
- *
  */
 
 FLUIDSYNTH_API fluid_player_t* new_fluid_player(fluid_synth_t* synth);

Modified: haiku/trunk/headers/libs/fluidsynth/fluidsynth/sfont.h
===================================================================
--- haiku/trunk/headers/libs/fluidsynth/fluidsynth/sfont.h	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/headers/libs/fluidsynth/fluidsynth/sfont.h	2008-03-18 22:17:50 UTC (rev 24454)
@@ -144,9 +144,9 @@
 {
   char name[21];
   unsigned int start;
-  unsigned int end;
+  unsigned int end;	/* Note: Index of last valid sample point (contrary to SF spec) */
   unsigned int loopstart;
-  unsigned int loopend;
+  unsigned int loopend;	/* Note: first point following the loop (superimposed on loopstart) */
   unsigned int samplerate;
   int origpitch;
   int pitchadj;

Modified: haiku/trunk/headers/libs/fluidsynth/fluidsynth/version.h
===================================================================
--- haiku/trunk/headers/libs/fluidsynth/fluidsynth/version.h	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/headers/libs/fluidsynth/fluidsynth/version.h	2008-03-18 22:17:50 UTC (rev 24454)
@@ -26,10 +26,10 @@
 extern "C" {
 #endif
 
-#define FLUIDSYNTH_VERSION       "1.0.7"
+#define FLUIDSYNTH_VERSION       "1.0.8"
 #define FLUIDSYNTH_VERSION_MAJOR 1
 #define FLUIDSYNTH_VERSION_MINOR 0
-#define FLUIDSYNTH_VERSION_MICRO 7
+#define FLUIDSYNTH_VERSION_MICRO 8
 
 
 FLUIDSYNTH_API void fluid_version(int *major, int *minor, int *micro);

Modified: haiku/trunk/headers/libs/fluidsynth/fluidsynth.h
===================================================================
--- haiku/trunk/headers/libs/fluidsynth/fluidsynth.h	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/headers/libs/fluidsynth/fluidsynth.h	2008-03-18 22:17:50 UTC (rev 24454)
@@ -44,41 +44,38 @@
 #endif
 
 
-  /**
+/**
+ * @file fluidsynth.h
+ * @brief FluidSynth is a real-time synthesizer designed for SoundFont(R) files.
+ *
+ * This is the header of the fluidsynth library and contains the
+ * synthesizer's public API.
+ *
+ * Depending on how you want to use or extend the synthesizer you
+ * will need different API functions. You probably do not need all
+ * of them. Here is what you might want to do:
+ *
+ * o Embedded synthesizer: create a new synthesizer and send MIDI
+ *   events to it. The sound goes directly to the audio output of
+ *   your system.
+ *
+ * o Plugin synthesizer: create a synthesizer and send MIDI events
+ *   but pull the audio back into your application.
+ *
+ * o SoundFont plugin: create a new type of "SoundFont" and allow
+ *   the synthesizer to load your type of SoundFonts.
+ *
+ * o MIDI input: Create a MIDI handler to read the MIDI input on your
+ *   machine and send the MIDI events directly to the synthesizer.
+ *
+ * o MIDI files: Open MIDI files and send the MIDI events to the
+ *   synthesizer.
+ *
+ * o Command lines: You can send textual commands to the synthesizer.
+ *
+ * SoundFont(R) is a registered trademark of E-mu Systems, Inc.
+ */
 
-     \file fluidsynth.h
-
-     \brief fluidsynth is a real-time SoundFont(R) synthesizer. This is
-     the header of the fluidsynth library and contains the
-     synthesizer's public API.
-
-     Depending on how you want to use or extend the synthesizer you
-     will need different API functions. You probably do not need all
-     of them. Here is what you might want to do:
-     
-     o Embedded synthesizer: create a new synthesizer and send MIDI
-       events to it. The sound goes directly to the audio output of
-       your system.
-     
-     o Plugin synthesizer: create a synthesizer and send MIDI events
-       but pull the audio back into your application.
-     
-     o SoundFont plugin: create a new type of "SoundFont" and allow
-       the synthesizer to load your type of SoundFonts.
-     
-     o MIDI input: Create a MIDI handler to read the MIDI input on your
-       machine and send the MIDI events directly to the synthesizer.
-     
-     o MIDI files: Open MIDI files and send the MIDI events to the
-       synthesizer.
-     
-     o Command lines: You can send textual commands to the synthesizer.
-
-
-     SoundFont(R) is a registered trademark of E-mu Systems, Inc. 
-							    
-  */
-
 #include "fluidsynth/types.h"
 #include "fluidsynth/settings.h"
 #include "fluidsynth/synth.h"

Modified: haiku/trunk/src/libs/fluidsynth/AUTHORS
===================================================================
--- haiku/trunk/src/libs/fluidsynth/AUTHORS	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/src/libs/fluidsynth/AUTHORS	2008-03-18 22:17:50 UTC (rev 24454)
@@ -6,10 +6,10 @@
 
 [:Development:]
 
-Many people contributed to FluidSynth, send suggestions or bug
+Many people contributed to FluidSynth, sent suggestions or bug
 fixes. The project was started by Peter Hanappe who is the main
 author. Josh Green is the current maintainer. Below you'll find a
-summery of contributions.
+summary of contributions.
 
 
 * Peter Hanappe. Initiated the project. files: sticked his nose in all
@@ -24,10 +24,6 @@
   (the blue waves with FluidSynth letters partially submerged).
   files: iiwu_defsfont.{c,h}, iiwu_alsa{c,h} and others.
 
-* Stephane Letz from Grame wrote most of the MidiShare driver, all of
-  the PortAudio driver, ported iiwusynth to MacOS X, and sent in many
-  fixes. files: iiwu_midishare.c, iiwu_portaudio.c
-
 * Markus Nentwig (re-)designed the resonant filter, the chorus, the
   LADSPA subsystem, the MIDI router, optimized for SSE, made many
   changes and bug fixes and got the synthesizer to actually work. Most
@@ -36,6 +32,10 @@
   iiwu_sse.h, iiwu_dsp_core.h, iiwu_rev.{c,h}, and basically all the
   other files.
 
+* Stephane Letz from Grame wrote most of the MidiShare driver, all of
+  the PortAudio driver, ported iiwusynth to MacOS X, and sent in many
+  fixes. files: iiwu_midishare.c, iiwu_portaudio.c
+
 * Antoine Schmitt added the sequencer support, support for sample
   loading (RAM Sfont), developed the
   MacroMedia Director Xtra, and send in many many bug reports. Thanks
@@ -67,8 +67,7 @@
   portability.
 
 * The midi device uses code from jMax's alsarawmidi.c file and from
-  Smurf's midi_alsaraw.c by Josh Green. Josh also added support for
-  the alsa sequencer interface. file: iiwu_alsa.c
+  Smurf's midi_alsaraw.c by Josh Green.  file: iiwu_alsa.c
 
 * The reverb algorithm was written by Jezar
   (http://www.dreampoint.co.uk). His code is public domain. The code
@@ -115,3 +114,7 @@
 Rui Nuno Capela
 Frieder B?rzele
 Henri Manson
+Mihail Zenkov
+Paul Millar
+Nick Daly
+David Hilvert

Modified: haiku/trunk/src/libs/fluidsynth/src/Jamfile
===================================================================
--- haiku/trunk/src/libs/fluidsynth/src/Jamfile	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/src/libs/fluidsynth/src/Jamfile	2008-03-18 22:17:50 UTC (rev 24454)
@@ -14,6 +14,7 @@
 	fluid_cmd.c
 	fluid_conv.c
 	fluid_defsfont.c
+	fluid_dsp_float.c
 	fluid_event.c
 	fluid_gen.c
 	fluid_hash.c
@@ -28,7 +29,6 @@
 	fluid_seq.c
 	fluid_seqbind.c
 	fluid_settings.c
-	fluid_strtok.c
 	fluid_synth.c
 	fluid_sys.c
 	fluid_tuning.c

Modified: haiku/trunk/src/libs/fluidsynth/src/fluid_adriver.c
===================================================================
--- haiku/trunk/src/libs/fluidsynth/src/fluid_adriver.c	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/src/libs/fluidsynth/src/fluid_adriver.c	2008-03-18 22:17:50 UTC (rev 24454)
@@ -11,7 +11,7 @@
  * 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
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -25,12 +25,12 @@
  * fluid_adriver_definition_t
  */
 
-typedef struct _fluid_audriver_definition_t 
+typedef struct _fluid_audriver_definition_t
 {
   char* name;
   fluid_audio_driver_t* (*new)(fluid_settings_t* settings, fluid_synth_t* synth);
-  fluid_audio_driver_t* (*new2)(fluid_settings_t* settings, 
-				fluid_audio_func_t func, 
+  fluid_audio_driver_t* (*new2)(fluid_settings_t* settings,
+				fluid_audio_func_t func,
 				void* data);
   int (*free)(fluid_audio_driver_t* driver);
   void (*settings)(fluid_settings_t* settings);
@@ -48,57 +48,57 @@
 #endif
 
 #if OSS_SUPPORT
-fluid_audio_driver_t* new_fluid_oss_audio_driver(fluid_settings_t* settings, 
+fluid_audio_driver_t* new_fluid_oss_audio_driver(fluid_settings_t* settings,
 						 fluid_synth_t* synth);
-fluid_audio_driver_t* new_fluid_oss_audio_driver2(fluid_settings_t* settings, 
+fluid_audio_driver_t* new_fluid_oss_audio_driver2(fluid_settings_t* settings,
 						fluid_audio_func_t func, void* data);
 int delete_fluid_oss_audio_driver(fluid_audio_driver_t* p);
 void fluid_oss_audio_driver_settings(fluid_settings_t* settings);
 #endif
 
 #if COREAUDIO_SUPPORT
-fluid_audio_driver_t* new_fluid_core_audio_driver(fluid_settings_t* settings, 
+fluid_audio_driver_t* new_fluid_core_audio_driver(fluid_settings_t* settings,
 						  fluid_synth_t* synth);
-fluid_audio_driver_t* new_fluid_core_audio_driver2(fluid_settings_t* settings, 
-						      fluid_audio_func_t func, 
+fluid_audio_driver_t* new_fluid_core_audio_driver2(fluid_settings_t* settings,
+						      fluid_audio_func_t func,
 						      void* data);
 int delete_fluid_core_audio_driver(fluid_audio_driver_t* p);
 void fluid_core_audio_driver_settings(fluid_settings_t* settings);
 #endif
 
 #if DSOUND_SUPPORT
-fluid_audio_driver_t* new_fluid_dsound_audio_driver(fluid_settings_t* settings, 
+fluid_audio_driver_t* new_fluid_dsound_audio_driver(fluid_settings_t* settings,
 						  fluid_synth_t* synth);
 int delete_fluid_dsound_audio_driver(fluid_audio_driver_t* p);
 void fluid_dsound_audio_driver_settings(fluid_settings_t* settings);
 #endif
 
 #if PORTAUDIO_SUPPORT
-fluid_audio_driver_t* new_fluid_portaudio_driver(fluid_settings_t* settings, 
+fluid_audio_driver_t* new_fluid_portaudio_driver(fluid_settings_t* settings,
 						 fluid_synth_t* synth);
 int delete_fluid_portaudio_driver(fluid_audio_driver_t* p);
 #endif
 
 #if JACK_SUPPORT
 fluid_audio_driver_t* new_fluid_jack_audio_driver(fluid_settings_t* settings, fluid_synth_t* synth);
-fluid_audio_driver_t* new_fluid_jack_audio_driver2(fluid_settings_t* settings, 
+fluid_audio_driver_t* new_fluid_jack_audio_driver2(fluid_settings_t* settings,
 						 fluid_audio_func_t func, void* data);
 int delete_fluid_jack_audio_driver(fluid_audio_driver_t* p);
 void fluid_jack_audio_driver_settings(fluid_settings_t* settings);
 #endif
 
 #if SNDMAN_SUPPORT
-fluid_audio_driver_t* new_fluid_sndmgr_audio_driver(fluid_settings_t* settings, 
+fluid_audio_driver_t* new_fluid_sndmgr_audio_driver(fluid_settings_t* settings,
 						  fluid_synth_t* synth);
-fluid_audio_driver_t* new_fluid_sndmgr_audio_driver2(fluid_settings_t* settings, 
-						   fluid_audio_func_t func, 
+fluid_audio_driver_t* new_fluid_sndmgr_audio_driver2(fluid_settings_t* settings,
+						   fluid_audio_func_t func,
 						   void* data);
 int delete_fluid_sndmgr_audio_driver(fluid_audio_driver_t* p);
 #endif
 
 #define AUFILE_SUPPORT 1
 #if AUFILE_SUPPORT
-fluid_audio_driver_t* new_fluid_file_audio_driver(fluid_settings_t* settings, 
+fluid_audio_driver_t* new_fluid_file_audio_driver(fluid_settings_t* settings,
 						  fluid_synth_t* synth);
 int delete_fluid_file_audio_driver(fluid_audio_driver_t* p);
 void fluid_file_audio_driver_settings(fluid_settings_t* settings);
@@ -106,10 +106,10 @@
 
 fluid_audriver_definition_t fluid_audio_drivers[] = {
 #if OSS_SUPPORT
-  { "oss", 
-    new_fluid_oss_audio_driver, 
+  { "oss",
+    new_fluid_oss_audio_driver,
     new_fluid_oss_audio_driver2,
-    delete_fluid_oss_audio_driver, 
+    delete_fluid_oss_audio_driver,
     fluid_oss_audio_driver_settings },
 #endif
 #if ALSA_SUPPORT
@@ -120,45 +120,45 @@
     fluid_alsa_audio_driver_settings },
 #endif
 #if COREAUDIO_SUPPORT
-  { "coreaudio", 
-    new_fluid_core_audio_driver, 
+  { "coreaudio",
+    new_fluid_core_audio_driver,
     new_fluid_core_audio_driver2,
-    delete_fluid_core_audio_driver, 
+    delete_fluid_core_audio_driver,
     fluid_core_audio_driver_settings },
 #endif
 #if DSOUND_SUPPORT
-  { "dsound", 
-    new_fluid_dsound_audio_driver, 
+  { "dsound",
+    new_fluid_dsound_audio_driver,
     NULL,
-    delete_fluid_dsound_audio_driver, 
+    delete_fluid_dsound_audio_driver,
     fluid_dsound_audio_driver_settings },
 #endif
 #if PORTAUDIO_SUPPORT
-  { "portaudio", 
-    new_fluid_portaudio_driver, 
+  { "portaudio",
+    new_fluid_portaudio_driver,
     NULL,
-    delete_fluid_portaudio_driver, 
-    NULL }, 
+    delete_fluid_portaudio_driver,
+    NULL },
 #endif
 #if SNDMAN_SUPPORT
-  { "sndman", 
-    new_fluid_sndmgr_audio_driver, 
+  { "sndman",
+    new_fluid_sndmgr_audio_driver,
     new_fluid_sndmgr_audio_driver2,
-    delete_fluid_sndmgr_audio_driver, 
+    delete_fluid_sndmgr_audio_driver,
     NULL },
 #endif
 #if JACK_SUPPORT
-  { "jack", 
-    new_fluid_jack_audio_driver, 
+  { "jack",
+    new_fluid_jack_audio_driver,
     new_fluid_jack_audio_driver2,
-    delete_fluid_jack_audio_driver, 
+    delete_fluid_jack_audio_driver,
     fluid_jack_audio_driver_settings },
 #endif
 #if AUFILE_SUPPORT
-  { "file", 
-    new_fluid_file_audio_driver, 
+  { "file",
+    new_fluid_file_audio_driver,
     NULL,
-    delete_fluid_file_audio_driver, 
+    delete_fluid_file_audio_driver,
     fluid_file_audio_driver_settings },
 #endif
   { NULL, NULL, NULL, NULL, NULL }
@@ -241,11 +241,21 @@
     if (fluid_audio_drivers[i].settings != NULL) {
       fluid_audio_drivers[i].settings(settings);
     }
-  }  
+  }
 }
 
 
-fluid_audio_driver_t* 
+/**
+ * Create a new audio driver.
+ * @param settings Configuration settings used to select and create the audio
+ *   driver.
+ * @param synth Synthesizer instance for which the audio driver is created for.
+ * @return The new audio driver instance.
+ *
+ * Creates a new audio driver for a given 'synth' instance with a defined set
+ * of configuration 'settings'.
+ */
+fluid_audio_driver_t*
 new_fluid_audio_driver(fluid_settings_t* settings, fluid_synth_t* synth)
 {
   int i;
@@ -260,7 +270,7 @@
       driver = (*fluid_audio_drivers[i].new)(settings, synth);
       if (driver) {
 	driver->name = fluid_audio_drivers[i].name;
-      } 
+      }
       return driver;
     }
   }
@@ -269,7 +279,20 @@
   return NULL;
 }
 
-fluid_audio_driver_t* 
+/**
+ * Create a new audio driver.
+ * @param settings Configuration settings used to select and create the audio
+ *   driver.
+ * @param func Function called to fill audio buffers for audio playback
+ * @param data User defined data pointer to pass to 'func'
+ * @return The new audio driver instance.
+ *
+ * Like new_fluid_audio_driver() but allows for custom audio processing before
+ * audio is sent to audio driver.  It is the responsibility of the callback
+ * 'func' to render the audio into the buffers.
+ * NOTE: Not as efficient as new_fluid_audio_driver().
+ */
+fluid_audio_driver_t*
 new_fluid_audio_driver2(fluid_settings_t* settings, fluid_audio_func_t func, void* data)
 {
   int i;
@@ -285,7 +308,7 @@
       driver = (*fluid_audio_drivers[i].new2)(settings, func, data);
       if (driver) {
 	driver->name = fluid_audio_drivers[i].name;
-      } 
+      }
       return driver;
     }
   }
@@ -294,7 +317,13 @@
   return NULL;
 }
 
-void 
+/**
+ * Deletes an audio driver instance.
+ * @param driver Audio driver instance to delete
+ *
+ * Shuts down an audio driver and deletes its instance.
+ */
+void
 delete_fluid_audio_driver(fluid_audio_driver_t* driver)
 {
   int i;

Modified: haiku/trunk/src/libs/fluidsynth/src/fluid_adriver.h
===================================================================
--- haiku/trunk/src/libs/fluidsynth/src/fluid_adriver.h	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/src/libs/fluidsynth/src/fluid_adriver.h	2008-03-18 22:17:50 UTC (rev 24454)
@@ -11,7 +11,7 @@
  * 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
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -30,7 +30,7 @@
  * fluid_audio_driver_t
  */
 
-struct _fluid_audio_driver_t 
+struct _fluid_audio_driver_t
 {
   char* name;
 };

Modified: haiku/trunk/src/libs/fluidsynth/src/fluid_aufile.c
===================================================================
--- haiku/trunk/src/libs/fluidsynth/src/fluid_aufile.c	2008-03-18 21:41:02 UTC (rev 24453)
+++ haiku/trunk/src/libs/fluidsynth/src/fluid_aufile.c	2008-03-18 22:17:50 UTC (rev 24454)
@@ -11,7 +11,7 @@
  * 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
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -20,7 +20,7 @@
 
 /* fluid_aufile.c
  *
- * Audio driver, outputs the audio to a file (non real-time) 
+ * Audio driver, outputs the audio to a file (non real-time)
  *
  */
 
@@ -31,9 +31,9 @@
 
 
 /** fluid_file_audio_driver_t
- * 
+ *
  * This structure should not be accessed directly. Use audio port
- * functions instead.  
+ * functions instead.
  */

[... truncated: 16762 lines follow ...]


From korli at mail.berlios.de  Tue Mar 18 23:37:09 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Tue, 18 Mar 2008 23:37:09 +0100
Subject: [Haiku-commits] r24455 -
	haiku/trunk/src/add-ons/kernel/drivers/audio/echo/generic
Message-ID: <200803182237.m2IMb9jC012510@sheep.berlios.de>

Author: korli
Date: 2008-03-18 23:37:08 +0100 (Tue, 18 Mar 2008)
New Revision: 24455
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24455&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/audio/echo/generic/OsSupportBeOS.h
Log:
it seems GCC headers define NULL to __null instead of 0, fixing


Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/echo/generic/OsSupportBeOS.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/echo/generic/OsSupportBeOS.h	2008-03-18 22:17:50 UTC (rev 24454)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/echo/generic/OsSupportBeOS.h	2008-03-18 22:37:08 UTC (rev 24455)
@@ -91,7 +91,8 @@
 typedef uint64 		ULONGLONG ;
 typedef uint64 		*PULONGLONG ;
 typedef long 		*PKEVENT ;
-//#define NULL 0
+#undef NULL
+#define NULL 0
 #define CALLBACK
 
 #define CONST const



From axeld at pinc-software.de  Tue Mar 18 23:51:07 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Tue, 18 Mar 2008 23:51:07 +0100 CET
Subject: [Haiku-commits] r24452 - haiku/trunk/src/system/kernel/arch/x86
In-Reply-To: <200803182125.m2ILPZTh031608@sheep.berlios.de>
Message-ID: <36269433807-BeMail@zon>

korli at BerliOS <korli at mail.berlios.de> wrote:
> +static int64 props[MTRR_MAX_SOLUTIONS];

BTW that would be sProps, right?

Bye,
   Axel.



From umccullough at gmail.com  Wed Mar 19 04:49:27 2008
From: umccullough at gmail.com (Urias McCullough)
Date: Tue, 18 Mar 2008 20:49:27 -0700
Subject: [Haiku-commits] r24423 -
	haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <f019d2f30803180527q4e9b80a3ofd272161f3acd575@mail.gmail.com>
References: <f019d2f30803172024r3d316330s886ce1d1b73a9c83@mail.gmail.com>
	<696619337-BeMail@zon>
	<f019d2f30803180527q4e9b80a3ofd272161f3acd575@mail.gmail.com>
Message-ID: <1e80d8750803182049i5e1aa9fu6a2513ac4647a9d4@mail.gmail.com>

On 18/03/2008, Rene Gollent <anevilyak at gmail.com> wrote:
> >  Do you have more than one card in your system?
>  >  Does "ifconfig" show your card as having a link?
>
> Nope, only /dev/net/nforce/0, no other ethernet interfaces on that motherboard.

FWIW, DHCP also no longer works for me on an ipro1000-based machine...


From anevilyak at gmail.com  Wed Mar 19 05:40:05 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Tue, 18 Mar 2008 23:40:05 -0500
Subject: [Haiku-commits] r24423 -
	haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <1e80d8750803182049i5e1aa9fu6a2513ac4647a9d4@mail.gmail.com>
References: <f019d2f30803172024r3d316330s886ce1d1b73a9c83@mail.gmail.com>
	<696619337-BeMail@zon>
	<f019d2f30803180527q4e9b80a3ofd272161f3acd575@mail.gmail.com>
	<1e80d8750803182049i5e1aa9fu6a2513ac4647a9d4@mail.gmail.com>
Message-ID: <f019d2f30803182140r47c68f4bg32fbcb5b5150ad27@mail.gmail.com>

Hi Axel,

I'm still digging further into the dhcp code to figure out exactly
what fails but at least preliminary analysis suggests the network
stack is failing to send the broadcast packets because it doesn't find
a route, so DHCP bails out.

Will report more information as I find it.

Regards,

Rene


From anevilyak at gmail.com  Wed Mar 19 06:11:18 2008
From: anevilyak at gmail.com (Rene Gollent)
Date: Wed, 19 Mar 2008 00:11:18 -0500
Subject: [Haiku-commits] r24423 -
	haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <f019d2f30803182140r47c68f4bg32fbcb5b5150ad27@mail.gmail.com>
References: <f019d2f30803172024r3d316330s886ce1d1b73a9c83@mail.gmail.com>
	<696619337-BeMail@zon>
	<f019d2f30803180527q4e9b80a3ofd272161f3acd575@mail.gmail.com>
	<1e80d8750803182049i5e1aa9fu6a2513ac4647a9d4@mail.gmail.com>
	<f019d2f30803182140r47c68f4bg32fbcb5b5150ad27@mail.gmail.com>
Message-ID: <f019d2f30803182211k11b936cw299f6932ccf25da9@mail.gmail.com>

Hi again,

Giving up for tonight, posted syslog with route tracing enabled at
http://dev.haiku-os.org/ticket/1941.

Regards,

Rene


From axeld at mail.berlios.de  Wed Mar 19 09:41:01 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 19 Mar 2008 09:41:01 +0100
Subject: [Haiku-commits] r24456 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200803190841.m2J8f1UX005149@sheep.berlios.de>

Author: axeld
Date: 2008-03-19 09:41:00 +0100 (Wed, 19 Mar 2008)
New Revision: 24456
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24456&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
Log:
* If two equal keys were compared, the check for the key end was 
  incorrect; only the length of the key matters, not if they are null
  terminated. It would still return the correct value, though, it would
  just access one byte beyond the buffer (which didn't really matter 
  in this specific case).
* Minor cleanup.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp	2008-03-18 22:37:08 UTC (rev 24455)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp	2008-03-19 08:41:00 UTC (rev 24456)
@@ -2301,7 +2301,7 @@
 		// give a meaningful result
 		if (key1 == NULL && key2 != NULL)
 			return 1;
-		else if (key2 == NULL && key1 != NULL)
+		if (key2 == NULL && key1 != NULL)
 			return -1;
 
 		return 0;
@@ -2310,11 +2310,8 @@
 	switch (type) {
 	    case B_STRING_TYPE:
     	{
-			int len = min_c(keyLength1, keyLength2);
-			int result = strncmp((const char *)key1, (const char *)key2, len);
-
-			if (result == 0
-				&& !(((const char *)key1)[len] == '\0' && ((const char *)key2)[len] == '\0'))
+			int result = memcmp(key1, key2, min_c(keyLength1, keyLength2));
+			if (result == 0)
 				result = keyLength1 - keyLength2;
 
 			return result;
@@ -2328,7 +2325,7 @@
 		case B_UINT32_TYPE:
 			if (*(uint32 *)key1 == *(uint32 *)key2)
 				return 0;
-			else if (*(uint32 *)key1 > *(uint32 *)key2)
+			if (*(uint32 *)key1 > *(uint32 *)key2)
 				return 1;
 
 			return -1;
@@ -2337,7 +2334,7 @@
 		case B_INT64_TYPE:
 			if (*(int64 *)key1 == *(int64 *)key2)
 				return 0;
-			else if (*(int64 *)key1 > *(int64 *)key2)
+			if (*(int64 *)key1 > *(int64 *)key2)
 				return 1;
 
 			return -1;
@@ -2345,7 +2342,7 @@
 		case B_UINT64_TYPE:
 			if (*(uint64 *)key1 == *(uint64 *)key2)
 				return 0;
-			else if (*(uint64 *)key1 > *(uint64 *)key2)
+			if (*(uint64 *)key1 > *(uint64 *)key2)
 				return 1;
 
 			return -1;



From axeld at mail.berlios.de  Wed Mar 19 09:43:50 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 19 Mar 2008 09:43:50 +0100
Subject: [Haiku-commits] r24457 - in
	haiku/trunk/src/tests/system/libroot/posix: . string
Message-ID: <200803190843.m2J8hofd005423@sheep.berlios.de>

Author: axeld
Date: 2008-03-19 09:43:50 +0100 (Wed, 19 Mar 2008)
New Revision: 24457
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24457&view=rev

Added:
   haiku/trunk/src/tests/system/libroot/posix/string/
   haiku/trunk/src/tests/system/libroot/posix/string/Jamfile
   haiku/trunk/src/tests/system/libroot/posix/string/compare_test.cpp
Modified:
   haiku/trunk/src/tests/system/libroot/posix/Jamfile
Log:
* A simple test that shows that our string compare functions inherited
  by NewOS are all broken. This is the actual reason for bug #724.


Modified: haiku/trunk/src/tests/system/libroot/posix/Jamfile
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/Jamfile	2008-03-19 08:41:00 UTC (rev 24456)
+++ haiku/trunk/src/tests/system/libroot/posix/Jamfile	2008-03-19 08:43:50 UTC (rev 24457)
@@ -36,3 +36,4 @@
 SubInclude HAIKU_TOP src tests system libroot posix bonnie ;
 SubInclude HAIKU_TOP src tests system libroot posix math ;
 SubInclude HAIKU_TOP src tests system libroot posix posixtestsuite ;
+SubInclude HAIKU_TOP src tests system libroot posix string ;

Added: haiku/trunk/src/tests/system/libroot/posix/string/Jamfile
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/string/Jamfile	2008-03-19 08:41:00 UTC (rev 24456)
+++ haiku/trunk/src/tests/system/libroot/posix/string/Jamfile	2008-03-19 08:43:50 UTC (rev 24457)
@@ -0,0 +1,5 @@
+SubDir HAIKU_TOP src tests system libroot posix string ;
+
+SimpleTest compare_test
+	: compare_test.cpp
+;

Added: haiku/trunk/src/tests/system/libroot/posix/string/compare_test.cpp
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/string/compare_test.cpp	2008-03-19 08:41:00 UTC (rev 24456)
+++ haiku/trunk/src/tests/system/libroot/posix/string/compare_test.cpp	2008-03-19 08:43:50 UTC (rev 24457)
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT license.
+ */
+
+
+#include <stdio.h>
+#include <string.h>
+
+
+int
+main(int argc, char** argv)
+{
+	char a[] = { -26, '\0' };
+	char b[] = { '.', '\0' };
+
+	printf("strcmp(): %d\n", strcmp(a, b));
+	printf("memcmp(): %d\n", memcmp(a, b, 1));
+	printf("strncmp(): %d\n", strncmp(a, b, 1));
+	printf("strcasecmp(): %d\n", strcasecmp(a, b));
+	printf("strncasecmp(): %d\n", strncasecmp(a, b, 1));
+
+	return 0;
+}



From axeld at mail.berlios.de  Wed Mar 19 09:45:11 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 19 Mar 2008 09:45:11 +0100
Subject: [Haiku-commits] r24458 - haiku/trunk/src/system/libroot/posix/string
Message-ID: <200803190845.m2J8jBKn005624@sheep.berlios.de>

Author: axeld
Date: 2008-03-19 09:45:08 +0100 (Wed, 19 Mar 2008)
New Revision: 24458
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24458&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/string/memcmp.c
   haiku/trunk/src/system/libroot/posix/string/strcasecmp.c
   haiku/trunk/src/system/libroot/posix/string/strcmp.c
   haiku/trunk/src/system/libroot/posix/string/strncmp.c
Log:
* Replaced our string compare functions (and memcmp()) with versions
  that actually work correctly (and treat the data as unsigned 
  characters).
* This fixes bug #724.


Modified: haiku/trunk/src/system/libroot/posix/string/memcmp.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/string/memcmp.c	2008-03-19 08:43:50 UTC (rev 24457)
+++ haiku/trunk/src/system/libroot/posix/string/memcmp.c	2008-03-19 08:45:08 UTC (rev 24458)
@@ -1,20 +1,23 @@
-/* 
-** Copyright 2001, Travis Geiselbrecht. All rights reserved.
-** Distributed under the terms of the NewOS License.
-*/
+/*
+ * Copyright 2008, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT license.
+ */
 
-#include <sys/types.h>
+
 #include <string.h>
 
 
 int
-memcmp(const void *cs, const void *ct, size_t count)
+memcmp(const void *_a, const void *_b, size_t count)
 {
-	const unsigned char *su1, *su2;
-	signed char res = 0;
+	const unsigned char *a = (const unsigned char *)_a;
+	const unsigned char *b = (const unsigned char *)_b;
 
-	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-		if ((res = *su1 - *su2) != 0)
-			break;
-	return res;
+	while (count-- > 0) {
+		int cmp = *a++ - *b++;
+		if (cmp != 0)
+			return cmp;
+	}
+
+	return 0;
 }

Modified: haiku/trunk/src/system/libroot/posix/string/strcasecmp.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/string/strcasecmp.c	2008-03-19 08:43:50 UTC (rev 24457)
+++ haiku/trunk/src/system/libroot/posix/string/strcasecmp.c	2008-03-19 08:45:08 UTC (rev 24458)
@@ -35,18 +35,17 @@
 #include <string.h>
 #include <ctype.h>
 
-//typedef unsigned char u_char;
 
-
 int
 strcasecmp(const char *s1, const char *s2)
 {
 	const u_char *us1 = (const u_char *)s1;
 	const u_char *us2 = (const u_char *)s2;
 
-	while (tolower(*us1) == tolower(*us2++))
+	while (tolower(*us1) == tolower(*us2++)) {
 		if (*us1++ == '\0')
 			return 0;
+	}
 
 	return tolower(*us1) - tolower(*--us2);
 }

Modified: haiku/trunk/src/system/libroot/posix/string/strcmp.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/string/strcmp.c	2008-03-19 08:43:50 UTC (rev 24457)
+++ haiku/trunk/src/system/libroot/posix/string/strcmp.c	2008-03-19 08:45:08 UTC (rev 24458)
@@ -1,21 +1,19 @@
-/* 
-** Copyright 2001, Travis Geiselbrecht. All rights reserved.
-** Distributed under the terms of the NewOS License.
-*/
+/*
+ * Copyright 2008, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT license.
+ */
 
-#include <sys/types.h>
+
+#include <stdbool.h>
 #include <string.h>
 
 
 int
-strcmp(char const *cs, char const *ct)
+strcmp(char const *a, char const *b)
 {
-	signed char __res;
-
-	while (1) {
-		if ((__res = *cs - *ct++) != 0 || !*cs++)
-			break;
+	while (true) {
+		int cmp = (unsigned char)*a - (unsigned char)*b++;
+		if (cmp != 0 || *a++ == '\0')
+			return cmp;
 	}
-
-	return __res;
 }

Modified: haiku/trunk/src/system/libroot/posix/string/strncmp.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/string/strncmp.c	2008-03-19 08:43:50 UTC (rev 24457)
+++ haiku/trunk/src/system/libroot/posix/string/strncmp.c	2008-03-19 08:45:08 UTC (rev 24458)
@@ -1,22 +1,20 @@
-/* 
-** Copyright 2001, Travis Geiselbrecht. All rights reserved.
-** Distributed under the terms of the NewOS License.
-*/
+/*
+ * Copyright 2008, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT license.
+ */
 
-#include <sys/types.h>
+
 #include <string.h>
 
 
 int
-strncmp(char const *cs, char const *ct, size_t count)
+strncmp(char const *a, char const *b, size_t count)
 {
-	signed char __res = 0;
-
-	while (count > 0) {
-		if ((__res = *cs - *ct++) != 0 || !*cs++)
-			break;
-		count--;
+	while (count-- > 0) {
+		int cmp = (unsigned char)*a - (unsigned char)*b++;
+		if (cmp != 0 || *a++ == '\0')
+			return cmp;
 	}
 
-	return __res;
+	return 0;
 }



From korli at users.berlios.de  Wed Mar 19 10:13:28 2008
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Wed, 19 Mar 2008 10:13:28 +0100
Subject: [Haiku-commits] r24458 -
	haiku/trunk/src/system/libroot/posix/string
In-Reply-To: <200803190845.m2J8jBKn005624@sheep.berlios.de>
References: <200803190845.m2J8jBKn005624@sheep.berlios.de>
Message-ID: <c47b1d430803190213g79a09b65y10e3643bb6ed38b6@mail.gmail.com>

Hi Axel,

2008/3/19, axeld at BerliOS <axeld at mail.berlios.de>:
>  * Replaced our string compare functions (and memcmp()) with versions
>   that actually work correctly (and treat the data as unsigned
>   characters).

Could there be some optimized versions of these functions (ie in
glibc) to be used ?

Bye,
J?r?me


From korli at users.berlios.de  Wed Mar 19 10:14:06 2008
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Wed, 19 Mar 2008 10:14:06 +0100
Subject: [Haiku-commits] r24452 - haiku/trunk/src/system/kernel/arch/x86
In-Reply-To: <36269433807-BeMail@zon>
References: <200803182125.m2ILPZTh031608@sheep.berlios.de>
	<36269433807-BeMail@zon>
Message-ID: <c47b1d430803190214h3ce5a01seb65a6a29189d5b7@mail.gmail.com>

2008/3/18, Axel D?rfler <axeld at pinc-software.de>:
> korli at BerliOS <korli at mail.berlios.de> wrote:
>  > +static int64 props[MTRR_MAX_SOLUTIONS];
>
>  BTW that would be sProps, right?
>

Acknowledged! Thanks!

Bye,
J?r?me


From axeld at pinc-software.de  Wed Mar 19 11:04:43 2008
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Wed, 19 Mar 2008 11:04:43 +0100 CET
Subject: [Haiku-commits]
 =?iso-8859-15?q?r24458_-_haiku/trunk/src/system/l?=
 =?iso-8859-15?q?ibroot/posix/string?=
In-Reply-To: <c47b1d430803190213g79a09b65y10e3643bb6ed38b6@mail.gmail.com>
Message-ID: <7859192934-BeMail@zon>

"J?r?me Duval" <korli at users.berlios.de> wrote:
> 2008/3/19, axeld at BerliOS <axeld at mail.berlios.de>:
> >  * Replaced our string compare functions (and memcmp()) with 
> > versions
> >   that actually work correctly (and treat the data as unsigned
> >   characters).
> Could there be some optimized versions of these functions (ie in
> glibc) to be used ?

Sure, feel free to do that :-)
memcmp() seems to be a different version when using userland code, 
already. The files here should be the generic fall back versions.

Bye,
   Axel.



From axeld at mail.berlios.de  Wed Mar 19 11:42:46 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 19 Mar 2008 11:42:46 +0100
Subject: [Haiku-commits] r24459 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200803191042.m2JAgkrY021152@sheep.berlios.de>

Author: axeld
Date: 2008-03-19 11:42:46 +0100 (Wed, 19 Mar 2008)
New Revision: 24459
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24459&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp
Log:
* Routes that belong to an interface without a link are no longer 
  ignored, but other routes will be preferred if available.
* This fixes problems with networking cards that don't report their
  link status correctly (ipro100, see bug #1936), or too late 
  (nforce, ipro1000, see bug #1941). Drivers that did not report any
  status at all were not affected, though.


Modified: haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp	2008-03-19 08:45:08 UTC (rev 24458)
+++ haiku/trunk/src/add-ons/kernel/network/stack/routes.cpp	2008-03-19 10:42:46 UTC (rev 24459)
@@ -161,6 +161,8 @@
 	// find last matching route
 
 	RouteList::Iterator iterator = domain->routes.GetIterator();
+	net_route_private *candidate = NULL;
+
 	TRACE(("test address %s for routes...\n", AddressString(domain, address).Data()));
 
 	// TODO: alternate equal default routes
@@ -168,10 +170,6 @@
 	while (iterator.HasNext()) {
 		net_route_private *route = iterator.Next();
 
-		// ignore routes that point to devices that have no link
-		if ((route->interface->device->flags & IFF_LINK) == 0)
-			continue;
-
 		if (route->mask) {
 			sockaddr maskedAddress;
 			domain->address_module->mask_address(address, route->mask,
@@ -186,10 +184,16 @@
 		TRACE(("  found route: %s, flags %lx\n",
 			AddressString(domain, route->destination).Data(), route->flags));
 
+		// neglect routes that point to devices that have no link
+		if ((route->interface->device->flags & IFF_LINK) == 0) {
+			candidate = route;
+			continue;
+		}
+
 		return route;
 	}
 
-	return NULL;
+	return candidate;
 }
 
 



From bga at bug-br.org.br  Wed Mar 19 12:31:09 2008
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Wed, 19 Mar 2008 08:31:09 -0300
Subject: [Haiku-commits] r24423
	-	haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <1e80d8750803182049i5e1aa9fu6a2513ac4647a9d4@mail.gmail.com>
References: <f019d2f30803172024r3d316330s886ce1d1b73a9c83@mail.gmail.com>	<696619337-BeMail@zon>	<f019d2f30803180527q4e9b80a3ofd272161f3acd575@mail.gmail.com>
	<1e80d8750803182049i5e1aa9fu6a2513ac4647a9d4@mail.gmail.com>
Message-ID: <47E0F97D.9090504@bug-br.org.br>

Urias McCullough wrote:
>>>  Do you have more than one card in your system?
>>  >  Does "ifconfig" show your card as having a link?
>>
>> Nope, only /dev/net/nforce/0, no other ethernet interfaces on that motherboard.
> 
> FWIW, DHCP also no longer works for me on an ipro1000-based machine...

I also managed to check on my machine (which Axel's change was supposed 
to help) and it is also broken. :) If Axel does not beat me to it, I 
will take a look at the problem again this weekend.

-Bruno


From bonefish at mail.berlios.de  Wed Mar 19 12:38:29 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 19 Mar 2008 12:38:29 +0100
Subject: [Haiku-commits] r24460 - in buildtools/trunk: . patches patches/perl
Message-ID: <200803191138.m2JBcT1p010400@sheep.berlios.de>

Author: bonefish
Date: 2008-03-19 12:38:28 +0100 (Wed, 19 Mar 2008)
New Revision: 24460
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24460&view=rev

Added:
   buildtools/trunk/patches/
   buildtools/trunk/patches/perl/
   buildtools/trunk/patches/perl/perl-5.10.0.diff
Log:
First version of a Perl 5.10.0 patch adding Haiku support:
* Built with debugging enabled (-O0 -g).
* No support for sockets or threads yet. We do want those eventually,
  though.
* 6 tests of Perl's test suite fail. 2 due to missing sockets support. 4
  others since they compile modules and make no provisions to link
  against libperl.so, which they should. Have to check back with the
  maintainters.


Added: buildtools/trunk/patches/perl/perl-5.10.0.diff
===================================================================
--- buildtools/trunk/patches/perl/perl-5.10.0.diff	2008-03-19 10:42:46 UTC (rev 24459)
+++ buildtools/trunk/patches/perl/perl-5.10.0.diff	2008-03-19 11:38:28 UTC (rev 24460)
@@ -0,0 +1,613 @@
+Index: perlio.h
+===================================================================
+--- perlio.h	(.../vendor/perl/current)	(revision 18)
++++ perlio.h	(.../trunk)	(revision 18)
+@@ -64,7 +64,7 @@
+  */
+ #include <stdio.h>
+ 
+-#ifdef __BEOS__
++#if defined(__BEOS__) && !defined(__HAIKU__)
+ int fseeko(FILE *stream, off_t offset, int whence);
+ off_t ftello(FILE *stream);
+ #endif
+Index: haiku/haikuish.h
+===================================================================
+--- haiku/haikuish.h	(.../vendor/perl/current)	(revision 0)
++++ haiku/haikuish.h	(.../trunk)	(revision 18)
+@@ -0,0 +1,11 @@
++#ifndef PERL_HAIKU_HAIKUISH_H
++#define PERL_HAIKU_HAIKUISH_H
++
++#include "../unixish.h"
++
++/* We need <sys/wait.h> or else the W* macros aren't defined in perl.h. */
++
++#include <sys/wait.h>
++
++#endif
++
+Index: perl.c
+===================================================================
+--- perl.c	(.../vendor/perl/current)	(revision 18)
++++ perl.c	(.../trunk)	(revision 18)
+@@ -107,7 +107,7 @@
+ 
+ #endif
+ 
+-#ifdef __BEOS__
++#if defined(__BEOS__) && !defined(__HAIKU__)
+ #  define HZ 1000000
+ #endif
+ 
+@@ -381,7 +381,7 @@
+      * BeOS has those, but returns the wrong value.
+      * The HZ if not originally defined has been by now
+      * been defined as CLK_TCK, if available. */
+-#if defined(HAS_SYSCONF) && defined(_SC_CLK_TCK) && !defined(__BEOS__)
++#if defined(HAS_SYSCONF) && defined(_SC_CLK_TCK) && (!defined(__BEOS__) || defined(__HAIKU__))
+     PL_clocktick = sysconf(_SC_CLK_TCK);
+     if (PL_clocktick <= 0)
+ #endif
+Index: perl.h
+===================================================================
+--- perl.h	(.../vendor/perl/current)	(revision 18)
++++ perl.h	(.../trunk)	(revision 18)
+@@ -2551,7 +2551,10 @@
+ #   define ISHISH "macos classic"
+ #endif
+ 
+-#if defined(__BEOS__)
++#if defined(__HAIKU__)
++#   include "haiku/haikuish.h"
++#   define ISHISH "haiku"
++#elif defined(__BEOS__)
+ #   include "beos/beosish.h"
+ #   define ISHISH "beos"
+ #endif
+@@ -5609,9 +5612,10 @@
+ #if O_TEXT != O_BINARY
+     /* If you have different O_TEXT and O_BINARY and you are a CLRF shop,
+      * that is, you are somehow DOSish. */
+-#   if defined(__BEOS__) || defined(__VOS__) || defined(__CYGWIN__)
+-    /* BeOS has O_TEXT != O_BINARY but O_TEXT and O_BINARY have no effect;
+-     * BeOS is always UNIXoid (LF), not DOSish (CRLF). */
++#   if defined(__BEOS__) || defined(__HAIKU__) || defined(__VOS__) || \
++	defined(__CYGWIN__)
++    /* BeOS/Haiku has O_TEXT != O_BINARY but O_TEXT and O_BINARY have no effect;
++     * BeOS/Haiku is always UNIXoid (LF), not DOSish (CRLF). */
+     /* VOS has O_TEXT != O_BINARY, and they have effect,
+      * but VOS always uses LF, never CRLF. */
+     /* If you have O_TEXT different from your O_BINARY but you still are
+Index: lib/CPANPLUS/Internals/Constants/Report.pm
+===================================================================
+--- lib/CPANPLUS/Internals/Constants/Report.pm	(.../vendor/perl/current)	(revision 18)
++++ lib/CPANPLUS/Internals/Constants/Report.pm	(.../trunk)	(revision 18)
+@@ -29,6 +29,7 @@
+     Cygwin      => 'cygwin',
+     Darwin      => 'darwin',
+     EBCDIC      => 'os390|os400|posix-bc|vmesa',
++    Haiku       => 'haiku',
+     HPUX        => 'hpux',
+     Linux       => 'linux',
+     MSDOS       => 'dos|os2|MSWin32|cygwin',
+Index: lib/CPANPLUS/t/20_CPANPLUS-Dist-MM.t
+===================================================================
+--- lib/CPANPLUS/t/20_CPANPLUS-Dist-MM.t	(.../vendor/perl/current)	(revision 18)
++++ lib/CPANPLUS/t/20_CPANPLUS-Dist-MM.t	(.../trunk)	(revision 18)
+@@ -45,7 +45,13 @@
+ $conf->set_conf( cpantest => 0 );
+ 
+ ### Redirect errors to file ###
+-*STDERR                          = output_handle() unless $Verbose;
++### The code in IPC::Cmd::_open3_run() uses a pipe to get the child's stderr
++### output and IPC::Open3::_open3() will not dup the child's error end to the
++### original STDERR FD. Instead it will assign the pipe's write end FD, which
++### will be CLOEXEC. On exec() this FD will be closed and the select()+read()
++### loop in IPC::Cmd::_open3_run() will become very busy, since select()
++### will always return immediately due to the half-closed pipe.
++#*STDERR                          = output_handle() unless $Verbose;
+ 
+ ### dont uncomment this, it screws up where STDOUT goes and makes
+ ### test::harness create test counter mismatches
+Index: lib/Module/Build.pm
+===================================================================
+--- lib/Module/Build.pm	(.../vendor/perl/current)	(revision 18)
++++ lib/Module/Build.pm	(.../trunk)	(revision 18)
+@@ -30,6 +30,7 @@
+ 		 dynixptx  Unix
+ 		 freebsd   Unix
+ 		 linux     Unix
++		 haiku     Unix
+ 		 hpux      Unix
+ 		 irix      Unix
+ 		 darwin    Unix
+Index: lib/Term/ReadLine.pm
+===================================================================
+--- lib/Term/ReadLine.pm	(.../vendor/perl/current)	(revision 18)
++++ lib/Term/ReadLine.pm	(.../trunk)	(revision 18)
+@@ -222,7 +222,8 @@
+ 	$console = "sys\$command";
+     }
+ 
+-    if (($^O eq 'amigaos') || ($^O eq 'beos') || ($^O eq 'epoc')) {
++    if (($^O eq 'amigaos') || ($^O eq 'beos') || ($^O eq 'epoc') ||
++	($^O eq 'haiku')) {
+ 	$console = undef;
+     }
+     elsif ($^O eq 'os2') {
+Index: lib/ExtUtils/MM.pm
+===================================================================
+--- lib/ExtUtils/MM.pm	(.../vendor/perl/current)	(revision 18)
++++ lib/ExtUtils/MM.pm	(.../trunk)	(revision 18)
+@@ -69,6 +69,7 @@
+ $Is{VOS}    = $^O eq 'vos';
+ $Is{QNX}    = $^O eq 'qnx';
+ $Is{AIX}    = $^O eq 'aix';
++$Is{Haiku}  = $^O eq 'haiku';
+ 
+ $Is{Unix}   = !grep { $_ } values %Is;
+ 
+Index: lib/ExtUtils/MM_Haiku.pm
+===================================================================
+--- lib/ExtUtils/MM_Haiku.pm	(.../vendor/perl/current)	(revision 0)
++++ lib/ExtUtils/MM_Haiku.pm	(.../trunk)	(revision 18)
+@@ -0,0 +1,62 @@
++package ExtUtils::MM_Haiku;
++
++use strict;
++
++=head1 NAME
++
++ExtUtils::MM_Haiku - methods to override UN*X behaviour in ExtUtils::MakeMaker
++
++=head1 SYNOPSIS
++
++ use ExtUtils::MM_Haiku;	# Done internally by ExtUtils::MakeMaker if needed
++
++=head1 DESCRIPTION
++
++See ExtUtils::MM_Unix for a documentation of the methods provided
++there. This package overrides the implementation of these methods, not
++the semantics.
++
++=over 4
++
++=cut
++
++use ExtUtils::MakeMaker::Config;
++use File::Spec;
++require ExtUtils::MM_Any;
++require ExtUtils::MM_Unix;
++
++use vars qw(@ISA $VERSION);
++ at ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
++$VERSION = '6.42';
++
++
++=item os_flavor
++
++Haiku is Haiku.
++
++=cut
++
++sub os_flavor {
++    return('Haiku');
++}
++
++=item init_linker
++
++libperl.a equivalent to be linked to dynamic extensions.
++
++=cut
++
++sub init_linker {
++    my($self) = shift;
++
++    $self->{PERL_ARCHIVE} ||= 
++      File::Spec->catdir('$(PERL_INC)',$Config{libperl});
++    $self->{PERL_ARCHIVE_AFTER} ||= '';
++    $self->{EXPORT_LIST}  ||= '';
++}
++
++=back
++
++1;
++__END__
++
+Index: hints/haiku.sh
+===================================================================
+--- hints/haiku.sh	(.../vendor/perl/current)	(revision 0)
++++ hints/haiku.sh	(.../trunk)	(revision 18)
+@@ -0,0 +1,65 @@
++# Haiku hints file
++# $Id$
++
++prefix="/boot/home/config"
++
++libpth='/boot/beos/system/lib /boot/home/config/lib'
++usrinc='/boot/develop/headers/posix'
++locinc='/boot/develop/headers/ /boot/home/config/include'
++
++libc='/boot/beos/system/lib/libroot.so'
++libs=' '
++
++#d_bcmp='define'
++#d_bcopy='define'
++#d_bzero='define'
++#d_index='define'
++#d_htonl='define' # It exists, but much hackery would be required to support.
++# a bunch of extra includes would have to be added, and it's only used at
++# one place in the non-socket perl code.
++
++#these are all in libdll.a, which my version of nm doesn't know how to parse.
++#if I can get it to both do that, and scan multiple library files, perhaps
++#these can be gotten rid of.
++
++case "$usemymalloc" in
++'') usemymalloc='n' ;;
++esac
++# Hopefully, Be's malloc knows better than perl's.
++
++d_link='undef'
++dont_use_nlink='define'
++# no posix (aka hard) links for us!
++
++d_syserrlst='undef'
++# the array syserrlst[] is useless for the most part.
++# large negative numbers really kind of suck in arrays.
++
++# Sockets didn't use to be real sockets but BONE changes this.
++#if [ ! -f /boot/develop/headers/be/bone/sys/socket.h ]; then
++#    d_socket='undef'
++#    d_gethbyaddr='undef'
++#    d_gethbyname='undef'
++#    d_getsbyname='undef'
++#
++#	libs='-lnet'
++#fi
++
++
++cc="gcc"
++ld='gcc'
++
++export PATH="$PATH:$PWD/haiku"
++
++case "$ldlibpthname" in
++'') ldlibpthname=LIBRARY_PATH ;;
++esac
++
++# the waitpid() wrapper (among other things)
++#archobjs="beos.o"
++#test -f beos.c || cp beos/beos.c .
++
++# TODO: Remove when using a native Haiku compiler!
++ccflags="$ccflags -g -O0 -D__HAIKU__ -fno-strict-aliasing -pipe"
++cppflags="$cppflags -D__HAIKU__"
++
+Index: ext/Errno/Errno_pm.PL
+===================================================================
+--- ext/Errno/Errno_pm.PL	(.../vendor/perl/current)	(revision 18)
++++ ext/Errno/Errno_pm.PL	(.../trunk)	(revision 18)
+@@ -155,7 +155,7 @@
+ 	# we might miss out on compiler-specific ones
+ 	$file{"$ENV{GUSI}include:sys:errno.h"} = 1;
+ 
+-    } elsif ($^O eq 'beos') {
++    } elsif ($^O eq 'beos' || $^O eq 'haiku') {
+ 	# hidden in a special place
+ 	$file{'/boot/develop/headers/posix/errno.h'} = 1;
+ 
+@@ -250,7 +250,8 @@
+ 
+     close(CPPI);
+ 
+-    unless ($^O eq 'MacOS' || $^O eq 'beos') {	# trust what we have / get later
++    unless ($^O eq 'MacOS' || $^O eq 'beos' || $^O eq 'haiku') {
++	# trust what we have / get later
+     # invoke CPP and read the output
+ 
+ 	if ($^O eq 'VMS') {
+@@ -293,12 +294,12 @@
+ 
+     # Many of the E constants (including ENOENT, which is being
+     # used in the Perl test suite a lot), are available only as
+-    # enums in BeOS, so compiling and executing some code is about
++    # enums in BeOS/Haiku, so compiling and executing some code is about
+     # only way to find out what the numeric Evalues are. In fact above, we
+     # didn't even bother to get the values of the ones that have numeric
+     # values, since we can get all of them here, anyway.
+ 
+-    if ($^O eq 'beos') {
++    if ($^O eq 'beos' || $^O eq 'haiku') {
+ 	if (open(C, ">errno.c")) {
+ 	    my @allerrs = keys %err;
+ 	    print C <<EOF;
+Index: ext/Compress/Raw/Zlib/zlib-src/zutil.h
+===================================================================
+--- ext/Compress/Raw/Zlib/zlib-src/zutil.h	(.../vendor/perl/current)	(revision 18)
++++ ext/Compress/Raw/Zlib/zlib-src/zutil.h	(.../trunk)	(revision 18)
+@@ -147,7 +147,7 @@
+ #  define OS_CODE  0x0f
+ #endif
+ 
+-#if defined(_BEOS_) || defined(RISCOS)
++#if (defined(_BEOS_) && !defined(__HAIKU__)) || defined(RISCOS)
+ #  define fdopen(fd,mode) NULL /* No fdopen() */
+ #endif
+ 
+Index: ext/Time/HiRes/t/HiRes.t
+===================================================================
+--- ext/Time/HiRes/t/HiRes.t	(.../vendor/perl/current)	(revision 18)
++++ ext/Time/HiRes/t/HiRes.t	(.../trunk)	(revision 18)
+@@ -337,7 +337,8 @@
+ 	&& defined &Time::HiRes::getitimer
+ 	&& has_symbol('ITIMER_VIRTUAL')
+ 	&& $Config{sig_name} =~ m/\bVTALRM\b/
+-        && $^O !~ /^(nto)$/) { # nto: QNX 6 has the API but no implementation
++	&& $^O !~ /^(nto)$/ # nto: QNX 6 has the API but no implementation
++	&& $^O ne 'haiku') { # same for Haiku
+     for (18..19) {
+ 	print "ok $_ # Skip: no virtual interval timers\n";
+     }
+Index: ext/Haiku/Makefile.PL
+===================================================================
+--- ext/Haiku/Makefile.PL	(.../vendor/perl/current)	(revision 0)
++++ ext/Haiku/Makefile.PL	(.../trunk)	(revision 18)
+@@ -0,0 +1,20 @@
++use 5.006;
++use ExtUtils::MakeMaker;
++
++unless ($^O eq "haiku") {
++    die "OS unsupported\n";
++}
++
++#my @libs;
++#push @libs, '-L/lib/w32api -lole32 -lversion' if $^O eq "cygwin";
++
++WriteMakefile(
++    NAME          => 'Haiku',
++    VERSION_FROM  => 'Haiku.pm',
++#    LIBS          => \@libs,
++    INSTALLDIRS   => ($] >= 5.008004 ? 'perl' : 'site'),
++    NO_META       => 1,
++
++    AUTHOR        => 'Ingo Weinhold <ingo_weinhold at gmx.de>',
++    ABSTRACT_FROM => 'Haiku.pm',
++);
+Index: ext/Haiku/Haiku.xs
+===================================================================
+--- ext/Haiku/Haiku.xs	(.../vendor/perl/current)	(revision 0)
++++ ext/Haiku/Haiku.xs	(.../trunk)	(revision 18)
+@@ -0,0 +1,141 @@
++#define PERL_NO_GET_CONTEXT
++#include "EXTERN.h"
++#include "perl.h"
++#include "XSUB.h"
++
++#include <stdarg.h>
++
++#include <OS.h>
++
++static void
++haiku_do_debugger(const char* format,...)
++{
++    char buffer[1024];
++    va_list args;
++    va_start(args, format);
++    my_vsnprintf(buffer, sizeof(buffer), format, args);
++    va_end(args);
++
++    debugger(buffer);
++}
++
++static void
++haiku_do_debug_printf(pTHX_ register SV *sv,
++    void (*printfFunc)(const char*,...))
++{
++    dVAR;
++
++    if (!sv)
++	return;
++    if (SvTYPE(sv) == SVt_IV && SvIOK(sv)) {
++	assert(!SvGMAGICAL(sv));
++	if (SvIsUV(sv))
++	    (*printfFunc)("%"UVuf, (UV)SvUVX(sv));
++	else
++	    (*printfFunc)("%"IVdf, (IV)SvIVX(sv));
++	return;
++    }
++    else {
++	STRLEN len;
++	/* Do this first to trigger any overloading.  */
++	const char *tmps = SvPV_const(sv, len);
++	U8 *tmpbuf = NULL;
++#undef strnlen
++if (strnlen(tmps, len) != len)
++haiku_do_debugger("haiku_do_debug_printf(): len: %lu, acually: %lu",
++len, strnlen(tmps, len));
++
++	if (!SvUTF8(sv)) {
++	    /* We don't modify the original scalar.  */
++	    tmpbuf = bytes_to_utf8((const U8*) tmps, &len);
++	    tmps = (char *) tmpbuf;
++	}
++
++	if (len)
++	    (*printfFunc)("%.*s", (int)len, tmps);
++	Safefree(tmpbuf);
++    }
++}
++
++XS(haiku_debug_printf)
++{
++    dVAR;
++    dXSARGS;
++    dORIGMARK;
++    SV *sv;
++
++    if (items < 1)
++	Perl_croak(aTHX_ "usage: Haiku::debug_printf($format,...)");
++
++    sv = newSV(0);
++
++    if (SvTAINTED(MARK[1]))
++	TAINT_PROPER("debug_printf");
++    do_sprintf(sv, SP - MARK, MARK + 1);
++
++    haiku_do_debug_printf(sv, &debug_printf);
++
++    SvREFCNT_dec(sv);
++    SP = ORIGMARK;
++    PUSHs(&PL_sv_yes);
++}
++
++XS(haiku_ktrace_printf)
++{
++    dVAR;
++    dXSARGS;
++    dORIGMARK;
++    SV *sv;
++
++    if (items < 1)
++	Perl_croak(aTHX_ "usage: Haiku::debug_printf($format,...)");
++
++    sv = newSV(0);
++
++    if (SvTAINTED(MARK[1]))
++	TAINT_PROPER("ktrace_printf");
++    do_sprintf(sv, SP - MARK, MARK + 1);
++
++    haiku_do_debug_printf(sv, &ktrace_printf);
++
++    SvREFCNT_dec(sv);
++    SP = ORIGMARK;
++    PUSHs(&PL_sv_yes);
++}
++
++XS(haiku_debugger)
++{
++    dVAR;
++    dXSARGS;
++    dORIGMARK;
++    SV *sv;
++
++    if (items < 1)
++	Perl_croak(aTHX_ "usage: Haiku::debugger($format,...)");
++
++    sv = newSV(0);
++
++    if (SvTAINTED(MARK[1]))
++	TAINT_PROPER("debugger");
++    do_sprintf(sv, SP - MARK, MARK + 1);
++
++    haiku_do_debug_printf(sv, &haiku_do_debugger);
++
++    SvREFCNT_dec(sv);
++    SP = ORIGMARK;
++    PUSHs(&PL_sv_yes);
++}
++
++MODULE = Haiku            PACKAGE = Haiku
++
++PROTOTYPES: DISABLE
++
++BOOT:
++{
++    char *file = __FILE__;
++
++    newXS("Haiku::debug_printf", haiku_debug_printf, file);
++    newXS("Haiku::ktrace_printf", haiku_ktrace_printf, file);
++    newXS("Haiku::debugger", haiku_debugger, file);
++    XSRETURN_YES;
++}
+Index: ext/Haiku/Haiku.pm
+===================================================================
+--- ext/Haiku/Haiku.pm	(.../vendor/perl/current)	(revision 0)
++++ ext/Haiku/Haiku.pm	(.../trunk)	(revision 18)
+@@ -0,0 +1,54 @@
++package Haiku;
++
++BEGIN {
++    use strict;
++    use vars qw|$VERSION $XS_VERSION @ISA @EXPORT @EXPORT_OK|;
++
++    require Exporter;
++    require DynaLoader;
++
++    @ISA = qw|Exporter DynaLoader|;
++    $VERSION = '0.34';
++    $XS_VERSION = $VERSION;
++    $VERSION = eval $VERSION;
++
++    @EXPORT = qw(
++    );
++    @EXPORT_OK = qw(
++    );
++}
++
++bootstrap Haiku;
++
++1;
++
++__END__
++
++=head1 NAME
++
++Haiku - Interfaces to some Haiku API Functions
++
++=head1 DESCRIPTION
++
++The Haiku module contains functions to access Haiku APIs.
++
++=head2 Alphabetical Listing of Haiku Functions
++
++=over
++
++=item Haiku::debug_printf(FORMAT,...)
++
++Similar to printf, but prints to system debug output.
++
++=item Haiku::debugger(FORMAT,...)
++
++Drops the program into the debugger. The printf like arguments define the
++debugger message.
++
++=item Haiku::ktrace_printf(FORMAT,...)
++
++Similar to printf, but prints to a kernel tracing entry.
++
++=back
++
++=cut
+Index: Configure
+===================================================================
+--- Configure	(.../vendor/perl/current)	(revision 18)
++++ Configure	(.../trunk)	(revision 18)
+@@ -7864,6 +7864,7 @@
+     case "$lddlflags" in
+     '') case "$osname" in
+   			beos) dflt='-nostart' ;;
++  			haiku) dflt='-nostart' ;;
+ 			hpux) dflt='-b';
+ 			      case "$gccversion" in
+ 			      '') dflt="$dflt +vnocompatwarnings" ;;
+@@ -7946,7 +7947,7 @@
+ 	;;
+ *)	case "$useshrplib" in
+ 	'')	case "$osname" in
+-		svr4*|nonstopux|dgux|dynixptx|esix|powerux|beos|cygwin*)
++		svr4*|nonstopux|dgux|dynixptx|esix|powerux|beos|cygwin*|haiku)
+ 			dflt=y
+ 			also='Building a shared libperl is required for dynamic loading to work on your system.'
+ 			;;
+@@ -8109,6 +8110,9 @@
+ 	beos)
+ 		# beos doesn't like the default, either.
+ 		;;
++	haiku)
++		# Haiku doesn't like the default, either.
++		;;
+ 	hpux*)
+ 		# hpux doesn't like the default, either.
+ 		tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""



From bonefish at mail.berlios.de  Wed Mar 19 13:30:54 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 19 Mar 2008 13:30:54 +0100
Subject: [Haiku-commits] r24461 - in buildtools/vendor/autoconf/current: .
	build-aux config m4
Message-ID: <200803191230.m2JCUsTr027800@sheep.berlios.de>

Author: bonefish
Date: 2008-03-19 13:30:44 +0100 (Wed, 19 Mar 2008)
New Revision: 24461
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24461&view=rev

Added:
   buildtools/vendor/autoconf/current/build-aux/
   buildtools/vendor/autoconf/current/build-aux/config.guess
   buildtools/vendor/autoconf/current/build-aux/config.sub
   buildtools/vendor/autoconf/current/build-aux/elisp-comp
   buildtools/vendor/autoconf/current/build-aux/install-sh
   buildtools/vendor/autoconf/current/build-aux/mdate-sh
   buildtools/vendor/autoconf/current/build-aux/missing
   buildtools/vendor/autoconf/current/build-aux/texinfo.tex
   buildtools/vendor/autoconf/current/m4/
   buildtools/vendor/autoconf/current/m4/m4.m4
Removed:
   buildtools/vendor/autoconf/current/config/config.guess
   buildtools/vendor/autoconf/current/config/config.sub
   buildtools/vendor/autoconf/current/config/elisp-comp
   buildtools/vendor/autoconf/current/config/install-sh
   buildtools/vendor/autoconf/current/config/m4.m4
   buildtools/vendor/autoconf/current/config/mdate-sh
   buildtools/vendor/autoconf/current/config/missing
   buildtools/vendor/autoconf/current/config/texinfo.tex
Log:
To prepare to load autoconf-2.61 into
buildtools/vendor/autoconf/current, perform 8 renames.

* buildtools/vendor/autoconf/current/build-aux/config.guess: Renamed
  from buildtools/vendor/autoconf/current/config/config.guess.
* buildtools/vendor/autoconf/current/build-aux/config.sub: Renamed from
  buildtools/vendor/autoconf/current/config/config.sub.
* buildtools/vendor/autoconf/current/build-aux/elisp-comp: Renamed from
  buildtools/vendor/autoconf/current/config/elisp-comp.
* buildtools/vendor/autoconf/current/build-aux/install-sh: Renamed from
  buildtools/vendor/autoconf/current/config/install-sh.
* buildtools/vendor/autoconf/current/build-aux/mdate-sh: Renamed from
  buildtools/vendor/autoconf/current/config/mdate-sh.
* buildtools/vendor/autoconf/current/m4/m4.m4: Renamed from
  buildtools/vendor/autoconf/current/config/m4.m4.
* buildtools/vendor/autoconf/current/build-aux/texinfo.tex: Renamed
  from buildtools/vendor/autoconf/current/config/texinfo.tex.
* buildtools/vendor/autoconf/current/build-aux/missing: Renamed from
  buildtools/vendor/autoconf/current/config/missing.


Copied: buildtools/vendor/autoconf/current/build-aux/config.guess (from rev 24460, buildtools/vendor/autoconf/current/config/config.guess)

Copied: buildtools/vendor/autoconf/current/build-aux/config.sub (from rev 24460, buildtools/vendor/autoconf/current/config/config.sub)

Copied: buildtools/vendor/autoconf/current/build-aux/elisp-comp (from rev 24460, buildtools/vendor/autoconf/current/config/elisp-comp)

Copied: buildtools/vendor/autoconf/current/build-aux/install-sh (from rev 24460, buildtools/vendor/autoconf/current/config/install-sh)

Copied: buildtools/vendor/autoconf/current/build-aux/mdate-sh (from rev 24460, buildtools/vendor/autoconf/current/config/mdate-sh)

Copied: buildtools/vendor/autoconf/current/build-aux/missing (from rev 24460, buildtools/vendor/autoconf/current/config/missing)

Copied: buildtools/vendor/autoconf/current/build-aux/texinfo.tex (from rev 24460, buildtools/vendor/autoconf/current/config/texinfo.tex)

Deleted: buildtools/vendor/autoconf/current/config/config.guess

Deleted: buildtools/vendor/autoconf/current/config/config.sub

Deleted: buildtools/vendor/autoconf/current/config/elisp-comp

Deleted: buildtools/vendor/autoconf/current/config/install-sh

Deleted: buildtools/vendor/autoconf/current/config/m4.m4

Deleted: buildtools/vendor/autoconf/current/config/mdate-sh

Deleted: buildtools/vendor/autoconf/current/config/missing

Deleted: buildtools/vendor/autoconf/current/config/texinfo.tex

Copied: buildtools/vendor/autoconf/current/m4/m4.m4 (from rev 24460, buildtools/vendor/autoconf/current/config/m4.m4)



From bonefish at mail.berlios.de  Wed Mar 19 13:32:31 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 19 Mar 2008 13:32:31 +0100
Subject: [Haiku-commits] r24462 - in buildtools/vendor/autoconf/current: .
	bin build-aux config doc lib lib/Autom4te lib/autoconf
	lib/autoscan lib/autotest lib/emacs lib/m4sugar m4 man tests
Message-ID: <200803191232.m2JCWV8G027976@sheep.berlios.de>

Author: bonefish
Date: 2008-03-19 13:30:53 +0100 (Wed, 19 Mar 2008)
New Revision: 24462
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24462&view=rev

Added:
   buildtools/vendor/autoconf/current/config/announce-gen
   buildtools/vendor/autoconf/current/lib/autoconf/erlang.m4
   buildtools/vendor/autoconf/current/tests/autoscan.at
   buildtools/vendor/autoconf/current/tests/autotest.at
Removed:
   buildtools/vendor/autoconf/current/bin/autoconf.in
   buildtools/vendor/autoconf/current/config/Makefile.am
   buildtools/vendor/autoconf/current/config/Makefile.in
   buildtools/vendor/autoconf/current/config/mkinstalldirs
   buildtools/vendor/autoconf/current/config/move-if-change
   buildtools/vendor/autoconf/current/doc/texinfo.tex
   buildtools/vendor/autoconf/current/tests/wrapper.in
Modified:
   buildtools/vendor/autoconf/current/AUTHORS
   buildtools/vendor/autoconf/current/BUGS
   buildtools/vendor/autoconf/current/COPYING
   buildtools/vendor/autoconf/current/ChangeLog
   buildtools/vendor/autoconf/current/ChangeLog.0
   buildtools/vendor/autoconf/current/ChangeLog.1
   buildtools/vendor/autoconf/current/ChangeLog.2
   buildtools/vendor/autoconf/current/GNUmakefile
   buildtools/vendor/autoconf/current/INSTALL
   buildtools/vendor/autoconf/current/Makefile.am
   buildtools/vendor/autoconf/current/Makefile.cfg
   buildtools/vendor/autoconf/current/Makefile.in
   buildtools/vendor/autoconf/current/Makefile.maint
   buildtools/vendor/autoconf/current/NEWS
   buildtools/vendor/autoconf/current/README
   buildtools/vendor/autoconf/current/THANKS
   buildtools/vendor/autoconf/current/TODO
   buildtools/vendor/autoconf/current/aclocal.m4
   buildtools/vendor/autoconf/current/bin/Makefile.am
   buildtools/vendor/autoconf/current/bin/Makefile.in
   buildtools/vendor/autoconf/current/bin/autoconf.as
   buildtools/vendor/autoconf/current/bin/autoheader.in
   buildtools/vendor/autoconf/current/bin/autom4te.in
   buildtools/vendor/autoconf/current/bin/autoreconf.in
   buildtools/vendor/autoconf/current/bin/autoscan.in
   buildtools/vendor/autoconf/current/bin/autoupdate.in
   buildtools/vendor/autoconf/current/bin/ifnames.in
   buildtools/vendor/autoconf/current/build-aux/config.guess
   buildtools/vendor/autoconf/current/build-aux/config.sub
   buildtools/vendor/autoconf/current/build-aux/elisp-comp
   buildtools/vendor/autoconf/current/build-aux/install-sh
   buildtools/vendor/autoconf/current/build-aux/mdate-sh
   buildtools/vendor/autoconf/current/build-aux/missing
   buildtools/vendor/autoconf/current/build-aux/texinfo.tex
   buildtools/vendor/autoconf/current/config/prev-version.txt
   buildtools/vendor/autoconf/current/configure
   buildtools/vendor/autoconf/current/configure.ac
   buildtools/vendor/autoconf/current/doc/Makefile.am
   buildtools/vendor/autoconf/current/doc/Makefile.in
   buildtools/vendor/autoconf/current/doc/autoconf.info
   buildtools/vendor/autoconf/current/doc/autoconf.texi
   buildtools/vendor/autoconf/current/doc/fdl.texi
   buildtools/vendor/autoconf/current/doc/install.texi
   buildtools/vendor/autoconf/current/doc/make-stds.texi
   buildtools/vendor/autoconf/current/doc/stamp-vti
   buildtools/vendor/autoconf/current/doc/standards.info
   buildtools/vendor/autoconf/current/doc/standards.texi
   buildtools/vendor/autoconf/current/doc/version.texi
   buildtools/vendor/autoconf/current/lib/Autom4te/C4che.pm
   buildtools/vendor/autoconf/current/lib/Autom4te/ChannelDefs.pm
   buildtools/vendor/autoconf/current/lib/Autom4te/Channels.pm
   buildtools/vendor/autoconf/current/lib/Autom4te/Configure_ac.pm
   buildtools/vendor/autoconf/current/lib/Autom4te/FileUtils.pm
   buildtools/vendor/autoconf/current/lib/Autom4te/General.pm
   buildtools/vendor/autoconf/current/lib/Autom4te/Makefile.in
   buildtools/vendor/autoconf/current/lib/Autom4te/Request.pm
   buildtools/vendor/autoconf/current/lib/Autom4te/Struct.pm
   buildtools/vendor/autoconf/current/lib/Autom4te/XFile.pm
   buildtools/vendor/autoconf/current/lib/Makefile.am
   buildtools/vendor/autoconf/current/lib/Makefile.in
   buildtools/vendor/autoconf/current/lib/autoconf/Makefile.am
   buildtools/vendor/autoconf/current/lib/autoconf/Makefile.in
   buildtools/vendor/autoconf/current/lib/autoconf/autoconf.m4
   buildtools/vendor/autoconf/current/lib/autoconf/autoheader.m4
   buildtools/vendor/autoconf/current/lib/autoconf/autoscan.m4
   buildtools/vendor/autoconf/current/lib/autoconf/autotest.m4
   buildtools/vendor/autoconf/current/lib/autoconf/autoupdate.m4
   buildtools/vendor/autoconf/current/lib/autoconf/c.m4
   buildtools/vendor/autoconf/current/lib/autoconf/fortran.m4
   buildtools/vendor/autoconf/current/lib/autoconf/functions.m4
   buildtools/vendor/autoconf/current/lib/autoconf/general.m4
   buildtools/vendor/autoconf/current/lib/autoconf/headers.m4
   buildtools/vendor/autoconf/current/lib/autoconf/lang.m4
   buildtools/vendor/autoconf/current/lib/autoconf/libs.m4
   buildtools/vendor/autoconf/current/lib/autoconf/oldnames.m4
   buildtools/vendor/autoconf/current/lib/autoconf/programs.m4
   buildtools/vendor/autoconf/current/lib/autoconf/specific.m4
   buildtools/vendor/autoconf/current/lib/autoconf/status.m4
   buildtools/vendor/autoconf/current/lib/autoconf/types.m4
   buildtools/vendor/autoconf/current/lib/autom4te.in
   buildtools/vendor/autoconf/current/lib/autoscan/Makefile.am
   buildtools/vendor/autoconf/current/lib/autoscan/Makefile.in
   buildtools/vendor/autoconf/current/lib/autoscan/autoscan.pre
   buildtools/vendor/autoconf/current/lib/autotest/Makefile.am
   buildtools/vendor/autoconf/current/lib/autotest/Makefile.in
   buildtools/vendor/autoconf/current/lib/autotest/autotest.m4
   buildtools/vendor/autoconf/current/lib/autotest/general.m4
   buildtools/vendor/autoconf/current/lib/emacs/Makefile.am
   buildtools/vendor/autoconf/current/lib/emacs/Makefile.in
   buildtools/vendor/autoconf/current/lib/emacs/autoconf-mode.el
   buildtools/vendor/autoconf/current/lib/emacs/autotest-mode.el
   buildtools/vendor/autoconf/current/lib/freeze.mk
   buildtools/vendor/autoconf/current/lib/m4sugar/Makefile.am
   buildtools/vendor/autoconf/current/lib/m4sugar/Makefile.in
   buildtools/vendor/autoconf/current/lib/m4sugar/m4sh.m4
   buildtools/vendor/autoconf/current/lib/m4sugar/m4sugar.m4
   buildtools/vendor/autoconf/current/m4/m4.m4
   buildtools/vendor/autoconf/current/man/Makefile.am
   buildtools/vendor/autoconf/current/man/Makefile.in
   buildtools/vendor/autoconf/current/man/autoconf.1
   buildtools/vendor/autoconf/current/man/autoheader.1
   buildtools/vendor/autoconf/current/man/autom4te.1
   buildtools/vendor/autoconf/current/man/autoreconf.1
   buildtools/vendor/autoconf/current/man/autoscan.1
   buildtools/vendor/autoconf/current/man/autoupdate.1
   buildtools/vendor/autoconf/current/man/config.guess.1
   buildtools/vendor/autoconf/current/man/config.sub.1
   buildtools/vendor/autoconf/current/man/ifnames.1
   buildtools/vendor/autoconf/current/tests/Makefile.am
   buildtools/vendor/autoconf/current/tests/Makefile.in
   buildtools/vendor/autoconf/current/tests/acc.at
   buildtools/vendor/autoconf/current/tests/acfortran.at
   buildtools/vendor/autoconf/current/tests/acfunctions.at
   buildtools/vendor/autoconf/current/tests/acgeneral.at
   buildtools/vendor/autoconf/current/tests/acheaders.at
   buildtools/vendor/autoconf/current/tests/aclang.at
   buildtools/vendor/autoconf/current/tests/aclibs.at
   buildtools/vendor/autoconf/current/tests/acprograms.at
   buildtools/vendor/autoconf/current/tests/acspecific.at
   buildtools/vendor/autoconf/current/tests/acstatus.at
   buildtools/vendor/autoconf/current/tests/actypes.at
   buildtools/vendor/autoconf/current/tests/atlocal.in
   buildtools/vendor/autoconf/current/tests/base.at
   buildtools/vendor/autoconf/current/tests/c.at
   buildtools/vendor/autoconf/current/tests/compile.at
   buildtools/vendor/autoconf/current/tests/foreign.at
   buildtools/vendor/autoconf/current/tests/fortran.at
   buildtools/vendor/autoconf/current/tests/local.at
   buildtools/vendor/autoconf/current/tests/m4sh.at
   buildtools/vendor/autoconf/current/tests/m4sugar.at
   buildtools/vendor/autoconf/current/tests/mktests.sh
   buildtools/vendor/autoconf/current/tests/package.m4
   buildtools/vendor/autoconf/current/tests/semantics.at
   buildtools/vendor/autoconf/current/tests/suite.at
   buildtools/vendor/autoconf/current/tests/tools.at
   buildtools/vendor/autoconf/current/tests/torture.at
   buildtools/vendor/autoconf/current/tests/wrapper.as
Log:
Load autoconf-2.61 into buildtools/vendor/autoconf/current.


Modified: buildtools/vendor/autoconf/current/AUTHORS
===================================================================
--- buildtools/vendor/autoconf/current/AUTHORS	2008-03-19 12:30:44 UTC (rev 24461)
+++ buildtools/vendor/autoconf/current/AUTHORS	2008-03-19 12:30:53 UTC (rev 24462)
@@ -28,5 +28,5 @@
 
 You should have received a copy of the GNU General Public License
 along with autoconf; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.

Modified: buildtools/vendor/autoconf/current/BUGS
===================================================================
--- buildtools/vendor/autoconf/current/BUGS	2008-03-19 12:30:44 UTC (rev 24461)
+++ buildtools/vendor/autoconf/current/BUGS	2008-03-19 12:30:53 UTC (rev 24462)
@@ -19,31 +19,25 @@
 
 	You should have received a copy of the GNU General Public License
 	along with autoconf; see the file COPYING.  If not, write to
-	the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-	Boston, MA 02111-1307, USA.
+	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+	Boston, MA 02110-1301, USA.
 
 
 Autoconf must not be used in production if there are ``Serious'' bugs,
 and use with caution an Autoconf with ``Important bugs''.
 
-Many other bugs are registered on the GNATS server:
-
-     http://bugs.gnu.org/cgi-bin/gnatsweb.pl?database=autoconf
-
-Please, don't register bugs listed below: we already know we have to
-address them.
-
 * Status
 
                     /*--------------------------.
                     | Sane for full scale use.  |
                     `--------------------------*/
 
-* Interoperability bugs
+* No known serious or important bugs.
 
-** libtool 1.4.2, configure.ac, and AC_CONFIG_AUX_DIR
+* Minor Problems
 
-configure.ac files that use AC_CONFIG_AUX_DIR do not work with libtool
-1.4.2.  To work around the problem, you can rename configure.ac to
-configure.in.  Or you can apply Roger Leigh's patch to libtool; see
-<http://mail.gnu.org/pipermail/libtool-patches/2002-January/001659.html>.
+Some Makefile segments do not behave correctly in VPATH builds with proprietary
+`make' programs.  Some BSD `make's will work.  For best results, build in the
+source directory or use GNU `make'.
+
+Parallel builds via `make -jN' do not work.

Modified: buildtools/vendor/autoconf/current/COPYING
===================================================================
--- buildtools/vendor/autoconf/current/COPYING	2008-03-19 12:30:44 UTC (rev 24461)
+++ buildtools/vendor/autoconf/current/COPYING	2008-03-19 12:30:53 UTC (rev 24462)
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

Modified: buildtools/vendor/autoconf/current/ChangeLog
===================================================================
--- buildtools/vendor/autoconf/current/ChangeLog	2008-03-19 12:30:44 UTC (rev 24461)
+++ buildtools/vendor/autoconf/current/ChangeLog	2008-03-19 12:30:53 UTC (rev 24462)
@@ -1,3 +1,5999 @@
+2006-11-17  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Version 2.61.
+
+	* configure.ac (AC_INIT): Bump to 2.61.
+	* NEWS: Likewise.
+
+	* tests/autotest.at (Macro with backslash in a test title):
+	Comment out for now, as this tests neither fails nor passes
+	reliably.  Problem reported by Ralf Wildenhues.
+
+2006-11-16  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/general.m4 (_AC_INIT_PARSE_ENABLE): Fix some typos
+	in previous change, which caused test failures.
+
+2006-11-16  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Factor out
+	code for --enable, --disable, --with, and --without to...
+	(_AC_INIT_PARSE_ENABLE): ... a new macro.
+	* doc/autoconf.texi (Package Options):
+	* NEWS: Document that AC_ARG_ENABLE allows dots, too.
+
+2006-11-16  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Import these changes from config via gnulib:
+
+	2006-11-15  Ben Elliston  <bje at gnu.org>
+
+	From Josselin Mouette <joss at debian.org>:
+	* build-aux/config.guess (SX-8:SUPER-UX:*:*): New.
+
+	2006-11-08  Ben Elliston  <bje at gnu.org>
+
+	* build-aux/config.guess (authenticamd:Interix*:[3456]*): Another AMD64.
+
+	2006-11-07  Steve Woodford  <scw at NetBSD.org>
+		    Ben Elliston  <bje at gnu.org>
+
+	* build-aux/config.guess (*:NetBSD:*:*): Handle sh5el arch.
+	* build-aux/config.sub (sh5el): New basic_machine.
+
+
+	Import this change from coreutils:
+
+	2006-02-13  Jim Meyering  <jim at meyering.net>
+
+	* GNUmakefile (all): Emit diagnostics to stderr, not stdout.
+
+
+	Import this change from gnustandards via gnulib:
+
+	2006-11-15  Karl Berry  <karl at gnu.org>
+
+	* standards.texi: core -> memory, throughout.
+	(CPU Portability): show correct example of calling write
+	on a char value; thanks to Paul Eggert for the code.
+	Both of these suggestions from Eugene Y. Vasserman.
+
+
+	Import these changes from texinfo via gnulib:
+
+	2006-11-08  Karl Berry  <karl at gnu.org>
+
+	* build-aux/texinfo.tex (\dopdfimage): look for png, jpg/jpeg/JPG, and
+	  as well as pdf images, since they are supported in pdftex with
+	  no further ado.
+
+	2006-11-05  Karl Berry  <karl at gnu.org>
+
+	* doc/texinfo.tex (Image Syntax): don't mention GIF any more.
+
+2006-11-13  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: Document the AC_ARG_WITH change.
+
+2006-11-13  Bruno Haible  <bruno at clisp.org>
+
+	* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): For --with, --without
+	options, transliterate also dots to underscores.
+	(_AC_ENABLE_IF): Transliterate also dots to underscores.
+	* doc/autoconf.texi (External Software): Document that AC_ARG_WITH's
+	first argument may also contain dots.
+
+2006-11-09  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* tests/mktests.sh (ac_exclude_list): Exclude AC_PROG_CXX_C_O, for
+	benefit of platforms like Solaris+GCC where it is common to have a
+	non-working g++ installation.
+
+2006-11-08  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+	and Joel E. Denny  <jdenny at ces.clemson.edu>
+	and Paul Eggert  <eggert at cs.ucla.edu>
+
+	* tests/autotest.at (AT_CHECK_AT_TITLE): Fix shell quoting bugs
+	and non-portable sed scripts, and use $CONFIG_SHELL when invoking
+	./micro-suite.
+
+2006-11-08  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/types.m4 (AC_TYPE_LONG_LONG_INT): Set
+	ac_cv_type_long_long_int to 'yes' instead of 'cross-compiling'.
+	Imported from a similar patch to gnulib by Bruno Haible.
+
+2006-11-08  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: New macros AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS.
+	* doc/autoconf.texi (C Compiler): Document them.
+	* lib/autoconf/c.m4 (AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS):
+	New macros, taken from gnulib.
+
+2006-11-07  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/types.m4 (AC_TYPE_LONG_LONG_INT): Detect bug in
+	Tandem NonStop Kernel (OSS) cc -O circa 2004, reported by
+	Matthew Woehlke.
+
+2006-10-28  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* tests/torture.at (Configuring subdirectories): Do not skip
+	Automake 1.10 nor future Automake 11.1 (sic).
+
+2006-10-26  Joel E. Denny  <jdenny at ces.clemson.edu>
+	and Stepan Kasal  <kasal at ucw.cz>
+
+	Handle special characters in test case titles correctly.
+	* lib/autotest/general.m4 (AT_INIT): M4-quote and AS_ESCAPE AT_help_all
+	properly.
+	(AT_SETUP): M4-quote and AS_ESCAPE the title properly everywhere.
+	* tests/autotest.at (AT_CHECK_AT_TITLE): Add EXPANDED-TITLE-TO-TEST
+	argument.  Extend to check titles printed by ./micro-suite and
+	./micro-suite -l and the title in micro-suite.log.
+	(Backquote in a test title,
+	Single-quote in a test title,
+	Double-quote in a test title): Don't expect failure anymore.
+	(Backslash in a test title): Put a non-whitespace character after the
+	backslash so that Bourne shells might actually see it as an escape
+	sequence.
+	(Brackets in a test title,
+	Pound in a test title,
+	Comma in a test title,
+	Quoted Macro in a test title,
+	Macro in a test title,
+	Macro with single-quote in a test title): New tests.
+	(Macro with backquote in a test title,
+	Macro with double-quote in a test title,
+	Macro with backslash in a test title): New tests expected to fail.
+	* tests/torture.at (#define header templates): M4-quote this title in
+	AT_SETUP call so that no M4 code is commented inadvertently somewhere.
+	The visible effect was a stray [] in the testsuite output.
+
+2006-10-27  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (Limitations of Builtins): Do not invoke
+	`trap ... 0' inside a function, for AIX sh.
+
+2006-10-26  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* tests/base.at (AC_COMPUTE_INT): Test **0** rather than 1 / 0,
+	since powerpc-apple-darwin8-gcc-4.0.1 (Apple Computer, Inc. build
+	5363) simply issues a warning when dividing by zero at compile
+	time.  Problem reported by Elias Pipping.
+
+2006-10-26  Eric Blake  <ebb9 at byu.net>
+
+	* THANKS: Update.
+	* doc/autoconf.texi (Evaluation Macros): Improve the example to
+	show effect on macros that expand with commas.
+	Reported by Joel E. Denny.
+
+	* tests/m4sugar.at (m4_warn, m4_require: circular dependencies):
+	Also work with M4 1.4.8.
+
+2006-10-25  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Slashes): Document Tru64 4.0 bug reported by
+	Jim Meyering.
+
+2006-10-25  Stepan Kasal  <kasal at ucw.cz>
+
+	* tests/tools.at (autom4te --force): New test, verifies that
+	`--force' always rewrites the output file.
+
+2006-10-24  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Limitations of Usual Tools): Document that rm
+	needs operands on NetBSD 2.0.2.  Problem reported by Bruno Haible.
+
+2006-10-24  Stepan Kasal  <kasal at ucw.cz>
+
+	* tools/trace.at (autoconf --trace: user macros): Test `$%'.
+
+2006-10-24  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_MACRO_VALUE):
+	If FUNCTION-BODY is nonempty, use AC_LINK_IFELSE rather than
+	AC_COMPILE_IFELSE, to work around problem with OSF/1 4.0F fseeko
+	reported by Nelson H. F. Beebe for Coreutils 6.4.
+
+	* tests/tools.at (autoconf --trace: user macros): Remove test
+	for tracing multiline macros, since m4 1.4.7a uses a different
+	way to number lines.  Problem reported by Ralf Wildenhues.
+
+2006-10-24  Stepan Kasal  <kasal at ucw.cz>
+
+	* bin/autom4te.in (handle_m4): Do not redirect stdin to
+	/dev/null since the heuristics for interactive behaviour was
+	fixed in CVS m4.
+
+	* bin/autom4te.in: With --force, always refresh the output
+	file.  Problem reported by Greg Schafer <gschafer at zip.com.au>.
+
+	* bin/autoconf.as: Fix the verbose message at the end.
+
+2006-10-23  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* configure.ac (AC_INIT): Bump to 2.60c.
+	* NEWS: Likewise.
+
+2006-10-22  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: Version 2.60b.
+
+	Import this change from Texinfo:
+	2006-10-15  Karl Berry  <karl at gnu.org>
+	* build-aux/texinfo.tex: automake 1.10
+
+	* NEWS: Remove AC_CACHE_CHECK_INT.
+	* doc/autoconf.texi (Caching Results): Likewise.
+	* lib/autoconf/general.m4 (_AC_CACHE_CHECK_INT): Renamed from
+	AC_CACHE_CHECK_INT, since it's no longer public.
+	* lib/autoconf/types.m4: All uses of AC_CACHE_CHECK_INT changed.
+	* tests/base.at (AC_COMPUTE_INT): Test this, not AC_CACHE_CHECK_INT.
+
+2006-10-20  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (Limitations of Usual Tools): Fix two typos.
+
+2006-10-19  Eric Blake  <ebb9 at byu.net>
+
+	* lib/m4sugar/m4sugar.m4 (m4_mkstemp): New macro.
+	(m4_maketemp): Avoid warnings with M4 1.9a.
+	* lib/emacs/autoconf-mode.el (autoconf-font-lock-keywords): Color
+	m4_mkstemp.
+	* doc/autoconf.texi (Redefined M4 Macros): Document m4_mkstemp.
+	* NEWS: Likewise.
+
+2006-10-16  Eric Blake  <ebb9 at byu.net>
+
+	* doc/autoconf.texi (Setting Output Variables): Fix typo.
+
+	* bin/autoconf.as (version): Reword to match GNU Coding
+	Standards.
+	* bin/autoheader.in (version): Likewise.
+	* bin/autom4te.in (version): Likewise.
+	* bin/autoreconf.in (version): Likewise.
+	* bin/autoscan.in (version): Likewise.
+	* bin/autoupdate.in (version): Likewise.
+	* bin/ifnames.in (version): Likewise.
+
+2006-10-14  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/m4sugar/m4sh.m4 (AS_LITERAL_IF): Expand $1 before
+	looking for special shell characters.
+	* lib/autoconf/functions.m4 (AC_CHECK_FUNC): Do not expand the
+	macro defined by AS_VAR_PUSHDEF before passing it as a
+	parameter.
+	* lib/autoconf/general.m4 (AC_CHECK_FILE, AC_CHECK_DECL):
+	* lib/autoconf/libs.m4 (AC_SEARCH_LIBS, AC_CHECK_LIB):
+	* lib/autoconf/types.m4 (_AC_CHECK_TYPE_NEW, AC_CHECK_MEMBER):
+	* lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL):
+	(_AC_CHECK_HEADER_NEW, _AC_CHECK_HEADER_OLD, _AC_CHECK_HEADER_DIRENT):
+	Likewise.
+	* lib/autotest/general.m4 (AT_INIT): Quote parameters of
+	AS_VAR_* properly.
+	* tests/m4sh.at (AS_LITERAL_IF): New test.
+
+2006-10-14  Paul Eggert  <eggert at cs.ucla.edu>
+
+	(Imported from Automake.)
+	* build-aux/install-sh (posix_mkdir): Reject FreeBSD 6.1 mkdir -p -m,
+	which incorrectly sets the mode of an existing destination
+	directory.  In some cases the unpatched install-sh could do the
+	equivalent of "chmod 777 /" or "chmod 0 /" on a buggy FreeBSD
+	system.  We hope this is rare in practice, but it's clearly worth
+	fixing.  Problem reported by Alex Unleashed in
+	<http://lists.gnu.org/archive/html/bug-autoconf/2006-10/msg00012.html>.
+	Also, don't bother to check for -m bugs unless we're using -m;
+	suggested by Stepan Kasal.
+
+2006-10-14  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Import this change from Automake:
+
+	2006-08-23  Alexandre Duret-Lutz  <adl at gnu.org>
+	* lib/Autom4te/ChannelDefs.pm (usage): Mention that -Wportability
+	is enabled by default with gnu and gnits strictness.
+	Report from Bruno Haible.
+
+	2006-03-10  Alexandre Duret-Lutz  <adl at gnu.org>
+	* lib/Autom4te/ChannelDefs.pm: Make -Wportability the default in
+	gnu and gnits modes.
+
+	Import this change from Config:
+
+	2006-09-20  Ben Elliston  <bje at gnu.org>
+	* build-aux/config.sub (score, score-*): New.
+
+	Import this change from Gnulib:
+
+	2006-09-16  Karl Berry  <karl at gnu.org>
+	* doc/fdl.texi (ADDENDUM): switch to @heading from @appendixsubsec,
+	to avoid sectioning errors.
+
+	Import these changes from Texinfo:
+
+	2006-10-04  Karl Berry  <karl at gnu.org>
+	* build-aux/texinfo.tex (\singlequotechar): rename to \codequoteright.
+	(\quoteexpand): rename to \rquoteexpand.
+	(\codequoteleft): new def, to look for @set codequotebacktick.
+	(\lquoteexpand, \quoteexpand): new defs.
+	(\lquoteChar, \rquoteChar, \dashChar, \underChar: new \chardef's.
+	(\code): must use new \...Char values, since now ` is active.
+
+	2006-08-26  Karl Berry  <karl at gnu.org>
+	* build-aux/texinfo.tex (\textdegree): New command.
+
+	2006-08-12  Karl Berry  <karl at gnu.org>
+	* build-aux/texinfo.tex (error \box0): smaller font.
+
+2006-10-14  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (Autoheader Macros): Fix syntax error.
+
+2006-10-13  Stepan Kasal  <kasal at ucw.cz>
+
+	* doc/autoconf.texi (Autoheader Macros): Warn that the text
+	added to the template can get mangled.
+
+2006-10-13  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_OBSTACK): In the test,
+	include the default headers, and redefine obstack_chunk_alloc
+	and obstack_chunk_free.  Fixes false failure with glibc.
+
+2006-10-12  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Set as_executable_p,
+	for backward compatibility with Libtool 1.5.22.  Problem reported
+	by Ralf Wildenhues.
+
+2006-10-12  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/c.m4 (AC_PROG_GCC_TRADITIONAL): Require
+	AC_PROG_CC.
+	Report by IOhannes m zmoelnig <zmoelnig at iem.at>.
+
+2006-10-11  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: AC_USE_SYSTEM_EXTENSIONS now defines _TANDEM_SOURCE for
+	the NonStop platform.
+	* doc/autoconf.texi (Posix Variants): Likewise.
+	* lib/autoconf/specific.m4 (AC_USE_SYSTEM_EXTENSIONS): Likewise.
+
+	* lib/m4sugar/m4sh.m4 (AS_TEST_X): New macro.
+	(AS_EXECUTABLE_P): Use as_test_x rather than as_executable_p.
+	(_AS_TEST_PREPARE): Set as_test_x rather than as_executable_p.
+	Use a better substitute, by inspecting the output of "ls"
+	rather than just using ":".
+	* lib/autoconf/general.m4 (_AC_LINK_IFELSE): Use AS_TEST_X
+	rather than AS_EXECUTABLE_P, since we needn't worry about
+	non-regular files here.
+
+	* NEWS: Autoconf-generated shell scripts no longer export BIN_SH,
+	due to configuration hassles with this.  See Tonya Underwood's report
+	<http://lists.gnu.org/archive/html/bug-autoconf/2006-10/msg00003.html>.
+	* doc/autoconf.texi (Special Shell Variables): Likewise.
+
+2006-10-11  Paul Eggert  <eggert at cs.ucla.edu>
+	    Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/m4sugar/m4sh.m4 (AS_BOURNE_COMPATIBLE): Don't set BIN_SH.
+	(_AS_DETECT_BETTER_SHELL): Don't look in /usr/bin/posix.
+
+2006-10-11  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/m4sugar/m4sh.m4 (AS_BOURNE_COMPATIBLE): Move the
+	  initialization which is not inherited through the environment
+	(_AS_BOURNE_COMPATIBLE): ... to this new macro.
+	(_AS_RUN): Call _AS_BOURNE_COMPATIBLE, not AS_BOURNE_COMPATIBLE.
+
+2006-10-09  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Limitations of Usual Tools): Describe
+	problems with mkdir -p -m.
+
+2006-10-06  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/c.m4 (_AC_PROG_PREPROC_WORKS_IFELSE): Remove
+	comment about ac_cpp_err; it was incorrect, and anyway
+	ac_cpp_err is being removed below.
+	* lib/autoconf/general.m4 (_AC_PREPROC_IFELSE): Don't
+	set ac_cpp_err to 'yesyes' if preproc_warn_flag and werror_flag
+	are both 'yes'.  In fact, don't bother setting ac_cpp_err at all;
+	nobody uses it.
+	(_AC_COMPILE_IFELSE, _AC_LINK_IFELSE): Don't log our funky tests
+	with werror_flag and conftest.err and so forth.  This is more
+	compatible with how _AC_PROG_PREPROC_WORKS_IFELSE behaves,
+	and anyway the user shouldn't normally want to see this gorp logged.
+	Problem reported by Ralf Wildenhues.
+	* lib/autoconf/lang.m4 (AC_LANG_WERROR): werror_flag's default is
+	empty, not 'no', since the rest of the code uses 'test -z'.
+
+2006-10-04  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/general.m4 (_AC_COMPILE_IFELSE, _AC_LINK_IFELSE):
+	Use a single call to AC_DO_TOKENS rather than multiple, for
+	efficiency.
+	(_AC_LINK_IFELSE): Test that resulting file is executable.
+	Problem reported by mwoehlke in
+	<http://lists.gnu.org/archive/html/bug-coreutils/2006-10/msg00048.html>.
+
+	* lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Use "test -x /" rather
+	than creating a file to use with test -x; this is much faster.
+
+2006-10-02  Bruno Haible  <bruno at clisp.org>
+
+	* lib/autom4te.in (Automake-preselections): Add
+	AM_GNU_GETTEXT_INTL_SUBDIR, for automake 1.10.
+
+2006-09-27  Stepan Kasal  <kasal at ucw.cz>
+
+	* doc/autoconf.texi (Writing testsuite.at): Fix a typo: for
+	standard error, `experr' should be used, not `expout'.
+
+2006-09-26  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_FSEEKO): Don't compile the
+	fseeko testing program twice; just use the earlier result.
+	* lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_MACRO_VALUE):
+	Set cache var to 'unknown' (not 'no') if leaving the macro unset
+	still doesn't let the program compile.
+	(AC_SYS_LARGEFILE): Test for _LARGE_FILES only if earlier tests
+	failed.
+
+	* lib/autoconf/functions.m4: Fix problems reported by Ralf Wildenhues.
+	(AC_FUNC_ERROR_AT_LINE): Don't bother to check for error.h.  Just
+	include it, without including anything else.
+	(AC_FUNC_FSEEKO): Avoid gcc -Wall warnings about constant
+	expressions.
+	(AC_FUNC_STRNLEN): Require AC_USE_SYSTEM_EXTENSIONS.
+
+2006-09-26  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_ERROR_AT_LINE): Check for
+	`error.h', and include it, for a `error_at_line' prototype.
+	Use a nonempty format string in the link test.
+	* lib/autoconf/functions.m4 (AC_FUNC_WAIT3): Include <sys/wait.h>,
+	for a declaration of wait3.
+
+2006-09-26  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: AC_CHECK_DECL now also works with aggregate objects.
+	* doc/autoconf.texi (Generic Declarations): Clarify that AC_CHECK_DECL
+	can apply to constants too, and that it checks for macro defns.
+	* lib/autoconf/general.m4 (AC_CHECK_DECL): Assume C89 or better,
+	and simply cast the identifier to void.  This handles structure
+	values.  Problem reported by Ralf Wildenhues.
+	* tests/semantics.at (AC_CHECK_DECLS): Also check enums.
+
+2006-09-26  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* tests/semantics.at (AC_CHECK_DECLS): Also check macros,
+	structure, and function symbols.
+
+2006-09-26  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* tests/semantics.at (AC_CHECK_MEMBERS): Also test with a struct
+	member.
+
+2006-09-25  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: Recommend M4 1.4.7 instead of 1.4.6.
+	* README: Likewise.
+	* doc/autoconf.texi (Introduction, Why GNU M4): Likewise.
+
+2006-09-25  Paul Eggert  <eggert at cs.ucla.edu>
+	and Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_OBSTACK): Avoid `gcc -Wall'
+	warnings (uninitialized value).
+	(AC_FUNC_UTIME_NULL): Likewise, test for and include <utime.h> if
+	present.
+	* lib/autoconf/types.m4 (AC_TYPE_LONG_LONG_INT): Likewise, add
+	parentheses.
+	(AC_STRUCT_TM): Likewise, avoid unused variables.
+
+2006-09-20  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/c.m4 (_AC_ARG_VAR_LDFLAGS): Update comment.
+	(_AC_ARG_VAR_LIBS): New macro: let LIBS be precious.
+	(AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC): Call _AC_ARG_VAR_LIBS.
+	* lib/autoconf/fortran.m4 (AC_PROG_F77, AC_PROG_FC): Likewise.
+	Report by Olly Betts.
+
+2006-09-19  Eric Blake  <ebb9 at byu.net>
+
+	* m4/m4.m4: Change copyright.
+	* configure: Regenerate.
+	* Makefile.in: Likewise.
+	* bin/Makefile.in: Likewise.
+	* doc/Makefile.in: Likewise.
+	* lib/Makefile.in: Likewise.
+	* lib/Autom4te/Makefile.in: Likewise.
+	* lib/autoconf/Makefile.in: Likewise.
+	* lib/autoscan/Makefile.in: Likewise.
+	* lib/autotest/Makefile.in: Likewise.
+	* lib/emacs/Makefile.in: Likewise.
+	* lib/m4sugar/Makefile.in: Likewise.
+	* man/Makefile.in: Likewise.
+	* tests/Makefile.in: Likewise.
+
+	* m4/m4.m4 (AC_PROG_GNU_M4): Check for m4 --debugfile support.
+	* bin/Makefile.am (edit): Substitute M4_DEBUGFILE.
+	* bin/autom4te.in (handle_m4): Favor --debugfile over misnamed
+	--error-output, to avoid warnings with M4 2.0.
+
+2006-09-19  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autoconf/libs.m4 (AH_CHECK_LIB): Fix quoting, to be
+	  consistent with _AH_CHECK_FUNCS and _AH_CHECK_HEADERS.
+	* lib/autoconf/headers.m4 (AH_CHECK_HEADERS_DIRENT): Likewise.
+
+2006-09-15  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_GETMNTENT): Eliminate the
+	expansion of AC_CHECK_FUNCS.
+
+2006-09-14  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Remove a
+	mistaken comment: the path has to be relative; do not use
+	the path at runtime.
+
+2006-09-13  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/status.m4 (_AC_OUTPUT_SUBDIRS): Quote the
+	argument to `--prefix' for sub-configure scripts.
+	Pass `--silent' to sub-configure scripts.
+	* tests/torture.at (Configuring subdirectories): Add tests
+	for both changes.
+	* doc/autoconf.texi (Setting Output Variables): Fix example to
+	not show `--silent' being passed to a `configure' re-run.
+
+2006-09-12  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Input): Clarify role of AC_CONFIG_MACRO_DIR.
+	* lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Do not check
+	for the existence of the directory at configure-time.  That's
+	too late, anyway.  Problem reported by Stefan Seefeld.
+
+	* lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Avoid bug in UnixWare
+	7.1.4 /usr/bin/posix/sh described by Tim Rice in
+	<http://lists.gnu.org/archive/html/bug-autoconf/2006-09/msg00017.html>.
+
+2006-09-11  Stepan Kasal  <kasal at ucw.cz>
+
+	* tests/local.at (AT_CHECK_M4): Fix this so that the testsuite
+	works with GNU M4 1.4.3 again; make the normalized form
+	match the current m4 message; fix the description.
+	* test/tools.at (autom4te cache): Adapt to the change.
+
+2006-09-08  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_MKTIME):  Add year_2050_test
+	to catch glibc bug 2821
+	<http://sourceware.org/bugzilla/show_bug.cgi?id=2821>.
+
+	Merge from gnulib as follows: Use AC_CHECK_HEADERS_ONCE instead of
+	AC_CHECK_HEADERS, and likewise for AC_CHECK_FUNCS_ONCE and
+	AC_CHECK_FUNCS.  Don't check for stdlib.h, since we now
+	assume C89.
+
+2006-09-08  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autom4te.in (Autoconf-without-aclocal-m4): Move the
+	preselections ...
+	(Autoconf): ... here.
+	(Autoscan-preselections): Delete.
+
+2006-09-07  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autom4te.in (Automake-preselections): Preselect
+	AM_ENABLE_MULTILIB.
+
+2006-09-05  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Preset Output Variables): srcdir and
+	top_srcdir are not necessarily relative.  Problem reported
+	by Dries Kimpe.
+
+2006-09-05  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/fortran.m4 (_AC_PROG_FC): Prefer xlf90/xlf95 over
+	f90/f95 because the latter drivers of AIX Fortran 9.1 do not
+	accept files with extension `.f'.  For consistency, also prefer
+	xlf over f77.
+	* doc/autoconf.texi (Fortran Compiler): Remove mention of bug
+	from last patch.
+
+2006-09-05  Romain Lenglet  <rlenglet at users.forge.objectweb.org>
+
+	* lib/autoconf/erlang.m4 (AC_ERLANG_CHECK_LIB): Added substitution
+	of ERLANG_LIB_VER_* variables.
+	* doc/autoconf.texi (Erlang Libraries): Document ERLANG_LIB_VER_*
+	variables.
+
+2006-09-03  Paul Eggert  <eggert at cs.ucla.edu>
+	and Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (Limitations of Builtins): Document 'unset'
+	bugs of Bash 2.01 and 2.05a.
+	(Fortran Compiler): Document that AC_PROG_CC should be called
+	before AC_PROG_FC, due to a bug in Autoconf.
+
+2006-09-01  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: New macro AC_CACHE_CHECK_INT.  It replaces the
+	old AC_COMPUTE_INT, which now behaves like _AC_COMPUTE_INT
+	except the first two arguments are reversed.
+	* doc/autoconf.texi (Caching Results): New macro AC_CACHE_CHECK_INT.
+	(Generic Compiler Characteristics): AC_COMPUTE_INT no longer
+	caches nor outputs a diagnostic.  Suggested by Bruno Haible.
+	* lib/autoconf/general.m4 (AC_CACHE_CHECK_INT): New macro,
+	equivalent to the old AC_COMPUTE_INT.
+	(AC_COMPUTE_INT): No longer caches or reports.  New signature.
+	All uses changed to AC_CACHE_CHECK_INT.
+	* tests/base.at (AC_CACHE_CHECK_INT): New test.
+	* tests/mktests.sh (ac_exclude_list): Add AC_CACHE_CHECK_INT.
+
+2006-08-31  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: AC_FUNC_FNMATCH, AC_FUNC_FNMATCH_GNU, AC_FUNC_GETLOADVG,
+	and AC_REPLACE_FNMATCH are now obsolescent in Autoconf.  New
+	programs should use their Gnulib counterparts.
+	* doc/autoconf.texi (Particular Functions): Likewise.
+	(Macro Names, testsuite Invocation): Replace uses of these
+	obsolete macros with uses of non-obsolete macros.
+
+2006-08-29  Eric Blake  <ebb9 at byu.net>
+
+	* configure.ac (AC_INIT): Bump to 2.60b.
+	* NEWS: Update.
+
+2006-08-28  Eric Blake  <ebb9 at byu.net>
+
+	* lib/autoconf/headers.m4 (AC_HEADER_STAT): Fix logic that was
+	mistakenly swapped on 2006-08-15.
+
+2006-08-25  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: Version 2.60a.
+
+2006-08-25  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autoconf/general.m4 (_AC_LINK_IFELSE): Remove the IPA/IPO
+	file created by the PGI compiler.
+
+2006-08-25  Noah Misch  <noah at cs.caltech.edu>
+
+	* lib/Autom4te/General.pm (END): Use `File::Path::rmtree' to
+	simplify the code.
+
+2006-08-25  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Fix Lex library problem reported to us by Julio Garvia.
+	* doc/autoconf.texi (Particular Programs): YYTEXT_POINTER is
+	for the default, which the user can override.
+	* lib/autoconf/programs.m4 (AC_PROG_LEX): Let _AC_PROG_LEX_YYTEXT_DECL
+	deal with LEXLIB.
+	(_AC_PROG_LEX_YYTEXT_DECL): Handle caching correctly; the old code
+	didn't work if some values were cached but not others.  Test for
+	broken lex libraries like native ia64-hp-hpux11.22; see
+	<http://sources.redhat.com/ml/binutils/2003-12/msg00337.html>, and
+	work around the problem by preferring an empty LEXLIB to -lfl or
+	-ll.  Let the user set LEXLIB='' to indicate no library needed.
+
+	* NEWS: Recommend M4 1.4.6 instead of 1.4.5.
+	* README: Likewise.
+	* doc/autoconf.texi (Introduction, Why GNU M4): Likewise.
+
+2006-08-24  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Rework to use more-modern build style.
+	Many files are renamed; all uses of their names were changed.
+	* .x-sc_trailing_blank: Renamed from .x-sc_trailing_space.
+	* .x-sc_useless_cpp_parens: New file.
+	* build-aux/config.guess: Renamed from config/config.guess.  Update.
+	* build-aux/config.sub: Renamed from config/config.sub.  Update.
+	* build-aux/elisp-comp: Renamed from config/elisp-comp.
+	* build-aux/install-sh: Renamed from config/install-sh.  Update.
+	* build-aux/mdate-sh: Renamed from config/mdate-sh.
+	* build-aux/missing: Renamed from config/missing.
+	* build-aux/texinfo.tex: Renamed from config/texinfo.tex.  Update.
+	* build-aux/vc-list-files: Renamed from config/vc-list-files.
+	* config/Makefile.am: Removed.
+	* config/mkinstalldirs: Removed.
+	* config/move-if-change: Removed.
+	* m4/m4.m4: Renamed from config/m4.m4.  Add (C) to copyright notice.
+	* Makefile.am (SUBDIRS): Remove config.
+	(ACLOCAL_AMFLAGS): Include from m4, not config.
+	(EXTRA_DIST): Add config/announce-gen, config/prev-version.txt.
+	(WGET, WGETFLAGS): New macros, since Makefile.maint no longer does this.
+	(autom4te-update): Rewrite with a loop.  Get from gnulib, not automake.
+	Fail if there's an error.
+	* Makefile.cfg (move_if_change): Remove.
+	(wget_files): Remove.
+	(cvs_executable_files): New macro.
+	(cvs_files): Use it.  Remove mkinstalldirs.  Add fdl.texi.
+	(executable-update): Use $(cvs_executable_files).
+	(local-checks-to-skip): Remove.
+	* Makefile.maint: Merge from coreutils, plus add our own changes
+	(gzip_rsyncable): New macro.
+	(GZIP_ENV): Use it.
+	(CVS_LIST): Use build-aux/vc-list-files.
+	(VERSION_REGEXP): New macro.
+	(local-checks-available): Add patch-check, $(syntax-check-rules),
+	check-AUTHORS.
+	(syntax-check-rules): Compute dynamically.
+	(sc_cast_of_x_alloc_return_value): Work even if no source files.
+	(sc_cast_of_alloca_return_value): Likewise.
+	(sc_prohibit_atoi_atof): Simplify regexp.
+	(sc_no_if_have_config_h, sc_require_config_h):
+	(sc_prohibit_assert_without_use,
+	(sc_obsolete_symbols): Check for O_NDELAY.
+	(sc_texi_notab): Remove.
+	(sc-changelog): Don't make an exception for '----' lines.
+	(.re-list): Remove, so we don't have a junk file behind.
+	(sc_system_h_headers): Remove the need for .re-list.
+	(sc_the_the):  New rule.
+	(sc_tight_scope): Simplify.
+	(sc_trailing_blank): Renamed from sc_trailing_space.
+	(longopt_re): New macro.
+	(sc_two_space_separator_in_usage): New rule.
+	(sc_unmarked_diagnostics): Look at all files under CVS.
+	(sc_useless_cpp_parens, patch-check, check-AUTHORS): New rules.
+	(news-date-check, changelog-check): Version is OK.
+	(po-check): Look for lib files even if not in CVS.
+	(copyright-check): Use $() not ``.
+	(maintainer-distcheck): Do not depend on changelog-check.
+	(my-distcheck): Depend on $(release_archive_dir)/$(prev-tgz).
+	Also check for -Wpointer-arith.
+	(WGET, WGETFLAGS, tgz-md5, tgz-sha1, bz2-md5, bz2-sha1):
+	(xdelta-md5, xdelta-sha1, tgz-size, bz2-size, xd-size, rel-check):
+	Remove.
+	(announcement): Add --gpg-key-id arg.
+	(cvs-sv): Remove.
+	(move_if_change): Just use mv.
+	(local_updates: Remove wget-update, po-update.
+	(po_repo, do-po-update, po-update, wget_files, get-targets): Remove.
+	(config.guess-url_prefix, config.sub-url_prefix): Remove.
+	(ansi2knr.c-url_prefix, texinfo.tex-url_prefix):
+	(standards.texi-url_prefix, make-stds.texi-url_prefix, target, url):
+	($(get-targets)): Remove.
+	(cvs_files): Remove missing, mkinstalldirs, ansi2knr.c.
+	(gnulib_repo): Renamed from automake_repo.  Get from gnulib now.
+	(cvs-update): Get from gnulib.
+	(emut_upload_commands): gnupload is in build-aux now.
+	(alpha beta major): Add changelog-check.  Check version.
+	* configure.ac (AC_CONFIG_AUX_DIR): Renamed from config to build-aux.
+	(AC_CONFIG_FILES): Remove.
+	* bin/autoconf.as: Add spaces to avoid distcheck warning.
+	* config/announce-gen: Sync from coreutils.
+	* doc/make-stds.texi: Sync from gnulib.
+	* doc/standards.texi: Likewise.
+	* man/Makefile.am: Adjust for config -> build-aux renaming.
+	* tests/Makefile.am: Prefer $(FOO) to @FOO at .
+	* tests/local.at: Adjust from config -> build-aux renaming.
+	* tests/tools.at: Likewise.
+	* tests/torture.at: Likewise.
+
+	* NEWS: The C99 check now tests for vararg macros and 64-bit
+	preprocessor ints.
+	* doc/autoconf.texi (C Compiler): Document // comments, va_copy.
+	* lib/autoconf/c.m4 (_AC_PROG_CC_C99): Test varargs macros and
+	64-bit preprocessor ints.  Check for static initialization of
+	long long.  Remove unnecessary casts.
+
+2006-08-24  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (Particular Programs): Mention that
+	@INSTALL@ and @MKDIR_P@ may vary for different output files.
+	Reported by Alexandre Duret-Lutz.
+
+2006-08-24  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/fortran.m4 (_AC_FC_LIBRARY_LDFLAGS): Also ignore
+	-lgcc?* and -lSystem, for Darwin/MacOS X.  Problem reported by
+	Bill Northcott in
+	<http://lists.gnu.org/archive/html/autoconf/2006-08/msg00083.html>.
+
+2006-08-22  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/c.m4 (AC_C_CONST): Don't used shadowed vars, to
+	pacify insanely picky compilers.  Problem reported by Eric Blake.
+
+	* doc/autoconf.texi (Posix Variants): INTERACTIVE Unix is no
+	longer supported by Sun.
+
+2006-08-15  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: Autoconf now uses constructs like "#ifdef HAVE_STDLIB_H"
+	rather than "#if HAVE_STDLIB_H", so that it now works with "gcc
+	-Wundef -Werror".  Problem reported by David Fang in
+	<http://lists.gnu.org/archive/html/autoconf/2006-08/msg00045.html>.
+	* doc/autoconf.texi (Header Templates, Default Includes):
+	(Particular Functions, Generic Functions, Header Portability):
+	(Particular Headers, Generic Headers, Generic Declarations, Guidelines):
+	(Obsolete Macros, AC_FOO_IFELSE vs AC_TRY_FOO):
+	(Present But Cannot Be Compiled, Preprocessor Symbol Index):
+	Prefer #ifdef to #if.
+	* lib/autoconf/c.m4 (AC_C_BIGENDIAN): Prefer #ifdef to #if.
+	* lib/autoconf/functions.m4 (AC_FUNC_ALLOCA, _AC_FUNC_MALLOC_IF):
+	(AC_FUNC_MKTIME, AC_FUNC_MMAP, _AC_FUNC_REALLOC_IF):
+	(AC_FUNC_SELECT_ARGTYPES, AC_FUNC_SETVBUF_REVERSED, _AC_FUNC_VFORK):
+	Likewise.
+	* lib/autoconf/headers.m4 (_AC_INCLUDES_DEFAULT_REQUIREMENTS):
+	(AC_HEADER_RESOLV, AC_HEADER_STAT): Likewise.
+	* lib/autoconf/specific.m4 (AC_DECL_SYS_SYGLIST):
+	(AC_SYS_RESTARTABLE_SYSCALLS): Likewise.
+	* lib/autoconf/headers.m4 (AC_HEADER_STAT): Don't assume that
+	S_ISDIR etc. are valid for use in #if; POSIX doesn't guarantee
+	this.
+
+2006-08-14  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Limitations of Usual Tools): Document sed
+	problems with arg script text that doesn't end in newline, and
+	with '-e a...'.  Problems reported by Ralf Wildenhues.
+
+2006-08-12  Alexandre Julliard  <julliard at winehq.org>  (tiny change)
+
+	* lib/autoconf/libs.m4 (AC_PATH_X_DIRECT): Replace another
+	check for libXt by a check for libX11.
+
+2006-08-10  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (config.status Invocation): Adjust according
+	to last change.
+
+2006-08-08  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): `config.status
+	--help' should mention that `--version' outputs configuration
+	settings.  Report by Bruno Haible.
+
+2006-08-06  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Fix test suite failures reported by Pierre in
+	<http://lists.gnu.org/archive/html/bug-autoconf/2006-08/msg00005.html>.
+	* lib/autoconf/lang.m4 (_AC_COMPILER_EXEEXT_DEFAULT): Don't claim
+	the compiler created a file "b.out" when it didn't create anything
+	at all.
+	* lib/autoconf/specific.m4 (AC_SYS_INTERPRETER):
+	Discard stderr too, when invoking the test script.
+
+2006-08-05  Alexandre Julliard  <julliard at winehq.org>  (tiny change)
+
+	* lib/autoconf/libs.m4 (AC_PATH_XTRA): Fixed a typo
+	in the restoring of the werror flag.
+
+2006-07-24  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Volatile Objects): Be even a little
+	less skeptical about "volatile", after discussion with
+	Bruno Haible on bug-gnulib.
+	(Limitations of Usual Tools): Warn about sed stripping
+	leading white space from text.  From Bruno Haible.
+
+2006-07-20  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/libs.m4 (AC_PATH_XTRA): Don't use -R if the
+	compiler complains about it, even if things works after the
+	complaint.  Problem reported by Peter O'Gorman.
+
+	* doc/autoconf.texi (Preset Output Variables): Document CFLAGS,
+	CPPFLAGS, and LDFLAGS better.  Problem reported by Bruno Haible.
+	Similarly for CXXFLAGS, OBJCFLAGS, ERLCFLAGS.
+
+2006-07-17  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/libs.m4 (AC_PATH_XTRA): Do the check for space
+	after -R regardless of host.  Patrick Welche reports that this
+	fixes things on NetBSD 3.99.
+
+	* NEWS: Recommend M4 1.4.5.
+	* README: Likewise.
+	* doc/autoconf.texi (Introduction, Why GNU M4): Likewise.
+	* tests/tools.at (autom4te cache): Update wording of diagnostic
+	to match M4 1.4.5.
+
+2006-07-07  Paul Eggert  <eggert at cs.ucla.edu>
+

[... truncated: 88764 lines follow ...]


From bonefish at mail.berlios.de  Wed Mar 19 13:37:38 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 19 Mar 2008 13:37:38 +0100
Subject: [Haiku-commits] r24463 - buildtools/vendor/autoconf
Message-ID: <200803191237.m2JCbceB028654@sheep.berlios.de>

Author: bonefish
Date: 2008-03-19 13:37:38 +0100 (Wed, 19 Mar 2008)
New Revision: 24463
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24463&view=rev

Added:
   buildtools/vendor/autoconf/2.61/
Log:
Tagging autoconf 2.61.


Copied: buildtools/vendor/autoconf/2.61 (from rev 24462, buildtools/vendor/autoconf/current)



From bonefish at mail.berlios.de  Wed Mar 19 13:43:34 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 19 Mar 2008 13:43:34 +0100
Subject: [Haiku-commits] r24464 - in buildtools/trunk/autoconf: . bin config
	doc lib lib/Autom4te lib/autoconf lib/autoscan lib/autotest
	lib/emacs lib/m4sugar man tests
Message-ID: <200803191243.m2JChYAm030107@sheep.berlios.de>

Author: bonefish
Date: 2008-03-19 13:42:05 +0100 (Wed, 19 Mar 2008)
New Revision: 24464
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24464&view=rev

Added:
   buildtools/trunk/autoconf/build-aux/
   buildtools/trunk/autoconf/config/announce-gen
   buildtools/trunk/autoconf/lib/autoconf/erlang.m4
   buildtools/trunk/autoconf/m4/
   buildtools/trunk/autoconf/tests/autoscan.at
   buildtools/trunk/autoconf/tests/autotest.at
Removed:
   buildtools/trunk/autoconf/bin/autoconf.in
   buildtools/trunk/autoconf/config/Makefile.am
   buildtools/trunk/autoconf/config/Makefile.in
   buildtools/trunk/autoconf/config/config.guess
   buildtools/trunk/autoconf/config/config.sub
   buildtools/trunk/autoconf/config/elisp-comp
   buildtools/trunk/autoconf/config/install-sh
   buildtools/trunk/autoconf/config/m4.m4
   buildtools/trunk/autoconf/config/mdate-sh
   buildtools/trunk/autoconf/config/missing
   buildtools/trunk/autoconf/config/mkinstalldirs
   buildtools/trunk/autoconf/config/move-if-change
   buildtools/trunk/autoconf/config/texinfo.tex
   buildtools/trunk/autoconf/doc/texinfo.tex
   buildtools/trunk/autoconf/tests/wrapper.in
Modified:
   buildtools/trunk/autoconf/AUTHORS
   buildtools/trunk/autoconf/BUGS
   buildtools/trunk/autoconf/COPYING
   buildtools/trunk/autoconf/ChangeLog
   buildtools/trunk/autoconf/ChangeLog.0
   buildtools/trunk/autoconf/ChangeLog.1
   buildtools/trunk/autoconf/ChangeLog.2
   buildtools/trunk/autoconf/GNUmakefile
   buildtools/trunk/autoconf/INSTALL
   buildtools/trunk/autoconf/Makefile.am
   buildtools/trunk/autoconf/Makefile.cfg
   buildtools/trunk/autoconf/Makefile.in
   buildtools/trunk/autoconf/Makefile.maint
   buildtools/trunk/autoconf/NEWS
   buildtools/trunk/autoconf/README
   buildtools/trunk/autoconf/THANKS
   buildtools/trunk/autoconf/TODO
   buildtools/trunk/autoconf/aclocal.m4
   buildtools/trunk/autoconf/bin/Makefile.am
   buildtools/trunk/autoconf/bin/Makefile.in
   buildtools/trunk/autoconf/bin/autoconf.as
   buildtools/trunk/autoconf/bin/autoheader.in
   buildtools/trunk/autoconf/bin/autom4te.in
   buildtools/trunk/autoconf/bin/autoreconf.in
   buildtools/trunk/autoconf/bin/autoscan.in
   buildtools/trunk/autoconf/bin/autoupdate.in
   buildtools/trunk/autoconf/bin/ifnames.in
   buildtools/trunk/autoconf/config/prev-version.txt
   buildtools/trunk/autoconf/configure
   buildtools/trunk/autoconf/configure.ac
   buildtools/trunk/autoconf/doc/Makefile.am
   buildtools/trunk/autoconf/doc/Makefile.in
   buildtools/trunk/autoconf/doc/autoconf.info
   buildtools/trunk/autoconf/doc/autoconf.texi
   buildtools/trunk/autoconf/doc/fdl.texi
   buildtools/trunk/autoconf/doc/install.texi
   buildtools/trunk/autoconf/doc/make-stds.texi
   buildtools/trunk/autoconf/doc/stamp-vti
   buildtools/trunk/autoconf/doc/standards.info
   buildtools/trunk/autoconf/doc/standards.texi
   buildtools/trunk/autoconf/doc/version.texi
   buildtools/trunk/autoconf/lib/Autom4te/C4che.pm
   buildtools/trunk/autoconf/lib/Autom4te/ChannelDefs.pm
   buildtools/trunk/autoconf/lib/Autom4te/Channels.pm
   buildtools/trunk/autoconf/lib/Autom4te/Configure_ac.pm
   buildtools/trunk/autoconf/lib/Autom4te/FileUtils.pm
   buildtools/trunk/autoconf/lib/Autom4te/General.pm
   buildtools/trunk/autoconf/lib/Autom4te/Makefile.in
   buildtools/trunk/autoconf/lib/Autom4te/Request.pm
   buildtools/trunk/autoconf/lib/Autom4te/Struct.pm
   buildtools/trunk/autoconf/lib/Autom4te/XFile.pm
   buildtools/trunk/autoconf/lib/Makefile.am
   buildtools/trunk/autoconf/lib/Makefile.in
   buildtools/trunk/autoconf/lib/autoconf/Makefile.am
   buildtools/trunk/autoconf/lib/autoconf/Makefile.in
   buildtools/trunk/autoconf/lib/autoconf/autoconf.m4
   buildtools/trunk/autoconf/lib/autoconf/autoheader.m4
   buildtools/trunk/autoconf/lib/autoconf/autoscan.m4
   buildtools/trunk/autoconf/lib/autoconf/autotest.m4
   buildtools/trunk/autoconf/lib/autoconf/autoupdate.m4
   buildtools/trunk/autoconf/lib/autoconf/c.m4
   buildtools/trunk/autoconf/lib/autoconf/fortran.m4
   buildtools/trunk/autoconf/lib/autoconf/functions.m4
   buildtools/trunk/autoconf/lib/autoconf/general.m4
   buildtools/trunk/autoconf/lib/autoconf/headers.m4
   buildtools/trunk/autoconf/lib/autoconf/lang.m4
   buildtools/trunk/autoconf/lib/autoconf/libs.m4
   buildtools/trunk/autoconf/lib/autoconf/oldnames.m4
   buildtools/trunk/autoconf/lib/autoconf/programs.m4
   buildtools/trunk/autoconf/lib/autoconf/specific.m4
   buildtools/trunk/autoconf/lib/autoconf/status.m4
   buildtools/trunk/autoconf/lib/autoconf/types.m4
   buildtools/trunk/autoconf/lib/autom4te.in
   buildtools/trunk/autoconf/lib/autoscan/Makefile.am
   buildtools/trunk/autoconf/lib/autoscan/Makefile.in
   buildtools/trunk/autoconf/lib/autoscan/autoscan.pre
   buildtools/trunk/autoconf/lib/autotest/Makefile.am
   buildtools/trunk/autoconf/lib/autotest/Makefile.in
   buildtools/trunk/autoconf/lib/autotest/autotest.m4
   buildtools/trunk/autoconf/lib/autotest/general.m4
   buildtools/trunk/autoconf/lib/emacs/Makefile.am
   buildtools/trunk/autoconf/lib/emacs/Makefile.in
   buildtools/trunk/autoconf/lib/emacs/autoconf-mode.el
   buildtools/trunk/autoconf/lib/emacs/autotest-mode.el
   buildtools/trunk/autoconf/lib/freeze.mk
   buildtools/trunk/autoconf/lib/m4sugar/Makefile.am
   buildtools/trunk/autoconf/lib/m4sugar/Makefile.in
   buildtools/trunk/autoconf/lib/m4sugar/m4sh.m4
   buildtools/trunk/autoconf/lib/m4sugar/m4sugar.m4
   buildtools/trunk/autoconf/man/Makefile.am
   buildtools/trunk/autoconf/man/Makefile.in
   buildtools/trunk/autoconf/man/autoconf.1
   buildtools/trunk/autoconf/man/autoheader.1
   buildtools/trunk/autoconf/man/autom4te.1
   buildtools/trunk/autoconf/man/autoreconf.1
   buildtools/trunk/autoconf/man/autoscan.1
   buildtools/trunk/autoconf/man/autoupdate.1
   buildtools/trunk/autoconf/man/config.guess.1
   buildtools/trunk/autoconf/man/config.sub.1
   buildtools/trunk/autoconf/man/ifnames.1
   buildtools/trunk/autoconf/tests/Makefile.am
   buildtools/trunk/autoconf/tests/Makefile.in
   buildtools/trunk/autoconf/tests/acc.at
   buildtools/trunk/autoconf/tests/acfortran.at
   buildtools/trunk/autoconf/tests/acfunctions.at
   buildtools/trunk/autoconf/tests/acgeneral.at
   buildtools/trunk/autoconf/tests/acheaders.at
   buildtools/trunk/autoconf/tests/aclang.at
   buildtools/trunk/autoconf/tests/aclibs.at
   buildtools/trunk/autoconf/tests/acprograms.at
   buildtools/trunk/autoconf/tests/acspecific.at
   buildtools/trunk/autoconf/tests/acstatus.at
   buildtools/trunk/autoconf/tests/actypes.at
   buildtools/trunk/autoconf/tests/atlocal.in
   buildtools/trunk/autoconf/tests/base.at
   buildtools/trunk/autoconf/tests/c.at
   buildtools/trunk/autoconf/tests/compile.at
   buildtools/trunk/autoconf/tests/foreign.at
   buildtools/trunk/autoconf/tests/fortran.at
   buildtools/trunk/autoconf/tests/local.at
   buildtools/trunk/autoconf/tests/m4sh.at
   buildtools/trunk/autoconf/tests/m4sugar.at
   buildtools/trunk/autoconf/tests/mktests.sh
   buildtools/trunk/autoconf/tests/package.m4
   buildtools/trunk/autoconf/tests/semantics.at
   buildtools/trunk/autoconf/tests/suite.at
   buildtools/trunk/autoconf/tests/tools.at
   buildtools/trunk/autoconf/tests/torture.at
   buildtools/trunk/autoconf/tests/wrapper.as
Log:
Merged autoconf 2.61 into trunk.

Modified: buildtools/trunk/autoconf/AUTHORS
===================================================================
--- buildtools/trunk/autoconf/AUTHORS	2008-03-19 12:37:38 UTC (rev 24463)
+++ buildtools/trunk/autoconf/AUTHORS	2008-03-19 12:42:05 UTC (rev 24464)
@@ -28,5 +28,5 @@
 
 You should have received a copy of the GNU General Public License
 along with autoconf; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.

Modified: buildtools/trunk/autoconf/BUGS
===================================================================
--- buildtools/trunk/autoconf/BUGS	2008-03-19 12:37:38 UTC (rev 24463)
+++ buildtools/trunk/autoconf/BUGS	2008-03-19 12:42:05 UTC (rev 24464)
@@ -19,31 +19,25 @@
 
 	You should have received a copy of the GNU General Public License
 	along with autoconf; see the file COPYING.  If not, write to
-	the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-	Boston, MA 02111-1307, USA.
+	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+	Boston, MA 02110-1301, USA.
 
 
 Autoconf must not be used in production if there are ``Serious'' bugs,
 and use with caution an Autoconf with ``Important bugs''.
 
-Many other bugs are registered on the GNATS server:
-
-     http://bugs.gnu.org/cgi-bin/gnatsweb.pl?database=autoconf
-
-Please, don't register bugs listed below: we already know we have to
-address them.
-
 * Status
 
                     /*--------------------------.
                     | Sane for full scale use.  |
                     `--------------------------*/
 
-* Interoperability bugs
+* No known serious or important bugs.
 
-** libtool 1.4.2, configure.ac, and AC_CONFIG_AUX_DIR
+* Minor Problems
 
-configure.ac files that use AC_CONFIG_AUX_DIR do not work with libtool
-1.4.2.  To work around the problem, you can rename configure.ac to
-configure.in.  Or you can apply Roger Leigh's patch to libtool; see
-<http://mail.gnu.org/pipermail/libtool-patches/2002-January/001659.html>.
+Some Makefile segments do not behave correctly in VPATH builds with proprietary
+`make' programs.  Some BSD `make's will work.  For best results, build in the
+source directory or use GNU `make'.
+
+Parallel builds via `make -jN' do not work.

Modified: buildtools/trunk/autoconf/COPYING
===================================================================
--- buildtools/trunk/autoconf/COPYING	2008-03-19 12:37:38 UTC (rev 24463)
+++ buildtools/trunk/autoconf/COPYING	2008-03-19 12:42:05 UTC (rev 24464)
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

Modified: buildtools/trunk/autoconf/ChangeLog
===================================================================
--- buildtools/trunk/autoconf/ChangeLog	2008-03-19 12:37:38 UTC (rev 24463)
+++ buildtools/trunk/autoconf/ChangeLog	2008-03-19 12:42:05 UTC (rev 24464)
@@ -1,3 +1,5999 @@
+2006-11-17  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Version 2.61.
+
+	* configure.ac (AC_INIT): Bump to 2.61.
+	* NEWS: Likewise.
+
+	* tests/autotest.at (Macro with backslash in a test title):
+	Comment out for now, as this tests neither fails nor passes
+	reliably.  Problem reported by Ralf Wildenhues.
+
+2006-11-16  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/general.m4 (_AC_INIT_PARSE_ENABLE): Fix some typos
+	in previous change, which caused test failures.
+
+2006-11-16  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Factor out
+	code for --enable, --disable, --with, and --without to...
+	(_AC_INIT_PARSE_ENABLE): ... a new macro.
+	* doc/autoconf.texi (Package Options):
+	* NEWS: Document that AC_ARG_ENABLE allows dots, too.
+
+2006-11-16  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Import these changes from config via gnulib:
+
+	2006-11-15  Ben Elliston  <bje at gnu.org>
+
+	From Josselin Mouette <joss at debian.org>:
+	* build-aux/config.guess (SX-8:SUPER-UX:*:*): New.
+
+	2006-11-08  Ben Elliston  <bje at gnu.org>
+
+	* build-aux/config.guess (authenticamd:Interix*:[3456]*): Another AMD64.
+
+	2006-11-07  Steve Woodford  <scw at NetBSD.org>
+		    Ben Elliston  <bje at gnu.org>
+
+	* build-aux/config.guess (*:NetBSD:*:*): Handle sh5el arch.
+	* build-aux/config.sub (sh5el): New basic_machine.
+
+
+	Import this change from coreutils:
+
+	2006-02-13  Jim Meyering  <jim at meyering.net>
+
+	* GNUmakefile (all): Emit diagnostics to stderr, not stdout.
+
+
+	Import this change from gnustandards via gnulib:
+
+	2006-11-15  Karl Berry  <karl at gnu.org>
+
+	* standards.texi: core -> memory, throughout.
+	(CPU Portability): show correct example of calling write
+	on a char value; thanks to Paul Eggert for the code.
+	Both of these suggestions from Eugene Y. Vasserman.
+
+
+	Import these changes from texinfo via gnulib:
+
+	2006-11-08  Karl Berry  <karl at gnu.org>
+
+	* build-aux/texinfo.tex (\dopdfimage): look for png, jpg/jpeg/JPG, and
+	  as well as pdf images, since they are supported in pdftex with
+	  no further ado.
+
+	2006-11-05  Karl Berry  <karl at gnu.org>
+
+	* doc/texinfo.tex (Image Syntax): don't mention GIF any more.
+
+2006-11-13  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: Document the AC_ARG_WITH change.
+
+2006-11-13  Bruno Haible  <bruno at clisp.org>
+
+	* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): For --with, --without
+	options, transliterate also dots to underscores.
+	(_AC_ENABLE_IF): Transliterate also dots to underscores.
+	* doc/autoconf.texi (External Software): Document that AC_ARG_WITH's
+	first argument may also contain dots.
+
+2006-11-09  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* tests/mktests.sh (ac_exclude_list): Exclude AC_PROG_CXX_C_O, for
+	benefit of platforms like Solaris+GCC where it is common to have a
+	non-working g++ installation.
+
+2006-11-08  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+	and Joel E. Denny  <jdenny at ces.clemson.edu>
+	and Paul Eggert  <eggert at cs.ucla.edu>
+
+	* tests/autotest.at (AT_CHECK_AT_TITLE): Fix shell quoting bugs
+	and non-portable sed scripts, and use $CONFIG_SHELL when invoking
+	./micro-suite.
+
+2006-11-08  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/types.m4 (AC_TYPE_LONG_LONG_INT): Set
+	ac_cv_type_long_long_int to 'yes' instead of 'cross-compiling'.
+	Imported from a similar patch to gnulib by Bruno Haible.
+
+2006-11-08  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: New macros AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS.
+	* doc/autoconf.texi (C Compiler): Document them.
+	* lib/autoconf/c.m4 (AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS):
+	New macros, taken from gnulib.
+
+2006-11-07  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/types.m4 (AC_TYPE_LONG_LONG_INT): Detect bug in
+	Tandem NonStop Kernel (OSS) cc -O circa 2004, reported by
+	Matthew Woehlke.
+
+2006-10-28  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* tests/torture.at (Configuring subdirectories): Do not skip
+	Automake 1.10 nor future Automake 11.1 (sic).
+
+2006-10-26  Joel E. Denny  <jdenny at ces.clemson.edu>
+	and Stepan Kasal  <kasal at ucw.cz>
+
+	Handle special characters in test case titles correctly.
+	* lib/autotest/general.m4 (AT_INIT): M4-quote and AS_ESCAPE AT_help_all
+	properly.
+	(AT_SETUP): M4-quote and AS_ESCAPE the title properly everywhere.
+	* tests/autotest.at (AT_CHECK_AT_TITLE): Add EXPANDED-TITLE-TO-TEST
+	argument.  Extend to check titles printed by ./micro-suite and
+	./micro-suite -l and the title in micro-suite.log.
+	(Backquote in a test title,
+	Single-quote in a test title,
+	Double-quote in a test title): Don't expect failure anymore.
+	(Backslash in a test title): Put a non-whitespace character after the
+	backslash so that Bourne shells might actually see it as an escape
+	sequence.
+	(Brackets in a test title,
+	Pound in a test title,
+	Comma in a test title,
+	Quoted Macro in a test title,
+	Macro in a test title,
+	Macro with single-quote in a test title): New tests.
+	(Macro with backquote in a test title,
+	Macro with double-quote in a test title,
+	Macro with backslash in a test title): New tests expected to fail.
+	* tests/torture.at (#define header templates): M4-quote this title in
+	AT_SETUP call so that no M4 code is commented inadvertently somewhere.
+	The visible effect was a stray [] in the testsuite output.
+
+2006-10-27  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (Limitations of Builtins): Do not invoke
+	`trap ... 0' inside a function, for AIX sh.
+
+2006-10-26  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* tests/base.at (AC_COMPUTE_INT): Test **0** rather than 1 / 0,
+	since powerpc-apple-darwin8-gcc-4.0.1 (Apple Computer, Inc. build
+	5363) simply issues a warning when dividing by zero at compile
+	time.  Problem reported by Elias Pipping.
+
+2006-10-26  Eric Blake  <ebb9 at byu.net>
+
+	* THANKS: Update.
+	* doc/autoconf.texi (Evaluation Macros): Improve the example to
+	show effect on macros that expand with commas.
+	Reported by Joel E. Denny.
+
+	* tests/m4sugar.at (m4_warn, m4_require: circular dependencies):
+	Also work with M4 1.4.8.
+
+2006-10-25  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Slashes): Document Tru64 4.0 bug reported by
+	Jim Meyering.
+
+2006-10-25  Stepan Kasal  <kasal at ucw.cz>
+
+	* tests/tools.at (autom4te --force): New test, verifies that
+	`--force' always rewrites the output file.
+
+2006-10-24  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Limitations of Usual Tools): Document that rm
+	needs operands on NetBSD 2.0.2.  Problem reported by Bruno Haible.
+
+2006-10-24  Stepan Kasal  <kasal at ucw.cz>
+
+	* tools/trace.at (autoconf --trace: user macros): Test `$%'.
+
+2006-10-24  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_MACRO_VALUE):
+	If FUNCTION-BODY is nonempty, use AC_LINK_IFELSE rather than
+	AC_COMPILE_IFELSE, to work around problem with OSF/1 4.0F fseeko
+	reported by Nelson H. F. Beebe for Coreutils 6.4.
+
+	* tests/tools.at (autoconf --trace: user macros): Remove test
+	for tracing multiline macros, since m4 1.4.7a uses a different
+	way to number lines.  Problem reported by Ralf Wildenhues.
+
+2006-10-24  Stepan Kasal  <kasal at ucw.cz>
+
+	* bin/autom4te.in (handle_m4): Do not redirect stdin to
+	/dev/null since the heuristics for interactive behaviour was
+	fixed in CVS m4.
+
+	* bin/autom4te.in: With --force, always refresh the output
+	file.  Problem reported by Greg Schafer <gschafer at zip.com.au>.
+
+	* bin/autoconf.as: Fix the verbose message at the end.
+
+2006-10-23  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* configure.ac (AC_INIT): Bump to 2.60c.
+	* NEWS: Likewise.
+
+2006-10-22  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: Version 2.60b.
+
+	Import this change from Texinfo:
+	2006-10-15  Karl Berry  <karl at gnu.org>
+	* build-aux/texinfo.tex: automake 1.10
+
+	* NEWS: Remove AC_CACHE_CHECK_INT.
+	* doc/autoconf.texi (Caching Results): Likewise.
+	* lib/autoconf/general.m4 (_AC_CACHE_CHECK_INT): Renamed from
+	AC_CACHE_CHECK_INT, since it's no longer public.
+	* lib/autoconf/types.m4: All uses of AC_CACHE_CHECK_INT changed.
+	* tests/base.at (AC_COMPUTE_INT): Test this, not AC_CACHE_CHECK_INT.
+
+2006-10-20  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (Limitations of Usual Tools): Fix two typos.
+
+2006-10-19  Eric Blake  <ebb9 at byu.net>
+
+	* lib/m4sugar/m4sugar.m4 (m4_mkstemp): New macro.
+	(m4_maketemp): Avoid warnings with M4 1.9a.
+	* lib/emacs/autoconf-mode.el (autoconf-font-lock-keywords): Color
+	m4_mkstemp.
+	* doc/autoconf.texi (Redefined M4 Macros): Document m4_mkstemp.
+	* NEWS: Likewise.
+
+2006-10-16  Eric Blake  <ebb9 at byu.net>
+
+	* doc/autoconf.texi (Setting Output Variables): Fix typo.
+
+	* bin/autoconf.as (version): Reword to match GNU Coding
+	Standards.
+	* bin/autoheader.in (version): Likewise.
+	* bin/autom4te.in (version): Likewise.
+	* bin/autoreconf.in (version): Likewise.
+	* bin/autoscan.in (version): Likewise.
+	* bin/autoupdate.in (version): Likewise.
+	* bin/ifnames.in (version): Likewise.
+
+2006-10-14  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/m4sugar/m4sh.m4 (AS_LITERAL_IF): Expand $1 before
+	looking for special shell characters.
+	* lib/autoconf/functions.m4 (AC_CHECK_FUNC): Do not expand the
+	macro defined by AS_VAR_PUSHDEF before passing it as a
+	parameter.
+	* lib/autoconf/general.m4 (AC_CHECK_FILE, AC_CHECK_DECL):
+	* lib/autoconf/libs.m4 (AC_SEARCH_LIBS, AC_CHECK_LIB):
+	* lib/autoconf/types.m4 (_AC_CHECK_TYPE_NEW, AC_CHECK_MEMBER):
+	* lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL):
+	(_AC_CHECK_HEADER_NEW, _AC_CHECK_HEADER_OLD, _AC_CHECK_HEADER_DIRENT):
+	Likewise.
+	* lib/autotest/general.m4 (AT_INIT): Quote parameters of
+	AS_VAR_* properly.
+	* tests/m4sh.at (AS_LITERAL_IF): New test.
+
+2006-10-14  Paul Eggert  <eggert at cs.ucla.edu>
+
+	(Imported from Automake.)
+	* build-aux/install-sh (posix_mkdir): Reject FreeBSD 6.1 mkdir -p -m,
+	which incorrectly sets the mode of an existing destination
+	directory.  In some cases the unpatched install-sh could do the
+	equivalent of "chmod 777 /" or "chmod 0 /" on a buggy FreeBSD
+	system.  We hope this is rare in practice, but it's clearly worth
+	fixing.  Problem reported by Alex Unleashed in
+	<http://lists.gnu.org/archive/html/bug-autoconf/2006-10/msg00012.html>.
+	Also, don't bother to check for -m bugs unless we're using -m;
+	suggested by Stepan Kasal.
+
+2006-10-14  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Import this change from Automake:
+
+	2006-08-23  Alexandre Duret-Lutz  <adl at gnu.org>
+	* lib/Autom4te/ChannelDefs.pm (usage): Mention that -Wportability
+	is enabled by default with gnu and gnits strictness.
+	Report from Bruno Haible.
+
+	2006-03-10  Alexandre Duret-Lutz  <adl at gnu.org>
+	* lib/Autom4te/ChannelDefs.pm: Make -Wportability the default in
+	gnu and gnits modes.
+
+	Import this change from Config:
+
+	2006-09-20  Ben Elliston  <bje at gnu.org>
+	* build-aux/config.sub (score, score-*): New.
+
+	Import this change from Gnulib:
+
+	2006-09-16  Karl Berry  <karl at gnu.org>
+	* doc/fdl.texi (ADDENDUM): switch to @heading from @appendixsubsec,
+	to avoid sectioning errors.
+
+	Import these changes from Texinfo:
+
+	2006-10-04  Karl Berry  <karl at gnu.org>
+	* build-aux/texinfo.tex (\singlequotechar): rename to \codequoteright.
+	(\quoteexpand): rename to \rquoteexpand.
+	(\codequoteleft): new def, to look for @set codequotebacktick.
+	(\lquoteexpand, \quoteexpand): new defs.
+	(\lquoteChar, \rquoteChar, \dashChar, \underChar: new \chardef's.
+	(\code): must use new \...Char values, since now ` is active.
+
+	2006-08-26  Karl Berry  <karl at gnu.org>
+	* build-aux/texinfo.tex (\textdegree): New command.
+
+	2006-08-12  Karl Berry  <karl at gnu.org>
+	* build-aux/texinfo.tex (error \box0): smaller font.
+
+2006-10-14  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (Autoheader Macros): Fix syntax error.
+
+2006-10-13  Stepan Kasal  <kasal at ucw.cz>
+
+	* doc/autoconf.texi (Autoheader Macros): Warn that the text
+	added to the template can get mangled.
+
+2006-10-13  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_OBSTACK): In the test,
+	include the default headers, and redefine obstack_chunk_alloc
+	and obstack_chunk_free.  Fixes false failure with glibc.
+
+2006-10-12  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Set as_executable_p,
+	for backward compatibility with Libtool 1.5.22.  Problem reported
+	by Ralf Wildenhues.
+
+2006-10-12  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/c.m4 (AC_PROG_GCC_TRADITIONAL): Require
+	AC_PROG_CC.
+	Report by IOhannes m zmoelnig <zmoelnig at iem.at>.
+
+2006-10-11  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: AC_USE_SYSTEM_EXTENSIONS now defines _TANDEM_SOURCE for
+	the NonStop platform.
+	* doc/autoconf.texi (Posix Variants): Likewise.
+	* lib/autoconf/specific.m4 (AC_USE_SYSTEM_EXTENSIONS): Likewise.
+
+	* lib/m4sugar/m4sh.m4 (AS_TEST_X): New macro.
+	(AS_EXECUTABLE_P): Use as_test_x rather than as_executable_p.
+	(_AS_TEST_PREPARE): Set as_test_x rather than as_executable_p.
+	Use a better substitute, by inspecting the output of "ls"
+	rather than just using ":".
+	* lib/autoconf/general.m4 (_AC_LINK_IFELSE): Use AS_TEST_X
+	rather than AS_EXECUTABLE_P, since we needn't worry about
+	non-regular files here.
+
+	* NEWS: Autoconf-generated shell scripts no longer export BIN_SH,
+	due to configuration hassles with this.  See Tonya Underwood's report
+	<http://lists.gnu.org/archive/html/bug-autoconf/2006-10/msg00003.html>.
+	* doc/autoconf.texi (Special Shell Variables): Likewise.
+
+2006-10-11  Paul Eggert  <eggert at cs.ucla.edu>
+	    Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/m4sugar/m4sh.m4 (AS_BOURNE_COMPATIBLE): Don't set BIN_SH.
+	(_AS_DETECT_BETTER_SHELL): Don't look in /usr/bin/posix.
+
+2006-10-11  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/m4sugar/m4sh.m4 (AS_BOURNE_COMPATIBLE): Move the
+	  initialization which is not inherited through the environment
+	(_AS_BOURNE_COMPATIBLE): ... to this new macro.
+	(_AS_RUN): Call _AS_BOURNE_COMPATIBLE, not AS_BOURNE_COMPATIBLE.
+
+2006-10-09  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Limitations of Usual Tools): Describe
+	problems with mkdir -p -m.
+
+2006-10-06  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/c.m4 (_AC_PROG_PREPROC_WORKS_IFELSE): Remove
+	comment about ac_cpp_err; it was incorrect, and anyway
+	ac_cpp_err is being removed below.
+	* lib/autoconf/general.m4 (_AC_PREPROC_IFELSE): Don't
+	set ac_cpp_err to 'yesyes' if preproc_warn_flag and werror_flag
+	are both 'yes'.  In fact, don't bother setting ac_cpp_err at all;
+	nobody uses it.
+	(_AC_COMPILE_IFELSE, _AC_LINK_IFELSE): Don't log our funky tests
+	with werror_flag and conftest.err and so forth.  This is more
+	compatible with how _AC_PROG_PREPROC_WORKS_IFELSE behaves,
+	and anyway the user shouldn't normally want to see this gorp logged.
+	Problem reported by Ralf Wildenhues.
+	* lib/autoconf/lang.m4 (AC_LANG_WERROR): werror_flag's default is
+	empty, not 'no', since the rest of the code uses 'test -z'.
+
+2006-10-04  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/general.m4 (_AC_COMPILE_IFELSE, _AC_LINK_IFELSE):
+	Use a single call to AC_DO_TOKENS rather than multiple, for
+	efficiency.
+	(_AC_LINK_IFELSE): Test that resulting file is executable.
+	Problem reported by mwoehlke in
+	<http://lists.gnu.org/archive/html/bug-coreutils/2006-10/msg00048.html>.
+
+	* lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Use "test -x /" rather
+	than creating a file to use with test -x; this is much faster.
+
+2006-10-02  Bruno Haible  <bruno at clisp.org>
+
+	* lib/autom4te.in (Automake-preselections): Add
+	AM_GNU_GETTEXT_INTL_SUBDIR, for automake 1.10.
+
+2006-09-27  Stepan Kasal  <kasal at ucw.cz>
+
+	* doc/autoconf.texi (Writing testsuite.at): Fix a typo: for
+	standard error, `experr' should be used, not `expout'.
+
+2006-09-26  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_FSEEKO): Don't compile the
+	fseeko testing program twice; just use the earlier result.
+	* lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_MACRO_VALUE):
+	Set cache var to 'unknown' (not 'no') if leaving the macro unset
+	still doesn't let the program compile.
+	(AC_SYS_LARGEFILE): Test for _LARGE_FILES only if earlier tests
+	failed.
+
+	* lib/autoconf/functions.m4: Fix problems reported by Ralf Wildenhues.
+	(AC_FUNC_ERROR_AT_LINE): Don't bother to check for error.h.  Just
+	include it, without including anything else.
+	(AC_FUNC_FSEEKO): Avoid gcc -Wall warnings about constant
+	expressions.
+	(AC_FUNC_STRNLEN): Require AC_USE_SYSTEM_EXTENSIONS.
+
+2006-09-26  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_ERROR_AT_LINE): Check for
+	`error.h', and include it, for a `error_at_line' prototype.
+	Use a nonempty format string in the link test.
+	* lib/autoconf/functions.m4 (AC_FUNC_WAIT3): Include <sys/wait.h>,
+	for a declaration of wait3.
+
+2006-09-26  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: AC_CHECK_DECL now also works with aggregate objects.
+	* doc/autoconf.texi (Generic Declarations): Clarify that AC_CHECK_DECL
+	can apply to constants too, and that it checks for macro defns.
+	* lib/autoconf/general.m4 (AC_CHECK_DECL): Assume C89 or better,
+	and simply cast the identifier to void.  This handles structure
+	values.  Problem reported by Ralf Wildenhues.
+	* tests/semantics.at (AC_CHECK_DECLS): Also check enums.
+
+2006-09-26  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* tests/semantics.at (AC_CHECK_DECLS): Also check macros,
+	structure, and function symbols.
+
+2006-09-26  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* tests/semantics.at (AC_CHECK_MEMBERS): Also test with a struct
+	member.
+
+2006-09-25  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: Recommend M4 1.4.7 instead of 1.4.6.
+	* README: Likewise.
+	* doc/autoconf.texi (Introduction, Why GNU M4): Likewise.
+
+2006-09-25  Paul Eggert  <eggert at cs.ucla.edu>
+	and Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_OBSTACK): Avoid `gcc -Wall'
+	warnings (uninitialized value).
+	(AC_FUNC_UTIME_NULL): Likewise, test for and include <utime.h> if
+	present.
+	* lib/autoconf/types.m4 (AC_TYPE_LONG_LONG_INT): Likewise, add
+	parentheses.
+	(AC_STRUCT_TM): Likewise, avoid unused variables.
+
+2006-09-20  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/c.m4 (_AC_ARG_VAR_LDFLAGS): Update comment.
+	(_AC_ARG_VAR_LIBS): New macro: let LIBS be precious.
+	(AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC): Call _AC_ARG_VAR_LIBS.
+	* lib/autoconf/fortran.m4 (AC_PROG_F77, AC_PROG_FC): Likewise.
+	Report by Olly Betts.
+
+2006-09-19  Eric Blake  <ebb9 at byu.net>
+
+	* m4/m4.m4: Change copyright.
+	* configure: Regenerate.
+	* Makefile.in: Likewise.
+	* bin/Makefile.in: Likewise.
+	* doc/Makefile.in: Likewise.
+	* lib/Makefile.in: Likewise.
+	* lib/Autom4te/Makefile.in: Likewise.
+	* lib/autoconf/Makefile.in: Likewise.
+	* lib/autoscan/Makefile.in: Likewise.
+	* lib/autotest/Makefile.in: Likewise.
+	* lib/emacs/Makefile.in: Likewise.
+	* lib/m4sugar/Makefile.in: Likewise.
+	* man/Makefile.in: Likewise.
+	* tests/Makefile.in: Likewise.
+
+	* m4/m4.m4 (AC_PROG_GNU_M4): Check for m4 --debugfile support.
+	* bin/Makefile.am (edit): Substitute M4_DEBUGFILE.
+	* bin/autom4te.in (handle_m4): Favor --debugfile over misnamed
+	--error-output, to avoid warnings with M4 2.0.
+
+2006-09-19  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autoconf/libs.m4 (AH_CHECK_LIB): Fix quoting, to be
+	  consistent with _AH_CHECK_FUNCS and _AH_CHECK_HEADERS.
+	* lib/autoconf/headers.m4 (AH_CHECK_HEADERS_DIRENT): Likewise.
+
+2006-09-15  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_GETMNTENT): Eliminate the
+	expansion of AC_CHECK_FUNCS.
+
+2006-09-14  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Remove a
+	mistaken comment: the path has to be relative; do not use
+	the path at runtime.
+
+2006-09-13  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/status.m4 (_AC_OUTPUT_SUBDIRS): Quote the
+	argument to `--prefix' for sub-configure scripts.
+	Pass `--silent' to sub-configure scripts.
+	* tests/torture.at (Configuring subdirectories): Add tests
+	for both changes.
+	* doc/autoconf.texi (Setting Output Variables): Fix example to
+	not show `--silent' being passed to a `configure' re-run.
+
+2006-09-12  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Input): Clarify role of AC_CONFIG_MACRO_DIR.
+	* lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Do not check
+	for the existence of the directory at configure-time.  That's
+	too late, anyway.  Problem reported by Stefan Seefeld.
+
+	* lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Avoid bug in UnixWare
+	7.1.4 /usr/bin/posix/sh described by Tim Rice in
+	<http://lists.gnu.org/archive/html/bug-autoconf/2006-09/msg00017.html>.
+
+2006-09-11  Stepan Kasal  <kasal at ucw.cz>
+
+	* tests/local.at (AT_CHECK_M4): Fix this so that the testsuite
+	works with GNU M4 1.4.3 again; make the normalized form
+	match the current m4 message; fix the description.
+	* test/tools.at (autom4te cache): Adapt to the change.
+
+2006-09-08  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_MKTIME):  Add year_2050_test
+	to catch glibc bug 2821
+	<http://sourceware.org/bugzilla/show_bug.cgi?id=2821>.
+
+	Merge from gnulib as follows: Use AC_CHECK_HEADERS_ONCE instead of
+	AC_CHECK_HEADERS, and likewise for AC_CHECK_FUNCS_ONCE and
+	AC_CHECK_FUNCS.  Don't check for stdlib.h, since we now
+	assume C89.
+
+2006-09-08  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autom4te.in (Autoconf-without-aclocal-m4): Move the
+	preselections ...
+	(Autoconf): ... here.
+	(Autoscan-preselections): Delete.
+
+2006-09-07  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autom4te.in (Automake-preselections): Preselect
+	AM_ENABLE_MULTILIB.
+
+2006-09-05  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Preset Output Variables): srcdir and
+	top_srcdir are not necessarily relative.  Problem reported
+	by Dries Kimpe.
+
+2006-09-05  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/fortran.m4 (_AC_PROG_FC): Prefer xlf90/xlf95 over
+	f90/f95 because the latter drivers of AIX Fortran 9.1 do not
+	accept files with extension `.f'.  For consistency, also prefer
+	xlf over f77.
+	* doc/autoconf.texi (Fortran Compiler): Remove mention of bug
+	from last patch.
+
+2006-09-05  Romain Lenglet  <rlenglet at users.forge.objectweb.org>
+
+	* lib/autoconf/erlang.m4 (AC_ERLANG_CHECK_LIB): Added substitution
+	of ERLANG_LIB_VER_* variables.
+	* doc/autoconf.texi (Erlang Libraries): Document ERLANG_LIB_VER_*
+	variables.
+
+2006-09-03  Paul Eggert  <eggert at cs.ucla.edu>
+	and Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (Limitations of Builtins): Document 'unset'
+	bugs of Bash 2.01 and 2.05a.
+	(Fortran Compiler): Document that AC_PROG_CC should be called
+	before AC_PROG_FC, due to a bug in Autoconf.
+
+2006-09-01  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: New macro AC_CACHE_CHECK_INT.  It replaces the
+	old AC_COMPUTE_INT, which now behaves like _AC_COMPUTE_INT
+	except the first two arguments are reversed.
+	* doc/autoconf.texi (Caching Results): New macro AC_CACHE_CHECK_INT.
+	(Generic Compiler Characteristics): AC_COMPUTE_INT no longer
+	caches nor outputs a diagnostic.  Suggested by Bruno Haible.
+	* lib/autoconf/general.m4 (AC_CACHE_CHECK_INT): New macro,
+	equivalent to the old AC_COMPUTE_INT.
+	(AC_COMPUTE_INT): No longer caches or reports.  New signature.
+	All uses changed to AC_CACHE_CHECK_INT.
+	* tests/base.at (AC_CACHE_CHECK_INT): New test.
+	* tests/mktests.sh (ac_exclude_list): Add AC_CACHE_CHECK_INT.
+
+2006-08-31  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: AC_FUNC_FNMATCH, AC_FUNC_FNMATCH_GNU, AC_FUNC_GETLOADVG,
+	and AC_REPLACE_FNMATCH are now obsolescent in Autoconf.  New
+	programs should use their Gnulib counterparts.
+	* doc/autoconf.texi (Particular Functions): Likewise.
+	(Macro Names, testsuite Invocation): Replace uses of these
+	obsolete macros with uses of non-obsolete macros.
+
+2006-08-29  Eric Blake  <ebb9 at byu.net>
+
+	* configure.ac (AC_INIT): Bump to 2.60b.
+	* NEWS: Update.
+
+2006-08-28  Eric Blake  <ebb9 at byu.net>
+
+	* lib/autoconf/headers.m4 (AC_HEADER_STAT): Fix logic that was
+	mistakenly swapped on 2006-08-15.
+
+2006-08-25  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: Version 2.60a.
+
+2006-08-25  Stepan Kasal  <kasal at ucw.cz>
+
+	* lib/autoconf/general.m4 (_AC_LINK_IFELSE): Remove the IPA/IPO
+	file created by the PGI compiler.
+
+2006-08-25  Noah Misch  <noah at cs.caltech.edu>
+
+	* lib/Autom4te/General.pm (END): Use `File::Path::rmtree' to
+	simplify the code.
+
+2006-08-25  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Fix Lex library problem reported to us by Julio Garvia.
+	* doc/autoconf.texi (Particular Programs): YYTEXT_POINTER is
+	for the default, which the user can override.
+	* lib/autoconf/programs.m4 (AC_PROG_LEX): Let _AC_PROG_LEX_YYTEXT_DECL
+	deal with LEXLIB.
+	(_AC_PROG_LEX_YYTEXT_DECL): Handle caching correctly; the old code
+	didn't work if some values were cached but not others.  Test for
+	broken lex libraries like native ia64-hp-hpux11.22; see
+	<http://sources.redhat.com/ml/binutils/2003-12/msg00337.html>, and
+	work around the problem by preferring an empty LEXLIB to -lfl or
+	-ll.  Let the user set LEXLIB='' to indicate no library needed.
+
+	* NEWS: Recommend M4 1.4.6 instead of 1.4.5.
+	* README: Likewise.
+	* doc/autoconf.texi (Introduction, Why GNU M4): Likewise.
+
+2006-08-24  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Rework to use more-modern build style.
+	Many files are renamed; all uses of their names were changed.
+	* .x-sc_trailing_blank: Renamed from .x-sc_trailing_space.
+	* .x-sc_useless_cpp_parens: New file.
+	* build-aux/config.guess: Renamed from config/config.guess.  Update.
+	* build-aux/config.sub: Renamed from config/config.sub.  Update.
+	* build-aux/elisp-comp: Renamed from config/elisp-comp.
+	* build-aux/install-sh: Renamed from config/install-sh.  Update.
+	* build-aux/mdate-sh: Renamed from config/mdate-sh.
+	* build-aux/missing: Renamed from config/missing.
+	* build-aux/texinfo.tex: Renamed from config/texinfo.tex.  Update.
+	* build-aux/vc-list-files: Renamed from config/vc-list-files.
+	* config/Makefile.am: Removed.
+	* config/mkinstalldirs: Removed.
+	* config/move-if-change: Removed.
+	* m4/m4.m4: Renamed from config/m4.m4.  Add (C) to copyright notice.
+	* Makefile.am (SUBDIRS): Remove config.
+	(ACLOCAL_AMFLAGS): Include from m4, not config.
+	(EXTRA_DIST): Add config/announce-gen, config/prev-version.txt.
+	(WGET, WGETFLAGS): New macros, since Makefile.maint no longer does this.
+	(autom4te-update): Rewrite with a loop.  Get from gnulib, not automake.
+	Fail if there's an error.
+	* Makefile.cfg (move_if_change): Remove.
+	(wget_files): Remove.
+	(cvs_executable_files): New macro.
+	(cvs_files): Use it.  Remove mkinstalldirs.  Add fdl.texi.
+	(executable-update): Use $(cvs_executable_files).
+	(local-checks-to-skip): Remove.
+	* Makefile.maint: Merge from coreutils, plus add our own changes
+	(gzip_rsyncable): New macro.
+	(GZIP_ENV): Use it.
+	(CVS_LIST): Use build-aux/vc-list-files.
+	(VERSION_REGEXP): New macro.
+	(local-checks-available): Add patch-check, $(syntax-check-rules),
+	check-AUTHORS.
+	(syntax-check-rules): Compute dynamically.
+	(sc_cast_of_x_alloc_return_value): Work even if no source files.
+	(sc_cast_of_alloca_return_value): Likewise.
+	(sc_prohibit_atoi_atof): Simplify regexp.
+	(sc_no_if_have_config_h, sc_require_config_h):
+	(sc_prohibit_assert_without_use,
+	(sc_obsolete_symbols): Check for O_NDELAY.
+	(sc_texi_notab): Remove.
+	(sc-changelog): Don't make an exception for '----' lines.
+	(.re-list): Remove, so we don't have a junk file behind.
+	(sc_system_h_headers): Remove the need for .re-list.
+	(sc_the_the):  New rule.
+	(sc_tight_scope): Simplify.
+	(sc_trailing_blank): Renamed from sc_trailing_space.
+	(longopt_re): New macro.
+	(sc_two_space_separator_in_usage): New rule.
+	(sc_unmarked_diagnostics): Look at all files under CVS.
+	(sc_useless_cpp_parens, patch-check, check-AUTHORS): New rules.
+	(news-date-check, changelog-check): Version is OK.
+	(po-check): Look for lib files even if not in CVS.
+	(copyright-check): Use $() not ``.
+	(maintainer-distcheck): Do not depend on changelog-check.
+	(my-distcheck): Depend on $(release_archive_dir)/$(prev-tgz).
+	Also check for -Wpointer-arith.
+	(WGET, WGETFLAGS, tgz-md5, tgz-sha1, bz2-md5, bz2-sha1):
+	(xdelta-md5, xdelta-sha1, tgz-size, bz2-size, xd-size, rel-check):
+	Remove.
+	(announcement): Add --gpg-key-id arg.
+	(cvs-sv): Remove.
+	(move_if_change): Just use mv.
+	(local_updates: Remove wget-update, po-update.
+	(po_repo, do-po-update, po-update, wget_files, get-targets): Remove.
+	(config.guess-url_prefix, config.sub-url_prefix): Remove.
+	(ansi2knr.c-url_prefix, texinfo.tex-url_prefix):
+	(standards.texi-url_prefix, make-stds.texi-url_prefix, target, url):
+	($(get-targets)): Remove.
+	(cvs_files): Remove missing, mkinstalldirs, ansi2knr.c.
+	(gnulib_repo): Renamed from automake_repo.  Get from gnulib now.
+	(cvs-update): Get from gnulib.
+	(emut_upload_commands): gnupload is in build-aux now.
+	(alpha beta major): Add changelog-check.  Check version.
+	* configure.ac (AC_CONFIG_AUX_DIR): Renamed from config to build-aux.
+	(AC_CONFIG_FILES): Remove.
+	* bin/autoconf.as: Add spaces to avoid distcheck warning.
+	* config/announce-gen: Sync from coreutils.
+	* doc/make-stds.texi: Sync from gnulib.
+	* doc/standards.texi: Likewise.
+	* man/Makefile.am: Adjust for config -> build-aux renaming.
+	* tests/Makefile.am: Prefer $(FOO) to @FOO at .
+	* tests/local.at: Adjust from config -> build-aux renaming.
+	* tests/tools.at: Likewise.
+	* tests/torture.at: Likewise.
+
+	* NEWS: The C99 check now tests for vararg macros and 64-bit
+	preprocessor ints.
+	* doc/autoconf.texi (C Compiler): Document // comments, va_copy.
+	* lib/autoconf/c.m4 (_AC_PROG_CC_C99): Test varargs macros and
+	64-bit preprocessor ints.  Check for static initialization of
+	long long.  Remove unnecessary casts.
+
+2006-08-24  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (Particular Programs): Mention that
+	@INSTALL@ and @MKDIR_P@ may vary for different output files.
+	Reported by Alexandre Duret-Lutz.
+
+2006-08-24  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/fortran.m4 (_AC_FC_LIBRARY_LDFLAGS): Also ignore
+	-lgcc?* and -lSystem, for Darwin/MacOS X.  Problem reported by
+	Bill Northcott in
+	<http://lists.gnu.org/archive/html/autoconf/2006-08/msg00083.html>.
+
+2006-08-22  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/c.m4 (AC_C_CONST): Don't used shadowed vars, to
+	pacify insanely picky compilers.  Problem reported by Eric Blake.
+
+	* doc/autoconf.texi (Posix Variants): INTERACTIVE Unix is no
+	longer supported by Sun.
+
+2006-08-15  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* NEWS: Autoconf now uses constructs like "#ifdef HAVE_STDLIB_H"
+	rather than "#if HAVE_STDLIB_H", so that it now works with "gcc
+	-Wundef -Werror".  Problem reported by David Fang in
+	<http://lists.gnu.org/archive/html/autoconf/2006-08/msg00045.html>.
+	* doc/autoconf.texi (Header Templates, Default Includes):
+	(Particular Functions, Generic Functions, Header Portability):
+	(Particular Headers, Generic Headers, Generic Declarations, Guidelines):
+	(Obsolete Macros, AC_FOO_IFELSE vs AC_TRY_FOO):
+	(Present But Cannot Be Compiled, Preprocessor Symbol Index):
+	Prefer #ifdef to #if.
+	* lib/autoconf/c.m4 (AC_C_BIGENDIAN): Prefer #ifdef to #if.
+	* lib/autoconf/functions.m4 (AC_FUNC_ALLOCA, _AC_FUNC_MALLOC_IF):
+	(AC_FUNC_MKTIME, AC_FUNC_MMAP, _AC_FUNC_REALLOC_IF):
+	(AC_FUNC_SELECT_ARGTYPES, AC_FUNC_SETVBUF_REVERSED, _AC_FUNC_VFORK):
+	Likewise.
+	* lib/autoconf/headers.m4 (_AC_INCLUDES_DEFAULT_REQUIREMENTS):
+	(AC_HEADER_RESOLV, AC_HEADER_STAT): Likewise.
+	* lib/autoconf/specific.m4 (AC_DECL_SYS_SYGLIST):
+	(AC_SYS_RESTARTABLE_SYSCALLS): Likewise.
+	* lib/autoconf/headers.m4 (AC_HEADER_STAT): Don't assume that
+	S_ISDIR etc. are valid for use in #if; POSIX doesn't guarantee
+	this.
+
+2006-08-14  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Limitations of Usual Tools): Document sed
+	problems with arg script text that doesn't end in newline, and
+	with '-e a...'.  Problems reported by Ralf Wildenhues.
+
+2006-08-12  Alexandre Julliard  <julliard at winehq.org>  (tiny change)
+
+	* lib/autoconf/libs.m4 (AC_PATH_X_DIRECT): Replace another
+	check for libXt by a check for libX11.
+
+2006-08-10  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* doc/autoconf.texi (config.status Invocation): Adjust according
+	to last change.
+
+2006-08-08  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+
+	* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): `config.status
+	--help' should mention that `--version' outputs configuration
+	settings.  Report by Bruno Haible.
+
+2006-08-06  Paul Eggert  <eggert at cs.ucla.edu>
+
+	Fix test suite failures reported by Pierre in
+	<http://lists.gnu.org/archive/html/bug-autoconf/2006-08/msg00005.html>.
+	* lib/autoconf/lang.m4 (_AC_COMPILER_EXEEXT_DEFAULT): Don't claim
+	the compiler created a file "b.out" when it didn't create anything
+	at all.
+	* lib/autoconf/specific.m4 (AC_SYS_INTERPRETER):
+	Discard stderr too, when invoking the test script.
+
+2006-08-05  Alexandre Julliard  <julliard at winehq.org>  (tiny change)
+
+	* lib/autoconf/libs.m4 (AC_PATH_XTRA): Fixed a typo
+	in the restoring of the werror flag.
+
+2006-07-24  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* doc/autoconf.texi (Volatile Objects): Be even a little
+	less skeptical about "volatile", after discussion with
+	Bruno Haible on bug-gnulib.
+	(Limitations of Usual Tools): Warn about sed stripping
+	leading white space from text.  From Bruno Haible.
+
+2006-07-20  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/libs.m4 (AC_PATH_XTRA): Don't use -R if the
+	compiler complains about it, even if things works after the
+	complaint.  Problem reported by Peter O'Gorman.
+
+	* doc/autoconf.texi (Preset Output Variables): Document CFLAGS,
+	CPPFLAGS, and LDFLAGS better.  Problem reported by Bruno Haible.
+	Similarly for CXXFLAGS, OBJCFLAGS, ERLCFLAGS.
+
+2006-07-17  Paul Eggert  <eggert at cs.ucla.edu>
+
+	* lib/autoconf/libs.m4 (AC_PATH_XTRA): Do the check for space
+	after -R regardless of host.  Patrick Welche reports that this
+	fixes things on NetBSD 3.99.
+
+	* NEWS: Recommend M4 1.4.5.
+	* README: Likewise.
+	* doc/autoconf.texi (Introduction, Why GNU M4): Likewise.
+	* tests/tools.at (autom4te cache): Update wording of diagnostic
+	to match M4 1.4.5.
+
+2006-07-07  Paul Eggert  <eggert at cs.ucla.edu>
+

[... truncated: 76141 lines follow ...]


From stippi at mail.berlios.de  Wed Mar 19 13:58:09 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 19 Mar 2008 13:58:09 +0100
Subject: [Haiku-commits] r24465 - haiku/trunk/src/apps/networkstatus
Message-ID: <200803191258.m2JCw9PN000683@sheep.berlios.de>

Author: stippi
Date: 2008-03-19 13:58:08 +0100 (Wed, 19 Mar 2008)
New Revision: 24465
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24465&view=rev

Modified:
   haiku/trunk/src/apps/networkstatus/NetworkStatus.cpp
Log:
* Added --help and -h command line options which print the available options
  and quit the program immediately.
* Added --deskbar option to automatically install the Deskbar replicant.
  NetworkStatus waits up to 10 seconds for Deskbar to become available in
  case it is not running. In case the replicant is already installed, the
  program quits immediately.
* Refactored a _InstallDeskbarReplicant() method.


Modified: haiku/trunk/src/apps/networkstatus/NetworkStatus.cpp
===================================================================
--- haiku/trunk/src/apps/networkstatus/NetworkStatus.cpp	2008-03-19 12:42:05 UTC (rev 24464)
+++ haiku/trunk/src/apps/networkstatus/NetworkStatus.cpp	2008-03-19 12:58:08 UTC (rev 24465)
@@ -1,9 +1,10 @@
 /*
- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Axel D?rfler, axeld at pinc-software.de
+ *		Stephan A?mus <superstippi at gmx.de>
  */
 
 
@@ -25,8 +26,14 @@
 		NetworkStatus();
 		virtual	~NetworkStatus();
 
+		virtual	void	ArgvReceived(int32 argc, char** argv);
 		virtual	void	ReadyToRun();
 		virtual void	AboutRequested();
+	private:
+				void	_InstallReplicantInDeskbar();
+
+				bool	fAutoInstallInDeskbar;
+				bool	fQuitImmediately;
 };
 
 
@@ -53,7 +60,9 @@
 
 
 NetworkStatus::NetworkStatus()
-	: BApplication(kSignature)
+	: BApplication(kSignature),
+	  fAutoInstallInDeskbar(false),
+	  fQuitImmediately(false)
 {
 }
 
@@ -64,10 +73,37 @@
 
 
 void
+NetworkStatus::ArgvReceived(int32 argc, char** argv)
+{
+	if (argc <= 1)
+		return;
+
+	if (strcmp(argv[1], "--help") == 0
+		|| strcmp(argv[1], "-h") == 0) {
+		printf("NetworkStatus options:\n");
+		printf("   --deskbar      automatically add replicant to Deskbar\n");
+		printf("   --help         print this info and exit\n");
+		fQuitImmediately = true;
+		return;
+	}
+
+	if (strcmp(argv[1], "--deskbar") == 0)
+		fAutoInstallInDeskbar = true;
+}
+
+
+void
 NetworkStatus::ReadyToRun()
 {
+	if (fQuitImmediately) {
+		// we printed the help message into the Terminal and
+		// should just quit
+		Quit();
+		return;
+	}
+
+	bool isDeskbarRunning = true;
 	bool isInstalled = false;
-	bool isDeskbarRunning = true;
 
 	{
 		// if the Deskbar is not alive at this point, it might be after having
@@ -79,22 +115,42 @@
 		isInstalled = deskbar.HasItem(kDeskbarItemName);
 	}
 
+	if (fAutoInstallInDeskbar) {
+		if (isInstalled) {
+			Quit();
+			return;
+		}
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+		// wait up to 10 seconds for Deskbar to become available
+		// in case it is not running (yet?)
+		int32 tries = 10;
+		while (!isDeskbarRunning && --tries) {
+			BDeskbar deskbar;
+			if (deskbar.IsRunning()) {
+				isDeskbarRunning = true;
+				break;
+			}
+			snooze(1000000);
+		}
+#endif
+		if (!isDeskbarRunning) {
+			printf("Deskbar is not running, giving up.\n");
+			Quit();
+			return;
+		}
+
+		_InstallReplicantInDeskbar();
+		return;
+	}
+
 	if (isDeskbarRunning && !isInstalled) {
-		BAlert* alert = new BAlert("", "Do you want NetworkStatus to live in the Deskbar?",
-			"Don't", "Install", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		BAlert* alert = new BAlert("", "Do you want NetworkStatus to live in "
+			"the Deskbar?", "Don't", "Install", NULL, B_WIDTH_AS_USUAL,
+			B_WARNING_ALERT);
 		alert->SetShortcut(0, B_ESCAPE);
 
-		if (alert->Go()) {
-			image_info info;
-			entry_ref ref;
-
-			if (our_image(info) == B_OK
-				&& get_ref_for_path(info.name, &ref) == B_OK) {
-				BDeskbar deskbar;
-				deskbar.AddItem(&ref);
-			}
-
-			Quit();
+		if (alert->Go() == 1) {
+			_InstallReplicantInDeskbar();
 			return;
 		}
 	}
@@ -121,6 +177,22 @@
 }
 
 
+void
+NetworkStatus::_InstallReplicantInDeskbar()
+{
+	image_info info;
+	entry_ref ref;
+
+	if (our_image(info) == B_OK
+		&& get_ref_for_path(info.name, &ref) == B_OK) {
+		BDeskbar deskbar;
+		deskbar.AddItem(&ref);
+	}
+
+	Quit();
+}
+
+
 //	#pragma mark -
 
 



From bonefish at mail.berlios.de  Wed Mar 19 14:01:57 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 19 Mar 2008 14:01:57 +0100
Subject: [Haiku-commits] r24466 - buildtools/trunk/autoconf/build-aux
Message-ID: <200803191301.m2JD1vBp001452@sheep.berlios.de>

Author: bonefish
Date: 2008-03-19 14:01:56 +0100 (Wed, 19 Mar 2008)
New Revision: 24466
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24466&view=rev

Modified:
   buildtools/trunk/autoconf/build-aux/config.guess
Log:
Congrats svn_load_dirs.pl, this change just disappeared.


Modified: buildtools/trunk/autoconf/build-aux/config.guess
===================================================================
--- buildtools/trunk/autoconf/build-aux/config.guess	2008-03-19 12:58:08 UTC (rev 24465)
+++ buildtools/trunk/autoconf/build-aux/config.guess	2008-03-19 13:01:56 UTC (rev 24466)
@@ -1200,6 +1200,12 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BeMac:Haiku:*:*)
+	echo powerpc-apple-haiku
+	exit ;;
+    BePC:Haiku:*:*)
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;



From bonefish at mail.berlios.de  Wed Mar 19 15:09:04 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 19 Mar 2008 15:09:04 +0100
Subject: [Haiku-commits] r24467 - haiku/trunk/src/system/runtime_loader
Message-ID: <200803191409.m2JE944u009695@sheep.berlios.de>

Author: bonefish
Date: 2008-03-19 15:09:03 +0100 (Wed, 19 Mar 2008)
New Revision: 24467
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24467&view=rev

Modified:
   haiku/trunk/src/system/runtime_loader/runtime_loader.c
Log:
_kern_read_link() no longer null-terminates the read string. Fixes
loading of symlinked libraries.


Modified: haiku/trunk/src/system/runtime_loader/runtime_loader.c
===================================================================
--- haiku/trunk/src/system/runtime_loader/runtime_loader.c	2008-03-19 13:01:56 UTC (rev 24466)
+++ haiku/trunk/src/system/runtime_loader/runtime_loader.c	2008-03-19 14:09:03 UTC (rev 24467)
@@ -139,13 +139,14 @@
 
 	if (S_ISLNK(stat.st_mode)) {
 		char buffer[PATH_MAX];
-		size_t length = PATH_MAX;
+		size_t length = PATH_MAX - 1;
 		char *lastSlash;
 
 		// it's a link, indeed
 		status = _kern_read_link(-1, path, buffer, &length);
 		if (status < B_OK)
 			return status;
+		buffer[length] = '\0';
 
 		lastSlash = strrchr(path, '/');
 		if (buffer[0] != '/' && lastSlash != NULL) {



From anevilyak at mail.berlios.de  Wed Mar 19 15:57:50 2008
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Wed, 19 Mar 2008 15:57:50 +0100
Subject: [Haiku-commits] r24468 - haiku/trunk/src/kits/interface
Message-ID: <200803191457.m2JEvoM9014564@sheep.berlios.de>

Author: anevilyak
Date: 2008-03-19 15:57:50 +0100 (Wed, 19 Mar 2008)
New Revision: 24468
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24468&view=rev

Modified:
   haiku/trunk/src/kits/interface/StatusBar.cpp
Log:
Fix SpaceMonitor crash. Verified that R5 and/or Zeta in fact do *not*
Invalidate() on SetMaxValue(). This should probably be revisited in
the future whenever we break binary compat. TODO note added to that
effect.



Modified: haiku/trunk/src/kits/interface/StatusBar.cpp
===================================================================
--- haiku/trunk/src/kits/interface/StatusBar.cpp	2008-03-19 14:09:03 UTC (rev 24467)
+++ haiku/trunk/src/kits/interface/StatusBar.cpp	2008-03-19 14:57:50 UTC (rev 24468)
@@ -343,8 +343,11 @@
 void
 BStatusBar::SetMaxValue(float max)
 {
+	// R5 and/or Zeta's SetMaxValue does not trigger an invalidate here.
+	// this is probably not ideal behavior, but it does break apps in some cases 
+	// as observed with SpaceMonitor.
+	// TODO: revisit this when we break binary compatibility
 	fMax = max;
-	Invalidate(_BarFrame());
 }
 
 



From axeld at mail.berlios.de  Wed Mar 19 17:19:48 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 19 Mar 2008 17:19:48 +0100
Subject: [Haiku-commits] r24469 - haiku/trunk/build/jam
Message-ID: <200803191619.m2JGJmcE027837@sheep.berlios.de>

Author: axeld
Date: 2008-03-19 17:19:47 +0100 (Wed, 19 Mar 2008)
New Revision: 24469
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24469&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
* Added "headers/build/gcc-2.95.3" to the Development optional package.
* This allows you to use a GCC compiler completely with native headers, 
  all you have to do (after having unpacked and moved GCC to the correct
  location), is to replace its "lib/gcc-lib/i586-pc-beos/2.95.3-beos-060710/include"
  directory with this one. There is no need for R5 headers anymore, 
  then.
* Removed extraneous whitespace.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2008-03-19 14:57:50 UTC (rev 24468)
+++ haiku/trunk/build/jam/HaikuImage	2008-03-19 16:19:47 UTC (rev 24469)
@@ -38,7 +38,7 @@
 	mount_nfs mountvolume mv nc netstat nl nohup od open paste patch pathchk pc
 	ping play playfile playsound playwav pr prio printenv printf ps ptx pwd
 	query quit readlink release renice rescan rlog rm rmattr rmindex rmdir roster route
-	safemode screen_blanker sed setdecor settype setversion setvolume seq sh sha1sum shar 
+	safemode screen_blanker sed setdecor settype setversion setvolume seq sh sha1sum shar
 	shred shuf shutdown sleep sort split stat strace stty su sum sync sysinfo tac tail tar
 	tcpdump tcptester tee telnet telnetd test top touch tput tr traceroute
 	translate true tsort tty uname unchop unexpand unmount uniq unrar unshar
@@ -47,7 +47,7 @@
 	zipcloak zipgrep zipnote zipsplit zmore znew
 ;
 
-	
+
 BEOS_APPS = AboutSystem CodyCam DeskCalc DiskProbe DriveSetup CDPlayer Expander
 	Icon-O-Matic Installer LaunchBox Magnify Mail MediaPlayer MidiPlayer
 	NetworkStatus PackageInstaller People PowerStatus ProcessController
@@ -91,8 +91,8 @@
 	TIFFTranslator WonderBrushTranslator
 ;
 BEOS_ADD_ONS_MEDIA = dvb.media_addon
-	hmulti_audio.media_addon 
-	mixer.media_addon 
+	hmulti_audio.media_addon
+	mixer.media_addon
 	opensound.media_addon
     tone_producer_demo.media_addon
 	usb_webcam.media_addon
@@ -105,7 +105,7 @@
 	matroska mov_reader
 	mp3_decoder mp3_reader
 	mp4_reader musepack
-	ogg raw_decoder speex 
+	ogg raw_decoder speex
 	# theora
 	vorbis wav_reader
 ;
@@ -368,7 +368,7 @@
 AddFilesToHaikuImage beos system : zbeos ;
 
 # boot module links
-AddBootModuleSymlinksToHaikuImage 
+AddBootModuleSymlinksToHaikuImage
 	pci $(X86_ONLY)isa config_manager ide scsi
 	$(PPC_ONLY)openpic
 	block_io fast_log ide_adapter locked_pool scsi_periph
@@ -381,7 +381,7 @@
 # add-ons
 AddFilesToHaikuImage beos system add-ons accelerants
 	: $(BEOS_ADD_ONS_ACCELERANTS) ;
-AddFilesToHaikuImage beos system add-ons opengl 
+AddFilesToHaikuImage beos system add-ons opengl
 	: $(X86_ONLY)Mesa\ Software\ Renderer ;
 AddFilesToHaikuImage beos system add-ons Translators
 	: $(BEOS_ADD_ONS_TRANSLATORS) ;
@@ -493,7 +493,7 @@
 
 	# library symlinks
 	local lib ;
-	for lib in $(BEOS_SYSTEM_LIBS) 
+	for lib in $(BEOS_SYSTEM_LIBS)
 		$(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) libglut.so {
 		AddSymlinkToHaikuImage develop lib x86 : /system/lib/$(lib:BS) ;
 	}
@@ -505,6 +505,7 @@
 	AddHeaderDirectoryToHaikuImage gnu ;
 	AddHeaderDirectoryToHaikuImage os ;
 	AddHeaderDirectoryToHaikuImage posix ;
+	AddHeaderDirectoryToHaikuImage build gcc-2.95.3 ;
 
 	# make be -> os symlink for now
 	AddSymlinkToHaikuImage develop headers : /boot/develop/headers/os : be ;
@@ -528,7 +529,7 @@
 if [ IsOptionalHaikuImagePackageAdded WonderBrush ] {
 	if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		Echo "No optional package WonderBrush available for gcc4" ;
-	} else {  
+	} else {
 		InstallOptionalHaikuImagePackage WonderBrush
 			: http://www.yellowbites.com/downloads/WonderBrush-2.1.1-demo-x86-R5.zip
 			: apps
@@ -545,7 +546,7 @@
 	} else {
 		InstallOptionalHaikuImagePackage OpenSound
 			: http://revolf.free.fr/beos/oss-beos-v4.1test-bin.zip
-			: 
+			:
 		;
 	}
 	#UnzipArchiveToHaikuImage home : data/vv.mp3.zip : 0 ;
@@ -558,7 +559,7 @@
 	} else {
 		InstallOptionalHaikuImagePackage Links
 			: http://revolf.free.fr/beos/links-beos-bin.zip
-			: 
+			:
 		;
 		AddSymlinkToHaikuImage home config be Applications
 			: /boot/home/config/bin/links ;



From stippi at mail.berlios.de  Wed Mar 19 17:32:28 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 19 Mar 2008 17:32:28 +0100
Subject: [Haiku-commits] r24470 - haiku/trunk/src/add-ons/media/plugins/ogg
Message-ID: <200803191632.m2JGWS14029373@sheep.berlios.de>

Author: stippi
Date: 2008-03-19 17:32:27 +0100 (Wed, 19 Mar 2008)
New Revision: 24470
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24470&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp
   haiku/trunk/src/add-ons/media/plugins/ogg/OggSeekable.cpp
   haiku/trunk/src/add-ons/media/plugins/ogg/OggSpeexSeekable.cpp
   haiku/trunk/src/add-ons/media/plugins/ogg/OggSpeexStream.cpp
   haiku/trunk/src/add-ons/media/plugins/ogg/OggStream.cpp
   haiku/trunk/src/add-ons/media/plugins/ogg/OggTheoraStream.cpp
   haiku/trunk/src/add-ons/media/plugins/ogg/OggTobiasSeekable.cpp
   haiku/trunk/src/add-ons/media/plugins/ogg/OggTobiasStream.cpp
   haiku/trunk/src/add-ons/media/plugins/ogg/OggTrack.cpp
   haiku/trunk/src/add-ons/media/plugins/ogg/OggVorbisSeekable.cpp
   haiku/trunk/src/add-ons/media/plugins/ogg/OggVorbisStream.cpp
Log:
Turn off tracing. Only people looking for bugs in this plugin should have
it turned on, IMHO.


Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -12,7 +12,7 @@
 #include "OggStream.h"
 #include "OggSeekable.h"
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggSeekable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggSeekable.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggSeekable.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -7,7 +7,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggSpeexSeekable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggSpeexSeekable.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggSpeexSeekable.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -2,7 +2,7 @@
 #include "OggSpeexSeekable.h"
 #include <stdio.h>
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggSpeexStream.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggSpeexStream.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggSpeexStream.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -2,7 +2,7 @@
 #include "OggSpeexStream.h"
 #include <stdio.h>
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggStream.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggStream.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggStream.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -7,7 +7,7 @@
 #include <Autolock.h>
 #include <stdio.h>
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggTheoraStream.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggTheoraStream.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggTheoraStream.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -3,7 +3,7 @@
 #include <ogg/ogg.h>
 #include <stdio.h>
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggTobiasSeekable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggTobiasSeekable.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggTobiasSeekable.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -2,7 +2,7 @@
 #include "OggTobiasSeekable.h"
 #include <stdio.h>
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggTobiasStream.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggTobiasStream.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggTobiasStream.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -2,7 +2,7 @@
 #include "OggTobiasStream.h"
 #include <stdio.h>
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggTrack.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggTrack.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggTrack.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -1,7 +1,7 @@
 #include "OggTrack.h"
 #include <stdio.h>
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggVorbisSeekable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggVorbisSeekable.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggVorbisSeekable.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -2,7 +2,7 @@
 #include "OggVorbisSeekable.h"
 #include <stdio.h>
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/ogg/OggVorbisStream.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ogg/OggVorbisStream.cpp	2008-03-19 16:19:47 UTC (rev 24469)
+++ haiku/trunk/src/add-ons/media/plugins/ogg/OggVorbisStream.cpp	2008-03-19 16:32:27 UTC (rev 24470)
@@ -2,7 +2,7 @@
 #include "OggVorbisStream.h"
 #include <stdio.h>
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else



From stippi at mail.berlios.de  Wed Mar 19 17:44:28 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 19 Mar 2008 17:44:28 +0100
Subject: [Haiku-commits] r24471 - in haiku/trunk/src/add-ons/media/plugins:
	. avcodec avi_reader matroska mov_reader mp3_decoder
	mp4_reader musepack speex theora vorbis
Message-ID: <200803191644.m2JGiSN9030456@sheep.berlios.de>

Author: stippi
Date: 2008-03-19 17:44:26 +0100 (Wed, 19 Mar 2008)
New Revision: 24471
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24471&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/Jamfile
   haiku/trunk/src/add-ons/media/plugins/avcodec/avcodec.cpp
   haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.cpp
   haiku/trunk/src/add-ons/media/plugins/matroska/matroska_codecs.cpp
   haiku/trunk/src/add-ons/media/plugins/matroska/matroska_reader.cpp
   haiku/trunk/src/add-ons/media/plugins/mov_reader/mov_reader.cpp
   haiku/trunk/src/add-ons/media/plugins/mp3_decoder/mp3DecoderPlugin.cpp
   haiku/trunk/src/add-ons/media/plugins/mp4_reader/mp4_reader.cpp
   haiku/trunk/src/add-ons/media/plugins/musepack/MusePackReader.cpp
   haiku/trunk/src/add-ons/media/plugins/speex/speexCodecPlugin.cpp
   haiku/trunk/src/add-ons/media/plugins/theora/theoraCodecPlugin.cpp
   haiku/trunk/src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp
Log:
Turn off tracing in all the decoder and reader plug-ins. It should be turned on
when looking for a bug in the respective plug-in.


Modified: haiku/trunk/src/add-ons/media/plugins/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/Jamfile	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/Jamfile	2008-03-19 16:44:26 UTC (rev 24471)
@@ -26,3 +26,4 @@
 # licensed add-ons, you need to run configure with the --include-gpl-addons
 # parameter
 SubIncludeGPL HAIKU_TOP src add-ons media plugins ac3_decoder ;
+#SubIncludeGPL HAIKU_TOP src add-ons media plugins xvid_decoder ;

Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/avcodec.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/avcodec.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/avcodec.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -153,7 +153,7 @@
 			if (gCodecTable[i].family == descr.family && gCodecTable[i].fourcc == cid) {
 				fCodec = avcodec_find_decoder(gCodecTable[i].id);
 				if (!fCodec) {
-					printf("avCodec: unable to find the correct ffmpeg decoder (id = %d)!!!\n",gCodecTable[i].id);
+					PRINT(("avCodec: unable to find the correct ffmpeg decoder (id = %d)!!!\n",gCodecTable[i].id));
 					return B_ERROR;
 				}
 				
@@ -225,8 +225,8 @@
 		ffc->extradata = fExtraData;
 		ffc->extradata_size = fExtraDataSize;
 
-		printf("bit_rate %d, sample_rate %d, channels %d, block_align %d, extradata_size %d\n",
-			ffc->bit_rate, ffc->sample_rate, ffc->channels, ffc->block_align, ffc->extradata_size);
+		PRINT(("bit_rate %d, sample_rate %d, channels %d, block_align %d, extradata_size %d\n",
+			ffc->bit_rate, ffc->sample_rate, ffc->channels, ffc->block_align, ffc->extradata_size));
 
 		// close any previous instance
 		if (fCodecInitDone) {
@@ -268,7 +268,7 @@
 			ffc->extradata_size = fInputFormat.MetaDataSize();
 		}
 
-		printf("#### requested video format 0x%x\n", inout_format->u.raw_video.display.format);
+		PRINT(("#### requested video format 0x%x\n", inout_format->u.raw_video.display.format));
 
 		// make MediaPlayer happy (if not in rgb32 screen depth and no overlay,
 		// it will only ask for YCbCr, which DrawBitmap doesn't handle, so the default
@@ -300,11 +300,11 @@
 		}
 
 		if (!fCodecInitDone) {
-			printf("avcodec_open() failed!\n");
+			PRINT(("avcodec_open() failed!\n"));
 			return B_ERROR;
 		}
 		if (!conv_func) {
-			printf("no conv_func!\n");
+			PRINT(("no conv_func!\n"));
 			return B_ERROR;
 		}
 
@@ -324,7 +324,7 @@
 		PRINT(("[%c]  out_format=%s\n", isAudio?('a'):('v'), buffer));
 	#endif
 
-		printf("#### returned  video format 0x%x\n", inout_format->u.raw_video.display.format);
+		PRINT(("#### returned  video format 0x%x\n", inout_format->u.raw_video.display.format));
 
 		return B_OK;
 	}
@@ -354,17 +354,17 @@
 
 		mh->start_time = fStartTime;
 
-//		printf("audio start_time %.6f\n", mh->start_time / 1000000.0);
+//		PRINT(("audio start_time %.6f\n", mh->start_time / 1000000.0));
 
 		char *output_buffer = (char *)out_buffer;
 		*out_frameCount = 0;
 		while (*out_frameCount < fOutputFrameCount) {
 			if (fOutputBufferSize < 0) {
-				printf("############ fOutputBufferSize %ld\n", fOutputBufferSize);
+				PRINT(("############ fOutputBufferSize %ld\n", fOutputBufferSize));
 				fOutputBufferSize = 0;
 			}
 			if (fChunkBufferSize < 0) {
-				printf("############ fChunkBufferSize %ld\n", fChunkBufferSize);
+				PRINT(("############ fChunkBufferSize %ld\n", fChunkBufferSize));
 				fChunkBufferSize = 0;
 			}
 		
@@ -383,7 +383,7 @@
 				status_t err;
 				err = GetNextChunk(&fChunkBuffer, &fChunkBufferSize, &chunk_mh);
 				if (err != B_OK || fChunkBufferSize < 0) {
-					printf("GetNextChunk error\n");
+					PRINT(("GetNextChunk error\n"));
 					fChunkBufferSize = 0;
 					break;
 				}
@@ -397,13 +397,13 @@
 				int len, out_size;
 				len = avcodec_decode_audio(ffc, (short *)fOutputBuffer, &out_size, const_cast<uint8_t *>(static_cast<const uint8_t *>(fChunkBuffer)) + fChunkBufferOffset, fChunkBufferSize);
 				if (len < 0) {
-					printf("########### audio decode error, fChunkBufferSize %ld, fChunkBufferOffset %ld\n", fChunkBufferSize, fChunkBufferOffset);
+					PRINT(("########### audio decode error, fChunkBufferSize %ld, fChunkBufferOffset %ld\n", fChunkBufferSize, fChunkBufferOffset));
 					out_size = 0;
 					len = 0;
 					fChunkBufferOffset = 0;
 					fChunkBufferSize = 0;
 				}
-//				else printf("audio decode: len %d, out_size %d\n", len, out_size);
+//				else PRINT(("audio decode: len %d, out_size %d\n", len, out_size));
 				fChunkBufferOffset += len;
 				fChunkBufferSize -= len;
 				fOutputBufferOffset = 0;
@@ -451,8 +451,8 @@
 		int len;
 		len = avcodec_decode_video(ffc, ffpicture, &got_picture, (uint8_t *)data, size);
 
-//printf("FFDEC: PTS = %d:%d:%d.%d - ffc->frame_number = %ld ffc->frame_rate = %ld\n", (int)(ffc->pts / (60*60*1000000)), (int)(ffc->pts / (60*1000000)), (int)(ffc->pts / (1000000)), (int)(ffc->pts % 1000000), ffc->frame_number, ffc->frame_rate);
-//printf("FFDEC: PTS = %d:%d:%d.%d - ffc->frame_number = %ld ffc->frame_rate = %ld\n", (int)(ffpicture->pts / (60*60*1000000)), (int)(ffpicture->pts / (60*1000000)), (int)(ffpicture->pts / (1000000)), (int)(ffpicture->pts % 1000000), ffc->frame_number, ffc->frame_rate);
+//PRINT(("FFDEC: PTS = %d:%d:%d.%d - ffc->frame_number = %ld ffc->frame_rate = %ld\n", (int)(ffc->pts / (60*60*1000000)), (int)(ffc->pts / (60*1000000)), (int)(ffc->pts / (1000000)), (int)(ffc->pts % 1000000), ffc->frame_number, ffc->frame_rate));
+//PRINT(("FFDEC: PTS = %d:%d:%d.%d - ffc->frame_number = %ld ffc->frame_rate = %ld\n", (int)(ffpicture->pts / (60*60*1000000)), (int)(ffpicture->pts / (60*1000000)), (int)(ffpicture->pts / (1000000)), (int)(ffpicture->pts % 1000000), ffc->frame_number, ffc->frame_rate));
 
 		if (len < 0)
 			printf("[%c] avCodec: error in decoding frame %lld\n", isAudio?('a'):('v'), *out_frameCount);
@@ -488,7 +488,7 @@
 			diff2 += prof_t3 - prof_t2;
 			prof_cnt++;
 			if (!(fFrame % 10))
-				printf("[%c] profile: d1 = %lld, d2 = %lld (%ld)\n", isAudio?('a'):('v'), diff1/prof_cnt, diff2/prof_cnt, fFrame);
+				PRINT(("[%c] profile: d1 = %lld, d2 = %lld (%ld)\n", isAudio?('a'):('v'), diff1/prof_cnt, diff2/prof_cnt, fFrame));
 #endif
 		}
 	}

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -33,7 +33,7 @@
 #include "RawFormats.h"
 #include "avi_reader.h"
 
-#define TRACE_AVI_READER
+//#define TRACE_AVI_READER
 #ifdef TRACE_AVI_READER
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/matroska/matroska_codecs.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/matroska/matroska_codecs.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/matroska/matroska_codecs.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -27,6 +27,15 @@
 #include <MediaFormats.h>
 #include "matroska_codecs.h"
 
+//#define TRACE_MATROSKA
+#ifdef TRACE_MATROSKA
+  #define TRACE printf
+#else
+  #define TRACE(a...)
+#endif
+
+#define ERROR(a...) fprintf(stderr, a)
+
 #define IS_CODEC(a,b) !memcmp(a, b, strlen(b))
 
 struct bitmap_info_header
@@ -50,7 +59,7 @@
 status_t
 GetAudioFormat(media_format *format, const char *codec, void *private_data, int private_size)
 {
-	printf("GetAudioFormat: codec '%s', private data size %d\n", codec, private_size);
+	TRACE("GetAudioFormat: codec '%s', private data size %d\n", codec, private_size);
 	
 	BMediaFormats formats;
 	media_format_description description;
@@ -129,7 +138,7 @@
 status_t
 GetVideoFormat(media_format *format, const char *codec, void *private_data, int private_size)
 {
-	printf("private_data: codec '%s', private data size %d\n", codec, private_size);
+	TRACE("private_data: codec '%s', private data size %d\n", codec, private_size);
 	
 	BMediaFormats formats;
 	media_format_description description;

Modified: haiku/trunk/src/add-ons/media/plugins/matroska/matroska_reader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/matroska/matroska_reader.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/matroska/matroska_reader.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -34,7 +34,7 @@
 #include "matroska_codecs.h"
 #include "matroska_util.h"
 
-#define TRACE_MKV_READER
+//#define TRACE_MKV_READER
 #ifdef TRACE_MKV_READER
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/mov_reader/mov_reader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/mov_reader/mov_reader.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/mov_reader/mov_reader.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -34,7 +34,7 @@
 
 #include "mov_reader.h"
 
-#define TRACE_MOV_READER
+//#define TRACE_MOV_READER
 #ifdef TRACE_MOV_READER
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/mp3_decoder/mp3DecoderPlugin.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/mp3_decoder/mp3DecoderPlugin.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/mp3_decoder/mp3DecoderPlugin.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -29,7 +29,7 @@
 #include <MediaRoster.h>
 #include "mp3DecoderPlugin.h"
 
-#define TRACE_MP3_DECODER
+//#define TRACE_MP3_DECODER
 #ifdef TRACE_MP3_DECODER
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/mp4_reader/mp4_reader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/mp4_reader/mp4_reader.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/mp4_reader/mp4_reader.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -38,7 +38,7 @@
 #include <string.h>
 
 
-#define TRACE_MP4_READER
+//#define TRACE_MP4_READER
 #ifdef TRACE_MP4_READER
 #	define TRACE printf
 #else
@@ -469,7 +469,7 @@
 			size_t size = video_format->VOLSize;
 			const void *data = video_format->theVOL;
 			if (format->SetMetaData(data, size) != B_OK) {
-				printf("Failed to set VOL\n %d %d",(16 << 20),32000);
+				ERROR("Failed to set VOL\n %d %d",(16 << 20),32000);
 			}
 
 #ifdef TRACE_MP4_READER

Modified: haiku/trunk/src/add-ons/media/plugins/musepack/MusePackReader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/musepack/MusePackReader.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/musepack/MusePackReader.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -11,6 +11,14 @@
 #include <string.h>
 
 
+//#define TRACE_MUSEPACK_READER
+#ifdef TRACE_MUSEPACK_READER
+  #define TRACE printf
+#else
+  #define TRACE(a...)
+#endif
+
+
 MusePackReader::MusePackReader()
 {
 }
@@ -40,12 +48,12 @@
 	int error = fInfo.ReadStreamInfo(file);
 	if (error > B_OK) {
 		// error came from engine
-		printf("MusePackReader: ReadStreamInfo() engine error %d\n", error);
+		TRACE("MusePackReader: ReadStreamInfo() engine error %d\n", error);
 		return B_ERROR;
 	} else if (error < B_OK)
 		return error;
 
-	printf("MusePackReader: recognized MPC file\n");
+	TRACE("MusePackReader: recognized MPC file\n");
 	*_streamCount = 1;
 	return B_OK;
 }

Modified: haiku/trunk/src/add-ons/media/plugins/speex/speexCodecPlugin.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/speex/speexCodecPlugin.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/speex/speexCodecPlugin.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -10,7 +10,7 @@
 #include "speexCodecDefaults.h"
 #include "OggSpeexFormats.h"
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/theora/theoraCodecPlugin.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/theora/theoraCodecPlugin.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/theora/theoraCodecPlugin.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -8,7 +8,7 @@
 #include "theoraCodecPlugin.h"
 #include "OggTheoraFormats.h"
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp	2008-03-19 16:32:27 UTC (rev 24470)
+++ haiku/trunk/src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp	2008-03-19 16:44:26 UTC (rev 24471)
@@ -8,7 +8,7 @@
 #include "vorbisCodecPlugin.h"
 #include "OggVorbisFormats.h"
 
-#define TRACE_THIS 1
+#define TRACE_THIS 0
 #if TRACE_THIS
   #define TRACE printf
 #else



From stippi at mail.berlios.de  Wed Mar 19 18:09:27 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 19 Mar 2008 18:09:27 +0100
Subject: [Haiku-commits] r24472 - haiku/trunk/src/kits/media
Message-ID: <200803191709.m2JH9R5J000164@sheep.berlios.de>

Author: stippi
Date: 2008-03-19 18:09:26 +0100 (Wed, 19 Mar 2008)
New Revision: 24472
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24472&view=rev

Modified:
   haiku/trunk/src/kits/media/MediaFile.cpp
Log:
* Improved debug output.
* fTrackList was deleted with delete, but needed delete[].


Modified: haiku/trunk/src/kits/media/MediaFile.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaFile.cpp	2008-03-19 16:44:26 UTC (rev 24471)
+++ haiku/trunk/src/kits/media/MediaFile.cpp	2008-03-19 17:09:26 UTC (rev 24472)
@@ -123,7 +123,7 @@
 	CALLED();
 	
 	ReleaseAllTracks();
-	delete fTrackList;
+	delete[] fTrackList;
 	delete fExtractor;
 	if (fDeleteSource)
 		delete fSource;
@@ -200,7 +200,7 @@
 			return B_OK;
 		}
 	}
-	printf("BMediaFile::ReleaseTrack track %p not found\n", track);
+	fprintf(stderr, "BMediaFile::ReleaseTrack track %p not found\n", track);
 	return B_ERROR;
 }
 



From stippi at mail.berlios.de  Wed Mar 19 18:12:05 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 19 Mar 2008 18:12:05 +0100
Subject: [Haiku-commits] r24473 - in haiku/trunk: headers/private/media
	src/kits/media
Message-ID: <200803191712.m2JHC5Yu000428@sheep.berlios.de>

Author: stippi
Date: 2008-03-19 18:12:05 +0100 (Wed, 19 Mar 2008)
New Revision: 24473
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24473&view=rev

Modified:
   haiku/trunk/headers/private/media/debug.h
   haiku/trunk/src/kits/media/MediaTrack.cpp
Log:
* Use tracing facilities in BMediaTrack.
* Turn off tracing in the Media Kit.
* Notify of unimplemented functions regardless of tracing.


Modified: haiku/trunk/headers/private/media/debug.h
===================================================================
--- haiku/trunk/headers/private/media/debug.h	2008-03-19 17:09:26 UTC (rev 24472)
+++ haiku/trunk/headers/private/media/debug.h	2008-03-19 17:12:05 UTC (rev 24473)
@@ -2,7 +2,7 @@
 #define _MEDIA_DEBUG_OLD_H_
 
 #ifndef DEBUG
-  #define DEBUG 1
+  #define DEBUG 0
 #endif
 
 #include <Debug.h>
@@ -40,7 +40,7 @@
 	#define PRINT_FORMAT(_text, _fmt)	((void)0)
 	#define PRINT_INPUT(_text, _in)		((void)0)
 	#define PRINT_OUTPUT(_text, _out)	((void)0)
-	#define UNIMPLEMENTED() 			((void)0)
+	#define UNIMPLEMENTED() 			printf("UNIMPLEMENTED %s\n",__PRETTY_FUNCTION__)
 	#define BROKEN()					((void)0)
 	#define CALLED()					((void)0)
 	#define PRINT(l, a...)				((void)0)

Modified: haiku/trunk/src/kits/media/MediaTrack.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaTrack.cpp	2008-03-19 17:09:26 UTC (rev 24472)
+++ haiku/trunk/src/kits/media/MediaTrack.cpp	2008-03-19 17:12:05 UTC (rev 24473)
@@ -32,6 +32,20 @@
 #include "PluginManager.h"
 #include "debug.h"
 
+//#define TRACE_MEDIA_TRACK
+#ifdef TRACE_MEDIA_TRACK
+  #ifndef TRACE
+    #define TRACE printf
+  #endif
+#else
+  #ifndef TRACE
+    #define TRACE(a...)
+  #endif
+#endif
+
+#define ERROR(a...) fprintf(stderr, a)
+
+
 #define CONVERT_TO_INT32 0 // XXX test! this triggers a few bugs!
 
 // flags used for workarounds
@@ -112,9 +126,11 @@
 
 	*out_format = *fExtractor->EncodedFormat(fStream);
 
+#ifdef TRACE_MEDIA_TRACK
 	char s[200];
 	string_for_format(*out_format, s, sizeof(s));
-	printf("BMediaTrack::EncodedFormat: %s\n", s);  
+	printf("BMediaTrack::EncodedFormat: %s\n", s);
+#endif
 
 	return B_OK;
 }
@@ -141,10 +157,11 @@
 	_plugin_manager.DestroyDecoder(fRawDecoder);
 	fRawDecoder = 0;
 
+#ifdef TRACE_MEDIA_TRACK
 	char s[200];
-
 	string_for_format(*inout_format, s, sizeof(s));
 	printf("BMediaTrack::DecodedFormat: req1: %s\n", s);  
+#endif
 	
 	if ((fWorkaroundFlags & FORCE_RAW_AUDIO) || ((fWorkaroundFlags & IGNORE_ENCODED_AUDIO) && inout_format->type == B_MEDIA_ENCODED_AUDIO)) {
 		inout_format->type = B_MEDIA_RAW_AUDIO;
@@ -165,8 +182,10 @@
 			inout_format->u.raw_audio.format = media_raw_audio_format::B_AUDIO_FLOAT;
 	}
 
+#ifdef TRACE_MEDIA_TRACK
 	string_for_format(*inout_format, s, sizeof(s));
-	printf("BMediaTrack::DecodedFormat: req2: %s\n", s);  
+	printf("BMediaTrack::DecodedFormat: req2: %s\n", s);
+#endif
 
 	media_format requested_format = *inout_format;
 
@@ -174,8 +193,10 @@
 
 	res = fDecoder->NegotiateOutputFormat(inout_format);
 
+#ifdef TRACE_MEDIA_TRACK
 	string_for_format(*inout_format, s, sizeof(s));
 	printf("BMediaTrack::DecodedFormat: nego: %s\n", s);  
+#endif
 	
 	if (inout_format->type == 0)
 		debugger("Decoder didn't set output format type");
@@ -284,7 +305,7 @@
 		fCurFrame += *out_frameCount;
 		fCurTime = header.start_time;
 	} else {
-		printf("BMediaTrack::ReadFrames: decoder returned error 0x%08lx (%s)\n", result, strerror(result));
+		ERROR("BMediaTrack::ReadFrames: decoder returned error 0x%08lx (%s)\n", result, strerror(result));
 		*out_frameCount = 0;
 	}
 	if (mh)
@@ -330,20 +351,20 @@
 	time = seekTime;
 	result = fExtractor->Seek(fStream, seekTo, &frame, &time);
 	if (result != B_OK) {
-		printf("BMediaTrack::SeekToTime: extractor seek failed\n");
+		ERROR("BMediaTrack::SeekToTime: extractor seek failed\n");
 		return result;
 	}
 
 	result = fDecoder->Seek(seekTo, 0, &frame, seekTime, &time);
 	if (result != B_OK) {
-		printf("BMediaTrack::SeekToTime: decoder seek failed\n");
+		ERROR("BMediaTrack::SeekToTime: decoder seek failed\n");
 		return result;
 	}
 
 	if (fRawDecoder) {
 		result = fRawDecoder->Seek(seekTo, 0, &frame, seekTime, &time);
 		if (result != B_OK) {
-			printf("BMediaTrack::SeekToTime: raw decoder seek failed\n");
+			ERROR("BMediaTrack::SeekToTime: raw decoder seek failed\n");
 			return result;
 		}
 	}
@@ -381,20 +402,20 @@
 	frame = seekFrame;
 	result = fExtractor->Seek(fStream, seekTo, &frame, &time);
 	if (result != B_OK) {
-		printf("BMediaTrack::SeekToFrame: extractor seek failed\n");
+		ERROR("BMediaTrack::SeekToFrame: extractor seek failed\n");
 		return result;
 	}
 		
 	result = fDecoder->Seek(seekTo, seekFrame, &frame, 0, &time);
 	if (result != B_OK) {
+		ERROR("BMediaTrack::SeekToFrame: decoder seek failed\n");
 		return result;
-		printf("BMediaTrack::SeekToFrame: decoder seek failed\n");
 	}		
 
 	if (fRawDecoder) {
 		result = fRawDecoder->Seek(seekTo, seekFrame, &frame, 0, &time);
 		if (result != B_OK) {
-			printf("BMediaTrack::SeekToFrame: raw decoder seek failed\n");
+			ERROR("BMediaTrack::SeekToFrame: raw decoder seek failed\n");
 			return result;
 		}
 	}
@@ -707,18 +728,18 @@
 bool
 BMediaTrack::SetupFormatTranslation(const media_format &from, media_format *to)
 {
-	char s[200];
-	status_t res;
-
 	_plugin_manager.DestroyDecoder(fRawDecoder);
 	fRawDecoder = NULL;
-	
+
+#ifdef TRACE_MEDIA_TRACK	
+	char s[200];
 	string_for_format(from, s, sizeof(s));
 	printf("BMediaTrack::SetupFormatTranslation: from: %s\n", s);  
+#endif
 
-	res = _plugin_manager.CreateDecoder(&fRawDecoder, from);
+	status_t res = _plugin_manager.CreateDecoder(&fRawDecoder, from);
 	if (res != B_OK) {
-		printf("BMediaTrack::SetupFormatTranslation: CreateDecoder failed\n");
+		ERROR("BMediaTrack::SetupFormatTranslation: CreateDecoder failed\n");
 		return false;
 	}
 
@@ -729,28 +750,32 @@
 
 	ChunkProvider *chunkProvider = new(std::nothrow) RawDecoderChunkProvider(fDecoder, buffer_size, frame_size);
 	if (!chunkProvider) {
-		printf("BMediaTrack::SetupFormatTranslation: can't create chunk provider\n");
+		ERROR("BMediaTrack::SetupFormatTranslation: can't create chunk provider\n");
 		goto error;
 	}
 	fRawDecoder->SetChunkProvider(chunkProvider);
 
 	res = fRawDecoder->Setup(&notconstFrom, 0, 0);
 	if (res != B_OK) {
-		printf("BMediaTrack::SetupFormatTranslation: Setup failed\n");
+		ERROR("BMediaTrack::SetupFormatTranslation: Setup failed\n");
 		goto error;
 	}
 
+#ifdef TRACE_MEDIA_TRACK	
 	string_for_format(*to, s, sizeof(s));
 	printf("BMediaTrack::SetupFormatTranslation:   to: %s\n", s);  
+#endif
 
 	res = fRawDecoder->NegotiateOutputFormat(to);
 	if (res != B_OK) {
-		printf("BMediaTrack::SetupFormatTranslation: NegotiateOutputFormat failed\n");
+		ERROR("BMediaTrack::SetupFormatTranslation: NegotiateOutputFormat failed\n");
 		goto error;
 	}
 
+#ifdef TRACE_MEDIA_TRACK	
 	string_for_format(*to, s, sizeof(s));
 	printf("BMediaTrack::SetupFormatTranslation:  res: %s\n", s);  
+#endif
 
 	return true;
 
@@ -843,7 +868,7 @@
 		*chunkSize = frames * fFrameSize;
 //		printf("RawDecoderChunkProvider::GetNextChunk, %Ld frames, %ld bytes, start-time %Ld\n", frames, *chunkSize, mediaHeader->start_time);
 	} else {
-		printf("RawDecoderChunkProvider::GetNextChunk failed\n");
+		ERROR("RawDecoderChunkProvider::GetNextChunk failed\n");
 	}
 	return res;
 }



From stippi at mail.berlios.de  Wed Mar 19 18:15:12 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 19 Mar 2008 18:15:12 +0100
Subject: [Haiku-commits] r24474 - haiku/trunk/src/kits/media
Message-ID: <200803191715.m2JHFCUC000944@sheep.berlios.de>

Author: stippi
Date: 2008-03-19 18:15:12 +0100 (Wed, 19 Mar 2008)
New Revision: 24474
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24474&view=rev

Modified:
   haiku/trunk/src/kits/media/MediaTrack.cpp
Log:
Return B_ERROR for the FindKeyFrameFor*() methods, unless the time/frame
is 0, in which case it is almost save to assume it is a keyframe. Added
TODO though.


Modified: haiku/trunk/src/kits/media/MediaTrack.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaTrack.cpp	2008-03-19 17:12:05 UTC (rev 24473)
+++ haiku/trunk/src/kits/media/MediaTrack.cpp	2008-03-19 17:15:12 UTC (rev 24474)
@@ -434,9 +434,14 @@
 BMediaTrack::FindKeyFrameForTime(bigtime_t *inout_time,
 								 int32 flags) const
 {
+	// TODO: let the codec handle this, but it is almost
+	// save to assume that frame at time 0 is a keyframe
+	if (*inout_time == 0)
+		return B_OK;
+
 	UNIMPLEMENTED();
 
-	return B_OK;
+	return B_ERROR;
 }
 
 
@@ -444,9 +449,14 @@
 BMediaTrack::FindKeyFrameForFrame(int64 *inout_frame,
 								  int32 flags) const
 {
+	// TODO: let the codec handle this, but it is almost
+	// save to assume that frame 0 is a keyframe
+	if (*inout_frame == 0)
+		return B_OK;
+
 	UNIMPLEMENTED();
 
-	return B_OK;
+	return B_ERROR;
 }
 
 



From revol at free.fr  Wed Mar 19 19:27:45 2008
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Wed, 19 Mar 2008 19:27:45 +0100 CET
Subject: [Haiku-commits] r24474 - haiku/trunk/src/kits/media
In-Reply-To: <200803191715.m2JHFCUC000944@sheep.berlios.de>
Message-ID: <745221396-BeMail@laptop>

> Author: stippi
> Date: 2008-03-19 18:15:12 +0100 (Wed, 19 Mar 2008)
> New Revision: 24474
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24474&view=rev
> 
> Modified:
>    haiku/trunk/src/kits/media/MediaTrack.cpp
> Log:
> Return B_ERROR for the FindKeyFrameFor*() methods, unless the time/
> frame
> is 0, in which case it is almost save to assume it is a keyframe. 
> Added
> TODO though.

This can very well not be the case, like for an mpeg file that has been 
cut from another file, or a live stream, where there is no guarantee 
about the first frame being a keyframe...

Fran?ois.


From stippi at mail.berlios.de  Wed Mar 19 19:49:09 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 19 Mar 2008 19:49:09 +0100
Subject: [Haiku-commits] r24475 -
	haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML
Message-ID: <200803191849.m2JIn93a000156@sheep.berlios.de>

Author: stippi
Date: 2008-03-19 19:49:09 +0100 (Wed, 19 Mar 2008)
New Revision: 24475
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24475&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLParser.cpp
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/StandardIndex.cpp
Log:
* printf -> TRACE (turned off)
* fixed a few compiler warnings


Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLParser.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLParser.cpp	2008-03-19 17:15:12 UTC (rev 24474)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLParser.cpp	2008-03-19 18:49:09 UTC (rev 24475)
@@ -27,7 +27,7 @@
 #include "OpenDMLParser.h"
 #include "avi.h"
 
-#define TRACE_ODML_PARSER
+//#define TRACE_ODML_PARSER
 #ifdef TRACE_ODML_PARSER
   #define TRACE printf
 #else
@@ -167,9 +167,13 @@
 		return B_ERROR;
 	}	
 
-	uint32 frame_count = OdmlExtendedHeader() ? OdmlExtendedHeader()->total_frames : AviMainHeader()->total_frames;
-	bigtime_t duration = frame_count * AviMainHeader()->micro_sec_per_frame;
-	printf("AVI Header frame count %lu, duration %.6f\n", frame_count, duration / 1E6);
+#ifdef TRACE_ODML_PARSER
+	uint32 frameCount = OdmlExtendedHeader() ?
+		OdmlExtendedHeader()->total_frames : AviMainHeader()->total_frames;
+	bigtime_t duration = frameCount * AviMainHeader()->micro_sec_per_frame;
+	printf("AVI Header frame count %lu, duration %.6f\n", frameCount,
+		duration / 1E6);
+#endif
 	
 	for (int i = 0; i < fStreamCount; i++) {
 		SetupStreamLength(const_cast<stream_info *>(StreamInfo(i)));
@@ -197,42 +201,48 @@
 	  && stream->stream_header.sample_size != 0
 	  && stream->stream_header.sample_size != 1) { // PCM
 		stream->frame_count /= (stream->stream_header.sample_size + 7) / 8;
-		printf("audio: messing up PCM frame_count?\n");
+		TRACE("audio: messing up PCM frame_count?\n");
 	}
 
 	if (stream->stream_header.rate && stream->stream_header.scale) {
 		stream->frames_per_sec_rate = stream->stream_header.rate;
 		stream->frames_per_sec_scale = stream->stream_header.scale;
 		stream->duration = (stream->frame_count * stream->frames_per_sec_scale * 1000000) / stream->frames_per_sec_rate;
-		printf("audio: using rate+scale\n");
+		TRACE("audio: using rate+scale\n");
 	} else if (stream->audio_format->avg_bytes_per_sec) {
 		stream->frames_per_sec_rate = stream->audio_format->avg_bytes_per_sec;
 		stream->frames_per_sec_scale = 1;
 		stream->duration = (stream->frame_count * stream->frames_per_sec_scale * 1000000) / stream->frames_per_sec_rate;
-		printf("audio: using avg_bytes_per_sec\n");
+		TRACE("audio: using avg_bytes_per_sec\n");
 	} else if (AviMainHeader()->micro_sec_per_frame) {
 		uint32 video_frame_count = OdmlExtendedHeader() ? OdmlExtendedHeader()->total_frames : AviMainHeader()->total_frames;
 		stream->duration = video_frame_count * AviMainHeader()->micro_sec_per_frame;
 		stream->frames_per_sec_rate = (stream->frame_count * 1000 * 1000000) / stream->duration;
 		stream->frames_per_sec_scale = 1000;
-		printf("audio: using micro_sec_per_frame\n");
+		TRACE("audio: using micro_sec_per_frame\n");
 	} else {
-		printf("audio: no idea what to do\n");
+		TRACE("audio: no idea what to do\n");
 	}
 
 	if (stream->audio_format->avg_bytes_per_sec) {
-		int64 expected_frame_count = (stream->duration * stream->audio_format->avg_bytes_per_sec) / 1000000;
-		printf("audio: expected frame_count %lld, calculated stream frame_count %lld\n", expected_frame_count, stream->frame_count);
-		if (expected_frame_count * 9 > stream->frame_count * 10) {
-			printf("audio: something is wrong, ignoring calculated stream frame_count, rate and scale\n");
-			stream->frame_count = expected_frame_count;
-			stream->frames_per_sec_rate = stream->audio_format->avg_bytes_per_sec;
+		int64 expectedFrameCount
+			= (stream->duration * stream->audio_format->avg_bytes_per_sec)
+				/ 1000000;
+		TRACE("audio: expected frame_count %lld, calculated stream "
+			"frame_count %lld\n", expectedFrameCount, stream->frame_count);
+		if (expectedFrameCount * 9 > stream->frame_count * 10) {
+			TRACE("audio: something is wrong, ignoring calculated stream "
+				"frame_count, rate and scale\n");
+			stream->frame_count = expectedFrameCount;
+			stream->frames_per_sec_rate
+				= stream->audio_format->avg_bytes_per_sec;
 			stream->frames_per_sec_scale = 1;
 		}
 	}
 
-	printf("audio: frame_count %lld, duration %.6f, fps %.3f\n", 
-		stream->frame_count, stream->duration / 1E6, stream->frames_per_sec_rate / (double)stream->frames_per_sec_scale);
+	TRACE("audio: frame_count %lld, duration %.6f, fps %.3f\n", 
+		stream->frame_count, stream->duration / 1E6,
+		stream->frames_per_sec_rate / (double)stream->frames_per_sec_scale);
 }
 
 void
@@ -242,20 +252,22 @@
 	if (stream->stream_header.rate && stream->stream_header.scale) {
 		stream->frames_per_sec_rate = stream->stream_header.rate;
 		stream->frames_per_sec_scale = stream->stream_header.scale;
-		printf("video: using rate+scale\n");
+		TRACE("video: using rate+scale\n");
 	} else if (AviMainHeader()->micro_sec_per_frame) {
 		stream->frames_per_sec_rate = 1000000;
 		stream->frames_per_sec_scale = AviMainHeader()->micro_sec_per_frame;
-		printf("video: using micro_sec_per_frame\n");
+		TRACE("video: using micro_sec_per_frame\n");
 	} else {
 		stream->frames_per_sec_rate = 25;
 		stream->frames_per_sec_scale = 1;
-		printf("video: using fallback\n");
+		TRACE("video: using fallback\n");
 	}
-	stream->duration = (stream->frame_count * stream->frames_per_sec_scale * 1000000) / stream->frames_per_sec_rate;
+	stream->duration = (stream->frame_count * stream->frames_per_sec_scale
+		* 1000000) / stream->frames_per_sec_rate;
 
-	printf("video: frame_count %lld, duration %.6f, fps %.3f\n", 
-		stream->frame_count, stream->duration / 1E6, stream->frames_per_sec_rate / (double)stream->frames_per_sec_scale);
+	TRACE("video: frame_count %lld, duration %.6f, fps %.3f\n", 
+		stream->frame_count, stream->duration / 1E6,
+		stream->frames_per_sec_rate / (double)stream->frames_per_sec_scale);
 }
 
 status_t

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/StandardIndex.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/StandardIndex.cpp	2008-03-19 17:15:12 UTC (rev 24474)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/StandardIndex.cpp	2008-03-19 18:49:09 UTC (rev 24475)
@@ -33,6 +33,16 @@
 #include <StopWatch.h>
 
 
+//#define TRACE_ODML_PARSER
+#ifdef TRACE_ODML_PARSER
+  #define TRACE printf
+#else
+  #define TRACE(a...)
+#endif
+
+#define ERROR(a...) fprintf(stderr, a)
+
+
 StandardIndex::StandardIndex(BPositionIO *source, OpenDMLParser *parser)
  :	Index(source, parser)
  ,	fIndex(NULL)
@@ -64,13 +74,15 @@
 	uint32 seekHintsStride = 1800 * fStreamCount;
 	uint32 seekHintsMax = fIndexSize / seekHintsStride;
 	
-	printf("StandardIndex::Init: seekHintsStride %lu\n", seekHintsStride);
-	printf("StandardIndex::Init: seekHintsMax %lu\n", seekHintsMax);
+	TRACE("StandardIndex::Init: seekHintsStride %lu\n", seekHintsStride);
+	TRACE("StandardIndex::Init: seekHintsMax %lu\n", seekHintsMax);
 
- { BStopWatch w("StandardIndex::Init: malloc");
+#ifdef TRACE_ODML_PARSER
+{ BStopWatch w("StandardIndex::Init: malloc");
+#endif
 
 	if (indexBytes > 0x1900000) { // 25 MB
-		printf("StandardIndex::Init index is way too big\n");
+		ERROR("libOpenDML: StandardIndex::Init index is way too big\n");
 		return B_NO_MEMORY;
 	}
 
@@ -81,21 +93,25 @@
 
 	fIndex = new (std::nothrow) avi_standard_index_entry[fIndexSize];
 	if (fIndex == NULL) {
-		printf("StandardIndex::Init out of memory\n");
+		ERROR("libOpenDML: StandardIndex::Init out of memory\n");
 		return B_NO_MEMORY;
 	}
+#ifdef TRACE_ODML_PARSER
 }
 { BStopWatch w("StandardIndex::Init: file read");
+#endif
 
-	if (indexBytes != fSource->ReadAt(fParser->StandardIndexStart(), fIndex, indexBytes)) {
-		printf("StandardIndex::Init file reading failed\n");
+	if ((int32)indexBytes != fSource->ReadAt(fParser->StandardIndexStart(),
+			fIndex, indexBytes)) {
+		ERROR("libOpenDML: StandardIndex::Init file reading failed\n");
 		delete [] fIndex;
 		fIndex = NULL;
 		return B_IO_ERROR;
 	}
+#ifdef TRACE_ODML_PARSER
 }
-
 	//DumpIndex();
+#endif
 
 	fStreamData = new stream_data[fStreamCount];
 	for (int i = 0; i < fStreamCount; i++) {
@@ -109,16 +125,18 @@
 		fStreamData[i].seek_hints_next = seekHintsStride;
 	}
 
+#ifdef TRACE_ODML_PARSER
 { BStopWatch w("StandardIndex::Init: scan index");
+#endif
 	
 	for (int stream = 0; stream < fStreamCount; stream++) {
 		uint32 chunk_id = fStreamData[stream].chunk_id;
 		uint64 stream_size = 0;
 		uint32 chunk_count = 0;
 		uint32 keyframe_count = 0;
-		int seek_hints_next = seekHintsStride;
-		int seek_hints_count = 0;
-		for (int i = 0; i < fIndexSize; i++) {
+		uint32 seek_hints_next = seekHintsStride;
+		uint32 seek_hints_count = 0;
+		for (uint32 i = 0; i < fIndexSize; i++) {
 			if ((fIndex[i].chunk_id & 0xffff) == chunk_id) {
 				stream_size += fIndex[i].chunk_length;
 				chunk_count++;
@@ -126,7 +144,8 @@
 
 				if (i >= seek_hints_next) {
 					seek_hints_next = i + seekHintsStride;
-					seek_hint *hint = &fStreamData[stream].seek_hints[seek_hints_count++];
+					seek_hint *hint = &fStreamData[stream].seek_hints[
+						seek_hints_count++];
 					hint->stream_pos = fIndex[i].chunk_offset;
 					hint->index_pos = i;
 				}
@@ -137,19 +156,23 @@
 		fStreamData[stream].keyframe_count = keyframe_count;
 		fStreamData[stream].seek_hints_count = seek_hints_count;
 	}
+#ifdef TRACE_ODML_PARSER
 }
 
 	for (int i = 0; i < fStreamCount; i++) {
 		printf("stream %d, stream_size %llu\n", i, fStreamData[i].stream_size);
 		printf("stream %d, chunk_count %lu\n", i, fStreamData[i].chunk_count);
-		printf("stream %d, keyframe_count %lu\n", i, fStreamData[i].keyframe_count);
-		printf("stream %d, seek_hints_count %lu\n", i, fStreamData[i].seek_hints_count);
+		printf("stream %d, keyframe_count %lu\n", i,
+			fStreamData[i].keyframe_count);
+		printf("stream %d, seek_hints_count %lu\n", i,
+			fStreamData[i].seek_hints_count);
 		for (int j = 0; j < fStreamData[i].seek_hints_count; j++) {
 			printf("  seek_hint %3d, index_pos %6lu, stream_pos %lld\n", j,
 				fStreamData[i].seek_hints[j].index_pos, 
 				fStreamData[i].seek_hints[j].stream_pos);
 		}
 	}
+#endif // TRACE_ODML_PARSER
 
 	return B_OK;
 }
@@ -162,8 +185,8 @@
 	int count = 0;
 	int pos = 0;
 
-	printf("StandardIndex::DumpIndex %u entries\n", fIndexSize);
-	for (int i = 0; i < fIndexSize; i++) {
+	printf("StandardIndex::DumpIndex %lu entries\n", fIndexSize);
+	for (uint32 i = 0; i < fIndexSize; i++) {
 		count++;
 		if (chunk != fIndex[i].chunk_id) {
 			printf("%3d %c%c%c%c", count, FOURCC_PARAM(chunk));
@@ -180,13 +203,15 @@
 
 
 status_t
-StandardIndex::GetNextChunkInfo(int stream_index, int64 *start, uint32 *size, bool *keyframe)
+StandardIndex::GetNextChunkInfo(int stream_index, int64 *start, uint32 *size,
+	bool *keyframe)
 {
 	stream_data *data = &fStreamData[stream_index];
 	while (data->stream_pos < fIndexSize) {
 		if ((fIndex[data->stream_pos].chunk_id & 0xffff) == data->chunk_id) {
 			*keyframe = fIndex[data->stream_pos].flags & AVIIF_KEYFRAME;
-			*start = fDataOffset + fIndex[data->stream_pos].chunk_offset + 8;  // skip 8 bytes (chunk id + chunk size)
+			*start = fDataOffset + fIndex[data->stream_pos].chunk_offset + 8; 
+				// skip 8 bytes (chunk id + chunk size)
 			*size = fIndex[data->stream_pos].chunk_length;
 			data->stream_pos++;
 			return B_OK;
@@ -199,14 +224,17 @@
 
 
 status_t
-StandardIndex::Seek(int stream_index, uint32 seekTo, int64 *frame, bigtime_t *time)
+StandardIndex::Seek(int stream_index, uint32 seekTo, int64 *frame,
+	bigtime_t *time)
 {
-	printf("StandardIndex::Seek: stream %d, seekTo%s%s%s%s, time %Ld, frame %Ld\n",
-		stream_index,
+	TRACE("StandardIndex::Seek: stream %d, seekTo%s%s%s%s, time %Ld, "
+		"frame %Ld\n", stream_index,
 		(seekTo & B_MEDIA_SEEK_TO_TIME) ? " B_MEDIA_SEEK_TO_TIME" : "",
 		(seekTo & B_MEDIA_SEEK_TO_FRAME) ? " B_MEDIA_SEEK_TO_FRAME" : "",
-		(seekTo & B_MEDIA_SEEK_CLOSEST_FORWARD) ? " B_MEDIA_SEEK_CLOSEST_FORWARD" : "",
-		(seekTo & B_MEDIA_SEEK_CLOSEST_BACKWARD) ? " B_MEDIA_SEEK_CLOSEST_BACKWARD" : "",
+		(seekTo & B_MEDIA_SEEK_CLOSEST_FORWARD) ?
+			" B_MEDIA_SEEK_CLOSEST_FORWARD" : "",
+		(seekTo & B_MEDIA_SEEK_CLOSEST_BACKWARD) ?
+			" B_MEDIA_SEEK_CLOSEST_BACKWARD" : "",
 		*time, *frame);
 	
 	const stream_info *stream = fParser->StreamInfo(stream_index);
@@ -215,14 +243,15 @@
 	int64 frame_pos;
 	if (seekTo & B_MEDIA_SEEK_TO_FRAME)
 		frame_pos = *frame;
-	else if (seekTo & B_MEDIA_SEEK_TO_TIME)
-		frame_pos = (*time * stream->frames_per_sec_rate) / (1000000 * stream->frames_per_sec_scale);
-	else
+	else if (seekTo & B_MEDIA_SEEK_TO_TIME) {
+		frame_pos = (*time * stream->frames_per_sec_rate)
+			/ (1000000 * stream->frames_per_sec_scale);
+	} else
 		return B_BAD_VALUE;
 
 	if (stream->is_audio) {
 		int64 bytes = 0;
-		for (int i = 0; i < fIndexSize; i++) {
+		for (uint32 i = 0; i < fIndexSize; i++) {
 			if ((fIndex[i].chunk_id & 0xffff) == data->chunk_id) {
 				int64 bytesNext = bytes + fIndex[i].chunk_length;
 				if (bytes <= frame_pos && bytesNext > frame_pos) {
@@ -234,7 +263,7 @@
 		}
 	} else if (stream->is_video) {
 		int pos = 0;
-		for (int i = 0; i < fIndexSize; i++) {
+		for (uint32 i = 0; i < fIndexSize; i++) {
 			if ((fIndex[i].chunk_id & 0xffff) == data->chunk_id) {
 				if (pos == frame_pos) {
 					data->stream_pos = i;
@@ -247,11 +276,11 @@
 		return B_BAD_VALUE;
 	}
 
-	printf("seek failed, position not found\n");
+	ERROR("libOpenDML: seek failed, position not found\n");
 	return B_ERROR;
 
 done:
-	printf("seek done: index: pos %d, size  %d\n", data->stream_pos, fIndexSize);
+	TRACE("seek done: index: pos %d, size  %d\n", data->stream_pos, fIndexSize);
 	*frame = frame_pos;
 	*time = (frame_pos * 1000000 * stream->frames_per_sec_scale) / stream->frames_per_sec_rate;
 	return B_OK;



From superstippi at gmx.de  Wed Mar 19 19:56:36 2008
From: superstippi at gmx.de (Stephan Assmus)
Date: Wed, 19 Mar 2008 19:56:36 +0100
Subject: [Haiku-commits] r24474 - haiku/trunk/src/kits/media
In-Reply-To: <745221396-BeMail@laptop>
References: <745221396-BeMail@laptop>
Message-ID: <20080319195636.945.1@stippis2.1205952592.fake>


Fran?ois Revol wrote:
> > Author: stippi
> > Date: 2008-03-19 18:15:12 +0100 (Wed, 19 Mar 2008) New Revision: 24474
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24474&view=rev
> > 
> > Modified:
> >    haiku/trunk/src/kits/media/MediaTrack.cpp
> > Log:
> > Return B_ERROR for the FindKeyFrameFor*() methods, unless the time/ 
> > frame
> > is 0, in which case it is almost save to assume it is a keyframe. Added
> > TODO though.
> 
> This can very well not be the case, like for an mpeg file that has been 
> cut from another file, or a live stream, where there is no guarantee 
> about the first frame being a keyframe...

That's why I added a TODO and wrote "almost save". The function is not 
implemented, but used to return B_OK regardless before my change. Now it is 
still unimplemented, but returns B_ERROR for all frames but the 0 frame. So 
my patch improves the situation for most cases (returning B_ERROR) and is 
incorrect for the cases you point out. For the moment, I am tracking down 
something else. :-)

Best regards,
-Stephan


From korli at mail.berlios.de  Wed Mar 19 20:00:36 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 19 Mar 2008 20:00:36 +0100
Subject: [Haiku-commits] r24476 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200803191900.m2JJ0aKU001197@sheep.berlios.de>

Author: korli
Date: 2008-03-19 20:00:35 +0100 (Wed, 19 Mar 2008)
New Revision: 24476
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24476&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
Log:
style cleanup
replaced addr_t by uint64
more debug output


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-19 18:49:09 UTC (rev 24475)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-19 19:00:35 UTC (rev 24476)
@@ -79,7 +79,7 @@
 
 
 static uint64
-nearest_power(addr_t value)
+nearest_power(uint64 value)
 {
 	uint64 power = 1UL << 12;
 		// 12 bits is the smallest supported alignment/length
@@ -131,7 +131,6 @@
 		case B_MTR_WB:
 			type = IA32_MTR_WRITE_BACK;
 			break;
-
 		default:
 			return B_BAD_VALUE;
 	}
@@ -155,7 +154,8 @@
 	if (index < 0)
 		return B_ERROR;
 
-	TRACE_MTRR("allocate MTRR slot %ld, base = %Lx, length = %Lx\n", index, base, length);
+	TRACE_MTRR("allocate MTRR slot %ld, base = %Lx, length = %Lx, type=0x%lx\n", 
+		index, base, length, type);
 
 	sMemoryTypeIDs[index] = id;
 	x86_set_mtrr(index, base, length, type);
@@ -166,9 +166,9 @@
 
 #define MTRR_MAX_SOLUTIONS 	5	// usually MTRR count is eight, keep a few for other needs
 #define MTRR_MIN_SIZE 		0x100000	// 1 MB
-static int64 sols[MTRR_MAX_SOLUTIONS];
-static int solCount;
-static int64 props[MTRR_MAX_SOLUTIONS];
+static int64 sSolutions[MTRR_MAX_SOLUTIONS];
+static int32 sSolutionCount;
+static int64 sPropositions[MTRR_MAX_SOLUTIONS];
 
 
 /*!	Find the nearest powers of two for a value, save current iteration,
@@ -180,24 +180,24 @@
 find_nearest(uint64 value, int iteration)
 {
 	TRACE_MTRR("find_nearest %Lx %d\n", value, iteration);
-	if (iteration > (MTRR_MAX_SOLUTIONS - 1) || (iteration + 1) >= solCount)
+	if (iteration > (MTRR_MAX_SOLUTIONS - 1) || (iteration + 1) >= sSolutionCount)
 		return;
 	uint64 down, up;
 	int i;
 	nearest_powers(value, &down, &up);
-	props[iteration] = down;
+	sPropositions[iteration] = down;
 	if (value - down < MTRR_MIN_SIZE) {
 		for (i=0; i<=iteration; i++)
-			sols[i] = props[i];
-		solCount = iteration + 1;
+			sSolutions[i] = sPropositions[i];
+		sSolutionCount = iteration + 1;
 		return;
 	}
 	find_nearest(value - down, iteration + 1);
-	props[iteration] = -up;
+	sPropositions[iteration] = -up;
 	if (up - value < MTRR_MIN_SIZE) {
 		for (i=0; i<=iteration; i++)
-			sols[i] = props[i];
-		solCount = iteration + 1;
+			sSolutions[i] = sPropositions[i];
+		sSolutionCount = iteration + 1;
 		return;
 	}
 	find_nearest(up - value, iteration + 1);
@@ -208,33 +208,40 @@
 static void
 set_memory_write_back(int32 id, uint64 base, uint64 length)
 {
+	status_t err;
 	TRACE_MTRR("set_memory_write_back base %Lx length %Lx\n", base, length);
-	solCount = MTRR_MAX_SOLUTIONS;
+	sSolutionCount = MTRR_MAX_SOLUTIONS;
 	find_nearest(length, 0);
 
 #ifdef TRACE_MTRR
-	dprintf("sols: ");
-	for (int i=0; i<solCount; i++) {
-                dprintf("0x%Lx ", sols[i]);
+	dprintf("solutions: ");
+	for (int i=0; i<sSolutionCount; i++) {
+                dprintf("0x%Lx ", sSolutions[i]);
         }
         dprintf("\n");
 #endif
 
 	bool nextDown = false;
-	for (int i = 0; i < solCount; i++) {
-		if (sols[i] < 0) {
+	for (int i = 0; i < sSolutionCount; i++) {
+		if (sSolutions[i] < 0) {
 			if (nextDown)
-				base += sols[i];
-			set_memory_type(id, base, -sols[i], nextDown ? B_MTR_UC : B_MTR_WB);
+				base += sSolutions[i];
+			err = set_memory_type(id, base, -sSolutions[i], nextDown ? B_MTR_UC : B_MTR_WB);
+			if (err != B_OK) {
+				dprintf("set_memory_type returned %s (0x%lx)\n", strerror(err), err);
+			}
 			if (!nextDown)
-				base -= sols[i];
+				base -= sSolutions[i];
 			nextDown = !nextDown;
 		} else {
 			if (nextDown)
-				base -= sols[i];
-			set_memory_type(id, base, sols[i], nextDown ? B_MTR_UC : B_MTR_WB);
+				base -= sSolutions[i];
+			err = set_memory_type(id, base, sSolutions[i], nextDown ? B_MTR_UC : B_MTR_WB);
+			if (err != B_OK) {
+				dprintf("set_memory_type returned %s (0x%lx)\n", strerror(err), err);
+			}
 			if (!nextDown)
-				base += sols[i];
+				base += sSolutions[i];
 		}
 	}
 }



From stippi at mail.berlios.de  Wed Mar 19 20:14:49 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 19 Mar 2008 20:14:49 +0100
Subject: [Haiku-commits] r24477 -
	haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML
Message-ID: <200803191914.m2JJEndm002734@sheep.berlios.de>

Author: stippi
Date: 2008-03-19 20:14:48 +0100 (Wed, 19 Mar 2008)
New Revision: 24477
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24477&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.cpp
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/StandardIndex.cpp
Log:
* turn tracing off in OpenDMLFile as well
* rename tracing define in StartIndex


Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.cpp	2008-03-19 19:00:35 UTC (rev 24476)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.cpp	2008-03-19 19:14:48 UTC (rev 24477)
@@ -28,7 +28,7 @@
 #include "StandardIndex.h"
 #include "FallbackIndex.h"
 
-#define TRACE_ODML_FILE
+//#define TRACE_ODML_FILE
 #ifdef TRACE_ODML_FILE
   #define TRACE printf
 #else

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/StandardIndex.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/StandardIndex.cpp	2008-03-19 19:00:35 UTC (rev 24476)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/StandardIndex.cpp	2008-03-19 19:14:48 UTC (rev 24477)
@@ -33,8 +33,8 @@
 #include <StopWatch.h>
 
 
-//#define TRACE_ODML_PARSER
-#ifdef TRACE_ODML_PARSER
+//#define TRACE_START_INDEX
+#ifdef TRACE_START_INDEX
   #define TRACE printf
 #else
   #define TRACE(a...)
@@ -77,7 +77,7 @@
 	TRACE("StandardIndex::Init: seekHintsStride %lu\n", seekHintsStride);
 	TRACE("StandardIndex::Init: seekHintsMax %lu\n", seekHintsMax);
 
-#ifdef TRACE_ODML_PARSER
+#ifdef TRACE_START_INDEX
 { BStopWatch w("StandardIndex::Init: malloc");
 #endif
 
@@ -96,7 +96,7 @@
 		ERROR("libOpenDML: StandardIndex::Init out of memory\n");
 		return B_NO_MEMORY;
 	}
-#ifdef TRACE_ODML_PARSER
+#ifdef TRACE_START_INDEX
 }
 { BStopWatch w("StandardIndex::Init: file read");
 #endif
@@ -108,7 +108,7 @@
 		fIndex = NULL;
 		return B_IO_ERROR;
 	}
-#ifdef TRACE_ODML_PARSER
+#ifdef TRACE_START_INDEX
 }
 	//DumpIndex();
 #endif
@@ -125,7 +125,7 @@
 		fStreamData[i].seek_hints_next = seekHintsStride;
 	}
 
-#ifdef TRACE_ODML_PARSER
+#ifdef TRACE_START_INDEX
 { BStopWatch w("StandardIndex::Init: scan index");
 #endif
 	
@@ -156,7 +156,7 @@
 		fStreamData[stream].keyframe_count = keyframe_count;
 		fStreamData[stream].seek_hints_count = seek_hints_count;
 	}
-#ifdef TRACE_ODML_PARSER
+#ifdef TRACE_START_INDEX
 }
 
 	for (int i = 0; i < fStreamCount; i++) {
@@ -172,7 +172,7 @@
 				fStreamData[i].seek_hints[j].stream_pos);
 		}
 	}
-#endif // TRACE_ODML_PARSER
+#endif // TRACE_START_INDEX
 
 	return B_OK;
 }



From stippi at mail.berlios.de  Wed Mar 19 20:39:09 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 19 Mar 2008 20:39:09 +0100
Subject: [Haiku-commits] r24478 - in haiku/trunk: headers/private/media
	src/kits/media
Message-ID: <200803191939.m2JJd97G006368@sheep.berlios.de>

Author: stippi
Date: 2008-03-19 20:39:07 +0100 (Wed, 19 Mar 2008)
New Revision: 24478
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24478&view=rev

Modified:
   haiku/trunk/headers/private/media/debug.h
   haiku/trunk/src/kits/media/DefaultMediaTheme.cpp
   haiku/trunk/src/kits/media/MediaDefs.cpp
   haiku/trunk/src/kits/media/MediaExtractor.cpp
   haiku/trunk/src/kits/media/MediaFormats.cpp
   haiku/trunk/src/kits/media/ParameterWeb.cpp
Log:
* Implemented ERROR as fprintf(stderr, ...) with tracing turned off as well.
* Fixed all but one compiler warnings in libmedia.so.
* Truncated lines to 80 char width where I looked at code.
* Turned printf()s into TRACE/ERROR calls in MediaExtractor.


Modified: haiku/trunk/headers/private/media/debug.h
===================================================================
--- haiku/trunk/headers/private/media/debug.h	2008-03-19 19:14:48 UTC (rev 24477)
+++ haiku/trunk/headers/private/media/debug.h	2008-03-19 19:39:07 UTC (rev 24478)
@@ -44,7 +44,7 @@
 	#define BROKEN()					((void)0)
 	#define CALLED()					((void)0)
 	#define PRINT(l, a...)				((void)0)
-	#define ERROR(a...)					((void)0)
+	#define ERROR(a...)					fprintf(stderr, a)
 	#define TRACE(a...)					((void)0)
 
 #endif

Modified: haiku/trunk/src/kits/media/DefaultMediaTheme.cpp
===================================================================
--- haiku/trunk/src/kits/media/DefaultMediaTheme.cpp	2008-03-19 19:14:48 UTC (rev 24477)
+++ haiku/trunk/src/kits/media/DefaultMediaTheme.cpp	2008-03-19 19:39:07 UTC (rev 24478)
@@ -544,7 +544,9 @@
 	float value[fParameter.CountChannels()];
 	size_t size = sizeof(value);
 	if (parameter.GetValue((void *)&value, &size, NULL) < B_OK) {
-		ERROR("ContinuousMessageFilter: Could not get value for continuous parameter %p (name '%s', node %d)\n", &parameter, parameter.Name(), parameter.Web()->Node().node);
+		ERROR("ContinuousMessageFilter: Could not get value for continuous "
+			"parameter %p (name '%s', node %d)\n", &parameter,
+			parameter.Name(), (int)(parameter.Web()->Node().node));
 		return;
 	}
 
@@ -614,7 +616,9 @@
 	size_t size = sizeof(int32);
 	int32 value;
 	if (parameter.GetValue((void *)&value, &size, NULL) < B_OK) {
-		ERROR("DiscreteMessageFilter: Could not get value for discrete parameter %p (name '%s', node %d)\n", &parameter, parameter.Name(), parameter.Web()->Node().node);
+		ERROR("DiscreteMessageFilter: Could not get value for discrete "
+			"parameter %p (name '%s', node %d)\n", &parameter,
+			parameter.Name(), (int)(parameter.Web()->Node().node));
 		return;
 	}
 
@@ -1033,7 +1037,8 @@
 		}
 
 		default:
-			ERROR("BMediaTheme: Don't know parameter type: 0x%lx\n", parameter->Type());
+			ERROR("BMediaTheme: Don't know parameter type: 0x%x\n",
+				parameter->Type());
 	}
 	return NULL;
 }

Modified: haiku/trunk/src/kits/media/MediaDefs.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaDefs.cpp	2008-03-19 19:14:48 UTC (rev 24477)
+++ haiku/trunk/src/kits/media/MediaDefs.cpp	2008-03-19 19:39:07 UTC (rev 24478)
@@ -517,12 +517,14 @@
 			break;
 
 		default:
-			ERROR("media_format::SpecializeTo can't specialize media_multistream_format of format %d\n", format->format);
+			ERROR("media_format::SpecializeTo can't specialize "
+				"media_multistream_format of format %ld\n", format->format);
 	}
 }
 
 static void
-encoded_audio_format_specialize(media_encoded_audio_format *format, const media_encoded_audio_format *other)
+encoded_audio_format_specialize(media_encoded_audio_format *format,
+	const media_encoded_audio_format *other)
 {
 	raw_audio_format_specialize(&format->output, &other->output);
 	if (format->encoding == 0)
@@ -535,7 +537,8 @@
 }
 
 static void
-encoded_video_format_specialize(media_encoded_video_format *format, const media_encoded_video_format *other)
+encoded_video_format_specialize(media_encoded_video_format *format,
+	const media_encoded_video_format *other)
 {
 	raw_video_format_specialize(&format->output, &other->output);
 	if (format->avg_bit_rate == 0)

Modified: haiku/trunk/src/kits/media/MediaExtractor.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaExtractor.cpp	2008-03-19 19:14:48 UTC (rev 24477)
+++ haiku/trunk/src/kits/media/MediaExtractor.cpp	2008-03-19 19:39:07 UTC (rev 24478)
@@ -42,7 +42,8 @@
 		fStreamInfo[i].infoBuffer = 0;
 		fStreamInfo[i].infoBufferSize = 0;
 		fStreamInfo[i].chunkCache = new ChunkCache;
-		memset(&fStreamInfo[i].encodedFormat, 0, sizeof(fStreamInfo[i].encodedFormat));
+		memset(&fStreamInfo[i].encodedFormat, 0,
+			sizeof(fStreamInfo[i].encodedFormat));
 	}
 
 	// create all stream cookies
@@ -51,7 +52,8 @@
 			fStreamInfo[i].cookie = 0;
 			fStreamInfo[i].hasCookie = false;
 			fStreamInfo[i].status = B_ERROR;
-			printf("MediaExtractor::MediaExtractor: AllocateCookie for stream %ld failed\n", i);
+			ERROR("MediaExtractor::MediaExtractor: AllocateCookie for stream "
+				"%ld failed\n", i);
 		}
 	}
 
@@ -61,19 +63,20 @@
 			continue;
 		int64 frameCount;
 		bigtime_t duration;
-		if (B_OK != fReader->GetStreamInfo(fStreamInfo[i].cookie, &frameCount, &duration,
-										   &fStreamInfo[i].encodedFormat,
-										   &fStreamInfo[i].infoBuffer,
-										   &fStreamInfo[i].infoBufferSize)) {
+		if (B_OK != fReader->GetStreamInfo(fStreamInfo[i].cookie, &frameCount,
+				&duration, &fStreamInfo[i].encodedFormat,
+				&fStreamInfo[i].infoBuffer, &fStreamInfo[i].infoBufferSize)) {
 			fStreamInfo[i].status = B_ERROR;
-			printf("MediaExtractor::MediaExtractor: GetStreamInfo for stream %ld failed\n", i);
+			ERROR("MediaExtractor::MediaExtractor: GetStreamInfo for "
+				"stream %ld failed\n", i);
 		}
 	}
 	
 #if DISABLE_CHUNK_CACHE == 0
 	// start extractor thread
 	fExtractorWaitSem = create_sem(1, "media extractor thread sem");
-	fExtractorThread = spawn_thread(extractor_thread, "media extractor thread", 10, this);
+	fExtractorThread = spawn_thread(extractor_thread, "media extractor thread",
+		10, this);
 	resume_thread(fExtractorThread);
 #endif
 }
@@ -146,7 +149,8 @@
 	const void *infoBuffer;
 	size_t infoSize;
 	
-	fReader->GetStreamInfo(fStreamInfo[stream].cookie, &frameCount, &duration, &format, &infoBuffer, &infoSize);
+	fReader->GetStreamInfo(fStreamInfo[stream].cookie, &frameCount, &duration,
+		&format, &infoBuffer, &infoSize);
 
 	return frameCount;
 }
@@ -162,7 +166,8 @@
 	const void *infoBuffer;
 	size_t infoSize;
 	
-	fReader->GetStreamInfo(fStreamInfo[stream].cookie, &frameCount, &duration, &format, &infoBuffer, &infoSize);
+	fReader->GetStreamInfo(fStreamInfo[stream].cookie, &frameCount, &duration,
+		&format, &infoBuffer, &infoSize);
 
 	return duration;
 }
@@ -200,18 +205,19 @@
 #if DISABLE_CHUNK_CACHE > 0
 	static BLocker locker;
 	BAutolock lock(locker);
-	return fReader->GetNextChunk(fStreamInfo[stream].cookie, chunkBuffer, chunkSize, mediaHeader); 
+	return fReader->GetNextChunk(fStreamInfo[stream].cookie, chunkBuffer,
+		chunkSize, mediaHeader); 
 #endif
 
 	status_t err;
-	err = fStreamInfo[stream].chunkCache->GetNextChunk(chunkBuffer, chunkSize, mediaHeader);
+	err = fStreamInfo[stream].chunkCache->GetNextChunk(chunkBuffer, chunkSize,
+		mediaHeader);
 	release_sem(fExtractorWaitSem);
 	return err;
 }
 
 
-class MediaExtractorChunkProvider : public ChunkProvider
-{
+class MediaExtractorChunkProvider : public ChunkProvider {
 private:
 	MediaExtractor * fExtractor;
 	int32 fStream;
@@ -225,13 +231,15 @@
 	virtual status_t GetNextChunk(const void **chunkBuffer, size_t *chunkSize,
 	                              media_header *mediaHeader)
 	{
-		return fExtractor->GetNextChunk(fStream, chunkBuffer, chunkSize, mediaHeader);
+		return fExtractor->GetNextChunk(fStream, chunkBuffer, chunkSize,
+			mediaHeader);
 	}
 };
 
 
 status_t
-MediaExtractor::CreateDecoder(int32 stream, Decoder **out_decoder, media_codec_info *mci)
+MediaExtractor::CreateDecoder(int32 stream, Decoder **out_decoder,
+	media_codec_info *mci)
 {
 	CALLED();
 	status_t res;
@@ -239,36 +247,44 @@
 
 	res = fStreamInfo[stream].status;
 	if (res != B_OK) {
-		printf("MediaExtractor::CreateDecoder can't create decoder for stream %ld\n", stream);
+		ERROR("MediaExtractor::CreateDecoder can't create decoder for "
+			"stream %ld\n", stream);
 		return res;
 	}
 	
-	res = _plugin_manager.CreateDecoder(&decoder, fStreamInfo[stream].encodedFormat);
+	res = _plugin_manager.CreateDecoder(&decoder,
+		fStreamInfo[stream].encodedFormat);
 	if (res != B_OK) {
-		printf("MediaExtractor::CreateDecoder _plugin_manager.CreateDecoder failed for stream %ld\n", stream);
+		ERROR("MediaExtractor::CreateDecoder _plugin_manager.CreateDecoder "
+			"failed for stream %ld\n", stream);
 		return res;
 	}
 
-	ChunkProvider *chunkProvider = new(std::nothrow) MediaExtractorChunkProvider(this, stream);
+	ChunkProvider *chunkProvider
+		= new(std::nothrow) MediaExtractorChunkProvider(this, stream);
 	if (!chunkProvider) {
 		_plugin_manager.DestroyDecoder(decoder);
-		printf("MediaExtractor::CreateDecoder can't create chunk provider for stream %ld\n", stream);
+		ERROR("MediaExtractor::CreateDecoder can't create chunk provider "
+			"for stream %ld\n", stream);
 		return B_NO_MEMORY;
 	}
 
 	decoder->SetChunkProvider(chunkProvider);
 	
-	res = decoder->Setup(&fStreamInfo[stream].encodedFormat, fStreamInfo[stream].infoBuffer, fStreamInfo[stream].infoBufferSize);
+	res = decoder->Setup(&fStreamInfo[stream].encodedFormat,
+		fStreamInfo[stream].infoBuffer, fStreamInfo[stream].infoBufferSize);
 	if (res != B_OK) {
 		_plugin_manager.DestroyDecoder(decoder);
-		printf("MediaExtractor::CreateDecoder Setup failed for stream %ld: %ld (%s)\n", stream, res, strerror(res));
+		ERROR("MediaExtractor::CreateDecoder Setup failed for stream %ld: "
+			"%ld (%s)\n", stream, res, strerror(res));
 		return res;
 	}
 
 	res = _plugin_manager.GetDecoderInfo(decoder, mci);
 	if (res != B_OK) {
 		_plugin_manager.DestroyDecoder(decoder);
-		printf("MediaExtractor::CreateDecoder GetCodecInfo failed for stream %ld: %ld (%s)\n", stream, res, strerror(res));
+		ERROR("MediaExtractor::CreateDecoder GetCodecInfo failed for stream "
+			"%ld: %ld (%s)\n", stream, res, strerror(res));
 		return res;
 	}
 
@@ -304,8 +320,10 @@
 					const void *chunkBuffer;
 					size_t chunkSize;
 					status_t err;
-					err = fReader->GetNextChunk(fStreamInfo[stream].cookie, &chunkBuffer, &chunkSize, &mediaHeader);
-					fStreamInfo[stream].chunkCache->PutNextChunk(chunkBuffer, chunkSize, mediaHeader, err);
+					err = fReader->GetNextChunk(fStreamInfo[stream].cookie,
+						&chunkBuffer, &chunkSize, &mediaHeader);
+					fStreamInfo[stream].chunkCache->PutNextChunk(chunkBuffer,
+						chunkSize, mediaHeader, err);
 					refill_done = true;
 				}
 			}

Modified: haiku/trunk/src/kits/media/MediaFormats.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaFormats.cpp	2008-03-19 19:14:48 UTC (rev 24477)
+++ haiku/trunk/src/kits/media/MediaFormats.cpp	2008-03-19 19:39:07 UTC (rev 24478)
@@ -370,17 +370,20 @@
 
 	status_t status = update_media_formats();
 	if (status < B_OK) {
-		printf("BMediaFormats: updating formats from server failed: %s!\n", strerror(status));
+		ERROR("BMediaFormats: updating formats from server failed: %s!\n",
+			strerror(status));
 		return status;
 	}
-	printf("search for description family = %d, a = 0x%lx, b = 0x%lx\n",
-		description.family, description.u.misc.file_format, description.u.misc.codec);
+	TRACE("search for description family = %d, a = 0x%lx, b = 0x%lx\n",
+		description.family, description.u.misc.file_format,
+		description.u.misc.codec);
 
 	// search for a matching format description
 
 	meta_format other(description);
-	const meta_format *metaFormat = sFormats.BinarySearch(other, meta_format::CompareDescriptions);
-	printf("meta format == %p\n", metaFormat);
+	const meta_format *metaFormat = sFormats.BinarySearch(other,
+		meta_format::CompareDescriptions);
+	TRACE("meta format == %p\n", metaFormat);
 	if (metaFormat == NULL) {
 		memset(_format, 0, sizeof(*_format)); // clear to widlcard
 		return B_MEDIA_BAD_FORMAT;

Modified: haiku/trunk/src/kits/media/ParameterWeb.cpp
===================================================================
--- haiku/trunk/src/kits/media/ParameterWeb.cpp	2008-03-19 19:14:48 UTC (rev 24477)
+++ haiku/trunk/src/kits/media/ParameterWeb.cpp	2008-03-19 19:39:07 UTC (rev 24478)
@@ -1256,13 +1256,15 @@
 			return new BNullParameter(-1, B_MEDIA_NO_TYPE, NULL, NULL, NULL);
 
 		case BParameter::B_DISCRETE_PARAMETER:
-			return new BDiscreteParameter(-1, B_MEDIA_NO_TYPE, NULL, NULL, NULL);
+			return new BDiscreteParameter(-1, B_MEDIA_NO_TYPE, NULL, NULL,
+				NULL);
 
 		case BParameter::B_CONTINUOUS_PARAMETER:
-			return new BContinuousParameter(-1, B_MEDIA_NO_TYPE, NULL, NULL, NULL, NULL, 0, 0, 0);
+			return new BContinuousParameter(-1, B_MEDIA_NO_TYPE, NULL, NULL,
+				NULL, NULL, 0, 0, 0);
 
 		case BParameter::B_TEXT_PARAMETER:
-			return new BTextParameter(-1, B_MEDIA_NO_TYPE, NULL, NULL, NULL, NULL);
+			return new BTextParameter(-1, B_MEDIA_NO_TYPE, NULL, NULL, NULL, 0);
 
 		default:
 			ERROR("BParameterGroup::MakeControl unknown type %ld\n", type);
@@ -1401,8 +1403,9 @@
 		if (_when != NULL)
 			*_when = reply.last_change;
 	} else
-		ERROR("BParameter::GetValue parameter '%s' querying node %d, port %d failed: %s\n", 
-			mName, node.node, node.port, strerror(status));
+		ERROR("BParameter::GetValue parameter '%s' querying node %d, "
+			"port %d failed: %s\n",  mName, (int)node.node, (int)node.port,
+			strerror(status));
 
 	if (area >= B_OK)
 		delete_area(area);



From jackburton at mail.berlios.de  Wed Mar 19 21:59:55 2008
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Wed, 19 Mar 2008 21:59:55 +0100
Subject: [Haiku-commits] r24479 - haiku/trunk/src/kits/interface
Message-ID: <200803192059.m2JKxtlt014986@sheep.berlios.de>

Author: jackburton
Date: 2008-03-19 21:59:55 +0100 (Wed, 19 Mar 2008)
New Revision: 24479
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24479&view=rev

Modified:
   haiku/trunk/src/kits/interface/Menu.cpp
   haiku/trunk/src/kits/interface/MenuBar.cpp
Log:
Apply the same logic of BMenu::_Track() also in BMenuBar::_track(): 
check if mouse is over a submenu and then if it's over the current menu.


Modified: haiku/trunk/src/kits/interface/Menu.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Menu.cpp	2008-03-19 19:39:07 UTC (rev 24478)
+++ haiku/trunk/src/kits/interface/Menu.cpp	2008-03-19 20:59:55 UTC (rev 24479)
@@ -1607,6 +1607,7 @@
 	}
 }
 
+
 void
 BMenu::_UpdateStateOpenSelect(BMenuItem* item, BPoint position,
 	BRect& navAreaRectAbove, BRect& navAreaRectBelow, bigtime_t& selectedTime,
@@ -1615,7 +1616,6 @@
 	if (fState == MENU_STATE_CLOSED)
 		return;
 
-
 	if (item != fSelected) {
 		if (navigationAreaTime == 0)
 			navigationAreaTime = system_time();

Modified: haiku/trunk/src/kits/interface/MenuBar.cpp
===================================================================
--- haiku/trunk/src/kits/interface/MenuBar.cpp	2008-03-19 19:39:07 UTC (rev 24478)
+++ haiku/trunk/src/kits/interface/MenuBar.cpp	2008-03-19 20:59:55 UTC (rev 24479)
@@ -471,22 +471,7 @@
 			break;
 
 		BMenuItem *menuItem = _HitTestItems(where, B_ORIGIN);
-		if (menuItem != NULL) {
-			if (menuItem->Submenu() != NULL && menuItem != fSelected) {
-				if (menuItem->Submenu()->Window() == NULL) {
-					// open the menu if it's not opened yet
-					_SelectItem(menuItem);
-				} else {
-					// Menu was already opened, close it and bail
-					_SelectItem(NULL);
-					fState = MENU_STATE_CLOSED;
-					fChosenItem = NULL;
-				}
-			} else {
-				// No submenu, just select the item
-				_SelectItem(menuItem);					
-			}
-		} else if (_OverSubmenu(fSelected, ConvertToScreen(where))) {
+		if (_OverSubmenu(fSelected, ConvertToScreen(where))) {
 			// call _Track() from the selected sub-menu when the mouse cursor
 			// is over its window
 			BMenu *menu = fSelected->Submenu();
@@ -523,6 +508,21 @@
 			}
 			if (!window->Lock())
 				break;
+		} else if (menuItem != NULL) {
+			if (menuItem->Submenu() != NULL && menuItem != fSelected) {
+				if (menuItem->Submenu()->Window() == NULL) {
+					// open the menu if it's not opened yet
+					_SelectItem(menuItem);
+				} else {
+					// Menu was already opened, close it and bail
+					_SelectItem(NULL);
+					fState = MENU_STATE_CLOSED;
+					fChosenItem = NULL;
+				}
+			} else {
+				// No submenu, just select the item
+				_SelectItem(menuItem);					
+			}
 		} else if (menuItem == NULL && fSelected != NULL
 			&& !_IsStickyMode() && Bounds().Contains(where)) {
 			_SelectItem(NULL);



From bonefish at mail.berlios.de  Wed Mar 19 23:12:30 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 19 Mar 2008 23:12:30 +0100
Subject: [Haiku-commits] r24480 - haiku/trunk/src/bin/m4/lib
Message-ID: <200803192212.m2JMCUhf020519@sheep.berlios.de>

Author: bonefish
Date: 2008-03-19 23:12:30 +0100 (Wed, 19 Mar 2008)
New Revision: 24480
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24480&view=rev

Modified:
   haiku/trunk/src/bin/m4/lib/config.h
Log:
Unlike BeOS' strerror_r() (not in headers) ours is standard-conforming
and returns int. Fixes the only (unexpectedly) failing autoconf test.


Modified: haiku/trunk/src/bin/m4/lib/config.h
===================================================================
--- haiku/trunk/src/bin/m4/lib/config.h	2008-03-19 20:59:55 UTC (rev 24479)
+++ haiku/trunk/src/bin/m4/lib/config.h	2008-03-19 22:12:30 UTC (rev 24480)
@@ -441,7 +441,7 @@
 #define STDC_HEADERS 1
 
 /* Define to 1 if strerror_r returns char *. */
-#define STRERROR_R_CHAR_P 1
+/* #undef STRERROR_R_CHAR_P */
 
 /* Define to 1 if using stack overflow detection */
 // #define USE_STACKOVF 1



From korli at mail.berlios.de  Wed Mar 19 23:58:48 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 19 Mar 2008 23:58:48 +0100
Subject: [Haiku-commits] r24481 - haiku/trunk/src/system/kernel/fs
Message-ID: <200803192258.m2JMwm6C023799@sheep.berlios.de>

Author: korli
Date: 2008-03-19 23:58:48 +0100 (Wed, 19 Mar 2008)
New Revision: 24481
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24481&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/devfs.cpp
Log:
added help support for devfs_driver debugger command


Modified: haiku/trunk/src/system/kernel/fs/devfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/devfs.cpp	2008-03-19 22:12:30 UTC (rev 24480)
+++ haiku/trunk/src/system/kernel/fs/devfs.cpp	2008-03-19 22:58:48 UTC (rev 24481)
@@ -1431,6 +1431,11 @@
 		return 0;
 	}
 
+	if (!strcmp(argv[1], "--help")) {
+		kprintf("usage: %s [name]\n", argv[0]);
+		return 0;
+	}
+
 	driver_entry *driver = (driver_entry *)hash_lookup(
 		sDeviceFileSystem->driver_hash, argv[1]);
 	if (driver == NULL) {



From korli at mail.berlios.de  Thu Mar 20 00:02:31 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 20 Mar 2008 00:02:31 +0100
Subject: [Haiku-commits] r24482 - haiku/trunk/src/system/kernel/fs
Message-ID: <200803192302.m2JN2VPu024324@sheep.berlios.de>

Author: korli
Date: 2008-03-20 00:02:30 +0100 (Thu, 20 Mar 2008)
New Revision: 24482
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24482&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/devfs.cpp
Log:
added --help support for devfs_node debugger command


Modified: haiku/trunk/src/system/kernel/fs/devfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/devfs.cpp	2008-03-19 22:58:48 UTC (rev 24481)
+++ haiku/trunk/src/system/kernel/fs/devfs.cpp	2008-03-19 23:02:30 UTC (rev 24482)
@@ -1364,7 +1364,7 @@
 static int
 dump_node(int argc, char **argv)
 {
-	if (argc < 2) {
+	if (argc < 2 || !strcmp(argv[1], "--help")) {
 		kprintf("usage: %s <address>\n", argv[0]);
 		return 0;
 	}



From bonefish at mail.berlios.de  Thu Mar 20 02:45:03 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 20 Mar 2008 02:45:03 +0100
Subject: [Haiku-commits] r24483 - in haiku/trunk: headers/private/kernel
	src/system/libroot/os src/system/runtime_loader
Message-ID: <200803200145.m2K1j3ut026258@sheep.berlios.de>

Author: bonefish
Date: 2008-03-20 02:45:00 +0100 (Thu, 20 Mar 2008)
New Revision: 24483
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24483&view=rev

Modified:
   haiku/trunk/headers/private/kernel/user_runtime.h
   haiku/trunk/src/system/libroot/os/image.c
   haiku/trunk/src/system/runtime_loader/runtime_loader.c
   haiku/trunk/src/system/runtime_loader/runtime_loader_private.h
Log:
* The runtime_loader's test_executable() no longer analyzes the
  executable permissions of the file by hand. We use _kern_access()
  instead, which also handles the root case correctly.
* The user and group arguments of test_executable() aren't needed any
  longer.


Modified: haiku/trunk/headers/private/kernel/user_runtime.h
===================================================================
--- haiku/trunk/headers/private/kernel/user_runtime.h	2008-03-19 23:02:30 UTC (rev 24482)
+++ haiku/trunk/headers/private/kernel/user_runtime.h	2008-03-20 01:45:00 UTC (rev 24483)
@@ -34,8 +34,7 @@
 		int32 symbolType, void **_location);
 	status_t (*get_nth_image_symbol)(image_id imageID, int32 num, char *symbolName,
 		int32 *nameLength, int32 *symbolType, void **_location);
-	status_t (*test_executable)(const char *path, uid_t user, gid_t group,
-		char *starter);
+	status_t (*test_executable)(const char *path, char *interpreter);
 	status_t (*get_next_image_dependency)(image_id id, uint32 *cookie,
 		const char **_name);
 

Modified: haiku/trunk/src/system/libroot/os/image.c
===================================================================
--- haiku/trunk/src/system/libroot/os/image.c	2008-03-19 23:02:30 UTC (rev 24482)
+++ haiku/trunk/src/system/libroot/os/image.c	2008-03-20 01:45:00 UTC (rev 24483)
@@ -195,7 +195,7 @@
 status_t
 __test_executable(const char *path, char *invoker)
 {
-	return __gRuntimeLoader->test_executable(path, geteuid(), getegid(), invoker);
+	return __gRuntimeLoader->test_executable(path, invoker);
 }
 
 

Modified: haiku/trunk/src/system/runtime_loader/runtime_loader.c
===================================================================
--- haiku/trunk/src/system/runtime_loader/runtime_loader.c	2008-03-19 23:02:30 UTC (rev 24482)
+++ haiku/trunk/src/system/runtime_loader/runtime_loader.c	2008-03-20 01:45:00 UTC (rev 24483)
@@ -267,12 +267,11 @@
 	both types, the caller will give scripts a proper treatment.
 */
 status_t
-test_executable(const char *name, uid_t user, gid_t group, char *invoker)
+test_executable(const char *name, char *invoker)
 {
 	char path[B_PATH_NAME_LENGTH];
 	char buffer[B_FILE_NAME_LENGTH];
 		// must be large enough to hold the ELF header
-	struct stat stat;
 	status_t status;
 	ssize_t length;
 	int fd;
@@ -287,22 +286,10 @@
 		return fd;
 
 	// see if it's executable at all
-
-	status = _kern_read_stat(fd, NULL, true, &stat, sizeof(struct stat));
+	status = _kern_access(path, X_OK);
 	if (status != B_OK)
 		goto out;
 
-	// shift mode bits, to check directly against accessMode
-	if (user == stat.st_uid)
-		stat.st_mode >>= 6;
-	else if (group == stat.st_gid)
-		stat.st_mode >>= 3;
-
-	if (~(stat.st_mode & S_IRWXO) & X_OK) {
-		status = B_NOT_ALLOWED;
-		goto out;
-	}
-
 	// read and verify the ELF header
 
 	length = _kern_read(fd, 0, buffer, sizeof(buffer));

Modified: haiku/trunk/src/system/runtime_loader/runtime_loader_private.h
===================================================================
--- haiku/trunk/src/system/runtime_loader/runtime_loader_private.h	2008-03-19 23:02:30 UTC (rev 24482)
+++ haiku/trunk/src/system/runtime_loader/runtime_loader_private.h	2008-03-20 01:45:00 UTC (rev 24483)
@@ -25,8 +25,7 @@
 int runtime_loader(void *arg);
 int open_executable(char *name, image_type type, const char *rpath,
 	const char *programPath);
-status_t test_executable(const char *path, uid_t user, gid_t group,
-	char *starter);
+status_t test_executable(const char *path, char *interpreter);
 
 void terminate_program(void);
 image_id load_program(char const *path, void **entry);



From bonefish at mail.berlios.de  Thu Mar 20 02:45:30 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 20 Mar 2008 02:45:30 +0100
Subject: [Haiku-commits] r24484 - haiku/trunk/src/system/runtime_loader
Message-ID: <200803200145.m2K1jTUL026311@sheep.berlios.de>

Author: bonefish
Date: 2008-03-20 02:45:29 +0100 (Thu, 20 Mar 2008)
New Revision: 24484
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24484&view=rev

Modified:
   haiku/trunk/src/system/runtime_loader/elf.cpp
Log:
Fixed NULL related warnings.


Modified: haiku/trunk/src/system/runtime_loader/elf.cpp
===================================================================
--- haiku/trunk/src/system/runtime_loader/elf.cpp	2008-03-20 01:45:00 UTC (rev 24483)
+++ haiku/trunk/src/system/runtime_loader/elf.cpp	2008-03-20 01:45:29 UTC (rev 24484)
@@ -757,7 +757,7 @@
 	// ToDo: "type" is currently ignored!
 	(void)type;
 
-	if (image->dynamic_ptr == NULL)
+	if (image->dynamic_ptr == 0)
 		return NULL;
 
 	hash = elf_hash((uint8 *)name) % HASHTABSIZE(image);
@@ -1093,7 +1093,7 @@
 		goto err3;
 	}
 
-	if (eheader.e_entry != NULL)
+	if (eheader.e_entry != 0)
 		image->entry_point = eheader.e_entry + image->regions[0].delta;
 
 	image->type = type;
@@ -1309,7 +1309,7 @@
 
 		TRACE(("%ld:  init: %s\n", find_thread(NULL), image->name));
 
-		if (image->init_routine != NULL)
+		if (image->init_routine != 0)
 			((init_term_function)image->init_routine)(image->id);
 	}
 	TRACE(("%ld:  init done.\n", find_thread(NULL)));
@@ -1392,7 +1392,7 @@
 				(symbol->st_value + image->regions[0].delta);
 	}
 
-	if (sProgramImage->entry_point == NULL) {
+	if (sProgramImage->entry_point == 0) {
 		status = B_NOT_AN_EXECUTABLE;
 		goto err;
 	}



From stippi at mail.berlios.de  Thu Mar 20 10:47:55 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 20 Mar 2008 10:47:55 +0100
Subject: [Haiku-commits] r24485 -
	haiku/trunk/src/apps/icon-o-matic/import_export/flat_icon
Message-ID: <200803200947.m2K9lt0E011705@sheep.berlios.de>

Author: stippi
Date: 2008-03-20 10:47:55 +0100 (Thu, 20 Mar 2008)
New Revision: 24485
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24485&view=rev

Modified:
   haiku/trunk/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.cpp
Log:
Icon-O-Matic was missing the "[]" specifier when exporting a C array. Thanks
to mmu_man for pointing this out!


Modified: haiku/trunk/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.cpp
===================================================================
--- haiku/trunk/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.cpp	2008-03-20 01:45:29 UTC (rev 24484)
+++ haiku/trunk/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.cpp	2008-03-20 09:47:55 UTC (rev 24485)
@@ -52,7 +52,7 @@
 {
 	char buffer[2048];
 	// write header
-	sprintf(buffer, "\nconst unsigned char kIconName = {\n");
+	sprintf(buffer, "\nconst unsigned char kIconName[] = {\n");
 	size_t size = strlen(buffer);
 
 	ssize_t written = stream->Write(buffer, size);



From stippi at mail.berlios.de  Thu Mar 20 12:00:28 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 20 Mar 2008 12:00:28 +0100
Subject: [Haiku-commits] r24486 -
	haiku/trunk/src/apps/icon-o-matic/import_export/svg
Message-ID: <200803201100.m2KB0SqV018561@sheep.berlios.de>

Author: stippi
Date: 2008-03-20 12:00:27 +0100 (Thu, 20 Mar 2008)
New Revision: 24486
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24486&view=rev

Modified:
   haiku/trunk/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp
Log:
Don't export shapes which are not visible at the default image scale.


Modified: haiku/trunk/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp
===================================================================
--- haiku/trunk/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp	2008-03-20 09:47:55 UTC (rev 24485)
+++ haiku/trunk/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp	2008-03-20 11:00:27 UTC (rev 24486)
@@ -201,6 +201,13 @@
 status_t
 SVGExporter::_ExportShape(const Shape* shape, BPositionIO* stream)
 {
+	if (shape->MaxVisibilityScale() < 1.0
+		|| shape->MinVisibilityScale() > 1.0) {
+		// don't export shapes which are not visible at the
+		// default scale
+		return B_OK;
+	}
+
 	const Style* style = shape->Style();
 
 	char color[64];



From axeld at mail.berlios.de  Thu Mar 20 12:04:47 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 20 Mar 2008 12:04:47 +0100
Subject: [Haiku-commits] r24487 - in haiku/trunk/src/system/kernel: .
	arch/x86 debug vm
Message-ID: <200803201104.m2KB4lXZ019004@sheep.berlios.de>

Author: axeld
Date: 2008-03-20 12:04:45 +0100 (Thu, 20 Mar 2008)
New Revision: 24487
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24487&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_int.c
   haiku/trunk/src/system/kernel/arch/x86/arch_thread.cpp
   haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp
   haiku/trunk/src/system/kernel/module.cpp
   haiku/trunk/src/system/kernel/signal.cpp
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
* Fixed warnings, mostly due to NULL changes.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_int.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_int.c	2008-03-20 11:00:27 UTC (rev 24486)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_int.c	2008-03-20 11:04:45 UTC (rev 24487)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2002-2008, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001, Travis Geiselbrecht. All rights reserved.
@@ -225,6 +225,12 @@
 
 	// determine which interrupts are level or edge triggered
 
+#if 0
+	// should set everything possible to level triggered
+	out8(PIC_MASTER_TRIGGER_MODE, 0xf8);
+	out8(PIC_SLAVE_TRIGGER_MODE, 0xde);
+#endif
+
 	sLevelTriggeredInterrupts = in8(PIC_MASTER_TRIGGER_MODE)
 		| (in8(PIC_SLAVE_TRIGGER_MODE) << 8);
 
@@ -453,7 +459,7 @@
 
 	if (kernelDebugger) {
 		// if this thread has a fault handler, we're allowed to be here
-		if (thread && thread->fault_handler != NULL) {
+		if (thread && thread->fault_handler != 0) {
 			frame->eip = thread->fault_handler;
 			return;
 		}

Modified: haiku/trunk/src/system/kernel/arch/x86/arch_thread.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_thread.cpp	2008-03-20 11:00:27 UTC (rev 24486)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_thread.cpp	2008-03-20 11:04:45 UTC (rev 24487)
@@ -353,7 +353,7 @@
 
 	// set TLS GDT entry to the current thread - since this action is
 	// dependent on the current CPU, we have to do it here
-	if (to->user_local_storage != NULL)
+	if (to->user_local_storage != 0)
 		set_tls_context(to);
 
 	newPageDirectory = (addr_t)x86_next_page_directory(from, to);

Modified: haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp	2008-03-20 11:00:27 UTC (rev 24486)
+++ haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp	2008-03-20 11:04:45 UTC (rev 24487)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2005-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 
@@ -381,7 +381,7 @@
 bool
 frame_buffer_console_available(void)
 {
-	return sConsole.frame_buffer != NULL;
+	return sConsole.frame_buffer != 0;
 }
 
 
@@ -425,8 +425,7 @@
 {
 	mutex_init(&sConsole.lock, "console_lock");
 
-	// TODO: enable MTRR in VESA mode!
-	if (sConsole.frame_buffer == NULL)
+	if (sConsole.frame_buffer == 0)
 		return B_OK;
 
 	// try to set frame buffer memory to write combined
@@ -447,7 +446,7 @@
 
 	if (geteuid() != 0)
 		return B_NOT_ALLOWED;
-	if (IS_USER_ADDRESS(baseAddress) && baseAddress != NULL)
+	if (IS_USER_ADDRESS(baseAddress) && baseAddress != 0)
 		return B_BAD_ADDRESS;
 
 	return frame_buffer_update(baseAddress, width, height, depth, bytesPerRow);

Modified: haiku/trunk/src/system/kernel/module.cpp
===================================================================
--- haiku/trunk/src/system/kernel/module.cpp	2008-03-20 11:00:27 UTC (rev 24486)
+++ haiku/trunk/src/system/kernel/module.cpp	2008-03-20 11:04:45 UTC (rev 24487)
@@ -1262,7 +1262,7 @@
 {
 	if (sModulesHash == NULL) {
 		dprintf("get_next_loaded_module_name() called too early!\n");
-		return NULL;
+		return B_ERROR;
 	}
 
 	//TRACE(("get_next_loaded_module_name(\"%s\")\n", buffer));

Modified: haiku/trunk/src/system/kernel/signal.cpp
===================================================================
--- haiku/trunk/src/system/kernel/signal.cpp	2008-03-20 11:00:27 UTC (rev 24486)
+++ haiku/trunk/src/system/kernel/signal.cpp	2008-03-20 11:04:45 UTC (rev 24487)
@@ -724,7 +724,7 @@
 			// remove pending signal if it should now be ignored
 			atomic_and(&thread->sig_pending, ~SIGNAL_TO_MASK(signal));
 		} else if (act && act->sa_handler == SIG_DFL
-			&& (SIGNAL_TO_MASK(signal) & DEFAULT_IGNORE_SIGNALS) != NULL) {
+			&& (SIGNAL_TO_MASK(signal) & DEFAULT_IGNORE_SIGNALS) != 0) {
 			// remove pending signal for those signals whose default
 			// action is to ignore them
 			atomic_and(&thread->sig_pending, ~SIGNAL_TO_MASK(signal));

Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2008-03-20 11:00:27 UTC (rev 24486)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2008-03-20 11:04:45 UTC (rev 24487)
@@ -1434,7 +1434,7 @@
 
 	AddressSpaceWriteLocker locker;
 	status_t status = locker.SetTo(team);
-	if (status != NULL)
+	if (status != B_OK)
 		return status;
 
 	vm_address_space *addressSpace = locker.AddressSpace();
@@ -2837,7 +2837,7 @@
 	}
 
 	addr_t address = strtoul(argv[1], NULL, 0);
-	if (address == NULL)
+	if (address == 0)
 		return 0;
 
 	vm_cache *cache = (vm_cache *)address;
@@ -2923,7 +2923,7 @@
 	}
 
 	addr_t address = strtoul(argv[i], NULL, 0);
-	if (address == NULL)
+	if (address == 0)
 		return 0;
 
 	cache = (vm_cache *)address;



From stippi at mail.berlios.de  Thu Mar 20 12:06:41 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 20 Mar 2008 12:06:41 +0100
Subject: [Haiku-commits] r24488 -
	haiku/trunk/src/apps/icon-o-matic/import_export/svg
Message-ID: <200803201106.m2KB6f7Z019995@sheep.berlios.de>

Author: stippi
Date: 2008-03-20 12:06:41 +0100 (Thu, 20 Mar 2008)
New Revision: 24488
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24488&view=rev

Modified:
   haiku/trunk/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp
Log:
Small cleanup.


Modified: haiku/trunk/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp
===================================================================
--- haiku/trunk/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp	2008-03-20 11:04:45 UTC (rev 24487)
+++ haiku/trunk/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp	2008-03-20 11:06:41 UTC (rev 24488)
@@ -360,7 +360,6 @@
 status_t
 SVGExporter::_ExportGradient(const Gradient* gradient, BPositionIO* stream)
 {
-	status_t ret = B_OK;
 	BString helper;
 
 	// start new gradient tag
@@ -435,11 +434,7 @@
 		helper << "  </linearGradient>\n";
 	}
 
-	if (ret >= B_OK) {
-		ret = write_line(stream, helper);
-	}
-
-	return ret;
+	return write_line(stream, helper);
 }
 
 // _AppendMatrix



From axeld at mail.berlios.de  Thu Mar 20 12:10:18 2008
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 20 Mar 2008 12:10:18 +0100
Subject: [Haiku-commits] r24489 - in haiku/trunk: headers/private/kernel
	headers/private/kernel/boot src/system/kernel
	src/system/kernel/debug
Message-ID: <200803201110.m2KBAIoT020740@sheep.berlios.de>

Author: axeld
Date: 2008-03-20 12:10:17 +0100 (Thu, 20 Mar 2008)
New Revision: 24489
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24489&view=rev

Added:
   haiku/trunk/headers/private/kernel/boot_splash.h
   haiku/trunk/src/system/kernel/boot_splash.cpp
Removed:
   haiku/trunk/headers/private/kernel/boot/splash.h
   haiku/trunk/src/system/kernel/splash.cpp
Modified:
   haiku/trunk/headers/private/kernel/debug.h
   haiku/trunk/src/system/kernel/Jamfile
   haiku/trunk/src/system/kernel/debug/debug.cpp
   haiku/trunk/src/system/kernel/main.c
Log:
* Added debug_screen_output_enabled() function.
* The boot splash code now checks wether debug screen output is enabled or not
  using the above function.
* The boot splash code no longer maps it's own copy of the frame buffer, instead,
  it will use the boot item feature as the VESA driver does. Also removed the
  lock, as that's not needed at all.
* Renamed splash.cpp to boot_splash.cpp, and boot/splash.h to boot_splash.h
  (it's not part of the boot loader, but the kernel).
* Removed dead code from boot_splash.cpp, added license. Replaced license
  header in boot_splash.h to a style guide conforming one.


Deleted: haiku/trunk/headers/private/kernel/boot/splash.h

Copied: haiku/trunk/headers/private/kernel/boot_splash.h (from rev 24485, haiku/trunk/headers/private/kernel/boot/splash.h)
===================================================================
--- haiku/trunk/headers/private/kernel/boot/splash.h	2008-03-20 09:47:55 UTC (rev 24485)
+++ haiku/trunk/headers/private/kernel/boot_splash.h	2008-03-20 11:10:17 UTC (rev 24489)
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Artur Wyszynski <harakash at gmail.com>
+ */
+#ifndef KERNEL_BOOT_SPLASH_H
+#define KERNEL_BOOT_SPLASH_H
+
+
+#include <sys/types.h>
+
+
+enum {
+	BOOT_SPLASH_STAGE_1_INIT_MODULES = 0,
+	BOOT_SPLASH_STAGE_2_BOOTSTRAP_FS,
+	BOOT_SPLASH_STAGE_3_INIT_DEVICES,
+	BOOT_SPLASH_STAGE_4_MOUNT_BOOT_FS,
+	BOOT_SPLASH_STAGE_5_INIT_CPU_MODULES,
+	BOOT_SPLASH_STAGE_6_INIT_VM_MODULES,
+	BOOT_SPLASH_STAGE_7_RUN_BOOT_SCRIPT,
+
+	BOOT_SPLASH_STAGE_MAX // keep this at the end
+};
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void boot_splash_init(void);
+void boot_splash_set_stage(int stage);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KERNEL_BOOT_SPLASH_H */

Modified: haiku/trunk/headers/private/kernel/debug.h
===================================================================
--- haiku/trunk/headers/private/kernel/debug.h	2008-03-20 11:06:41 UTC (rev 24488)
+++ haiku/trunk/headers/private/kernel/debug.h	2008-03-20 11:10:17 UTC (rev 24489)
@@ -70,6 +70,7 @@
 extern void debug_early_boot_message(const char *string);
 extern void debug_puts(const char *s, int32 length);
 extern bool debug_debugger_running(void);
+extern bool debug_screen_output_enabled(void);
 extern void debug_stop_screen_debug_output(void);
 
 extern void	kputs(const char *string);

Modified: haiku/trunk/src/system/kernel/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/Jamfile	2008-03-20 11:06:41 UTC (rev 24488)
+++ haiku/trunk/src/system/kernel/Jamfile	2008-03-20 11:10:17 UTC (rev 24489)
@@ -17,6 +17,7 @@
 
 KernelMergeObject kernel_core.o :
 	boot_item.cpp
+	boot_splash.cpp
 	commpage.cpp
 	condition_variable.cpp
 	cpu.c
@@ -39,7 +40,6 @@
 	system_info.cpp
 	smp.c
 	syscalls.cpp
-	splash.cpp
 	team.cpp
 	thread.cpp
 	timer.c

Copied: haiku/trunk/src/system/kernel/boot_splash.cpp (from rev 24485, haiku/trunk/src/system/kernel/splash.cpp)
===================================================================
--- haiku/trunk/src/system/kernel/splash.cpp	2008-03-20 09:47:55 UTC (rev 24485)
+++ haiku/trunk/src/system/kernel/boot_splash.cpp	2008-03-20 11:10:17 UTC (rev 24489)
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2008, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Artur Wyszynski <harakash at gmail.com>
+ */
+
+
+#include <boot_splash.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <KernelExport.h>
+
+#include <boot/images.h>
+#include <boot_item.h>
+#include <debug.h>
+#include <frame_buffer_console.h>
+
+
+//#define TRACE_BOOT_SPLASH 1
+#ifdef TRACE_BOOT_SPLASH
+#	define TRACE(x...) dprintf(x);
+#else
+#	define TRACE(x...) ;
+#endif
+
+
+static struct frame_buffer_boot_info *sInfo;
+
+
+static void
+blit15_cropped(const uint8 *data, uint16 imageLeft, uint16 imageTop,
+	uint16 imageRight, uint16 imageBottom, uint16 imageWidth,
+	uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
+{
+	data += (imageWidth * imageTop + imageLeft) * 3;
+	uint16* start = (uint16*)(sInfo->frame_buffer
+		+ sInfo->bytes_per_row * (top + imageTop)
+		+ 2 * (left + imageLeft));
+
+	for (int32 y = imageTop; y < imageBottom; y++) {
+		const uint8* src = data;
+		uint16* dst = start;
+		for (int32 x = imageLeft; x < imageRight; x++) {
+			dst[0] = ((src[2] >> 3) << 10)
+				| ((src[1] >> 3) << 5)
+				| ((src[0] >> 3));
+
+			dst++;
+			src += 3;
+		}
+
+		data += imageWidth * 3;
+		start = (uint16*)((addr_t)start + sInfo->bytes_per_row);
+	}
+}
+
+
+static void
+blit16_cropped(const uint8 *data, uint16 imageLeft, uint16 imageTop,
+	uint16 imageRight, uint16 imageBottom, uint16 imageWidth,
+	uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
+{
+	data += (imageWidth * imageTop + imageLeft) * 3;
+	uint16* start = (uint16*)(sInfo->frame_buffer
+		+ sInfo->bytes_per_row * (top + imageTop) + 2 * (left + imageLeft));
+
+	for (int32 y = imageTop; y < imageBottom; y++) {
+		const uint8* src = data;
+		uint16* dst = start;
+		for (int32 x = imageLeft; x < imageRight; x++) {
+			dst[0] = ((src[2] >> 3) << 11)
+				| ((src[1] >> 2) << 5)
+				| ((src[0] >> 3));
+
+			dst++;
+			src += 3;
+		}
+
+		data += imageWidth * 3;
+		start = (uint16*)((addr_t)start + sInfo->bytes_per_row);
+	}
+}
+
+
+static void
+blit24_cropped(const uint8 *data, uint16 imageLeft, uint16 imageTop,
+	uint16 imageRight, uint16 imageBottom, uint16 imageWidth,
+	uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
+{
+	data += (imageWidth * imageTop + imageLeft) * 3;
+	uint8* start = (uint8*)(sInfo->frame_buffer
+		+ sInfo->bytes_per_row * (top + imageTop) + 3 * (left + imageLeft));
+
+	for (int32 y = imageTop; y < imageBottom; y++) {
+		const uint8* src = data;
+		uint8* dst = start;
+		for (int32 x = imageLeft; x < imageRight; x++) {
+			dst[0] = src[0];
+			dst[1] = src[1];
+			dst[2] = src[2];
+			dst += 3;
+			src += 3;
+		}
+
+		data += imageWidth * 3;
+		start = (uint8*)((addr_t)start + sInfo->bytes_per_row);
+	}
+}
+
+
+static void
+blit32_cropped(const uint8 *data, uint16 imageLeft, uint16 imageTop,
+	uint16 imageRight, uint16 imageBottom, uint16 imageWidth,
+	uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
+{
+	data += (imageWidth * imageTop + imageLeft) * 3;
+	uint32* start = (uint32*)(sInfo->frame_buffer
+		+ sInfo->bytes_per_row * (top + imageTop) + 4 * (left + imageLeft));
+
+	for (int32 y = imageTop; y < imageBottom; y++) {
+		const uint8* src = data;
+		uint32* dst = start;
+		for (int32 x = imageLeft; x < imageRight; x++) {
+			dst[0] = (src[2] << 16) | (src[1] << 8) | (src[0]);
+			dst++;
+			src += 3;
+		}
+
+		data += imageWidth * 3;
+		start = (uint32*)((addr_t)start + sInfo->bytes_per_row);
+	}
+}
+
+
+static void
+blit_cropped(const uint8* data, const uint8* indexedData,
+	uint16 imageLeft, uint16 imageTop, uint16 imageRight, uint16 imageBottom,
+	uint16 imageWidth, uint16 imageHeight, const uint8 *palette,
+	uint16 left, uint16 top)
+{
+	switch (sInfo->depth) {
+		case 15:
+			blit15_cropped(data, imageLeft, imageTop, imageRight, imageBottom,
+				imageWidth, imageHeight, palette, left, top);
+			return;
+		case 16:
+			blit16_cropped(data, imageLeft, imageTop, imageRight, imageBottom,
+				imageWidth, imageHeight, palette, left, top);
+			return;
+		case 24:
+			blit24_cropped(data, imageLeft, imageTop, imageRight, imageBottom,
+				imageWidth, imageHeight, palette, left, top);
+			return;
+		case 32:
+			blit32_cropped(data, imageLeft, imageTop, imageRight, imageBottom,
+				imageWidth, imageHeight, palette, left, top);
+			return;
+	}
+}
+
+
+//	#pragma mark - exported functions
+
+
+void
+boot_splash_init(void)
+{
+	TRACE("boot_splash_init: enter\n");
+
+	if (debug_screen_output_enabled())
+		return;
+
+	sInfo = (frame_buffer_boot_info *)get_boot_item(FRAME_BUFFER_BOOT_INFO);
+}
+
+
+void
+boot_splash_set_stage(int stage)
+{
+	TRACE("boot_splash_set_stage: stage=%d\n", stage);
+
+	if (sInfo == NULL || stage < 0 || stage >= BOOT_SPLASH_STAGE_MAX)
+		return;
+
+	// TODO: Use placement info from images.h
+	int x = sInfo->width / 2 - kSplashIconsWidth / 2;
+	int y = sInfo->height / 2 - kSplashLogoHeight / 2;
+	y = y + kSplashLogoHeight;
+
+	int stageLeftEdge = kSplashIconsWidth * stage / BOOT_SPLASH_STAGE_MAX;
+	int stageRightEdge = kSplashIconsWidth * (stage + 1)
+		/ BOOT_SPLASH_STAGE_MAX;
+
+	blit_cropped(kSplashIconsImage, NULL, stageLeftEdge, 0, stageRightEdge,
+		kSplashIconsHeight / 2, kSplashIconsWidth, kSplashIconsHeight, NULL,
+		x, y);
+}
+

Modified: haiku/trunk/src/system/kernel/debug/debug.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/debug.cpp	2008-03-20 11:06:41 UTC (rev 24488)
+++ haiku/trunk/src/system/kernel/debug/debug.cpp	2008-03-20 11:10:17 UTC (rev 24489)
@@ -899,6 +899,13 @@
 //	#pragma mark - private kernel API
 
 
+bool
+debug_screen_output_enabled(void)
+{
+	return sDebugScreenEnabled;
+}
+
+
 void
 debug_stop_screen_debug_output(void)
 {

Modified: haiku/trunk/src/system/kernel/main.c
===================================================================
--- haiku/trunk/src/system/kernel/main.c	2008-03-20 11:06:41 UTC (rev 24488)
+++ haiku/trunk/src/system/kernel/main.c	2008-03-20 11:10:17 UTC (rev 24489)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2002-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -13,6 +13,7 @@
 
 #include <arch/platform.h>
 #include <boot_item.h>
+#include <boot_splash.h>
 #include <cbuf.h>
 #include <commpage.h>
 #include <condition_variable.h>
@@ -40,7 +41,6 @@
 #include <vfs.h>
 #include <vm.h>
 #include <boot/kernel_args.h>
-#include <boot/splash.h>
 
 #include <string.h>
 
@@ -222,8 +222,7 @@
 	
 	TRACE("start of main2: initializing devices\n");
 	
-	TRACE("Init boot splash frame buffer\n");
-	boot_splash_fb_init(&sKernelArgs);
+	boot_splash_init();
 
 	TRACE("Init modules\n");
 	boot_splash_set_stage(BOOT_SPLASH_STAGE_1_INIT_MODULES);

Deleted: haiku/trunk/src/system/kernel/splash.cpp



From stippi at mail.berlios.de  Thu Mar 20 12:35:52 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 20 Mar 2008 12:35:52 +0100
Subject: [Haiku-commits] r24490 - in haiku/trunk/src/libs/icon: . style
Message-ID: <200803201135.m2KBZqrO000354@sheep.berlios.de>

Author: stippi
Date: 2008-03-20 12:35:51 +0100 (Thu, 20 Mar 2008)
New Revision: 24490
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24490&view=rev

Modified:
   haiku/trunk/src/libs/icon/IconRenderer.cpp
   haiku/trunk/src/libs/icon/IconRenderer.h
   haiku/trunk/src/libs/icon/style/Style.cpp
   haiku/trunk/src/libs/icon/style/Style.h
Log:
* Add Style::HasTransparency() which just tells if any of the colors that the
  style uses has an alpha value below 255.
* Add support for intermediate rendering passes to IconRenderer. Normally,
  the whole icon is rendered in a single pass, which means shapes cannot
  overlap. With the change, intermediate rendering passes are inserted when
  a shape is encountered that contains transparency. This is an easy way to
  allow for more feature rich icons, with easy support for glossy/reflective
  surface effects or other such effects that require support for transparent
  shapes on top of other shapes.


Modified: haiku/trunk/src/libs/icon/IconRenderer.cpp
===================================================================
--- haiku/trunk/src/libs/icon/IconRenderer.cpp	2008-03-20 11:10:17 UTC (rev 24489)
+++ haiku/trunk/src/libs/icon/IconRenderer.cpp	2008-03-20 11:35:51 UTC (rev 24490)
@@ -26,7 +26,7 @@
 
 using std::nothrow;
 
-class StyleHandler {
+class IconRenderer::StyleHandler {
 	struct StyleItem {
 		Style*			style;
 		Transformation	transformation;
@@ -96,7 +96,7 @@
 
 // color
 const agg::rgba8&
-StyleHandler::color(unsigned styleIndex)
+IconRenderer::StyleHandler::color(unsigned styleIndex)
 {
 	StyleItem* styleItem = (StyleItem*)fStyles.ItemAt(styleIndex);
 	if (!styleItem) {
@@ -115,8 +115,8 @@
 
 // generate_span
 void
-StyleHandler::generate_span(agg::rgba8* span, int x, int y,
-							unsigned len, unsigned styleIndex)
+IconRenderer::StyleHandler::generate_span(agg::rgba8* span, int x, int y,
+	unsigned len, unsigned styleIndex)
 {
 	StyleItem* styleItem = (StyleItem*)fStyles.ItemAt(styleIndex);
 	if (!styleItem || !styleItem->style->Gradient()) {
@@ -172,12 +172,9 @@
 // _GenerateGradient
 template<class GradientFunction>
 void
-StyleHandler::_GenerateGradient(agg::rgba8* span, int x, int y, unsigned len,
-								GradientFunction function,
-								int32 start, int32 end,
-								const agg::rgba8* gradientColors,
-								Transformation& gradientTransform)
-
+IconRenderer::StyleHandler::_GenerateGradient(agg::rgba8* span, int x, int y,
+	unsigned len, GradientFunction function, int32 start, int32 end,
+	const agg::rgba8* gradientColors, Transformation& gradientTransform)
 {
 	typedef agg::pod_auto_array<agg::rgba8, 256>	ColorArray;
 	typedef agg::span_interpolator_linear<>			Interpolator;
@@ -393,6 +390,12 @@
 			printf("IconRenderer::_Render() - out of memory\n");
 			break;
 		}
+
+		// if this is not the first shape, and the style contains
+		// transparency, commit a render pass of previous shapes
+		if (i > 0 && style->HasTransparency())
+			_CommitRenderPass(styleHandler);
+
 		fRasterizer.styles(styleIndex, -1);
 		styleIndex++;
 
@@ -409,12 +412,7 @@
 		}
 	}
 
-	agg::render_scanlines_compound(fRasterizer,
-								   fScanline,
-								   fBinaryScanline,
-								   fBaseRendererPre,
-								   fSpanAllocator,
-								   styleHandler);
+	_CommitRenderPass(styleHandler, false);
 
 	if (fGammaTable.gamma() != 1.0)
 		fPixelFormat.apply_gamma_inv(fGammaTable);
@@ -423,6 +421,19 @@
 //printf("rendering 64x64: %lld\n", system_time() - start);
 }
 
+// _CommitRenderPass
+void
+IconRenderer::_CommitRenderPass(StyleHandler& styleHandler, bool reset)
+{
+	agg::render_scanlines_compound(fRasterizer,
+								   fScanline,
+								   fBinaryScanline,
+								   fBaseRendererPre,
+								   fSpanAllocator,
+								   styleHandler);
+	if (reset)
+		fRasterizer.reset();
+}
 
 
 

Modified: haiku/trunk/src/libs/icon/IconRenderer.h
===================================================================
--- haiku/trunk/src/libs/icon/IconRenderer.h	2008-03-20 11:10:17 UTC (rev 24489)
+++ haiku/trunk/src/libs/icon/IconRenderer.h	2008-03-20 11:35:51 UTC (rev 24490)
@@ -72,7 +72,11 @@
 			void				Demultiply();
 
  private:
+		class StyleHandler;
+
 			void				_Render(const BRect& area);
+			void				_CommitRenderPass(StyleHandler& styleHandler,
+									bool reset = true);
 
 			BBitmap*			fBitmap;
 			const BBitmap*		fBackground;

Modified: haiku/trunk/src/libs/icon/style/Style.cpp
===================================================================
--- haiku/trunk/src/libs/icon/style/Style.cpp	2008-03-20 11:10:17 UTC (rev 24489)
+++ haiku/trunk/src/libs/icon/style/Style.cpp	2008-03-20 11:35:51 UTC (rev 24490)
@@ -162,6 +162,22 @@
 
 #endif // ICON_O_MATIC
 
+// HasTransparency
+bool
+Style::HasTransparency() const
+{
+	if (fGradient) {
+		int32 count = fGradient->CountColors();
+		for (int32 i = 0; i < count; i++) {
+			color_step* step = fGradient->ColorAtFast(i);
+			if (step->color.alpha < 255)
+				return true;
+		}
+		return false;
+	}
+	return fColor.alpha < 255;
+}
+
 // SetColor
 void
 Style::SetColor(const rgb_color& color)

Modified: haiku/trunk/src/libs/icon/style/Style.h
===================================================================
--- haiku/trunk/src/libs/icon/style/Style.h	2008-03-20 11:10:17 UTC (rev 24489)
+++ haiku/trunk/src/libs/icon/style/Style.h	2008-03-20 11:35:51 UTC (rev 24490)
@@ -55,6 +55,8 @@
 	inline	void				Notify() {}
 #endif // ICON_O_MATIC
 
+			bool				HasTransparency() const;
+
 			void				SetColor(const rgb_color& color);
 	inline	rgb_color			Color() const
 									{ return fColor; }



From stippi at mail.berlios.de  Thu Mar 20 13:59:46 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 20 Mar 2008 13:59:46 +0100
Subject: [Haiku-commits] r24491 - haiku/trunk/src/kits/media
Message-ID: <200803201259.m2KCxkHq020291@sheep.berlios.de>

Author: stippi
Date: 2008-03-20 13:59:45 +0100 (Thu, 20 Mar 2008)
New Revision: 24491
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24491&view=rev

Modified:
   haiku/trunk/src/kits/media/MediaTrack.cpp
   haiku/trunk/src/kits/media/PluginManager.cpp
Log:
Failing to find a suitable decoder for a stream is reported in three different
modules, I left the one from MediaExtractor::CreateDecoder, since it also
mentions the stream index.


Modified: haiku/trunk/src/kits/media/MediaTrack.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaTrack.cpp	2008-03-20 11:35:51 UTC (rev 24490)
+++ haiku/trunk/src/kits/media/MediaTrack.cpp	2008-03-20 12:59:45 UTC (rev 24491)
@@ -677,7 +677,7 @@
 	SetupWorkaround();
 	
 	if (fExtractor->CreateDecoder(fStream, &fDecoder, &fMCI) != B_OK) {
-		ERROR("BMediaTrack::BMediaTrack: Error: creating decoder failed\n");
+		TRACE("BMediaTrack::BMediaTrack: Error: creating decoder failed\n");
 		// we do not set fErr here, because ReadChunk should still work
 		fDecoder = 0;
 		return;

Modified: haiku/trunk/src/kits/media/PluginManager.cpp
===================================================================
--- haiku/trunk/src/kits/media/PluginManager.cpp	2008-03-20 11:35:51 UTC (rev 24490)
+++ haiku/trunk/src/kits/media/PluginManager.cpp	2008-03-20 12:59:45 UTC (rev 24491)
@@ -94,8 +94,9 @@
 	server_get_decoder_for_format_request request;
 	server_get_decoder_for_format_reply reply;
 	request.format = format;
-	if (B_OK != QueryServer(SERVER_GET_DECODER_FOR_FORMAT, &request, sizeof(request), &reply, sizeof(reply))) {
-		printf("PluginManager::CreateDecoder: can't get decoder for format\n");
+	if (B_OK != QueryServer(SERVER_GET_DECODER_FOR_FORMAT, &request,
+			sizeof(request), &reply, sizeof(reply))) {
+		TRACE("PluginManager::CreateDecoder: can't get decoder for format\n");
 		return B_ERROR;
 	}
 



From bonefish at mail.berlios.de  Thu Mar 20 14:33:35 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 20 Mar 2008 14:33:35 +0100
Subject: [Haiku-commits] r24492 - haiku/trunk/src/system/libroot/posix
Message-ID: <200803201333.m2KDXZnU022858@sheep.berlios.de>

Author: bonefish
Date: 2008-03-20 14:33:35 +0100 (Thu, 20 Mar 2008)
New Revision: 24492
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24492&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/dlfcn.c
Log:
Added TODO.


Modified: haiku/trunk/src/system/libroot/posix/dlfcn.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/dlfcn.c	2008-03-20 12:59:45 UTC (rev 24491)
+++ haiku/trunk/src/system/libroot/posix/dlfcn.c	2008-03-20 13:33:35 UTC (rev 24492)
@@ -21,6 +21,9 @@
 void *
 dlopen(char const *name, int mode)
 {
+// TODO: According to the standard multiple dlopen() invocations for the same
+// file will cause the object to be loaded once only. That is we should load
+// the object as a library, not an add-on.
 	status_t status;
 
 	if (name == NULL)



From bonefish at mail.berlios.de  Thu Mar 20 14:34:23 2008
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 20 Mar 2008 14:34:23 +0100
Subject: [Haiku-commits] r24493 - haiku/trunk/src/tools/fs_shell
Message-ID: <200803201334.m2KDYNSs022903@sheep.berlios.de>

Author: bonefish
Date: 2008-03-20 14:34:23 +0100 (Thu, 20 Mar 2008)
New Revision: 24493
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24493&view=rev

Modified:
   haiku/trunk/src/tools/fs_shell/fssh.cpp
Log:
"rm" was leaking the dir FD when failing to read from the dir.


Modified: haiku/trunk/src/tools/fs_shell/fssh.cpp
===================================================================
--- haiku/trunk/src/tools/fs_shell/fssh.cpp	2008-03-20 13:33:35 UTC (rev 24492)
+++ haiku/trunk/src/tools/fs_shell/fssh.cpp	2008-03-20 13:34:23 UTC (rev 24493)
@@ -887,7 +887,7 @@
 	if (numRead < 0) {
 		fprintf(stderr, "Error: Failed to read directory \"%s\": %s\n", name,
 			fssh_strerror(numRead));
-		return numRead;
+		error = numRead;
 	}
 
 	// close



From korli at mail.berlios.de  Thu Mar 20 23:12:28 2008
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 20 Mar 2008 23:12:28 +0100
Subject: [Haiku-commits] r24494 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200803202212.m2KMCSlS021567@sheep.berlios.de>

Author: korli
Date: 2008-03-20 23:12:28 +0100 (Thu, 20 Mar 2008)
New Revision: 24494
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24494&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
Log:
now fails if a write combining overlaps


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-20 13:34:23 UTC (rev 24493)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp	2008-03-20 22:12:28 UTC (rev 24494)
@@ -78,6 +78,24 @@
 }
 
 
+static bool
+is_memory_overlapping(uint64 base, uint64 length)
+{
+	for (uint32 index = 0; index < sMemoryTypeRegisterCount; index++) {
+		if (sMemoryTypeBitmap & (1UL << index)) {
+			uint64 b,l;
+			uint8 t;
+			x86_get_mtrr(index, &b, &l, &t);
+			if ((base > b && base < (b + l))
+				|| ((base + length) > b 
+					&& (base + length) < (b + l)))
+				return true;
+		}
+	}
+	return false;
+}
+
+
 static uint64
 nearest_power(uint64 value)
 {
@@ -138,6 +156,13 @@
 	if (sMemoryTypeRegisterCount == 0)
 		return B_NOT_SUPPORTED;
 
+	// check if it overlaps
+	if (type == IA32_MTR_WRITE_COMBINING
+		&& is_memory_overlapping(base, length)) {
+		dprintf("allocate MTRR failed, it overlaps an existing MTRR slot\n");
+		return B_BAD_VALUE;
+	}
+
 	// length must be a power of 2; just round it up to the next value
 	length = nearest_power(length); 	
 



From stippi at mail.berlios.de  Fri Mar 21 00:36:16 2008
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 21 Mar 2008 00:36:16 +0100
Subject: [Haiku-commits] r24495 - in haiku/trunk: headers/private/media
	src/add-ons/media/plugins/avi_reader
	src/add-ons/media/plugins/avi_reader/libOpenDML src/kits/media
Message-ID: <200803202336.m2KNaGH4007546@sheep.berlios.de>

Author: stippi
Date: 2008-03-21 00:36:14 +0100 (Fri, 21 Mar 2008)
New Revision: 24495
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24495&view=rev

Modified:
   haiku/trunk/headers/private/media/MediaExtractor.h
   haiku/trunk/headers/private/media/ReaderPlugin.h
   haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.cpp
   haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.h
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.cpp
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.h
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/Index.h
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.cpp
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.h
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLIndex.cpp
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLIndex.h
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/StandardIndex.cpp
   haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/StandardIndex.h
   haiku/trunk/src/kits/media/MediaExtractor.cpp
   haiku/trunk/src/kits/media/MediaTrack.cpp
   haiku/trunk/src/kits/media/ReaderPlugin.cpp
Log:
* Added FindKeyFrame() method to MediaExtractor, it is similar to Seek(),
  but operates "read-only".
* Added FindKeyFrame() method to ReaderPlugin, see above.
* Reformated ReaderPlugin header. Added const qualifier to Source() method.
* Small cleanups in BMediaTrack::SeekToTime() and SeekToFrame(). Added TODOs
  with regards to "seeking" in decoders, wich should IMHO be revised. (Codecs
  cannot seek in the stream, they only get fed chunk data. The only thing they
  can do is reset themselves in preparation for a discontinuity of the chunk
  data...)
* Implemented BMediaTrack::FindKeyframeByXX() methods via the new
  MediaExtractor::FindKeyFrame() method.
* Implemented Seek() and FindKeyFrame() methods in the Reader base class,
  returning B_NOT_SUPPORTED. I think this makes sense and also I don't have
  to adapt all existing Reader plugins for the new FindKeyFrame() call. :-)
* Implemeneted FindKeyFrame() in the avi_reader. The OpenDMLFile class
  gets Seek() extended for a "read-only" mode. Currently the implementation
  is broken (as before) with regards to keyframes. These were ignored before
  and I have not changed them to actually support the seek flags with regards
  to keyframes. That's the interesting TODO...
* Some reformatting here and there in avi_reader code, sorry for the mixup.
  The only actual change is the support for the read-only flag to Seek().


Modified: haiku/trunk/headers/private/media/MediaExtractor.h
===================================================================
--- haiku/trunk/headers/private/media/MediaExtractor.h	2008-03-20 22:12:28 UTC (rev 24494)
+++ haiku/trunk/headers/private/media/MediaExtractor.h	2008-03-20 23:36:14 UTC (rev 24495)
@@ -38,6 +38,8 @@
 
 	status_t		Seek(int32 stream, uint32 seekTo,
 						 int64 *frame, bigtime_t *time);
+	status_t		FindKeyFrame(int32 stream, uint32 seekTo,
+						 int64 *frame, bigtime_t *time) const;
 	
 	status_t		GetNextChunk(int32 stream,
 								 const void **chunkBuffer, size_t *chunkSize,

Modified: haiku/trunk/headers/private/media/ReaderPlugin.h
===================================================================
--- haiku/trunk/headers/private/media/ReaderPlugin.h	2008-03-20 22:12:28 UTC (rev 24494)
+++ haiku/trunk/headers/private/media/ReaderPlugin.h	2008-03-20 23:36:14 UTC (rev 24495)
@@ -11,50 +11,52 @@
 	B_MEDIA_SEEK_TO_FRAME	= 0x20000
 };
 
-class Reader
-{
+class Reader {
 public:
-						Reader();
-	virtual				~Reader();
+								Reader();
+	virtual						~Reader();
 	
-	virtual const char *Copyright() = 0;
+	virtual	const char*			Copyright() = 0;
 	
-	virtual status_t	Sniff(int32 *streamCount) = 0;
+	virtual	status_t			Sniff(int32* streamCount) = 0;
 
-	virtual void		GetFileFormatInfo(media_file_format *mff) = 0;
+	virtual	void				GetFileFormatInfo(media_file_format* mff) = 0;
 
-	virtual status_t	AllocateCookie(int32 streamNumber, void **cookie) = 0;
-	virtual	status_t	FreeCookie(void *cookie) = 0;
+	virtual	status_t			AllocateCookie(int32 streamNumber,
+									void** cookie) = 0;
+	virtual	status_t			FreeCookie(void* cookie) = 0;
 	
-	virtual status_t	GetStreamInfo(void *cookie, int64 *frameCount, bigtime_t *duration,
-									  media_format *format, const void **infoBuffer, size_t *infoSize) = 0;
+	virtual	status_t			GetStreamInfo(void* cookie, int64* frameCount,
+									bigtime_t *duration, media_format* format,
+									const void** infoBuffer,
+									size_t* infoSize) = 0;
 
-	virtual status_t	Seek(void *cookie,
-							 uint32 seekTo,
-							 int64 *frame, bigtime_t *time) = 0;
+	virtual	status_t			Seek(void* cookie, uint32 flags, int64* frame,
+									bigtime_t* time);
+	virtual	status_t			FindKeyFrame(void* cookie, uint32 flags,
+									int64* frame, bigtime_t* time);
 
-	virtual status_t	GetNextChunk(void *cookie,
-									 const void **chunkBuffer, size_t *chunkSize,
-									 media_header *mediaHeader) = 0;
+	virtual	status_t			GetNextChunk(void* cookie,
+									const void** chunkBuffer, size_t* chunkSize,
+									media_header* mediaHeader) = 0;
 	
-	BDataIO *			Source();
+			BDataIO*			Source() const;
 	
 private:
 public: // XXX for test programs only
-	void		Setup(BDataIO *source);
+			void				Setup(BDataIO* source);
 
-	BDataIO * fSource;
+			BDataIO*			fSource;
 };
 
 
-class ReaderPlugin : public virtual MediaPlugin
-{
+class ReaderPlugin : public virtual MediaPlugin {
 public:
-	virtual Reader *NewReader() = 0;
+	virtual	Reader*				NewReader() = 0;
 };
 
 } } // namespace BPrivate::media
 
 using namespace BPrivate::media;
 
-#endif
+#endif // _READER_PLUGIN_H

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.cpp	2008-03-20 22:12:28 UTC (rev 24494)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.cpp	2008-03-20 23:36:14 UTC (rev 24495)
@@ -307,7 +307,7 @@
 
 status_t
 aviReader::GetStreamInfo(void *_cookie, int64 *frameCount, bigtime_t *duration,
-						 media_format *format, const void **infoBuffer, size_t *infoSize)
+	media_format *format, const void **infoBuffer, size_t *infoSize)
 {
 	avi_cookie *cookie = (avi_cookie *)_cookie;
 
@@ -321,8 +321,7 @@
 
 
 status_t
-aviReader::Seek(void *_cookie, uint32 seekTo,
-				int64 *frame, bigtime_t *time)
+aviReader::Seek(void *_cookie, uint32 seekTo, int64 *frame, bigtime_t *time)
 {
 	avi_cookie *cookie = (avi_cookie *)_cookie;
 
@@ -330,32 +329,61 @@
 		cookie->stream,
 		(seekTo & B_MEDIA_SEEK_TO_TIME) ? " B_MEDIA_SEEK_TO_TIME" : "",
 		(seekTo & B_MEDIA_SEEK_TO_FRAME) ? " B_MEDIA_SEEK_TO_FRAME" : "",
-		(seekTo & B_MEDIA_SEEK_CLOSEST_FORWARD) ? " B_MEDIA_SEEK_CLOSEST_FORWARD" : "",
-		(seekTo & B_MEDIA_SEEK_CLOSEST_BACKWARD) ? " B_MEDIA_SEEK_CLOSEST_BACKWARD" : "",
+		(seekTo & B_MEDIA_SEEK_CLOSEST_FORWARD) ?
+			" B_MEDIA_SEEK_CLOSEST_FORWARD" : "",
+		(seekTo & B_MEDIA_SEEK_CLOSEST_BACKWARD) ?
+			" B_MEDIA_SEEK_CLOSEST_BACKWARD" : "",
 		*time, *frame);
 
-	status_t rv = fFile->Seek(cookie->stream, seekTo, frame, time);
+	status_t rv = fFile->Seek(cookie->stream, seekTo, frame, time, false);
 	if (rv == B_OK) {
 		cookie->frame_pos = *frame;
-		TRACE("aviReader::Seek: stream %d, success, setting frame_pos to %lld\n", cookie->stream, cookie->frame_pos);
+		TRACE("aviReader::Seek: stream %d, success, setting frame_pos "
+			"to %lld\n", cookie->stream, cookie->frame_pos);
 	}
 	return rv;
 }
 
 
 status_t
-aviReader::GetNextChunk(void *_cookie,
-						const void **chunkBuffer, size_t *chunkSize,
-						media_header *mediaHeader)
+aviReader::FindKeyFrame(void *_cookie, uint32 flags, int64 *frame,
+	bigtime_t *time)
 {
 	avi_cookie *cookie = (avi_cookie *)_cookie;
 
+	TRACE("aviReader::FindKeyFrame: stream %d, flags%s%s%s%s, time %Ld, "
+		"frame %Ld\n",
+		cookie->stream,
+		(flags & B_MEDIA_SEEK_TO_TIME) ? " B_MEDIA_SEEK_TO_TIME" : "",
+		(flags & B_MEDIA_SEEK_TO_FRAME) ? " B_MEDIA_SEEK_TO_FRAME" : "",
+		(flags & B_MEDIA_SEEK_CLOSEST_FORWARD) ?
+			" B_MEDIA_SEEK_CLOSEST_FORWARD" : "",
+		(flags & B_MEDIA_SEEK_CLOSEST_BACKWARD) ?
+			" B_MEDIA_SEEK_CLOSEST_BACKWARD" : "",
+		*time, *frame);
+
+	status_t rv = fFile->Seek(cookie->stream, flags, frame, time, true);
+	if (rv == B_OK) {
+		TRACE("aviReader::FindKeyFrame: stream %d, success\n",
+			cookie->stream);
+	}
+	return rv;
+}
+
+
+status_t
+aviReader::GetNextChunk(void *_cookie, const void **chunkBuffer,
+	size_t *chunkSize, media_header *mediaHeader)
+{
+	avi_cookie *cookie = (avi_cookie *)_cookie;
+
 	int64 start; uint32 size; bool keyframe;
-	if (fFile->GetNextChunkInfo(cookie->stream, &start, &size, &keyframe) < B_OK)
+	if (fFile->GetNextChunkInfo(cookie->stream, &start, &size,
+			&keyframe) < B_OK)
 		return B_LAST_BUFFER_ERROR;
 
 	if (size > 0x200000) { // 2 MB
-		ERROR("stream %u: frame too big: %u byte\n", cookie->stream, size);
+		ERROR("stream %u: frame too big: %lu bytes\n", cookie->stream, size);
 		return B_NO_MEMORY;
 	}
 
@@ -369,17 +397,20 @@
 		}
 	}
 
-	mediaHeader->start_time = (cookie->frame_pos * 1000000 * cookie->frames_per_sec_scale) / cookie->frames_per_sec_rate;
+	mediaHeader->start_time = (cookie->frame_pos * 1000000
+		* cookie->frames_per_sec_scale) / cookie->frames_per_sec_rate;
 	
 	if (cookie->is_audio) {
 		mediaHeader->type = B_MEDIA_ENCODED_AUDIO;
-		mediaHeader->u.encoded_audio.buffer_flags = keyframe ? B_MEDIA_KEY_FRAME : 0;
+		mediaHeader->u.encoded_audio.buffer_flags = keyframe ?
+			B_MEDIA_KEY_FRAME : 0;
 		cookie->frame_pos += size;
 	} else if (cookie->is_video) {
 		mediaHeader->type = B_MEDIA_ENCODED_VIDEO;
-		mediaHeader->u.encoded_video.field_flags = keyframe ? B_MEDIA_KEY_FRAME : 0;
+		mediaHeader->u.encoded_video.field_flags = keyframe ?
+			B_MEDIA_KEY_FRAME : 0;
 		mediaHeader->u.encoded_video.first_active_line = 0;
-		mediaHeader->u.encoded_video.line_count = cookie->line_count;	
+		mediaHeader->u.encoded_video.line_count = cookie->line_count;
 		cookie->frame_pos += 1;
 	} else {
 		return B_BAD_VALUE;
@@ -387,11 +418,13 @@
 	
 //	TRACE("stream %d (%s): start_time %.6f, pos %.3f %%\n", 
 //		cookie->stream, cookie->is_audio ? "A" : cookie->is_video ? "V" : "?", 
-//		mediaHeader->start_time / 1000000.0, cookie->frame_pos * 100.0 / cookie->frame_count);
+//		mediaHeader->start_time / 1000000.0, cookie->frame_pos * 100.0
+//		/ cookie->frame_count);
 
 	*chunkBuffer = cookie->buffer;
 	*chunkSize = size;
-	return (int)size == fFile->Source()->ReadAt(start, cookie->buffer, size) ? B_OK : B_LAST_BUFFER_ERROR;
+	return (int)size == fFile->Source()->ReadAt(start, cookie->buffer, size) ?
+		B_OK : B_LAST_BUFFER_ERROR;
 }
 
 

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.h	2008-03-20 22:12:28 UTC (rev 24494)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/avi_reader.h	2008-03-20 23:36:14 UTC (rev 24495)
@@ -28,42 +28,44 @@
 #include "ReaderPlugin.h"
 #include "OpenDMLFile.h"
 
-class aviReader : public Reader
-{
+class aviReader : public Reader {
 public:
-				aviReader();
-				~aviReader();
+								aviReader();
+								~aviReader();
 	
-	const char *Copyright();
+	virtual	const char*			Copyright();
 	
-	status_t	Sniff(int32 *streamCount);
+	virtual	status_t			Sniff(int32* streamCount);
 
-	void		GetFileFormatInfo(media_file_format *mff);
+	virtual	void				GetFileFormatInfo(media_file_format* mff);
 
-	status_t	AllocateCookie(int32 streamNumber, void **cookie);
-	status_t	FreeCookie(void *cookie);
+	virtual	status_t			AllocateCookie(int32 streamNumber,
+									void** cookie);
+	virtual	status_t			FreeCookie(void* cookie);
 	
-	status_t	GetStreamInfo(void *cookie, int64 *frameCount, bigtime_t *duration,
-							  media_format *format, const void **infoBuffer, size_t *infoSize);
+	virtual	status_t			GetStreamInfo(void* cookie, int64* frameCount,
+									bigtime_t *duration, media_format* format,
+									const void** infoBuffer,
+									size_t* infoSize);
 
-	status_t	Seek(void *cookie,
-					 uint32 seekTo,
-					 int64 *frame, bigtime_t *time);
+	virtual	status_t			Seek(void* cookie, uint32 flags, int64* frame,
+									bigtime_t* time);
+	virtual	status_t			FindKeyFrame(void* cookie, uint32 flags,
+									int64* frame, bigtime_t* time);
 
-	status_t	GetNextChunk(void *cookie,
-							 const void **chunkBuffer, size_t *chunkSize,
-							 media_header *mediaHeader);
+	virtual	status_t			GetNextChunk(void* cookie,
+									const void** chunkBuffer, size_t* chunkSize,
+									media_header* mediaHeader);
 private:
-	OpenDMLFile	*fFile;
+			OpenDMLFile*		fFile;
 };
 
 
-class aviReaderPlugin : public ReaderPlugin
-{
+class aviReaderPlugin : public ReaderPlugin {
 public:
-	Reader *NewReader();
+			Reader*				NewReader();
 };
 
 MediaPlugin *instantiate_plugin();
 
-#endif
+#endif // _AVI_READER_H

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.cpp	2008-03-20 22:12:28 UTC (rev 24494)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.cpp	2008-03-20 23:36:14 UTC (rev 24495)
@@ -46,14 +46,17 @@
 
 
 status_t
-FallbackIndex::GetNextChunkInfo(int stream_index, int64 *start, uint32 *size, bool *keyframe)
+FallbackIndex::GetNextChunkInfo(int stream_index, int64 *start, uint32 *size,
+	bool *keyframe)
 {
 	return B_ERROR;
 }
 
 
 status_t
-FallbackIndex::Seek(int stream_index, uint32 seekTo, int64 *frame, bigtime_t *time)
+FallbackIndex::Seek(int stream_index, uint32 seekTo, int64 *frame,
+	bigtime_t *time, bool readOnly)
 {
 	return B_ERROR;
 }
+

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.h	2008-03-20 22:12:28 UTC (rev 24494)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/FallbackIndex.h	2008-03-20 23:36:14 UTC (rev 24495)
@@ -39,7 +39,7 @@
 	status_t		GetNextChunkInfo(int stream_index, int64 *start,
 						uint32 *size, bool *keyframe);
 	status_t		Seek(int stream_index, uint32 seekTo, int64 *frame,
-						bigtime_t *time);
+						bigtime_t *time, bool readOnly);
 };
 
 #endif	// _FALLBACK_INDEX_H

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/Index.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/Index.h	2008-03-20 22:12:28 UTC (rev 24494)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/Index.h	2008-03-20 23:36:14 UTC (rev 24495)
@@ -42,7 +42,7 @@
 	virtual status_t	GetNextChunkInfo(int stream_index, int64 *start,
 							uint32 *size, bool *keyframe) = 0;
 	virtual status_t	Seek(int stream_index, uint32 seekTo, int64 *frame,
-							bigtime_t *time) = 0;
+							bigtime_t *time, bool readOnly) = 0;
 
 protected:
 	BPositionIO *		fSource;

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.cpp	2008-03-20 22:12:28 UTC (rev 24494)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.cpp	2008-03-20 23:36:14 UTC (rev 24495)
@@ -385,15 +385,17 @@
 
 
 status_t
-OpenDMLFile::GetNextChunkInfo(int stream_index, int64 *start, uint32 *size, bool *keyframe)
+OpenDMLFile::GetNextChunkInfo(int stream_index, int64 *start, uint32 *size,
+	bool *keyframe)
 {
 	return fIndex->GetNextChunkInfo(stream_index, start, size, keyframe);
 }
 
 status_t
-OpenDMLFile::Seek(int stream_index, uint32 seekTo, int64 *frame, bigtime_t *time)
+OpenDMLFile::Seek(int stream_index, uint32 seekTo, int64 *frame,
+	bigtime_t *time, bool readOnly)
 {
-	return fIndex->Seek(stream_index, seekTo, frame, time);
+	return fIndex->Seek(stream_index, seekTo, frame, time, readOnly);
 }
 
 int

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.h	2008-03-20 22:12:28 UTC (rev 24494)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/libOpenDML/OpenDMLFile.h	2008-03-20 23:36:14 UTC (rev 24495)
@@ -57,8 +57,10 @@
 	const bitmap_info_header *	VideoFormat(int stream_index);
 	const avi_stream_header *	StreamFormat(int stream_index);
 	
-	status_t			GetNextChunkInfo(int stream_index, int64 *start, uint32 *size, bool *keyframe);
-	status_t			Seek(int stream_index, uint32 seekTo, int64 *frame, bigtime_t *time);
+	status_t			GetNextChunkInfo(int stream_index, int64 *start,
+							uint32 *size, bool *keyframe);
+	status_t			Seek(int stream_index, uint32 seekTo, int64 *frame,
+							bigtime_t *time, bool readOnly);
 	
 	BPositionI