From umccullough at gmail.com  Sat Aug  1 00:07:28 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Fri, 31 Jul 2009 15:07:28 -0700
Subject: [Haiku-commits] r32036 - haiku/trunk/src/preferences/screen
In-Reply-To: <200907312129.n6VLTfrc010768@sheep.berlios.de>
References: <200907312129.n6VLTfrc010768@sheep.berlios.de>
Message-ID: <1e80d8750907311507g1dcac336sb400192726adcf59@mail.gmail.com>

On Fri, Jul 31, 2009 at 2:29 PM, <axeld at mail.berlios.de> wrote:
> Author: axeld
> Date: 2009-07-31 23:29:40 +0200 (Fri, 31 Jul 2009)
> New Revision: 32036
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32036&view=rev
>
> Modified:
> ? haiku/trunk/src/preferences/screen/ScreenMode.cpp
> Log:
> * Added some more vendor names, taken from the syslog data in our bug
> ?tracker :-)


You missed this one I think: http://dev.haiku-os.org/ticket/1732

HWP = "Hewlett Packard"

and this perhaps: http://dev.haiku-os.org/ticket/1667 which probably should be:

MED = "Medion"

(this one is actually a guess, since that's the only LCD display
vendor I could find that matched: http://en.wikipedia.org/wiki/Medion
)

- Urias


From stippi at mail.berlios.de  Sat Aug  1 00:12:05 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 1 Aug 2009 00:12:05 +0200
Subject: [Haiku-commits] r32037 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg
Message-ID: <200907312212.n6VMC54l018247@sheep.berlios.de>

Author: stippi
Date: 2009-08-01 00:12:03 +0200 (Sat, 01 Aug 2009)
New Revision: 32037
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32037&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h
Log:
This should fix the GCC 4 build. The avformat code expects a non-const buffer
for the write() hook.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp	2009-07-31 21:29:40 UTC (rev 32036)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp	2009-07-31 22:12:03 UTC (rev 32037)
@@ -331,7 +331,7 @@
 
 
 /*static*/ int
-AVFormatWriter::_Write(void* cookie, const uint8* buffer, int bufferSize)
+AVFormatWriter::_Write(void* cookie, uint8* buffer, int bufferSize)
 {
 	TRACE_IO("AVFormatWriter::_Write(%p, %p, %d)\n",
 		cookie, buffer, bufferSize);

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h	2009-07-31 21:29:40 UTC (rev 32036)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h	2009-07-31 22:12:03 UTC (rev 32037)
@@ -43,7 +43,7 @@
 									media_encode_info* encodeInfo);
 
 private:
-	static	int					_Write(void* cookie, const uint8* buffer,
+	static	int					_Write(void* cookie, uint8* buffer,
 									int bufferSize);
 
 	static	off_t				_Seek(void* cookie, off_t offset, int whence);



From anevilyak at mail.berlios.de  Sat Aug  1 00:16:58 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 1 Aug 2009 00:16:58 +0200
Subject: [Haiku-commits] r32038 - haiku/trunk/headers/posix
Message-ID: <200907312216.n6VMGwi2018993@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-01 00:16:58 +0200 (Sat, 01 Aug 2009)
New Revision: 32038
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32038&view=rev

Modified:
   haiku/trunk/headers/posix/wchar.h
Log:
Add missing definition for wcsstr. This was preventing clucene from building with wide chars enabled.



Modified: haiku/trunk/headers/posix/wchar.h
===================================================================
--- haiku/trunk/headers/posix/wchar.h	2009-07-31 22:12:03 UTC (rev 32037)
+++ haiku/trunk/headers/posix/wchar.h	2009-07-31 22:16:58 UTC (rev 32038)
@@ -105,6 +105,7 @@
 extern size_t   wcsrtombs(char *dst, const wchar_t **src, size_t len,
 					mbstate_t *ps);
 extern size_t	wcsspn(const wchar_t *, const wchar_t *);
+extern wchar_t	*wcsstr(const wchar_t *, const wchar_t *);
 extern double	wcstod(const wchar_t *, wchar_t **);
 extern float	wcstof(const wchar_t *, wchar_t **);
 extern wchar_t	*wcstok(wchar_t *, const wchar_t *, wchar_t **);



From mmlr at mail.berlios.de  Sat Aug  1 00:19:40 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Sat, 1 Aug 2009 00:19:40 +0200
Subject: [Haiku-commits] r32039 - in haiku/trunk: headers/os/app
	headers/private/app src/kits/app src/kits/interface
	src/servers/registrar
Message-ID: <200907312219.n6VMJeRv019233@sheep.berlios.de>

Author: mmlr
Date: 2009-08-01 00:19:36 +0200 (Sat, 01 Aug 2009)
New Revision: 32039
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32039&view=rev

Modified:
   haiku/trunk/headers/os/app/Message.h
   haiku/trunk/headers/private/app/MessagePrivate.h
   haiku/trunk/src/kits/app/Message.cpp
   haiku/trunk/src/kits/app/MessageAdapter.cpp
   haiku/trunk/src/kits/app/MessageUtils.cpp
   haiku/trunk/src/kits/interface/View.cpp
   haiku/trunk/src/servers/registrar/MessageDeliverer.cpp
Log:
* Fully switch to the Haiku message format so that it is also used for on-disk
  storage.
* Remove reduntant information from the header (field_count vs. fields_size).
* Remove checksums previously used to validate the message passing by area
  mechanism.
* Move variables that are purely used by the instance out of the header and into
  the BMessage object.
* Use more sensible types for the different message fields.
* Reduce some field sizes to realistic values.
* Make size_t values into uint32 values so the message format will not change
  when later moving to 64 bits.
* Pack the structures used for flat message storage so it doesn't change
  because of padding.
* Fix message passing by area. It never worked because the created area was
  never actually filled with any data!
* Some more allocation checks with graceful fallbacks (should be all now).
* Some more checks for negative index values (should also be all now).
* Make printing more inline with how the rest of the class works and make some
  of the output more consistent.
* Also add the new unsigned types to PrintToStream() output.
* Fix printing of unknown types and invalid BMessages, it would always have
  printed only the first entry respectively the same error.
* Added some clarifying comments.
* Cleanup.


Modified: haiku/trunk/headers/os/app/Message.h
===================================================================
--- haiku/trunk/headers/os/app/Message.h	2009-07-31 22:16:58 UTC (rev 32038)
+++ haiku/trunk/headers/os/app/Message.h	2009-07-31 22:19:36 UTC (rev 32039)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007, Haiku Inc. All Rights Reserved.
+ * Copyright 2005-2009, Haiku Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -291,11 +291,13 @@
 
 		status_t		_FlattenToArea(message_header **_header) const;
 		status_t		_CopyForWrite();
-		status_t		_Reference(message_header *header);
+		status_t		_Reference();
 		status_t		_Dereference();
 
-		status_t		_ResizeData(int32 offset, int32 change);
+		status_t		_ValidateMessage();
 
+		status_t		_ResizeData(uint32 offset, int32 change);
+
 		uint32			_HashName(const char* name) const;
 		status_t		_FindField(const char* name, type_code type,
 							field_header** _result) const;
@@ -303,9 +305,6 @@
 							bool isFixedSize, field_header** _result);
 		status_t		_RemoveField(field_header* field);
 
-		ssize_t			_NativeFlattenedSize() const;
-		status_t		_NativeFlatten(char *buffer, ssize_t size) const;
-		status_t		_NativeFlatten(BDataIO *stream, ssize_t *size = NULL) const;
 		void			_PrintToStream(const char* indent) const;
 
 	private:
@@ -313,12 +312,15 @@
 		field_header*	fFields;
 		uint8*			fData;
 
+		uint32			fFieldsAvailable;
+		size_t			fDataAvailable;
+
 		mutable	BMessage* fOriginal;
 
 		BMessage*		fQueueLink;
 			// fQueueLink is used by BMessageQueue to build a linked list
 
-		uint32			fReserved[11];
+		uint32			fReserved[9];
 
 						// deprecated
 						BMessage(BMessage *message);

Modified: haiku/trunk/headers/private/app/MessagePrivate.h
===================================================================
--- haiku/trunk/headers/private/app/MessagePrivate.h	2009-07-31 22:16:58 UTC (rev 32038)
+++ haiku/trunk/headers/private/app/MessagePrivate.h	2009-07-31 22:19:36 UTC (rev 32039)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007, Haiku Inc. All rights reserved.
+ * Copyright 2005-2009, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -14,10 +14,9 @@
 #include <TokenSpace.h>
 
 
-#define MESSAGE_BODY_HASH_TABLE_SIZE	10
+#define MESSAGE_BODY_HASH_TABLE_SIZE	5
 #define MAX_DATA_PREALLOCATION			B_PAGE_SIZE * 10
 #define MAX_FIELD_PREALLOCATION			50
-#define MAX_ITEM_PREALLOCATION			B_PAGE_SIZE
 
 
 static const int32 kPortMessageCode = 'pjpp';
@@ -30,8 +29,8 @@
 	MESSAGE_FLAG_IS_REPLY = 0x0008,
 	MESSAGE_FLAG_WAS_DELIVERED = 0x0010,
 	MESSAGE_FLAG_HAS_SPECIFIERS = 0x0020,
-	MESSAGE_FLAG_WAS_DROPPED = 0x0080,
-	MESSAGE_FLAG_PASS_BY_AREA = 0x0100
+	MESSAGE_FLAG_WAS_DROPPED = 0x0040,
+	MESSAGE_FLAG_PASS_BY_AREA = 0x0080
 };
 
 
@@ -42,15 +41,14 @@
 
 
 struct BMessage::field_header {
-	uint32		flags;
+	uint16		flags;
+	uint16		name_length;
 	type_code	type;
-	int32		name_length;
-	int32		count;
-	ssize_t		data_size;
-	ssize_t		allocated;
-	int32		offset;
+	uint32		count;
+	uint32		data_size;
+	uint32		offset;
 	int32		next_field;
-};
+} _PACKED;
 
 
 struct BMessage::message_header {
@@ -58,14 +56,6 @@
 	uint32		what;
 	uint32		flags;
 
-	ssize_t		fields_size;
-	ssize_t		data_size;
-	ssize_t		fields_available;
-	ssize_t		data_available;
-
-	uint32		fields_checksum;
-	uint32		data_checksum;
-
 	int32		target;
 	int32		current_specifier;
 	area_id		message_area;
@@ -76,8 +66,9 @@
 	team_id		reply_team;
 
 	// body info
-	int32		field_count;
-	int32		hash_table_size;
+	uint32		data_size;
+	uint32		field_count;
+	uint32		hash_table_size;
 	int32		hash_table[MESSAGE_BODY_HASH_TABLE_SIZE];
 
 	/*	The hash table does contain indexes into the field list and
@@ -86,18 +77,20 @@
 		The hash table must be reevaluated when we remove a field
 		though.
 	*/
-};
+} _PACKED;
 
 
 class BMessage::Private {
 	public:
 		Private(BMessage *msg)
-			: fMessage(msg)
+			:
+			fMessage(msg)
 		{
 		}
 
 		Private(BMessage &msg)
-			: fMessage(&msg)
+			:
+			fMessage(&msg)
 		{
 		}
 
@@ -175,25 +168,7 @@
 			return fMessage->fData;
 		}
 
-		ssize_t
-		NativeFlattenedSize() const
-		{
-			return fMessage->_NativeFlattenedSize();
-		}
-
 		status_t
-		NativeFlatten(char *buffer, ssize_t size) const
-		{
-			return fMessage->_NativeFlatten(buffer, size);
-		}
-
-		status_t
-		NativeFlatten(BDataIO *stream, ssize_t *size) const
-		{
-			return fMessage->_NativeFlatten(stream, size);
-		}
-
-		status_t
 		FlattenToArea(message_header **header) const
 		{
 			return fMessage->_FlattenToArea(header);

Modified: haiku/trunk/src/kits/app/Message.cpp
===================================================================
--- haiku/trunk/src/kits/app/Message.cpp	2009-07-31 22:16:58 UTC (rev 32038)
+++ haiku/trunk/src/kits/app/Message.cpp	2009-07-31 22:19:36 UTC (rev 32039)
@@ -36,9 +36,21 @@
 #include "tracing_config.h"
 	// kernel tracing configuration
 
-#define DEBUG_FUNCTION_ENTER	//debug_printf("thread: 0x%x; this: 0x%08x; header: 0x%08x; fields: 0x%08x; data: 0x%08x; line: %04ld; func: %s\n", find_thread(NULL), this, fHeader, fFields, fData, __LINE__, __PRETTY_FUNCTION__);
-#define DEBUG_FUNCTION_ENTER2	//debug_printf("thread: 0x%x;                                                                             line: %04ld: func: %s\n", find_thread(NULL), __LINE__, __PRETTY_FUNCTION__);
+//#define VERBOSE_DEBUG_OUTPUT
+#ifdef VERBOSE_DEBUG_OUTPUT
+#define DEBUG_FUNCTION_ENTER	\
+	debug_printf("msg thread: %ld; this: %p; header: %p; fields: %p;" \
+		" data: %p; what: 0x%08lx '%.4s'; line: %d; func: %s\n", \
+		find_thread(NULL), this, fHeader, fFields, fData, what, (char *)&what, \
+		__LINE__, __PRETTY_FUNCTION__);
 
+#define DEBUG_FUNCTION_ENTER2	\
+	debug_printf("msg thread: %ld; line: %d: func: %s\n", find_thread(NULL), \
+		__LINE__, __PRETTY_FUNCTION__);
+#else
+#define DEBUG_FUNCTION_ENTER	/* nothing */
+#define DEBUG_FUNCTION_ENTER2	/* nothing */
+#endif
 
 #if BMESSAGE_TRACING
 #	define KTRACE(format...)	ktrace_printf(format)
@@ -67,21 +79,21 @@
 long BMessage::sReplyPortInUse[sNumReplyPorts];
 
 
-template<typename Type> static uint8 *
-print_to_stream_type(uint8* pointer)
+template<typename Type>
+static void
+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)
+template<typename Type>
+static void
+print_type(const char *format, uint8 *pointer)
 {
 	Type *item = (Type *)pointer;
 	printf(format, *item, *item);
-	return (uint8 *)(item+1);
 }
 
 
@@ -95,7 +107,7 @@
 		size = port_buffer_size_etc(replyPort, B_RELATIVE_TIMEOUT, timeout);
 	} while (size == B_INTERRUPTED);
 
-	if (size < B_OK)
+	if (size < 0)
 		return size;
 
 	status_t result;
@@ -107,9 +119,9 @@
 		result = read_port(replyPort, _code, buffer, size);
 	} while (result == B_INTERRUPTED);
 
-	if (result < B_OK || *_code != kPortMessageCode) {
+	if (result < 0 || *_code != kPortMessageCode) {
 		free(buffer);
-		return result < B_OK ? result : B_ERROR;
+		return result < 0 ? result : B_ERROR;
 	}
 
 	result = reply->Unflatten(buffer);
@@ -170,6 +182,9 @@
 	_Clear();
 
 	fHeader = (message_header *)malloc(sizeof(message_header));
+	if (fHeader == NULL)
+		return *this;
+
 	memcpy(fHeader, other.fHeader, sizeof(message_header));
 
 	// Clear some header flags inherited from the original message that don't
@@ -179,20 +194,30 @@
 		| MESSAGE_FLAG_WAS_DROPPED | MESSAGE_FLAG_PASS_BY_AREA);
 	// Note, that BeOS R5 seems to keep the reply info.
 
-	if (fHeader->fields_size > 0) {
-		fFields = (field_header *)malloc(fHeader->fields_size);
-		memcpy(fFields, other.fFields, fHeader->fields_size);
+	if (fHeader->field_count > 0) {
+		size_t fieldsSize = fHeader->field_count * sizeof(field_header);
+		fFields = (field_header *)malloc(fieldsSize);
+		if (fFields == NULL) {
+			fHeader->field_count = 0;
+			fHeader->data_size = 0;
+		} else
+			memcpy(fFields, other.fFields, fieldsSize);
 	}
 
 	if (fHeader->data_size > 0) {
 		fData = (uint8 *)malloc(fHeader->data_size);
-		memcpy(fData, other.fData, fHeader->data_size);
+		if (fData == NULL) {
+			fHeader->field_count = 0;
+			free(fFields);
+			fFields = NULL;
+		} else
+			memcpy(fData, other.fData, fHeader->data_size);
 	}
 
+	fHeader->what = what = other.what;
 	fHeader->message_area = -1;
-	fHeader->fields_available = 0;
-	fHeader->data_available = 0;
-	fHeader->what = what = other.what;
+	fFieldsAvailable = 0;
+	fDataAvailable = 0;
 
 	return *this;
 }
@@ -233,7 +258,7 @@
 	if (fHeader->field_count != other.fHeader->field_count)
 		return false;
 
-	for (int32 i = 0; i < fHeader->field_count; i++) {
+	for (uint32 i = 0; i < fHeader->field_count; i++) {
 		field_header *field = &fFields[i];
 		field_header *otherField = NULL;
 
@@ -292,6 +317,9 @@
 	fFields = NULL;
 	fData = NULL;
 
+	fFieldsAvailable = 0;
+	fDataAvailable = 0;
+
 	fOriginal = NULL;
 	fQueueLink = NULL;
 
@@ -307,7 +335,12 @@
 BMessage::_InitHeader()
 {
 	DEBUG_FUNCTION_ENTER;
-	fHeader = (message_header *)malloc(sizeof(message_header));
+	if (fHeader == NULL) {
+		fHeader = (message_header *)malloc(sizeof(message_header));
+		if (fHeader == NULL)
+			return B_NO_MEMORY;
+	}
+
 	memset(fHeader, 0, sizeof(message_header) - sizeof(fHeader->hash_table));
 
 	fHeader->format = MESSAGE_FORMAT_HAIKU;
@@ -332,7 +365,7 @@
 BMessage::_Clear()
 {
 	DEBUG_FUNCTION_ENTER;
-	if (fHeader) {
+	if (fHeader != NULL) {
 		// 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.
@@ -351,6 +384,9 @@
 	free(fData);
 	fData = NULL;
 
+	fFieldsAvailable = 0;
+	fDataAvailable = 0;
+
 	delete fOriginal;
 	fOriginal = NULL;
 
@@ -363,10 +399,10 @@
 	type_code *typeFound, int32 *countFound) const
 {
 	DEBUG_FUNCTION_ENTER;
+	if (index < 0 || (uint32)index >= fHeader->field_count)
+		return B_BAD_INDEX;
+
 	if (typeRequested == B_ANY_TYPE) {
-		if (index >= fHeader->field_count)
-			return B_BAD_INDEX;
-
 		if (nameFound)
 			*nameFound = (char *)fData + fFields[index].offset;
 		if (typeFound)
@@ -378,7 +414,7 @@
 
 	int32 counter = -1;
 	field_header *field = fFields;
-	for (int32 i = 0; i < fHeader->field_count; i++, field++) {
+	for (uint32 i = 0; i < fHeader->field_count; i++, field++) {
 		if (field->type == typeRequested)
 			counter++;
 
@@ -410,7 +446,7 @@
 
 	field_header *field = NULL;
 	status_t result = _FindField(name, B_ANY_TYPE, &field);
-	if (result < B_OK || !field)
+	if (result < B_OK || field == NULL)
 		return result;
 
 	if (typeFound)
@@ -429,13 +465,13 @@
 	DEBUG_FUNCTION_ENTER;
 	field_header *field = NULL;
 	status_t result = _FindField(name, B_ANY_TYPE, &field);
-	if (result < B_OK || !field)
+	if (result < B_OK || field == NULL)
 		return result;
 
 	if (typeFound)
 		*typeFound = field->type;
 	if (fixedSize)
-		*fixedSize = field->flags & FIELD_FLAG_FIXED_SIZE;
+		*fixedSize = (field->flags & FIELD_FLAG_FIXED_SIZE) != 0;
 
 	return B_OK;
 }
@@ -450,7 +486,7 @@
 
 	int32 count = 0;
 	field_header *field = fFields;
-	for (int32 i = 0; i < fHeader->field_count; i++, field++) {
+	for (uint32 i = 0; i < fHeader->field_count; i++, field++) {
 		if (field->type == type)
 			count++;
 	}
@@ -493,7 +529,7 @@
 BMessage::IsReply() const
 {
 	DEBUG_FUNCTION_ENTER;
-	return fHeader->flags & MESSAGE_FLAG_IS_REPLY;
+	return (fHeader->flags & MESSAGE_FLAG_IS_REPLY) != 0;
 }
 
 
@@ -512,21 +548,24 @@
 
 	int32 value = B_BENDIAN_TO_HOST_INT32(what);
 	printf("BMessage(");
-	if (isprint(*(char *)&value)) {
+	if (isprint(*(char *)&value))
 		printf("'%.4s'", (char *)&value);
-	} else
+	else
 		printf("0x%lx", what);
 	printf(") {\n");
 
+	if (fHeader == NULL || fFields == NULL || fData == NULL)
+		return;
+
 	field_header *field = fFields;
-	for (int32 i = 0; i < fHeader->field_count; i++, field++) {
+	for (uint32 i = 0; i < fHeader->field_count; i++, field++) {
 		value = B_BENDIAN_TO_HOST_INT32(field->type);
 		ssize_t size = 0;
-		if ((field->flags & FIELD_FLAG_FIXED_SIZE) && field->count > 0)
+		if ((field->flags & FIELD_FLAG_FIXED_SIZE) != 0 && field->count > 0)
 			size = field->data_size / field->count;
 
 		uint8 *pointer = fData + field->offset + field->name_length;
-		for (int32 j = 0; j < field->count; j++) {
+		for (uint32 j = 0; j < field->count; j++) {
 			if (field->count == 1) {
 				printf("%s        %s = ", indent,
 					(char *)(fData + field->offset));
@@ -537,62 +576,80 @@
 
 			switch (field->type) {
 				case B_RECT_TYPE:
-					pointer = print_to_stream_type<BRect>(pointer);
+					print_to_stream_type<BRect>(pointer);
 					break;
 
 				case B_POINT_TYPE:
-					pointer = print_to_stream_type<BPoint>(pointer);
+					print_to_stream_type<BPoint>(pointer);
 					break;
 
-				case B_STRING_TYPE:	{
-					ssize_t size = *(ssize_t *)pointer;
-					pointer += sizeof(ssize_t);
-					printf("string(\"%s\", %ld bytes)\n", (char *)pointer, size);
-					pointer += size;
+				case B_STRING_TYPE:
+				{
+					size = *(uint32 *)pointer;
+					pointer += sizeof(uint32);
+					printf("string(\"%s\", %ld bytes)\n", (char *)pointer,
+						size);
 					break;
 				}
 
 				case B_INT8_TYPE:
-					pointer = print_type<int8>("int8(0x%hx or %d or \'%.1s\')\n", pointer);
+					print_type<int8>("int8(0x%hx or %d or '%.1s')\n", pointer);
 					break;
 
+				case B_UINT8_TYPE:
+					print_type<uint8>("uint8(0x%hx or %u or '%.1s')\n",
+						pointer);
+					break;
+
 				case B_INT16_TYPE:
-					pointer = print_type<int16>("int16 (0x%x or %d)\n", pointer);
+					print_type<int16>("int16(0x%x or %d)\n", pointer);
 					break;
 
+				case B_UINT16_TYPE:
+					print_type<uint16>("uint16(0x%x or %u\n", pointer);
+					break;
+
 				case B_INT32_TYPE:
-					pointer = print_type<int32>("int32(0x%lx or %ld)\n", pointer);
+					print_type<int32>("int32(0x%lx or %ld)\n", pointer);
 					break;
 
+				case B_UINT32_TYPE:
+					print_type<uint32>("uint32(0x%lx or %lu\n", pointer);
+					break;
+
 				case B_INT64_TYPE:
-					pointer = print_type<int64>("int64(0x%Lx or %Ld)\n", pointer);
+					print_type<int64>("int64(0x%Lx or %Ld)\n", pointer);
 					break;
 
+				case B_UINT64_TYPE:
+					print_type<uint64>("uint64(0x%Lx or %Ld\n", pointer);
+					break;
+
 				case B_BOOL_TYPE:
-					printf("bool(%s)\n", *((bool *)pointer)!= 0 ? "true" : "false");
-					pointer += sizeof(bool);
+					printf("bool(%s)\n", *((bool *)pointer) != 0
+						? "true" : "false");
 					break;
 
 				case B_FLOAT_TYPE:
-					pointer = print_type<float>("float(%.4f)\n", pointer);
+					print_type<float>("float(%.4f)\n", pointer);
 					break;
 
 				case B_DOUBLE_TYPE:
-					pointer = print_type<double>("double(%.8f)\n", pointer);
+					print_type<double>("double(%.8f)\n", pointer);
 					break;
 
-				case B_REF_TYPE: {
-					ssize_t size = *(ssize_t *)pointer;
-					pointer += sizeof(ssize_t);
+				case B_REF_TYPE:
+				{
+					size = *(uint32 *)pointer;
+					pointer += sizeof(uint32);
 					entry_ref ref;
 					BPrivate::entry_ref_unflatten(&ref, (char *)pointer, size);
 
-					printf("entry_ref(device=%ld, directory=%lld, name=\"%s\", ",
-							ref.device, ref.directory, ref.name);
+					printf("entry_ref(device=%ld, directory=%lld,
+						name=\"%s\", ", ref.device, ref.directory, ref.name);
 
 					BPath path(&ref);
 					printf("path=\"%s\")\n", path.Path());
-					pointer += size;
 					break;
 				}
 
@@ -602,22 +659,28 @@
 					sprintf(buffer, "%s        ", indent);
 
 					BMessage message;
-					const ssize_t size = *(const ssize_t *)pointer;
-					pointer += sizeof(ssize_t);
-					if (message.Unflatten((const char *)pointer)!=B_OK) {
-						fprintf(stderr, "couldn't unflatten item %ld\n", i);
+					size = *(uint32 *)pointer;
+					pointer += sizeof(uint32);
+					status_t result = message.Unflatten((const char *)pointer);
+					if (result != B_OK) {
+						printf("failed unflatten: %s\n", strerror(result));
 						break;
 					}
+
 					message._PrintToStream(buffer);
 					printf("%s        }\n", indent);
-					pointer += size;
 					break;
 				}
 
-				default: {
-					printf("(type = '%.4s')(size = %ld)\n", (char *)&value, size);
+				default:
+				{
+					printf("(type = '%.4s')(size = %ld)\n", (char *)&value,
+						size);
+					break;
 				}
 			}
+
+			pointer += size;
 		}
 	}
 }
@@ -627,7 +690,7 @@
 BMessage::Rename(const char *oldEntry, const char *newEntry)
 {
 	DEBUG_FUNCTION_ENTER;
-	if (!oldEntry || !newEntry)
+	if (oldEntry == NULL || newEntry == NULL)
 		return B_BAD_VALUE;
 
 	if (fHeader->message_area >= 0)
@@ -674,7 +737,7 @@
 BMessage::WasDelivered() const
 {
 	DEBUG_FUNCTION_ENTER;
-	return fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED;
+	return (fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED) != 0;
 }
 
 
@@ -682,8 +745,8 @@
 BMessage::IsSourceWaiting() const
 {
 	DEBUG_FUNCTION_ENTER;
-	return (fHeader->flags & MESSAGE_FLAG_REPLY_REQUIRED)
-		&& !(fHeader->flags & MESSAGE_FLAG_REPLY_DONE);
+	return (fHeader->flags & MESSAGE_FLAG_REPLY_REQUIRED) != 0
+		&& (fHeader->flags & MESSAGE_FLAG_REPLY_DONE) == 0;
 }
 
 
@@ -691,8 +754,8 @@
 BMessage::IsSourceRemote() const
 {
 	DEBUG_FUNCTION_ENTER;
-	return (fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED)
-		&& (fHeader->reply_team != BPrivate::current_team());
+	return (fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED) != 0
+		&& fHeader->reply_team != BPrivate::current_team();
 }
 
 
@@ -700,7 +763,7 @@
 BMessage::ReturnAddress() const
 {
 	DEBUG_FUNCTION_ENTER;
-	if (fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED) {
+	if ((fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED) != 0) {
 		BMessenger messenger;
 		BMessenger::Private(messenger).SetTo(fHeader->reply_team,
 			fHeader->reply_port, fHeader->reply_target);
@@ -716,7 +779,7 @@
 {
 	DEBUG_FUNCTION_ENTER;
 	/* ToDo: test if the "_previous_" field is used in R5 */
-	if (!fOriginal) {
+	if (fOriginal == NULL) {
 		fOriginal = new BMessage();
 
 		if (FindMessage("_previous_", fOriginal) != B_OK) {
@@ -733,7 +796,7 @@
 BMessage::WasDropped() const
 {
 	DEBUG_FUNCTION_ENTER;
-	return fHeader->flags & MESSAGE_FLAG_WAS_DROPPED;
+	return (fHeader->flags & MESSAGE_FLAG_WAS_DROPPED) != 0;
 }
 
 
@@ -775,8 +838,8 @@
 	messengerPrivate.SetTo(fHeader->reply_team, fHeader->reply_port,
 		fHeader->reply_target);
 
-	if (fHeader->flags & MESSAGE_FLAG_REPLY_REQUIRED) {
-		if (fHeader->flags & MESSAGE_FLAG_REPLY_DONE)
+	if ((fHeader->flags & MESSAGE_FLAG_REPLY_REQUIRED) != 0) {
+		if ((fHeader->flags & MESSAGE_FLAG_REPLY_DONE) != 0)
 			return B_DUPLICATE_REPLY;
 
 		fHeader->flags |= MESSAGE_FLAG_REPLY_DONE;
@@ -795,7 +858,7 @@
 	}
 
 	// no reply required
-	if (!(fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED))
+	if ((fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED) == 0)
 		return B_BAD_REPLY;
 
 	reply->AddMessage("_previous_", this);
@@ -826,8 +889,8 @@
 	messengerPrivate.SetTo(fHeader->reply_team, fHeader->reply_port,
 		fHeader->reply_target);
 
-	if (fHeader->flags & MESSAGE_FLAG_REPLY_REQUIRED) {
-		if (fHeader->flags & MESSAGE_FLAG_REPLY_DONE)
+	if ((fHeader->flags & MESSAGE_FLAG_REPLY_REQUIRED) != 0) {
+		if ((fHeader->flags & MESSAGE_FLAG_REPLY_DONE) != 0)
 			return B_DUPLICATE_REPLY;
 
 		fHeader->flags |= MESSAGE_FLAG_REPLY_DONE;
@@ -847,7 +910,7 @@
 	}
 
 	// no reply required
-	if (!(fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED))
+	if ((fHeader->flags & MESSAGE_FLAG_WAS_DELIVERED) == 0)
 		return B_BAD_REPLY;
 
 	reply->AddMessage("_previous_", this);
@@ -864,7 +927,8 @@
 BMessage::FlattenedSize() const
 {
 	DEBUG_FUNCTION_ENTER;
-	return BPrivate::MessageAdapter::FlattenedSize(MESSAGE_FORMAT_R5, this);
+	return sizeof(message_header) + fHeader->field_count * sizeof(field_header)
+		+ fHeader->data_size;
 }
 
 
@@ -872,36 +936,10 @@
 BMessage::Flatten(char *buffer, ssize_t size) const
 {
 	DEBUG_FUNCTION_ENTER;
-	return BPrivate::MessageAdapter::Flatten(MESSAGE_FORMAT_R5, this, buffer,
-		&size);
-}
-
-
-status_t
-BMessage::Flatten(BDataIO *stream, ssize_t *size) const
-{
-	DEBUG_FUNCTION_ENTER;
-	return BPrivate::MessageAdapter::Flatten(MESSAGE_FORMAT_R5, this, stream,
-		size);
-}
-
-
-ssize_t
-BMessage::_NativeFlattenedSize() const
-{
-	DEBUG_FUNCTION_ENTER;
-	return sizeof(message_header) + fHeader->fields_size + fHeader->data_size;
-}
-
-
-status_t
-BMessage::_NativeFlatten(char *buffer, ssize_t size) const
-{
-	DEBUG_FUNCTION_ENTER;
-	if (!buffer)
+	if (buffer == NULL || size < 0)
 		return B_BAD_VALUE;
 
-	if (!fHeader)
+	if (fHeader == NULL)
 		return B_NO_INIT;
 
 	/* we have to sync the what code as it is a public member */
@@ -911,26 +949,27 @@
 	buffer += sizeof(message_header);
 	size -= sizeof(message_header);
 
-	memcpy(buffer, fFields, min_c(fHeader->fields_size, size));
-	buffer += fHeader->fields_size;
-	size -= fHeader->fields_size;
+	size_t fieldsSize = fHeader->field_count * sizeof(field_header);
+	memcpy(buffer, fFields, min_c(fieldsSize, (size_t)size));
+	buffer += fieldsSize;
+	size -= fieldsSize;
 
-	memcpy(buffer, fData, min_c(fHeader->data_size, size));
-	if (size >= fHeader->data_size)
-		return B_OK;
+	memcpy(buffer, fData, min_c(fHeader->data_size, (size_t)size));
+	if ((size_t)size < fHeader->data_size)
+		return B_BUFFER_OVERFLOW;
 
-	return B_NO_MEMORY;
+	return B_OK;
 }
 
 
 status_t
-BMessage::_NativeFlatten(BDataIO *stream, ssize_t *size) const
+BMessage::Flatten(BDataIO *stream, ssize_t *size) const
 {
 	DEBUG_FUNCTION_ENTER;
-	if (!stream)
+	if (stream == NULL)
 		return B_BAD_VALUE;
 
-	if (!fHeader)
+	if (fHeader == NULL)
 		return B_NO_INIT;
 
 	/* we have to sync the what code as it is a public member */
@@ -941,16 +980,17 @@
 		return (result1 >= 0 ? B_ERROR : result1);
 
 	ssize_t result2 = 0;
-	if (fHeader->fields_size > 0) {
-		result2 = stream->Write(fFields, fHeader->fields_size);
-		if (result2 != fHeader->fields_size)
+	if (fHeader->field_count > 0) {
+		ssize_t fieldsSize = fHeader->field_count * sizeof(field_header);
+		result2 = stream->Write(fFields, fieldsSize);
+		if (result2 != fieldsSize)
 			return (result2 >= 0 ? B_ERROR : result2);
 	}
 
 	ssize_t result3 = 0;
 	if (fHeader->data_size > 0) {
 		result3 = stream->Write(fData, fHeader->data_size);
-		if (result3 != fHeader->data_size)
+		if (result3 != (ssize_t)fHeader->data_size)
 			return (result3 >= 0 ? B_ERROR : result3);
 	}
 
@@ -1001,54 +1041,41 @@
 	memcpy(header, fHeader, sizeof(message_header));
 
 	header->what = what;
-	header->fields_available = 0;
-	header->data_available = 0;
-	header->flags |= MESSAGE_FLAG_PASS_BY_AREA;
+	header->message_area = -1;
 	*_header = header;
 
-	if (header->message_area >= 0)
+	if (header->field_count == 0 && header->data_size == 0)
 		return B_OK;
 
-	if (header->fields_size == 0 && header->data_size == 0)
-		return B_OK;
-
-	uint8 *address = NULL;
-	ssize_t size = header->fields_size + header->data_size;
+	char *address = NULL;
+	size_t fieldsSize = header->field_count * sizeof(field_header);
+	size_t size = fieldsSize + header->data_size;
 	size = (size + B_PAGE_SIZE) & ~(B_PAGE_SIZE - 1);
 	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) {
+	if (area < 0) {
 		free(header);
 		*_header = NULL;
 		return area;
 	}
 
-	if (header->fields_size > 0) {
-		memcpy(address, fFields, header->fields_size);
-		header->fields_checksum = BPrivate::CalculateChecksum((uint8 *)address, header->fields_size);
-		address += header->fields_size;
-	}
-
-	if (header->data_size > 0) {
-		memcpy(address, fData, header->data_size);
-		header->data_checksum = BPrivate::CalculateChecksum((uint8 *)address, header->data_size);
-	}
-
+	memcpy(address, fFields, fieldsSize);
+	memcpy(address + fieldsSize, fData, fHeader->data_size);
+	header->flags |= MESSAGE_FLAG_PASS_BY_AREA;
 	header->message_area = area;
 	return B_OK;
 }
 
 
 status_t
-BMessage::_Reference(message_header *header)
+BMessage::_Reference()
 {
 	DEBUG_FUNCTION_ENTER;
-	fHeader = header;
 	fHeader->flags &= ~MESSAGE_FLAG_PASS_BY_AREA;
 
 	/* if there is no data at all we don't need the area */
-	if (fHeader->fields_size == 0 && header->data_size == 0)
+	if (fHeader->field_count == 0 && fHeader->data_size == 0)
 		return B_OK;
 
 	area_info areaInfo;
@@ -1075,18 +1102,7 @@
 		address = (uint8 *)areaInfo.address;
 
 	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("BMessage: checksum mismatch in message passed by area!\n");
-		_Clear();
-		_InitHeader();
-		return B_BAD_VALUE;
-	}
-
+	fData = address + fHeader->field_count * sizeof(field_header);
 	return B_OK;
 }
 
@@ -1111,12 +1127,13 @@
 	field_header *newFields = NULL;
 	uint8 *newData = NULL;
 
-	if (fHeader->fields_size > 0) {
-		newFields = (field_header *)malloc(fHeader->fields_size);
+	if (fHeader->field_count > 0) {
+		size_t fieldsSize = fHeader->field_count * sizeof(field_header);
+		newFields = (field_header *)malloc(fieldsSize);
 		if (newFields == NULL)
 			return B_NO_MEMORY;
 
-		memcpy(newFields, fFields, fHeader->fields_size);
+		memcpy(newFields, fFields, fieldsSize);
 	}
 
 	if (fHeader->data_size > 0) {
@@ -1131,8 +1148,8 @@
 
 	_Dereference();
 
-	fHeader->fields_available = 0;
-	fHeader->data_available = 0;
+	fFieldsAvailable = 0;
+	fDataAvailable = 0;
 
 	fFields = newFields;
 	fData = newData;
@@ -1141,10 +1158,35 @@
 
 
 status_t
+BMessage::_ValidateMessage()
+{
+	if (fHeader->field_count == 0)
+		return B_OK;
+
+	if (fFields == NULL)
+		return B_NO_INIT;
+
+	for (uint32 i = 0; i < fHeader->field_count; i++) {
+		field_header *field = &fFields[i];
+		if ((field->next_field >= 0
+				&& (uint32)field->next_field > fHeader->field_count)
+			|| (field->offset + field->name_length + field->data_size
+				> fHeader->data_size)) {
+			// the message is corrupt
+			MakeEmpty();
+			return B_BAD_VALUE;
+		}
+	}
+
+	return B_OK;
+}
+
+
+status_t
 BMessage::Unflatten(const char *flatBuffer)
 {
 	DEBUG_FUNCTION_ENTER;
-	if (!flatBuffer)
+	if (flatBuffer == NULL)
 		return B_BAD_VALUE;
 
 	uint32 format = *(uint32 *)flatBuffer;
@@ -1156,45 +1198,46 @@
 	_Clear();
 
 	fHeader = (message_header *)malloc(sizeof(message_header));
-	if (!fHeader)
+	if (fHeader == NULL)
 		return B_NO_MEMORY;
 
 	memcpy(fHeader, flatBuffer, sizeof(message_header));
 	flatBuffer += sizeof(message_header);
 
 	if (fHeader->format != MESSAGE_FORMAT_HAIKU
-		|| !(fHeader->flags & MESSAGE_FLAG_VALID)) {
-		free(fHeader);
-		fHeader = NULL;
+		|| (fHeader->flags & MESSAGE_FLAG_VALID) == 0) {
 		_InitHeader();
 		return B_BAD_VALUE;
 	}
 
-	fHeader->fields_available = 0;
-	fHeader->data_available = 0;
 	what = fHeader->what;
 
-	if (fHeader->flags & MESSAGE_FLAG_PASS_BY_AREA) {
-		status_t result = _Reference(fHeader);
-		if (result < B_OK)
+	if ((fHeader->flags & MESSAGE_FLAG_PASS_BY_AREA) != 0
+		&& fHeader->message_area >= 0) {
+		status_t result = _Reference();
+		if (result != B_OK)
 			return result;
 	} else {

[... truncated: 797 lines follow ...]


From axeld at mail.berlios.de  Sat Aug  1 00:22:29 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 1 Aug 2009 00:22:29 +0200
Subject: [Haiku-commits] r32040 - in haiku/trunk/src: preferences/screen
	servers/app/drawing
Message-ID: <200907312222.n6VMMT25019533@sheep.berlios.de>

Author: axeld
Date: 2009-08-01 00:22:28 +0200 (Sat, 01 Aug 2009)
New Revision: 32040
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32040&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenMode.cpp
   haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
Log:
* Added Eizo, thanks Jonas.
* Added comment to monitor_info::name retrieval via EDID1_MONITOR_NAME.


Modified: haiku/trunk/src/preferences/screen/ScreenMode.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-07-31 22:19:36 UTC (rev 32039)
+++ haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-07-31 22:22:28 UTC (rev 32040)
@@ -358,6 +358,9 @@
 		case 'EMA\0':
 			strcpy(info.vendor, "eMachines");
 			break;
+		case 'ENC\0':
+			strcpy(info.vendor, "Eizo");
+			break;
 		case 'FUS\0':
 			strcpy(info.vendor, "Fujitsu-Siemens");
 			break;

Modified: haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp	2009-07-31 22:19:36 UTC (rev 32039)
+++ haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp	2009-07-31 22:22:28 UTC (rev 32040)
@@ -944,6 +944,8 @@
 				break;
 
 			case EDID1_MONITOR_NAME:
+				// There can be several of these; in this case we'll just
+				// overwrite the previous entries
 				strlcpy(info->name, monitor->data.monitor_name,
 					sizeof(info->name));
 				break;



From mattmadia at gmail.com  Sat Aug  1 00:49:54 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Fri, 31 Jul 2009 22:49:54 +0000
Subject: [Haiku-commits] r32039 - in haiku/trunk: headers/os/app
	headers/private/app src/kits/app src/kits/interface
	src/servers/registrar
In-Reply-To: <200907312219.n6VMJeRv019233@sheep.berlios.de>
References: <200907312219.n6VMJeRv019233@sheep.berlios.de>
Message-ID: <1e42d8c50907311549y387b1913v22bff52d3ca43827@mail.gmail.com>

On Fri, Jul 31, 2009 at 22:19, <mmlr at mail.berlios.de> wrote:
>
> Modified:
>   haiku/trunk/headers/os/app/Message.h
>   haiku/trunk/headers/private/app/MessagePrivate.h
>   haiku/trunk/src/kits/app/Message.cpp
>   haiku/trunk/src/kits/app/MessageAdapter.cpp
>   haiku/trunk/src/kits/app/MessageUtils.cpp
>   haiku/trunk/src/kits/interface/View.cpp
>   haiku/trunk/src/servers/registrar/MessageDeliverer.cpp

At least PPC is broken with this:
not sure about  x86gcc4
though x86gcc2 is ok.

C++ /haiku-src/haiku/haiku/generated.ppc/objects/haiku/ppc/release/kits/app/Message.o
/haiku-src/haiku/haiku/src/kits/app/Message.cpp:648:13: error: missing
terminating " character
/haiku-src/haiku/haiku/src/kits/app/Message.cpp:648: error: missing
terminating " character
/haiku-src/haiku/haiku/src/kits/app/Message.cpp:649: error: stray '\' in program
/haiku-src/haiku/haiku/src/kits/app/Message.cpp: In member function
'void BMessage::_PrintToStream(const char*) const':
/haiku-src/haiku/haiku/src/kits/app/Message.cpp:649: error: 'name' was
not declared in this scope

/haiku-src/haiku/haiku/generated.ppc/cross-tools/bin/powerpc-apple-haiku-gcc
-c "/haiku-src/haiku/haiku/src/kits/app/Message.cpp" -O -Wall
-Wno-trigraphs -Wno-ctor-dtor-privacy -Woverloaded-virtual
-Wpointer-arith -Wcast-align -Wsign-compare -Wno-multichar -pipe
-fno-strict-aliasing -fno-tree-vrp -nostdinc -Wno-deprecated
-D_ZETA_USING_DEPRECATED_API_=1 -D_ZETA_TS_FIND_DIR_=1 -Werror
-Wno-error=uninitialized -D__HAIKU__
-DHAIKU_DISTRO_COMPATIBILITY_DEFAULT -D__POWERPC__ -DARCH_ppc
-DBOOT_ARCHIVE_IMAGE_OFFSET=192 -DHAIKU_TARGET_PLATFORM_HAIKU -iquote
/haiku-src/haiku/haiku/build/user_config_headers -iquote
/haiku-src/haiku/haiku/build/config_headers -iquote
/haiku-src/haiku/haiku/src/kits/app -iquote
/haiku-src/haiku/haiku/generated.ppc/objects/common/kits/app -iquote
/haiku-src/haiku/haiku/generated.ppc/objects/freebsd/x86/common/kits/app
-iquote /haiku-src/haiku/haiku/generated.ppc/objects/haiku/ppc/common/kits/app
-I /haiku-src/haiku/haiku/headers/private/shared -I
/haiku-src/haiku/haiku/headers/private/app -I
/haiku-src/haiku/haiku/headers/private/interface -I
/haiku-src/haiku/haiku/headers/private/kernel -I
/haiku-src/haiku/haiku/headers/private/. -I
/haiku-src/haiku/haiku/headers/private/system -I
/haiku-src/haiku/haiku/headers/private/system/arch/ppc -I
/haiku-src/haiku/haiku/generated.ppc/cross-tools/lib/gcc/powerpc-apple-haiku/4.3.3/../../../../powerpc-apple-haiku/include/c++/4.3.3
-I /haiku-src/haiku/haiku/generated.ppc/cross-tools/lib/gcc/powerpc-apple-haiku/4.3.3/../../../../powerpc-apple-haiku/include/c++/4.3.3/powerpc-apple-haiku
-I /haiku-src/haiku/haiku/generated.ppc/cross-tools/lib/gcc/powerpc-apple-haiku/4.3.3/../../../../powerpc-apple-haiku/include/c++/4.3.3/backward
-I /haiku-src/haiku/haiku/generated.ppc/cross-tools/lib/gcc/powerpc-apple-haiku/4.3.3/../../../../powerpc-apple-haiku/include/c++/4.3.3/ext
-I /haiku-src/haiku/haiku/generated.ppc/cross-tools/lib/gcc/powerpc-apple-haiku/4.3.3/include
-I /haiku-src/haiku/haiku/generated.ppc/cross-tools/lib/gcc/powerpc-apple-haiku/4.3.3/include-fixed
-I /haiku-src/haiku/haiku/headers -I
/haiku-src/haiku/haiku/headers/posix -I
/haiku-src/haiku/haiku/headers/gnu -I
/haiku-src/haiku/haiku/headers/glibc -I
/haiku-src/haiku/haiku/headers/os -I
/haiku-src/haiku/haiku/headers/os/add-ons -I
/haiku-src/haiku/haiku/headers/os/add-ons/file_system -I
/haiku-src/haiku/haiku/headers/os/add-ons/graphics -I
/haiku-src/haiku/haiku/headers/os/add-ons/input_server -I
/haiku-src/haiku/haiku/headers/os/add-ons/registrar -I
/haiku-src/haiku/haiku/headers/os/add-ons/screen_saver -I
/haiku-src/haiku/haiku/headers/os/add-ons/tracker -I
/haiku-src/haiku/haiku/headers/os/app -I
/haiku-src/haiku/haiku/headers/os/device -I
/haiku-src/haiku/haiku/headers/os/drivers -I
/haiku-src/haiku/haiku/headers/os/game -I
/haiku-src/haiku/haiku/headers/os/interface -I
/haiku-src/haiku/haiku/headers/os/kernel -I
/haiku-src/haiku/haiku/headers/os/media -I
/haiku-src/haiku/haiku/headers/os/mail -I
/haiku-src/haiku/haiku/headers/os/midi -I
/haiku-src/haiku/haiku/headers/os/midi2 -I
/haiku-src/haiku/haiku/headers/os/net -I
/haiku-src/haiku/haiku/headers/os/opengl -I
/haiku-src/haiku/haiku/headers/os/storage -I
/haiku-src/haiku/haiku/headers/os/support -I
/haiku-src/haiku/haiku/headers/os/translation -I
/haiku-src/haiku/haiku/headers/private/. -o
"/haiku-src/haiku/haiku/generated.ppc/objects/haiku/ppc/release/kits/app/Message.o"
;

...failed C++ /haiku-src/haiku/haiku/generated.ppc/objects/haiku/ppc/release/kits/app/Message.o
...
...skipped <libbe>app_kit.o for lack of <src!kits!app>Message.o...


From axeld at pinc-software.de  Sat Aug  1 01:19:53 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sat, 01 Aug 2009 01:19:53 +0200 CEST
Subject: [Haiku-commits] r32036 - haiku/trunk/src/preferences/screen
In-Reply-To: <1e80d8750907311507g1dcac336sb400192726adcf59@mail.gmail.com>
Message-ID: <50200107713-BeMail@zon>

Urias McCullough <umccullough at gmail.com> wrote:
> You missed this one I think: http://dev.haiku-os.org/ticket/1732
> 
> HWP = "Hewlett Packard"
> 
> and this perhaps: http://dev.haiku-os.org/ticket/1667 which probably 
> should be:
> 
> MED = "Medion"

I might have missed even more, since I only searched for "syslog", and 
got tired after a few pages, not for "edid vendor"; unfortunately, Trac 
doesn't search text attachments :-)

> (this one is actually a guess, since that's the only LCD display
> vendor I could find that matched: http://en.wikipedia.org/wiki/Medion
> )

A good guess actually. I usually searched for the model name which then 
got me the vendor name, although only LG was a bit surprising.

Bye,
   Axel.



From axeld at mail.berlios.de  Sat Aug  1 01:25:23 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sat, 1 Aug 2009 01:25:23 +0200
Subject: [Haiku-commits] r32041 - haiku/trunk/src/preferences/screen
Message-ID: <200907312325.n6VNPNox019197@sheep.berlios.de>

Author: axeld
Date: 2009-08-01 01:25:21 +0200 (Sat, 01 Aug 2009)
New Revision: 32041
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32041&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenMode.cpp
Log:
* Added two more vendors found by Urias, thanks! If anyone has a SONY (SNY?),
  Dell, or Acer monitor, those are still missing as well.


Modified: haiku/trunk/src/preferences/screen/ScreenMode.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-07-31 22:22:28 UTC (rev 32040)
+++ haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-07-31 23:25:21 UTC (rev 32041)
@@ -367,9 +367,15 @@
 		case 'GSM\0':
 			strcpy(info.vendor, "LG");
 			break;
+		case 'HWP\0':
+			strcpy(info.vendor, "Hewlett Packard");
+			break;
 		case 'LEN\0':
 			strcpy(info.vendor, "Lenovo");
 			break;
+		case 'MED\0':
+			strcpy(info.vendor, "Medion");
+			break;
 		case 'PHL\0':
 			strcpy(info.vendor, "Philips");
 			break;



From umccullough at gmail.com  Sat Aug  1 01:40:07 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Fri, 31 Jul 2009 16:40:07 -0700
Subject: [Haiku-commits] r32041 - haiku/trunk/src/preferences/screen
In-Reply-To: <200907312325.n6VNPNox019197@sheep.berlios.de>
References: <200907312325.n6VNPNox019197@sheep.berlios.de>
Message-ID: <1e80d8750907311640k423305e9qcdce79a77e637cbb@mail.gmail.com>

On Fri, Jul 31, 2009 at 4:25 PM, <axeld at mail.berlios.de> wrote:
> Author: axeld
> Date: 2009-08-01 01:25:21 +0200 (Sat, 01 Aug 2009)
> New Revision: 32041
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32041&view=rev
>
> Modified:
> ? haiku/trunk/src/preferences/screen/ScreenMode.cpp
> Log:
> * Added two more vendors found by Urias, thanks! If anyone has a SONY (SNY?),
> ?Dell, or Acer monitor, those are still missing as well.

I have a Dell 24" here at work, but I don't have a Haiku install handy
to check with (will try to get one monday).

I don't suppose there are Windows XP programs that pull EDID info?
I'll see if I can find one.


From umccullough at gmail.com  Sat Aug  1 02:01:15 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Fri, 31 Jul 2009 17:01:15 -0700
Subject: [Haiku-commits] r32041 - haiku/trunk/src/preferences/screen
In-Reply-To: <1e80d8750907311640k423305e9qcdce79a77e637cbb@mail.gmail.com>
References: <200907312325.n6VNPNox019197@sheep.berlios.de>
	<1e80d8750907311640k423305e9qcdce79a77e637cbb@mail.gmail.com>
Message-ID: <1e80d8750907311701i6053327bpf2161d4a694f9dd7@mail.gmail.com>

On Fri, Jul 31, 2009 at 4:40 PM, Urias McCullough<umccullough at gmail.com> wrote:
> On Fri, Jul 31, 2009 at 4:25 PM, <axeld at mail.berlios.de> wrote:
>> Author: axeld
>> Date: 2009-08-01 01:25:21 +0200 (Sat, 01 Aug 2009)
>> New Revision: 32041
>> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32041&view=rev
>>
>> Modified:
>> ? haiku/trunk/src/preferences/screen/ScreenMode.cpp
>> Log:
>> * Added two more vendors found by Urias, thanks! If anyone has a SONY (SNY?),
>> ?Dell, or Acer monitor, those are still missing as well.
>
> I have a Dell 24" here at work, but I don't have a Haiku install handy
> to check with (will try to get one monday).
>
> I don't suppose there are Windows XP programs that pull EDID info?
> I'll see if I can find one.

I found this: http://www.eldim.fr/products/display-controller/fpdlite/fpdlite-free-tools

and it produces this output:

EDID ( Extended Display Identification Data) Report


Vendor/Product Identification:

	Monitor Name : 	DELL 2408WFP
	Monitor Serial Number : 	JU4368661CNS
	Manufacturer Name : 	Dell Computer Corp.
	Product Id : 	A029
	Serial Number : 	826494547
	Week Of Manufacture : 	23
	Year Of Manufacture : 	2008
	EDIDVersion : 	V1.3
	Number Of Extension Flag : 	0

Display parameters:

	Video Input Definition : 	Analog Signal
	 Analog Signal Properties : 	Composite Sync - Sync on Green -
Separate Sync - 0.700V/0.300V (1.000 Vp-p)
	Max Horizontal Image Size : 	520 mm
	Max Vertical Image Size : 	320 mm
	Max Display Size : 	24 Inches

Power Management and Features:

	Standby : 	Supported
	Suspend : 	Supported
	ActiveOff : 	Supported
	Video Input : 	1
	sRGB Default ColorSpace : 	False
	Default GTF : 	Not Supported
	Prefered Timing Mode : 	True

Gamma/Color and Etablished Timings:

	Display Gamma : 	2.2
	Red : 	x = 0.674 - y = 0.319
	Green : 	x = 0.187 - y = 0.706
	Blue : 	x = 0.148 - y = 0.064
	White : 	x = 0.313 - y = 0.329

	Etablished Timings : 	
		800 x 600 @ 60Hz (VESA)
		640 x 480 @ 75Hz (VESA)
		640 x 480 @ 60Hz (IBM, VGA)
		720 x 400 @ 70Hz (IBM, VGA)
		1280 x 1024 @ 75Hz (VESA)
		1024 x 768 @ 75Hz (VESA)
		1024 x 768 @ 60Hz (VESA)
		800 x 600 @ 75Hz (VESA)

	Display Type : 	RGB Color Display

Standard Timing:


	Standard Timings n?	1
	X Resolution : 	1280
	Y Resolution : 	1024
	Vertical Frequency : 	60

	Standard Timings n?	2
	X Resolution : 	1600
	Y Resolution : 	1200
	Vertical Frequency : 	60

	Standard Timings n?	3
	X Resolution : 	1152
	Y Resolution : 	864
	Vertical Frequency : 	75

Preferred Detailed Timing:

	Pixel Clock : 	154 Mhz

	Horizontal Active : 	1920 pixels
	Horizontal Blanking : 	160 pixels
	Horizontal Sync Offset : 	48 pixels
	Horizontal Sync Pulse Width : 	32 pixels
	Horizontal Border : 	0 pixels
	Horizontal Size : 	519 mm

	Vertical Active : 	1200 lines
	Vertical Blanking : 	35 lines
	Vertical Sync Offset : 	3 lines
	Vertical Sync Pulse Width : 	6 lines
	Vertical Border : 	0 lines
	Vertical Size : 	324 mm

	Input Type : 	Digital Separate
	Interlaced : 	False
	VerticalPolarity : 	False
	HorizontalPolarity : 	True

Monitor Range Limit:

	Maximum Vertical Frequency : 	76 Hz
	Minimum Vertical Frequency : 	56 Hz
	Maximum Horizontal Frequency : 	83 KHz
	Minimum Horizontal Frequency : 	30 KHz
	Maximum Pixel Clock : 	170 MHz

Stereo Display:

	Stereo Display : 	Normal display (no stereo)

RAW Data:

0x00	 00 FF FF FF FF FF FF 00 10 AC 29 A0 53 4E 43 31	.??????..?)?SNC1
0x10	 17 12 01 03 0E 34 20 78 EA B3 25 AC 51 30 B4 26	.....4 x??%?Q0?&
0x20	 10 50 54 A5 4B 00 81 80 A9 40 71 4F 01 01 01 01	.PT?K.???@qO....
0x30	 01 01 01 01 01 01 28 3C 80 A0 70 B0 23 40 30 20	......(<??p?#@0
0x40	 36 00 07 44 21 00 00 1A 00 00 00 FF 00 4A 55 34	6..D!......?.JU4
0x50	 33 36 38 36 36 31 43 4E 53 0A 00 00 00 FC 00 44	368661CNS....?.D
0x60	 45 4C 4C 20 32 34 30 38 57 46 50 0A 00 00 00 FD	ELL 2408WFP....?
0x70	 00 38 4C 1E 53 11 00 0A 20 20 20 20 20 20 00 64	.8L.S...      .d

Not sure if the RAW Data has what you need to know, but I notice it
actually shows the model number in the data there...that's nice :)


From anevilyak at mail.berlios.de  Sat Aug  1 02:04:06 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 1 Aug 2009 02:04:06 +0200
Subject: [Haiku-commits] r32042 - haiku/trunk/src/kits/app
Message-ID: <200908010004.n71046A2013246@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-01 02:04:05 +0200 (Sat, 01 Aug 2009)
New Revision: 32042
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32042&view=rev

Modified:
   haiku/trunk/src/kits/app/Message.cpp
   haiku/trunk/src/kits/app/MessageAdapter.cpp
Log:
gcc4 build fix.



Modified: haiku/trunk/src/kits/app/Message.cpp
===================================================================
--- haiku/trunk/src/kits/app/Message.cpp	2009-07-31 23:25:21 UTC (rev 32041)
+++ haiku/trunk/src/kits/app/Message.cpp	2009-08-01 00:04:05 UTC (rev 32042)
@@ -645,8 +645,8 @@
 					entry_ref ref;
 					BPrivate::entry_ref_unflatten(&ref, (char *)pointer, size);
 
-					printf("entry_ref(device=%ld, directory=%lld,
-						name=\"%s\", ", ref.device, ref.directory, ref.name);
+					printf("entry_ref(device=%ld, directory=%lld,"
+						"name=\"%s\", ", ref.device, ref.directory, ref.name);
 
 					BPath path(&ref);
 					printf("path=\"%s\")\n", path.Path());

Modified: haiku/trunk/src/kits/app/MessageAdapter.cpp
===================================================================
--- haiku/trunk/src/kits/app/MessageAdapter.cpp	2009-07-31 23:25:21 UTC (rev 32041)
+++ haiku/trunk/src/kits/app/MessageAdapter.cpp	2009-08-01 00:04:05 UTC (rev 32042)
@@ -519,13 +519,13 @@
 
 	header->what = into->what = r5header.what;
 	if (r5header.flags & R5_MESSAGE_FLAG_INCLUDE_TARGET)
-		reader(header->target);
+		reader(header->target, sizeof(header->target));
 
 	if (r5header.flags & R5_MESSAGE_FLAG_INCLUDE_REPLY) {
 		// reply info
-		reader(header->reply_port);
-		reader(header->reply_target);
-		reader(header->reply_team);
+		reader(header->reply_port, sizeof(header->reply_port));
+		reader(header->reply_target, sizeof(header->reply_target));
+		reader(header->reply_team, sizeof(header->reply_team));
 
 		// big flags
 		uint8 bigFlag;



From jonas at kirilla.com  Sat Aug  1 02:05:24 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Sat, 01 Aug 2009 02:05:24 +0200 CEST
Subject: [Haiku-commits] r32041 - haiku/trunk/src/preferences/screen
In-Reply-To: <200907312325.n6VNPNox019197@sheep.berlios.de>
Message-ID: <461265595-BeMail@kirilla>

axeld at mail.berlios.de wrote:
 ...
> If anyone has a SONY (SNY?),
>   Dell, or Acer monitor, those are still missing as well.

Confirmed: SNY = Sony

Cheers,
Jonas.


From stippi at mail.berlios.de  Sat Aug  1 03:16:17 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 1 Aug 2009 03:16:17 +0200
Subject: [Haiku-commits] r32043 - in haiku/trunk: headers/private/media
	src/add-ons/media/plugins/ffmpeg
	src/add-ons/media/plugins/ffmpeg/libavformat
	src/add-ons/media/plugins/ffmpeg/libswscale src/kits/media
Message-ID: <200908010116.n711GHjw023549@sheep.berlios.de>

Author: stippi
Date: 2009-08-01 03:16:12 +0200 (Sat, 01 Aug 2009)
New Revision: 32043
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32043&view=rev

Modified:
   haiku/trunk/headers/private/media/WriterPlugin.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavformat/utils.c
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/libswscale/swscale.h
   haiku/trunk/src/kits/media/MediaFile.cpp
   haiku/trunk/src/kits/media/MediaWriter.cpp
Log:
* Also pass the media_codec_info to the Writer::AllocateCookie(), since that
  info is not part of the media_format otherwise.
* Finished enough in the AVFormatWriter and AVCodecEncoder that we can now
  actually create AVIs and MPGs and encode MPEG1, MPEG2 and MPEG4 video.
  But no audio as of yet. Also, there is no bit-rate/quality setup, so it seems
  libavformat is using the least possible bit-rate/quality.
* Enable some more muxers and encoders in the FFmpeg libs.
* Uses pixel format conversion from libswsscale, need to read the documentation
  again, but I think it makes the plugin GPL.
* Fixed includes in libswscale/swscale.h, this is now an unmodified FFmpeg 0.5
  header again (AFAICT).


Modified: haiku/trunk/headers/private/media/WriterPlugin.h
===================================================================
--- haiku/trunk/headers/private/media/WriterPlugin.h	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/headers/private/media/WriterPlugin.h	2009-08-01 01:16:12 UTC (rev 32043)
@@ -21,7 +21,8 @@
 	virtual	status_t			Close() = 0;
 
 	virtual	status_t			AllocateCookie(void** cookie,
-									const media_format* format) = 0;
+									const media_format* format,
+									const media_codec_info* codecInfo) = 0;
 	virtual	status_t			FreeCookie(void* cookie) = 0;
 
 	virtual	status_t			SetCopyright(void* cookie,

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-01 01:16:12 UTC (rev 32043)
@@ -24,7 +24,7 @@
 #endif
 
 
-static const size_t kDefaultChunkBufferSize = FF_MIN_BUFFER_SIZE;
+static const size_t kDefaultChunkBufferSize = 2 * 1024 * 1024;
 
 
 AVCodecEncoder::AVCodecEncoder(uint32 codecID)
@@ -32,8 +32,8 @@
 	Encoder(),
 	fCodec(NULL),
 	fContext(avcodec_alloc_context()),
-	fInputPicture(avcodec_alloc_frame()),
-//	fOutputPicture(avcodec_alloc_frame()),
+	fFrame(avcodec_alloc_frame()),
+	fSwsContext(NULL),
 	fCodecInitDone(false),
 	fChunkBuffer(new(std::nothrow) uint8[kDefaultChunkBufferSize])
 {
@@ -53,8 +53,25 @@
 	if (fCodecInitDone)
 		avcodec_close(fContext);
 
-//	free(fOutputPicture);
-	free(fInputPicture);
+	sws_freeContext(fSwsContext);
+
+	avpicture_free(&fDstFrame);
+	// NOTE: Do not use avpicture_free() on fSrcFrame!! We fill the picture
+	// data on the file with the media buffer data passed to Encode().
+
+	if (fFrame != NULL) {
+		fFrame->data[0] = NULL;
+		fFrame->data[1] = NULL;
+		fFrame->data[2] = NULL;
+		fFrame->data[3] = NULL;
+
+		fFrame->linesize[0] = 0;
+		fFrame->linesize[1] = 0;
+		fFrame->linesize[2] = 0;
+		fFrame->linesize[3] = 0;
+		free(fFrame);
+	}
+
 	free(fContext);
 
 	delete[] fChunkBuffer;
@@ -94,10 +111,15 @@
 	fInputFormat = *inputFormat;
 
 	if (fInputFormat.type == B_MEDIA_RAW_VIDEO) {
+		// frame rate
+		fContext->time_base.den = (int)fInputFormat.u.raw_video.field_rate;
+		fContext->time_base.num = 1;
+		// video size
 		fContext->width = fInputFormat.u.raw_video.display.line_width;
 		fContext->height = fInputFormat.u.raw_video.display.line_count;
 //		fContext->gop_size = 12;
-		fContext->pix_fmt = PIX_FMT_BGR32;
+		// TODO: Fix pixel format or setup conversion method...
+		fContext->pix_fmt = PIX_FMT_YUV420P;
 //		fContext->rate_emu = 0;
 		// TODO: Setup rate control:
 //		fContext->rc_eq = NULL;
@@ -111,11 +133,38 @@
 			|| fContext->sample_aspect_ratio.den == 0) {
 			av_reduce(&fContext->sample_aspect_ratio.num,
 				&fContext->sample_aspect_ratio.den, fContext->width,
-				fContext->height, 256);
+				fContext->height, 255);
 		}
 
 		// TODO: This should already happen in AcceptFormat()
-		fInputFormat.u.raw_video.display.bytes_per_row = fContext->width * 4;
+		if (fInputFormat.u.raw_video.display.bytes_per_row == 0) {
+			fInputFormat.u.raw_video.display.bytes_per_row
+				= fContext->width * 4;
+		}
+
+		fFrame->pts = 0;
+
+		// Allocate space for colorspace converted AVPicture
+		// TODO: Check allocations...
+		avpicture_alloc(&fDstFrame, fContext->pix_fmt, fContext->width,
+			fContext->height);
+
+		// Make the frame point to the data in the converted AVPicture
+		fFrame->data[0] = fDstFrame.data[0];
+		fFrame->data[1] = fDstFrame.data[1];
+		fFrame->data[2] = fDstFrame.data[2];
+		fFrame->data[3] = fDstFrame.data[3];
+
+		fFrame->linesize[0] = fDstFrame.linesize[0];
+		fFrame->linesize[1] = fDstFrame.linesize[1];
+		fFrame->linesize[2] = fDstFrame.linesize[2];
+		fFrame->linesize[3] = fDstFrame.linesize[3];
+
+		// TODO: Use actual pixel format from media_format!
+		fSwsContext = sws_getContext(fContext->width, fContext->height,
+			PIX_FMT_RGB32, fContext->width, fContext->height,
+			fContext->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL);
+
 	} else {
 		return B_NOT_SUPPORTED;
 	}
@@ -154,6 +203,9 @@
 {
 	TRACE("AVCodecEncoder::Encode(%p, %lld, %p)\n", buffer, frameCount, info);
 
+	if (!fCodecInitDone)
+		return B_NO_INIT;
+
 	if (fInputFormat.type == B_MEDIA_RAW_AUDIO)
 		return _EncodeAudio(buffer, frameCount, info);
 	else if (fInputFormat.type == B_MEDIA_RAW_VIDEO)
@@ -192,12 +244,23 @@
 	while (frameCount > 0) {
 		size_t bpr = fInputFormat.u.raw_video.display.bytes_per_row;
 		size_t bufferSize = fInputFormat.u.raw_video.display.line_count * bpr;
+		TRACE("  bytes per row: %ld, buffer size: %ld\n", bpr, bufferSize);
 
-		fInputPicture->data[0] = (uint8_t*)buffer;
-		fInputPicture->linesize[0] = bpr;
+		// We should always get chunky bitmaps, so this code should be safe.
+		fSrcFrame.data[0] = (uint8_t*)buffer;
+		fSrcFrame.linesize[0] = bpr;
 
+		// Run the pixel format conversion
+		sws_scale(fSwsContext, fSrcFrame.data, fSrcFrame.linesize, 0,
+			fInputFormat.u.raw_video.display.line_count, fDstFrame.data,
+			fDstFrame.linesize);
+
+		// TODO: Look into this... avcodec.h says we need to set it.
+		fFrame->pts++;
+
+		// Encode one video chunk/frame.
 		int usedBytes = avcodec_encode_video(fContext, fChunkBuffer,
-			kDefaultChunkBufferSize, fInputPicture);
+			kDefaultChunkBufferSize, fFrame);
 
 		if (usedBytes < 0) {
 			TRACE("  avcodec_encode_video() failed: %d\n", usedBytes);

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h	2009-08-01 01:16:12 UTC (rev 32043)
@@ -10,6 +10,7 @@
 
 extern "C" {
 	#include "avcodec.h"
+	#include "swscale.h"
 }
 
 #include "EncoderPlugin.h"
@@ -51,8 +52,10 @@
 			// TODO: Refactor common base class from AVCodec[De|En]Coder!
 			AVCodec*			fCodec;
 			AVCodecContext*		fContext;
-			AVFrame*			fInputPicture;
-//			AVFrame*			fOutputPicture;
+			AVPicture			fSrcFrame;
+			AVPicture			fDstFrame;
+			AVFrame*			fFrame;
+			SwsContext*			fSwsContext;
 
 			uint32				fAVCodecID;
 

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp	2009-08-01 01:16:12 UTC (rev 32043)
@@ -26,7 +26,7 @@
 #include "gfx_util.h"
 
 
-#define TRACE_AVFORMAT_READER
+//#define TRACE_AVFORMAT_READER
 #ifdef TRACE_AVFORMAT_READER
 #	define TRACE printf
 #	define TRACE_IO(a...)

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp	2009-08-01 01:16:12 UTC (rev 32043)
@@ -58,7 +58,8 @@
 									BLocker* streamLock);
 	virtual						~StreamCookie();
 
-			status_t			Init(const media_format* format);
+			status_t			Init(const media_format* format,
+									const media_codec_info* codecInfo);
 
 			status_t			WriteChunk(const void* chunkBuffer,
 									size_t chunkSize,
@@ -70,7 +71,8 @@
 private:
 			AVFormatContext*	fContext;
 			AVStream*			fStream;
-			// Since different threads may read from the source,
+			AVPacket			fPacket;
+			// Since different threads may write to the target,
 			// we need to protect the file position and I/O by a lock.
 			BLocker*			fStreamLock;
 };
@@ -84,30 +86,65 @@
 	fStream(NULL),
 	fStreamLock(streamLock)
 {
+	av_new_packet(&fPacket, 0);
 }
 
 
 AVFormatWriter::StreamCookie::~StreamCookie()
 {
+	av_free_packet(&fPacket);
 }
 
 
 status_t
-AVFormatWriter::StreamCookie::Init(const media_format* format)
+AVFormatWriter::StreamCookie::Init(const media_format* format,
+	const media_codec_info* codecInfo)
 {
 	TRACE("AVFormatWriter::StreamCookie::Init()\n");
 
 	BAutolock _(fStreamLock);
 
-	fStream = av_new_stream(fContext, fContext->nb_streams);
+	fPacket.stream_index = fContext->nb_streams;
+	fStream = av_new_stream(fContext, fPacket.stream_index);
 
 	if (fStream == NULL) {
 		TRACE("  failed to add new stream\n");
 		return B_ERROR;
 	}
 
-	// TODO: Setup the stream according to the media format...
+	// Setup the stream according to the media format...
+	if (format->type == B_MEDIA_RAW_VIDEO) {
+		avcodec_get_context_defaults2(fStream->codec, CODEC_TYPE_VIDEO);
+		// frame rate
+		fStream->codec->time_base.den = (int)format->u.raw_video.field_rate;
+		fStream->codec->time_base.num = 1;
+		// video size
+		fStream->codec->width = format->u.raw_video.display.line_width;
+		fStream->codec->height = format->u.raw_video.display.line_count;
+		// pixel aspect ratio
+		fStream->sample_aspect_ratio.num
+			= format->u.raw_video.pixel_width_aspect;
+		fStream->sample_aspect_ratio.den
+			= format->u.raw_video.pixel_height_aspect;
+		if (fStream->sample_aspect_ratio.num == 0
+			|| fStream->sample_aspect_ratio.den == 0) {
+			av_reduce(&fStream->sample_aspect_ratio.num,
+				&fStream->sample_aspect_ratio.den, fStream->codec->width,
+				fStream->codec->height, 255);
+		}
 
+		fStream->codec->sample_aspect_ratio = fStream->sample_aspect_ratio;
+		// TODO: Don't hard code this...
+		fStream->codec->pix_fmt = PIX_FMT_YUV420P;
+	} else if (format->type == B_MEDIA_RAW_AUDIO) {
+		avcodec_get_context_defaults2(fStream->codec, CODEC_TYPE_AUDIO);
+		// TODO: ...
+	}
+
+	// TODO: This is a hack for now! Use avcodec_find_encoder_by_name()
+	// or something similar...
+	fStream->codec->codec_id = (CodecID)codecInfo->sub_id;
+
 	return B_OK;
 }
 
@@ -116,12 +153,33 @@
 AVFormatWriter::StreamCookie::WriteChunk(const void* chunkBuffer,
 	size_t chunkSize, media_encode_info* encodeInfo)
 {
-	TRACE("AVFormatWriter::StreamCookie::WriteChunk(%p, %ld)\n",
+	TRACE_PACKET("AVFormatWriter::StreamCookie::WriteChunk(%p, %ld)\n",
 		chunkBuffer, chunkSize);
 
 	BAutolock _(fStreamLock);
 
-	return B_ERROR;
+	// TODO: Probably the AVCodecEncoder needs to pass packet data
+	// in encodeInfo...
+
+	fPacket.data = const_cast<uint8_t*>((const uint8_t*)chunkBuffer);
+	fPacket.size = chunkSize;
+
+#if 0
+	// TODO: Eventually, we need to write interleaved packets, but
+	// maybe we are only supposed to use this if we have actually
+	// more than one stream. For the moment, this crashes in AVPacket
+	// shuffling inside libavformat. Maybe if we want to use this, we
+	// need to allocate a separate AVPacket and copy the chunk buffer.
+	int result = av_interleaved_write_frame(fContext, &fPacket);
+	if (result < 0)
+		TRACE("  av_interleaved_write_frame(): %d\n", result);
+#else
+	int result = av_write_frame(fContext, &fPacket);
+	if (result < 0)
+		TRACE("  av_write_frame(): %d\n", result);
+#endif
+
+	return result == 0 ? B_OK : B_ERROR;
 }
 
 
@@ -183,12 +241,10 @@
 		return B_ERROR;
 	}
 
-	// TODO: Is this how it works?
-	// TODO: Is the cookie stored in ByteIOContext? Or does it need to be
-	// stored in fContext->priv_data?
+	// Setup I/O hooks. This seems to be enough.
 	fContext->pb = &fIOContext;
 
-	// TODO: Set the AVOutputFormat according to fileFormat...
+	// Set the AVOutputFormat according to fileFormat...
 	fContext->oformat = guess_format(fileFormat->short_name,
 		fileFormat->file_extension, fileFormat->mime_type);
 	if (fContext->oformat == NULL) {
@@ -263,7 +319,8 @@
 
 
 status_t
-AVFormatWriter::AllocateCookie(void** _cookie, const media_format* format)
+AVFormatWriter::AllocateCookie(void** _cookie, const media_format* format,
+	const media_codec_info* codecInfo)
 {
 	TRACE("AVFormatWriter::AllocateCookie()\n");
 
@@ -275,7 +332,14 @@
 	StreamCookie* cookie = new(std::nothrow) StreamCookie(fContext,
 		&fStreamLock);
 
-	return cookie->Init(format);
+	status_t ret = cookie->Init(format, codecInfo);
+	if (ret != B_OK) {
+		delete cookie;
+		return ret;
+	}
+
+	*_cookie = cookie;
+	return B_OK;
 }
 
 
@@ -327,7 +391,7 @@
 }
 
 
-// #pragma mark -
+// #pragma mark - I/O hooks
 
 
 /*static*/ int

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h	2009-08-01 01:16:12 UTC (rev 32043)
@@ -28,7 +28,8 @@
 	virtual	status_t			Close();
 
 	virtual	status_t			AllocateCookie(void** cookie,
-									const media_format* format);
+									const media_format* format,
+									const media_codec_info* codecInfo);
 	virtual	status_t			FreeCookie(void* cookie);
 
 	virtual	status_t			SetCopyright(void* cookie,

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp	2009-08-01 01:16:12 UTC (rev 32043)
@@ -20,22 +20,46 @@
 			CODEC_ID_MPEG4,
 			{ 0 }
 		},
-		B_ANY_FORMAT_FAMILY,
+		B_ANY_FORMAT_FAMILY, // TODO: Hm, actually not really /any/ family...
 		B_MEDIA_RAW_VIDEO,
 		B_MEDIA_ENCODED_VIDEO
 	},
 	{
 		{
-			"MP3 Audio",
-			"mp3",
+			"MPEG1 Video",
+			"mpeg1video",
 			0,
-			CODEC_ID_MP3,
+			CODEC_ID_MPEG1VIDEO,
 			{ 0 }
 		},
-		B_ANY_FORMAT_FAMILY,
-		B_MEDIA_RAW_AUDIO,
-		B_MEDIA_ENCODED_AUDIO
-	}
+		B_MPEG_FORMAT_FAMILY,
+		B_MEDIA_RAW_VIDEO,
+		B_MEDIA_ENCODED_VIDEO
+	},
+	{
+		{
+			"MPEG2 Video",
+			"mpeg2video",
+			0,
+			CODEC_ID_MPEG2VIDEO,
+			{ 0 }
+		},
+		B_MPEG_FORMAT_FAMILY,
+		B_MEDIA_RAW_VIDEO,
+		B_MEDIA_ENCODED_VIDEO
+	},
+//	{
+//		{
+//			"MP3 Audio",
+//			"mp3",
+//			0,
+//			CODEC_ID_MP3,
+//			{ 0 }
+//		},
+//		B_ANY_FORMAT_FAMILY,
+//		B_MEDIA_RAW_AUDIO,
+//		B_MEDIA_ENCODED_AUDIO
+//	}
 };
 
 const size_t gEncoderCount = sizeof(gEncoderTable) / sizeof(EncoderDescription);

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp	2009-08-01 01:16:12 UTC (rev 32043)
@@ -24,6 +24,20 @@
 		"avi",
 		{ 0 }
 	},
+	{
+		media_file_format::B_WRITABLE
+			| media_file_format::B_KNOWS_ENCODED_VIDEO
+			| media_file_format::B_KNOWS_ENCODED_AUDIO,
+		{ 0 },
+		B_MPEG_FORMAT_FAMILY,
+		100,
+		{ 0 },
+		"video/mpeg",
+		"MPEG (Motion Picture Experts Group)",
+		"mpg",
+		"mpg",
+		{ 0 }
+	},
 };
 
 const size_t gMuxerCount = sizeof(gMuxerTable) / sizeof(media_file_format);

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-01 01:16:12 UTC (rev 32043)
@@ -673,14 +673,14 @@
 #define CONFIG_MP2_MUXER 0
 #define CONFIG_MP3_MUXER 0
 #define CONFIG_MP4_MUXER 0
-#define CONFIG_MPEG1SYSTEM_MUXER 0
+#define CONFIG_MPEG1SYSTEM_MUXER 1
 #define CONFIG_MPEG1VCD_MUXER 0
-#define CONFIG_MPEG1VIDEO_MUXER 0
+#define CONFIG_MPEG1VIDEO_MUXER 1
 #define CONFIG_MPEG2DVD_MUXER 0
 #define CONFIG_MPEG2SVCD_MUXER 0
-#define CONFIG_MPEG2VIDEO_MUXER 0
+#define CONFIG_MPEG2VIDEO_MUXER 1
 #define CONFIG_MPEG2VOB_MUXER 0
-#define CONFIG_MPEGTS_MUXER 0
+#define CONFIG_MPEGTS_MUXER 1
 #define CONFIG_MPJPEG_MUXER 0
 #define CONFIG_MXF_MUXER 0
 #define CONFIG_MXF_D10_MUXER 0

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavformat/utils.c
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavformat/utils.c	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavformat/utils.c	2009-08-01 01:16:12 UTC (rev 32043)
@@ -2723,7 +2723,10 @@
         AVPacket opkt;
         int ret= av_interleave_packet(s, &opkt, pkt, 0);
         if(ret<=0) //FIXME cleanup needed for ret<0 ?
+{
+av_log(NULL, AV_LOG_ERROR, "av_interleaved_write_frame() - av_interleave_packet() failed.\n");
             return ret;
+}
 
         ret= s->oformat->write_packet(s, &opkt);
 
@@ -2731,9 +2734,15 @@
         pkt= NULL;
 
         if(ret<0)
+{
+av_log(NULL, AV_LOG_ERROR, "av_interleaved_write_frame() - write_packet() failed.\n");
             return ret;
+}
         if(url_ferror(s->pb))
+{
+av_log(NULL, AV_LOG_ERROR, "av_interleaved_write_frame() - url_ferror() failed.\n");
             return url_ferror(s->pb);
+}
     }
 }
 

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/libswscale/swscale.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/libswscale/swscale.h	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/libswscale/swscale.h	2009-08-01 01:16:12 UTC (rev 32043)
@@ -28,7 +28,6 @@
  */
 
 #include "libavutil/avutil.h"
-#include "libavutil/internal.h"
 
 #define LIBSWSCALE_VERSION_MAJOR 0
 #define LIBSWSCALE_VERSION_MINOR 7

Modified: haiku/trunk/src/kits/media/MediaFile.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaFile.cpp	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/kits/media/MediaFile.cpp	2009-08-01 01:16:12 UTC (rev 32043)
@@ -60,7 +60,8 @@
 	CALLED();
 	_Init();
 	fDeleteSource = true;
-	_InitWriter(new(std::nothrow) BFile(ref, O_WRONLY), mfi, flags);
+	_InitWriter(new(std::nothrow) BFile(ref, B_CREATE_FILE | B_ERASE_FILE
+		| B_WRITE_ONLY), mfi, flags);
 }
 
 

Modified: haiku/trunk/src/kits/media/MediaWriter.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaWriter.cpp	2009-08-01 00:04:05 UTC (rev 32042)
+++ haiku/trunk/src/kits/media/MediaWriter.cpp	2009-08-01 01:16:12 UTC (rev 32043)
@@ -110,7 +110,7 @@
 	}
 
 	StreamInfo info;
-	ret = fWriter->AllocateCookie(&info.cookie, format);
+	ret = fWriter->AllocateCookie(&info.cookie, format, codecInfo);
 	if (ret != B_OK) {
 		_plugin_manager.DestroyEncoder(encoder);
 		return ret;



From bonefish at mail.berlios.de  Sat Aug  1 03:18:41 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Sat, 1 Aug 2009 03:18:41 +0200
Subject: [Haiku-commits] r32044 -
	haiku/trunk/src/system/boot/platform/pxe_ia32
Message-ID: <200908010118.n711IfQ4023628@sheep.berlios.de>

Author: bonefish
Date: 2009-08-01 03:18:39 +0200 (Sat, 01 Aug 2009)
New Revision: 32044
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32044&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/pxe_ia32/network.cpp
   haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage1.S
   haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage2.S
Log:
Automatic whitespace cleanup.


Modified: haiku/trunk/src/system/boot/platform/pxe_ia32/network.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/pxe_ia32/network.cpp	2009-08-01 01:16:12 UTC (rev 32043)
+++ haiku/trunk/src/system/boot/platform/pxe_ia32/network.cpp	2009-08-01 01:18:39 UTC (rev 32044)
@@ -168,7 +168,7 @@
 UNDI::Init()
 {
 	TRACE("UNDI::Init\n");
-	
+
 	PXENV_UNDI_GET_INFORMATION get_info;
 	PXENV_UNDI_GET_STATE get_state;
 	PXENV_UNDI_OPEN undi_open;
@@ -177,8 +177,8 @@
 	status_t error = PXEService::Init();
 	if (error != B_OK)
 		return error;
-	
-	dprintf("client-ip: %lu.%lu.%lu.%lu, server-ip: %lu.%lu.%lu.%lu\n", 
+
+	dprintf("client-ip: %lu.%lu.%lu.%lu, server-ip: %lu.%lu.%lu.%lu\n",
 		(fClientIP >> 24) & 0xff, (fClientIP >> 16) & 0xff, (fClientIP >> 8) & 0xff, fClientIP & 0xff,
 		(fServerIP >> 24) & 0xff, (fServerIP >> 16) & 0xff, (fServerIP >> 8) & 0xff, fServerIP & 0xff);
 
@@ -198,16 +198,16 @@
 		dprintf("PXENV_UNDI_GET_STATE failed, res %x, status %x, ignoring\n", res, get_state.Status);
 	} else {
 		switch (get_state.UNDIstate) {
-			case PXE_UNDI_GET_STATE_STARTED: 
+			case PXE_UNDI_GET_STATE_STARTED:
 				TRACE("PXE_UNDI_GET_STATE_STARTED\n");
 				break;
-			case PXE_UNDI_GET_STATE_INITIALIZED: 
+			case PXE_UNDI_GET_STATE_INITIALIZED:
 				TRACE("PXE_UNDI_GET_STATE_INITIALIZED\n");
 				break;
-			case PXE_UNDI_GET_STATE_OPENED: 
+			case PXE_UNDI_GET_STATE_OPENED:
 				TRACE("PXE_UNDI_GET_STATE_OPENED\n");
 				break;
-			default: 
+			default:
 				TRACE("unknown undi state 0x%02x\n", get_state.UNDIstate);
 				break;
 		}
@@ -229,7 +229,7 @@
 	TRACE("TxBufCt = %x\n", get_info.TxBufCt);
 
 	fMACAddress = get_info.CurrentNodeAddress;
-	
+
 	TRACE("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", fMACAddress[0], fMACAddress[1], fMACAddress[2], fMACAddress[3], fMACAddress[4], fMACAddress[5]);
 
 	return B_OK;
@@ -313,7 +313,7 @@
 			fRxFinished = true;
 			return 0;
 		}
-	
+
 	} else {
 
 		undi_isr.FuncFlag = PXENV_UNDI_ISR_IN_START;
@@ -332,7 +332,7 @@
 		// send EOI to pic ?
 
 //		TRACE("PXENV_UNDI_ISR_OUT_OURS\n");
-	
+
 		undi_isr.FuncFlag = PXENV_UNDI_ISR_IN_PROCESS;
 		res = call_pxe_bios(fPxeData, UNDI_ISR, &undi_isr);
 		if (res != 0 || undi_isr.Status != 0) {

Modified: haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage1.S
===================================================================
--- haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage1.S	2009-08-01 01:16:12 UTC (rev 32043)
+++ haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage1.S	2009-08-01 01:18:39 UTC (rev 32044)
@@ -60,7 +60,7 @@
 
 			cld
 
-			// print start banner	
+			// print start banner
 			movw	$startmsg, %si
 			call	puts
 
@@ -77,7 +77,7 @@
 			call	puts
 
 			// switch to unreal mode
-			cli	
+			cli
 			call	enable_a20
 			call	go_unreal
 			sti
@@ -161,7 +161,7 @@
 			movw	$crlf, %si
 			call	puts
 
-			// handle DHCP options.....		
+			// handle DHCP options.....
 			movw	$PXENV_GET_CACHED_INFO, %bx
 			movw	$s_PXENV_GET_CACHED_INFO_2, %di
 			lcall *	pxenv_api
@@ -198,7 +198,7 @@
 			call	puts
 			movw	$crlf, %si
 			call	puts
-		
+
 			// get file size
 			movl	server_ip, %eax
 			movl	%eax, s_PXENV_TFTP_GET_FSIZE_ServerIPAddress
@@ -244,7 +244,7 @@
 			movw	s_PXENV_TFTP_OPEN_PacketSize, %ax
 			imull	$65535, %eax
 			movl	%eax, max_fsize
-			
+
 			// print max TFTP file size
 			movw	$maxfsize, %si
 			call	puts
@@ -382,7 +382,7 @@
 			movw	$sizefailed, %si
 			call	puts
 			jmp		stop
-		
+
 err_load:
 			movw	$loadfailed, %si
 			call	puts
@@ -401,7 +401,7 @@
 			ret
 putc:		movw	$0x7, %bx
 			movb	$0xe, %ah
-			int		$0x10	
+			int		$0x10
 			jmp		_puts2
 
 puthex32:

Modified: haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage2.S
===================================================================
--- haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage2.S	2009-08-01 01:16:12 UTC (rev 32043)
+++ haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage2.S	2009-08-01 01:18:39 UTC (rev 32044)
@@ -39,12 +39,12 @@
 
 			cld
 
-			// print start banner	
+			// print start banner
 			mov		$kStartMessage + INITIAL_LOAD_OFFSET, %esi
 			call	puts
 
 			// switch to unreal mode
-			cli	
+			cli
 			call	enable_a20
 			call	go_unreal
 			sti



From umccullough at gmail.com  Sat Aug  1 03:22:43 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Fri, 31 Jul 2009 18:22:43 -0700
Subject: [Haiku-commits] r32041 - haiku/trunk/src/preferences/screen
In-Reply-To: <461265595-BeMail@kirilla>
References: <200907312325.n6VNPNox019197@sheep.berlios.de>
	<461265595-BeMail@kirilla>
Message-ID: <1e80d8750907311822n7f14488fo1af58127d760ba90@mail.gmail.com>

2009/7/31 Jonas Sundstr?m <jonas at kirilla.com>:
> axeld at mail.berlios.de wrote:
> ?...
>> If anyone has a SONY (SNY?),
>> ? Dell, or Acer monitor, those are still missing as well.
>
> Confirmed: SNY = Sony

I've also checked elsewhere, and DEL = Dell

Examples:
https://bugzilla.redhat.com/show_bug.cgi?id=494125
http://ubuntuforums.org/archive/index.php/t-1126592.html
https://lists.ubuntu.com/archives/universe-bugs/2009-April/071334.html

It also seems ACR = Acer
http://kernel.org/pub/linux/kernel/people/jbarnes/patches/i915-edid-quirks.patch

- Urias


From stippi at mail.berlios.de  Sat Aug  1 03:33:03 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 1 Aug 2009 03:33:03 +0200
Subject: [Haiku-commits] r32045 - haiku/trunk/src/apps/mediaconverter
Message-ID: <200908010133.n711X3jQ024329@sheep.berlios.de>

Author: stippi
Date: 2009-08-01 03:33:01 +0200 (Sat, 01 Aug 2009)
New Revision: 32045
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32045&view=rev

Modified:
   haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
Log:
Fix compilation and small cleanups.


Modified: haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp	2009-08-01 01:18:39 UTC (rev 32044)
+++ haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp	2009-08-01 01:33:01 UTC (rev 32045)
@@ -35,16 +35,14 @@
 // #pragma mark - DirectoryFilter
 
 
-class DirectoryFilter : public BRefFilter
-{
+class DirectoryFilter : public BRefFilter {
 public:
-		DirectoryFilter(){};
-		virtual bool Filter(const entry_ref *ref,
-				BNode *node, struct stat *st, const char *filetype)
-		{
-			return node->IsDirectory();
-		}
-private:
+	DirectoryFilter() {};
+	virtual bool Filter(const entry_ref* ref,
+		BNode* node, struct stat_beos* st, const char* filetype)
+	{
+		return node->IsDirectory();
+	}
 };
 
 
@@ -52,9 +50,9 @@
 
 
 class FileFormatMenuItem : public BMenuItem {
-	public:
-				FileFormatMenuItem(media_file_format* format);
-	virtual		~FileFormatMenuItem();
+public:
+	FileFormatMenuItem(media_file_format* format);
+	virtual ~FileFormatMenuItem();
 
 	media_file_format fFileFormat;
 };



From stippi at mail.berlios.de  Sat Aug  1 03:33:39 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 1 Aug 2009 03:33:39 +0200
Subject: [Haiku-commits] r32046 - haiku/trunk/src/apps/mediaconverter
Message-ID: <200908010133.n711Xdud024347@sheep.berlios.de>

Author: stippi
Date: 2009-08-01 03:33:38 +0200 (Sat, 01 Aug 2009)
New Revision: 32046
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32046&view=rev

Modified:
   haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp
Log:
* Auto white-space cleanup.
* Do not override pixel aspect unnecessarily.


Modified: haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp	2009-08-01 01:33:01 UTC (rev 32045)
+++ haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp	2009-08-01 01:33:38 UTC (rev 32046)
@@ -67,7 +67,7 @@
 
 		case START_CONVERSION_MESSAGE:
 			if (!fConverting)
-				StartConverting();			
+				StartConverting();
 			break;
 
 		case CANCEL_CONVERSION_MESSAGE:
@@ -80,21 +80,21 @@
 			DetachCurrentMessage();
 			BMessenger(fWin).SendMessage(msg);
 			break;
-	
+
 		default:
 			BApplication::MessageReceived(msg);
 	}
 }
 
 
-void 
+void
 MediaConverterApp::ReadyToRun()
 {
 	fWin->Show();
 	fWin->PostMessage(INIT_FORMAT_MENUS);
 }
 
-void 
+void
 MediaConverterApp::RefsReceived(BMessage *msg)
 {
 	entry_ref ref;
@@ -134,14 +134,14 @@
 // #pragma mark -
 
 
-bool 
+bool
 MediaConverterApp::IsConverting() const
 {
 	return fConverting;
 }
 
 
-void 
+void
 MediaConverterApp::StartConverting()
 {
 	bool locked = fWin->Lock();
@@ -152,7 +152,7 @@
 		if (fConvertThreadID >= 0) {
 			fConverting = true;
 			fCancel = false;
-			resume_thread(fConvertThreadID);			
+			resume_thread(fConvertThreadID);
 		}
 	}
 
@@ -162,7 +162,7 @@
 }
 
 
-void 
+void
 MediaConverterApp::SetStatusMessage(const char *message)
 {
 	if (fWin != NULL && fWin->Lock()) {
@@ -186,7 +186,7 @@
 		name.Truncate(extIndex + 1);
 	else
 		name.Append(".");
-	
+
 	name.Append(outputFormat->file_extension);
 
 	BEntry inEntry(ref);
@@ -298,8 +298,8 @@
 					}
 					fWin->Unlock();
 				}
-				
-				
+
+
 			} else {
 				fWin->Unlock();
 				break;
@@ -316,7 +316,7 @@
 // #pragma mark -
 
 
-status_t 
+status_t
 MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
 	media_codec_info* audioCodec, media_codec_info* videoCodec,
 	int32 audioQuality, int32 videoQuality,
@@ -359,7 +359,7 @@
 			outAudFormat.type = B_MEDIA_RAW_AUDIO;
 			raf = &(outAudFormat.u.raw_audio);
 			inTrack->DecodedFormat(&outAudFormat);
-			
+
 			audioBuffer = new uint8[raf->buffer_size];
 //			audioFrameSize = (raf->format & media_raw_audio_format::B_AUDIO_SIZE_MASK)
 			audioFrameSize = (raf->format & 0xf) * raf->channel_count;
@@ -377,15 +377,13 @@
 			inVidTrack = inTrack;
 			width = (int32)inFormat.Width();
 			height = (int32)inFormat.Height();
-			
+
 			// construct desired decoded video format
-//			memset(&outVidFormat, 0, sizeof(outVidFormat));
+			memset(&outVidFormat, 0, sizeof(outVidFormat));
 			outVidFormat.type = B_MEDIA_RAW_VIDEO;
 			rvf = &(outVidFormat.u.raw_video);
 			rvf->last_active = (uint32)(height - 1);
 			rvf->orientation = B_VIDEO_TOP_LEFT_RIGHT;
-			rvf->pixel_width_aspect = 1;
-			rvf->pixel_height_aspect = 1;
 			rvf->display.format = B_RGB32;
 			rvf->display.bytes_per_row = 4 * width;
 			rvf->display.line_width = width;
@@ -410,7 +408,7 @@
 						= new MediaEncoderWindow(BRect(50, 50, 520, 555), encoderView);
 					encoderWin->Go();
 						// blocks until the window is quit
-					
+
 					// The quality setting is ignored by the 3ivx encoder if the
 					// view was displayed, but this method is the trigger to read
 					// all the parameter settings
@@ -594,6 +592,6 @@
 {
 	MediaConverterApp app;
 	app.Run();
-	
+
 	return 0;
 }



From anevilyak at mail.berlios.de  Sat Aug  1 03:40:11 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 1 Aug 2009 03:40:11 +0200
Subject: [Haiku-commits] r32047 -
	haiku/trunk/src/apps/debugger/gui/team_window
Message-ID: <200908010140.n711eB5G025252@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-01 03:40:11 +0200 (Sat, 01 Aug 2009)
New Revision: 32047
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32047&view=rev

Modified:
   haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp
Log:
Implement double click / triple click drag selection as in Pe.


Modified: haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp
===================================================================
--- haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp	2009-08-01 01:33:38 UTC (rev 32046)
+++ haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp	2009-08-01 01:40:11 UTC (rev 32047)
@@ -253,14 +253,16 @@
 			void				_FormatLine(const char* line,
 									BString& formattedLine);
 	inline 	int32				_NextTabStop(int32 column) const;
-			float				_FormattedPosition(int32 line, 
+			float				_FormattedPosition(int32 line,
 									int32 offset) const;
 			SelectionPoint		_SelectionPointAt(BPoint where) const;
 			void				_GetSelectionRegion(BRegion& region) const;
 			void				_GetSelectionText(BString& text) const;
 			void				_CopySelectionToClipboard() const;
-			void				_SelectWordAt(const SelectionPoint& point);
-			void				_SelectLineAt(const SelectionPoint& point);
+			void				_SelectWordAt(const SelectionPoint& point,
+									bool extend = false);
+			void				_SelectLineAt(const SelectionPoint& point,
+									bool extend = false);
 			void				_HandleAutoScroll();
 			void				_ScrollHorizontal(int32 charCount);
 			void				_ScrollByLines(int32 lineCount);
@@ -1051,10 +1053,12 @@
 			fLastClickTime = clickTime;
 		}
 
-		if (fClickCount == 2)
+		if (fClickCount == 2) {
 			_SelectWordAt(point);
-		else if (fClickCount == 3) {
+			fSelectionMode = true;
+		} else if (fClickCount == 3) {
 			_SelectLineAt(point);
+			fSelectionMode = true;
 		} else if (!region.Contains(where)) {
 			fSelectionBase = fSelectionStart = fSelectionEnd = point;
 			fSelectionMode = true;
@@ -1080,18 +1084,24 @@
 		switch (transit) {
 			case B_INSIDE_VIEW:
 			case B_OUTSIDE_VIEW:
-				if (point.line > fSelectionBase.line) {
-					fSelectionStart = fSelectionBase;
-					fSelectionEnd = point;
-				} else if (point.line < fSelectionBase.line) {
-					fSelectionEnd = fSelectionBase;
-					fSelectionStart = point;
-				} else if (point.offset > fSelectionBase.offset) {
-					fSelectionStart = fSelectionBase;
-					fSelectionEnd = point;
-				} else {
-					fSelectionEnd = fSelectionBase;
-					fSelectionStart = point;
+				if (fClickCount == 2)
+					_SelectWordAt(point, true);
+				else if (fClickCount == 3)
+					_SelectLineAt(point, true);
+				else {
+					if (point.line > fSelectionBase.line) {
+						fSelectionStart = fSelectionBase;
+						fSelectionEnd = point;
+					} else if (point.line < fSelectionBase.line) {
+						fSelectionEnd = fSelectionBase;
+						fSelectionStart = point;
+					} else if (point.offset > fSelectionBase.offset) {
+						fSelectionStart = fSelectionBase;
+						fSelectionEnd = point;
+					} else {
+						fSelectionEnd = fSelectionBase;
+						fSelectionStart = point;
+					}
 				}
 				break;
 
@@ -1193,7 +1203,7 @@
 }
 
 
-int32 
+int32
 SourceView::TextView::_NextTabStop(int32 column) const
 {
 	return (column / kSpacesPerTab + 1) * kSpacesPerTab;
@@ -1205,12 +1215,12 @@
 {
 	int32 column = 0;
 	for (int32 i = 0; i < offset; i++) {
-		if (fSourceCode->LineAt(line)[i] == '\t') 
+		if (fSourceCode->LineAt(line)[i] == '\t')
 			column = _NextTabStop(column);
 		else
 			++column;
 	}
-	
+
 	return column * fCharacterWidth;
 }
 
@@ -1224,9 +1234,9 @@
 		int32 column = 0;
 		int32 lineLength = fSourceCode->LineLengthAt(line);
 		const char* sourceLine = fSourceCode->LineAt(line);
-		
+
 		for (int32 i = 0; i < lineLength; i++) {
-			if (sourceLine[i] == '\t') 
+			if (sourceLine[i] == '\t')
 				column = _NextTabStop(column);
 			else
 				++column;
@@ -1236,8 +1246,8 @@
 				break;
 			}
 		}
-		
-		if (offset < 0) 
+
+		if (offset < 0)
 			offset = lineLength;
 	}
 
@@ -1336,41 +1346,76 @@
 
 
 void
-SourceView::TextView::_SelectWordAt(const SelectionPoint& point)
+SourceView::TextView::_SelectWordAt(const SelectionPoint& point, bool extend)
 {
 	const char* line = fSourceCode->LineAt(point.line);
-	if (isalpha(line[point.offset]) || isdigit(line[point.offset])) {
-		int32 length = fSourceCode->LineLengthAt(point.line);
-		int32 start = point.offset - 1;
-		int32 end = point.offset + 1;
-		while ((end) < length) {
-			if (!isalpha(line[end]) && !isdigit(line[end]))
-				break;
-			++end;
+	int32 length = fSourceCode->LineLengthAt(point.line);
+	int32 start = point.offset - 1;
+	int32 end = point.offset + 1;
+	while ((end) < length) {
+		if (!isalpha(line[end]) && !isdigit(line[end]))
+			break;
+		++end;
+	}
+	while ((start - 1) >= 0) {
+		if (!isalpha(line[start - 1]) && !isdigit(line[start - 1]))
+			break;
+		--start;
+	}
+
+	if (extend) {
+		if (point.line >= fSelectionBase.line
+			|| (point.line == fSelectionBase.line
+				&& point.offset > fSelectionBase.offset)) {
+			fSelectionStart.line = fSelectionBase.line;
+			fSelectionStart.offset = fSelectionBase.offset;
+			fSelectionEnd.line = point.line;
+			fSelectionEnd.offset = end;
+		} else if (point.line < fSelectionBase.line) {
+			fSelectionStart.line = point.line;
+			fSelectionStart.offset = start;
+			fSelectionEnd.line = fSelectionBase.line;
+			fSelectionEnd.offset = fSelectionBase.offset;
+		} else if (point.line == fSelectionBase.line) {
+			// if we hit here, our offset is before the actual start.
+			fSelectionStart.line = point.line;
+			fSelectionStart.offset = start;
+			fSelectionEnd.line = point.line;
+			fSelectionEnd.offset = fSelectionBase.offset;
 		}
-		while ((start - 1) >= 0) {
-			if (!isalpha(line[start - 1]) && !isdigit(line[start - 1]))
-				break;
-			--start;
-		}
-
-		fSelectionStart.line = point.line;
-		fSelectionStart.offset = start;
+	} else {
+		fSelectionBase.line = fSelectionStart.line = point.line;
+		fSelectionBase.offset = fSelectionStart.offset = start;
 		fSelectionEnd.line = point.line;
 		fSelectionEnd.offset = end;
-		BRegion region;
-		_GetSelectionRegion(region);
-		Invalidate(&region);
 	}
+	BRegion region;
+	_GetSelectionRegion(region);
+	Invalidate(&region);
 }
 
 
 void
-SourceView::TextView::_SelectLineAt(const SelectionPoint& point)
+SourceView::TextView::_SelectLineAt(const SelectionPoint& point, bool extend)
 {
-	fSelectionStart.line = fSelectionEnd.line = point.line;
-	fSelectionStart.offset = 0;
-	fSelectionEnd.offset = fSourceCode->LineLengthAt(point.line);
+	if (extend) {
+		if (point.line >= fSelectionBase.line) {
+			fSelectionStart.line = fSelectionBase.line;
+			fSelectionStart.offset = 0;
+			fSelectionEnd.line = point.line;
+			fSelectionEnd.offset = fSourceCode->LineLengthAt(point.line);
+		} else {
+			fSelectionStart.line = point.line;
+			fSelectionStart.offset = 0;
+			fSelectionEnd.line = fSelectionBase.line;
+			fSelectionEnd.offset = fSourceCode->LineLengthAt(
+				fSelectionBase.line);
+		}
+	} else {
+		fSelectionStart.line = fSelectionEnd.line = point.line;
+		fSelectionStart.offset = 0;
+		fSelectionEnd.offset = fSourceCode->LineLengthAt(point.line);
+	}
 	BRegion region;
 	_GetSelectionRegion(region);
 	Invalidate(&region);
@@ -1403,7 +1448,7 @@
 		factor = (int)(ceilf(difference / fCharacterWidth));
 		_ScrollHorizontal(factor);
 	}
-	
+
 	MouseMoved(point, B_OUTSIDE_VIEW, NULL);
 }
 



From axeld at mail.berlios.de  Sat Aug  1 03:46:55 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sat, 1 Aug 2009 03:46:55 +0200
Subject: [Haiku-commits] r32048 - haiku/trunk/src/preferences/screen
Message-ID: <200908010146.n711ktPG026277@sheep.berlios.de>

Author: axeld
Date: 2009-08-01 03:46:53 +0200 (Sat, 01 Aug 2009)
New Revision: 32048
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32048&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenWindow.cpp
Log:
* Made the refresh slider/menu take the monitor's capabilities into account.


Modified: haiku/trunk/src/preferences/screen/ScreenWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-01 01:40:11 UTC (rev 32047)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-01 01:46:53 UTC (rev 32048)
@@ -310,7 +310,16 @@
 		fRefreshMenu->AddItem(item = new BMenuItem(name.String(), message));
 		item->SetEnabled(false);
 	} else {
+		monitor_info info;
+		if (fScreenMode.GetMonitorInfo(info) == B_OK) {
+			min = max_c(info.min_vertical_frequency, min);
+			max = min_c(info.max_vertical_frequency, max);
+		}
+
 		for (int32 i = 0; i < kRefreshRateCount; ++i) {
+			if (kRefreshRates[i] < min || kRefreshRates[i] > max)
+				continue;
+
 			BString name;
 			name << kRefreshRates[i] << " Hz";
 
@@ -880,8 +889,15 @@
 			if (max > gMaxRefresh)
 				max = gMaxRefresh;
 
+			monitor_info info;
+			if (fScreenMode.GetMonitorInfo(info) == B_OK) {
+				min = max_c(info.min_vertical_frequency, min);
+				max = min_c(info.max_vertical_frequency, max);
+			}
+
 			RefreshWindow *fRefreshWindow = new RefreshWindow(
-				fRefreshField->ConvertToScreen(B_ORIGIN), fSelected.refresh, min, max);
+				fRefreshField->ConvertToScreen(B_ORIGIN), fSelected.refresh,
+				min, max);
 			fRefreshWindow->Show();
 			break;
 		}



From axeld at mail.berlios.de  Sat Aug  1 03:47:42 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sat, 1 Aug 2009 03:47:42 +0200
Subject: [Haiku-commits] r32049 - haiku/trunk/src/preferences/screen
Message-ID: <200908010147.n711lgRA026400@sheep.berlios.de>

Author: axeld
Date: 2009-08-01 03:47:40 +0200 (Sat, 01 Aug 2009)
New Revision: 32049
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32049&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenMode.cpp
   haiku/trunk/src/preferences/screen/ScreenMode.h
Log:
* Added many many more vendors, thanks to Brecht for digging up a nice web
  resource that I couldn't find! Also thanks to Jonas and Urias :-)
* Header cleanup.


Modified: haiku/trunk/src/preferences/screen/ScreenMode.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-08-01 01:46:53 UTC (rev 32048)
+++ haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-08-01 01:47:40 UTC (rev 32049)
@@ -202,7 +202,7 @@
 	SetTVStandard(&screen, mode.tv_standard);
 
 	display_mode displayMode;
-	if (!GetDisplayMode(mode, displayMode))
+	if (!_GetDisplayMode(mode, displayMode))
 		return B_ENTRY_NOT_FOUND;
 
 	return screen.SetMode(workspace, &displayMode, true);
@@ -309,7 +309,7 @@
 {
 	uint32 minClock, maxClock;
 	display_mode displayMode;
-	if (!GetDisplayMode(mode, displayMode))
+	if (!_GetDisplayMode(mode, displayMode))
 		return B_ERROR;
 
 	BScreen screen(fWindow);
@@ -344,20 +344,41 @@
 	uint32 id = (info.vendor[0] << 24) | (info.vendor[1] << 16)
 		| (info.vendor[2] << 8) | (info.vendor[3]);
 
-	// TODO: replace more vendor strings with something readable
 	switch (id) {
 		case 'ADI\0':
 			strcpy(info.vendor, "ADI MicroScan");
 			break;
+		case 'API\0':
+			strcpy(info.vendor, "Acer");
+			break;
+		case 'APP\0':
+			strcpy(info.vendor, "Apple");
+			break;
 		case 'AUO\0':
 			strcpy(info.vendor, "AU Optronics");
 			break;
 		case 'BNQ\0':
 			strcpy(info.vendor, "BenQ");
 			break;
+		case 'CPL\0':
+			strcpy(info.vendor, "ALFA");
+			break;
+		case 'CPQ\0':
+			strcpy(info.vendor, "Compaq");
+			break;
+		case 'DEL\0':
+			strcpy(info.vendor, "Dell");
+			break;
+		case 'DPC\0':
+			strcpy(info.vendor, "Delta Electronics");
+			break;
+		case 'DWE\0':
+			strcpy(info.vendor, "Daewoo");
+			break;
 		case 'EMA\0':
 			strcpy(info.vendor, "eMachines");
 			break;
+		case 'EIZ\0':
 		case 'ENC\0':
 			strcpy(info.vendor, "Eizo");
 			break;
@@ -367,15 +388,52 @@
 		case 'GSM\0':
 			strcpy(info.vendor, "LG");
 			break;
+		case 'HEI\0':
+			strcpy(info.vendor, "Hyundai");
+			break;
+		case 'HIT\0':
+		case 'HTC\0':
+			strcpy(info.vendor, "Hitachi");
+			break;
+		case 'HSL\0':
+			strcpy(info.vendor, "Hansol");
+			break;
 		case 'HWP\0':
 			strcpy(info.vendor, "Hewlett Packard");
 			break;
+		case 'ICL\0':
+			strcpy(info.vendor, "Fujitsu");
+			break;
+		case 'IVM\0':
+			strcpy(info.vendor, "Iiyama");
+			break;
 		case 'LEN\0':
 			strcpy(info.vendor, "Lenovo");
 			break;
+		case 'MAX\0':
+			strcpy(info.vendor, "Maxdata");
+			break;
 		case 'MED\0':
 			strcpy(info.vendor, "Medion");
 			break;
+		case 'MEI\0':
+			strcpy(info.vendor, "Panasonic");
+			break;
+		case 'MEL\0':
+			strcpy(info.vendor, "Mitsubishi");
+			break;
+		case 'MIR\0':
+			strcpy(info.vendor, "miro");
+			break;
+		case 'MTC\0':
+			strcpy(info.vendor, "Mitac");
+			break;
+		case 'NAN\0':
+			strcpy(info.vendor, "Nanao");
+			break;
+		case 'NOK\0':
+			strcpy(info.vendor, "Nokia");
+			break;
 		case 'PHL\0':
 			strcpy(info.vendor, "Philips");
 			break;
@@ -385,9 +443,21 @@
 		case 'SAM\0':
 			strcpy(info.vendor, "Samsung");
 			break;
+		case 'SDI\0':
+			strcpy(info.vendor, "Samtron");
+			break;
 		case 'SHP\0':
 			strcpy(info.vendor, "Sharp");
 			break;
+		case 'SNI\0':
+			strcpy(info.vendor, "Siemens");
+			break;
+		case 'SNY\0':
+			strcpy(info.vendor, "Sony");
+			break;
+		case 'UNM\0':
+			strcpy(info.vendor, "Unisys");
+			break;
 		case 'VIZ\0':
 			strcpy(info.vendor, "Vizio");
 			break;
@@ -431,7 +501,7 @@
 
 
 bool
-ScreenMode::GetDisplayMode(const screen_mode& mode, display_mode& displayMode)
+ScreenMode::_GetDisplayMode(const screen_mode& mode, display_mode& displayMode)
 {
 	uint16 virtualWidth, virtualHeight;
 	int32 bestIndex = -1;

Modified: haiku/trunk/src/preferences/screen/ScreenMode.h
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenMode.h	2009-08-01 01:46:53 UTC (rev 32048)
+++ haiku/trunk/src/preferences/screen/ScreenMode.h	2009-08-01 01:47:40 UTC (rev 32049)
@@ -37,35 +37,39 @@
 
 
 class ScreenMode {
-	public:
-		ScreenMode(BWindow* window);
-		~ScreenMode();
+public:
+							ScreenMode(BWindow* window);
+							~ScreenMode();
 
-		status_t Set(const screen_mode& mode, int32 workspace = ~0);
-		status_t Get(screen_mode& mode, int32 workspace = ~0) const;
-		status_t GetOriginalMode(screen_mode &mode, int32 workspace = ~0) const;
+			status_t		Set(const screen_mode& mode, int32 workspace = ~0);
+			status_t		Get(screen_mode& mode, int32 workspace = ~0) const;
+			status_t		GetOriginalMode(screen_mode &mode,
+								int32 workspace = ~0) const;
 
-		status_t Revert();
-		void UpdateOriginalModes();
+			status_t		Revert();
+			void			UpdateOriginalModes();
 
-		bool SupportsColorSpace(const screen_mode& mode, color_space space);
-		status_t GetRefreshLimits(const screen_mode& mode, float& min,
-			float& max);
-		status_t GetMonitorInfo(monitor_info& info, float* _diagonalInches);
+			bool			SupportsColorSpace(const screen_mode& mode,
+								color_space space);
+			status_t		GetRefreshLimits(const screen_mode& mode,
+								float& min, float& max);
+			status_t		GetMonitorInfo(monitor_info& info,
+								float* _diagonalInches = NULL);
 
-		screen_mode ModeAt(int32 index);
-		int32 CountModes();
+			screen_mode		ModeAt(int32 index);
+			int32			CountModes();
 
-	private:
-		bool GetDisplayMode(const screen_mode& mode, display_mode& displayMode);
+private:
+			bool			_GetDisplayMode(const screen_mode& mode,
+								display_mode& displayMode);
 
-		BWindow*		fWindow;
-		display_mode*	fModeList;
-		uint32			fModeCount;
+			BWindow*		fWindow;
+			display_mode*	fModeList;
+			uint32			fModeCount;
 
-		bool			fUpdatedModes;
-		display_mode	fOriginalDisplayMode[32];
-		screen_mode		fOriginal[32];
+			bool			fUpdatedModes;
+			display_mode	fOriginalDisplayMode[32];
+			screen_mode		fOriginal[32];
 };
 
 #endif	/* SCREEN_MODE_H */



From bonefish at mail.berlios.de  Sat Aug  1 03:54:01 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Sat, 1 Aug 2009 03:54:01 +0200
Subject: [Haiku-commits] r32050 - in haiku/trunk: headers/private/kernel
	headers/private/kernel/arch/x86 src/system/kernel
	src/system/kernel/arch/x86 src/system/kernel/debug
Message-ID: <200908010154.n711s1X0027348@sheep.berlios.de>

Author: bonefish
Date: 2009-08-01 03:53:54 +0200 (Sat, 01 Aug 2009)
New Revision: 32050
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32050&view=rev

Added:
   haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp
Removed:
   haiku/trunk/src/system/kernel/arch/x86/arch_int.c
Modified:
   haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h
   haiku/trunk/headers/private/kernel/debug.h
   haiku/trunk/headers/private/kernel/smp.h
   haiku/trunk/src/system/kernel/arch/x86/Jamfile
   haiku/trunk/src/system/kernel/arch/x86/arch_cpu.cpp
   haiku/trunk/src/system/kernel/arch/x86/arch_interrupts.S
   haiku/trunk/src/system/kernel/arch/x86/arch_smp.c
   haiku/trunk/src/system/kernel/debug/debug.cpp
   haiku/trunk/src/system/kernel/smp.cpp
Log:
More work towards making our double fault handler less triple fault prone:
* SMP:
  - Added smp_send_broadcast_ici_interrupts_disabled(), which is basically
    equivalent to smp_send_broadcast_ici(), but is only called with interrupts
    disabled and gets the CPU index, so it doesn't have to use
    smp_get_current_cpu() (which dereferences the current thread).
  - Added cpu index parameter to smp_intercpu_int_handler().
* x86:
  - arch_int.c -> arch_int.cpp
  - Set up an IDT per CPU. We were using a single IDT for all CPUs, but that
    can't work, since we need different tasks for the double fault interrupt
    vector.
  - Set the per CPU double fault task gates correctly.
  - Renamed set_intr_gate() to set_interrupt_gate and set_system_gate() to
    set_trap_gate() and documented them a bit.
  - Renamed double_fault_exception() x86_double_fault_exception() and fixed
    it not to use smp_get_current_cpu(). Instead we have the new
    x86_double_fault_get_cpu() that deducts the CPU index from the used stack.
  - Fixed the double_fault interrupt handler: It no longer calls int_bottom to
    avoid accessing the current thread.
* debug.cpp:
  - Introduced explicit debug_double_fault() to enter the kernel debugger from
    a double fault handler.
  - Avoid using smp_get_current_cpu().
  - Don't use kprintf() before sDebuggerOnCPU is set. Otherwise
    acquire_spinlock() is invoked by arch_debug_serial_puts().

Things look a bit better when the current thread pointer is broken -- we run
into kernel_debugger_loop() and successfully print the "Welcome to KDL"
message -- but we still dereference the thread pointer afterwards, so that we
don't get a usable kernel debugger yet.


Modified: haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h	2009-08-01 01:47:40 UTC (rev 32049)
+++ haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h	2009-08-01 01:53:54 UTC (rev 32050)
@@ -275,13 +275,15 @@
 void x86_write_cr4(uint32 value);
 uint64 x86_read_msr(uint32 registerNumber);
 void x86_write_msr(uint32 registerNumber, uint64 value);
-void x86_set_task_gate(int32 n, int32 segment);
+void x86_set_task_gate(int32 cpu, int32 n, int32 segment);
+void* x86_get_idt(int32 cpu);
 uint32 x86_count_mtrrs(void);
 void x86_set_mtrr(uint32 index, uint64 base, uint64 length, uint8 type);
 status_t x86_get_mtrr(uint32 index, uint64 *_base, uint64 *_length, uint8 *_type);
 bool x86_check_feature(uint32 feature, enum x86_feature_type type);
 void* x86_get_double_fault_stack(int32 cpu, size_t* _size);
-int x86_double_fault_get_cpu();
+int32 x86_double_fault_get_cpu(void);
+void x86_double_fault_exception(struct iframe* frame);
 
 
 #define read_cr3(value) \

Modified: haiku/trunk/headers/private/kernel/debug.h
===================================================================
--- haiku/trunk/headers/private/kernel/debug.h	2009-08-01 01:47:40 UTC (rev 32049)
+++ haiku/trunk/headers/private/kernel/debug.h	2009-08-01 01:53:54 UTC (rev 32050)
@@ -120,7 +120,8 @@
 extern void		debug_set_page_fault_info(addr_t faultAddress, addr_t pc,
 					uint32 flags);
 extern debug_page_fault_info* debug_get_page_fault_info();
-extern void		debug_trap_cpu_in_kdl(bool returnIfHandedOver);
+extern void		debug_trap_cpu_in_kdl(int32 cpu, bool returnIfHandedOver);
+extern void		debug_double_fault(int32 cpu);
 extern bool		debug_emergency_key_pressed(char key);
 
 extern char		kgetc(void);

Modified: haiku/trunk/headers/private/kernel/smp.h
===================================================================
--- haiku/trunk/headers/private/kernel/smp.h	2009-08-01 01:47:40 UTC (rev 32049)
+++ haiku/trunk/headers/private/kernel/smp.h	2009-08-01 01:53:54 UTC (rev 32050)
@@ -52,12 +52,14 @@
 		uint32 data2, uint32 data3, void *data_ptr, uint32 flags);
 void smp_send_broadcast_ici(int32 message, uint32 data, uint32 data2, uint32 data3,
 		void *data_ptr, uint32 flags);
+void smp_send_broadcast_ici_interrupts_disabled(int32 currentCPU, int32 message,
+		uint32 data, uint32 data2, uint32 data3, void *data_ptr, uint32 flags);
 
 int32 smp_get_num_cpus(void);
 void smp_set_num_cpus(int32 numCPUs);
 int32 smp_get_current_cpu(void);
 
-int smp_intercpu_int_handler(void);
+int smp_intercpu_int_handler(int32 cpu);
 
 #ifdef __cplusplus
 }

Modified: haiku/trunk/src/system/kernel/arch/x86/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/Jamfile	2009-08-01 01:47:40 UTC (rev 32049)
+++ haiku/trunk/src/system/kernel/arch/x86/Jamfile	2009-08-01 01:53:54 UTC (rev 32050)
@@ -16,7 +16,7 @@
 	arch_debug.cpp
 	arch_debug_console.c
 	arch_elf.c
-	arch_int.c
+	arch_int.cpp
 	arch_platform.c
 #	arch_selector.c
 	arch_real_time_clock.c

Modified: haiku/trunk/src/system/kernel/arch/x86/arch_cpu.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_cpu.cpp	2009-08-01 01:47:40 UTC (rev 32049)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_cpu.cpp	2009-08-01 01:53:54 UTC (rev 32050)
@@ -269,8 +269,11 @@
 	tss->io_map_base = sizeof(struct tss);
 
 	// add TSS descriptor for this new TSS
-	set_tss_descriptor(&gGDT[DOUBLE_FAULT_TSS_BASE_SEGMENT + cpuNum],
+	uint16 tssSegmentDescriptorIndex = DOUBLE_FAULT_TSS_BASE_SEGMENT + cpuNum;
+	set_tss_descriptor(&gGDT[tssSegmentDescriptorIndex],
 		(addr_t)tss, sizeof(struct tss));
+
+	x86_set_task_gate(cpuNum, 8, tssSegmentDescriptorIndex << 3);
 }
 
 
@@ -511,8 +514,8 @@
 /*!	Returns the index of the current CPU. Can only be called from the double
 	fault handler.
 */
-int
-x86_double_fault_get_cpu()
+int32
+x86_double_fault_get_cpu(void)
 {
 	uint32 stack = x86_read_ebp();
 	return (stack - (uint32)sDoubleFaultStacks) / kDoubleFaultStackSize;
@@ -561,9 +564,21 @@
 
 	// load the TSS for this cpu
 	// note the main cpu gets initialized in arch_cpu_init_post_vm()
-	if (cpu != 0)
+	if (cpu != 0) {
 		load_tss(cpu);
 
+		// set the IDT
+		struct {
+			uint16	limit;
+			void*	address;
+		} _PACKED descriptor = {
+			256 * 8 - 1,	// 256 descriptors, 8 bytes each (-1 for "limit")
+			x86_get_idt(cpu)
+		};
+
+		asm volatile("lidt	%0" : : "m"(descriptor));
+	}
+
 	return 0;
 }
 
@@ -621,8 +636,6 @@
 	// set the current hardware task on cpu 0
 	load_tss(0);
 
-	x86_set_task_gate(8, DOUBLE_FAULT_TSS_BASE_SEGMENT << 3);
-
 	// setup TLS descriptors (one for every CPU)
 
 	for (i = 0; i < args->num_cpus; i++) {

Deleted: haiku/trunk/src/system/kernel/arch/x86/arch_int.c

Copied: haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp (from rev 31963, haiku/trunk/src/system/kernel/arch/x86/arch_int.c)
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_int.c	2009-07-30 10:41:33 UTC (rev 31963)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp	2009-08-01 01:53:54 UTC (rev 32050)
@@ -0,0 +1,1101 @@
+/*
+ * Copyright 2009, Ingo Weinhold, ingo_weinhold at gmx.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.
+ * Distributed under the terms of the NewOS License.
+ */
+
+#include <cpu.h>
+#include <int.h>
+#include <kscheduler.h>
+#include <ksyscalls.h>
+#include <smp.h>
+#include <team.h>
+#include <thread.h>
+#include <vm.h>
+#include <vm_priv.h>
+
+#include <arch/cpu.h>
+#include <arch/int.h>
+#include <arch/smp.h>
+#include <arch/user_debugger.h>
+#include <arch/vm.h>
+
+#include <arch/x86/arch_apic.h>
+#include <arch/x86/descriptors.h>
+#include <arch/x86/vm86.h>
+
+#include "interrupts.h"
+
+#include <ACPI.h>
+#include <safemode.h>
+#include <string.h>
+#include <stdio.h>
+
+
+//#define TRACE_ARCH_INT
+#ifdef TRACE_ARCH_INT
+#	define TRACE(x) dprintf x
+#else
+#	define TRACE(x) ;
+#endif
+
+// Definitions for the PIC 8259 controller
+// (this is not a complete list, only what we're actually using)
+
+#define PIC_MASTER_CONTROL		0x20
+#define PIC_MASTER_MASK			0x21
+#define PIC_SLAVE_CONTROL		0xa0
+#define PIC_SLAVE_MASK			0xa1
+#define PIC_MASTER_INIT1		PIC_MASTER_CONTROL
+#define PIC_MASTER_INIT2		PIC_MASTER_MASK
+#define PIC_MASTER_INIT3		PIC_MASTER_MASK
+#define PIC_MASTER_INIT4		PIC_MASTER_MASK
+#define PIC_SLAVE_INIT1			PIC_SLAVE_CONTROL
+#define PIC_SLAVE_INIT2			PIC_SLAVE_MASK
+#define PIC_SLAVE_INIT3			PIC_SLAVE_MASK
+#define PIC_SLAVE_INIT4			PIC_SLAVE_MASK
+
+// the edge/level trigger control registers
+#define PIC_MASTER_TRIGGER_MODE	0x4d0
+#define PIC_SLAVE_TRIGGER_MODE	0x4d1
+
+#define PIC_INIT1				0x10
+#define PIC_INIT1_SEND_INIT4	0x01
+#define PIC_INIT3_IR2_IS_SLAVE	0x04
+#define PIC_INIT3_SLAVE_ID2		0x02
+#define PIC_INIT4_x86_MODE		0x01
+
+#define PIC_CONTROL3			0x08
+#define PIC_CONTROL3_READ_ISR	0x03
+#define PIC_CONTROL3_READ_IRR	0x02
+
+#define PIC_NON_SPECIFIC_EOI	0x20
+
+#define PIC_SLAVE_INT_BASE		8
+#define PIC_NUM_INTS			0x0f
+
+
+// Definitions for a 82093AA IO APIC controller
+#define IO_APIC_IDENTIFICATION				0x00
+#define IO_APIC_VERSION						0x01
+#define IO_APIC_ARBITRATION					0x02
+#define IO_APIC_REDIRECTION_TABLE			0x10 // entry = base + 2 * index
+
+// Fields for the version register
+#define IO_APIC_VERSION_SHIFT				0
+#define IO_APIC_VERSION_MASK				0xff
+#define IO_APIC_MAX_REDIRECTION_ENTRY_SHIFT	16
+#define IO_APIC_MAX_REDIRECTION_ENTRY_MASK	0xff
+
+// Fields of each redirection table entry
+#define IO_APIC_DESTINATION_FIELD_SHIFT		56
+#define IO_APIC_DESTINATION_FIELD_MASK		0x0f
+#define IO_APIC_INTERRUPT_MASK_SHIFT		16
+#define IO_APIC_INTERRUPT_MASKED			1
+#define IO_APIC_INTERRUPT_UNMASKED			0
+#define IO_APIC_TRIGGER_MODE_SHIFT			15
+#define IO_APIC_TRIGGER_MODE_EDGE			0
+#define IO_APIC_TRIGGER_MODE_LEVEL			1
+#define IO_APIC_REMOTE_IRR_SHIFT			14
+#define IO_APIC_PIN_POLARITY_SHIFT			13
+#define IO_APIC_PIN_POLARITY_HIGH_ACTIVE	0
+#define IO_APIC_PIN_POLARITY_LOW_ACTIVE		1
+#define IO_APIC_DELIVERY_STATUS_SHIFT		12
+#define IO_APIC_DELIVERY_STATUS_IDLE		0
+#define IO_APIC_DELIVERY_STATUS_PENDING		1
+#define IO_APIC_DESTINATION_MODE_SHIFT		11
+#define IO_APIC_DESTINATION_MODE_PHYSICAL	0
+#define IO_APIC_DESTINATION_MODE_LOGICAL	1
+#define IO_APIC_DELIVERY_MODE_SHIFT			8
+#define IO_APIC_DELIVERY_MODE_MASK			0x07
+#define IO_APIC_DELIVERY_MODE_FIXED			0
+#define IO_APIC_DELIVERY_MODE_LOWEST_PRIO	1
+#define IO_APIC_DELIVERY_MODE_SMI			2
+#define IO_APIC_DELIVERY_MODE_NMI			4
+#define IO_APIC_DELIVERY_MODE_INIT			5
+#define IO_APIC_DELIVERY_MODE_EXT_INT		7
+#define IO_APIC_INTERRUPT_VECTOR_SHIFT		0
+#define IO_APIC_INTERRUPT_VECTOR_MASK		0xff
+
+typedef struct ioapic_s {
+	volatile uint32	io_register_select;
+	uint32			reserved[3];
+	volatile uint32	io_window_register;
+} ioapic;
+
+static ioapic *sIOAPIC = NULL;
+static uint32 sIOAPICMaxRedirectionEntry = 23;
+static void *sLocalAPIC = NULL;
+
+static uint32 sIRQToIOAPICPin[256];
+
+bool gUsingIOAPIC = false;
+
+typedef struct interrupt_controller_s {
+	const char *name;
+	void	(*enable_io_interrupt)(int32 num);
+	void	(*disable_io_interrupt)(int32 num);
+	void	(*configure_io_interrupt)(int32 num, uint32 config);
+	bool	(*is_spurious_interrupt)(int32 num);
+	void	(*end_of_interrupt)(int32 num);
+} interrupt_controller;
+
+static interrupt_controller *sCurrentPIC = NULL;
+
+
+static const char *kInterruptNames[] = {
+	/*  0 */ "Divide Error Exception",
+	/*  1 */ "Debug Exception",
+	/*  2 */ "NMI Interrupt",
+	/*  3 */ "Breakpoint Exception",
+	/*  4 */ "Overflow Exception",
+	/*  5 */ "BOUND Range Exceeded Exception",
+	/*  6 */ "Invalid Opcode Exception",
+	/*  7 */ "Device Not Available Exception",
+	/*  8 */ "Double Fault Exception",
+	/*  9 */ "Coprocessor Segment Overrun",
+	/* 10 */ "Invalid TSS Exception",
+	/* 11 */ "Segment Not Present",
+	/* 12 */ "Stack Fault Exception",
+	/* 13 */ "General Protection Exception",
+	/* 14 */ "Page-Fault Exception",
+	/* 15 */ "-",
+	/* 16 */ "x87 FPU Floating-Point Error",
+	/* 17 */ "Alignment Check Exception",
+	/* 18 */ "Machine-Check Exception",
+	/* 19 */ "SIMD Floating-Point Exception",
+};
+static const int kInterruptNameCount = 20;
+
+#define MAX_ARGS 16
+
+typedef struct {
+	uint32 a, b;
+} desc_table;
+static desc_table* sIDTs[B_MAX_CPU_COUNT];
+
+static uint32 sLevelTriggeredInterrupts = 0;
+	// binary mask: 1 level, 0 edge
+
+// table with functions handling respective interrupts
+typedef void interrupt_handler_function(struct iframe* frame);
+#define INTERRUPT_HANDLER_TABLE_SIZE 256
+interrupt_handler_function* gInterruptHandlerTable[
+	INTERRUPT_HANDLER_TABLE_SIZE];
+
+
+/*!	Initializes a descriptor in an IDT.
+*/
+static void
+set_gate(desc_table *gate_addr, addr_t addr, int type, int dpl)
+{
+	unsigned int gate1; // first byte of gate desc
+	unsigned int gate2; // second byte of gate desc
+
+	gate1 = (KERNEL_CODE_SEG << 16) | (0x0000ffff & addr);
+	gate2 = (0xffff0000 & addr) | 0x8000 | (dpl << 13) | (type << 8);
+
+	gate_addr->a = gate1;
+	gate_addr->b = gate2;
+}
+
+
+/*!	Initializes the descriptor for interrupt vector \a n in the IDT of the
+	boot CPU to an interrupt-gate descriptor with the given procedure address.
+*/
+static void
+set_interrupt_gate(int n, void (*addr)())
+{
+	set_gate(&sIDTs[0][n], (addr_t)addr, 14, DPL_KERNEL);
+}
+
+
+/*!	Initializes the descriptor for interrupt vector \a n in the IDT of the
+	boot CPU to an trap-gate descriptor with the given procedure address.
+*/
+static void
+set_trap_gate(int n, void (*addr)())
+{
+	set_gate(&sIDTs[0][n], (unsigned int)addr, 15, DPL_USER);
+}
+
+
+/*!	Initializes the descriptor for interrupt vector \a n in the IDT of CPU
+	\a cpu to a task-gate descripter referring to the TSS segment identified
+	by TSS segment selector \a segment.
+	For CPUs other than the boot CPU it must not be called before
+	arch_int_init_post_vm() (arch_cpu_init_post_vm() is fine).
+*/
+void
+x86_set_task_gate(int32 cpu, int32 n, int32 segment)
+{
+	sIDTs[cpu][n].a = (segment << 16);
+	sIDTs[cpu][n].b = 0x8000 | (0 << 13) | (0x5 << 8); // present, dpl 0, type 5
+}
+
+
+/*!	Returns the virtual IDT address for CPU \a cpu. */
+void*
+x86_get_idt(int32 cpu)
+{
+	return sIDTs[cpu];
+}
+
+
+/**	Tests if the interrupt in-service register of the responsible
+ *	PIC is set for interrupts 7 and 15, and if that's not the case,
+ *	it must assume it's a spurious interrupt.
+ */
+
+static bool
+pic_is_spurious_interrupt(int32 num)
+{
+	int32 isr;
+
+	if (num != 7)
+		return false;
+
+	// Note, detecting spurious interrupts on line 15 obviously doesn't
+	// work correctly - and since those are extremely rare, anyway, we
+	// just ignore them
+
+	out8(PIC_CONTROL3 | PIC_CONTROL3_READ_ISR, PIC_MASTER_CONTROL);
+	isr = in8(PIC_MASTER_CONTROL);
+	out8(PIC_CONTROL3 | PIC_CONTROL3_READ_IRR, PIC_MASTER_CONTROL);
+
+	return (isr & 0x80) == 0;
+}
+
+
+/**	Sends a non-specified EOI (end of interrupt) notice to the PIC in
+ *	question (or both of them).
+ *	This clears the PIC interrupt in-service bit.
+ */
+
+static void
+pic_end_of_interrupt(int32 num)
+{
+	if (num < 0 || num > PIC_NUM_INTS)
+		return;
+
+	// PIC 8259 controlled interrupt
+	if (num >= PIC_SLAVE_INT_BASE)
+		out8(PIC_NON_SPECIFIC_EOI, PIC_SLAVE_CONTROL);
+
+	// we always need to acknowledge the master PIC
+	out8(PIC_NON_SPECIFIC_EOI, PIC_MASTER_CONTROL);
+}
+
+
+static void
+pic_enable_io_interrupt(int32 num)
+{
+	// interrupt is specified "normalized"
+	if (num < 0 || num > PIC_NUM_INTS)
+		return;
+
+	// enable PIC 8259 controlled interrupt
+
+	TRACE(("pic_enable_io_interrupt: irq %ld\n", num));
+
+	if (num < PIC_SLAVE_INT_BASE)
+		out8(in8(PIC_MASTER_MASK) & ~(1 << num), PIC_MASTER_MASK);
+	else
+		out8(in8(PIC_SLAVE_MASK) & ~(1 << (num - PIC_SLAVE_INT_BASE)), PIC_SLAVE_MASK);
+}
+
+
+static void
+pic_disable_io_interrupt(int32 num)
+{
+	// interrupt is specified "normalized"
+	// never disable slave pic line IRQ 2
+	if (num < 0 || num > PIC_NUM_INTS || num == 2)
+		return;
+
+	// disable PIC 8259 controlled interrupt
+
+	TRACE(("pic_disable_io_interrupt: irq %ld\n", num));
+
+	if (num < PIC_SLAVE_INT_BASE)
+		out8(in8(PIC_MASTER_MASK) | (1 << num), PIC_MASTER_MASK);
+	else
+		out8(in8(PIC_SLAVE_MASK) | (1 << (num - PIC_SLAVE_INT_BASE)), PIC_SLAVE_MASK);
+}
+
+
+static void
+pic_configure_io_interrupt(int32 num, uint32 config)
+{
+	uint8 value;
+	int32 localBit;
+	if (num < 0 || num > PIC_NUM_INTS || num == 2)
+		return;
+
+	TRACE(("pic_configure_io_interrupt: irq %ld; config 0x%08lx\n", num, config));
+
+	if (num < PIC_SLAVE_INT_BASE) {
+		value = in8(PIC_MASTER_TRIGGER_MODE);
+		localBit = num;
+	} else {
+		value = in8(PIC_SLAVE_TRIGGER_MODE);
+		localBit = num - PIC_SLAVE_INT_BASE;
+	}
+
+	if (config & B_LEVEL_TRIGGERED)
+		value |= 1 << localBit;
+	else
+		value &= ~(1 << localBit);
+
+	if (num < PIC_SLAVE_INT_BASE)
+		out8(value, PIC_MASTER_TRIGGER_MODE);
+	else
+		out8(value, PIC_SLAVE_TRIGGER_MODE);
+
+	sLevelTriggeredInterrupts = in8(PIC_MASTER_TRIGGER_MODE)
+		| (in8(PIC_SLAVE_TRIGGER_MODE) << 8);
+}
+
+
+static void
+pic_init(void)
+{
+	static interrupt_controller picController = {
+		"8259 PIC",
+		&pic_enable_io_interrupt,
+		&pic_disable_io_interrupt,
+		&pic_configure_io_interrupt,
+		&pic_is_spurious_interrupt,
+		&pic_end_of_interrupt
+	};
+
+	// Start initialization sequence for the master and slave PICs
+	out8(PIC_INIT1 | PIC_INIT1_SEND_INIT4, PIC_MASTER_INIT1);
+	out8(PIC_INIT1 | PIC_INIT1_SEND_INIT4, PIC_SLAVE_INIT1);
+
+	// Set start of interrupts to 0x20 for master, 0x28 for slave
+	out8(ARCH_INTERRUPT_BASE, PIC_MASTER_INIT2);
+	out8(ARCH_INTERRUPT_BASE + PIC_SLAVE_INT_BASE, PIC_SLAVE_INIT2);
+
+	// Specify cascading through interrupt 2
+	out8(PIC_INIT3_IR2_IS_SLAVE, PIC_MASTER_INIT3);
+	out8(PIC_INIT3_SLAVE_ID2, PIC_SLAVE_INIT3);
+
+	// Set both to operate in 8086 mode
+	out8(PIC_INIT4_x86_MODE, PIC_MASTER_INIT4);
+	out8(PIC_INIT4_x86_MODE, PIC_SLAVE_INIT4);
+
+	out8(0xfb, PIC_MASTER_MASK);	// Mask off all interrupts (except slave pic line IRQ 2).
+	out8(0xff, PIC_SLAVE_MASK); 	// Mask off interrupts on the slave.
+
+	// determine which interrupts are level or edge triggered
+
+#if 0
+	// should set everything possible to level triggered
+	out8(0xf8, PIC_MASTER_TRIGGER_MODE);
+	out8(0xde, PIC_SLAVE_TRIGGER_MODE);
+#endif
+
+	sLevelTriggeredInterrupts = in8(PIC_MASTER_TRIGGER_MODE)
+		| (in8(PIC_SLAVE_TRIGGER_MODE) << 8);
+
+	TRACE(("PIC level trigger mode: 0x%08lx\n", sLevelTriggeredInterrupts));
+
+	// make the pic controller the current one
+	sCurrentPIC = &picController;
+	gUsingIOAPIC = false;
+}
+
+
+static inline uint32
+ioapic_read_32(uint8 registerSelect)
+{
+	sIOAPIC->io_register_select = registerSelect;
+	return sIOAPIC->io_window_register;
+}
+
+
+static inline void
+ioapic_write_32(uint8 registerSelect, uint32 value)
+{
+	sIOAPIC->io_register_select = registerSelect;
+	sIOAPIC->io_window_register = value;
+}
+
+
+static inline uint64
+ioapic_read_64(uint8 registerSelect)
+{
+	uint64 result;
+	sIOAPIC->io_register_select = registerSelect + 1;
+	result = sIOAPIC->io_window_register;
+	result <<= 32;
+	sIOAPIC->io_register_select = registerSelect;
+	result |= sIOAPIC->io_window_register;
+	return result;
+}
+
+
+static inline void
+ioapic_write_64(uint8 registerSelect, uint64 value)
+{
+	sIOAPIC->io_register_select = registerSelect;
+	sIOAPIC->io_window_register = (uint32)value;
+	sIOAPIC->io_register_select = registerSelect + 1;
+	sIOAPIC->io_window_register = (uint32)(value >> 32);
+}
+
+
+static bool
+ioapic_is_spurious_interrupt(int32 num)
+{
+	// the spurious interrupt vector is initialized to the max value in smp
+	return num == 0xff - ARCH_INTERRUPT_BASE;
+}
+
+
+static void
+ioapic_end_of_interrupt(int32 num)
+{
+	*(volatile uint32 *)((char *)sLocalAPIC + APIC_EOI) = 0;
+}
+
+
+static void
+ioapic_enable_io_interrupt(int32 num)
+{
+	uint64 entry;
+	int32 pin = sIRQToIOAPICPin[num];
+	if (pin < 0 || pin > (int32)sIOAPICMaxRedirectionEntry)
+		return;
+
+	TRACE(("ioapic_enable_io_interrupt: IRQ %ld -> pin %ld\n", num, pin));
+
+	entry = ioapic_read_64(IO_APIC_REDIRECTION_TABLE + pin * 2);
+	entry &= ~(1 << IO_APIC_INTERRUPT_MASK_SHIFT);
+	entry |= IO_APIC_INTERRUPT_UNMASKED << IO_APIC_INTERRUPT_MASK_SHIFT;
+	ioapic_write_64(IO_APIC_REDIRECTION_TABLE + pin * 2, entry);
+}
+
+
+static void
+ioapic_disable_io_interrupt(int32 num)
+{
+	uint64 entry;
+	int32 pin = sIRQToIOAPICPin[num];
+	if (pin < 0 || pin > (int32)sIOAPICMaxRedirectionEntry)
+		return;
+
+	TRACE(("ioapic_disable_io_interrupt: IRQ %ld -> pin %ld\n", num, pin));
+
+	entry = ioapic_read_64(IO_APIC_REDIRECTION_TABLE + pin * 2);
+	entry &= ~(1 << IO_APIC_INTERRUPT_MASK_SHIFT);
+	entry |= IO_APIC_INTERRUPT_MASKED << IO_APIC_INTERRUPT_MASK_SHIFT;
+	ioapic_write_64(IO_APIC_REDIRECTION_TABLE + pin * 2, entry);
+}
+
+
+static void
+ioapic_configure_io_interrupt(int32 num, uint32 config)
+{
+	uint64 entry;
+	int32 pin = sIRQToIOAPICPin[num];
+	if (pin < 0 || pin > (int32)sIOAPICMaxRedirectionEntry)
+		return;
+
+	TRACE(("ioapic_configure_io_interrupt: IRQ %ld -> pin %ld; config 0x%08lx\n",
+		num, pin, config));
+
+	entry = ioapic_read_64(IO_APIC_REDIRECTION_TABLE + pin * 2);
+	entry &= ~((1 << IO_APIC_TRIGGER_MODE_SHIFT)
+		| (1 << IO_APIC_PIN_POLARITY_SHIFT)
+		| (IO_APIC_INTERRUPT_VECTOR_MASK << IO_APIC_INTERRUPT_VECTOR_SHIFT));
+
+	if (config & B_LEVEL_TRIGGERED) {
+		entry |= (IO_APIC_TRIGGER_MODE_LEVEL << IO_APIC_TRIGGER_MODE_SHIFT);
+		sLevelTriggeredInterrupts |= (1 << num);
+	} else {
+		entry |= (IO_APIC_TRIGGER_MODE_EDGE << IO_APIC_TRIGGER_MODE_SHIFT);
+		sLevelTriggeredInterrupts &= ~(1 << num);
+	}
+
+	if (config & B_LOW_ACTIVE_POLARITY)
+		entry |= (IO_APIC_PIN_POLARITY_LOW_ACTIVE << IO_APIC_PIN_POLARITY_SHIFT);
+	else
+		entry |= (IO_APIC_PIN_POLARITY_HIGH_ACTIVE << IO_APIC_PIN_POLARITY_SHIFT);
+
+	entry |= (num + ARCH_INTERRUPT_BASE) << IO_APIC_INTERRUPT_VECTOR_SHIFT;
+	ioapic_write_64(IO_APIC_REDIRECTION_TABLE + pin * 2, entry);
+}
+
+
+static void
+ioapic_init(kernel_args *args)
+{
+	uint32 i;
+	uint32 version;
+	uint64 targetAPIC;
+	void *settings;
+	acpi_module_info *acpi;
+
+	static interrupt_controller ioapicController = {
+		"82093AA IOAPIC",
+		&ioapic_enable_io_interrupt,
+		&ioapic_disable_io_interrupt,
+		&ioapic_configure_io_interrupt,
+		&ioapic_is_spurious_interrupt,
+		&ioapic_end_of_interrupt
+	};
+
+	if (args->arch_args.apic == NULL) {
+		dprintf("no local apic available\n");
+		return;
+	}
+
+	// always map the local apic as it can be used for timers even if we
+	// don't end up using the io apic
+	sLocalAPIC = args->arch_args.apic;
+	if (map_physical_memory("local apic", (void *)args->arch_args.apic_phys,
+		B_PAGE_SIZE, B_EXACT_ADDRESS, B_KERNEL_READ_AREA
+		| B_KERNEL_WRITE_AREA, &sLocalAPIC) < B_OK) {
+		panic("mapping the local apic failed");
+		return;
+	}
+
+	if (args->arch_args.ioapic == NULL) {
+		dprintf("no ioapic available, not using ioapics for interrupt routing\n");
+		return;
+	}
+
+	settings = load_driver_settings(B_SAFEMODE_DRIVER_SETTINGS);
+	if (settings != NULL && get_driver_boolean_parameter(settings,
+		B_SAFEMODE_DISABLE_IOAPIC, false, false)) {
+		dprintf("ioapic explicitly disabled, not using ioapics for interrupt routing\n");
+		unload_driver_settings(settings);
+		return;
+	} else if (settings != NULL)
+		unload_driver_settings(settings);
+
+	// TODO: remove when the PCI IRQ routing through ACPI is available below
+	return;
+	if (get_module(B_ACPI_MODULE_NAME, (module_info **)&acpi) != B_OK) {
+		dprintf("acpi module not available, not configuring ioapic\n");
+		return;
+	}
+
+	// map in the ioapic
+	sIOAPIC = (ioapic *)args->arch_args.ioapic;
+	if (map_physical_memory("ioapic", (void *)args->arch_args.ioapic_phys,
+		B_PAGE_SIZE, B_EXACT_ADDRESS, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA,
+		(void **)&sIOAPIC) < B_OK) {
+		panic("mapping the ioapic failed");
+		return;
+	}
+
+	version = ioapic_read_32(IO_APIC_VERSION);
+	if (version == 0xffffffff) {
+		dprintf("ioapic seems inaccessible, not using it\n");
+		return;
+	}
+
+	sLevelTriggeredInterrupts = 0;
+	sIOAPICMaxRedirectionEntry
+		= ((version >> IO_APIC_MAX_REDIRECTION_ENTRY_SHIFT)
+		& IO_APIC_MAX_REDIRECTION_ENTRY_MASK);
+
+	// use the boot CPU as the target for all interrupts
+	targetAPIC = args->arch_args.cpu_apic_id[0];
+
+	// program the interrupt vectors of the ioapic
+	for (i = 0; i <= sIOAPICMaxRedirectionEntry; i++) {
+		// initialize everything to deliver to the boot CPU in physical mode
+		// and masked until explicitly enabled through enable_io_interrupt()
+		uint64 entry = (targetAPIC << IO_APIC_DESTINATION_FIELD_SHIFT)
+			| (IO_APIC_INTERRUPT_MASKED << IO_APIC_INTERRUPT_MASK_SHIFT)
+			| (IO_APIC_DESTINATION_MODE_PHYSICAL << IO_APIC_DESTINATION_MODE_SHIFT)
+			| ((i + ARCH_INTERRUPT_BASE) << IO_APIC_INTERRUPT_VECTOR_SHIFT);
+
+		if (i == 0) {
+			// make redirection entry 0 into an external interrupt
+			entry |= (IO_APIC_TRIGGER_MODE_EDGE << IO_APIC_TRIGGER_MODE_SHIFT)
+				| (IO_APIC_PIN_POLARITY_HIGH_ACTIVE << IO_APIC_PIN_POLARITY_SHIFT)
+				| (IO_APIC_DELIVERY_MODE_EXT_INT << IO_APIC_DELIVERY_MODE_SHIFT);
+		} else if (i < 16) {
+			// make 1-15 ISA interrupts
+			entry |= (IO_APIC_TRIGGER_MODE_EDGE << IO_APIC_TRIGGER_MODE_SHIFT)
+				| (IO_APIC_PIN_POLARITY_HIGH_ACTIVE << IO_APIC_PIN_POLARITY_SHIFT)
+				| (IO_APIC_DELIVERY_MODE_FIXED << IO_APIC_DELIVERY_MODE_SHIFT);
+		} else {
+			// and the rest are PCI interrupts
+			entry |= (IO_APIC_TRIGGER_MODE_LEVEL << IO_APIC_TRIGGER_MODE_SHIFT)
+				| (IO_APIC_PIN_POLARITY_LOW_ACTIVE << IO_APIC_PIN_POLARITY_SHIFT)
+				| (IO_APIC_DELIVERY_MODE_FIXED << IO_APIC_DELIVERY_MODE_SHIFT);
+			sLevelTriggeredInterrupts |= (1 << i);
+		}
+
+		ioapic_write_64(IO_APIC_REDIRECTION_TABLE + 2 * i, entry);
+	}
+
+	// setup default 1:1 mapping
+	for (i = 0; i < 256; i++)
+		sIRQToIOAPICPin[i] = i;
+
+	// TODO: here ACPI needs to be used to properly set up the PCI IRQ
+	// routing.
+
+	// prefer the ioapic over the normal pic
+	put_module(B_ACPI_MODULE_NAME);
+	dprintf("using ioapic for interrupt routing\n");
+	sCurrentPIC = &ioapicController;
+	gUsingIOAPIC = true;
+}
+
+
+void
+arch_int_enable_io_interrupt(int irq)
+{
+	sCurrentPIC->enable_io_interrupt(irq);
+}
+
+
+void
+arch_int_disable_io_interrupt(int irq)
+{
+	sCurrentPIC->disable_io_interrupt(irq);
+}
+
+
+void
+arch_int_configure_io_interrupt(int irq, uint32 config)
+{
+	sCurrentPIC->configure_io_interrupt(irq, config);
+}
+
+
+#undef arch_int_enable_interrupts
+#undef arch_int_disable_interrupts
+#undef arch_int_restore_interrupts
+#undef arch_int_are_interrupts_enabled
+
+
+void
+arch_int_enable_interrupts(void)
+{
+	arch_int_enable_interrupts_inline();
+}
+
+
+int
+arch_int_disable_interrupts(void)
+{
+	return arch_int_disable_interrupts_inline();
+}
+
+
+void
+arch_int_restore_interrupts(int oldstate)
+{
+	arch_int_restore_interrupts_inline(oldstate);
+}
+
+
+bool
+arch_int_are_interrupts_enabled(void)
+{
+	return arch_int_are_interrupts_enabled_inline();
+}
+
+
+static const char *
+exception_name(int number, char *buffer, int32 bufferSize)
+{
+	if (number >= 0 && number < kInterruptNameCount)
+		return kInterruptNames[number];
+
+	snprintf(buffer, bufferSize, "exception %d", number);
+	return buffer;
+}
+
+
+static void
+invalid_exception(struct iframe* frame)
+{
+	struct thread* thread = thread_get_current_thread();
+	char name[32];
+	panic("unhandled trap 0x%lx (%s) at ip 0x%lx, thread %ld!\n",
+		frame->vector, exception_name(frame->vector, name, sizeof(name)),
+		frame->eip, thread ? thread->id : -1);
+}
+
+
+static void
+fatal_exception(struct iframe *frame)
+{
+	char name[32];
+	panic("Fatal exception \"%s\" occurred! Error code: 0x%lx\n",
+		exception_name(frame->vector, name, sizeof(name)), frame->error_code);
+}
+
+
+static void
+unexpected_exception(struct iframe* frame)
+{
+	debug_exception_type type;
+	int signal;
+
+	if (IFRAME_IS_VM86(frame)) {
+		x86_vm86_return((struct vm86_iframe *)frame, (frame->vector == 13) ?
+			B_OK : B_ERROR);
+		// won't get here
+	}
+
+	switch (frame->vector) {
+		case 0:		// Divide Error Exception (#DE)
+			type = B_DIVIDE_ERROR;
+			signal = SIGFPE;
+			break;
+
+		case 4:		// Overflow Exception (#OF)
+			type = B_OVERFLOW_EXCEPTION;
+			signal = SIGTRAP;
+			break;
+
+		case 5:		// BOUND Range Exceeded Exception (#BR)
+			type = B_BOUNDS_CHECK_EXCEPTION;
+			signal = SIGTRAP;
+			break;
+
+		case 6:		// Invalid Opcode Exception (#UD)
+			type = B_INVALID_OPCODE_EXCEPTION;
+			signal = SIGILL;
+			break;
+
+		case 13: 	// General Protection Exception (#GP)
+			type = B_GENERAL_PROTECTION_FAULT;
+			signal = SIGILL;
+			break;
+
+		case 16: 	// x87 FPU Floating-Point Error (#MF)
+			type = B_FLOATING_POINT_EXCEPTION;
+			signal = SIGFPE;
+			break;
+
+		case 17: 	// Alignment Check Exception (#AC)
+			type = B_ALIGNMENT_EXCEPTION;
+			signal = SIGTRAP;
+			break;
+
+		case 19: 	// SIMD Floating-Point Exception (#XF)
+			type = B_FLOATING_POINT_EXCEPTION;
+			signal = SIGFPE;
+			break;
+
+		default:
+			invalid_exception(frame);
+			return;
+	}
+
+	if (IFRAME_IS_USER(frame)) {
+		struct sigaction action;
+		struct thread* thread = thread_get_current_thread();
+
+		enable_interrupts();
+
+		// If the thread has a signal handler for the signal, we simply send it
+		// the signal. Otherwise we notify the user debugger first.
+		if (sigaction(signal, NULL, &action) == 0
+			&& action.sa_handler != SIG_DFL
+			&& action.sa_handler != SIG_IGN) {
+			send_signal(thread->id, signal);
+		} else if (user_debug_exception_occurred(type, signal))
+			send_signal(team_get_current_team_id(), signal);
+	} else {
+		char name[32];
+		panic("Unexpected exception \"%s\" occurred in kernel mode! "
+			"Error code: 0x%lx\n",
+			exception_name(frame->vector, name, sizeof(name)),
+			frame->error_code);
+	}
+}
+
+
+void
+x86_double_fault_exception(struct iframe* frame)
+{
+	int cpu = x86_double_fault_get_cpu();
+
+	// The double fault iframe contains no useful information (as
+	// per Intel's architecture spec). Thus we simply save the
+	// information from the (unhandlable) exception which caused the
+	// double in our iframe. This will result even in useful stack
+	// traces. Only problem is that we trust that at least the
+	// TSS is still accessible.
+	struct tss *tss = &gCPU[cpu].arch.tss;
+
+	frame->cs = tss->cs;
+	frame->es = tss->es;
+	frame->ds = tss->ds;
+	frame->fs = tss->fs;
+	frame->gs = tss->gs;
+	frame->eip = tss->eip;
+	frame->ebp = tss->ebp;
+	frame->esp = tss->esp;
+	frame->eax = tss->eax;
+	frame->ebx = tss->ebx;
+	frame->ecx = tss->ecx;
+	frame->edx = tss->edx;
+	frame->esi = tss->esi;
+	frame->edi = tss->edi;
+	frame->flags = tss->eflags;
+
+	debug_double_fault(cpu);
+}
+
+
+static void
+page_fault_exception(struct iframe* frame)

[... truncated: 703 lines follow ...]


From stippi at mail.berlios.de  Sat Aug  1 03:54:49 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 1 Aug 2009 03:54:49 +0200
Subject: [Haiku-commits] r32051 - haiku/trunk/src/apps/mediaconverter
Message-ID: <200908010154.n711snrk027451@sheep.berlios.de>

Author: stippi
Date: 2009-08-01 03:54:48 +0200 (Sat, 01 Aug 2009)
New Revision: 32051
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32051&view=rev

Modified:
   haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp
Log:
This should transfer the display aspect ratio correctly...


Modified: haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp	2009-08-01 01:53:54 UTC (rev 32050)
+++ haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp	2009-08-01 01:54:48 UTC (rev 32051)
@@ -395,6 +395,18 @@
 				printf("fixing color space (B_RGBA32 -> B_RGB32)");
 				rvf->display.format = B_RGB32;
 			}
+			// Transfer the display aspect ratio.
+			if (inFormat.type == B_MEDIA_ENCODED_VIDEO) {
+				rvf->pixel_width_aspect
+					= inFormat.u.encoded_video.output.pixel_width_aspect;
+				rvf->pixel_height_aspect
+					= inFormat.u.encoded_video.output.pixel_height_aspect;
+			} else {
+				rvf->pixel_width_aspect
+					= inFormat.u.raw_video.pixel_width_aspect;
+				rvf->pixel_height_aspect
+					= inFormat.u.raw_video.pixel_height_aspect;
+			}
 
 			videoBuffer = new (nothrow) uint8[height * rvf->display.bytes_per_row];
 			outVidTrack = outFile->CreateTrack(&outVidFormat, videoCodec);



From anevilyak at gmail.com  Sat Aug  1 03:58:16 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Fri, 31 Jul 2009 20:58:16 -0500
Subject: [Haiku-commits] r32050 - in haiku/trunk: headers/private/kernel
	headers/private/kernel/arch/x86 src/system/kernel
	src/system/kernel/arch/x86 src/system/kernel/debug
In-Reply-To: <200908010154.n711s1X0027348@sheep.berlios.de>
References: <200908010154.n711s1X0027348@sheep.berlios.de>
Message-ID: <f019d2f30907311858t19490eb5l6560ad94797ebef3@mail.gmail.com>

On Fri, Jul 31, 2009 at 8:54 PM, <bonefish at mail.berlios.de> wrote:
> Author: bonefish
> Date: 2009-08-01 03:53:54 +0200 (Sat, 01 Aug 2009)
> New Revision: 32050
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32050&view=rev
>
> ? ?disabled and gets the CPU index, so it doesn't have to use
> ? ?smp_get_current_cpu() (which dereferences the current thread).

Just curious, is there any reason not to use the non-dereferencing
version in general? Is it slower, or does it specifically rely on
information that only applies on the double fault stack? Nice changes!

Regards,

Rene


From stippi at mail.berlios.de  Sat Aug  1 03:59:35 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 1 Aug 2009 03:59:35 +0200
Subject: [Haiku-commits] r32052 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg
Message-ID: <200908010159.n711xZ0B028177@sheep.berlios.de>

Author: stippi
Date: 2009-08-01 03:59:34 +0200 (Sat, 01 Aug 2009)
New Revision: 32052
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32052&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
Log:
Quiet down some debug output.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-01 01:54:48 UTC (rev 32051)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-01 01:59:34 UTC (rev 32052)
@@ -18,9 +18,11 @@
 #undef TRACE
 #define TRACE_AV_CODEC_ENCODER
 #ifdef TRACE_AV_CODEC_ENCODER
-#	define TRACE(x...)	printf(x)
+#	define TRACE	printf
+#	define TRACE_IO(a...)
 #else
-#	define TRACE(x...)
+#	define TRACE(a...)
+#	define TRACE_IO(a...)
 #endif
 
 
@@ -233,7 +235,7 @@
 AVCodecEncoder::_EncodeVideo(const void* buffer, int64 frameCount,
 	media_encode_info* info)
 {
-	TRACE("AVCodecEncoder::_EncodeVideo(%p, %lld, %p)\n", buffer, frameCount,
+	TRACE_IO("AVCodecEncoder::_EncodeVideo(%p, %lld, %p)\n", buffer, frameCount,
 		info);
 
 	if (fChunkBuffer == NULL)
@@ -244,7 +246,6 @@
 	while (frameCount > 0) {
 		size_t bpr = fInputFormat.u.raw_video.display.bytes_per_row;
 		size_t bufferSize = fInputFormat.u.raw_video.display.line_count * bpr;
-		TRACE("  bytes per row: %ld, buffer size: %ld\n", bpr, bufferSize);
 
 		// We should always get chunky bitmaps, so this code should be safe.
 		fSrcFrame.data[0] = (uint8_t*)buffer;



From anevilyak at gmail.com  Sat Aug  1 04:24:43 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Fri, 31 Jul 2009 21:24:43 -0500
Subject: [Haiku-commits] r32049 - haiku/trunk/src/preferences/screen
In-Reply-To: <200908010147.n711lgRA026400@sheep.berlios.de>
References: <200908010147.n711lgRA026400@sheep.berlios.de>
Message-ID: <f019d2f30907311924q42d1266dp771587f1ca77469d@mail.gmail.com>

On Fri, Jul 31, 2009 at 8:47 PM, <axeld at mail.berlios.de> wrote:
> Author: axeld
> Date: 2009-08-01 03:47:40 +0200 (Sat, 01 Aug 2009)
> New Revision: 32049
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32049&view=rev

> Log:
> * Added many many more vendors, thanks to Brecht for digging up a nice web
> ?resource that I couldn't find! Also thanks to Jonas and Urias :-)

I have some more of these...should I send you a diff or just add them
directly? Don't want to step on your toes :)

Regards,

Rene


From anevilyak at mail.berlios.de  Sat Aug  1 06:20:57 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 1 Aug 2009 06:20:57 +0200
Subject: [Haiku-commits] r32053 - haiku/trunk/src/kits/interface
Message-ID: <200908010420.n714KvEX021663@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-01 06:20:56 +0200 (Sat, 01 Aug 2009)
New Revision: 32053
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32053&view=rev

Modified:
   haiku/trunk/src/kits/interface/ListView.cpp
Log:
Fix some regressions in keyboard shift selection behavior introduced by the last set of changes.



Modified: haiku/trunk/src/kits/interface/ListView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ListView.cpp	2009-08-01 01:59:34 UTC (rev 32052)
+++ haiku/trunk/src/kits/interface/ListView.cpp	2009-08-01 04:20:56 UTC (rev 32053)
@@ -414,7 +414,7 @@
 	bool extend
 		= fListType == B_MULTIPLE_SELECTION_LIST
 			&& (modifiers() & B_SHIFT_KEY) != 0;
-
+	
 	switch (bytes[0]) {
 		case B_UP_ARROW:
 		{
@@ -424,9 +424,9 @@
 			} else {
 				if (fAnchorIndex > 0) {
 					if (!extend || fAnchorIndex <= fFirstSelected)
-						Select(fAnchorIndex - 1, extend);
+						Select(--fAnchorIndex, extend);
 					else
-						Deselect(fAnchorIndex);
+						Deselect(fAnchorIndex--);
 				}
 			}
 
@@ -441,9 +441,9 @@
 			} else {
 				if (fAnchorIndex < CountItems() - 1) {
 					if (!extend || fAnchorIndex >= fLastSelected)
-						Select(fAnchorIndex + 1, extend);
+						Select(++fAnchorIndex, extend);
 					else
-						Deselect(fAnchorIndex);
+						Deselect(fAnchorIndex++);
 				}
 			}
 
@@ -456,6 +456,7 @@
 				Select(0, fAnchorIndex, true);
 			else
 				Select(0, false);
+			fAnchorIndex = 0;
 			ScrollToSelection();
 			break;
 		case B_END:
@@ -463,6 +464,7 @@
 				Select(fAnchorIndex, CountItems() - 1, true);
 			else
 				Select(CountItems() - 1, false);
+			fAnchorIndex = CountItems() - 1;
 			ScrollToSelection();
 			break;
 



From anevilyak at mail.berlios.de  Sat Aug  1 06:21:51 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 1 Aug 2009 06:21:51 +0200
Subject: [Haiku-commits] r32054 - haiku/trunk/src/preferences/screen
Message-ID: <200908010421.n714LpNn021717@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-01 06:21:50 +0200 (Sat, 01 Aug 2009)
New Revision: 32054
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32054&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenMode.cpp
Log:
Add some more vendor IDs gleaned from some of my monitors here, Urias and one of linux's EDID quirks files.



Modified: haiku/trunk/src/preferences/screen/ScreenMode.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-08-01 04:20:56 UTC (rev 32053)
+++ haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-08-01 04:21:50 UTC (rev 32054)
@@ -348,6 +348,7 @@
 		case 'ADI\0':
 			strcpy(info.vendor, "ADI MicroScan");
 			break;
+		case 'ACR\0':
 		case 'API\0':
 			strcpy(info.vendor, "Acer");
 			break;
@@ -382,12 +383,19 @@
 		case 'ENC\0':
 			strcpy(info.vendor, "Eizo");
 			break;
+		case 'EPI\0':
+			strcpy(info.vendor, "Envision Peripherals");
+			break;
+		case 'FCM\0':
+			strcpy(info.vendor, "Funai Electronics");
+			break;
 		case 'FUS\0':
 			strcpy(info.vendor, "Fujitsu-Siemens");
 			break;
 		case 'GSM\0':
 			strcpy(info.vendor, "LG");
 			break;
+		case 'HIQ\0':
 		case 'HEI\0':
 			strcpy(info.vendor, "Hyundai");
 			break;
@@ -410,6 +418,9 @@
 		case 'LEN\0':
 			strcpy(info.vendor, "Lenovo");
 			break;
+		case 'LPL\0':
+			strcpy(info.vendor, "LG Phillips");
+			break;
 		case 'MAX\0':
 			strcpy(info.vendor, "Maxdata");
 			break;
@@ -437,6 +448,9 @@
 		case 'PHL\0':
 			strcpy(info.vendor, "Philips");
 			break;
+		case 'PTS\0':
+			strcpy(info.vendor, "Proview");
+			break;
 		case 'QDS\0':
 			strcpy(info.vendor, "Quanta Display");
 			break;



From anevilyak at mail.berlios.de  Sat Aug  1 06:33:40 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 1 Aug 2009 06:33:40 +0200
Subject: [Haiku-commits] r32055 - haiku/trunk/src/preferences/screen
Message-ID: <200908010433.n714Xedp024675@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-01 06:33:38 +0200 (Sat, 01 Aug 2009)
New Revision: 32055
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32055&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenMode.cpp
Log:
Added vendor ID for Gateway. Thanks Urias!


Modified: haiku/trunk/src/preferences/screen/ScreenMode.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-08-01 04:21:50 UTC (rev 32054)
+++ haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-08-01 04:33:38 UTC (rev 32055)
@@ -395,6 +395,9 @@
 		case 'GSM\0':
 			strcpy(info.vendor, "LG");
 			break;
+		case 'GWY\0':
+			strcpy(info.vendor, "Gateway");
+			break;
 		case 'HIQ\0':
 		case 'HEI\0':
 			strcpy(info.vendor, "Hyundai");



From stefano.ceccherini at gmail.com  Sat Aug  1 09:52:08 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Sat, 1 Aug 2009 09:52:08 +0200
Subject: [Haiku-commits] r32035 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <200907312113.n6VLDLEP008679@sheep.berlios.de>
References: <200907312113.n6VLDLEP008679@sheep.berlios.de>
Message-ID: <894b9700908010052w4fb9b003q395b6c1593c01a01@mail.gmail.com>

2009/7/31  <axeld at mail.berlios.de>:
> Author: axeld
> Date: 2009-07-31 23:13:19 +0200 (Fri, 31 Jul 2009)
> New Revision: 32035
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32035&view=rev
>
> Modified:
> ? haiku/trunk/headers/os/support/String.h
> ? haiku/trunk/src/kits/support/String.cpp
> Log:
> * Added desperately missing Trim() method.

And Trim Left(), and TrimRight() ? :-)


From jackburton at mail.berlios.de  Sat Aug  1 10:14:20 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Sat, 1 Aug 2009 10:14:20 +0200
Subject: [Haiku-commits] r32056 - in haiku/trunk: headers/private/interface
	src/kits/interface
Message-ID: <200908010814.n718EKUG017800@sheep.berlios.de>

Author: jackburton
Date: 2009-08-01 10:14:18 +0200 (Sat, 01 Aug 2009)
New Revision: 32056
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32056&view=rev

Modified:
   haiku/trunk/headers/private/interface/MenuPrivate.h
   haiku/trunk/src/kits/interface/Menu.cpp
   haiku/trunk/src/kits/interface/MenuPrivate.cpp
Log:
Some cleanups: made the bitmaps static, moved variables around. No functional change.


Modified: haiku/trunk/headers/private/interface/MenuPrivate.h
===================================================================
--- haiku/trunk/headers/private/interface/MenuPrivate.h	2009-08-01 04:33:38 UTC (rev 32055)
+++ haiku/trunk/headers/private/interface/MenuPrivate.h	2009-08-01 08:14:18 UTC (rev 32056)
@@ -17,11 +17,14 @@
 	MENU_STATE_CLOSED = 5
 };
 
+
 class BBitmap;
 class BMenu;
 class BWindow;
 
 namespace BPrivate {
+
+extern const char *kEmptyMenuLabel;
 	
 class MenuPrivate {
 public:
@@ -37,7 +40,8 @@
 	BRect Padding() const;
 	void GetItemMargins(float *, float *, float *, float *) const;
 
-	bool IsAltCommandKey() const;
+	static bool IsAltCommandKey();
+
 	int State(BMenuItem **item = NULL) const;
 	
 	void Install(BWindow *window);
@@ -56,18 +60,18 @@
 	static const BBitmap *MenuItemShift();
 private:
 	BMenu *fMenu;	
+
+	static BBitmap *sMenuItemAlt;
+	static BBitmap *sMenuItemControl;
+	static BBitmap *sMenuItemOption;
+	static BBitmap *sMenuItemShift;
+
 };
 
-extern BBitmap *gMenuItemAlt;
-extern BBitmap *gMenuItemControl;
-extern BBitmap *gMenuItemOption;
-extern BBitmap *gMenuItemShift;
 
 };
 
-extern const char *kEmptyMenuLabel;
 
-
 // Note: since sqrt is slow, we don't use it and return the square of the distance
 #define square(x) ((x) * (x))
 static inline float

Modified: haiku/trunk/src/kits/interface/Menu.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Menu.cpp	2009-08-01 04:33:38 UTC (rev 32055)
+++ haiku/trunk/src/kits/interface/Menu.cpp	2009-08-01 08:14:18 UTC (rev 32056)
@@ -173,7 +173,7 @@
 };
 
 
-const char *kEmptyMenuLabel = "<empty>";
+const char *BPrivate::kEmptyMenuLabel = "<empty>";
 
 
 struct BMenu::LayoutData {
@@ -2667,7 +2667,8 @@
 		}
 	} else {
 		_CacheFontInfo();
-		window->ResizeTo(StringWidth(kEmptyMenuLabel) + fPad.left + fPad.right,
+		window->ResizeTo(StringWidth(BPrivate::kEmptyMenuLabel)
+			+ fPad.left + fPad.right,
 			fFontHeight + fPad.top + fPad.bottom);
 	}
 

Modified: haiku/trunk/src/kits/interface/MenuPrivate.cpp
===================================================================
--- haiku/trunk/src/kits/interface/MenuPrivate.cpp	2009-08-01 04:33:38 UTC (rev 32055)
+++ haiku/trunk/src/kits/interface/MenuPrivate.cpp	2009-08-01 08:14:18 UTC (rev 32056)
@@ -72,11 +72,13 @@
 
 namespace BPrivate {
 
-BBitmap *gMenuItemAlt;
-BBitmap *gMenuItemControl;
-BBitmap *gMenuItemOption;
-BBitmap *gMenuItemShift;
 
+BBitmap* MenuPrivate::sMenuItemAlt;
+BBitmap* MenuPrivate::sMenuItemControl;
+BBitmap* MenuPrivate::sMenuItemOption;
+BBitmap* MenuPrivate::sMenuItemShift;
+
+
 MenuPrivate::MenuPrivate(BMenu *menu)
 	:
 	fMenu(menu)
@@ -134,10 +136,11 @@
 }
 
 
+/* static */
 bool
-MenuPrivate::IsAltCommandKey() const
+MenuPrivate::IsAltCommandKey()
 {
-	return fMenu->sAltAsCommandKey;
+	return BMenu::sAltAsCommandKey;
 }
 
 
@@ -197,21 +200,21 @@
 	BRect smallRect(0, 0, 16, 10);
 	BRect largeRect(0, 0, 21, 10);
 	try {
-		gMenuItemAlt = new BBitmap(smallRect, B_CMAP8);
-		gMenuItemControl = new BBitmap(smallRect, B_CMAP8);
-		gMenuItemOption = new BBitmap(smallRect, B_CMAP8);	
-		gMenuItemShift = new BBitmap(largeRect, B_CMAP8);
+		sMenuItemAlt = new BBitmap(smallRect, B_CMAP8);
+		sMenuItemControl = new BBitmap(smallRect, B_CMAP8);
+		sMenuItemOption = new BBitmap(smallRect, B_CMAP8);	
+		sMenuItemShift = new BBitmap(largeRect, B_CMAP8);
 	} catch (...) {
 		return B_NO_MEMORY;
 	}
 	
-	gMenuItemAlt->ImportBits(kAltBits, sizeof(kAltBits),
+	sMenuItemAlt->ImportBits(kAltBits, sizeof(kAltBits),
 		17, 0, B_CMAP8);
-	gMenuItemControl->ImportBits(kCtrlBits, sizeof(kCtrlBits),
+	sMenuItemControl->ImportBits(kCtrlBits, sizeof(kCtrlBits),
 		17, 0, B_CMAP8);
-	gMenuItemOption->ImportBits(kOptBits, sizeof(kOptBits),
+	sMenuItemOption->ImportBits(kOptBits, sizeof(kOptBits),
 		17, 0, B_CMAP8);
-	gMenuItemShift->ImportBits(kShiftBits, sizeof(kShiftBits),
+	sMenuItemShift->ImportBits(kShiftBits, sizeof(kShiftBits),
 		22, 0, B_CMAP8);
 	
 	return B_OK;
@@ -222,10 +225,10 @@
 void
 MenuPrivate::DeleteBitmaps()
 {
-	delete gMenuItemAlt;
-	delete gMenuItemControl;
-	delete gMenuItemOption;
-	delete gMenuItemShift;
+	delete sMenuItemAlt;
+	delete sMenuItemControl;
+	delete sMenuItemOption;
+	delete sMenuItemShift;
 }
 
 
@@ -234,9 +237,9 @@
 MenuPrivate::MenuItemCommand()
 {
 	if (BMenu::sAltAsCommandKey)
-		return gMenuItemAlt;
+		return sMenuItemAlt;
 	
-	return gMenuItemControl;
+	return sMenuItemControl;
 }
 
 
@@ -245,9 +248,9 @@
 MenuPrivate::MenuItemControl()
 {
 	if (BMenu::sAltAsCommandKey)
-		return gMenuItemControl;
+		return sMenuItemControl;
 	
-	return gMenuItemAlt;
+	return sMenuItemAlt;
 }
 
 
@@ -255,7 +258,7 @@
 const BBitmap *
 MenuPrivate::MenuItemOption()
 {
-	return gMenuItemOption;
+	return sMenuItemOption;
 }
 
 
@@ -263,7 +266,7 @@
 const BBitmap *
 MenuPrivate::MenuItemShift()
 {
-	return gMenuItemShift;
+	return sMenuItemShift;
 }
 
 



From revol at free.fr  Sat Aug  1 11:25:46 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Sat, 01 Aug 2009 11:25:46 +0200 CEST
Subject: [Haiku-commits] r32041 - haiku/trunk/src/preferences/screen
In-Reply-To: <200907312325.n6VNPNox019197@sheep.berlios.de>
Message-ID: <1978386275-BeMail@laptop>

> Author: axeld
> Date: 2009-08-01 01:25:21 +0200 (Sat, 01 Aug 2009)
> New Revision: 32041
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32041&view=rev
> 
> Modified:
>    haiku/trunk/src/preferences/screen/ScreenMode.cpp
> Log:
> * Added two more vendors found by Urias, thanks! If anyone has a SONY 
> (SNY?),
>   Dell, or Acer monitor, those are still missing as well.

Btw, for those who have GNU/Linux boxen, you can check /var/log/
Xorg.0.log

Oddly I do have an EDID for this antique CRT monitor here.
Oddly too, IIRC I had to select a "generic monitor" in the X11 config 
because it was too dumb to use it ;)

The EDID seems to be DPC

From jackburton at mail.berlios.de  Sat Aug  1 11:39:49 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Sat, 1 Aug 2009 11:39:49 +0200
Subject: [Haiku-commits] r32057 - haiku/trunk/src/apps/haiku3d
Message-ID: <200908010939.n719dnVl024999@sheep.berlios.de>

Author: jackburton
Date: 2009-08-01 11:39:46 +0200 (Sat, 01 Aug 2009)
New Revision: 32057
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32057&view=rev

Modified:
   haiku/trunk/src/apps/haiku3d/Jamfile
   haiku/trunk/src/apps/haiku3d/MathUtils.cpp
   haiku/trunk/src/apps/haiku3d/RenderView.cpp
Log:
Fixed build with gcc4


Modified: haiku/trunk/src/apps/haiku3d/Jamfile
===================================================================
--- haiku/trunk/src/apps/haiku3d/Jamfile	2009-08-01 08:14:18 UTC (rev 32056)
+++ haiku/trunk/src/apps/haiku3d/Jamfile	2009-08-01 09:39:46 UTC (rev 32057)
@@ -22,6 +22,6 @@
 	BitmapTexture.cpp
 	VideoFileTexture.cpp
 
-	: be game GL media translation
+	: be game GL media translation $(TARGET_LIBSUPC++)
 	: Haiku3d.rdef
 ;

Modified: haiku/trunk/src/apps/haiku3d/MathUtils.cpp
===================================================================
--- haiku/trunk/src/apps/haiku3d/MathUtils.cpp	2009-08-01 08:14:18 UTC (rev 32056)
+++ haiku/trunk/src/apps/haiku3d/MathUtils.cpp	2009-08-01 09:39:46 UTC (rev 32057)
@@ -11,7 +11,9 @@
 
 #include "MathUtils.h"
 
+#include <math.h>
 
+
 float
 MathUtils::EaseInOutCubic(float t /*time*/, float b /*begin*/, float c /*distance*/, float d /*duration*/)
 {

Modified: haiku/trunk/src/apps/haiku3d/RenderView.cpp
===================================================================
--- haiku/trunk/src/apps/haiku3d/RenderView.cpp	2009-08-01 08:14:18 UTC (rev 32056)
+++ haiku/trunk/src/apps/haiku3d/RenderView.cpp	2009-08-01 09:39:46 UTC (rev 32057)
@@ -20,6 +20,8 @@
 #include <TranslationKit.h>
 #include <TranslationUtils.h>
 
+#include <stdio.h>
+
 RenderView::RenderView(BRect frame)
 	:
 	BGLView(frame, "renderView", B_FOLLOW_ALL, B_WILL_DRAW,



From clemens.zeidler at rwth-aachen.de  Sat Aug  1 11:53:02 2009
From: clemens.zeidler at rwth-aachen.de (Clemens zeidler)
Date: Sat, 01 Aug 2009 11:53:02 +0200
Subject: [Haiku-commits] r31990 - haiku/trunk/src/apps/powerstatus
In-Reply-To: <a4855ac50907301349i243ad4afib45b12812b3d06c6@mail.gmail.com>
References: <200907301828.n6UISaHg005813@sheep.berlios.de>
	<37901446270-BeMail@zon>
	<a4855ac50907301349i243ad4afib45b12812b3d06c6@mail.gmail.com>
Message-ID: <op.uxy9qomtsfi1ex@lec-modul>

On Thu, 30 Jul 2009 22:49:39 +0200, Ryan Leavengood <leavengood at gmail.com>  
wrote:

>> BTW with support for multiple screens in mind, it's not safe to assume
>> that a screen starts at (0, 0). IOW the position should be offset by
>> the screen's LeftTop() point.

Ok will look into it when I find time.

> On that note I wonder if BWindow could get a new non-virtual utility
> method CenterOnScreen() to avoid the constant wheel reinvention of
> this functionality?

Also storing the last window position is a pain.

bye,
	Clemens




From cjsthompson at gmail.com  Sat Aug  1 12:58:53 2009
From: cjsthompson at gmail.com (Christoph .J Thompson)
Date: Sat, 1 Aug 2009 12:58:53 +0200
Subject: [Haiku-commits] r32041 - haiku/trunk/src/preferences/screen
In-Reply-To: <1978386275-BeMail@laptop>
References: <200907312325.n6VNPNox019197@sheep.berlios.de>
	<1978386275-BeMail@laptop>
Message-ID: <20090801125853.f9875724.cjsthompson@gmail.com>

Hi,

I checked the X.org log for my monitor whose brand is Sceptre and the model is "X7S-NAGA":

(II) RADEON(0): EDID vendor "SPT", prod id 5913
(II) RADEON(0): Monitor name: Sceptre
(II) RADEON(0): Monitor name: X7S-NAGA
(II) RADEON(0): EDID (in hex):
(II) RADEON(0):         00ffffffffffff004e141917b2000000
(II) RADEON(0):         1c0d01036c221b78eac0f5a3574a9c23
(II) RADEON(0):         114f54bfef008180818a714f6146614a
(II) RADEON(0):         454c01010101302a009851002a403070
(II) RADEON(0):         1300520e1100001e000000fd00324b18
(II) RADEON(0):         500e000a202020202020000000fc0053
(II) RADEON(0):         636570747265200a00000000000000fc
(II) RADEON(0):         005837532d4e4147410a0000000000ec

Cheers,

-- 
Christoph .J Thompson <cjsthompson at gmail.com>


From phoudoin at mail.berlios.de  Sat Aug  1 13:03:18 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Sat, 1 Aug 2009 13:03:18 +0200
Subject: [Haiku-commits] r32058 - haiku/trunk/src/servers/app
Message-ID: <200908011103.n71B3IGZ031042@sheep.berlios.de>

Author: phoudoin
Date: 2009-08-01 13:03:15 +0200 (Sat, 01 Aug 2009)
New Revision: 32058
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32058&view=rev

Modified:
   haiku/trunk/src/servers/app/FontManager.cpp
Log:
Fixed warning.


Modified: haiku/trunk/src/servers/app/FontManager.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontManager.cpp	2009-08-01 09:39:46 UTC (rev 32057)
+++ haiku/trunk/src/servers/app/FontManager.cpp	2009-08-01 11:03:15 UTC (rev 32058)
@@ -511,7 +511,7 @@
 	while (true) {
 		// We just want the file in the kernel file cache...
 		ssize_t read = file.Read(buffer, bufferSize);
-		if (read < bufferSize)
+		if (read < (ssize_t) bufferSize)
 			break;
 	}
 



From mmu_man at mail.berlios.de  Sat Aug  1 14:03:23 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sat, 1 Aug 2009 14:03:23 +0200
Subject: [Haiku-commits] r32059 -
	haiku/trunk/src/system/boot/platform/bios_ia32
Message-ID: <200908011203.n71C3NhP022787@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-01 14:03:22 +0200 (Sat, 01 Aug 2009)
New Revision: 32059
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32059&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/bios_ia32/shell.S
Log:
Add MultiBoot support.
Based on a patch from Dustin Howett, reworked, and help from Vladimir 'phcoder' Serbinenko.
- used defines for clarity, the rest of teh code could make use of them too...
- added a gMultiBootInfo pointer to the passed args, to let C code handle it instead of faking the boot drive ID,
- conditionalized the copy back, maybe we can get rid of it when QEMU handles our default load address correctly,
- added video mode info to ask for 1024x768 but QEMU ignores it anyway, and we might need to show the menu, so it's disabled.


Modified: haiku/trunk/src/system/boot/platform/bios_ia32/shell.S
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/shell.S	2009-08-01 11:03:15 UTC (rev 32058)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/shell.S	2009-08-01 12:03:22 UTC (rev 32059)
@@ -16,6 +16,32 @@
 
 #define GLOBAL(x) .globl x ; x
 
+// GRUB-compatible MultiBoot info
+// we use the official names
+#define MULTIBOOT_MAGIC 0x1badb002
+#define MULTIBOOT_MAGIC2 0x2badb002
+// header flags
+#define MULTIBOOT_PAGE_ALIGN 0x00000001
+#define MULTIBOOT_MEMORY_INFO 0x00000002
+#define MULTIBOOT_VIDEO_MODE 0x00000004
+#define MULTIBOOT_AOUT_KLUDGE 0x00010000
+// info flags
+#define MULTIBOOT_INFO_BOOTDEV 0x00000002
+
+#define OUR_MB_FLAGS (MULTIBOOT_PAGE_ALIGN \
+	| MULTIBOOT_MEMORY_INFO \
+	/*| MULTIBOOT_VIDEO_MODE*/ \
+	| MULTIBOOT_AOUT_KLUDGE)
+
+// load address
+#define LOAD_SEGMENT 0x1000
+#define LOAD_ADDRESS 0x10000
+
+// MultiBoot load address
+#define MB_LOAD_ADDRESS 0x100000
+//#define MB_LOAD_ADDRESS LOAD_ADDRESS
+#define MB_LOAD_OFFSET (MB_LOAD_ADDRESS - LOAD_ADDRESS)
+
 // this saves us some trouble with relocation (I didn't manage GAS to
 // create 32 bit references to labels)
 #define FAILURE_STRING 0x1d0
@@ -283,6 +309,36 @@
 
 //--------------------------------------------------------------
 
+/** MultiBoot entry point
+ */
+
+multiboot_start:
+	//subl		$MULTIBOOT_MAGIC2, %eax
+	//jnz		load_failed		// rts to grub ?
+	movl		%ebx, gMultiBootInfo + MB_LOAD_OFFSET
+	// load the GDT
+	lgdt		gdt_descriptor + MB_LOAD_OFFSET
+
+#if MB_LOAD_ADDRESS != LOAD_ADDRESS
+	// QEMU does not like the real load address...
+	// copy ourselves to the expected location
+	cld
+	mov		$(_end - LOAD_ADDRESS), %ecx
+	add		$3, %ecx
+	shr		$2, %ecx
+	mov		$LOAD_ADDRESS, %edi
+	mov		$MB_LOAD_ADDRESS, %esi
+	rep movsl
+
+	// reload the GDT just in case
+	lgdt		gdt_descriptor
+#endif
+
+relocated_mb_start:
+	ljmp		$0x8, $_protected_code_segment
+
+//--------------------------------------------------------------
+
 /** Enables the a20 gate. It will first try to enable it through
  *	the BIOS, and, if that fails, will use the old style AT mechanism
  *	using the keyboard port.
@@ -331,11 +387,28 @@
 
 //--------------------------------------------------------------
 
-.org 896
+.org 856
 	// since we don't need the above space when the boot loader is
 	// running, it is used as a real mode scratch buffer (as our
 	// boot loader spans over the whole real mode 0x1000 segment)
 
+.align 4
+multiboot_header:
+	.long	MULTIBOOT_MAGIC
+	.long	OUR_MB_FLAGS
+	.long	(0 - MULTIBOOT_MAGIC - OUR_MB_FLAGS)		// checksum (8 bytes)
+	.long	multiboot_header + MB_LOAD_OFFSET
+	.long	.text + MB_LOAD_OFFSET
+	.long	.bss + (MB_LOAD_OFFSET - 24)
+	.long	_end + (MB_LOAD_OFFSET - 24)
+	.long	multiboot_start + MB_LOAD_OFFSET
+#if (OUR_MB_FLAGS & MULTIBOOT_VIDEO_MODE)
+	.long	0	// non text mode
+	.long	1024
+	.long	786
+	.long	24
+#endif
+
 /* global data table */
 
 gdt:
@@ -373,4 +446,7 @@
 GLOBAL(gBootPartitionOffset):
 	.long	0
 
+GLOBAL(gMultiBootInfo):
+	.long	0
+
 .org 1024



From mmu_man at mail.berlios.de  Sat Aug  1 14:32:19 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sat, 1 Aug 2009 14:32:19 +0200
Subject: [Haiku-commits] r32060 -
	haiku/trunk/src/system/boot/platform/bios_ia32
Message-ID: <200908011232.n71CWJuS025809@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-01 14:32:18 +0200 (Sat, 01 Aug 2009)
New Revision: 32060
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32060&view=rev

Added:
   haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.h
Log:
Minimal definition of the MultiBoot Info struct, should be enough for now.
We use official names for defines & struct members.


Added: haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.h
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.h	2009-08-01 12:03:22 UTC (rev 32059)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.h	2009-08-01 12:32:18 UTC (rev 32060)
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2003-2006, Fran?ois Revol, revol at free.fr.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _MULTIBOOT_H
+#define _MULTIBOOT_H
+
+/* minimal part of the MultiBoot API */
+
+/* magics */
+#define MULTIBOOT_MAGIC 0x1badb002
+#define MULTIBOOT_MAGIC2 0x2badb002
+
+/* header flags */
+#define MULTIBOOT_PAGE_ALIGN 0x00000001
+#define MULTIBOOT_MEMORY_INFO 0x00000002
+#define MULTIBOOT_VIDEO_MODE 0x00000004
+#define MULTIBOOT_AOUT_KLUDGE 0x00010000
+
+/* info flags */
+#define MULTIBOOT_INFO_MEMORY 0x00000001
+#define MULTIBOOT_INFO_BOOTDEV 0x00000002
+#define MULTIBOOT_INFO_CMDLINE 0x00000004
+#define MULTIBOOT_INFO_MODS 0x00000008
+#define MULTIBOOT_INFO_MEM_MAP 0x00000040
+
+
+/* info struct passed to the loader */
+struct multiboot_info {
+	uint32 flags;
+	uint32 mem_lower;
+	uint32 mem_upper;
+	uint32 boot_device;
+	uint32 cmdline;
+	uint32 mods_count;
+	uint32 mods_addr;
+	uint32 syms[4];
+	uint32 mmap_length;
+	uint32 mmap_addr;
+	uint32 drives_length;
+	uint32 drives_addr;
+	uint32 config_table;
+	uint32 boot_loader_name;
+	uint32 apm_table;
+	uint32 vbe_control_info;
+	uint32 vbe_mode_info;
+	uint16 vbe_interface_seg;
+	uint16 vbe_interface_off;
+	uint16 vbe_interface_len;
+};
+
+#endif /* _MULTIBOOT_H */



From alex at zappotek.com  Sat Aug  1 16:59:30 2009
From: alex at zappotek.com (Alex)
Date: Sat, 01 Aug 2009 16:59:30 +0200
Subject: [Haiku-commits] r32057 - haiku/trunk/src/apps/haiku3d
In-Reply-To: <200908010939.n719dnVl024999@sheep.berlios.de>
Message-ID: <1249138770-998347fa8c89d2dcc88638eba0d8a755@zappotek.com>

>Author: jackburton>Date: 2009-08-01 11:39:46 +0200 (Sat, 01 Aug 2009)>New Revision: 32057>ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32057&view=rev>Modified:>   haiku/trunk/src/apps/haiku3d/Jamfile>   haiku/trunk/src/apps/haiku3d/MathUtils.cpp>   haiku/trunk/src/apps/haiku3d/RenderView.cpp>Log:>Fixed build with gcc4Thanks!Btw, just fixed a few style issues, but i'm stuck on Windows dialup for the weekend :)Regards,Alex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20090801/cb706eda/attachment.html>

From anevilyak at mail.berlios.de  Sat Aug  1 17:43:55 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 1 Aug 2009 17:43:55 +0200
Subject: [Haiku-commits] r32061 - haiku/trunk/build/jam
Message-ID: <200908011543.n71FhtLX008834@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-01 17:43:54 +0200 (Sat, 01 Aug 2009)
New Revision: 32061
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32061&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackageDependencies
Log:
Added LibIconv as dep for Firefox. Fixes ticket #4169.



Modified: haiku/trunk/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/trunk/build/jam/OptionalPackageDependencies	2009-08-01 12:32:18 UTC (rev 32060)
+++ haiku/trunk/build/jam/OptionalPackageDependencies	2009-08-01 15:43:54 UTC (rev 32061)
@@ -9,6 +9,7 @@
 OptionalPackageDependencies Development : DevelopmentBase Perl ;
 OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
 OptionalPackageDependencies DevelopmentMin : LibIconv ;
+OptionalPackageDependencies Firefox : LibIconv ;
 OptionalPackageDependencies LibLayout : DevelopmentBase ;
 OptionalPackageDependencies NetSurf : OpenSSL ;
 OptionalPackageDependencies OpenSSH : OpenSSL ;



From jackburton at mail.berlios.de  Sat Aug  1 17:57:25 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Sat, 1 Aug 2009 17:57:25 +0200
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
Message-ID: <200908011557.n71FvPDw010067@sheep.berlios.de>

Author: jackburton
Date: 2009-08-01 17:57:22 +0200 (Sat, 01 Aug 2009)
New Revision: 32062
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32062&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/ServerWindow.h
Log:
Completed the server part of BDirectWindow::SetFullScreen(). The window is
now resized and moved correctly. Moved this functionality to its own method.
Should fix bug #4168.


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2009-08-01 15:43:54 UTC (rev 32061)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2009-08-01 15:57:22 UTC (rev 32062)
@@ -126,8 +126,9 @@
 	sem_id	sem;
 	sem_id	sem_ack;
 	area_id	area;
+	BRect	old_window_frame;
+	direct_buffer_info *buffer_info;
 	bool	started;
-	direct_buffer_info *buffer_info;
 };
 
 
@@ -136,8 +137,8 @@
 	sem(-1),
 	sem_ack(-1),
 	area(-1),
-	started(false),
-	buffer_info(NULL)
+	buffer_info(NULL),
+	started(false)
 {
 	area = create_area("direct area", (void **)&buffer_info,
 		B_ANY_ADDRESS, B_PAGE_SIZE, B_NO_LOCK, B_READ_WRITE);
@@ -1164,19 +1165,13 @@
 		}
 		case AS_DIRECT_WINDOW_SET_FULLSCREEN:
 		{
-			// TODO: maybe there is more to do than this?
-			// (like resizing it to screen size?)
 			bool enable;
 			link.Read<bool>(&enable);
 
 			status_t status = B_OK;
 			if (!fWindow->IsOffscreenWindow()) {
 //fDesktop->UnlockSingleWindow();
-				if (enable)
-					fDirectWindowFeel = fWindow->Feel();
-
-				fDesktop->SetWindowFeel(fWindow,
-					enable ? kWindowScreenFeel : fDirectWindowFeel);
+				_DirectWindowSetFullScreen(enable);	
 //fDesktop->LockSingleWindow();
 			} else
 				status = B_BAD_TYPE;
@@ -3720,6 +3715,36 @@
 }
 
 
+void
+ServerWindow::_DirectWindowSetFullScreen(bool enable)
+{
+	if (enable) {
+		fDirectWindowData->old_window_frame = fWindow->Frame();
+		BRect screenFrame =
+			fDesktop->ActiveScreen()->Frame();
+		fDirectWindowFeel = fWindow->Feel();
+		fDesktop->MoveWindowBy(fWindow,
+			- fWindow->Frame().left,
+			- fWindow->Frame().top);
+		fDesktop->ResizeWindowBy(fWindow,
+			screenFrame.Width() - fWindow->Frame().Width(),
+			screenFrame.Height() 
+				- fWindow->Frame().Height());
+	} else {
+		const BRect &oldFrame = fDirectWindowData->old_window_frame;
+		fDesktop->MoveWindowBy(fWindow,
+			oldFrame.left - fWindow->Frame().left,
+			oldFrame.top - fWindow->Frame().top);
+		fDesktop->ResizeWindowBy(fWindow,
+			oldFrame.Width() - fWindow->Frame().Width(),
+			oldFrame.Height() - fWindow->Frame().Height());			
+	}
+
+	fDesktop->SetWindowFeel(fWindow,
+		enable ? kWindowScreenFeel : fDirectWindowFeel);
+}
+
+
 status_t
 ServerWindow::PictureToRegion(ServerPicture *picture, BRegion &region,
 	bool inverse, BPoint where)

Modified: haiku/trunk/src/servers/app/ServerWindow.h
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.h	2009-08-01 15:43:54 UTC (rev 32061)
+++ haiku/trunk/src/servers/app/ServerWindow.h	2009-08-01 15:57:22 UTC (rev 32062)
@@ -131,6 +131,7 @@
 
 			bool				_MessageNeedsAllWindowsLocked(uint32 code) const;
 
+			void				_DirectWindowSetFullScreen(bool set);
 			// TODO: Move me elsewhere
 			status_t			PictureToRegion(ServerPicture *picture,
 									BRegion& region, bool inverse,



From bga at bug-br.org.br  Sat Aug  1 16:43:09 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sat, 01 Aug 2009 16:43:09
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
Message-ID: <229810562-BeMail@Gaspode>

On Sat, 1 Aug 2009 17:57:25 +0200, jackburton at mail.berlios.de said:

> Author: jackburton
> Date: 2009-08-01 17:57:22 +0200 (Sat, 01 Aug 2009)
> New Revision: 32062
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32062&view=rev
> 
> Modified:
>    haiku/trunk/src/servers/app/ServerWindow.cpp
>    haiku/trunk/src/servers/app/ServerWindow.h
> Log:
> Completed the server part of BDirectWindow::SetFullScreen(). The 
> window is
> now resized and moved correctly. Moved this functionality to its own 
> method.
> Should fix bug #4168.

Thanks for the quick fix. I am just wondering if this is really the 
expected behavior based on what the BeBook says:

"In addition, BDirectWindow lets you switch between full-screen 
exclusive mode and windowed modes without breaking down and rebuilding 
the object. A simple call to the SetFullScreen() function does the job.
"

"Note

if you want your direct window to be full-screen but don't want 
exclusive mode, just resize the window to fill the entire screen; since 
full-screen exclusive mode (as set by calling SetFullScreen()) won't 
let other windows draw in front of your direct window, you can't have 
menus in a full-screen exclusive mode direct window."

It looks like all you are doing is resizing the window so it can be 
fullscreen and the exclusive mode seems to be a bit more than that (or, 
of course, I may be missing something).

-Bruno
  


From stefano.ceccherini at gmail.com  Sat Aug  1 18:47:24 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Sat, 1 Aug 2009 18:47:24 +0200
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
In-Reply-To: <229810562-BeMail@Gaspode>
References: <229810562-BeMail@Gaspode>
Message-ID: <894b9700908010947k779153ddlfa9225449a56d7b7@mail.gmail.com>

2009/8/1 Bruno Albuquerque <bga at bug-br.org.br>:

> Thanks for the quick fix. I am just wondering if this is really the
> expected behavior based on what the BeBook says:
>
> "In addition, BDirectWindow lets you switch between full-screen
> exclusive mode and windowed modes without breaking down and rebuilding
> the object. A simple call to the SetFullScreen() function does the job.
> "
>
> "Note
>
> if you want your direct window to be full-screen but don't want
> exclusive mode, just resize the window to fill the entire screen; since
> full-screen exclusive mode (as set by calling SetFullScreen()) won't
> let other windows draw in front of your direct window, you can't have
> menus in a full-screen exclusive mode direct window."
>
> It looks like all you are doing is resizing the window so it can be
> fullscreen and the exclusive mode seems to be a bit more than that (or,
> of course, I may be missing something).
>

The window feel is also changed to a special feel called
kDirectWindowFeel, which prevent other windows to get in front of it.
That part had already been implemented (by Axel, IIRC), but the
resizing / moving part was missing.


From anevilyak at mail.berlios.de  Sat Aug  1 19:10:35 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 1 Aug 2009 19:10:35 +0200
Subject: [Haiku-commits] r32063 - haiku/trunk/build/jam
Message-ID: <200908011710.n71HAZEP013736@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-01 19:10:34 +0200 (Sat, 01 Aug 2009)
New Revision: 32063
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32063&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Fix several incorrect gcc4 and/or hybrid build checks. Closes ticket #4036.



Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-08-01 15:57:22 UTC (rev 32062)
+++ haiku/trunk/build/jam/OptionalPackages	2009-08-01 17:10:34 UTC (rev 32063)
@@ -375,7 +375,7 @@
 if [ IsOptionalHaikuImagePackageAdded Firefox ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage 
 			BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
 			: $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
@@ -400,7 +400,7 @@
 if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage 
 			KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31
 			:  $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip
@@ -437,7 +437,7 @@
 if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package LibLayout available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 		Echo "No optional package LibLayout available for gcc4" ;
 	} else {
 		InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08
@@ -752,7 +752,7 @@
 if [ IsOptionalHaikuImagePackageAdded Vim ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Vim available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage vim-7.2-x86-gcc4-2009-05-31
 			:  $(baseURL)/vim-7.2-x86-gcc4-2009-05-31.zip
 			:



From umccullough at gmail.com  Sat Aug  1 18:44:40 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Sat, 1 Aug 2009 09:44:40 -0700
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
In-Reply-To: <229810562-BeMail@Gaspode>
References: <229810562-BeMail@Gaspode>
Message-ID: <1e80d8750908010944p1a2a116ei331af9449966b80@mail.gmail.com>

On Sat, Aug 1, 2009 at 9:43 AM, Bruno Albuquerque<bga at bug-br.org.br> wrote:
> On Sat, 1 Aug 2009 17:57:25 +0200, jackburton at mail.berlios.de said:
>
>> Author: jackburton
>> Date: 2009-08-01 17:57:22 +0200 (Sat, 01 Aug 2009)
>> New Revision: 32062
>> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32062&view=rev
>>
>> Modified:
>> ? ?haiku/trunk/src/servers/app/ServerWindow.cpp
>> ? ?haiku/trunk/src/servers/app/ServerWindow.h
>> Log:
>> Completed the server part of BDirectWindow::SetFullScreen(). The
>> window is
>> now resized and moved correctly. Moved this functionality to its own
>> method.
>> Should fix bug #4168.
>
> Thanks for the quick fix. I am just wondering if this is really the
> expected behavior based on what the BeBook says:

On another note, I saw ScummVM was failing to go "fullscreen" the
other day while I was testing it - I wonder if this was related. I'll
have to try again.

- Urias


From bga at bug-br.org.br  Sat Aug  1 17:41:08 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sat, 01 Aug 2009 17:41:08
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
In-Reply-To: <1e80d8750908010944p1a2a116ei331af9449966b80@mail.gmail.com>
Message-ID: <412730539-BeMail@Gaspode>

On Sat, 1 Aug 2009 09:44:40 -0700, Urias McCullough said:

> On another note, I saw ScummVM was failing to go "fullscreen" the
> other day while I was testing it - I wonder if this was related. I'll
> have to try again.

It tries to go fullscreen but then ends up in a messed up state. I am 
not sure it is using BDirectWindow when in fullscreen mode as it 
actually changes the screen resolution (but it could also be that it 
just uses BScreen to do that before changing to fullscreen mode).

-Bruno



From leavengood at gmail.com  Sat Aug  1 19:41:49 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Sat, 1 Aug 2009 13:41:49 -0400
Subject: [Haiku-commits] r32044 -
	haiku/trunk/src/system/boot/platform/pxe_ia32
In-Reply-To: <200908010118.n711IfQ4023628@sheep.berlios.de>
References: <200908010118.n711IfQ4023628@sheep.berlios.de>
Message-ID: <a4855ac50908011041w5680fcfch7a80e067b9992dc1@mail.gmail.com>

On Fri, Jul 31, 2009 at 9:18 PM, <bonefish at mail.berlios.de> wrote:
>
> Automatic whitespace cleanup.

When you guys do this, is there a particular tool you use, or just
search and replace in your editor? I know I could do it in VIM, I am
just curious...

On a similar note, the WebKit project has lately been working on a
Python tool for checking and correcting code based on their coding
style (which isn't too different than ours) and it might be worth
looking at for us too.

-- 
Regards,
Ryan


From leavengood at gmail.com  Sat Aug  1 20:09:52 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Sat, 1 Aug 2009 14:09:52 -0400
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
In-Reply-To: <894b9700908010947k779153ddlfa9225449a56d7b7@mail.gmail.com>
References: <229810562-BeMail@Gaspode>
	<894b9700908010947k779153ddlfa9225449a56d7b7@mail.gmail.com>
Message-ID: <a4855ac50908011109x1cd9ad80r3ce42fed7c4b1187@mail.gmail.com>

On Sat, Aug 1, 2009 at 12:47 PM, Stefano
Ceccherini<stefano.ceccherini at gmail.com> wrote:
>
> The window feel is also changed to a special feel called
> kDirectWindowFeel, which prevent other windows to get in front of it.
> That part had already been implemented (by Axel, IIRC), but the
> resizing / moving part was missing.

I suppose this works as a way of emulating the behavior of BeOS, but
isn't the point of BDirectWindow to give the programmer full and
speedy access to the frame buffer? Though I haven't looked at the code
and if it is already doing that then you can ignore me :)

-- 
Regards,
Ryan


From leavengood at gmail.com  Sat Aug  1 20:37:19 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Sat, 1 Aug 2009 14:37:19 -0400
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
In-Reply-To: <a4855ac50908011109x1cd9ad80r3ce42fed7c4b1187@mail.gmail.com>
References: <229810562-BeMail@Gaspode>
	<894b9700908010947k779153ddlfa9225449a56d7b7@mail.gmail.com>
	<a4855ac50908011109x1cd9ad80r3ce42fed7c4b1187@mail.gmail.com>
Message-ID: <a4855ac50908011137i7deeb010g325b323c8bdd1e3c@mail.gmail.com>

On Sat, Aug 1, 2009 at 2:09 PM, Ryan Leavengood<leavengood at gmail.com> wrote:
>
> I suppose this works as a way of emulating the behavior of BeOS, but
> isn't the point of BDirectWindow to give the programmer full and
> speedy access to the frame buffer? Though I haven't looked at the code
> and if it is already doing that then you can ignore me :)

I have since been informed by Rene that this is how the code is
supposed to work, so just ignore the above as suggested ;)

-- 
Regards,
Ryan


From fredrik at modeen.se  Sat Aug  1 20:42:23 2009
From: fredrik at modeen.se (Fredrik =?utf-8?Q?Mod=C3=A8en?=)
Date: Sat, 1 Aug 2009 20:42:23 +0200 (CEST)
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
In-Reply-To: <412730539-BeMail@Gaspode>
References: <412730539-BeMail@Gaspode>
Message-ID: <c8ef7819cb4b36687e6f227d3ab39172.squirrel@webmail2.webbhotellsgruppen.se>


> On Sat, 1 Aug 2009 09:44:40 -0700, Urias McCullough said:
>
>> On another note, I saw ScummVM was failing to go "fullscreen" the
>> other day while I was testing it - I wonder if this was related. I'll
>> have to try again.
>
> It tries to go fullscreen but then ends up in a messed up state. I am
> not sure it is using BDirectWindow when in fullscreen mode as it
> actually changes the screen resolution (but it could also be that it
> just uses BScreen to do that before changing to fullscreen mode).
ScummVM uses SDL right? then the problem should be in more SDL apps.
I had a check and SDL are using BDirectWindow

>
> -Bruno
>
> _______________________________________________
> Haiku-commits mailing list
> Haiku-commits at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/haiku-commits
>


-- 
MVH
Fredrik Mod?en



From bga at bug-br.org.br  Sat Aug  1 18:57:07 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sat, 01 Aug 2009 18:57:07
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
In-Reply-To: <c8ef7819cb4b36687e6f227d3ab39172.squirrel@webmail2.webbhotellsgruppen.se>
Message-ID: <4971264451-BeMail@Gaspode>

On Sat, 1 Aug 2009 20:42:23 +0200 (CEST), Fredrik Mod?en said:

> >> On another note, I saw ScummVM was failing to go "fullscreen" the
> >> other day while I was testing it - I wonder if this was related. 
> > > I'll
> >> have to try again.
> >
> > It tries to go fullscreen but then ends up in a messed up state. I 
> > am
> > not sure it is using BDirectWindow when in fullscreen mode as it
> > actually changes the screen resolution (but it could also be that 
> > it
> > just uses BScreen to do that before changing to fullscreen mode).
>
> ScummVM uses SDL right? then the problem should be in more SDL apps.
> I had a check and SDL are using BDirectWindow

Yes. I also took a look at SDl bu the logic is a bit concoluted. For 
instance, it tries to move and resize the window *AFTER* switching to 
fullscreen which is either unecessary or plain broken. Unfortunatelly I 
could not compile it (even with the patch from Haiku Ports) under Haiku 
so I could not test a possible fix.

-Bruno



From stefano.ceccherini at gmail.com  Sun Aug  2 09:24:15 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Sun, 2 Aug 2009 09:24:15 +0200
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
In-Reply-To: <4971264451-BeMail@Gaspode>
References: <c8ef7819cb4b36687e6f227d3ab39172.squirrel@webmail2.webbhotellsgruppen.se>
	<4971264451-BeMail@Gaspode>
Message-ID: <894b9700908020024g2f3f654fu7bbfb02e324f33c5@mail.gmail.com>

2009/8/1 Bruno Albuquerque <bga at bug-br.org.br>:

>> ScummVM uses SDL right? then the problem should be in more SDL apps.
>> I had a check and SDL are using BDirectWindow

Actually, it's not.
Even if it creates a BDirectWindow, it doesn't implement the needed
DirectConnected() hook, so it just uses it as a normal BWindow.


From superstippi at gmx.de  Sun Aug  2 03:36:08 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Sun, 02 Aug 2009 03:36:08 +0200
Subject: [Haiku-commits] r32062 - haiku/trunk/src/servers/app
In-Reply-To: <a4855ac50908011109x1cd9ad80r3ce42fed7c4b1187@mail.gmail.com>
References: <229810562-BeMail@Gaspode>
	<894b9700908010947k779153ddlfa9225449a56d7b7@mail.gmail.com>
	<a4855ac50908011109x1cd9ad80r3ce42fed7c4b1187@mail.gmail.com>
Message-ID: <20090802033608.604.2@bepc.1249176297.fake>


On 2009-08-01 at 20:09:52 [+0200], Ryan Leavengood <leavengood at gmail.com> 
wrote:
> On Sat, Aug 1, 2009 at 12:47 PM, Stefano
> Ceccherini<stefano.ceccherini at gmail.com> wrote:
> >
> > The window feel is also changed to a special feel called 
> > kDirectWindowFeel, which prevent other windows to get in front of it. 
> > That part had already been implemented (by Axel, IIRC), but the 
> > resizing / moving part was missing.
> 
> I suppose this works as a way of emulating the behavior of BeOS, but 
> isn't the point of BDirectWindow to give the programmer full and speedy 
> access to the frame buffer? Though I haven't looked at the code and if it 
> is already doing that then you can ignore me :)

You may feel ignored... ;-)

Ciao,
-Stephan


From ingo_weinhold at gmx.de  Sat Aug  1 21:24:12 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Sat, 01 Aug 2009 21:24:12 +0200
Subject: [Haiku-commits] r32044 -
 haiku/trunk/src/system/boot/platform/pxe_ia32
In-Reply-To: <a4855ac50908011041w5680fcfch7a80e067b9992dc1@mail.gmail.com>
References: <200908010118.n711IfQ4023628@sheep.berlios.de>
	<a4855ac50908011041w5680fcfch7a80e067b9992dc1@mail.gmail.com>
Message-ID: <20090801212412.698.2@knochen-vm.localdomain>


On 2009-08-01 at 19:41:49 [+0200], Ryan Leavengood <leavengood at gmail.com> 
wrote:
> On Fri, Jul 31, 2009 at 9:18 PM, <bonefish at mail.berlios.de> wrote:
> >
> > Automatic whitespace cleanup.
> 
> When you guys do this, is there a particular tool you use, or just
> search and replace in your editor? I know I could do it in VIM, I am
> just curious...

Most editors have a setting that makes them remove whitespace at the end of 
lines automatically. I have no idea whether this also applies to vim, but 
it would surprise me, if it didn't. In a current Pe you'll find the option 
in the preferences under "Files" -> "When saving a file" -> "Discard 
trailing space".

> On a similar note, the WebKit project has lately been working on a
> Python tool for checking and correcting code based on their coding
> style (which isn't too different than ours) and it might be worth
> looking at for us too.

That would be interesting indeed.

CU, Ingo


From superstippi at gmx.de  Sun Aug  2 03:35:26 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Sun, 02 Aug 2009 03:35:26 +0200
Subject: [Haiku-commits] r32044 -
 haiku/trunk/src/system/boot/platform/pxe_ia32
In-Reply-To: <a4855ac50908011041w5680fcfch7a80e067b9992dc1@mail.gmail.com>
References: <200908010118.n711IfQ4023628@sheep.berlios.de>
	<a4855ac50908011041w5680fcfch7a80e067b9992dc1@mail.gmail.com>
Message-ID: <20090802033526.572.1@bepc.1249176297.fake>

Hi,

On 2009-08-01 at 19:41:49 [+0200], Ryan Leavengood <leavengood at gmail.com> 
wrote:
> On Fri, Jul 31, 2009 at 9:18 PM, <bonefish at mail.berlios.de> wrote:
> >
> > Automatic whitespace cleanup.
> 
> When you guys do this, is there a particular tool you use, or just search 
> and replace in your editor? I know I could do it in VIM, I am just 
> curious...

Ingo added it to Pe a while back, it's already in the version that is the 
current optional package, but you have to enable it in the Editor part of 
the settings.

Best regards,
-Stephan


From ingo_weinhold at gmx.de  Sat Aug  1 21:20:43 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Sat, 01 Aug 2009 21:20:43 +0200
Subject: [Haiku-commits] r32050 - in haiku/trunk: headers/private/kernel
 headers/private/kernel/arch/x86 src/system/kernel
 src/system/kernel/arch/x86 src/system/kernel/debug
In-Reply-To: <f019d2f30907311858t19490eb5l6560ad94797ebef3@mail.gmail.com>
References: <200908010154.n711s1X0027348@sheep.berlios.de>
	<f019d2f30907311858t19490eb5l6560ad94797ebef3@mail.gmail.com>
Message-ID: <20090801212043.668.1@knochen-vm.localdomain>


On 2009-08-01 at 03:58:16 [+0200], Rene Gollent <anevilyak at gmail.com> wrote:
> On Fri, Jul 31, 2009 at 8:54 PM, <bonefish at mail.berlios.de> wrote:
> > Author: bonefish
> > Date: 2009-08-01 03:53:54 +0200 (Sat, 01 Aug 2009)
> > New Revision: 32050
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32050&view=rev
> >
> >    disabled and gets the CPU index, so it doesn't have to use
> >    smp_get_current_cpu() (which dereferences the current thread).
> 
> Just curious, is there any reason not to use the non-dereferencing
> version in general? Is it slower, or does it specifically rely on
> information that only applies on the double fault stack?

It can only be called with interrupts disabled and has a CPU index 
parameter. The only way to get the CPU index in architecture independent 
code is smp_get_current_cpu(). The double fault handler can determine the 
CPU index, since it uses a separate stack per CPU.

CU, Ingo


From axeld at pinc-software.de  Sun Aug  2 13:54:28 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 02 Aug 2009 13:54:28 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32044_-_haiku/trunk/src/system/boot/pl?=
 =?utf-8?q?atform/pxe=5Fia32?=
In-Reply-To: <a4855ac50908011041w5680fcfch7a80e067b9992dc1@mail.gmail.com>
Message-ID: <2063705672-BeMail@zon>

Ryan Leavengood <leavengood at gmail.com> wrote:
> On Fri, Jul 31, 2009 at 9:18 PM, <bonefish at mail.berlios.de> wrote:
> > Automatic whitespace cleanup.
> When you guys do this, is there a particular tool you use, or just
> search and replace in your editor? I know I could do it in VIM, I am
> just curious...

Pe has a setting to discard extraneous whitespace (added by Ingo 
recently), and most other editors have that, too.

Bye,
   Axel.



From axeld at pinc-software.de  Sun Aug  2 13:54:59 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 02 Aug 2009 13:54:59 +0200 CEST
Subject: [Haiku-commits] r32049 - haiku/trunk/src/preferences/screen
In-Reply-To: <f019d2f30907311924q42d1266dp771587f1ca77469d@mail.gmail.com>
Message-ID: <2094546794-BeMail@zon>

Rene Gollent <anevilyak at gmail.com> wrote:
> On Fri, Jul 31, 2009 at 8:47 PM, <axeld at mail.berlios.de> wrote:
> > Log:
> > * Added many many more vendors, thanks to Brecht for digging up a 
> > nice web
> > ?resource that I couldn't find! Also thanks to Jonas and Urias :-)
> I have some more of these...should I send you a diff or just add them
> directly? Don't want to step on your toes :)

Please just go ahead!

Bye,
   Axel.



From axeld at pinc-software.de  Sun Aug  2 14:01:04 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 02 Aug 2009 14:01:04 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32035_-_in_haiku/trunk=3A_headers/os/s?=
 =?utf-8?q?upport_src/kits/support?=
In-Reply-To: <894b9700908010052w4fb9b003q395b6c1593c01a01@mail.gmail.com>
Message-ID: <2459384319-BeMail@zon>

Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
> 2009/7/31  <axeld at mail.berlios.de>:
> > Log:
> > * Added desperately missing Trim() method.
> And Trim Left(), and TrimRight() ? :-)

I thought about those for a short moment, but thought they weren't that 
useful in comparison to Trim(). I wouldn't mind if you'd add those, 
though :-)

Bye,
   Axel.



From stefano.ceccherini at gmail.com  Mon Aug  3 11:09:51 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Mon, 3 Aug 2009 11:09:51 +0200
Subject: [Haiku-commits] r32035 - in haiku/trunk: headers/os/support
	src/kits/support
In-Reply-To: <2459384319-BeMail@zon>
References: <894b9700908010052w4fb9b003q395b6c1593c01a01@mail.gmail.com>
	<2459384319-BeMail@zon>
Message-ID: <894b9700908030209v4569b5cs8c95c66355eb450d@mail.gmail.com>

2009/8/2 Axel D?rfler <axeld at pinc-software.de>:
> Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
>> 2009/7/31 ?<axeld at mail.berlios.de>:
>> > Log:
>> > * Added desperately missing Trim() method.
>> And Trim Left(), and TrimRight() ? :-)
>
> I thought about those for a short moment, but thought they weren't that
> useful in comparison to Trim().

Indeed, it was a sort of joke. Actually Delphi has them, that's why I asked.

> I wouldn't mind if you'd add those,
> though :-)
>
> Bye,
> ? Axel.

Well, most string implementations have many more methods than ours. So
I guess we could add those, and even more (if the need arouses).


From stippi at mail.berlios.de  Mon Aug  3 11:35:33 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 3 Aug 2009 11:35:33 +0200
Subject: [Haiku-commits] r32064 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg
Message-ID: <200908030935.n739ZXqe013308@sheep.berlios.de>

Author: stippi
Date: 2009-08-03 11:35:30 +0200 (Mon, 03 Aug 2009)
New Revision: 32064
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32064&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
Log:
Implemented audio track encoding. There is something wrong with the PTS
generation for the packets and how I set the time_base in the AVStream and
AVStream->codec structures. This results in the audio streams of the written
files to report a much too long duration.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-01 17:10:34 UTC (rev 32063)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-03 09:35:30 UTC (rev 32064)
@@ -34,9 +34,13 @@
 	Encoder(),
 	fCodec(NULL),
 	fContext(avcodec_alloc_context()),
+	fCodecInitDone(false),
+
 	fFrame(avcodec_alloc_frame()),
 	fSwsContext(NULL),
-	fCodecInitDone(false),
+
+	fFramesWritten(0),
+
 	fChunkBuffer(new(std::nothrow) uint8[kDefaultChunkBufferSize])
 {
 	TRACE("AVCodecEncoder::AVCodecEncoder()\n");
@@ -110,7 +114,13 @@
 	if (inputFormat == NULL)
 		return B_BAD_VALUE;
 
+	if (fCodecInitDone) {
+		fCodecInitDone = false;
+		avcodec_close(fContext);
+	}
+
 	fInputFormat = *inputFormat;
+	fFramesWritten = 0;
 
 	if (fInputFormat.type == B_MEDIA_RAW_VIDEO) {
 		// frame rate
@@ -167,6 +177,68 @@
 			PIX_FMT_RGB32, fContext->width, fContext->height,
 			fContext->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL);
 
+	} else if (fInputFormat.type == B_MEDIA_RAW_AUDIO) {
+		// frame rate
+		fContext->sample_rate = (int)fInputFormat.u.raw_audio.frame_rate;
+		fContext->time_base.den = (int)fInputFormat.u.raw_audio.frame_rate;
+		fContext->time_base.num = 1;
+		// channels
+		fContext->channels = fInputFormat.u.raw_audio.channel_count;
+		switch (fInputFormat.u.raw_audio.format) {
+			case media_raw_audio_format::B_AUDIO_FLOAT:
+				fContext->sample_fmt = SAMPLE_FMT_FLT;
+				break;
+			case media_raw_audio_format::B_AUDIO_DOUBLE:
+				fContext->sample_fmt = SAMPLE_FMT_DBL;
+				break;
+			case media_raw_audio_format::B_AUDIO_INT:
+				fContext->sample_fmt = SAMPLE_FMT_S32;
+				break;
+			case media_raw_audio_format::B_AUDIO_SHORT:
+				fContext->sample_fmt = SAMPLE_FMT_S16;
+				break;
+			case media_raw_audio_format::B_AUDIO_UCHAR:
+				fContext->sample_fmt = SAMPLE_FMT_U8;
+				break;
+
+			case media_raw_audio_format::B_AUDIO_CHAR:
+			default:
+				return B_MEDIA_BAD_FORMAT;
+				break;
+		}
+		if (fInputFormat.u.raw_audio.channel_mask == 0) {
+			// guess the channel mask...
+			switch (fInputFormat.u.raw_audio.channel_count) {
+				default:
+				case 2:
+					fContext->channel_layout = CH_LAYOUT_STEREO;
+					break;
+				case 1:
+					fContext->channel_layout = CH_LAYOUT_MONO;
+					break;
+				case 3:
+					fContext->channel_layout = CH_LAYOUT_SURROUND;
+					break;
+				case 4:
+					fContext->channel_layout = CH_LAYOUT_QUAD;
+					break;
+				case 5:
+					fContext->channel_layout = CH_LAYOUT_5POINT0;
+					break;
+				case 6:
+					fContext->channel_layout = CH_LAYOUT_5POINT1;
+					break;
+				case 8:
+					fContext->channel_layout = CH_LAYOUT_7POINT1;
+					break;
+				case 10:
+					fContext->channel_layout = CH_LAYOUT_7POINT1_WIDE;
+					break;
+			}
+		} else {
+			// The bits match 1:1 for media_multi_channels and FFmpeg defines.
+			fContext->channel_layout = fInputFormat.u.raw_audio.channel_mask;
+		}
 	} else {
 		return B_NOT_SUPPORTED;
 	}
@@ -221,13 +293,80 @@
 
 
 status_t
-AVCodecEncoder::_EncodeAudio(const void* buffer, int64 frameCount,
+AVCodecEncoder::_EncodeAudio(const void* _buffer, int64 frameCount,
 	media_encode_info* info)
 {
-	TRACE("AVCodecEncoder::_EncodeAudio(%p, %lld, %p)\n", buffer, frameCount,
+	TRACE("AVCodecEncoder::_EncodeAudio(%p, %lld, %p)\n", _buffer, frameCount,
 		info);
 
-	return B_NOT_SUPPORTED;
+	if (fChunkBuffer == NULL)
+		return B_NO_MEMORY;
+
+	status_t ret = B_OK;
+
+	const uint8* buffer = reinterpret_cast<const uint8*>(_buffer);
+
+	size_t inputSampleSize = fInputFormat.u.raw_audio.format
+		& media_raw_audio_format::B_AUDIO_SIZE_MASK;
+	size_t inputFrameSize = inputSampleSize
+		* fInputFormat.u.raw_audio.channel_count;
+
+	size_t outSampleSize = av_get_bits_per_sample_format(
+		fContext->sample_fmt) / 8;
+	size_t outSize = outSampleSize * fContext->channels;
+	TRACE("  sampleSize: %ld/%ld, frameSize: %ld/%ld\n",
+		inputSampleSize, inputFrameSize, outSampleSize, outSize);
+
+	size_t bufferSize = frameCount * inputFrameSize;
+	bufferSize = min_c(bufferSize, kDefaultChunkBufferSize);
+
+	while (frameCount > 0) {
+		if (frameCount < fContext->frame_size) {
+			TRACE("  ERROR: too few frames left! (left: %lld, needed: %d)\n",
+				frameCount, fContext->frame_size);
+			// TODO: Handle this some way. Maybe use an av_fifo to buffer data?
+			return B_ERROR;
+		}
+
+		int chunkFrames = fContext->frame_size;
+
+		TRACE("  frames left: %lld, chunk frames: %d\n",
+			frameCount, chunkFrames);
+
+		// Encode one audio chunk/frame.
+		int usedBytes = avcodec_encode_audio(fContext, fChunkBuffer,
+			bufferSize, reinterpret_cast<const short*>(buffer));
+
+		if (usedBytes < 0) {
+			TRACE("  avcodec_encode_video() failed: %d\n", usedBytes);
+			return B_ERROR;
+		}
+
+		// Setup media_encode_info, most important is the time stamp.
+		info->start_time = (bigtime_t)(fFramesWritten * 1000000LL
+			/ fInputFormat.u.raw_audio.frame_rate);
+
+		// Write the chunk
+		ret = WriteChunk(fChunkBuffer, usedBytes, info);
+		if (ret != B_OK)
+			break;
+
+		size_t framesWritten = usedBytes / inputFrameSize;
+		if (chunkFrames == 1) {
+			// For PCM data:
+			framesWritten = usedBytes / inputFrameSize;
+		} else {
+			// For encoded audio:
+			framesWritten = chunkFrames * inputFrameSize;
+		}
+
+		// Skip to next chunk of buffer.
+		fFramesWritten += framesWritten;
+		frameCount -= framesWritten;
+		buffer += usedBytes;
+	}
+
+	return ret;
 }
 
 
@@ -268,6 +407,10 @@
 			return B_ERROR;
 		}
 
+		// Setup media_encode_info, most important is the time stamp.
+		info->start_time = (bigtime_t)(fFramesWritten * 1000000LL
+			/ fInputFormat.u.raw_video.field_rate);
+
 		// Write the chunk
 		ret = WriteChunk(fChunkBuffer, usedBytes, info);
 		if (ret != B_OK)
@@ -276,6 +419,7 @@
 		// Skip to the next frame (but usually, there is only one to encode
 		// for video).
 		frameCount--;
+		fFramesWritten++;
 		buffer = (const void*)((const uint8*)buffer + bufferSize);
 	}
 

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h	2009-08-01 17:10:34 UTC (rev 32063)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h	2009-08-03 09:35:30 UTC (rev 32064)
@@ -52,15 +52,15 @@
 			// TODO: Refactor common base class from AVCodec[De|En]Coder!
 			AVCodec*			fCodec;
 			AVCodecContext*		fContext;
+			bool				fCodecInitDone;
+
 			AVPicture			fSrcFrame;
 			AVPicture			fDstFrame;
 			AVFrame*			fFrame;
 			SwsContext*			fSwsContext;
 
-			uint32				fAVCodecID;
+			int64				fFramesWritten;
 
-			bool				fCodecInitDone;
-
 			uint8*				fChunkBuffer;
 };
 

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp	2009-08-01 17:10:34 UTC (rev 32063)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp	2009-08-03 09:35:30 UTC (rev 32064)
@@ -26,7 +26,7 @@
 #include "gfx_util.h"
 
 
-//#define TRACE_AVFORMAT_READER
+#define TRACE_AVFORMAT_READER
 #ifdef TRACE_AVFORMAT_READER
 #	define TRACE printf
 #	define TRACE_IO(a...)
@@ -674,7 +674,7 @@
 		*duration = (bigtime_t)(1000000LL * fStream->duration
 			* fStream->time_base.num / fStream->time_base.den);
 		TRACE("  stream duration: %lld, time_base %.4f (%d/%d)\n",
-			*duration, av_q2d(fStream->time_base),
+			fStream->duration, av_q2d(fStream->time_base),
 			fStream->time_base.num, fStream->time_base.den);
 	} else if ((int64)fContext->duration != kNoPTSValue) {
 		*duration = (bigtime_t)(1000000LL * fContext->duration / AV_TIME_BASE);
@@ -844,6 +844,8 @@
 		mediaHeader->destination = -1;
 		mediaHeader->time_source = -1;
 		mediaHeader->size_used = fPacket.size;
+//TRACE("  PTS: %lld (time_base.num: %d, .den: %d)\n",
+//fPacket.pts, fStream->time_base.num, fStream->time_base.den);
 		mediaHeader->start_time = (bigtime_t)(1000000.0 * fPacket.pts
 			/ av_q2d(fStream->time_base));
 		mediaHeader->file_pos = fPacket.pos;

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp	2009-08-01 17:10:34 UTC (rev 32063)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp	2009-08-03 09:35:30 UTC (rev 32064)
@@ -30,7 +30,7 @@
 #ifdef TRACE_AVFORMAT_WRITER
 #	define TRACE printf
 #	define TRACE_IO(a...)
-#	define TRACE_PACKET(a...)
+#	define TRACE_PACKET printf
 #else
 #	define TRACE(a...)
 #	define TRACE_IO(a...)
@@ -75,6 +75,7 @@
 			// Since different threads may write to the target,
 			// we need to protect the file position and I/O by a lock.
 			BLocker*			fStreamLock;
+			int64				fChunksWritten;
 };
 
 
@@ -84,7 +85,8 @@
 	:
 	fContext(context),
 	fStream(NULL),
-	fStreamLock(streamLock)
+	fStreamLock(streamLock),
+	fChunksWritten(0)
 {
 	av_new_packet(&fPacket, 0);
 }
@@ -118,6 +120,10 @@
 		// frame rate
 		fStream->codec->time_base.den = (int)format->u.raw_video.field_rate;
 		fStream->codec->time_base.num = 1;
+		fStream->r_frame_rate.den = (int)format->u.raw_video.field_rate;
+		fStream->r_frame_rate.num = 1;
+		fStream->time_base.den = (int)format->u.raw_video.field_rate;
+		fStream->time_base.num = 1;
 		// video size
 		fStream->codec->width = format->u.raw_video.display.line_width;
 		fStream->codec->height = format->u.raw_video.display.line_count;
@@ -138,9 +144,75 @@
 		fStream->codec->pix_fmt = PIX_FMT_YUV420P;
 	} else if (format->type == B_MEDIA_RAW_AUDIO) {
 		avcodec_get_context_defaults2(fStream->codec, CODEC_TYPE_AUDIO);
-		// TODO: ...
+		// channels
+		fStream->codec->channels = format->u.raw_audio.channel_count;
+		switch (format->u.raw_audio.format) {
+			case media_raw_audio_format::B_AUDIO_FLOAT:
+				fStream->codec->sample_fmt = SAMPLE_FMT_FLT;
+				break;
+			case media_raw_audio_format::B_AUDIO_DOUBLE:
+				fStream->codec->sample_fmt = SAMPLE_FMT_DBL;
+				break;
+			case media_raw_audio_format::B_AUDIO_INT:
+				fStream->codec->sample_fmt = SAMPLE_FMT_S32;
+				break;
+			case media_raw_audio_format::B_AUDIO_SHORT:
+				fStream->codec->sample_fmt = SAMPLE_FMT_S16;
+				break;
+			case media_raw_audio_format::B_AUDIO_UCHAR:
+				fStream->codec->sample_fmt = SAMPLE_FMT_U8;
+				break;
+
+			case media_raw_audio_format::B_AUDIO_CHAR:
+			default:
+				return B_MEDIA_BAD_FORMAT;
+				break;
+		}
+		if (format->u.raw_audio.channel_mask == 0) {
+			// guess the channel mask...
+			switch (format->u.raw_audio.channel_count) {
+				default:
+				case 2:
+					fStream->codec->channel_layout = CH_LAYOUT_STEREO;
+					break;
+				case 1:
+					fStream->codec->channel_layout = CH_LAYOUT_MONO;
+					break;
+				case 3:
+					fStream->codec->channel_layout = CH_LAYOUT_SURROUND;
+					break;
+				case 4:
+					fStream->codec->channel_layout = CH_LAYOUT_QUAD;
+					break;
+				case 5:
+					fStream->codec->channel_layout = CH_LAYOUT_5POINT0;
+					break;
+				case 6:
+					fStream->codec->channel_layout = CH_LAYOUT_5POINT1;
+					break;
+				case 8:
+					fStream->codec->channel_layout = CH_LAYOUT_7POINT1;
+					break;
+				case 10:
+					fStream->codec->channel_layout = CH_LAYOUT_7POINT1_WIDE;
+					break;
+			}
+		} else {
+			// The bits match 1:1 for media_multi_channels and FFmpeg defines.
+			fStream->codec->channel_layout = format->u.raw_audio.channel_mask;
+		}
+		// frame rate
+		fStream->codec->sample_rate = (int)format->u.raw_audio.frame_rate;
+		fStream->codec->time_base.den = (int)format->u.raw_audio.frame_rate;
+		fStream->codec->time_base.num = 1;
+		fStream->time_base.den = (int)format->u.raw_audio.frame_rate;
+		fStream->time_base.num = 1;
 	}
 
+	TRACE("  stream->time_base: (%d/%d), codec->time_base: (%d/%d))\n",
+		fStream->time_base.num, fStream->time_base.den,
+		fStream->codec->time_base.num, fStream->codec->time_base.den);
+
 	// TODO: This is a hack for now! Use avcodec_find_encoder_by_name()
 	// or something similar...
 	fStream->codec->codec_id = (CodecID)codecInfo->sub_id;
@@ -153,8 +225,8 @@
 AVFormatWriter::StreamCookie::WriteChunk(const void* chunkBuffer,
 	size_t chunkSize, media_encode_info* encodeInfo)
 {
-	TRACE_PACKET("AVFormatWriter::StreamCookie::WriteChunk(%p, %ld)\n",
-		chunkBuffer, chunkSize);
+	TRACE_PACKET("AVFormatWriter::StreamCookie::WriteChunk(%p, %ld, "
+		"start_time: %lld)\n", chunkBuffer, chunkSize, encodeInfo->start_time);
 
 	BAutolock _(fStreamLock);
 
@@ -164,6 +236,19 @@
 	fPacket.data = const_cast<uint8_t*>((const uint8_t*)chunkBuffer);
 	fPacket.size = chunkSize;
 
+	fPacket.pts = (encodeInfo->start_time
+		* fStream->time_base.den / fStream->time_base.num) / 1000000;
+	TRACE_PACKET("  PTS: %lld  (stream->time_base: (%d/%d), "
+		"codec->time_base: (%d/%d))\n", fPacket.pts,
+		fStream->time_base.num, fStream->time_base.den,
+		fStream->codec->time_base.num, fStream->codec->time_base.den);
+
+// From ffmpeg.c::do_audio_out():
+//	if (enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
+//		fPacket.pts = av_rescale_q(enc->coded_frame->pts,
+//		enc->time_base, ost->st->time_base);
+
+
 #if 0
 	// TODO: Eventually, we need to write interleaved packets, but
 	// maybe we are only supposed to use this if we have actually
@@ -280,12 +365,27 @@
 	if (fHeaderWritten)
 		return B_NOT_ALLOWED;
 
+	for (unsigned i = 0; i < fContext->nb_streams; i++) {
+		AVStream* stream = fContext->streams[i];
+		TRACE("  stream[%u] time_base: (%d/%d), codec->time_base: (%d/%d)\n",
+			i, stream->time_base.num, stream->time_base.den,
+			stream->codec->time_base.num, stream->codec->time_base.den);
+	}
+
 	int result = av_write_header(fContext);
 	if (result < 0)
 		TRACE("  av_write_header(): %d\n", result);
 	else
 		fHeaderWritten = true;
 
+	TRACE("  wrote header\n");
+	for (unsigned i = 0; i < fContext->nb_streams; i++) {
+		AVStream* stream = fContext->streams[i];
+		TRACE("  stream[%u] time_base: (%d/%d), codec->time_base: (%d/%d)\n",
+			i, stream->time_base.num, stream->time_base.den,
+			stream->codec->time_base.num, stream->codec->time_base.den);
+	}
+
 	return result == 0 ? B_OK : B_ERROR;
 }
 
@@ -383,8 +483,8 @@
 AVFormatWriter::WriteChunk(void* _cookie, const void* chunkBuffer,
 	size_t chunkSize, media_encode_info* encodeInfo)
 {
-	TRACE("AVFormatWriter::WriteChunk(%p, %ld, %p)\n", chunkBuffer, chunkSize,
-		encodeInfo);
+	TRACE_PACKET("AVFormatWriter::WriteChunk(%p, %ld, %p)\n", chunkBuffer,
+		chunkSize, encodeInfo);
 
 	StreamCookie* cookie = reinterpret_cast<StreamCookie*>(_cookie);
 	return cookie->WriteChunk(chunkBuffer, chunkSize, encodeInfo);

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp	2009-08-01 17:10:34 UTC (rev 32063)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp	2009-08-03 09:35:30 UTC (rev 32064)
@@ -48,18 +48,18 @@
 		B_MEDIA_RAW_VIDEO,
 		B_MEDIA_ENCODED_VIDEO
 	},
-//	{
-//		{
-//			"MP3 Audio",
-//			"mp3",
-//			0,
-//			CODEC_ID_MP3,
-//			{ 0 }
-//		},
-//		B_ANY_FORMAT_FAMILY,
-//		B_MEDIA_RAW_AUDIO,
-//		B_MEDIA_ENCODED_AUDIO
-//	}
+	{
+		{
+			"Raw Audio",
+			"pcm",
+			0,
+			CODEC_ID_PCM_S16LE,
+			{ 0 }
+		},
+		B_ANY_FORMAT_FAMILY,
+		B_MEDIA_RAW_AUDIO,
+		B_MEDIA_ENCODED_AUDIO
+	}
 };
 
 const size_t gEncoderCount = sizeof(gEncoderTable) / sizeof(EncoderDescription);



From stippi at mail.berlios.de  Mon Aug  3 11:56:19 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 3 Aug 2009 11:56:19 +0200
Subject: [Haiku-commits] r32065 - haiku/trunk/build/jam
Message-ID: <200908030956.n739uJ51016316@sheep.berlios.de>

Author: stippi
Date: 2009-08-03 11:56:17 +0200 (Mon, 03 Aug 2009)
New Revision: 32065
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32065&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Added MediaConverter to the build. It still needs a nice new icon though...


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-08-03 09:35:30 UTC (rev 32064)
+++ haiku/trunk/build/jam/HaikuImage	2009-08-03 09:56:17 UTC (rev 32065)
@@ -66,9 +66,9 @@
 
 SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProbe
 	DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer LaunchBox
-	Magnify Mail MediaPlayer MidiPlayer NetworkStatus PackageInstaller People
-	PoorMan PowerStatus ProcessController Screenshot ShowImage SoundRecorder
-	StyledEdit Terminal TextSearch TV Workspaces
+	Magnify Mail MediaConverter MediaPlayer MidiPlayer NetworkStatus
+	PackageInstaller People PoorMan PowerStatus ProcessController Screenshot
+	ShowImage SoundRecorder StyledEdit Terminal TextSearch TV Workspaces
 ;
 SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations E-mail
 	FileTypes Fonts Keyboard Keymap Locale Media Mouse Network Printers
@@ -284,8 +284,9 @@
 # Deskbar Application links
 AddDirectoryToHaikuImage home config be Applications ;
 DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc
-	DiskProbe DriveSetup DiskUsage Expander Icon-O-Matic Magnify Mail MediaPlayer
-	MidiPlayer People PoorMan Screenshot SoundRecorder StyledEdit Terminal TV
+	DiskProbe DriveSetup DiskUsage Expander Icon-O-Matic Magnify Mail
+	MediaConverter MediaPlayer MidiPlayer People PoorMan Screenshot
+	SoundRecorder StyledEdit Terminal TV
 ;
 local linkTarget ;
 for linkTarget in $(DESKBAR_APPLICATIONS) {



From axeld at mail.berlios.de  Mon Aug  3 12:04:46 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Mon, 3 Aug 2009 12:04:46 +0200
Subject: [Haiku-commits] r32066 - haiku/trunk/src/servers/app
Message-ID: <200908031004.n73A4k4v017976@sheep.berlios.de>

Author: axeld
Date: 2009-08-03 12:04:43 +0200 (Mon, 03 Aug 2009)
New Revision: 32066
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32066&view=rev

Modified:
   haiku/trunk/src/servers/app/FontManager.cpp
Log:
* Fixed style.


Modified: haiku/trunk/src/servers/app/FontManager.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontManager.cpp	2009-08-03 09:56:17 UTC (rev 32065)
+++ haiku/trunk/src/servers/app/FontManager.cpp	2009-08-03 10:04:43 UTC (rev 32066)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -511,7 +511,7 @@
 	while (true) {
 		// We just want the file in the kernel file cache...
 		ssize_t read = file.Read(buffer, bufferSize);
-		if (read < (ssize_t) bufferSize)
+		if (read < (ssize_t)bufferSize)
 			break;
 	}
 



From mmu_man at mail.berlios.de  Mon Aug  3 12:10:51 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Mon, 3 Aug 2009 12:10:51 +0200
Subject: [Haiku-commits] r32067 - in haiku/trunk: headers/private/kernel
	src/system/boot/platform/openfirmware/arch/ppc
	src/system/kernel/arch/ppc
Message-ID: <200908031010.n73AAp0F018885@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-03 12:10:22 +0200 (Mon, 03 Aug 2009)
New Revision: 32067
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32067&view=rev

Modified:
   haiku/trunk/headers/private/kernel/user_atomic.h
   haiku/trunk/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp
   haiku/trunk/src/system/kernel/arch/ppc/arch_asm.S
   haiku/trunk/src/system/kernel/arch/ppc/arch_cpu.cpp
   haiku/trunk/src/system/kernel/arch/ppc/arch_cpu_asm.S
Log:
Some ppc fixes for #4115, patch by kallisti5 (without the #ifdef _BOOT_MODE):
- stubbed out arch_cpu_init_percpu(),
- make atomic ops declarations extern "C",
- move calls to [i]sync inside the asm code that needs it.


Modified: haiku/trunk/headers/private/kernel/user_atomic.h
===================================================================
--- haiku/trunk/headers/private/kernel/user_atomic.h	2009-08-03 10:04:43 UTC (rev 32066)
+++ haiku/trunk/headers/private/kernel/user_atomic.h	2009-08-03 10:10:22 UTC (rev 32067)
@@ -9,6 +9,10 @@
  * in userspace, they are implemented as these syscalls.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int32 _user_atomic_set(vint32 *value, int32 newValue);
 int32 _user_atomic_test_and_set(vint32 *value, int32 newValue, int32 testAgainst);
 int32 _user_atomic_add(vint32 *value, int32 addValue);
@@ -23,4 +27,9 @@
 int64 _user_atomic_or64(vint64 *value, int64 orValue);	
 int64 _user_atomic_get64(vint64 *value);
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif	/* _KERNEL_USER_ATOMIC_H */

Modified: haiku/trunk/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp	2009-08-03 10:04:43 UTC (rev 32066)
+++ haiku/trunk/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp	2009-08-03 10:10:22 UTC (rev 32067)
@@ -991,12 +991,8 @@
 	// set up new page table and turn on translation again
 
 	for (int32 i = 0; i < 16; i++) {
-		isync();
-
 		ppc_set_segment_register((void *)(i * 0x10000000), sSegments[i]);
 			// one segment describes 256 MB of memory
-
-		ppc_sync();
 	}
 
 	ppc_set_page_table(physicalTable, tableSize);

Modified: haiku/trunk/src/system/kernel/arch/ppc/arch_asm.S
===================================================================
--- haiku/trunk/src/system/kernel/arch/ppc/arch_asm.S	2009-08-03 10:04:43 UTC (rev 32066)
+++ haiku/trunk/src/system/kernel/arch/ppc/arch_asm.S	2009-08-03 10:10:22 UTC (rev 32067)
@@ -26,6 +26,7 @@
 		// sets bit 15, EE
 
 	mtmsr	%r3							// put it back into the msr
+	isync
 	blr
 
 
@@ -40,6 +41,7 @@
 		// clears bit 15, EE
 
 	mtmsr	%r4							// put it back into the msr
+	isync
 	blr
 
 
@@ -53,6 +55,7 @@
 		// clear or set bit 15, EE to the same state as in r3, oldState
 
 	mtmsr	%r4
+	isync
 	blr
 
 /* bool arch_int_are_interrupts_enabled(void) */
@@ -175,7 +178,9 @@
 
 // void sethid0(unsigned int val);
 FUNCTION(sethid0):
+	isync
 	mtspr		1008, %r3
+	isync
 	blr
 
 // unsigned int getl2cr();
@@ -185,7 +190,9 @@
 
 // void setl2cr(unsigned int val);
 FUNCTION(setl2cr):
+	isync
 	mtspr		1017, %r3
+	isync
 	blr
 
 	

Modified: haiku/trunk/src/system/kernel/arch/ppc/arch_cpu.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/ppc/arch_cpu.cpp	2009-08-03 10:04:43 UTC (rev 32066)
+++ haiku/trunk/src/system/kernel/arch/ppc/arch_cpu.cpp	2009-08-03 10:10:22 UTC (rev 32067)
@@ -48,6 +48,16 @@
 }
 
 status_t
+arch_cpu_init_percpu(kernel_args *args, int curr_cpu)
+{
+        //detect_cpu(curr_cpu);
+
+        // we only support one on ppc anyway at the moment...
+	//XXX: WRITEME
+        return 0;
+}
+
+status_t
 arch_cpu_init_post_modules(kernel_args *args)
 {
 	return B_OK;

Modified: haiku/trunk/src/system/kernel/arch/ppc/arch_cpu_asm.S
===================================================================
--- haiku/trunk/src/system/kernel/arch/ppc/arch_cpu_asm.S	2009-08-03 10:04:43 UTC (rev 32066)
+++ haiku/trunk/src/system/kernel/arch/ppc/arch_cpu_asm.S	2009-08-03 10:10:22 UTC (rev 32067)
@@ -31,7 +31,9 @@
  *			   r3					 r4
  */
 FUNCTION(set_sr):
+	isync
 	mtsrin	%r4, %r3
+	isync
 	blr
 
 /* uint32 get_msr(void);
@@ -45,6 +47,7 @@
  */
 FUNCTION(set_msr):
 	mtmsr	%r3
+	isync
 	blr
 
 /* uint32 get_pvr(void);



From stippi at mail.berlios.de  Mon Aug  3 12:34:27 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 3 Aug 2009 12:34:27 +0200
Subject: [Haiku-commits] r32068 - haiku/trunk/src/apps/mediaconverter
Message-ID: <200908031034.n73AYRro027961@sheep.berlios.de>

Author: stippi
Date: 2009-08-03 12:33:52 +0200 (Mon, 03 Aug 2009)
New Revision: 32068
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32068&view=rev

Modified:
   haiku/trunk/src/apps/mediaconverter/Jamfile
   haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp
   haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
   haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.h
   haiku/trunk/src/apps/mediaconverter/MediaFileListView.cpp
   haiku/trunk/src/apps/mediaconverter/MediaFileListView.h
Log:
Fixed GCC4 build and added handling of allocation failures in
some places.


Modified: haiku/trunk/src/apps/mediaconverter/Jamfile
===================================================================
--- haiku/trunk/src/apps/mediaconverter/Jamfile	2009-08-03 10:10:22 UTC (rev 32067)
+++ haiku/trunk/src/apps/mediaconverter/Jamfile	2009-08-03 10:33:52 UTC (rev 32068)
@@ -10,6 +10,6 @@
 	MediaFileListView.cpp
 	StatusView.cpp
 
-	: be media tracker
+	: be media tracker $(TARGET_LIBSTDC++)
 	: MediaConverter.rdef
 ;

Modified: haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp	2009-08-03 10:10:22 UTC (rev 32067)
+++ haiku/trunk/src/apps/mediaconverter/MediaConverterApp.cpp	2009-08-03 10:33:52 UTC (rev 32068)
@@ -23,17 +23,16 @@
 #include "Strings.h"
 
 
-using std::nothrow;
-
 const char APP_SIGNATURE[] = "application/x-vnd.Haiku-MediaConverter";
 
 
 MediaConverterApp::MediaConverterApp()
-	: BApplication(APP_SIGNATURE)
-	, fWin(NULL)
-	, fConvertThreadID(-1)
-	, fConverting(false)
-	, fCancel(false)
+	:
+	BApplication(APP_SIGNATURE),
+	fWin(NULL),
+	fConvertThreadID(-1),
+	fConverting(false),
+	fCancel(false)
 {
 	// TODO: implement settings for window pos
 	fWin = new MediaConverterWindow(BRect(50, 50, 520, 555));
@@ -99,22 +98,23 @@
 {
 	entry_ref ref;
 	int32 i = 0;
-	BMediaFile *f;
 	BString errorFiles;
 	int32 errors = 0;
 
 	// from Open dialog or drag & drop
 
 	while (msg->FindRef("refs", i++, &ref) == B_OK) {
-		f = new BMediaFile(&ref/*, B_MEDIA_FILE_NO_READ_AHEAD*/);
-		if (f->InitCheck() != B_OK) {
+		uint32 flags = 0; // B_MEDIA_FILE_NO_READ_AHEAD
+		BMediaFile* file = new(std::nothrow) BMediaFile(&ref, flags);
+		if (file == NULL || file->InitCheck() != B_OK) {
 			errorFiles << ref.name << "\n";
 			errors++;
-			delete f;
+			delete file;
 			continue;
 		}
 		if (fWin->Lock()) {
-			fWin->AddSourceFile(f, ref);
+			if (!fWin->AddSourceFile(file, ref))
+				delete file;
 			fWin->Unlock();
 		}
 	}
@@ -408,7 +408,8 @@
 					= inFormat.u.raw_video.pixel_height_aspect;
 			}
 
-			videoBuffer = new (nothrow) uint8[height * rvf->display.bytes_per_row];
+			videoBuffer = new (std::nothrow) uint8[height
+				* rvf->display.bytes_per_row];
 			outVidTrack = outFile->CreateTrack(&outVidFormat, videoCodec);
 
 			if (outVidTrack != NULL) {
@@ -417,7 +418,8 @@
 				BView* encoderView = outVidTrack->GetParameterView();
 				if (encoderView) {
 					MediaEncoderWindow* encoderWin
-						= new MediaEncoderWindow(BRect(50, 50, 520, 555), encoderView);
+						= new MediaEncoderWindow(BRect(50, 50, 520, 555),
+							encoderView);
 					encoderWin->Go();
 						// blocks until the window is quit
 

Modified: haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp	2009-08-03 10:10:22 UTC (rev 32067)
+++ haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp	2009-08-03 10:33:52 UTC (rev 32068)
@@ -343,11 +343,12 @@
 
 	BString string, string2;
 
-    // TODO: for preview, launch the default file app instead of hardcoded MediaPlayer
+    // TODO: For preview, launch the default file app instead of hardcoded
+    // MediaPlayer
 	BEntry entry("/boot/system/apps/MediaPlayer", true);
 	char buffer[40];
 	char buffer2[B_PATH_NAME_LENGTH];
-	char *argv[3];
+	const char* argv[3];
 	argv[0] = "-pos";
 	BMediaFile *inFile(NULL);
 	int32 srcIndex = 0;
@@ -501,7 +502,7 @@
 			string << fStartDurationTC->Text();
 			string << "000";
 
-			strcpy(buffer,string.String());
+			strcpy(buffer, string.String());
 			argv[1] = buffer;
 			srcIndex = fListView->CurrentSelection();
 			status = GetSourceFileAt(srcIndex, &inFile, &inRef);
@@ -512,7 +513,7 @@
 				strcpy(buffer, string.String());
 
 				strcpy(buffer2, name.Path());
-				argv[2]= buffer2;
+				argv[2] = buffer2;
 			}
 
 			status = be_roster->Launch(&ref, 3, argv);
@@ -752,16 +753,19 @@
 // #pragma mark -
 
 
-void
+bool
 MediaConverterWindow::AddSourceFile(BMediaFile* file, const entry_ref& ref)
 {
-	fListView->AddItem(file, ref);
+	if (!fListView->AddMediaItem(file, ref))
+		return false;
 
 	if (!fOutputDirSpecified) {
 		BEntry entry(&ref);
 		entry.GetParent(&entry);
 		_SetOutputFolder(entry);
 	}
+
+	return true;
 }
 
 

Modified: haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.h
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.h	2009-08-03 10:10:22 UTC (rev 32067)
+++ haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.h	2009-08-03 10:33:52 UTC (rev 32068)
@@ -44,11 +44,11 @@
 									media_file_format** _format,
 									media_codec_info** _audio,
 									media_codec_info** _video);
-	
+
 			void				SetStatusMessage(const char *message);
 			void				SetFileMessage(const char *message);
-	
-			void				AddSourceFile(BMediaFile* file,
+
+			bool				AddSourceFile(BMediaFile* file,
 									const entry_ref& ref);
 			void				RemoveSourceFile(int32 index);
 			int32				CountSourceFiles();

Modified: haiku/trunk/src/apps/mediaconverter/MediaFileListView.cpp
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MediaFileListView.cpp	2009-08-03 10:10:22 UTC (rev 32067)
+++ haiku/trunk/src/apps/mediaconverter/MediaFileListView.cpp	2009-08-03 10:33:52 UTC (rev 32068)
@@ -1,9 +1,13 @@
 // Copyright 1999, Be Incorporated. All Rights Reserved.
 // Copyright 2000-2004, Jun Suzuki. All Rights Reserved.
-// Copyright 2007, Stephan A?mus. All Rights Reserved.
+// Copyright 2007, 2009 Stephan A?mus. All Rights Reserved.
 // This file may be used under the terms of the Be Sample Code License.
+
+
 #include "MediaFileListView.h"
 
+#include <new>
+
 #include <Application.h>
 #include <MediaFile.h>
 #include <Messenger.h>
@@ -16,9 +20,10 @@
 
 
 MediaFileListItem::MediaFileListItem(BMediaFile* file, const entry_ref& ref)
-	: BStringItem(ref.name),
-	  fRef(ref),
-	  fMediaFile(file)
+	:
+	BStringItem(ref.name),
+	fRef(ref),
+	fMediaFile(file)
 {
 }
 
@@ -49,7 +54,7 @@
 }
 
 
-void 
+void
 MediaFileListView::SetEnabled(bool enabled)
 {
 	if (enabled == fEnabled)
@@ -60,22 +65,27 @@
 }
 
 
-bool 
+bool
 MediaFileListView::IsEnabled() const
 {
 	return fEnabled;
 }
 
 
-void
-MediaFileListView::AddItem(BMediaFile* file, const entry_ref& ref)
+bool
+MediaFileListView::AddMediaItem(BMediaFile* file, const entry_ref& ref)
 {
-	BListView::AddItem(new MediaFileListItem(file, ref));
+	MediaFileListItem* item = new(std::nothrow) MediaFileListItem(file, ref);
+	if (item == NULL || !AddItem(item)) {
+		delete item;
+		return false;
+	}
 	be_app_messenger.SendMessage(FILE_LIST_CHANGE_MESSAGE);
+	return true;
 }
 
 
-void 
+void
 MediaFileListView::KeyDown(const char *bytes, int32 numBytes)
 {
 	switch (bytes[0]) {
@@ -90,7 +100,7 @@
 						selection = count - 1;
 					Select(selection);
 					be_app_messenger.SendMessage(FILE_LIST_CHANGE_MESSAGE);
-				}		
+				}
 			}
 			break;
 		default:
@@ -99,10 +109,10 @@
 }
 
 
-void 
+void
 MediaFileListView::SelectionChanged()
 {
-	MediaConverterWindow* win = dynamic_cast<MediaConverterWindow *>(Window());
+	MediaConverterWindow* win = dynamic_cast<MediaConverterWindow*>(Window());
 	if (win != NULL)
 		win->SourceFileSelectionChanged();
 }

Modified: haiku/trunk/src/apps/mediaconverter/MediaFileListView.h
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MediaFileListView.h	2009-08-03 10:10:22 UTC (rev 32067)
+++ haiku/trunk/src/apps/mediaconverter/MediaFileListView.h	2009-08-03 10:33:52 UTC (rev 32068)
@@ -15,7 +15,7 @@
 
 
 class MediaFileListItem : public BStringItem {
-	public:
+public:
 				MediaFileListItem(BMediaFile* file, const entry_ref& ref);
 	virtual		~MediaFileListItem();
 
@@ -25,22 +25,23 @@
 
 
 class MediaFileListView : public BListView {
-	public:
+public:
 								MediaFileListView(BRect frame,
 									uint32 resizingMode);
 	virtual						~MediaFileListView();
 
-	protected:
+protected:
 	virtual void				KeyDown(const char *bytes, int32 numBytes);
 	virtual void				SelectionChanged();
 
-	public:
-			void				AddItem(BMediaFile* file, const entry_ref& ref);
+public:
+			bool				AddMediaItem(BMediaFile* file,
+									const entry_ref& ref);
 
 			void				SetEnabled(bool enabled);
 			bool				IsEnabled() const;
 
-	private:
+private:
 			bool				fEnabled;
 };
 



From aldeck at mail.berlios.de  Mon Aug  3 12:55:22 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Mon, 3 Aug 2009 12:55:22 +0200
Subject: [Haiku-commits] r32069 - haiku/trunk/src/apps/haiku3d
Message-ID: <200908031055.n73AtM20020147@sheep.berlios.de>

Author: aldeck
Date: 2009-08-03 12:55:13 +0200 (Mon, 03 Aug 2009)
New Revision: 32069
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32069&view=rev

Modified:
   haiku/trunk/src/apps/haiku3d/Mesh.h
   haiku/trunk/src/apps/haiku3d/MeshInstance.cpp
   haiku/trunk/src/apps/haiku3d/RenderView.cpp
   haiku/trunk/src/apps/haiku3d/Texture.cpp
   haiku/trunk/src/apps/haiku3d/Texture.h
Log:
* Style fixes
* Moved the wait_for_thread in _StopRenderThread()


Modified: haiku/trunk/src/apps/haiku3d/Mesh.h
===================================================================
--- haiku/trunk/src/apps/haiku3d/Mesh.h	2009-08-03 10:33:52 UTC (rev 32068)
+++ haiku/trunk/src/apps/haiku3d/Mesh.h	2009-08-03 10:55:13 UTC (rev 32069)
@@ -29,7 +29,7 @@
 
 class Mesh : public Referenceable {
 public:
-	virtual	~Mesh();
+	virtual			~Mesh();
 
 	virtual Face&	GetFace(uint32 index) const = 0;
 	virtual uint32	FaceCount() const = 0;

Modified: haiku/trunk/src/apps/haiku3d/MeshInstance.cpp
===================================================================
--- haiku/trunk/src/apps/haiku3d/MeshInstance.cpp	2009-08-03 10:33:52 UTC (rev 32068)
+++ haiku/trunk/src/apps/haiku3d/MeshInstance.cpp	2009-08-03 10:55:13 UTC (rev 32069)
@@ -105,50 +105,50 @@
 
 		// draw face
 		glNormal3f(normal.x(), normal.y(),  normal.z());
-   		glTexCoord2f(face.v[0].u, face.v[0].v);
-   		glVertex3f(face.v[0].p.x(), face.v[0].p.y(),  face.v[0].p.z());
+		glTexCoord2f(face.v[0].u, face.v[0].v);
+		glVertex3f(face.v[0].p.x(), face.v[0].p.y(), face.v[0].p.z());
 
-   		glNormal3f(normal.x(), normal.y(),  normal.z());
-   		glTexCoord2f(face.v[1].u, face.v[1].v);
-   		glVertex3f(face.v[1].p.x(), face.v[1].p.y(),  face.v[1].p.z());
+		glNormal3f(normal.x(), normal.y(),  normal.z());
+		glTexCoord2f(face.v[1].u, face.v[1].v);
+		glVertex3f(face.v[1].p.x(), face.v[1].p.y(), face.v[1].p.z());
 
-   		glNormal3f(normal.x(), normal.y(),  normal.z());
-   		glTexCoord2f(face.v[2].u, face.v[2].v);
-   		glVertex3f(face.v[2].p.x(), face.v[2].p.y(),  face.v[2].p.z());
+		glNormal3f(normal.x(), normal.y(),  normal.z());
+		glTexCoord2f(face.v[2].u, face.v[2].v);
+		glVertex3f(face.v[2].p.x(), face.v[2].p.y(), face.v[2].p.z());
 
-   		if (face.vertexCount == 4) {
-   			glNormal3f(normal.x(), normal.y(),  normal.z());
-   			glTexCoord2f(face.v[3].u, face.v[3].v);
-   			glVertex3f(face.v[3].p.x(), face.v[3].p.y(),  face.v[3].p.z());
-   		}
+		if (face.vertexCount == 4) {
+			glNormal3f(normal.x(), normal.y(), normal.z());
+			glTexCoord2f(face.v[3].u, face.v[3].v);
+			glVertex3f(face.v[3].p.x(), face.v[3].p.y(), face.v[3].p.z());
+		}
 
-   		if (fDoubleSided) {
-	   		if (face.vertexCount == 4) {
-		   		glNormal3f(-normal.x(), -normal.y(),  -normal.z());
-		   		glTexCoord2f(face.v[3].u, face.v[3].v);
-		   		glVertex3f(face.v[3].p.x(), face.v[3].p.y(),  face.v[3].p.z());
-	   		}
+		if (fDoubleSided) {
+			if (face.vertexCount == 4) {
+				glNormal3f(-normal.x(), -normal.y(), -normal.z());
+				glTexCoord2f(face.v[3].u, face.v[3].v);
+				glVertex3f(face.v[3].p.x(), face.v[3].p.y(), face.v[3].p.z());
+			}
 
-	   		glNormal3f(-normal.x(), -normal.y(),  -normal.z());
-	   		glTexCoord2f(face.v[2].u, face.v[2].v);
-	   		glVertex3f(face.v[2].p.x(), face.v[2].p.y(),  face.v[2].p.z());
+			glNormal3f(-normal.x(), -normal.y(), -normal.z());
+			glTexCoord2f(face.v[2].u, face.v[2].v);
+			glVertex3f(face.v[2].p.x(), face.v[2].p.y(), face.v[2].p.z());
 
-	   		glNormal3f(-normal.x(), -normal.y(),  -normal.z());
-	   		glTexCoord2f(face.v[1].u, face.v[1].v);
-	   		glVertex3f(face.v[1].p.x(), face.v[1].p.y(),  face.v[1].p.z());
+			glNormal3f(-normal.x(), -normal.y(), -normal.z());
+			glTexCoord2f(face.v[1].u, face.v[1].v);
+			glVertex3f(face.v[1].p.x(), face.v[1].p.y(), face.v[1].p.z());
 
-	   		glNormal3f(-normal.x(), -normal.y(),  -normal.z());
-	   		glTexCoord2f(face.v[0].u, face.v[0].v);
-	   		glVertex3f(face.v[0].p.x(), face.v[0].p.y(),  face.v[0].p.z());
-   		}
-   		lastVertexCount = face.vertexCount;
+			glNormal3f(-normal.x(), -normal.y(), -normal.z());
+			glTexCoord2f(face.v[0].u, face.v[0].v);
+			glVertex3f(face.v[0].p.x(), face.v[0].p.y(), face.v[0].p.z());
+		}
+		lastVertexCount = face.vertexCount;
 	}
 	glEnd();
 	//printf("batchCount %d\n", batchCount);
 
-   	if (fDrawNormals) {
-   		glBegin(GL_LINES);
-	   	for(uint32 i = 0; i < fMeshReference->FaceCount(); i++) {
+	if (fDrawNormals) {
+		glBegin(GL_LINES);
+		for(uint32 i = 0; i < fMeshReference->FaceCount(); i++) {
 
 			const Face& face = fMeshReference->GetFace(i);
 

Modified: haiku/trunk/src/apps/haiku3d/RenderView.cpp
===================================================================
--- haiku/trunk/src/apps/haiku3d/RenderView.cpp	2009-08-03 10:33:52 UTC (rev 32068)
+++ haiku/trunk/src/apps/haiku3d/RenderView.cpp	2009-08-03 10:55:13 UTC (rev 32069)
@@ -39,10 +39,6 @@
 RenderView::~RenderView()
 {
 	_StopRenderThread();
-
-	if (fRenderThread >= 0)
-		wait_for_thread(fRenderThread, NULL);
-
 	_DeleteScene();
 }
 
@@ -62,10 +58,9 @@
 uint32
 RenderView::_CreateRenderThread()
 {
-	fRenderThread = spawn_thread(RenderView::_RenderThreadEntry,
-								"renderThread",
-								B_NORMAL_PRIORITY,
-								this);
+	fRenderThread = spawn_thread(RenderView::_RenderThreadEntry, "renderThread",
+		B_NORMAL_PRIORITY, this);
+
 	if (fRenderThread < 0)
 		return fRenderThread;
 
@@ -79,6 +74,9 @@
 	LockGL();
 	fStopRendering = true;
 	UnlockGL();
+
+	if (fRenderThread >= 0)
+		wait_for_thread(fRenderThread, NULL);
 }
 
 
@@ -178,10 +176,9 @@
 		Quaternion(0, 0, 0, 1), 4.0f * timeSpacing);
 	fMeshInstances.push_back(instance);
 	mesh->ReleaseReference();
+	texture->ReleaseReference();
 
 	fMainCamera = new Camera(Vector3(0, 0, 0), Quaternion(0, 0, 0, 1), 50);
-
-	texture->ReleaseReference();
 }
 
 
@@ -200,7 +197,7 @@
 RenderView::_UpdateViewport()
 {
 	if (fNextRes != fRes && fNextRes.x >= 1.0 && fNextRes.y >= 1.0) {
-		glViewport(0, 0, (GLint)fNextRes.x + 1, (GLint)fNextRes.y + 1);
+		glViewport(0, 0, (GLint) fNextRes.x + 1, (GLint) fNextRes.y + 1);
 		fRes = fNextRes;
 		_UpdateCamera();
 	}
@@ -227,10 +224,10 @@
 	_UpdateViewport();
 
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    glLoadIdentity();
+	glLoadIdentity();
 
-    bigtime_t time = system_time();
-    float deltaTime = 0.000001 * (float)(time - fLastFrameTime);
+	bigtime_t time = system_time();
+	float deltaTime = 0.000001 * (float)(time - fLastFrameTime);
 	fLastFrameTime = time;
 
 	MeshInstanceList::iterator it = fMeshInstances.begin();
@@ -243,7 +240,7 @@
 		UnlockGL();
 		return false;
 	}
-    UnlockGL();
+	UnlockGL();
 	SwapBuffers(false); // true = vsync
 	return true;
 }

Modified: haiku/trunk/src/apps/haiku3d/Texture.cpp
===================================================================
--- haiku/trunk/src/apps/haiku3d/Texture.cpp	2009-08-03 10:33:52 UTC (rev 32068)
+++ haiku/trunk/src/apps/haiku3d/Texture.cpp	2009-08-03 10:55:13 UTC (rev 32069)
@@ -32,3 +32,9 @@
 {
 	return fId;
 }
+
+
+void
+Texture::Update(float dt)
+{
+}

Modified: haiku/trunk/src/apps/haiku3d/Texture.h
===================================================================
--- haiku/trunk/src/apps/haiku3d/Texture.h	2009-08-03 10:33:52 UTC (rev 32068)
+++ haiku/trunk/src/apps/haiku3d/Texture.h	2009-08-03 10:55:13 UTC (rev 32069)
@@ -20,7 +20,7 @@
 
 	GLuint		 	Id();
 
-	virtual	void	Update(float dt) {};
+	virtual	void	Update(float dt);
 
 protected:
 	GLuint			fId;



From pulkomandy at mail.berlios.de  Mon Aug  3 12:57:05 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Mon, 3 Aug 2009 12:57:05 +0200
Subject: [Haiku-commits] r32070 - in
	haiku/branches/components/gsoc-locale-kit:
	headers/private/shared src/kits/locale src/preferences/locale
	src/tools/locale
Message-ID: <200908031057.n73Av5nH023113@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-03 12:57:03 +0200 (Mon, 03 Aug 2009)
New Revision: 32070
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32070&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/headers/private/shared/OpenHashTable.h
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/tools/locale/Jamfile
Log:
More work on the locale preflet. Some code stolen from Icon-O-Matic allow you to drag and drop languages between the two lists. The settings are still not saved properly. This is the next step...


Modified: haiku/branches/components/gsoc-locale-kit/headers/private/shared/OpenHashTable.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/private/shared/OpenHashTable.h	2009-08-03 10:55:13 UTC (rev 32069)
+++ haiku/branches/components/gsoc-locale-kit/headers/private/shared/OpenHashTable.h	2009-08-03 10:57:03 UTC (rev 32070)
@@ -45,7 +45,7 @@
 #ifndef __OPEN_HASH_TABLE__
 #define __OPEN_HASH_TABLE__
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <new>
 
 // don't include <Debug.h>

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-08-03 10:55:13 UTC (rev 32069)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-08-03 10:57:03 UTC (rev 32070)
@@ -182,9 +182,9 @@
 	BString langName;
 	if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) {
 		path.Append("Locale settings");
-		if (file.SetTo(path.Path(), B_READ_ONLY) == B_OK && 
-				settingsMessage.Unflatten(&file) == B_OK) {
-			if (settingsMessage.FindString("language",&langName) == B_OK) {
+		if (file.SetTo(path.Path(), B_READ_ONLY) == B_OK
+				&& settingsMessage.Unflatten(&file) == B_OK) {
+			if (settingsMessage.FindString("language", &langName) == B_OK) {
 				fPreferredLanguages.ReplaceString("language", langName);
 				UErrorCode icuError = U_ZERO_ERROR;
 				Locale icuLocale = Locale::createCanonical(langName.String());

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-03 10:55:13 UTC (rev 32069)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-03 10:57:03 UTC (rev 32070)
@@ -9,6 +9,7 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Bitmap.h>
 #include <Button.h>
 #include <Catalog.h>
 #include <GroupLayout.h>
@@ -29,8 +30,10 @@
 
 
 #define TR_CONTEXT "Locale Preflet Window"
+#define MAX_DRAG_HEIGHT		200.0
+#define ALPHA				170
+#define TEXT_OFFSET			5.0
 
-
 // Language lists management
 
 
@@ -47,23 +50,264 @@
 		~LanguageListItem() {};
 
 		const inline BString getLanguageCode() { return LanguageCode; }
+		void Draw(BView *owner, BRect frame);
 	private:
 		const BString LanguageCode;
 };
 
 
+void
+LanguageListItem::Draw(BView *owner, BRect frame)
+{
+	owner->SetLowColor(255, 255, 255, 255);
+	owner->FillRect(frame, B_SOLID_LOW);
+	// label
+	owner->SetHighColor(0, 0, 0, 255);
+	font_height fh;
+	owner->GetFontHeight(&fh);
+	const char* text = Text();
+	BString truncatedString(text);
+	owner->TruncateString(&truncatedString, B_TRUNCATE_MIDDLE,
+						  frame.Width() - TEXT_OFFSET - 4.0);
+	float height = frame.Height();
+	float textHeight = fh.ascent + fh.descent;
+	BPoint textPoint;
+	textPoint.x = frame.left + TEXT_OFFSET;
+	textPoint.y = frame.top
+				  + ceilf(height / 2.0 - textHeight / 2.0
+				  		  + fh.ascent);
+	owner->DrawString(truncatedString.String(), textPoint);
+}
+
+
 // This is a language list. Basically, a drag-n-drop enabled list.
 class LanguageListView: public BListView
 {
 	public:
-		bool InitiateDrag(BPoint point, int32 index, bool wasSelected)
+		LanguageListView(const char* name, list_view_type type)
+			: BListView(name, type)
+		{}
+
+		bool InitiateDrag(BPoint point, int32 index, bool wasSelected);
+		void MouseMoved(BPoint where, uint32 transit, const BMessage *msg);
+		void MoveItems(BList& items, int32 index);
+
+		void MessageReceived (BMessage* message)
 		{
-			if (!wasSelected) return false;
-			return true;
+			if (message->what == 'DRAG') {
+				LanguageListView *list = NULL;
+				if (message->FindPointer("list", (void **)&list) == B_OK) {
+					if (list == this) {
+						int32 count = CountItems();
+						if (fDropIndex < 0 || fDropIndex > count)
+							fDropIndex = count;
+
+						// gather all the items from the BMessage
+						BList items;
+						int32 index;
+						for (int32 i = 0; message->FindInt32("index", i, &index) == B_OK; i++)
+							if (BListItem* item = ItemAt(index))
+								items.AddItem((void*)item);
+
+						// handle them
+						if (items.CountItems() > 0) {
+							MoveItems(items, fDropIndex);
+						}
+						fDropIndex = -1;
+					} else {
+						int32 count = CountItems();
+						if (fDropIndex < 0 || fDropIndex > count)
+							fDropIndex = count;
+
+						// gather all the items from the BMessage
+						int32 index;
+						for (int32 i = 0; message->FindInt32("index", i, &index) == B_OK; i++)
+							if (BListItem* item = list->RemoveItem(index)) {
+								AddItem(item,fDropIndex);
+								fDropIndex++;
+							}
+
+						fDropIndex = -1;
+					}
+				}
+			} else BListView::MessageReceived(message);
 		}
+	private:
+		int32 fDropIndex;
 };
 
 
+void
+LanguageListView::MoveItems(BList& items, int32 index)
+{
+	DeselectAll();
+	// we remove the items while we look at them, the insertion index is decreased
+	// when the items index is lower, so that we insert at the right spot after
+	// removal
+	BList removedItems;
+	int32 count = items.CountItems();
+	for (int32 i = 0; i < count; i++) {
+		BListItem* item = (BListItem*)items.ItemAt(i);
+		int32 removeIndex = IndexOf(item);
+		if (RemoveItem(item) && removedItems.AddItem((void*)item)) {
+			if (removeIndex < index)
+				index--;
+		}
+		// else ??? -> blow up
+	}
+	for (int32 i = 0;
+		 BListItem* item = (BListItem*)removedItems.ItemAt(i); i++) {
+		if (AddItem(item, index)) {
+			// after we're done, the newly inserted items will be selected
+			Select(index, true);
+			// next items will be inserted after this one
+			index++;
+		} else
+			delete item;
+	}
+}
+
+
+bool
+LanguageListView::InitiateDrag(BPoint point, int32 index, bool)
+{
+	bool success = false;
+	BListItem* item = ItemAt(CurrentSelection(0));
+	if (!item) {
+		// workarround a timing problem
+		Select(index);
+		item = ItemAt(index);
+	}
+	if (item) {
+		// create drag message
+		BMessage msg('DRAG');
+		msg.AddPointer("list",(void*)(this));
+		int32 index;
+		for (int32 i = 0; (index = CurrentSelection(i)) >= 0; i++)
+			msg.AddInt32("index", index);
+		// figure out drag rect
+		float width = Bounds().Width();
+		BRect dragRect(0.0, 0.0, width, -1.0);
+		// figure out, how many items fit into our bitmap
+		int32 numItems;
+		bool fade = false;
+		for (numItems = 0; BListItem* item = ItemAt(CurrentSelection(numItems)); numItems++) {
+			dragRect.bottom += ceilf(item->Height()) + 1.0;
+			if (dragRect.Height() > MAX_DRAG_HEIGHT) {
+				fade = true;
+				dragRect.bottom = MAX_DRAG_HEIGHT;
+				numItems++;
+				break;
+			}
+		}
+		BBitmap* dragBitmap = new BBitmap(dragRect, B_RGB32, true);
+		if (dragBitmap && dragBitmap->IsValid()) {
+			if (BView *v = new BView(dragBitmap->Bounds(), "helper",
+									 B_FOLLOW_NONE, B_WILL_DRAW)) {
+				dragBitmap->AddChild(v);
+				dragBitmap->Lock();
+				BRect itemBounds(dragRect) ;
+				itemBounds.bottom = 0.0;
+				// let all selected items, that fit into our drag_bitmap, draw
+				for (int32 i = 0; i < numItems; i++) {
+					int32 index = CurrentSelection(i);
+					LanguageListItem* item = static_cast<LanguageListItem*>(ItemAt(index));
+					itemBounds.bottom = itemBounds.top + ceilf(item->Height());
+					if (itemBounds.bottom > dragRect.bottom)
+						itemBounds.bottom = dragRect.bottom;
+					item->Draw(v, itemBounds);
+					itemBounds.top = itemBounds.bottom + 1.0;
+				}
+				// make a black frame arround the edge
+				v->SetHighColor(0, 0, 0, 255);
+				v->StrokeRect(v->Bounds());
+				v->Sync();
+	
+				uint8 *bits = (uint8 *)dragBitmap->Bits();
+				int32 height = (int32)dragBitmap->Bounds().Height() + 1;
+				int32 width = (int32)dragBitmap->Bounds().Width() + 1;
+				int32 bpr = dragBitmap->BytesPerRow();
+	
+				if (fade) {
+					for (int32 y = 0; y < height - ALPHA / 2; y++, bits += bpr) {
+						uint8 *line = bits + 3;
+						for (uint8 *end = line + 4 * width; line < end; line += 4)
+							*line = ALPHA;
+					}
+					for (int32 y = height - ALPHA / 2; y < height; y++, bits += bpr) {
+						uint8 *line = bits + 3;
+						for (uint8 *end = line + 4 * width; line < end; line += 4)
+							*line = (height - y) << 1;
+					}
+				} else {
+					for (int32 y = 0; y < height; y++, bits += bpr) {
+						uint8 *line = bits + 3;
+						for (uint8 *end = line + 4 * width; line < end; line += 4)
+							*line = ALPHA;
+					}
+				}
+				dragBitmap->Unlock();
+			}
+		} else {
+			delete dragBitmap;
+			dragBitmap = NULL;
+		}
+		if (dragBitmap)
+			DragMessage(&msg, dragBitmap, B_OP_ALPHA, BPoint(0.0, 0.0));
+		else
+			DragMessage(&msg, dragRect.OffsetToCopy(point), this);
+
+		success = true;
+	}
+	return success;
+}
+
+
+void
+LanguageListView::MouseMoved(BPoint where, uint32 transit, const BMessage *msg)
+{
+	if (msg && (msg->what == 'DRAG')) {
+		switch (transit) {
+			case B_ENTERED_VIEW:
+			case B_INSIDE_VIEW: {
+				// set drop target through virtual function
+				// offset where by half of item height
+				BRect r = ItemFrame(0);
+				where.y += r.Height() / 2.0;
+	
+				int32 index = IndexOf(where);
+				if (index < 0)
+					index = CountItems();
+				if (fDropIndex != index) {
+					fDropIndex = index;
+					if (fDropIndex >= 0) {
+						int32 count = CountItems();
+						if (fDropIndex == count) {
+							BRect r;
+							if (BListItem* item = ItemAt(count - 1)) {
+								r = ItemFrame(count - 1);
+								r.top = r.bottom;
+								r.bottom = r.top + 1.0;
+							} else {
+								r = Bounds();
+								r.bottom--;	// compensate for scrollbars moved slightly out of window
+							}
+						} else {
+							BRect r = ItemFrame(fDropIndex);
+							r.top--;
+							r.bottom = r.top + 1.0;
+						}
+					}
+				}
+				break;
+			}
+		}
+	} else {
+		BListView::MouseMoved(where, transit, msg);
+	}
+}
+
+
 const static uint32 kMsgSelectLanguage = 'slng';
 const static uint32 kMsgDefaults = 'dflt';
 const static uint32 kMsgRevert = 'revt';
@@ -94,8 +338,8 @@
 
 	{
 		// first list: available languages
-		BListView *listView = new BListView("available",
-			B_SINGLE_SELECTION_LIST);
+		LanguageListView *listView = new LanguageListView("available",
+			B_MULTIPLE_SELECTION_LIST);
 		listView->SetSelectionMessage(new BMessage(kMsgSelectLanguage));
 		BScrollView *scrollView = new BScrollView("scroller", listView, 
 			0, false, true, B_FANCY_BORDER);
@@ -118,7 +362,7 @@
 				currentLocale.getDisplayName(languageFullName);
 				languageFullName.toUTF8(bbs);
 				LanguageListItem* si = 
-					new LanguageListItem(str,currentLanguage.String());
+					new LanguageListItem(str, currentLanguage.String());
 				listView->AddItem(si);
 			}
 
@@ -141,8 +385,8 @@
 		*/
 
 		// Second list: active languages
-		listView = new BListView("enabled",
-			B_SINGLE_SELECTION_LIST);
+		listView = new LanguageListView("preferred",
+			B_MULTIPLE_SELECTION_LIST);
 		listView->SetSelectionMessage(new BMessage(kMsgSelectLanguage));
 		BScrollView *scrollViewEnabled = new BScrollView("scroller", listView, 
 			0, false, true, B_FANCY_BORDER);
@@ -244,24 +488,6 @@
 			// revert to last settings
 			break;
 
-		case kMsgSelectLanguage:
-		{
-			// select language
-			void* tmp;
-			message->FindPointer("source",&tmp);
-			BListView* languageList = static_cast<BListView*>(tmp);
-			BMessage preferredLanguages(kMsgSettingsChanged);
-			preferredLanguages.AddString("language", 
-				static_cast<LanguageListItem*>(
-						languageList->ItemAt(languageList->CurrentSelection()))
-					->getLanguageCode());
-			be_locale_roster->SetPreferredLanguages(&preferredLanguages);
-
-			be_app_messenger.SendMessage(&preferredLanguages);
-
-			break;
-		}
-
 		default:
 			BWindow::MessageReceived(message);
 			break;

Modified: haiku/branches/components/gsoc-locale-kit/src/tools/locale/Jamfile
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/tools/locale/Jamfile	2009-08-03 10:55:13 UTC (rev 32069)
+++ haiku/branches/components/gsoc-locale-kit/src/tools/locale/Jamfile	2009-08-03 10:57:03 UTC (rev 32070)
@@ -38,7 +38,7 @@
 	Catalog.cpp
 	RegExp.cpp
 	adler32.c
-	: $(HOST_LIBBE) ;
+	: $(HOST_LIBBE)  $(HOST_LIBSUPC++) ;
 
 BuildPlatformMain <build>linkcatkeys :
 	linkcatkeys.cpp
@@ -47,4 +47,4 @@
 	DefaultCatalog.cpp
 	Catalog.cpp
 	adler32.c
-	: $(HOST_LIBBE) ;
+	: $(HOST_LIBBE) $(HOST_LIBSUPC++) ;



From bonefish at mail.berlios.de  Mon Aug  3 13:32:20 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 3 Aug 2009 13:32:20 +0200
Subject: [Haiku-commits] r32071 - haiku/trunk/src/system/kernel/arch
Message-ID: <200908031132.n73BWKPb027249@sheep.berlios.de>

Author: bonefish
Date: 2009-08-03 13:32:08 +0200 (Mon, 03 Aug 2009)
New Revision: 32071
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32071&view=rev

Removed:
   haiku/trunk/src/system/kernel/arch/sh4/
   haiku/trunk/src/system/kernel/arch/sparc/
   haiku/trunk/src/system/kernel/arch/sparc64/
Log:
Removed unsupported architectures.




From bonefish at mail.berlios.de  Mon Aug  3 13:54:34 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 3 Aug 2009 13:54:34 +0200
Subject: [Haiku-commits] r32072 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200908031154.n73BsY1A029187@sheep.berlios.de>

Author: bonefish
Date: 2009-08-03 13:54:25 +0200 (Mon, 03 Aug 2009)
New Revision: 32072
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32072&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_debug_console.c
Log:
Don't lock when the debugger is running.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_debug_console.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_debug_console.c	2009-08-03 11:32:08 UTC (rev 32071)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_debug_console.c	2009-08-03 11:54:25 UTC (rev 32072)
@@ -344,13 +344,18 @@
 void
 arch_debug_serial_putchar(const char c)
 {
-	cpu_status state = disable_interrupts();
-	acquire_spinlock(&sSerialOutputSpinlock);
+	cpu_status state = 0;
+	if (!debug_debugger_running()) {
+		state = disable_interrupts();
+		acquire_spinlock(&sSerialOutputSpinlock);
+	}
 
 	_arch_debug_serial_putchar(c);
 
-	release_spinlock(&sSerialOutputSpinlock);
-	restore_interrupts(state);
+	if (!debug_debugger_running()) {
+		release_spinlock(&sSerialOutputSpinlock);
+		restore_interrupts(state);
+	}
 }
 
 



From bonefish at mail.berlios.de  Mon Aug  3 14:40:29 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 3 Aug 2009 14:40:29 +0200
Subject: [Haiku-commits] r32073 - in haiku/trunk: headers/private/kernel
	headers/private/kernel/arch headers/private/kernel/arch/x86
	src/system/boot/loader src/system/boot/platform/bios_ia32
	src/system/boot/platform/openfirmware/arch/ppc
	src/system/boot/platform/u-boot src/system/kernel
	src/system/kernel/arch/m68k src/system/kernel/arch/ppc
	src/system/kernel/arch/x86 src/system/kernel/debug
	src/system/kernel/slab src/system/kernel/vm
Message-ID: <200908031240.n73CeTJL007743@sheep.berlios.de>

Author: bonefish
Date: 2009-08-03 14:39:56 +0200 (Mon, 03 Aug 2009)
New Revision: 32073
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32073&view=rev

Modified:
   haiku/trunk/headers/private/kernel/arch/debug.h
   haiku/trunk/headers/private/kernel/arch/vm_translation_map.h
   haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h
   haiku/trunk/headers/private/kernel/cpu.h
   haiku/trunk/headers/private/kernel/debug.h
   haiku/trunk/headers/private/kernel/kernel.h
   haiku/trunk/src/system/boot/loader/elf.cpp
   haiku/trunk/src/system/boot/loader/kernel_args.cpp
   haiku/trunk/src/system/boot/platform/bios_ia32/mmu.cpp
   haiku/trunk/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp
   haiku/trunk/src/system/boot/platform/u-boot/mmu.cpp
   haiku/trunk/src/system/kernel/arch/m68k/arch_cpu.cpp
   haiku/trunk/src/system/kernel/arch/m68k/arch_debug.cpp
   haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp
   haiku/trunk/src/system/kernel/arch/ppc/arch_cpu.cpp
   haiku/trunk/src/system/kernel/arch/ppc/arch_debug.cpp
   haiku/trunk/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp
   haiku/trunk/src/system/kernel/arch/x86/arch_debug.cpp
   haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp
   haiku/trunk/src/system/kernel/arch/x86/arch_interrupts.S
   haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
   haiku/trunk/src/system/kernel/arch/x86/arch_x86.S
   haiku/trunk/src/system/kernel/arch/x86/asm_offsets.cpp
   haiku/trunk/src/system/kernel/arch/x86/interrupts.h
   haiku/trunk/src/system/kernel/arch/x86/x86_physical_page_mapper.h
   haiku/trunk/src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp
   haiku/trunk/src/system/kernel/debug/debug.cpp
   haiku/trunk/src/system/kernel/debug/debug_commands.cpp
   haiku/trunk/src/system/kernel/debug/debug_parser.cpp
   haiku/trunk/src/system/kernel/debug/gdb.cpp
   haiku/trunk/src/system/kernel/elf.cpp
   haiku/trunk/src/system/kernel/slab/Slab.cpp
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
* Renamed the ROUNDOWN macro to ROUNDDOWN. Also changed the implementation of
  ROUNDUP to use '*' and '/' -- the compiler will optimize that for powers of
  two anyway and this implementation works for other numbers as well.
* The thread::fault_handler use in C[++] code was broken with gcc 4. At least
  when other functions were invoked. Trying to trick the compiler wasn't a
  particularly good idea anyway, since the next compiler version could break
  the trick again. So the general policy is to use the fault handlers only in
  assembly code where we have full control. Changed that for x86 (save for the
  vm86 mode, which has a similar mechanism), but not for the other
  architectures.
* Introduced fault_handler, fault_handler_stack_pointer, and fault_jump_buffer
  fields in the cpu_ent structure, which must be used instead of
  thread::fault_handler in the kernel debugger. Consequently user_memcpy() must
  not be used in the kernel debugger either. Introduced a debug_memcpy()
  instead.
* Introduced debug_call_with_fault_handler() function which calls a function
  in a setjmp() and fault handler context. The architecture specific backend
  arch_debug_call_with_fault_handler() has only been implemented for x86 yet.
* Introduced debug_is_kernel_memory_accessible() for use in the kernel
  debugger. It determines whether a range of memory can be accessed in the
  way specified. The architecture specific back end
  arch_vm_translation_map_is_kernel_page_accessible() has only been implemented
  for x86 yet.
* Added arch_debug_unset_current_thread() (only implemented for x86) to unset
  the current thread pointer in the kernel debugger. When entering the kernel
  debugger we do some basic sanity checks of the currently set thread structure
  and unset it, if they fail. This allows certain commands (most importantly
  the stack trace command) to avoid accessing the thread structure.
* x86: When handling a double fault, we do now install a special handler for
  page faults. This allows us to gracefully catch faulting commands, even if
  e.g. the thread structure is toast.

We are now in much better shape to deal with double faults. Hopefully avoiding
the triple faults that some people have been experiencing on their hardware
and ideally even allowing to use the kernel debugger normally.


Modified: haiku/trunk/headers/private/kernel/arch/debug.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/debug.h	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/headers/private/kernel/arch/debug.h	2009-08-03 12:39:56 UTC (rev 32073)
@@ -11,6 +11,9 @@
 
 #include <SupportDefs.h>
 
+#include <cpu.h>
+
+
 struct kernel_args;
 struct thread;
 
@@ -27,6 +30,9 @@
 bool arch_debug_contains_call(struct thread *thread, const char *symbol,
 		addr_t start, addr_t end);
 void arch_debug_save_registers(int *);
+void arch_debug_unset_current_thread(void);
+void arch_debug_call_with_fault_handler(cpu_ent* cpu, jmp_buf jumpBuffer,
+		void (*function)(void*), void* parameter);
 
 bool arch_is_debug_variable_defined(const char* variableName);
 status_t arch_set_debug_variable(const char* variableName, uint64 value);

Modified: haiku/trunk/headers/private/kernel/arch/vm_translation_map.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/vm_translation_map.h	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/headers/private/kernel/arch/vm_translation_map.h	2009-08-03 12:39:56 UTC (rev 32073)
@@ -23,11 +23,14 @@
 status_t arch_vm_translation_map_init_post_area(struct kernel_args *args);
 status_t arch_vm_translation_map_init_post_sem(struct kernel_args *args);
 
-// quick function to map a page in regardless of map context. Used in VM initialization,
-// before most vm data structures exist
+// Quick function to map a page in regardless of map context. Used in VM
+// initialization before most vm data structures exist.
 status_t arch_vm_translation_map_early_map(struct kernel_args *args, addr_t va, addr_t pa,
 	uint8 attributes, addr_t (*get_free_page)(struct kernel_args *));
 
+bool arch_vm_translation_map_is_kernel_page_accessible(addr_t virtualAddress,
+		uint32 protection);
+
 #ifdef __cplusplus
 }
 #endif

Modified: haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/headers/private/kernel/arch/x86/arch_cpu.h	2009-08-03 12:39:56 UTC (rev 32073)
@@ -284,6 +284,7 @@
 void* x86_get_double_fault_stack(int32 cpu, size_t* _size);
 int32 x86_double_fault_get_cpu(void);
 void x86_double_fault_exception(struct iframe* frame);
+void x86_page_fault_exception_double_fault(struct iframe* frame);
 
 
 #define read_cr3(value) \

Modified: haiku/trunk/headers/private/kernel/cpu.h
===================================================================
--- haiku/trunk/headers/private/kernel/cpu.h	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/headers/private/kernel/cpu.h	2009-08-03 12:39:56 UTC (rev 32073)
@@ -9,6 +9,8 @@
 #define _KERNEL_CPU_H
 
 
+#include <setjmp.h>
+
 #include <smp.h>
 #include <timer.h>
 #include <boot/kernel_args.h>
@@ -24,20 +26,25 @@
 /* CPU local data structure */
 
 typedef struct cpu_ent {
-	int cpu_num;
+	int			cpu_num;
 
 	// thread.c: used to force a reschedule at quantum expiration time
-	int preempted;
-	timer quantum_timer;
+	int			preempted;
+	timer		quantum_timer;
 
 	// keeping track of CPU activity
-	bigtime_t active_time;
-	bigtime_t last_kernel_time;
-	bigtime_t last_user_time;
+	bigtime_t	active_time;
+	bigtime_t	last_kernel_time;
+	bigtime_t	last_user_time;
 
-	bool invoke_scheduler;
-	bool disabled;
+	// used in the kernel debugger
+	addr_t		fault_handler;
+	addr_t		fault_handler_stack_pointer;
+	jmp_buf		fault_jump_buffer;
 
+	bool		invoke_scheduler;
+	bool		disabled;
+
 	// arch-specific stuff
 	arch_cpu_info arch;
 } cpu_ent __attribute__((aligned(64)));

Modified: haiku/trunk/headers/private/kernel/debug.h
===================================================================
--- haiku/trunk/headers/private/kernel/debug.h	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/headers/private/kernel/debug.h	2009-08-03 12:39:56 UTC (rev 32073)
@@ -8,12 +8,15 @@
 #ifndef _KERNEL_DEBUG_H
 #define _KERNEL_DEBUG_H
 
-#include "kernel_debug_config.h"
 
+#include <setjmp.h>
+
 #include <KernelExport.h>
 #include <module.h>
 
+#include "kernel_debug_config.h"
 
+
 /*	KDEBUG
 	The kernel debug level.
 	Level 1 is usual asserts, > 1 should be used for very expensive runtime
@@ -123,6 +126,11 @@
 extern void		debug_trap_cpu_in_kdl(int32 cpu, bool returnIfHandedOver);
 extern void		debug_double_fault(int32 cpu);
 extern bool		debug_emergency_key_pressed(char key);
+extern bool		debug_is_kernel_memory_accessible(addr_t address, size_t size,
+					uint32 protection);
+extern int		debug_call_with_fault_handler(jmp_buf jumpBuffer,
+					void (*function)(void*), void* parameter);
+extern status_t	debug_memcpy(void* to, const void* from, size_t size);
 
 extern char		kgetc(void);
 extern void		kputs(const char *string);

Modified: haiku/trunk/headers/private/kernel/kernel.h
===================================================================
--- haiku/trunk/headers/private/kernel/kernel.h	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/headers/private/kernel/kernel.h	2009-08-03 12:39:56 UTC (rev 32073)
@@ -39,8 +39,8 @@
 #define ENV_SIZE	(B_PAGE_SIZE * 8)
 
 
-#define ROUNDUP(a, b) (((a) + ((b)-1)) & ~((b)-1))
-#define ROUNDOWN(a, b) (((a) / (b)) * (b))
+#define ROUNDDOWN(a, b)	(((a) / (b)) * (b))
+#define ROUNDUP(a, b)	ROUNDDOWN((a) + (b) - 1, b)
 
 
 #define CHECK_BIT(a, b) ((a) & (1 << (b)))

Modified: haiku/trunk/src/system/boot/loader/elf.cpp
===================================================================
--- haiku/trunk/src/system/boot/loader/elf.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/boot/loader/elf.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -126,9 +126,9 @@
 		status = B_ERROR;
 		goto error1;
 	}
-	
+
 	// find symbol table in section headers
-	
+
 	for (int32 i = 0; i < elfHeader.e_shnum; i++) {
 		if (sectionHeaders[i].sh_type == SHT_SYMTAB) {
 			stringHeader = &sectionHeaders[sectionHeaders[i].sh_link];
@@ -275,7 +275,7 @@
 		} else
 			continue;
 
-		region->start = ROUNDOWN(header.p_vaddr, B_PAGE_SIZE);
+		region->start = ROUNDDOWN(header.p_vaddr, B_PAGE_SIZE);
 		region->size = ROUNDUP(header.p_memsz + (header.p_vaddr % B_PAGE_SIZE),
 			B_PAGE_SIZE);
 		region->delta = -region->start;

Modified: haiku/trunk/src/system/boot/loader/kernel_args.cpp
===================================================================
--- haiku/trunk/src/system/boot/loader/kernel_args.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/boot/loader/kernel_args.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -62,7 +62,7 @@
 {
 	uint32 numRanges = *_numRanges;
 
-	start = ROUNDOWN(start, B_PAGE_SIZE);
+	start = ROUNDDOWN(start, B_PAGE_SIZE);
 	size = ROUNDUP(size, B_PAGE_SIZE);
 	addr_t end = start + size;
 
@@ -141,7 +141,7 @@
 	uint32 numRanges = *_numRanges;
 
 	addr_t end = ROUNDUP(start + size, B_PAGE_SIZE);
-	start = ROUNDOWN(start, B_PAGE_SIZE);
+	start = ROUNDDOWN(start, B_PAGE_SIZE);
 
 	for (uint32 i = 0; i < numRanges; i++) {
 		addr_t rangeStart = ranges[i].start;

Modified: haiku/trunk/src/system/boot/platform/bios_ia32/mmu.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/mmu.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/mmu.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -632,7 +632,7 @@
 				extMemoryBlock[i].base_addr
 					= ROUNDUP(extMemoryBlock[i].base_addr, B_PAGE_SIZE);
 				extMemoryBlock[i].length
-					= ROUNDOWN(extMemoryBlock[i].length, B_PAGE_SIZE);
+					= ROUNDDOWN(extMemoryBlock[i].length, B_PAGE_SIZE);
 
 				// we ignore all memory beyond 4 GB
 				if (extMemoryBlock[i].base_addr > 0xffffffffULL)

Modified: haiku/trunk/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -57,7 +57,7 @@
 insert_memory_range(addr_range *ranges, uint32 &numRanges, uint32 maxRanges,
 	const void *_start, uint32 _size)
 {
-	addr_t start = ROUNDOWN(addr_t(_start), B_PAGE_SIZE);
+	addr_t start = ROUNDDOWN(addr_t(_start), B_PAGE_SIZE);
 	addr_t end = ROUNDUP(addr_t(_start) + _size, B_PAGE_SIZE);
 	addr_t size = end - start;
 	if (size == 0)
@@ -133,7 +133,7 @@
 remove_memory_range(addr_range *ranges, uint32 &numRanges, uint32 maxRanges,
 	const void *_start, uint32 _size)
 {
-	addr_t start = ROUNDOWN(addr_t(_start), B_PAGE_SIZE);
+	addr_t start = ROUNDDOWN(addr_t(_start), B_PAGE_SIZE);
 	addr_t end = ROUNDUP(addr_t(_start) + _size, B_PAGE_SIZE);
 
 	for (uint32 i = 0; i < numRanges; i++) {

Modified: haiku/trunk/src/system/boot/platform/u-boot/mmu.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/mmu.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/boot/platform/u-boot/mmu.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -618,7 +618,7 @@
 				extMemoryBlock[i].base_addr
 					= ROUNDUP(extMemoryBlock[i].base_addr, B_PAGE_SIZE);
 				extMemoryBlock[i].length
-					= ROUNDOWN(extMemoryBlock[i].length, B_PAGE_SIZE);
+					= ROUNDDOWN(extMemoryBlock[i].length, B_PAGE_SIZE);
 
 				// we ignore all memory beyond 4 GB
 				if (extMemoryBlock[i].base_addr > 0xffffffffULL)

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_cpu.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_cpu.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_cpu.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -30,7 +30,7 @@
 int arch_mmu_type;
 int arch_platform;
 
-status_t 
+status_t
 arch_cpu_preboot_init_percpu(kernel_args *args, int curr_cpu)
 {
 	// enable FPU
@@ -44,7 +44,7 @@
 }
 
 
-status_t 
+status_t
 arch_cpu_init_percpu(kernel_args *args, int curr_cpu)
 {
 	//detect_cpu(curr_cpu);
@@ -102,7 +102,7 @@
 }
 
 
-void 
+void
 arch_cpu_sync_icache(void *address, size_t len)
 {
 	cpu_ops.flush_icache((addr_t)address, len);
@@ -125,7 +125,7 @@
 }
 
 
-void 
+void
 arch_cpu_invalidate_TLB_range(addr_t start, addr_t end)
 {
 	int32 num_pages = end / B_PAGE_SIZE - start / B_PAGE_SIZE;
@@ -139,11 +139,11 @@
 }
 
 
-void 
+void
 arch_cpu_invalidate_TLB_list(addr_t pages[], int num_pages)
 {
 	int i;
-	
+
 	cpu_ops.flush_insn_pipeline();
 	for (i = 0; i < num_pages; i++) {
 		cpu_ops.flush_atc_addr(pages[i]);
@@ -153,7 +153,7 @@
 }
 
 
-void 
+void
 arch_cpu_global_TLB_invalidate(void)
 {
 	cpu_ops.flush_insn_pipeline();
@@ -162,7 +162,7 @@
 }
 
 
-void 
+void
 arch_cpu_user_TLB_invalidate(void)
 {
 	cpu_ops.flush_insn_pipeline();
@@ -179,6 +179,7 @@
 	char *s = (char *)from;
 	addr_t oldFaultHandler = *faultHandler;
 
+// TODO: This doesn't work correctly with gcc 4 anymore!
 	if (m68k_set_fault_handler(faultHandler, (addr_t)&&error))
 		goto error;
 
@@ -200,7 +201,7 @@
  *	\param to Pointer to the destination C-string.
  *	\param from Pointer to the source C-string.
  *	\param size Size in bytes of the string buffer pointed to by \a to.
- *	
+ *
  *	\return strlen(\a from).
  */
 
@@ -210,12 +211,13 @@
 	int from_length = 0;
 	addr_t oldFaultHandler = *faultHandler;
 
+// TODO: This doesn't work correctly with gcc 4 anymore!
 	if (m68k_set_fault_handler(faultHandler, (addr_t)&&error))
 		goto error;
 
 	if (size > 0) {
 		to[--size] = '\0';
-		// copy 
+		// copy
 		for ( ; size; size--, from_length++, to++, from++) {
 			if ((*to = *from) == '\0')
 				break;
@@ -240,6 +242,7 @@
 	char *xs = (char *)s;
 	addr_t oldFaultHandler = *faultHandler;
 
+// TODO: This doesn't work correctly with gcc 4 anymore!
 	if (m68k_set_fault_handler(faultHandler, (addr_t)&&error))
 		goto error;
 
@@ -289,6 +292,7 @@
 bool
 m68k_set_fault_handler(addr_t *handlerLocation, addr_t handler)
 {
+// TODO: This doesn't work correctly with gcc 4 anymore!
 	*handlerLocation = handler;
 	return false;
 }

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_debug.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_debug.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_debug.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -65,25 +65,14 @@
 static status_t
 get_next_frame(addr_t framePointer, addr_t *next, addr_t *ip)
 {
-	struct thread *thread = thread_get_current_thread();
-	addr_t oldFaultHandler = thread->fault_handler;
+	stack_frame frame;
+	if (debug_memcpy(&frame, (void*)framePointer, sizeof(frame)) != B_OK)
+		return B_BAD_ADDRESS;
 
-	// set fault handler, so that we can safely access user stacks
-	if (thread) {
-		if (m68k_set_fault_handler(&thread->fault_handler, (addr_t)&&error))
-			goto error;
-	}
+	*ip = frame.return_address;
+	*next = (addr_t)frame.previous;
 
-	*ip = ((struct stack_frame *)framePointer)->return_address;
-	*next = (addr_t)((struct stack_frame *)framePointer)->previous;
-
-	if (thread)
-		thread->fault_handler = oldFaultHandler;
 	return B_OK;
-
-error:
-	thread->fault_handler = oldFaultHandler;
-	return B_BAD_ADDRESS;
 }
 
 
@@ -367,6 +356,22 @@
 }
 
 
+void
+arch_debug_unset_current_thread(void)
+{
+	// TODO: Implement!
+}
+
+
+void
+arch_debug_call_with_fault_handler(cpu_ent* cpu, jmp_buf jumpBuffer,
+	void (*function)(void*), void* parameter)
+{
+	// TODO: Implement! Most likely in assembly.
+	longjmp(jumpBuffer, 1);
+}
+
+
 bool
 arch_is_debug_variable_defined(const char* variableName)
 {

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -651,7 +651,7 @@
 	status_t status;
 	int index;
 
-	start = ROUNDOWN(start, B_PAGE_SIZE);
+	start = ROUNDDOWN(start, B_PAGE_SIZE);
 	end = ROUNDUP(end, B_PAGE_SIZE);
 
 	TRACE(("unmap_tmap: asked to free pages 0x%lx to 0x%lx\n", start, end));
@@ -873,7 +873,7 @@
 	status_t status;
 	int index;
 
-	start = ROUNDOWN(start, B_PAGE_SIZE);
+	start = ROUNDDOWN(start, B_PAGE_SIZE);
 	end = ROUNDUP(end, B_PAGE_SIZE);
 
 	TRACE(("protect_tmap: pages 0x%lx to 0x%lx, attributes %lx\n", start, end, attributes));
@@ -1511,3 +1511,11 @@
 	return B_OK;
 }
 
+
+bool
+arch_vm_translation_map_is_kernel_page_accessible(addr_t virtualAddress,
+	uint32 protection)
+{
+	// TODO: Implement!
+	return false;
+}

Modified: haiku/trunk/src/system/kernel/arch/ppc/arch_cpu.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/ppc/arch_cpu.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/kernel/arch/ppc/arch_cpu.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -16,7 +16,7 @@
 
 static bool sHasTlbia;
 
-status_t 
+status_t
 arch_cpu_preboot_init_percpu(kernel_args *args, int curr_cpu)
 {
 	// enable FPU
@@ -65,7 +65,7 @@
 
 #define CACHELINE 32
 
-void 
+void
 arch_cpu_sync_icache(void *address, size_t len)
 {
 	int l, off;
@@ -109,7 +109,7 @@
 }
 
 
-void 
+void
 arch_cpu_invalidate_TLB_range(addr_t start, addr_t end)
 {
 	asm volatile("sync");
@@ -124,7 +124,7 @@
 }
 
 
-void 
+void
 arch_cpu_invalidate_TLB_list(addr_t pages[], int num_pages)
 {
 	int i;
@@ -140,7 +140,7 @@
 }
 
 
-void 
+void
 arch_cpu_global_TLB_invalidate(void)
 {
 	if (sHasTlbia) {
@@ -156,7 +156,7 @@
 			tlbie(address);
 			eieio();
 			ppc_sync();
-	
+
 			address += B_PAGE_SIZE;
 		}
 		tlbsync();
@@ -165,7 +165,7 @@
 }
 
 
-void 
+void
 arch_cpu_user_TLB_invalidate(void)
 {
 	arch_cpu_global_TLB_invalidate();
@@ -180,6 +180,7 @@
 	char *s = (char *)from;
 	addr_t oldFaultHandler = *faultHandler;
 
+// TODO: This doesn't work correctly with gcc 4 anymore!
 	if (ppc_set_fault_handler(faultHandler, (addr_t)&&error))
 		goto error;
 
@@ -201,7 +202,7 @@
  *	\param to Pointer to the destination C-string.
  *	\param from Pointer to the source C-string.
  *	\param size Size in bytes of the string buffer pointed to by \a to.
- *	
+ *
  *	\return strlen(\a from).
  */
 
@@ -211,12 +212,13 @@
 	int from_length = 0;
 	addr_t oldFaultHandler = *faultHandler;
 
+// TODO: This doesn't work correctly with gcc 4 anymore!
 	if (ppc_set_fault_handler(faultHandler, (addr_t)&&error))
 		goto error;
 
 	if (size > 0) {
 		to[--size] = '\0';
-		// copy 
+		// copy
 		for ( ; size; size--, from_length++, to++, from++) {
 			if ((*to = *from) == '\0')
 				break;
@@ -241,6 +243,7 @@
 	char *xs = (char *)s;
 	addr_t oldFaultHandler = *faultHandler;
 
+// TODO: This doesn't work correctly with gcc 4 anymore!
 	if (ppc_set_fault_handler(faultHandler, (addr_t)&&error))
 		goto error;
 
@@ -286,6 +289,7 @@
 bool
 ppc_set_fault_handler(addr_t *handlerLocation, addr_t handler)
 {
+// TODO: This doesn't work correctly with gcc 4 anymore!
 	*handlerLocation = handler;
 	return false;
 }

Modified: haiku/trunk/src/system/kernel/arch/ppc/arch_debug.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/ppc/arch_debug.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/kernel/arch/ppc/arch_debug.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -64,25 +64,14 @@
 static status_t
 get_next_frame(addr_t framePointer, addr_t *next, addr_t *ip)
 {
-	struct thread *thread = thread_get_current_thread();
-	addr_t oldFaultHandler = thread->fault_handler;
+	stack_frame frame;
+	if (debug_memcpy(&frame, (void*)framePointer, sizeof(frame)) != B_OK)
+		return B_BAD_ADDRESS;
 
-	// set fault handler, so that we can safely access user stacks
-	if (thread) {
-		if (ppc_set_fault_handler(&thread->fault_handler, (addr_t)&&error))
-			goto error;
-	}
+	*ip = frame.return_address;
+	*next = (addr_t)frame.previous;
 
-	*ip = ((struct stack_frame *)framePointer)->return_address;
-	*next = (addr_t)((struct stack_frame *)framePointer)->previous;
-
-	if (thread)
-		thread->fault_handler = oldFaultHandler;
 	return B_OK;
-
-error:
-	thread->fault_handler = oldFaultHandler;
-	return B_BAD_ADDRESS;
 }
 
 
@@ -303,6 +292,22 @@
 }
 
 
+void
+arch_debug_unset_current_thread(void)
+{
+	// TODO: Implement!
+}
+
+
+void
+arch_debug_call_with_fault_handler(cpu_ent* cpu, jmp_buf jumpBuffer,
+	void (*function)(void*), void* parameter)
+{
+	// TODO: Implement! Most likely in assembly.
+	longjmp(jumpBuffer, 1);
+}
+
+
 bool
 arch_is_debug_variable_defined(const char* variableName)
 {

Modified: haiku/trunk/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -330,7 +330,7 @@
 {
 	page_table_entry *entry;
 
-	start = ROUNDOWN(start, B_PAGE_SIZE);
+	start = ROUNDDOWN(start, B_PAGE_SIZE);
 	end = ROUNDUP(end, B_PAGE_SIZE);
 
 //	dprintf("vm_translation_map.unmap_tmap: start 0x%lx, end 0x%lx\n", start, end);
@@ -678,8 +678,8 @@
 	size_t size)
 {
 	addr_t virtualEnd = ROUNDUP(virtualAddress + size, B_PAGE_SIZE);
-	virtualAddress = ROUNDOWN(virtualAddress, B_PAGE_SIZE);
-	physicalAddress = ROUNDOWN(physicalAddress, B_PAGE_SIZE);
+	virtualAddress = ROUNDDOWN(virtualAddress, B_PAGE_SIZE);
+	physicalAddress = ROUNDDOWN(physicalAddress, B_PAGE_SIZE);
 
 	vm_address_space *addressSpace = vm_kernel_address_space();
 
@@ -701,7 +701,7 @@
 ppc_unmap_address_range(addr_t virtualAddress, size_t size)
 {
 	addr_t virtualEnd = ROUNDUP(virtualAddress + size, B_PAGE_SIZE);
-	virtualAddress = ROUNDOWN(virtualAddress, B_PAGE_SIZE);
+	virtualAddress = ROUNDDOWN(virtualAddress, B_PAGE_SIZE);
 
 	vm_address_space *addressSpace = vm_kernel_address_space();
 
@@ -713,7 +713,7 @@
 status_t
 ppc_remap_address_range(addr_t *_virtualAddress, size_t size, bool unmap)
 {
-	addr_t virtualAddress = ROUNDOWN(*_virtualAddress, B_PAGE_SIZE);
+	addr_t virtualAddress = ROUNDDOWN(*_virtualAddress, B_PAGE_SIZE);
 	size = ROUNDUP(*_virtualAddress + size - virtualAddress, B_PAGE_SIZE);
 
 	vm_address_space *addressSpace = vm_kernel_address_space();
@@ -746,3 +746,11 @@
 	return B_OK;
 }
 
+
+bool
+arch_vm_translation_map_is_kernel_page_accessible(addr_t virtualAddress,
+	uint32 protection)
+{
+	// TODO: Implement!
+	return false;
+}

Modified: haiku/trunk/src/system/kernel/arch/x86/arch_debug.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_debug.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_debug.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -56,26 +56,36 @@
 }
 
 
+/*!	Safe to be called only from outside the debugger.
+*/
 static status_t
-get_next_frame(addr_t ebp, addr_t *_next, addr_t *_eip)
+get_next_frame_no_debugger(addr_t ebp, addr_t *_next, addr_t *_eip)
 {
-	// set fault handler, so that we can safely access user stacks
-	addr_t oldFaultHandler = thread_get_current_thread()->fault_handler;
-	thread_get_current_thread()->fault_handler = (addr_t)&&error;
-	// Fake goto to trick the compiler not to optimize the code at the label
-	// away.
-	if (ebp == 0)
-		goto error;
+	// TODO: Do this more efficiently in assembly.
+	stack_frame frame;
+	if (user_memcpy(&frame, (void*)ebp, sizeof(frame)) != B_OK)
+		return B_BAD_ADDRESS;
 
-	*_eip = ((struct stack_frame *)ebp)->return_address;
-	*_next = (addr_t)((struct stack_frame *)ebp)->previous;
+	*_eip = frame.return_address;
+	*_next = (addr_t)frame.previous;
 
-	thread_get_current_thread()->fault_handler = oldFaultHandler;
 	return B_OK;
+}
 
-error:
-	thread_get_current_thread()->fault_handler = oldFaultHandler;
-	return B_BAD_ADDRESS;
+
+/*!	Safe to be called only from inside the debugger.
+*/
+static status_t
+get_next_frame_debugger(addr_t ebp, addr_t *_next, addr_t *_eip)
+{
+	stack_frame frame;
+	if (debug_memcpy(&frame, (void*)ebp, sizeof(frame)) != B_OK)
+		return B_BAD_ADDRESS;
+
+	*_eip = frame.return_address;
+	*_next = (addr_t)frame.previous;
+
+	return B_OK;
 }
 
 
@@ -285,8 +295,10 @@
 		kprintf(" + 0x%04lx\n", eip - baseAddress);
 	} else {
 		vm_area *area = NULL;
-		if (thread->team->address_space != NULL)
+		if (thread != NULL && thread->team != NULL
+			&& thread->team->address_space != NULL) {
 			area = vm_area_lookup(thread->team->address_space, eip);
+		}
 		if (area != NULL) {
 			kprintf("%ld:%s@%p + %#lx\n", area->id, area->name,
 				(void*)area->base, eip - area->base);
@@ -358,6 +370,7 @@
 	*_thread = thread;
 }
 
+
 static bool
 is_double_fault_stack_address(int32 cpu, addr_t address)
 {
@@ -564,7 +577,7 @@
 		} else {
 			addr_t eip, nextEbp;
 
-			if (get_next_frame(ebp, &nextEbp, &eip) != B_OK) {
+			if (get_next_frame_debugger(ebp, &nextEbp, &eip) != B_OK) {
 				kprintf("%08lx -- read fault\n", ebp);
 				break;
 			}
@@ -723,7 +736,7 @@
 		} else {
 			addr_t eip, nextEbp;
 
-			if (get_next_frame(ebp, &nextEbp, &eip) != B_OK) {
+			if (get_next_frame_debugger(ebp, &nextEbp, &eip) != B_OK) {
 				kprintf("%08lx -- read fault\n", ebp);
 				break;
 			}
@@ -894,7 +907,7 @@
 		} else {
 			addr_t eip, nextEbp;
 
-			if (get_next_frame(ebp, &nextEbp, &eip) != B_OK
+			if (get_next_frame_no_debugger(ebp, &nextEbp, &eip) != B_OK
 				|| eip == 0 || ebp == 0)
 				break;
 
@@ -964,7 +977,7 @@
 					skipFrames = 0;
 			}
 		} else {
-			if (get_next_frame(ebp, &nextEbp, &eip) != B_OK)
+			if (get_next_frame_no_debugger(ebp, &nextEbp, &eip) != B_OK)
 				break;
 		}
 
@@ -1000,6 +1013,16 @@
 }
 
 
+/*!	Sets the current thread to \c NULL.
+	Invoked in the kernel debugger only.
+*/
+void
+arch_debug_unset_current_thread(void)
+{
+	write_dr3(NULL);
+}
+
+
 bool
 arch_is_debug_variable_defined(const char* variableName)
 {

Modified: haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp	2009-08-03 11:54:25 UTC (rev 32072)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp	2009-08-03 12:39:56 UTC (rev 32073)
@@ -204,22 +204,27 @@
 
 
 /*!	Initializes the descriptor for interrupt vector \a n in the IDT of the
-	boot CPU to an interrupt-gate descriptor with the given procedure address.
+	specified CPU to an interrupt-gate descriptor with the given procedure
+	address.
+	For CPUs other than the boot CPU it must not be called before
+	arch_int_init_post_vm().
 */
 static void
-set_interrupt_gate(int n, void (*addr)())
+set_interrupt_gate(int32 cpu, int n, void (*addr)())
 {
-	set_gate(&sIDTs[0][n], (addr_t)addr, 14, DPL_KERNEL);
+	set_gate(&sIDTs[cpu][n], (addr_t)addr, 14, DPL_KERNEL);
 }
 
 
 /*!	Initializes the descriptor for interrupt vector \a n in the IDT of the
-	boot CPU to an trap-gate descriptor with the given procedure address.
+	specified CPU to an trap-gate descriptor with the given procedure address.
+	For CPUs other than the boot CPU it must not be called before
+	arch_int_init_post_vm().
 */
 static void
-set_trap_gate(int n, void (*addr)())
+set_trap_gate(int32 cpu, int n, void (*addr)())
 {
-	set_gate(&sIDTs[0][n], (unsigned int)addr, 15, DPL_USER);
+	set_gate(&sIDTs[cpu][n], (unsigned int)addr, 15, DPL_USER);
 }
 
 
@@ -851,27 +856,74 @@
 	frame->edi = tss->edi;
 	frame->flags = tss->eflags;
 
+	// Use a special handler for page faults which avoids the triple fault
+	// pitfalls.
+	set_interrupt_gate(cpu, 14, &trap14_double_fault);
+
 	debug_double_fault(cpu);
 }
 
 
+void
+x86_page_fault_exception_double_fault(struct iframe* frame)
+{
+	uint32 cr2;
+	asm("movl %%cr2, %0" : "=r" (cr2));
+
+	// Only if this CPU has a fault handler, we're allowed to be here.
+	cpu_ent& cpu = gCPU[x86_double_fault_get_cpu()];
+	addr_t faultHandler = cpu.fault_handler;
+	if (faultHandler != 0) {
+		debug_set_page_fault_info(cr2, frame->eip,
+			(frame->error_code & 0x2) != 0 ? DEBUG_PAGE_FAULT_WRITE : 0);
+		frame->eip = faultHandler;
+		frame->ebp = cpu.fault_handler_stack_pointer;
+		return;
+	}
+
+	// No fault handler. This is bad. Since we originally came from a double
+	// fault, we don't try to reenter the kernel debugger. Instead we just
+	// print the info we've got and enter an infinite loop.
+	kprintf("Page fault in double fault debugger without fault handler! "
+		"Touching address %p from eip %p. Entering infinite loop...\n",
+		(void*)cr2, (void*)frame->eip);
+
+	while (true);
+}
+
+
 static void
 page_fault_exception(struct iframe* frame)
 {
 	struct thread *thread = thread_get_current_thread();
-	bool kernelDebugger = debug_debugger_running();
-	unsigned int cr2;
+	uint32 cr2;
 	addr_t newip;
 
 	asm("movl %%cr2, %0" : "=r" (cr2));
 
-	if (kernelDebugger) {
-		// if this thread has a fault handler, we're allowed to be here
-		if (thread && thread->fault_handler != 0) {
-			debug_set_page_fault_info(cr2, frame->eip,
-				(frame->error_code & 0x2) != 0 ? DEBUG_PAGE_FAULT_WRITE : 0);
-			frame->eip = thread->fault_handler;
-			return;
+	if (debug_debugger_running()) {
+		// If this CPU or this thread has a fault handler, we're allowed to be
+		// here.
+		if (thread != NULL) {
+			cpu_ent* cpu = &gCPU[smp_get_current_cpu()];
+			if (cpu->fault_handler != 0) {
+				debug_set_page_fault_info(cr2, frame->eip,
+					(frame->error_code & 0x2) != 0
+						? DEBUG_PAGE_FAULT_WRITE : 0);
+				frame->eip = cpu->fault_handler;
+				frame->ebp = cpu->fault_handler_stack_pointer;
+				return;
+			}
+
+			if (thread->fault_handler != 0) {
+				kprintf("ERROR: thread::fault_handler used in kernel "
+					"debugger!\n");
+				debug_set_page_fault_info(cr2, frame->eip,
+					(frame->error_code & 0x2) != 0
+						? DEBUG_PAGE_FAULT_WRITE : 0);
+				frame->eip = thread->fault_handler;
+				return;
+			}
 		}
 
 		// otherwise, not really
@@ -886,8 +938,16 @@
 		// disabled, which in most cases is a bug. We should add some thread
 		// flag allowing to explicitly indicate that this handling is desired.
 		if (thread && thread->fault_handler != 0) {
-			frame->eip = thread->fault_handler;
-			return;
+			if (frame->eip != thread->fault_handler) {
+				frame->eip = thread->fault_handler;
+				return;
+			}
+
+			// The fault happened at the fault handler address. This is a
+			// certain infinite loop.
+			panic("page fault, interrupts disabled, fault handler loop. "
+				"Touching address %p from eip %p\n", (void*)cr2,
+				(void*)frame->eip);
 		}
 
 		// If we are not running the kernel startup the page fault was not
@@ -971,60 +1031,60 @@
 	// setup the standard programmable interrupt controller
 	pic_init();
 
-	set_interrupt_gate(0,  &trap0);
-	set_interrupt_gate(1,  &trap1);
-	set_interrupt_gate(2,  &trap2);
-	set_trap_gate(3,  &trap3);
-	set_interrupt_gate(4,  &trap4);
-	set_interrupt_gate(5,  &trap5);
-	set_interrupt_gate(6,  &trap6);
-	set_interrupt_gate(7,  &trap7);
+	set_interrupt_gate(0, 0,  &trap0);
+	set_interrupt_gate(0, 1,  &trap1);
+	set_interrupt_gate(0, 2,  &trap2);
+	set_trap_gate(0, 3,  &trap3);
+	set_interrupt_gate(0, 4,  &trap4);
+	set_interrupt_gate(0, 5,  &trap5);
+	set_interrupt_gate(0, 6,  &trap6);
+	set_interrupt_gate(0, 7,  &trap7);
 	// trap8 (double fault) is set in arch_cpu.c
-	set_interrupt_gate(9,  &trap9);
-	set_interrupt_gate(10,  &trap10);
-	set_interrupt_gate(11,  &trap11);
-	set_interrupt_gate(12,  &trap12);
-	set_interrupt_gate(13,  &trap13);
-	set_interrupt_gate(14,  &trap14);

[... truncated: 895 lines follow ...]


From axeld at pinc-software.de  Sun Aug  2 13:47:35 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 02 Aug 2009 13:47:35 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32059_-_haiku/trunk/src/system/boot/pl?=
 =?utf-8?q?atform/bios=5Fia32?=
In-Reply-To: <200908011203.n71C3NhP022787@sheep.berlios.de>
Message-ID: <1650914521-BeMail@zon>

mmu_man at BerliOS <mmu_man at mail.berlios.de> wrote:
> Log:
> Add MultiBoot support.

I can't imagine a single reason why we would want this in our boot 
loader.
Is there any benefit from using it?

Bye,
   Axel.



From pulkomandy at gmail.com  Mon Aug  3 15:12:06 2009
From: pulkomandy at gmail.com (PulkoMandy)
Date: Mon, 3 Aug 2009 15:12:06 +0200
Subject: [Haiku-commits] r32059 -
	haiku/trunk/src/system/boot/platform/bios_ia32
In-Reply-To: <1650914521-BeMail@zon>
References: <200908011203.n71C3NhP022787@sheep.berlios.de>
	<1650914521-BeMail@zon>
Message-ID: <36ed0c950908030612m6b463b94va88232885ca2bfa7@mail.gmail.com>

2009/8/2 Axel D?rfler <axeld at pinc-software.de>:
> mmu_man at BerliOS <mmu_man at mail.berlios.de> wrote:
>> Log:
>> Add MultiBoot support.
>
> I can't imagine a single reason why we would want this in our boot
> loader.
> Is there any benefit from using it?

mainly stnadardization, grub compatibility and simpler porting to
other platforms (ARM board use jtag and can make use of it IIRC). Also
it allows dorect loading of the kernel in qemu for debugging.

>
> Bye,
> ? Axel.
>
> _______________________________________________
> Haiku-commits mailing list
> Haiku-commits at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/haiku-commits
>



-- 
Adrien Destugues / PulkoMandy
El?ve ing?nieur ENSSAT EII1- www.enssat.fr
GSoC student for Haiku - http://haiku-os.org
GrafX2 project team - http://code.google.com/p/grafx2


From mmlr at mail.berlios.de  Mon Aug  3 15:59:47 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Mon, 3 Aug 2009 15:59:47 +0200
Subject: [Haiku-commits] r32074 - in haiku/trunk: headers/private/kernel
	src/system/kernel
Message-ID: <200908031359.n73Dxlqp030165@sheep.berlios.de>

Author: mmlr
Date: 2009-08-03 15:59:45 +0200 (Mon, 03 Aug 2009)
New Revision: 32074
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32074&view=rev

Modified:
   haiku/trunk/headers/private/kernel/heap.h
   haiku/trunk/src/system/kernel/heap.cpp
Log:
* Rework the heap locking strategy. Use a read-write lock for the area lock to
  allow for more parallelism. Also introduce seperate locks for the bins and
  for page allocation. This greatly reduces lock contention and reduces the
  duration the locks are held due to them overall protecting less code. Now only
  allocations of the same size hitting the same allocator or allocating larger
  chunks of memory should block. Previously, basically any allocation and also
  free would be mutually exclusive, making it scale pretty badely.
* Added memalign_nogrow(). As it uses heap_memalign() anyway, there's no real
  reason not to allow for an alignment.
* Some cleanup.


Modified: haiku/trunk/headers/private/kernel/heap.h
===================================================================
--- haiku/trunk/headers/private/kernel/heap.h	2009-08-03 12:39:56 UTC (rev 32073)
+++ haiku/trunk/headers/private/kernel/heap.h	2009-08-03 13:59:45 UTC (rev 32074)
@@ -41,8 +41,9 @@
 extern "C" {
 #endif
 
-// malloc_nogrow disallows waiting for a grow to happen - only to be used by
-// vm functions that may deadlock on a triggered area creation
+// malloc- and memalign_nogrow disallow waiting for a grow to happen - only to
+// be used by vm functions that may deadlock on a triggered area creation.
+void *memalign_nogrow(size_t alignment, size_t size);
 void *malloc_nogrow(size_t size);
 
 void *memalign(size_t alignment, size_t size);

Modified: haiku/trunk/src/system/kernel/heap.cpp
===================================================================
--- haiku/trunk/src/system/kernel/heap.cpp	2009-08-03 12:39:56 UTC (rev 32073)
+++ haiku/trunk/src/system/kernel/heap.cpp	2009-08-03 13:59:45 UTC (rev 32074)
@@ -88,13 +88,15 @@
 } heap_page;
 
 typedef struct heap_bin_s {
+	mutex		lock;
 	uint32		element_size;
 	uint16		max_free_count;
 	heap_page *	page_list; // sorted so that the desired page is always first
 } heap_bin;
 
 struct heap_allocator_s {
-	mutex		lock;
+	rw_lock		area_lock;
+	mutex		page_lock;
 
 	const char *name;
 	uint32		bin_count;
@@ -628,7 +630,7 @@
 
 
 static bool
-analyze_allocation_callers(heap_allocator* heap)
+analyze_allocation_callers(heap_allocator *heap)
 {
 	// go through all the pages in all the areas
 	heap_area *area = heap->all_areas;
@@ -661,7 +663,7 @@
 					info = (heap_leak_check_info *)(base + elementSize
 						- sizeof(heap_leak_check_info));
 
-					caller_info* callerInfo = get_caller_info(info->caller);
+					caller_info *callerInfo = get_caller_info(info->caller);
 					if (callerInfo == NULL) {
 						kprintf("out of space for caller infos\n");
 						return 0;
@@ -685,7 +687,7 @@
 				info = (heap_leak_check_info *)(base + pageCount
 					* heap->page_size - sizeof(heap_leak_check_info));
 
-				caller_info* callerInfo = get_caller_info(info->caller);
+				caller_info *callerInfo = get_caller_info(info->caller);
 				if (callerInfo == NULL) {
 					kprintf("out of space for caller infos\n");
 					return false;
@@ -710,7 +712,7 @@
 dump_allocations_per_caller(int argc, char **argv)
 {
 	bool sortBySize = true;
-	heap_allocator* heap = NULL;
+	heap_allocator *heap = NULL;
 
 	for (int32 i = 1; i < argc; i++) {
 		if (strcmp(argv[i], "-c") == 0) {
@@ -756,8 +758,8 @@
 		caller_info& info = sCallerInfoTable[i];
 		kprintf("%10ld  %10ld  %#08lx", info.count, info.size, info.caller);
 
-		const char* symbol;
-		const char* imageName;
+		const char *symbol;
+		const char *imageName;
 		bool exactMatch;
 		addr_t baseAddress;
 
@@ -780,7 +782,10 @@
 static void
 heap_validate_heap(heap_allocator *heap)
 {
-	mutex_lock(&heap->lock);
+	ReadLocker areaReadLocker(heap->area_lock);
+	for (uint32 i = 0; i < heap->bin_count; i++)
+		mutex_lock(&heap->bins[i].lock);
+	MutexLocker pageLocker(heap->page_lock);
 
 	uint32 totalPageCount = 0;
 	uint32 totalFreePageCount = 0;
@@ -862,7 +867,6 @@
 	// validate the bins
 	for (uint32 i = 0; i < heap->bin_count; i++) {
 		heap_bin *bin = &heap->bins[i];
-
 		heap_page *lastPage = NULL;
 		heap_page *page = bin->page_list;
 		lastFreeCount = 0;
@@ -938,7 +942,10 @@
 		}
 	}
 
-	mutex_unlock(&heap->lock);
+	pageLocker.Unlock();
+	for (uint32 i = 0; i < heap->bin_count; i++)
+		mutex_unlock(&heap->bins[i].lock);
+	areaReadLocker.Unlock();
 }
 #endif // PARANOID_HEAP_VALIDATION
 
@@ -949,8 +956,6 @@
 static void
 heap_add_area(heap_allocator *heap, area_id areaID, addr_t base, size_t size)
 {
-	mutex_lock(&heap->lock);
-
 	heap_area *area = (heap_area *)base;
 	area->area = areaID;
 
@@ -986,8 +991,10 @@
 	area->free_pages = &area->page_table[0];
 	area->free_page_count = pageCount;
 	area->page_table[0].prev = NULL;
+	area->next = NULL;
 
-	area->next = NULL;
+	WriteLocker areaWriteLocker(heap->area_lock);
+	MutexLocker pageLocker(heap->page_lock);
 	if (heap->areas == NULL) {
 		// it's the only (empty) area in that heap
 		area->prev = NULL;
@@ -1018,13 +1025,14 @@
 	heap->total_pages += area->page_count;
 	heap->total_free_pages += area->free_page_count;
 
-	if (areaID >= B_OK) {
+	if (areaID >= 0) {
 		// this later on deletable area is yet empty - the empty count will be
 		// decremented as soon as this area is used for the first time
 		heap->empty_areas++;
 	}
 
-	mutex_unlock(&heap->lock);
+	pageLocker.Unlock();
+	areaWriteLocker.Unlock();
 
 	dprintf("heap_add_area: area %ld added to %s heap %p - usable range 0x%08lx "
 		"- 0x%08lx\n", area->area, heap->name, heap, area->base,
@@ -1033,11 +1041,8 @@
 
 
 static status_t
-heap_remove_area(heap_allocator *heap, heap_area *area, bool locked)
+heap_remove_area(heap_allocator *heap, heap_area *area)
 {
-	if (!locked)
-		mutex_lock(&heap->lock);
-
 	if (area->free_page_count != area->page_count) {
 		panic("tried removing heap area that has still pages in use");
 		return B_ERROR;
@@ -1075,12 +1080,10 @@
 	heap->total_pages -= area->page_count;
 	heap->total_free_pages -= area->free_page_count;
 
-	if (!locked)
-		mutex_unlock(&heap->lock);
-
 	dprintf("heap_remove_area: area %ld with range 0x%08lx - 0x%08lx removed "
 		"from %s heap %p\n", area->area, area->base, area->base + area->size,
 		heap->name, heap);
+
 	return B_OK;
 }
 
@@ -1114,6 +1117,7 @@
 			continue;
 
 		heap_bin *bin = &heap->bins[heap->bin_count];
+		mutex_init(&bin->lock, "heap bin lock");
 		bin->element_size = binSize;
 		bin->max_free_count = heap->page_size / binSize;
 		bin->page_list = NULL;
@@ -1126,14 +1130,15 @@
 	base += heap->bin_count * sizeof(heap_bin);
 	size -= heap->bin_count * sizeof(heap_bin);
 
-	mutex_init(&heap->lock, "heap_mutex");
+	rw_lock_init(&heap->area_lock, "heap area rw lock");
+	mutex_init(&heap->page_lock, "heap page lock");
 
 	heap_add_area(heap, -1, base, size);
 	return heap;
 }
 
 
-static inline area_id
+static inline void
 heap_free_pages_added(heap_allocator *heap, heap_area *area, uint32 pageCount)
 {
 	area->free_page_count += pageCount;
@@ -1170,29 +1175,15 @@
 		}
 	}
 
-	// can and should we free this area?
-	if (area->free_page_count == area->page_count && area->area >= B_OK) {
-		if (heap->empty_areas > 0) {
-			// we already have at least another empty area, just free this one
-			if (heap_remove_area(heap, area, true) == B_OK) {
-				// we cannot delete the area here, because it would result
-				// in calls to free, which would necessarily deadlock as we
-				// are locked at this point
-				return area->area;
-			}
-		}
-
+	if (area->free_page_count == area->page_count && area->area >= 0)
 		heap->empty_areas++;
-	}
-
-	return -1;
 }
 
 
 static inline void
 heap_free_pages_removed(heap_allocator *heap, heap_area *area, uint32 pageCount)
 {
-	if (area->free_page_count == area->page_count && area->area >= B_OK) {
+	if (area->free_page_count == area->page_count && area->area >= 0) {
 		// this area was completely empty
 		heap->empty_areas--;
 	}
@@ -1239,6 +1230,7 @@
 static heap_page *
 heap_allocate_contiguous_pages(heap_allocator *heap, uint32 pageCount)
 {
+	MutexLocker pageLocker(heap->page_lock);
 	heap_area *area = heap->areas;
 	while (area) {
 		bool found = false;
@@ -1286,10 +1278,14 @@
 static void *
 heap_raw_alloc(heap_allocator *heap, size_t size, uint32 binIndex)
 {
+	TRACE(("raw_alloc: heap %p; size %lu; bin %lu\n", heap, size, binIndex));
 	if (binIndex < heap->bin_count) {
 		heap_bin *bin = &heap->bins[binIndex];
+		MutexLocker binLocker(bin->lock);
+
 		heap_page *page = bin->page_list;
 		if (page == NULL) {
+			MutexLocker pageLocker(heap->page_lock);
 			heap_area *area = heap->areas;
 			if (area == NULL) {
 				TRACE(("heap %p: no free pages to allocate %lu bytes\n", heap,
@@ -1305,7 +1301,13 @@
 				page->next->prev = NULL;
 
 			heap_free_pages_removed(heap, area, 1);
+
+			if (page->in_use)
+				panic("got an in use page from the free pages list\n");
 			page->in_use = 1;
+
+			pageLocker.Unlock();
+
 			page->bin_index = binIndex;
 			page->free_count = bin->max_free_count;
 			page->empty_index = 0;
@@ -1336,6 +1338,8 @@
 			page->next = page->prev = NULL;
 		}
 
+		binLocker.Unlock();
+
 #if KERNEL_HEAP_LEAK_CHECK
 		heap_leak_check_info *info = (heap_leak_check_info *)((addr_t)address
 			+ bin->element_size - sizeof(heap_leak_check_info));
@@ -1396,8 +1400,6 @@
 		panic("memalign() with an alignment which is not a power of 2\n");
 #endif
 
-	mutex_lock(&heap->lock);
-
 #if KERNEL_HEAP_LEAK_CHECK
 	size += sizeof(heap_leak_check_info);
 #endif
@@ -1420,15 +1422,14 @@
 
 	void *address = heap_raw_alloc(heap, size, binIndex);
 
-	TRACE(("memalign(): asked to allocate %lu bytes, returning pointer %p\n",
-		size, address));
-
 #if KERNEL_HEAP_LEAK_CHECK
 	size -= sizeof(heap_leak_check_info);
 #endif
 
+	TRACE(("memalign(): asked to allocate %lu bytes, returning pointer %p\n",
+		size, address));
+
 	T(Allocate((addr_t)address, size));
-	mutex_unlock(&heap->lock);
 	if (address == NULL)
 		return address;
 
@@ -1453,8 +1454,7 @@
 	if (address == NULL)
 		return B_OK;
 
-	mutex_lock(&heap->lock);
-
+	ReadLocker areaReadLocker(heap->area_lock);
 	heap_area *area = heap->all_areas;
 	while (area) {
 		// since the all_areas list is ordered by base with the biggest
@@ -1476,7 +1476,6 @@
 
 	if (area == NULL) {
 		// this address does not belong to us
-		mutex_unlock(&heap->lock);
 		return B_ENTRY_NOT_FOUND;
 	}
 
@@ -1490,19 +1489,18 @@
 
 	if (page->bin_index > heap->bin_count) {
 		panic("free(): page %p: invalid bin_index %d\n", page, page->bin_index);
-		mutex_unlock(&heap->lock);
 		return B_ERROR;
 	}
 
-	area_id areaToDelete = -1;
 	if (page->bin_index < heap->bin_count) {
 		// small allocation
 		heap_bin *bin = &heap->bins[page->bin_index];
+		MutexLocker binLocker(bin->lock);
+
 		if (((addr_t)address - area->base - page->index
 			* heap->page_size) % bin->element_size != 0) {
 			panic("free(): passed invalid pointer %p supposed to be in bin for "
 				"element size %ld\n", address, bin->element_size);
-			mutex_unlock(&heap->lock);
 			return B_ERROR;
 		}
 
@@ -1515,7 +1513,6 @@
 				if (temp == address) {
 					panic("free(): address %p already exists in page free "
 						"list\n", address);
-					mutex_unlock(&heap->lock);
 					return B_ERROR;
 				}
 			}
@@ -1525,7 +1522,6 @@
 		if (bin->element_size % 4 != 0) {
 			panic("free(): didn't expect a bin element size that is not a "
 				"multiple of 4\n");
-			mutex_unlock(&heap->lock);
 			return B_ERROR;
 		}
 
@@ -1542,10 +1538,11 @@
 
 		if (page->free_count == bin->max_free_count) {
 			// we are now empty, remove the page from the bin list
+			MutexLocker pageLocker(heap->page_lock);
 			heap_unlink_page(page, &bin->page_list);
 			page->in_use = 0;
 			heap_link_page(page, &area->free_pages);
-			areaToDelete = heap_free_pages_added(heap, area, 1);
+			heap_free_pages_added(heap, area, 1);
 		} else if (page->free_count == 1) {
 			// we need to add ourselfs to the page list of the bin
 			heap_link_page(page, &bin->page_list);
@@ -1572,6 +1569,8 @@
 		uint32 allocationID = page->allocation_id;
 		uint32 maxPages = area->page_count - page->index;
 		uint32 pageCount = 0;
+
+		MutexLocker pageLocker(heap->page_lock);
 		for (uint32 i = 0; i < maxPages; i++) {
 			// loop until we find the end of this allocation
 			if (!page[i].in_use || page[i].bin_index != heap->bin_count
@@ -1587,16 +1586,27 @@
 			pageCount++;
 		}
 
-		areaToDelete = heap_free_pages_added(heap, area, pageCount);
+		heap_free_pages_added(heap, area, pageCount);
 	}
 
 	T(Free((addr_t)address));
-	mutex_unlock(&heap->lock);
+	areaReadLocker.Unlock();
 
-	if (areaToDelete >= B_OK) {
-		// adding free pages caused an area to become empty and freeable that
-		// we can now delete as we don't hold the heap lock anymore
-		delete_area(areaToDelete);
+	if (heap->empty_areas > 1) {
+		WriteLocker areaWriteLocker(heap->area_lock);
+		MutexLocker pageLocker(heap->page_lock);
+
+		area = heap->areas;
+		while (area != NULL && heap->empty_areas > 1) {
+			if (area->area >= 0
+				&& area->free_page_count == area->page_count
+				&& heap_remove_area(heap, area) == B_OK) {
+				delete_area(area->area);
+				heap->empty_areas--;
+			}
+
+			area = area->next;
+		}
 	}
 
 	return B_OK;
@@ -1616,19 +1626,29 @@
 heap_realloc(heap_allocator *heap, void *address, void **newAddress,
 	size_t newSize)
 {
-	mutex_lock(&heap->lock);
+	ReadLocker heapReadLocker(heap->area_lock);
 	heap_area *area = heap->all_areas;
 	while (area) {
-		if ((addr_t)address >= area->base
-			&& (addr_t)address < area->base + area->size)
+		// since the all_areas list is ordered by base with the biggest
+		// base at the top, we need only find the first area with a base
+		// smaller than our address to become our only candidate for
+		// reallocating
+		if (area->base <= (addr_t)address) {
+			if ((addr_t)address >= area->base + area->size) {
+				// the only candidate area doesn't contain the address,
+				// set it to NULL so we return below (none of the other areas
+				// can contain the address as the list is ordered)
+				area = NULL;
+			}
+
 			break;
+		}
 
 		area = area->all_next;
 	}
 
 	if (area == NULL) {
 		// this address does not belong to us
-		mutex_unlock(&heap->lock);
 		return B_ENTRY_NOT_FOUND;
 	}
 
@@ -1639,7 +1659,6 @@
 	if (page->bin_index > heap->bin_count) {
 		panic("realloc(): page %p: invalid bin_index %d\n", page,
 			page->bin_index);
-		mutex_unlock(&heap->lock);
 		return B_ERROR;
 	}
 
@@ -1657,6 +1676,8 @@
 		uint32 allocationID = page->allocation_id;
 		uint32 maxPages = area->page_count - page->index;
 		maxSize = heap->page_size;
+
+		MutexLocker pageLocker(heap->page_lock);
 		for (uint32 i = 1; i < maxPages; i++) {
 			if (!page[i].in_use || page[i].bin_index != heap->bin_count
 				|| page[i].allocation_id != allocationID)
@@ -1667,7 +1688,7 @@
 		}
 	}
 
-	mutex_unlock(&heap->lock);
+	heapReadLocker.Unlock();
 
 #if KERNEL_HEAP_LEAK_CHECK
 	newSize += sizeof(heap_leak_check_info);
@@ -2001,11 +2022,11 @@
 
 
 void *
-malloc_nogrow(size_t size)
+memalign_nogrow(size_t alignment, size_t size)
 {
 	// use dedicated memory in the grow thread by default
 	if (thread_get_current_thread_id() == sHeapGrowThread) {
-		void *result = heap_memalign(sGrowHeap, 0, size);
+		void *result = heap_memalign(sGrowHeap, alignment, size);
 		if (!sAddGrowHeap && heap_should_grow(sGrowHeap)) {
 			// hopefully the heap grower will manage to create a new heap
 			// before running out of private memory...
@@ -2020,7 +2041,7 @@
 
 	// try public memory, there might be something available
 	heap_allocator *heap = sHeaps[heap_class_for(size)];
-	void *result = heap_memalign(heap, 0, size);
+	void *result = heap_memalign(heap, alignment, size);
 	if (result != NULL)
 		return result;
 
@@ -2035,6 +2056,13 @@
 
 
 void *
+malloc_nogrow(size_t size)
+{
+	return memalign_nogrow(0, size);
+}
+
+
+void *
 malloc(size_t size)
 {
 	return memalign(0, size);
@@ -2169,36 +2197,35 @@
 
 
 void
-deferred_free(void* block)
+deferred_free(void *block)
 {
 	if (block == NULL)
 		return;
 
-	DeferredFreeListEntry* entry = new(block) DeferredFreeListEntry;
+	DeferredFreeListEntry *entry = new(block) DeferredFreeListEntry;
 
 	InterruptsSpinLocker _(sDeferredFreeListLock);
 	sDeferredFreeList.Add(entry);
 }
 
 
-void*
+void *
 malloc_referenced(size_t size)
 {
-	int32* referencedData = (int32*)malloc(size + 4);
+	int32 *referencedData = (int32 *)malloc(size + 4);
 	if (referencedData == NULL)
 		return NULL;
 
 	*referencedData = 1;
-
 	return referencedData + 1;
 }
 
 
-void*
-malloc_referenced_acquire(void* data)
+void *
+malloc_referenced_acquire(void *data)
 {
 	if (data != NULL) {
-		int32* referencedData = (int32*)data - 1;
+		int32 *referencedData = (int32 *)data - 1;
 		atomic_add(referencedData, 1);
 	}
 
@@ -2207,12 +2234,12 @@
 
 
 void
-malloc_referenced_release(void* data)
+malloc_referenced_release(void *data)
 {
 	if (data == NULL)
 		return;
 
-	int32* referencedData = (int32*)data - 1;
+	int32 *referencedData = (int32 *)data - 1;
 	if (atomic_add(referencedData, -1) < 1)
 		free(referencedData);
 }
@@ -2224,7 +2251,7 @@
 
 
 void
-deferred_delete(DeferredDeletable* deletable)
+deferred_delete(DeferredDeletable *deletable)
 {
 	if (deletable == NULL)
 		return;



From axeld at mail.berlios.de  Mon Aug  3 16:35:31 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Mon, 3 Aug 2009 16:35:31 +0200
Subject: [Haiku-commits] r32075 - haiku/trunk/src/kits/interface
Message-ID: <200908031435.n73EZVJw003506@sheep.berlios.de>

Author: axeld
Date: 2009-08-03 16:35:27 +0200 (Mon, 03 Aug 2009)
New Revision: 32075
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32075&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
* The preferred size is now actually the preferred size - the size that is
  needed to show all of the text view's contents. No idea what the previous
  solution was about.


Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-08-03 13:59:45 UTC (rev 32074)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-08-03 14:35:27 UTC (rev 32075)
@@ -2797,10 +2797,20 @@
 	fLayoutData->min = min;
 
 	// compute our preferred size
-	fLayoutData->preferred = min;
-	fLayoutData->preferred.width += lineHeight * 6;
-	fLayoutData->preferred.height += lineHeight * 2;
+	fLayoutData->preferred.height = fTextRect.Height()
+		+ fLayoutData->topInset + fLayoutData->bottomInset;
+	float maxWidth = 0;
+	for (int i = 0; i < fLines->NumLines(); i++) {
+		float width = LineWidth(0);
+		if (maxWidth < width)
+			maxWidth = width;
+	}
+	if (maxWidth < min.width)
+		maxWidth = min.width;
 
+	fLayoutData->preferred.width
+		= maxWidth + fLayoutData->leftInset + fLayoutData->rightInset;
+
 	fLayoutData->valid = true;
 
 	TRACE("width: %.2f, height: %.2f\n", min.width, min.height);



From mmu_man at mail.berlios.de  Mon Aug  3 16:39:47 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Mon, 3 Aug 2009 16:39:47 +0200
Subject: [Haiku-commits] r32076 - in haiku/trunk:
	headers/private/kernel/boot src/system/boot/loader
	src/system/boot/platform/atari_m68k
	src/system/boot/platform/bios_ia32
	src/system/boot/platform/openfirmware
Message-ID: <200908031439.n73Edl9Z004092@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-03 16:39:41 +0200 (Mon, 03 Aug 2009)
New Revision: 32076
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32076&view=rev

Added:
   haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.cpp
Modified:
   haiku/trunk/headers/private/kernel/boot/stage2_args.h
   haiku/trunk/src/system/boot/loader/load_driver_settings.cpp
   haiku/trunk/src/system/boot/loader/load_driver_settings.h
   haiku/trunk/src/system/boot/loader/main.cpp
   haiku/trunk/src/system/boot/platform/atari_m68k/start.c
   haiku/trunk/src/system/boot/platform/bios_ia32/Jamfile
   haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.h
   haiku/trunk/src/system/boot/platform/bios_ia32/start.c
   haiku/trunk/src/system/boot/platform/openfirmware/start.c
Log:
- introduced an "argumetns" field in stage2_args to hold command line args from chaining loader,
- added some multiboot support code:
	- dump some of the passed info,
	- parse command line (skip the 'kernel' name and pass the rest to stage2_args.arguments),
- added an add_stage2_driver_settings() function which takes stage2_args.arguments and translates it into safe mode driver settings, a bit dumb for now.
This allows using qemu -kernel haiku_loader -append 'debug_screen true' and get debug output without having to enter the menu (once multiboot info is used to determine the boot device too).
The idea is to allow passing driver settings and using them to pass extra stuff (like 'force_keymap fr' and other stuff for demo), and to help automate tests ('run_test /bin/sometest').
This should answer Axel's question :)


Modified: haiku/trunk/headers/private/kernel/boot/stage2_args.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/stage2_args.h	2009-08-03 14:35:27 UTC (rev 32075)
+++ haiku/trunk/headers/private/kernel/boot/stage2_args.h	2009-08-03 14:39:41 UTC (rev 32076)
@@ -12,6 +12,7 @@
 
 typedef struct stage2_args {
 	size_t heap_size;
+	const char **arguments;
 	struct platform_stage2_args	platform;
 } stage2_args ;
 

Modified: haiku/trunk/src/system/boot/loader/load_driver_settings.cpp
===================================================================
--- haiku/trunk/src/system/boot/loader/load_driver_settings.cpp	2009-08-03 14:35:27 UTC (rev 32075)
+++ haiku/trunk/src/system/boot/loader/load_driver_settings.cpp	2009-08-03 14:39:41 UTC (rev 32076)
@@ -135,6 +135,19 @@
 
 
 status_t
+add_stage2_driver_settings(stage2_args *args)
+{
+	const char **p = args->arguments;
+	//TODO: split more intelligently
+	for (; p && *p; p++) {
+		dprintf("adding args: '%s'\n", *p);
+		add_safe_mode_settings((char *)*p);
+	}
+	return B_OK;
+}
+
+
+status_t
 add_safe_mode_settings(char *settings)
 {
 	if (settings == NULL || settings[0] == '\0')

Modified: haiku/trunk/src/system/boot/loader/load_driver_settings.h
===================================================================
--- haiku/trunk/src/system/boot/loader/load_driver_settings.h	2009-08-03 14:35:27 UTC (rev 32075)
+++ haiku/trunk/src/system/boot/loader/load_driver_settings.h	2009-08-03 14:39:41 UTC (rev 32076)
@@ -10,6 +10,7 @@
 
 
 extern status_t add_safe_mode_settings(char *buffer);
+extern status_t add_stage2_driver_settings(stage2_args *args);
 extern status_t load_driver_settings(stage2_args *args, Directory *volume);
 
 #endif	/* LOAD_DRIVER_SETTINGS_H */

Modified: haiku/trunk/src/system/boot/loader/main.cpp
===================================================================
--- haiku/trunk/src/system/boot/loader/main.cpp	2009-08-03 14:35:27 UTC (rev 32075)
+++ haiku/trunk/src/system/boot/loader/main.cpp	2009-08-03 14:39:41 UTC (rev 32076)
@@ -38,6 +38,8 @@
 	// construct boot_volume KMessage explicitely
 	new(&gKernelArgs.boot_volume) KMessage;
 
+	add_stage2_driver_settings(args);
+
 	platform_init_video();
 
 	// the main platform dependent initialisation

Modified: haiku/trunk/src/system/boot/platform/atari_m68k/start.c
===================================================================
--- haiku/trunk/src/system/boot/platform/atari_m68k/start.c	2009-08-03 14:35:27 UTC (rev 32075)
+++ haiku/trunk/src/system/boot/platform/atari_m68k/start.c	2009-08-03 14:39:41 UTC (rev 32076)
@@ -132,6 +132,7 @@
 	Bconout(DEV_CON, 'I');
 
 	args.heap_size = HEAP_SIZE;
+	args.arguments = NULL;
 	
 	// so we can dprintf
 	init_nat_features();

Modified: haiku/trunk/src/system/boot/platform/bios_ia32/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/Jamfile	2009-08-03 14:35:27 UTC (rev 32075)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/Jamfile	2009-08-03 14:39:41 UTC (rev 32076)
@@ -28,6 +28,7 @@
 	keyboard.cpp
 	menu.cpp
 	mmu.cpp
+	multiboot.cpp
 	cpu.cpp
 	acpi.cpp
 	smp.cpp

Added: haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.cpp	2009-08-03 14:35:27 UTC (rev 32075)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.cpp	2009-08-03 14:39:41 UTC (rev 32076)
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2009, Fran?ois Revol, revol at free.fr.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include "multiboot.h"
+
+#include <KernelExport.h>
+#include <string.h>
+#include <boot/stage2_args.h>
+
+extern struct multiboot_info *gMultiBootInfo;
+
+// load_driver_settings.h
+extern status_t add_safe_mode_settings(char *buffer);
+
+void
+dump_multiboot_info(void)
+{
+	if (!gMultiBootInfo)
+		return;
+	dprintf("Found MultiBoot Info at %p\n", gMultiBootInfo);
+	dprintf("	flags: 0x%lx\n", gMultiBootInfo->flags);
+	if (gMultiBootInfo->flags & MULTIBOOT_INFO_BOOTDEV)
+		dprintf("	boot_device: 0x%lx\n", gMultiBootInfo->boot_device);
+	if (gMultiBootInfo->flags & MULTIBOOT_INFO_CMDLINE && gMultiBootInfo->cmdline)
+		dprintf("	cmdline: '%s'\n", (char *)gMultiBootInfo->cmdline);
+	if (gMultiBootInfo->boot_loader_name)
+		dprintf("	boot_loader_name: '%s'\n", (char *)gMultiBootInfo->boot_loader_name);
+}
+
+
+status_t
+parse_multiboot_commandline(stage2_args *args)
+{
+	static const char *sArgs[] = { NULL, NULL };
+	if (!gMultiBootInfo || !(gMultiBootInfo->flags & MULTIBOOT_INFO_CMDLINE) || !gMultiBootInfo->cmdline)
+		return B_ENTRY_NOT_FOUND;
+	
+	const char *cmdline = (const char *)gMultiBootInfo->cmdline;
+	// skip kernel (bootloader) name
+	cmdline = strchr(cmdline, ' ');
+	if (!cmdline)
+		return B_ENTRY_NOT_FOUND;
+	cmdline++;
+	if (*cmdline == '\0')
+		return B_ENTRY_NOT_FOUND;
+	sArgs[0] = cmdline;
+	args->arguments = sArgs;
+	return B_OK;
+}

Modified: haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.h
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.h	2009-08-03 14:35:27 UTC (rev 32075)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/multiboot.h	2009-08-03 14:39:41 UTC (rev 32076)
@@ -1,10 +1,14 @@
 /*
- * Copyright 2003-2006, Fran?ois Revol, revol at free.fr.
+ * Copyright 2009, Fran?ois Revol, revol at free.fr.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _MULTIBOOT_H
 #define _MULTIBOOT_H
 
+
+#include <SupportDefs.h>
+
+
 /* minimal part of the MultiBoot API */
 
 /* magics */
@@ -49,4 +53,17 @@
 	uint16 vbe_interface_len;
 };
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void dump_multiboot_info(void);
+extern status_t parse_multiboot_commandline(struct stage2_args *args);
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _MULTIBOOT_H */

Modified: haiku/trunk/src/system/boot/platform/bios_ia32/start.c
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/start.c	2009-08-03 14:35:27 UTC (rev 32075)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/start.c	2009-08-03 14:39:41 UTC (rev 32076)
@@ -13,6 +13,7 @@
 #include "acpi.h"
 #include "keyboard.h"
 #include "bios.h"
+#include "multiboot.h"
 
 #include <KernelExport.h>
 #include <boot/platform.h>
@@ -120,11 +121,13 @@
 		// call C++ constructors before doing anything else
 
 	args.heap_size = HEAP_SIZE;
+	args.arguments = NULL;
 
 	serial_init();
 	console_init();
 	cpu_init();
 	mmu_init();
+	parse_multiboot_commandline(&args);
 
 	// wait a bit to give the user the opportunity to press a key
 	spin(750000);
@@ -139,6 +142,7 @@
 	acpi_init();
 	smp_init();
 	//hpet_init(); // TODO: Not yet
+	dump_multiboot_info();
 	main(&args);
 }
 

Modified: haiku/trunk/src/system/boot/platform/openfirmware/start.c
===================================================================
--- haiku/trunk/src/system/boot/platform/openfirmware/start.c	2009-08-03 14:35:27 UTC (rev 32075)
+++ haiku/trunk/src/system/boot/platform/openfirmware/start.c	2009-08-03 14:39:41 UTC (rev 32076)
@@ -135,6 +135,7 @@
 	// stage2 args - might be set via the command line one day
 	stage2_args args;
 	args.heap_size = HEAP_SIZE;
+	args.arguments = NULL;
 
 	of_init(openFirmwareEntry);
 



From axeld at mail.berlios.de  Mon Aug  3 16:41:30 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Mon, 3 Aug 2009 16:41:30 +0200
Subject: [Haiku-commits] r32077 - haiku/trunk/src/kits/interface
Message-ID: <200908031441.n73EfUfu004479@sheep.berlios.de>

Author: axeld
Date: 2009-08-03 16:41:27 +0200 (Mon, 03 Aug 2009)
New Revision: 32077
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32077&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
* Only use the new preferred computation method if word wrap is disabled, or
  else this won't work as is (this is something that could be done, better,
  though).


Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-08-03 14:39:41 UTC (rev 32076)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-08-03 14:41:27 UTC (rev 32077)
@@ -2799,18 +2799,23 @@
 	// compute our preferred size
 	fLayoutData->preferred.height = fTextRect.Height()
 		+ fLayoutData->topInset + fLayoutData->bottomInset;
-	float maxWidth = 0;
-	for (int i = 0; i < fLines->NumLines(); i++) {
-		float width = LineWidth(0);
-		if (maxWidth < width)
-			maxWidth = width;
+
+	if (fWrap)
+		fLayoutData->preferred.width = min.width + 5 * lineHeight;
+	else {
+		float maxWidth = 0;
+		for (int i = 0; i < fLines->NumLines(); i++) {
+			float width = LineWidth(0);
+			if (maxWidth < width)
+				maxWidth = width;
+		}
+		if (maxWidth < min.width)
+			maxWidth = min.width;
+
+		fLayoutData->preferred.width
+			= maxWidth + fLayoutData->leftInset + fLayoutData->rightInset;
 	}
-	if (maxWidth < min.width)
-		maxWidth = min.width;
 
-	fLayoutData->preferred.width
-		= maxWidth + fLayoutData->leftInset + fLayoutData->rightInset;
-
 	fLayoutData->valid = true;
 
 	TRACE("width: %.2f, height: %.2f\n", min.width, min.height);



From axeld at mail.berlios.de  Mon Aug  3 16:47:54 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Mon, 3 Aug 2009 16:47:54 +0200
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
	headers/os/interface headers/private/binary_compatibility
	headers/private/interface src/kits/interface
	src/tests/kits/interface
Message-ID: <200908031447.n73Elscv005496@sheep.berlios.de>

Author: axeld
Date: 2009-08-03 16:47:41 +0200 (Mon, 03 Aug 2009)
New Revision: 32078
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32078&view=rev

Added:
   haiku/trunk/headers/private/interface/ToolTip.h
   haiku/trunk/headers/private/interface/ToolTipManager.h
   haiku/trunk/headers/private/interface/ToolTipWindow.h
   haiku/trunk/src/kits/interface/ToolTip.cpp
   haiku/trunk/src/kits/interface/ToolTipManager.cpp
   haiku/trunk/src/tests/kits/interface/ToolTipTest.cpp
Modified:
   haiku/trunk/headers/os/app/AppDefs.h
   haiku/trunk/headers/os/interface/InterfaceDefs.h
   haiku/trunk/headers/os/interface/View.h
   haiku/trunk/headers/os/interface/Window.h
   haiku/trunk/headers/private/binary_compatibility/Global.h
   haiku/trunk/headers/private/binary_compatibility/Interface.h
   haiku/trunk/src/kits/interface/Jamfile
   haiku/trunk/src/kits/interface/View.cpp
   haiku/trunk/src/kits/interface/Window.cpp
   haiku/trunk/src/tests/kits/interface/Jamfile
Log:
* Added a basic tool tip API, and implementation.
* The BView API can probably be regarded as good enough; the implementation
  might need to be improved over time (also, some things as archivability
  aren't fully implemented yet). The ToolTip.h header should get public once
  finalized.
* Added new B_MOUSE_IDLE message that is sent to a BView after a certain
  time has passed (BToolTipManager::ShowDelay()).
* Added small test app (ToolTipTest) that shows what is already working.


Modified: haiku/trunk/headers/os/app/AppDefs.h
===================================================================
--- haiku/trunk/headers/os/app/AppDefs.h	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/headers/os/app/AppDefs.h	2009-08-03 14:47:41 UTC (rev 32078)
@@ -44,6 +44,7 @@
 	B_MOUSE_DOWN 				= '_MDN',
 	B_MOUSE_MOVED 				= '_MMV',
 	B_MOUSE_ENTER_EXIT			= '_MEX',
+	B_MOUSE_IDLE				= '_MSI',
 	B_MOUSE_UP 					= '_MUP',
 	B_MOUSE_WHEEL_CHANGED		= '_MWC',
 	B_OPEN_IN_WORKSPACE			= '_OWS',

Modified: haiku/trunk/headers/os/interface/InterfaceDefs.h
===================================================================
--- haiku/trunk/headers/os/interface/InterfaceDefs.h	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/headers/os/interface/InterfaceDefs.h	2009-08-03 14:47:41 UTC (rev 32078)
@@ -282,8 +282,8 @@
 	B_MENU_SELECTED_ITEM_TEXT_COLOR = 8,
 	B_MENU_SELECTED_BORDER_COLOR = 9,
 
-	B_TOOLTIP_BACKGROUND_COLOR = 20,
-	B_TOOLTIP_TEXT_COLOR = 21,
+	B_TOOL_TIP_BACKGROUND_COLOR = 20,
+	B_TOOL_TIP_TEXT_COLOR = 21,
 
 	B_SUCCESS_COLOR = 100,
 	B_FAILURE_COLOR = 101,

Modified: haiku/trunk/headers/os/interface/View.h
===================================================================
--- haiku/trunk/headers/os/interface/View.h	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/headers/os/interface/View.h	2009-08-03 14:47:41 UTC (rev 32078)
@@ -124,6 +124,7 @@
 class BShape;
 class BShelf;
 class BString;
+class BToolTip;
 class BWindow;
 struct _array_data_;
 struct _array_hdr_;
@@ -503,7 +504,6 @@
 
 	virtual	void			DrawAfterChildren(BRect r);
 
-
 			// layout related
 
 	virtual	BSize			MinSize();
@@ -542,6 +542,19 @@
 protected:
 	virtual	void			DoLayout();
 
+public:
+			// tool tip support
+
+			void			SetToolTip(const char* text);
+			void			SetToolTip(BToolTip* tip);
+			BToolTip*		ToolTip() const;
+
+			void			ShowToolTip(BToolTip* tip = NULL);
+			void			HideToolTip();
+
+protected:
+	virtual bool			GetToolTipAt(BPoint point, BToolTip** _tip);
+
 private:
 			void			_Layout(bool force, BLayoutContext* context);
 
@@ -556,7 +569,6 @@
 	friend class BTabView;
 	friend class BWindow;
 
-	virtual	void			_ReservedView11();
 	virtual	void			_ReservedView12();
 	virtual	void			_ReservedView13();
 	virtual	void			_ReservedView14();
@@ -653,8 +665,10 @@
 			uint32			fMouseEventOptions;
 
 			LayoutData*		fLayoutData;
+			BToolTip*		fToolTip;
+			BToolTip*		fVisibleToolTip;
 
-			uint32			_reserved[7];
+			uint32			_reserved[5];
 };
 
 

Modified: haiku/trunk/headers/os/interface/Window.h
===================================================================
--- haiku/trunk/headers/os/interface/Window.h	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/headers/os/interface/Window.h	2009-08-03 14:47:41 UTC (rev 32078)
@@ -347,7 +347,7 @@
 			BView*			fTopView;
 			BView*			fFocus;
 			BView*			fLastMouseMovedView;
-			uint32			_unused1;
+			BMessageRunner*	fIdleMouseRunner;
 			BMenuBar*		fKeyMenuBar;
 			BButton*		fDefaultButton;
 			BList			fShortcuts;

Modified: haiku/trunk/headers/private/binary_compatibility/Global.h
===================================================================
--- haiku/trunk/headers/private/binary_compatibility/Global.h	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/headers/private/binary_compatibility/Global.h	2009-08-03 14:47:41 UTC (rev 32078)
@@ -20,7 +20,8 @@
 	PERFORM_CODE_GET_HEIGHT_FOR_WIDTH	= 1005,
 	PERFORM_CODE_SET_LAYOUT				= 1006,
 	PERFORM_CODE_INVALIDATE_LAYOUT		= 1007,
-	PERFORM_CODE_DO_LAYOUT				= 1008
+	PERFORM_CODE_DO_LAYOUT				= 1008,
+	PERFORM_CODE_GET_TOOL_TIP_AT		= 1009
 
 	// support kit
 };

Modified: haiku/trunk/headers/private/binary_compatibility/Interface.h
===================================================================
--- haiku/trunk/headers/private/binary_compatibility/Interface.h	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/headers/private/binary_compatibility/Interface.h	2009-08-03 14:47:41 UTC (rev 32078)
@@ -45,5 +45,10 @@
 	bool	descendants;
 };
 
+struct perform_data_get_tool_tip_at {
+	BPoint		point;
+	BToolTip**	tool_tip;
+	bool		return_value;
+};
 
 #endif /* _BINARY_COMPATIBILITY_INTERFACE_H_ */

Added: haiku/trunk/headers/private/interface/ToolTip.h
===================================================================
--- haiku/trunk/headers/private/interface/ToolTip.h	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/headers/private/interface/ToolTip.h	2009-08-03 14:47:41 UTC (rev 32078)
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2009, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _TOOL_TIP_H
+#define _TOOL_TIP_H
+
+
+#include <Alignment.h>
+#include <Archivable.h>
+#include <Point.h>
+#include <Referenceable.h>
+
+
+class BView;
+class BTextView;
+
+
+class BToolTip : public BArchivable, public BReferenceable {
+public:
+								BToolTip();
+								BToolTip(BMessage* archive);
+	virtual						~BToolTip();
+
+	virtual	status_t			Archive(BMessage* archive,
+									bool deep = true) const;
+
+	virtual	BView*				View() const = 0;
+
+	virtual void				SetSticky(bool enable);
+			bool				IsSticky() const;
+	virtual void				SetMouseRelativeLocation(BPoint location);
+			BPoint				MouseRelativeLocation() const;
+	virtual void				SetAlignment(BAlignment alignment);
+			BAlignment			Alignment() const;
+
+private:
+								BToolTip(const BToolTip& other);
+			BToolTip&			operator=(const BToolTip &other);
+
+			void				_InitData();
+
+private:
+			bool				fIsSticky;
+			BPoint				fRelativeLocation;
+			BAlignment			fAlignment;
+};
+
+
+class BTextToolTip : public BToolTip {
+public:
+								BTextToolTip(const char* text);
+								BTextToolTip(BMessage* archive);
+	virtual						~BTextToolTip();
+
+	static	BTextToolTip*		Instantiate(BMessage* archive);
+	virtual	status_t			Archive(BMessage* archive,
+									bool deep = true) const;
+
+	virtual	BView*				View() const;
+
+			const char*			Text() const;
+			void				SetText(const char* text);
+
+private:
+			void				_InitData(const char* text);
+
+private:
+			BTextView*			fTextView;
+};
+
+
+#endif	// _TOOL_TIP_H

Added: haiku/trunk/headers/private/interface/ToolTipManager.h
===================================================================
--- haiku/trunk/headers/private/interface/ToolTipManager.h	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/headers/private/interface/ToolTipManager.h	2009-08-03 14:47:41 UTC (rev 32078)
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2009, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _TOOL_TIP_MANAGER_H
+#define _TOOL_TIP_MANAGER_H
+
+
+#include <Messenger.h>
+#include <Point.h>
+
+
+class BToolTip;
+
+
+class BToolTipManager {
+public:
+	static	BToolTipManager*	Manager();
+
+			void				ShowTip(BToolTip* tip, BPoint point);
+			void				HideTip();
+
+			void				SetShowDelay(bigtime_t time);
+			bigtime_t			ShowDelay() const;
+			void				SetHideDelay(bigtime_t time);
+			bigtime_t			HideDelay() const;
+
+private:
+								BToolTipManager();
+	virtual						~BToolTipManager();
+
+			BMessenger			fWindow;
+
+			bigtime_t			fShowDelay;
+			bigtime_t			fHideDelay;
+
+	static	BToolTipManager*	sDefaultInstance;
+};
+
+
+#endif	// _TOOL_TIP_MANAGER_H

Added: haiku/trunk/headers/private/interface/ToolTipWindow.h
===================================================================
--- haiku/trunk/headers/private/interface/ToolTipWindow.h	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/headers/private/interface/ToolTipWindow.h	2009-08-03 14:47:41 UTC (rev 32078)
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2009, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef TOOL_TIP_WINDOW_H
+#define TOOL_TIP_WINDOW_H
+
+
+#include <Window.h>
+
+
+namespace BPrivate {
+
+class ToolTipWindow : public BWindow {
+public:
+							ToolTipWindow(BToolTip* tip, BPoint where);
+
+	virtual	void			MessageReceived(BMessage* message);
+};
+
+}	// namespace BPrivate
+
+
+#endif	// TOOL_TIP_WINDOW_H

Modified: haiku/trunk/src/kits/interface/Jamfile
===================================================================
--- haiku/trunk/src/kits/interface/Jamfile	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/src/kits/interface/Jamfile	2009-08-03 14:47:41 UTC (rev 32078)
@@ -122,6 +122,8 @@
 	TextControl.cpp
 	TextInput.cpp
 	TextView.cpp
+	ToolTip.cpp
+	ToolTipManager.cpp
 	TwoDimensionalLayout.cpp
 	View.cpp
 	ViewLayoutItem.cpp

Added: haiku/trunk/src/kits/interface/ToolTip.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ToolTip.cpp	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/src/kits/interface/ToolTip.cpp	2009-08-03 14:47:41 UTC (rev 32078)
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2009, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <ToolTip.h>
+
+#include <new>
+
+#include <Message.h>
+#include <TextView.h>
+
+
+BToolTip::BToolTip()
+{
+	_InitData();
+}
+
+
+BToolTip::BToolTip(BMessage* archive)
+{
+	_InitData();
+
+	bool sticky;
+	if (archive->FindBool("sticky", &sticky) == B_OK)
+		fIsSticky = sticky;
+
+	// TODO!
+}
+
+
+BToolTip::~BToolTip()
+{
+}
+
+
+status_t
+BToolTip::Archive(BMessage* archive, bool deep) const
+{
+	status_t status = BArchivable::Archive(archive, deep);
+
+	if (fIsSticky)
+		status = archive->AddBool("sticky", fIsSticky);
+
+	// TODO!
+	return status;
+}
+
+
+void
+BToolTip::SetSticky(bool enable)
+{
+	fIsSticky = enable;
+}
+
+
+bool
+BToolTip::IsSticky() const
+{
+	return fIsSticky;
+}
+
+
+void
+BToolTip::SetMouseRelativeLocation(BPoint location)
+{
+	fRelativeLocation = location;
+}
+
+
+BPoint
+BToolTip::MouseRelativeLocation() const
+{
+	return fRelativeLocation;
+}
+
+
+void
+BToolTip::SetAlignment(BAlignment alignment)
+{
+	fAlignment = alignment;
+}
+
+
+BAlignment
+BToolTip::Alignment() const
+{
+	return fAlignment;
+}
+
+
+void
+BToolTip::_InitData()
+{
+	fIsSticky = false;
+	fRelativeLocation = BPoint(20, 20);
+	fAlignment = BAlignment(B_ALIGN_RIGHT, B_ALIGN_BOTTOM);
+}
+
+
+//	#pragma mark -
+
+
+BTextToolTip::BTextToolTip(const char* text)
+{
+	_InitData(text);
+}
+
+
+BTextToolTip::BTextToolTip(BMessage* archive)
+{
+	// TODO!
+}
+
+
+BTextToolTip::~BTextToolTip()
+{
+	delete fTextView;
+}
+
+
+/*static*/ BTextToolTip*
+BTextToolTip::Instantiate(BMessage* archive)
+{
+	if (!validate_instantiation(archive, "BTextToolTip"))
+		return NULL;
+
+	return new(std::nothrow) BTextToolTip(archive);
+}
+
+
+status_t
+BTextToolTip::Archive(BMessage* archive, bool deep) const
+{
+	status_t status = BToolTip::Archive(archive, deep);
+	// TODO!
+
+	return status;
+}
+
+
+BView*
+BTextToolTip::View() const
+{
+	return fTextView;
+}
+
+
+const char*
+BTextToolTip::Text() const
+{
+	return fTextView->Text();
+}
+
+
+void
+BTextToolTip::SetText(const char* text)
+{
+	fTextView->SetText(text);
+}
+
+
+void
+BTextToolTip::_InitData(const char* text)
+{
+	fTextView = new BTextView("tool tip text");
+	fTextView->SetText(text);
+	fTextView->MakeEditable(false);
+	fTextView->SetViewColor(ui_color(B_TOOL_TIP_BACKGROUND_COLOR));
+	rgb_color color = ui_color(B_TOOL_TIP_TEXT_COLOR);
+	fTextView->SetFontAndColor(NULL, 0, &color);
+	fTextView->SetWordWrap(false);
+}
+

Added: haiku/trunk/src/kits/interface/ToolTipManager.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ToolTipManager.cpp	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/src/kits/interface/ToolTipManager.cpp	2009-08-03 14:47:41 UTC (rev 32078)
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2009, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <ToolTipManager.h>
+#include <ToolTipWindow.h>
+
+#include <Autolock.h>
+#include <LayoutBuilder.h>
+#include <MessageRunner.h>
+
+#include <ToolTip.h>
+
+
+BToolTipManager* BToolTipManager::sDefaultInstance;
+
+static BLocker sLock("tool tip manager");
+
+static const uint32 kMsgHideToolTip = 'hide';
+static const uint32 kMsgShowToolTip = 'show';
+static const uint32 kMsgCurrentToolTip = 'curr';
+static const uint32 kMsgCloseToolTip = 'clos';
+
+
+namespace BPrivate {
+
+class ToolTipView : public BView {
+public:
+	ToolTipView(BToolTip* tip)
+		:
+		BView("tool tip", B_WILL_DRAW),
+		fToolTip(tip),
+		fHidden(false)
+	{
+		fToolTip->AcquireReference();
+		SetViewColor(ui_color(B_TOOL_TIP_BACKGROUND_COLOR));
+
+		BGroupLayout* layout = new BGroupLayout(B_VERTICAL);
+		layout->SetInsets(5, 5, 5, 5);
+		SetLayout(layout);
+
+		AddChild(fToolTip->View());
+	}
+
+	virtual ~ToolTipView()
+	{
+		fToolTip->ReleaseReference();
+	}
+
+	virtual void AttachedToWindow()
+	{
+		SetEventMask(B_POINTER_EVENTS, 0);
+	}
+
+	virtual void DetachedFromWindow()
+	{
+		RemoveChild(fToolTip->View());
+			// don't delete this one!
+	}
+
+	virtual void MouseMoved(BPoint where, uint32 transit,
+		const BMessage* dragMessage)
+	{
+		if (fToolTip->IsSticky()) {
+			// TODO: move window with mouse!
+			Window()->MoveTo(
+				ConvertToScreen(where) + fToolTip->MouseRelativeLocation());
+		} else if (transit == B_ENTERED_VIEW) {
+			// close instantly if the user managed to enter
+			Window()->Quit();
+		} else {
+			// close with the preferred delay in case the mouse just moved
+			HideTip();
+		}
+	}
+
+	void HideTip()
+	{
+		if (fHidden)
+			return;
+
+		BMessage quit(kMsgCloseToolTip);
+		BMessageRunner::StartSending(Window(), &quit,
+			BToolTipManager::Manager()->HideDelay(), 1);
+		fHidden = true;
+	}
+
+	void ShowTip()
+	{
+		fHidden = false;
+	}
+
+	BToolTip* Tip() const { return fToolTip; }
+	bool IsTipHidden() const { return fHidden; }
+
+private:
+	BToolTip*	fToolTip;
+	bool		fHidden;
+};
+
+
+ToolTipWindow::ToolTipWindow(BToolTip* tip, BPoint where)
+	:
+	BWindow(BRect(0, 0, 250, 10), "tool tip", B_BORDERED_WINDOW_LOOK,
+		B_FLOATING_APP_WINDOW_FEEL, B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE
+			| B_AUTO_UPDATE_SIZE_LIMITS | B_AVOID_FRONT | B_AVOID_FOCUS)
+{
+	MoveTo(where + tip->MouseRelativeLocation());
+
+	// TODO: take alignment into account!
+
+	SetLayout(new BGroupLayout(B_VERTICAL));
+	AddChild(new ToolTipView(tip));
+
+	BSize size = ChildAt(0)->PreferredSize();
+	ResizeTo(size.width, size.height);
+	//AddChild(BLayoutBuilder::Group<>(B_VERTICAL).Add(new ToolTipView(tip)));
+}
+
+
+void
+ToolTipWindow::MessageReceived(BMessage* message)
+{
+	ToolTipView* view = static_cast<ToolTipView*>(ChildAt(0));
+
+	switch (message->what) {
+		case kMsgHideToolTip:
+			view->HideTip();
+			break;
+
+		case kMsgCurrentToolTip:
+		{
+			BToolTip* tip = view->Tip();
+
+			BMessage reply(B_REPLY);
+			reply.AddPointer("current", tip);
+
+			if (message->SendReply(&reply) == B_OK)
+				tip->AcquireReference();
+			break;
+		}
+
+		case kMsgShowToolTip:
+			view->ShowTip();
+			break;
+
+		case kMsgCloseToolTip:
+			if (view->IsTipHidden())
+				Quit();
+			break;
+
+		default:
+			BWindow::MessageReceived(message);
+	}
+}
+
+}	// namespace BPrivate
+
+
+//	#pragma mark -
+
+
+/*static*/ BToolTipManager*
+BToolTipManager::Manager()
+{
+	BAutolock _(sLock);
+
+	if (sDefaultInstance == NULL)
+		sDefaultInstance = new BToolTipManager();
+
+	return sDefaultInstance;
+}
+
+
+void
+BToolTipManager::ShowTip(BToolTip* tip, BPoint point)
+{
+	BToolTip* current = NULL;
+	BMessage reply;
+	if (fWindow.SendMessage(kMsgCurrentToolTip, &reply) == B_OK)
+		reply.FindPointer("current", (void**)&current);
+
+	if (current != NULL)
+		current->ReleaseReference();
+
+	if (current == tip) {
+		fWindow.SendMessage(kMsgShowToolTip);
+		return;
+	}
+
+	fWindow.SendMessage(kMsgHideToolTip);
+
+	if (current != NULL)
+		current->ReleaseReference();
+
+	if (tip != NULL) {
+		BWindow* window = new BPrivate::ToolTipWindow(tip, point);
+		window->Show();
+
+		fWindow = BMessenger(window);
+	}
+}
+
+
+void
+BToolTipManager::HideTip()
+{
+	fWindow.SendMessage(kMsgHideToolTip);
+}
+
+
+void
+BToolTipManager::SetShowDelay(bigtime_t time)
+{
+	// between 10ms and 3s
+	if (time < 10000)
+		time = 10000;
+	else if (time > 3000000)
+		time = 3000000;
+
+	fShowDelay = time;
+}
+
+
+bigtime_t
+BToolTipManager::ShowDelay() const
+{
+	return fShowDelay;
+}
+
+
+void
+BToolTipManager::SetHideDelay(bigtime_t time)
+{
+	// between 0 and 0.5s
+	if (time < 0)
+		time = 0;
+	else if (time > 500000)
+		time = 500000;
+
+	fHideDelay = time;
+}
+
+
+bigtime_t
+BToolTipManager::HideDelay() const
+{
+	return fHideDelay;
+}
+
+
+BToolTipManager::BToolTipManager()
+	:
+	fShowDelay(750000),
+	fHideDelay(50000)
+{
+}
+
+
+BToolTipManager::~BToolTipManager()
+{
+}

Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/src/kits/interface/View.cpp	2009-08-03 14:47:41 UTC (rev 32078)
@@ -54,6 +54,8 @@
 #include <ServerProtocol.h>
 #include <ServerProtocolStructs.h>
 #include <ShapePrivate.h>
+#include <ToolTip.h>
+#include <ToolTipManager.h>
 #include <TokenSpace.h>
 #include <ViewPrivate.h>
 
@@ -579,6 +581,9 @@
 
 	RemoveSelf();
 
+	if (fToolTip != NULL)
+		fToolTip->ReleaseReference();
+
 	// TODO: see about BShelf! must I delete it here? is it deleted by
 	// the window?
 
@@ -4171,6 +4176,18 @@
 				FrameMoved(fParentOffset);
 				break;
 
+			case B_MOUSE_IDLE:
+			{
+				BPoint where;
+				if (msg->FindPoint("be:view_where", &where) != B_OK)
+					break;
+
+				BToolTip* tip;
+				if (GetToolTipAt(where, &tip))
+					ShowToolTip(tip);
+				break;
+			}
+
 			case B_MOUSE_WHEEL_CHANGED:
 			{
 				BScrollBar* horizontal = ScrollBar(B_HORIZONTAL);
@@ -4339,6 +4356,14 @@
 			BView::DoLayout();
 			return B_OK;
 		}
+		case PERFORM_CODE_GET_TOOL_TIP_AT:
+		{
+			perform_data_get_tool_tip_at* data
+				= (perform_data_get_tool_tip_at*)_data;
+			data->return_value
+				= BView::GetToolTipAt(data->point, data->tool_tip);
+			return B_OK;
+		}
 	}
 
 	return BHandler::Perform(code, _data);
@@ -4613,6 +4638,74 @@
 
 
 void
+BView::SetToolTip(const char* text)
+{
+	SetToolTip(new BTextToolTip(text));
+}
+
+
+void
+BView::SetToolTip(BToolTip* tip)
+{
+	if (fToolTip == tip)
+		return;
+
+	if (fToolTip != NULL)
+		fToolTip->ReleaseReference();
+	fToolTip = tip;
+	if (fToolTip != NULL)
+		fToolTip->AcquireReference();
+}
+
+
+BToolTip*
+BView::ToolTip() const
+{
+	return fToolTip;
+}
+
+
+void
+BView::ShowToolTip(BToolTip* tip)
+{
+	if (tip == NULL)
+		return;
+
+	fVisibleToolTip = tip;
+
+	BPoint where;
+	GetMouse(&where, NULL, false);
+
+	BToolTipManager::Manager()->ShowTip(tip, ConvertToScreen(where));
+}
+
+
+void
+BView::HideToolTip()
+{
+	BToolTipManager::Manager()->HideTip();
+	fVisibleToolTip = NULL;
+}
+
+
+bool
+BView::GetToolTipAt(BPoint point, BToolTip** _tip)
+{
+	if (fVisibleToolTip != NULL) {
+		*_tip = fVisibleToolTip;
+		return true;
+	}
+	if (fToolTip != NULL) {
+		*_tip = fToolTip;
+		return true;
+	}
+
+	*_tip = NULL;
+	return false;
+}
+
+
+void
 BView::_Layout(bool force, BLayoutContext* context)
 {
 //printf("%p->BView::_Layout(%d, %p)\n", this, force, context);
@@ -4715,6 +4808,9 @@
 	fMouseEventOptions = 0;
 
 	fLayoutData = new LayoutData;
+
+	fToolTip = NULL;
+	fVisibleToolTip = NULL;
 }
 
 
@@ -5494,14 +5590,25 @@
 }
 
 
-void BView::_ReservedView11(){}
-void BView::_ReservedView12(){}
-void BView::_ReservedView13(){}
-void BView::_ReservedView14(){}
-void BView::_ReservedView15(){}
-void BView::_ReservedView16(){}
+extern "C" bool
+_ReservedView11__5BView(BView* view, BPoint point, BToolTip** _toolTip)
+{
+	// GetToolTipAt()
+	perform_data_get_tool_tip_at data;
+	data.point = point;
+	data.tool_tip = _toolTip;
+	view->Perform(PERFORM_CODE_GET_TOOL_TIP_AT, &data);
+	return data.return_value;
+}
 
 
+void BView::_ReservedView12() {}
+void BView::_ReservedView13() {}
+void BView::_ReservedView14() {}
+void BView::_ReservedView15() {}
+void BView::_ReservedView16() {}
+
+
 BView::BView(const BView& other)
 	:
 	BHandler()

Modified: haiku/trunk/src/kits/interface/Window.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Window.cpp	2009-08-03 14:41:27 UTC (rev 32077)
+++ haiku/trunk/src/kits/interface/Window.cpp	2009-08-03 14:47:41 UTC (rev 32078)
@@ -43,6 +43,8 @@
 #include <PortLink.h>
 #include <ServerProtocol.h>
 #include <TokenSpace.h>
+#include <ToolTipManager.h>
+#include <ToolTipWindow.h>
 #include <tracker_private.h>
 #include <WindowPrivate.h>
 
@@ -1209,6 +1211,21 @@
 				msg->FindPoint("be:view_where", &where);
 				msg->FindInt32("buttons", (int32*)&buttons);
 
+				delete fIdleMouseRunner;
+
+				if (transit != B_EXITED_VIEW && transit != B_OUTSIDE_VIEW) {
+					// Start new idle runner
+					BMessage idle(B_MOUSE_IDLE);
+					idle.AddPoint("be:view_where", where);
+					fIdleMouseRunner = new BMessageRunner(
+						BMessenger(NULL, this), &idle,
+						BToolTipManager::Manager()->ShowDelay(), 1);
+				} else {
+					fIdleMouseRunner = NULL;
+					if (dynamic_cast<BPrivate::ToolTipWindow*>(this) == NULL)
+						BToolTipManager::Manager()->HideTip();
+				}
+
 				BMessage* dragMessage = NULL;
 				if (msg->HasMessage("be:drag_message")) {
 					dragMessage = new BMessage();
@@ -2595,6 +2612,7 @@
 	fTopView = NULL;
 	fFocus = NULL;
 	fLastMouseMovedView	= NULL;
+	fIdleMouseRunner = NULL;
 	fKeyMenuBar = NULL;
 	fDefaultButton = NULL;
 
@@ -3089,6 +3107,7 @@
 		case B_MOUSE_UP:
 		case B_MOUSE_MOVED:
 		case B_MOUSE_WHEEL_CHANGED:
+		case B_MOUSE_IDLE:
 			// is there a token of the view that is currently under the mouse?
 			int32 token;
 			if (message->FindInt32("_view_token", &token) == B_OK) {
@@ -3183,7 +3202,8 @@
 	// message directly (but not to the focus view)
 
 	for (int32 token; !cookie.tokens_scanned
-			&& cookie.message->FindInt32("_token", cookie.index, &token) == B_OK;
+			&& cookie.message->FindInt32("_token", cookie.index, &token)
+				== B_OK;
 			cookie.index++) {
 		// focus view is preferred and should get its message directly
 		if (token == cookie.focus_token) {
@@ -3294,7 +3314,8 @@
 						viewUnderMouse = _FindView(token);
 
 					// add transit information
-					uint32 transit = _TransitForMouseMoved(view, viewUnderMouse);;
+					uint32 transit
+						= _TransitForMouseMoved(view, viewUnderMouse);
 					message->AddInt32("be:transit", transit);

[... truncated: 297 lines follow ...]


From axeld at mail.berlios.de  Mon Aug  3 16:54:25 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Mon, 3 Aug 2009 16:54:25 +0200
Subject: [Haiku-commits] r32079 - haiku/trunk/src/tests/kits/interface
Message-ID: <200908031454.n73EsPL8007336@sheep.berlios.de>

Author: axeld
Date: 2009-08-03 16:54:22 +0200 (Mon, 03 Aug 2009)
New Revision: 32079
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32079&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/ToolTipTest.cpp
Log:
* Changed text so that it's obvious those are supposed to be sticky.


Modified: haiku/trunk/src/tests/kits/interface/ToolTipTest.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/ToolTipTest.cpp	2009-08-03 14:47:41 UTC (rev 32078)
+++ haiku/trunk/src/tests/kits/interface/ToolTipTest.cpp	2009-08-03 14:54:22 UTC (rev 32079)
@@ -209,10 +209,10 @@
 	BView* changing = new BStringView("3", "Changing Tool Tip");
 	changing->SetToolTip(new ChangingToolTip());
 
-	BView* mouse = new BStringView("3", "Mouse Tool Tip");
+	BView* mouse = new BStringView("3", "Mouse Tool Tip (sticky)");
 	mouse->SetToolTip(new MouseToolTip());
 
-	BView* immediate = new ImmediateView("3", "Immediate Tool Tip");
+	BView* immediate = new ImmediateView("3", "Immediate Tool Tip (sticky)");
 
 	BLayoutBuilder::Group<>(this, B_VERTICAL)
 		.Add(simple)



From dev at m-phasis.de  Mon Aug  3 16:59:51 2009
From: dev at m-phasis.de (Michael Weirauch)
Date: Mon, 3 Aug 2009 16:59:51 +0200
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
	headers/os/interface headers/private/binary_compatibility
	headers/private/interface src/kits/interface
	src/tests/kits/interface
In-Reply-To: <200908031447.n73Elscv005496@sheep.berlios.de>
References: <200908031447.n73Elscv005496@sheep.berlios.de>
Message-ID: <ba1cb1a80908030759i44544bf1x9081c24b87a981e@mail.gmail.com>

2009/8/3  <axeld at mail.berlios.de>:
> Author: axeld
> Date: 2009-08-03 16:47:41 +0200 (Mon, 03 Aug 2009)
> New Revision: 32078
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32078&view=rev
>
> Added:
> ? haiku/trunk/headers/private/interface/ToolTip.h
> ? haiku/trunk/headers/private/interface/ToolTipManager.h
> ? haiku/trunk/headers/private/interface/ToolTipWindow.h
> ? haiku/trunk/src/kits/interface/ToolTip.cpp
> ? haiku/trunk/src/kits/interface/ToolTipManager.cpp
> ? haiku/trunk/src/tests/kits/interface/ToolTipTest.cpp
> Modified:
> ? haiku/trunk/headers/os/app/AppDefs.h
> ? haiku/trunk/headers/os/interface/InterfaceDefs.h
> ? haiku/trunk/headers/os/interface/View.h
> ? haiku/trunk/headers/os/interface/Window.h
> ? haiku/trunk/headers/private/binary_compatibility/Global.h
> ? haiku/trunk/headers/private/binary_compatibility/Interface.h
> ? haiku/trunk/src/kits/interface/Jamfile
> ? haiku/trunk/src/kits/interface/View.cpp
> ? haiku/trunk/src/kits/interface/Window.cpp
> ? haiku/trunk/src/tests/kits/interface/Jamfile
> Log:
> * Added a basic tool tip API, and implementation.
> * The BView API can probably be regarded as good enough; the implementation
> ?might need to be improved over time (also, some things as archivability
> ?aren't fully implemented yet). The ToolTip.h header should get public once
> ?finalized.
> * Added new B_MOUSE_IDLE message that is sent to a BView after a certain
> ?time has passed (BToolTipManager::ShowDelay()).
> * Added small test app (ToolTipTest) that shows what is already working.
>

Fix for the renamed constants:

Index: src/preferences/appearance/ColorSet.cpp
===================================================================
--- src/preferences/appearance/ColorSet.cpp	(Revision 32078)
+++ src/preferences/appearance/ColorSet.cpp	(Arbeitskopie)
@@ -37,8 +37,8 @@
 	{ B_MENU_ITEM_TEXT_COLOR, "Menu Item Text" },
 	{ B_MENU_SELECTED_ITEM_TEXT_COLOR, "Selected Menu Item Text" },
 	{ B_MENU_SELECTED_BORDER_COLOR, "Selected Menu Item Border" },
-	{ B_TOOLTIP_BACKGROUND_COLOR, "Tooltip Background" },
-	{ B_TOOLTIP_TEXT_COLOR, "Tooltip Text" },
+	{ B_TOOL_TIP_BACKGROUND_COLOR, "Tooltip Background" },
+	{ B_TOOL_TIP_TEXT_COLOR, "Tooltip Text" },
 	{ B_SUCCESS_COLOR, "Success" },
 	{ B_FAILURE_COLOR, "Failure" },
 	{ B_WINDOW_TAB_COLOR, "Window Tab" },
@@ -117,8 +117,8 @@
 	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_TOOL_TIP_BACKGROUND_COLOR] = make_color(255, 255, 0);
+	set.fColors[B_TOOL_TIP_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);


Regards,
Michael


From axeld at pinc-software.de  Mon Aug  3 17:01:09 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 03 Aug 2009 17:01:09 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32059_-_haiku/trunk/src/system/boot/pl?=
 =?utf-8?q?atform/bios=5Fia32?=
In-Reply-To: <36ed0c950908030612m6b463b94va88232885ca2bfa7@mail.gmail.com>
Message-ID: <28906793063-BeMail@zon>

PulkoMandy <pulkomandy at gmail.com> wrote:
> 2009/8/2 Axel D?rfler <axeld at pinc-software.de>:
> > mmu_man at BerliOS <mmu_man at mail.berlios.de> wrote:
> >> Log:
> >> Add MultiBoot support.
> > I can't imagine a single reason why we would want this in our boot
> > loader.
> > Is there any benefit from using it?
> mainly stnadardization, grub compatibility

A standard that is not relevant at all, though. And we are compatible 
to every x86 boot loader out there, as we allow chainloading.

> and simpler porting to
> other platforms (ARM board use jtag and can make use of it IIRC). 
> Also

No reason to clobber any other platforms, then.

> it allows dorect loading of the kernel in qemu for debugging.

Nope, only the boot loader, because that's where the multi-boot support 
is.
I really think it should be removed again; our loader is too large 
anyway, no need to put more useless stuff in it.

Bye,
   Axel.



From pulkomandy at mail.berlios.de  Mon Aug  3 17:02:56 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Mon, 3 Aug 2009 17:02:56 +0200
Subject: [Haiku-commits] r32080 - in
	haiku/branches/components/gsoc-locale-kit: build/jam
	src/kits/locale src/preferences/locale
Message-ID: <200908031502.n73F2urD008731@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-03 17:02:55 +0200 (Mon, 03 Aug 2009)
New Revision: 32080
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32080&view=rev

Added:
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/fr.catkeys
Removed:
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/french.catkeys
Modified:
   haiku/branches/components/gsoc-locale-kit/build/jam/BeOSRules
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Locale.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h
Log:
-Language preferences are now saved and loaded properly. So you can now select your favorite language and actually use the locale kit with something else than french :)
-Some style fixes for the code I borrowed in Icon-O-Matic, and to some of my code, and other cleanups
-Updated the french catkeys to include the new strings from the preflet

Now working on the "Country" tab...


Modified: haiku/branches/components/gsoc-locale-kit/build/jam/BeOSRules
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/BeOSRules	2009-08-03 14:54:22 UTC (rev 32079)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/BeOSRules	2009-08-03 15:02:55 UTC (rev 32080)
@@ -370,7 +370,7 @@
 	ExtractCatalogEntries $(genCat:S=.catkeys) : $(sources) : $(signature) ;
 
 	LinkApplicationCatalog $(genCat) : $(genCat:S=.catkeys)
-		: $(signature) : english ;
+		: $(signature) : $(genCat:B) ;
 	
 	for catalog in $(translatedCatalogs)
 	{

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-08-03 14:54:22 UTC (rev 32079)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-08-03 15:02:55 UTC (rev 32080)
@@ -185,7 +185,6 @@
 		if (file.SetTo(path.Path(), B_READ_ONLY) == B_OK
 				&& settingsMessage.Unflatten(&file) == B_OK) {
 			if (settingsMessage.FindString("language", &langName) == B_OK) {
-				fPreferredLanguages.ReplaceString("language", langName);
 				UErrorCode icuError = U_ZERO_ERROR;
 				Locale icuLocale = Locale::createCanonical(langName.String());
 				assert(!icuLocale.isBogus());
@@ -194,12 +193,11 @@
 				BStringByteSink bbs(&bstr);
 				icuLocale.getDisplayName(ustr);
 				ustr.toUTF8(bbs);
-				log_team(LOG_ERR,"*** READABLE: %s\n",bstr.String());
 
 				Locale::setDefault(icuLocale,icuError);
 				assert(icuError == U_ZERO_ERROR);
-				int i;
-				for (i=1; settingsMessage.FindString("language", i, &langName)
+				fPreferredLanguages.RemoveName("language");
+				for (int i=0; settingsMessage.FindString("language", i, &langName)
 						== B_OK; i++) {
 					fPreferredLanguages.AddString("language", langName);
 				}

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Locale.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Locale.cpp	2009-08-03 14:54:22 UTC (rev 32079)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Locale.cpp	2009-08-03 15:02:55 UTC (rev 32080)
@@ -121,8 +121,9 @@
 	// We make sure there is at least one string before erasing the previous
 	// settings, then we add the remaining ones, if any
 	if (message->FindString("language",&langName) == B_OK) {
-		fMessage.ReplaceString("language", langName);
-		for (int i=1; message->FindString("language", i, &langName) == B_OK; i++)
+		// Remove any old data as we know we have newer one to replace it
+		fMessage.RemoveName("language");
+		for (int i=0; message->FindString("language", i, &langName) == B_OK; i++)
 			fMessage.AddString("language", langName);
 	}
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-03 14:54:22 UTC (rev 32079)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-03 15:02:55 UTC (rev 32080)
@@ -105,7 +105,8 @@
 						// gather all the items from the BMessage
 						BList items;
 						int32 index;
-						for (int32 i = 0; message->FindInt32("index", i, &index) == B_OK; i++)
+						for (int32 i = 0; message->FindInt32("index", i, &index)
+							   	== B_OK; i++)
 							if (BListItem* item = ItemAt(index))
 								items.AddItem((void*)item);
 
@@ -121,7 +122,8 @@
 
 						// gather all the items from the BMessage
 						int32 index;
-						for (int32 i = 0; message->FindInt32("index", i, &index) == B_OK; i++)
+						for (int32 i = 0; message->FindInt32("index", i, &index)
+								== B_OK; i++)
 							if (BListItem* item = list->RemoveItem(index)) {
 								AddItem(item,fDropIndex);
 								fDropIndex++;
@@ -141,9 +143,9 @@
 LanguageListView::MoveItems(BList& items, int32 index)
 {
 	DeselectAll();
-	// we remove the items while we look at them, the insertion index is decreased
-	// when the items index is lower, so that we insert at the right spot after
-	// removal
+	// we remove the items while we look at them, the insertion index is
+	// decreaded when the items index is lower, so that we insert at the right
+	// spot after removal
 	BList removedItems;
 	int32 count = items.CountItems();
 	for (int32 i = 0; i < count; i++) {
@@ -191,7 +193,8 @@
 		// figure out, how many items fit into our bitmap
 		int32 numItems;
 		bool fade = false;
-		for (numItems = 0; BListItem* item = ItemAt(CurrentSelection(numItems)); numItems++) {
+		for (numItems = 0; BListItem* item = ItemAt(CurrentSelection(numItems));
+				numItems++) {
 			dragRect.bottom += ceilf(item->Height()) + 1.0;
 			if (dragRect.Height() > MAX_DRAG_HEIGHT) {
 				fade = true;
@@ -211,7 +214,8 @@
 				// let all selected items, that fit into our drag_bitmap, draw
 				for (int32 i = 0; i < numItems; i++) {
 					int32 index = CurrentSelection(i);
-					LanguageListItem* item = static_cast<LanguageListItem*>(ItemAt(index));
+					LanguageListItem* item =
+						static_cast<LanguageListItem*>(ItemAt(index));
 					itemBounds.bottom = itemBounds.top + ceilf(item->Height());
 					if (itemBounds.bottom > dragRect.bottom)
 						itemBounds.bottom = dragRect.bottom;
@@ -229,20 +233,25 @@
 				int32 bpr = dragBitmap->BytesPerRow();
 	
 				if (fade) {
-					for (int32 y = 0; y < height - ALPHA / 2; y++, bits += bpr) {
+					for (int32 y = 0; y < height - ALPHA / 2;
+							y++, bits += bpr) {
 						uint8 *line = bits + 3;
-						for (uint8 *end = line + 4 * width; line < end; line += 4)
+						for (uint8 *end = line + 4 * width; line < end;
+								line += 4)
 							*line = ALPHA;
 					}
-					for (int32 y = height - ALPHA / 2; y < height; y++, bits += bpr) {
+					for (int32 y = height - ALPHA / 2; y < height;
+							y++, bits += bpr) {
 						uint8 *line = bits + 3;
-						for (uint8 *end = line + 4 * width; line < end; line += 4)
+						for (uint8 *end = line + 4 * width; line < end;
+								line += 4)
 							*line = (height - y) << 1;
 					}
 				} else {
 					for (int32 y = 0; y < height; y++, bits += bpr) {
 						uint8 *line = bits + 3;
-						for (uint8 *end = line + 4 * width; line < end; line += 4)
+						for (uint8 *end = line + 4 * width; line < end;
+								line += 4)
 							*line = ALPHA;
 					}
 				}
@@ -290,7 +299,9 @@
 								r.bottom = r.top + 1.0;
 							} else {
 								r = Bounds();
-								r.bottom--;	// compensate for scrollbars moved slightly out of window
+								r.bottom--;
+									// compensate for scrollbars moved slightly
+									// out of window
 							}
 						} else {
 							BRect r = ItemFrame(fDropIndex);
@@ -340,7 +351,6 @@
 		// first list: available languages
 		LanguageListView *listView = new LanguageListView("available",
 			B_MULTIPLE_SELECTION_LIST);
-		listView->SetSelectionMessage(new BMessage(kMsgSelectLanguage));
 		BScrollView *scrollView = new BScrollView("scroller", listView, 
 			0, false, true, B_FANCY_BORDER);
 
@@ -355,7 +365,8 @@
 
 				// Now get an human-readable, loacalized name for each language
 				// TODO: sort them using collators.
-				Locale currentLocale = Locale::createFromName(currentLanguage.String());
+				Locale currentLocale =
+					Locale::createFromName(currentLanguage.String());
 				UnicodeString languageFullName;
 				BString str;
 				BStringByteSink bbs(&str);
@@ -375,40 +386,36 @@
 			myAlert->Go();
 		}
 
-		// buttons: Add, Remove, Move up, Move down, (clear)
-		// Actually I think it's simpler to use drag'n'drop
-		/*
-		BButton* addButton = new BButton("Add >");
-		BButton* removeButton = new BButton("Remove <");
-		BButton* upButton = new BButton("Move up ^");
-		BButton* downButton = new BButton("Move down v");
-		*/
-
 		// Second list: active languages
-		listView = new LanguageListView("preferred",
+		fPreferredListView = new LanguageListView("preferred",
 			B_MULTIPLE_SELECTION_LIST);
-		listView->SetSelectionMessage(new BMessage(kMsgSelectLanguage));
-		BScrollView *scrollViewEnabled = new BScrollView("scroller", listView, 
-			0, false, true, B_FANCY_BORDER);
+		BScrollView *scrollViewEnabled = new BScrollView("scroller",
+			fPreferredListView, 0, false, true, B_FANCY_BORDER);
 
+		// get the preferred languages from the Settings. Move them here from
+		// the other list.
+		BMessage msg;
+		be_locale_roster->GetPreferredLanguages(&msg);
+		BString langCode;
+		for(int index = 0; msg.FindString("language", index, &langCode) == B_OK;
+				index++) {
+			for(int listPos = 0; LanguageListItem* lli =
+					static_cast<LanguageListItem*>(listView->ItemAt(listPos)); 
+					listPos++) {
+				if(langCode == lli->getLanguageCode()) {
+					fPreferredListView->AddItem(lli);
+					listView->RemoveItem(lli);
+				}
+			}
+		}
+
 		tab->AddChild(BGroupLayoutBuilder(B_HORIZONTAL, 10)
 			.Add(BGroupLayoutBuilder(B_VERTICAL,10)
-				.Add(new BStringView("", "Available languages"))
+				.Add(new BStringView("", TR("Available languages")))
 				.Add(scrollView)
 			)
-			/*
 			.Add(BGroupLayoutBuilder(B_VERTICAL,10)
-				.AddGlue()
-				.Add(addButton)
-				.Add(removeButton)
-				.AddGlue()
-				.Add(upButton)
-				.Add(downButton)
-				.AddGlue()
-			)
-			*/
-			.Add(BGroupLayoutBuilder(B_VERTICAL,10)
-				.Add(new BStringView("", "Preferred languages"))
+				.Add(new BStringView("", TR("Preferred languages")))
 				.Add(scrollViewEnabled)
 			)
 		);
@@ -469,6 +476,12 @@
 {
 	BMessage update(kMsgSettingsChanged);
 	update.AddRect("window_frame", Frame());
+	int index = 0;
+	while (index < fPreferredListView->CountItems()) {
+		update.AddString("language",static_cast<LanguageListItem*>
+			(fPreferredListView->ItemAt(index))->getLanguageCode());
+		index++;
+	}
 	be_app_messenger.SendMessage(&update);
 
 	be_app_messenger.SendMessage(B_QUIT_REQUESTED);

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h	2009-08-03 14:54:22 UTC (rev 32079)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h	2009-08-03 15:02:55 UTC (rev 32080)
@@ -9,6 +9,7 @@
 #include <Window.h>
 
 class BButton;
+class BListView;
 
 
 class LocaleWindow : public BWindow {
@@ -20,6 +21,7 @@
 
 	private:
 		BButton*	fRevertButton;
+		BListView*	fPreferredListView;
 };
 
 #endif	/* LOCALE_WINDOW_H */

Copied: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/fr.catkeys (from rev 32056, haiku/branches/components/gsoc-locale-kit/src/preferences/locale/french.catkeys)
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/french.catkeys	2009-08-01 08:14:18 UTC (rev 32056)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/fr.catkeys	2009-08-03 15:02:55 UTC (rev 32080)
@@ -0,0 +1,11 @@
+1	fr	x-vnd.Haiku-Locale	2841580836
+Locale\n\twritten by Axel D?rfler\n\tCopyright 2005, Haiku.\n\n	Locale Preflet		Locale\n\t?crit par Axel D?rfler\n\tCopyright 2009, Haiku.\n\n
+Keyboard	Locale Preflet Window		Clavier
+Defaults	Locale Preflet Window		D?fauts
+Revert	Locale Preflet Window		D?faire
+Country	Locale Preflet Window		Pays
+Language	Locale Preflet Window		Langage
+Unable to find the available languages!You can't use this preflet!	Locale Preflet Window		La liste des langages disponibles est introuvable, ce preflet est donc inutilisable !
+Ok	Locale Preflet Window		Ok
+Available languages	Locale Preflet Window		Langues disponibles
+Preferred languages	Locale Preflet Window		Langues pr?f?r?es

Deleted: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/french.catkeys



From axeld at pinc-software.de  Mon Aug  3 17:04:11 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 03 Aug 2009 17:04:11 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32076_-_in_haiku/trunk=3A_headers/priv?=
 =?utf-8?q?ate/kernel/boot_src/system/boot/loader_src/system/boot/platform?=
 =?utf-8?q?/atari=5Fm68k_src/system/boot/platform/bios=5Fia32_src/system/b?=
 =?utf-8?q?oot/platform/openfirmware?=
In-Reply-To: <200908031439.n73Edl9Z004092@sheep.berlios.de>
Message-ID: <29088419254-BeMail@zon>

mmu_man at mail.berlios.de wrote:
> This should answer Axel's question :)

Yes, but it doesn't change my opinion about that code :-)
All settings should be changeable through the kernel settings file, 
anyway, so if you need sticky options, there is always an interface to 
be used.

Bye,
   Axel.



From revol at free.fr  Mon Aug  3 17:07:54 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Mon, 03 Aug 2009 17:07:54 +0200 CEST
Subject: [Haiku-commits] r32059 -
 haiku/trunk/src/system/boot/platform/bios_ia32
In-Reply-To: <28906793063-BeMail@zon>
Message-ID: <3633690168-BeMail@laptop>

> > > I can't imagine a single reason why we would want this in our 
> > > boot
> > > loader.
> > > Is there any benefit from using it?

In case you didn't see yet, the idea is to use it to pass args to an 
image from qemu, allowing to set stuff from outside, and for ex. 
automate tests or demos.

Fran?ois.


From revol at free.fr  Mon Aug  3 17:08:40 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Mon, 03 Aug 2009 17:08:40 +0200 CEST
Subject: [Haiku-commits] r32076 - in haiku/trunk:
 headers/private/kernel/boot src/system/boot/loader
 src/system/boot/platform/atari_m68k src/system/boot/platform/bios_ia32
 src/system/boot/platform/openfirmware
In-Reply-To: <29088419254-BeMail@zon>
Message-ID: <3679162470-BeMail@laptop>

> mmu_man at mail.berlios.de wrote:
> > This should answer Axel's question :)
> 
> Yes, but it doesn't change my opinion about that code :-)
> All settings should be changeable through the kernel settings file, 
> anyway, so if you need sticky options, there is always an interface 
> to 
> be used.

This means you must change the image each time...

Fran?ois.


From mmu_man at mail.berlios.de  Mon Aug  3 17:12:25 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Mon, 3 Aug 2009 17:12:25 +0200
Subject: [Haiku-commits] r32081 -
	haiku/trunk/src/system/boot/platform/openfirmware
Message-ID: <200908031512.n73FCPC1010165@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-03 17:12:24 +0200 (Mon, 03 Aug 2009)
New Revision: 32081
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32081&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/openfirmware/start.c
Log:
Implemented getting bootargs from OF. Untested.


Modified: haiku/trunk/src/system/boot/platform/openfirmware/start.c
===================================================================
--- haiku/trunk/src/system/boot/platform/openfirmware/start.c	2009-08-03 15:02:55 UTC (rev 32080)
+++ haiku/trunk/src/system/boot/platform/openfirmware/start.c	2009-08-03 15:12:24 UTC (rev 32081)
@@ -132,6 +132,8 @@
 void
 start(void *openFirmwareEntry)
 {
+	char bootargs[512];
+
 	// stage2 args - might be set via the command line one day
 	stage2_args args;
 	args.heap_size = HEAP_SIZE;
@@ -139,6 +141,13 @@
 
 	of_init(openFirmwareEntry);
 
+	// check for arguments
+	if (of_getprop(gChosen, "bootargs", bootargs, sizeof(bootargs)) != OF_FAILED) {
+		static const char *sArgs[] = { NULL, NULL };
+		sArgs[0] = (const char *)bootargs;
+		args.arguments = sArgs;
+	}
+
 	determine_machine();
 	console_init();
 



From axeld at mail.berlios.de  Mon Aug  3 17:21:25 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Mon, 3 Aug 2009 17:21:25 +0200
Subject: [Haiku-commits] r32082 - haiku/trunk/src/preferences/screen
Message-ID: <200908031521.n73FLPkj011420@sheep.berlios.de>

Author: axeld
Date: 2009-08-03 17:21:24 +0200 (Mon, 03 Aug 2009)
New Revision: 32082
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32082&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenWindow.cpp
Log:
* Added a tool tip for the monitor's capabilities.


Modified: haiku/trunk/src/preferences/screen/ScreenWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-03 15:12:24 UTC (rev 32081)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-03 15:21:24 UTC (rev 32082)
@@ -1111,6 +1111,17 @@
 
 	if (fMonitorInfo->IsHidden())
 		fMonitorInfo->Show();
+
+	if (info.min_horizontal_frequency != 0
+		&& info.min_vertical_frequency != 0
+		&& info.max_pixel_clock != 0) {
+		snprintf(text, sizeof(text), "Horizonal Frequency:\t%lu - %lu kHz\n"
+			"VerticalFrequency:\t%lu - %lu Hz\n\n"
+			"Maximum Pixel Clock:\t%g MHz", info.min_horizontal_frequency,
+			info.max_horizontal_frequency, info.min_vertical_frequency,
+			info.max_vertical_frequency, info.max_pixel_clock / 1000.0);
+		fMonitorView->SetToolTip(text);
+	}
 }
 
 



From dev at m-phasis.de  Mon Aug  3 17:24:58 2009
From: dev at m-phasis.de (Michael Weirauch)
Date: Mon, 3 Aug 2009 17:24:58 +0200
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
	headers/os/interface headers/private/binary_compatibility
	headers/private/interface src/kits/interface
	src/tests/kits/interface
In-Reply-To: <ba1cb1a80908030759i44544bf1x9081c24b87a981e@mail.gmail.com>
References: <200908031447.n73Elscv005496@sheep.berlios.de>
	<ba1cb1a80908030759i44544bf1x9081c24b87a981e@mail.gmail.com>
Message-ID: <ba1cb1a80908030824rdb5995asd023802bc74d53e7@mail.gmail.com>

Hi again,

starting BezillaBrowser or gvim on 32078 (VirtualBox) or 32080
(native) gives missing symbol error:
_ZN5BView15_ReservedView11Ev.

Seems related to this change. Anybody can confirm?

Greetings,
Michael


From mmu_man at mail.berlios.de  Mon Aug  3 18:03:04 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Mon, 3 Aug 2009 18:03:04 +0200
Subject: [Haiku-commits] r32083 - haiku/trunk/src/kits/interface
Message-ID: <200908031603.n73G34HQ019493@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-03 18:03:03 +0200 (Mon, 03 Aug 2009)
New Revision: 32083
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32083&view=rev

Modified:
   haiku/trunk/src/kits/interface/ControlLook.cpp
Log:
Fix a warning.


Modified: haiku/trunk/src/kits/interface/ControlLook.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ControlLook.cpp	2009-08-03 15:21:24 UTC (rev 32082)
+++ haiku/trunk/src/kits/interface/ControlLook.cpp	2009-08-03 16:03:03 UTC (rev 32083)
@@ -1534,6 +1534,7 @@
 					col2 = background;
 					break;
 				case 3:
+				default:
 					col1 = background;
 					col2 = light;
 					num = 0;



From axeld at mail.berlios.de  Mon Aug  3 18:08:37 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 3 Aug 2009 18:08:37 +0200
Subject: [Haiku-commits] r32084 - haiku/trunk/src/preferences/appearance
Message-ID: <200908031608.n73G8bu2020844@sheep.berlios.de>

Author: axeld
Date: 2009-08-03 18:08:36 +0200 (Mon, 03 Aug 2009)
New Revision: 32084
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32084&view=rev

Modified:
   haiku/trunk/src/preferences/appearance/ColorSet.cpp
Log:
* Build fix.


Modified: haiku/trunk/src/preferences/appearance/ColorSet.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/ColorSet.cpp	2009-08-03 16:03:03 UTC (rev 32083)
+++ haiku/trunk/src/preferences/appearance/ColorSet.cpp	2009-08-03 16:08:36 UTC (rev 32084)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -18,7 +18,7 @@
 #include "ColorSet.h"
 
 
-static ColorDescription sColorDescriptionTable[] = 
+static ColorDescription sColorDescriptionTable[] =
 {
 	{ B_PANEL_BACKGROUND_COLOR, "Panel Background" },
 	{ B_PANEL_TEXT_COLOR, "Panel Text" },
@@ -37,8 +37,8 @@
 	{ B_MENU_ITEM_TEXT_COLOR, "Menu Item Text" },
 	{ B_MENU_SELECTED_ITEM_TEXT_COLOR, "Selected Menu Item Text" },
 	{ B_MENU_SELECTED_BORDER_COLOR, "Selected Menu Item Border" },
-	{ B_TOOLTIP_BACKGROUND_COLOR, "Tooltip Background" },
-	{ B_TOOLTIP_TEXT_COLOR, "Tooltip Text" },
+	{ B_TOOL_TIP_BACKGROUND_COLOR, "Tooltip Background" },
+	{ B_TOOL_TIP_TEXT_COLOR, "Tooltip Text" },
 	{ B_SUCCESS_COLOR, "Success" },
 	{ B_FAILURE_COLOR, "Failure" },
 	{ B_WINDOW_TAB_COLOR, "Window Tab" },
@@ -49,7 +49,7 @@
 
 const int32 sColorDescriptionCount = sizeof(sColorDescriptionTable) / sizeof(ColorDescription);
 
-const ColorDescription* 
+const ColorDescription*
 get_color_description(int32 index)
 {
 	if (index < 0 || index >= sColorDescriptionCount)
@@ -117,8 +117,8 @@
 	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_TOOL_TIP_BACKGROUND_COLOR] = make_color(255, 255, 0);
+	set.fColors[B_TOOL_TIP_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);
@@ -129,7 +129,7 @@
 	return set;
 }
 
-	
+
 /*!
 	\brief Assigns a value to a named color member
 	\param string name of the color to receive the value



From revol at free.fr  Mon Aug  3 18:11:06 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Mon, 03 Aug 2009 18:11:06 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32078_-_in_haiku/trunk=3A_headers/os/a?=
 =?utf-8?q?pp_headers/os/interface_headers/private/binary=5Fcompatibility_?=
 =?utf-8?q?headers/private/interface_src/kits/interface_src/tests/kits/int?=
 =?utf-8?q?erface?=
In-Reply-To: <ba1cb1a80908030759i44544bf1x9081c24b87a981e@mail.gmail.com>
Message-ID: <202505291-BeMail@laptop>

> > Log:
> > * Added a basic tool tip API, and implementation.
> > * The BView API can probably be regarded as good enough; the 
> > implementation
> > ?might need to be improved over time (also, some things as 
> > archivability
> > ?aren't fully implemented yet). The ToolTip.h header should get 
> > public once
> > ?finalized.
> > * Added new B_MOUSE_IDLE message that is sent to a BView after a 
> > certain
> > ?time has passed (BToolTipManager::ShowDelay()).
> > * Added small test app (ToolTipTest) that shows what is already 
> > working.
> >
> 
> Fix for the renamed constants:
> 
> Index: src/preferences/appearance/ColorSet.cpp
> ===================================================================
> --- src/preferences/appearance/ColorSet.cpp	(Revision 32078)
> +++ src/preferences/appearance/ColorSet.cpp	(Arbeitskopie)
> @@ -37,8 +37,8 @@
>  	{ B_MENU_ITEM_TEXT_COLOR, "Menu Item Text" },
>  	{ B_MENU_SELECTED_ITEM_TEXT_COLOR, "Selected Menu Item Text" },
>  	{ B_MENU_SELECTED_BORDER_COLOR, "Selected Menu Item Border" },
> -	{ B_TOOLTIP_BACKGROUND_COLOR, "Tooltip Background" },
> -	{ B_TOOLTIP_TEXT_COLOR, "Tooltip Text" },
> +	{ B_TOOL_TIP_BACKGROUND_COLOR, "Tooltip Background" },
> +	{ B_TOOL_TIP_TEXT_COLOR, "Tooltip Text" },
>  	{ B_SUCCESS_COLOR, "Success" },
>  	{ B_FAILURE_COLOR, "Failure" },
>  	{ B_WINDOW_TAB_COLOR, "Window Tab" },
> @@ -117,8 +117,8 @@
>  	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_TOOL_TIP_BACKGROUND_COLOR] = make_color(255, 255, 0);
> +	set.fColors[B_TOOL_TIP_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);
> 

Why rename them anyway ?
This breaks Themes also.

Fran?ois.


From axeld at pinc-software.de  Mon Aug  3 18:12:19 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 03 Aug 2009 18:12:19 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32078_-_in_haiku/trunk=3A_headers/os/a?=
 =?utf-8?q?pp_headers/os/interface_headers/private/binary=5Fcompatibility_?=
 =?utf-8?q?headers/private/interface_src/kits/interface_src/tests/kits/int?=
 =?utf-8?q?erface?=
In-Reply-To: <ba1cb1a80908030759i44544bf1x9081c24b87a981e@mail.gmail.com>
Message-ID: <33176923349-BeMail@zon>

Michael Weirauch <dev at m-phasis.de> wrote:
> Fix for the renamed constants:

Thanks, I missed those!

Bye,
   Axel.



From axeld at pinc-software.de  Mon Aug  3 18:15:11 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 03 Aug 2009 18:15:11 +0200 CEST
Subject: [Haiku-commits] r32076 - in haiku/trunk:
 headers/private/kernel/boot src/system/boot/loader
 src/system/boot/platform/atari_m68k src/system/boot/platform/bios_ia32
 src/system/boot/platform/openfirmware
In-Reply-To: <3679162470-BeMail@laptop>
Message-ID: <33348910514-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> > mmu_man at mail.berlios.de wrote:
> > > This should answer Axel's question :)
> > Yes, but it doesn't change my opinion about that code :-)
> > All settings should be changeable through the kernel settings file, 
> > anyway, so if you need sticky options, there is always an interface 
> > to be used.
> This means you must change the image each time...

So what?
kernel settings are nothing you will have to change often or at all.

Bye,
   Axel.



From mmu_man at mail.berlios.de  Mon Aug  3 18:16:49 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Mon, 3 Aug 2009 18:16:49 +0200
Subject: [Haiku-commits] r32085 - haiku/trunk/3rdparty/mmu_man/themes
Message-ID: <200908031616.n73GGnNk023351@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-03 18:16:45 +0200 (Mon, 03 Aug 2009)
New Revision: 32085
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32085&view=rev

Modified:
   haiku/trunk/3rdparty/mmu_man/themes/UITheme.h
Log:
Fix Haiku build. WTF rename those anyway ???


Modified: haiku/trunk/3rdparty/mmu_man/themes/UITheme.h
===================================================================
--- haiku/trunk/3rdparty/mmu_man/themes/UITheme.h	2009-08-03 16:08:36 UTC (rev 32084)
+++ haiku/trunk/3rdparty/mmu_man/themes/UITheme.h	2009-08-03 16:16:45 UTC (rev 32085)
@@ -112,5 +112,9 @@
 #endif
 #endif
 
+#ifdef __HAIKU__
+#define B_TOOLTIP_BACKGROUND_COLOR B_TOOL_TIP_BACKGROUND_COLOR
+#define B_TOOLTIP_TEXT_COLOR B_TOOL_TIP_TEXT_COLOR
+#endif
 
 #endif /* _Z_UI_THEME_H */



From revol at free.fr  Mon Aug  3 18:20:08 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Mon, 03 Aug 2009 18:20:08 +0200 CEST
Subject: [Haiku-commits] r32076 - in haiku/trunk:
 headers/private/kernel/boot src/system/boot/loader
 src/system/boot/platform/atari_m68k src/system/boot/platform/bios_ia32
 src/system/boot/platform/openfirmware
In-Reply-To: <33348910514-BeMail@zon>
Message-ID: <744391145-BeMail@laptop>

> "Fran?ois Revol" <revol at free.fr> wrote:
> > > mmu_man at mail.berlios.de wrote:
> > > > This should answer Axel's question :)
> > > Yes, but it doesn't change my opinion about that code :-)
> > > All settings should be changeable through the kernel settings 
> > > file, 
> > > anyway, so if you need sticky options, there is always an 
> > > interface 
> > > to be used.
> > This means you must change the image each time...
> 
> So what?
> kernel settings are nothing you will have to change often or at all.

It's not so much about kernel settings.
More about passing args to the vm at boot time without requiring a 
change on the image.

Fran?ois.


From axeld at pinc-software.de  Mon Aug  3 18:22:22 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 03 Aug 2009 18:22:22 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32078_-_in_haiku/trunk=3A_headers/os/a?=
 =?utf-8?q?pp_headers/os/interface_headers/private/binary=5Fcompatibility_?=
 =?utf-8?q?headers/private/interface_src/kits/interface_src/tests/kits/int?=
 =?utf-8?q?erface?=
In-Reply-To: <ba1cb1a80908030824rdb5995asd023802bc74d53e7@mail.gmail.com>
Message-ID: <33779194933-BeMail@zon>

Michael Weirauch <dev at m-phasis.de> wrote:
> starting BezillaBrowser or gvim on 32078 (VirtualBox) or 32080
> (native) gives missing symbol error:
> _ZN5BView15_ReservedView11Ev.
> 
> Seems related to this change. Anybody can confirm?

It is related indeed - GCC4 software using BViews need to be 
recompiled, only the GCC2 compatibility is retained.

Bye,
   Axel.



From mmu_man at mail.berlios.de  Mon Aug  3 18:25:43 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Mon, 3 Aug 2009 18:25:43 +0200
Subject: [Haiku-commits] r32086 - haiku/trunk/src/bin
Message-ID: <200908031625.n73GPhWG025662@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-03 18:25:41 +0200 (Mon, 03 Aug 2009)
New Revision: 32086
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32086&view=rev

Modified:
   haiku/trunk/src/bin/safemode.c
Log:
Allow getting other safe mode settings than the default one, from command line.
Added a -s option to get the string value of the setting directly instead of interpreting it as bool.


Modified: haiku/trunk/src/bin/safemode.c
===================================================================
--- haiku/trunk/src/bin/safemode.c	2009-08-03 16:16:45 UTC (rev 32085)
+++ haiku/trunk/src/bin/safemode.c	2009-08-03 16:25:41 UTC (rev 32086)
@@ -14,11 +14,25 @@
 int
 main(int argc, char **argv)
 {
+	const char *optionName = B_SAFEMODE_SAFE_MODE;
+	bool realString = false;
 	char buffer[B_FILE_NAME_LENGTH];
 	size_t size = sizeof(buffer);
+	int i;
 
-	status_t status = _kern_get_safemode_option(B_SAFEMODE_SAFE_MODE, buffer, &size);
+	for (i = 1; i < argc; i++) {
+		if (!strcmp(argv[i], "-s"))
+			realString = true;
+		else
+			optionName = argv[i];
+	}
+
+	status_t status = _kern_get_safemode_option(optionName, buffer, &size);
 	if (status == B_OK) {
+		if (realString) {
+			puts(buffer);
+			return 0;
+		}
 		if (!strncasecmp(buffer, "true", size)
 			|| !strncasecmp(buffer, "yes", size)
 			|| !strncasecmp(buffer, "on", size)



From jackburton at mail.berlios.de  Mon Aug  3 18:50:05 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Mon, 3 Aug 2009 18:50:05 +0200
Subject: [Haiku-commits] r32087 - haiku/trunk/src/servers/app
Message-ID: <200908031650.n73Go5ZQ012985@sheep.berlios.de>

Author: jackburton
Date: 2009-08-03 18:50:01 +0200 (Mon, 03 Aug 2009)
New Revision: 32087
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32087&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/ServerWindow.h
Log:
Now also hide/show the cursor when BDirectWindow::SetFullScreen() is called.
in the handler, instead of checking if the window is an offscreen one,
check if fDirectWindowData is NULL, and do nothing if it's the case.
When setting a clip region in ServerPicture, also invalidate the clipping.
To do so, I added a public ServerWindoow::UpdateCurrentDrawingRegion()
which just calls the private function. Please review and see if it can
be done better. This fixes the problem with BPicture and the 
ConstrainClippingRegion() op (see ticket #1389)


Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2009-08-03 16:25:41 UTC (rev 32086)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2009-08-03 16:50:01 UTC (rev 32087)
@@ -477,6 +477,7 @@
 	for (uint32 c = 0; c < numRects; c++)
 		region.Include(rects[c]);
 	view->SetUserClipping(&region);
+	view->Window()->ServerWindow()->UpdateCurrentDrawingRegion();
 }
 
 

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2009-08-03 16:25:41 UTC (rev 32086)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2009-08-03 16:50:01 UTC (rev 32087)
@@ -1169,7 +1169,7 @@
 			link.Read<bool>(&enable);
 
 			status_t status = B_OK;
-			if (!fWindow->IsOffscreenWindow()) {
+			if (fDirectWindowData != NULL) {
 //fDesktop->UnlockSingleWindow();
 				_DirectWindowSetFullScreen(enable);	
 //fDesktop->LockSingleWindow();
@@ -3719,6 +3719,8 @@
 ServerWindow::_DirectWindowSetFullScreen(bool enable)
 {
 	if (enable) {
+		fDesktop->HWInterface()->SetCursorVisible(false);
+		
 		fDirectWindowData->old_window_frame = fWindow->Frame();
 		BRect screenFrame =
 			fDesktop->ActiveScreen()->Frame();
@@ -3737,7 +3739,9 @@
 			oldFrame.top - fWindow->Frame().top);
 		fDesktop->ResizeWindowBy(fWindow,
 			oldFrame.Width() - fWindow->Frame().Width(),
-			oldFrame.Height() - fWindow->Frame().Height());			
+			oldFrame.Height() - fWindow->Frame().Height());
+			
+		fDesktop->HWInterface()->SetCursorVisible(true);			
 	}
 
 	fDesktop->SetWindowFeel(fWindow,

Modified: haiku/trunk/src/servers/app/ServerWindow.h
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.h	2009-08-03 16:25:41 UTC (rev 32086)
+++ haiku/trunk/src/servers/app/ServerWindow.h	2009-08-03 16:50:01 UTC (rev 32087)
@@ -104,6 +104,9 @@
 
 			void				ResyncDrawState();
 
+						// TODO: Change this
+	inline	void				UpdateCurrentDrawingRegion() { _UpdateCurrentDrawingRegion(); };
+
 private:
 			View*				_CreateView(BPrivate::LinkReceiver &link,
 									View **_parent);
@@ -127,8 +130,9 @@
 
 			void				_SetCurrentView(View* view);
 			void				_UpdateDrawState(View* view);
+public:
 			void				_UpdateCurrentDrawingRegion();
-
+private:
 			bool				_MessageNeedsAllWindowsLocked(uint32 code) const;
 
 			void				_DirectWindowSetFullScreen(bool set);



From jackburton at mail.berlios.de  Mon Aug  3 18:53:13 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Mon, 3 Aug 2009 18:53:13 +0200
Subject: [Haiku-commits] r32088 - haiku/trunk/src/tests/kits/game/ParticlesII
Message-ID: <200908031653.n73GrDJG016902@sheep.berlios.de>

Author: jackburton
Date: 2009-08-03 18:53:04 +0200 (Mon, 03 Aug 2009)
New Revision: 32088
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32088&view=rev

Modified:
   haiku/trunk/src/tests/kits/game/ParticlesII/Jamfile
   haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp
Log:
Gcc4 fixes


Modified: haiku/trunk/src/tests/kits/game/ParticlesII/Jamfile
===================================================================
--- haiku/trunk/src/tests/kits/game/ParticlesII/Jamfile	2009-08-03 16:50:01 UTC (rev 32087)
+++ haiku/trunk/src/tests/kits/game/ParticlesII/Jamfile	2009-08-03 16:53:04 UTC (rev 32088)
@@ -2,6 +2,6 @@
 
 SimpleTest ParticlesII
 	: particlesII.cpp
-	: game be root
+	: game be root $(TARGET_LIBSUPC++)
 ;
 

Modified: haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp
===================================================================
--- haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp	2009-08-03 16:50:01 UTC (rev 32087)
+++ haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp	2009-08-03 16:53:04 UTC (rev 32088)
@@ -74,9 +74,11 @@
 							// 	app from ScreenConnected()
 };
 
+int
 main()
 {
 	NApplication app;
+	return 0;
 }
 
 NApplication::NApplication()
@@ -215,7 +217,7 @@
 			}
 			if((i>=192) && (i<256))
 			{
-				c1.red = 0i; // blues
+				c1.red = 0; // blues
 				c1.green = 0;
 				c1.blue = j*4;
 				c1.alpha = 255;



From superstippi at gmx.de  Mon Aug  3 21:18:08 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 03 Aug 2009 21:18:08 +0200
Subject: [Haiku-commits] r32076 - in haiku/trunk:
 headers/private/kernel/boot src/system/boot/loader
 src/system/boot/platform/atari_m68k src/system/boot/platform/bios_ia32
 src/system/boot/platform/openfirmware
In-Reply-To: <744391145-BeMail@laptop>
References: <744391145-BeMail@laptop>
Message-ID: <20090803211808.11774.7@bepc.1249297773.fake>


On 2009-08-03 at 18:20:08 [+0200], Fran?ois Revol <revol at free.fr> wrote:
> > "Fran?ois Revol" <revol at free.fr> wrote:
> > > > mmu_man at mail.berlios.de wrote:
> > > > > This should answer Axel's question :)
> > > > Yes, but it doesn't change my opinion about that code :-) All 
> > > > settings should be changeable through the kernel settings file, 
> > > > anyway, so if you need sticky options, there is always an interface 
> > > > to be used.
> > > This means you must change the image each time...
> > 
> > So what?
> > kernel settings are nothing you will have to change often or at all.
> 
> It's not so much about kernel settings.
> More about passing args to the vm at boot time without requiring a change 
> on the image.

For what it's worth, I see your point, Fran?ois. :-)

Best regards,
-Stephan


From leavengood at gmail.com  Mon Aug  3 19:25:25 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 3 Aug 2009 13:25:25 -0400
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
	headers/os/interface headers/private/binary_compatibility
	headers/private/interface src/kits/interface
	src/tests/kits/interface
In-Reply-To: <200908031447.n73Elscv005496@sheep.berlios.de>
References: <200908031447.n73Elscv005496@sheep.berlios.de>
Message-ID: <a4855ac50908031025r37b7311akd8d9ebda9dc123ad@mail.gmail.com>

On Mon, Aug 3, 2009 at 10:47 AM, <axeld at mail.berlios.de> wrote:
>
> * Added a basic tool tip API, and implementation.

Yay! Funny because I was just about to start investigating doing this
myself since I really wanted tool tips for the browser project.

-- 
Regards,
Ryan


From superstippi at gmx.de  Mon Aug  3 21:27:59 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 03 Aug 2009 21:27:59 +0200
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
 headers/os/interface headers/private/binary_compatibility
 headers/private/interface src/kits/interface src/tests/kits/interface
In-Reply-To: <a4855ac50908031025r37b7311akd8d9ebda9dc123ad@mail.gmail.com>
References: <200908031447.n73Elscv005496@sheep.berlios.de>
	<a4855ac50908031025r37b7311akd8d9ebda9dc123ad@mail.gmail.com>
Message-ID: <20090803212759.12001.8@bepc.1249297773.fake>


On 2009-08-03 at 19:25:25 [+0200], Ryan Leavengood <leavengood at gmail.com> 
wrote:
> On Mon, Aug 3, 2009 at 10:47 AM, <axeld at mail.berlios.de> wrote:
> >
> > * Added a basic tool tip API, and implementation.
> 
> Yay! Funny because I was just about to start investigating doing this 
> myself since I really wanted tool tips for the browser project.

Yes, this was desperately missing. Nice work, Axel (and Ingo).

Best regards,
-Stephan


From mmu_man at mail.berlios.de  Mon Aug  3 19:30:20 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Mon, 3 Aug 2009 19:30:20 +0200
Subject: [Haiku-commits] r32089 -
	haiku/trunk/src/add-ons/kernel/drivers/ports
Message-ID: <200908031730.n73HUKJj000813@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-03 19:30:18 +0200 (Mon, 03 Aug 2009)
New Revision: 32089
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32089&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/ports/Jamfile
Log:
Add pc_serial to the build. No, it's not yet usable in Haiku.


Modified: haiku/trunk/src/add-ons/kernel/drivers/ports/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/ports/Jamfile	2009-08-03 16:53:04 UTC (rev 32088)
+++ haiku/trunk/src/add-ons/kernel/drivers/ports/Jamfile	2009-08-03 17:30:18 UTC (rev 32089)
@@ -1,3 +1,4 @@
 SubDir HAIKU_TOP src add-ons kernel drivers ports ; 
 
+SubInclude HAIKU_TOP src add-ons kernel drivers ports pc_serial ;
 SubInclude HAIKU_TOP src add-ons kernel drivers ports usb_serial ;



From revol at free.fr  Mon Aug  3 19:31:18 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Mon, 03 Aug 2009 19:31:18 +0200 CEST
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
 headers/os/interface headers/private/binary_compatibility
 headers/private/interface src/kits/interface src/tests/kits/interface
In-Reply-To: <20090803212759.12001.8@bepc.1249297773.fake>
Message-ID: <2284837054-BeMail@laptop>

> 
> On 2009-08-03 at 19:25:25 [+0200], Ryan Leavengood <
> leavengood at gmail.com> 
> wrote:
> > On Mon, Aug 3, 2009 at 10:47 AM, <axeld at mail.berlios.de> wrote:
> > >
> > > * Added a basic tool tip API, and implementation.
> > 
> > Yay! Funny because I was just about to start investigating doing 
> > this 
> > myself since I really wanted tool tips for the browser project.
> 
> Yes, this was desperately missing. Nice work, Axel (and Ingo).

Indeed, though I still can't get why he renamed the uicolors :P

Fran?ois.


From leavengood at gmail.com  Mon Aug  3 19:52:16 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 3 Aug 2009 13:52:16 -0400
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
	headers/os/interface headers/private/binary_compatibility
	headers/private/interface src/kits/interface
	src/tests/kits/interface
In-Reply-To: <2284837054-BeMail@laptop>
References: <20090803212759.12001.8@bepc.1249297773.fake>
	<2284837054-BeMail@laptop>
Message-ID: <a4855ac50908031052s445ac9bq43e90781ba9f53f0@mail.gmail.com>

On Mon, Aug 3, 2009 at 1:31 PM, Fran?ois Revol<revol at free.fr> wrote:
>
> Indeed, though I still can't get why he renamed the uicolors :P

Consistency I would think: tool tip is two words and all the other
constants are split on words. Plus since the API is new, no one should
really have been using those constants, at least in Haiku. I don't
know if they were carried over from Zeta or something...

-- 
Regards,
Ryan


From bga at bug-br.org.br  Mon Aug  3 19:52:38 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Mon, 03 Aug 2009 14:52:38 -0300
Subject: [Haiku-commits] r32078 - in haiku/trunk:
 headers/os/app	headers/os/interface
 headers/private/binary_compatibility	headers/private/interface
 src/kits/interface src/tests/kits/interface
In-Reply-To: <a4855ac50908031025r37b7311akd8d9ebda9dc123ad@mail.gmail.com>
References: <200908031447.n73Elscv005496@sheep.berlios.de>
	<a4855ac50908031025r37b7311akd8d9ebda9dc123ad@mail.gmail.com>
Message-ID: <4A7723E6.1000509@bug-br.org.br>

Ryan Leavengood wrote:

>> * Added a basic tool tip API, and implementation.
> 
> Yay! Funny because I was just about to start investigating doing this
> myself since I really wanted tool tips for the browser project.

BTW, Tooltip (without spaces) is a well recognized name (for example: 
http://en.wikipedia.org/wiki/Tooltip). Changing the name of the contants 
from *TOOLTIP* to *TOOL_TIP* does not make much sense (and, as Fran?ois 
pointed out, has the potential to break things). Other than that, 
tooltips are an welcome addition. In fact, maybe we should automatically 
add one to text that is automatically truncated and have ellipsis added? 
The tooltip would have the full text.

-Bruno


From bga at bug-br.org.br  Mon Aug  3 19:56:17 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Mon, 03 Aug 2009 14:56:17 -0300
Subject: [Haiku-commits] r32078 - in haiku/trunk:
 headers/os/app	headers/os/interface
 headers/private/binary_compatibility	headers/private/interface
 src/kits/interface src/tests/kits/interface
In-Reply-To: <a4855ac50908031052s445ac9bq43e90781ba9f53f0@mail.gmail.com>
References: <20090803212759.12001.8@bepc.1249297773.fake>	<2284837054-BeMail@laptop>
	<a4855ac50908031052s445ac9bq43e90781ba9f53f0@mail.gmail.com>
Message-ID: <4A7724C1.1030400@bug-br.org.br>

Ryan Leavengood wrote:

>> Indeed, though I still can't get why he renamed the uicolors :P
> 
> Consistency I would think: tool tip is two words and all the other
> constants are split on words. Plus since the API is new, no one should
> really have been using those constants, at least in Haiku. I don't
> know if they were carried over from Zeta or something...

Actually, tooltip is one word, as I pointed out in the previous email. 
One must not forget that languages are dynamic. :)

-Bruno


From zooey at mail.berlios.de  Mon Aug  3 19:59:05 2009
From: zooey at mail.berlios.de (zooey at BerliOS)
Date: Mon, 3 Aug 2009 19:59:05 +0200
Subject: [Haiku-commits] r32090 - haiku/trunk/src/kits/interface
Message-ID: <200908031759.n73Hx5vd032450@sheep.berlios.de>

Author: zooey
Date: 2009-08-03 19:59:04 +0200 (Mon, 03 Aug 2009)
New Revision: 32090
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32090&view=rev

Modified:
   haiku/trunk/src/kits/interface/ListView.cpp
Log:
small cleanup in ListView:
* avoid setting fAnchorIndex multiple times in certain situations

Modified: haiku/trunk/src/kits/interface/ListView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ListView.cpp	2009-08-03 17:30:18 UTC (rev 32089)
+++ haiku/trunk/src/kits/interface/ListView.cpp	2009-08-03 17:59:04 UTC (rev 32090)
@@ -414,7 +414,7 @@
 	bool extend
 		= fListType == B_MULTIPLE_SELECTION_LIST
 			&& (modifiers() & B_SHIFT_KEY) != 0;
-	
+
 	switch (bytes[0]) {
 		case B_UP_ARROW:
 		{
@@ -424,7 +424,7 @@
 			} else {
 				if (fAnchorIndex > 0) {
 					if (!extend || fAnchorIndex <= fFirstSelected)
-						Select(--fAnchorIndex, extend);
+						Select(fAnchorIndex - 1, extend);
 					else
 						Deselect(fAnchorIndex--);
 				}
@@ -441,7 +441,7 @@
 			} else {
 				if (fAnchorIndex < CountItems() - 1) {
 					if (!extend || fAnchorIndex >= fLastSelected)
-						Select(++fAnchorIndex, extend);
+						Select(fAnchorIndex + 1, extend);
 					else
 						Deselect(fAnchorIndex++);
 				}
@@ -452,19 +452,19 @@
 		}
 
 		case B_HOME:
-			if (extend)
+			if (extend) {
 				Select(0, fAnchorIndex, true);
-			else
+				fAnchorIndex = 0;
+			} else
 				Select(0, false);
-			fAnchorIndex = 0;
 			ScrollToSelection();
 			break;
 		case B_END:
-			if (extend)
+			if (extend) {
 				Select(fAnchorIndex, CountItems() - 1, true);
-			else
+				fAnchorIndex = CountItems() - 1;
+			} else
 				Select(CountItems() - 1, false);
-			fAnchorIndex = CountItems() - 1;
 			ScrollToSelection();
 			break;
 
@@ -1426,12 +1426,11 @@
 
 	bool changed = false;
 
-	if (!extend) {
-		fAnchorIndex = index;
-		if (fFirstSelected != -1)
-			changed = _DeselectAll(index, index);
-	}
+	if (!extend && fFirstSelected != -1)
+		changed = _DeselectAll(index, index);
 
+	fAnchorIndex = index;
+
 	BListItem* item = ItemAt(index);
 	if (!item->IsEnabled() || item->IsSelected()) {
 		// if the item is already selected, or can't be selected,



From mattmadia at gmail.com  Mon Aug  3 20:02:13 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Mon, 3 Aug 2009 18:02:13 +0000
Subject: [Haiku-commits] r32086 - haiku/trunk/src/bin
In-Reply-To: <200908031625.n73GPhWG025662@sheep.berlios.de>
References: <200908031625.n73GPhWG025662@sheep.berlios.de>
Message-ID: <1e42d8c50908031102n58b02e83qf544bba340054296@mail.gmail.com>

On Mon, Aug 3, 2009 at 16:25, <mmu_man at mail.berlios.de> wrote:
> Modified:
>   haiku/trunk/src/bin/safemode.c
> Log:
> Allow getting other safe mode settings than the default one, from command line.
> Added a -s option to get the string value of the setting directly instead of interpreting it as bool.

x86gcc2 - broken

AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/random
/haiku-src/haiku/haiku/src/bin/safemode.c: In function `main':
/haiku-src/haiku/haiku/src/bin/safemode.c:30: parse error before `status'
/haiku-src/haiku/haiku/src/bin/safemode.c:31: `status' undeclared
(first use in this function)
/haiku-src/haiku/haiku/src/bin/safemode.c:31: (Each undeclared
identifier is reported only once
/haiku-src/haiku/haiku/src/bin/safemode.c:31: for each function it appears in.)
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/tty
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/zero
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/audio/hmulti/auich

/haiku-src/haiku/haiku/generated.x86gcc2/cross-tools/bin/i586-pc-haiku-gcc
-O -Wall -Wno-trigraphs -Wmissing-prototypes -Wpointer-arith
-Wcast-align -Wsign-compare -Wno-multichar -pipe -nostdinc -c
"/haiku-src/haiku/haiku/src/bin/safemode.c" -D__HAIKU__
-DHAIKU_DISTRO_COMPATIBILITY_DEFAULT -D__INTEL__ -DARCH_x86
-DBOOT_ARCHIVE_IMAGE_OFFSET=300 -D_BEOS_R5_COMPATIBLE_
-DHAIKU_TARGET_PLATFORM_HAIKU
-I/haiku-src/haiku/haiku/build/user_config_headers
-I/haiku-src/haiku/haiku/build/config_headers
-I/haiku-src/haiku/haiku/src/bin
-I/haiku-src/haiku/haiku/generated.x86gcc2/objects/common/bin
-I/haiku-src/haiku/haiku/generated.x86gcc2/objects/freebsd/x86/common/bin
-I/haiku-src/haiku/haiku/generated.x86gcc2/objects/haiku/x86/common/bin
-I/haiku-src/haiku/haiku/src/add-ons/kernel/file_cache -I-
-I/haiku-src/haiku/haiku/headers/private/app
-I/haiku-src/haiku/haiku/headers/private/shared
-I/haiku-src/haiku/haiku/headers/private/storage
-I/haiku-src/haiku/haiku/headers/private/support
-I/haiku-src/haiku/haiku/headers/private/usb
-I/haiku-src/haiku/haiku/headers/private/.
-I/haiku-src/haiku/haiku/headers/private/system
-I/haiku-src/haiku/haiku/headers/private/system/arch/x86
-I/haiku-src/haiku/haiku/headers/libs/ncurses
-I/haiku-src/haiku/haiku/headers/cpp
-I/haiku-src/haiku/haiku/headers/build/gcc-2.95.3
-I/haiku-src/haiku/haiku/headers
-I/haiku-src/haiku/haiku/headers/posix
-I/haiku-src/haiku/haiku/headers/gnu
-I/haiku-src/haiku/haiku/headers/glibc
-I/haiku-src/haiku/haiku/headers/os
-I/haiku-src/haiku/haiku/headers/os/add-ons
-I/haiku-src/haiku/haiku/headers/os/add-ons/file_system
-I/haiku-src/haiku/haiku/headers/os/add-ons/graphics
-I/haiku-src/haiku/haiku/headers/os/add-ons/input_server
-I/haiku-src/haiku/haiku/headers/os/add-ons/registrar
-I/haiku-src/haiku/haiku/headers/os/add-ons/screen_saver
-I/haiku-src/haiku/haiku/headers/os/add-ons/tracker
-I/haiku-src/haiku/haiku/headers/os/app
-I/haiku-src/haiku/haiku/headers/os/device
-I/haiku-src/haiku/haiku/headers/os/drivers
-I/haiku-src/haiku/haiku/headers/os/game
-I/haiku-src/haiku/haiku/headers/os/interface
-I/haiku-src/haiku/haiku/headers/os/kernel
-I/haiku-src/haiku/haiku/headers/os/media
-I/haiku-src/haiku/haiku/headers/os/mail
-I/haiku-src/haiku/haiku/headers/os/midi
-I/haiku-src/haiku/haiku/headers/os/midi2
-I/haiku-src/haiku/haiku/headers/os/net
-I/haiku-src/haiku/haiku/headers/os/opengl
-I/haiku-src/haiku/haiku/headers/os/storage
-I/haiku-src/haiku/haiku/headers/os/support
-I/haiku-src/haiku/haiku/headers/os/translation
-I/haiku-src/haiku/haiku/headers/private/. -o
"/haiku-src/haiku/haiku/generated.x86gcc2/objects/haiku/x86/release/bin/safemode.o"
;

...failed Cc /haiku-src/haiku/haiku/generated.x86gcc2/objects/haiku/x86/release/bin/safemode.o
...
...skipped safemode for lack of <src!bin>safemode.o...
...skipped <HaikuImage>haiku.image-copy-files-dummy-system/bin for
lack of safemode...
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/audio/hmulti/auvia
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/audio/hmulti/echo3g
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/audio/hmulti/emuxki
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/audio/hmulti/hda
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/midi/emuxki
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/midi/usb_midi
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/bus/usb_raw
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/bus/fw_raw
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/disk/floppy/pc_floppy
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/disk/usb/usb_disk
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/disk/virtual/nbd
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/dvb/cx23882
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/graphics/radeon
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/graphics/nvidia
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/graphics/neomagic
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/graphics/matrox
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/graphics/intel_extreme
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/graphics/s3
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/graphics/vesa
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/graphics/ati
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/input/ps2_hid
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/input/usb_hid
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/input/wacom
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/misc/poke
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/misc/test
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/misc/mem
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/3com
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/broadcom440x
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/broadcom570x
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/etherpci
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/ipro1000
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/pegasus
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/rtl8139
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/rtl8169
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/rtl81xx
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/sis900
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/via_rhine
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/wb840
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/ipro100
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/nforce
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/marvell_yukon
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/syskonnect
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/attansic_l2
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/ar81xx
AddSymlinkToContainerCopyFilesScript
<HaikuImage>system/add-ons/kernel/drivers/dev/net/usb_ecm
AppendToContainerCopyFilesScript
<HaikuImage>haiku.image-copy-files-dummy-system
AppendToContainerCopyFilesScript
<HaikuImage>haiku.image-copy-files-dummy-system/lib
AddSymlinkToContainerCopyFilesScript <HaikuImage>system/lib/libsocket.so
AddSymlinkToContainerCopyFilesScript <HaikuImage>system/lib/libbind.so
AddSymlinkToContainerCopyFilesScript <HaikuImage>system/lib/libnet.so
AddSymlinkToContainerCopyFilesScript <HaikuImage>system/lib/libnetapi.so
AddSymlinkToContainerCopyFilesScript <HaikuImage>system/lib/libGLU.so
AddSymlinkToContainerCopyFilesScript <HaikuImage>system/lib/libglut.so
AppendToContainerCopyFilesScript
<HaikuImage>haiku.image-copy-files-dummy-system/servers
...skipped haiku-alpha.image for lack of <HaikuImage>haiku.image-copy-files...
...failed updating 1 target(s)...
...skipped 3 target(s)...
...updated 86 target(s)...
jam -q -j2 @alpha-raw


From superstippi at gmx.de  Mon Aug  3 22:05:33 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 03 Aug 2009 22:05:33 +0200
Subject: [Haiku-commits] r32090 - haiku/trunk/src/kits/interface
In-Reply-To: <200908031759.n73Hx5vd032450@sheep.berlios.de>
References: <200908031759.n73Hx5vd032450@sheep.berlios.de>
Message-ID: <20090803220533.15141.10@bepc.1249297773.fake>


On 2009-08-03 at 19:59:05 [+0200], zooey at BerliOS <zooey at mail.berlios.de> 
wrote:
> Author: zooey
> Date: 2009-08-03 19:59:04 +0200 (Mon, 03 Aug 2009) New Revision: 32090
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32090&view=rev
> 
> Modified:
>    haiku/trunk/src/kits/interface/ListView.cpp
> Log:
> small cleanup in ListView:
> * avoid setting fAnchorIndex multiple times in certain situations

BTW, I don't know which revision broke this, but when I delete a mail in 
Beam, the mail below the one I deleted is automatically selected. Then when 
I want to move up to the next mail, I have to press "up" two times. The 
first time has no effect. I think it's something recent.

Best regards,
-Stephan


From mmu_man at mail.berlios.de  Mon Aug  3 20:10:46 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Mon, 3 Aug 2009 20:10:46 +0200
Subject: [Haiku-commits] r32091 - haiku/trunk/src/bin
Message-ID: <200908031810.n73IAkqW003285@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-03 20:10:45 +0200 (Mon, 03 Aug 2009)
New Revision: 32091
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32091&view=rev

Modified:
   haiku/trunk/src/bin/safemode.c
Log:
C89, should fix gcc2 build.


Modified: haiku/trunk/src/bin/safemode.c
===================================================================
--- haiku/trunk/src/bin/safemode.c	2009-08-03 17:59:04 UTC (rev 32090)
+++ haiku/trunk/src/bin/safemode.c	2009-08-03 18:10:45 UTC (rev 32091)
@@ -18,6 +18,7 @@
 	bool realString = false;
 	char buffer[B_FILE_NAME_LENGTH];
 	size_t size = sizeof(buffer);
+	status_t status;
 	int i;
 
 	for (i = 1; i < argc; i++) {
@@ -27,7 +28,7 @@
 			optionName = argv[i];
 	}
 
-	status_t status = _kern_get_safemode_option(optionName, buffer, &size);
+	status = _kern_get_safemode_option(optionName, buffer, &size);
 	if (status == B_OK) {
 		if (realString) {
 			puts(buffer);



From kirilla at mail.berlios.de  Mon Aug  3 20:17:16 2009
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Mon, 3 Aug 2009 20:17:16 +0200
Subject: [Haiku-commits] r32092 - haiku/trunk/src/add-ons/tracker/zipomatic
Message-ID: <200908031817.n73IHGYN005001@sheep.berlios.de>

Author: kirilla
Date: 2009-08-03 20:17:14 +0200 (Mon, 03 Aug 2009)
New Revision: 32092
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32092&view=rev

Modified:
   haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
   haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMatic.h
   haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticMisc.h
   haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
   haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticWindow.h
   haiku/trunk/src/add-ons/tracker/zipomatic/ZipperThread.cpp
   haiku/trunk/src/add-ons/tracker/zipomatic/ZipperThread.h
Log:
Have the application do a single BAlert on a BApplication::QuitRequested()-event in multi-window situations. Move reading/writing of settings from window to application. Cascade-offset the most recent window when they collide.

Modified: haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
===================================================================
--- haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMatic.cpp	2009-08-03 18:10:45 UTC (rev 32091)
+++ haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMatic.cpp	2009-08-03 18:17:14 UTC (rev 32092)
@@ -4,7 +4,9 @@
 
 #include "ZipOMatic.h"
 
+#include <Alert.h>
 #include <Roster.h>
+#include <Screen.h>
 #include <TrackerAddOn.h>
 
 #include "ZipOMaticMisc.h"
@@ -39,15 +41,24 @@
 ZipOMatic::ZipOMatic()
 	:
 	BApplication(ZIPOMATIC_APP_SIG),
-	fGotRefs(false)
+	fSettings(),
+	fGotRefs(false),
+	fInvoker(new BInvoker(new BMessage(ZIPPO_QUIT_OR_CONTINUE), NULL, this)),
+	fWindowFrame(200, 200, 430, 310)
 {
-
+	status_t status = _ReadSettings();
+	
+	if (status != B_OK)
+		ErrorMessage("_ReadSettings()", status);	
 }
 
 
 ZipOMatic::~ZipOMatic()
 {
-
+	status_t status = _WriteSettings();
+	
+	if (status != B_OK)
+		ErrorMessage("_WriteSettings()", status);
 }
 
 
@@ -76,15 +87,32 @@
 {
 	switch (message->what) {
 		case ZIPPO_WINDOW_QUIT:
+		{
+			BRect frame;
+			if (message->FindRect("frame", &frame) == B_OK)
+				fWindowFrame = frame;
 			snooze(200000);
 			if (CountWindows() == 0)
 				Quit();
 			break;
-					
+		}
 		case B_SILENT_RELAUNCH:
 			_SilentRelaunch();
 			break;
 
+		case ZIPPO_QUIT_OR_CONTINUE:
+		{
+			int32 button;
+			if (message->FindInt32("which", &button) == B_OK)
+				if (button == 0) {
+					_StopZipping();
+				} else  {
+					if (CountWindows() == 0)
+						Quit();
+				}
+			break;
+		}
+
 		default:
 			BApplication::MessageReceived(message);
 			break;			
@@ -95,34 +123,74 @@
 bool
 ZipOMatic::QuitRequested  (void)
 {
-	// Overriding BApplication's default behaviour on purpose
-	// so we can have multiple zippers pause in unison.
-	
 	if (CountWindows() <= 0)
 		return true;
 	
-	BList list(5);
 	BWindow* window;
+	ZippoWindow* zippo;
+	ZippoWindow* lastFoundZippo;
+	int32 zippoCount = 0;
 	
 	for (int32 i = 0;; i++) {
-		window =  WindowAt(i);
+		window = WindowAt(i);
 		if (window == NULL)
 			break;
-			
-		list.AddItem(window);
+		
+		zippo = dynamic_cast<ZippoWindow*>(window);
+		if (zippo == NULL)
+			continue;
+		
+		lastFoundZippo = zippo;
+		
+		if (zippo->Lock()) {
+			if (zippo->IsZipping())
+				zippoCount++;
+			else
+				zippo->PostMessage(B_QUIT_REQUESTED);
+				
+			zippo->Unlock();
+		}
 	}
 	
-	while (true) {
-		window = (BWindow*) list.RemoveItem(int32(0));
-		if (window == NULL)
-			break;
-		
-		if (window->Lock()) {
-			window->PostMessage(B_QUIT_REQUESTED);
-			window->Unlock();
+	if (zippoCount == 1) {
+		// This is likely the most frequent case - a single zipper.
+		// We post a message to the window so it can put up its own
+		// BAlert instead of the app-wide BAlert. This avoids making
+		// a difference between having pressed Commmand-W or Command-Q.
+		// Closing or quitting, it doesn't matter for a single window.
+
+		if (lastFoundZippo->Lock()) {
+			lastFoundZippo->Activate();
+			lastFoundZippo->PostMessage(B_QUIT_REQUESTED);
+			lastFoundZippo->Unlock();
 		}
+		return false;
 	}
 
+	if (zippoCount > 0) {
+		// The multi-zipper case differs from the single-zipper case
+		// in that zippers are not paused while the BAlert is up.
+
+		BString question;
+		question << "You have " << zippoCount;
+		question << " Zip-O-Matic running.\n\nDo you want to stop them?";
+
+		BAlert* alert = new BAlert("Stop or Continue", question.String(),
+			"Stop them", "Let them continue", NULL, B_WIDTH_AS_USUAL,
+			B_WARNING_ALERT);
+		alert->Go(fInvoker);
+		alert->Activate();
+			// BAlert, being modal, does not show on the current workspace
+			// if the application has no window there. Activate() triggers
+			// a switch to a workspace where it does have a window.
+			
+			// TODO: See if AS_ACTIVATE_WINDOW should be handled differently
+			// in src/servers/app/Desktop.cpp Desktop::ActivateWindow()
+			// or if maybe BAlert should (and does not?) activate itself.
+			
+		return false;
+	}
+
 	if (CountWindows() <= 0)
 		return true;
 	
@@ -154,6 +222,7 @@
 				foundNonBusyWindow = true;
 				if (message != NULL)
 					window->PostMessage(message);
+				window->SetWorkspaces(B_CURRENT_WORKSPACE);
 				window->Activate();
 				window->Unlock();
 				break;
@@ -164,8 +233,143 @@
 	
 	if (!foundNonBusyWindow)
 	{
-		ZippoWindow * window = new ZippoWindow(message);
+		BScreen screen;
+		fWindowFrame.OffsetBy(screen.Frame().LeftTop());
+		
+		_CascadeOnFrameCollision(&fWindowFrame);
+		if(!screen.Frame().Contains(fWindowFrame)) {
+			fWindowFrame.OffsetTo(screen.Frame().LeftTop());
+			fWindowFrame.OffsetBy(20,45);
+				// TODO: replace with CenterOnScreen()
+		}
+		
+		ZippoWindow * window = new ZippoWindow(fWindowFrame, message);
 		window->Show();
 	}
 }
 
+
+void
+ZipOMatic::_StopZipping()
+{
+	BWindow* window;
+	ZippoWindow* zippo;
+	BList list;
+	
+	for (int32 i = 0;; i++) {
+		window = WindowAt(i);
+		if (window == NULL)
+			break;
+		
+		zippo = dynamic_cast<ZippoWindow*>(window);
+		if (zippo == NULL)
+			continue;
+		
+		list.AddItem(zippo);
+	}
+
+	for (int32 i = 0;; i++) {
+		zippo = static_cast<ZippoWindow*>(list.ItemAt(i));
+		if (zippo == NULL)
+			break;
+
+		if (zippo->Lock()) {
+			if (zippo->IsZipping())
+				zippo->StopZipping();
+
+			zippo->PostMessage(B_QUIT_REQUESTED);
+			zippo->Unlock();
+		}
+	}	
+}
+
+
+status_t
+ZipOMatic::_ReadSettings()
+{
+	status_t status = B_OK;
+	
+	status = fSettings.SetTo("zipomatic.msg");
+	if (status != B_OK)
+		return status;
+
+	status = fSettings.InitCheck();
+	if (status != B_OK)
+		return status;
+
+	status = fSettings.InitCheck();
+	if (status != B_OK)
+		return status;
+
+	status = fSettings.ReadSettings();
+	if (status != B_OK)
+		return status;
+
+	BRect frame;
+	status = fSettings.FindRect("frame", &frame);
+	if (status != B_OK)
+		return status;
+	
+	fWindowFrame = frame;
+	
+	return B_OK;
+}
+
+
+status_t
+ZipOMatic::_WriteSettings()
+{
+	status_t status = B_OK;
+
+	status = fSettings.InitCheck();
+	if (status != B_OK)
+		return status;
+
+	status = fSettings.MakeEmpty();
+	if (status != B_OK)
+		return status;
+
+	status = fSettings.AddRect("frame", fWindowFrame);
+	if (status != B_OK)
+		return status;
+	
+	status = fSettings.WriteSettings();
+	if (status != B_OK)
+		return status;
+	
+	return B_OK;
+}
+
+
+void
+ZipOMatic::_CascadeOnFrameCollision(BRect* frame)
+{
+	BWindow* window;
+	ZippoWindow* zippo;
+	BList list;
+	
+	for (int32 i = 0;; i++) {
+		window = WindowAt(i);
+		if (window == NULL)
+			break;
+		
+		zippo = dynamic_cast<ZippoWindow*>(window);
+		if (zippo == NULL)
+			continue;
+		
+		list.AddItem(zippo);
+	}
+
+	for (int32 i = 0;; i++) {
+		zippo = static_cast<ZippoWindow*>(list.ItemAt(i));
+		if (zippo == NULL)
+			break;
+
+		if (zippo->Lock()) {
+			if (frame->LeftTop() == zippo->Frame().LeftTop())
+				frame->OffsetBy(20, 20);
+			zippo->Unlock();
+		}
+	}	
+}
+

Modified: haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMatic.h
===================================================================
--- haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMatic.h	2009-08-03 18:10:45 UTC (rev 32091)
+++ haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMatic.h	2009-08-03 18:17:14 UTC (rev 32092)
@@ -3,9 +3,13 @@
 
 
 #include <Application.h>
+#include <Invoker.h>
 #include <Message.h>
+#include <Rect.h>
 
+#include "ZipOMaticSettings.h"
 
+
 class ZipOMatic : public BApplication
 {
 public:
@@ -18,11 +22,18 @@
 	virtual	bool			QuitRequested();
 	
 private:
+			status_t		_ReadSettings();
+			status_t		_WriteSettings();
+			void			_CascadeOnFrameCollision(BRect* frame);
 			void			_SilentRelaunch();
 			void			_UseExistingOrCreateNewWindow(BMessage*
 								message = NULL);
+			void			_StopZipping();
 
+			ZippoSettings	fSettings;
 			bool			fGotRefs;
+			BInvoker*		fInvoker;
+			BRect			fWindowFrame;
 };
 
 #endif // _ZIPOMATIC_H_

Modified: haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticMisc.h
===================================================================
--- haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticMisc.h	2009-08-03 18:10:45 UTC (rev 32091)
+++ haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticMisc.h	2009-08-03 18:17:14 UTC (rev 32092)
@@ -18,6 +18,11 @@
 #define ZIPOMATIC_APP_SIG		"application/x-vnd.haiku.zip-o-matic"
 
 #define ZIPPO_WINDOW_QUIT		'winq'
+#define ZIPPO_QUIT_OR_CONTINUE	'alrt'
+#define ZIPPO_THREAD_EXIT		'exit'
+#define ZIPPO_THREAD_EXIT_ERROR	'exrr'
+#define ZIPPO_TASK_DESCRIPTION	'strt'
+#define ZIPPO_LINE_OF_STDOUT	'outp'
 
 status_t	FindAndCreateDirectory(directory_which which,
 				BVolume* volume = NULL, const char* relativePath = NULL,

Modified: haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
===================================================================
--- haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp	2009-08-03 18:10:45 UTC (rev 32091)
+++ haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp	2009-08-03 18:17:14 UTC (rev 32092)
@@ -28,39 +28,26 @@
 #include "ZipperThread.h"
 
 
-ZippoWindow::ZippoWindow(BMessage* message)
+ZippoWindow::ZippoWindow(BRect frame, BMessage* refs)
 	:
-	BWindow(BRect(200, 200, 430, 310), "Zip-O-Matic", B_TITLED_WINDOW,
-		B_NOT_V_RESIZABLE),
+	BWindow(frame, "Zip-O-Matic", B_TITLED_WINDOW, B_NOT_V_RESIZABLE),
 	fView(NULL),
-	fSettings(),
 	fThread(NULL),
 	fWindowGotRefs(false),
 	fZippingWasStopped(false),
-	fWindowInvoker(new BInvoker(new BMessage('alrt'), NULL, this))
+	fWindowInvoker(new BInvoker(new BMessage(ZIPPO_QUIT_OR_CONTINUE), NULL,
+		this))
 {
-	status_t status = B_OK;
-
-	status = fSettings.SetTo("ZipOMatic.msg");
-	if (status != B_OK)	
-		ErrorMessage("fSettings.SetTo()", status);
-
-	status = fSettings.InitCheck();
-	if (status != B_OK)
-		ErrorMessage("fSettings.InitCheck()", status);
-	
 	fView = new ZippoView(Bounds());
 	AddChild(fView);
 	
 	SetSizeLimits(Bounds().Width(), 15000, Bounds().Height(),
 		Bounds().Height());
 
-	_ReadSettings();
-
-	if (message != NULL)
+	if (refs != NULL)
 	{
 		fWindowGotRefs = true;
-		_StartZipping(message);
+		_StartZipping(refs);
 	}
 }
 
@@ -88,8 +75,7 @@
 			}
 			break;
 		
-		case 'exit':
-			// thread has finished - (finished, quit, killed, we don't know)
+		case ZIPPO_THREAD_EXIT:
 			fThread = NULL;
 			fView->fActivityView->Stop();
 			fView->fStopButton->SetEnabled(false);
@@ -102,7 +88,8 @@
 			_CloseWindowOrKeepOpen();
 			break;
 											
-		case 'exrr':	// thread has finished - badly
+		case ZIPPO_THREAD_EXIT_ERROR:
+			// TODO: figure out why this case does not happen when it should
 			fThread = NULL;
 			fView->fActivityView->Stop();
 			fView->fStopButton->SetEnabled(false);
@@ -110,7 +97,7 @@
 			fView->fZipOutputView->SetText("Error creating archive");
 			break;
 						
-		case 'strt':
+		case ZIPPO_TASK_DESCRIPTION:
 		{
 			BString string;
 			if (message->FindString("archive_filename", &string) == B_OK)
@@ -118,7 +105,7 @@
 			break;
 		}
 
-		case 'outp':
+		case ZIPPO_LINE_OF_STDOUT:
 		{
 			BString string;
 			if (message->FindString("zip_output", &string) == B_OK)
@@ -126,12 +113,12 @@
 			break;
 		}
 
-		case 'alrt':
+		case ZIPPO_QUIT_OR_CONTINUE:
 		{
 			int32 which_button = -1;
 			if (message->FindInt32("which", &which_button) == B_OK) {
 				if (which_button == 0) {
-					_StopZipping();
+					StopZipping();
 				} else {
 					if (fThread != NULL)
 						fThread->ResumeExternalZip();
@@ -152,85 +139,25 @@
 bool
 ZippoWindow::QuitRequested()
 {
-	if (fThread == NULL) {
-		_WriteSettings();
-		be_app_messenger.SendMessage(ZIPPO_WINDOW_QUIT);
+	if (!IsZipping()) {
+		BMessage message(ZIPPO_WINDOW_QUIT);
+		message.AddRect("frame", Frame());
+		be_app_messenger.SendMessage(&message);
 		return true;
 	} else {
-		if (fThread != NULL)
-			fThread->SuspendExternalZip();
-	
+		fThread->SuspendExternalZip();
 		fView->fActivityView->Pause();
-	
+
 		BAlert* alert = new BAlert("Stop or Continue",
 			"Are you sure you want to stop creating this archive?", "Stop",
 			"Continue", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
 		alert->Go(fWindowInvoker);
+		
 		return false;
 	}
 }
 
 
-status_t
-ZippoWindow::_ReadSettings()
-{
-	status_t status = B_OK;
-
-	status = fSettings.InitCheck();
-	if (status != B_OK)
-		ErrorMessage("fSettings.InitCheck()", status);
-
-	status = fSettings.ReadSettings();
-	if (status != B_OK)
-		ErrorMessage("fSettings.ReadSettings()", status);
-
-	BRect windowRect;
-	
-	status = fSettings.FindRect("windowRect", &windowRect);
-	if (status != B_OK)
-	{
-		ErrorMessage("fSettings.FindRect(windowRect)", status);
-		return status;
-	}
-	
-	ResizeTo(windowRect.Width(), windowRect.Height());
-	MoveTo(windowRect.LeftTop());
-	
-	return B_OK;
-}
-
-
-status_t
-ZippoWindow::_WriteSettings()
-{
-	status_t status = B_OK;
-
-	status = fSettings.InitCheck();
-	if (status != B_OK)
-		ErrorMessage("fSettings.InitCheck()", status);
-
-	status = fSettings.MakeEmpty();
-	if (status != B_OK)
-		ErrorMessage("fSettings.MakeEmpty()", status);
-
-	status = fSettings.AddRect("windowRect", Frame());
-	if (status != B_OK)
-	{
-		ErrorMessage("fSettings.AddRect(windowRect)", status);
-		return status;
-	}
-	
-	status = fSettings.WriteSettings();
-	if (status != B_OK)
-	{
-		ErrorMessage("fSettings.WriteSettings()", status);
-		return status;
-	}
-	
-	return B_OK;
-}
-
-
 void
 ZippoWindow::_StartZipping(BMessage* message)
 {
@@ -245,7 +172,7 @@
 
 
 void
-ZippoWindow::_StopZipping()
+ZippoWindow::StopZipping()
 {
 	fZippingWasStopped = true;
 

Modified: haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticWindow.h
===================================================================
--- haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticWindow.h	2009-08-03 18:10:45 UTC (rev 32091)
+++ haiku/trunk/src/add-ons/tracker/zipomatic/ZipOMaticWindow.h	2009-08-03 18:17:14 UTC (rev 32092)
@@ -8,7 +8,6 @@
 #include <MenuItem.h>
 #include <Window.h>
 
-#include "ZipOMaticSettings.h"
 #include "ZipOMaticView.h"
 #include "ZipperThread.h"
 
@@ -16,7 +15,7 @@
 class ZippoWindow : public BWindow
 {
 public:
-							ZippoWindow(BMessage* message = NULL);
+							ZippoWindow(BRect frame, BMessage* refs = NULL);
 							~ZippoWindow();
 							
 	virtual	void			MessageReceived(BMessage* message);
@@ -24,18 +23,14 @@
 	virtual	void			Zoom(BPoint origin, float width, float height);
 	
 			bool			IsZipping();
+			void			StopZipping();
 			
 private:
-			status_t		_ReadSettings();
-			status_t		_WriteSettings();
 
 			void			_StartZipping(BMessage* message);
-			void			_StopZipping();
-				
 			void			_CloseWindowOrKeepOpen();
 
 			ZippoView*		fView;
-			ZippoSettings	fSettings;
 			ZipperThread*	fThread;
 	
 			bool			fWindowGotRefs;

Modified: haiku/trunk/src/add-ons/tracker/zipomatic/ZipperThread.cpp
===================================================================
--- haiku/trunk/src/add-ons/tracker/zipomatic/ZipperThread.cpp	2009-08-03 18:10:45 UTC (rev 32091)
+++ haiku/trunk/src/add-ons/tracker/zipomatic/ZipperThread.cpp	2009-08-03 18:17:14 UTC (rev 32092)
@@ -140,8 +140,10 @@
 
 	archiveName.Prepend("Creating archive: ");
 
-	_SendMessageToWindow('strt', "archive_filename", archiveName.String());
-	_SendMessageToWindow('outp', "zip_output", "Preparing to archive"); 
+	_SendMessageToWindow(ZIPPO_TASK_DESCRIPTION, "archive_filename",
+		archiveName.String());
+	_SendMessageToWindow(ZIPPO_LINE_OF_STDOUT, "zip_output",
+		"Preparing to archive");
 
 	return B_OK;
 }
@@ -164,12 +166,12 @@
 
 	if (!strncmp("  a", output, 3)) {
 		output[2] = 'A';
-		_SendMessageToWindow('outp', "zip_output", output + 2);
+		_SendMessageToWindow(ZIPPO_LINE_OF_STDOUT, "zip_output", output + 2);
 	} else if (!strncmp("up", output, 2)) {
 		output[0] = 'U';
-		_SendMessageToWindow('outp', "zip_output", output);
+		_SendMessageToWindow(ZIPPO_LINE_OF_STDOUT, "zip_output", output);
 	} else {
-		_SendMessageToWindow('outp', "zip_output", output);
+		_SendMessageToWindow(ZIPPO_LINE_OF_STDOUT, "zip_output", output);
 	}
 
 	return B_OK;
@@ -202,10 +204,10 @@
 
 	if (status == EOF) {
 		// thread has finished, been quit or killed, we don't know
-		_SendMessageToWindow('exit');
+		_SendMessageToWindow(ZIPPO_THREAD_EXIT);
 	} else {
 		// explicit error - communicate error to Window
-		_SendMessageToWindow('exrr');
+		_SendMessageToWindow(ZIPPO_THREAD_EXIT_ERROR);
 	}
 
 	Quit();

Modified: haiku/trunk/src/add-ons/tracker/zipomatic/ZipperThread.h
===================================================================
--- haiku/trunk/src/add-ons/tracker/zipomatic/ZipperThread.h	2009-08-03 18:10:45 UTC (rev 32091)
+++ haiku/trunk/src/add-ons/tracker/zipomatic/ZipperThread.h	2009-08-03 18:17:14 UTC (rev 32092)
@@ -14,6 +14,7 @@
 
 #include <Message.h>
 #include <Messenger.h>
+#include <String.h>
 #include <Window.h>
 
 #include "GenericThread.h"



From leavengood at gmail.com  Mon Aug  3 20:22:18 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 3 Aug 2009 14:22:18 -0400
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
	headers/os/interface headers/private/binary_compatibility
	headers/private/interface src/kits/interface
	src/tests/kits/interface
In-Reply-To: <4A7724C1.1030400@bug-br.org.br>
References: <20090803212759.12001.8@bepc.1249297773.fake>
	<2284837054-BeMail@laptop>
	<a4855ac50908031052s445ac9bq43e90781ba9f53f0@mail.gmail.com>
	<4A7724C1.1030400@bug-br.org.br>
Message-ID: <a4855ac50908031122n3c1922batfb655b3f5ad793f0@mail.gmail.com>

On Mon, Aug 3, 2009 at 1:56 PM, Bruno Albuquerque<bga at bug-br.org.br> wrote:
>
> Actually, tooltip is one word, as I pointed out in the previous email.
> One must not forget that languages are dynamic. :)

Indeed English is very dynamic, but tool tip as two words is also
valid and used in the Java world as well as from Microsoft in .NET
(based on the camel-casing of the class name):

http://72.5.124.55/docs/books/tutorial/uiswing/components/tooltip.html
http://msdn.microsoft.com/en-us/library/system.windows.forms.tooltip.aspx

In fact it looks like Axel was inspired by the Java implementation to
some extent.

Either way he chose to call the class ToolTip and changed the constant
to match, which I think makes sense. If the class was Tooltip then the
constant would not need to be changed. I personally prefer ToolTip.

-- 
Regards,
Ryan


From leavengood at gmail.com  Mon Aug  3 20:25:06 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 3 Aug 2009 14:25:06 -0400
Subject: [Haiku-commits] r32065 - haiku/trunk/build/jam
In-Reply-To: <200908030956.n739uJ51016316@sheep.berlios.de>
References: <200908030956.n739uJ51016316@sheep.berlios.de>
Message-ID: <a4855ac50908031125jf8bd19bnb471eeea5ceb9407@mail.gmail.com>

On Mon, Aug 3, 2009 at 5:56 AM, <stippi at mail.berlios.de> wrote:
>
> Added MediaConverter to the build. It still needs a nice new icon though...

Are you working on the new icon, or would you like some help?

-- 
Regards,
Ryan


From bga at bug-br.org.br  Mon Aug  3 20:36:40 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Mon, 03 Aug 2009 15:36:40 -0300
Subject: [Haiku-commits] r32078 - in haiku/trunk:
 headers/os/app	headers/os/interface
 headers/private/binary_compatibility	headers/private/interface
 src/kits/interface src/tests/kits/interface
In-Reply-To: <a4855ac50908031122n3c1922batfb655b3f5ad793f0@mail.gmail.com>
References: <20090803212759.12001.8@bepc.1249297773.fake>	<2284837054-BeMail@laptop>	<a4855ac50908031052s445ac9bq43e90781ba9f53f0@mail.gmail.com>	<4A7724C1.1030400@bug-br.org.br>
	<a4855ac50908031122n3c1922batfb655b3f5ad793f0@mail.gmail.com>
Message-ID: <4A772E38.9080305@bug-br.org.br>

Ryan Leavengood wrote:
> On Mon, Aug 3, 2009 at 1:56 PM, Bruno Albuquerque<bga at bug-br.org.br> wrote:
>> Actually, tooltip is one word, as I pointed out in the previous email.
>> One must not forget that languages are dynamic. :)
> 
> Indeed English is very dynamic, but tool tip as two words is also
> valid and used in the Java world as well as from Microsoft in .NET
> (based on the camel-casing of the class name):
> 
> http://72.5.124.55/docs/books/tutorial/uiswing/components/tooltip.html
> http://msdn.microsoft.com/en-us/library/system.windows.forms.tooltip.aspx
> 
> In fact it looks like Axel was inspired by the Java implementation to
> some extent.
> 
> Either way he chose to call the class ToolTip and changed the constant
> to match, which I think makes sense. If the class was Tooltip then the
> constant would not need to be changed. I personally prefer ToolTip.

If the constants didn't exist yet, I am all for calling it whatever you 
want (even Walter ;) ). But considering the constants already existed 
and "tooltip" exists and is a well known term (I would guess the 
wikipedia entry is more general than the Java use of it), I think the 
change was a mistake.

-Bruno


From revol at free.fr  Mon Aug  3 20:50:41 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Mon, 03 Aug 2009 20:50:41 +0200 CEST
Subject: [Haiku-commits] r32086 - haiku/trunk/src/bin
In-Reply-To: <1e42d8c50908031102n58b02e83qf544bba340054296@mail.gmail.com>
Message-ID: <1115169233-BeMail@laptop>

> On Mon, Aug 3, 2009 at 16:25, <mmu_man at mail.berlios.de> wrote:
> > Modified:
> >   haiku/trunk/src/bin/safemode.c
> > Log:
> > Allow getting other safe mode settings than the default one, from 
> > command line.
> > Added a -s option to get the string value of the setting directly 
> > instead of interpreting it as bool.
> 
> x86gcc2 - broken

Fixed in r32091, hopefully.

Fran?ois.


From superstippi at gmx.de  Mon Aug  3 22:54:14 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 03 Aug 2009 22:54:14 +0200
Subject: [Haiku-commits] r32078 - in haiku/trunk:
 headers/os/app	headers/os/interface
 headers/private/binary_compatibility	headers/private/interface
 src/kits/interface src/tests/kits/interface
In-Reply-To: <4A772E38.9080305@bug-br.org.br>
References: <20090803212759.12001.8@bepc.1249297773.fake>
	<2284837054-BeMail@laptop>
	<a4855ac50908031052s445ac9bq43e90781ba9f53f0@mail.gmail.com>
	<4A7724C1.1030400@bug-br.org.br>
	<a4855ac50908031122n3c1922batfb655b3f5ad793f0@mail.gmail.com>
	<4A772E38.9080305@bug-br.org.br>
Message-ID: <20090803225414.1778.1@bepc.1249330610.fake>


On 2009-08-03 at 20:36:40 [+0200], Bruno Albuquerque <bga at bug-br.org.br> 
wrote:
> Ryan Leavengood wrote:
> > On Mon, Aug 3, 2009 at 1:56 PM, Bruno Albuquerque<bga at bug-br.org.br> 
> > wrote:
> >> Actually, tooltip is one word, as I pointed out in the previous email. 
> >> One must not forget that languages are dynamic. :)
> > 
> > Indeed English is very dynamic, but tool tip as two words is also valid 
> > and used in the Java world as well as from Microsoft in .NET (based on 
> > the camel-casing of the class name):
> > 
> > http://72.5.124.55/docs/books/tutorial/uiswing/components/tooltip.html 
> > http://msdn.microsoft.com/en-us/library/system.windows.forms.tooltip.aspx
> > 
> > In fact it looks like Axel was inspired by the Java implementation to 
> > some extent.
> > 
> > Either way he chose to call the class ToolTip and changed the constant 
> > to match, which I think makes sense. If the class was Tooltip then the 
> > constant would not need to be changed. I personally prefer ToolTip.
> 
> If the constants didn't exist yet, I am all for calling it whatever you 
> want (even Walter ;) ). But considering the constants already existed and 
> "tooltip" exists and is a well known term (I would guess the wikipedia 
> entry is more general than the Java use of it), I think the change was a 
> mistake.

Sometimes we non-native English speakers have the wrong feel for something, 
and Ryan is a native speaker. In any case, the constants did not exist on 
BeOS R5, which is the API that we want to replicate. Axel didn't copy the 
Dano tool tip API either, although I know he and Ingo looked at it. You 
could also ask why the constants were declared in our headers, even if most 
of them are not actually supported anyways.

Best regards,
-Stephan


From bonefish at mail.berlios.de  Mon Aug  3 20:58:22 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 3 Aug 2009 20:58:22 +0200
Subject: [Haiku-commits] r32093 -
	haiku/trunk/src/add-ons/kernel/partitioning_systems/intel
Message-ID: <200908031858.n73IwMip015505@sheep.berlios.de>

Author: bonefish
Date: 2009-08-03 20:58:21 +0200 (Mon, 03 Aug 2009)
New Revision: 32093
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32093&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionLocker.cpp
Log:
Patch by Bryce Groff: Style cleanup.


Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionLocker.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionLocker.cpp	2009-08-03 18:17:14 UTC (rev 32092)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionLocker.cpp	2009-08-03 18:58:21 UTC (rev 32093)
@@ -12,8 +12,9 @@
 
 // constructor
 PartitionLocker::PartitionLocker(partition_id partitionID)
-	: fDevice(NULL),
-	  fPartitionID(partitionID)
+	:
+	fDevice(NULL),
+	fPartitionID(partitionID)
 {
 }
 
@@ -42,7 +43,8 @@
 
 // constructor
 PartitionReadLocker::PartitionReadLocker(partition_id partitionID)
-	: PartitionLocker(partitionID)
+	:
+	PartitionLocker(partitionID)
 {
 	fDevice = read_lock_disk_device(partitionID);
 }
@@ -60,7 +62,8 @@
 
 // constructor
 PartitionWriteLocker::PartitionWriteLocker(partition_id partitionID)
-	: PartitionLocker(partitionID)
+	:
+	PartitionLocker(partitionID)
 {
 	fDevice = write_lock_disk_device(partitionID);
 }



From bonefish at mail.berlios.de  Mon Aug  3 21:01:21 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 3 Aug 2009 21:01:21 +0200
Subject: [Haiku-commits] r32094 -
	haiku/trunk/src/system/kernel/disk_device_manager
Message-ID: <200908031901.n73J1Lg3016122@sheep.berlios.de>

Author: bonefish
Date: 2009-08-03 21:01:20 +0200 (Mon, 03 Aug 2009)
New Revision: 32094
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32094&view=rev

Modified:
   haiku/trunk/src/system/kernel/disk_device_manager/disk_device_manager.cpp
Log:
Patch by Bryce Groff: Allow passing an ID of any partition contained in the
disk device to the locking functions, not only the ID of the disk device
itself.


Modified: haiku/trunk/src/system/kernel/disk_device_manager/disk_device_manager.cpp
===================================================================
--- haiku/trunk/src/system/kernel/disk_device_manager/disk_device_manager.cpp	2009-08-03 18:58:21 UTC (rev 32093)
+++ haiku/trunk/src/system/kernel/disk_device_manager/disk_device_manager.cpp	2009-08-03 19:01:20 UTC (rev 32094)
@@ -22,7 +22,7 @@
 write_lock_disk_device(partition_id partitionID)
 {
 	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KDiskDevice *device = manager->RegisterDevice(partitionID)) {
+	if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) {
 		if (device->WriteLock())
 			return device->DeviceData();
 		// Only unregister, when the locking fails. The guarantees, that the
@@ -38,7 +38,7 @@
 write_unlock_disk_device(partition_id partitionID)
 {
 	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KDiskDevice *device = manager->RegisterDevice(partitionID)) {
+	if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) {
 		bool isLocked = device->IsWriteLocked();
 		if (isLocked) {
 			device->WriteUnlock();
@@ -54,7 +54,7 @@
 read_lock_disk_device(partition_id partitionID)
 {
 	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KDiskDevice *device = manager->RegisterDevice(partitionID)) {
+	if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) {
 		if (device->ReadLock())
 			return device->DeviceData();
 		// Only unregister, when the locking fails. The guarantees, that the
@@ -70,7 +70,7 @@
 read_unlock_disk_device(partition_id partitionID)
 {
 	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KDiskDevice *device = manager->RegisterDevice(partitionID)) {
+	if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) {
 		bool isLocked = device->IsReadLocked(false);
 		if (isLocked) {
 			device->ReadUnlock();



From bonefish at mail.berlios.de  Mon Aug  3 21:02:52 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 3 Aug 2009 21:02:52 +0200
Subject: [Haiku-commits] r32095 - haiku/trunk/src/apps/drivesetup
Message-ID: <200908031902.n73J2qkF016293@sheep.berlios.de>

Author: bonefish
Date: 2009-08-03 21:02:51 +0200 (Mon, 03 Aug 2009)
New Revision: 32095
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32095&view=rev

Modified:
   haiku/trunk/src/apps/drivesetup/MainWindow.cpp
Log:
Patch by Bryce Groff: Correctly notify the user when committing the
modifications for deleting a partition failed.


Modified: haiku/trunk/src/apps/drivesetup/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-08-03 19:01:20 UTC (rev 32094)
+++ haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-08-03 19:02:51 UTC (rev 32095)
@@ -1024,8 +1024,14 @@
 		return;
 	}
 
-	modificationPreparer.CommitModifications();
+	ret = modificationPreparer.CommitModifications();
 
+	if (ret != B_OK) {
+		_DisplayPartitionError("Failed to delete the partition. "
+			"This operation is exiting.\nNo changes have been made!\n");
+		return;
+	}
+
 	_ScanDrives();
 	fDiskView->ForceUpdate();
 }



From bonefish at mail.berlios.de  Mon Aug  3 21:05:39 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 3 Aug 2009 21:05:39 +0200
Subject: [Haiku-commits] r32096 - haiku/trunk/src/apps/drivesetup
Message-ID: <200908031905.n73J5dWH016847@sheep.berlios.de>

Author: bonefish
Date: 2009-08-03 21:05:38 +0200 (Mon, 03 Aug 2009)
New Revision: 32096
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32096&view=rev

Modified:
   haiku/trunk/src/apps/drivesetup/CreateParamsPanel.cpp
Log:
Patch by Bryce Groff: Allow the disk system add-ons to return a NULL parameter
editor, when they don't have any additional parameters to edit.


Modified: haiku/trunk/src/apps/drivesetup/CreateParamsPanel.cpp
===================================================================
--- haiku/trunk/src/apps/drivesetup/CreateParamsPanel.cpp	2009-08-03 19:02:51 UTC (rev 32095)
+++ haiku/trunk/src/apps/drivesetup/CreateParamsPanel.cpp	2009-08-03 19:05:38 UTC (rev 32096)
@@ -125,9 +125,11 @@
 			break;
 
 		case MSG_PARTITION_TYPE:
-			const char* type;
-			message->FindString("type", &type);
-			fEditor->PartitionTypeChanged(type);
+			if (fEditor != NULL) {
+				const char* type;
+				message->FindString("type", &type);
+				fEditor->PartitionTypeChanged(type);
+			}
 			break;
 
 		default:
@@ -185,10 +187,12 @@
 		}
 
 		// get editors parameters
-		if (fEditor->FinishedEditing()) {
-			status_t status = fEditor->GetParameters(&parameters);
-			if (status != B_OK)
-				fReturnValue = status;
+		if (fEditor != NULL) {
+			if (fEditor->FinishedEditing()) {
+				status_t status = fEditor->GetParameters(&parameters);
+				if (status != B_OK)
+					fReturnValue = status;
+			}
 		}
 	}
 
@@ -249,33 +253,56 @@
 		.Add(fTypeMenuField)
 	;
 	BBox* infoBox = new BBox(B_FANCY_BORDER, infoView);
+	BView* rootView;
 
 	parent->GetChildCreationParameterEditor(NULL, &fEditor);
-	BBox* parameterBox = new BBox(B_FANCY_BORDER, fEditor->View());
+	if (fEditor != NULL) {
+		BBox* parameterBox = new BBox(B_FANCY_BORDER, fEditor->View());
 
-	BView* rootView = BGroupLayoutBuilder(B_VERTICAL, 4)
-		.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
+		rootView = BGroupLayoutBuilder(B_VERTICAL, 4)
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
 
-		// slider and types
-		.Add(infoBox)
+			// slider and types
+			.Add(infoBox)
 
-		.Add(BSpaceLayoutItem::CreateVerticalStrut(10))
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(10))
 
-		// editor's view
-		.Add(parameterBox)
+			// editor's view
+			.Add(parameterBox)
 
-		// controls
-		.AddGroup(B_HORIZONTAL, 10)
-			.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
-			.AddGlue()
-			.Add(fCancelButton)
-			.Add(fOKButton)
-			.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
-		.End()
+			// controls
+			.AddGroup(B_HORIZONTAL, 10)
+				.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
+				.AddGlue()
+				.Add(fCancelButton)
+				.Add(fOKButton)
+				.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
+			.End()
 
-		.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
-	;
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
+		;
+	} else {
+		rootView = BGroupLayoutBuilder(B_VERTICAL, 4)
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
 
+			// slider and types
+			.Add(infoBox)
+
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(10))
+
+			// controls
+			.AddGroup(B_HORIZONTAL, 10)
+				.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
+				.AddGlue()
+				.Add(fCancelButton)
+				.Add(fOKButton)
+				.Add(BSpaceLayoutItem::CreateHorizontalStrut(5))
+			.End()
+
+			.Add(BSpaceLayoutItem::CreateVerticalStrut(5))
+		;
+	}
+
 	SetLayout(new BGroupLayout(B_HORIZONTAL));
 	AddChild(rootView);
 	SetDefaultButton(fOKButton);



From bonefish at mail.berlios.de  Mon Aug  3 21:06:23 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 3 Aug 2009 21:06:23 +0200
Subject: [Haiku-commits] r32097 - haiku/trunk/src/apps/drivesetup
Message-ID: <200908031906.n73J6NSc016917@sheep.berlios.de>

Author: bonefish
Date: 2009-08-03 21:06:21 +0200 (Mon, 03 Aug 2009)
New Revision: 32097
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32097&view=rev

Modified:
   haiku/trunk/src/apps/drivesetup/InitParamsPanel.cpp
Log:
Patch by Bryce Groff: don't leak the driver settings handle.


Modified: haiku/trunk/src/apps/drivesetup/InitParamsPanel.cpp
===================================================================
--- haiku/trunk/src/apps/drivesetup/InitParamsPanel.cpp	2009-08-03 19:05:38 UTC (rev 32096)
+++ haiku/trunk/src/apps/drivesetup/InitParamsPanel.cpp	2009-08-03 19:06:21 UTC (rev 32097)
@@ -198,6 +198,7 @@
 					const char* string = get_driver_parameter(handle, "name",
 						NULL, NULL);
 					name.SetTo(string);
+					delete_driver_settings(handle);
 				}
 			} else
 				fReturnValue = err;



From bonefish at mail.berlios.de  Mon Aug  3 21:11:14 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 3 Aug 2009 21:11:14 +0200
Subject: [Haiku-commits] r32098 - haiku/trunk/src/add-ons/disk_systems/intel
Message-ID: <200908031911.n73JBEok017537@sheep.berlios.de>

Author: bonefish
Date: 2009-08-03 21:11:14 +0200 (Mon, 03 Aug 2009)
New Revision: 32098
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32098&view=rev

Modified:
   haiku/trunk/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
Log:
Patch by Bryce Groff with small change by myself:
* Don't leak the driver settings handle.
* No need to get the "active" parameter in ValidateCreateChild() -- either
  way is fine.


Modified: haiku/trunk/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp	2009-08-03 19:06:21 UTC (rev 32097)
+++ haiku/trunk/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp	2009-08-03 19:11:14 UTC (rev 32098)
@@ -349,9 +349,9 @@
 	void* handle = parse_driver_settings_string(parameters);
 	if (handle == NULL)
 		return B_ERROR;
+	get_driver_boolean_parameter(handle, "active", false, true);
+	delete_driver_settings(handle);
 
-	bool active = get_driver_boolean_parameter(handle, "active", false, true);
-
 	// do we have a spare primary partition?
 	if (fPartitionMap.CountNonEmptyPrimaryPartitions() == 4)
 		return B_BAD_VALUE;
@@ -467,6 +467,7 @@
 		return B_ERROR;
 
 	bool active = get_driver_boolean_parameter(handle, "active", false, true);
+	delete_driver_settings(handle);
 
 	// get a spare primary partition
 	PrimaryPartition* primary = NULL;
@@ -507,8 +508,6 @@
 	if (!foundSpace)
 		return B_BAD_VALUE;
 
-	// everything looks good, do it
-
 	// create the child
 	// (Note: the primary partition index is indeed the child index, since
 	// we picked the first empty primary partition.)
@@ -529,9 +528,6 @@
 	// init the primary partition
 	primary->SetTo(offset, size, type.Type(), active, partition->BlockSize());
 
-	// TODO: If the child is an extended partition, we should trigger its
-	// initialization.
-
 	*_child = child;
 	return B_OK;
 }



From superstippi at gmx.de  Mon Aug  3 23:10:40 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 03 Aug 2009 23:10:40 +0200
Subject: [Haiku-commits] r32065 - haiku/trunk/build/jam
In-Reply-To: <a4855ac50908031125jf8bd19bnb471eeea5ceb9407@mail.gmail.com>
References: <200908030956.n739uJ51016316@sheep.berlios.de>
	<a4855ac50908031125jf8bd19bnb471eeea5ceb9407@mail.gmail.com>
Message-ID: <20090803231040.1806.2@bepc.1249330610.fake>


On 2009-08-03 at 20:25:06 [+0200], Ryan Leavengood <leavengood at gmail.com> 
wrote:
> On Mon, Aug 3, 2009 at 5:56 AM, <stippi at mail.berlios.de> wrote:
> >
> > Added MediaConverter to the build. It still needs a nice new icon 
> > though...
> 
> Are you working on the new icon, or would you like some help?

No, please go ahead! :-) I am still busy with the FFmpeg encoder and 
writer...

Best regards,
-Stephan


From zooey at mail.berlios.de  Mon Aug  3 21:46:00 2009
From: zooey at mail.berlios.de (zooey at BerliOS)
Date: Mon, 3 Aug 2009 21:46:00 +0200
Subject: [Haiku-commits] r32099 - haiku/trunk/src/kits/interface
Message-ID: <200908031946.n73Jk0vJ022832@sheep.berlios.de>

Author: zooey
Date: 2009-08-03 21:46:00 +0200 (Mon, 03 Aug 2009)
New Revision: 32099
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32099&view=rev

Modified:
   haiku/trunk/src/kits/interface/ListView.cpp
Log:
Fixed two more peculiarities in ListView:
* when items are removed, the anchor may need adjustment (fixes the problem
  in Beam reported by Stippi)
* the check for needed adjustment of fLastSelected in _Select(from, to, extend)
  was broken, as it needs to be independent of fFirstSelected - this fixes
  broken navigation after doing a select-all

Modified: haiku/trunk/src/kits/interface/ListView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ListView.cpp	2009-08-03 19:11:14 UTC (rev 32098)
+++ haiku/trunk/src/kits/interface/ListView.cpp	2009-08-03 19:46:00 UTC (rev 32099)
@@ -671,6 +671,9 @@
 	if (fLastSelected != -1 && index < fLastSelected)
 		fLastSelected--;
 
+	if (fAnchorIndex != -1 && index < fAnchorIndex)
+		fAnchorIndex--;
+
 	_RecalcItemTops(index);
 
 	_InvalidateFrom(index);
@@ -696,6 +699,9 @@
 	if (index < 0)
 		return false;
 
+	if (fAnchorIndex != -1 && index < fAnchorIndex)
+		fAnchorIndex = index;
+
 	fList.RemoveItems(index, count);
 	if (index < fList.CountItems())
 		_RecalcItemTops(index);
@@ -1479,10 +1485,12 @@
 	if (fFirstSelected == -1) {
 		fFirstSelected = from;
 		fLastSelected = to;
-	} else if (from < fFirstSelected)
-		fFirstSelected = from;
-	else if (to > fLastSelected)
-		fLastSelected = to;
+	} else {
+		if (from < fFirstSelected)
+			fFirstSelected = from;
+		if (to > fLastSelected)
+			fLastSelected = to;
+	}
 
 	for (int32 i = from; i <= to; ++i) {
 		BListItem *item = ItemAt(i);



From mmu_man at mail.berlios.de  Mon Aug  3 21:53:18 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Mon, 3 Aug 2009 21:53:18 +0200
Subject: [Haiku-commits] r32100 - haiku/trunk/src/system/boot/platform/u-boot
Message-ID: <200908031953.n73JrIWD023639@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-03 21:53:17 +0200 (Mon, 03 Aug 2009)
New Revision: 32100
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32100&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/u-boot/start2.c
Log:
Initialize args.arguments on ARM too.


Modified: haiku/trunk/src/system/boot/platform/u-boot/start2.c
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/start2.c	2009-08-03 19:46:00 UTC (rev 32099)
+++ haiku/trunk/src/system/boot/platform/u-boot/start2.c	2009-08-03 19:53:17 UTC (rev 32100)
@@ -102,6 +102,7 @@
 		// call C++ constructors before doing anything else
 	call_ctors();
 	args.heap_size = HEAP_SIZE;
+	args.arguments = NULL;
 
 
 	serial_init();



From ingo_weinhold at gmx.de  Mon Aug  3 22:01:15 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Mon, 03 Aug 2009 22:01:15 +0200
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
 headers/os/interface headers/private/binary_compatibility
 headers/private/interface src/kits/interface src/tests/kits/interface
In-Reply-To: <33779194933-BeMail@zon>
References: <33779194933-BeMail@zon>
Message-ID: <20090803220115.959.2@knochen-vm.localdomain>


On 2009-08-03 at 18:22:22 [+0200], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> Michael Weirauch <dev at m-phasis.de> wrote:
> > starting BezillaBrowser or gvim on 32078 (VirtualBox) or 32080
> > (native) gives missing symbol error:
> > _ZN5BView15_ReservedView11Ev.
> > 
> > Seems related to this change. Anybody can confirm?
> 
> It is related indeed - GCC4 software using BViews need to be
> recompiled, only the GCC2 compatibility is retained.

I think in cases like this we should just introduce the gcc 4 compatility 
symbol for the time being, so that the optional packages don't just break, 
and remove it again after branching for the release, which would be the 
point when all optional packages need to be rebuilt anyway.

CU, Ingo


From anevilyak at gmail.com  Mon Aug  3 22:05:13 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Mon, 3 Aug 2009 15:05:13 -0500
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
	headers/os/interface headers/private/binary_compatibility
	headers/private/interface src/kits/interface
	src/tests/kits/interface
In-Reply-To: <20090803220115.959.2@knochen-vm.localdomain>
References: <33779194933-BeMail@zon>
	<20090803220115.959.2@knochen-vm.localdomain>
Message-ID: <f019d2f30908031305vb53a464redc31a91a7dfe7a5@mail.gmail.com>

On Mon, Aug 3, 2009 at 3:01 PM, Ingo Weinhold<ingo_weinhold at gmx.de> wrote:
> I think in cases like this we should just introduce the gcc 4 compatility
> symbol for the time being, so that the optional packages don't just break,
> and remove it again after branching for the release, which would be the
> point when all optional packages need to be rebuilt anyway.

Why is an app even linking to one of the ReservedVirtual symbols?

Regards,

Rene


From superstippi at gmx.de  Tue Aug  4 00:13:55 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 04 Aug 2009 00:13:55 +0200
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
 headers/os/interface headers/private/binary_compatibility
 headers/private/interface src/kits/interface src/tests/kits/interface
In-Reply-To: <f019d2f30908031305vb53a464redc31a91a7dfe7a5@mail.gmail.com>
References: <33779194933-BeMail@zon>
	<20090803220115.959.2@knochen-vm.localdomain>
	<f019d2f30908031305vb53a464redc31a91a7dfe7a5@mail.gmail.com>
Message-ID: <20090804001355.3567.5@bepc.1249330610.fake>


On 2009-08-03 at 22:05:13 [+0200], Rene Gollent <anevilyak at gmail.com> wrote:
> On Mon, Aug 3, 2009 at 3:01 PM, Ingo Weinhold<ingo_weinhold at gmx.de> wrote:
> > I think in cases like this we should just introduce the gcc 4 
> > compatility symbol for the time being, so that the optional packages 
> > don't just break, and remove it again after branching for the release, 
> > which would be the point when all optional packages need to be rebuilt 
> > anyway.
> 
> Why is an app even linking to one of the ReservedVirtual symbols?

That's what I am thinking, too. I have not yet upgraded to the revision 
after the BToolTip introduction, but I am wondering if WonderBrush is 
affected as well (GCC2, but built on Haiku).

Best regards,
-Stephan


From aldeck at mail.berlios.de  Mon Aug  3 22:23:01 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Mon, 3 Aug 2009 22:23:01 +0200
Subject: [Haiku-commits] r32101 -
	haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker
Message-ID: <200908032023.n73KN1xx027294@sheep.berlios.de>

Author: aldeck
Date: 2009-08-03 22:22:56 +0200 (Mon, 03 Aug 2009)
New Revision: 32101
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32101&view=rev

Added:
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/DebugSpatialCache.cpp
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/DebugSpatialCache.h
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/HashedSpatialCache.cpp
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/HashedSpatialCache.h
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/LinearSpatialCache.cpp
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/LinearSpatialCache.h
Modified:
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/Jamfile
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseSpatialCache.cpp
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseSpatialCache.h
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseView.cpp
   haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseView.h
Log:
* Made PoseSpatialCache abstract. Moved current impl in LinearSpatialCache.

* Added HashedSpatialCache (the impl is a copy of LinearSpatialCache atm).

* Added DebugSpatialCache that helps to compare/validate implementations.
 Will probably put some time measurement there too.

* Renamed PoseSpatialCache::Clear() to RemoveAllPoses()

* Automatic whitespace cleanup



Added: haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/DebugSpatialCache.cpp
===================================================================
--- haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/DebugSpatialCache.cpp	2009-08-03 19:53:17 UTC (rev 32100)
+++ haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/DebugSpatialCache.cpp	2009-08-03 20:22:56 UTC (rev 32101)
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2009, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Alexandre Deckner <alex at zappotek.com>
+ */
+
+#include "DebugSpatialCache.h"
+#include "LinearSpatialCache.h"
+#include "HashedSpatialCache.h"
+
+#include "Pose.h"
+#include "PoseView.h"
+
+
+DebugSpatialCache::DebugSpatialCache(BPoseView *parentPoseView)
+	:
+	fSpatialCache1(NULL),
+	fSpatialCache2(NULL)
+{
+	fSpatialCache1 = new LinearSpatialCache(parentPoseView);
+	fSpatialCache2 = new HashedSpatialCache(parentPoseView);
+}
+
+
+DebugSpatialCache::~DebugSpatialCache()
+{
+	delete fSpatialCache1;
+	delete fSpatialCache2;
+}
+
+
+void
+DebugSpatialCache::AddPose(BPose* pose)
+{
+	fSpatialCache1->AddPose(pose);
+	fSpatialCache2->AddPose(pose);
+}
+
+
+void
+DebugSpatialCache::RemovePose(BPose* pose)
+{
+	fSpatialCache1->RemovePose(pose);
+	fSpatialCache2->RemovePose(pose);
+}
+
+
+void
+DebugSpatialCache::RemoveAllPoses()
+{
+	fSpatialCache1->RemoveAllPoses();
+	fSpatialCache2->RemoveAllPoses();
+}
+
+
+BPose*
+DebugSpatialCache::FindUpperLeftPose() const
+{
+	BPose* pose1 = fSpatialCache1->FindUpperLeftPose();
+	BPose* pose2 = fSpatialCache2->FindUpperLeftPose();
+	if (pose1 != pose2)
+		printf("DebugSpatialCache::FindUpperLeftPose() different results!\n");
+	return pose1;
+}
+
+
+PoseSet
+DebugSpatialCache::FindIntersectingPoses(const BPoint &point) const
+{
+	PoseSet set1(fSpatialCache1->FindIntersectingPoses(point));
+	PoseSet set2(fSpatialCache2->FindIntersectingPoses(point));
+	if (set1 != set2)
+		printf("DebugSpatialCache::FindIntersectingPoses(BPoint) different results!\n");
+	return set1;
+}
+
+
+PoseSet
+DebugSpatialCache::FindIntersectingPoses(const BRect &rect) const
+{
+	PoseSet set1(fSpatialCache1->FindIntersectingPoses(rect));
+	PoseSet set2(fSpatialCache2->FindIntersectingPoses(rect));
+	if (set1 != set2)
+		printf("DebugSpatialCache::FindIntersectingPoses(BRect) different results!\n");
+	return set1;
+}
+
+
+BRect
+DebugSpatialCache::PosesExtent() const
+{
+	BRect rect1(fSpatialCache1->PosesExtent());
+	BRect rect2(fSpatialCache2->PosesExtent());
+	if (rect1 != rect1)
+		printf("DebugSpatialCache::PosesExtent() different results!\n");
+	return rect1;
+}

Added: haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/DebugSpatialCache.h
===================================================================
--- haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/DebugSpatialCache.h	2009-08-03 19:53:17 UTC (rev 32100)
+++ haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/DebugSpatialCache.h	2009-08-03 20:22:56 UTC (rev 32101)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Alexandre Deckner <alex at zappotek.com>
+ */
+#ifndef _DEBUG_SPATIAL_CACHE_H
+#define _DEBUG_SPATIAL_CACHE_H
+
+#include "PoseSpatialCache.h"
+
+#include <set>
+
+//TODO debug
+
+namespace BPrivate {
+
+class BPose;
+class BPoseView;
+
+class DebugSpatialCache : public PoseSpatialCache {
+public:
+						DebugSpatialCache(BPoseView *parentPoseView);
+	virtual				~DebugSpatialCache();
+
+	virtual	void		AddPose(BPose* pose);
+	virtual	void		RemovePose(BPose* pose);
+	virtual	void		RemoveAllPoses();
+
+	virtual	BPose*		FindUpperLeftPose() const;
+	virtual	PoseSet		FindIntersectingPoses(const BPoint& point) const;
+	virtual	PoseSet		FindIntersectingPoses(const BRect& rect) const;
+
+	virtual	BRect		PosesExtent() const;
+
+private:
+	PoseSpatialCache*	fSpatialCache1;
+	PoseSpatialCache*	fSpatialCache2;
+};
+
+} // namespace BPrivate
+
+using namespace BPrivate;
+
+#endif	// _DEBUG_SPATIAL_CACHE_H

Added: haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/HashedSpatialCache.cpp
===================================================================
--- haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/HashedSpatialCache.cpp	2009-08-03 19:53:17 UTC (rev 32100)
+++ haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/HashedSpatialCache.cpp	2009-08-03 20:22:56 UTC (rev 32101)
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2009, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Alexandre Deckner <alex at zappotek.com>
+ */
+
+#include "HashedSpatialCache.h"
+
+#include "Pose.h"
+#include "PoseView.h"
+
+HashedSpatialCache::HashedSpatialCache(BPoseView *parentPoseView)
+	:
+	fPoseView(parentPoseView)
+{
+
+}
+
+
+HashedSpatialCache::~HashedSpatialCache()
+{
+
+}
+
+
+void
+HashedSpatialCache::AddPose(BPose* pose)
+{
+	fPoses.insert(pose);
+}
+
+
+void
+HashedSpatialCache::RemovePose(BPose* pose)
+{
+	fPoses.erase(pose);
+}
+
+
+void
+HashedSpatialCache::RemoveAllPoses()
+{
+	fPoses.clear();
+}
+
+
+BPose*
+HashedSpatialCache::FindUpperLeftPose() const
+{
+	if (fPoses.empty())
+		return NULL;
+
+
+	PoseSet::const_iterator it = fPoses.begin();
+	BPoint min((*it)->Location(fPoseView));
+	BPose* res = (*it);
+
+	for(; it != fPoses.end(); it++) {
+		BPoint candidateMin((*it)->Location(fPoseView));
+		if (candidateMin.x <= min.x && candidateMin.y <= min.y) {
+			res = (*it);
+			min = candidateMin;
+		}
+	}
+	return res;
+}
+
+
+PoseSet
+HashedSpatialCache::FindIntersectingPoses(const BPoint &point) const
+{
+	PoseSet res;
+	PoseSet::const_iterator it = fPoses.begin();
+	for(; it != fPoses.end(); it++) {
+		if ((*it)->PointInPose(fPoseView, point))
+			res.insert(*it);
+	}
+	return res;
+}
+
+
+PoseSet
+HashedSpatialCache::FindIntersectingPoses(const BRect &rect) const
+{
+	PoseSet res;
+	PoseSet::const_iterator it = fPoses.begin();
+	for(; it != fPoses.end(); it++) {
+		BRect poseRect((*it)->CalcRect(fPoseView));
+		if (rect.Intersects(poseRect))
+			res.insert(*it);
+	}
+	return res;
+}
+
+
+BRect
+HashedSpatialCache::PosesExtent() const
+{
+	BRect extent(LONG_MAX, LONG_MAX, LONG_MIN, LONG_MIN);
+	PoseSet::const_iterator it = fPoses.begin();
+	for(; it != fPoses.end(); it++) {
+		extent = extent | (*it)->CalcRect(fPoseView);
+	}
+	return extent;
+}

Added: haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/HashedSpatialCache.h
===================================================================
--- haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/HashedSpatialCache.h	2009-08-03 19:53:17 UTC (rev 32100)
+++ haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/HashedSpatialCache.h	2009-08-03 20:22:56 UTC (rev 32101)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Alexandre Deckner <alex at zappotek.com>
+ */
+#ifndef _HASHED_SPATIAL_CACHE_H
+#define _HASHED_SPATIAL_CACHE_H
+
+#include "PoseSpatialCache.h"
+
+#include <set>
+
+
+namespace BPrivate {
+
+class BPose;
+class BPoseView;
+
+
+class HashedSpatialCache : public PoseSpatialCache {
+public:
+						HashedSpatialCache(BPoseView *parentPoseView);
+	virtual				~HashedSpatialCache();
+
+	virtual	void		AddPose(BPose* pose);
+	virtual	void		RemovePose(BPose* pose);
+	virtual	void		RemoveAllPoses();
+
+	virtual	BPose*		FindUpperLeftPose() const;
+	virtual	PoseSet		FindIntersectingPoses(const BPoint& point) const;
+	virtual	PoseSet		FindIntersectingPoses(const BRect& rect) const;
+
+	virtual	BRect		PosesExtent() const;
+
+private:
+	PoseSet				fPoses;
+	BPoseView*			fPoseView;
+};
+
+} // namespace BPrivate
+
+using namespace BPrivate;
+
+#endif	// _HASHED_SPATIAL_CACHE_H

Modified: haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/Jamfile
===================================================================
--- haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/Jamfile	2009-08-03 19:53:17 UTC (rev 32100)
+++ haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/Jamfile	2009-08-03 20:22:56 UTC (rev 32101)
@@ -9,12 +9,12 @@
 
 AddResources libtracker.so : TrackerIcons.rdef ;
 
-SubDirC++Flags 
+SubDirC++Flags
 	-D_BUILDING_tracker=1 -DOPEN_TRACKER=1
 #	-D_INCLUDES_CLASS_DEVICE_MAP=1
 	-D_SUPPORTS_RESOURCES=1
 	-D_SUPPORTS_FEATURE_SCRIPTING=1
-#	-D_SILENTLY_CORRECT_FILE_NAMES=1 
+#	-D_SILENTLY_CORRECT_FILE_NAMES=1
 	;
 
 local vector_icon_libs ;
@@ -30,6 +30,7 @@
 	Bitmaps.cpp
 	ContainerWindow.cpp
 	CountView.cpp
+	DebugSpatialCache.cpp
 	DeskWindow.cpp
 	DesktopPoseView.cpp
 	DialogPane.cpp
@@ -46,9 +47,11 @@
 	FilePermissionsView.cpp
 	FindPanel.cpp
 	GroupedMenu.cpp
+	HashedSpatialCache.cpp
 	IconCache.cpp
 	IconMenuItem.cpp
 	InfoWindow.cpp
+	LinearSpatialCache.cpp
 	MimeTypeList.cpp
 	MiniMenuField.cpp
 	Model.cpp

Added: haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/LinearSpatialCache.cpp
===================================================================
--- haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/LinearSpatialCache.cpp	2009-08-03 19:53:17 UTC (rev 32100)
+++ haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/LinearSpatialCache.cpp	2009-08-03 20:22:56 UTC (rev 32101)
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2009, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Alexandre Deckner <alex at zappotek.com>
+ */
+
+#include "LinearSpatialCache.h"
+
+#include "Pose.h"
+#include "PoseView.h"
+
+LinearSpatialCache::LinearSpatialCache(BPoseView *parentPoseView)
+	:
+	fPoseView(parentPoseView)
+{
+
+}
+
+
+LinearSpatialCache::~LinearSpatialCache()
+{
+
+}
+
+
+void
+LinearSpatialCache::AddPose(BPose* pose)
+{
+	fPoses.insert(pose);
+}
+
+
+void
+LinearSpatialCache::RemovePose(BPose* pose)
+{
+	fPoses.erase(pose);
+}
+
+
+void
+LinearSpatialCache::RemoveAllPoses()
+{
+	fPoses.clear();
+}
+
+
+BPose*
+LinearSpatialCache::FindUpperLeftPose() const
+{
+	if (fPoses.empty())
+		return NULL;
+
+
+	PoseSet::const_iterator it = fPoses.begin();
+	BPoint min((*it)->Location(fPoseView));
+	BPose* res = (*it);
+
+	for(; it != fPoses.end(); it++) {
+		BPoint candidateMin((*it)->Location(fPoseView));
+		if (candidateMin.x <= min.x && candidateMin.y <= min.y) {
+			res = (*it);
+			min = candidateMin;
+		}
+	}
+	return res;
+}
+
+
+PoseSet
+LinearSpatialCache::FindIntersectingPoses(const BPoint &point) const
+{
+	PoseSet res;
+	PoseSet::const_iterator it = fPoses.begin();
+	for(; it != fPoses.end(); it++) {
+		if ((*it)->PointInPose(fPoseView, point))
+			res.insert(*it);
+	}
+	return res;
+}
+
+
+PoseSet
+LinearSpatialCache::FindIntersectingPoses(const BRect &rect) const
+{
+	PoseSet res;
+	PoseSet::const_iterator it = fPoses.begin();
+	for(; it != fPoses.end(); it++) {
+		BRect poseRect((*it)->CalcRect(fPoseView));
+		if (rect.Intersects(poseRect))
+			res.insert(*it);
+	}
+	return res;
+}
+
+
+BRect
+LinearSpatialCache::PosesExtent() const
+{
+	BRect extent(LONG_MAX, LONG_MAX, LONG_MIN, LONG_MIN);
+	PoseSet::const_iterator it = fPoses.begin();
+	for(; it != fPoses.end(); it++) {
+		extent = extent | (*it)->CalcRect(fPoseView);
+	}
+	return extent;
+}

Added: haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/LinearSpatialCache.h
===================================================================
--- haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/LinearSpatialCache.h	2009-08-03 19:53:17 UTC (rev 32100)
+++ haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/LinearSpatialCache.h	2009-08-03 20:22:56 UTC (rev 32101)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Alexandre Deckner <alex at zappotek.com>
+ */
+#ifndef _LINEAR_SPATIAL_CACHE_H
+#define _LINEAR_SPATIAL_CACHE_H
+
+#include "PoseSpatialCache.h"
+
+#include <set>
+
+
+namespace BPrivate {
+
+class BPose;
+class BPoseView;
+
+
+class LinearSpatialCache : public PoseSpatialCache {
+public:
+						LinearSpatialCache(BPoseView *parentPoseView);
+	virtual				~LinearSpatialCache();
+
+	virtual	void		AddPose(BPose* pose);
+	virtual	void		RemovePose(BPose* pose);
+	virtual	void		RemoveAllPoses();
+
+	virtual	BPose*		FindUpperLeftPose() const;
+	virtual	PoseSet		FindIntersectingPoses(const BPoint& point) const;
+	virtual	PoseSet		FindIntersectingPoses(const BRect& rect) const;
+
+	virtual	BRect		PosesExtent() const;
+
+private:
+	PoseSet				fPoses;
+	BPoseView*			fPoseView;
+};
+
+} // namespace BPrivate
+
+using namespace BPrivate;
+
+#endif	// _LINEAR_SPATIAL_CACHE_H

Modified: haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseSpatialCache.cpp
===================================================================
--- haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseSpatialCache.cpp	2009-08-03 19:53:17 UTC (rev 32100)
+++ haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseSpatialCache.cpp	2009-08-03 20:22:56 UTC (rev 32101)
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2009, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
@@ -11,104 +11,8 @@
 #include "Pose.h"
 #include "PoseView.h"
 
-PoseSpatialCache::PoseSpatialCache(BPoseView *parentPoseView)
-	:
-	fPoseView(parentPoseView)
-{
 
-}
-
-
 PoseSpatialCache::~PoseSpatialCache()
 {
 
 }
-
-
-void
-PoseSpatialCache::AddPose(BPose* pose)
-{
-	fPoses.insert(pose);
-}
-
-
-void
-PoseSpatialCache::RemovePose(BPose* pose)
-{
-	fPoses.erase(pose);
-}
-
-
-void
-PoseSpatialCache::Clear()
-{
-	fPoses.clear();
-}
-
-
-void
-PoseSpatialCache::PoseMoved(BPose* pose)
-{
-	// will be used for better algorithms
-}
-
-
-BPose*
-PoseSpatialCache::FindUpperLeftPose() const
-{
-	if (fPoses.empty())
-		return NULL;
-	
-	
-	PoseSet::const_iterator it = fPoses.begin();
-	BPoint min((*it)->Location(fPoseView));
-	BPose* res = (*it);
-	
-	for(; it != fPoses.end(); it++) {
-		BPoint candidateMin((*it)->Location(fPoseView));
-		if (candidateMin.x <= min.x && candidateMin.y <= min.y) {
-			res = (*it);
-			min = candidateMin;
-		}
-	}
-	return res;
-}
-
-
-PoseSet
-PoseSpatialCache::FindIntersectingPoses(const BPoint &point) const
-{
-	PoseSet res;
-	PoseSet::const_iterator it = fPoses.begin();
-	for(; it != fPoses.end(); it++) {
-		if ((*it)->PointInPose(fPoseView, point))
-			res.insert(*it);
-	}
-	return res;
-}
-
-
-PoseSet
-PoseSpatialCache::FindIntersectingPoses(const BRect &rect) const
-{
-	PoseSet res;
-	PoseSet::const_iterator it = fPoses.begin();
-	for(; it != fPoses.end(); it++) {
-		BRect poseRect((*it)->CalcRect(fPoseView));
-		if (rect.Intersects(poseRect))
-			res.insert(*it);
-	}	
-	return res;
-}
-
-
-BRect
-PoseSpatialCache::PosesExtent() const
-{
-	BRect extent(LONG_MAX, LONG_MAX, LONG_MIN, LONG_MIN);
-	PoseSet::const_iterator it = fPoses.begin();
-	for(; it != fPoses.end(); it++) {
-		extent = extent | (*it)->CalcRect(fPoseView);		
-	}
-	return extent;	
-}

Modified: haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseSpatialCache.h
===================================================================
--- haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseSpatialCache.h	2009-08-03 19:53:17 UTC (rev 32100)
+++ haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseSpatialCache.h	2009-08-03 20:22:56 UTC (rev 32101)
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2009, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
@@ -17,28 +17,22 @@
 
 class BPose;
 class BPoseView;
-	
+
 typedef std::set<BPose*> PoseSet;
 
 class PoseSpatialCache {
 public:
-				PoseSpatialCache(BPoseView* parentPoseView);
-	virtual 	~PoseSpatialCache();
+	virtual				~PoseSpatialCache();
 
-	void 		AddPose(BPose* pose);
-	void 		RemovePose(BPose* pose);
-	void 		Clear();
-	void 		PoseMoved(BPose* pose);
+	virtual	void		AddPose(BPose* pose) = 0;
+	virtual	void		RemovePose(BPose* pose) = 0;
+	virtual	void		RemoveAllPoses() = 0;
 
-	BPose*		FindUpperLeftPose() const;	
-	PoseSet		FindIntersectingPoses(const BPoint& point) const;
-	PoseSet		FindIntersectingPoses(const BRect& rect) const;
-	
-	BRect		PosesExtent() const;
+	virtual	BPose*		FindUpperLeftPose() const = 0;
+	virtual	PoseSet		FindIntersectingPoses(const BPoint& point) const = 0;
+	virtual	PoseSet		FindIntersectingPoses(const BRect& rect) const = 0;
 
-private:
-	PoseSet		fPoses;
-	BPoseView*	fPoseView;
+	virtual	BRect		PosesExtent() const = 0;
 };
 
 } // namespace BPrivate

Modified: haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseView.cpp	2009-08-03 19:53:17 UTC (rev 32100)
+++ haiku/branches/developer/aldeck/tracker_refactor/src/kits/tracker/PoseView.cpp	2009-08-03 20:22:56 UTC (rev 32101)
@@ -70,6 +70,7 @@
 #include "Commands.h"
 #include "ContainerWindow.h"
 #include "CountView.h"
+#include "DebugSpatialCache.h"
 #include "DeskWindow.h"
 #include "DesktopPoseView.h"
 #include "DirMenu.h"
@@ -198,7 +199,7 @@
 	fModel(model),
 	fActivePose(NULL),
 	fPoseList(new PoseList(40, true)),
-	fPoseSpatialCache(this),
+	fPoseSpatialCache(NULL),
 	fSelectionList(new PoseList()),
 	fMimeTypesInSelectionCache(20, true),
 	fZombieList(new BObjectList<Model>(10, true)),
@@ -245,6 +246,7 @@
 	fViewState->SetViewMode(viewMode);
 	fShowSelectionWhenInactive = TrackerSettings().ShowSelectionWhenInactive();
 	fTransparentSelection = TrackerSettings().TransparentSelection();
+	fPoseSpatialCache = new DebugSpatialCache(this);
 }
 
 
@@ -258,6 +260,7 @@
 	delete fViewState;
 	delete fModel;
 	delete fKeyRunner;
+	delete fPoseSpatialCache;
 
 	IconCache::sIconCache->Deleting(this);
 }
@@ -1636,7 +1639,7 @@
 			if (resultingPoses)
 				resultingPoses[modelIndex] = NULL;
 			continue;
-		} else 
+		} else
 			fInsertedNodes.insert(*(model->NodeRef()));
 
 		if ((clipboardMode = FSClipboardFindNodeMode(model, false, true)) != 0
@@ -1656,7 +1659,7 @@
 		if (poseInfo->fInitedDirectory != -1LL) {
 			PinPointToValidRange(poseInfo->fLocation);
 			pose->SetLocation(poseInfo->fLocation, this);
-			fPoseSpatialCache.AddPose(pose);
+			fPoseSpatialCache->AddPose(pose);
 		}
 
 		BRect poseBounds;
@@ -1740,7 +1743,7 @@
 			case kMiniIconMode:
 				if (poseInfo->fInitedDirectory == -1LL || fAlwaysAutoPlace) {
 					if (pose->HasLocation())
-						fPoseSpatialCache.RemovePose(pose);
+						fPoseSpatialCache->RemovePose(pose);
 
 					PlacePose(pose, viewBounds);
 
@@ -1752,7 +1755,7 @@
 					if (!fAlwaysAutoPlace)
 						pose->SetAutoPlaced(true);
 
-					fPoseSpatialCache.AddPose(pose);
+					fPoseSpatialCache->AddPose(pose);
 				}
 
 				// add item to list and draw if necessary
@@ -1763,12 +1766,12 @@
 
 				if (fEnsurePosesVisible && !viewBounds.Intersects(poseBounds)) {
 					viewBounds.InsetBy(20, 20);
-					fPoseSpatialCache.RemovePose(pose);
+					fPoseSpatialCache->RemovePose(pose);
 					BPoint loc(pose->Location(this));
 					loc.ConstrainTo(viewBounds);
 					pose->SetLocation(loc, this);
 					pose->SetSaveLocation();
-					fPoseSpatialCache.AddPose(pose);
+					fPoseSpatialCache->AddPose(pose);
 					poseBounds = pose->CalcRect(this);
 					viewBounds.InsetBy(-20, -20);
 				}
@@ -2840,7 +2843,7 @@
 			} else if (checkLocations && !IsValidLocation(pose)) {
 				// this icon has a location, but needs to be remapped, because
 				// it is going out of view for example
-				fPoseSpatialCache.RemovePose(pose);
+				fPoseSpatialCache->RemovePose(pose);
 				newPoseList.AddItem(pose);
 			} else if (iconSizeChanged) {
 				// The pose location is still changed in view coordinates,
@@ -2875,7 +2878,7 @@
 	for (int32 index = 0; index < count; index++) {
 		BPose *pose = newPoseList.ItemAt(index);
 		PlacePose(pose, bounds);
-		fPoseSpatialCache.AddPose(pose);
+		fPoseSpatialCache->AddPose(pose);
 	}
 
 	// sort poselist if we are switching to list mode
@@ -3183,12 +3186,12 @@
 		BRect viewBounds(Bounds());
 
 		// relocate all poses in list (reset spatial cache)
-		fPoseSpatialCache.Clear();
+		fPoseSpatialCache->RemoveAllPoses();
 		int32 count = fPoseList->CountItems();
 		for (int32 index = 0; index < count; index++) {
 			BPose *pose = fPoseList->ItemAt(index);
 			PlacePose(pose, viewBounds);
-			fPoseSpatialCache.AddPose(pose);
+			fPoseSpatialCache->AddPose(pose);
 		}
 
 		// scroll icons into view so that leftmost icon is "fOffset" from left
@@ -3217,7 +3220,7 @@
 			// do we need to move pose to a grid location?
 			if (newLocation != location) {
 				// remove pose from VSlist so it doesn't "bump" into itself
-				fPoseSpatialCache.RemovePose(pose);
+				fPoseSpatialCache->RemovePose(pose);
 
 				// try new grid location
 				BRect oldBounds(pose->CalcRect(this));
@@ -3229,7 +3232,7 @@
 					poseBounds = pose->CalcRect(this);
 				}
 
-				fPoseSpatialCache.AddPose(pose);
+				fPoseSpatialCache->AddPose(pose);
 
  				if (viewBounds.Intersects(poseBounds))
 					Invalidate(poseBounds);
@@ -3254,12 +3257,12 @@
 
 	bool checkValidLocation = IsDesktopWindow();
 
-	// find an empty slot to put pose into	
+	// find an empty slot to put pose into
 	while (SlotOccupied(rect, viewBounds)
 		// check good location on the desktop
 		|| (checkValidLocation && !IsValidLocation(rect))) {
 		NextSlot(pose, rect, viewBounds);
-	}	
+	}
 
 	rect.InsetBy(3, 0);
 
@@ -3342,13 +3345,13 @@
 	for (int32 index = 0; index < count; index++) {
 		BPose *pose = fPoseList->ItemAt(index);
 		if (pose->WasAutoPlaced()) {
-			fPoseSpatialCache.RemovePose(pose);
+			fPoseSpatialCache->RemovePose(pose);
 			fHintLocation = pose->Location(this);
 			BRect oldBounds(pose->CalcRect(this));
 			PlacePose(pose, viewBounds);
 
 			BRect newBounds(pose->CalcRect(this));
-			fPoseSpatialCache.AddPose(pose);
+			fPoseSpatialCache->AddPose(pose);
 			pose->SetAutoPlaced(false);
 
 			Invalidate(oldBounds);
@@ -3393,7 +3396,7 @@
 					locationNeedsUpdating = true;
 					Invalidate(pose->CalcRect(this));
 						// make sure the old icon gets erased
-					fPoseSpatialCache.RemovePose(pose);
+					fPoseSpatialCache->RemovePose(pose);
 					pose->SetLocation(newLocation, this);
 						// set the new location
 				}
@@ -3408,7 +3411,7 @@
 			if (!locationNeedsUpdating) {
 				// didn't already invalidate and remove in the desktop case
 				Invalidate(rect);
-				fPoseSpatialCache.RemovePose(pose);
+				fPoseSpatialCache->RemovePose(pose);
 			}
 			BPoint loc(pose->Location(this));
 			loc.ConstrainTo(bounds);
@@ -3422,7 +3425,7 @@
 		if (locationNeedsUpdating) {
 			// pose got reposition by one or both of the above
 			pose->SetSaveLocation();
-			fPoseSpatialCache.AddPose(pose);
+			fPoseSpatialCache->AddPose(pose);
 				// add it at the new location
 			Invalidate(pose->CalcRect(this));
 				// make sure the new pose location updates properly
@@ -3434,17 +3437,17 @@
 bool
 BPoseView::SlotOccupied(BRect poseRect, BRect viewBounds) const
 {
-	// TODO check that...	
+	// TODO check that...
 	// ## be sure to keep this code in sync with calls to NextSlot
-	// ## in terms of the comparison of fHintLocation and PinToGrid	
+	// ## in terms of the comparison of fHintLocation and PinToGrid
 	//if (poseRect.right >= viewBounds.right) {
 	//	BPoint point(viewBounds.left + fOffset.x, 0);
 	//	point = PinToGrid(point, fGrid, fOffset);
 	//	if (fHintLocation.x != point.x)
 	//		return true;
-	//} 	
-	
-	return !fPoseSpatialCache.FindIntersectingPoses(poseRect).empty();
+	//}
+
+	return !fPoseSpatialCache->FindIntersectingPoses(poseRect).empty();
 }
 
 
@@ -4497,14 +4500,14 @@
 		int32 count = targetView->fSelectionList->CountItems();
 		for (int32 index = 0; index < count; index++) {
 			BPose *pose = targetView->fSelectionList->ItemAt(index);
-			targetView->fPoseSpatialCache.RemovePose(pose);
+			targetView->fPoseSpatialCache->RemovePose(pose);
 
 			BPoint location (pose->Location(targetView) + delta);
 			if (dropOnGrid)
 				location = targetView->PinToGrid(location, targetView->fGrid, targetView->fOffset);
 			pose->MoveTo(location, targetView);
 
-			targetView->fPoseSpatialCache.AddPose(pose);
+			targetView->fPoseSpatialCache->AddPose(pose);
 		}
 
 		return;
@@ -5205,7 +5208,7 @@
 					PRINT(("converting model %s from a zombie\n", zombie->Name()));
 						ConvertZombieToPose(zombie, index);
 					}
-				} 
+				}
 			} else {
 				zombie->StatChanged();
 			}
@@ -6154,7 +6157,7 @@
 
 	// handle case where there is no current selection
 	if (fSelectionList->IsEmpty()) {
-		return fPoseSpatialCache.FindUpperLeftPose();
+		return fPoseSpatialCache->FindUpperLeftPose();
 	}
 
 	BRect selectionRect(selectedPose->CalcRect(this));
@@ -6663,13 +6666,13 @@
 		}
 	} else {
 		BPoint offsetBy(-inner.LeftTop().x, -inner.LeftTop().y);
-		
-		PoseSet res = fPoseSpatialCache.FindIntersectingPoses(Bounds());
+
+		PoseSet res = fPoseSpatialCache->FindIntersectingPoses(Bounds());
 		PoseSet::iterator it = res.begin();
 		for (; it != res.end(); it++) {
 			BPose* pose = (*it);
 			BRect poseRect(pose->CalcRect(this));
-			if (pose->IsSelected() && poseRect.Intersects(inner)) {				
+			if (pose->IsSelected() && poseRect.Intersects(inner)) {
 				pose->Draw(poseRect, poseRect, this, view, true, offsetBy,
 					false);
 			}
@@ -6729,8 +6732,8 @@
 	} else {
 		// get starting rect of clicked pose
 		result = pose->CalcRect(this);
-		
-		PoseSet res = fPoseSpatialCache.FindIntersectingPoses(Bounds());
+
+		PoseSet res = fPoseSpatialCache->FindIntersectingPoses(Bounds());
 		PoseSet::iterator it = res.begin();
 		for (; it != res.end(); it++) {
 			BPose* pose = (*it);
@@ -6813,7 +6816,7 @@
 			// use current selection rectangle to scan poses
 			if (ViewMode() == kListMode)
 				SelectPosesListMode(fSelectionRect, &selectionList);
-			else {				
+			else {
 				SelectPosesIconMode(fSelectionRect);
 			}
 
@@ -6961,14 +6964,14 @@
 
 	BRect bounds(Bounds());
 	SetDrawingMode(B_OP_COPY);
-	
-	PoseSet poses = fPoseSpatialCache.FindIntersectingPoses(selectionRect);
+
+	PoseSet poses = fPoseSpatialCache->FindIntersectingPoses(selectionRect);
 	PoseSet::iterator it = poses.begin();
 	for (; it != poses.end(); it++) {
 		BPose* pose = (*it);
 
 		bool selected = pose->IsSelected();
-		pose->Select(!fSelectionList->HasItem(pose));		
+		pose->Select(!fSelectionList->HasItem(pose));
 

[... truncated: 226 lines follow ...]


From axeld at pinc-software.de  Mon Aug  3 22:57:02 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 03 Aug 2009 22:57:02 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32078_-_in_haiku/trunk=3A_headers/os/a?=
 =?utf-8?q?pp_headers/os/interface_headers/private/binary=5Fcompatibility_?=
 =?utf-8?q?headers/private/interface__src/kits/interface_src/tests/kits/in?=
 =?utf-8?q?terface?=
In-Reply-To: <4A7723E6.1000509@bug-br.org.br>
Message-ID: <50259744556-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> Why rename them anyway ?
> This breaks Themes also.

Bruno Albuquerque <bga at bug-br.org.br> wrote:
> BTW, Tooltip (without spaces) is a well recognized name (for example: 
> http://en.wikipedia.org/wiki/Tooltip). Changing the name of the 
> contants 
> from *TOOLTIP* to *TOOL_TIP* does not make much sense (and, as 
> Fran?ois 
> pointed out, has the potential to break things). Other than that, 
> tooltips are an welcome addition. In fact, maybe we should 
> automatically 
> add one to text that is automatically truncated and have ellipsis 
> added? 
> The tooltip would have the full text.

Maybe "tooltip" will be adopted in dictionaries some day, to the best 
of my knowledge, this hasn't happened yet (and I don't regard Wikipedia 
as a reliable source for this). Also, it's called ToolTip in every API 
I looked at (incl. Dano), and it's spelled like this in our API as 
well. Hence, the TOOLTIP has been renamed as it's otherwise not 
consistent.
The TOOLTIP constants were introduced in Dano, and therefore were never 
public API in Haiku - if you used them, it is really your own problem - 
this kind of thing will probably happen some more once we rework parts 
of our current private API to make it finally public.

Bye,
   Axel.



From axeld at pinc-software.de  Mon Aug  3 23:01:57 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 03 Aug 2009 23:01:57 +0200 CEST
Subject: [Haiku-commits] r32076 - in haiku/trunk:
 headers/private/kernel/boot src/system/boot/loader
 src/system/boot/platform/atari_m68k src/system/boot/platform/bios_ia32
 src/system/boot/platform/openfirmware
In-Reply-To: <744391145-BeMail@laptop>
Message-ID: <50554207892-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> > So what?
> > kernel settings are nothing you will have to change often or at 
> > all.
> It's not so much about kernel settings.
> More about passing args to the vm at boot time without requiring a 
> change on the image.

For what? I understand what you can do with this, I just don't see the 
point.
There are no settings besides the kernel settings last time I looked 
at, also.

Bye,
   Axel.



From revol at free.fr  Mon Aug  3 23:14:36 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Mon, 03 Aug 2009 23:14:36 +0200 CEST
Subject: [Haiku-commits] r32076 - in haiku/trunk:
 headers/private/kernel/boot src/system/boot/loader
 src/system/boot/platform/atari_m68k src/system/boot/platform/bios_ia32
 src/system/boot/platform/openfirmware
In-Reply-To: <50554207892-BeMail@zon>
Message-ID: <1973760389-BeMail@laptop>

> "Fran?ois Revol" <revol at free.fr> wrote:
> > > So what?
> > > kernel settings are nothing you will have to change often or at 
> > > all.
> > It's not so much about kernel settings.
> > More about passing args to the vm at boot time without requiring a 
> > change on the image.
> 
> For what? I understand what you can do with this, I just don't see 
> the 
> point.
> There are no settings besides the kernel settings last time I looked 
> at, also.

- vesa default mode,
- presetting a network interface, or even a vpn,
- forcing keymap to match the one passed to qemu (for vnc),
- setting the name of a script/app/test to run at boot...

and those using grub could have more than 1 menu entries with different 
profiles.
Like an "autodemo" profile that would start videos & GL demos at boot 
:D

Fran?ois.


From mmu_man at mail.berlios.de  Mon Aug  3 23:17:06 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Mon, 3 Aug 2009 23:17:06 +0200
Subject: [Haiku-commits] r32102 - in haiku/trunk:
	headers/private/kernel/arch/m68k src/system/kernel/arch/m68k
Message-ID: <200908032117.n73LH6xj001122@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-03 23:17:03 +0200 (Mon, 03 Aug 2009)
New Revision: 32102
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32102&view=rev

Modified:
   haiku/trunk/headers/private/kernel/arch/m68k/arch_vm.h
   haiku/trunk/src/system/kernel/arch/m68k/arch_030_mmu.cpp
   haiku/trunk/src/system/kernel/arch/m68k/arch_040_mmu.cpp
   haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp
   haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp
Log:
Fix m68k build, still unimplemented.


Modified: haiku/trunk/headers/private/kernel/arch/m68k/arch_vm.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/m68k/arch_vm.h	2009-08-03 20:22:56 UTC (rev 32101)
+++ haiku/trunk/headers/private/kernel/arch/m68k/arch_vm.h	2009-08-03 21:17:03 UTC (rev 32102)
@@ -32,6 +32,8 @@
 	void (*m68k_unmap_address_range)(addr_t virtualAddress, size_t size);
 	status_t (*m68k_remap_address_range)(addr_t *_virtualAddress, size_t size, bool unmap);
 #endif
+	bool (*arch_vm_translation_map_is_kernel_page_accessible)(addr_t virtualAddress, uint32 protection);
+
 };
 
 #ifdef __cplusplus

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_030_mmu.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_030_mmu.cpp	2009-08-03 20:22:56 UTC (rev 32101)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_030_mmu.cpp	2009-08-03 21:17:03 UTC (rev 32102)
@@ -45,4 +45,5 @@
 	m68k_unmap_address_range,
 	m68k_remap_address_range
 #endif
+	m68k_vm_translation_map_is_kernel_page_accessible
 };

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_040_mmu.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_040_mmu.cpp	2009-08-03 20:22:56 UTC (rev 32101)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_040_mmu.cpp	2009-08-03 21:17:03 UTC (rev 32102)
@@ -43,4 +43,5 @@
 	m68k_unmap_address_range,
 	m68k_remap_address_range
 #endif
+	m68k_vm_translation_map_is_kernel_page_accessible
 };

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp	2009-08-03 20:22:56 UTC (rev 32101)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp	2009-08-03 21:17:03 UTC (rev 32102)
@@ -159,3 +159,13 @@
 }
 
 #endif
+
+bool
+arch_vm_translation_map_is_kernel_page_accessible(addr_t virtualAddress,
+	uint32 protection)
+{
+	return get_vm_ops()-arch_vm_translation_map_is_kernel_page_accessible(virtualAddress,
+		protection);
+}
+
+

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp	2009-08-03 20:22:56 UTC (rev 32101)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp	2009-08-03 21:17:03 UTC (rev 32102)
@@ -1512,8 +1512,8 @@
 }
 
 
-bool
-arch_vm_translation_map_is_kernel_page_accessible(addr_t virtualAddress,
+static bool
+m68k_vm_translation_map_is_kernel_page_accessible(addr_t virtualAddress,
 	uint32 protection)
 {
 	// TODO: Implement!



From stippi at mail.berlios.de  Mon Aug  3 23:32:04 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 3 Aug 2009 23:32:04 +0200
Subject: [Haiku-commits] r32103 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg
Message-ID: <200908032132.n73LW4sS003048@sheep.berlios.de>

Author: stippi
Date: 2009-08-03 23:32:03 +0200 (Mon, 03 Aug 2009)
New Revision: 32103
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32103&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
Log:
* AVWriter::StreamCookie::~StreamCookie() incorrectly freed packet data that it
  didn't own.
* We are supposed to open the AVCodecContext in the writer, even though we never
  use it. According to libav-users mailing list, this is necessary, since that
  will allocate and initialize some structures that are later needed in
  av_write_header(). How this is supposed to work for encoders that libavcodec
  does not support, or which we don't know how to map, I do not yet know. For
  now it doesn't matter and resolves the problem that audio tracks report the
  wrong stream duration.
* Some more improvements with regards to what information we need to fill out
  and which we don't.
* Use more sensible defaults for the stream bitrate, so that we get better
  quality video by default. This and other parameters can be calculated when
  we implement setting the quality.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-03 21:17:03 UTC (rev 32102)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-03 21:32:03 UTC (rev 32103)
@@ -132,11 +132,16 @@
 //		fContext->gop_size = 12;
 		// TODO: Fix pixel format or setup conversion method...
 		fContext->pix_fmt = PIX_FMT_YUV420P;
+
+		// TODO: Setup rate control:
 //		fContext->rate_emu = 0;
-		// TODO: Setup rate control:
 //		fContext->rc_eq = NULL;
 //		fContext->rc_max_rate = 0;
 //		fContext->rc_min_rate = 0;
+		// TODO: Try to calculate a good bit rate...
+		fContext->bit_rate = 800000;
+
+		// Pixel aspect ratio
 		fContext->sample_aspect_ratio.num
 			= fInputFormat.u.raw_video.pixel_width_aspect;
 		fContext->sample_aspect_ratio.den
@@ -180,6 +185,8 @@
 	} else if (fInputFormat.type == B_MEDIA_RAW_AUDIO) {
 		// frame rate
 		fContext->sample_rate = (int)fInputFormat.u.raw_audio.frame_rate;
+		// NOTE: From the output_example.c, it looks like we are not supposed
+		// to set this.
 		fContext->time_base.den = (int)fInputFormat.u.raw_audio.frame_rate;
 		fContext->time_base.num = 1;
 		// channels
@@ -243,6 +250,17 @@
 		return B_NOT_SUPPORTED;
 	}
 
+	// Add some known fixes from the FFmpeg API example:
+	if (fContext->codec_id == CODEC_ID_MPEG2VIDEO) {
+		// Just for testing, we also add B frames */
+		fContext->max_b_frames = 2;
+    } else if (fContext->codec_id == CODEC_ID_MPEG1VIDEO){
+		// Needed to avoid using macroblocks in which some coeffs overflow.
+		// This does not happen with normal video, it just happens here as
+		// the motion of the chroma plane does not match the luma plane.
+		fContext->mb_decision = 2;
+    }
+
 	// Open the codec
 	int result = avcodec_open(fContext, fCodec);
 	fCodecInitDone = (result >= 0);
@@ -292,6 +310,11 @@
 // #pragma mark -
 
 
+static const int64 kNoPTSValue = 0x8000000000000000LL;
+	// NOTE: For some reasons, I have trouble with the avcodec.h define:
+	// #define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
+	// INT64_C is not defined here.
+
 status_t
 AVCodecEncoder::_EncodeAudio(const void* _buffer, int64 frameCount,
 	media_encode_info* info)
@@ -311,12 +334,6 @@
 	size_t inputFrameSize = inputSampleSize
 		* fInputFormat.u.raw_audio.channel_count;
 
-	size_t outSampleSize = av_get_bits_per_sample_format(
-		fContext->sample_fmt) / 8;
-	size_t outSize = outSampleSize * fContext->channels;
-	TRACE("  sampleSize: %ld/%ld, frameSize: %ld/%ld\n",
-		inputSampleSize, inputFrameSize, outSampleSize, outSize);
-
 	size_t bufferSize = frameCount * inputFrameSize;
 	bufferSize = min_c(bufferSize, kDefaultChunkBufferSize);
 
@@ -342,6 +359,16 @@
 			return B_ERROR;
 		}
 
+		// Maybe we need to use this PTS to calculate start_time:
+		if (fContext->coded_frame->pts != kNoPTSValue) {
+			TRACE("  codec frame PTS: %lld (codec time_base: %d/%d)\n",
+				fContext->coded_frame->pts, fContext->time_base.num,
+				fContext->time_base.den);
+		} else {
+			TRACE("  codec frame PTS: N/A (codec time_base: %d/%d)\n",
+				fContext->time_base.num, fContext->time_base.den);
+		}
+
 		// Setup media_encode_info, most important is the time stamp.
 		info->start_time = (bigtime_t)(fFramesWritten * 1000000LL
 			/ fInputFormat.u.raw_audio.frame_rate);
@@ -407,6 +434,16 @@
 			return B_ERROR;
 		}
 
+		// Maybe we need to use this PTS to calculate start_time:
+		if (fContext->coded_frame->pts != kNoPTSValue) {
+			TRACE("  codec frame PTS: %lld (codec time_base: %d/%d)\n",
+				fContext->coded_frame->pts, fContext->time_base.num,
+				fContext->time_base.den);
+		} else {
+			TRACE("  codec frame PTS: N/A (codec time_base: %d/%d)\n",
+				fContext->time_base.num, fContext->time_base.den);
+		}
+
 		// Setup media_encode_info, most important is the time stamp.
 		info->start_time = (bigtime_t)(fFramesWritten * 1000000LL
 			/ fInputFormat.u.raw_video.field_rate);

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp	2009-08-03 21:17:03 UTC (rev 32102)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp	2009-08-03 21:32:03 UTC (rev 32103)
@@ -44,11 +44,13 @@
 	// TODO: This could depend on the BMediaFile creation flags, IIRC,
 	// they allow to specify a buffering mode.
 
+// NOTE: The following works around some weird bug in libavformat. We
+// have to open the AVFormatContext->AVStream->AVCodecContext, even though
+// we are not interested in donig any encoding here!!
+#define OPEN_CODEC_CONTEXT 1
+#define GET_CONTEXT_DEFAULTS 0
 
-// #pragma mark - URLProtocol
-// TODO: Do we need to write an URLProtocol?
 
-
 // #pragma mark - AVFormatWriter::StreamCookie
 
 
@@ -72,10 +74,10 @@
 			AVFormatContext*	fContext;
 			AVStream*			fStream;
 			AVPacket			fPacket;
+			bool				fCalculatePTS;
 			// Since different threads may write to the target,
 			// we need to protect the file position and I/O by a lock.
 			BLocker*			fStreamLock;
-			int64				fChunksWritten;
 };
 
 
@@ -85,16 +87,15 @@
 	:
 	fContext(context),
 	fStream(NULL),
-	fStreamLock(streamLock),
-	fChunksWritten(0)
+	fCalculatePTS(false),
+	fStreamLock(streamLock)
 {
-	av_new_packet(&fPacket, 0);
+	av_init_packet(&fPacket);
 }
 
 
 AVFormatWriter::StreamCookie::~StreamCookie()
 {
-	av_free_packet(&fPacket);
 }
 
 
@@ -102,7 +103,7 @@
 AVFormatWriter::StreamCookie::Init(const media_format* format,
 	const media_codec_info* codecInfo)
 {
-	TRACE("AVFormatWriter::StreamCookie::Init()\n");
+	TRACE("AVFormatWriter::StreamCookie::Init() (Yes, New)\n");
 
 	BAutolock _(fStreamLock);
 
@@ -114,16 +115,26 @@
 		return B_ERROR;
 	}
 
+//	TRACE("  fStream->codec: %p\n", fStream->codec);
+	// TODO: This is a hack for now! Use avcodec_find_encoder_by_name()
+	// or something similar...
+	fStream->codec->codec_id = (CodecID)codecInfo->sub_id;
+
 	// Setup the stream according to the media format...
 	if (format->type == B_MEDIA_RAW_VIDEO) {
-		avcodec_get_context_defaults2(fStream->codec, CODEC_TYPE_VIDEO);
+		fStream->codec->codec_type = CODEC_TYPE_VIDEO;
+#if GET_CONTEXT_DEFAULTS
+// NOTE: API example does not do this:
+		avcodec_get_context_defaults(fStream->codec);
+#endif
 		// frame rate
 		fStream->codec->time_base.den = (int)format->u.raw_video.field_rate;
 		fStream->codec->time_base.num = 1;
-		fStream->r_frame_rate.den = (int)format->u.raw_video.field_rate;
-		fStream->r_frame_rate.num = 1;
-		fStream->time_base.den = (int)format->u.raw_video.field_rate;
-		fStream->time_base.num = 1;
+// NOTE: API example does not do this:
+//		fStream->r_frame_rate.den = (int)format->u.raw_video.field_rate;
+//		fStream->r_frame_rate.num = 1;
+//		fStream->time_base.den = (int)format->u.raw_video.field_rate;
+//		fStream->time_base.num = 1;
 		// video size
 		fStream->codec->width = format->u.raw_video.display.line_width;
 		fStream->codec->height = format->u.raw_video.display.line_count;
@@ -142,8 +153,26 @@
 		fStream->codec->sample_aspect_ratio = fStream->sample_aspect_ratio;
 		// TODO: Don't hard code this...
 		fStream->codec->pix_fmt = PIX_FMT_YUV420P;
+
+		// Some formats want stream headers to be separate
+		if ((fContext->oformat->flags & AVFMT_GLOBALHEADER) != 0)
+			fStream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+
+		fCalculatePTS = true;
 	} else if (format->type == B_MEDIA_RAW_AUDIO) {
-		avcodec_get_context_defaults2(fStream->codec, CODEC_TYPE_AUDIO);
+		fStream->codec->codec_type = CODEC_TYPE_AUDIO;
+#if GET_CONTEXT_DEFAULTS
+// NOTE: API example does not do this:
+		avcodec_get_context_defaults(fStream->codec);
+#endif
+		// frame rate
+		fStream->codec->sample_rate = (int)format->u.raw_audio.frame_rate;
+// NOTE: API example does not do this:
+//		fStream->codec->time_base.den = (int)format->u.raw_audio.frame_rate;
+//		fStream->codec->time_base.num = 1;
+//		fStream->time_base.den = (int)format->u.raw_audio.frame_rate;
+//		fStream->time_base.num = 1;
+
 		// channels
 		fStream->codec->channels = format->u.raw_audio.channel_count;
 		switch (format->u.raw_audio.format) {
@@ -201,22 +230,14 @@
 			// The bits match 1:1 for media_multi_channels and FFmpeg defines.
 			fStream->codec->channel_layout = format->u.raw_audio.channel_mask;
 		}
-		// frame rate
-		fStream->codec->sample_rate = (int)format->u.raw_audio.frame_rate;
-		fStream->codec->time_base.den = (int)format->u.raw_audio.frame_rate;
-		fStream->codec->time_base.num = 1;
-		fStream->time_base.den = (int)format->u.raw_audio.frame_rate;
-		fStream->time_base.num = 1;
+
+		fCalculatePTS = false;
 	}
 
 	TRACE("  stream->time_base: (%d/%d), codec->time_base: (%d/%d))\n",
 		fStream->time_base.num, fStream->time_base.den,
 		fStream->codec->time_base.num, fStream->codec->time_base.den);
 
-	// TODO: This is a hack for now! Use avcodec_find_encoder_by_name()
-	// or something similar...
-	fStream->codec->codec_id = (CodecID)codecInfo->sub_id;
-
 	return B_OK;
 }
 
@@ -236,14 +257,17 @@
 	fPacket.data = const_cast<uint8_t*>((const uint8_t*)chunkBuffer);
 	fPacket.size = chunkSize;
 
-	fPacket.pts = (encodeInfo->start_time
-		* fStream->time_base.den / fStream->time_base.num) / 1000000;
-	TRACE_PACKET("  PTS: %lld  (stream->time_base: (%d/%d), "
-		"codec->time_base: (%d/%d))\n", fPacket.pts,
-		fStream->time_base.num, fStream->time_base.den,
-		fStream->codec->time_base.num, fStream->codec->time_base.den);
+	if (fCalculatePTS) {
+		fPacket.pts = (encodeInfo->start_time
+			* fStream->time_base.den / fStream->time_base.num) / 1000000;
+		TRACE_PACKET("  PTS: %lld  (stream->time_base: (%d/%d), "
+			"codec->time_base: (%d/%d))\n", fPacket.pts,
+			fStream->time_base.num, fStream->time_base.den,
+			fStream->codec->time_base.num, fStream->codec->time_base.den);
+	}
 
 // From ffmpeg.c::do_audio_out():
+// TODO:
 //	if (enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
 //		fPacket.pts = av_rescale_q(enc->coded_frame->pts,
 //		enc->time_base, ost->st->time_base);
@@ -299,6 +323,17 @@
 {
 	TRACE("AVFormatWriter::~AVFormatWriter\n");
 
+	// Free the streams and close the AVCodecContexts
+    for(unsigned i = 0; i < fContext->nb_streams; i++) {
+#if OPEN_CODEC_CONTEXT
+		// We only need to close the AVCodecContext when we opened it.
+		// This is experimental, see WriteHeader().
+		avcodec_close(fContext->streams[i]->codec);
+#endif
+		av_freep(&fContext->streams[i]->codec);
+		av_freep(&fContext->streams[i]);
+    }
+
 	av_free(fContext);
 
 	delete[] fIOBuffer;
@@ -365,8 +400,24 @@
 	if (fHeaderWritten)
 		return B_NOT_ALLOWED;
 
+	// According to output_example.c, the output parameters must be set even
+	// if none are specified. In the example, this call is used after the
+	// streams have been created.
+	if (av_set_parameters(fContext, NULL) < 0)
+		return B_ERROR;
+
 	for (unsigned i = 0; i < fContext->nb_streams; i++) {
 		AVStream* stream = fContext->streams[i];
+#if OPEN_CODEC_CONTEXT
+		// NOTE: Experimental, this should not be needed. Especially, since
+		// we have no idea (in the future) what CodecID some encoder uses,
+		// it may be an encoder from a different plugin.
+		AVCodecContext* codecContext = stream->codec;
+		AVCodec* codec = avcodec_find_encoder(codecContext->codec_id);
+		if (codec == NULL || avcodec_open(codecContext, codec) < 0) {
+			TRACE("  stream[%u] - failed to open AVCodecContext\n", i);
+		}
+#endif
 		TRACE("  stream[%u] time_base: (%d/%d), codec->time_base: (%d/%d)\n",
 			i, stream->time_base.num, stream->time_base.den,
 			stream->codec->time_base.num, stream->codec->time_base.den);
@@ -424,6 +475,9 @@
 {
 	TRACE("AVFormatWriter::AllocateCookie()\n");
 
+	if (fHeaderWritten)
+		return B_NOT_ALLOWED;
+
 	BAutolock _(fStreamLock);
 
 	if (_cookie == NULL)



From axeld at pinc-software.de  Mon Aug  3 23:36:24 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 03 Aug 2009 23:36:24 +0200 CEST
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
 headers/os/interface headers/private/binary_compatibility
 headers/private/interface src/kits/interface src/tests/kits/interface
In-Reply-To: <20090803220115.959.2@knochen-vm.localdomain>
Message-ID: <52621245669-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> On 2009-08-03 at 18:22:22 [+0200], Axel D?rfler <axeld at pinc-software.de> 
> > wrote:
> > It is related indeed - GCC4 software using BViews need to be
> > recompiled, only the GCC2 compatibility is retained.
> I think in cases like this we should just introduce the gcc 4 
> compatility 
> symbol for the time being, so that the optional packages don't just 
> break, 
> and remove it again after branching for the release, which would be 
> the 
> point when all optional packages need to be rebuilt anyway.

Yes, a temporary work-around would be a good solution. I forgot about 
GCC4 when I did that change, otherwise I would have mentioned it in the 
commit message at least.

Bye,
   Axel.



From axeld at pinc-software.de  Mon Aug  3 23:37:34 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 03 Aug 2009 23:37:34 +0200 CEST
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
 headers/os/interface headers/private/binary_compatibility
 headers/private/interface src/kits/interface src/tests/kits/interface
In-Reply-To: <20090804001355.3567.5@bepc.1249330610.fake>
Message-ID: <52691451024-BeMail@zon>

Stephan Assmus <superstippi at gmx.de> wrote:
> On 2009-08-03 at 22:05:13 [+0200], Rene Gollent <anevilyak at gmail.com> 
> wrote:
> > On Mon, Aug 3, 2009 at 3:01 PM, Ingo Weinhold<ingo_weinhold at gmx.de> 
> > wrote:
> > > I think in cases like this we should just introduce the gcc 4 
> > > compatility symbol for the time being, so that the optional 
> > > packages 
> > > don't just break, and remove it again after branching for the 
> > > release, 
> > > which would be the point when all optional packages need to be 
> > > rebuilt 
> > > anyway.
> > Why is an app even linking to one of the ReservedVirtual symbols?
> That's what I am thinking, too. I have not yet upgraded to the 
> revision 
> after the BToolTip introduction, but I am wondering if WonderBrush is 
> affected as well (GCC2, but built on Haiku).

As I said, for GCC2 the compatibility is retained - it doesn't matter 
where it has been compiled.
The virtuals are obviously used to build the vtable of subclasses of 
BView.

Bye,
   Axel.



From axeld at pinc-software.de  Mon Aug  3 23:48:44 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 03 Aug 2009 23:48:44 +0200 CEST
Subject: [Haiku-commits] r32076 - in haiku/trunk:
 headers/private/kernel/boot src/system/boot/loader
 src/system/boot/platform/atari_m68k src/system/boot/platform/bios_ia32
 src/system/boot/platform/openfirmware
In-Reply-To: <1973760389-BeMail@laptop>
Message-ID: <53361267687-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> > For what? I understand what you can do with this, I just don't see 
> > the point.
> > There are no settings besides the kernel settings last time I 
> > looked 
> > at, also.
> - vesa default mode,

Which is already part of the current settings.

> - presetting a network interface, or even a vpn,
> - forcing keymap to match the one passed to qemu (for vnc),
> - setting the name of a script/app/test to run at boot...
> 
> and those using grub could have more than 1 menu entries with 
> different 
> profiles.
> Like an "autodemo" profile that would start videos & GL demos at boot 
> :D

For which they need to change the image anyway, as otherwise that stuff 
is not supported.
Even if it's not completely useless, it has a very limited use, and 
will probably never be used by more than 3 people. You included ;-)

Anyway, I'm mostly worried because our boot loader (incl. the boot 
modules) is already too fat to fit onto an 1.44 MB boot image, and it 
seems this prevents the CD from booting on certain hardware.
We should really try to restrict it to 1.44 MB if at all possible - 
multiboot support doesn't take much space, granted, but it doesn't 
really bring anything valuable either to the table. Either way, that's 
an issue to be solved.

Bye,
   Axel.



From bga at mail.berlios.de  Mon Aug  3 23:54:26 2009
From: bga at mail.berlios.de (bga at mail.berlios.de)
Date: Mon, 3 Aug 2009 23:54:26 +0200
Subject: [Haiku-commits] r32104 - haiku/trunk/src/preferences/screen
Message-ID: <200908032154.n73LsQTr005325@sheep.berlios.de>

Author: bga
Date: 2009-08-03 23:54:14 +0200 (Mon, 03 Aug 2009)
New Revision: 32104
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32104&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenWindow.cpp
Log:
- Fix small typo.

Is it intentional that Horizontal Frequency is reported as being KHz while
Vertical Frequency is reported as being Hz?



Modified: haiku/trunk/src/preferences/screen/ScreenWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-03 21:32:03 UTC (rev 32103)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-03 21:54:14 UTC (rev 32104)
@@ -1116,7 +1116,7 @@
 		&& info.min_vertical_frequency != 0
 		&& info.max_pixel_clock != 0) {
 		snprintf(text, sizeof(text), "Horizonal Frequency:\t%lu - %lu kHz\n"
-			"VerticalFrequency:\t%lu - %lu Hz\n\n"
+			"Vertical Frequency:\t%lu - %lu Hz\n\n"
 			"Maximum Pixel Clock:\t%g MHz", info.min_horizontal_frequency,
 			info.max_horizontal_frequency, info.min_vertical_frequency,
 			info.max_vertical_frequency, info.max_pixel_clock / 1000.0);



From stippi at mail.berlios.de  Tue Aug  4 00:53:55 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 4 Aug 2009 00:53:55 +0200
Subject: [Haiku-commits] r32105 - in
	haiku/trunk/src/add-ons/media/plugins/ffmpeg: . libavcodec
Message-ID: <200908032253.n73MrtF8028292@sheep.berlios.de>

Author: stippi
Date: 2009-08-04 00:53:52 +0200 (Tue, 04 Aug 2009)
New Revision: 32105
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32105&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
Log:
Now supports encoded audio. Added Dolby Digital (AC-3) encoding to test this.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-03 21:54:14 UTC (rev 32104)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-03 22:53:52 UTC (rev 32105)
@@ -9,6 +9,7 @@
 #include <new>
 
 #include <stdio.h>
+#include <string.h>
 
 extern "C" {
 	#include "rational.h"
@@ -46,9 +47,11 @@
 	TRACE("AVCodecEncoder::AVCodecEncoder()\n");
 
 	fCodec = avcodec_find_encoder((enum CodecID)codecID);
-	TRACE("  found AVCodec: %p\n", fCodec);
+	TRACE("  found AVCodec for %lu: %p\n", codecID, fCodec);
 
 	memset(&fInputFormat, 0, sizeof(media_format));
+
+	av_fifo_init(&fAudioFifo, 0);
 }
 
 
@@ -337,63 +340,81 @@
 	size_t bufferSize = frameCount * inputFrameSize;
 	bufferSize = min_c(bufferSize, kDefaultChunkBufferSize);
 
-	while (frameCount > 0) {
-		if (frameCount < fContext->frame_size) {
-			TRACE("  ERROR: too few frames left! (left: %lld, needed: %d)\n",
-				frameCount, fContext->frame_size);
-			// TODO: Handle this some way. Maybe use an av_fifo to buffer data?
-			return B_ERROR;
-		}
+	if (fContext->frame_size > 1) {
+		// Encoded audio. Things work differently from raw audio. We need
+		// the fAudioFifo to pipe data.
+		if (av_fifo_realloc2(&fAudioFifo,
+				av_fifo_size(&fAudioFifo) + bufferSize) < 0) {
+			TRACE("  av_fifo_realloc2() failed\n");
+            return B_NO_MEMORY;
+        }
+        av_fifo_generic_write(&fAudioFifo, const_cast<uint8*>(buffer),
+        	bufferSize, NULL);
 
-		int chunkFrames = fContext->frame_size;
+		int frameBytes = fContext->frame_size * inputFrameSize;
+		uint8* tempBuffer = new(std::nothrow) uint8[frameBytes];
+		if (tempBuffer == NULL)
+			return B_NO_MEMORY;
 
-		TRACE("  frames left: %lld, chunk frames: %d\n",
-			frameCount, chunkFrames);
+		// Encode as many chunks as can be read from the FIFO.
+		while (av_fifo_size(&fAudioFifo) >= frameBytes) {
+			av_fifo_read(&fAudioFifo, tempBuffer, frameBytes);
 
-		// Encode one audio chunk/frame.
-		int usedBytes = avcodec_encode_audio(fContext, fChunkBuffer,
-			bufferSize, reinterpret_cast<const short*>(buffer));
-
-		if (usedBytes < 0) {
-			TRACE("  avcodec_encode_video() failed: %d\n", usedBytes);
-			return B_ERROR;
+			ret = _EncodeAudio(tempBuffer, frameBytes, fContext->frame_size,
+				info);
+			if (ret != B_OK)
+				break;
 		}
+	} else {
+		// Raw audio. The number of bytes returned from avcodec_encode_audio()
+		// is always the same as the number of input bytes.
+		return _EncodeAudio(buffer, bufferSize, frameCount,
+			info);
+	}
 
-		// Maybe we need to use this PTS to calculate start_time:
-		if (fContext->coded_frame->pts != kNoPTSValue) {
-			TRACE("  codec frame PTS: %lld (codec time_base: %d/%d)\n",
-				fContext->coded_frame->pts, fContext->time_base.num,
-				fContext->time_base.den);
-		} else {
-			TRACE("  codec frame PTS: N/A (codec time_base: %d/%d)\n",
-				fContext->time_base.num, fContext->time_base.den);
-		}
+	return ret;
+}
 
-		// Setup media_encode_info, most important is the time stamp.
-		info->start_time = (bigtime_t)(fFramesWritten * 1000000LL
-			/ fInputFormat.u.raw_audio.frame_rate);
 
-		// Write the chunk
-		ret = WriteChunk(fChunkBuffer, usedBytes, info);
-		if (ret != B_OK)
-			break;
+status_t
+AVCodecEncoder::_EncodeAudio(const uint8* buffer, size_t bufferSize,
+	int64 frameCount, media_encode_info* info)
+{
+	// Encode one audio chunk/frame. The bufferSize has already been adapted
+	// to the needed size for fContext->frame_size, or we are writing raw
+	// audio.
+	int usedBytes = avcodec_encode_audio(fContext, fChunkBuffer,
+		bufferSize, reinterpret_cast<const short*>(buffer));
 
-		size_t framesWritten = usedBytes / inputFrameSize;
-		if (chunkFrames == 1) {
-			// For PCM data:
-			framesWritten = usedBytes / inputFrameSize;
-		} else {
-			// For encoded audio:
-			framesWritten = chunkFrames * inputFrameSize;
-		}
+	if (usedBytes < 0) {
+		TRACE("  avcodec_encode_video() failed: %d\n", usedBytes);
+		return B_ERROR;
+	}
 
-		// Skip to next chunk of buffer.
-		fFramesWritten += framesWritten;
-		frameCount -= framesWritten;
-		buffer += usedBytes;
+	// Maybe we need to use this PTS to calculate start_time:
+	if (fContext->coded_frame->pts != kNoPTSValue) {
+		TRACE("  codec frame PTS: %lld (codec time_base: %d/%d)\n",
+			fContext->coded_frame->pts, fContext->time_base.num,
+			fContext->time_base.den);
+	} else {
+		TRACE("  codec frame PTS: N/A (codec time_base: %d/%d)\n",
+			fContext->time_base.num, fContext->time_base.den);
 	}
 
-	return ret;
+	// Setup media_encode_info, most important is the time stamp.
+	info->start_time = (bigtime_t)(fFramesWritten * 1000000LL
+		/ fInputFormat.u.raw_audio.frame_rate);
+
+	// Write the chunk
+	status_t ret = WriteChunk(fChunkBuffer, usedBytes, info);
+	if (ret != B_OK) {
+		TRACE("  error writing chunk: %s\n", strerror(ret));
+		return ret;
+	}
+
+	fFramesWritten += frameCount;
+
+	return B_OK;
 }
 
 
@@ -450,8 +471,10 @@
 
 		// Write the chunk
 		ret = WriteChunk(fChunkBuffer, usedBytes, info);
-		if (ret != B_OK)
+		if (ret != B_OK) {
+			TRACE("  error writing chunk: %s\n", strerror(ret));
 			break;
+		}
 
 		// Skip to the next frame (but usually, there is only one to encode
 		// for video).

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h	2009-08-03 21:54:14 UTC (rev 32104)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h	2009-08-03 22:53:52 UTC (rev 32105)
@@ -11,6 +11,7 @@
 extern "C" {
 	#include "avcodec.h"
 	#include "swscale.h"
+	#include "libavutil/fifo.h"
 }
 
 #include "EncoderPlugin.h"
@@ -36,10 +37,17 @@
 	virtual status_t			Encode(const void* buffer, int64 frameCount,
 									media_encode_info* info);
 
+	// TODO: Turns out we need Flush() after all. We buffer encoded audio
+	// in a FIFO, since the user suggested buffer size may not fit the
+	// codec buffer size.
+
 private:
 			status_t			_EncodeAudio(const void* buffer,
 									int64 frameCount,
 									media_encode_info* info);
+			status_t			_EncodeAudio(const uint8* buffer,
+									size_t bufferSize, int64 frameCount,
+									media_encode_info* info);
 
 			status_t			_EncodeVideo(const void* buffer,
 									int64 frameCount,
@@ -54,11 +62,15 @@
 			AVCodecContext*		fContext;
 			bool				fCodecInitDone;
 
+			// For video (color space conversion):
 			AVPicture			fSrcFrame;
 			AVPicture			fDstFrame;
 			AVFrame*			fFrame;
 			SwsContext*			fSwsContext;
 
+			// For encoded audio:
+			AVFifoBuffer		fAudioFifo;
+
 			int64				fFramesWritten;
 
 			uint8*				fChunkBuffer;

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp	2009-08-03 21:54:14 UTC (rev 32104)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp	2009-08-03 22:53:52 UTC (rev 32105)
@@ -103,7 +103,7 @@
 AVFormatWriter::StreamCookie::Init(const media_format* format,
 	const media_codec_info* codecInfo)
 {
-	TRACE("AVFormatWriter::StreamCookie::Init() (Yes, New)\n");
+	TRACE("AVFormatWriter::StreamCookie::Init()\n");
 
 	BAutolock _(fStreamLock);
 

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp	2009-08-03 21:54:14 UTC (rev 32104)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp	2009-08-03 22:53:52 UTC (rev 32105)
@@ -59,6 +59,18 @@
 		B_ANY_FORMAT_FAMILY,
 		B_MEDIA_RAW_AUDIO,
 		B_MEDIA_ENCODED_AUDIO
+	},
+	{
+		{
+			"Dolby Digital (AC-3)",
+			"ac3",
+			0,
+			CODEC_ID_AC3,
+			{ 0 }
+		},
+		B_ANY_FORMAT_FAMILY,
+		B_MEDIA_RAW_AUDIO,
+		B_MEDIA_ENCODED_AUDIO
 	}
 };
 

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-03 21:54:14 UTC (rev 32104)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-03 22:53:52 UTC (rev 32105)
@@ -431,7 +431,7 @@
 #define CONFIG_WMV2_ENCODER 0
 #define CONFIG_ZLIB_ENCODER 0
 #define CONFIG_ZMBV_ENCODER 0
-#define CONFIG_AC3_ENCODER 0
+#define CONFIG_AC3_ENCODER 1
 #define CONFIG_ALAC_ENCODER 0
 #define CONFIG_FLAC_ENCODER 0
 #define CONFIG_MP2_ENCODER 0

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile	2009-08-03 21:54:14 UTC (rev 32104)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile	2009-08-03 22:53:52 UTC (rev 32105)
@@ -29,6 +29,7 @@
 	ac3_parser.c
 	ac3dec.c
 	ac3dec_data.c
+	ac3enc.c
 	ac3tab.c
 	acelp_filters.c
 	acelp_pitch_delay.c



From stippi at mail.berlios.de  Tue Aug  4 00:59:27 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 4 Aug 2009 00:59:27 +0200
Subject: [Haiku-commits] r32106 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg
Message-ID: <200908032259.n73MxRN5002028@sheep.berlios.de>

Author: stippi
Date: 2009-08-04 00:59:23 +0200 (Tue, 04 Aug 2009)
New Revision: 32106
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32106&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
Log:
Free the AVFifoBuffer data in the destructor...


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-03 22:53:52 UTC (rev 32105)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-03 22:59:23 UTC (rev 32106)
@@ -64,6 +64,8 @@
 
 	sws_freeContext(fSwsContext);
 
+	av_fifo_free(&fAudioFifo);
+
 	avpicture_free(&fDstFrame);
 	// NOTE: Do not use avpicture_free() on fSrcFrame!! We fill the picture
 	// data on the file with the media buffer data passed to Encode().



From anevilyak at gmail.com  Tue Aug  4 01:35:29 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Mon, 3 Aug 2009 18:35:29 -0500
Subject: [Haiku-commits] r32104 - haiku/trunk/src/preferences/screen
In-Reply-To: <200908032154.n73LsQTr005325@sheep.berlios.de>
References: <200908032154.n73LsQTr005325@sheep.berlios.de>
Message-ID: <f019d2f30908031635i1b57f4e7y53b77b5dfa5a9bc6@mail.gmail.com>

On Mon, Aug 3, 2009 at 4:54 PM, <bga at mail.berlios.de> wrote:
>
> Is it intentional that Horizontal Frequency is reported as being KHz while
> Vertical Frequency is reported as being Hz?

Yes, the horizontal frequency is in fact a measure of scan frequency,
ergo number of pixels scanned per second. (+ roughly 5% for the
overhead of moving the beam back to the left side after each line).
Another way of looking at it is if you divide the horizontal scan
frequency by (1.05 * number of horizontal lines), you will get the
corresponding vertical refresh.

Regards,

Rene


From stefano.ceccherini at gmail.com  Tue Aug  4 08:25:40 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Tue, 4 Aug 2009 08:25:40 +0200
Subject: [Haiku-commits] r32087 - haiku/trunk/src/servers/app
In-Reply-To: <200908031650.n73Go5ZQ012985@sheep.berlios.de>
References: <200908031650.n73Go5ZQ012985@sheep.berlios.de>
Message-ID: <894b9700908032325n3ca4c9ebsbeecd114eb1292cf@mail.gmail.com>

2009/8/3  <jackburton at mail.berlios.de>:

> +public:
> ? ? ? ? ? ? ? ? ? ? ? ?void ? ? ? ? ? ? ? ? ? ? ? ? ? ?_UpdateCurrentDrawingRegion();
> -
> +private:

Sorry, this was a leftover and wasn't meant to be committed.
I'll remove it again later, if no one beats me.


From stippi at mail.berlios.de  Tue Aug  4 09:21:26 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 4 Aug 2009 09:21:26 +0200
Subject: [Haiku-commits] r32107 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg
Message-ID: <200908040721.n747LQLC013616@sheep.berlios.de>

Author: stippi
Date: 2009-08-04 09:21:22 +0200 (Tue, 04 Aug 2009)
New Revision: 32107
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32107&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
Log:
I have no idea how that ended up there... set the decoded audio format correctly
again. Should fix playback of any file where the ffmpeg plugin was responsible
for sound. (The symptoms were a crash into the debugger because of an unspecified
audio format...)


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp	2009-08-03 22:59:23 UTC (rev 32106)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp	2009-08-04 07:21:22 UTC (rev 32107)
@@ -334,7 +334,7 @@
 		= fInputFormat.u.encoded_audio.output.frame_rate;
 	outputAudioFormat.channel_count
 		= fInputFormat.u.encoded_audio.output.channel_count;
-	outputAudioFormat.format = fInputFormat.u.encoded_audio.output.format;
+	outputAudioFormat.format = media_raw_audio_format::B_AUDIO_SHORT;
 	outputAudioFormat.buffer_size
 		= 1024 * fInputFormat.u.encoded_audio.output.channel_count;
 	inOutFormat->type = B_MEDIA_RAW_AUDIO;



From stippi at mail.berlios.de  Tue Aug  4 09:58:37 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 4 Aug 2009 09:58:37 +0200
Subject: [Haiku-commits] r32108 - haiku/trunk/src/kits/media
Message-ID: <200908040758.n747wb8v019180@sheep.berlios.de>

Author: stippi
Date: 2009-08-04 09:58:32 +0200 (Tue, 04 Aug 2009)
New Revision: 32108
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32108&view=rev

Modified:
   haiku/trunk/src/kits/media/MediaFile.cpp
Log:
Don't leak the MediaWriter instance.


Modified: haiku/trunk/src/kits/media/MediaFile.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaFile.cpp	2009-08-04 07:21:22 UTC (rev 32107)
+++ haiku/trunk/src/kits/media/MediaFile.cpp	2009-08-04 07:58:32 UTC (rev 32108)
@@ -391,14 +391,14 @@
 	fTrackNum = 0;
 	fTrackList = NULL;
 	fExtractor = NULL;
+	fWriter = NULL;
+	fWriterID = 0;
 	fErr = B_OK;
 	fDeleteSource = false;
 
 	// not used so far:
 	fEncoderMgr = NULL;
 	fWriterMgr = NULL;
-	fWriter = NULL;
-	fWriterID = 0;
 	fFileClosed = false;
 }
 
@@ -412,6 +412,8 @@
 	fTrackNum = 0;
 	delete fExtractor;
 	fExtractor = NULL;
+	delete fWriter;
+	fWriter = NULL;
 	if (fDeleteSource) {
 		delete fSource;
 		fSource = NULL;



From pulkomandy at mail.berlios.de  Tue Aug  4 10:11:57 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Tue, 4 Aug 2009 10:11:57 +0200
Subject: [Haiku-commits] r32109 - in
	haiku/branches/components/gsoc-locale-kit:
	headers/libs/icu/unicode src/libs/icu/source/i18n
Message-ID: <200908040811.n748BvSN020308@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-04 10:11:54 +0200 (Tue, 04 Aug 2009)
New Revision: 32109
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32109&view=rev

Added:
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/basictz.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/bms.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/bmsearch.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/calendar.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/choicfmt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/coleitr.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/coll.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/colldata.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/curramt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/currpinf.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/currunit.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/datefmt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dcfmtsym.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/decimfmt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dtfmtsym.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dtitvfmt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dtitvinf.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dtptngen.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dtrule.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/fieldpos.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/fmtable.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/format.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/gregocal.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/measfmt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/measunit.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/measure.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/msgfmt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/numfmt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/numsys.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/plurfmt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/plurrule.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/rbnf.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/rbtz.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/regex.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/search.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/simpletz.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/smpdtfmt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/sortkey.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/stsearch.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tblcoll.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/timezone.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tmunit.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tmutamt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tmutfmt.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/translit.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tzrule.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tztrans.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ucal.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ucol.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ucoleitr.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ucsdet.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ucurr.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/udat.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/udatpg.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ulocdata.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/umsg.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/unirepl.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/unum.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/uregex.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/usearch.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/uspoof.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/utmscale.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/utrans.h
   haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/vtzone.h
Removed:
   haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/
Log:
Move icu i18n headers to the proper directory.


Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/basictz.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/basictz.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/bms.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/bms.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/bmsearch.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/bmsearch.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/calendar.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/calendar.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/choicfmt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/choicfmt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/coleitr.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/coleitr.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/coll.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/coll.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/colldata.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/colldata.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/curramt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/curramt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/currpinf.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/currpinf.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/currunit.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/currunit.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/datefmt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/datefmt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dcfmtsym.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/dcfmtsym.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/decimfmt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/decimfmt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dtfmtsym.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/dtfmtsym.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dtitvfmt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/dtitvfmt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dtitvinf.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/dtitvinf.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dtptngen.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/dtptngen.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/dtrule.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/dtrule.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/fieldpos.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/fieldpos.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/fmtable.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/fmtable.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/format.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/format.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/gregocal.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/gregocal.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/measfmt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/measfmt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/measunit.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/measunit.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/measure.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/measure.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/msgfmt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/msgfmt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/numfmt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/numfmt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/numsys.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/numsys.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/plurfmt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/plurfmt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/plurrule.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/plurrule.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/rbnf.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/rbnf.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/rbtz.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/rbtz.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/regex.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/regex.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/search.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/search.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/simpletz.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/simpletz.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/smpdtfmt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/smpdtfmt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/sortkey.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/sortkey.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/stsearch.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/stsearch.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tblcoll.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/tblcoll.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/timezone.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/timezone.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tmunit.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/tmunit.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tmutamt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/tmutamt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tmutfmt.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/tmutfmt.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/translit.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/translit.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tzrule.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/tzrule.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/tztrans.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/tztrans.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ucal.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/ucal.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ucol.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/ucol.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ucoleitr.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/ucoleitr.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ucsdet.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/ucsdet.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ucurr.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/ucurr.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/udat.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/udat.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/udatpg.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/udatpg.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/ulocdata.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/ulocdata.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/umsg.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/umsg.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/unirepl.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/unirepl.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/unum.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/unum.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/uregex.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/uregex.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/usearch.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/usearch.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/uspoof.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/uspoof.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/utmscale.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/utmscale.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/utrans.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/utrans.h)

Copied: haiku/branches/components/gsoc-locale-kit/headers/libs/icu/unicode/vtzone.h (from rev 32107, haiku/branches/components/gsoc-locale-kit/src/libs/icu/source/i18n/unicode/vtzone.h)



From mmu_man at mail.berlios.de  Tue Aug  4 11:00:22 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Tue, 4 Aug 2009 11:00:22 +0200
Subject: [Haiku-commits] r32110 - haiku/trunk/src/system/boot/loader
Message-ID: <200908040900.n7490MhG000165@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-04 11:00:10 +0200 (Tue, 04 Aug 2009)
New Revision: 32110
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32110&view=rev

Modified:
   haiku/trunk/src/system/boot/loader/Jamfile
   haiku/trunk/src/system/boot/loader/partitions.cpp
Log:
Remove file map disk support by default, it's not used anyway, and we'll use layers for CD anyway. Doesn't spare that many bytes though...


Modified: haiku/trunk/src/system/boot/loader/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/loader/Jamfile	2009-08-04 08:11:54 UTC (rev 32109)
+++ haiku/trunk/src/system/boot/loader/Jamfile	2009-08-04 09:00:10 UTC (rev 32110)
@@ -19,6 +19,7 @@
 
 		BOOT_SUPPORT_FILE_SYSTEM_BFS
 		BOOT_SUPPORT_FILE_SYSTEM_TARFS
+		#BOOT_SUPPORT_FILE_MAP_DISK
 	;
 
 	# Add architecture specific partition/file system modules
@@ -51,7 +52,6 @@
 KernelStaticLibrary boot_loader :
 	main.cpp
 	vfs.cpp
-	FileMapDisk.cpp
 	RootFileSystem.cpp
 	partitions.cpp
 	heap.cpp
@@ -77,6 +77,7 @@
 # so that only the ones that are used will be included.
 
 KernelStaticLibrary boot_partitions :
+	FileMapDisk.cpp
 	amiga_rdb.cpp
 	apple.cpp
 	efi_gpt.cpp

Modified: haiku/trunk/src/system/boot/loader/partitions.cpp
===================================================================
--- haiku/trunk/src/system/boot/loader/partitions.cpp	2009-08-04 08:11:54 UTC (rev 32109)
+++ haiku/trunk/src/system/boot/loader/partitions.cpp	2009-08-04 09:00:10 UTC (rev 32110)
@@ -222,7 +222,6 @@
 status_t
 Partition::_Mount(file_system_module_info *module, Directory **_fileSystem)
 {
-	static int fileMapDiskDepth = 0;
 	TRACE(("%p Partition::_Mount check for file_system: %s\n",
 		this, module->pretty_name));
 
@@ -237,6 +236,8 @@
 
 		fIsFileSystem = true;
 
+#ifdef BOOT_SUPPORT_FILE_MAP_DISK
+		static int fileMapDiskDepth = 0;
 		// if we aren't already mounting an image
 		if (!fileMapDiskDepth++) {
 			// see if it contains an image file we could mount in turn
@@ -248,6 +249,7 @@
 			}
 		}
 		fileMapDiskDepth--;
+#endif
 
 		return B_OK;
 	}



From korli at users.berlios.de  Tue Aug  4 15:17:07 2009
From: korli at users.berlios.de (=?ISO-8859-1?B?Suly9G1lIER1dmFs?=)
Date: Tue, 4 Aug 2009 15:17:07 +0200
Subject: [Haiku-commits] r32107 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg
In-Reply-To: <200908040721.n747LQLC013616@sheep.berlios.de>
References: <200908040721.n747LQLC013616@sheep.berlios.de>
Message-ID: <c47b1d430908040617i721e2d32hf16fc7f741fa95c9@mail.gmail.com>

Hi Stephan,

2009/8/4  <stippi at mail.berlios.de>:
> Author: stippi
> Date: 2009-08-04 09:21:22 +0200 (Tue, 04 Aug 2009)
> New Revision: 32107
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32107&view=rev
>
> Modified:
>   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
> Log:
> I have no idea how that ended up there... set the decoded audio format correctly
> again. Should fix playback of any file where the ffmpeg plugin was responsible
> for sound. (The symptoms were a crash into the debugger because of an unspecified
> audio format...)

This is needed to play anything non 16bits (I checked with 24bits flac
files). Please revert, the problem might be located elsewhere.

Bye,
J?r?me


From ingo_weinhold at gmx.de  Tue Aug  4 15:41:42 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Tue, 04 Aug 2009 15:41:42 +0200
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
 headers/os/interface headers/private/binary_compatibility
 headers/private/interface src/kits/interface src/tests/kits/interface
In-Reply-To: <f019d2f30908031305vb53a464redc31a91a7dfe7a5@mail.gmail.com>
References: <33779194933-BeMail@zon>
	<20090803220115.959.2@knochen-vm.localdomain>
	<f019d2f30908031305vb53a464redc31a91a7dfe7a5@mail.gmail.com>
Message-ID: <20090804154142.352.1@knochen-vm.localdomain>


On 2009-08-03 at 22:05:13 [+0200], Rene Gollent <anevilyak at gmail.com> wrote:
> On Mon, Aug 3, 2009 at 3:01 PM, Ingo Weinhold<ingo_weinhold at gmx.de> wrote:
> > I think in cases like this we should just introduce the gcc 4 compatility
> > symbol for the time being, so that the optional packages don't just break,
> > and remove it again after branching for the release, which would be the
> > point when all optional packages need to be rebuilt anyway.
> 
> Why is an app even linking to one of the ReservedVirtual symbols?

That happens when you create a subclass. The compiler has to generate a 
vtable for your class, which contains slots for all virtual functions of the 
base classes (and those introduced in your class). Unless a virtual function 
is overridden, the respective slot is filled in with pointer to the function 
of the closest base class that implements this virtual function. In case of 
reserved slots, since no-one overrides them, that's always those _Reserve*() 
functions.

CU, Ingo


From axeld at mail.berlios.de  Tue Aug  4 16:35:11 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 4 Aug 2009 16:35:11 +0200
Subject: [Haiku-commits] r32111 - haiku/trunk/src/preferences/screen
Message-ID: <200908041435.n74EZBiG005997@sheep.berlios.de>

Author: axeld
Date: 2009-08-04 16:35:10 +0200 (Tue, 04 Aug 2009)
New Revision: 32111
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32111&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenMode.cpp
Log:
* Added more vendor entries, thanks to Brecht again for digging up another
  resource.


Modified: haiku/trunk/src/preferences/screen/ScreenMode.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-08-04 09:00:10 UTC (rev 32110)
+++ haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-08-04 14:35:10 UTC (rev 32111)
@@ -348,10 +348,14 @@
 		case 'ADI\0':
 			strcpy(info.vendor, "ADI MicroScan");
 			break;
+		case 'AAC\0':
 		case 'ACR\0':
 		case 'API\0':
 			strcpy(info.vendor, "Acer");
 			break;
+		case 'ACT\0':
+			strcpy(info.vendor, "Targa");
+			break;
 		case 'APP\0':
 			strcpy(info.vendor, "Apple");
 			break;
@@ -376,6 +380,12 @@
 		case 'DWE\0':
 			strcpy(info.vendor, "Daewoo");
 			break;
+		case 'ECS\0':
+			strcpy(info.vendor, "Elitegroup");
+			break;
+		case 'ELS\0':
+			strcpy(info.vendor, "ELSA");
+			break;
 		case 'EMA\0':
 			strcpy(info.vendor, "eMachines");
 			break;
@@ -384,7 +394,7 @@
 			strcpy(info.vendor, "Eizo");
 			break;
 		case 'EPI\0':
-			strcpy(info.vendor, "Envision Peripherals");
+			strcpy(info.vendor, "Envision");
 			break;
 		case 'FCM\0':
 			strcpy(info.vendor, "Funai Electronics");
@@ -424,6 +434,9 @@
 		case 'LPL\0':
 			strcpy(info.vendor, "LG Phillips");
 			break;
+		case 'LTN\0':
+			strcpy(info.vendor, "Lite-On");
+			break;
 		case 'MAX\0':
 			strcpy(info.vendor, "Maxdata");
 			break;
@@ -448,6 +461,9 @@
 		case 'NOK\0':
 			strcpy(info.vendor, "Nokia");
 			break;
+		case 'OQI\0':
+			strcpy(info.vendor, "Optiquest");
+			break;
 		case 'PHL\0':
 			strcpy(info.vendor, "Philips");
 			break;
@@ -457,6 +473,9 @@
 		case 'QDS\0':
 			strcpy(info.vendor, "Quanta Display");
 			break;
+		case 'REL\0':
+			strcpy(info.vendor, "Relisys");
+			break;
 		case 'SAM\0':
 			strcpy(info.vendor, "Samsung");
 			break;
@@ -472,6 +491,22 @@
 		case 'SNY\0':
 			strcpy(info.vendor, "Sony");
 			break;
+		case 'SPT\0':
+			strcpy(info.vendor, "Sceptre");
+			break;
+		case 'SRC\0':
+			strcpy(info.vendor, "Shamrock");
+			break;
+		case 'SUN\0':
+			strcpy(info.vendor, "Sun Microsystems");
+			break;
+		case 'TAT\0':
+			strcpy(info.vendor, "Tatung");
+			break;
+		case 'TOS\0':
+		case 'TSB\0':
+			strcpy(info.vendor, "Toshiba");
+			break;
 		case 'UNM\0':
 			strcpy(info.vendor, "Unisys");
 			break;
@@ -481,6 +516,9 @@
 		case 'VSC\0':
 			strcpy(info.vendor, "ViewSonic");
 			break;
+		case 'ZCM\0':
+			strcpy(info.vendor, "Zenith");
+			break;
 	}
 
 	// Remove extraneous vendor strings and whitespace



From superstippi at gmx.de  Tue Aug  4 16:36:11 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 04 Aug 2009 16:36:11 +0200
Subject: [Haiku-commits] r32107 -
 haiku/trunk/src/add-ons/media/plugins/ffmpeg
In-Reply-To: <c47b1d430908040617i721e2d32hf16fc7f741fa95c9@mail.gmail.com>
References: <200908040721.n747LQLC013616@sheep.berlios.de>
	<c47b1d430908040617i721e2d32hf16fc7f741fa95c9@mail.gmail.com>
Message-ID: <20090804163611.40925.6@bepc.1249388284.fake>


On 2009-08-04 at 15:17:07 [+0200], J?r?me Duval <korli at users.berlios.de> 
wrote:
> Hi Stephan,
> 
> 2009/8/4  <stippi at mail.berlios.de>:
> > Author: stippi
> > Date: 2009-08-04 09:21:22 +0200 (Tue, 04 Aug 2009) New Revision: 32107
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32107&view=rev
> >
> > Modified:
> >   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
> > Log:
> > I have no idea how that ended up there... set the decoded audio format 
> > correctly again. Should fix playback of any file where the ffmpeg 
> > plugin was responsible for sound. (The symptoms were a crash into the 
> > debugger because of an unspecified audio format...)
> 
> This is needed to play anything non 16bits (I checked with 24bits flac 
> files). Please revert, the problem might be located elsewhere.

Oh, so you changed that? I was puzzled why I changed that. The problem is 
that fInputFormat->u.raw_audio.format is nowhere set. So this would be 
unspecified. So the fInputFormat should have a wildcard there, and if you 
are saying that the BMediaTrack user should be able to set that, then the 
fix could be to check if the ioDecodedFormat has a wildcard, and specify 
the format only then. Does the rest of AVCodecDecoder actually handle 
anything other than 16bit audio?

Best regards,
-Stephan


From superstippi at gmx.de  Tue Aug  4 16:37:52 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 04 Aug 2009 16:37:52 +0200
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
 headers/os/interface headers/private/binary_compatibility
 headers/private/interface src/kits/interface src/tests/kits/interface
In-Reply-To: <20090804154142.352.1@knochen-vm.localdomain>
References: <33779194933-BeMail@zon>
	<20090803220115.959.2@knochen-vm.localdomain>
	<f019d2f30908031305vb53a464redc31a91a7dfe7a5@mail.gmail.com>
	<20090804154142.352.1@knochen-vm.localdomain>
Message-ID: <20090804163752.40953.7@bepc.1249388284.fake>


On 2009-08-04 at 15:41:42 [+0200], Ingo Weinhold <ingo_weinhold at gmx.de> 
wrote:
> 
> On 2009-08-03 at 22:05:13 [+0200], Rene Gollent <anevilyak at gmail.com> 
> wrote:
> > On Mon, Aug 3, 2009 at 3:01 PM, Ingo Weinhold<ingo_weinhold at gmx.de> 
> > wrote:
> > > I think in cases like this we should just introduce the gcc 4 
> > > compatility symbol for the time being, so that the optional packages 
> > > don't just break, and remove it again after branching for the 
> > > release, which would be the point when all optional packages need to 
> > > be rebuilt anyway.
> > 
> > Why is an app even linking to one of the ReservedVirtual symbols?
> 
> That happens when you create a subclass. The compiler has to generate a 
> vtable for your class, which contains slots for all virtual functions of 
> the base classes (and those introduced in your class). Unless a virtual 
> function is overridden, the respective slot is filled in with pointer to 
> the function of the closest base class that implements this virtual 
> function. In case of reserved slots, since no-one overrides them, that's 
> always those _Reserve*() functions.

And the actual problem is that we are not generating the code via an 
__GNU_C_ < 3 check?

Best regards,
-Stephan


From axeld at pinc-software.de  Tue Aug  4 16:49:20 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 04 Aug 2009 16:49:20 +0200 CEST
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
 headers/os/interface headers/private/binary_compatibility
 headers/private/interface src/kits/interface src/tests/kits/interface
In-Reply-To: <20090804163752.40953.7@bepc.1249388284.fake>
Message-ID: <26820219767-BeMail@zon>

Stephan Assmus <superstippi at gmx.de> wrote:
> And the actual problem is that we are not generating the code via an 
> __GNU_C_ < 3 check?

Since the code is mangled differently for GCC2 and 4, the replacement 
functions have a different signature; you would need to copy the 
Reserved11 from the GCC2 section, find out the mangling in GCC4, and 
give the function that new signature.

Bye,
   Axel.



From superstippi at gmx.de  Tue Aug  4 17:13:06 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 04 Aug 2009 17:13:06 +0200
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
 headers/os/interface headers/private/binary_compatibility
 headers/private/interface src/kits/interface src/tests/kits/interface
In-Reply-To: <26820219767-BeMail@zon>
References: <26820219767-BeMail@zon>
Message-ID: <20090804171306.1723.1@bepc.1249398692.fake>


On 2009-08-04 at 16:49:20 [+0200], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> Stephan Assmus <superstippi at gmx.de> wrote:
> > And the actual problem is that we are not generating the code via an 
> > __GNU_C_ < 3 check?
> 
> Since the code is mangled differently for GCC2 and 4, the replacement 
> functions have a different signature; you would need to copy the 
> Reserved11 from the GCC2 section, find out the mangling in GCC4, and give 
> the function that new signature.

Ah! That makes sense, sorry for not looking at the code myself. I thought I 
remembered we do that somewhere, which is probably true, but obviously not 
always.

Best regards,
-Stephan


From anevilyak at gmail.com  Tue Aug  4 17:23:25 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Tue, 4 Aug 2009 10:23:25 -0500
Subject: [Haiku-commits] r32078 - in haiku/trunk: headers/os/app
	headers/os/interface headers/private/binary_compatibility
	headers/private/interface src/kits/interface
	src/tests/kits/interface
In-Reply-To: <20090804154142.352.1@knochen-vm.localdomain>
References: <33779194933-BeMail@zon>
	<20090803220115.959.2@knochen-vm.localdomain>
	<f019d2f30908031305vb53a464redc31a91a7dfe7a5@mail.gmail.com>
	<20090804154142.352.1@knochen-vm.localdomain>
Message-ID: <f019d2f30908040823u10729aear1d3ff393352093d3@mail.gmail.com>

On Tue, Aug 4, 2009 at 8:41 AM, Ingo Weinhold<ingo_weinhold at gmx.de> wrote:
> That happens when you create a subclass. The compiler has to generate a
> vtable for your class, which contains slots for all virtual functions of the
> base classes (and those introduced in your class). Unless a virtual function
> is overridden, the respective slot is filled in with pointer to the function
> of the closest base class that implements this virtual function. In case of
> reserved slots, since no-one overrides them, that's always those _Reserve*()
> functions.

Aha. Thanks :)

Regards,

Rene


From stippi at mail.berlios.de  Tue Aug  4 18:25:26 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 4 Aug 2009 18:25:26 +0200
Subject: [Haiku-commits] r32112 - haiku/trunk/build/jam
Message-ID: <200908041625.n74GPQp6019078@sheep.berlios.de>

Author: stippi
Date: 2009-08-04 18:25:24 +0200 (Tue, 04 Aug 2009)
New Revision: 32112
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32112&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
   haiku/trunk/build/jam/ReleaseBuildProfiles
Log:
* Added small description to all OptionalPackages at the top.
* Replaced Pe GCC4 package with one that works again after the BToolTip
  addition.
* Disabled Firefox and Vision GCC4 packages for the time being, so that one
  at least gets a working hybrid installation.
* Added Clockwerk GCC2 and GCC4 packages. I also added it to the alpha
  release build profile, so that people testing the pre-alpha images have
  more easy access to it. I am not sure if it should stay there, since it may
  not be polished enough. Feedback welcome! :-)


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-08-04 14:35:10 UTC (rev 32111)
+++ haiku/trunk/build/jam/OptionalPackages	2009-08-04 16:25:24 UTC (rev 32112)
@@ -12,47 +12,48 @@
 
 
 # Available Optional Packages:
-#	APR
+#	APR					- support libraries used for example by SVN
 #	APR-util
-#	Beam
-#	BeBook
-#	BeHappy
-#	BeOSCompatibility
-#	BePDF
-#	Bluetooth
-#	CDRecord
-#	CLucene
-#	CVS
+#	Beam				- powerful native e-mail client
+#	BeBook				- the classic BeOS API documentation
+#	BeHappy				- special documentation (i.e. BeBook) browser
+#	BeOSCompatibility	- creates links within the system to support old apps
+#	BePDF				- native PDF reader
+#	Bluetooth			- experimental Haiku components for Bluetooth
+#	CDRecord			- the command line CD writing tools
+#	Clockwerk			- native audio/video compositing
+#	CLucene				- indexed file search
+#	CVS					- the version control system
 #	Development			- more complete dev environment (including autotools)
 #	DevelopmentBase		- basic development environment (gcc, headers, libs,...)
 #	DevelopmentMin		- development headers, libs, tools, from sources only
-#	Firefox
-#	KeymapSwitcher
-#	LibIconv
-#	LibLayout
-#	LibXML2
-#	Links
-#	Nano
-#	Neon
-#	NetSurf
-#	OpenSound
-#	OpenSSH
-#	OpenSSL
-#	P7zip
-#	Pe
-#	Perl
-#	Python
-#	Rsync
-#	SQLite
-#	Subversion
-#	Tar
-#	UserlandFS
-#	Vim
-#	Vision
-#	VLC
-#	Welcome
-#	WonderBrush
-#	Yasm
+#	Firefox				- the webbrowser
+#	KeymapSwitcher		- Desktop utility
+#	LibIconv			- text encoding conversion library
+#	LibLayout			- GCC2 package needed by some BeOS apps to compile
+#	LibXML2				- the XML support libary
+#	Links				- the web browser
+#	Nano				- the command line text editor
+#	Neon				- support libraries used for example by SVN
+#	NetSurf				- the web browser
+#	OpenSound			- additional audio driver package
+#	OpenSSH				- the secure shell
+#	OpenSSL				- secure sockets library
+#	P7zip				- file archiving utility
+#	Pe					- the powerful native Programmer's Editor
+#	Perl				- the scripting language
+#	Python				- the scripting language
+#	Rsync				- remote directory synchronization
+#	SQLite				- the database implementation
+#	Subversion			- the version control system
+#	Tar					- archiving utility
+#	UserlandFS			- aids native file system development (like FUSE)
+#	Vim					- the command line text editor
+#	Vision				- powerful native IRC client
+#	VLC					- the multi media player with native interface
+#	Welcome				- introductory documentation to Haiku
+#	WonderBrush			- native graphics application
+#	Yasm				- the assembler utility
 
 local baseURL = http://haiku-files.org/files/optional-packages ;
 
@@ -198,6 +199,28 @@
 }
 
 
+# Clockwerk
+if [ IsOptionalHaikuImagePackageAdded Clockwerk ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Clockwerk available for $(TARGET_ARCH)" ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-2009-08-04
+			: $(baseURL)/Clockwerk-0.0.1-x86-gcc4-2009-08-04.zip
+			:
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/Clockwerk/Clockwerk ;
+	} else {
+		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-2009-08-04
+			: $(baseURL)/Clockwerk-0.0.1-x86-gcc2-2009-08-04.zip
+			:
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/Clockwerk/Clockwerk ;
+	}
+}
+
+
 # CLucene
 if [ IsOptionalHaikuImagePackageAdded CLucene ] {
 	if $(TARGET_ARCH) != x86 {
@@ -205,7 +228,7 @@
 	} else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
 		Echo "No optional package CLucene available for GCC2" ;
 	} else {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11
 			: $(baseURL)/clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11.zip
 			:
@@ -375,16 +398,19 @@
 if [ IsOptionalHaikuImagePackageAdded Firefox ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage 
-			BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
-			: $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
- 			: apps
- 		;
- 		AddSymlinkToHaikuImage home config be Applications
-			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
-
-
+# TODO: Update BeZilla GCC4 build, this one is currently broken, because of
+# the BToolTip addition. At least the GCC2 build will work just fine on hybrid
+# installations.
+#	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+#		InstallOptionalHaikuImagePackage
+#			BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
+#			: $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
+# 			: apps
+# 		;
+# 		AddSymlinkToHaikuImage home config be Applications
+#			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+		Echo "No optional package Firefox available for GCC4" ;
 	} else {
 		InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218
 			: http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip
@@ -401,7 +427,7 @@
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31
 			:  $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip
 			:
@@ -409,7 +435,7 @@
 		AddSymlinkToHaikuImage home config be Desktop\ Applets
 			: /boot/common/bin/KeymapSwitcher ;
 	} else {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			KeymapSwitcher-1.2.3-x86-gcc2-2009-05-31
 			:  $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc2-2009-05-31.zip
 			:
@@ -600,8 +626,8 @@
 		Echo "No optional package Pe available for $(TARGET_ARCH)" ;
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
-			InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc4-2009-07-05
-				: $(baseURL)/Pe-2.4.2-x86-gcc4-2009-07-05.zip
+			InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc4-2009-08-04
+				: $(baseURL)/Pe-2.4.2-x86-gcc4-2009-08-04.zip
 			;
 		} else {
 			InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc2-2009-07-05
@@ -774,13 +800,18 @@
 if [ IsOptionalHaikuImagePackageAdded Vision ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Vision available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423
-			: $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip
-			: apps
-		;
-		AddSymlinkToHaikuImage home config be Applications
-			: /boot/apps/Vision-0.9.7-H-090423/Vision ;
+# TODO: Update Vision GCC4 build, this one is currently broken, because of
+# the BToolTip addition. At least the GCC2 build will work just fine on hybrid
+# installations.
+#	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+#		InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423
+#			: $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip
+#			: apps
+#		;
+#		AddSymlinkToHaikuImage home config be Applications
+#			: /boot/apps/Vision-0.9.7-H-090423/Vision ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+		Echo "No optional package Vision available for GCC4" ;
 	} else {
 		InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423
 			: $(baseURL)/Vision-0.9.7-H-x86-gcc2-2009-04-23.zip

Modified: haiku/trunk/build/jam/ReleaseBuildProfiles
===================================================================
--- haiku/trunk/build/jam/ReleaseBuildProfiles	2009-08-04 14:35:10 UTC (rev 32111)
+++ haiku/trunk/build/jam/ReleaseBuildProfiles	2009-08-04 16:25:24 UTC (rev 32112)
@@ -11,7 +11,8 @@
 		HAIKU_IMAGE_HOST_NAME = shredder ;
 		HAIKU_IMAGE_SIZE = 500 ;
 
-		AddOptionalHaikuImagePackages BePDF Firefox Pe Vision VLC WonderBrush ;
+		AddOptionalHaikuImagePackages BePDF Clockwerk Firefox Pe Vision VLC
+			WonderBrush ;
 		AddOptionalHaikuImagePackages CVS Development Subversion OpenSSH Yasm ;
 		AddOptionalHaikuImagePackages Welcome BeBook ;
 	}



From axeld at mail.berlios.de  Tue Aug  4 18:34:44 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 4 Aug 2009 18:34:44 +0200
Subject: [Haiku-commits] r32113 - haiku/trunk/data/develop
Message-ID: <200908041634.n74GYivH023322@sheep.berlios.de>

Author: axeld
Date: 2009-08-04 18:34:30 +0200 (Tue, 04 Aug 2009)
New Revision: 32113
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32113&view=rev

Modified:
   haiku/trunk/data/develop/makefile-engine
Log:
* Added support for TARGET_DIR.
* Now uses g++ instead of gcc for C++ files.
* Removed mwcc support.


Modified: haiku/trunk/data/develop/makefile-engine
===================================================================
--- haiku/trunk/data/develop/makefile-engine	2009-08-04 16:25:24 UTC (rev 32112)
+++ haiku/trunk/data/develop/makefile-engine	2009-08-04 16:34:30 UTC (rev 32113)
@@ -9,7 +9,7 @@
 ifeq ($(MACHINE), BePC)
 	CPU = x86
 else
-	CPU = ppc
+	CPU = $(MACHINE)
 endif
 
 #	set the directory where object files and binaries will be created
@@ -28,27 +28,27 @@
 	DRIVER_PATH = misc
 endif
 
-# 	specify that the binary should be created in the object directory
+# 	specify the directory the binary should be created in by default
+ifeq ($(TARGET_DIR), )
+	TARGET_DIR	:= $(OBJ_DIR)
+endif
+
 # NOTE: make doesn't find the target if its name is enclosed in
 #       quotation marks
-#	TARGET		:= "$(OBJ_DIR)/$(NAME)"
-	TARGET		:= $(OBJ_DIR)/$(NAME)
+	TARGET		:= $(TARGET_DIR)/$(NAME)
 
 #	specify the mimeset tool
 	MIMESET		:= mimeset
 
 #	specify the tools for adding and removing resources
-	XRES		= xres
+	XRES		:= xres
 
 #	specify the tools for compiling resource definition files
-	RESCOMP		= rc
+	RESCOMP		:= rc
 
-# 	platform specific settings
-
-#	x86 Settings
-ifeq ($(CPU), x86)
 #	set the compiler and compiler flags
-	CC		=	gcc
+	CC			:=	gcc
+	C++			:=	g++
 
 #	SETTING: set the CFLAGS for each binary type
 	ifeq ($(TYPE), DRIVER)
@@ -73,8 +73,6 @@
 	endif
 	endif
 
-
-
 #	SETTING: set proper debugger flags
 	ifeq ($(DEBUGGER), TRUE)
 		DEBUG += -g
@@ -111,93 +109,6 @@
 	endif
 
 
-else
-
-#	ppc Settings
-ifeq ($(CPU), ppc)
-#	set the compiler and compiler flags
-	CC		=	mwcc
-	CFLAGS	+=
-
-#	SETTING: set the proper optimization level
-	ifeq ($(OPTIMIZE), FULL)
-		OPTIMIZER	= -O7
-	else
-	ifeq ($(OPTIMIZE), SOME)
-		OPTIMIZER	= -O3
-	else
-	ifeq ($(OPTIMIZE), NONE)
-		OPTIMIZER	= -O0
-	else
-#		OPTIMIZE not set so set to full
-		OPTIMIZER	= -O7
-	endif
-	endif
-	endif
-
-	#set the proper debugger settings
-	ifeq ($(DEBUGGER), TRUE)
-		DEBUG += -g
-	endif
-
-	CFLAGS += $(OPTIMIZER) $(DEBUG)
-
-#	SETTING: set warning level
-	ifeq ($(WARNINGS), ALL)
-		CFLAGS += -w on -requireprotos
-	else
-	ifeq ($(WARNINGS), NONE)
-		CFLAGS += -w off
-	endif
-	endif
-
-	# clear the standard environment variable
-	# now there are no standard libraries to link against
-	BELIBFILES=
-
-#	set the linker and linker flags
-	LD			= mwldppc
-
-#	SETTING: set linker flags for each binary type
-	ifeq ($(TYPE), APP)
-		LDFLAGS +=
-	else
-	ifeq ($(TYPE), SHARED)
-		LDFLAGS += 	-xms
-	endif
-	endif
-
-	ifeq ($(TYPE), DRIVER)
-		LDFLAGS += -nodefaults \
-					-export all \
-					-G \
-					/boot/develop/lib/ppc/glue-noinit.a \
-					/boot/develop/lib/ppc/_KERNEL_
-	else
-		LDFLAGS +=	-export pragma \
-					-init _init_routine_ \
-					-term _term_routine_ \
-					-lroot \
-					/boot/develop/lib/ppc/glue-noinit.a \
-					/boot/develop/lib/ppc/init_term_dyn.o \
-					/boot/develop/lib/ppc/start_dyn.o
-	endif
-
-
-#	SETTING: output symbols in an xMAP file
-	ifeq ($(SYMBOLS), TRUE)
-		LDFLAGS += -map $(TARGET).xMAP
-	endif
-
-#	SETTING: output debugging info to a .SYM file
-	ifeq ($(DEBUGGER), TRUE)
-		LDFLAGS += -g -osym $(TARGET).SYM
-	endif
-
-endif
-endif
-
-
 # psuedo-function for converting a list of source files in SRCS variable
 # to a corresponding list of object files in $(OBJ_DIR)/xxx.o
 # The "function" strips off the src file suffix (.ccp or .c or whatever)
@@ -337,17 +248,17 @@
 $(OBJ_DIR)/%.o : %.c
 	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.cpp
-	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
+	$(C++) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.cp
 	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.cc
-	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
+	$(C++) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.C
 	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.CC
-	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
+	$(C++) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.CPP
-	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
+	$(C++) -c $< $(INCLUDES) $(CFLAGS) -o $@
 
 # rules to compile resource definition files
 $(OBJ_DIR)/%.rsrc : %.rdef



From axeld at mail.berlios.de  Tue Aug  4 18:43:42 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 4 Aug 2009 18:43:42 +0200
Subject: [Haiku-commits] r32114 - haiku/trunk/src/kits/interface
Message-ID: <200908041643.n74GhgND000310@sheep.berlios.de>

Author: axeld
Date: 2009-08-04 18:43:37 +0200 (Tue, 04 Aug 2009)
New Revision: 32114
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32114&view=rev

Modified:
   haiku/trunk/src/kits/interface/InterfaceDefs.cpp
Log:
* Made the default tool tip color a bit easier on the eye.


Modified: haiku/trunk/src/kits/interface/InterfaceDefs.cpp
===================================================================
--- haiku/trunk/src/kits/interface/InterfaceDefs.cpp	2009-08-04 16:34:30 UTC (rev 32113)
+++ haiku/trunk/src/kits/interface/InterfaceDefs.cpp	2009-08-04 16:43:37 UTC (rev 32114)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Haiku, Inc.
+ * Copyright 2001-2009, Haiku, Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -79,7 +79,7 @@
 	{0, 0, 0, 255},			// B_NAVIGATION_PULSE_COLOR
 	{255, 255, 255, 255},	// B_SHINE_COLOR
 	{0, 0, 0, 255},			// B_SHADOW_COLOR
-	{255, 255, 0, 255},		// B_TOOLTIP_BACKGROUND_COLOR
+	{255, 255, 216, 255},	// B_TOOLTIP_BACKGROUND_COLOR
 	{0, 0, 0, 255},			// B_TOOLTIP_TEXT_COLOR
 	{0, 0, 0, 255},			// B_WINDOW_TEXT_COLOR
 	{232, 232, 232, 255},	// B_WINDOW_INACTIVE_TAB_COLOR



From axeld at mail.berlios.de  Tue Aug  4 18:49:11 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 4 Aug 2009 18:49:11 +0200
Subject: [Haiku-commits] r32115 - haiku/trunk/data/develop
Message-ID: <200908041649.n74GnBHn005341@sheep.berlios.de>

Author: axeld
Date: 2009-08-04 18:49:06 +0200 (Tue, 04 Aug 2009)
New Revision: 32115
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32115&view=rev

Modified:
   haiku/trunk/data/develop/makefile-engine
Log:
* driverinstall now also depends on "default"
* Added install target using INSTALL_DIR variable.
* Made "clean" and "rmapp" targets whitespace friendly.


Modified: haiku/trunk/data/develop/makefile-engine
===================================================================
--- haiku/trunk/data/develop/makefile-engine	2009-08-04 16:43:37 UTC (rev 32114)
+++ haiku/trunk/data/develop/makefile-engine	2009-08-04 16:49:06 UTC (rev 32115)
@@ -91,7 +91,7 @@
 	endif
 
 #	set the linker and linker flags
-	LD			= gcc
+	LD			:= gcc
 	LDFLAGS		+= $(DEBUG)
 
 #	SETTING: set linker flags for each binary type
@@ -280,19 +280,27 @@
 
 #	The generic clean command. Delete everything in the object folder.
 clean :: FORCE
-	-rm -rf $(OBJ_DIR)
+	-rm -rf "$(OBJ_DIR)"
 
 #	remove just the application from the object folder
 rmapp ::
-	-rm -f $(TARGET)
+	-rm -f "$(TARGET)"
 
 # make it easy to install drivers for testing
 USER_BIN_PATH = /boot/home/config/add-ons/kernel/drivers/bin
 USER_DEV_PATH = /boot/home/config/add-ons/kernel/drivers/dev
 
-driverinstall ::
+driverinstall :: default
 ifeq ($(TYPE), DRIVER)
 	copyattr --data $(OBJ_DIR)/$(NAME) $(USER_BIN_PATH)/$(NAME)
 	mkdir -p $(USER_DEV_PATH)/$(DRIVER_PATH)
 	ln -sf $(USER_BIN_PATH)/$(NAME) $(USER_DEV_PATH)/$(DRIVER_PATH)/$(NAME)
 endif
+
+install :: default
+ifeq ($(INSTALL_DIR), )
+	@echo "No install directory specified for \"$(NAME)\" (INSTALL_DIR is empty)" >&2
+else
+	mkdir -p "$(INSTALL_DIR)"
+	cp "$(TARGET)" "$(INSTALL_DIR)/$(NAME)"
+endif



From axeld at pinc-software.de  Tue Aug  4 19:57:46 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 04 Aug 2009 19:57:46 +0200 CEST
Subject: [Haiku-commits] r32112 - haiku/trunk/build/jam
In-Reply-To: <200908041625.n74GPQp6019078@sheep.berlios.de>
Message-ID: <38126805005-BeMail@zon>

stippi at mail.berlios.de wrote:
> * Added Clockwerk GCC2 and GCC4 packages. I also added it to the 
> alpha
>   release build profile, so that people testing the pre-alpha images 
> have
>   more easy access to it. I am not sure if it should stay there, 
> since it may
>   not be polished enough. Feedback welcome! :-)

I am against putting it on the alpha - IMO a program like this doesn't 
really belong into the base distribution.
Optional packages for it are welcome, though.

Bye,
   Axel.



From superstippi at gmx.de  Tue Aug  4 20:46:41 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Tue, 04 Aug 2009 20:46:41 +0200
Subject: [Haiku-commits] r32112 - haiku/trunk/build/jam
In-Reply-To: <38126805005-BeMail@zon>
References: <38126805005-BeMail@zon>
Message-ID: <20090804204641.390.3@bepc.1249410789.fake>


On 2009-08-04 at 19:57:46 [+0200], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> stippi at mail.berlios.de wrote:
> > * Added Clockwerk GCC2 and GCC4 packages. I also added it to the 
> > alpha
> >   release build profile, so that people testing the pre-alpha images 
> > have
> >   more easy access to it. I am not sure if it should stay there, 
> > since it may
> >   not be polished enough. Feedback welcome! :-)
> 
> I am against putting it on the alpha - IMO a program like this doesn't 
> really belong into the base distribution.
> Optional packages for it are welcome, though.

I have no problem agreeing to that. Who put WonderBrush in the alpha 
profile, was that you or someone else? Based on what criteria is it decided 
which applications should be on the alpha? For me, it's always been about:

1) What applications do many of us use each day?
2) What applications show the fact that Haiku can be used to get work done? 
(Like a snapshot of the more powerful Haiku applications across different 
fields of work.)

Best regards,
-Stephan


From mmu_man at mail.berlios.de  Tue Aug  4 20:50:09 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Tue, 4 Aug 2009 20:50:09 +0200
Subject: [Haiku-commits] r32116 - in haiku/trunk/src/system/boot/platform:
	bios_ia32 u-boot
Message-ID: <200908041850.n74Io9mr025224@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-04 20:50:08 +0200 (Tue, 04 Aug 2009)
New Revision: 32116
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32116&view=rev

Removed:
   haiku/trunk/src/system/boot/platform/bios_ia32/images.h
   haiku/trunk/src/system/boot/platform/u-boot/images.h
Log:
Remove those antique misleading leftovers, the good ones are at headers/private/kernel/boot/images.h


Deleted: haiku/trunk/src/system/boot/platform/bios_ia32/images.h

Deleted: haiku/trunk/src/system/boot/platform/u-boot/images.h



From anevilyak at mail.berlios.de  Wed Aug  5 00:54:57 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Wed, 5 Aug 2009 00:54:57 +0200
Subject: [Haiku-commits] r32117 - haiku/trunk/build/jam
Message-ID: <200908042254.n74MsvLo005252@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-05 00:54:54 +0200 (Wed, 05 Aug 2009)
New Revision: 32117
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32117&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Re-enable Vision gcc4 package (update has been posted to haiku-files).



Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-08-04 18:50:08 UTC (rev 32116)
+++ haiku/trunk/build/jam/OptionalPackages	2009-08-04 22:54:54 UTC (rev 32117)
@@ -800,16 +800,13 @@
 if [ IsOptionalHaikuImagePackageAdded Vision ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Vision available for $(TARGET_ARCH)" ;
-# TODO: Update Vision GCC4 build, this one is currently broken, because of
-# the BToolTip addition. At least the GCC2 build will work just fine on hybrid
-# installations.
-#	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-#		InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423
-#			: $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip
-#			: apps
-#		;
-#		AddSymlinkToHaikuImage home config be Applications
-#			: /boot/apps/Vision-0.9.7-H-090423/Vision ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423-1
+			: $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip
+			: apps
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/Vision-0.9.7-H-090423/Vision ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 		Echo "No optional package Vision available for GCC4" ;
 	} else {



From mmlr at mail.berlios.de  Wed Aug  5 01:15:11 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Wed, 5 Aug 2009 01:15:11 +0200
Subject: [Haiku-commits] r32118 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200908042315.n74NFBsc024285@sheep.berlios.de>

Author: mmlr
Date: 2009-08-05 01:15:05 +0200 (Wed, 05 Aug 2009)
New Revision: 32118
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32118&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_cpu.cpp
   haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
Log:
Prevent the user TLB invalidation function from being preempted by turning off
interrupts when invoking it. The user TLB invalidation function essentially only
reads and writes back control register 3 (cr3) which holds the physical address
of the current page directory. Still a preemption between the read and the write
can cause problems when the last thread of a team dies and therefore the team
is deleted. The context switch on preemption would decrement the refcount of the
object that holds the page directory. Then the team address space is deleted
causing the context switch returning to that thread to not re-acquire a
reference to the object. At that point the page directory as set in cr3 is the
one of the previously run thread (which is fine, as all share the kernel space
mappings we need). Now when the preempted thread continues though, it would
overwrite cr3 with the physical page directory address from before the context
switch still stored in eax, therefore setting the page directory to the one of
the dying thread that now doesn't have the corresponding reference. Further
progressing the thread would release the last reference causing the deletion
of the object and freeing of the, now active again, page directory. The memory
getting overwritten (by deadbeef) now completely corrupts the page directory
causing basically any memory access to fault, in the end resulting in a
triplefault. This should fix bug #3399.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_cpu.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_cpu.cpp	2009-08-04 22:54:54 UTC (rev 32117)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_cpu.cpp	2009-08-04 23:15:05 UTC (rev 32118)
@@ -731,8 +731,11 @@
 		// of the global page bit
 		x86_write_cr4(flags & ~IA32_CR4_GLOBAL_PAGES);
 		x86_write_cr4(flags | IA32_CR4_GLOBAL_PAGES);
-	} else
+	} else {
+		cpu_status state = disable_interrupts();
 		arch_cpu_user_TLB_invalidate();
+		restore_interrupts(state);
+	}
 }
 
 

Modified: haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp	2009-08-04 22:54:54 UTC (rev 32117)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp	2009-08-04 23:15:05 UTC (rev 32118)
@@ -632,7 +632,9 @@
 			smp_send_broadcast_ici(SMP_MSG_GLOBAL_INVALIDATE_PAGES, 0, 0, 0,
 				NULL, SMP_MSG_FLAG_SYNC);
 		} else {
+			cpu_status state = disable_interrupts();
 			arch_cpu_user_TLB_invalidate();
+			restore_interrupts(state);
 
 			int cpu = smp_get_current_cpu();
 			uint32 cpuMask = map->arch_data->active_on_cpus



From leavengood at gmail.com  Wed Aug  5 02:55:39 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Tue, 4 Aug 2009 20:55:39 -0400
Subject: [Haiku-commits] r32114 - haiku/trunk/src/kits/interface
In-Reply-To: <200908041643.n74GhgND000310@sheep.berlios.de>
References: <200908041643.n74GhgND000310@sheep.berlios.de>
Message-ID: <a4855ac50908041755u4afbd279ka1f7809e7cb0d7ca@mail.gmail.com>

On Tue, Aug 4, 2009 at 12:43 PM, <axeld at mail.berlios.de> wrote:
> * Made the default tool tip color a bit easier on the eye.

Thank goodness, that pure yellow was killing me. I haven't updated my
code to see this new choice, but I had an idea to maybe try out some
different color ideas for this. Based on the RGB values this looks
like a light yellow, which mimics Windows I guess...probably fine for
now.

-- 
Regards,
Ryan


From ingo_weinhold at gmx.de  Wed Aug  5 03:26:16 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Wed, 05 Aug 2009 03:26:16 +0200
Subject: [Haiku-commits] r32118 - haiku/trunk/src/system/kernel/arch/x86
In-Reply-To: <200908042315.n74NFBsc024285@sheep.berlios.de>
References: <200908042315.n74NFBsc024285@sheep.berlios.de>
Message-ID: <20090805032616.594.2@knochen-vm.localdomain>

On 2009-08-05 at 01:15:11 [+0200], mmlr at mail.berlios.de wrote:
> Author: mmlr
> Date: 2009-08-05 01:15:05 +0200 (Wed, 05 Aug 2009)
> New Revision: 32118
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32118&view=rev
> 
> Modified:
>    haiku/trunk/src/system/kernel/arch/x86/arch_cpu.cpp
>    haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
> Log:
> Prevent the user TLB invalidation function from being preempted by turning 
> off
> interrupts when invoking it. The user TLB invalidation function essentially 
> only
> reads and writes back control register 3 (cr3) which holds the physical 
> address
> of the current page directory. Still a preemption between the read and the 
> write
> can cause problems when the last thread of a team dies and therefore the 
> team
> is deleted. The context switch on preemption would decrement the refcount 
> of the
> object that holds the page directory. Then the team address space is deleted
> causing the context switch returning to that thread to not re-acquire a
> reference to the object. At that point the page directory as set in cr3 is 
> the
> one of the previously run thread (which is fine, as all share the kernel 
> space
> mappings we need). Now when the preempted thread continues though, it would
> overwrite cr3 with the physical page directory address from before the 
> context
> switch still stored in eax, therefore setting the page directory to the one 
> of
> the dying thread that now doesn't have the corresponding reference. Further
> progressing the thread would release the last reference causing the deletion
> of the object and freeing of the, now active again, page directory. The 
> memory
> getting overwritten (by deadbeef) now completely corrupts the page directory
> causing basically any memory access to fault, in the end resulting in a
> triplefault. This should fix bug #3399.

Nice one! Funny that -- as so often -- piecing everything together took so 
long, although we already had all the needed information when the scheduler 
tracing yielded the exact place of preemption.

Anyway, I actually don't quite see why the triple fault happened. I 
understand the double fault, but our double fault handler uses the kernel 
page directory (and already did so even before my changes), so it should have 
safely run into the kernel debugger.

CU, Ingo


From bonefish at mail.berlios.de  Wed Aug  5 04:31:01 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 5 Aug 2009 04:31:01 +0200
Subject: [Haiku-commits] r32119 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200908050231.n752V1xj004788@sheep.berlios.de>

Author: bonefish
Date: 2009-08-05 04:31:00 +0200 (Wed, 05 Aug 2009)
New Revision: 32119
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32119&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_x86.S
Log:
Added comment.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_x86.S
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_x86.S	2009-08-04 23:15:05 UTC (rev 32118)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_x86.S	2009-08-05 02:31:00 UTC (rev 32119)
@@ -17,10 +17,12 @@
 
 .text
 
-/* void arch_cpu_user_TLB_invalidate(); */
+/*! \fn void arch_cpu_user_TLB_invalidate()
+	Invalidates the TLB. Must be called with interrupts disabled.
+*/
 FUNCTION(arch_cpu_user_TLB_invalidate):
-	movl	%cr3,%eax
-	movl	%eax,%cr3
+	movl	%cr3, %eax
+	movl	%eax, %cr3
 	ret
 FUNCTION_END(arch_cpu_user_TLB_invalidate)
 



From koki at haikuzone.net  Wed Aug  5 04:55:31 2009
From: koki at haikuzone.net (Jorge G. Mare)
Date: Tue, 04 Aug 2009 19:55:31 -0700
Subject: [Haiku-commits] r32112 - haiku/trunk/build/jam
In-Reply-To: <38126805005-BeMail@zon>
References: <38126805005-BeMail@zon>
Message-ID: <4A78F4A3.6010807@haikuzone.net>

Axel D?rfler wrote:
> stippi at mail.berlios.de wrote:
>   
>> * Added Clockwerk GCC2 and GCC4 packages. I also added it to the 
>> alpha
>>   release build profile, so that people testing the pre-alpha images 
>> have
>>   more easy access to it. I am not sure if it should stay there, 
>> since it may
>>   not be polished enough. Feedback welcome! :-)
>>     
>
> I am against putting it on the alpha - IMO a program like this doesn't 
> really belong into the base distribution.
> Optional packages for it are welcome, though.
>   

Is the final release going to be available in two versions, one being
the base (barebone) distro and the other the base + applications (like
the nightly builds)?

Cheers,

Jorge



From axeld at pinc-software.de  Wed Aug  5 08:09:12 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 08:09:12 +0200 CEST
Subject: [Haiku-commits] r32114 - haiku/trunk/src/kits/interface
In-Reply-To: <a4855ac50908041755u4afbd279ka1f7809e7cb0d7ca@mail.gmail.com>
Message-ID: <1790291353-BeMail@zon>

Ryan Leavengood <leavengood at gmail.com> wrote:
> On Tue, Aug 4, 2009 at 12:43 PM, <axeld at mail.berlios.de> wrote:
> > * Made the default tool tip color a bit easier on the eye.
> Thank goodness, that pure yellow was killing me. I haven't updated my
> code to see this new choice, but I had an idea to maybe try out some
> different color ideas for this. Based on the RGB values this looks
> like a light yellow, which mimics Windows I guess...probably fine for
> now.

I'm definitely open to other ideas, I just wanted the yellow to be gone 
:-)

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug  5 08:23:19 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 08:23:19 +0200 CEST
Subject: [Haiku-commits] r32112 - haiku/trunk/build/jam
In-Reply-To: <20090804204641.390.3@bepc.1249410789.fake>
Message-ID: <2637826605-BeMail@zon>

Stephan Assmus <superstippi at gmx.de> wrote:
> On 2009-08-04 at 19:57:46 [+0200], Axel D?rfler <axeld at pinc-software.de> 
> > wrote:
> > I am against putting it on the alpha - IMO a program like this 
> > doesn't 
> > really belong into the base distribution.
> > Optional packages for it are welcome, though.
> I have no problem agreeing to that. Who put WonderBrush in the alpha 
> profile, was that you or someone else?

I guess that could have been me, but that doesn't necessarily mean that 
I have thought about it too much :-)

> Based on what criteria is it decided which applications should be on 
> the alpha?
> For me, it's always been about:
> 1) What applications do many of us use each day?
> 2) What applications show the fact that Haiku can be used to get work 
> done? 
> (Like a snapshot of the more powerful Haiku applications across 
> different 
> fields of work.)

For me it's just 1). If a user never uses a video cut application, why 
bother to download and install it? It would be quite a big package if 
it should show that you can get work done with Haiku (ie. include 
sample videos). It should be part of demoing Haiku, but that doesn't 
already make it a good part of a release IMO.
WonderBrush definitely has a broader use, at least, although I'm not 
sure there either. In any case, I guess it's time to nail the 
specifics, anyway.

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug  5 08:26:31 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 08:26:31 +0200 CEST
Subject: [Haiku-commits] r32112 - haiku/trunk/build/jam
In-Reply-To: <4A78F4A3.6010807@haikuzone.net>
Message-ID: <2829311946-BeMail@zon>

"Jorge G. Mare" <koki at haikuzone.net> wrote:
> Is the final release going to be available in two versions, one being
> the base (barebone) distro and the other the base + applications 
> (like
> the nightly builds)?

I would guess that has yet to be determined, too. 
Since we plan to have a package manager with R1, maybe that's not a big 
issue, though.

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug  5 08:45:36 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 08:45:36 +0200 CEST
Subject: [Haiku-commits] r32118 - haiku/trunk/src/system/kernel/arch/x86
In-Reply-To: <20090805032616.594.2@knochen-vm.localdomain>
Message-ID: <3974745493-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> Anyway, I actually don't quite see why the triple fault happened. I 
> understand the double fault, but our double fault handler uses the 
> kernel 
> page directory (and already did so even before my changes), so it 
> should have 
> safely run into the kernel debugger.

arch_vm_translation_map_init_map() copies the kernel page directory to 
the user page directory, if that contains garbage (or 0xdeadbeef), the 
kernel memory is not available anymore.

Bye,
   Axel.



From stippi at mail.berlios.de  Wed Aug  5 10:14:24 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 5 Aug 2009 10:14:24 +0200
Subject: [Haiku-commits] r32120 - haiku/trunk/build/jam
Message-ID: <200908050814.n758EO8I021179@sheep.berlios.de>

Author: stippi
Date: 2009-08-05 10:14:23 +0200 (Wed, 05 Aug 2009)
New Revision: 32120
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32120&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Rene missed to remove this part when re-enabling the GCC4 package.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-08-05 02:31:00 UTC (rev 32119)
+++ haiku/trunk/build/jam/OptionalPackages	2009-08-05 08:14:23 UTC (rev 32120)
@@ -807,8 +807,6 @@
 		;
 		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/Vision-0.9.7-H-090423/Vision ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
-		Echo "No optional package Vision available for GCC4" ;
 	} else {
 		InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423
 			: $(baseURL)/Vision-0.9.7-H-x86-gcc2-2009-04-23.zip



From axeld at mail.berlios.de  Wed Aug  5 11:47:22 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 5 Aug 2009 11:47:22 +0200
Subject: [Haiku-commits] r32121 - haiku/trunk/src/tests/system/libroot/os
Message-ID: <200908050947.n759lMNA030474@sheep.berlios.de>

Author: axeld
Date: 2009-08-05 11:47:20 +0200 (Wed, 05 Aug 2009)
New Revision: 32121
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32121&view=rev

Modified:
   haiku/trunk/src/tests/system/libroot/os/ParseDateTest.cpp
Log:
* Improved the parsedate() test to produce a reliable test case (with a fixed
  "now", and given expected results).
* Now only prints failures, unless you give a command argument (which just
  enables verbose output).


Modified: haiku/trunk/src/tests/system/libroot/os/ParseDateTest.cpp
===================================================================
--- haiku/trunk/src/tests/system/libroot/os/ParseDateTest.cpp	2009-08-05 08:14:23 UTC (rev 32120)
+++ haiku/trunk/src/tests/system/libroot/os/ParseDateTest.cpp	2009-08-05 09:47:20 UTC (rev 32121)
@@ -1,7 +1,7 @@
 /*
-** Copyright 2003, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
-*/
+ * Copyright 2003-2009, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
 
 
 #include <SupportDefs.h>
@@ -9,24 +9,26 @@
 
 #include <stdio.h>
 
-// this file can also be compiled against the R5 parsedate() implementation
-#ifndef PARSEDATE_INVALID_DATE
-#	define PARSEDATE_INVALID_DATE 4
-#	define PARSEDATE_MINUTE_RELATIVE_TIME 8
-#endif
 
+#define ABSOLUTE		0
+#define UNKNOWN			0
+#define DAY_RELATIVE	PARSEDATE_RELATIVE_TIME
+#define MINUTE_RELATIVE	(PARSEDATE_RELATIVE_TIME \
+	| PARSEDATE_MINUTE_RELATIVE_TIME)
+#define INVALID			PARSEDATE_INVALID_DATE
 
-char *
+
+char*
 parsedate_flags_to_string(time_t result, int flags)
 {
 	if (result == -1) {
-		if (flags & PARSEDATE_INVALID_DATE)
+		if ((flags & PARSEDATE_INVALID_DATE) != 0)
 			return "invalid";
 		return "unknown";
 	}
 
-	if (flags & PARSEDATE_RELATIVE_TIME) {
-		if (flags & PARSEDATE_MINUTE_RELATIVE_TIME)
+	if ((flags & PARSEDATE_RELATIVE_TIME) != 0) {
+		if ((flags & PARSEDATE_MINUTE_RELATIVE_TIME) != 0)
 			return "minute relative";
 
 		return "day relative";
@@ -37,60 +39,78 @@
 
 
 int
-main(int argc, char **argv)
+main(int argc, char** argv)
 {
-	const char *dates[] = {
-		"last tuesday",
-		"today",
-		"next tuesday",
-		"tuesday",
-		"1976-12-15",
-		"5.8.1976",
-		"last hour",
-		"1 hour",
-		"now",
-		"12/15/1976",
-		"Sat, 08/23/2003",
-		"Sun, 08/23/2003",
-		"",
-		"next monday 3:00",
-		"thursday 4:42",
-		"thursday +4:42",
-		"this thursday 4:42",
-		"42 minutes",
-		"2 weeks",
-		"next 5 minutes",
-		"last 15 minutes",
-		"-15 minutes",
-		"3:33pm GMT",
-		"Mon, June 10th, 1993 10:00:03 am GMT",
-		"Sat, 16 Aug   ?????????? ????? (????)",
-		"Mon, June 10th, 1993 10:00:03 am UTC",
-		"Mon, June 10th, 1993 10:00:03 am CEST",
-		"Mon, June 10th, 1993 10:00:03 am +0000",
-		"Mon, June 10th, 1993 10:00:03 am 0000",	// invalid!
-		"Mon, June 10th, 1993 10:00:03 am +0100",
-		"Mon, June 10th, 1993 10:00:03 am -0700",
-		"Mon, June 10th, 1993 06:00:03 am ACDT",
-		NULL
+	time_t now = 1249471430;
+		// August 5th, 2009, 11:23:50
+
+	struct test {
+		time_t		result;
+		const char*	date;
+		int			flags;
 	};
+	static const test kDates[] = {
+		{1248739200,	"last tuesday", DAY_RELATIVE},
+		{1249430400,	"today", DAY_RELATIVE},
+		{1249948800,	"next tuesday", DAY_RELATIVE},
+		{1249344000,	"tuesday", DAY_RELATIVE},
+		{1249467830,	"last hour", MINUTE_RELATIVE},
+		{1249475030,	"1 hour", MINUTE_RELATIVE},
+		{now,			"now", MINUTE_RELATIVE},
+		{219456000,		"1976-12-15", ABSOLUTE},
+		{219456000,		"12/15/1976", ABSOLUTE},
+		{219456000,		"1976/12/15", ABSOLUTE},
+		{219456000,		"15.12.1976", ABSOLUTE},
+		{208051200,		"5.8.1976", ABSOLUTE},
+		{1061596800,	"Sat, 08/23/2003", ABSOLUTE},
+		{1061596800,	"Sun, 08/23/2003", ABSOLUTE},
+		{-1,			"", INVALID},
+		{1249873200,	"next monday 3:00", DAY_RELATIVE},
+		{1249533720,	"thursday 4:42", DAY_RELATIVE},
+		{1249533740,	"thursday +4:42:20", DAY_RELATIVE},
+		{1249533720,	"this thursday 4:42", DAY_RELATIVE},
+		{1249473950,	"42 minutes", MINUTE_RELATIVE},
+		{1250640000,	"2 weeks", DAY_RELATIVE},
+		{1249471730,	"next 5 minutes", MINUTE_RELATIVE},
+		{1249470530,	"last 15 minutes", MINUTE_RELATIVE},
+		{1249470530,	"-15 minutes", MINUTE_RELATIVE},
+		{1249486380,	"3:33pm GMT", DAY_RELATIVE},
+		{739706403,		"Mon, June 10th, 1993 10:00:03 am GMT", ABSOLUTE},
+		{-1,			"Sat, 16 Aug   ?????????? ????? (????)", INVALID},
+		{739706403,		"Mon, June 10th, 1993 10:00:03 am UTC", ABSOLUTE},
+		{739699203,		"Mon, June 10th, 1993 10:00:03 am CEST", ABSOLUTE},
+		{739706403,		"Mon, June 10th, 1993 10:00:03 am +0000", ABSOLUTE},
+		{-1,			"Mon, June 10th, 1993 10:00:03 am 0000", UNKNOWN},
+		{739702803,		"Mon, June 10th, 1993 10:00:03 am +0100", ABSOLUTE},
+		{739731603,		"Mon, June 10th, 1993 10:00:03 am -0700", ABSOLUTE},
+		{739654203,		"Mon, June 10th, 1993 06:00:03 am ACDT", ABSOLUTE},
+		{-1,			NULL, 0}
+	};
 
-#if 0
-	time_t now = time(NULL);
-	for (int i = 0; i < 500000; i++) {
+	bool verbose = argc > 1;
+
+	if (verbose)
+		printf("All times relative to: %s (%ld)\n", ctime(&now), now);
+
+	for (int32 i = 0; kDates[i].date; i++) {
 		int flags = 0;
-		parsedate_etc(dates[0], now, &flags);
+		time_t result = parsedate_etc(kDates[i].date, now, &flags);
+
+		bool failure = false;
+		if (flags != kDates[i].flags || result != kDates[i].result)
+			failure = true;
+		if (failure) {
+			printf("FAILURE: parsing time at index %ld (should be %ld, %s)\n",
+				i, kDates[i].result,
+				parsedate_flags_to_string(kDates[i].result, flags));
+		}
+
+		if (verbose || failure) {
+			printf("\"%s\" = %ld (%s) -> %s", kDates[i].date, result,
+				parsedate_flags_to_string(result, flags), result == -1
+					? "-\n" : ctime(&result));
+		}
 	}
-#else
-	// this crashes the R5 version but not ours:
-	// parsedate(NULL, -1);
 
-	for (int32 i = 0; dates[i]; i++) {
-		int flags = 0;
-		time_t result = parsedate_etc(dates[i], -1, &flags);
-		printf("\"%s\" = %ld (%s) -> %s", dates[i], result,
-			parsedate_flags_to_string(result, flags), result == -1 ? "-\n" : ctime(&result));
-	}
-#endif
 	return 0;
 }



From stippi at mail.berlios.de  Wed Aug  5 12:07:44 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 5 Aug 2009 12:07:44 +0200
Subject: [Haiku-commits] r32122 - haiku/trunk/src/kits/media
Message-ID: <200908051007.n75A7i9C032213@sheep.berlios.de>

Author: stippi
Date: 2009-08-05 12:07:43 +0200 (Wed, 05 Aug 2009)
New Revision: 32122
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32122&view=rev

Modified:
   haiku/trunk/src/kits/media/MediaWriter.cpp
Log:
Do not use fWriter functions, when it has not been instantiated properly.


Modified: haiku/trunk/src/kits/media/MediaWriter.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaWriter.cpp	2009-08-05 09:47:20 UTC (rev 32121)
+++ haiku/trunk/src/kits/media/MediaWriter.cpp	2009-08-05 10:07:43 UTC (rev 32122)
@@ -61,13 +61,15 @@
 {
 	CALLED();
 
-	// free all stream cookies
-	// and chunk caches
-	StreamInfo* info;
-	for (fStreamInfos.Rewind(); fStreamInfos.GetNext(&info);)
-		fWriter->FreeCookie(info->cookie);
+	if (fWriter != NULL) {
+		// free all stream cookies
+		// and chunk caches
+		StreamInfo* info;
+		for (fStreamInfos.Rewind(); fStreamInfos.GetNext(&info);)
+			fWriter->FreeCookie(info->cookie);
 
-	_plugin_manager.DestroyWriter(fWriter);
+		_plugin_manager.DestroyWriter(fWriter);
+	}
 
 	// fTarget is owned by the BMediaFile
 }
@@ -99,6 +101,9 @@
 {
 	CALLED();
 
+	if (fWriter == NULL)
+		return B_NO_INIT;
+
 	// TODO: Here we should work out a way so that if there is a setup
 	// failure we can try the next encoder.
 	Encoder* encoder;



From stippi at mail.berlios.de  Wed Aug  5 12:11:07 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 5 Aug 2009 12:11:07 +0200
Subject: [Haiku-commits] r32123 - haiku/trunk/headers/os/media
Message-ID: <200908051011.n75AB7Ti032584@sheep.berlios.de>

Author: stippi
Date: 2009-08-05 12:11:06 +0200 (Wed, 05 Aug 2009)
New Revision: 32123
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32123&view=rev

Modified:
   haiku/trunk/headers/os/media/MediaTrack.h
Log:
Small cleanups.


Modified: haiku/trunk/headers/os/media/MediaTrack.h
===================================================================
--- haiku/trunk/headers/os/media/MediaTrack.h	2009-08-05 10:07:43 UTC (rev 32122)
+++ haiku/trunk/headers/os/media/MediaTrack.h	2009-08-05 10:11:06 UTC (rev 32123)
@@ -53,7 +53,7 @@
 	// Use BMediaFile::ReleaseTrack() instead -- or it will go away
 	// on its own when the MediaFile is deleted.
 	virtual						~BMediaTrack();
-	
+
 public:
 
 	// for read-only access the BMediaTrack should be instantiated
@@ -66,18 +66,18 @@
 
 	// Get information about the codec being used.
 			status_t		GetCodecInfo(media_codec_info* _codecInfo) const;
-	
 
-	// EncodedFormat returns information about the track's 
-	// "native" encoded format.  
 
+	// EncodedFormat returns information about the track's
+	// "native" encoded format.
+
 			status_t		EncodedFormat(media_format* _format) const;
 
 	// DecodedFormat is used to negotiate the format that the codec will
 	// use when decoding the track's data.  You pass in the format that
 	// that you want; the codec will find and return its "best fit"
-	// format.  (inout_format is used as both the input and the returned 
-	// format.)  The format is typically of the B_MEDIA_RAW_AUDIO or 	
+	// format.  (inout_format is used as both the input and the returned
+	// format.)  The format is typically of the B_MEDIA_RAW_AUDIO or
 	// B_MEDIA_RAW_VIDEO flavor.
 	// The data returned through ReadFrames() will be in the format that's
  	// returned by this function.
@@ -103,7 +103,7 @@
 	// negotiated by DecodedFormat().  However, if it reaches the end of the
 	// file and was not able to fill the whole  buffer, it returns a partial
 	// buffer.  Upon return, out_frameCount contains the actual number of
-	// frame/samples returned, and the start time for the frame, expressed 
+	// frame/samples returned, and the start time for the frame, expressed
 	// in microseconds, is in the media_header structure.
 
 			status_t		ReadFrames(void* _buffer, int64* _frameCount,
@@ -182,9 +182,9 @@
 	// These are for controlling the underlying encoder and track parameters
 	// returns a copy of the parameter web
 			status_t		GetParameterWeb(BParameterWeb** _web);
-			status_t 		GetParameterValue(int32 id, void* _value,
+			status_t 		GetParameterValue(int32 id, void* value,
 								size_t* size);
-			status_t		SetParameterValue(int32 id, const void* _value,
+			status_t		SetParameterValue(int32 id, const void* value,
 								size_t size);
 			BView*			GetParameterView();
 
@@ -202,11 +202,11 @@
 
 private:
 	friend class BMediaFile;
-	
+
 	// deprecated, but for BeOS R5 compatibility
 			BParameterWeb*	Web();
 
-	// Does nothing, returns B_ERROR, for Zeta compatiblity only	
+	// Does nothing, returns B_ERROR, for Zeta compatiblity only
 			status_t		ControlCodec(int32 selector, void* _inOutData,
 								size_t size);
 



From stippi at mail.berlios.de  Wed Aug  5 12:21:40 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 5 Aug 2009 12:21:40 +0200
Subject: [Haiku-commits] r32124 - in haiku/trunk: headers/private/media
	src/add-ons/media/plugins/ffmpeg src/kits/media
Message-ID: <200908051021.n75ALejB000598@sheep.berlios.de>

Author: stippi
Date: 2009-08-05 12:21:36 +0200 (Wed, 05 Aug 2009)
New Revision: 32124
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32124&view=rev

Modified:
   haiku/trunk/headers/private/media/EncoderPlugin.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
   haiku/trunk/src/kits/media/EncoderPlugin.cpp
   haiku/trunk/src/kits/media/MediaTrack.cpp
Log:
Encoder:
* Fleshed out the Encoder API to support parameter setters/getters and returning
  a BView for configuration. (Not yet sure if this is a good idea.)

BMediaTrack:
* Implemented all but one of the unimplemented methods in BMediaTrack. It should
  be working as far as that class is concerned, unless I missed some of the
  vision. ReplaceFrames() remains a stub, added a comment on why it probably
  stays that way.
* Release the Encoder reference in the destructor.

FFmpeg plugin:
* Refactoring to delay opening the AVCodec until encoding the first chunk,
  so that we can still adjust parameters.
* Support adjusting parameters via [Set|Get]EncodeParameters(). Currently,
  only quality is supported, added TODOs about supporting the bit_rate setup
  versus the automatically calculated bit_rate.
* Extended EncoderDescription by a bit_rate scale. The Encoder calculates the
  raw bitrate needed by the current media format, and then divides that
  number by the specific codec's bit_rate_scale, while taking into account the
  desired quality. This seems to work very well already (tested with MPEG4),
  although a lot more parameters could be specified for libavcodec, depending
  on the desired quality.
* Enabled the ogg muxer in libavformat, although it is currently still disabled
  in MuxerTable.cpp, because it rejects unknown codecs. Added TODO to this
  effect.


Modified: haiku/trunk/headers/private/media/EncoderPlugin.h
===================================================================
--- haiku/trunk/headers/private/media/EncoderPlugin.h	2009-08-05 10:11:06 UTC (rev 32123)
+++ haiku/trunk/headers/private/media/EncoderPlugin.h	2009-08-05 10:21:36 UTC (rev 32124)
@@ -8,11 +8,10 @@
 
 #include <MediaTrack.h>
 #include <MediaFormats.h>
+#include <View.h>
 #include "MediaPlugin.h"
 
 
-class AddOnManager;
-
 namespace BPrivate { namespace media {
 
 class PluginManager;
@@ -56,10 +55,20 @@
 	virtual	status_t			AddTrackInfo(uint32 code, const void* data,
 									size_t size, uint32 flags = 0);
 
+	// Ownership of the BView and BParameterWeb remain with the Encoder.
+	// A window embedding the view must remove it before it is destroyed.
+	virtual	BView*				ParameterView();
+
+	virtual	BParameterWeb*		ParameterWeb();
+	virtual	status_t			GetParameterValue(int32 id, void* value,
+									size_t* size) const;
+	virtual	status_t			SetParameterValue(int32 id, const void* value,
+									size_t size);
+
 	virtual status_t			GetEncodeParameters(
 									encode_parameters* parameters) const;
 	virtual status_t			SetEncodeParameters(
-									encode_parameters* parameters) const;
+									encode_parameters* parameters);
 
 	virtual status_t			Encode(const void* buffer, int64 frameCount,
 									media_encode_info* info) = 0;
@@ -73,19 +82,36 @@
 	virtual status_t			Perform(perform_code code, void* data);
 
 private:
-	virtual void				_ReservedEncoder1();
-	virtual void				_ReservedEncoder2();
-	virtual void				_ReservedEncoder3();
-	virtual void				_ReservedEncoder4();
-	virtual void				_ReservedEncoder5();
-
 			ChunkWriter*		fChunkWriter;
 
 	// needed for plug-in reference count management
 	friend class PluginManager;
 			MediaPlugin*		fMediaPlugin;
 
-			uint32				fReserved[5];
+private:
+	// FBC padding
+			uint32				fReserved[20];
+
+	virtual void				_ReservedEncoder1();
+	virtual void				_ReservedEncoder2();
+	virtual void				_ReservedEncoder3();
+	virtual void				_ReservedEncoder4();
+	virtual void				_ReservedEncoder5();
+	virtual void				_ReservedEncoder6();
+	virtual void				_ReservedEncoder7();
+	virtual void				_ReservedEncoder8();
+	virtual void				_ReservedEncoder9();
+	virtual void				_ReservedEncoder10();
+	virtual void				_ReservedEncoder11();
+	virtual void				_ReservedEncoder12();
+	virtual void				_ReservedEncoder13();
+	virtual void				_ReservedEncoder14();
+	virtual void				_ReservedEncoder15();
+	virtual void				_ReservedEncoder16();
+	virtual void				_ReservedEncoder17();
+	virtual void				_ReservedEncoder18();
+	virtual void				_ReservedEncoder19();
+	virtual void				_ReservedEncoder20();
 };
 
 

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-05 10:11:06 UTC (rev 32123)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-05 10:21:36 UTC (rev 32124)
@@ -30,12 +30,13 @@
 static const size_t kDefaultChunkBufferSize = 2 * 1024 * 1024;
 
 
-AVCodecEncoder::AVCodecEncoder(uint32 codecID)
+AVCodecEncoder::AVCodecEncoder(uint32 codecID, int bitRateScale)
 	:
 	Encoder(),
+	fBitRateScale(bitRateScale),
 	fCodec(NULL),
 	fContext(avcodec_alloc_context()),
-	fCodecInitDone(false),
+	fCodecInitStatus(CODEC_INIT_NEEDED),
 
 	fFrame(avcodec_alloc_frame()),
 	fSwsContext(NULL),
@@ -52,6 +53,11 @@
 	memset(&fInputFormat, 0, sizeof(media_format));
 
 	av_fifo_init(&fAudioFifo, 0);
+
+	// Initial parameters, so we know if the user changed them
+	fEncodeParameters.avg_field_size = 0;
+	fEncodeParameters.max_field_size = 0;
+	fEncodeParameters.quality = 1.0f;
 }
 
 
@@ -59,8 +65,7 @@
 {
 	TRACE("AVCodecEncoder::~AVCodecEncoder()\n");
 
-	if (fCodecInitDone)
-		avcodec_close(fContext);
+	_CloseCodecIfNeeded();
 
 	sws_freeContext(fSwsContext);
 
@@ -119,15 +124,118 @@
 	if (inputFormat == NULL)
 		return B_BAD_VALUE;
 
-	if (fCodecInitDone) {
-		fCodecInitDone = false;
-		avcodec_close(fContext);
-	}
+	_CloseCodecIfNeeded();
 
 	fInputFormat = *inputFormat;
 	fFramesWritten = 0;
 
+	return _Setup();
+}
+
+
+status_t
+AVCodecEncoder::GetEncodeParameters(encode_parameters* parameters) const
+{
+	TRACE("AVCodecEncoder::GetEncodeParameters(%p)\n", parameters);
+
+// TODO: Implement maintaining an automatically calculated bit_rate versus
+// a user specified (via SetEncodeParameters()) bit_rate. At this point, the
+// fContext->bit_rate may not yet have been specified (_Setup() was never
+// called yet). So it cannot work like the code below, but in any case, it's
+// showing how to convert between the values (Albeit untested).
+//	int avgBytesPerSecond = fContext->bit_rate / 8;
+//	int maxBytesPerSecond = (fContext->bit_rate
+//		+ fContext->bit_rate_tolerance) / 8;
+//
+//	if (fInputFormat.type == B_MEDIA_RAW_AUDIO) {
+//		fEncodeParameters.avg_field_size = (int32)(avgBytesPerSecond
+//			/ fInputFormat.u.raw_audio.frame_rate);
+//		fEncodeParameters.max_field_size = (int32)(maxBytesPerSecond
+//			/ fInputFormat.u.raw_audio.frame_rate);
+//	} else if (fInputFormat.type == B_MEDIA_RAW_VIDEO) {
+//		fEncodeParameters.avg_field_size = (int32)(avgBytesPerSecond
+//			/ fInputFormat.u.raw_video.field_rate);
+//		fEncodeParameters.max_field_size = (int32)(maxBytesPerSecond
+//			/ fInputFormat.u.raw_video.field_rate);
+//	}
+
+	parameters->quality = fEncodeParameters.quality;
+
+	return B_OK;
+}
+
+
+status_t
+AVCodecEncoder::SetEncodeParameters(encode_parameters* parameters)
+{
+	TRACE("AVCodecEncoder::SetEncodeParameters(%p)\n", parameters);
+
+	if (fFramesWritten > 0)
+		return B_NOT_SUPPORTED;
+
+	fEncodeParameters.quality = parameters->quality;
+	TRACE("  quality: %.1f\n", parameters->quality);
+
+// TODO: Auto-bit_rate versus user supplied. See above.
+//	int avgBytesPerSecond = 0;
+//	int maxBytesPerSecond = 0;
+//
+//	if (fInputFormat.type == B_MEDIA_RAW_AUDIO) {
+//		avgBytesPerSecond = (int)(parameters->avg_field_size
+//			* fInputFormat.u.raw_audio.frame_rate);
+//		maxBytesPerSecond = (int)(parameters->max_field_size
+//			* fInputFormat.u.raw_audio.frame_rate);
+//	} else if (fInputFormat.type == B_MEDIA_RAW_VIDEO) {
+//		avgBytesPerSecond = (int)(parameters->avg_field_size
+//			* fInputFormat.u.raw_video.field_rate);
+//		maxBytesPerSecond = (int)(parameters->max_field_size
+//			* fInputFormat.u.raw_video.field_rate);
+//	}
+//
+//	if (maxBytesPerSecond < avgBytesPerSecond)
+//		maxBytesPerSecond = avgBytesPerSecond;
+//
+//	// Reset these, so we can tell the difference between uninitialized
+//	// and initialized...
+//	if (avgBytesPerSecond > 0) {
+//		fContext->bit_rate = avgBytesPerSecond * 8;
+//		fContext->bit_rate_tolerance = (maxBytesPerSecond
+//			- avgBytesPerSecond) * 8;
+//		fBitRateControlledByUser = true;
+//	}
+
+	return _Setup();
+}
+
+
+status_t
+AVCodecEncoder::Encode(const void* buffer, int64 frameCount,
+	media_encode_info* info)
+{
+	TRACE("AVCodecEncoder::Encode(%p, %lld, %p)\n", buffer, frameCount, info);
+
+	if (!_OpenCodecIfNeeded())
+		return B_NO_INIT;
+
+	if (fInputFormat.type == B_MEDIA_RAW_AUDIO)
+		return _EncodeAudio(buffer, frameCount, info);
+	else if (fInputFormat.type == B_MEDIA_RAW_VIDEO)
+		return _EncodeVideo(buffer, frameCount, info);
+	else
+		return B_NO_INIT;
+}
+
+
+// #pragma mark -
+
+
+status_t
+AVCodecEncoder::_Setup()
+{
+	TRACE("AVCodecEncoder::_Setup\n");
+
 	if (fInputFormat.type == B_MEDIA_RAW_VIDEO) {
+		TRACE("  B_MEDIA_RAW_VIDEO\n");
 		// frame rate
 		fContext->time_base.den = (int)fInputFormat.u.raw_video.field_rate;
 		fContext->time_base.num = 1;
@@ -144,7 +252,15 @@
 //		fContext->rc_max_rate = 0;
 //		fContext->rc_min_rate = 0;
 		// TODO: Try to calculate a good bit rate...
-		fContext->bit_rate = 800000;
+		int rawBitRate = (int)(fContext->width * fContext->height * 2
+			* fInputFormat.u.raw_video.field_rate) * 8;
+		int wantedBitRate = (int)(rawBitRate / fBitRateScale
+			* fEncodeParameters.quality);
+		TRACE("  rawBitRate: %d, wantedBitRate: %d (%.1f)\n", rawBitRate,
+			wantedBitRate, fEncodeParameters.quality);
+		// TODO: Support letting the user overwrite this via
+		// SetEncodeParameters(). See comments there...
+		fContext->bit_rate = wantedBitRate;
 
 		// Pixel aspect ratio
 		fContext->sample_aspect_ratio.num
@@ -188,6 +304,7 @@
 			fContext->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL);
 
 	} else if (fInputFormat.type == B_MEDIA_RAW_AUDIO) {
+		TRACE("  B_MEDIA_RAW_AUDIO\n");
 		// frame rate
 		fContext->sample_rate = (int)fInputFormat.u.raw_audio.frame_rate;
 		// NOTE: From the output_example.c, it looks like we are not supposed
@@ -252,6 +369,7 @@
 			fContext->channel_layout = fInputFormat.u.raw_audio.channel_mask;
 		}
 	} else {
+		TRACE("  UNSUPPORTED MEDIA TYPE!\n");
 		return B_NOT_SUPPORTED;
 	}
 
@@ -266,55 +384,46 @@
 		fContext->mb_decision = 2;
     }
 
-	// Open the codec
-	int result = avcodec_open(fContext, fCodec);
-	fCodecInitDone = (result >= 0);
-
-	TRACE("  avcodec_open(): %d\n", result);
-
-	return fCodecInitDone ? B_OK : B_ERROR;
+	// Unfortunately, we may fail later, when we try to open the codec
+	// for real... but we need to delay this because we still allow
+	// parameter/quality changes.
+	return B_OK;
 }
 
 
-status_t
-AVCodecEncoder::GetEncodeParameters(encode_parameters* parameters) const
+bool
+AVCodecEncoder::_OpenCodecIfNeeded()
 {
-	TRACE("AVCodecEncoder::GetEncodeParameters(%p)\n", parameters);
+	if (fCodecInitStatus == CODEC_INIT_DONE)
+		return true;
 
-	return B_NOT_SUPPORTED;
-}
+	if (fCodecInitStatus == CODEC_INIT_FAILED)
+		return false;
 
+	// Open the codec
+	int result = avcodec_open(fContext, fCodec);
+	if (result >= 0)
+		fCodecInitStatus = CODEC_INIT_DONE;
+	else
+		fCodecInitStatus = CODEC_INIT_FAILED;
 
-status_t
-AVCodecEncoder::SetEncodeParameters(encode_parameters* parameters) const
-{
-	TRACE("AVCodecEncoder::SetEncodeParameters(%p)\n", parameters);
+	TRACE("  avcodec_open(): %d\n", result);
 
-	return B_NOT_SUPPORTED;
+	return fCodecInitStatus == CODEC_INIT_DONE;
+
 }
 
 
-status_t
-AVCodecEncoder::Encode(const void* buffer, int64 frameCount,
-	media_encode_info* info)
+void
+AVCodecEncoder::_CloseCodecIfNeeded()
 {
-	TRACE("AVCodecEncoder::Encode(%p, %lld, %p)\n", buffer, frameCount, info);
-
-	if (!fCodecInitDone)
-		return B_NO_INIT;
-
-	if (fInputFormat.type == B_MEDIA_RAW_AUDIO)
-		return _EncodeAudio(buffer, frameCount, info);
-	else if (fInputFormat.type == B_MEDIA_RAW_VIDEO)
-		return _EncodeVideo(buffer, frameCount, info);
-	else
-		return B_NO_INIT;
+	if (fCodecInitStatus == CODEC_INIT_DONE) {
+		avcodec_close(fContext);
+		fCodecInitStatus = CODEC_INIT_NEEDED;
+	}
 }
 
 
-// #pragma mark -
-
-
 static const int64 kNoPTSValue = 0x8000000000000000LL;
 	// NOTE: For some reasons, I have trouble with the avcodec.h define:
 	// #define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h	2009-08-05 10:11:06 UTC (rev 32123)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h	2009-08-05 10:21:36 UTC (rev 32124)
@@ -19,7 +19,8 @@
 
 class AVCodecEncoder : public Encoder {
 public:
-								AVCodecEncoder(uint32 codecID);
+								AVCodecEncoder(uint32 codecID,
+									int bitRateScale);
 
 	virtual						~AVCodecEncoder();
 
@@ -32,7 +33,7 @@
 	virtual status_t			GetEncodeParameters(
 									encode_parameters* parameters) const;
 	virtual status_t			SetEncodeParameters(
-									encode_parameters* parameters) const;
+									encode_parameters* parameters);
 
 	virtual status_t			Encode(const void* buffer, int64 frameCount,
 									media_encode_info* info);
@@ -42,6 +43,11 @@
 	// codec buffer size.
 
 private:
+			status_t			_Setup();
+
+			bool				_OpenCodecIfNeeded();
+			void				_CloseCodecIfNeeded();
+
 			status_t			_EncodeAudio(const void* buffer,
 									int64 frameCount,
 									media_encode_info* info);
@@ -55,13 +61,21 @@
 
 private:
 			media_format		fInputFormat;
+			encode_parameters	fEncodeParameters;
+			int					fBitRateScale;
 
 			// FFmpeg related members
 			// TODO: Refactor common base class from AVCodec[De|En]Coder!
 			AVCodec*			fCodec;
 			AVCodecContext*		fContext;
-			bool				fCodecInitDone;
 
+			enum {
+				CODEC_INIT_NEEDED = 0,
+				CODEC_INIT_DONE,
+				CODEC_INIT_FAILED
+			};
+			uint32				fCodecInitStatus;
+
 			// For video (color space conversion):
 			AVPicture			fSrcFrame;
 			AVPicture			fDstFrame;

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp	2009-08-05 10:11:06 UTC (rev 32123)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp	2009-08-05 10:21:36 UTC (rev 32124)
@@ -22,7 +22,8 @@
 		},
 		B_ANY_FORMAT_FAMILY, // TODO: Hm, actually not really /any/ family...
 		B_MEDIA_RAW_VIDEO,
-		B_MEDIA_ENCODED_VIDEO
+		B_MEDIA_ENCODED_VIDEO,
+		23
 	},
 	{
 		{
@@ -34,7 +35,8 @@
 		},
 		B_MPEG_FORMAT_FAMILY,
 		B_MEDIA_RAW_VIDEO,
-		B_MEDIA_ENCODED_VIDEO
+		B_MEDIA_ENCODED_VIDEO,
+		10
 	},
 	{
 		{
@@ -46,7 +48,8 @@
 		},
 		B_MPEG_FORMAT_FAMILY,
 		B_MEDIA_RAW_VIDEO,
-		B_MEDIA_ENCODED_VIDEO
+		B_MEDIA_ENCODED_VIDEO,
+		15
 	},
 	{
 		{
@@ -58,7 +61,8 @@
 		},
 		B_ANY_FORMAT_FAMILY,
 		B_MEDIA_RAW_AUDIO,
-		B_MEDIA_ENCODED_AUDIO
+		B_MEDIA_ENCODED_AUDIO,
+		1
 	},
 	{
 		{
@@ -70,7 +74,8 @@
 		},
 		B_ANY_FORMAT_FAMILY,
 		B_MEDIA_RAW_AUDIO,
-		B_MEDIA_ENCODED_AUDIO
+		B_MEDIA_ENCODED_AUDIO,
+		10
 	}
 };
 

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.h	2009-08-05 10:11:06 UTC (rev 32123)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/EncoderTable.h	2009-08-05 10:21:36 UTC (rev 32124)
@@ -14,6 +14,7 @@
 	media_format_family		format_family;
 	media_type				input_type;
 	media_type				output_type;
+	int						bit_rate_scale;
 };
 
 

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp	2009-08-05 10:11:06 UTC (rev 32123)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp	2009-08-05 10:21:36 UTC (rev 32124)
@@ -134,7 +134,13 @@
 Encoder*
 FFmpegPlugin::NewEncoder(const media_codec_info& codecInfo)
 {
-	return new(std::nothrow)AVCodecEncoder(codecInfo.sub_id);
+	for (size_t i = 0; i < gEncoderCount; i++) {
+		if (codecInfo.sub_id == gEncoderTable[i].codec_info.sub_id) {
+			return new(std::nothrow)AVCodecEncoder(codecInfo.sub_id,
+				gEncoderTable[i].bit_rate_scale);
+		}
+	}
+	return NULL;
 }
 
 

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp	2009-08-05 10:11:06 UTC (rev 32123)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp	2009-08-05 10:21:36 UTC (rev 32124)
@@ -38,6 +38,23 @@
 		"mpg",
 		{ 0 }
 	},
+// TODO: This one rejects unknown codecs. We probably need to define
+// a media_format_family for it so that Encoders can announce their support
+// for it specifically.
+//	{
+//		media_file_format::B_WRITABLE
+//			| media_file_format::B_KNOWS_ENCODED_VIDEO
+//			| media_file_format::B_KNOWS_ENCODED_AUDIO,
+//		{ 0 },
+//		B_AVI_FORMAT_FAMILY,
+//		100,
+//		{ 0 },
+//		"application/ogg",
+//		"Ogg (Xiph.Org Foundation)",
+//		"ogg",
+//		"ogg",
+//		{ 0 }
+//	},
 };
 
 const size_t gMuxerCount = sizeof(gMuxerTable) / sizeof(media_file_format);

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-05 10:11:06 UTC (rev 32123)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-05 10:21:36 UTC (rev 32124)
@@ -686,7 +686,7 @@
 #define CONFIG_MXF_D10_MUXER 0
 #define CONFIG_NULL_MUXER 0
 #define CONFIG_NUT_MUXER 0
-#define CONFIG_OGG_MUXER 0
+#define CONFIG_OGG_MUXER 1
 #define CONFIG_PCM_ALAW_MUXER 0
 #define CONFIG_PCM_MULAW_MUXER 0
 #define CONFIG_PCM_F64BE_MUXER 0

Modified: haiku/trunk/src/kits/media/EncoderPlugin.cpp
===================================================================
--- haiku/trunk/src/kits/media/EncoderPlugin.cpp	2009-08-05 10:11:06 UTC (rev 32123)
+++ haiku/trunk/src/kits/media/EncoderPlugin.cpp	2009-08-05 10:21:36 UTC (rev 32124)
@@ -26,6 +26,9 @@
 }
 
 
+// #pragma mark - Convenience stubs
+
+
 status_t
 Encoder::AddTrackInfo(uint32 code, const void* data, size_t size, uint32 flags)
 {
@@ -33,7 +36,35 @@
 }
 
 
+BView*
+Encoder::ParameterView()
+{
+	return NULL;
+}
+
+
+BParameterWeb*
+Encoder::ParameterWeb()
+{
+	return NULL;
+}
+
+
 status_t
+Encoder::GetParameterValue(int32 id, void* value, size_t* size) const
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+Encoder::SetParameterValue(int32 id, const void* value, size_t size)
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
 Encoder::GetEncodeParameters(encode_parameters* parameters) const
 {
 	return B_NOT_SUPPORTED;
@@ -41,12 +72,15 @@
 
 
 status_t
-Encoder::SetEncodeParameters(encode_parameters* parameters) const
+Encoder::SetEncodeParameters(encode_parameters* parameters)
 {
 	return B_NOT_SUPPORTED;
 }
 
 
+// #pragma mark -
+
+
 status_t
 Encoder::WriteChunk(const void* chunkBuffer, size_t chunkSize,
 	media_encode_info* encodeInfo)
@@ -63,6 +97,9 @@
 }
 
 
+// #pragma mark - FBC padding
+
+
 status_t
 Encoder::Perform(perform_code code, void* data)
 {
@@ -75,9 +112,24 @@
 void Encoder::_ReservedEncoder3() {}
 void Encoder::_ReservedEncoder4() {}
 void Encoder::_ReservedEncoder5() {}
+void Encoder::_ReservedEncoder6() {}
+void Encoder::_ReservedEncoder7() {}
+void Encoder::_ReservedEncoder8() {}
+void Encoder::_ReservedEncoder9() {}
+void Encoder::_ReservedEncoder10() {}
+void Encoder::_ReservedEncoder11() {}
+void Encoder::_ReservedEncoder12() {}
+void Encoder::_ReservedEncoder13() {}
+void Encoder::_ReservedEncoder14() {}
+void Encoder::_ReservedEncoder15() {}
+void Encoder::_ReservedEncoder16() {}
+void Encoder::_ReservedEncoder17() {}
+void Encoder::_ReservedEncoder18() {}
+void Encoder::_ReservedEncoder19() {}
+void Encoder::_ReservedEncoder20() {}
 
 
-//	#pragma mark -
+//	#pragma mark - EncoderPlugin
 
 
 EncoderPlugin::EncoderPlugin()

Modified: haiku/trunk/src/kits/media/MediaTrack.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaTrack.cpp	2009-08-05 10:11:06 UTC (rev 32123)
+++ haiku/trunk/src/kits/media/MediaTrack.cpp	2009-08-05 10:21:36 UTC (rev 32124)
@@ -76,6 +76,7 @@
 	CALLED();
 	_plugin_manager.DestroyDecoder(fRawDecoder);
 	_plugin_manager.DestroyDecoder(fDecoder);
+	_plugin_manager.DestroyDecoder(fEncoder);
 }
 
 /*************************************************************
@@ -321,28 +322,31 @@
 
 
 status_t
-BMediaTrack::ReplaceFrames(const void *in_buffer,
-						   int64 *io_frameCount,
-						   const media_header *mh)
+BMediaTrack::ReplaceFrames(const void* inBuffer, int64* inOutFrameCount,
+	const media_header* mediaHeader)
 {
 	UNIMPLEMENTED();
 
-	return B_OK;
+	// TODO: Actually, a file is either open for reading or writing at the
+	// moment. Since the chunk size of encoded media data will change,
+	// implementing this call will only be possible for raw media tracks.
+
+	return B_NOT_SUPPORTED;
 }
 
 
 status_t
-BMediaTrack::SeekToTime(bigtime_t *inout_time, int32 flags)
+BMediaTrack::SeekToTime(bigtime_t* inOutTime, int32 flags)
 {
 	CALLED();
 	if (!fDecoder || !fExtractor)
 		return B_NO_INIT;
-	if (!inout_time)
+	if (!inOutTime)
 		return B_BAD_VALUE;
 
 	uint32 seekTo = (flags & B_MEDIA_SEEK_DIRECTION_MASK)
 		| B_MEDIA_SEEK_TO_TIME;
-	bigtime_t seekTime = *inout_time;
+	bigtime_t seekTime = *inOutTime;
 
 	int64 frame = 0;
 	bigtime_t time = seekTime;
@@ -355,7 +359,7 @@
 	// TODO: Codecs cannot actually "seek" in the stream, all they
 	// can do is "reset" their decoder state, since they are made
 	// aware of the fact that there will be a jump in the data. Maybe
-	// rename the codec method?
+	// rename the Decoder method?
 	result = fDecoder->Seek(seekTo, 0, &frame, seekTime, &time);
 	if (result != B_OK) {
 		ERROR("BMediaTrack::SeekToTime: decoder seek failed\n");
@@ -370,11 +374,12 @@
 		}
 	}
 
-	*inout_time = time;
+	*inOutTime = time;
 	fCurFrame = frame;
 	fCurTime = time;
 
-	PRINT(1, "BMediaTrack::SeekToTime finished, requested %.6f, result %.6f\n", seekTime / 1000000.0, *inout_time / 1000000.0);
+	PRINT(1, "BMediaTrack::SeekToTime finished, requested %.6f, result %.6f\n",
+		seekTime / 1000000.0, *inOutTime / 1000000.0);
 
 	return B_OK;
 }
@@ -589,102 +594,142 @@
 BParameterWeb*
 BMediaTrack::Web()
 {
-	UNIMPLEMENTED();
+	BParameterWeb* web;
+	if (GetParameterWeb(&web) == B_OK)
+		return web;
 	return NULL;
 }
 
 
-// returns a copy of the parameter web
 status_t
 BMediaTrack::GetParameterWeb(BParameterWeb** outWeb)
 {
-	UNIMPLEMENTED();
+	if (outWeb == NULL)
+		return B_BAD_VALUE;
 
-	return B_OK;
+	if (fEncoder == NULL)
+		return B_NO_INIT;
+
+	// TODO: This method is new in Haiku. The header mentions it returns a
+	// copy. But how could it even do that? How can one clone a web and make
+	// it point to the same BControllable?
+	*outWeb = fEncoder->ParameterWeb();
+	if (*outWeb != NULL)
+		return B_OK;
+
+	return B_NOT_SUPPORTED;
 }
 
 
 status_t
-BMediaTrack::GetParameterValue(int32 id,
-							   void *valu,
-							   size_t *size)
+BMediaTrack::GetParameterValue(int32 id, void* value, size_t* size)
 {
-	UNIMPLEMENTED();
+	if (value == NULL || size == NULL)
+		return B_BAD_VALUE;
 
-	return B_ERROR;
+	if (fEncoder == NULL)
+		return B_NO_INIT;
+
+	return fEncoder->GetParameterValue(id, value, size);
 }
 
 
 status_t
-BMediaTrack::SetParameterValue(int32 id,
-							   const void *valu,
-							   size_t size)
+BMediaTrack::SetParameterValue(int32 id, const void* value, size_t size)
 {
-	UNIMPLEMENTED();
+	if (value == NULL || size == 0)
+		return B_BAD_VALUE;
 
-	return B_ERROR;
+	if (fEncoder == NULL)
+		return B_NO_INIT;
+
+	return fEncoder->SetParameterValue(id, value, size);
 }
 
 
-BView *
+BView*
 BMediaTrack::GetParameterView()
 {
-	UNIMPLEMENTED();
-	return NULL;
+	if (fEncoder == NULL)
+		return NULL;
+
+	return fEncoder->ParameterView();
 }
 
 
 status_t
-BMediaTrack::GetQuality(float *quality)
+BMediaTrack::GetQuality(float* quality)
 {
-	UNIMPLEMENTED();
+	if (quality == NULL)
+		return B_BAD_VALUE;
 
-	return B_ERROR;
+	encode_parameters parameters;
+	status_t ret = GetEncodeParameters(&parameters);
+	if (ret != B_OK)
+		return ret;
+
+	*quality = parameters.quality;
+
+	return B_OK;
 }
 
 
 status_t
 BMediaTrack::SetQuality(float quality)
 {
-	UNIMPLEMENTED();
+	encode_parameters parameters;
+	status_t ret = GetEncodeParameters(&parameters);
+	if (ret != B_OK)
+		return ret;
 
-	return B_ERROR;
+	if (quality < 0.0f)
+		quality = 0.0f;
+	if (quality > 1.0f)
+		quality = 1.0f;
+
+	parameters.quality = quality;
+
+	return SetEncodeParameters(&parameters);
 }
 
 
 status_t
-BMediaTrack::GetEncodeParameters(encode_parameters *parameters) const
+BMediaTrack::GetEncodeParameters(encode_parameters* parameters) const
 {
-	UNIMPLEMENTED();
+	if (parameters == NULL)
+		return B_BAD_VALUE;
 
-	return B_ERROR;
+	if (fEncoder == NULL)
+		return B_NO_INIT;
+
+	return fEncoder->GetEncodeParameters(parameters);
 }
 
 
 status_t
 BMediaTrack::SetEncodeParameters(encode_parameters *parameters)
 {
-	UNIMPLEMENTED();
+	if (parameters == NULL)
+		return B_BAD_VALUE;
 
-	return B_ERROR;
+	if (fEncoder == NULL)
+		return B_NO_INIT;
+
+	return fEncoder->SetEncodeParameters(parameters);
 }
 
 
 status_t
-BMediaTrack::Perform(int32 selector,
-					 void *data)
+BMediaTrack::Perform(int32 selector, void* data)
 {
-	UNIMPLEMENTED();
-
-	return B_ERROR;
+	return B_OK;
 }
 
-/*************************************************************
- * private BMediaTrack
- *************************************************************/
+// #pragma mark - private
 
-BMediaTrack::BMediaTrack(BPrivate::media::MediaExtractor *extractor,
-						 int32 stream)
+
+BMediaTrack::BMediaTrack(BPrivate::media::MediaExtractor* extractor,
+	int32 stream)
 {
 	CALLED();
 	fWorkaroundFlags = 0;



From stippi at mail.berlios.de  Wed Aug  5 12:22:53 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 5 Aug 2009 12:22:53 +0200
Subject: [Haiku-commits] r32125 - haiku/trunk/src/kits/media
Message-ID: <200908051022.n75AMrEt000659@sheep.berlios.de>

Author: stippi
Date: 2009-08-05 12:22:52 +0200 (Wed, 05 Aug 2009)
New Revision: 32125
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32125&view=rev

Modified:
   haiku/trunk/src/kits/media/MediaTrack.cpp
Log:
Fixed last minute change that I apparently didn't compile. Sorry.


Modified: haiku/trunk/src/kits/media/MediaTrack.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaTrack.cpp	2009-08-05 10:21:36 UTC (rev 32124)
+++ haiku/trunk/src/kits/media/MediaTrack.cpp	2009-08-05 10:22:52 UTC (rev 32125)
@@ -76,7 +76,7 @@
 	CALLED();
 	_plugin_manager.DestroyDecoder(fRawDecoder);
 	_plugin_manager.DestroyDecoder(fDecoder);
-	_plugin_manager.DestroyDecoder(fEncoder);
+	_plugin_manager.DestroyEncoder(fEncoder);
 }
 
 /*************************************************************



From stippi at mail.berlios.de  Wed Aug  5 12:40:09 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 5 Aug 2009 12:40:09 +0200
Subject: [Haiku-commits] r32126 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg
Message-ID: <200908051040.n75Ae9CZ010188@sheep.berlios.de>

Author: stippi
Date: 2009-08-05 12:40:06 +0200 (Wed, 05 Aug 2009)
New Revision: 32126
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32126&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
Log:
Fixed bugs when freeing the AVCodecEncoder.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-05 10:22:52 UTC (rev 32125)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp	2009-08-05 10:40:06 UTC (rev 32126)
@@ -54,6 +54,16 @@
 
 	av_fifo_init(&fAudioFifo, 0);
 
+	fDstFrame.data[0] = NULL;
+	fDstFrame.data[1] = NULL;
+	fDstFrame.data[2] = NULL;
+	fDstFrame.data[3] = NULL;
+
+	fDstFrame.linesize[0] = 0;
+	fDstFrame.linesize[1] = 0;
+	fDstFrame.linesize[2] = 0;
+	fDstFrame.linesize[3] = 0;
+
 	// Initial parameters, so we know if the user changed them
 	fEncodeParameters.avg_field_size = 0;
 	fEncodeParameters.max_field_size = 0;
@@ -67,7 +77,8 @@
 
 	_CloseCodecIfNeeded();
 
-	sws_freeContext(fSwsContext);
+	if (fSwsContext != NULL)
+		sws_freeContext(fSwsContext);
 
 	av_fifo_free(&fAudioFifo);
 



From jackburton at mail.berlios.de  Wed Aug  5 13:00:41 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Wed, 5 Aug 2009 13:00:41 +0200
Subject: [Haiku-commits] r32127 - haiku/trunk/src/kits/interface
Message-ID: <200908051100.n75B0f1p030685@sheep.berlios.de>

Author: jackburton
Date: 2009-08-05 13:00:35 +0200 (Wed, 05 Aug 2009)
New Revision: 32127
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32127&view=rev

Modified:
   haiku/trunk/src/kits/interface/MenuItem.cpp
Log:
fixed copy/paste error which caused bug #4186. Sorry

Modified: haiku/trunk/src/kits/interface/MenuItem.cpp
===================================================================
--- haiku/trunk/src/kits/interface/MenuItem.cpp	2009-08-05 10:40:06 UTC (rev 32126)
+++ haiku/trunk/src/kits/interface/MenuItem.cpp	2009-08-05 11:00:35 UTC (rev 32127)
@@ -754,7 +754,7 @@
 	}
 	
 	if (fModifiers & B_SHIFT_KEY) {
-		const BBitmap *shift = MenuPrivate::MenuItemOption();		
+		const BBitmap *shift = MenuPrivate::MenuItemShift();		
 		const BRect &rect = shift->Bounds();
 		where.x -= rect.Width() + 1;
 		fSuper->DrawBitmap(shift, where);



From axeld at mail.berlios.de  Wed Aug  5 13:10:01 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 5 Aug 2009 13:10:01 +0200
Subject: [Haiku-commits] r32128 - haiku/trunk/src/bin
Message-ID: <200908051110.n75BA1PY006418@sheep.berlios.de>

Author: axeld
Date: 2009-08-05 13:09:59 +0200 (Wed, 05 Aug 2009)
New Revision: 32128
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32128&view=rev

Modified:
   haiku/trunk/src/bin/mountvolume.cpp
Log:
* "mountvolume" now can also mount by device path.


Modified: haiku/trunk/src/bin/mountvolume.cpp
===================================================================
--- haiku/trunk/src/bin/mountvolume.cpp	2009-08-05 11:00:35 UTC (rev 32127)
+++ haiku/trunk/src/bin/mountvolume.cpp	2009-08-05 11:09:59 UTC (rev 32128)
@@ -368,16 +368,25 @@
 		if (entry.GetPath(&path) != B_OK)
 			continue;
 
-		// a file with this name exists, so try to mount it
-		partition_id id = roster.RegisterFileDevice(path.Path());
-		if (id < B_OK)
-			continue;
-
+		partition_id id = -1;
 		BDiskDevice device;
 		BPartition* partition;
-		if (roster.GetPartitionWithID(id, &device, &partition) != B_OK) {
-			roster.UnregisterFileDevice(id);
-			continue;
+
+		if (!strncmp(path.Path(), "/dev/", 5)) {
+			// seems to be a device path
+			if (roster.GetPartitionForPath(path.Path(), &device, &partition)
+					!= B_OK)
+				continue;
+		} else {
+			// a file with this name exists, so try to mount it
+			id = roster.RegisterFileDevice(path.Path());
+			if (id < 0)
+				continue;
+
+			if (roster.GetPartitionWithID(id, &device, &partition) != B_OK) {
+				roster.UnregisterFileDevice(id);
+				continue;
+			}
 		}
 
 		status_t status = partition->Mount(NULL,
@@ -386,14 +395,14 @@
 			if (status >= B_OK) {
 				BPath mountPoint;
 				partition->GetMountPoint(&mountPoint);
-				printf("Image \"%s\" mounted successfully at \"%s\".\n", name,
-					mountPoint.Path());
+				printf("%s \"%s\" mounted successfully at \"%s\".\n",
+					id < 0 ? "Device" : "Image", name, mountPoint.Path());
 			}
 		}
 		if (status >= B_OK) {
 			// remove from list
 			mountVisitor.toMount.erase(name);
-		} else
+		} else if (id >= 0)
 			roster.UnregisterFileDevice(id);
 	}
 



From ingo_weinhold at gmx.de  Wed Aug  5 13:46:44 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Wed, 05 Aug 2009 13:46:44 +0200
Subject: [Haiku-commits] r32118 - haiku/trunk/src/system/kernel/arch/x86
In-Reply-To: <3974745493-BeMail@zon>
References: <3974745493-BeMail@zon>
Message-ID: <20090805134644.391.1@knochen-vm.localdomain>


On 2009-08-05 at 08:45:36 [+0200], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > Anyway, I actually don't quite see why the triple fault happened. I
> > understand the double fault, but our double fault handler uses the
> > kernel
> > page directory (and already did so even before my changes), so it
> > should have
> > safely run into the kernel debugger.
> 
> arch_vm_translation_map_init_map() copies the kernel page directory to
> the user page directory, if that contains garbage (or 0xdeadbeef), the
> kernel memory is not available anymore.

With user team page directories, yes, but why would that affect the double 
fault handler, which always uses the kernel page directory?

CU, Ingo


From axeld at pinc-software.de  Wed Aug  5 14:50:28 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 14:50:28 +0200 CEST
Subject: [Haiku-commits] r32118 - haiku/trunk/src/system/kernel/arch/x86
In-Reply-To: <20090805134644.391.1@knochen-vm.localdomain>
Message-ID: <25866853455-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> On 2009-08-05 at 08:45:36 [+0200], Axel D?rfler <axeld at pinc-software.de> 
> > wrote:
> > Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > > Anyway, I actually don't quite see why the triple fault happened. 
> > > I
> > > understand the double fault, but our double fault handler uses 
> > > the
> > > kernel
> > > page directory (and already did so even before my changes), so it
> > > should have
> > > safely run into the kernel debugger.
> > arch_vm_translation_map_init_map() copies the kernel page directory 
> > to
> > the user page directory, if that contains garbage (or 0xdeadbeef), 
> > the
> > kernel memory is not available anymore.
> With user team page directories, yes, but why would that affect the 
> double 
> fault handler, which always uses the kernel page directory?

If that's really the case, then you're right indeed :-)
And then I have no idea, unfortunately.

Bye,
   Axel.



From axeld at mail.berlios.de  Wed Aug  5 15:05:58 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 5 Aug 2009 15:05:58 +0200
Subject: [Haiku-commits] r32129 - haiku/trunk/src/system/kernel/cache
Message-ID: <200908051305.n75D5wdq005514@sheep.berlios.de>

Author: axeld
Date: 2009-08-05 15:05:58 +0200 (Wed, 05 Aug 2009)
New Revision: 32129
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32129&view=rev

Modified:
   haiku/trunk/src/system/kernel/cache/file_map.cpp
Log:
* FileMap::Translate() did not choke on negative offsets, and _Cache() does not
  necessarily return an error in this case.


Modified: haiku/trunk/src/system/kernel/cache/file_map.cpp
===================================================================
--- haiku/trunk/src/system/kernel/cache/file_map.cpp	2009-08-05 11:09:59 UTC (rev 32128)
+++ haiku/trunk/src/system/kernel/cache/file_map.cpp	2009-08-05 13:05:58 UTC (rev 32129)
@@ -393,6 +393,9 @@
 FileMap::Translate(off_t offset, size_t size, file_io_vec* vecs, size_t* _count,
 	size_t align)
 {
+	if (offset < 0)
+		return B_BAD_VALUE;
+
 	MutexLocker _(fLock);
 
 	size_t maxVecs = *_count;



From pulkomandy at mail.berlios.de  Wed Aug  5 15:34:26 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Wed, 5 Aug 2009 15:34:26 +0200
Subject: [Haiku-commits] r32130 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale src/preferences/locale src/tools/locale
Message-ID: <200908051334.n75DYQR4016623@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-05 15:34:25 +0200 (Wed, 05 Aug 2009)
New Revision: 32130
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32130&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleRoster.h
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Locale.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
   haiku/branches/components/gsoc-locale-kit/src/tools/locale/Jamfile
Log:
- Renamed the locale preflet class from Locale to LocalePreflet to avoid conflict with ICU Locale class
- Cleanups
- Modified BCountry to use ICU's Locale class
- It is now possible to select a country in the Country tab of the preflet; The setting is saved and taken into account by the Locale kit.
- The preflet displays an example date with the current settings. It's not yet updated in realtime when you select a new country.


Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-05 13:34:25 UTC (rev 32130)
@@ -6,6 +6,9 @@
 #include <LocaleStrings.h>
 #include <String.h>
 
+#include <unicode/locid.h>
+
+
 enum {
 	B_METRIC = 0,
 	B_US
@@ -14,7 +17,8 @@
 
 class BCountry {
 	public:
-		BCountry();
+		BCountry(const char* languageCode, const char* countryCode);
+		BCountry(const char* languageAndCountryCode = "en_US");
 		virtual ~BCountry();
 
 		virtual const char *Name() const;
@@ -24,9 +28,11 @@
 
 		// date & time
 
-		virtual void	FormatDate(char *string,size_t maxSize,time_t time,bool longFormat);
+		virtual void	FormatDate(char *string,size_t maxSize,time_t time,
+			bool longFormat);
 		virtual void	FormatDate(BString *string,time_t time,bool longFormat);
-		virtual void	FormatTime(char *string,size_t maxSize,time_t time,bool longFormat);
+		virtual void	FormatTime(char *string,size_t maxSize,time_t time,
+			bool longFormat);
 		virtual void	FormatTime(BString *string,time_t time,bool longFormat);
 
 		const char		*DateFormat(bool longFormat) const;
@@ -54,7 +60,8 @@
 
 		// monetary
 
-		virtual ssize_t	FormatMonetary(char *string,size_t maxSize,char *format, ...);
+		virtual ssize_t	FormatMonetary(char *string,size_t maxSize,char *format,
+			...);
 		virtual ssize_t	FormatMonetary(BString *string,char *format, ...);
 
 		const char		*CurrencySymbol() const;
@@ -69,6 +76,7 @@
 
 	private:
 		const char	**fStrings;
+		Locale fICULocale;
 };
 
 #endif	/* _COUNTRY_H_ */

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleRoster.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleRoster.h	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleRoster.h	2009-08-05 13:34:25 UTC (rev 32130)
@@ -1,8 +1,10 @@
 #ifndef _LOCALE_ROSTER_H_
 #define _LOCALE_ROSTER_H_
 
+
 #include <String.h>
 
+
 class BLanguage;
 class BLocale;
 class BCollator;
@@ -10,6 +12,8 @@
 class BCatalog;
 class BCatalogAddOn;
 
+struct entry_ref;
+
 namespace BPrivate {
 	class EditableCatalog;
 };
@@ -18,6 +22,7 @@
 	B_LOCALE_CHANGED	= '_LCC',
 };
 
+
 class BLocaleRoster {
 
 	public:
@@ -43,33 +48,29 @@
 			// the message contains one or more 'language'-string-fields
 			// which contain the language-name(s)
 
-		status_t GetInstalledCatalogs(BMessage *,
-					const char* sigPattern = NULL,
-					const char* langPattern = NULL,
-					int32 fingerprint = 0) const;
+		status_t GetInstalledCatalogs(BMessage *, const char* sigPattern = NULL,
+			const char* langPattern = NULL,	int32 fingerprint = 0) const;
 			// the message contains...
 
 		static const char *kCatLangAttr;
 		static const char *kCatSigAttr;
 		static const char *kCatFingerprintAttr;
-		//
+
 		static const char *kCatManagerMimeType;
 		static const char *kCatEditorMimeType;
-		//
+
 		static const char *kEmbeddedCatAttr;
 		static int32 kEmbeddedCatResId;
 
 	private:
 
 		BCatalogAddOn* LoadCatalog(const char *signature,
-							const char *language = NULL,
-							int32 fingerprint = 0);
+			const char *language = NULL, int32 fingerprint = 0);
 		BCatalogAddOn* LoadEmbeddedCatalog(entry_ref *appOrAddOnRef);
 		status_t UnloadCatalog(BCatalogAddOn *addOn);
-		//
+
 		BCatalogAddOn* CreateCatalog(const char *type,
-							const char *signature,
-							const char *language);
+			const char *signature, const char *language);
 
 		friend class BCatalog;
 		friend class BPrivate::EditableCatalog;

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-05 13:34:25 UTC (rev 32130)
@@ -7,6 +7,9 @@
 #include <Country.h>
 #include <String.h>
 
+#include <unicode/datefmt.h>
+#include <ICUWrapper.h>
+
 #include <monetary.h>
 #include <stdarg.h>
 
@@ -42,13 +45,20 @@
 };
 
 
-BCountry::BCountry()
-	:
-	fStrings(gStrings)
+BCountry::BCountry(const char* languageCode, const char* countryCode)
+	: fStrings(gStrings)
+	, fICULocale(languageCode, countryCode)
 {
 }
 
 
+BCountry::BCountry(const char* languageAndCountryCode)
+	: fStrings(gStrings)
+	, fICULocale(languageAndCountryCode)
+{
+}
+
+
 BCountry::BCountry(const char **strings)
 	:
 	fStrings(strings)
@@ -88,6 +98,18 @@
 void 
 BCountry::FormatDate(BString *string, time_t time, bool longFormat)
 {
+	icu_4_2::DateFormat* dateFormatter;
+   	dateFormatter = DateFormat::createDateInstance(
+		longFormat ? DateFormat::LONG : DateFormat::SHORT,
+		fICULocale);
+	//UDate myDate = Calendar::getNow();
+	UnicodeString myString;
+	myString = dateFormatter->format(time, myString);
+
+	string->Truncate(0);
+	BStringByteSink bbs(string);
+
+	myString.toUTF8(bbs);
 }
 
 

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Jamfile
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Jamfile	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Jamfile	2009-08-05 13:34:25 UTC (rev 32130)
@@ -34,5 +34,5 @@
 	  PropertyFile.cpp
 	  strfmon.cpp
 	  UnicodeChar.cpp
-	: be $(TARGET_LIBSTDC++) libicu-common.so
+	: be $(TARGET_LIBSTDC++) libicu-common.so libicu-i18n.so
 	;

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-08-05 13:34:25 UTC (rev 32130)
@@ -149,6 +149,7 @@
 	BLocker fLock;
 	BList fCatalogAddOnInfos;
 	BMessage fPreferredLanguages;
+	BString fCountryCodeName;
 
 	RosterData();
 	~RosterData();
@@ -178,12 +179,12 @@
 	// Load preferences to get the preffered languages
 	BPath path;
 	BFile file;
-	BMessage settingsMessage;
-	BString langName;
 	if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) {
 		path.Append("Locale settings");
+		BMessage settingsMessage;
 		if (file.SetTo(path.Path(), B_READ_ONLY) == B_OK
 				&& settingsMessage.Unflatten(&file) == B_OK) {
+			BString langName;
 			if (settingsMessage.FindString("language", &langName) == B_OK) {
 				UErrorCode icuError = U_ZERO_ERROR;
 				Locale icuLocale = Locale::createCanonical(langName.String());
@@ -197,15 +198,23 @@
 				Locale::setDefault(icuLocale,icuError);
 				assert(icuError == U_ZERO_ERROR);
 				fPreferredLanguages.RemoveName("language");
-				for (int i=0; settingsMessage.FindString("language", i, &langName)
-						== B_OK; i++) {
+				for (int i = 0; settingsMessage.FindString("language", i, 
+						&langName) == B_OK; i++) {
 					fPreferredLanguages.AddString("language", langName);
 				}
-				return;
-			}
+			} else
+				fPreferredLanguages.AddString("language", "en");
+
+			if (settingsMessage.FindString("country", &fCountryCodeName) != B_OK)
+				fCountryCodeName = "en_US";
+			return;
 		}
 	}
+
+	// Something went wrong (no settings file or invalid BMessage
+	// set everything to default values
 	fPreferredLanguages.AddString("language", "en");
+	fCountryCodeName = "en_US";
 	log_team(LOG_ERR,"*** No language preference found!\n");
 }
 
@@ -428,7 +437,11 @@
 {
 	if (!country)
 		return B_BAD_VALUE;
-	*country = new(std::nothrow) BCountry();
+
+	BAutolock lock(gRosterData.fLock);
+	assert(lock.IsLocked());
+
+	*country = new(std::nothrow) BCountry(gRosterData.fCountryCodeName.String());
 	return B_OK;
 }
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Jamfile
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Jamfile	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Jamfile	2009-08-05 13:34:25 UTC (rev 32130)
@@ -7,7 +7,8 @@
 	Locale.cpp
 	LocaleWindow.cpp
 	TimeFormatSettingsView.cpp
-	: be liblocale.so $(TARGET_LIBSUPC++) libicu-common.so
+	: be liblocale.so $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) libicu-common.so 
+		libicu-data.so
 	: Locale.rdef 
 	;
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Locale.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Locale.cpp	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/Locale.cpp	2009-08-05 13:34:25 UTC (rev 32130)
@@ -44,10 +44,10 @@
 };
 
 
-class Locale : public BApplication {
+class LocalePreflet : public BApplication {
 	public:
-		Locale();
-		virtual ~Locale();
+		LocalePreflet();
+		virtual ~LocalePreflet();
 
 		virtual void ReadyToRun();
 		virtual void MessageReceived(BMessage *message);
@@ -78,6 +78,7 @@
 		// set default prefs
 		fMessage.AddRect("window_frame", BRect(50, 50, 550, 500));
 		fMessage.AddString("language", "en");
+		fMessage.AddString("country", "en_US");
 		return;
 	}
 }
@@ -123,10 +124,15 @@
 	if (message->FindString("language",&langName) == B_OK) {
 		// Remove any old data as we know we have newer one to replace it
 		fMessage.RemoveName("language");
-		for (int i=0; message->FindString("language", i, &langName) == B_OK; i++)
+		for (int i = 0; message->FindString("language", i, &langName) == B_OK;
+				i++)
 			fMessage.AddString("language", langName);
 	}
 
+	if (message->FindString("country",&langName) == B_OK) 
+		fMessage.ReplaceString("country", langName);
+
+
 	fUpdated = true;
 }
 
@@ -134,7 +140,7 @@
 //	#pragma mark -
 
 
-Locale::Locale()
+LocalePreflet::LocalePreflet()
 	: BApplication(kSignature)
 {
 	fWindowFrame = fSettings.Message().FindRect("window_frame");
@@ -146,13 +152,13 @@
 }
 
 
-Locale::~Locale()
+LocalePreflet::~LocalePreflet()
 {
 }
 
 
 void 
-Locale::ReadyToRun()
+LocalePreflet::ReadyToRun()
 {
 	// are there already windows open?
 	if (CountWindows() != 1)
@@ -164,7 +170,7 @@
 
 
 void 
-Locale::MessageReceived(BMessage *message)
+LocalePreflet::MessageReceived(BMessage *message)
 {
 	switch (message->what) {
 		case kMsgSettingsChanged:
@@ -179,7 +185,7 @@
 
 
 void
-Locale::AboutRequested()
+LocalePreflet::AboutRequested()
 {
 	BAlert *alert = new BAlert("about", TR("Locale\n"
 		"\twritten by Axel D?rfler\n"
@@ -199,7 +205,7 @@
 
 
 bool 
-Locale::QuitRequested()
+LocalePreflet::QuitRequested()
 {
 	return true;
 }
@@ -211,7 +217,7 @@
 int 
 main(int argc, char **argv)
 {
-	Locale app;
+	LocalePreflet app;
 
 	app.Run();
 	return 0;

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-05 13:34:25 UTC (rev 32130)
@@ -25,6 +25,7 @@
 #include <ICUWrapper.h>
 
 #include <unicode/locid.h>
+#include <unicode/datefmt.h>
 
 #include "TimeFormatSettingsView.h"
 
@@ -214,8 +215,8 @@
 				// let all selected items, that fit into our drag_bitmap, draw
 				for (int32 i = 0; i < numItems; i++) {
 					int32 index = CurrentSelection(i);
-					LanguageListItem* item =
-						static_cast<LanguageListItem*>(ItemAt(index));
+					LanguageListItem* item
+						= static_cast<LanguageListItem*>(ItemAt(index));
 					itemBounds.bottom = itemBounds.top + ceilf(item->Height());
 					if (itemBounds.bottom > dragRect.bottom)
 						itemBounds.bottom = dragRect.bottom;
@@ -293,7 +294,7 @@
 						int32 count = CountItems();
 						if (fDropIndex == count) {
 							BRect r;
-							if (BListItem* item = ItemAt(count - 1)) {
+							if (ItemAt(count - 1)) {
 								r = ItemFrame(count - 1);
 								r.top = r.bottom;
 								r.bottom = r.top + 1.0;
@@ -365,8 +366,8 @@
 
 				// Now get an human-readable, loacalized name for each language
 				// TODO: sort them using collators.
-				Locale currentLocale =
-					Locale::createFromName(currentLanguage.String());
+				Locale currentLocale
+					= Locale::createFromName(currentLanguage.String());
 				UnicodeString languageFullName;
 				BString str;
 				BStringByteSink bbs(&str);
@@ -397,10 +398,11 @@
 		BMessage msg;
 		be_locale_roster->GetPreferredLanguages(&msg);
 		BString langCode;
-		for(int index = 0; msg.FindString("language", index, &langCode) == B_OK;
+		for (int index = 0; msg.FindString("language", index, &langCode) 
+					== B_OK;
 				index++) {
-			for(int listPos = 0; LanguageListItem* lli =
-					static_cast<LanguageListItem*>(listView->ItemAt(listPos)); 
+			for (int listPos = 0; LanguageListItem* lli
+					= static_cast<LanguageListItem*>(listView->ItemAt(listPos));
 					listPos++) {
 				if(langCode == lli->getLanguageCode()) {
 					fPreferredListView->AddItem(lli);
@@ -430,20 +432,41 @@
 	tabView->AddTab(tab);
 
 	{
-		TimeFormatSettingsView* timeFormatSettings = 
+		BListView* listView = new BListView("country", B_SINGLE_SELECTION_LIST);
+		BScrollView *scrollView = new BScrollView("scroller",
+			listView, 0, false, true, B_FANCY_BORDER);
+
+		BMessage* msg = new BMessage('csel');
+		listView->SetSelectionMessage(msg);
+
+		
+		// get all available countries from ICU
+		// Use DateFormat::getAvailableLocale so we get only the one we can
+		// use. Maybe check the NumberFormat one and see if there is more.
+		int32_t localeCount;
+		const Locale* currentLocale
+			= Locale::getAvailableLocales(localeCount);
+		for(int index = 0; index < localeCount; index++)
+		{
+			UnicodeString countryFullName;
+			BString str;
+			BStringByteSink bbs(&str);
+			currentLocale[index].getDisplayName(countryFullName);
+			countryFullName.toUTF8(bbs);
+			LanguageListItem* si = 
+				new LanguageListItem(str, currentLocale[index].getName());
+			listView->AddItem(si);
+		}
+
+		fTimeFormatSettings = 
 			new TimeFormatSettingsView();
+
 		tab->AddChild(BGroupLayoutBuilder(B_HORIZONTAL,10)
-			.Add(timeFormatSettings)
-			.AddGlue()
+			.Add(scrollView)
+			.Add(fTimeFormatSettings)
 		);
 	}
 
-	// Keyboard tab
-
-	tab = new BView(TR("Keyboard"), B_WILL_DRAW);
-	tab->SetViewColor(tabView->ViewColor());
-	tabView->AddTab(tab);
-
 	// check if the window is on screen
 
 	rect = BScreen().Frame();
@@ -478,7 +501,7 @@
 	update.AddRect("window_frame", Frame());
 	int index = 0;
 	while (index < fPreferredListView->CountItems()) {
-		update.AddString("language",static_cast<LanguageListItem*>
+		update.AddString("language", static_cast<LanguageListItem*>
 			(fPreferredListView->ItemAt(index))->getLanguageCode());
 		index++;
 	}
@@ -501,6 +524,22 @@
 			// revert to last settings
 			break;
 
+		case 'csel':
+		{
+			// Country selection changed.
+			// Get the new selected country from the ListView and send it to the
+			// main app event handler.
+			void* ptr;
+			message->FindPointer("source", &ptr);
+			BListView* countryList = static_cast<BListView*>(ptr);
+			LanguageListItem* lli = static_cast<LanguageListItem*>
+				(countryList->ItemAt(countryList->CurrentSelection()));
+			BMessage* newMessage = new BMessage(kMsgSettingsChanged);
+			newMessage->AddString("country",lli->getLanguageCode());
+			be_app_messenger.SendMessage(newMessage);
+			break;
+		}
+
 		default:
 			BWindow::MessageReceived(message);
 			break;

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h	2009-08-05 13:34:25 UTC (rev 32130)
@@ -8,6 +8,8 @@
 
 #include <Window.h>
 
+#include "TimeFormatSettingsView.h"
+
 class BButton;
 class BListView;
 
@@ -22,6 +24,7 @@
 	private:
 		BButton*	fRevertButton;
 		BListView*	fPreferredListView;
+		TimeFormatSettingsView* fTimeFormatSettings; 
 };
 
 #endif	/* LOCALE_WINDOW_H */

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-05 13:34:25 UTC (rev 32130)
@@ -1,5 +1,5 @@
 /*
-** Copyright 2009, Adrien Destugues pulkomandy at gmail.com. All rights reserved.
+** Copyright 2009, Adrien Destugues, pulkomandy at gmail.com. All rights reserved.
 ** Distributed under the terms of the MIT License.
 */
 
@@ -7,8 +7,11 @@
 #include "TimeFormatSettingsView.h"
 
 #include <Box.h>
+#include <Country.h>
 #include <GroupLayout.h>
 #include <GroupLayoutBuilder.h>
+#include <Locale.h>
+#include <LocaleRoster.h>
 #include <Message.h>
 #include <Menu.h>
 #include <MenuField.h>
@@ -25,9 +28,6 @@
 {
 	SetLayout(new BGroupLayout(B_VERTICAL));
 
-	font_height fontHeight;
-	be_bold_font->GetHeight(&fontHeight);
-
 	BBox *clockBox = new BBox("Clock");
 	clockBox->SetLabel("Clock");
 	clockBox->SetLayout(new BGroupLayout(B_VERTICAL, 10));
@@ -306,39 +306,18 @@
 TimeFormatSettingsView::_UpdateExamples()
 {
 	time_t timeValue = (time_t)time(NULL);
-	tm timeData;
-	localtime_r(&timeValue, &timeData);
 	BString timeFormat = "Internal Error!";
-	char buffer[256];
 
-	FormatSeparator separator;
+	BCountry* country; 
+	be_locale_roster->GetDefaultCountry(&country);
+	country->FormatDate(&timeFormat, timeValue, true);
 
-	BMenuItem *item = fSeparatorMenuField->Menu()->FindMarked();
-	if (item) {
-		int32 index = fSeparatorMenuField->Menu()->IndexOf(item);
-		if (index >= 0)
-			separator = (FormatSeparator)index;
-		else
-			separator = kSlashSeparator;
-	} else
-		separator = kSlashSeparator;
-		
-	DateOrder order =
-		fYMDRadioButton->Value() ? kYMDFormat :
-		(fDMYRadioButton->Value() ? kDMYFormat : kMDYFormat);
-
-	bool clockIs24hr = (f24HrRadioButton->Value() > 0);
-
-	//TimeFormat(timeFormat, 0, separator, order, clockIs24hr);
-	strftime(buffer, 256, timeFormat.String(), &timeData);
-
-	fLongDateExampleView->SetText(buffer);
+	fLongDateExampleView->SetText(timeFormat);
 	fLongDateExampleView->ResizeToPreferred();
 
-	//TimeFormat(timeFormat, 4, separator, order, clockIs24hr);
-	strftime(buffer, 256, timeFormat.String(), &timeData);
+	country->FormatDate(&timeFormat, timeValue, false);
 	
-	fShortDateExampleView->SetText(buffer);
+	fShortDateExampleView->SetText(timeFormat);
 	fShortDateExampleView->ResizeToPreferred();
 }
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-05 13:34:25 UTC (rev 32130)
@@ -1,5 +1,5 @@
 /*
-** Copyright 2009, Adrien Destugues pulkomandy at gmail.com. All rights reserved.
+** Copyright 2009, Adrien Destugues, pulkomandy at gmail.com. All rights reserved.
 ** Distributed under the terms of the MIT License.
 */
 

Modified: haiku/branches/components/gsoc-locale-kit/src/tools/locale/Jamfile
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/tools/locale/Jamfile	2009-08-05 13:05:58 UTC (rev 32129)
+++ haiku/branches/components/gsoc-locale-kit/src/tools/locale/Jamfile	2009-08-05 13:34:25 UTC (rev 32130)
@@ -21,6 +21,8 @@
 	UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ;
 }
 
+UseLibraryHeaders icu ;
+
 # TODO: temporary kludge
 local libHaikuCompat ;
 if $(HOST_PLATFORM) in r5 bone dano {



From ingo_weinhold at gmx.de  Wed Aug  5 15:23:07 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Wed, 05 Aug 2009 15:23:07 +0200
Subject: [Haiku-commits] r32118 - haiku/trunk/src/system/kernel/arch/x86
In-Reply-To: <25866853455-BeMail@zon>
References: <25866853455-BeMail@zon>
Message-ID: <20090805152307.504.3@knochen-vm.localdomain>

On 2009-08-05 at 14:50:28 [+0200], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > On 2009-08-05 at 08:45:36 [+0200], Axel D?rfler <axeld at pinc-software.de>
> > > wrote:
> > > Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> > > > Anyway, I actually don't quite see why the triple fault happened.
> > > > I
> > > > understand the double fault, but our double fault handler uses
> > > > the
> > > > kernel
> > > > page directory (and already did so even before my changes), so it
> > > > should have
> > > > safely run into the kernel debugger.
> > > arch_vm_translation_map_init_map() copies the kernel page directory
> > > to
> > > the user page directory, if that contains garbage (or 0xdeadbeef),
> > > the
> > > kernel memory is not available anymore.
> > With user team page directories, yes, but why would that affect the
> > double
> > fault handler, which always uses the kernel page directory?
> 
> If that's really the case, then you're right indeed :-)
> And then I have no idea, unfortunately.

I've experimented a bit more with these triple faults and checked the 
architecture specification and it seems, it simply not possible to cache 
this kind of double fault. We use a task gate for the double fault 
(interrupt or trap gates would be even more useless), but task switching 
involves accessing both the current and the next TSS via their linear 
addresses. Well, I guess the processor doesn't even get that far, since the 
IDT is in the linear address space, too, so it won't even be able to access 
the double fault vector descriptor after the page directory is toast. In 
short, when invalidating the current page directory, the game is over 
immediately.

CU, Ingo


From axeld at pinc-software.de  Wed Aug  5 15:47:41 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 15:47:41 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32130_-_in_haiku/branches/components/g?=
 =?utf-8?q?soc-locale-kit=3A_headers/os/locale_src/kits/locale_src/prefere?=
 =?utf-8?q?nces/locale_src/tools/locale?=
In-Reply-To: <200908051334.n75DYQR4016623@sheep.berlios.de>
Message-ID: <29299483188-BeMail@zon>

pulkomandy at BerliOS <pulkomandy at mail.berlios.de> wrote:
> - Renamed the locale preflet class from Locale to LocalePreflet to 
> avoid conflict
> with ICU Locale class

It's probably related to the fact that I don't like the term "preflet", 
but since it inherits from BApplication, maybe LocaleApplication would 
have been the better choice?
Also, why are any ICU classes visible at this point? The locale 
preferences should only work with our liblocale.so, not ICU.

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug  5 15:49:41 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 15:49:41 +0200 CEST
Subject: [Haiku-commits] r32118 - haiku/trunk/src/system/kernel/arch/x86
In-Reply-To: <20090805152307.504.3@knochen-vm.localdomain>
Message-ID: <29419785080-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> On 2009-08-05 at 14:50:28 [+0200], Axel D?rfler <axeld at pinc-software.de> 
> > > If that's really the case, then you're right indeed :-)
> > And then I have no idea, unfortunately.
> I've experimented a bit more with these triple faults and checked the 
> architecture specification and it seems, it simply not possible to 
> cache 
> this kind of double fault. We use a task gate for the double fault 
> (interrupt or trap gates would be even more useless), but task 
> switching 
> involves accessing both the current and the next TSS via their linear 
> addresses. Well, I guess the processor doesn't even get that far, 
> since the 
> IDT is in the linear address space, too, so it won't even be able to 
> access 
> the double fault vector descriptor after the page directory is toast. 
> In 
> short, when invalidating the current page directory, the game is over 
> immediately.

Now that explains why they actually need a virtual address for the 
IDT... ;-)
Bummer, but at least it seems you have limited the reboots to exactly 
this cause, which may make debugging of those a bit easier next time.

Bye,
   Axel.



From pulkomandy at gmail.com  Wed Aug  5 16:02:12 2009
From: pulkomandy at gmail.com (PulkoMandy)
Date: Wed, 5 Aug 2009 16:02:12 +0200
Subject: [Haiku-commits] r32130 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale src/preferences/locale src/tools/locale
In-Reply-To: <29299483188-BeMail@zon>
References: <200908051334.n75DYQR4016623@sheep.berlios.de>
	<29299483188-BeMail@zon>
Message-ID: <36ed0c950908050702y15dd4c52jab21ebde5851d073@mail.gmail.com>

2009/8/5 Axel D?rfler <axeld at pinc-software.de>:
> pulkomandy at BerliOS <pulkomandy at mail.berlios.de> wrote:
>> - Renamed the locale preflet class from Locale to LocalePreflet to
>> avoid conflict
>> with ICU Locale class
>
> It's probably related to the fact that I don't like the term "preflet",
> but since it inherits from BApplication, maybe LocaleApplication would
> have been the better choice?

Could work too.

> Also, why are any ICU classes visible at this point? The locale
> preferences should only work with our liblocale.so, not ICU.

Because my code for language selection is not really clean and use ICU
directly, and so does the country listing. I'm still not sure how to
work with BLanguage. These enumarations could migrate inside
liblocale.so, but I wanted to get a working preflet to test BCountry
before the end of GSoC. I want to get the specified methods working
before I add new ones.

>
> Bye,
> ? Axel.
>
> _______________________________________________
> Haiku-commits mailing list
> Haiku-commits at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/haiku-commits
>



-- 
Adrien Destugues / PulkoMandy
El?ve ing?nieur ENSSAT EII1- www.enssat.fr
GSoC student for Haiku - http://haiku-os.org
GrafX2 project team - http://code.google.com/p/grafx2


From axeld at mail.berlios.de  Wed Aug  5 16:23:13 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 5 Aug 2009 16:23:13 +0200
Subject: [Haiku-commits] r32131 -
	haiku/trunk/src/add-ons/kernel/file_systems/ext2
Message-ID: <200908051423.n75ENDX4000064@sheep.berlios.de>

Author: axeld
Date: 2009-08-05 16:23:13 +0200 (Wed, 05 Aug 2009)
New Revision: 32131
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32131&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/ext2/Inode.cpp
Log:
* Also the indirect array indices can point to a sparse point if they are 0;
  this fixes problems with large files with sparse ranges (for example, Haiku
  images).


Modified: haiku/trunk/src/add-ons/kernel/file_systems/ext2/Inode.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ext2/Inode.cpp	2009-08-05 13:34:25 UTC (rev 32130)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ext2/Inode.cpp	2009-08-05 14:23:13 UTC (rev 32131)
@@ -110,6 +110,9 @@
 	if (offset >= Size())
 		return B_ENTRY_NOT_FOUND;
 
+	// TODO: we could return the size of the sparse range, as this might be more
+	// than just a block
+
 	if (index < EXT2_DIRECT_BLOCKS) {
 		// direct blocks
 		block = B_LENDIAN_TO_HOST_INT32(Node().stream.direct[index]);
@@ -130,12 +133,19 @@
 		if (indirectBlocks == NULL)
 			return B_IO_ERROR;
 
-		indirectBlocks = (uint32*)cached.SetTo(B_LENDIAN_TO_HOST_INT32(
-			indirectBlocks[index / perBlock]));
-		if (indirectBlocks == NULL)
-			return B_IO_ERROR;
+		uint32 indirectIndex
+			= B_LENDIAN_TO_HOST_INT32(indirectBlocks[index / perBlock]);
+		if (indirectIndex == 0) {
+			// a sparse indirect block
+			block = 0;
+		} else {
+			indirectBlocks = (uint32*)cached.SetTo(indirectIndex);
+			if (indirectBlocks == NULL)
+				return B_IO_ERROR;
 
-		block = B_LENDIAN_TO_HOST_INT32(indirectBlocks[index & (perBlock - 1)]);
+			block = B_LENDIAN_TO_HOST_INT32(
+				indirectBlocks[index & (perBlock - 1)]);
+		}
 	} else if ((index -= perIndirectBlock) / perBlock < perIndirectBlock) {
 		// triple indirect blocks
 		CachedBlock cached(fVolume);
@@ -144,17 +154,30 @@
 		if (indirectBlocks == NULL)
 			return B_IO_ERROR;
 
-		indirectBlocks = (uint32*)cached.SetTo(B_LENDIAN_TO_HOST_INT32(
-			indirectBlocks[index / perIndirectBlock]));
-		if (indirectBlocks == NULL)
-			return B_IO_ERROR;
+		uint32 indirectIndex
+			= B_LENDIAN_TO_HOST_INT32(indirectBlocks[index / perIndirectBlock]);
+		if (indirectIndex == 0) {
+			// a sparse indirect block
+			block = 0;
+		} else {
+			indirectBlocks = (uint32*)cached.SetTo(indirectIndex);
+			if (indirectBlocks == NULL)
+				return B_IO_ERROR;
 
-		indirectBlocks = (uint32*)cached.SetTo(B_LENDIAN_TO_HOST_INT32(
-			indirectBlocks[(index / perBlock) & (perBlock - 1)]));
-		if (indirectBlocks == NULL)
-			return B_IO_ERROR;
+			indirectIndex = B_LENDIAN_TO_HOST_INT32(
+				indirectBlocks[(index / perBlock) & (perBlock - 1)]);
+			if (indirectIndex == 0) {
+				// a sparse indirect block
+				block = 0;
+			} else {
+				indirectBlocks = (uint32*)cached.SetTo(indirectIndex);
+				if (indirectBlocks == NULL)
+					return B_IO_ERROR;
 
-		block = B_LENDIAN_TO_HOST_INT32(indirectBlocks[index & (perBlock - 1)]);
+				block = B_LENDIAN_TO_HOST_INT32(
+					indirectBlocks[index & (perBlock - 1)]);
+			}
+		}
 	} else {
 		// outside of the possible data stream
 		dprintf("ext2: block outside datastream!\n");



From bonefish at mail.berlios.de  Wed Aug  5 16:26:50 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 5 Aug 2009 16:26:50 +0200
Subject: [Haiku-commits] r32132 - haiku/trunk/src/kits/interface
Message-ID: <200908051426.n75EQoeB000885@sheep.berlios.de>

Author: bonefish
Date: 2009-08-05 16:26:47 +0200 (Wed, 05 Aug 2009)
New Revision: 32132
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32132&view=rev

Modified:
   haiku/trunk/src/kits/interface/View.cpp
Log:
* Only build the gcc 2 compatibility symbols with gcc 2.
* Added gcc 4 _ReservedView11() compatibility symbol.


Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2009-08-05 14:23:13 UTC (rev 32131)
+++ haiku/trunk/src/kits/interface/View.cpp	2009-08-05 14:26:47 UTC (rev 32132)
@@ -5490,6 +5490,9 @@
 }
 
 
+#if __GNUC__ == 2
+
+
 extern "C" void
 _ReservedView1__5BView(BView* view, BRect rect)
 {
@@ -5602,6 +5605,23 @@
 }
 
 
+#elif __GNUC__ > 2
+
+
+extern "C" bool
+_ZN5BView15_ReservedView11Ev(BView* view, BPoint point, BToolTip** _toolTip)
+{
+	// GetToolTipAt()
+	perform_data_get_tool_tip_at data;
+	data.point = point;
+	data.tool_tip = _toolTip;
+	view->Perform(PERFORM_CODE_GET_TOOL_TIP_AT, &data);
+	return data.return_value;
+}
+
+
+#endif	// __GNUC__ > 2
+
 void BView::_ReservedView12() {}
 void BView::_ReservedView13() {}
 void BView::_ReservedView14() {}



From bonefish at mail.berlios.de  Wed Aug  5 16:29:00 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 5 Aug 2009 16:29:00 +0200
Subject: [Haiku-commits] r32133 - haiku/trunk/build/jam
Message-ID: <200908051429.n75ET0DB001612@sheep.berlios.de>

Author: bonefish
Date: 2009-08-05 16:28:58 +0200 (Wed, 05 Aug 2009)
New Revision: 32133
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32133&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Reenabled Firefox gcc 4 package.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-08-05 14:26:47 UTC (rev 32132)
+++ haiku/trunk/build/jam/OptionalPackages	2009-08-05 14:28:58 UTC (rev 32133)
@@ -398,17 +398,14 @@
 if [ IsOptionalHaikuImagePackageAdded Firefox ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
-# TODO: Update BeZilla GCC4 build, this one is currently broken, because of
-# the BToolTip addition. At least the GCC2 build will work just fine on hybrid
-# installations.
-#	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-#		InstallOptionalHaikuImagePackage
-#			BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
-#			: $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
-# 			: apps
-# 		;
-# 		AddSymlinkToHaikuImage home config be Applications
-#			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		InstallOptionalHaikuImagePackage
+			BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
+			: $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
+ 			: apps
+ 		;
+ 		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 		Echo "No optional package Firefox available for GCC4" ;
 	} else {



From stippi at mail.berlios.de  Wed Aug  5 16:47:34 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 5 Aug 2009 16:47:34 +0200
Subject: [Haiku-commits] r32134 - haiku/trunk/src/servers/app
Message-ID: <200908051447.n75ElXwO008758@sheep.berlios.de>

Author: stippi
Date: 2009-08-05 16:47:32 +0200 (Wed, 05 Aug 2009)
New Revision: 32134
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32134&view=rev

Modified:
   haiku/trunk/src/servers/app/FontManager.cpp
Log:
Initialize the default fonts to NULL.


Modified: haiku/trunk/src/servers/app/FontManager.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontManager.cpp	2009-08-05 14:28:58 UTC (rev 32133)
+++ haiku/trunk/src/servers/app/FontManager.cpp	2009-08-05 14:47:32 UTC (rev 32134)
@@ -103,6 +103,11 @@
 	fDirectories(10, true),
 	fMappings(10, true),
 	fFamilies(20),
+
+	fDefaultPlainFont(NULL),
+	fDefaultBoldFont(NULL),
+	fDefaultFixedFont(NULL),
+
 	fScanned(false),
 	fNextID(0)
 {



From axeld at pinc-software.de  Wed Aug  5 16:52:06 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 16:52:06 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32130_-_in_haiku/branches/components/g?=
 =?utf-8?q?soc-locale-kit=3A_headers/os/locale_src/kits/locale_src/prefere?=
 =?utf-8?q?nces/locale_src/tools/locale?=
In-Reply-To: <36ed0c950908050702y15dd4c52jab21ebde5851d073@mail.gmail.com>
Message-ID: <33164684702-BeMail@zon>

PulkoMandy <pulkomandy at gmail.com> wrote:
> 2009/8/5 Axel D?rfler <axeld at pinc-software.de>:
> > Also, why are any ICU classes visible at this point? The locale
> > preferences should only work with our liblocale.so, not ICU.
> Because my code for language selection is not really clean and use 
> ICU
> directly, and so does the country listing. I'm still not sure how to
> work with BLanguage. These enumarations could migrate inside
> liblocale.so, but I wanted to get a working preflet to test BCountry
> before the end of GSoC. I want to get the specified methods working
> before I add new ones.

Hm, dirty tricks :-)
No, understood, as long as that's cleaned up afterwards. That sort of 
functionality sounds like it should live in the BLocaleRoster.

Bye,
   Axel.



From superstippi at gmx.de  Wed Aug  5 17:02:05 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Wed, 05 Aug 2009 17:02:05 +0200
Subject: [Haiku-commits] r32133 - haiku/trunk/build/jam
In-Reply-To: <200908051429.n75ET0DB001612@sheep.berlios.de>
References: <200908051429.n75ET0DB001612@sheep.berlios.de>
Message-ID: <20090805170205.533.1@bepc.1249484037.fake>


On 2009-08-05 at 16:29:00 [+0200], bonefish at mail.berlios.de wrote:
> Author: bonefish
> Date: 2009-08-05 16:28:58 +0200 (Wed, 05 Aug 2009) New Revision: 32133
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32133&view=rev
> 
> Modified:
>    haiku/trunk/build/jam/OptionalPackages
> Log:
> Reenabled Firefox gcc 4 package.
> 
> 
> Modified: haiku/trunk/build/jam/OptionalPackages
> ===================================================================
> --- haiku/trunk/build/jam/OptionalPackages    2009-08-05 14:26:47 UTC 
> (rev 32132)
> +++ haiku/trunk/build/jam/OptionalPackages    2009-08-05 14:28:58 UTC 
> (rev 32133)
> @@ -398,17 +398,14 @@
>  if [ IsOptionalHaikuImagePackageAdded Firefox ] {
>      if $(TARGET_ARCH) != x86 {
>          Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
> -# TODO: Update BeZilla GCC4 build, this one is currently broken, because 
> of
> -# the BToolTip addition. At least the GCC2 build will work just fine on 
> hybrid
> -# installations.
> -#    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
> -#        InstallOptionalHaikuImagePackage
> -#            BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
> -#            : 
> $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
> -#             : apps
> -#         ;
> -#         AddSymlinkToHaikuImage home config be Applications
> -#            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
> +    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
> +        InstallOptionalHaikuImagePackage
> +            BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
> +            : 
> $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
> +             : apps
> +         ;
> +         AddSymlinkToHaikuImage home config be Applications
> +            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
>      } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
>          Echo "No optional package Firefox available for GCC4" ;
>      } else {

You did the same mistake as Rene. The next two lines need to be removed as 
well.

(And thanks for fixing the issue in a much cleaner way!)

Best regards,
-Stephan


From axeld at mail.berlios.de  Wed Aug  5 17:04:47 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 5 Aug 2009 17:04:47 +0200
Subject: [Haiku-commits] r32135 - haiku/trunk/src/system/kernel/vm
Message-ID: <200908051504.n75F4lmC015088@sheep.berlios.de>

Author: axeld
Date: 2009-08-05 17:04:45 +0200 (Wed, 05 Aug 2009)
New Revision: 32135
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32135&view=rev

Modified:
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
* area_for() now also returns the area ID for kernel areas if they are
  accessible to the userland - this fixes #2405 (ie. MediaPlayer overlay now
  works).


Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2009-08-05 14:47:32 UTC (rev 32134)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2009-08-05 15:04:45 UTC (rev 32135)
@@ -3921,15 +3921,28 @@
 
 
 static area_id
-vm_area_for(team_id team, addr_t address)
+vm_area_for(addr_t address, bool kernel)
 {
+	team_id team;
+	if (IS_USER_ADDRESS(address)) {
+		// we try the user team address space, if any
+		team = vm_current_user_address_space_id();
+		if (team < 0)
+			return team;
+	} else
+		team = vm_kernel_address_space_id();
+
 	AddressSpaceReadLocker locker(team);
 	if (!locker.IsLocked())
 		return B_BAD_TEAM_ID;
 
 	vm_area* area = vm_area_lookup(locker.AddressSpace(), address);
-	if (area != NULL)
+	if (area != NULL) {
+		if (!kernel && (area->protection & (B_READ_AREA | B_WRITE_AREA)) == 0)
+			return B_ERROR;
+
 		return area->id;
+	}
 
 	return B_ERROR;
 }
@@ -5705,17 +5718,7 @@
 area_id
 area_for(void* address)
 {
-	team_id space;
-
-	if (IS_USER_ADDRESS(address)) {
-		// we try the user team address space, if any
-		space = vm_current_user_address_space_id();
-		if (space < B_OK)
-			return space;
-	} else
-		space = vm_kernel_address_space_id();
-
-	return vm_area_for(space, (addr_t)address);
+	return vm_area_for((addr_t)address, true);
 }
 
 
@@ -5949,7 +5952,7 @@
 area_id
 _user_area_for(void* address)
 {
-	return vm_area_for(vm_current_user_address_space_id(), (addr_t)address);
+	return vm_area_for((addr_t)address, false);
 }
 
 



From axeld at mail.berlios.de  Wed Aug  5 17:38:46 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 5 Aug 2009 17:38:46 +0200
Subject: [Haiku-commits] r32136 - haiku/trunk/src/kits/media
Message-ID: <200908051538.n75FckQD028728@sheep.berlios.de>

Author: axeld
Date: 2009-08-05 17:38:44 +0200 (Wed, 05 Aug 2009)
New Revision: 32136
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32136&view=rev

Modified:
   haiku/trunk/src/kits/media/Buffer.cpp
Log:
* Cleanup, no functional change.


Modified: haiku/trunk/src/kits/media/Buffer.cpp
===================================================================
--- haiku/trunk/src/kits/media/Buffer.cpp	2009-08-05 15:04:45 UTC (rev 32135)
+++ haiku/trunk/src/kits/media/Buffer.cpp	2009-08-05 15:38:44 UTC (rev 32136)
@@ -27,21 +27,25 @@
  *
  */
 
+
+#include <Buffer.h>
+
 #include <MediaDefs.h>
-#include <Buffer.h>
-#include "SharedBufferList.h"
+
 #include "debug.h"
 #include "DataExchange.h"
+#include "SharedBufferList.h"
 
+
 namespace BPrivate { namespace media {
 	extern team_id team;
-} } // BPrivate::media
+} }
 using namespace BPrivate::media;
 
-/*************************************************************
- * public struct buffer_clone_info
- *************************************************************/
 
+//	#pragma mark - buffer_clone_info
+
+
 buffer_clone_info::buffer_clone_info()
 {
 	CALLED();
@@ -58,11 +62,11 @@
 	CALLED();
 }
 
-/*************************************************************
- * public BBuffer
- *************************************************************/
 
-void *
+//	#pragma mark - public BBuffer
+
+
+void*
 BBuffer::Data()
 {
 	CALLED();
@@ -145,7 +149,7 @@
 }
 
 
-media_header *
+media_header*
 BBuffer::Header()
 {
 	CALLED();
@@ -153,7 +157,7 @@
 }
 
 
-media_audio_header *
+media_audio_header*
 BBuffer::AudioHeader()
 {
 	CALLED();
@@ -161,7 +165,7 @@
 }
 
 
-media_video_header *
+media_video_header*
 BBuffer::VideoHeader()
 {
 	CALLED();
@@ -176,16 +180,18 @@
 	return SizeAvailable();
 }
 
-/*************************************************************
- * private BBuffer
- *************************************************************/
 
-/* explicit */
-BBuffer::BBuffer(const buffer_clone_info & info) :
-	fBufferList(0), // must be 0 if not correct initialized
-	fData(0), // must be 0 if not correct initialized
-	fSize(0), // should be 0 if not correct initialized
-	fBufferID(0) // must be 0 if not registered
+//	#pragma mark - private BBuffer
+
+
+BBuffer::BBuffer(const buffer_clone_info& info)
+	:
+	// must all be NULL/0 if not correct initialized
+	fBufferList(NULL), 
+	fData(NULL),
+	fSize(0),
+	fBufferID(0)
+		// must be 0 if not registered
 {
 	CALLED();
 
@@ -194,16 +200,15 @@
 		return;
 
 	// ask media_server to get the area_id of the shared buffer list
-	server_get_shared_buffer_area_request area_request;
-	server_get_shared_buffer_area_reply area_reply;
-	if (QueryServer(SERVER_GET_SHARED_BUFFER_AREA, &area_request, sizeof(area_request), &area_reply, sizeof(area_reply)) != B_OK) {
+	server_get_shared_buffer_area_request areaRequest;
+	server_get_shared_buffer_area_reply areaReply;
+	if (QueryServer(SERVER_GET_SHARED_BUFFER_AREA, &areaRequest,
+			sizeof(areaRequest), &areaReply, sizeof(areaReply)) != B_OK) {
 		ERROR("BBuffer::BBuffer: SERVER_GET_SHARED_BUFFER_AREA failed\n");
 		return;
 	}
 
-	ASSERT(area_reply.area > 0);
-
-	fBufferList = _shared_buffer_list::Clone(area_reply.area);
+	fBufferList = _shared_buffer_list::Clone(areaReply.area);
 	if (fBufferList == NULL) {
 		ERROR("BBuffer::BBuffer: _shared_buffer_list::Clone() failed\n");
 		return;
@@ -223,8 +228,10 @@
 	// until the last buffer has been unregistered
 	// the area_id of the cached area is passed back to us, and we clone it.
 
-	if (QueryServer(SERVER_REGISTER_BUFFER, &request, sizeof(request), &reply, sizeof(reply)) != B_OK) {
-		ERROR("BBuffer::BBuffer: failed to register buffer with media_server\n");
+	if (QueryServer(SERVER_REGISTER_BUFFER, &request, sizeof(request), &reply,
+			sizeof(reply)) != B_OK) {
+		ERROR("BBuffer::BBuffer: failed to register buffer with "
+			"media_server\n");
 		return;
 	}
 
@@ -241,14 +248,14 @@
 
 	fArea = clone_area("a cloned BBuffer", &fData, B_ANY_ADDRESS,
 		B_READ_AREA | B_WRITE_AREA, reply.info.area);
-	if (fArea <= B_OK) {
-		// XXX should unregister buffer here
+	if (fArea < 0) {
+		// TODO: should unregister buffer here
 		ERROR("BBuffer::BBuffer: buffer cloning failed\n");
 		fData = 0;
 		return;
 	}
 
-	fData = (char *)fData + fOffset;
+	fData = (char*)fData + fOffset;
 	fMediaHeader.size_used = 0;
 	fMediaHeader.buffer = fBufferID;
 }
@@ -258,12 +265,11 @@
 {
 	CALLED();
 	// unmap the BufferList
-	if (fBufferList != NULL) {
+	if (fBufferList != NULL)
 		fBufferList->Unmap();
-	}
+
 	// unmap the Data
 	if (fData != NULL) {
-
 		delete_area(fArea);
 
 		// ask media_server to unregister the buffer
@@ -278,23 +284,25 @@
 
 
 void
-BBuffer::SetHeader(const media_header *header)
+BBuffer::SetHeader(const media_header* header)
 {
 	CALLED();
 	fMediaHeader = *header;
 
-//  XXX why can't we do this without crash? what's wrong?
+//  TODO: why can't we do this without crash? what's wrong?
 //	fMediaHeader.buffer = fBufferID;
 }
 
 
-/*************************************************************
- * public BSmallBuffer
- *************************************************************/
+//	#pragma mark - public BSmallBuffer
 
-static const buffer_clone_info info;
+
+static const buffer_clone_info sSmallBufferInfo;
+
+
 BSmallBuffer::BSmallBuffer()
-	: BBuffer(info)
+	:
+	BBuffer(sSmallBufferInfo)
 {
 	UNIMPLEMENTED();
 	debugger("BSmallBuffer::BSmallBuffer called\n");



From mmu_man at mail.berlios.de  Wed Aug  5 18:00:18 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Wed, 5 Aug 2009 18:00:18 +0200
Subject: [Haiku-commits] r32137 - in haiku/trunk: build/jam
	headers/private/system
Message-ID: <200908051600.n75G0IES004412@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-05 18:00:13 +0200 (Wed, 05 Aug 2009)
New Revision: 32137
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32137&view=rev

Added:
   haiku/trunk/headers/private/system/board/
Modified:
   haiku/trunk/build/jam/BuildSetup
Log:
Introduce a new level of portability: boards.
Since we don't support Flattened Device Trees yet (and they don't solve all the issues), we need a place to hole board-specific config, which are different even though we use U-Boot on ARM. Things like cpu & mmu type...
U-Boot doesn't really help us there anyway, it only passes a few board infos (RAM banks & the bill), and optionally other stuff if we fake a linux kernel or netbsd loader, but still not enough. FDT support isn't available for ARM in U-Boot yet either. So for now, and likely for stuff we can't get from FDT, we'll put board-specific config there.
Unlike desktop machines were we want a single kernel per arch, we'd rather have the kernel built for a single board without having to handle detecting mmu type at boot and switching calls like I did on m68k.


Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2009-08-05 15:38:44 UTC (rev 32136)
+++ haiku/trunk/build/jam/BuildSetup	2009-08-05 16:00:13 UTC (rev 32137)
@@ -198,6 +198,7 @@
 	{
 		HAIKU_DEFINES += __ARM__ ;
 		HAIKU_BOOT_PLATFORM = u-boot ;
+		HAIKU_BOOT_BOARD ?= verdex ;
 		HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB (there is not realy a floppy on the gumstix ;) )
 		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
@@ -850,6 +851,7 @@
 	TARGET_GCC_LIBGCC_OBJECTS	= $(HAIKU_GCC_LIBGCC_OBJECTS) ;
 
 	TARGET_BOOT_PLATFORM		?= $(HAIKU_BOOT_PLATFORM) ;
+	TARGET_BOOT_BOARD		?= $(HAIKU_BOOT_BOARD) ;
 
 	TARGET_LIBRARY_NAME_MAP		= HAIKU_LIBRARY_NAME_MAP ;
 



From mmu_man at mail.berlios.de  Wed Aug  5 18:01:17 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Wed, 5 Aug 2009 18:01:17 +0200
Subject: [Haiku-commits] r32138 - haiku/trunk/headers/private/system/board
Message-ID: <200908051601.n75G1Hgp004794@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-05 18:01:17 +0200 (Wed, 05 Aug 2009)
New Revision: 32138
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32138&view=rev

Added:
   haiku/trunk/headers/private/system/board/overo/
   haiku/trunk/headers/private/system/board/verdex/
Log:
Placeholder for current GSoC targets (verdex is QEMU, overo is the real one).




From axeld at mail.berlios.de  Wed Aug  5 18:08:49 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 5 Aug 2009 18:08:49 +0200
Subject: [Haiku-commits] r32139 - in haiku/trunk: headers/os/media
	src/kits/media
Message-ID: <200908051608.n75G8neh007373@sheep.berlios.de>

Author: axeld
Date: 2009-08-05 18:08:47 +0200 (Wed, 05 Aug 2009)
New Revision: 32139
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32139&view=rev

Modified:
   haiku/trunk/headers/os/media/BufferGroup.h
   haiku/trunk/src/kits/media/BufferGroup.cpp
Log:
* Rewrote BBufferGroup header.
* Cleaned up the source file, no functional change (intended).


Modified: haiku/trunk/headers/os/media/BufferGroup.h
===================================================================
--- haiku/trunk/headers/os/media/BufferGroup.h	2009-08-05 16:01:17 UTC (rev 32138)
+++ haiku/trunk/headers/os/media/BufferGroup.h	2009-08-05 16:08:47 UTC (rev 32139)
@@ -1,82 +1,68 @@
-/*******************************************************************************
-/
-/	File:			BufferGroup.h
-/
-/   Description:   A BBufferGroup organizes sets of BBuffers so that you can request
-/	and reclaim them.
-/
-/	Copyright 1997-98, Be Incorporated, All Rights Reserved
-/
-*******************************************************************************/
-
-#if !defined(_BUFFER_GROUP_H)
+/*
+ * Copyright 2009, Haiku Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _BUFFER_GROUP_H
 #define _BUFFER_GROUP_H
 
+
 #include <MediaDefs.h>
 
+
 class BBuffer;
 struct _shared_buffer_list;
 
-class BBufferGroup
-{
+
+class BBufferGroup {
 public:
+							BBufferGroup(size_t size, int32 count = 3,
+								uint32 placement = B_ANY_ADDRESS,
+								uint32 lock = B_FULL_LOCK);
+	explicit				BBufferGroup();
+							BBufferGroup(int32 count,
+								const media_buffer_id* buffers);
+							~BBufferGroup();
 
-		BBufferGroup(
-				size_t size,
-				int32 count = 3,
-				uint32 placement = B_ANY_ADDRESS,
-				uint32 lock = B_FULL_LOCK);
-explicit	BBufferGroup();
-		BBufferGroup(
-				int32 count,
-				const media_buffer_id * buffers);
-		~BBufferGroup();	/* BBufferGroup is NOT a virtual class!!! */
+			status_t		InitCheck();
 
-		status_t InitCheck();
+			status_t		AddBuffer(const buffer_clone_info& info,
+								BBuffer** _buffer = NULL);
 
-			/* use this function to add buffers you created on your own */
-		status_t AddBuffer(
-				const buffer_clone_info & info,
-				BBuffer ** out_buffer = NULL);
+			BBuffer*		RequestBuffer(size_t size,
+								bigtime_t timeout = B_INFINITE_TIMEOUT);
+			status_t		RequestBuffer(BBuffer* buffer,
+								bigtime_t timeout = B_INFINITE_TIMEOUT);
 
-		BBuffer * RequestBuffer(
-				size_t size,
-				bigtime_t timeout = B_INFINITE_TIMEOUT);
-		status_t RequestBuffer(
-				BBuffer * buffer,
-				bigtime_t timeout = B_INFINITE_TIMEOUT);
-		status_t RequestError();	/* return last RequestBuffer error, useful if NULL is returned */
+			status_t		RequestError();
 
-		status_t CountBuffers(
-				int32 * out_count);
-		status_t GetBufferList(
-				int32 buf_count,
-				BBuffer ** out_buffers);
+			status_t		CountBuffers(int32* _count);
+			status_t		GetBufferList(int32 bufferCount,
+								BBuffer** _buffers);
 
-		status_t WaitForBuffers();
-		status_t ReclaimAllBuffers();
+			status_t		WaitForBuffers();
+			status_t		ReclaimAllBuffers();
 
 private:
-		/* in BeOS R5 this is a deprecated api, from BeOS R4 times */
-		status_t 				AddBuffersTo(BMessage * message, const char * name, bool needLock=true);
-		
-		status_t				InitBufferGroup(); 		/* used internally */
-		BBufferGroup(const BBufferGroup &);				/* not implemented */
-		BBufferGroup& operator=(const BBufferGroup&);	/* not implemented */
+			// deprecated BeOS R4 API
+			status_t 		AddBuffersTo(BMessage* message, const char* name,
+								bool needLock);
 
-		friend struct 			_shared_buffer_list;
+							BBufferGroup(const BBufferGroup& other);
+			BBufferGroup&	operator=(const BBufferGroup& other);
 
-		status_t 				fInitError;
-		status_t 				fRequestError;
-		int32					fBufferCount;
-		_shared_buffer_list *	fBufferList;
-		
-		// this is a BBufferGroup specific semaphore used for reclaiming BBuffers of this group
-		// is also is a system wide unique identifier of this group
-		sem_id					fReclaimSem;
+			status_t		_Init();
 
-		uint32 					_reserved_buffer_group_[9];
+private:
+	friend struct _shared_buffer_list;
+
+			status_t		fInitError;
+			status_t		fRequestError;
+			int32			fBufferCount;
+			_shared_buffer_list* fBufferList;
+			sem_id			fReclaimSem;
+
+			uint32			_reserved[9];
 };
 
-#endif /* _BUFFER_GROUP_H */
 
+#endif	// _BUFFER_GROUP_H

Modified: haiku/trunk/src/kits/media/BufferGroup.cpp
===================================================================
--- haiku/trunk/src/kits/media/BufferGroup.cpp	2009-08-05 16:01:17 UTC (rev 32138)
+++ haiku/trunk/src/kits/media/BufferGroup.cpp	2009-08-05 16:08:47 UTC (rev 32139)
@@ -27,69 +27,21 @@
  *
  */
 
+
 #include <BufferGroup.h>
+
 #include <Buffer.h>
+
 #include "debug.h"
-#include "SharedBufferList.h"
 #include "DataExchange.h"
+#include "SharedBufferList.h"
 
-/*************************************************************
- * private BBufferGroup
- *************************************************************/
 
-status_t				
-BBufferGroup::InitBufferGroup()
+BBufferGroup::BBufferGroup(size_t size, int32 count, uint32 placement,
+	uint32 lock)
 {
 	CALLED();
-	
-	// some defaults
-	fBufferList = 0;
-	fReclaimSem = B_ERROR;
-	fInitError = B_ERROR;
-	fRequestError = B_ERROR;
-	fBufferCount = 0;
-
-	// create the reclaim semaphore
-	fReclaimSem = create_sem(0,"buffer reclaim sem");
-	if (fReclaimSem < B_OK) {
-		ERROR("BBufferGroup::InitBufferGroup: couldn't create fReclaimSem\n");
-		fInitError = (status_t)fReclaimSem;
-		return fInitError;
-	}
-
-	// ask media_server to get the area_id of the shared buffer list
-	server_get_shared_buffer_area_request area_request;
-	server_get_shared_buffer_area_reply area_reply;
-	if (QueryServer(SERVER_GET_SHARED_BUFFER_AREA, &area_request, sizeof(area_request), &area_reply, sizeof(area_reply)) != B_OK) {
-		ERROR("BBufferGroup::InitBufferGroup: SERVER_GET_SHARED_BUFFER_AREA failed\n");
-		fInitError = B_ERROR;
-		return fInitError;
-	}
-	ASSERT(area_reply.area > 0);
-
-	fBufferList = _shared_buffer_list::Clone(area_reply.area);
-	if (fBufferList == NULL) {
-		ERROR("BBufferGroup::InitBufferGroup: _shared_buffer_list::Clone failed\n");
-		fInitError = B_ERROR;
-		return fInitError;
-	}
-
-	fInitError = B_OK;
-	return fInitError;
-}
-
-
-/*************************************************************
- * public BBufferGroup
- *************************************************************/
-
-BBufferGroup::BBufferGroup(size_t size,
-						   int32 count,
-						   uint32 placement,
-						   uint32 lock)
-{
-	CALLED();
-	if (InitBufferGroup() != B_OK)
+	if (_Init() != B_OK)
 		return;
 		
 	// This one is easy. We need to create "count" BBuffers,
@@ -99,99 +51,75 @@
 	// then we delete our area. This way BBuffers are
 	// independent from the BBufferGroup
 
-	void *start_addr;
-	area_id buffer_area;
-	size_t area_size;
-	buffer_clone_info bci;
-	BBuffer *buffer;
-
 	// don't allow all placement parameter values
 	if (placement != B_ANY_ADDRESS && placement != B_ANY_KERNEL_ADDRESS) {
-		ERROR("BBufferGroup: placement != B_ANY_ADDRESS && placement != B_ANY_KERNEL_ADDRESS (0x%08lx)\n",placement);
+		ERROR("BBufferGroup: placement != B_ANY_ADDRESS "
+			"&& placement != B_ANY_KERNEL_ADDRESS (0x%08lx)\n", placement);
 		placement = B_ANY_ADDRESS;
 	}
 	
 	// first we roundup for a better placement in memory
-	int allocsize = (size + 63) & ~63;
+	size_t allocSize = (size + 63) & ~63;
 
 	// now we create the area
-	area_size = ((allocsize * count) + (B_PAGE_SIZE - 1)) & ~(B_PAGE_SIZE - 1);
+	size_t areaSize
+		= ((allocSize * count) + B_PAGE_SIZE - 1) & ~(B_PAGE_SIZE - 1);
 
-	buffer_area = create_area("some buffers area", &start_addr,placement,area_size,lock,B_READ_AREA | B_WRITE_AREA);
-	if (buffer_area < B_OK) {
-		ERROR("BBufferGroup: failed to allocate %ld bytes area\n",area_size);
-		fInitError = (status_t)buffer_area;
+	void* startAddress;
+	area_id bufferArea = create_area("some buffers area", &startAddress,
+		placement, areaSize, lock, B_READ_AREA | B_WRITE_AREA);
+	if (bufferArea < 0) {
+		ERROR("BBufferGroup: failed to allocate %ld bytes area\n", areaSize);
+		fInitError = (status_t)bufferArea;
 		return;
 	}
-	
-	fBufferCount = count;
 
+	buffer_clone_info info;
+
 	for (int32 i = 0; i < count; i++) {	
-		bci.area = buffer_area;
-		bci.offset = i * allocsize;
-		bci.size = size;
-		buffer = new BBuffer(bci);
-		if (0 == buffer->Data()) {
-			// BBuffer::Data() will return 0 if an error occured
-			ERROR("BBufferGroup: error while creating buffer\n");
-			delete buffer;
-			fInitError = B_ERROR;
+		info.area = bufferArea;
+		info.offset = i * allocSize;
+		info.size = size;
+
+		fInitError = AddBuffer(info);
+		if (fInitError != B_OK)
 			break;
-		}
-		if (B_OK != fBufferList->AddBuffer(fReclaimSem,buffer)) {
-			ERROR("BBufferGroup: error when adding buffer\n");
-			delete buffer;
-			fInitError = B_ERROR;
-			break;
-		}
 	}
 
-	delete_area(buffer_area);
+	delete_area(bufferArea);
 }
 
-/* explicit */
+
 BBufferGroup::BBufferGroup()
 {
 	CALLED();
-	if (InitBufferGroup() != B_OK)
+	if (_Init() != B_OK)
 		return;
 		
 	// this one simply creates an empty BBufferGroup
 }
 
 
-BBufferGroup::BBufferGroup(int32 count,
-						   const media_buffer_id *buffers)
+BBufferGroup::BBufferGroup(int32 count, const media_buffer_id* buffers)
 {
 	CALLED();
-	if (InitBufferGroup() != B_OK)
+	if (_Init() != B_OK)
 		return;
 		
-	// XXX we need to make sure that a media_buffer_id is only added once to each group
+	// TODO: we need to make sure that a media_buffer_id is only added
+	// once to each group
 
 	// this one creates "BBuffer"s from "media_buffer_id"s passed 
 	// by the application.
 
-	fBufferCount = count;
+	buffer_clone_info info;
 
-	buffer_clone_info bci;
-	BBuffer *buffer;
 	for (int32 i = 0; i < count; i++) {	
-		bci.buffer = buffers[i];
-		buffer = new BBuffer(bci);
-		if (0 == buffer->Data()) {
-			// BBuffer::Data() will return 0 if an error occured
-			ERROR("BBufferGroup(2): error while creating buffer\n");
-			delete buffer;
-			fInitError = B_ERROR;
+		info.buffer = buffers[i];
+
+		fInitError = AddBuffer(info);
+		if (fInitError != B_OK)
 			break;
-		}
-		if (B_OK != fBufferList->AddBuffer(fReclaimSem,buffer)) {
-			ERROR("BBufferGroup(2): error when adding buffer\n");
-			delete buffer;
-			fInitError = B_ERROR;
-			break;
-		}
 	}
 }
 
@@ -201,8 +129,8 @@
 	CALLED();
 	if (fBufferList)
 		fBufferList->Terminate(fReclaimSem);
-	if (fReclaimSem >= B_OK)
-		delete_sem(fReclaimSem);
+
+	delete_sem(fReclaimSem);
 }
 
 
@@ -215,41 +143,44 @@
 
 
 status_t
-BBufferGroup::AddBuffer(const buffer_clone_info &info,
-						BBuffer **out_buffer)
+BBufferGroup::AddBuffer(const buffer_clone_info& info, BBuffer** _buffer)
 {
 	CALLED();
 	if (fInitError != B_OK)
 		return B_NO_INIT;
 
-	// XXX we need to make sure that a media_buffer_id is only added once to each group
+	// TODO: we need to make sure that a media_buffer_id is only added
+	// once to each group
 
-	BBuffer *buffer;	
-	buffer = new BBuffer(info);
-	if (0 == buffer->Data()) {
-		// BBuffer::Data() will return 0 if an error occured
-		ERROR("BBufferGroup::AddBuffer: error while creating buffer\n");
+	BBuffer* buffer = new(std::nothrow) BBuffer(info);
+	if (buffer == NULL)
+		return B_NO_MEMORY;
+
+	if (buffer->Data() == NULL) {
+		// BBuffer::Data() will return NULL if an error occured
+		ERROR("BBufferGroup: error while creating buffer\n");
 		delete buffer;
 		return B_ERROR;
 	}
-	if (B_OK != fBufferList->AddBuffer(fReclaimSem,buffer)) {
-		ERROR("BBufferGroup::AddBuffer: error when adding buffer\n");
+
+	status_t status = fBufferList->AddBuffer(fReclaimSem, buffer);
+	if (status != B_OK) {
+		ERROR("BBufferGroup: error when adding buffer\n");
 		delete buffer;
-		fInitError = B_ERROR;
-		return B_ERROR;
+		return status;
 	}
-	atomic_add(&fBufferCount,1);
-	
-	if (out_buffer != 0)
-		*out_buffer = buffer;
 
+	atomic_add(&fBufferCount, 1);
+
+	if (_buffer != NULL)
+		*_buffer = buffer;
+
 	return B_OK;
 }
 
 
-BBuffer *
-BBufferGroup::RequestBuffer(size_t size,
-							bigtime_t timeout)
+BBuffer*
+BBufferGroup::RequestBuffer(size_t size, bigtime_t timeout)
 {
 	CALLED();
 	if (fInitError != B_OK)
@@ -262,16 +193,16 @@
 	status_t status;
 
 	buffer = NULL;
-	status = fBufferList->RequestBuffer(fReclaimSem, fBufferCount, size, 0, &buffer, timeout);
+	status = fBufferList->RequestBuffer(fReclaimSem, fBufferCount, size, 0,
+		&buffer, timeout);
 	fRequestError = status;
-		
-	return (status == B_OK) ? buffer : NULL;
+
+	return status == B_OK ? buffer : NULL;
 }
 
 
 status_t
-BBufferGroup::RequestBuffer(BBuffer *buffer,
-							bigtime_t timeout)
+BBufferGroup::RequestBuffer(BBuffer* buffer, bigtime_t timeout)
 {
 	CALLED();
 	if (fInitError != B_OK)
@@ -281,7 +212,8 @@
 		return B_BAD_VALUE;
 
 	status_t status;
-	status = fBufferList->RequestBuffer(fReclaimSem, fBufferCount, 0, 0, &buffer, timeout);
+	status = fBufferList->RequestBuffer(fReclaimSem, fBufferCount, 0, 0,
+		&buffer, timeout);
 	fRequestError = status;
 		
 	return status;
@@ -300,29 +232,28 @@
 
 
 status_t
-BBufferGroup::CountBuffers(int32 *out_count)
+BBufferGroup::CountBuffers(int32* _count)
 {
 	CALLED();
 	if (fInitError != B_OK)
 		return B_NO_INIT;
 
-	*out_count = fBufferCount;
+	*_count = fBufferCount;
 	return B_OK;
 }
 
 
 status_t
-BBufferGroup::GetBufferList(int32 buf_count,
-							BBuffer **out_buffers)
+BBufferGroup::GetBufferList(int32 bufferCount, BBuffer** _buffers)
 {
 	CALLED();
 	if (fInitError != B_OK)
 		return B_NO_INIT;
 		
-	if (buf_count <= 0 || buf_count > fBufferCount)
+	if (bufferCount <= 0 || bufferCount > fBufferCount)
 		return B_BAD_VALUE;
 
-	return fBufferList->GetBufferList(fReclaimSem,buf_count,out_buffers);
+	return fBufferList->GetBufferList(fReclaimSem, bufferCount, _buffers);
 }
 
 
@@ -333,25 +264,26 @@
 	if (fInitError != B_OK)
 		return B_NO_INIT;
 
-	// XXX this function is not really useful anyway, and will 
-	// XXX not work exactly as documented, but it is close enough
+	// TODO: this function is not really useful anyway, and will 
+	// not work exactly as documented, but it is close enough
 
 	if (fBufferCount < 0)
 		return B_BAD_VALUE;
 	if (fBufferCount == 0)
 		return B_OK;
 
-	// we need to wait until at least one buffer belonging to this group is reclaimed.
-	// this has happened when can aquire "fReclaimSem"
+	// We need to wait until at least one buffer belonging to this group is
+	// reclaimed.
+	// This has happened when can aquire "fReclaimSem"
 
 	status_t status;
-	while (B_INTERRUPTED == (status = acquire_sem(fReclaimSem)))
+	while ((status = acquire_sem(fReclaimSem)) == B_INTERRUPTED)
 		;
-	
-	if (status != B_OK) // some error happened
+	if (status != B_OK)
 		return status;
 		
-	// we need to release the "fReclaimSem" now, else we would block requesting of new buffers
+	// we need to release the "fReclaimSem" now, else we would block
+	// requesting of new buffers
 
 	return release_sem(fReclaimSem);
 }
@@ -364,7 +296,8 @@
 	if (fInitError != B_OK)
 		return B_NO_INIT;
 
-	// because additional BBuffers might get added to this group betweeen acquire and release		
+	// because additional BBuffers might get added to this group betweeen
+	// acquire and release		
 	int32 count = fBufferCount;
 
 	if (count < 0)
@@ -373,32 +306,29 @@
 		return B_OK;
 
 	// we need to wait until all BBuffers belonging to this group are reclaimed.
-	// this has happened when the "fReclaimSem" can be aquired "fBufferCount" times
+	// this has happened when the "fReclaimSem" can be aquired "fBufferCount"
+	// times
 
 	status_t status;
-	while (B_INTERRUPTED == (status = acquire_sem_etc(fReclaimSem, count, 0, 0)))
-		;
+	do {
+		status = acquire_sem_etc(fReclaimSem, count, 0, 0);
+	} while (status == B_INTERRUPTED);
 	
-	if (status != B_OK) // some error happened
+	if (status != B_OK)
 		return status;
 		
-	// we need to release the "fReclaimSem" now, else we would block requesting of new buffers
+	// we need to release the "fReclaimSem" now, else we would block
+	// requesting of new buffers
 
 	return release_sem_etc(fReclaimSem, count, 0);
 }
 
-/*************************************************************
- * private BBufferGroup
- *************************************************************/
 
-/* not implemented */
-/*
-BBufferGroup::BBufferGroup(const BBufferGroup &)
-BBufferGroup & BBufferGroup::operator=(const BBufferGroup &)
-*/
+//	#pragma mark - deprecated BeOS R4 API
 
+
 status_t
-BBufferGroup::AddBuffersTo(BMessage * message, const char * name, bool needLock)
+BBufferGroup::AddBuffersTo(BMessage* message, const char* name, bool needLock)
 {
 	CALLED();
 	if (fInitError != B_OK)
@@ -413,22 +343,76 @@
 	if (name == NULL || strlen(name) == 0)
 		return B_BAD_VALUE;
 	
-	BBuffer ** buffers;
-	status_t status;
+	BBuffer** buffers;
 	int32 count;
 	
 	count = fBufferCount;
 	buffers = new BBuffer * [count];
-	
-	if (B_OK != (status = GetBufferList(count,buffers)))
+
+	status_t status = GetBufferList(count, buffers);
+	if (status != B_OK)
 		goto end;
 		
-	for (int32 i = 0; i < count; i++)
-		if (B_OK != (status = message->AddInt32(name,int32(buffers[i]->ID()))))
+	for (int32 i = 0; i < count; i++) {
+		status = message->AddInt32(name, int32(buffers[i]->ID()));
+		if (status != B_OK)
 			goto end;
-	
+	}
+
 end:
 	delete [] buffers;
 	return status;
 }
 
+
+//	#pragma mark - private methods
+
+
+/* not implemented */
+//BBufferGroup::BBufferGroup(const BBufferGroup &)
+//BBufferGroup & BBufferGroup::operator=(const BBufferGroup &)
+
+
+status_t
+BBufferGroup::_Init()
+{
+	CALLED();
+	
+	// some defaults in case we drop out early
+	fBufferList = 0;
+	fInitError = B_ERROR;
+	fRequestError = B_ERROR;
+	fBufferCount = 0;
+
+	// Create the reclaim semaphore
+	// This is also used as a system wide unique identifier for this group
+	fReclaimSem = create_sem(0, "buffer reclaim sem");
+	if (fReclaimSem < B_OK) {
+		ERROR("BBufferGroup::InitBufferGroup: couldn't create fReclaimSem\n");
+		fInitError = (status_t)fReclaimSem;
+		return fInitError;
+	}
+
+	// ask media_server to get the area_id of the shared buffer list
+	server_get_shared_buffer_area_request areaRequest;
+	server_get_shared_buffer_area_reply areaReply;
+	if (QueryServer(SERVER_GET_SHARED_BUFFER_AREA, &areaRequest,
+			sizeof(areaRequest), &areaReply, sizeof(areaReply)) != B_OK) {
+		ERROR("BBufferGroup::InitBufferGroup: SERVER_GET_SHARED_BUFFER_AREA "
+			"failed\n");
+		fInitError = B_ERROR;
+		return fInitError;
+	}
+
+	fBufferList = _shared_buffer_list::Clone(areaReply.area);
+	if (fBufferList == NULL) {
+		ERROR("BBufferGroup::InitBufferGroup: _shared_buffer_list::Clone "
+			"failed\n");
+		fInitError = B_ERROR;
+		return fInitError;
+	}
+
+	fInitError = B_OK;
+	return fInitError;
+}
+



From axeld at pinc-software.de  Wed Aug  5 18:33:49 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 18:33:49 +0200 CEST
Subject: [Haiku-commits] r32138 -
	haiku/trunk/headers/private/system/board
In-Reply-To: <200908051601.n75G1Hgp004794@sheep.berlios.de>
Message-ID: <142191487-BeMail@zon>

mmu_man at mail.berlios.de wrote:
> Added:
>    haiku/trunk/headers/private/system/board/overo/
>    haiku/trunk/headers/private/system/board/verdex/
> Log:
> Placeholder for current GSoC targets (verdex is QEMU, overo is the 
> real one).

What is supposed to go in there, and why isn't it in arch/?

Bye,
   Axel.



From phoudoin at mail.berlios.de  Wed Aug  5 18:54:33 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Wed, 5 Aug 2009 18:54:33 +0200
Subject: [Haiku-commits] r32140 - haiku/trunk/build/jam
Message-ID: <200908051654.n75GsXN2008891@sheep.berlios.de>

Author: phoudoin
Date: 2009-08-05 18:54:19 +0200 (Wed, 05 Aug 2009)
New Revision: 32140
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32140&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Fixed Clockwerk gcc2/gcc4 package filenames.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-08-05 16:08:47 UTC (rev 32139)
+++ haiku/trunk/build/jam/OptionalPackages	2009-08-05 16:54:19 UTC (rev 32140)
@@ -204,14 +204,14 @@
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Clockwerk available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-2009-08-04
+		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc4-2009-08-04
 			: $(baseURL)/Clockwerk-0.0.1-x86-gcc4-2009-08-04.zip
 			:
 		;
 		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/Clockwerk/Clockwerk ;
 	} else {
-		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-2009-08-04
+		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc2-2009-08-04
 			: $(baseURL)/Clockwerk-0.0.1-x86-gcc2-2009-08-04.zip
 			:
 		;



From revol at free.fr  Wed Aug  5 19:01:41 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Wed, 05 Aug 2009 19:01:41 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32138_-_haiku/trunk/headers/private/sy?=
 =?utf-8?q?stem/board?=
In-Reply-To: <142191487-BeMail@zon>
Message-ID: <2498479705-BeMail@laptop>

> mmu_man at mail.berlios.de wrote:
> > Added:
> >    haiku/trunk/headers/private/system/board/overo/
> >    haiku/trunk/headers/private/system/board/verdex/
> > Log:
> > Placeholder for current GSoC targets (verdex is QEMU, overo is the 
> > real one).
> 
> What is supposed to go in there, and why isn't it in arch/?

board_config.h & other stuff telling the cpu is an omap3, ...

Right, it could be a subfolder of arch/$arch/ ...
I don't know of a board with the same config and a different arch, yet.
Ok let's move that here.

Fran?ois.


From axeld at mail.berlios.de  Wed Aug  5 19:24:26 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 5 Aug 2009 19:24:26 +0200
Subject: [Haiku-commits] r32141 - in haiku/trunk:
	headers/private/graphics/vesa
	src/system/boot/platform/bios_ia32 src/system/kernel/debug
Message-ID: <200908051724.n75HOQAV023152@sheep.berlios.de>

Author: axeld
Date: 2009-08-05 19:24:23 +0200 (Wed, 05 Aug 2009)
New Revision: 32141
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32141&view=rev

Modified:
   haiku/trunk/headers/private/graphics/vesa/vesa.h
   haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp
   haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp
Log:
* This fixes VGA mode frame buffer use, no idea when this got broken. It might
  be broken in the app_server now, but I haven't checked yet.
* Fixed typo in vesa.h.


Modified: haiku/trunk/headers/private/graphics/vesa/vesa.h
===================================================================
--- haiku/trunk/headers/private/graphics/vesa/vesa.h	2009-08-05 16:54:19 UTC (rev 32140)
+++ haiku/trunk/headers/private/graphics/vesa/vesa.h	2009-08-05 17:24:23 UTC (rev 32141)
@@ -44,7 +44,7 @@
 	uint16		attributes;
 	uint8		window_a_attributes;
 	uint8		window_b_attributes;
-	uint16		window_granulatiry;
+	uint16		window_granularity;
 	uint16		window_size;
 	uint16		window_a_segment;
 	uint16		window_b_segment;

Modified: haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp	2009-08-05 16:54:19 UTC (rev 32140)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp	2009-08-05 17:24:23 UTC (rev 32141)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2004-2009, Axel D?rfler, axeld at pinc-software.de.
  * Copyright 2008, Stephan A?mus <superstippi at gmx.de>
  * Copyright 2008, Philippe Saint-Pierre <stpere at gmail.com>
  * Distributed under the terms of the MIT License.
@@ -1007,7 +1007,7 @@
 
 		gKernelArgs.frame_buffer.width = 640;
 		gKernelArgs.frame_buffer.height = 480;
-		gKernelArgs.frame_buffer.bytes_per_row = 640 / 2;
+		gKernelArgs.frame_buffer.bytes_per_row = 80;
 		gKernelArgs.frame_buffer.depth = 4;
 		gKernelArgs.frame_buffer.physical_buffer.size
 			= gKernelArgs.frame_buffer.width

Modified: haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp	2009-08-05 16:54:19 UTC (rev 32140)
+++ haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp	2009-08-05 17:24:23 UTC (rev 32141)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2005-2009, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -142,8 +142,8 @@
 	} else {
 		// monochrome mode
 
-		uint8 *base = (uint8 *)(sConsole.frame_buffer + sConsole.bytes_per_row * y * CHAR_HEIGHT
-			+ x * CHAR_WIDTH / 8);
+		uint8 *base = (uint8 *)(sConsole.frame_buffer
+			+ sConsole.bytes_per_row * y * CHAR_HEIGHT + x * CHAR_WIDTH / 8);
 		uint8 baseOffset =  (x * CHAR_WIDTH) & 0x7;
 
 		for (y = 0; y < CHAR_HEIGHT; y++) {
@@ -415,7 +415,8 @@
 
 	if (args->frame_buffer.depth == 4) {
 		// VGA mode will be treated as monochrome
-		args->frame_buffer.bytes_per_row /= 8;
+		// (ie. only the first plane will be used)
+		args->frame_buffer.depth = 1;
 	}
 
 	frame_buffer_update((addr_t)frameBuffer, args->frame_buffer.width,



From mmu_man at mail.berlios.de  Wed Aug  5 19:30:01 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Wed, 5 Aug 2009 19:30:01 +0200
Subject: [Haiku-commits] r32142 - in haiku/trunk/headers/private/system: .
	arch/arm
Message-ID: <200908051730.n75HU1o2032578@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-05 19:29:55 +0200 (Wed, 05 Aug 2009)
New Revision: 32142
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32142&view=rev

Added:
   haiku/trunk/headers/private/system/arch/arm/board/
Removed:
   haiku/trunk/headers/private/system/board/
Log:
Move board/ into arch/arm/ since boards likely depend on a cpu anyway. Other archs might want to use the same structure (mipsel ?).


Copied: haiku/trunk/headers/private/system/arch/arm/board (from rev 32140, haiku/trunk/headers/private/system/board)



From axeld at pinc-software.de  Wed Aug  5 20:05:34 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 20:05:34 +0200 CEST
Subject: [Haiku-commits] r32138 -
	haiku/trunk/headers/private/system/board
In-Reply-To: <2498479705-BeMail@laptop>
Message-ID: <5647316905-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> > mmu_man at mail.berlios.de wrote:
> > > Added:
> > >    haiku/trunk/headers/private/system/board/overo/
> > >    haiku/trunk/headers/private/system/board/verdex/
> > > Log:
> > > Placeholder for current GSoC targets (verdex is QEMU, overo is 
> > > the 
> > > real one).
> > What is supposed to go in there, and why isn't it in arch/?
> board_config.h & other stuff telling the cpu is an omap3, ...
> 
> Right, it could be a subfolder of arch/$arch/ ...
> I don't know of a board with the same config and a different arch, 
> yet.
> Ok let's move that here.

Also, does that really have to be "board" dependent - shouldn't it 
rather be CPU dependent?
Like a sub-arch folder?
And finally, why system/ and not kernel/ - the former are kernel 
headers interesting for userland.

Bye,
   Axel.



From bonefish at mail.berlios.de  Wed Aug  5 20:41:23 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 5 Aug 2009 20:41:23 +0200
Subject: [Haiku-commits] r32143 - haiku/trunk/build/jam
Message-ID: <200908051841.n75IfNMX001149@sheep.berlios.de>

Author: bonefish
Date: 2009-08-05 20:41:21 +0200 (Wed, 05 Aug 2009)
New Revision: 32143
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32143&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Removed superfluous check.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-08-05 17:29:55 UTC (rev 32142)
+++ haiku/trunk/build/jam/OptionalPackages	2009-08-05 18:41:21 UTC (rev 32143)
@@ -406,8 +406,6 @@
  		;
  		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
-		Echo "No optional package Firefox available for GCC4" ;
 	} else {
 		InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218
 			: http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip



From ingo_weinhold at gmx.de  Wed Aug  5 20:11:13 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Wed, 05 Aug 2009 20:11:13 +0200
Subject: [Haiku-commits] r32133 - haiku/trunk/build/jam
In-Reply-To: <20090805170205.533.1@bepc.1249484037.fake>
References: <200908051429.n75ET0DB001612@sheep.berlios.de>
	<20090805170205.533.1@bepc.1249484037.fake>
Message-ID: <20090805201113.542.2@knochen-vm.localdomain>


On 2009-08-05 at 17:02:05 [+0200], Stephan Assmus <superstippi at gmx.de> wrote:
> 
> On 2009-08-05 at 16:29:00 [+0200], bonefish at mail.berlios.de wrote:
> > Author: bonefish
> > Date: 2009-08-05 16:28:58 +0200 (Wed, 05 Aug 2009) New Revision: 32133
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32133&view=rev
> > 
> > Modified:
> >    haiku/trunk/build/jam/OptionalPackages
> > Log:
> > Reenabled Firefox gcc 4 package.
> > 
> > 
> > Modified: haiku/trunk/build/jam/OptionalPackages
> > ===================================================================
> > --- haiku/trunk/build/jam/OptionalPackages    2009-08-05 14:26:47 UTC
> > (rev 32132)
> > +++ haiku/trunk/build/jam/OptionalPackages    2009-08-05 14:28:58 UTC
> > (rev 32133)
> > @@ -398,17 +398,14 @@
> >  if [ IsOptionalHaikuImagePackageAdded Firefox ] {
> >      if $(TARGET_ARCH) != x86 {
> >          Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
> > -# TODO: Update BeZilla GCC4 build, this one is currently broken, because
> > of
> > -# the BToolTip addition. At least the GCC2 build will work just fine on
> > hybrid
> > -# installations.
> > -#    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
> > -#        InstallOptionalHaikuImagePackage
> > -#            BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
> > -#            :
> > $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
> > -#             : apps
> > -#         ;
> > -#         AddSymlinkToHaikuImage home config be Applications
> > -#            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
> > +    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
> > +        InstallOptionalHaikuImagePackage
> > +            BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
> > +            :
> > $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
> > +             : apps
> > +         ;
> > +         AddSymlinkToHaikuImage home config be Applications
> > +            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
> >      } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
> >          Echo "No optional package Firefox available for GCC4" ;
> >      } else {
> 
> You did the same mistake as Rene. The next two lines need to be removed as
> well.

Oh, right. I guess I expected those temporary lines to be unintended or 
otherwise marked.

CU, Ingo


From axeld at mail.berlios.de  Wed Aug  5 21:08:38 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 5 Aug 2009 21:08:38 +0200
Subject: [Haiku-commits] r32144 - haiku/trunk/src/preferences/screen
Message-ID: <200908051908.n75J8cOG009013@sheep.berlios.de>

Author: axeld
Date: 2009-08-05 21:08:36 +0200 (Wed, 05 Aug 2009)
New Revision: 32144
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32144&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenWindow.cpp
Log:
* Now also puts the monitor's serial number and production date into the
  tool tip (if available).


Modified: haiku/trunk/src/preferences/screen/ScreenWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-05 18:41:21 UTC (rev 32143)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-05 19:08:36 UTC (rev 32144)
@@ -1103,7 +1103,7 @@
 		return;
 	}
 
-	char text[256];
+	char text[512];
 	snprintf(text, sizeof(text), "%s%s%s %g\"", info.vendor,
 		info.name[0] ? " " : "", info.name, diagonalInches);
 
@@ -1112,16 +1112,32 @@
 	if (fMonitorInfo->IsHidden())
 		fMonitorInfo->Show();
 
+	size_t length = 0;
+	text[0] = 0;
+
 	if (info.min_horizontal_frequency != 0
 		&& info.min_vertical_frequency != 0
 		&& info.max_pixel_clock != 0) {
-		snprintf(text, sizeof(text), "Horizonal Frequency:\t%lu - %lu kHz\n"
+		length = snprintf(text, sizeof(text),
+			"Horizonal Frequency:\t%lu - %lu kHz\n"
 			"Vertical Frequency:\t%lu - %lu Hz\n\n"
-			"Maximum Pixel Clock:\t%g MHz", info.min_horizontal_frequency,
-			info.max_horizontal_frequency, info.min_vertical_frequency,
-			info.max_vertical_frequency, info.max_pixel_clock / 1000.0);
+			"Maximum Pixel Clock:\t%g MHz", 
+			info.min_horizontal_frequency, info.max_horizontal_frequency,
+			info.min_vertical_frequency, info.max_vertical_frequency,
+			info.max_pixel_clock / 1000.0);
+	}
+	if (info.serial_number[0] && length < sizeof(text)) {
+		length += snprintf(text + length, sizeof(text) - length,
+			"%sSerial no.: %s", length ? "\n\n" : "",
+			info.serial_number);
+		if (info.produced.week != 0 && info.produced.year != 0 
+			&& length < sizeof(text)) {
+			length += snprintf(text + length, sizeof(text) - length,
+				"(%u/%u)", info.produced.week, info.produced.year);
+ 		}
+	}
+	if (text[0])
 		fMonitorView->SetToolTip(text);
-	}
 }
 
 



From axeld at mail.berlios.de  Wed Aug  5 21:10:24 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 5 Aug 2009 21:10:24 +0200
Subject: [Haiku-commits] r32145 - haiku/trunk/src/servers/app/drawing
Message-ID: <200908051910.n75JAOaf009872@sheep.berlios.de>

Author: axeld
Date: 2009-08-05 21:10:22 +0200 (Wed, 05 Aug 2009)
New Revision: 32145
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32145&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
Log:
* Also fill out monitor_info production date from EDID info.
* Do not set serial_number if there is none.


Modified: haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp	2009-08-05 19:08:36 UTC (rev 32144)
+++ haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp	2009-08-05 19:10:22 UTC (rev 32145)
@@ -928,9 +928,13 @@
 
 	memset(info, 0, sizeof(monitor_info));
 	strlcpy(info->vendor, edid.vendor.manufacturer, sizeof(info->vendor));
-	snprintf(info->serial_number, sizeof(info->serial_number), "%lu",
-		edid.vendor.serial);
+	if (edid.vendor.serial != 0) {
+		snprintf(info->serial_number, sizeof(info->serial_number), "%lu",
+			edid.vendor.serial);
+	}
 	info->product_id = edid.vendor.prod_id;
+	info->produced.week = edid.vendor.week;
+	info->produced.year = edid.vendor.year;
 	info->width = edid.display.h_size;
 	info->height = edid.display.v_size;
 
@@ -946,6 +950,7 @@
 			case EDID1_MONITOR_NAME:
 				// There can be several of these; in this case we'll just
 				// overwrite the previous entries
+				// TODO: we could append them as well
 				strlcpy(info->name, monitor->data.monitor_name,
 					sizeof(info->name));
 				break;



From mattmadia at gmail.com  Wed Aug  5 23:09:50 2009
From: mattmadia at gmail.com (mattmadia at gmail.com)
Date: Wed, 05 Aug 2009 14:09:50 -0700 (PDT)
Subject: [Haiku-commits] BOM: r32142 - ...failed
	C++	/objects/haiku/--arch--/release/system/kernel/signal.o ...
Message-ID: <4a79f51e.48c3f10a.7b77.ffff8c51@mx.google.com>

Host Machine          : FreeBSD 7.2-RELEASE i386
Host Machine 32|64bit : 32bit
use-xattr             : True
use-32bit             : False
Architectures Tested  :
ppc
	x86gcc2
	x86gcc4
	x86gcc2hybrid
	x86gcc4hybrid
Targets Affected      :

	x86gcc4- at alpha-cd
	x86gcc4- at alpha-raw
	x86gcc4- at alpha-vmware
	x86gcc2- at alpha-cd
	x86gcc2- at alpha-raw
	x86gcc2- at alpha-vmware
	x86gcc2hybrid- at alpha-cd
	x86gcc2hybrid- at alpha-raw
	x86gcc2hybrid- at alpha-vmware
	ppc-haiku-image
	ppc- at alpha-raw
	x86gcc4hybrid- at alpha-cd
	x86gcc4hybrid- at alpha-raw
	x86gcc4hybrid- at alpha-vmware
Log Snippet :

AddTargetVariableToScript1 /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/haiku.image-init-vars 
AddTargetVariableToScript1 /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/haiku.image-init-vars 
AddTargetVariableToScript1 /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/haiku.image-init-vars 
AddTargetVariableToScript1 /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/haiku.image-init-vars 
AddTargetVariableToScript1 /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/haiku.image-init-vars 
InitScript1 /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/haiku.image-make-dirs 
CreateContainerMakeDirectoriesScript1 /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/haiku.image-make-dirs 
AppendToContainerMakeDirectoriesScriptAttributes <HaikuImage>haiku.image-make-dirs-attributes-dummy-home/config/settings/printers/Preview 
AppendToContainerMakeDirectoriesScriptAttributes <HaikuImage>haiku.image-make-dirs-attributes-dummy-home/config/settings/printers/Save as PDF 
InitScript1 /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/haiku.image-copy-files 
BuildHaikuImageUserGroupFile /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/common/group 
BuildHaikuImageUserGroupFile /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/common/passwd 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/etc 
C++ /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/haiku/x86/release/system/kernel/signal.o 
/storage/Build-o-Matic/haiku/haiku/src/system/kernel/signal.cpp:60: error: expected constructor, destructor, or type conversion before '--' token
/storage/Build-o-Matic/haiku/haiku/src/system/kernel/signal.cpp: In function 'bool handle_signals(thread*)':
/storage/Build-o-Matic/haiku/haiku/src/system/kernel/signal.cpp:382: error: 'deliver_signal' was not declared in this scope

/storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/bin/i586-pc-haiku-gcc -c "/storage/Build-o-Matic/haiku/haiku/src/system/kernel/signal.cpp" -O -Wall -Wno-trigraphs -Wno-multichar -pipe -fno-strict-aliasing -fno-tree-vrp -nostdinc -Wno-deprecated -DHAIKU_ARCH=\"x86\" -D_ZETA_USING_DEPRECATED_API_=1 -D_ZETA_TS_FIND_DIR_=1 -Werror -Wno-error=uninitialized -pipe -fno-strict-aliasing -fno-tree-vrp -finline -fno-builtin -fno-exceptions -DBOCHS_DEBUG_HACK=0 -fno-use-cxa-atexit -ffreestanding -fno-pic -D_KERNEL_MODE -D__HAIKU__ -DHAIKU_DISTRO_COMPATIBILITY_DEFAULT -D__INTEL__ -DARCH_x86 -DBOOT_ARCHIVE_IMAGE_OFFSET=300 -DHAIKU_TARGET_PLATFORM_HAIKU -iquote /storage/Build-o-Matic/haiku/haiku/build/user_config_headers -iquote /storage/Build-o-Matic/haiku/haiku/build/config_headers -iquote /storage/Build-o-Matic/haiku/haiku/src/system/kernel -iquote /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/common/system/kernel -iquote /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/freebsd/x86/common/system/kernel -iquote /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/haiku/x86/common/system/kernel -iquote /storage/Build-o-Matic/haiku/haiku/src/system/kernel/scheduler -I /storage/Build-o-Matic/haiku/haiku/headers/private/libroot -I /storage/Build-o-Matic/haiku/haiku/headers/private/shared -I /storage/Build-o-Matic/haiku/haiku/headers/private/runtime_loader -I /storage/Build-o-Matic/haiku/haiku/headers/private/. -I /storage/Build-o-Matic/haiku/haiku/headers/private/kernel -I /storage/Build-o-Matic/haiku/haiku/headers/private/libroot -I /storage/Build-o-Matic/haiku/haiku/headers/private/kernel/boot/platform/bios_ia32 -I /storage/Build-o-Matic/haiku/haiku/headers/private/kernel/arch/x86 -I /storage/Build-o-Matic/haiku/haiku/headers/private/. -I /storage/Build-o-Matic/haiku/haiku/headers/private/system -I /storage/Build-o-Matic/haiku/haiku/headers/private/system/arch/x86 -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3 -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3/i586-pc-haiku -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3/backward -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3/ext -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/include -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/include-fixed -I /storage/Build-o-Matic/haiku/haiku/headers -I /storage/Build-o-Matic/haiku/haiku/headers/posix -I /storage/Build-o-Matic/haiku/haiku/headers/gnu -I /storage/Build-o-Matic/haiku/haiku/headers/glibc -I /storage/Build-o-Matic/haiku/haiku/headers/os -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/file_system -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/graphics -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/input_server -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/registrar -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/screen_saver -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/tracker -I /storage/Build-o-Matic/haiku/haiku/headers/os/app -I /storage/Build-o-Matic/haiku/haiku/headers/os/device -I /storage/Build-o-Matic/haiku/haiku/headers/os/drivers -I /storage/Build-o-Matic/haiku/haiku/headers/os/game -I /storage/Build-o-Matic/haiku/haiku/headers/os/interface -I /storage/Build-o-Matic/haiku/haiku/headers/os/kernel -I /storage/Build-o-Matic/haiku/haiku/headers/os/media -I /storage/Build-o-Matic/haiku/haiku/headers/os/mail -I /storage/Build-o-Matic/haiku/haiku/headers/os/midi -I /storage/Build-o-Matic/haiku/haiku/headers/os/midi2 -I /storage/Build-o-Matic/haiku/haiku/headers/os/net -I /storage/Build-o-Matic/haiku/haiku/headers/os/opengl -I /storage/Build-o-Matic/haiku/haiku/headers/os/storage -I /storage/Build-o-Matic/haiku/haiku/headers/os/support -I /storage/Build-o-Matic/haiku/haiku/headers/os/translation -I /storage/Build-o-Matic/haiku/haiku/headers/private/. -o "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/haiku/x86/release/system/kernel/signal.o" ;

...failed C++ /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/haiku/x86/release/system/kernel/signal.o ...
...skipped kernel_core.o for lack of <src!system!kernel>signal.o...
...skipped kernel.so for lack of kernel_core.o...
...skipped pci for lack of kernel.so...
...skipped <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/kernel/bus_managers for lack of pci...
...skipped haiku-alpha.vmdk for lack of <HaikuImage>haiku.image-copy-files...
...failed updating 1 target(s)...
...skipped 5 target(s)...
...updated 10 target(s)...
command: jam -q -j1 @alpha-vmware


From mattmadia at gmail.com  Wed Aug  5 23:12:07 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Wed, 5 Aug 2009 21:12:07 +0000
Subject: [Haiku-commits] BOM: r32142 - ...failed C++
	/objects/haiku/--arch--/release/system/kernel/signal.o ...
In-Reply-To: <4a79f51e.48c3f10a.7b77.ffff8c51@mx.google.com>
References: <4a79f51e.48c3f10a.7b77.ffff8c51@mx.google.com>
Message-ID: <1e42d8c50908051412v3a0f63b5odb28f3e75e55f1d9@mail.gmail.com>

On Wed, Aug 5, 2009 at 21:09, <mattmadia at gmail.com> wrote:
> Host Machine          : FreeBSD 7.2-RELEASE i386
> Host Machine 32|64bit : 32bit
> use-xattr             : True
> use-32bit             : False
> Architectures Tested  :
> ppc

This was a forced error to demonstrate functionality.


From leavengood at gmail.com  Wed Aug  5 23:20:10 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Wed, 5 Aug 2009 17:20:10 -0400
Subject: [Haiku-commits] BOM: r32142 - ...failed C++
	/objects/haiku/--arch--/release/system/kernel/signal.o ...
In-Reply-To: <1e42d8c50908051412v3a0f63b5odb28f3e75e55f1d9@mail.gmail.com>
References: <4a79f51e.48c3f10a.7b77.ffff8c51@mx.google.com>
	<1e42d8c50908051412v3a0f63b5odb28f3e75e55f1d9@mail.gmail.com>
Message-ID: <a4855ac50908051420o531781ffic306a8e99705e009@mail.gmail.com>

On Wed, Aug 5, 2009 at 5:12 PM, Matt Madia<mattmadia at gmail.com> wrote:
>
> This was a forced error to demonstrate functionality.
>
> From this point forward, all emails with a similar subject are to be
> actual errors.

Looks cool! Now we just need an automatic tally of owed beers,
coffees, ice cream sundaes or your refreshment of choice for
introduced build errors ;)

-- 
Regards,
Ryan


From jackburton at mail.berlios.de  Wed Aug  5 23:29:24 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Wed, 5 Aug 2009 23:29:24 +0200
Subject: [Haiku-commits] r32146 - haiku/trunk/src/tests/kits/game/ParticlesII
Message-ID: <200908052129.n75LTOUM028729@sheep.berlios.de>

Author: jackburton
Date: 2009-08-05 23:29:22 +0200 (Wed, 05 Aug 2009)
New Revision: 32146
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32146&view=rev

Modified:
   haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp
Log:
Reverted r21451, otherwise ParticlesII crashes after a while, if the
accelerant doesn't support moving the frame buffer.


Modified: haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp
===================================================================
--- haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp	2009-08-05 19:10:22 UTC (rev 32145)
+++ haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp	2009-08-05 21:29:22 UTC (rev 32146)
@@ -95,7 +95,7 @@
 	NWindowScreen *ws = new NWindowScreen(&ret);
 	PRINT(("WindowScreen ctor returned. ret = %s\n", strerror(ret)));
 	// exit if constructing the WindowScreen failed.
-	if((ws == NULL) || (ret < B_OK))
+	if((ws == NULL) || (ret < B_OK) || !ws->CanControlFrameBuffer())
 	{
 		//printf("the window screen was NULL, or there was an error\n");
 		PostMessage(B_QUIT_REQUESTED);



From jackburton at mail.berlios.de  Wed Aug  5 23:30:42 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Wed, 5 Aug 2009 23:30:42 +0200
Subject: [Haiku-commits] r32147 - in haiku/trunk: headers/os/game
	src/kits/game
Message-ID: <200908052130.n75LUgt3029328@sheep.berlios.de>

Author: jackburton
Date: 2009-08-05 23:30:39 +0200 (Wed, 05 Aug 2009)
New Revision: 32147
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32147&view=rev

Modified:
   haiku/trunk/headers/os/game/WindowScreen.h
   haiku/trunk/src/kits/game/WindowScreen.cpp
Log:
Some cleanups. Shouldn't include any functional changes, except maybe
better cleanup on exiting.


Modified: haiku/trunk/headers/os/game/WindowScreen.h
===================================================================
--- haiku/trunk/headers/os/game/WindowScreen.h	2009-08-05 21:29:22 UTC (rev 32146)
+++ haiku/trunk/headers/os/game/WindowScreen.h	2009-08-05 21:30:39 UTC (rev 32147)
@@ -83,7 +83,9 @@
 		status_t			_Activate();
 		status_t			_Deactivate();
 
-		status_t			_SetupAccelerantHooks(bool enable);
+		status_t			_SetupAccelerantHooks();
+		void				_ResetAccelerantHooks();
+
 		status_t			_GetCardInfo();
 		void				_Suspend();
 		void				_Resume();

Modified: haiku/trunk/src/kits/game/WindowScreen.cpp
===================================================================
--- haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-05 21:29:22 UTC (rev 32146)
+++ haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-05 21:30:39 UTC (rev 32147)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008, Haiku. All Rights Reserved.
+ * Copyright 2002-2009, Haiku. All Rights Reserved.
  * Copyright 2002-2005,
  *		Marcus Overhagen,
  *		Stefano Ceccherini (stefano.ceccherini at gmail.com),
@@ -32,7 +32,7 @@
 using BPrivate::AppServerLink;
 
 
-//#define TRACE_WINDOWSCREEN 1
+#define TRACE_WINDOWSCREEN 1
 #if TRACE_WINDOWSCREEN
 #	define CALLED() printf("%s\n", __PRETTY_FUNCTION__);
 #else
@@ -321,44 +321,45 @@
 	if (firstIndex < 0 || lastIndex > 255 || firstIndex > lastIndex)
 		return;
 
-	if (Lock()) {
-		if (!fActivateState) {
-			// If we aren't active, we just change our local palette
-			for (int32 x = firstIndex; x <= lastIndex; x++) {
-				fPalette[x] = list[x];
-			}
-		} else {
-			uint8 colors[3 * 256];
-				// the color table has 3 bytes per color
-			int32 j = 0;
+	if (!Lock())
+		return;
+		
+	if (!fActivateState) {
+		// If we aren't active, we just change our local palette
+		for (int32 x = firstIndex; x <= lastIndex; x++) {
+			fPalette[x] = list[x];
+		}
+	} else {
+		uint8 colors[3 * 256];
+			// the color table has 3 bytes per color
+		int32 j = 0;
 
-			for (int32 x = firstIndex; x <= lastIndex; x++) {
-				fPalette[x] = list[x];
-					// update our local palette as well
+		for (int32 x = firstIndex; x <= lastIndex; x++) {
+			fPalette[x] = list[x];
+				// update our local palette as well
 
-				colors[j++] = list[x].red;
-				colors[j++] = list[x].green;
-				colors[j++] = list[x].blue;
-			}
+			colors[j++] = list[x].red;
+			colors[j++] = list[x].green;
+			colors[j++] = list[x].blue;
+		}
 
-			if (fAddonImage >= 0) {
-				set_indexed_colors setIndexedColors =
-					(set_indexed_colors)fGetAccelerantHook(B_SET_INDEXED_COLORS,
-						NULL);
-				if (setIndexedColors != NULL) {
-					setIndexedColors(lastIndex - firstIndex + 1, firstIndex,
-						colors, 0);
-				}
+		if (fAddonImage >= 0) {
+			set_indexed_colors setIndexedColors =
+				(set_indexed_colors)fGetAccelerantHook(B_SET_INDEXED_COLORS,
+					NULL);
+			if (setIndexedColors != NULL) {
+				setIndexedColors(lastIndex - firstIndex + 1, firstIndex,
+					colors, 0);
 			}
-
-			// TODO: Tell the app_server about our changes
-
-			BScreen screen(this);
-			screen.WaitForRetrace();
 		}
 
-		Unlock();
+		// TODO: Tell the app_server about our changes
+
+		BScreen screen(this);
+		screen.WaitForRetrace();
 	}
+
+	Unlock();
 }
 
 
@@ -683,11 +684,12 @@
 status_t
 BWindowScreen::_Activate()
 {
+	CALLED();
 	status_t status = _AssertDisplayMode(fDisplayMode);
 	if (status < B_OK)
 		return status;
 
-	status = _SetupAccelerantHooks(true);
+	status = _SetupAccelerantHooks();
 	if (status < B_OK)
 		return status;
 
@@ -716,6 +718,7 @@
 status_t
 BWindowScreen::_Deactivate()
 {
+	CALLED();
 	_AssertDisplayMode(fOriginalDisplayMode);
 
 	if (fDebugState && !fDebugFirst) {
@@ -724,76 +727,72 @@
 	} else
 		ScreenConnected(false);
 
-	status_t status = _SetupAccelerantHooks(false);
-	if (status == B_OK) {
-		be_app->ShowCursor();
-		if (fActivateState) {
-			// TODO: reset palette
-		}
+	_ResetAccelerantHooks();
+	
+	be_app->ShowCursor();
+	if (fActivateState) {
+		BScreen screen(this);
+		SetColorList((rgb_color *)screen.ColorMap()->color_list);
 	}
 
-	return status;
+	return B_OK;
 }
 
 
 status_t
-BWindowScreen::_SetupAccelerantHooks(bool enable)
+BWindowScreen::_SetupAccelerantHooks()
 {
 	CALLED();
-	if (fAddonImage >= 0) {
-		fWaitEngineIdle();
-		sFillRectHook = NULL;
-		sBlitRectHook = NULL;
-		sTransparentBlitHook = NULL;
-		sScaledFilteredBlitHook = NULL;
-		sWaitIdleHook = NULL;
-		sEngineToken = NULL;
-		sAcquireEngineHook = NULL;
-		sReleaseEngineHook = NULL;
-	}
-
-	fLockState = enable ? 1 : 0;
-
+	
 	status_t status = B_OK;
-	if (enable) {
-		acquire_engine aquireEngine = NULL;
-		release_engine releaseEngine = NULL;
-		fill_rectangle fillRectangle = NULL;
-		screen_to_screen_blit blit = NULL;
-		screen_to_screen_transparent_blit transparentBlit = NULL;
-		screen_to_screen_scaled_filtered_blit scaledFilteredBlit = NULL;
-
-		if (fAddonImage < 0) {
-			status = _InitClone();
-			if (status == B_OK) {
-				fWaitEngineIdle = (wait_engine_idle)fGetAccelerantHook(B_WAIT_ENGINE_IDLE, NULL);
-
-				releaseEngine = (release_engine)fGetAccelerantHook(B_RELEASE_ENGINE, NULL);
-				aquireEngine = (acquire_engine)fGetAccelerantHook(B_ACQUIRE_ENGINE, NULL);
-				fillRectangle = (fill_rectangle)fGetAccelerantHook(B_FILL_RECTANGLE, NULL);
-				blit = (screen_to_screen_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_BLIT, NULL);
-				transparentBlit = (screen_to_screen_transparent_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_TRANSPARENT_BLIT, NULL);
-				scaledFilteredBlit = (screen_to_screen_scaled_filtered_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT, NULL);
-			}
-		}
-
-		if (status == B_OK) {
-			sFillRectHook = fillRectangle;
-			sBlitRectHook = blit;
-			sTransparentBlitHook = transparentBlit;
-			sScaledFilteredBlitHook = scaledFilteredBlit;
-			sWaitIdleHook = fWaitEngineIdle;
-			sAcquireEngineHook = aquireEngine;
-			sReleaseEngineHook = releaseEngine;
-
+	if (fAddonImage < 0)
+		status = _InitClone();
+	else {
+		if (fWaitEngineIdle)
 			fWaitEngineIdle();
-		}
+		
+		_ResetAccelerantHooks();
 	}
-
+			
+	if (status == B_OK) {
+		sWaitIdleHook = fWaitEngineIdle = (wait_engine_idle)fGetAccelerantHook(B_WAIT_ENGINE_IDLE, NULL);
+		sReleaseEngineHook = (release_engine)fGetAccelerantHook(B_RELEASE_ENGINE, NULL);
+		sAcquireEngineHook = (acquire_engine)fGetAccelerantHook(B_ACQUIRE_ENGINE, NULL);
+		sFillRectHook = (fill_rectangle)fGetAccelerantHook(B_FILL_RECTANGLE, NULL);
+		sBlitRectHook = (screen_to_screen_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_BLIT, NULL);
+		sTransparentBlitHook = (screen_to_screen_transparent_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_TRANSPARENT_BLIT, NULL);
+		sScaledFilteredBlitHook = (screen_to_screen_scaled_filtered_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT, NULL);
+	
+		if (fWaitEngineIdle)
+			fWaitEngineIdle();
+		
+		fLockState = 1;
+	}
+	
 	return status;
 }
 
 
+void
+BWindowScreen::_ResetAccelerantHooks()
+{
+	CALLED();
+	
+	sFillRectHook = NULL;
+	sBlitRectHook = NULL;
+	sTransparentBlitHook = NULL;
+	sScaledFilteredBlitHook = NULL;
+	sWaitIdleHook = NULL;
+	sEngineToken = NULL;
+	sAcquireEngineHook = NULL;
+	sReleaseEngineHook = NULL;
+	
+	fWaitEngineIdle = NULL;
+	
+	fLockState = 0;
+}
+
+
 status_t
 BWindowScreen::_GetCardInfo()
 {



From jackburton at mail.berlios.de  Wed Aug  5 23:31:19 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Wed, 5 Aug 2009 23:31:19 +0200
Subject: [Haiku-commits] r32148 - haiku/trunk/src/kits/game
Message-ID: <200908052131.n75LVJWw029584@sheep.berlios.de>

Author: jackburton
Date: 2009-08-05 23:31:17 +0200 (Wed, 05 Aug 2009)
New Revision: 32148
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32148&view=rev

Modified:
   haiku/trunk/src/kits/game/WindowScreen.cpp
Log:
Accidentally enabled tracing


Modified: haiku/trunk/src/kits/game/WindowScreen.cpp
===================================================================
--- haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-05 21:30:39 UTC (rev 32147)
+++ haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-05 21:31:17 UTC (rev 32148)
@@ -32,7 +32,7 @@
 using BPrivate::AppServerLink;
 
 
-#define TRACE_WINDOWSCREEN 1
+//#define TRACE_WINDOWSCREEN 1
 #if TRACE_WINDOWSCREEN
 #	define CALLED() printf("%s\n", __PRETTY_FUNCTION__);
 #else



From axeld at pinc-software.de  Wed Aug  5 23:32:39 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 05 Aug 2009 23:32:39 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?BOM=3A_r32142_-_=2E=2E=2Efailed_C++_/ob?=
 =?utf-8?q?jects/haiku/--arch--/release/system/kernel/signal=2Eo_=2E=2E=2E?=
In-Reply-To: <1e42d8c50908051412v3a0f63b5odb28f3e75e55f1d9@mail.gmail.com>
Message-ID: <18072517850-BeMail@zon>

Matt Madia <mattmadia at gmail.com> wrote:
> On Wed, Aug 5, 2009 at 21:09, <mattmadia at gmail.com> wrote:
> > Host Machine          : FreeBSD 7.2-RELEASE i386
> > Host Machine 32|64bit : 32bit
> > use-xattr             : True
> > use-32bit             : False
> > Architectures Tested  :
> > ppc
> This was a forced error to demonstrate functionality.
> 
> From this point forward, all emails with a similar subject are to be
> actual errors.

Nice one! Thanks for doing this!
I would guess it would be nice to have those scripts in the repository 
as well?

Bye,
   Axel.



From pulkomandy at mail.berlios.de  Wed Aug  5 23:33:32 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Wed, 5 Aug 2009 23:33:32 +0200
Subject: [Haiku-commits] r32149 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale src/preferences/locale
Message-ID: <200908052133.n75LXWjZ030427@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-05 23:33:31 +0200 (Wed, 05 Aug 2009)
New Revision: 32149
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32149&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h
Log:
-Completed more methods in BCountry
-Select the current country in the preferences window when opening it
-Some small cleanups as usual


Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-05 21:31:17 UTC (rev 32148)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-05 21:33:31 UTC (rev 32149)
@@ -22,6 +22,7 @@
 		virtual ~BCountry();
 
 		virtual const char *Name() const;
+		const char* Code() const;
 
 		// see definitions below
 		const char *GetString(uint32 id) const;

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-05 21:31:17 UTC (rev 32148)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-05 21:33:31 UTC (rev 32149)
@@ -5,9 +5,15 @@
 
 
 #include <Country.h>
+
+#include <assert.h>
+
 #include <String.h>
 
 #include <unicode/datefmt.h>
+#include <unicode/dcfmtsym.h>
+#include <unicode/decimfmt.h>
+#include <unicode/dtfmtsym.h>
 #include <ICUWrapper.h>
 
 #include <monetary.h>
@@ -37,6 +43,7 @@
 	// positive/negative sign
 	"+",
 	"-",
+
 	// currency/monetary
 	"US$"
 	" "
@@ -59,6 +66,7 @@
 }
 
 
+// TODO should not exist
 BCountry::BCountry(const char **strings)
 	:
 	fStrings(strings)
@@ -74,11 +82,24 @@
 const char *
 BCountry::Name() const
 {
-	return "United States Of America";
+	UnicodeString uString;
+	fICULocale.getDisplayName(uString);
+	BString str;
+	BStringByteSink bbs(&str);
+	uString.toUTF8(bbs);
+	return str.String();
 }
 
 
 const char *
+BCountry::Code() const
+{
+	return fICULocale.getName();
+}
+
+
+// TODO use ICU backend keywords instead
+const char *
 BCountry::GetString(uint32 id) const
 {
 	if (id < B_COUNTRY_STRINGS_BASE || id >= B_NUM_COUNTRY_STRINGS)
@@ -98,11 +119,12 @@
 void 
 BCountry::FormatDate(BString *string, time_t time, bool longFormat)
 {
+	// TODO: ICU allows for 4 different levels of expansion :
+	// short, medium, long, and full. Our bool parameter is not enough...
 	icu_4_2::DateFormat* dateFormatter;
    	dateFormatter = DateFormat::createDateInstance(
-		longFormat ? DateFormat::LONG : DateFormat::SHORT,
+		longFormat ? DateFormat::FULL : DateFormat::SHORT,
 		fICULocale);
-	//UDate myDate = Calendar::getNow();
 	UnicodeString myString;
 	myString = dateFormatter->format(time, myString);
 
@@ -122,6 +144,19 @@
 void 
 BCountry::FormatTime(BString *string, time_t time, bool longFormat)
 {
+	// TODO: ICU allows for 4 different levels of expansion :
+	// short, medium, long, and full. Our bool parameter is not enough...
+	icu_4_2::DateFormat* timeFormatter;
+   	timeFormatter = DateFormat::createTimeInstance(
+		longFormat ? DateFormat::FULL : DateFormat::SHORT,
+		fICULocale);
+	UnicodeString myString;
+	myString = timeFormatter->format(time, myString);
+
+	string->Truncate(0);
+	BStringByteSink bbs(string);
+
+	myString.toUTF8(bbs);
 }
 
 
@@ -162,6 +197,18 @@
 void 
 BCountry::FormatNumber(BString *string, double value)
 {
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+
+	assert(err == U_ZERO_ERROR);
+
+	UnicodeString myString;
+	myString = nf->format(value, myString);
+
+	string->Truncate(0);
+	BStringByteSink bbs(string);
+
+	myString.toUTF8(bbs);
 }
 
 
@@ -174,41 +221,141 @@
 void 
 BCountry::FormatNumber(BString *string, int32 value)
 {
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+
+	assert(err == U_ZERO_ERROR);
+
+	UnicodeString myString;
+	myString = nf->format((int32_t)value, myString);
+
+	string->Truncate(0);
+	BStringByteSink bbs(string);
+
+	myString.toUTF8(bbs);
 }
 
 
+// This will only work for locales using the decimal system...
 const char *
 BCountry::DecimalPoint() const
 {
-	return fStrings[B_DECIMAL_POINT];
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+
+	assert(err == U_ZERO_ERROR);
+
+	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+
+	assert(df != NULL);
+
+	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+
+	UnicodeString myString;
+	myString = syms->getSymbol(DecimalFormatSymbols::kDecimalSeparatorSymbol);
+
+	BString string;
+	BStringByteSink bbs(&string);
+
+	myString.toUTF8(bbs);
+
+	return string.String();
 }
 
 
 const char *
 BCountry::ThousandsSeparator() const
 {
-	return fStrings[B_THOUSANDS_SEPARATOR];
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	assert(err == U_ZERO_ERROR);
+	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+
+	assert(df != NULL);
+
+	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+
+	UnicodeString myString;
+	myString = syms->getSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol);
+
+	BString string;
+	BStringByteSink bbs(&string);
+
+	myString.toUTF8(bbs);
+
+	return string.String();
 }
 
 
 const char *
 BCountry::Grouping() const
 {
-	return fStrings[B_GROUPING];
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	assert(err == U_ZERO_ERROR);
+	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+
+	assert(df != NULL);
+
+	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+
+	UnicodeString myString;
+	myString = syms->getSymbol(DecimalFormatSymbols::kGroupingSeparatorSymbol);
+
+	BString string;
+	BStringByteSink bbs(&string);
+
+	myString.toUTF8(bbs);
+
+	return string.String();
 }
 
 
 const char *
 BCountry::PositiveSign() const
 {
-	return fStrings[B_POSITIVE_SIGN];
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	assert(err == U_ZERO_ERROR);
+	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+
+	assert(df != NULL);
+
+	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+
+	UnicodeString myString;
+	myString = syms->getSymbol(DecimalFormatSymbols::kPlusSignSymbol);
+
+	BString string;
+	BStringByteSink bbs(&string);
+
+	myString.toUTF8(bbs);
+
+	return string.String();
 }
 
 
 const char *
 BCountry::NegativeSign() const
 {
-	return fStrings[B_NEGATIVE_SIGN];
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	assert(err == U_ZERO_ERROR);
+	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+
+	assert(df != NULL);
+
+	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+
+	UnicodeString myString;
+	myString = syms->getSymbol(DecimalFormatSymbols::kMinusSignSymbol);
+
+	BString string;
+	BStringByteSink bbs(&string);
+
+	myString.toUTF8(bbs);
+
+	return string.String();
 }
 
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-05 21:31:17 UTC (rev 32148)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-05 21:33:31 UTC (rev 32149)
@@ -446,6 +446,9 @@
 		int32_t localeCount;
 		const Locale* currentLocale
 			= Locale::getAvailableLocales(localeCount);
+		BCountry* defaultCountry;
+		be_locale_roster->GetDefaultCountry(&defaultCountry);
+
 		for(int index = 0; index < localeCount; index++)
 		{
 			UnicodeString countryFullName;
@@ -456,6 +459,9 @@
 			LanguageListItem* si = 
 				new LanguageListItem(str, currentLocale[index].getName());
 			listView->AddItem(si);
+			if (strcmp(currentLocale[index].getName(), 
+					defaultCountry->Code()) == 0)
+				listView->Select(listView->CountItems() - 1);
 		}
 
 		fTimeFormatSettings = 
@@ -465,6 +471,8 @@
 			.Add(scrollView)
 			.Add(fTimeFormatSettings)
 		);
+
+		listView->ScrollToSelection();
 	}
 
 	// check if the window is on screen

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h	2009-08-05 21:31:17 UTC (rev 32148)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.h	2009-08-05 21:33:31 UTC (rev 32149)
@@ -8,10 +8,9 @@
 
 #include <Window.h>
 
-#include "TimeFormatSettingsView.h"
-
 class BButton;
 class BListView;
+class TimeFormatSettingsView;
 
 
 class LocaleWindow : public BWindow {



From mattmadia at gmail.com  Wed Aug  5 23:42:24 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Wed, 5 Aug 2009 21:42:24 +0000
Subject: [Haiku-commits] BOM: r32142 - ...failed C++
	/objects/haiku/--arch--/release/system/kernel/signal.o ...
In-Reply-To: <18072517850-BeMail@zon>
References: <1e42d8c50908051412v3a0f63b5odb28f3e75e55f1d9@mail.gmail.com>
	<18072517850-BeMail@zon>
Message-ID: <1e42d8c50908051442rc072486j6f8dbeca70f5df9a@mail.gmail.com>

On Wed, Aug 5, 2009 at 21:32, Axel D?rfler<axeld at pinc-software.de> wrote:
> Nice one! Thanks for doing this!
> I would guess it would be nice to have those scripts in the repository
> as well?

I'm impartial either way.

for now, it's hosted at : http://dev.osdrawer.net/projects/show/haikubuildomatic

the current code is still on branches/class-rewrite
I need to tag trunk and merge/move class-rewrite to trunk.

TODO:
 * File uploading
 * misc "TODO"
 * cleanups

--mmadia


From superstippi at gmx.de  Wed Aug  5 23:50:24 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Wed, 05 Aug 2009 23:50:24 +0200
Subject: [Haiku-commits] BOM: r32142 - ...failed C++
 /objects/haiku/--arch--/release/system/kernel/signal.o ...
In-Reply-To: <1e42d8c50908051412v3a0f63b5odb28f3e75e55f1d9@mail.gmail.com>
References: <4a79f51e.48c3f10a.7b77.ffff8c51@mx.google.com>
	<1e42d8c50908051412v3a0f63b5odb28f3e75e55f1d9@mail.gmail.com>
Message-ID: <20090805235024.1108.3@bepc.1249507570.fake>


On 2009-08-05 at 23:12:07 [+0200], Matt Madia <mattmadia at gmail.com> wrote:
> On Wed, Aug 5, 2009 at 21:09, <mattmadia at gmail.com> wrote:
> > Host Machine          : FreeBSD 7.2-RELEASE i386
> > Host Machine 32|64bit : 32bit
> > use-xattr             : True
> > use-32bit             : False
> > Architectures Tested  :
> > ppc
> 
> This was a forced error to demonstrate functionality.
> 
> >From this point forward, all emails with a similar subject are to be
> actual errors.

Looks awesome! Thanks a lot for all the hard work, Matt! And yeah... what 
Ryan said! :-D

Best regards,
-Stephan


From phoudoin at mail.berlios.de  Wed Aug  5 23:55:33 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Wed, 5 Aug 2009 23:55:33 +0200
Subject: [Haiku-commits] r32150 -
	haiku/trunk/src/apps/mediaplayer/media_node_framework/audio
Message-ID: <200908052155.n75LtXP0005399@sheep.berlios.de>

Author: phoudoin
Date: 2009-08-05 23:55:22 +0200 (Wed, 05 Aug 2009)
New Revision: 32150
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32150&view=rev

Modified:
   haiku/trunk/src/apps/mediaplayer/media_node_framework/audio/AudioProducer.cpp
Log:
Fixed hardcoded AudioProducer output name.
Stephan, Axel, could one of you report this change in clockwerk/src/shared/AudioProducer.cpp too.
Clockwerk name his audio output "MediaPlayer Sound Output", which is both confusing and, well, 
semantically wrong ;-).

BTW, for MediaPlayer being able to (re)name his output after the filename playing will be great, no?


Modified: haiku/trunk/src/apps/mediaplayer/media_node_framework/audio/AudioProducer.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/media_node_framework/audio/AudioProducer.cpp	2009-08-05 21:33:31 UTC (rev 32149)
+++ haiku/trunk/src/apps/mediaplayer/media_node_framework/audio/AudioProducer.cpp	2009-08-05 21:55:22 UTC (rev 32150)
@@ -595,7 +595,7 @@
 	fOutput.source.port = ControlPort();
 	fOutput.source.id = 0;
 	fOutput.node = Node();
-	::strcpy(fOutput.name, "MediaPlayer Sound Output");
+	::strcpy(fOutput.name, Name());
 }
 
 



From revol at free.fr  Wed Aug  5 23:59:32 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Wed, 05 Aug 2009 23:59:32 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32138_-_haiku/trunk/headers/private/sy?=
 =?utf-8?q?stem/board?=
In-Reply-To: <5647316905-BeMail@zon>
Message-ID: <490852703-BeMail@laptop>

> "Fran?ois Revol" <revol at free.fr> wrote:
> > > mmu_man at mail.berlios.de wrote:
> > > > Added:
> > > >    haiku/trunk/headers/private/system/board/overo/
> > > >    haiku/trunk/headers/private/system/board/verdex/
> > > > Log:
> > > > Placeholder for current GSoC targets (verdex is QEMU, overo is 
> > > > the 
> > > > real one).
> > > What is supposed to go in there, and why isn't it in arch/?
> > board_config.h & other stuff telling the cpu is an omap3, ...
> > 
> > Right, it could be a subfolder of arch/$arch/ ...
> > I don't know of a board with the same config and a different arch, 
> > yet.
> > Ok let's move that here.
> 
> Also, does that really have to be "board" dependent - shouldn't it 
> rather be CPU dependent?
> Like a sub-arch folder?

It's the usual terminology, besides, usually a single cpu has its on 
chip peripherals mapped differently for each board...

> And finally, why system/ and not kernel/ - the former are kernel 
> headers interesting for userland.

Well it was both for the kernel and loader. Userland shouldn't be 
impacted but maybe some configurations are interesting there as well 
(optimization, ..).
It can still be moved around, I just didn't want to scatter all the 
board stuff around too much.

Fran?ois.


From revol at free.fr  Thu Aug  6 00:02:07 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Thu, 06 Aug 2009 00:02:07 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?BOM=3A_r32142_-_=2E=2E=2Efailed_C++_/ob?=
 =?utf-8?q?jects/haiku/--arch--/release/system/kernel/signal=2Eo_=2E=2E=2E?=
In-Reply-To: <a4855ac50908051420o531781ffic306a8e99705e009@mail.gmail.com>
Message-ID: <645981826-BeMail@laptop>

> On Wed, Aug 5, 2009 at 5:12 PM, Matt Madia<mattmadia at gmail.com> 
> wrote:
> >
> > This was a forced error to demonstrate functionality.
> >
> > From this point forward, all emails with a similar subject are to 
> > be
> > actual errors.

Cool now we need a "I broke the build" cap to give away.

> 
> Looks cool! Now we just need an automatic tally of owed beers,
> coffees, ice cream sundaes or your refreshment of choice for
> introduced build errors ;)
> 

We can probably add support for HTCPCP :p

Fran?ois.


From phoudoin at mail.berlios.de  Thu Aug  6 02:17:41 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Thu, 6 Aug 2009 02:17:41 +0200
Subject: [Haiku-commits] r32151 - haiku/trunk/src/kits/opengl
Message-ID: <200908060017.n760HfIG032153@sheep.berlios.de>

Author: phoudoin
Date: 2009-08-06 02:17:30 +0200 (Thu, 06 Aug 2009)
New Revision: 32151
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32151&view=rev

Modified:
   haiku/trunk/src/kits/opengl/GLView.cpp
Log:
Fixed a crash when resizing GLInfo window (or any non-BDirectWindow with GLView kid(s), for that matter).


Modified: haiku/trunk/src/kits/opengl/GLView.cpp
===================================================================
--- haiku/trunk/src/kits/opengl/GLView.cpp	2009-08-05 21:55:22 UTC (rev 32150)
+++ haiku/trunk/src/kits/opengl/GLView.cpp	2009-08-06 00:17:30 UTC (rev 32151)
@@ -402,6 +402,9 @@
 void
 BGLView::_CallDirectConnected()
 {
+	if (!fClipInfo)
+		return;
+	
 	glview_direct_info *glviewDirectInfo = (glview_direct_info *)fClipInfo;
 	direct_buffer_info *localInfo = glviewDirectInfo->direct_info;
 	direct_buffer_info *info = (direct_buffer_info *)calloc(1, DIRECT_BUFFER_INFO_AREA_SIZE);



From axeld at pinc-software.de  Thu Aug  6 09:26:09 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 06 Aug 2009 09:26:09 +0200 CEST
Subject: [Haiku-commits] r32138 -
	haiku/trunk/headers/private/system/board
In-Reply-To: <490852703-BeMail@laptop>
Message-ID: <1057768187-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> > Also, does that really have to be "board" dependent - shouldn't it 
> > rather be CPU dependent?
> > Like a sub-arch folder?
> It's the usual terminology, besides, usually a single cpu has its on 
> chip peripherals mapped differently for each board...

Well, maybe I should wait and see what happens with this before 
complaining :-)

> > And finally, why system/ and not kernel/ - the former are kernel 
> > headers interesting for userland.
> Well it was both for the kernel and loader. Userland shouldn't be 
> impacted but maybe some configurations are interesting there as well 
> (optimization, ..).

Then it shouldn't be in system/ but kernel/, or rather kerne/boot/ - 
the kernel should be affected by this as little as possible.

> It can still be moved around, I just didn't want to scatter all the 
> board stuff around too much.

Okay.

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Aug  6 10:24:25 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 6 Aug 2009 10:24:25 +0200
Subject: [Haiku-commits] r32152 -
	haiku/trunk/src/system/kernel/device_manager
Message-ID: <200908060824.n768OPQd007876@sheep.berlios.de>

Author: axeld
Date: 2009-08-06 10:24:23 +0200 (Thu, 06 Aug 2009)
New Revision: 32152
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32152&view=rev

Modified:
   haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp
Log:
* handle_driver_events() kept the sDriversListLock locked over the whole
  time. But since this is also locked from within the driver/directory watcher
  (with the node monitor lock held), and handle_driver_events() could cause
  node monitoring updates, the locking order could be reverted, causing a
  deadlock (I just ran into).


Modified: haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp	2009-08-06 00:17:30 UTC (rev 32151)
+++ haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp	2009-08-06 08:24:23 UTC (rev 32152)
@@ -196,6 +196,7 @@
 static EntryList sDriversToAdd;
 static EntryList sDriversToRemove;
 static mutex sDriversListLock = MUTEX_INITIALIZER("driversList");
+	// inner lock, protects the sDriversToAdd/sDriversToRemove lists only
 static DirectoryWatcher sDirectoryWatcher;
 static DirectoryNodeHash sDirectoryNodeHash;
 static recursive_lock sLock;
@@ -641,14 +642,19 @@
 
 	// something happened, let's see what it was
 
-	RecursiveLocker locker(sLock);
-	MutexLocker _(sDriversListLock);
+	RecursiveLocker _(sLock);
 
+	// Add new drivers
+
 	while (true) {
+		MutexLocker listLocker(sDriversListLock);
+
 		path_entry* path = sDriversToAdd.RemoveHead();
 		if (path == NULL)
 			break;
 
+		listLocker.Unlock();
+
 		legacy_driver* driver = (legacy_driver*)hash_lookup(sDriverHash,
 			get_leaf(path->path));
 		if (driver == NULL)
@@ -657,11 +663,18 @@
 			driver->binary_updated = true;
 		delete path;
 	}
+
+	// Mark removed drivers as updated
+
 	while (true) {
+		MutexLocker listLocker(sDriversListLock);
+
 		path_entry* path = sDriversToRemove.RemoveHead();
 		if (path == NULL)
 			break;
 
+		listLocker.Unlock();
+
 		legacy_driver* driver = (legacy_driver*)hash_lookup(sDriverHash,
 			get_leaf(path->path));
 		if (driver != NULL && get_priority(path->path) >= driver->priority)
@@ -669,6 +682,8 @@
 		delete path;
 	}
 
+	// Reload updated drivers
+
 	hash_iterator iterator;
 	hash_open(sDriverHash, &iterator);
 	legacy_driver *driver;



From axeld at mail.berlios.de  Thu Aug  6 10:55:05 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 6 Aug 2009 10:55:05 +0200
Subject: [Haiku-commits] r32153 - haiku/trunk/src/servers/media
Message-ID: <200908060855.n768t5Pl020786@sheep.berlios.de>

Author: axeld
Date: 2009-08-06 10:55:02 +0200 (Thu, 06 Aug 2009)
New Revision: 32153
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32153&view=rev

Modified:
   haiku/trunk/src/servers/media/BufferManager.cpp
   haiku/trunk/src/servers/media/BufferManager.h
   haiku/trunk/src/servers/media/media_server.cpp
Log:
* Cleanup, BufferManager now aggregates the buffer map as well as its locker
  instead of allocating them separately, no functional change.


Modified: haiku/trunk/src/servers/media/BufferManager.cpp
===================================================================
--- haiku/trunk/src/servers/media/BufferManager.cpp	2009-08-06 08:24:23 UTC (rev 32152)
+++ haiku/trunk/src/servers/media/BufferManager.cpp	2009-08-06 08:55:02 UTC (rev 32153)
@@ -2,167 +2,185 @@
  * Copyright 2002, Marcus Overhagen. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
-#include <MediaDefs.h>
+
+
+#include "BufferManager.h"
+
 #include <Autolock.h>
-#include "BufferManager.h"
+
+#include "debug.h"
 #include "SharedBufferList.h"
-#include "debug.h"
 
+
 BufferManager::BufferManager()
- :	fSharedBufferList(_shared_buffer_list::Clone()),
-	fNextBufferId(1),
-	fLocker(new BLocker("buffer manager locker")),
-	fBufferInfoMap(new Map<media_buffer_id, buffer_info>)
+	:
+	fSharedBufferList(_shared_buffer_list::Clone()),
+	fNextBufferID(1),
+	fLocker("buffer manager locker")
 {
-	fSharedBufferListId = area_for(fSharedBufferList);
-	ASSERT(fSharedBufferList!=NULL);
-	ASSERT(fSharedBufferListId > 0);
+	fSharedBufferListID = area_for(fSharedBufferList);
 }
 
+
 BufferManager::~BufferManager()
 {
 	fSharedBufferList->Unmap();
-	delete fLocker;
-	delete fBufferInfoMap;
 }
 
+
 area_id
 BufferManager::SharedBufferListID()
 {
-	return fSharedBufferListId;
+	return fSharedBufferListID;
 }
 
 status_t	
-BufferManager::RegisterBuffer(team_id teamid, media_buffer_id bufferid,
-							  size_t *size, int32 *flags, size_t *offset, area_id *area)
+BufferManager::RegisterBuffer(team_id team, media_buffer_id bufferID,
+	size_t* _size, int32* _flags, size_t* _offset, area_id* _area)
 {
 	BAutolock lock(fLocker);
 
-	TRACE("RegisterBuffer team = %ld, bufferid = %ld\n", teamid, bufferid);
-	
-	buffer_info *info;
-	if (!fBufferInfoMap->Get(bufferid, &info)) {
-		ERROR("failed to register buffer! team = %ld, bufferid = %ld\n", teamid, bufferid);
+	TRACE("RegisterBuffer team = %ld, bufferid = %ld\n", team, bufferID);
+
+	buffer_info* info;
+	if (!fBufferInfoMap.Get(bufferID, &info)) {
+		ERROR("failed to register buffer! team = %ld, bufferid = %ld\n", team,
+			bufferID);
 		return B_ERROR;
 	}
-	
-	info->teams.Insert(teamid);
-	
-	*area 	= info->area;
-	*offset	= info->offset;
-	*size 	= info->size, 
-	*flags 	= info->flags;
+
+	info->teams.Insert(team);
+
+	*_area = info->area;
+	*_offset = info->offset;
+	*_size = info->size, 
+	*_flags = info->flags;
+
 	return B_OK;
 }
 
+
 status_t
-BufferManager::RegisterBuffer(team_id teamid, size_t size, int32 flags, size_t offset, area_id area,
-							  media_buffer_id *bufferid)
+BufferManager::RegisterBuffer(team_id team, size_t size, int32 flags,
+	size_t offset, area_id area, media_buffer_id* _bufferID)
 {
 	BAutolock lock(fLocker);
-	TRACE("RegisterBuffer team = %ld, areaid = %ld, offset = %ld, size = %ld\n", teamid, area, offset, size);
+	TRACE("RegisterBuffer team = %ld, area = %ld, offset = %ld, size = %ld\n",
+		team, area, offset, size);
 	
-	void *adr;
-	area_id newarea;
-
-	newarea = clone_area("media_server cloned buffer", &adr, B_ANY_ADDRESS, B_READ_AREA | B_WRITE_AREA, area);
-	if (newarea <= B_OK) {
-		ERROR("RegisterBuffer: failed to clone buffer! error = %#lx, team = %ld, areaid = %ld, offset = %ld, size = %ld\n", newarea, teamid, area, offset, size);
+	void* address;
+	area_id clonedArea = clone_area("media_server cloned buffer", &address,
+		B_ANY_ADDRESS, B_READ_AREA | B_WRITE_AREA, area);
+	if (clonedArea < 0) {
+		ERROR("RegisterBuffer: failed to clone buffer! error = %#lx, team = "
+			"%ld, areaid = %ld, offset = %ld, size = %ld\n", clonedArea, team,
+			area, offset, size);
 		return B_ERROR;
 	}
 
 	buffer_info info;
-
-	*bufferid	= fNextBufferId;
-	info.id 	= fNextBufferId;
-	info.area 	= newarea;
+	info.id = fNextBufferID++;
+	info.area = clonedArea;
 	info.offset = offset;
-	info.size 	= size;
-	info.flags	= flags;
-	info.teams.Insert(teamid);
-	fBufferInfoMap->Insert(fNextBufferId, info);
+	info.size = size;
+	info.flags = flags;
+	info.teams.Insert(team);
 
-	TRACE("RegisterBuffer: done, bufferid = %ld\n", fNextBufferId);
+	*_bufferID = info.id;
 
-	fNextBufferId += 1;
-	
+	fBufferInfoMap.Insert(info.id, info);
+
+	TRACE("RegisterBuffer: done, bufferID = %ld\n", info.id);
+
 	return B_OK;
 }
 
+
 status_t
-BufferManager::UnregisterBuffer(team_id teamid, media_buffer_id bufferid)
+BufferManager::UnregisterBuffer(team_id team, media_buffer_id bufferID)
 {
 	BAutolock lock(fLocker);
-	TRACE("UnregisterBuffer: team = %ld, bufferid = %ld\n", teamid, bufferid);
+	TRACE("UnregisterBuffer: team = %ld, bufferid = %ld\n", team, bufferID);
 
-	buffer_info *info;
-	int index;
-	
-	if (!fBufferInfoMap->Get(bufferid, &info)) {
-		ERROR("UnregisterBuffer: failed to unregister buffer! team = %ld, bufferid = %ld\n", teamid, bufferid);
+	buffer_info* info;
+	if (!fBufferInfoMap.Get(bufferID, &info)) {
+		ERROR("UnregisterBuffer: failed to unregister buffer! team = %ld, "
+			"bufferid = %ld\n", team, bufferID);
 		return B_ERROR;
 	}
 
-	index = info->teams.Find(teamid);
+	int index = info->teams.Find(team);
 	if (index < 0) {
-		ERROR("UnregisterBuffer: failed to find team = %ld belonging to bufferid = %ld\n", teamid, bufferid);
+		ERROR("UnregisterBuffer: failed to find team = %ld belonging to "
+			"bufferID = %ld\n", team, bufferID);
 		return B_ERROR;
 	}
 	
 	if (!info->teams.Remove(index)) {
-		ERROR("UnregisterBuffer: failed to remove team = %ld from bufferid = %ld\n", teamid, bufferid);
+		ERROR("UnregisterBuffer: failed to remove team = %ld from bufferID "
+			"= %ld\n", team, bufferID);
 		return B_ERROR;
 	}
-	TRACE("UnregisterBuffer: team = %ld removed from bufferid = %ld\n", teamid, bufferid);
 
+	TRACE("UnregisterBuffer: team = %ld removed from bufferID = %ld\n", team,
+		bufferID);
+
 	if (info->teams.IsEmpty()) {
-	
-		if (!fBufferInfoMap->Remove(bufferid)) {
-			ERROR("UnregisterBuffer: failed to remove bufferid = %ld\n", bufferid);
+		if (!fBufferInfoMap.Remove(bufferID)) {
+			ERROR("UnregisterBuffer: failed to remove bufferID = %ld\n",
+				bufferID);
 			return B_ERROR;
 		}
-	
-		TRACE("UnregisterBuffer: bufferid = %ld removed\n", bufferid);
+
+		TRACE("UnregisterBuffer: bufferID = %ld removed\n", bufferID);
 	}
 
 	return B_OK;
 }
 
+
 void
 BufferManager::CleanupTeam(team_id team)
 {
 	BAutolock lock(fLocker);
-	buffer_info *info;
-	
+
 	TRACE("BufferManager::CleanupTeam: team %ld\n", team);
-	
-	for (fBufferInfoMap->Rewind(); fBufferInfoMap->GetNext(&info); ) {
-		team_id *otherteam;
-		for (info->teams.Rewind(); info->teams.GetNext(&otherteam); ) {
-			if (team == *otherteam) {
-				PRINT(1, "BufferManager::CleanupTeam: removing team %ld from buffer id %ld\n", team, info->id);
+
+	buffer_info* info;
+	for (fBufferInfoMap.Rewind(); fBufferInfoMap.GetNext(&info); ) {
+		team_id* currentTeam;
+		for (info->teams.Rewind(); info->teams.GetNext(&currentTeam); ) {
+			if (team == *currentTeam) {
+				PRINT(1, "BufferManager::CleanupTeam: removing team %ld from "
+					"buffer id %ld\n", team, info->id);
 				info->teams.RemoveCurrent();
 			}
 		}
 		if (info->teams.IsEmpty()) {
-			PRINT(1, "BufferManager::CleanupTeam: removing buffer id %ld that has no teams\n", info->id);
-			fBufferInfoMap->RemoveCurrent(); 
+			PRINT(1, "BufferManager::CleanupTeam: removing buffer id %ld that "
+				"has no teams\n", info->id);
+			fBufferInfoMap.RemoveCurrent(); 
 		}
 	}
 }
 
+
 void
 BufferManager::Dump()
 {
 	BAutolock lock(fLocker);
-	buffer_info *info;
+
 	printf("\n");
 	printf("BufferManager: list of buffers follows:\n");
-	for (fBufferInfoMap->Rewind(); fBufferInfoMap->GetNext(&info); ) {
-		printf(" buffer-id %ld, area-id %ld, offset %ld, size %ld, flags %#08lx\n",
-			 info->id, info->area, info->offset, info->size, info->flags);
+
+	buffer_info *info;
+	for (fBufferInfoMap.Rewind(); fBufferInfoMap.GetNext(&info); ) {
+		printf(" buffer-id %ld, area-id %ld, offset %ld, size %ld, flags "
+			"%#08lx\n", info->id, info->area, info->offset, info->size,
+			info->flags);
 		printf("   assigned teams: ");
-		team_id *team;
+
+		team_id* team;
 		for (info->teams.Rewind(); info->teams.GetNext(&team); ) {
 			printf("%ld, ", *team);
 		}

Modified: haiku/trunk/src/servers/media/BufferManager.h
===================================================================
--- haiku/trunk/src/servers/media/BufferManager.h	2009-08-06 08:24:23 UTC (rev 32152)
+++ haiku/trunk/src/servers/media/BufferManager.h	2009-08-06 08:55:02 UTC (rev 32153)
@@ -2,46 +2,54 @@
  * Copyright 2002, Marcus Overhagen. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
-struct _shared_buffer_list;
 
+
+#include <Locker.h>
+#include <MediaDefs.h>
+
 #include <TMap.h>
 #include <TList.h>
 
-class BufferManager
-{
+
+struct _shared_buffer_list;
+
+
+class BufferManager {
 public:
-	BufferManager();
-	~BufferManager();
+							BufferManager();
+							~BufferManager();
 	
-	area_id		SharedBufferListID();
+			area_id			SharedBufferListID();
 	
-	status_t	RegisterBuffer(team_id teamid, media_buffer_id bufferid,
-							   size_t *size, int32 *flags, size_t *offset, area_id *area);
+			status_t		RegisterBuffer(team_id team,
+								media_buffer_id bufferID, size_t* _size,
+								int32* _flags, size_t* _offset, area_id* _area);
 
-	status_t	RegisterBuffer(team_id teamid, size_t size, int32 flags, size_t offset, area_id area,
-							   media_buffer_id *bufferid);
+			status_t		RegisterBuffer(team_id team, size_t size,
+								int32 flags, size_t offset, area_id area,
+								media_buffer_id* _bufferID);
 
-	status_t	UnregisterBuffer(team_id teamid, media_buffer_id bufferid);
-	
-	void		CleanupTeam(team_id teamid);
+			status_t		UnregisterBuffer(team_id team,
+								media_buffer_id bufferID);
 
-	void 		Dump();
+			void			CleanupTeam(team_id team);
 
+			void			Dump();
+
 private:
-	struct buffer_info
-	{
-		media_buffer_id id;
-		area_id area;
-		size_t offset;
-		size_t size;
-		int32 flags;
-		List<team_id> teams;
+	struct buffer_info {
+		media_buffer_id	id;
+		area_id			area;
+		size_t			offset;
+		size_t			size;
+		int32			flags;
+		List<team_id>	teams;
 	};
-	
-	_shared_buffer_list *	fSharedBufferList;
-	area_id					fSharedBufferListId;
-	media_buffer_id			fNextBufferId;
-	BLocker *				fLocker;
-	Map<media_buffer_id, buffer_info> *fBufferInfoMap;
+
+			_shared_buffer_list* fSharedBufferList;
+			area_id			fSharedBufferListID;
+			media_buffer_id	fNextBufferID;
+			BLocker			fLocker;
+			Map<media_buffer_id, buffer_info> fBufferInfoMap;
 };
 

Modified: haiku/trunk/src/servers/media/media_server.cpp
===================================================================
--- haiku/trunk/src/servers/media/media_server.cpp	2009-08-06 08:24:23 UTC (rev 32152)
+++ haiku/trunk/src/servers/media/media_server.cpp	2009-08-06 08:55:02 UTC (rev 32153)
@@ -708,7 +708,7 @@
 					request->info.offset, request->info.area,
 					&reply.info.buffer);
 			} else {
-				reply.info = request->info; //buffer id is kept
+				reply.info = request->info; // buffer id is kept
 				status = gBufferManager->RegisterBuffer(request->team,
 					request->info.buffer, &reply.info.size, &reply.info.flags,
 					&reply.info.offset, &reply.info.area);
@@ -720,7 +720,7 @@
 		case SERVER_UNREGISTER_BUFFER:
 		{
 			const server_unregister_buffer_command *cmd = reinterpret_cast<
-					const server_unregister_buffer_command *>(data);
+				const server_unregister_buffer_command *>(data);
 
 			gBufferManager->UnregisterBuffer(cmd->team, cmd->bufferid);
 			break;
@@ -736,7 +736,7 @@
 
 			rv = gMMediaFilesManager->RewindTypes(
 					&types, &reply.count);
-			if(reply.count>0) {
+			if (reply.count > 0) {
 				// we create an area here, and pass it to the library,
 				// where it will be deleted.
 				char *start_addr;
@@ -780,7 +780,7 @@
 					&items, &reply.count);
 			// we create an area here, and pass it to the library,
 			// where it will be deleted.
-			if(reply.count>0) {
+			if (reply.count > 0) {
 				char *start_addr;
 				size_t size = ((reply.count * B_MEDIA_NAME_LENGTH)
 					+ B_PAGE_SIZE - 1) & ~(B_PAGE_SIZE - 1);



From axeld at mail.berlios.de  Thu Aug  6 11:42:35 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 6 Aug 2009 11:42:35 +0200
Subject: [Haiku-commits] r32154 - haiku/trunk/headers/private/shared
Message-ID: <200908060942.n769gZH8006994@sheep.berlios.de>

Author: axeld
Date: 2009-08-06 11:42:34 +0200 (Thu, 06 Aug 2009)
New Revision: 32154
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32154&view=rev

Modified:
   haiku/trunk/headers/private/shared/HashMap.h
Log:
* Added copyless direct value accessors (via Iterator::NextValue(), and
  Get()).


Modified: haiku/trunk/headers/private/shared/HashMap.h
===================================================================
--- haiku/trunk/headers/private/shared/HashMap.h	2009-08-06 08:55:02 UTC (rev 32153)
+++ haiku/trunk/headers/private/shared/HashMap.h	2009-08-06 09:42:34 UTC (rev 32154)
@@ -28,12 +28,13 @@
 #ifndef HASH_MAP_H
 #define HASH_MAP_H
 
-//#include <Debug.h>
+
 #include <Locker.h>
 
 #include "AutoLocker.h"
 #include "OpenHashTable.h"
 
+
 namespace BPrivate {
 
 // HashMapElement
@@ -107,7 +108,17 @@
 			_FindNext();
 			return result;
 		}
-	
+
+		Value* NextValue()
+		{
+			if (fElement == NULL)
+				return NULL;
+			
+			Value* value = &fElement->fValue;
+			_FindNext();
+			return value;
+		}
+
 		Entry Remove()
 		{
 			if (!fLastElement)
@@ -169,6 +180,7 @@
 	Value Remove(const Key& key);
 	void Clear();
 	Value Get(const Key& key) const;
+	bool Get(const Key& key, Value*& _value) const;
 
 	bool ContainsKey(const Key& key) const;
 
@@ -404,6 +416,19 @@
 	return Value();
 }
 
+// Get
+template<typename Key, typename Value>
+bool
+HashMap<Key, Value>::Get(const Key& key, Value*& _value) const
+{
+	if (Element* element = _FindElement(key)) {
+		_value = &element->fValue;
+		return true;
+	}
+
+	return false;
+}
+
 // ContainsKey
 template<typename Key, typename Value>
 bool



From axeld at mail.berlios.de  Thu Aug  6 11:45:05 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 6 Aug 2009 11:45:05 +0200
Subject: [Haiku-commits] r32155 - haiku/trunk/src/servers/media
Message-ID: <200908060945.n769j5EM008076@sheep.berlios.de>

Author: axeld
Date: 2009-08-06 11:45:04 +0200 (Thu, 06 Aug 2009)
New Revision: 32155
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32155&view=rev

Modified:
   haiku/trunk/src/servers/media/BufferManager.cpp
   haiku/trunk/src/servers/media/BufferManager.h
Log:
* When a buffer_info is removed, its area is now actually deleted as well. This
  already fixes bug #4189, although there is another bug that could cause a
  similar effect (working on that next).
* Switched from media_server local TMap to HashMap, although this is probably
  equally archaic.
* Also replaced TList with std::set for the team list.


Modified: haiku/trunk/src/servers/media/BufferManager.cpp
===================================================================
--- haiku/trunk/src/servers/media/BufferManager.cpp	2009-08-06 09:42:34 UTC (rev 32154)
+++ haiku/trunk/src/servers/media/BufferManager.cpp	2009-08-06 09:45:04 UTC (rev 32155)
@@ -1,5 +1,6 @@
 /* 
  * Copyright 2002, Marcus Overhagen. All rights reserved.
+ * Copyright 2009, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -34,6 +35,7 @@
 	return fSharedBufferListID;
 }
 
+
 status_t	
 BufferManager::RegisterBuffer(team_id team, media_buffer_id bufferID,
 	size_t* _size, int32* _flags, size_t* _offset, area_id* _area)
@@ -43,13 +45,13 @@
 	TRACE("RegisterBuffer team = %ld, bufferid = %ld\n", team, bufferID);
 
 	buffer_info* info;
-	if (!fBufferInfoMap.Get(bufferID, &info)) {
+	if (!fBufferInfoMap.Get(bufferID, info)) {
 		ERROR("failed to register buffer! team = %ld, bufferid = %ld\n", team,
 			bufferID);
 		return B_ERROR;
 	}
 
-	info->teams.Insert(team);
+	info->teams.insert(team);
 
 	*_area = info->area;
 	*_offset = info->offset;
@@ -68,14 +70,12 @@
 	TRACE("RegisterBuffer team = %ld, area = %ld, offset = %ld, size = %ld\n",
 		team, area, offset, size);
 	
-	void* address;
-	area_id clonedArea = clone_area("media_server cloned buffer", &address,
-		B_ANY_ADDRESS, B_READ_AREA | B_WRITE_AREA, area);
+	area_id clonedArea = _CloneArea(area);
 	if (clonedArea < 0) {
 		ERROR("RegisterBuffer: failed to clone buffer! error = %#lx, team = "
-			"%ld, areaid = %ld, offset = %ld, size = %ld\n", clonedArea, team,
+			"%ld, area = %ld, offset = %ld, size = %ld\n", clonedArea, team,
 			area, offset, size);
-		return B_ERROR;
+		return clonedArea;
 	}
 
 	buffer_info info;
@@ -84,11 +84,11 @@
 	info.offset = offset;
 	info.size = size;
 	info.flags = flags;
-	info.teams.Insert(team);
+	info.teams.insert(team);
 
 	*_bufferID = info.id;
 
-	fBufferInfoMap.Insert(info.id, info);
+	fBufferInfoMap.Put(info.id, info);
 
 	TRACE("RegisterBuffer: done, bufferID = %ld\n", info.id);
 
@@ -103,34 +103,26 @@
 	TRACE("UnregisterBuffer: team = %ld, bufferid = %ld\n", team, bufferID);
 
 	buffer_info* info;
-	if (!fBufferInfoMap.Get(bufferID, &info)) {
+	if (!fBufferInfoMap.Get(bufferID, info)) {
 		ERROR("UnregisterBuffer: failed to unregister buffer! team = %ld, "
 			"bufferid = %ld\n", team, bufferID);
 		return B_ERROR;
 	}
 
-	int index = info->teams.Find(team);
-	if (index < 0) {
+	if (info->teams.find(team) == info->teams.end()) {
 		ERROR("UnregisterBuffer: failed to find team = %ld belonging to "
 			"bufferID = %ld\n", team, bufferID);
 		return B_ERROR;
 	}
 	
-	if (!info->teams.Remove(index)) {
-		ERROR("UnregisterBuffer: failed to remove team = %ld from bufferID "
-			"= %ld\n", team, bufferID);
-		return B_ERROR;
-	}
+	info->teams.erase(team);
 
 	TRACE("UnregisterBuffer: team = %ld removed from bufferID = %ld\n", team,
 		bufferID);
 
-	if (info->teams.IsEmpty()) {
-		if (!fBufferInfoMap.Remove(bufferID)) {
-			ERROR("UnregisterBuffer: failed to remove bufferID = %ld\n",
-				bufferID);
-			return B_ERROR;
-		}
+	if (info->teams.empty()) {
+		_ReleaseClonedArea(info->area);
+		fBufferInfoMap.Remove(bufferID);
 
 		TRACE("UnregisterBuffer: bufferID = %ld removed\n", bufferID);
 	}
@@ -146,20 +138,17 @@
 
 	TRACE("BufferManager::CleanupTeam: team %ld\n", team);
 
-	buffer_info* info;
-	for (fBufferInfoMap.Rewind(); fBufferInfoMap.GetNext(&info); ) {
-		team_id* currentTeam;
-		for (info->teams.Rewind(); info->teams.GetNext(&currentTeam); ) {
-			if (team == *currentTeam) {
-				PRINT(1, "BufferManager::CleanupTeam: removing team %ld from "
-					"buffer id %ld\n", team, info->id);
-				info->teams.RemoveCurrent();
-			}
-		}
-		if (info->teams.IsEmpty()) {
+	BufferInfoMap::Iterator iterator = fBufferInfoMap.GetIterator();
+	while (iterator.HasNext()) {
+		BufferInfoMap::Entry entry = iterator.Next();
+
+		entry.value.teams.erase(team);
+
+		if (entry.value.teams.empty()) {
 			PRINT(1, "BufferManager::CleanupTeam: removing buffer id %ld that "
-				"has no teams\n", info->id);
-			fBufferInfoMap.RemoveCurrent(); 
+				"has no teams\n", entry.key);
+			_ReleaseClonedArea(entry.value.area);
+			iterator.Remove();
 		}
 	}
 }
@@ -173,18 +162,36 @@
 	printf("\n");
 	printf("BufferManager: list of buffers follows:\n");
 
-	buffer_info *info;
-	for (fBufferInfoMap.Rewind(); fBufferInfoMap.GetNext(&info); ) {
+	BufferInfoMap::Iterator iterator = fBufferInfoMap.GetIterator();
+	while (iterator.HasNext()) {
+		buffer_info& info = *iterator.NextValue();
 		printf(" buffer-id %ld, area-id %ld, offset %ld, size %ld, flags "
-			"%#08lx\n", info->id, info->area, info->offset, info->size,
-			info->flags);
+			"%#08lx\n", info.id, info.area, info.offset, info.size, info.flags);
 		printf("   assigned teams: ");
 
-		team_id* team;
-		for (info->teams.Rewind(); info->teams.GetNext(&team); ) {
-			printf("%ld, ", *team);
+		std::set<team_id>::iterator teamIterator = info.teams.begin();
+		for (; teamIterator != info.teams.end(); teamIterator++) {
+			printf("%ld, ", *teamIterator);
 		}
 		printf("\n");
 	}
 	printf("BufferManager: list end\n");
 }
+
+
+area_id
+BufferManager::_CloneArea(area_id area)
+{
+	void* address;
+	area_id clonedArea = clone_area("media_server cloned buffer", &address,
+		B_ANY_ADDRESS, B_READ_AREA | B_WRITE_AREA, area);
+	
+	return clonedArea;
+}
+
+
+void
+BufferManager::_ReleaseClonedArea(area_id clone)
+{
+	delete_area(clone);
+}

Modified: haiku/trunk/src/servers/media/BufferManager.h
===================================================================
--- haiku/trunk/src/servers/media/BufferManager.h	2009-08-06 09:42:34 UTC (rev 32154)
+++ haiku/trunk/src/servers/media/BufferManager.h	2009-08-06 09:45:04 UTC (rev 32155)
@@ -1,14 +1,16 @@
 /* 
  * Copyright 2002, Marcus Overhagen. All rights reserved.
+ * Copyright 2009, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
 
+#include <set>
+
 #include <Locker.h>
 #include <MediaDefs.h>
 
-#include <TMap.h>
-#include <TList.h>
+#include <HashMap.h>
 
 
 struct _shared_buffer_list;
@@ -37,19 +39,71 @@
 			void			Dump();
 
 private:
+			area_id			_CloneArea(area_id area);
+			void			_ReleaseClonedArea(area_id clone);
+
+private:
+	struct clone_info {
+		area_id				source;
+		area_id				clone;
+		vint32				ref_count;
+	};
+
 	struct buffer_info {
-		media_buffer_id	id;
-		area_id			area;
-		size_t			offset;
-		size_t			size;
-		int32			flags;
-		List<team_id>	teams;
+		media_buffer_id		id;
+		area_id				area;
+		size_t				offset;
+		size_t				size;
+		int32				flags;
+		std::set<team_id>	teams;
 	};
+	
+	template<typename Type> struct id_hash {
+		id_hash()
+			:
+			fID(0)
+		{
+		}
 
+		id_hash(Type id)
+			:
+			fID(id)
+		{
+		}
+
+		id_hash(const id_hash& other)
+		{
+			fID = other.fID;
+		}
+
+		uint32 GetHashCode() const
+		{
+			return fID;
+		}
+
+		operator Type() const
+		{
+			return fID;
+		}
+	
+		id_hash& operator=(const id_hash& other)
+		{
+			fID = other.fID;
+			return *this;
+		}
+
+	private:
+		Type	fID;
+	};
+
+	typedef HashMap<id_hash<media_buffer_id>, buffer_info> BufferInfoMap;
+	typedef HashMap<id_hash<area_id>, clone_info> CloneInfoMap;
+
 			_shared_buffer_list* fSharedBufferList;
 			area_id			fSharedBufferListID;
 			media_buffer_id	fNextBufferID;
 			BLocker			fLocker;
-			Map<media_buffer_id, buffer_info> fBufferInfoMap;
+			BufferInfoMap	fBufferInfoMap;
+			CloneInfoMap	fCloneInfoMap;
 };
 



From axeld at mail.berlios.de  Thu Aug  6 12:01:21 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 6 Aug 2009 12:01:21 +0200
Subject: [Haiku-commits] r32156 - haiku/trunk/src/servers/media
Message-ID: <200908061001.n76A1Lp0012707@sheep.berlios.de>

Author: axeld
Date: 2009-08-06 12:01:20 +0200 (Thu, 06 Aug 2009)
New Revision: 32156
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32156&view=rev

Modified:
   haiku/trunk/src/servers/media/BufferManager.cpp
   haiku/trunk/src/servers/media/BufferManager.h
Log:
* The media server now clones each buffer area only once - before, you could
  only add a very limited amount of buffers part of the frame buffer, for
  example, as that one is usually a very large area.
* This could prevent all sorts of media buffers to be cloned on certain
  conditions (and could also cause a MediaPlayer fallback to bitmap mode for
  no apparent reason).


Modified: haiku/trunk/src/servers/media/BufferManager.cpp
===================================================================
--- haiku/trunk/src/servers/media/BufferManager.cpp	2009-08-06 09:45:04 UTC (rev 32155)
+++ haiku/trunk/src/servers/media/BufferManager.cpp	2009-08-06 10:01:20 UTC (rev 32156)
@@ -182,10 +182,32 @@
 area_id
 BufferManager::_CloneArea(area_id area)
 {
+	clone_info* info;
+	if (fCloneInfoMap.Get(area, info)) {
+		// we have already cloned this particular area
+		TRACE("BufferManager::_CloneArea() area %ld has already been cloned "
+			"(id %ld)\n", area, info->clone);
+
+		info->ref_count++;
+		return info->clone;
+	}
+
 	void* address;
 	area_id clonedArea = clone_area("media_server cloned buffer", &address,
 		B_ANY_ADDRESS, B_READ_AREA | B_WRITE_AREA, area);
-	
+
+	TRACE("BufferManager::_CloneArea() cloned area %ld, clone id %ld\n",
+		area, clonedArea);
+
+	if (clonedArea >= 0) {
+		clone_info info;
+		info.clone = clonedArea;
+		info.ref_count = 1;
+
+		fCloneInfoMap.Put(area, info);
+		fSourceInfoMap.Put(clonedArea, area);
+	}
+
 	return clonedArea;
 }
 
@@ -193,5 +215,24 @@
 void
 BufferManager::_ReleaseClonedArea(area_id clone)
 {
-	delete_area(clone);
+	area_id source = fSourceInfoMap.Get(clone);
+
+	clone_info* info;
+	if (!fCloneInfoMap.Get(source, info)) {
+		ERROR("BufferManager::_ReleaseClonedArea(): could not find clone info "
+			"for id %ld (clone %ld)\n", source, clone);
+		return;
+	}
+
+	if (--info->ref_count == 0) {
+		TRACE("BufferManager::_ReleaseClonedArea(): delete cloned area %ld "
+			"(source %ld)\n", clone, source);
+
+		fSourceInfoMap.Remove(clone);
+		fCloneInfoMap.Remove(source);
+		delete_area(clone);
+	} else {
+		TRACE("BufferManager::_ReleaseClonedArea(): released cloned area %ld "
+			"(source %ld)\n", clone, source);
+	}
 }

Modified: haiku/trunk/src/servers/media/BufferManager.h
===================================================================
--- haiku/trunk/src/servers/media/BufferManager.h	2009-08-06 09:45:04 UTC (rev 32155)
+++ haiku/trunk/src/servers/media/BufferManager.h	2009-08-06 10:01:20 UTC (rev 32156)
@@ -44,7 +44,6 @@
 
 private:
 	struct clone_info {
-		area_id				source;
 		area_id				clone;
 		vint32				ref_count;
 	};
@@ -98,6 +97,7 @@
 
 	typedef HashMap<id_hash<media_buffer_id>, buffer_info> BufferInfoMap;
 	typedef HashMap<id_hash<area_id>, clone_info> CloneInfoMap;
+	typedef HashMap<id_hash<area_id>, area_id> SourceInfoMap;
 
 			_shared_buffer_list* fSharedBufferList;
 			area_id			fSharedBufferListID;
@@ -105,5 +105,6 @@
 			BLocker			fLocker;
 			BufferInfoMap	fBufferInfoMap;
 			CloneInfoMap	fCloneInfoMap;
+			SourceInfoMap	fSourceInfoMap;
 };
 



From axeld at pinc-software.de  Thu Aug  6 12:05:08 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 06 Aug 2009 12:05:08 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?BOM=3A_r32142_-_=2E=2E=2Efailed_C++_/ob?=
 =?utf-8?q?jects/haiku/--arch--/release/system/kernel/signal=2Eo_=2E=2E=2E?=
In-Reply-To: <1e42d8c50908051442rc072486j6f8dbeca70f5df9a@mail.gmail.com>
Message-ID: <10596469819-BeMail@zon>

Matt Madia <mattmadia at gmail.com> wrote:
> On Wed, Aug 5, 2009 at 21:32, Axel D?rfler<axeld at pinc-software.de> 
> wrote:
> > Nice one! Thanks for doing this!
> > I would guess it would be nice to have those scripts in the 
> > repository
> > as well?
> I'm impartial either way.
> 
> for now, it's hosted at : http://dev.osdrawer.net/projects/show/haikubuildomatic
> 
That should be good enough, I guess.

Bye,
   Axel.



From alex at zappotek.com  Thu Aug  6 12:29:38 2009
From: alex at zappotek.com (Alexandre Deckner)
Date: Thu, 06 Aug 2009 12:29:38 +0200
Subject: [Haiku-commits] r32027 - in haiku/trunk/src/apps: .
 haiku3d	haiku3d/data haiku3d/mesh haiku3d/texture
In-Reply-To: <200907311538.n6VFcQA6010856@sheep.berlios.de>
References: <200907311538.n6VFcQA6010856@sheep.berlios.de>
Message-ID: <4A7AB092.5030206@zappotek.com>

aldeck at mail.berlios.de a ?crit :
> Author: aldeck
> Date: 2009-07-31 17:38:12 +0200 (Fri, 31 Jul 2009)
> New Revision: 32027
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32027&view=rev
>
> Added:
>    haiku/trunk/src/apps/haiku3d/
>   
[...]
>  Not in the image yet, waiting for the green light. Enjoy!
>
>
>   

The voting/comment period has expired! You have until midnight before i 
add this evilware to the image :)

Best regards,
Alex



From axeld at mail.berlios.de  Thu Aug  6 13:02:22 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 6 Aug 2009 13:02:22 +0200
Subject: [Haiku-commits] r32157 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200908061102.n76B2M5o028211@sheep.berlios.de>

Author: axeld
Date: 2009-08-06 13:02:08 +0200 (Thu, 06 Aug 2009)
New Revision: 32157
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32157&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.h
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
Log:
* Somehow I forgot to update the parent directory's time stamps on file
  creation, removal, and name changes...


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp	2009-08-06 10:01:20 UTC (rev 32156)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp	2009-08-06 11:02:08 UTC (rev 32157)
@@ -1311,6 +1311,18 @@
 }
 
 
+status_t
+Inode::ContainerContentsChanged(Transaction& transaction)
+{
+	ASSERT(!InLastModifiedIndex());
+
+	Node().last_modified_time = Node().status_change_time
+		= HOST_ENDIAN_TO_BFS_INT64(bfs_inode::ToInode(real_time_clock_usecs()));
+
+	return WriteBack(transaction);
+}
+
+
 //	#pragma mark - data stream
 
 
@@ -2397,6 +2409,8 @@
 	}
 #endif
 
+	ContainerContentsChanged(transaction);
+
 	// update the inode, so that no one will ever doubt it's deleted :-)
 	inode->Node().flags |= HOST_ENDIAN_TO_BFS_INT32(INODE_DELETED);
 	inode->Node().flags &= ~HOST_ENDIAN_TO_BFS_INT32(INODE_IN_USE);
@@ -2447,7 +2461,7 @@
 	Volume* volume = transaction.GetVolume();
 	BPlusTree* tree = NULL;
 
-	if (parent && (mode & S_ATTR_DIR) == 0 && parent->IsContainer()) {
+	if (parent != NULL && (mode & S_ATTR_DIR) == 0 && parent->IsContainer()) {
 		// check if the file already exists in the directory
 		if (parent->GetTree(&tree) != B_OK)
 			RETURN_ERROR(B_BAD_VALUE);
@@ -2479,7 +2493,7 @@
 			Vnode vnode(volume, offset);
 			Inode* inode;
 			status_t status = vnode.Get(&inode);
-			if (status < B_OK) {
+			if (status != B_OK) {
 				REPORT_ERROR(status);
 				return B_ENTRY_NOT_FOUND;
 			}
@@ -2492,7 +2506,7 @@
 			if (inode->CheckPermissions(open_mode_to_access(openMode)) != B_OK)
 				return B_NOT_ALLOWED;
 
-			if (openMode & O_TRUNC) {
+			if ((openMode & O_TRUNC) != 0) {
 				// we need write access in order to truncate the file
 				status = inode->CheckPermissions(W_OK);
 				if (status != B_OK)
@@ -2523,7 +2537,7 @@
 
 			return B_OK;
 		}
-	} else if (parent && (mode & S_ATTR_DIR) == 0)
+	} else if (parent != NULL && (mode & S_ATTR_DIR) == 0)
 		return B_BAD_VALUE;
 
 	status_t status;
@@ -2567,23 +2581,23 @@
 	// only add the name to regular files, directories, or symlinks
 	// don't add it to attributes, or indices
 	if (tree && inode->IsRegularNode()
-		&& inode->SetName(transaction, name) < B_OK)
+		&& inode->SetName(transaction, name) != B_OK)
 		return B_ERROR;
 
 	// Initialize b+tree if it's a directory (and add "." & ".." if it's
 	// a standard directory for files - not for attributes or indices)
 	if (inode->IsContainer()) {
 		status = allocator.CreateTree();
-		if (status < B_OK)
+		if (status != B_OK)
 			return status;
 	}
 
 	// Add a link to the inode from the parent, depending on its type
 	// (the vnode is not published yet, so it is safe to make the inode
 	// accessable to the file system here)
-	if (tree) {
+	if (tree != NULL) {
 		status = tree->Insert(transaction, name, inode->ID());
-	} else if (parent && (mode & S_ATTR_DIR) != 0) {
+	} else if (parent != NULL && (mode & S_ATTR_DIR) != 0) {
 		parent->Attributes() = run;
 		status = parent->WriteBack(transaction);
 	}
@@ -2592,7 +2606,7 @@
 	// two cases above; the root node or the indices root node must
 	// handle this case on their own (or other cases where "parent" is
 	// NULL)
-	if (status < B_OK)
+	if (status != B_OK)
 		RETURN_ERROR(status);
 
 	// Update the main indices (name, size & last_modified)
@@ -2603,7 +2617,7 @@
 		// the name index only contains regular files
 		// (but not the root node where name == NULL)
 		status = index.InsertName(transaction, name, inode);
-		if (status < B_OK && status != B_BAD_INDEX) {
+		if (status != B_OK && status != B_BAD_INDEX) {
 			// We have to remove the node from the parent at this point,
 			// because the InodeAllocator destructor can't handle this
 			// case (and if it fails, we can't do anything about it...)
@@ -2616,6 +2630,9 @@
 		}
 	}
 
+	if (parent != NULL && parent->IsContainer())
+		parent->ContainerContentsChanged(transaction);
+
 	inode->UpdateOldLastModified();
 
 	// The "size" & "last_modified" indices don't contain directories.
@@ -2652,30 +2669,6 @@
 }
 
 
-/*!	Checks whether or not this node should be part of the name index */
-bool
-Inode::InNameIndex() const
-{
-	return IsRegularNode();
-}
-
-
-/*!	Checks whether or not this node should be part of the size index */
-bool
-Inode::InSizeIndex() const
-{
-	return IsFile();
-}
-
-
-/*!	Checks whether or not this node should be part of the last modified index */
-bool
-Inode::InLastModifiedIndex() const
-{
-	return IsFile() || IsSymLink();
-}
-
-
 //	#pragma mark - AttributeIterator
 
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.h	2009-08-06 10:01:20 UTC (rev 32156)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.h	2009-08-06 11:02:08 UTC (rev 32157)
@@ -121,6 +121,7 @@
 			// for directories only:
 			status_t		GetTree(BPlusTree** _tree);
 			bool			IsEmpty();
+			status_t		ContainerContentsChanged(Transaction& transaction);
 
 			// manipulating the data stream
 			status_t		FindBlockRun(off_t pos, block_run& run,
@@ -241,6 +242,31 @@
 			SinglyLinkedList<AttributeIterator> fIterators;
 };
 
+
+/*!	Checks whether or not this node should be part of the name index */
+inline bool
+Inode::InNameIndex() const
+{
+	return IsRegularNode();
+}
+
+
+/*!	Checks whether or not this node should be part of the size index */
+inline bool
+Inode::InSizeIndex() const
+{
+	return IsFile();
+}
+
+
+/*!	Checks whether or not this node should be part of the last modified index */
+inline bool
+Inode::InLastModifiedIndex() const
+{
+	return IsFile() || IsSymLink();
+}
+
+
 #if _KERNEL_MODE && KDEBUG
 #	define ASSERT_READ_LOCKED_INODE(inode) inode->AssertReadLocked()
 #	define ASSERT_WRITE_LOCKED_INODE(inode) inode->AssertWriteLocked()
@@ -249,6 +275,7 @@
 #	define ASSERT_WRITE_LOCKED_INODE(inode)
 #endif
 
+
 class InodeReadLocker {
 public:
 	InodeReadLocker(Inode* inode)

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	2009-08-06 10:01:20 UTC (rev 32156)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp	2009-08-06 11:02:08 UTC (rev 32157)
@@ -1149,7 +1149,7 @@
 		status = newTree->Insert(transaction, (const uint8*)newName,
 			strlen(newName), id);
 	}
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	inode->WriteLockInTransaction(transaction);
@@ -1186,6 +1186,12 @@
 				}
 			}
 
+			if (newDirectory != oldDirectory) {
+				oldDirectory->ContainerContentsChanged(transaction);
+				newDirectory->ContainerContentsChanged(transaction);
+			} else
+				newDirectory->ContainerContentsChanged(transaction);
+
 			if (status == B_OK)
 				status = inode->WriteBack(transaction);
 



From superstippi at gmx.de  Thu Aug  6 13:07:30 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Thu, 06 Aug 2009 13:07:30 +0200
Subject: [Haiku-commits] r32027 - in haiku/trunk/src/apps: .
 haiku3d	haiku3d/data haiku3d/mesh haiku3d/texture
In-Reply-To: <4A7AB092.5030206@zappotek.com>
References: <200907311538.n6VFcQA6010856@sheep.berlios.de>
	<4A7AB092.5030206@zappotek.com>
Message-ID: <20090806130730.1798.6@bepc.1249551590.fake>


On 2009-08-06 at 12:29:38 [+0200], Alexandre Deckner <alex at zappotek.com> 
wrote:
> aldeck at mail.berlios.de a ?crit :
> > Author: aldeck
> > Date: 2009-07-31 17:38:12 +0200 (Fri, 31 Jul 2009) New Revision: 32027
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32027&view=rev
> >
> > Added:
> >    haiku/trunk/src/apps/haiku3d/
> >   
> [...]
> >  Not in the image yet, waiting for the green light. Enjoy!
> 
> The voting/comment period has expired! You have until midnight before i 
> add this evilware to the image :)

Ah, I forgot I meant to reply. I looked at it and I think it's nice! 
Definitely more interesting than the GLCube, which is really more a 
programmer's demo, than a demo for Haiku as a system.

Best regards,
-Stephan


From superstippi at gmx.de  Thu Aug  6 13:13:22 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Thu, 06 Aug 2009 13:13:22 +0200
Subject: [Haiku-commits] r32156 - haiku/trunk/src/servers/media
In-Reply-To: <200908061001.n76A1Lp0012707@sheep.berlios.de>
References: <200908061001.n76A1Lp0012707@sheep.berlios.de>
Message-ID: <20090806131322.1864.7@bepc.1249551590.fake>


On 2009-08-06 at 12:01:21 [+0200], axeld at mail.berlios.de wrote:
> Author: axeld
> Date: 2009-08-06 12:01:20 +0200 (Thu, 06 Aug 2009) New Revision: 32156
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32156&view=rev
> 
> Modified:
>    haiku/trunk/src/servers/media/BufferManager.cpp
>    haiku/trunk/src/servers/media/BufferManager.h
> Log:
> * The media server now clones each buffer area only once - before, you 
> could
>   only add a very limited amount of buffers part of the frame buffer, for 
>   example, as that one is usually a very large area.
> * This could prevent all sorts of media buffers to be cloned on certain
>   conditions (and could also cause a MediaPlayer fallback to bitmap mode 
>   for no apparent reason).


From mattmadia at gmail.com  Thu Aug  6 13:14:38 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Thu, 6 Aug 2009 11:14:38 +0000
Subject: [Haiku-commits] BOM: r32142 - ...failed C++
	/objects/haiku/--arch--/release/system/kernel/signal.o ...
In-Reply-To: <1e42d8c50908051412v3a0f63b5odb28f3e75e55f1d9@mail.gmail.com>
References: <4a79f51e.48c3f10a.7b77.ffff8c51@mx.google.com>
	<1e42d8c50908051412v3a0f63b5odb28f3e75e55f1d9@mail.gmail.com>
Message-ID: <1e42d8c50908060414p237bb8b7p91e5f7059c4a8abd@mail.gmail.com>

On Wed, Aug 5, 2009 at 21:12, Matt Madia<mattmadia at gmail.com> wrote:
> This was a forced error to demonstrate functionality.

Just in case anyone's curious,

 * each unique error is reported only once.
 * Build-O-Matic will sleep a minimum of 5minutes between build cycles
 * New build cycles are triggered by polling CIA.vc, so sleeping may be longer.
 * only commits to haiku/buildtools/trunk and haiku/haiku/trunk will
trigger a build cycle.
 * If multiple commits have been made from the start of the last build
cycle, only the newest will be built.

To help identify the cause of the failing revision, "Targets
Affected:" will be updated to display:
<arch>:<jamtarget>:<last revision successfully built by BOM>

It's possible, although unlikely, for each of those to have a
different last-revision built successfully.  Eg,  someone commits a
change that breaks ppc and then someone else breaks gcc4 before ppc is
fixed.

--mmadia


From superstippi at gmx.de  Thu Aug  6 13:16:56 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Thu, 06 Aug 2009 13:16:56 +0200
Subject: [Haiku-commits] r32155 - haiku/trunk/src/servers/media
In-Reply-To: <200908060945.n769j5EM008076@sheep.berlios.de>
References: <200908060945.n769j5EM008076@sheep.berlios.de>
Message-ID: <20090806131656.1892.8@bepc.1249551590.fake>


On 2009-08-06 at 11:45:05 [+0200], axeld at mail.berlios.de wrote:
> Author: axeld
> Date: 2009-08-06 11:45:04 +0200 (Thu, 06 Aug 2009) New Revision: 32155
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32155&view=rev
> 
> Modified:
>    haiku/trunk/src/servers/media/BufferManager.cpp
>    haiku/trunk/src/servers/media/BufferManager.h
> Log:
> * When a buffer_info is removed, its area is now actually deleted as 
> well. This
>   already fixes bug #4189, although there is another bug that could cause 
>   a similar effect (working on that next).
> * Switched from media_server local TMap to HashMap, although this is 
> probably
>   equally archaic.
> * Also replaced TList with std::set for the team list.

BTW, is it your plan to eventually get rid of TList and TMap? Just thought 
I'd mention that I've been growing fond of TList at least. The code that 
uses it ends up being quite compact. Maybe we can keep that as a 
light-weight supplement to BObjectList, with O(1) Insert()? Some of it's 
internals could certainly be made more robust, though, IIRC.

Best regards,
-Stephan


From axeld at mail.berlios.de  Thu Aug  6 13:18:33 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 6 Aug 2009 13:18:33 +0200
Subject: [Haiku-commits] r32158 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200908061118.n76BIXh8020000@sheep.berlios.de>

Author: axeld
Date: 2009-08-06 13:18:26 +0200 (Thu, 06 Aug 2009)
New Revision: 32158
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32158&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp
   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/Inode.h
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
Log:
* Replaced the Inode::GetTree() method with a simple getter - the tree is
  always created for directories since quite some time now.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp	2009-08-06 11:02:08 UTC (rev 32157)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp	2009-08-06 11:18:26 UTC (rev 32158)
@@ -1369,8 +1369,8 @@
 
 			// get iterator for the next directory
 
-			BPlusTree* tree;
-			if (inode->GetTree(&tree) != B_OK) {
+			BPlusTree* tree = inode->Tree();
+			if (tree == NULL) {
 				FATAL(("check: could not open b+tree from inode at %Ld\n",
 					fVolume->ToBlock(cookie->current)));
 				continue;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp	2009-08-06 11:02:08 UTC (rev 32157)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp	2009-08-06 11:18:26 UTC (rev 32158)
@@ -293,9 +293,7 @@
 
 		kprintf("INODE %p\n", inode);
 		kprintf("  rw lock:           %p\n", &inode->Lock());
-		BPlusTree* tree = NULL;
-		inode->GetTree(&tree);
-		kprintf("  tree:              %p\n", tree);
+		kprintf("  tree:              %p\n", inode->Tree());
 		kprintf("  file cache:        %p\n", inode->FileCache());
 		kprintf("  file map:          %p\n", inode->Map());
 		kprintf("  old size:          %Ld\n", inode->OldSize());

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Index.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Index.cpp	2009-08-06 11:02:08 UTC (rev 32157)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Index.cpp	2009-08-06 11:18:26 UTC (rev 32158)
@@ -76,8 +76,8 @@
 
 	InodeReadLocker locker(indices);
 
-	BPlusTree* tree;
-	if (indices->GetTree(&tree) != B_OK)
+	BPlusTree* tree = indices->Tree();
+	if (tree == NULL)
 		return B_BAD_VALUE;
 
 	ino_t id;
@@ -261,15 +261,16 @@
 			newKey, newLength);
 	}
 
-	BPlusTree* tree;
-	status_t status = Node()->GetTree(&tree);
-	if (status < B_OK)
-		return status;
+	BPlusTree* tree = Node()->Tree();
+	if (tree == NULL)
+		return B_BAD_VALUE;
 
 	// remove the old key from the tree
 
 	Node()->WriteLockInTransaction(transaction);
 
+	status_t status = B_OK;
+
 	if (oldKey != NULL) {
 		status = tree->Remove(transaction, (const uint8*)oldKey, oldLength,
 			inode->ID());

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp	2009-08-06 11:02:08 UTC (rev 32157)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp	2009-08-06 11:18:26 UTC (rev 32158)
@@ -1206,25 +1206,26 @@
 		return B_ERROR;
 	}
 
-	BPlusTree* tree;
-	status_t status = attributes->GetTree(&tree);
-	if (status == B_OK) {
-		InodeReadLocker locker(attributes);
+	BPlusTree* tree = attributes->Tree();
+	if (tree == NULL)
+		return B_BAD_VALUE;
 
-		ino_t id;
-		status = tree->Find((uint8*)name, (uint16)strlen(name), &id);
-		if (status == B_OK) {
-			Vnode vnode(fVolume, id);
-			Inode* inode;
-			// Check if the attribute is really an attribute
-			if (vnode.Get(&inode) < B_OK || !inode->IsAttribute())
-				return B_ERROR;
+	InodeReadLocker locker(attributes);
 
-			*_attribute = inode;
-			vnode.Keep();
-			return B_OK;
-		}
+	ino_t id;
+	status_t status = tree->Find((uint8*)name, (uint16)strlen(name), &id);
+	if (status == B_OK) {
+		Vnode vnode(fVolume, id);
+		Inode* inode;
+		// Check if the attribute is really an attribute
+		if (vnode.Get(&inode) != B_OK || !inode->IsAttribute())
+			return B_ERROR;
+
+		*_attribute = inode;
+		vnode.Keep();
+		return B_OK;
 	}
+
 	return status;
 }
 
@@ -1264,33 +1265,11 @@
 //	#pragma mark - directory tree
 
 
-/*!	Gives the caller direct access to the b+tree for a given directory.
-	The tree is no longer created on demand, but when the inode is first
-	created. That will report any potential errors upfront, saves locking,
-	and should work as good (though a bit slower).
-*/
-status_t
-Inode::GetTree(BPlusTree** tree)
-{
-	if (fTree) {
-		*tree = fTree;
-		return B_OK;
-	}
-
-	RETURN_ERROR(B_BAD_VALUE);
-}
-
-
 bool
 Inode::IsEmpty()
 {
-	BPlusTree* tree;
-	status_t status = GetTree(&tree);
-	if (status < B_OK)
-		return status;
+	TreeIterator iterator(fTree);
 
-	TreeIterator iterator(tree);
-
 	// index and attribute directories are really empty when they are
 	// empty - directories for standard files always contain ".", and
 	// "..", so we need to ignore those two
@@ -2354,15 +2333,14 @@
 Inode::Remove(Transaction& transaction, const char* name, ino_t* _id,
 	bool isDirectory, bool force)
 {
-	BPlusTree* tree;
-	if (GetTree(&tree) != B_OK)
+	if (fTree == NULL)
 		RETURN_ERROR(B_BAD_VALUE);
 
 	WriteLockInTransaction(transaction);
 
 	// does the file even exist?
 	off_t id;
-	if (tree->Find((uint8*)name, (uint16)strlen(name), &id) < B_OK)
+	if (fTree->Find((uint8*)name, (uint16)strlen(name), &id) < B_OK)
 		return B_ENTRY_NOT_FOUND;
 
 	if (_id)
@@ -2398,13 +2376,13 @@
 	if (status != B_OK)
 		return status;
 
-	if (tree->Remove(transaction, name, id) != B_OK && !force) {
+	if (fTree->Remove(transaction, name, id) != B_OK && !force) {
 		unremove_vnode(fVolume->FSVolume(), id);
 		RETURN_ERROR(B_ERROR);
 	}
 
 #ifdef DEBUG
-	if (tree->Find((uint8*)name, (uint16)strlen(name), &id) == B_OK) {
+	if (fTree->Find((uint8*)name, (uint16)strlen(name), &id) == B_OK) {
 		DIE(("deleted entry still there"));
 	}
 #endif
@@ -2463,8 +2441,7 @@
 
 	if (parent != NULL && (mode & S_ATTR_DIR) == 0 && parent->IsContainer()) {
 		// check if the file already exists in the directory
-		if (parent->GetTree(&tree) != B_OK)
-			RETURN_ERROR(B_BAD_VALUE);
+		tree = parent->Tree();
 	}
 
 	if (parent != NULL) {
@@ -2759,8 +2736,8 @@
 			return B_ENTRY_NOT_FOUND;
 		}
 
-		BPlusTree* tree;
-		if (fAttributes->GetTree(&tree) < B_OK
+		BPlusTree* tree = fAttributes->Tree();
+		if (tree == NULL
 			|| (fIterator = new TreeIterator(tree)) == NULL) {
 			FATAL(("could not get tree in AttributeIterator::GetNext(ino_t"
 				" = %Ld,name = \"%s\")\n", fInode->ID(), name));

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.h	2009-08-06 11:02:08 UTC (rev 32157)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.h	2009-08-06 11:18:26 UTC (rev 32158)
@@ -119,7 +119,7 @@
 								Inode** attribute);
 
 			// for directories only:
-			status_t		GetTree(BPlusTree** _tree);
+			BPlusTree*		Tree() const { return fTree; }
 			bool			IsEmpty();
 			status_t		ContainerContentsChanged(Transaction& transaction);
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp	2009-08-06 11:02:08 UTC (rev 32157)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp	2009-08-06 11:18:26 UTC (rev 32158)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2001-2009, Axel D?rfler, axeld at pinc-software.de.
  * This file may be used under the terms of the MIT License.
  */
 
@@ -931,20 +931,20 @@
 	status_t status = index.SetTo(fAttribute);
 
 	// if we should query attributes without an index, we can just proceed here
-	if (status < B_OK && !queryNonIndexed)
+	if (status != B_OK && !queryNonIndexed)
 		return B_ENTRY_NOT_FOUND;
 
 	type_code type;
 
 	// Special case for OP_UNEQUAL - it will always operate through the whole
 	// index but we need the call to the original index to get the correct type
-	if (status < B_OK || fOp == OP_UNEQUAL) {
+	if (status != B_OK || fOp == OP_UNEQUAL) {
 		// Try to get an index that holds all files (name)
 		// Also sets the default type for all attributes without index
 		// to string.
 		type = status < B_OK ? B_STRING_TYPE : index.Type();
 
-		if (index.SetTo("name") < B_OK)
+		if (index.SetTo("name") != B_OK)
 			return B_ENTRY_NOT_FOUND;
 
 		fHasIndex = false;
@@ -956,8 +956,8 @@
 	if (ConvertValue(type) < B_OK)
 		return B_BAD_VALUE;
 
-	BPlusTree* tree;
-	if (index.Node()->GetTree(&tree) < B_OK)
+	BPlusTree* tree = index.Node()->Tree();
+	if (tree == NULL)
 		return B_ERROR;
 
 	*iterator = new TreeIterator(tree);
@@ -1033,7 +1033,7 @@
 
 		status_t status = iterator->GetNextEntry(&indexValue, &keyLength,
 			(uint16)sizeof(indexValue), &offset, &duplicate);
-		if (status < B_OK)
+		if (status != B_OK)
 			return status;
 
 		// only compare against the index entry when this is the correct

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	2009-08-06 11:02:08 UTC (rev 32157)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp	2009-08-06 11:18:26 UTC (rev 32158)
@@ -571,15 +571,15 @@
 
 	// check access permissions
 	status_t status = directory->CheckPermissions(X_OK);
-	if (status < B_OK)
+	if (status != B_OK)
 		RETURN_ERROR(status);
 
-	BPlusTree* tree;
-	if (directory->GetTree(&tree) != B_OK)
+	BPlusTree* tree = directory->Tree();
+	if (tree == NULL)
 		RETURN_ERROR(B_BAD_VALUE);
 
 	status = tree->Find((uint8*)file, (uint16)strlen(file), _vnodeID);
-	if (status < B_OK) {
+	if (status != B_OK) {
 		//PRINT(("bfs_walk() could not find %Ld:\"%s\": %s\n", directory->BlockNumber(), file, strerror(status)));
 		return status;
 	}
@@ -1059,24 +1059,23 @@
 	status_t status = oldDirectory->CheckPermissions(W_OK);
 	if (status == B_OK)
 		status = newDirectory->CheckPermissions(W_OK);
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	// Get the directory's tree, and a pointer to the inode which should be
 	// changed
-	BPlusTree* tree;
-	status = oldDirectory->GetTree(&tree);
-	if (status < B_OK)
-		RETURN_ERROR(status);
+	BPlusTree* tree = oldDirectory->Tree();
+	if (tree == NULL)
+		RETURN_ERROR(B_BAD_VALUE);
 
 	off_t id;
 	status = tree->Find((const uint8*)oldName, strlen(oldName), &id);
-	if (status < B_OK)
+	if (status != B_OK)
 		RETURN_ERROR(status);
 
 	Vnode vnode(volume, id);
 	Inode* inode;
-	if (vnode.Get(&inode) < B_OK)
+	if (vnode.Get(&inode) != B_OK)
 		return B_IO_ERROR;
 
 	// Don't move a directory into one of its children - we soar up
@@ -1096,7 +1095,7 @@
 
 			Vnode vnode(volume, parent);
 			Inode* parentNode;
-			if (vnode.Get(&parentNode) < B_OK)
+			if (vnode.Get(&parentNode) != B_OK)
 				return B_ERROR;
 
 			parent = volume->ToVnode(parentNode->Parent());
@@ -1110,9 +1109,9 @@
 	// failure, we will test this case first
 	BPlusTree* newTree = tree;
 	if (newDirectory != oldDirectory) {
-		status = newDirectory->GetTree(&newTree);
-		if (status < B_OK)
-			RETURN_ERROR(status);
+		newTree = newDirectory->Tree();
+		if (newTree == NULL)
+			RETURN_ERROR(B_BAD_VALUE);
 	}
 
 	status = newTree->Insert(transaction, (const uint8*)newName,
@@ -1173,10 +1172,10 @@
 
 			// if it's a directory, update the parent directory pointer
 			// in its tree if necessary
-			BPlusTree* movedTree = NULL;
+			BPlusTree* movedTree = inode->Tree();
 			if (oldDirectory != newDirectory
 				&& inode->IsDirectory()
-				&& (status = inode->GetTree(&movedTree)) == B_OK) {
+				&& movedTree != NULL) {
 				status = movedTree->Replace(transaction, (const uint8*)"..",
 					2, newDirectory->ID());
 
@@ -1579,8 +1578,8 @@
 	if (!inode->IsContainer())
 		RETURN_ERROR(B_BAD_VALUE);
 
-	BPlusTree* tree;
-	if (inode->GetTree(&tree) != B_OK)
+	BPlusTree* tree = inode->Tree();
+	if (tree == NULL)
 		RETURN_ERROR(B_BAD_VALUE);
 
 	TreeIterator* iterator = new(std::nothrow) TreeIterator(tree);



From pulkomandy at mail.berlios.de  Thu Aug  6 13:29:08 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Thu, 6 Aug 2009 13:29:08 +0200
Subject: [Haiku-commits] r32159 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale
Message-ID: <200908061129.n76BT89D005379@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-06 13:29:03 +0200 (Thu, 06 Aug 2009)
New Revision: 32159
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32159&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleStrings.h
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
Log:
-Monetary part of BCountry
-Removed Strings from LocaleStrings that are not used anymore (they are provided by ICU now)


Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-06 11:18:26 UTC (rev 32158)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-06 11:29:03 UTC (rev 32159)
@@ -63,7 +63,7 @@
 
 		virtual ssize_t	FormatMonetary(char *string,size_t maxSize,char *format,
 			...);
-		virtual ssize_t	FormatMonetary(BString *string,char *format, ...);
+		virtual ssize_t	FormatMonetary(BString *string, double value);
 
 		const char		*CurrencySymbol() const;
 		const char		*InternationalCurrencySymbol() const;

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleStrings.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleStrings.h	2009-08-06 11:18:26 UTC (rev 32158)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleStrings.h	2009-08-06 11:29:03 UTC (rev 32159)
@@ -20,18 +20,7 @@
 
 	B_DATE_SEPARATOR,
 	B_TIME_SEPARATOR,
-	B_GROUPING,
-	B_DECIMAL_POINT,
-	B_THOUSANDS_SEPARATOR,
-	B_POSITIVE_SIGN,
-	B_NEGATIVE_SIGN,
 
-	B_CURRENCY_SYMBOL,
-	B_INT_CURRENCY_SYMBOL,
-	B_MON_GROUPING,
-	B_MON_DECIMAL_POINT,
-	B_MON_THOUSANDS_SEPARATOR,
-
 	B_NUM_COUNTRY_STRINGS,
 };
 

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-06 11:18:26 UTC (rev 32158)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-06 11:29:03 UTC (rev 32159)
@@ -37,16 +37,8 @@
 	// separators
 	".",
 	":",
-	" ",
-	".",
-	",",
-	// positive/negative sign
-	"+",
-	"-",
 
 	// currency/monetary
-	"US$"
-	" "
 	"."
 	","
 };
@@ -381,8 +373,21 @@
 
 
 ssize_t 
-BCountry::FormatMonetary(BString *string, char *format, ...)
+BCountry::FormatMonetary(BString *string, double value)
 {
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+
+	assert(err == U_ZERO_ERROR);
+
+	UnicodeString myString;
+	myString = nf->format(value, myString);
+
+	string->Truncate(0);
+	BStringByteSink bbs(string);
+
+	myString.toUTF8(bbs);
+
 	return B_OK;
 }
 
@@ -390,35 +395,121 @@
 const char *
 BCountry::CurrencySymbol() const
 {
-	return fStrings[B_CURRENCY_SYMBOL];
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	assert(err == U_ZERO_ERROR);
+	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+
+	assert(df != NULL);
+
+	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+
+	UnicodeString myString;
+	myString = syms->getSymbol(DecimalFormatSymbols::kCurrencySymbol);
+
+	BString string;
+	BStringByteSink bbs(&string);
+
+	myString.toUTF8(bbs);
+
+	return string.String();
 }
 
 
 const char *
 BCountry::InternationalCurrencySymbol() const
 {
-	return fStrings[B_INT_CURRENCY_SYMBOL];
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	assert(err == U_ZERO_ERROR);
+	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+
+	assert(df != NULL);
+
+	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+
+	UnicodeString myString;
+	myString = syms->getSymbol(DecimalFormatSymbols::kIntlCurrencySymbol);
+
+	BString string;
+	BStringByteSink bbs(&string);
+
+	myString.toUTF8(bbs);
+
+	return string.String();
 }
 
 
 const char *
 BCountry::MonDecimalPoint() const
 {
-	return fStrings[B_MON_DECIMAL_POINT];
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	assert(err == U_ZERO_ERROR);
+	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+
+	assert(df != NULL);
+
+	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+
+	UnicodeString myString;
+	myString = syms->getSymbol(DecimalFormatSymbols::kMonetarySeparatorSymbol);
+
+	BString string;
+	BStringByteSink bbs(&string);
+
+	myString.toUTF8(bbs);
+
+	return string.String();
 }
 
 
 const char *
 BCountry::MonThousandsSeparator() const
 {
-	return fStrings[B_MON_THOUSANDS_SEPARATOR];
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	assert(err == U_ZERO_ERROR);
+	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+
+	assert(df != NULL);
+
+	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+
+	UnicodeString myString;
+	myString = syms->getSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol);
+
+	BString string;
+	BStringByteSink bbs(&string);
+
+	myString.toUTF8(bbs);
+
+	return string.String();
 }
 
 
 const char *
 BCountry::MonGrouping() const
 {
-	return fStrings[B_MON_GROUPING];
+	UErrorCode err;
+	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	assert(err == U_ZERO_ERROR);
+	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+
+	assert(df != NULL);
+
+	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+
+	UnicodeString myString;
+	myString = syms->getSymbol(
+		DecimalFormatSymbols::kMonetaryGroupingSeparatorSymbol);
+
+	BString string;
+	BStringByteSink bbs(&string);
+
+	myString.toUTF8(bbs);
+
+	return string.String();
 }
 
 



From bga at bug-br.org.br  Thu Aug  6 13:32:35 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Thu, 06 Aug 2009 08:32:35 -0300
Subject: [Haiku-commits] r32157
	-	haiku/trunk/src/add-ons/kernel/file_systems/bfs
In-Reply-To: <200908061102.n76B2M5o028211@sheep.berlios.de>
References: <200908061102.n76B2M5o028211@sheep.berlios.de>
Message-ID: <4A7ABF53.20709@bug-br.org.br>

axeld at mail.berlios.de wrote:
> Author: axeld
> Date: 2009-08-06 13:02:08 +0200 (Thu, 06 Aug 2009)
> New Revision: 32157
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32157&view=rev
> 
> Modified:
>    haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.cpp
>    haiku/trunk/src/add-ons/kernel/file_systems/bfs/Inode.h
>    haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
> Log:
> * Somehow I forgot to update the parent directory's time stamps on file
>   creation, removal, and name changes...

I wonder if this would explain why svn status, from time to time, shows 
zillions of files as being modified (when they were not) and svn revert 
on the files does nothing.

-Bruno


From axeld at pinc-software.de  Thu Aug  6 13:31:59 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 06 Aug 2009 13:31:59 +0200 CEST
Subject: [Haiku-commits] r32155 - haiku/trunk/src/servers/media
In-Reply-To: <20090806131656.1892.8@bepc.1249551590.fake>
Message-ID: <15807600832-BeMail@zon>

Stephan Assmus <superstippi at gmx.de> wrote:
> > * Also replaced TList with std::set for the team list.
> BTW, is it your plan to eventually get rid of TList and TMap? Just 
> thought 
> I'd mention that I've been growing fond of TList at least. The code 
> that 
> uses it ends up being quite compact. Maybe we can keep that as a 
> light-weight supplement to BObjectList, with O(1) Insert()? Some of 
> it's 
> internals could certainly be made more robust, though, IIRC.

In the long term, I want to get rid of TList and TMap, as well as any 
other home-brewn/private list/map implementations there are in our 
tree, and have public Be style classes for this (basically stl 
containers without their ugliness).
The TList iteration API is pretty awkward IMO, but since it works more 
than std::vector than BList, we don't have a shared replacement in our 
tree yet. In the case at hand, std::set was just more what you wanted 
there.

Bye,
   Axel.



From axeld at pinc-software.de  Thu Aug  6 13:32:52 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 06 Aug 2009 13:32:52 +0200 CEST
Subject: [Haiku-commits] r32156 - haiku/trunk/src/servers/media
In-Reply-To: <20090806131322.1864.7@bepc.1249551590.fake>
Message-ID: <15860323323-BeMail@zon>

Stephan Assmus <superstippi at gmx.de> wrote:
> From this commit I don't see why you need two maps. But nice fixes, 
> thanks!

_ReleaseClonedArea() needs the reverse mapping - one could walk through 
the list of all cloned areas, but using a map is just faster.

Bye,
   Axel.



From axeld at pinc-software.de  Thu Aug  6 13:36:08 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 06 Aug 2009 13:36:08 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32027_-_in_haiku/trunk/src/apps=3A_=2E?=
 =?utf-8?q?_haiku3d_haiku3d/data_haiku3d/mesh_haiku3d/texture?=
In-Reply-To: <4A7AB092.5030206@zappotek.com>
Message-ID: <16056184148-BeMail@zon>

Alexandre Deckner <alex at zappotek.com> wrote:
> The voting/comment period has expired! You have until midnight before 
> i 
> add this evilware to the image :)

I wouldn't mind to have it in demos either, but as stippi said, I would 
remove the GLCube demo then.

Bye,
   Axel.



From axeld at pinc-software.de  Thu Aug  6 14:22:15 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 06 Aug 2009 14:22:15 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32159_-_in_haiku/branches/components/g?=
 =?utf-8?q?soc-locale-kit=3A_headers/os/locale_src/kits/locale?=
In-Reply-To: <200908061129.n76BT89D005379@sheep.berlios.de>
Message-ID: <18823275828-BeMail@zon>

pulkomandy at BerliOS <pulkomandy at mail.berlios.de> wrote:
> +	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, 
> err);

Our coding style asks for descriptive names; "nf" is not one of those.

> +	UnicodeString myString;
> +	myString = nf->format(value, myString);

The coding style also mentions that you shouldn't use "my" and "the", 
and "a" as prefix for variable names, as they are most of the time 
(like here) totally meaningless.

Bye,
   Axel.



From axeld at pinc-software.de  Thu Aug  6 14:23:11 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 06 Aug 2009 14:23:11 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32157_-_haiku/trunk/src/add-ons/kernel?=
 =?utf-8?q?/file=5Fsystems/bfs?=
In-Reply-To: <4A7ABF53.20709@bug-br.org.br>
Message-ID: <18879534820-BeMail@zon>

Bruno Albuquerque <bga at bug-br.org.br> wrote:
> axeld at mail.berlios.de wrote:
> > Log:
> > * Somehow I forgot to update the parent directory's time stamps on 
> > file
> >   creation, removal, and name changes...
> I wonder if this would explain why svn status, from time to time, 
> shows 
> zillions of files as being modified (when they were not) and svn 
> revert 
> on the files does nothing.

No, that is an svn bug (it has problems with the $Id strings and 
similar).

Bye,
   Axel.



From pulkomandy at mail.berlios.de  Thu Aug  6 15:09:32 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Thu, 6 Aug 2009 15:09:32 +0200
Subject: [Haiku-commits] r32160 - in
	haiku/branches/components/gsoc-locale-kit/src: kits/locale
	preferences/locale tests/kits/locale
Message-ID: <200908061309.n76D9WLs021608@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-06 15:09:30 +0200 (Thu, 06 Aug 2009)
New Revision: 32160
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32160&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
   haiku/branches/components/gsoc-locale-kit/src/tests/kits/locale/Jamfile
Log:
-Fixed FormatDate and FormatTime to display the correct date (ICU is millisecond-precise)
-Update the examples dates in the preflet when one select another country
-Some variable renaming to better fit the guidelines


Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-06 11:29:03 UTC (rev 32159)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-06 13:09:30 UTC (rev 32160)
@@ -117,13 +117,13 @@
    	dateFormatter = DateFormat::createDateInstance(
 		longFormat ? DateFormat::FULL : DateFormat::SHORT,
 		fICULocale);
-	UnicodeString myString;
-	myString = dateFormatter->format(time, myString);
+	UnicodeString ICUString;
+	ICUString = dateFormatter->format((UDate)time*1000, ICUString);
 
 	string->Truncate(0);
 	BStringByteSink bbs(string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 }
 
 
@@ -142,13 +142,13 @@
    	timeFormatter = DateFormat::createTimeInstance(
 		longFormat ? DateFormat::FULL : DateFormat::SHORT,
 		fICULocale);
-	UnicodeString myString;
-	myString = timeFormatter->format(time, myString);
+	UnicodeString ICUString;
+	ICUString = timeFormatter->format((UDate)time*1000, ICUString);
 
 	string->Truncate(0);
 	BStringByteSink bbs(string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 }
 
 
@@ -190,17 +190,18 @@
 BCountry::FormatNumber(BString *string, double value)
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter =
+		NumberFormat::createInstance(fICULocale, err);
 
 	assert(err == U_ZERO_ERROR);
 
-	UnicodeString myString;
-	myString = nf->format(value, myString);
+	UnicodeString ICUString;
+	ICUString = numberFormatter->format(value, ICUString);
 
 	string->Truncate(0);
 	BStringByteSink bbs(string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 }
 
 
@@ -214,17 +215,18 @@
 BCountry::FormatNumber(BString *string, int32 value)
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter =
+		NumberFormat::createInstance(fICULocale, err);
 
 	assert(err == U_ZERO_ERROR);
 
-	UnicodeString myString;
-	myString = nf->format((int32_t)value, myString);
+	UnicodeString ICUString;
+	ICUString = numberFormatter->format((int32_t)value, ICUString);
 
 	string->Truncate(0);
 	BStringByteSink bbs(string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 }
 
 
@@ -233,23 +235,26 @@
 BCountry::DecimalPoint() const
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter = 
+		NumberFormat::createInstance(fICULocale, err);
 
 	assert(err == U_ZERO_ERROR);
 
-	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+	DecimalFormat* decimalFormatter
+		= dynamic_cast<DecimalFormat*>(numberFormatter);
 
-	assert(df != NULL);
+	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms =
+		decimalFormatter->getDecimalFormatSymbols();
 
-	UnicodeString myString;
-	myString = syms->getSymbol(DecimalFormatSymbols::kDecimalSeparatorSymbol);
+	UnicodeString ICUString;
+	ICUString = syms->getSymbol(DecimalFormatSymbols::kDecimalSeparatorSymbol);
 
 	BString string;
 	BStringByteSink bbs(&string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return string.String();
 }
@@ -259,21 +264,24 @@
 BCountry::ThousandsSeparator() const
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter 
+		= NumberFormat::createInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
-	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+	DecimalFormat* decimalFormatter
+		= dynamic_cast<DecimalFormat*>(numberFormatter);
 
-	assert(df != NULL);
+	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms
+		= decimalFormatter->getDecimalFormatSymbols();
 
-	UnicodeString myString;
-	myString = syms->getSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol);
+	UnicodeString ICUString;
+	ICUString = syms->getSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol);
 
 	BString string;
 	BStringByteSink bbs(&string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return string.String();
 }
@@ -283,21 +291,24 @@
 BCountry::Grouping() const
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter =
+		NumberFormat::createInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
-	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+	DecimalFormat* decimalFormatter
+		= dynamic_cast<DecimalFormat*>(numberFormatter);
 
-	assert(df != NULL);
+	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms
+		= decimalFormatter->getDecimalFormatSymbols();
 
-	UnicodeString myString;
-	myString = syms->getSymbol(DecimalFormatSymbols::kGroupingSeparatorSymbol);
+	UnicodeString ICUString;
+	ICUString = syms->getSymbol(DecimalFormatSymbols::kGroupingSeparatorSymbol);
 
 	BString string;
 	BStringByteSink bbs(&string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return string.String();
 }
@@ -307,21 +318,24 @@
 BCountry::PositiveSign() const
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter 
+		= NumberFormat::createInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
-	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+	DecimalFormat* decimalFormatter
+		= dynamic_cast<DecimalFormat*>(numberFormatter);
 
-	assert(df != NULL);
+	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms
+		= decimalFormatter->getDecimalFormatSymbols();
 
-	UnicodeString myString;
-	myString = syms->getSymbol(DecimalFormatSymbols::kPlusSignSymbol);
+	UnicodeString ICUString;
+	ICUString = syms->getSymbol(DecimalFormatSymbols::kPlusSignSymbol);
 
 	BString string;
 	BStringByteSink bbs(&string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return string.String();
 }
@@ -331,21 +345,24 @@
 BCountry::NegativeSign() const
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter =
+		NumberFormat::createInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
-	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+	DecimalFormat* decimalFormatter
+		= dynamic_cast<DecimalFormat*>(numberFormatter);
 
-	assert(df != NULL);
+	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms
+		= decimalFormatter->getDecimalFormatSymbols();
 
-	UnicodeString myString;
-	myString = syms->getSymbol(DecimalFormatSymbols::kMinusSignSymbol);
+	UnicodeString ICUString;
+	ICUString = syms->getSymbol(DecimalFormatSymbols::kMinusSignSymbol);
 
 	BString string;
 	BStringByteSink bbs(&string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return string.String();
 }
@@ -376,17 +393,18 @@
 BCountry::FormatMonetary(BString *string, double value)
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter =
+		NumberFormat::createCurrencyInstance(fICULocale, err);
 
 	assert(err == U_ZERO_ERROR);
 
-	UnicodeString myString;
-	myString = nf->format(value, myString);
+	UnicodeString ICUString;
+	ICUString = numberFormatter->format(value, ICUString);
 
 	string->Truncate(0);
 	BStringByteSink bbs(string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return B_OK;
 }
@@ -396,21 +414,24 @@
 BCountry::CurrencySymbol() const
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter =
+		NumberFormat::createCurrencyInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
-	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+	DecimalFormat* decimalFormatter
+		= dynamic_cast<DecimalFormat*>(numberFormatter);
 
-	assert(df != NULL);
+	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms
+		= decimalFormatter->getDecimalFormatSymbols();
 
-	UnicodeString myString;
-	myString = syms->getSymbol(DecimalFormatSymbols::kCurrencySymbol);
+	UnicodeString ICUString;
+	ICUString = syms->getSymbol(DecimalFormatSymbols::kCurrencySymbol);
 
 	BString string;
 	BStringByteSink bbs(&string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return string.String();
 }
@@ -420,21 +441,24 @@
 BCountry::InternationalCurrencySymbol() const
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter =
+		NumberFormat::createCurrencyInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
-	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+	DecimalFormat* decimalFormatter
+		= dynamic_cast<DecimalFormat*>(numberFormatter);
 
-	assert(df != NULL);
+	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms
+		= decimalFormatter->getDecimalFormatSymbols();
 
-	UnicodeString myString;
-	myString = syms->getSymbol(DecimalFormatSymbols::kIntlCurrencySymbol);
+	UnicodeString ICUString;
+	ICUString = syms->getSymbol(DecimalFormatSymbols::kIntlCurrencySymbol);
 
 	BString string;
 	BStringByteSink bbs(&string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return string.String();
 }
@@ -444,21 +468,24 @@
 BCountry::MonDecimalPoint() const
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter =
+		NumberFormat::createCurrencyInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
-	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+	DecimalFormat* decimalFormatter
+		= dynamic_cast<DecimalFormat*>(numberFormatter);
 
-	assert(df != NULL);
+	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms
+		= decimalFormatter->getDecimalFormatSymbols();
 
-	UnicodeString myString;
-	myString = syms->getSymbol(DecimalFormatSymbols::kMonetarySeparatorSymbol);
+	UnicodeString ICUString;
+	ICUString = syms->getSymbol(DecimalFormatSymbols::kMonetarySeparatorSymbol);
 
 	BString string;
 	BStringByteSink bbs(&string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return string.String();
 }
@@ -468,21 +495,24 @@
 BCountry::MonThousandsSeparator() const
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter 
+		= NumberFormat::createCurrencyInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
-	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+	DecimalFormat* decimalFormatter
+		= dynamic_cast<DecimalFormat*>(numberFormatter);
 
-	assert(df != NULL);
+	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms
+		= decimalFormatter->getDecimalFormatSymbols();
 
-	UnicodeString myString;
-	myString = syms->getSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol);
+	UnicodeString ICUString;
+	ICUString = syms->getSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol);
 
 	BString string;
 	BStringByteSink bbs(&string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return string.String();
 }
@@ -492,22 +522,25 @@
 BCountry::MonGrouping() const
 {
 	UErrorCode err;
-	NumberFormat* nf = NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter =
+		NumberFormat::createCurrencyInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
-	DecimalFormat* df = dynamic_cast<DecimalFormat*>(nf);
+	DecimalFormat* decimalFormatter
+		= dynamic_cast<DecimalFormat*>(numberFormatter);
 
-	assert(df != NULL);
+	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms = df->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms
+		= decimalFormatter->getDecimalFormatSymbols();
 
-	UnicodeString myString;
-	myString = syms->getSymbol(
+	UnicodeString ICUString;
+	ICUString = syms->getSymbol(
 		DecimalFormatSymbols::kMonetaryGroupingSeparatorSymbol);
 
 	BString string;
 	BStringByteSink bbs(&string);
 
-	myString.toUTF8(bbs);
+	ICUString.toUTF8(bbs);
 
 	return string.String();
 }

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-06 11:29:03 UTC (rev 32159)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-06 13:09:30 UTC (rev 32160)
@@ -465,7 +465,7 @@
 		}
 
 		fTimeFormatSettings = 
-			new TimeFormatSettingsView();
+			new TimeFormatSettingsView(defaultCountry);
 
 		tab->AddChild(BGroupLayoutBuilder(B_HORIZONTAL,10)
 			.Add(scrollView)
@@ -545,6 +545,9 @@
 			BMessage* newMessage = new BMessage(kMsgSettingsChanged);
 			newMessage->AddString("country",lli->getLanguageCode());
 			be_app_messenger.SendMessage(newMessage);
+
+			BCountry* country = new BCountry(lli->getLanguageCode());
+			fTimeFormatSettings->SetCountry(country);
 			break;
 		}
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-06 11:29:03 UTC (rev 32159)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-06 13:09:30 UTC (rev 32160)
@@ -23,8 +23,9 @@
 #include <Window.h>
 
 
-TimeFormatSettingsView::TimeFormatSettingsView()
+TimeFormatSettingsView::TimeFormatSettingsView(BCountry* country)
 	: BView("WindowsSettingsView", B_WILL_DRAW)
+	, fCountry(country)
 {
 	SetLayout(new BGroupLayout(B_VERTICAL));
 
@@ -186,7 +187,9 @@
 	settings.SetClockTo24Hr(false);
 	*/
 
-	ShowCurrentSettings();
+	delete fCountry;
+	be_locale_roster->GetDefaultCountry(&fCountry);
+	_UpdateExamples();
 	_SendNotices();
 }
 
@@ -216,7 +219,7 @@
 	settings.SetClockTo24Hr(f24HrClock);
 	*/
 
-	ShowCurrentSettings();
+	//ShowCurrentSettings();
 	_SendNotices();
 }
 
@@ -236,8 +239,11 @@
 
 
 void
-TimeFormatSettingsView::ShowCurrentSettings()
+TimeFormatSettingsView::SetCountry(BCountry* country)
 {
+	delete fCountry;
+	fCountry = country;
+
 	/*
 	f24HrRadioButton->SetValue(settings.ClockIs24Hr());
 	f12HrRadioButton->SetValue(!settings.ClockIs24Hr());
@@ -308,14 +314,12 @@
 	time_t timeValue = (time_t)time(NULL);
 	BString timeFormat = "Internal Error!";
 
-	BCountry* country; 
-	be_locale_roster->GetDefaultCountry(&country);
-	country->FormatDate(&timeFormat, timeValue, true);
+	fCountry->FormatDate(&timeFormat, timeValue, true);
 
 	fLongDateExampleView->SetText(timeFormat);
 	fLongDateExampleView->ResizeToPreferred();
 
-	country->FormatDate(&timeFormat, timeValue, false);
+	fCountry->FormatDate(&timeFormat, timeValue, false);
 	
 	fShortDateExampleView->SetText(timeFormat);
 	fShortDateExampleView->ResizeToPreferred();

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-06 11:29:03 UTC (rev 32159)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-06 13:09:30 UTC (rev 32160)
@@ -11,10 +11,11 @@
 #include <View.h>
 
 
+class BCountry;
+class BMenuField;
+class BMessage;
 class BRadioButton;
-class BMenuField;
 class BStringView;
-class BMessage;
 
 
 enum FormatSeparator {
@@ -39,7 +40,7 @@
 
 class TimeFormatSettingsView : public BView {
 	public:
-		TimeFormatSettingsView();
+		TimeFormatSettingsView(BCountry* country);
 
 		virtual void MessageReceived(BMessage *message);
 		virtual void AttachedToWindow();	
@@ -48,7 +49,7 @@
 		virtual void SetDefaults();
 		virtual bool IsDefaultable() const;
 		virtual void Revert();
-		virtual void ShowCurrentSettings();
+		virtual void SetCountry(BCountry* country);
 		virtual void RecordRevertSettings();
 		virtual bool IsRevertable() const;
 
@@ -73,6 +74,8 @@
 		FormatSeparator fSeparator;
 		DateOrder fFormat;
 
+		BCountry* fCountry;
+
 		typedef BView _inherited;
 };
 

Modified: haiku/branches/components/gsoc-locale-kit/src/tests/kits/locale/Jamfile
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/tests/kits/locale/Jamfile	2009-08-06 11:29:03 UTC (rev 32159)
+++ haiku/branches/components/gsoc-locale-kit/src/tests/kits/locale/Jamfile	2009-08-06 13:09:30 UTC (rev 32160)
@@ -35,7 +35,7 @@
 
 Application ICUTest : 
 	ICUTest.cpp :
-	be libicu-common.so $(TARGET_LIBSUPC++) ;
+	be libicu-common.so libicu-i18n.so libicu-data.so $(TARGET_LIBSUPC++) ;
 
 Addon catalogTestAddOn 
 	: catalogTestAddOn.cpp 



From axeld at pinc-software.de  Thu Aug  6 15:31:30 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 06 Aug 2009 15:31:30 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32160_-_in_haiku/branches/components/g?=
 =?utf-8?q?soc-locale-kit/src=3A_kits/locale_preferences/locale_tests/kits?=
 =?utf-8?q?/locale?=
In-Reply-To: <200908061309.n76D9WLs021608@sheep.berlios.de>
Message-ID: <22978180901-BeMail@zon>

pulkomandy at BerliOS <pulkomandy at mail.berlios.de> wrote:
>     	dateFormatter = DateFormat::createDateInstance(
>  		longFormat ? DateFormat::FULL : DateFormat::SHORT,

Coding style: indentation - we never use space for indenting, btw.

>  		fICULocale);
> -	UnicodeString myString;
> -	myString = dateFormatter->format(time, myString);
> +	UnicodeString ICUString;
> +	ICUString = dateFormatter->format((UDate)time*1000, ICUString);

Coding style: variables always start with lower case.
Also time _space_ * _space_ 1000

>  	string->Truncate(0);
>  	BStringByteSink bbs(string);

"bbs" is just like "nf" not a descriptive name, and must not be used.

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Aug  6 17:00:53 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 6 Aug 2009 17:00:53 +0200
Subject: [Haiku-commits] r32161 - haiku/trunk/src/apps/packageinstaller
Message-ID: <200908061500.n76F0rX4001187@sheep.berlios.de>

Author: axeld
Date: 2009-08-06 17:00:52 +0200 (Thu, 06 Aug 2009)
New Revision: 32161
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32161&view=rev

Modified:
   haiku/trunk/src/apps/packageinstaller/PackageItem.cpp
   haiku/trunk/src/apps/packageinstaller/PackageItem.h
   haiku/trunk/src/apps/packageinstaller/PackageView.cpp
   haiku/trunk/src/apps/packageinstaller/PackageView.h
Log:
* Applied patch by sil2100 that basically adds a "Yes to all" button, see
  ticket #4059. I fixed a few style violations, though. Thanks!
* Automatic whitespace cleanup.


Modified: haiku/trunk/src/apps/packageinstaller/PackageItem.cpp
===================================================================
--- haiku/trunk/src/apps/packageinstaller/PackageItem.cpp	2009-08-06 13:09:30 UTC (rev 32160)
+++ haiku/trunk/src/apps/packageinstaller/PackageItem.cpp	2009-08-06 15:00:52 UTC (rev 32161)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2009, Haiku, Inc.
+ * Copyright 2007-2009, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
  * Author:
@@ -9,16 +9,19 @@
 
 #include "PackageItem.h"
 
+#include <string.h>
+
 #include <Alert.h>
 #include <ByteOrder.h>
 #include <Directory.h>
+#include <fs_info.h>
 #include <NodeInfo.h>
 #include <SymLink.h>
 #include <Volume.h>
 
-#include <fs_info.h>
 #include "zlib.h"
 
+
 // Macro reserved for later localization
 #define T(x) x
 
@@ -37,7 +40,7 @@
 
 status_t
 inflate_data(uint8 *in, uint32 inSize, uint8 *out, uint32 outSize)
-{		
+{
 	z_stream stream;
 	stream.zalloc = Z_NULL;
 	stream.zfree = Z_NULL;
@@ -146,7 +149,7 @@
 
 
 void
-PackageItem::SetTo(BFile *parent, const BString &path, uint8 type, uint32 ctime, 
+PackageItem::SetTo(BFile *parent, const BString &path, uint8 type, uint32 ctime,
 	uint32 mtime, uint64 offset, uint64 size)
 {
 	fPackage = parent;
@@ -160,25 +163,6 @@
 }
 
 
-int32
-PackageItem::ItemExists(const char *name)
-{
-	// TODO: this function doesn't really fit in, the GUI should be separated
-	// from the package engine completely
-
-	BString alertString = "The ";
-
-	alertString << ItemKind() << " named \'" << name << "\' ";
-	alertString << T("already exists in the given path. Should I replace "
-		"the existing file with the one from this package?");
-
-	BAlert *alert = new BAlert(T("file_exists"), alertString.String(),
-		T("Yes"), T("No"), T("Abort"));
-
-	return alert->Go();
-}
-
-
 status_t
 PackageItem::InitPath(const char *path, BPath *destination)
 {
@@ -218,7 +202,7 @@
 
 
 status_t
-PackageItem::HandleAttributes(BPath *destination, BNode *node, 
+PackageItem::HandleAttributes(BPath *destination, BNode *node,
 	const char *header)
 {
 	status_t ret = B_OK;
@@ -256,7 +240,7 @@
 				continue;
 
 			ret = ParseAttribute(buffer, node, &attrName, &nameSize, &attrType,
-				&attrData, &dataSize, &temp, &tempSize, &attrCSize, &attrOSize, 
+				&attrData, &dataSize, &temp, &tempSize, &attrCSize, &attrOSize,
 				&attrStarted, &done);
 			if (ret != B_OK || done) {
 				if (ret != B_OK) {
@@ -276,9 +260,9 @@
 
 
 status_t
-PackageItem::ParseAttribute(uint8 *buffer, BNode *node, char **attrName, 
-	uint32 *nameSize, uint32 *attrType, uint8 **attrData, uint64 *dataSize, 
-	uint8 **temp, uint64 *tempSize, uint64 *attrCSize, uint64 *attrOSize, 
+PackageItem::ParseAttribute(uint8 *buffer, BNode *node, char **attrName,
+	uint32 *nameSize, uint32 *attrType, uint8 **attrData, uint64 *dataSize,
+	uint8 **temp, uint64 *tempSize, uint64 *attrCSize, uint64 *attrOSize,
 	bool *attrStarted, bool *done)
 {
 	status_t ret = B_OK;
@@ -320,7 +304,7 @@
 
 		parser_debug(" BeAT.\n");
 		fPackage->Read(attrType, 4);
-		swap_data(B_UINT32_TYPE, attrType, sizeof(*attrType), 
+		swap_data(B_UINT32_TYPE, attrType, sizeof(*attrType),
 				B_SWAP_BENDIAN_TO_HOST);
 	} else if (!memcmp(buffer, "BeAD", 5)) {
 		if (!*attrStarted) {
@@ -330,11 +314,11 @@
 
 		parser_debug(" BeAD.\n");
 		fPackage->Read(attrCSize, 8);
-		swap_data(B_UINT64_TYPE, attrCSize, sizeof(*attrCSize), 
+		swap_data(B_UINT64_TYPE, attrCSize, sizeof(*attrCSize),
 				B_SWAP_BENDIAN_TO_HOST);
 
 		fPackage->Read(attrOSize, 8);
-		swap_data(B_UINT64_TYPE, attrOSize, sizeof(*attrOSize), 
+		swap_data(B_UINT64_TYPE, attrOSize, sizeof(*attrOSize),
 				B_SWAP_BENDIAN_TO_HOST);
 
 		fPackage->Seek(4, SEEK_CUR); // TODO: Check what this means
@@ -350,7 +334,7 @@
 			*attrData = new uint8[*dataSize];
 		}
 
-		if (fPackage->Read(*temp, *attrCSize) 
+		if (fPackage->Read(*temp, *attrCSize)
 				!= static_cast<ssize_t>(*attrCSize)) {
 			ret = B_ERROR;
 			return ret;
@@ -367,7 +351,7 @@
 		}
 
 		parser_debug(" Padding.\n");
-		ssize_t wrote = node->WriteAttr(*attrName, *attrType, 0, *attrData, 
+		ssize_t wrote = node->WriteAttr(*attrName, *attrType, 0, *attrData,
 			*attrOSize);
 		if (wrote != static_cast<ssize_t>(*attrOSize)) {
 			parser_debug("Failed to write attribute %s %s\n", *attrName, strerror(wrote));
@@ -391,7 +375,7 @@
 
 
 status_t
-PackageItem::ParseData(uint8 *buffer, BFile *file, uint64 originalSize, 
+PackageItem::ParseData(uint8 *buffer, BFile *file, uint64 originalSize,
 	bool *done)
 {
 	status_t ret = B_OK;
@@ -400,11 +384,11 @@
 		parser_debug(" Found file data.\n");
 		uint64 compressed, original;
 		fPackage->Read(&compressed, 8);
-		swap_data(B_UINT64_TYPE, &compressed, sizeof(uint64), 
+		swap_data(B_UINT64_TYPE, &compressed, sizeof(uint64),
 				B_SWAP_BENDIAN_TO_HOST);
 
 		fPackage->Read(&original, 8);
-		swap_data(B_UINT64_TYPE, &original, sizeof(uint64), 
+		swap_data(B_UINT64_TYPE, &original, sizeof(uint64),
 				B_SWAP_BENDIAN_TO_HOST);
 		parser_debug(" Still good... (%llu : %llu)\n", original,
 				originalSize);
@@ -446,25 +430,28 @@
 
 PackageDirectory::PackageDirectory(BFile *parent, const BString &path,
 		uint8 type, uint32 ctime, uint32 mtime, uint64 offset, uint64 size)
-	: PackageItem(parent, path, type, ctime, mtime, offset, size)
+	:
+	PackageItem(parent, path, type, ctime, mtime, offset, size)
 {
 }
 
 
 status_t
-PackageDirectory::WriteToPath(const char *path, BPath *final)
+PackageDirectory::WriteToPath(const char *path, ItemState *state)
 {
-	BPath destination;
+	BPath &destination = state->destination;
 	status_t ret;
 	parser_debug("Directory: %s WriteToPath() called!\n", fPath.String());
 
 	ret = InitPath(path, &destination);
+	parser_debug("Ret: %d %s\n", ret, strerror(ret));
 	if (ret != B_OK)
 		return ret;
 
 	// Since Haiku is single-user right now, we give the newly
 	// created directory default permissions
 	ret = create_directory(destination.Path(), kDefaultMode);
+	parser_debug("Create dir ret: %d %s\n", ret, strerror(ret));
 	if (ret != B_OK)
 		return ret;
 	BDirectory dir(destination.Path());
@@ -472,7 +459,7 @@
 
 	if (fCreationTime)
 		dir.SetCreationTime(static_cast<time_t>(fCreationTime));
-	
+
 	if (fModificationTime)
 		dir.SetModificationTime(static_cast<time_t>(fModificationTime));
 
@@ -480,10 +467,8 @@
 	// we can check here whether it is necessary to continue
 	if (fOffset)
 		ret = HandleAttributes(&destination, &dir, "FoDa");
-	
-	if (final)
-		*final = destination;
 
+	parser_debug("Ret: %d %s\n", ret, strerror(ret));
 	return ret;
 }
 
@@ -502,7 +487,8 @@
 		uint32 ctime, uint32 mtime, uint64 offset, uint64 size,
 		uint64 originalSize, uint32 platform, const BString &mime,
 		const BString &signature, uint32 mode)
-	: PackageItem(parent, path, type, ctime, mtime, offset, size),
+	:
+	PackageItem(parent, path, type, ctime, mtime, offset, size),
 	fOriginalSize(originalSize),
 	fPlatform(platform),
 	fMode(mode),
@@ -513,43 +499,55 @@
 
 
 status_t
-PackageFile::WriteToPath(const char *path, BPath *final)
+PackageFile::WriteToPath(const char *path, ItemState *state)
 {
-	BPath destination;
-	status_t ret;
+	if (state == NULL)
+		return B_ERROR;
+
+	BPath &destination = state->destination;
+	status_t ret = B_OK;
 	parser_debug("File: %s WriteToPath() called!\n", fPath.String());
 
-	ret = InitPath(path, &destination);
-	if (ret != B_OK)
-		return ret;
+	BFile file;
+	if (state->status == B_NO_INIT || destination.InitCheck() != B_OK) {
+		ret = InitPath(path, &destination);
+		if (ret != B_OK)
+			return ret;
 
-	BFile file(destination.Path(),
-		B_WRITE_ONLY | B_CREATE_FILE | B_FAIL_IF_EXISTS);
-	ret = file.InitCheck();
-	if (ret == B_FILE_EXISTS) {
-		int32 selection = ItemExists(destination.Leaf());
-		switch (selection) {
-			case 0:
+		ret = file.SetTo(destination.Path(),
+			B_WRITE_ONLY | B_CREATE_FILE | B_FAIL_IF_EXISTS);
+		if (ret == B_ENTRY_NOT_FOUND) {
+			BPath directory;
+			destination.GetParent(&directory);
+			if (create_directory(directory.Path(), kDefaultMode) != B_OK)
+				return B_ERROR;
+
+			ret = file.SetTo(destination.Path(), B_WRITE_ONLY | B_CREATE_FILE);
+		} else if (ret == B_FILE_EXISTS)
+			state->status = B_FILE_EXISTS;
+
+		if (ret != B_OK)
+			return ret;
+	}
+
+	if (state->status == B_FILE_EXISTS) {
+		switch (state->policy) {
+			case P_EXISTS_OVERWRITE:
 				ret = file.SetTo(destination.Path(),
 					B_WRITE_ONLY | B_ERASE_FILE);
-				if (ret != B_OK)
-					return ret;
 				break;
-			case 1:
+
+			case P_EXISTS_NONE:
+			case P_EXISTS_ASK:
+				ret = B_FILE_EXISTS;
+				break;
+
+			case P_EXISTS_SKIP:
 				return B_OK;
-			default:
-				return B_FILE_EXISTS;
 		}
-	} else if (ret == B_ENTRY_NOT_FOUND) {
-		BPath directory;
-		destination.GetParent(&directory);
-		if (create_directory(directory.Path(), kDefaultMode) != B_OK)
-			return B_ERROR;
+	}
 
-		ret = file.SetTo(destination.Path(), B_WRITE_ONLY | B_CREATE_FILE);
-		if (ret != B_OK)
-			return ret;
-	} else if (ret != B_OK)
+	if (ret != B_OK)
 		return ret;
 
 	parser_debug(" File created!\n");
@@ -563,7 +561,7 @@
 
 	if (ret != B_OK)
 		return ret;
-	
+
 	// Set the mimetype and application signature if present
 	BNodeInfo info(&file);
 	if (fMimeType.Length() > 0) {
@@ -600,7 +598,7 @@
 		uint64 attrCSize = 0, attrOSize = 0;
 		uint32 attrType = 0; // type_code type
 		bool attrStarted = false, done = false;
-		
+
 		uint8 section = P_ATTRIBUTE;
 
 		while (fPackage->Read(buffer, 7) == 7) {
@@ -637,9 +635,6 @@
 		delete[] temp;
 	}
 
-	if (final)
-		*final = destination;
-
 	return ret;
 }
 
@@ -657,7 +652,8 @@
 PackageLink::PackageLink(BFile *parent, const BString &path,
 		const BString &link, uint8 type, uint32 ctime, uint32 mtime,
 		uint32 mode, uint64 offset, uint64 size)
-	: PackageItem(parent, path, type, ctime, mtime, offset, size),
+	:
+	PackageItem(parent, path, type, ctime, mtime, offset, size),
 	fMode(mode),
 	fLink(link)
 {
@@ -665,73 +661,88 @@
 
 
 status_t
-PackageLink::WriteToPath(const char *path, BPath *final)
+PackageLink::WriteToPath(const char *path, ItemState *state)
 {
+	if (state == NULL)
+		return B_ERROR;
+
+	status_t ret = B_OK;
+	BSymLink symlink;
 	parser_debug("Symlink: %s WriteToPath() called!\n", fPath.String());
 
-	BPath destination;
-	status_t ret = InitPath(path, &destination);
-	if (ret != B_OK)
-		return ret;
+	BPath &destination = state->destination;
+	BDirectory *dir = &state->parent;
 
-	BString linkName(destination.Leaf());
-	parser_debug("%s:%s:%s\n", fPath.String(), destination.Path(),
-		linkName.String());
+	if (state->status == B_NO_INIT || destination.InitCheck() != B_OK
+		|| dir->InitCheck() != B_OK) {
+		// Not yet initialized
+		ret = InitPath(path, &destination);
+		if (ret != B_OK)
+			return ret;
 
-	BPath dirPath;
-	ret = destination.GetParent(&dirPath);
-	BDirectory dir(dirPath.Path());
+		BString linkName(destination.Leaf());
+		parser_debug("%s:%s:%s\n", fPath.String(), destination.Path(),
+			linkName.String());
 
-	ret = dir.InitCheck();
-	if (ret == B_ENTRY_NOT_FOUND) {
-		if ((ret = create_directory(dirPath.Path(), kDefaultMode)) != B_OK) {
-			parser_debug("create_directory()) failed\n");
-			return B_ERROR;
+		BPath dirPath;
+		ret = destination.GetParent(&dirPath);
+		ret = dir->SetTo(dirPath.Path());
+
+		if (ret == B_ENTRY_NOT_FOUND) {
+			ret = create_directory(dirPath.Path(), kDefaultMode);
+			if (ret != B_OK) {
+				parser_debug("create_directory()) failed\n");
+				return B_ERROR;
+			}
 		}
+		if (ret != B_OK) {
+			parser_debug("destination InitCheck failed %s for %s\n",
+				strerror(ret), dirPath.Path());
+			return ret;
+		}
+
+		ret = dir->CreateSymLink(destination.Path(), fLink.String(), &symlink);
+		if (ret == B_FILE_EXISTS) {
+			// We need to check if the existing symlink is pointing at the same path
+			// as our new one - if not, let's prompt the user
+			symlink.SetTo(destination.Path());
+			BPath oldLink;
+
+			ret = symlink.MakeLinkedPath(dir, &oldLink);
+			chdir(dirPath.Path());
+
+			if (ret == B_BAD_VALUE || oldLink != fLink.String())
+				state->status = ret = B_FILE_EXISTS;
+			else
+				ret = B_OK;
+		}
 	}
-	if (ret != B_OK) {
-		parser_debug("destination InitCheck failed %s for %s\n", strerror(ret), dirPath.Path());
-		return ret;
-	}
 
-	BSymLink symlink;
-	ret = dir.CreateSymLink(destination.Path(), fLink.String(), &symlink);
-	if (ret == B_FILE_EXISTS) {
-		// We need to check if the existing symlink is pointing at the same path
-		// as our new one - if not, let's prompt the user
-		symlink.SetTo(destination.Path());
-		BPath oldLink;
+	if (state->status == B_FILE_EXISTS) {
+		switch (state->policy) {
+			case P_EXISTS_OVERWRITE:
+			{
+				BEntry entry;
+				ret = entry.SetTo(destination.Path());
+				if (ret != B_OK)
+					return ret;
 
-		ret = symlink.MakeLinkedPath(&dir, &oldLink);
-		chdir(dirPath.Path());
+				entry.Remove();
+				ret = dir->CreateSymLink(destination.Path(), fLink.String(),
+					&symlink);
+				break;
+			}
 
-		if (ret == B_BAD_VALUE || oldLink != fLink.String()) {
-			// The old symlink is different (or not a symlink) - ask the user
-			int32 selection = ItemExists(destination.Leaf());
-			switch (selection) {
-				case 0:
-				{
-					symlink.Unset();
-					BEntry entry;
-					ret = entry.SetTo(destination.Path());
-					if (ret != B_OK)
-						return ret;
+			case P_EXISTS_NONE:
+			case P_EXISTS_ASK:
+				ret = B_FILE_EXISTS;
+				break;
 
-					entry.Remove();
-					ret = dir.CreateSymLink(destination.Path(), fLink.String(),
-						&symlink);
-					break;
-				}
-				case 1:
-					parser_debug("Skipping already existent SymLink\n");
-					return B_OK;
-				default:
-					ret = B_FILE_EXISTS;
-			}
-		} else {
-			ret = B_OK;
+			case P_EXISTS_SKIP:
+				return B_OK;
 		}
 	}
+
 	if (ret != B_OK) {
 		parser_debug("CreateSymLink failed\n");
 		return ret;
@@ -743,7 +754,7 @@
 
 	if (fCreationTime && ret == B_OK)
 		ret = symlink.SetCreationTime(static_cast<time_t>(fCreationTime));
-	
+
 	if (fModificationTime && ret == B_OK) {
 		ret = symlink.SetModificationTime(static_cast<time_t>(
 			fModificationTime));
@@ -759,10 +770,6 @@
 		ret = HandleAttributes(&destination, &symlink, "LnDa");
 	}
 
-	if (final) {
-		*final = destination;
-	}
-
 	return ret;
 }
 

Modified: haiku/trunk/src/apps/packageinstaller/PackageItem.h
===================================================================
--- haiku/trunk/src/apps/packageinstaller/PackageItem.h	2009-08-06 13:09:30 UTC (rev 32160)
+++ haiku/trunk/src/apps/packageinstaller/PackageItem.h	2009-08-06 15:00:52 UTC (rev 32161)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Haiku, Inc.
+ * Copyright 2007-2009, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
  * Author:
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 
+#include <Directory.h>
 #include <Entry.h>
 #include <File.h>
 #include <Path.h>
@@ -32,10 +33,38 @@
 	P_USER_PATH
 };
 
+// Existing item overwriting policy of a single file
+enum {
+	P_EXISTS_ASK = 0,
+	P_EXISTS_OVERWRITE,
+	P_EXISTS_SKIP,
+	P_EXISTS_ABORT,
+	P_EXISTS_NONE
+};
+
 extern status_t inflate_data(uint8* in, uint32 inSize, uint8* out,
 	uint32 outSize);
 
 
+struct ItemState {
+	ItemState() : policy(P_EXISTS_NONE), status(B_NO_INIT) {}
+	~ItemState() {}
+
+	inline void Reset(int32 currentPolicy)
+	{
+		destination.Unset();
+		parent.Unset();
+		status = B_NO_INIT;
+		policy = currentPolicy;
+	}
+
+	BPath		destination;
+	BDirectory	parent;
+	uint8		policy;
+	status_t	status;
+};
+
+
 class PackageItem {
 public:
 							PackageItem(BFile* parent, const BString& path,
@@ -44,16 +73,15 @@
 	virtual					~PackageItem();
 
 	virtual	status_t		WriteToPath(const char* path = NULL,
-								BPath* final = NULL) = 0;
+								ItemState *state = NULL) = 0;
 	virtual	void			SetTo(BFile* parent, const BString& path,
 								uint8 type, uint32 ctime, uint32 mtime,
 								uint64 offset = 0, uint64 size = 0);
+	virtual	const char*		ItemKind() = 0;
 
 protected:
-	virtual	const char*		ItemKind() = 0;
-			int32			ItemExists(const char* name);
 			status_t		InitPath(const char* path, BPath* destination);
-			status_t		HandleAttributes(BPath* destination, BNode* node, 
+			status_t		HandleAttributes(BPath* destination, BNode* node,
 								const char* header);
 
 			status_t		ParseAttribute(uint8* buffer, BNode* node,
@@ -84,9 +112,7 @@
 								uint64 offset = 0, uint64 size = 0);
 
 	virtual	status_t		WriteToPath(const char* path = NULL,
-								BPath* final = NULL);
-
-protected:
+								ItemState *state = NULL);
 	virtual	const char*		ItemKind();
 };
 
@@ -100,16 +126,14 @@
 								const BString& signature, uint32 mode);
 
 	virtual	status_t		WriteToPath(const char* path = NULL,
-								BPath* final = NULL);
-
-protected:
+								ItemState *state = NULL);
 	virtual	const char*		ItemKind();
 
 private:
 			uint64			fOriginalSize;
 			uint32			fPlatform;
 			uint32			fMode;
-		
+
 			BString			fMimeType;
 			BString			fSignature;
 };
@@ -119,13 +143,11 @@
 public:
 							PackageLink(BFile* parent, const BString& path,
 								const BString& link, uint8 type,  uint32 ctime,
-								uint32 mtime, uint32 mode, uint64 offset = 0, 
+								uint32 mtime, uint32 mode, uint64 offset = 0,
 								uint64 size = 0);
 
 	virtual	status_t		WriteToPath(const char* path = NULL,
-								BPath* final = NULL);
-
-protected:
+								ItemState *state = NULL);
 	virtual	const char*		ItemKind();
 
 private:

Modified: haiku/trunk/src/apps/packageinstaller/PackageView.cpp
===================================================================
--- haiku/trunk/src/apps/packageinstaller/PackageView.cpp	2009-08-06 13:09:30 UTC (rev 32160)
+++ haiku/trunk/src/apps/packageinstaller/PackageView.cpp	2009-08-06 15:00:52 UTC (rev 32161)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Haiku, Inc.
+ * Copyright 2007-2009, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
  * Author:
@@ -69,7 +69,7 @@
 
 	// Check whether the package has been successfuly parsed
 	status_t ret = fInfo.InitCheck();
-	if (ret == B_OK) 
+	if (ret == B_OK)
 		_InitProfiles();
 
 	ResizeTo(Bounds().Width(), fInstall->Frame().bottom + 4);
@@ -129,7 +129,7 @@
 			PackageImageViewer *imageViewer = new PackageImageViewer(image);
 			imageViewer->Go();
 		}
-	
+
 		// Show the disclaimer/info text popup, if present
 		BString disclaimer = fInfo.GetDisclaimer();
 		if (disclaimer.Length() != 0) {
@@ -175,14 +175,14 @@
 				notify = new BAlert("installation_failed", // TODO: Review this
 					T("The requested package failed to install on your system. This "
 						"might be a problem with the target package file. Please consult "
-						"this issue with the package distributor."), T("OK"), NULL, 
+						"this issue with the package distributor."), T("OK"), NULL,
 					NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
 				fprintf(stderr, "Error while installing the package : %s\n", strerror(ret));
 			}
 			notify->Go();
 			fStatusWindow->Hide();
 			fInstall->SetEnabled(true);
-			
+
 			break;
 		}
 		case P_MSG_PATH_CHANGED:
@@ -196,7 +196,7 @@
 		case P_MSG_OPEN_PANEL:
 			fOpenPanel->Show();
 			break;
-		case P_MSG_GROUP_CHANGED: 
+		case P_MSG_GROUP_CHANGED:
 		{
 			int32 index;
 			if (msg->FindInt32("index", &index) == B_OK) {
@@ -267,7 +267,7 @@
 			T("The given package seems to be already installed on your system. "
 				"Would you like to uninstall the existing one and continue the "
 				"installation?"), T("Yes"), T("No"));
-		
+
 		if (reinstall->Go() == 0) {
 			// Uninstall the package
 			err = packageInfo.Uninstall();
@@ -305,10 +305,11 @@
 
 	// Install files and directories
 	PackageItem *iter;
-	BPath installedTo;
+	ItemState state;
 	uint32 i;
+	int32 choice;
 	BString label;
-	
+
 	packageInfo.SetName(fInfo.GetName());
 	// TODO: Here's a small problem, since right now it's not quite sure
 	//		which description is really used as such. The one displayed on
@@ -322,20 +323,35 @@
 	packageInfo.SetDescription(description.String());
 	packageInfo.SetSpaceNeeded(type->space_needed);
 
+	fItemExistsPolicy = P_EXISTS_NONE;
+
 	for (i = 0; i < n; i++) {
+		state.Reset(fItemExistsPolicy); // Reset the current item state
 		iter = static_cast<PackageItem *>(type->items.ItemAt(i));
-		err = iter->WriteToPath(fCurrentPath.Path(), &installedTo);
+
+		err = iter->WriteToPath(fCurrentPath.Path(), &state);
+		if (err == B_FILE_EXISTS) {
+			// Writing to path failed because path already exists - ask the user
+			// what to do and retry the writing process
+			choice = _ItemExists(*iter, state.destination);
+			if (choice != P_EXISTS_ABORT) {
+				state.policy = choice;
+				err = iter->WriteToPath(fCurrentPath.Path(), &state);
+			}
+		}
+
 		if (err != B_OK) {
 			fprintf(stderr, "Error while writing path %s\n", fCurrentPath.Path());
 			return err;
 		}
+
 		if (fStatusWindow->Stopped())
 			return B_FILE_EXISTS;
 		label = "";
 		label << (uint32)(i + 1) << " of " << (uint32)n;
 		fStatusWindow->StageStep(1, NULL, label.String());
 
-		packageInfo.AddItem(installedTo.Path());
+		packageInfo.AddItem(state.destination.Path());
 	}
 
 	fStatusWindow->StageStep(1, "Finishing installation", "");
@@ -355,7 +371,7 @@
 PackageView::_InitView()
 {
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-	
+
 	BTextView *description = new BTextView(BRect(0, 0, 20, 20), "description",
 		BRect(4, 4, 16, 16), B_FOLLOW_NONE, B_WILL_DRAW);
 	description->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -370,15 +386,15 @@
 	installType->SetAlignment(B_ALIGN_RIGHT);
 	installType->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_MIDDLE));
 
-	fInstallDesc = new BTextView(BRect(0, 0, 10, 10), "install_desc", 
+	fInstallDesc = new BTextView(BRect(0, 0, 10, 10), "install_desc",
 		BRect(2, 2, 8, 8), B_FOLLOW_NONE, B_WILL_DRAW);
 	fInstallDesc->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	fInstallDesc->MakeEditable(false);
 	fInstallDesc->MakeSelectable(false);
 	fInstallDesc->SetText(T("No installation type selected"));
 	fInstallDesc->TextHeight(0, fInstallDesc->TextLength());
-	
-	fInstall = new BButton("install_button", T("Install"), 
+
+	fInstall = new BButton("install_button", T("Install"),
 			new BMessage(P_MSG_INSTALL));
 
 	BView *installField = BGroupLayoutBuilder(B_VERTICAL, 5.0f)
@@ -400,7 +416,7 @@
 		.End();
 
 	AddChild(root);
-	
+
 	fInstall->MakeDefault(true);
 }*/
 
@@ -409,7 +425,7 @@
 PackageView::_InitView()
 {
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-	
+
 	BRect rect = Bounds();
 	BTextView *description = new BTextView(rect, "description",
 		rect.InsetByCopy(5, 5), B_FOLLOW_NONE, B_WILL_DRAW);
@@ -424,7 +440,7 @@
 		description->ResizeTo(rect.Width() - B_V_SCROLL_BAR_WIDTH, kMaxDescHeight);
 		BScrollView *scroller = new BScrollView("desciption_view", description,
 				B_FOLLOW_NONE, B_WILL_DRAW | B_FRAME_EVENTS, false, true, B_NO_BORDER);
-		
+
 		AddChild(scroller);
 		rect = scroller->Frame();
 	}
@@ -433,24 +449,24 @@
 		AddChild(description);
 		rect = description->Frame();
 	}
-	
+
 	rect.top = rect.bottom + 2;
 	rect.bottom += 100;
 	BBox *installBox = new BBox(rect.InsetByCopy(2, 2), "install_box");
 
 	fInstallTypes = new BPopUpMenu("none");
-	
+
 	BMenuField *installType = new BMenuField(BRect(2, 2, 100, 50), "install_type",
 		T("Installation type:"), fInstallTypes, false);
 	installType->SetDivider(installType->StringWidth(installType->Label()) + 8);
 	installType->SetAlignment(B_ALIGN_RIGHT);
 	installType->ResizeToPreferred();
-	
+
 	installBox->AddChild(installType);
-	
+
 	rect = installBox->Bounds().InsetBySelf(4, 4);
 	rect.top = installType->Frame().bottom;
-	fInstallDesc = new BTextView(rect, "install_desc", 
+	fInstallDesc = new BTextView(rect, "install_desc",
 		BRect(2, 2, rect.Width() - 2, rect.Height() - 2), B_FOLLOW_NONE,
 		B_WILL_DRAW);
 	fInstallDesc->MakeEditable(false);
@@ -461,28 +477,28 @@
 	fInstallDesc->ResizeTo(rect.Width() - B_V_SCROLL_BAR_WIDTH, 60);
 	BScrollView *scroller = new BScrollView("desciption_view", fInstallDesc,
 				B_FOLLOW_NONE, B_WILL_DRAW | B_FRAME_EVENTS, false, true, B_NO_BORDER);
-	
+
 	installBox->ResizeTo(installBox->Bounds().Width(),
 		scroller->Frame().bottom + 10);
 
 	installBox->AddChild(scroller);
-	
+
 	AddChild(installBox);
-	
+
 	fDestination = new BPopUpMenu("none");
-	
+
 	rect = installBox->Frame();
 	rect.top = rect.bottom + 5;
 	rect.bottom += 35;
-	fDestField = new BMenuField(rect, "install_to", T("Install to:"), 
+	fDestField = new BMenuField(rect, "install_to", T("Install to:"),
 			fDestination, false);
 	fDestField->SetDivider(fDestField->StringWidth(fDestField->Label()) + 8);
 	fDestField->SetAlignment(B_ALIGN_RIGHT);
 	fDestField->ResizeToPreferred();
-	
+
 	AddChild(fDestField);
-	
-	fInstall = new BButton(rect, "install_button", T("Install"), 
+
+	fInstall = new BButton(rect, "install_button", T("Install"),
 			new BMessage(P_MSG_INSTALL));
 	fInstall->ResizeToPreferred();
 	AddChild(fInstall);
@@ -506,7 +522,7 @@
 		prof = fInfo.GetProfile(0);
 		convert_size(prof->space_needed, sizeString, 32);
 		name << prof->name << " (" << sizeString << ")";
-		
+
 		message = new BMessage(P_MSG_GROUP_CHANGED);
 		message->AddInt32("index", 0);
 		item = new BMenuItem(name.String(), message);
@@ -517,12 +533,12 @@
 
 	for (i = 1; i < num; i++) {
 		prof = fInfo.GetProfile(i);
-		
+
 		if (prof) {
 			convert_size(prof->space_needed, sizeString, 32);
 			name = prof->name;
 			name << " (" << sizeString << ")";
-		
+
 			message = new BMessage(P_MSG_GROUP_CHANGED);
 			message->AddInt32("index", i);
 			item = new BMenuItem(name.String(), message);
@@ -534,6 +550,68 @@
 }
 
 
+int32
+PackageView::_ItemExists(PackageItem &item, BPath &path)
+{
+	int32 choice = P_EXISTS_NONE;
+
+	switch (fItemExistsPolicy) {
+		case P_EXISTS_OVERWRITE:
+			choice = P_EXISTS_OVERWRITE;
+			break;
+
+		case P_EXISTS_SKIP:
+			choice = P_EXISTS_SKIP;
+			break;
+
+		case P_EXISTS_ASK:
+		case P_EXISTS_NONE:
+		{
+			BString alertString = T("The ");
+
+			alertString << item.ItemKind() << T(" named \'") << path.Leaf() << "\' ";
+			alertString << T("already exists in the given path. Should the "
+				"existing file be replaced with the one from this package?");
+
+			BAlert *alert = new BAlert(T("file_exists"), alertString.String(),
+				T("Yes"), T("No"), T("Abort"));
+
+			choice = alert->Go();
+			switch (choice) {
+				case 0:
+					choice = P_EXISTS_OVERWRITE;
+					break;
+				case 1:
+					choice = P_EXISTS_SKIP;
+					break;
+				default:
+					return P_EXISTS_ABORT;
+			}
+
+			if (fItemExistsPolicy == P_EXISTS_NONE) {
+				// TODO: Maybe add 'No, but ask again' type of choice as well?
+				alertString = T("Should this decision be remembered and all "
+					"existing files encountered in the future be ");
+				alertString << ((choice == P_EXISTS_OVERWRITE)
+					? T("replaced?") : T("skipped?"));
+
+				alert = new BAlert(T("policy_decision"), alertString.String(),
+					T("Yes"), T("No"));
+
+				int32 decision = alert->Go();
+				if (decision == 0)
+					fItemExistsPolicy = choice;
+				else
+					fItemExistsPolicy = P_EXISTS_ASK;
+			}
+			break;
+		}
+	}
+
+	return choice;
+}
+
+
 status_t
 PackageView::_GroupChanged(int32 index)
 {
@@ -559,7 +637,7 @@
 		BPath path;
 		BMessage *temp;
 		BVolume volume;
-			
+
 		if (prof->path_type == P_INSTALL_PATH) {
 			dev_t device;
 			BString name;
@@ -570,7 +648,7 @@
 				if (volume.SetTo(device) == B_OK && !volume.IsReadOnly()) {
 					temp = new BMessage(P_MSG_PATH_CHANGED);
 					temp->AddString("path", BString(path.Path()));
-				
+
 					convert_size(volume.FreeBytes(), sizeString, 32);
 					name = path.Path();
 					name << " (" << sizeString << " free)";

Modified: haiku/trunk/src/apps/packageinstaller/PackageView.h
===================================================================
--- haiku/trunk/src/apps/packageinstaller/PackageView.h	2009-08-06 13:09:30 UTC (rev 32160)
+++ haiku/trunk/src/apps/packageinstaller/PackageView.h	2009-08-06 15:00:52 UTC (rev 32161)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Haiku, Inc.

[... truncated: 28 lines follow ...]


From pulkomandy at mail.berlios.de  Thu Aug  6 17:18:50 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Thu, 6 Aug 2009 17:18:50 +0200
Subject: [Haiku-commits] r32162 -
	haiku/branches/components/gsoc-locale-kit/src/kits/locale
Message-ID: <200908061518.n76FIoHl007748@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-06 17:18:49 +0200 (Thu, 06 Aug 2009)
New Revision: 32162
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32162&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
Log:
Some more variable renaming.


Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-06 15:00:52 UTC (rev 32161)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-06 15:18:49 UTC (rev 32162)
@@ -77,8 +77,8 @@
 	UnicodeString uString;
 	fICULocale.getDisplayName(uString);
 	BString str;
-	BStringByteSink bbs(&str);
-	uString.toUTF8(bbs);
+	BStringByteSink stringConverter(&str);
+	uString.toUTF8(stringConverter);
 	return str.String();
 }
 
@@ -118,12 +118,12 @@
 		longFormat ? DateFormat::FULL : DateFormat::SHORT,
 		fICULocale);
 	UnicodeString ICUString;
-	ICUString = dateFormatter->format((UDate)time*1000, ICUString);
+	ICUString = dateFormatter->format((UDate)time * 1000, ICUString);
 
 	string->Truncate(0);
-	BStringByteSink bbs(string);
+	BStringByteSink stringConverter(string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 }
 
 
@@ -143,12 +143,12 @@
 		longFormat ? DateFormat::FULL : DateFormat::SHORT,
 		fICULocale);
 	UnicodeString ICUString;
-	ICUString = timeFormatter->format((UDate)time*1000, ICUString);
+	ICUString = timeFormatter->format((UDate)time * 1000, ICUString);
 
 	string->Truncate(0);
-	BStringByteSink bbs(string);
+	BStringByteSink stringConverter(string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 }
 
 
@@ -199,9 +199,9 @@
 	ICUString = numberFormatter->format(value, ICUString);
 
 	string->Truncate(0);
-	BStringByteSink bbs(string);
+	BStringByteSink stringConverter(string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 }
 
 
@@ -224,9 +224,9 @@
 	ICUString = numberFormatter->format((int32_t)value, ICUString);
 
 	string->Truncate(0);
-	BStringByteSink bbs(string);
+	BStringByteSink stringConverter(string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 }
 
 
@@ -252,9 +252,9 @@
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kDecimalSeparatorSymbol);
 
 	BString string;
-	BStringByteSink bbs(&string);
+	BStringByteSink stringConverter(&string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return string.String();
 }
@@ -279,9 +279,9 @@
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol);
 
 	BString string;
-	BStringByteSink bbs(&string);
+	BStringByteSink stringConverter(&string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return string.String();
 }
@@ -306,9 +306,9 @@
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kGroupingSeparatorSymbol);
 
 	BString string;
-	BStringByteSink bbs(&string);
+	BStringByteSink stringConverter(&string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return string.String();
 }
@@ -333,9 +333,9 @@
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kPlusSignSymbol);
 
 	BString string;
-	BStringByteSink bbs(&string);
+	BStringByteSink stringConverter(&string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return string.String();
 }
@@ -360,9 +360,9 @@
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kMinusSignSymbol);
 
 	BString string;
-	BStringByteSink bbs(&string);
+	BStringByteSink stringConverter(&string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return string.String();
 }
@@ -402,9 +402,9 @@
 	ICUString = numberFormatter->format(value, ICUString);
 
 	string->Truncate(0);
-	BStringByteSink bbs(string);
+	BStringByteSink stringConverter(string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return B_OK;
 }
@@ -429,9 +429,9 @@
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kCurrencySymbol);
 
 	BString string;
-	BStringByteSink bbs(&string);
+	BStringByteSink stringConverter(&string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return string.String();
 }
@@ -456,9 +456,9 @@
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kIntlCurrencySymbol);
 
 	BString string;
-	BStringByteSink bbs(&string);
+	BStringByteSink stringConverter(&string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return string.String();
 }
@@ -483,9 +483,9 @@
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kMonetarySeparatorSymbol);
 
 	BString string;
-	BStringByteSink bbs(&string);
+	BStringByteSink stringConverter(&string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return string.String();
 }
@@ -510,9 +510,9 @@
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol);
 
 	BString string;
-	BStringByteSink bbs(&string);
+	BStringByteSink stringConverter(&string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return string.String();
 }
@@ -538,9 +538,9 @@
 		DecimalFormatSymbols::kMonetaryGroupingSeparatorSymbol);
 
 	BString string;
-	BStringByteSink bbs(&string);
+	BStringByteSink stringConverter(&string);
 
-	ICUString.toUTF8(bbs);
+	ICUString.toUTF8(stringConverter);
 
 	return string.String();
 }



From pulkomandy at mail.berlios.de  Thu Aug  6 17:56:05 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Thu, 6 Aug 2009 17:56:05 +0200
Subject: [Haiku-commits] r32163 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale
Message-ID: <200908061556.n76Fu5Wg020471@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-06 17:56:04 +0200 (Thu, 06 Aug 2009)
New Revision: 32163
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32163&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleStrings.h
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
Log:
Added char* versions of the methods in BCountry and some more things for returning the format string for date & time.


Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-06 15:18:49 UTC (rev 32162)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-06 15:56:04 UTC (rev 32163)
@@ -61,8 +61,8 @@
 
 		// monetary
 
-		virtual ssize_t	FormatMonetary(char *string,size_t maxSize,char *format,
-			...);
+		virtual ssize_t	FormatMonetary(char *string, size_t maxSize,
+			double value);
 		virtual ssize_t	FormatMonetary(BString *string, double value);
 
 		const char		*CurrencySymbol() const;
@@ -72,9 +72,6 @@
 		const char		*MonGrouping() const;
 		virtual int32	MonFracDigits() const;
 
-	protected:
-		BCountry(const char **strings);
-
 	private:
 		const char	**fStrings;
 		Locale fICULocale;

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleStrings.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleStrings.h	2009-08-06 15:18:49 UTC (rev 32162)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleStrings.h	2009-08-06 15:56:04 UTC (rev 32163)
@@ -6,13 +6,9 @@
 	B_COUNTRY_STRINGS_BASE	= 0,
 
 	B_DATE_TIME_FORMAT		= B_COUNTRY_STRINGS_BASE,
-	B_DATE_FORMAT,
-	B_TIME_FORMAT,
 	B_TIME_AM_PM_FORMAT,
 
 	B_SHORT_DATE_TIME_FORMAT,
-	B_SHORT_DATE_FORMAT,
-	B_SHORT_TIME_FORMAT,
 	B_SHORT_TIME_AM_PM_FORMAT,
 
 	B_AM_STRING,

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-06 15:18:49 UTC (rev 32162)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-06 15:56:04 UTC (rev 32163)
@@ -14,6 +14,7 @@
 #include <unicode/dcfmtsym.h>
 #include <unicode/decimfmt.h>
 #include <unicode/dtfmtsym.h>
+#include <unicode/smpdtfmt.h>
 #include <ICUWrapper.h>
 
 #include <monetary.h>
@@ -24,13 +25,9 @@
 	// date/time format
 	"",
 	"",
-	"",
-	"",
 	// short date/time format
 	"",
 	"",
-	"",
-	"",
 	// am/pm string
 	"AM",
 	"PM",
@@ -58,14 +55,6 @@
 }
 
 
-// TODO should not exist
-BCountry::BCountry(const char **strings)
-	:
-	fStrings(strings)
-{
-}
-
-
 BCountry::~BCountry()
 {
 }
@@ -104,7 +93,9 @@
 void 
 BCountry::FormatDate(char *string, size_t maxSize, time_t time, bool longFormat)
 {
-	// ToDo: implement us
+	BString fullString;
+	FormatDate(&fullString, time, longFormat);
+	strncpy(string, fullString.String(), maxSize);
 }
 
 
@@ -130,6 +121,9 @@
 void 
 BCountry::FormatTime(char *string, size_t maxSize, time_t time, bool longFormat)
 {
+	BString fullString;
+	FormatTime(&fullString, time, longFormat);
+	strncpy(string, fullString.String(), maxSize);
 }
 
 
@@ -155,17 +149,50 @@
 const char *
 BCountry::DateFormat(bool longFormat) const
 {
-	return fStrings[longFormat ? B_DATE_FORMAT : B_SHORT_DATE_FORMAT];
+	icu_4_2::DateFormat* dateFormatter;
+   	dateFormatter = DateFormat::createDateInstance(
+		longFormat ? DateFormat::FULL : DateFormat::SHORT,
+		fICULocale);
+	SimpleDateFormat* dateFormatterImpl =
+		static_cast<SimpleDateFormat*>(dateFormatter);
+
+	UnicodeString ICUString;
+	ICUString = dateFormatterImpl->toPattern(ICUString);
+
+	BString string;
+	BStringByteSink stringConverter(&string);
+
+	ICUString.toUTF8(stringConverter);
+
+	return string.String();
 }
 
 
 const char *
 BCountry::TimeFormat(bool longFormat) const
 {
-	return fStrings[longFormat ? B_TIME_FORMAT : B_SHORT_TIME_FORMAT];
+	icu_4_2::DateFormat* dateFormatter;
+   	dateFormatter = DateFormat::createTimeInstance(
+		longFormat ? DateFormat::FULL : DateFormat::SHORT,
+		fICULocale);
+	SimpleDateFormat* dateFormatterImpl =
+		static_cast<SimpleDateFormat*>(dateFormatter);
+
+	UnicodeString ICUString;
+	ICUString = dateFormatterImpl->toPattern(ICUString);
+
+	BString string;
+	BStringByteSink stringConverter(&string);
+
+	ICUString.toUTF8(stringConverter);
+
+	return string.String();
 }
 
 
+// TODO find how to get it from ICU (setting it is ok, we use the pattern-string
+// for that)
+// Or remove this function ?
 const char *
 BCountry::DateSeparator() const
 {
@@ -183,6 +210,9 @@
 void 
 BCountry::FormatNumber(char *string, size_t maxSize, double value)
 {
+	BString fullString;
+	FormatNumber(&fullString, value);
+	strncpy(string, fullString.String(), maxSize);
 }
 
 
@@ -208,6 +238,9 @@
 void 
 BCountry::FormatNumber(char *string, size_t maxSize, int32 value)
 {
+	BString fullString;
+	FormatNumber(&fullString, value);
+	strncpy(string, fullString.String(), maxSize);
 }
 
 
@@ -368,6 +401,7 @@
 }
 
 
+// TODO does ICU even support this ? Is it in the keywords ?
 int8 
 BCountry::Measurement() const
 {
@@ -376,16 +410,11 @@
 
 
 ssize_t
-BCountry::FormatMonetary(char *string, size_t maxSize, char *format, ...)
+BCountry::FormatMonetary(char *string, size_t maxSize, double value)
 {
-	va_list args;
-	va_start(args,format);
-
-	ssize_t status = vstrfmon(string, maxSize, format, args);
-
-	va_end(args);
-
-	return status;
+	BString fullString;
+	FormatMonetary(&fullString, value);
+	strncpy(string, fullString.String(), maxSize);
 }
 
 
@@ -546,6 +575,7 @@
 }
 
 
+// TODO: is this possible to get from ICU ?
 int32 
 BCountry::MonFracDigits() const
 {



From mmu_man at mail.berlios.de  Thu Aug  6 18:04:21 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 6 Aug 2009 18:04:21 +0200
Subject: [Haiku-commits] r32164 - haiku/trunk/src/bin/network/mount_nfs
Message-ID: <200908061604.n76G4L7q023930@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-06 18:04:20 +0200 (Thu, 06 Aug 2009)
New Revision: 32164
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32164&view=rev

Modified:
   haiku/trunk/src/bin/network/mount_nfs/mount_nfs.cpp
Log:
Better give the good len.


Modified: haiku/trunk/src/bin/network/mount_nfs/mount_nfs.cpp
===================================================================
--- haiku/trunk/src/bin/network/mount_nfs/mount_nfs.cpp	2009-08-06 15:56:04 UTC (rev 32163)
+++ haiku/trunk/src/bin/network/mount_nfs/mount_nfs.cpp	2009-08-06 16:04:20 UTC (rev 32164)
@@ -105,7 +105,7 @@
 		params.gid,
 		params.hostname);
 		
-	int result=mount ("nfs",argv[2],NULL,0,buf,sizeof(params));
+	int result=mount ("nfs",argv[2],NULL,0,buf,strlen(buf));
 	//int result=mount ("nfs",argv[2],NULL,0,&params,sizeof(params));
 
 	delete[] server;



From mmu_man at mail.berlios.de  Thu Aug  6 18:36:42 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Thu, 6 Aug 2009 18:36:42 +0200
Subject: [Haiku-commits] r32165 - haiku/trunk/src/add-ons/media/media-add-ons
Message-ID: <200908061636.n76Gag5J008411@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-06 18:36:32 +0200 (Thu, 06 Aug 2009)
New Revision: 32165
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32165&view=rev

Modified:
   haiku/trunk/src/add-ons/media/media-add-ons/Jamfile
Log:
Alpha sort.


Modified: haiku/trunk/src/add-ons/media/media-add-ons/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/Jamfile	2009-08-06 16:04:20 UTC (rev 32164)
+++ haiku/trunk/src/add-ons/media/media-add-ons/Jamfile	2009-08-06 16:36:32 UTC (rev 32165)
@@ -4,6 +4,7 @@
 # SubInclude HAIKU_TOP src add-ons media media-add-ons writer ;
 SubInclude HAIKU_TOP src add-ons media media-add-ons dvb ;
 SubInclude HAIKU_TOP src add-ons media media-add-ons esound_sink ;
+SubInclude HAIKU_TOP src add-ons media media-add-ons firewire_dv ;
 SubInclude HAIKU_TOP src add-ons media media-add-ons legacy ;
 SubInclude HAIKU_TOP src add-ons media media-add-ons mixer ;
 SubInclude HAIKU_TOP src add-ons media media-add-ons multi_audio ;
@@ -15,5 +16,4 @@
 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 ;
-SubInclude HAIKU_TOP src add-ons media media-add-ons firewire_dv ;
 



From jackburton at mail.berlios.de  Thu Aug  6 19:05:45 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Thu, 6 Aug 2009 19:05:45 +0200
Subject: [Haiku-commits] r32166 -
	haiku/trunk/src/add-ons/translators/jpeg2000
Message-ID: <200908061705.n76H5j3I013759@sheep.berlios.de>

Author: jackburton
Date: 2009-08-06 19:05:42 +0200 (Thu, 06 Aug 2009)
New Revision: 32166
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32166&view=rev

Modified:
   haiku/trunk/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
   haiku/trunk/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
Log:
Applied the logic in r31871 to jpeg2000 translator too. Fixes bug #4139.
Also cleaned up.


Modified: haiku/trunk/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
===================================================================
--- haiku/trunk/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp	2009-08-06 16:36:32 UTC (rev 32165)
+++ haiku/trunk/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp	2009-08-06 17:05:42 UTC (rev 32166)
@@ -81,9 +81,7 @@
 	{},
 };
 
-bool gAreSettingsRunning = false;
 
-
 //!	Make settings to defaults
 void
 LoadDefaultSettings(jpeg_settings *settings)
@@ -569,12 +567,9 @@
 //	#pragma mark - SView
 
 
-SView::SView(const char *name, float x, float y)
-	: BView(BRect(x, y, x, y), name, B_FOLLOW_NONE, B_WILL_DRAW)
+SView::SView(BRect frame, const char *name)
+	: BView(frame, name, B_FOLLOW_NONE, B_WILL_DRAW)
 {
-	fPreferredWidth = 0;
-	fPreferredHeight = 0;
-
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	SetLowColor(ViewColor());
 
@@ -583,44 +578,13 @@
 
 
 void
-SView::GetPreferredSize(float* _width, float* _height)
+SView::AttachedToWindow()
 {
-	if (_width)
-		*_width = fPreferredWidth;
-	if (_height)
-		*_height = fPreferredHeight;
+	BView::AttachedToWindow();
+	ResizeTo(Parent()->Bounds().Width(), Parent()->Bounds().Height());
 }
 
 
-void
-SView::ResizeToPreferred()
-{
-	ResizeTo(fPreferredWidth, fPreferredHeight);
-}
-
-
-void
-SView::ResizePreferredBy(float width, float height)
-{
-	fPreferredWidth += width;
-	fPreferredHeight += height;
-}
-
-
-void
-SView::AddChild(BView *child, BView *before)
-{
-	BView::AddChild(child, before);
-	child->ResizeToPreferred();
-	BRect frame = child->Frame();
-
-	if (frame.right > fPreferredWidth)
-		fPreferredWidth = frame.right;
-	if (frame.bottom > fPreferredHeight)
-		fPreferredHeight = frame.bottom;
-}
-
-
 //	#pragma mark -
 
 
@@ -662,27 +626,26 @@
 //	#pragma mark -
 
 
-TranslatorReadView::TranslatorReadView(const char *name, jpeg_settings *settings,
-		float x, float y)
-	: SView(name, x, y),
+TranslatorReadView::TranslatorReadView(BRect frame, const char *name,
+	jpeg_settings *settings)
+	: SView(frame, name),
 	fSettings(settings)
 {
-	fGrayAsRGB32 = new BCheckBox(BRect(10, GetPreferredHeight(), 10,
-		GetPreferredHeight()), "grayasrgb32", VIEW_LABEL_GRAYASRGB32,
-		new BMessage(VIEW_MSG_SET_GRAYASRGB32));
+	fGrayAsRGB32 = new BCheckBox(BRect(10, 10, 40, 40), "grayasrgb32",
+		VIEW_LABEL_GRAYASRGB32, new BMessage(VIEW_MSG_SET_GRAYASRGB32));
 	fGrayAsRGB32->SetFont(be_plain_font);
 	if (fSettings->B_GRAY8_as_B_RGB32)
 		fGrayAsRGB32->SetValue(1);
 
 	AddChild(fGrayAsRGB32);
-
-	ResizeToPreferred();
+	fGrayAsRGB32->ResizeToPreferred();
 }
 
 
 void
 TranslatorReadView::AttachedToWindow()
 {
+	SView::AttachedToWindow();
 	fGrayAsRGB32->SetTarget(this);
 }
 
@@ -710,46 +673,53 @@
 //	#pragma mark - TranslatorWriteView
 
 
-TranslatorWriteView::TranslatorWriteView(const char *name, jpeg_settings *settings,
-		float x, float y)
-	: SView(name, x, y),
+TranslatorWriteView::TranslatorWriteView(BRect frame, const char *name,
+	jpeg_settings *settings)
+	: SView(frame, name),
 	fSettings(settings)
 {
-	fQualitySlider = new SSlider(BRect(10, GetPreferredHeight(), 10,
-		GetPreferredHeight()), "quality", VIEW_LABEL_QUALITY,
-		new BMessage(VIEW_MSG_SET_QUALITY), 0, 100);
+	BRect rect(10, 10, 10, 40);
+	fQualitySlider = new SSlider(rect, "quality",
+		VIEW_LABEL_QUALITY, new BMessage(VIEW_MSG_SET_QUALITY), 0, 100);
 	fQualitySlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
 	fQualitySlider->SetHashMarkCount(10);
 	fQualitySlider->SetLimitLabels("Low", "High");
 	fQualitySlider->SetFont(be_plain_font);
 	fQualitySlider->SetValue(fSettings->Quality);
 	AddChild(fQualitySlider);
+	fQualitySlider->ResizeToPreferred();
 
-	fGrayAsRGB24 = new BCheckBox(BRect(10, GetPreferredHeight() + 5, 25,
-		GetPreferredHeight() + 5), "gray1asrgb24", VIEW_LABEL_GRAY1ASRGB24,
+	rect.OffsetBy(0, fQualitySlider->Bounds().Height() + 10);
+
+	fGrayAsRGB24 = new BCheckBox(rect, "gray1asrgb24",
+		VIEW_LABEL_GRAY1ASRGB24,
 		new BMessage(VIEW_MSG_SET_GRAY1ASRGB24));
 	fGrayAsRGB24->SetFont(be_plain_font);
 	if (fSettings->B_GRAY1_as_B_RGB24)
 		fGrayAsRGB24->SetValue(1);
 
 	AddChild(fGrayAsRGB24);
+	fGrayAsRGB24->ResizeToPreferred();
 
-	fCodeStreamOnly = new BCheckBox(BRect(10, GetPreferredHeight() + 5, 10,
-		GetPreferredHeight()), "codestreamonly", VIEW_LABEL_JPC,
-		new BMessage(VIEW_MSG_SET_JPC));
+	rect.OffsetBy(0, fGrayAsRGB24->Bounds().Height() + 10);
+	
+	fCodeStreamOnly = new BCheckBox(rect, "codestreamonly",
+		VIEW_LABEL_JPC, new BMessage(VIEW_MSG_SET_JPC));
 	fCodeStreamOnly->SetFont(be_plain_font);
 	if (fSettings->JPC)
 		fCodeStreamOnly->SetValue(1);
 
 	AddChild(fCodeStreamOnly);
-
-	ResizeToPreferred();
+	
+	fCodeStreamOnly->ResizeToPreferred();
 }
 
 
 void
 TranslatorWriteView::AttachedToWindow()
 {
+	SView::AttachedToWindow();
+	
 	fQualitySlider->SetTarget(this);
 	fGrayAsRGB24->SetTarget(this);
 	fCodeStreamOnly->SetTarget(this);
@@ -797,14 +767,15 @@
 //	#pragma mark -
 
 
-TranslatorAboutView::TranslatorAboutView(const char *name, float x, float y)
-	: SView(name, x, y)
+TranslatorAboutView::TranslatorAboutView(BRect frame, const char *name)
+	: SView(frame, name)
 {
 	BStringView *title = new BStringView(BRect(10, 0, 10, 0), "Title",
 		translatorName);
 	title->SetFont(be_bold_font);
 
 	AddChild(title);
+	title->ResizeToPreferred();
 
 	BRect rect = title->Bounds();
 	float space = title->StringWidth("    ");
@@ -822,7 +793,10 @@
 	version->MoveBy(0, rect.bottom-version->Frame().bottom);
 
 	AddChild(version);
-
+	
+	version->ResizeToPreferred();
+	
+	BRect stringFrame = title->Frame();
 	// Now for each line in translatorInfo add a BStringView
 	char* current = translatorInfo;
 	int32 index = 1;
@@ -837,71 +811,40 @@
 				newLine + 1 - current));
 			current = newLine + 1;
 		}
-
-		BStringView* string = new BStringView(BRect(10, GetPreferredHeight(),
-			10, GetPreferredHeight()), "copyright", text);
+		
+		stringFrame.OffsetBy(0, stringFrame.Height() + 2);
+		BStringView* string = new BStringView(stringFrame, "copyright",
+			text);
 		if (index > 3)
 			string->SetFontSize(9);
 		AddChild(string);
+		string->ResizeToPreferred();
 
 		index++;
 	}
-
-	ResizeToPreferred();
 }
 
 
 //	#pragma mark -
 
 
-TranslatorView::TranslatorView(const char *name)
-	: SView(name),
-	fTabWidth(30),
-	fActiveChild(0)
+TranslatorView::TranslatorView(BRect frame, const char *name)
+	: BTabView(frame, name)
 {
-	// Set global var to true
-	gAreSettingsRunning = true;
-
 	// Load settings to global settings struct
 	LoadSettings(&fSettings);
-
-	font_height fontHeight;
-	GetFontHeight(&fontHeight);
-	fTabHeight = (int32)ceilf(fontHeight.ascent + fontHeight.descent
-		+ fontHeight.leading) + 7;
-	// Add left and top margins
-	float top = fTabHeight + 20;
-	float left = 0;
-
-	// This will remember longest string width
-	int32 nameWidth = 0;
-
-	SView *view = new TranslatorWriteView("Write", &fSettings, left, top);
-	AddChild(view);
-	nameWidth = (int32)StringWidth(view->Name());
-	fTabs.AddItem(new BTab(view));
-
-	view = new TranslatorReadView("Read", &fSettings, left, top);
-	AddChild(view);
-	if (nameWidth < StringWidth(view->Name()))
-		nameWidth = (int32)StringWidth(view->Name());
-	fTabs.AddItem(new BTab(view));
-
-	view = new TranslatorAboutView("About", left, top);
-	AddChild(view);
-	if (nameWidth < StringWidth(view->Name()))
-		nameWidth = (int32)StringWidth(view->Name());
-	fTabs.AddItem(new BTab(view));
-
-	fTabWidth += nameWidth;
-	if (fTabWidth * CountChildren() > GetPreferredWidth())
-		ResizePreferredBy((fTabWidth * CountChildren()) - GetPreferredWidth(), 0);
-
-	// Add right and bottom margins
-	ResizePreferredBy(10, 15);
-
+	
+	BRect contentSize = ContainerView()->Bounds();
+	SView *view = new TranslatorWriteView(contentSize, "Write",
+		&fSettings);
+	AddTab(view);
+	view = new TranslatorReadView(contentSize, "Read", &fSettings);
+	AddTab(view);
+	view = new TranslatorAboutView(contentSize, "About");
+	AddTab(view);
+	
 	ResizeToPreferred();
-
+	
 	// Make TranslatorView resize itself with parent
 	SetFlags(Flags() | B_FOLLOW_ALL);
 }
@@ -909,112 +852,9 @@
 
 TranslatorView::~TranslatorView()
 {
-	gAreSettingsRunning = false;
-
-	BTab* tab;
-	while ((tab = (BTab*)fTabs.RemoveItem((int32)0)) != NULL) {
-		delete tab;
-	}
 }
 
 
-//!	Attached to window - resize parent to preferred
-void
-TranslatorView::AttachedToWindow()
-{
-	// Hide all children except first one
-	BView *child;
-	int32 index = 1;
-	while ((child = ChildAt(index++)) != NULL)
-		child->Hide();
-
-}
-
-
-BRect
-TranslatorView::_TabFrame(int32 index) const
-{
-	return BRect(index * fTabWidth, 10, (index + 1) * fTabWidth, 10 + fTabHeight);
-}
-
-
-void
-TranslatorView::Draw(BRect updateRect)
-{
-	// This is needed because DataTranslations app hides children
-	// after user changes translator
-	if (ChildAt(fActiveChild)->IsHidden())
-		ChildAt(fActiveChild)->Show();
-
-	// Clear
-	SetHighColor(ViewColor());
-	BRect frame = _TabFrame(0);
-	FillRect(BRect(frame.left, frame.top, Bounds().right, frame.bottom - 1));
-
-	int32 index = 0;
-	BTab* tab;
-	while ((tab = (BTab*)fTabs.ItemAt(index)) != NULL) {
-		tab_position position;
-		if (fActiveChild == index)
-			position = B_TAB_FRONT;
-		else if (index == 0)
-			position = B_TAB_FIRST;
-		else
-			position = B_TAB_ANY;
-
-		tab->DrawTab(this, _TabFrame(index), position, index + 1 != fActiveChild);
-		index++;
-	}
-
-	// Draw bottom edge
-	SetHighColor(tint_color(ViewColor(), B_LIGHTEN_MAX_TINT));
-
-	BRect selectedFrame = _TabFrame(fActiveChild);
-	float offset = ceilf(frame.Height() / 2.0);
-
-	if (selectedFrame.left > frame.left) {
-		StrokeLine(BPoint(frame.left, frame.bottom),
-			BPoint(selectedFrame.left, frame.bottom));
-	}
-	if (selectedFrame.right + offset < Bounds().right) {
-		StrokeLine(BPoint(selectedFrame.right + offset, frame.bottom),
-			BPoint(Bounds().right, frame.bottom));
-	}
-}
-
-
-//!	MouseDown, check if on tab, if so change tab if needed
-void
-TranslatorView::MouseDown(BPoint where)
-{
-	BRect frame = _TabFrame(fTabs.CountItems() - 1);
-	frame.left = 0;
-	if (!frame.Contains(where))
-		return;
-
-	for (int32 index = fTabs.CountItems(); index-- > 0;) {
-		if (!_TabFrame(index).Contains(where))
-			continue;
-
-		if (fActiveChild != index) {
-			// Hide current visible child
-			ChildAt(fActiveChild)->Hide();
-
-			// This loop is needed because it looks like in DataTranslations
-			// view gets hidden more than one time when user changes translator
-			while (ChildAt(index)->IsHidden()) {
-				ChildAt(index)->Show();
-			}
-
-			// Remember which one is currently visible
-			fActiveChild = index;
-			Invalidate(frame);
-			break;
-		}
-	}
-}
-
-
 //	#pragma mark -
 
 
@@ -1042,7 +882,7 @@
 status_t
 MakeConfig(BMessage *ioExtension, BView **outView, BRect *outExtent)
 {
-	*outView = new TranslatorView("TranslatorView");
+	*outView = new TranslatorView(BRect(0, 0, 300, 250), "TranslatorView");
 	*outExtent = (*outView)->Frame();
 	return B_OK;
 }

Modified: haiku/trunk/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
===================================================================
--- haiku/trunk/src/add-ons/translators/jpeg2000/JPEG2000Translator.h	2009-08-06 16:36:32 UTC (rev 32165)
+++ haiku/trunk/src/add-ons/translators/jpeg2000/JPEG2000Translator.h	2009-08-06 17:05:42 UTC (rev 32166)
@@ -40,6 +40,7 @@
 #include <Path.h>
 #include <Slider.h>
 #include <StringView.h>
+#include <TabView.h>
 #include <TranslationKit.h>
 #include <TranslatorAddOn.h>
 
@@ -99,29 +100,14 @@
 //!	Basic view class with resizing to needed size
 class SView : public BView {
 	public:
-		SView(const char* name, float x = 0, float y = 0);
-
-		virtual void	GetPreferredSize(float* _width, float* _height);
-		virtual void	ResizeToPreferred();
-
-		void			AddChild(BView* child, BView* before = NULL);
-
-		float			GetPreferredWidth()
-							{ return fPreferredWidth; }
-		float			GetPreferredHeight()
-							{ return fPreferredHeight; }
-		void			ResizePreferredBy(float width, float height);
-
-	private:
-		float			fPreferredWidth;
-		float			fPreferredHeight;
+		SView(BRect rect, const char* name);
+		virtual void AttachedToWindow();
 };
 
 //!	Configuration view for reading settings
 class TranslatorReadView : public SView {
 	public:
-		TranslatorReadView(const char* name, jpeg_settings* settings,
-			float x = 0, float y = 0);
+		TranslatorReadView(BRect rect, const char* name, jpeg_settings* settings);
 
 		virtual void	AttachedToWindow();
 		virtual void	MessageReceived(BMessage* message);
@@ -134,8 +120,7 @@
 //! Configuration view for writing settings
 class TranslatorWriteView : public SView {
 	public:
-		TranslatorWriteView(const char* name, jpeg_settings* settings,
-			float x = 0, float y = 0);
+		TranslatorWriteView(BRect rect, const char* name, jpeg_settings* settings);
 
 		virtual void	AttachedToWindow();
 		virtual void	MessageReceived(BMessage* message);
@@ -149,27 +134,17 @@
 
 class TranslatorAboutView : public SView {
 	public:
-		TranslatorAboutView(const char* name, float x = 0, float y = 0);
+		TranslatorAboutView(BRect rect, const char* name);
 };
 
 //!	Configuration view
-class TranslatorView : public SView {
+class TranslatorView : public BTabView {
 	public:
-		TranslatorView(const char *name);
+		TranslatorView(BRect rect, const char *name);
 		virtual ~TranslatorView();
 
-		virtual void	AttachedToWindow();
-		virtual void	Draw(BRect updateRect);
-		virtual void	MouseDown(BPoint where);
-
 	private:
-		BRect			_TabFrame(int32 index) const;
-
 		jpeg_settings	fSettings;
-		BList			fTabs;
-		int32			fTabWidth;
-		int32			fTabHeight;
-		int32			fActiveChild;
 };
 
 //!	Window used for configuration



From jackburton at mail.berlios.de  Thu Aug  6 19:06:05 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Thu, 6 Aug 2009 19:06:05 +0200
Subject: [Haiku-commits] r32167 - haiku/trunk/src/add-ons/translators/jpeg
Message-ID: <200908061706.n76H658l013908@sheep.berlios.de>

Author: jackburton
Date: 2009-08-06 19:05:57 +0200 (Thu, 06 Aug 2009)
New Revision: 32167
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32167&view=rev

Modified:
   haiku/trunk/src/add-ons/translators/jpeg/JPEGTranslator.cpp
   haiku/trunk/src/add-ons/translators/jpeg/JPEGTranslator.h
Log:
further cleanup


Modified: haiku/trunk/src/add-ons/translators/jpeg/JPEGTranslator.cpp
===================================================================
--- haiku/trunk/src/add-ons/translators/jpeg/JPEGTranslator.cpp	2009-08-06 17:05:42 UTC (rev 32166)
+++ haiku/trunk/src/add-ons/translators/jpeg/JPEGTranslator.cpp	2009-08-06 17:05:57 UTC (rev 32167)
@@ -92,9 +92,7 @@
 static status_t Error(j_common_ptr cinfo, status_t error = B_ERROR);
 
 
-bool gAreSettingsRunning = false;
 
-
 //!	Make settings to defaults
 void
 LoadDefaultSettings(jpeg_settings *settings)
@@ -805,14 +803,12 @@
 TranslatorView::TranslatorView(BRect frame, const char *name)
 	: BTabView(frame, name)
 {
-	// Set global var to true
-	gAreSettingsRunning = true;
-
 	// Load settings to global settings struct
 	LoadSettings(&fSettings);
 
 	BRect contentSize = ContainerView()->Bounds();
-	SView *view = new TranslatorWriteView(contentSize, "Write", &fSettings);
+	SView *view = new TranslatorWriteView(contentSize, "Write",
+		&fSettings);
 	AddTab(view);
 	view = new TranslatorReadView(contentSize, "Read", &fSettings);
 	AddTab(view);
@@ -828,25 +824,9 @@
 
 TranslatorView::~TranslatorView()
 {
-	gAreSettingsRunning = false;
 }
 
 
-//!	Attached to window - resize parent to preferred
-void
-TranslatorView::AttachedToWindow()
-{
-	BTabView::AttachedToWindow();
-}
-
-
-void
-TranslatorView::Select(int32 index)
-{
-	BTabView::Select(index);
-}
-
-
 //	#pragma mark -
 
 

Modified: haiku/trunk/src/add-ons/translators/jpeg/JPEGTranslator.h
===================================================================
--- haiku/trunk/src/add-ons/translators/jpeg/JPEGTranslator.h	2009-08-06 17:05:42 UTC (rev 32166)
+++ haiku/trunk/src/add-ons/translators/jpeg/JPEGTranslator.h	2009-08-06 17:05:57 UTC (rev 32167)
@@ -164,9 +164,6 @@
 		TranslatorView(BRect frame, const char *name);
 		virtual ~TranslatorView();
 
-		virtual void	AttachedToWindow();
-		virtual void	Select(int32 index);
-
 	private:
 		jpeg_settings	fSettings;
 };



From anevilyak at mail.berlios.de  Thu Aug  6 19:56:57 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Thu, 6 Aug 2009 19:56:57 +0200
Subject: [Haiku-commits] r32168 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200908061756.n76Huvfa012282@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-06 19:56:57 +0200 (Thu, 06 Aug 2009)
New Revision: 32168
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32168&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp
Log:
Patch by Blub\0: fix bfs build with DEBUG defined on gcc4.



Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp	2009-08-06 17:05:57 UTC (rev 32167)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Query.cpp	2009-08-06 17:56:57 UTC (rev 32168)
@@ -1272,7 +1272,7 @@
 	if (fLeft != NULL)
 		fLeft->PrintToStream();
 
-	char* op;
+	const char* op;
 	switch (fOp) {
 		case OP_OR: op = "OR"; break;
 		case OP_AND: op = "AND"; break;
@@ -1290,7 +1290,7 @@
 void
 Equation::PrintToStream()
 {
-	char* symbol = "???";
+	const char* symbol = "???";
 	switch (fOp) {
 		case OP_EQUAL: symbol = "=="; break;
 		case OP_UNEQUAL: symbol = "!="; break;



From oruizdorantes at mail.berlios.de  Thu Aug  6 20:28:39 2009
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Thu, 6 Aug 2009 20:28:39 +0200
Subject: [Haiku-commits] r32169 - haiku/trunk/src/preferences/bluetooth
Message-ID: <200908061828.n76ISd7a014916@sheep.berlios.de>

Author: oruizdorantes
Date: 2009-08-06 20:28:38 +0200 (Thu, 06 Aug 2009)
New Revision: 32169
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32169&view=rev

Modified:
   haiku/trunk/src/preferences/bluetooth/BluetoothSettingsView.cpp
Log:
Netbook!=Handheld

Modified: haiku/trunk/src/preferences/bluetooth/BluetoothSettingsView.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/BluetoothSettingsView.cpp	2009-08-06 17:56:57 UTC (rev 32168)
+++ haiku/trunk/src/preferences/bluetooth/BluetoothSettingsView.cpp	2009-08-06 18:28:38 UTC (rev 32169)
@@ -28,7 +28,7 @@
 static const int32 kMsgSetDeviceClassDesktop = 'sDCd';
 static const int32 kMsgSetDeviceClassServer = 'sDCs';
 static const int32 kMsgSetDeviceClassLaptop = 'sDCl';
-static const int32 kMsgSetDeviceClassNetbook = 'sDCn';
+static const int32 kMsgSetDeviceClassHandheld = 'sDCn';
 static const int32 kMsgSetDeviceClassSmartPhone = 'sDCp';
 
 static const int32 kMsgSetAverageWeight = 'afEa';
@@ -41,7 +41,7 @@
 static const char* kDesktopLabel = "Desktop";
 static const char* kServerLabel = "Server";
 static const char* kLaptopLabel = "Laptop";
-static const char* kNetBookLabel = "NetBook";
+static const char* kHandheldLabel = "Handheld";
 static const char* kPhoneLabel = "Smart Phone";
 
 
@@ -163,7 +163,7 @@
 			break;
 		}
 
-		case kMsgSetDeviceClassNetbook:
+		case kMsgSetDeviceClassHandheld:
 		{	
 			devClass.SetRecord(1, 4, 0x72);
 			ActiveLocalDevice->SetDeviceClass(devClass);
@@ -232,8 +232,8 @@
 	item = new BMenuItem(kLaptopLabel, message);
 	fHintingMenu->AddItem(item);
 
-	message = new BMessage(kMsgSetDeviceClassNetbook);
-	item = new BMenuItem(kNetBookLabel, message);
+	message = new BMessage(kMsgSetDeviceClassHandheld);
+	item = new BMenuItem(kHandheldLabel, message);
 	fHintingMenu->AddItem(item);
 	
 	message = new BMessage(kMsgSetDeviceClassSmartPhone);



From pulkomandy at mail.berlios.de  Fri Aug  7 00:19:18 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Fri, 7 Aug 2009 00:19:18 +0200
Subject: [Haiku-commits] r32170 -
	haiku/branches/components/gsoc-locale-kit/src/preferences/locale
Message-ID: <200908062219.n76MJIVM005512@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-07 00:19:18 +0200 (Fri, 07 Aug 2009)
New Revision: 32170
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32170&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
Log:
Some work on the locale preference panel. Moved things around in the advanced country settings, added time example and some headers, and made the thing scroll as there are more things to add and it will get too big for the window. I find this better than using a second level of tabs or popping up another window as osX and windows seem to do.
References : http://www.guidebookgallery.org/screenshots/international
The advanced settings will probably look somewhat like GeoWorks Ensemble ones, at least that's my personal favourite and it also matches ICU inner workings quite well while being easily user-editable.


Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-06 18:28:38 UTC (rev 32169)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-06 22:19:18 UTC (rev 32170)
@@ -469,7 +469,8 @@
 
 		tab->AddChild(BGroupLayoutBuilder(B_HORIZONTAL,10)
 			.Add(scrollView)
-			.Add(fTimeFormatSettings)
+			.Add(new BScrollView("advanced", fTimeFormatSettings, 0, 
+				false, true, B_NO_BORDER))
 		);
 
 		listView->ScrollToSelection();

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-06 18:28:38 UTC (rev 32169)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-06 22:19:18 UTC (rev 32170)
@@ -18,6 +18,9 @@
 #include <MenuItem.h>
 #include <PopUpMenu.h>
 #include <RadioButton.h>
+#include <ScrollView.h>
+#include <ScrollBar.h>
+#include <SeparatorView.h>
 #include <String.h>
 #include <StringView.h>
 #include <Window.h>
@@ -27,25 +30,11 @@
 	: BView("WindowsSettingsView", B_WILL_DRAW)
 	, fCountry(country)
 {
-	SetLayout(new BGroupLayout(B_VERTICAL));
+	SetLayout(new BGroupLayout(B_HORIZONTAL));
 
-	BBox *clockBox = new BBox("Clock");
-	clockBox->SetLabel("Clock");
-	clockBox->SetLayout(new BGroupLayout(B_VERTICAL, 10));
+	// Date
+	BSeparatorView* dateHeader = new BSeparatorView("Date");
 
-	{
-		f24HrRadioButton = new BRadioButton("", "24 Hour",
-				new BMessage(kSettingsContentsModified));
-
-		f12HrRadioButton = new BRadioButton("", "12 Hour",
-				new BMessage(kSettingsContentsModified));
-
-		clockBox->AddChild(BGroupLayoutBuilder(B_VERTICAL,10)
-				.Add(f24HrRadioButton)
-				.Add(f12HrRadioButton)
-		);
-	}
-
 	BBox *dateFormatBox = new BBox("Date Order");
 	dateFormatBox->SetLabel("Date Order");
 	dateFormatBox->SetLayout(new BGroupLayout(B_HORIZONTAL, 10));
@@ -82,46 +71,55 @@
 		fSeparatorMenuField->StringWidth(fSeparatorMenuField->Label()) + 8.0f);
 	fSeparatorMenuField->SetAlignment(B_ALIGN_LEFT);
 
-	BStringView *exampleView = new BStringView("", "Examples:");
-
 	fLongDateExampleView = new BStringView("", "");
-
 	fShortDateExampleView = new BStringView("", "");
 
+	// Time
+	BSeparatorView* timeHeader = new BSeparatorView("Time");
+
+	BBox *clockBox = new BBox("Clock");
+	clockBox->SetLabel("Clock");
+	clockBox->SetLayout(new BGroupLayout(B_VERTICAL, 10));
+
+	{
+		f24HrRadioButton = new BRadioButton("", "24 Hour",
+				new BMessage(kSettingsContentsModified));
+
+		f12HrRadioButton = new BRadioButton("", "12 Hour",
+				new BMessage(kSettingsContentsModified));
+
+		clockBox->AddChild(BGroupLayoutBuilder(B_VERTICAL,10)
+				.Add(f24HrRadioButton)
+				.Add(f12HrRadioButton)
+		);
+	}
+
+	fLongTimeExampleView = new BStringView("", "");
+	fShortTimeExampleView = new BStringView("", "");
+
+	// Numbers
+	// Currency
+
 	_UpdateExamples();
 
 	AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)
-		.Add(BGroupLayoutBuilder(B_HORIZONTAL,10)
-			.Add(clockBox)
-			.Add(dateFormatBox)
-			.AddGlue()
-		)
-		.Add(fSeparatorMenuField)
-		.Add(exampleView)
+		.Add(dateHeader)
 		.Add(fLongDateExampleView)
 		.Add(fShortDateExampleView)
+		.Add(dateFormatBox)
+		.Add(fSeparatorMenuField)
+
+		.Add(timeHeader)
+		.Add(fLongTimeExampleView)
+		.Add(fShortTimeExampleView)
+		.Add(clockBox)
 		.AddGlue()
+		.SetInsets(5,5,5,5)
 	);
 }
 
 
 void
-TimeFormatSettingsView::GetPreferredSize(float *_width, float *_height)
-{
-	if (_width != NULL) {
-		BView* view = fMDYRadioButton->Parent();
-		if (view != NULL)
-			*_width = view->Frame().right;
-		else
-			*_width = Bounds().Width();
-	}
-
-	if (_height != NULL)
-		*_height = fShortDateExampleView->Frame().bottom;
-}
-
-
-void
 TimeFormatSettingsView::AttachedToWindow()
 {
 	f24HrRadioButton->SetTarget(this);
@@ -131,6 +129,11 @@
 	fMDYRadioButton->SetTarget(this);
 
 	fSeparatorMenuField->Menu()->SetTargetForItems(this);
+
+	static_cast<BScrollView*>(Parent())->ScrollBar(B_VERTICAL)->SetRange(
+		0, Bounds().Height());
+	static_cast<BScrollView*>(Parent())->ScrollBar(B_VERTICAL)->SetProportion(
+		Bounds().Height() / Parent()->Bounds().Height());
 }
 
 
@@ -315,14 +318,16 @@
 	BString timeFormat = "Internal Error!";
 
 	fCountry->FormatDate(&timeFormat, timeValue, true);
-
 	fLongDateExampleView->SetText(timeFormat);
-	fLongDateExampleView->ResizeToPreferred();
 
 	fCountry->FormatDate(&timeFormat, timeValue, false);
-	
 	fShortDateExampleView->SetText(timeFormat);
-	fShortDateExampleView->ResizeToPreferred();
+
+	fCountry->FormatTime(&timeFormat, timeValue, true);
+	fLongTimeExampleView->SetText(timeFormat);
+
+	fCountry->FormatTime(&timeFormat, timeValue, false);
+	fShortTimeExampleView->SetText(timeFormat);
 }
 
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-06 18:28:38 UTC (rev 32169)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-06 22:19:18 UTC (rev 32170)
@@ -44,7 +44,6 @@
 
 		virtual void MessageReceived(BMessage *message);
 		virtual void AttachedToWindow();	
-		virtual void GetPreferredSize(float *_width, float *_height);
 
 		virtual void SetDefaults();
 		virtual bool IsDefaultable() const;
@@ -68,6 +67,8 @@
 
 		BStringView *fLongDateExampleView;
 		BStringView *fShortDateExampleView;
+		BStringView *fLongTimeExampleView;
+		BStringView *fShortTimeExampleView;
 
 		bool f24HrClock;
 



From anevilyak at mail.berlios.de  Fri Aug  7 01:24:50 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Fri, 7 Aug 2009 01:24:50 +0200
Subject: [Haiku-commits] r32171 - in haiku/trunk: headers/private/interface
	src/kits/interface
Message-ID: <200908062324.n76NOonJ004614@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-07 01:24:48 +0200 (Fri, 07 Aug 2009)
New Revision: 32171
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32171&view=rev

Modified:
   haiku/trunk/headers/private/interface/BMCPrivate.h
   haiku/trunk/src/kits/interface/BMCPrivate.cpp
Log:
BMenuField's private menu bar did not take into account the width of the popup indicator when computing its minimum size. Fixes ticket #3635.



Modified: haiku/trunk/headers/private/interface/BMCPrivate.h
===================================================================
--- haiku/trunk/headers/private/interface/BMCPrivate.h	2009-08-06 22:19:18 UTC (rev 32170)
+++ haiku/trunk/headers/private/interface/BMCPrivate.h	2009-08-06 23:24:48 UTC (rev 32171)
@@ -54,6 +54,7 @@
 			bool				IsPopUpMarkerShown() const
 									{ return fShowPopUpMarker; }
 
+	virtual BSize				MinSize();
 	virtual	BSize				MaxSize();
 
 private:

Modified: haiku/trunk/src/kits/interface/BMCPrivate.cpp
===================================================================
--- haiku/trunk/src/kits/interface/BMCPrivate.cpp	2009-08-06 22:19:18 UTC (rev 32170)
+++ haiku/trunk/src/kits/interface/BMCPrivate.cpp	2009-08-06 23:24:48 UTC (rev 32171)
@@ -363,6 +363,16 @@
 
 
 BSize
+_BMCMenuBar_::MinSize()
+{
+	BSize size;
+	BMenuBar::GetPreferredSize(&size.width, &size.height);
+	// account for popup indicator + a few pixels margin
+	size.width += 13.0;
+	return BLayoutUtils::ComposeSize(ExplicitMinSize(), size);
+}
+
+BSize
 _BMCMenuBar_::MaxSize()
 {
 	// The maximum width of a normal BMenuBar is unlimited, but we want it



From anevilyak at mail.berlios.de  Fri Aug  7 01:44:39 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Fri, 7 Aug 2009 01:44:39 +0200
Subject: [Haiku-commits] r32172 - haiku/trunk/src/kits/interface
Message-ID: <200908062344.n76Nidw6001806@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-07 01:44:39 +0200 (Fri, 07 Aug 2009)
New Revision: 32172
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32172&view=rev

Modified:
   haiku/trunk/src/kits/interface/BMCPrivate.cpp
Log:
Fix small style violation.



Modified: haiku/trunk/src/kits/interface/BMCPrivate.cpp
===================================================================
--- haiku/trunk/src/kits/interface/BMCPrivate.cpp	2009-08-06 23:24:48 UTC (rev 32171)
+++ haiku/trunk/src/kits/interface/BMCPrivate.cpp	2009-08-06 23:44:39 UTC (rev 32172)
@@ -372,6 +372,7 @@
 	return BLayoutUtils::ComposeSize(ExplicitMinSize(), size);
 }
 
+
 BSize
 _BMCMenuBar_::MaxSize()
 {



From axeld at mail.berlios.de  Fri Aug  7 09:22:58 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 7 Aug 2009 09:22:58 +0200
Subject: [Haiku-commits] r32173 - haiku/trunk/src/kits/interface
Message-ID: <200908070722.n777MwMc005658@sheep.berlios.de>

Author: axeld
Date: 2009-08-07 09:22:56 +0200 (Fri, 07 Aug 2009)
New Revision: 32173
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32173&view=rev

Modified:
   haiku/trunk/src/kits/interface/BMCPrivate.cpp
Log:
* Only take the popup marker into account if fShowPopUpMarker is true.
* Automatic whitespace cleanup.


Modified: haiku/trunk/src/kits/interface/BMCPrivate.cpp
===================================================================
--- haiku/trunk/src/kits/interface/BMCPrivate.cpp	2009-08-06 23:44:39 UTC (rev 32172)
+++ haiku/trunk/src/kits/interface/BMCPrivate.cpp	2009-08-07 07:22:56 UTC (rev 32173)
@@ -7,6 +7,7 @@
  *		Stephan A?mus <superstippi at gmx.de>
  */
 
+
 #include <BMCPrivate.h>
 
 #include <stdio.h>
@@ -151,7 +152,7 @@
 		be_control_look->DrawMenuFieldBackground(this, rect,
 			updateRect, base, fShowPopUpMarker, flags);
 
-		_DrawItems(updateRect);		
+		_DrawItems(updateRect);
 
 		return;
 	}
@@ -203,7 +204,7 @@
 	}
 
 	BRect r(bounds);
-	r.left = r.right - 10.0;	
+	r.left = r.right - 10.0;
 
 	BeginLineArray(6);
 		// bottom below item text, darker then BMenuBar
@@ -272,7 +273,7 @@
 			dirty.right = Frame().right + 2;
 			dirty.left = dirty.left - diff - 4;
 			fMenuField->Invalidate(dirty);
-			
+
 			// clean up the arrow part
 			dirty = Bounds();
 			dirty.left = dirty.right - diff - 12;
@@ -285,7 +286,7 @@
 			dirty.left = Frame().right - 2;
 			dirty.right = dirty.left - diff + 4;
 			fMenuField->Invalidate(dirty);
-			
+
 			// clean up the arrow part
 			dirty = Bounds();
 			dirty.left = dirty.right - 12;
@@ -315,16 +316,16 @@
 
 			if (item && item->Submenu() &&  item->Submenu()->Window()) {
 				BMessage message(B_KEY_DOWN);
-	
+
 				message.AddInt8("byte", B_ESCAPE);
 				message.AddInt8("key", B_ESCAPE);
 				message.AddInt32("modifiers", 0);
 				message.AddInt8("raw_char", B_ESCAPE);
-	
+
 				Window()->PostMessage(&message, this, NULL);
 			}
 		}
-		// fall through	
+		// fall through
 		default:
 			BMenuBar::MessageReceived(msg);
 			break;
@@ -367,8 +368,12 @@
 {
 	BSize size;
 	BMenuBar::GetPreferredSize(&size.width, &size.height);
-	// account for popup indicator + a few pixels margin
-	size.width += 13.0;
+
+	if (fShowPopUpMarker) {
+		// account for popup indicator + a few pixels margin
+		size.width += 13.0;
+	}
+
 	return BLayoutUtils::ComposeSize(ExplicitMinSize(), size);
 }
 
@@ -384,7 +389,7 @@
 }
 
 
-_BMCMenuBar_ 
+_BMCMenuBar_
 &_BMCMenuBar_::operator=(const _BMCMenuBar_ &)
 {
 	return *this;



From axeld at mail.berlios.de  Fri Aug  7 10:01:28 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 7 Aug 2009 10:01:28 +0200
Subject: [Haiku-commits] r32174 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200908070801.n7781SZL010585@sheep.berlios.de>

Author: axeld
Date: 2009-08-07 10:01:27 +0200 (Fri, 07 Aug 2009)
New Revision: 32174
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32174&view=rev

Modified:
   haiku/trunk/headers/os/interface/MenuField.h
   haiku/trunk/src/kits/interface/BMCPrivate.cpp
   haiku/trunk/src/kits/interface/Menu.cpp
   haiku/trunk/src/kits/interface/MenuBar.cpp
   haiku/trunk/src/kits/interface/MenuField.cpp
   haiku/trunk/src/kits/interface/MenuWindow.cpp
Log:
* Cleanup, no functional change.
* Remove superfluous operator=() implementations.


Modified: haiku/trunk/headers/os/interface/MenuField.h
===================================================================
--- haiku/trunk/headers/os/interface/MenuField.h	2009-08-07 07:22:56 UTC (rev 32173)
+++ haiku/trunk/headers/os/interface/MenuField.h	2009-08-07 08:01:27 UTC (rev 32174)
@@ -1,34 +1,36 @@
 /*
- * Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-
 #ifndef _MENU_FIELD_H
 #define _MENU_FIELD_H
 
+
 #include <BeBuild.h>
-#include <Menu.h>		/* For convenience */
+#include <Menu.h>
 #include <View.h>
 
+
 class BMenuBar;
 
+
 class BMenuField : public BView {
- public:
+public:
 							BMenuField(BRect frame, const char* name,
 								const char* label, BMenu* menu,
 								uint32 resize = B_FOLLOW_LEFT|B_FOLLOW_TOP,
-								uint32 flags = B_WILL_DRAW | B_NAVIGABLE); 
+								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
 							BMenuField(BRect frame, const char* name,
 								const char* label, BMenu* menu,
 								bool fixed_size,
 								uint32 resize = B_FOLLOW_LEFT|B_FOLLOW_TOP,
-								uint32 flags = B_WILL_DRAW | B_NAVIGABLE); 
+								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
 							BMenuField(const char* name,
 								const char* label, BMenu* menu,
 								BMessage* message,
-								uint32 flags = B_WILL_DRAW | B_NAVIGABLE); 
+								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
 							BMenuField(const char* label,
-								BMenu* menu, BMessage* message = NULL); 
+								BMenu* menu, BMessage* message = NULL);
 							BMenuField(BMessage* data);
 	virtual					~BMenuField();
 
@@ -57,7 +59,7 @@
 
 	virtual	void			SetLabel(const char* label);
 			const char*		Label() const;
-		
+
 	virtual void			SetEnabled(bool on);
 			bool			IsEnabled() const;
 
@@ -86,7 +88,7 @@
 			BLayoutItem*	CreateLabelLayoutItem();
 			BLayoutItem*	CreateMenuBarLayoutItem();
 
-	
+
 	/*----- Private or reserved -----------------------------------------*/
 	virtual status_t		Perform(perform_code d, void* arg);
 
@@ -107,17 +109,16 @@
 	virtual	void			_ReservedMenuField2();
 	virtual	void			_ReservedMenuField3();
 
-			BMenuField		&operator=(const BMenuField&);
+			BMenuField&		operator=(const BMenuField& other);
 
-
 			void			InitObject(const char* label);
 			void			InitObject2();
 			void			DrawLabel(BRect bounds, BRect update);
 	static	void			InitMenu(BMenu* menu);
-	
+
 			int32			_MenuTask();
 	static	int32			_thread_entry(void *arg);
-	
+
 			void			_UpdateFrame();
 			void			_InitMenuBar(BMenu* menu,
 								BRect frame, bool fixedSize);

Modified: haiku/trunk/src/kits/interface/BMCPrivate.cpp
===================================================================
--- haiku/trunk/src/kits/interface/BMCPrivate.cpp	2009-08-07 07:22:56 UTC (rev 32173)
+++ haiku/trunk/src/kits/interface/BMCPrivate.cpp	2009-08-07 08:01:27 UTC (rev 32174)
@@ -22,7 +22,7 @@
 #include <Window.h>
 
 
-_BMCFilter_::_BMCFilter_(BMenuField *menuField, uint32 what)
+_BMCFilter_::_BMCFilter_(BMenuField* menuField, uint32 what)
 	:
 	BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE, what),
 	fMenuField(menuField)
@@ -36,10 +36,10 @@
 
 
 filter_result
-_BMCFilter_::Filter(BMessage *message, BHandler **handler)
+_BMCFilter_::Filter(BMessage* message, BHandler** handler)
 {
 	if (message->what == B_MOUSE_DOWN) {
-		if (BView *view = dynamic_cast<BView *>(*handler)) {
+		if (BView* view = dynamic_cast<BView*>(*handler)) {
 			BPoint point;
 			message->FindPoint("be:view_where", &point);
 			view->ConvertToParent(&point);
@@ -52,13 +52,6 @@
 }
 
 
-_BMCFilter_ &
-_BMCFilter_::operator=(const _BMCFilter_ &)
-{
-	return *this;
-}
-
-
 // #pragma mark -
 
 
@@ -87,7 +80,7 @@
 }
 
 
-_BMCMenuBar_::_BMCMenuBar_(BMessage *data)
+_BMCMenuBar_::_BMCMenuBar_(BMessage* data)
 	:	BMenuBar(data),
 	fMenuField(NULL),
 	fFixedSize(true),
@@ -108,8 +101,8 @@
 }
 
 
-BArchivable *
-_BMCMenuBar_::Instantiate(BMessage *data)
+BArchivable*
+_BMCMenuBar_::Instantiate(BMessage* data)
 {
 	if (validate_instantiation(data, "_BMCMenuBar_"))
 		return new _BMCMenuBar_(data);
@@ -121,10 +114,10 @@
 void
 _BMCMenuBar_::AttachedToWindow()
 {
-	fMenuField = static_cast<BMenuField *>(Parent());
+	fMenuField = static_cast<BMenuField*>(Parent());
 
 	// Don't cause the KeyMenuBar to change by being attached
-	BMenuBar *menuBar = Window()->KeyMenuBar();
+	BMenuBar* menuBar = Window()->KeyMenuBar();
 	BMenuBar::AttachedToWindow();
 	Window()->SetKeyMenuBar(menuBar);
 
@@ -307,12 +300,12 @@
 
 
 void
-_BMCMenuBar_::MessageReceived(BMessage *msg)
+_BMCMenuBar_::MessageReceived(BMessage* msg)
 {
 	switch (msg->what) {
 		case 'TICK':
 		{
-			BMenuItem *item = ItemAt(0);
+			BMenuItem* item = ItemAt(0);
 
 			if (item && item->Submenu() &&  item->Submenu()->Window()) {
 				BMessage message(B_KEY_DOWN);
@@ -389,13 +382,6 @@
 }
 
 
-_BMCMenuBar_
-&_BMCMenuBar_::operator=(const _BMCMenuBar_ &)
-{
-	return *this;
-}
-
-
 void
 _BMCMenuBar_::_Init(bool setMaxContentWidth)
 {

Modified: haiku/trunk/src/kits/interface/Menu.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Menu.cpp	2009-08-07 07:22:56 UTC (rev 32173)
+++ haiku/trunk/src/kits/interface/Menu.cpp	2009-08-07 08:01:27 UTC (rev 32174)
@@ -8,6 +8,7 @@
  *		Rene Gollent (anevilyak at gmail.com)
  */
 
+
 #include <Menu.h>
 
 #include <new>
@@ -65,10 +66,10 @@
 
 class ExtraMenuData {
 public:
-	menu_tracking_hook trackingHook;
-	void *trackingState;
+	menu_tracking_hook	trackingHook;
+	void*				trackingState;
 
-	ExtraMenuData(menu_tracking_hook func, void *state)
+	ExtraMenuData(menu_tracking_hook func, void* state)
 	{
 		trackingHook = func;
 		trackingState = state;
@@ -173,7 +174,7 @@
 };
 
 
-const char *BPrivate::kEmptyMenuLabel = "<empty>";
+const char* BPrivate::kEmptyMenuLabel = "<empty>";
 
 
 struct BMenu::LayoutData {
@@ -182,7 +183,7 @@
 };
 
 
-BMenu::BMenu(const char *name, menu_layout layout)
+BMenu::BMenu(const char* name, menu_layout layout)
 	: BView(BRect(0, 0, 0, 0), name, 0, B_WILL_DRAW),
 	fChosenItem(NULL),
 	fPad(14.0f, 2.0f, 20.0f, 0.0f),
@@ -216,7 +217,7 @@
 }
 
 
-BMenu::BMenu(const char *name, float width, float height)
+BMenu::BMenu(const char* name, float width, float height)
 	: BView(BRect(0.0f, width, 0.0f, height), name, 0, B_WILL_DRAW),
 	fChosenItem(NULL),
 	fSelected(NULL),
@@ -261,7 +262,7 @@
 }
 
 
-BMenu::BMenu(BMessage *archive)
+BMenu::BMenu(BMessage* archive)
 	: BView(archive),
 	fChosenItem(NULL),
 	fPad(14.0f, 2.0f, 20.0f, 0.0f),
@@ -306,7 +307,7 @@
 
 
 status_t
-BMenu::Archive(BMessage *data, bool deep) const
+BMenu::Archive(BMessage* data, bool deep) const
 {
 	status_t err = BView::Archive(data, deep);
 
@@ -325,7 +326,7 @@
 	if (err == B_OK)
 		err = data->AddFloat("_maxwidth", fMaxContentWidth);
 	if (err == B_OK && deep) {
-		BMenuItem *item = NULL;
+		BMenuItem* item = NULL;
 		int32 index = 0;
 		while ((item = ItemAt(index++)) != NULL) {
 			BMessage itemData;
@@ -353,17 +354,17 @@
 	// when called there. Probably because the BApplication isn't yet
 	// initialized, or running.
 	BMenu::sAltAsCommandKey = true;
-	key_map *keys = NULL;
-	char *chars = NULL;
+	key_map* keys = NULL;
+	char* chars = NULL;
 	get_key_map(&keys, &chars);
 	if (keys == NULL || keys->left_command_key != 0x5d
 		|| keys->left_control_key != 0x5c)
 		BMenu::sAltAsCommandKey = false;
 	free(chars);
 	free(keys);
-	
-	BMenuItem *superItem = Superitem();
-	BMenu *superMenu = Supermenu();
+
+	BMenuItem* superItem = Superitem();
+	BMenu* superMenu = Supermenu();
 	if (AddDynamicItem(B_INITIAL_ADD)) {
 		do {
 			if (superMenu != NULL && !superMenu->_OkToProceed(superItem)) {
@@ -390,18 +391,19 @@
 
 
 bool
-BMenu::AddItem(BMenuItem *item)
+BMenu::AddItem(BMenuItem* item)
 {
 	return AddItem(item, CountItems());
 }
 
 
 bool
-BMenu::AddItem(BMenuItem *item, int32 index)
+BMenu::AddItem(BMenuItem* item, int32 index)
 {
-	if (fLayout == B_ITEMS_IN_MATRIX)
-		debugger("BMenu::AddItem(BMenuItem *, int32) this method can only "
-				"be called if the menu layout is not B_ITEMS_IN_MATRIX");
+	if (fLayout == B_ITEMS_IN_MATRIX) {
+		debugger("BMenu::AddItem(BMenuItem*, int32) this method can only "
+			"be called if the menu layout is not B_ITEMS_IN_MATRIX");
+	}
 
 	if (!item || !_AddItem(item, index))
 		return false;
@@ -420,11 +422,12 @@
 
 
 bool
-BMenu::AddItem(BMenuItem *item, BRect frame)
+BMenu::AddItem(BMenuItem* item, BRect frame)
 {
-	if (fLayout != B_ITEMS_IN_MATRIX)
-		debugger("BMenu::AddItem(BMenuItem *, BRect) this method can only "
+	if (fLayout != B_ITEMS_IN_MATRIX) {
+		debugger("BMenu::AddItem(BMenuItem*, BRect) this method can only "
 			"be called if the menu layout is B_ITEMS_IN_MATRIX");
+	}
 
 	if (!item)
 		return false;
@@ -449,9 +452,9 @@
 
 
 bool
-BMenu::AddItem(BMenu *submenu)
+BMenu::AddItem(BMenu* submenu)
 {
-	BMenuItem *item = new (nothrow) BMenuItem(submenu);
+	BMenuItem* item = new (nothrow) BMenuItem(submenu);
 	if (!item)
 		return false;
 
@@ -466,13 +469,14 @@
 
 
 bool
-BMenu::AddItem(BMenu *submenu, int32 index)
+BMenu::AddItem(BMenu* submenu, int32 index)
 {
-	if (fLayout == B_ITEMS_IN_MATRIX)
-		debugger("BMenu::AddItem(BMenuItem *, int32) this method can only "
-				"be called if the menu layout is not B_ITEMS_IN_MATRIX");
+	if (fLayout == B_ITEMS_IN_MATRIX) {
+		debugger("BMenu::AddItem(BMenuItem*, int32) this method can only "
+			"be called if the menu layout is not B_ITEMS_IN_MATRIX");
+	}
 
-	BMenuItem *item = new (nothrow) BMenuItem(submenu);
+	BMenuItem* item = new (nothrow) BMenuItem(submenu);
 	if (!item)
 		return false;
 
@@ -487,13 +491,14 @@
 
 
 bool
-BMenu::AddItem(BMenu *submenu, BRect frame)
+BMenu::AddItem(BMenu* submenu, BRect frame)
 {
-	if (fLayout != B_ITEMS_IN_MATRIX)
-		debugger("BMenu::AddItem(BMenu *, BRect) this method can only "
+	if (fLayout != B_ITEMS_IN_MATRIX) {
+		debugger("BMenu::AddItem(BMenu*, BRect) this method can only "
 			"be called if the menu layout is B_ITEMS_IN_MATRIX");
+	}
 
-	BMenuItem *item = new (nothrow) BMenuItem(submenu);
+	BMenuItem* item = new (nothrow) BMenuItem(submenu);
 	if (!item)
 		return false;
 
@@ -508,7 +513,7 @@
 
 
 bool
-BMenu::AddList(BList *list, int32 index)
+BMenu::AddList(BList* list, int32 index)
 {
 	// TODO: test this function, it's not documented in the bebook.
 	if (list == NULL)
@@ -518,7 +523,7 @@
 
 	int32 numItems = list->CountItems();
 	for (int32 i = 0; i < numItems; i++) {
-		BMenuItem *item = static_cast<BMenuItem *>(list->ItemAt(i));
+		BMenuItem* item = static_cast<BMenuItem*>(list->ItemAt(i));
 		if (item != NULL) {
 			if (!_AddItem(item, index + i))
 				break;
@@ -543,7 +548,7 @@
 bool
 BMenu::AddSeparatorItem()
 {
-	BMenuItem *item = new (nothrow) BSeparatorItem();
+	BMenuItem* item = new (nothrow) BSeparatorItem();
 	if (!item || !AddItem(item, CountItems())) {
 		delete item;
 		return false;
@@ -554,16 +559,16 @@
 
 
 bool
-BMenu::RemoveItem(BMenuItem *item)
+BMenu::RemoveItem(BMenuItem* item)
 {
 	return _RemoveItems(0, 0, item, false);
 }
 
 
-BMenuItem *
+BMenuItem*
 BMenu::RemoveItem(int32 index)
 {
-	BMenuItem *item = ItemAt(index);
+	BMenuItem* item = ItemAt(index);
 	if (item != NULL)
 		_RemoveItems(0, 0, item, false);
 	return item;
@@ -578,10 +583,10 @@
 
 
 bool
-BMenu::RemoveItem(BMenu *submenu)
+BMenu::RemoveItem(BMenu* submenu)
 {
 	for (int32 i = 0; i < fItems.CountItems(); i++) {
-		if (static_cast<BMenuItem *>(fItems.ItemAtFast(i))->Submenu() == submenu)
+		if (static_cast<BMenuItem*>(fItems.ItemAtFast(i))->Submenu() == submenu)
 			return _RemoveItems(i, 1, NULL, false);
 	}
 
@@ -596,30 +601,30 @@
 }
 
 
-BMenuItem *
+BMenuItem*
 BMenu::ItemAt(int32 index) const
 {
-	return static_cast<BMenuItem *>(fItems.ItemAt(index));
+	return static_cast<BMenuItem*>(fItems.ItemAt(index));
 }
 
 
-BMenu *
+BMenu*
 BMenu::SubmenuAt(int32 index) const
 {
-	BMenuItem *item = static_cast<BMenuItem *>(fItems.ItemAt(index));
-	return (item != NULL) ? item->Submenu() : NULL;
+	BMenuItem* item = static_cast<BMenuItem*>(fItems.ItemAt(index));
+	return item != NULL ? item->Submenu() : NULL;
 }
 
 
 int32
-BMenu::IndexOf(BMenuItem *item) const
+BMenu::IndexOf(BMenuItem* item) const
 {
 	return fItems.IndexOf(item);
 }
 
 
 int32
-BMenu::IndexOf(BMenu *submenu) const
+BMenu::IndexOf(BMenu* submenu) const
 {
 	for (int32 i = 0; i < fItems.CountItems(); i++) {
 		if (ItemAt(i)->Submenu() == submenu)
@@ -630,10 +635,10 @@
 }
 
 
-BMenuItem *
-BMenu::FindItem(const char *label) const
+BMenuItem*
+BMenu::FindItem(const char* label) const
 {
-	BMenuItem *item = NULL;
+	BMenuItem* item = NULL;
 
 	for (int32 i = 0; i < CountItems(); i++) {
 		item = ItemAt(i);
@@ -652,10 +657,10 @@
 }
 
 
-BMenuItem *
+BMenuItem*
 BMenu::FindItem(uint32 command) const
 {
-	BMenuItem *item = NULL;
+	BMenuItem* item = NULL;
 
 	for (int32 i = 0; i < CountItems(); i++) {
 		item = ItemAt(i);
@@ -675,7 +680,7 @@
 
 
 status_t
-BMenu::SetTargetForItems(BHandler *handler)
+BMenu::SetTargetForItems(BHandler* handler)
 {
 	status_t status = B_OK;
 	for (int32 i = 0; i < fItems.CountItems(); i++) {
@@ -792,11 +797,11 @@
 }
 
 
-BMenuItem *
+BMenuItem*
 BMenu::FindMarked()
 {
 	for (int32 i = 0; i < fItems.CountItems(); i++) {
-		BMenuItem *item = ItemAt(i);
+		BMenuItem* item = ItemAt(i);
 		if (item->IsMarked())
 			return item;
 	}
@@ -805,14 +810,14 @@
 }
 
 
-BMenu *
+BMenu*
 BMenu::Supermenu() const
 {
 	return fSuper;
 }
 
 
-BMenuItem *
+BMenuItem*
 BMenu::Superitem() const
 {
 	return fSuperitem;
@@ -820,7 +825,7 @@
 
 
 void
-BMenu::MessageReceived(BMessage *msg)
+BMenu::MessageReceived(BMessage* msg)
 {
 	switch (msg->what) {
 		case B_MOUSE_WHEEL_CHANGED:
@@ -830,7 +835,7 @@
 			if (deltaY == 0)
 				return;
 
-			BMenuWindow *window = dynamic_cast<BMenuWindow *>(Window());
+			BMenuWindow* window = dynamic_cast<BMenuWindow*>(Window());
 			if (window == NULL)
 				return;
 
@@ -847,7 +852,7 @@
 
 
 void
-BMenu::KeyDown(const char *bytes, int32 numBytes)
+BMenu::KeyDown(const char* bytes, int32 numBytes)
 {
 	// TODO: Test how it works on beos and implement it correctly
 	switch (bytes[0]) {
@@ -866,9 +871,9 @@
 				_SelectNextItem(fSelected, false);
 			else {
 				// this case has to be handled a bit specially.
-				BMenuItem *item = Superitem();
+				BMenuItem* item = Superitem();
 				if (item) {
-					if (dynamic_cast<BMenuBar *>(Supermenu())) {
+					if (dynamic_cast<BMenuBar*>(Supermenu())) {
 						// if we're at the top menu below the menu bar, pass the keypress to
 						// the menu bar so we can move to another top level menu
 						BMessenger msgr(Supermenu());
@@ -885,7 +890,7 @@
 			else {
 				if (fSelected && fSelected->Submenu()) {
 					_SelectItem(fSelected, true, true);
-				} else if (dynamic_cast<BMenuBar *>(Supermenu())) {
+				} else if (dynamic_cast<BMenuBar*>(Supermenu())) {
 					// if we have no submenu and we're an
 					// item in the top menu below the menubar,
 					// pass the keypress to the menubar
@@ -899,7 +904,7 @@
 		case B_PAGE_UP:
 		case B_PAGE_DOWN:
 		{
-			BMenuWindow *window = dynamic_cast<BMenuWindow *>(Window());
+			BMenuWindow* window = dynamic_cast<BMenuWindow*>(Window());
 			if (window == NULL || !window->HasScrollers())
 				break;
 
@@ -988,7 +993,7 @@
 
 
 void
-BMenu::GetPreferredSize(float *_width, float *_height)
+BMenu::GetPreferredSize(float* _width, float* _height)
 {
 	_ValidatePreferredSize();
 
@@ -1052,12 +1057,12 @@
 }
 
 
-BHandler *
-BMenu::ResolveSpecifier(BMessage *msg, int32 index, BMessage *specifier,
-						int32 form, const char *property)
+BHandler*
+BMenu::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier,
+	int32 form, const char* property)
 {
 	BPropertyInfo propInfo(sPropList);
-	BHandler *target = NULL;
+	BHandler* target = NULL;
 
 	switch (propInfo.FindMatch(msg, 0, specifier, form, property)) {
 		case B_ERROR:
@@ -1098,7 +1103,7 @@
 
 
 status_t
-BMenu::GetSupportedSuites(BMessage *data)
+BMenu::GetSupportedSuites(BMessage* data)
 {
 	if (data == NULL)
 		return B_BAD_VALUE;
@@ -1195,7 +1200,7 @@
 }
 
 
-BMenu::BMenu(BRect frame, const char *name, uint32 resizingMode, uint32 flags,
+BMenu::BMenu(BRect frame, const char* name, uint32 resizingMode, uint32 flags,
 		menu_layout layout, bool resizeToFit)
 	: BView(frame, name, resizingMode, flags),
 	fChosenItem(NULL),
@@ -1237,8 +1242,8 @@
 
 
 void
-BMenu::GetItemMargins(float *left, float *top, float *right,
-	float *bottom) const
+BMenu::GetItemMargins(float* left, float* top, float* right,
+	float* bottom) const
 {
 	if (left != NULL)
 		*left = fPad.left;
@@ -1281,8 +1286,8 @@
 }
 
 
-BMenuItem *
-BMenu::Track(bool sticky, BRect *clickToOpenRect)
+BMenuItem*
+BMenu::Track(bool sticky, BRect* clickToOpenRect)
 {
 	if (sticky && LockLooper()) {
 		//RedrawAfterSticky(Bounds());
@@ -1299,7 +1304,7 @@
 	_SetStickyMode(sticky);
 
 	int action;
-	BMenuItem *menuItem = _Track(&action);
+	BMenuItem* menuItem = _Track(&action);
 
 	fExtraRect = NULL;
 
@@ -1351,7 +1356,7 @@
 
 
 void
-BMenu::SetTrackingHook(menu_tracking_hook func, void *state)
+BMenu::SetTrackingHook(menu_tracking_hook func, void* state)
 {
 	delete fExtraMenuData;
 	fExtraMenuData = new (nothrow) BPrivate::ExtraMenuData(func, state);
@@ -1364,13 +1369,6 @@
 void BMenu::_ReservedMenu6() {}
 
 
-BMenu &
-BMenu::operator=(const BMenu &)
-{
-	return *this;
-}
-
-
 void
 BMenu::_InitData(BMessage* archive)
 {
@@ -1389,7 +1387,7 @@
 	fTriggerEnabled = sMenuInfo.triggers_always_shown;
 
 	if (archive != NULL) {
-		archive->FindInt32("_layout", (int32 *)&fLayout);
+		archive->FindInt32("_layout", (int32*)&fLayout);
 		archive->FindBool("_rsize_to_fit", &fResizeToFit);
 		bool disabled;
 		if (archive->FindBool("_disable", &disabled) == B_OK)
@@ -1405,8 +1403,8 @@
 
 		BMessage msg;
 			for (int32 i = 0; archive->FindMessage("_items", i, &msg) == B_OK; i++) {
-			BArchivable *object = instantiate_object(&msg);
-			if (BMenuItem *item = dynamic_cast<BMenuItem *>(object)) {
+			BArchivable* object = instantiate_object(&msg);
+			if (BMenuItem* item = dynamic_cast<BMenuItem*>(object)) {
 				BRect bounds;
 				if (fLayout == B_ITEMS_IN_MATRIX
 					&& archive->FindRect("_i_frames", i, &bounds) == B_OK)
@@ -1424,7 +1422,7 @@
 {
 	// See if the supermenu has a cached menuwindow,
 	// and use that one if possible.
-	BMenuWindow *window = NULL;
+	BMenuWindow* window = NULL;
 	bool ourWindow = false;
 	if (fSuper != NULL) {
 		fSuperbounds = fSuper->ConvertToScreen(fSuper->Bounds());
@@ -1481,7 +1479,7 @@
 void
 BMenu::_Hide()
 {
-	BMenuWindow *window = dynamic_cast<BMenuWindow *>(Window());
+	BMenuWindow* window = dynamic_cast<BMenuWindow*>(Window());
 	if (window == NULL || !window->Lock())
 		return;
 
@@ -1513,11 +1511,11 @@
 	// TODO: Same as above. Actually, we could get rid of the kHysteresis
 
 
-BMenuItem *
-BMenu::_Track(int *action, long start)
+BMenuItem*
+BMenu::_Track(int* action, long start)
 {
 	// TODO: cleanup
-	BMenuItem *item = NULL;
+	BMenuItem* item = NULL;
 	BRect navAreaRectAbove, navAreaRectBelow;
 	bigtime_t selectedTime = system_time();
 	bigtime_t navigationAreaTime = 0;
@@ -1543,7 +1541,7 @@
 		if (!LockLooper())
 			break;
 
-		BMenuWindow *window = static_cast<BMenuWindow *>(Window());
+		BMenuWindow* window = static_cast<BMenuWindow*>(Window());
 		BPoint screenLocation = ConvertToScreen(location);
 		if (window->CheckForScrolling(screenLocation)) {
 			UnlockLooper();
@@ -1567,14 +1565,14 @@
 			// redraw itself
 			UnlockLooper();
 			int submenuAction = MENU_STATE_TRACKING;
-			BMenu *submenu = fSelected->Submenu();
+			BMenu* submenu = fSelected->Submenu();
 			submenu->_SetStickyMode(_IsStickyMode());
 
 			// The following call blocks until the submenu
 			// gives control back to us, either because the mouse
 			// pointer goes out of the submenu's bounds, or because
 			// the user closes the menu
-			BMenuItem *submenuItem = submenu->_Track(&submenuAction);
+			BMenuItem* submenuItem = submenu->_Track(&submenuAction);
 			if (submenuAction == MENU_STATE_CLOSED) {
 				item = submenuItem;
 				fState = MENU_STATE_CLOSED;
@@ -1627,7 +1625,8 @@
 			// mouseSpeed in px per ms
 			// (actually point_distance returns the square of the distance,
 			// so it's more px^2 per ms)
-			mouseSpeed = (int32)(point_distance(newLocation, location) * 1000 / (newPollTime - pollTime));
+			mouseSpeed = (int32)(point_distance(newLocation, location) * 1000
+				/ (newPollTime - pollTime));
 			pollTime = newPollTime;
 
 			if (newLocation != location || newButtons != buttons) {
@@ -1698,7 +1697,7 @@
 	if (fSelected == NULL)
 		return;
 
-	BMenu *submenu = fSelected->Submenu();
+	BMenu* submenu = fSelected->Submenu();
 
 	if (submenu != NULL) {
 		BRect menuBounds = ConvertToScreen(Bounds());
@@ -1857,7 +1856,7 @@
 
 
 bool
-BMenu::_AddItem(BMenuItem *item, int32 index)
+BMenu::_AddItem(BMenuItem* item, int32 index)
 {
 	ASSERT(item != NULL);
 	if (index < 0 || index > fItems.CountItems())
@@ -1885,13 +1884,13 @@
 
 
 bool
-BMenu::_RemoveItems(int32 index, int32 count, BMenuItem *item, bool deleteItems)
+BMenu::_RemoveItems(int32 index, int32 count, BMenuItem* item, bool deleteItems)
 {
 	bool success = false;
 	bool invalidateLayout = false;
 
 	bool locked = LockLooper();
-	BWindow *window = Window();
+	BWindow* window = Window();
 
 	// The plan is simple: If we're given a BMenuItem directly, we use it
 	// and ignore index and count. Otherwise, we use them instead.
@@ -2060,7 +2059,7 @@
 		frame.Set(0, 0, 0, -1);
 
 	for (; index < fItems.CountItems(); index++) {
-		BMenuItem *item = ItemAt(index);
+		BMenuItem* item = ItemAt(index);
 
 		float width, height;
 		item->GetContentSize(&width, &height);
@@ -2121,7 +2120,7 @@
 		+ fPad.bottom));
 
 	for (int32 i = 0; i < fItems.CountItems(); i++) {
-		BMenuItem *item = ItemAt(i);
+		BMenuItem* item = ItemAt(i);
 
 		float width, height;
 		item->GetContentSize(&width, &height);
@@ -2152,7 +2151,7 @@
 {
 	frame.Set(0, 0, 0, 0);
 	for (int32 i = 0; i < CountItems(); i++) {
-		BMenuItem *item = ItemAt(i);
+		BMenuItem* item = ItemAt(i);
 		if (item != NULL) {
 			frame.left = min_c(frame.left, item->Frame().left);
 			frame.right = max_c(frame.right, item->Frame().right);
@@ -2167,8 +2166,8 @@
 BPoint
 BMenu::ScreenLocation()
 {
-	BMenu *superMenu = Supermenu();
-	BMenuItem *superItem = Superitem();
+	BMenu* superMenu = Supermenu();
+	BMenuItem* superItem = Superitem();
 
 	if (superMenu == NULL || superItem == NULL) {
 		debugger("BMenu can't determine where to draw."
@@ -2188,7 +2187,7 @@
 
 
 BRect
-BMenu::_CalcFrame(BPoint where, bool *scrollOn)
+BMenu::_CalcFrame(BPoint where, bool* scrollOn)
 {
 	// TODO: Improve me
 	BRect bounds = Bounds();
@@ -2197,15 +2196,15 @@
 	BScreen screen(Window());
 	BRect screenFrame = screen.Frame();
 
-	BMenu *superMenu = Supermenu();
-	BMenuItem *superItem = Superitem();
+	BMenu* superMenu = Supermenu();
+	BMenuItem* superItem = Superitem();
 
 	bool scroll = false;
 	// TODO: Horrible hack:
 	// When added to a BMenuField, a BPopUpMenu is the child of
 	// a _BMCMenuBar_ to "fake" the menu hierarchy
 	if (superMenu == NULL || superItem == NULL
-		|| dynamic_cast<_BMCMenuBar_ *>(superMenu) != NULL) {
+		|| dynamic_cast<_BMCMenuBar_*>(superMenu) != NULL) {
 		// just move the window on screen
 
 		if (frame.bottom > screenFrame.bottom)
@@ -2217,7 +2216,6 @@
 			frame.OffsetBy(screenFrame.right - frame.right, 0);
 		else if (frame.left < screenFrame.left)
 			frame.OffsetBy(-frame.left, 0);
-
 	} else if (superMenu->Layout() == B_ITEMS_IN_COLUMN) {
 		if (frame.right > screenFrame.right)
 			frame.OffsetBy(-superItem->Frame().Width() - frame.Width() - 2, 0);
@@ -2230,7 +2228,7 @@
 	} else {
 		if (frame.bottom > screenFrame.bottom) {
 			if (scrollOn != NULL && superMenu != NULL
-				&& dynamic_cast<BMenuBar *>(superMenu) != NULL
+				&& dynamic_cast<BMenuBar*>(superMenu) != NULL
 				&& frame.top < (screenFrame.bottom - 80)) {
 				scroll = true;
 			} else {
@@ -2262,7 +2260,7 @@
 {
 	int32 itemCount = fItems.CountItems();
 	for (int32 i = 0; i < itemCount; i++) {
-		BMenuItem *item = ItemAt(i);
+		BMenuItem* item = ItemAt(i);
 		if (item->Frame().Intersects(updateRect))
 			item->Draw();
 	}
@@ -2270,7 +2268,7 @@
 
 
 int
-BMenu::_State(BMenuItem **item) const
+BMenu::_State(BMenuItem** item) const
 {
 	if (fState == MENU_STATE_TRACKING || fState == MENU_STATE_CLOSED)
 		return fState;
@@ -2283,7 +2281,7 @@
 
 
 void
-BMenu::_InvokeItem(BMenuItem *item, bool now)
+BMenu::_InvokeItem(BMenuItem* item, bool now)
 {
 	if (!item->IsEnabled())
 		return;
@@ -2308,8 +2306,8 @@
 	}
 
 	// Lock the root menu window before calling BMenuItem::Invoke()
-	BMenu *parent = this;
-	BMenu *rootMenu = NULL;
+	BMenu* parent = this;
+	BMenu* rootMenu = NULL;
 	do {
 		rootMenu = parent;
 		parent = rootMenu->Supermenu();
@@ -2333,12 +2331,12 @@
 
 
 bool
-BMenu::_OverSubmenu(BMenuItem *item, BPoint loc)
+BMenu::_OverSubmenu(BMenuItem* item, BPoint loc)
 {
 	if (item == NULL)
 		return false;
 
-	BMenu *subMenu = item->Submenu();
+	BMenu* subMenu = item->Submenu();
 	if (subMenu == NULL || subMenu->Window() == NULL)
 		return false;
 
@@ -2350,7 +2348,7 @@
 }
 
 
-BMenuWindow *
+BMenuWindow*
 BMenu::_MenuWindow()
 {
 #if USE_CACHED_MENUWINDOW
@@ -2375,7 +2373,7 @@
 }
 
 
-BMenuItem *
+BMenuItem*
 BMenu::_HitTestItems(BPoint where, BPoint slop) const
 {
 	// TODO: Take "slop" into account ?
@@ -2387,7 +2385,7 @@
 
 	int32 itemCount = CountItems();
 	for (int32 i = 0; i < itemCount; i++) {
-		BMenuItem *item = ItemAt(i);
+		BMenuItem* item = ItemAt(i);
 		if (item->Frame().Contains(where))
 			return item;
 	}
@@ -2415,7 +2413,7 @@
 
 
 void
-BMenu::_ItemMarked(BMenuItem *item)
+BMenu::_ItemMarked(BMenuItem* item)
 {

[... truncated: 974 lines follow ...]


From axeld at mail.berlios.de  Fri Aug  7 10:36:13 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 7 Aug 2009 10:36:13 +0200
Subject: [Haiku-commits] r32175 - haiku/trunk/src/preferences/joysticks
Message-ID: <200908070836.n778aDfP015691@sheep.berlios.de>

Author: axeld
Date: 2009-08-07 10:36:13 +0200 (Fri, 07 Aug 2009)
New Revision: 32175
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32175&view=rev

Modified:
   haiku/trunk/src/preferences/joysticks/Jamfile
Log:
* Fixed build.


Modified: haiku/trunk/src/preferences/joysticks/Jamfile
===================================================================
--- haiku/trunk/src/preferences/joysticks/Jamfile	2009-08-07 08:01:27 UTC (rev 32174)
+++ haiku/trunk/src/preferences/joysticks/Jamfile	2009-08-07 08:36:13 UTC (rev 32175)
@@ -8,7 +8,7 @@
 	Joysticks.cpp
 	MessageWin.cpp
 	PortItem.cpp
-	: be device
+	: be libdevice.so
 	: Joysticks.rdef
 	;
 



From axeld at mail.berlios.de  Fri Aug  7 10:41:17 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 7 Aug 2009 10:41:17 +0200
Subject: [Haiku-commits] r32176 - haiku/trunk/src/preferences/screen
Message-ID: <200908070841.n778fH7e016598@sheep.berlios.de>

Author: axeld
Date: 2009-08-07 10:41:17 +0200 (Fri, 07 Aug 2009)
New Revision: 32176
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32176&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenWindow.cpp
Log:
* The colors menu had "label from marked" activated, but then replaced its
  label, causing bug #4193.


Modified: haiku/trunk/src/preferences/screen/ScreenWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-07 08:36:13 UTC (rev 32175)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-07 08:41:17 UTC (rev 32176)
@@ -279,7 +279,7 @@
 	fResolutionField = new BMenuField("ResolutionMenu", "Resolution:",
 		fResolutionMenu, NULL);
 
-	fColorsMenu = new BPopUpMenu("colors", true, true);
+	fColorsMenu = new BPopUpMenu("colors", true, false);
 
 	for (int32 i = 0; i < kColorSpaceCount; i++) {
 		BMessage *message = new BMessage(POP_COLORS_MSG);
@@ -1121,7 +1121,7 @@
 		length = snprintf(text, sizeof(text),
 			"Horizonal Frequency:\t%lu - %lu kHz\n"
 			"Vertical Frequency:\t%lu - %lu Hz\n\n"
-			"Maximum Pixel Clock:\t%g MHz", 
+			"Maximum Pixel Clock:\t%g MHz",
 			info.min_horizontal_frequency, info.max_horizontal_frequency,
 			info.min_vertical_frequency, info.max_vertical_frequency,
 			info.max_pixel_clock / 1000.0);
@@ -1130,7 +1130,7 @@
 		length += snprintf(text + length, sizeof(text) - length,
 			"%sSerial no.: %s", length ? "\n\n" : "",
 			info.serial_number);
-		if (info.produced.week != 0 && info.produced.year != 0 
+		if (info.produced.week != 0 && info.produced.year != 0
 			&& length < sizeof(text)) {
 			length += snprintf(text + length, sizeof(text) - length,
 				"(%u/%u)", info.produced.week, info.produced.year);



From axeld at mail.berlios.de  Fri Aug  7 10:52:33 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 7 Aug 2009 10:52:33 +0200
Subject: [Haiku-commits] r32177 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200908070852.n778qX0M019648@sheep.berlios.de>

Author: axeld
Date: 2009-08-07 10:52:32 +0200 (Fri, 07 Aug 2009)
New Revision: 32177
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32177&view=rev

Modified:
   haiku/trunk/headers/os/interface/MenuField.h
   haiku/trunk/src/kits/interface/Menu.cpp
   haiku/trunk/src/kits/interface/MenuField.cpp
Log:
* Added missing default initializer for the message.
* Changed BMenuField::MenuBarLayoutItem::BasePreferredSize() to return the
  min size as well, instead of a fixed 100 pixels for the width...
* More minor cleanup.


Modified: haiku/trunk/headers/os/interface/MenuField.h
===================================================================
--- haiku/trunk/headers/os/interface/MenuField.h	2009-08-07 08:41:17 UTC (rev 32176)
+++ haiku/trunk/headers/os/interface/MenuField.h	2009-08-07 08:52:32 UTC (rev 32177)
@@ -27,7 +27,7 @@
 								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
 							BMenuField(const char* name,
 								const char* label, BMenu* menu,
-								BMessage* message,
+								BMessage* message = NULL,
 								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
 							BMenuField(const char* label,
 								BMenu* menu, BMessage* message = NULL);

Modified: haiku/trunk/src/kits/interface/Menu.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Menu.cpp	2009-08-07 08:41:17 UTC (rev 32176)
+++ haiku/trunk/src/kits/interface/Menu.cpp	2009-08-07 08:52:32 UTC (rev 32177)
@@ -184,7 +184,8 @@
 
 
 BMenu::BMenu(const char* name, menu_layout layout)
-	: BView(BRect(0, 0, 0, 0), name, 0, B_WILL_DRAW),
+	:
+	BView(BRect(0, 0, 0, 0), name, 0, B_WILL_DRAW),
 	fChosenItem(NULL),
 	fPad(14.0f, 2.0f, 20.0f, 0.0f),
 	fSelected(NULL),
@@ -218,7 +219,8 @@
 
 
 BMenu::BMenu(const char* name, float width, float height)
-	: BView(BRect(0.0f, width, 0.0f, height), name, 0, B_WILL_DRAW),
+	:
+	BView(BRect(0.0f, width, 0.0f, height), name, 0, B_WILL_DRAW),
 	fChosenItem(NULL),
 	fSelected(NULL),
 	fCachedMenuWindow(NULL),
@@ -263,7 +265,8 @@
 
 
 BMenu::BMenu(BMessage* archive)
-	: BView(archive),
+	:
+	BView(archive),
 	fChosenItem(NULL),
 	fPad(14.0f, 2.0f, 20.0f, 0.0f),
 	fSelected(NULL),

Modified: haiku/trunk/src/kits/interface/MenuField.cpp
===================================================================
--- haiku/trunk/src/kits/interface/MenuField.cpp	2009-08-07 08:41:17 UTC (rev 32176)
+++ haiku/trunk/src/kits/interface/MenuField.cpp	2009-08-07 08:52:32 UTC (rev 32177)
@@ -1136,8 +1136,9 @@
 
 
 BMenuField::LabelLayoutItem::LabelLayoutItem(BMenuField* parent)
-	: fParent(parent),
-	  fFrame()
+	:
+	fParent(parent),
+	fFrame()
 {
 }
 
@@ -1216,8 +1217,9 @@
 
 
 BMenuField::MenuBarLayoutItem::MenuBarLayoutItem(BMenuField* parent)
-	: fParent(parent),
-	  fFrame()
+	:
+	fParent(parent),
+	fFrame()
 {
 	// by default the part right of the divider shall have an unlimited maximum
 	// width
@@ -1286,10 +1288,7 @@
 BSize
 BMenuField::MenuBarLayoutItem::BasePreferredSize()
 {
-	BSize size(BaseMinSize());
-	// puh, no idea...
-	size.width = 100;
-	return size;
+	return BaseMinSize();
 }
 
 



From zooey at mail.berlios.de  Fri Aug  7 12:11:39 2009
From: zooey at mail.berlios.de (zooey at BerliOS)
Date: Fri, 7 Aug 2009 12:11:39 +0200
Subject: [Haiku-commits] r32178 - in
 haiku/branches/components/gsoc-locale-kit: 3rdparty/mmu_man/themes
 build/jam data/develop headers/os/app headers/os/game headers/os/interface
 headers/os/media headers/os/support headers/posix headers/private/app
 headers/private/binary_compatibility headers/private/graphics/common
 headers/private/graphics/vesa headers/private/interface
 headers/private/kernel headers/private/kernel/arch
 headers/private/kernel/arch/m68k headers/private/kernel/arch/x86
 headers/private/kernel/boot headers/private/media headers/private/shared
 headers/private/system/arch/arm src/add-ons/accelerants/common
 src/add-ons/accelerants/vesa src/add-ons/disk_systems/intel
 src/add-ons/kernel/drivers/ports
 src/add-ons/kernel/drivers/power/acpi_battery
 src/add-ons/kernel/file_systems/bfs src/add-ons/kernel/file_systems/ext2
 src/add-ons/kernel/partitioning_systems/intel
 src/add-ons/media/media-add-ons src/add-ons/media/plugins/ffmpeg
 src/add-ons/media/plugins/ffmpeg/libavcodec src/add-ons/!
 media/plugins/ffmpeg/libavcodec/x86
 src/add-ons/media/plugins/ffmpeg/libavformat
 src/add-ons/media/plugins/ffmpeg/libswscale src/add-ons/tracker/zipomatic
 src/add-ons/translators/jpeg src/add-ons/translators/jpeg2000 src/apps
 src/apps/debuganalyzer/gui src/apps/debugger/gui/team_window
 src/apps/drivesetup src/apps/mediaconverter
 src/apps/mediaplayer/media_node_framework/audio src/apps/packageinstaller
 src/apps/powerstatus src/bin src/bin/makebootable/platform/bios_ia32
 src/bin/network/mount_nfs src/kits/app src/kits/game src/kits/interface
 src/kits/media src/kits/opengl src/kits/support src/kits/tracker
 src/preferences/appearance src/preferences/bluetooth
 src/preferences/joysticks src/preferences/screen src/servers/app
 src/servers/app/drawing src/servers/media src/servers/registrar
 src/system/boot/loader src/system/boot/platform/atari_m68k
 src/system/boot/platform/bios_ia32 src/system/boot/platform/openfirmware
 src/system/boot/platform/openfirmware/arch/ppc src/system/boot/!
 platform/pxe_ia32 src/system/boot/platform/u-boot src/system/k! ernel sr
Message-ID: <200908071011.n77ABdJX006073@sheep.berlios.de>

Author: zooey
Date: 2009-08-07 12:11:16 +0200 (Fri, 07 Aug 2009)
New Revision: 32178
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32178&view=rev

Added:
   haiku/branches/components/gsoc-locale-kit/headers/private/interface/ToolTip.h
   haiku/branches/components/gsoc-locale-kit/headers/private/interface/ToolTipManager.h
   haiku/branches/components/gsoc-locale-kit/headers/private/interface/ToolTipWindow.h
   haiku/branches/components/gsoc-locale-kit/headers/private/media/MediaWriter.h
   haiku/branches/components/gsoc-locale-kit/headers/private/system/arch/arm/board/
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/EncoderTable.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/EncoderTable.h
   haiku/branches/components/gsoc-locale-kit/src/apps/haiku3d/
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/ToolTip.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/ToolTipManager.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/MediaWriter.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/bios_ia32/multiboot.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/bios_ia32/multiboot.h
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/arch_int.cpp
   haiku/branches/components/gsoc-locale-kit/src/tests/kits/interface/ToolTipTest.cpp
Removed:
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/bios_ia32/images.h
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/u-boot/images.h
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/sh4/
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/sparc/
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/sparc64/
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/arch_int.c
Modified:
   haiku/branches/components/gsoc-locale-kit/3rdparty/mmu_man/themes/UITheme.h
   haiku/branches/components/gsoc-locale-kit/build/jam/BuildSetup
   haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage
   haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackageDependencies
   haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackages
   haiku/branches/components/gsoc-locale-kit/build/jam/ReleaseBuildProfiles
   haiku/branches/components/gsoc-locale-kit/data/develop/makefile-engine
   haiku/branches/components/gsoc-locale-kit/headers/os/app/AppDefs.h
   haiku/branches/components/gsoc-locale-kit/headers/os/app/Message.h
   haiku/branches/components/gsoc-locale-kit/headers/os/game/WindowScreen.h
   haiku/branches/components/gsoc-locale-kit/headers/os/interface/InterfaceDefs.h
   haiku/branches/components/gsoc-locale-kit/headers/os/interface/MenuField.h
   haiku/branches/components/gsoc-locale-kit/headers/os/interface/View.h
   haiku/branches/components/gsoc-locale-kit/headers/os/interface/Window.h
   haiku/branches/components/gsoc-locale-kit/headers/os/media/BufferGroup.h
   haiku/branches/components/gsoc-locale-kit/headers/os/media/MediaFile.h
   haiku/branches/components/gsoc-locale-kit/headers/os/media/MediaFormats.h
   haiku/branches/components/gsoc-locale-kit/headers/os/media/MediaTrack.h
   haiku/branches/components/gsoc-locale-kit/headers/os/support/String.h
   haiku/branches/components/gsoc-locale-kit/headers/posix/wchar.h
   haiku/branches/components/gsoc-locale-kit/headers/private/app/MessagePrivate.h
   haiku/branches/components/gsoc-locale-kit/headers/private/binary_compatibility/Global.h
   haiku/branches/components/gsoc-locale-kit/headers/private/binary_compatibility/Interface.h
   haiku/branches/components/gsoc-locale-kit/headers/private/graphics/common/create_display_modes.h
   haiku/branches/components/gsoc-locale-kit/headers/private/graphics/vesa/vesa.h
   haiku/branches/components/gsoc-locale-kit/headers/private/interface/BMCPrivate.h
   haiku/branches/components/gsoc-locale-kit/headers/private/interface/MenuPrivate.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/arch/debug.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/arch/m68k/arch_vm.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/arch/vm_translation_map.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/arch/x86/arch_cpu.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/boot/stage2_args.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/cpu.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/debug.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/heap.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/kernel.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/smp.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/tracing.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/user_atomic.h
   haiku/branches/components/gsoc-locale-kit/headers/private/media/DataExchange.h
   haiku/branches/components/gsoc-locale-kit/headers/private/media/EncoderPlugin.h
   haiku/branches/components/gsoc-locale-kit/headers/private/media/PluginManager.h
   haiku/branches/components/gsoc-locale-kit/headers/private/media/WriterPlugin.h
   haiku/branches/components/gsoc-locale-kit/headers/private/shared/HashMap.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/common/create_display_modes.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/vesa/mode.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/drivers/ports/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/bfs/Debug.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/bfs/Index.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/bfs/Inode.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/bfs/Inode.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/bfs/Query.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ext2/Inode.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/partitioning_systems/intel/PartitionLocker.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/media-add-ons/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/config.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/libavformat/utils.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/ffmpeg/libswscale/swscale.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/tracker/zipomatic/ZipOMatic.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/tracker/zipomatic/ZipOMaticMisc.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/tracker/zipomatic/ZipOMaticWindow.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/tracker/zipomatic/ZipperThread.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/tracker/zipomatic/ZipperThread.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/translators/jpeg/JPEGTranslator.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/translators/jpeg/JPEGTranslator.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
   haiku/branches/components/gsoc-locale-kit/src/apps/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/apps/debuganalyzer/gui/HeaderView.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/debugger/gui/team_window/SourceView.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/drivesetup/CreateParamsPanel.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/drivesetup/InitParamsPanel.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/drivesetup/MainWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/mediaconverter/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/apps/mediaconverter/MediaConverterApp.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/mediaconverter/MediaConverterWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/mediaconverter/MediaConverterWindow.h
   haiku/branches/components/gsoc-locale-kit/src/apps/mediaconverter/MediaFileListView.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/mediaconverter/MediaFileListView.h
   haiku/branches/components/gsoc-locale-kit/src/apps/mediaplayer/media_node_framework/audio/AudioProducer.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/packageinstaller/PackageItem.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/packageinstaller/PackageItem.h
   haiku/branches/components/gsoc-locale-kit/src/apps/packageinstaller/PackageView.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/packageinstaller/PackageView.h
   haiku/branches/components/gsoc-locale-kit/src/apps/powerstatus/DriverInterface.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/powerstatus/DriverInterface.h
   haiku/branches/components/gsoc-locale-kit/src/apps/powerstatus/ExtendedInfoWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/powerstatus/ExtendedInfoWindow.h
   haiku/branches/components/gsoc-locale-kit/src/apps/powerstatus/PowerStatusView.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/powerstatus/PowerStatusView.h
   haiku/branches/components/gsoc-locale-kit/src/bin/makebootable/platform/bios_ia32/makebootable.cpp
   haiku/branches/components/gsoc-locale-kit/src/bin/mountvolume.cpp
   haiku/branches/components/gsoc-locale-kit/src/bin/network/mount_nfs/mount_nfs.cpp
   haiku/branches/components/gsoc-locale-kit/src/bin/safemode.c
   haiku/branches/components/gsoc-locale-kit/src/kits/app/Message.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/app/MessageAdapter.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/app/MessageUtils.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/game/WindowScreen.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/BMCPrivate.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/ControlLook.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/InterfaceDefs.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/ListView.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/Menu.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/MenuBar.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/MenuField.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/MenuItem.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/MenuPrivate.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/MenuWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/TabView.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/TextView.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/View.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/Window.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/Buffer.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/BufferGroup.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/EncoderPlugin.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/kits/media/MediaExtractor.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/MediaFile.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/MediaFormats.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/MediaTrack.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/PluginManager.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/opengl/GLView.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/support/String.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/tracker/FindPanel.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/appearance/ColorSet.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/bluetooth/BluetoothSettingsView.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/joysticks/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/preferences/screen/MonitorView.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/screen/MonitorView.h
   haiku/branches/components/gsoc-locale-kit/src/preferences/screen/ScreenMode.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/screen/ScreenMode.h
   haiku/branches/components/gsoc-locale-kit/src/preferences/screen/ScreenSettings.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/screen/ScreenWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/screen/ScreenWindow.h
   haiku/branches/components/gsoc-locale-kit/src/preferences/screen/gtf.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/app/Desktop.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/app/FontManager.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/app/ServerPicture.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/app/ServerWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/app/ServerWindow.h
   haiku/branches/components/gsoc-locale-kit/src/servers/app/Window.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/app/Window.h
   haiku/branches/components/gsoc-locale-kit/src/servers/app/drawing/AccelerantHWInterface.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/media/AddOnManager.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/media/AddOnManager.h
   haiku/branches/components/gsoc-locale-kit/src/servers/media/BufferManager.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/media/BufferManager.h
   haiku/branches/components/gsoc-locale-kit/src/servers/media/FormatManager.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/media/FormatManager.h
   haiku/branches/components/gsoc-locale-kit/src/servers/media/media_server.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/registrar/MessageDeliverer.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/loader/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/system/boot/loader/elf.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/loader/kernel_args.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/loader/load_driver_settings.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/loader/load_driver_settings.h
   haiku/branches/components/gsoc-locale-kit/src/system/boot/loader/main.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/loader/partitions.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/atari_m68k/start.c
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/bios_ia32/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/bios_ia32/mmu.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/bios_ia32/shell.S
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/bios_ia32/start.c
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/bios_ia32/video.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/openfirmware/start.c
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/pxe_ia32/network.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/pxe_ia32/pxe_stage1.S
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/pxe_ia32/pxe_stage2.S
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/u-boot/mmu.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/boot/platform/u-boot/start2.c
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/m68k/arch_030_mmu.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/m68k/arch_040_mmu.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/m68k/arch_cpu.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/m68k/arch_debug.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/ppc/arch_asm.S
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/ppc/arch_cpu.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/ppc/arch_cpu_asm.S
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/ppc/arch_debug.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/arch_cpu.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/arch_debug.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/arch_debug_console.c
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/arch_interrupts.S
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/arch_smp.c
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/arch_x86.S
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/asm_offsets.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/interrupts.h
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/x86_physical_page_mapper.h
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/cache/file_cache.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/cache/file_map.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/cache/vnode_store.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/debug.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/debug_commands.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/debug_parser.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/frame_buffer_console.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/gdb.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/tracing.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/device_manager/legacy_drivers.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/disk_device_manager/disk_device_manager.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/elf.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/fs/vfs.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/heap.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/slab/Slab.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/smp.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/vm/vm.cpp
   haiku/branches/components/gsoc-locale-kit/src/tests/kits/game/ParticlesII/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/tests/kits/game/ParticlesII/particlesII.cpp
   haiku/branches/components/gsoc-locale-kit/src/tests/kits/interface/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/tests/system/libroot/os/ParseDateTest.cpp
Log:
* merged changes from trunk up to r32177

Modified: haiku/branches/components/gsoc-locale-kit/3rdparty/mmu_man/themes/UITheme.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/3rdparty/mmu_man/themes/UITheme.h	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/3rdparty/mmu_man/themes/UITheme.h	2009-08-07 10:11:16 UTC (rev 32178)
@@ -112,5 +112,9 @@
 #endif
 #endif
 
+#ifdef __HAIKU__
+#define B_TOOLTIP_BACKGROUND_COLOR B_TOOL_TIP_BACKGROUND_COLOR
+#define B_TOOLTIP_TEXT_COLOR B_TOOL_TIP_TEXT_COLOR
+#endif
 
 #endif /* _Z_UI_THEME_H */

Modified: haiku/branches/components/gsoc-locale-kit/build/jam/BuildSetup
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/BuildSetup	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/BuildSetup	2009-08-07 10:11:16 UTC (rev 32178)
@@ -198,6 +198,7 @@
 	{
 		HAIKU_DEFINES += __ARM__ ;
 		HAIKU_BOOT_PLATFORM = u-boot ;
+		HAIKU_BOOT_BOARD ?= verdex ;
 		HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB (there is not realy a floppy on the gumstix ;) )
 		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
@@ -850,6 +851,7 @@
 	TARGET_GCC_LIBGCC_OBJECTS	= $(HAIKU_GCC_LIBGCC_OBJECTS) ;
 
 	TARGET_BOOT_PLATFORM		?= $(HAIKU_BOOT_PLATFORM) ;
+	TARGET_BOOT_BOARD		?= $(HAIKU_BOOT_BOARD) ;
 
 	TARGET_LIBRARY_NAME_MAP		= HAIKU_LIBRARY_NAME_MAP ;
 

Modified: haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage	2009-08-07 10:11:16 UTC (rev 32178)
@@ -64,9 +64,9 @@
 
 SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProbe
 	DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer LaunchBox
-	Magnify Mail MediaPlayer MidiPlayer NetworkStatus PackageInstaller People
-	PoorMan PowerStatus ProcessController Screenshot ShowImage SoundRecorder
-	StyledEdit Terminal TextSearch TV Workspaces
+	Magnify Mail MediaConverter MediaPlayer MidiPlayer NetworkStatus
+	PackageInstaller People PoorMan PowerStatus ProcessController Screenshot
+	ShowImage SoundRecorder StyledEdit Terminal TextSearch TV Workspaces
 ;
 SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations E-mail
 	FileTypes Fonts Keyboard Keymap Locale Media Mouse Network Printers
@@ -285,8 +285,9 @@
 # Deskbar Application links
 AddDirectoryToHaikuImage home config be Applications ;
 DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc
-	DiskProbe DriveSetup DiskUsage Expander Icon-O-Matic Magnify Mail MediaPlayer
-	MidiPlayer People PoorMan Screenshot SoundRecorder StyledEdit Terminal TV
+	DiskProbe DriveSetup DiskUsage Expander Icon-O-Matic Magnify Mail
+	MediaConverter MediaPlayer MidiPlayer People PoorMan Screenshot
+	SoundRecorder StyledEdit Terminal TV
 ;
 local linkTarget ;
 for linkTarget in $(DESKBAR_APPLICATIONS) {

Modified: haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackageDependencies	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackageDependencies	2009-08-07 10:11:16 UTC (rev 32178)
@@ -9,6 +9,7 @@
 OptionalPackageDependencies Development : DevelopmentBase Perl ;
 OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
 OptionalPackageDependencies DevelopmentMin : LibIconv ;
+OptionalPackageDependencies Firefox : LibIconv ;
 OptionalPackageDependencies LibLayout : DevelopmentBase ;
 OptionalPackageDependencies NetSurf : OpenSSL ;
 OptionalPackageDependencies OpenSSH : OpenSSL ;

Modified: haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackages
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackages	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackages	2009-08-07 10:11:16 UTC (rev 32178)
@@ -12,47 +12,48 @@
 
 
 # Available Optional Packages:
-#	APR
+#	APR					- support libraries used for example by SVN
 #	APR-util
-#	Beam
-#	BeBook
-#	BeHappy
-#	BeOSCompatibility
-#	BePDF
-#	Bluetooth
-#	CDRecord
-#	CLucene
-#	CVS
+#	Beam				- powerful native e-mail client
+#	BeBook				- the classic BeOS API documentation
+#	BeHappy				- special documentation (i.e. BeBook) browser
+#	BeOSCompatibility	- creates links within the system to support old apps
+#	BePDF				- native PDF reader
+#	Bluetooth			- experimental Haiku components for Bluetooth
+#	CDRecord			- the command line CD writing tools
+#	Clockwerk			- native audio/video compositing
+#	CLucene				- indexed file search
+#	CVS					- the version control system
 #	Development			- more complete dev environment (including autotools)
 #	DevelopmentBase		- basic development environment (gcc, headers, libs,...)
 #	DevelopmentMin		- development headers, libs, tools, from sources only
-#	Firefox
-#	KeymapSwitcher
-#	LibIconv
-#	LibLayout
-#	LibXML2
-#	Links
-#	Nano
-#	Neon
-#	NetSurf
-#	OpenSound
-#	OpenSSH
-#	OpenSSL
-#	P7zip
-#	Pe
-#	Perl
-#	Python
-#	Rsync
-#	SQLite
-#	Subversion
-#	Tar
-#	UserlandFS
-#	Vim
-#	Vision
-#	VLC
-#	Welcome
-#	WonderBrush
-#	Yasm
+#	Firefox				- the webbrowser
+#	KeymapSwitcher		- Desktop utility
+#	LibIconv			- text encoding conversion library
+#	LibLayout			- GCC2 package needed by some BeOS apps to compile
+#	LibXML2				- the XML support libary
+#	Links				- the web browser
+#	Nano				- the command line text editor
+#	Neon				- support libraries used for example by SVN
+#	NetSurf				- the web browser
+#	OpenSound			- additional audio driver package
+#	OpenSSH				- the secure shell
+#	OpenSSL				- secure sockets library
+#	P7zip				- file archiving utility
+#	Pe					- the powerful native Programmer's Editor
+#	Perl				- the scripting language
+#	Python				- the scripting language
+#	Rsync				- remote directory synchronization
+#	SQLite				- the database implementation
+#	Subversion			- the version control system
+#	Tar					- archiving utility
+#	UserlandFS			- aids native file system development (like FUSE)
+#	Vim					- the command line text editor
+#	Vision				- powerful native IRC client
+#	VLC					- the multi media player with native interface
+#	Welcome				- introductory documentation to Haiku
+#	WonderBrush			- native graphics application
+#	Yasm				- the assembler utility
 
 local baseURL = http://haiku-files.org/files/optional-packages ;
 
@@ -198,6 +199,28 @@
 }
 
 
+# Clockwerk
+if [ IsOptionalHaikuImagePackageAdded Clockwerk ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Clockwerk available for $(TARGET_ARCH)" ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc4-2009-08-04
+			: $(baseURL)/Clockwerk-0.0.1-x86-gcc4-2009-08-04.zip
+			:
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/Clockwerk/Clockwerk ;
+	} else {
+		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc2-2009-08-04
+			: $(baseURL)/Clockwerk-0.0.1-x86-gcc2-2009-08-04.zip
+			:
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/Clockwerk/Clockwerk ;
+	}
+}
+
+
 # CLucene
 if [ IsOptionalHaikuImagePackageAdded CLucene ] {
 	if $(TARGET_ARCH) != x86 {
@@ -205,7 +228,7 @@
 	} else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
 		Echo "No optional package CLucene available for GCC2" ;
 	} else {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11
 			: $(baseURL)/clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11.zip
 			:
@@ -375,16 +398,14 @@
 if [ IsOptionalHaikuImagePackageAdded Firefox ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
-		InstallOptionalHaikuImagePackage 
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		InstallOptionalHaikuImagePackage
 			BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
 			: $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
  			: apps
  		;
  		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
-
-
 	} else {
 		InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218
 			: http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip
@@ -400,8 +421,8 @@
 if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
-		InstallOptionalHaikuImagePackage 
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		InstallOptionalHaikuImagePackage
 			KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31
 			:  $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip
 			:
@@ -409,7 +430,7 @@
 		AddSymlinkToHaikuImage home config be Desktop\ Applets
 			: /boot/common/bin/KeymapSwitcher ;
 	} else {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			KeymapSwitcher-1.2.3-x86-gcc2-2009-05-31
 			:  $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc2-2009-05-31.zip
 			:
@@ -437,7 +458,7 @@
 if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package LibLayout available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 		Echo "No optional package LibLayout available for gcc4" ;
 	} else {
 		InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08
@@ -600,8 +621,8 @@
 		Echo "No optional package Pe available for $(TARGET_ARCH)" ;
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
-			InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc4-2009-07-05
-				: $(baseURL)/Pe-2.4.2-x86-gcc4-2009-07-05.zip
+			InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc4-2009-08-04
+				: $(baseURL)/Pe-2.4.2-x86-gcc4-2009-08-04.zip
 			;
 		} else {
 			InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc2-2009-07-05
@@ -752,7 +773,7 @@
 if [ IsOptionalHaikuImagePackageAdded Vim ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Vim available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage vim-7.2-x86-gcc4-2009-05-31
 			:  $(baseURL)/vim-7.2-x86-gcc4-2009-05-31.zip
 			:
@@ -775,7 +796,7 @@
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Vision available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423
+		InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423-1
 			: $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip
 			: apps
 		;

Modified: haiku/branches/components/gsoc-locale-kit/build/jam/ReleaseBuildProfiles
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/ReleaseBuildProfiles	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/ReleaseBuildProfiles	2009-08-07 10:11:16 UTC (rev 32178)
@@ -11,7 +11,8 @@
 		HAIKU_IMAGE_HOST_NAME = shredder ;
 		HAIKU_IMAGE_SIZE = 500 ;
 
-		AddOptionalHaikuImagePackages BePDF Firefox Pe Vision VLC WonderBrush ;
+		AddOptionalHaikuImagePackages BePDF Clockwerk Firefox Pe Vision VLC
+			WonderBrush ;
 		AddOptionalHaikuImagePackages CVS Development Subversion OpenSSH Yasm ;
 		AddOptionalHaikuImagePackages Welcome BeBook ;
 	}

Modified: haiku/branches/components/gsoc-locale-kit/data/develop/makefile-engine
===================================================================
--- haiku/branches/components/gsoc-locale-kit/data/develop/makefile-engine	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/data/develop/makefile-engine	2009-08-07 10:11:16 UTC (rev 32178)
@@ -9,7 +9,7 @@
 ifeq ($(MACHINE), BePC)
 	CPU = x86
 else
-	CPU = ppc
+	CPU = $(MACHINE)
 endif
 
 #	set the directory where object files and binaries will be created
@@ -28,27 +28,27 @@
 	DRIVER_PATH = misc
 endif
 
-# 	specify that the binary should be created in the object directory
+# 	specify the directory the binary should be created in by default
+ifeq ($(TARGET_DIR), )
+	TARGET_DIR	:= $(OBJ_DIR)
+endif
+
 # NOTE: make doesn't find the target if its name is enclosed in
 #       quotation marks
-#	TARGET		:= "$(OBJ_DIR)/$(NAME)"
-	TARGET		:= $(OBJ_DIR)/$(NAME)
+	TARGET		:= $(TARGET_DIR)/$(NAME)
 
 #	specify the mimeset tool
 	MIMESET		:= mimeset
 
 #	specify the tools for adding and removing resources
-	XRES		= xres
+	XRES		:= xres
 
 #	specify the tools for compiling resource definition files
-	RESCOMP		= rc
+	RESCOMP		:= rc
 
-# 	platform specific settings
-
-#	x86 Settings
-ifeq ($(CPU), x86)
 #	set the compiler and compiler flags
-	CC		=	gcc
+	CC			:=	gcc
+	C++			:=	g++
 
 #	SETTING: set the CFLAGS for each binary type
 	ifeq ($(TYPE), DRIVER)
@@ -73,8 +73,6 @@
 	endif
 	endif
 
-
-
 #	SETTING: set proper debugger flags
 	ifeq ($(DEBUGGER), TRUE)
 		DEBUG += -g
@@ -93,7 +91,7 @@
 	endif
 
 #	set the linker and linker flags
-	LD			= gcc
+	LD			:= gcc
 	LDFLAGS		+= $(DEBUG)
 
 #	SETTING: set linker flags for each binary type
@@ -111,93 +109,6 @@
 	endif
 
 
-else
-
-#	ppc Settings
-ifeq ($(CPU), ppc)
-#	set the compiler and compiler flags
-	CC		=	mwcc
-	CFLAGS	+=
-
-#	SETTING: set the proper optimization level
-	ifeq ($(OPTIMIZE), FULL)
-		OPTIMIZER	= -O7
-	else
-	ifeq ($(OPTIMIZE), SOME)
-		OPTIMIZER	= -O3
-	else
-	ifeq ($(OPTIMIZE), NONE)
-		OPTIMIZER	= -O0
-	else
-#		OPTIMIZE not set so set to full
-		OPTIMIZER	= -O7
-	endif
-	endif
-	endif
-
-	#set the proper debugger settings
-	ifeq ($(DEBUGGER), TRUE)
-		DEBUG += -g
-	endif
-
-	CFLAGS += $(OPTIMIZER) $(DEBUG)
-
-#	SETTING: set warning level
-	ifeq ($(WARNINGS), ALL)
-		CFLAGS += -w on -requireprotos
-	else
-	ifeq ($(WARNINGS), NONE)
-		CFLAGS += -w off
-	endif
-	endif
-
-	# clear the standard environment variable
-	# now there are no standard libraries to link against
-	BELIBFILES=
-
-#	set the linker and linker flags
-	LD			= mwldppc
-
-#	SETTING: set linker flags for each binary type
-	ifeq ($(TYPE), APP)
-		LDFLAGS +=
-	else
-	ifeq ($(TYPE), SHARED)
-		LDFLAGS += 	-xms
-	endif
-	endif
-
-	ifeq ($(TYPE), DRIVER)
-		LDFLAGS += -nodefaults \
-					-export all \
-					-G \
-					/boot/develop/lib/ppc/glue-noinit.a \
-					/boot/develop/lib/ppc/_KERNEL_
-	else
-		LDFLAGS +=	-export pragma \
-					-init _init_routine_ \
-					-term _term_routine_ \
-					-lroot \
-					/boot/develop/lib/ppc/glue-noinit.a \
-					/boot/develop/lib/ppc/init_term_dyn.o \
-					/boot/develop/lib/ppc/start_dyn.o
-	endif
-
-
-#	SETTING: output symbols in an xMAP file
-	ifeq ($(SYMBOLS), TRUE)
-		LDFLAGS += -map $(TARGET).xMAP
-	endif
-
-#	SETTING: output debugging info to a .SYM file
-	ifeq ($(DEBUGGER), TRUE)
-		LDFLAGS += -g -osym $(TARGET).SYM
-	endif
-
-endif
-endif
-
-
 # psuedo-function for converting a list of source files in SRCS variable
 # to a corresponding list of object files in $(OBJ_DIR)/xxx.o
 # The "function" strips off the src file suffix (.ccp or .c or whatever)
@@ -337,17 +248,17 @@
 $(OBJ_DIR)/%.o : %.c
 	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.cpp
-	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
+	$(C++) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.cp
 	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.cc
-	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
+	$(C++) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.C
 	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.CC
-	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
+	$(C++) -c $< $(INCLUDES) $(CFLAGS) -o $@
 $(OBJ_DIR)/%.o : %.CPP
-	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
+	$(C++) -c $< $(INCLUDES) $(CFLAGS) -o $@
 
 # rules to compile resource definition files
 $(OBJ_DIR)/%.rsrc : %.rdef
@@ -369,19 +280,27 @@
 
 #	The generic clean command. Delete everything in the object folder.
 clean :: FORCE
-	-rm -rf $(OBJ_DIR)
+	-rm -rf "$(OBJ_DIR)"
 
 #	remove just the application from the object folder
 rmapp ::
-	-rm -f $(TARGET)
+	-rm -f "$(TARGET)"
 
 # make it easy to install drivers for testing
 USER_BIN_PATH = /boot/home/config/add-ons/kernel/drivers/bin
 USER_DEV_PATH = /boot/home/config/add-ons/kernel/drivers/dev
 
-driverinstall ::
+driverinstall :: default
 ifeq ($(TYPE), DRIVER)
 	copyattr --data $(OBJ_DIR)/$(NAME) $(USER_BIN_PATH)/$(NAME)
 	mkdir -p $(USER_DEV_PATH)/$(DRIVER_PATH)
 	ln -sf $(USER_BIN_PATH)/$(NAME) $(USER_DEV_PATH)/$(DRIVER_PATH)/$(NAME)
 endif
+
+install :: default
+ifeq ($(INSTALL_DIR), )
+	@echo "No install directory specified for \"$(NAME)\" (INSTALL_DIR is empty)" >&2
+else
+	mkdir -p "$(INSTALL_DIR)"
+	cp "$(TARGET)" "$(INSTALL_DIR)/$(NAME)"
+endif

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/app/AppDefs.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/app/AppDefs.h	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/app/AppDefs.h	2009-08-07 10:11:16 UTC (rev 32178)
@@ -44,6 +44,7 @@
 	B_MOUSE_DOWN 				= '_MDN',
 	B_MOUSE_MOVED 				= '_MMV',
 	B_MOUSE_ENTER_EXIT			= '_MEX',
+	B_MOUSE_IDLE				= '_MSI',
 	B_MOUSE_UP 					= '_MUP',
 	B_MOUSE_WHEEL_CHANGED		= '_MWC',
 	B_OPEN_IN_WORKSPACE			= '_OWS',

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/app/Message.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/app/Message.h	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/app/Message.h	2009-08-07 10:11:16 UTC (rev 32178)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007, Haiku Inc. All Rights Reserved.
+ * Copyright 2005-2009, Haiku Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -291,11 +291,13 @@
 
 		status_t		_FlattenToArea(message_header **_header) const;
 		status_t		_CopyForWrite();
-		status_t		_Reference(message_header *header);
+		status_t		_Reference();
 		status_t		_Dereference();
 
-		status_t		_ResizeData(int32 offset, int32 change);
+		status_t		_ValidateMessage();
 
+		status_t		_ResizeData(uint32 offset, int32 change);
+
 		uint32			_HashName(const char* name) const;
 		status_t		_FindField(const char* name, type_code type,
 							field_header** _result) const;
@@ -303,9 +305,6 @@
 							bool isFixedSize, field_header** _result);
 		status_t		_RemoveField(field_header* field);
 
-		ssize_t			_NativeFlattenedSize() const;
-		status_t		_NativeFlatten(char *buffer, ssize_t size) const;
-		status_t		_NativeFlatten(BDataIO *stream, ssize_t *size = NULL) const;
 		void			_PrintToStream(const char* indent) const;
 
 	private:
@@ -313,12 +312,15 @@
 		field_header*	fFields;
 		uint8*			fData;
 
+		uint32			fFieldsAvailable;
+		size_t			fDataAvailable;
+
 		mutable	BMessage* fOriginal;
 
 		BMessage*		fQueueLink;
 			// fQueueLink is used by BMessageQueue to build a linked list
 
-		uint32			fReserved[11];
+		uint32			fReserved[9];
 
 						// deprecated
 						BMessage(BMessage *message);

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/game/WindowScreen.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/game/WindowScreen.h	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/game/WindowScreen.h	2009-08-07 10:11:16 UTC (rev 32178)
@@ -83,7 +83,9 @@
 		status_t			_Activate();
 		status_t			_Deactivate();
 
-		status_t			_SetupAccelerantHooks(bool enable);
+		status_t			_SetupAccelerantHooks();
+		void				_ResetAccelerantHooks();
+
 		status_t			_GetCardInfo();
 		void				_Suspend();
 		void				_Resume();

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/interface/InterfaceDefs.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/interface/InterfaceDefs.h	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/interface/InterfaceDefs.h	2009-08-07 10:11:16 UTC (rev 32178)
@@ -282,8 +282,8 @@
 	B_MENU_SELECTED_ITEM_TEXT_COLOR = 8,
 	B_MENU_SELECTED_BORDER_COLOR = 9,
 
-	B_TOOLTIP_BACKGROUND_COLOR = 20,
-	B_TOOLTIP_TEXT_COLOR = 21,
+	B_TOOL_TIP_BACKGROUND_COLOR = 20,
+	B_TOOL_TIP_TEXT_COLOR = 21,
 
 	B_SUCCESS_COLOR = 100,
 	B_FAILURE_COLOR = 101,

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/interface/MenuField.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/interface/MenuField.h	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/interface/MenuField.h	2009-08-07 10:11:16 UTC (rev 32178)
@@ -1,34 +1,36 @@
 /*
- * Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-
 #ifndef _MENU_FIELD_H
 #define _MENU_FIELD_H
 
+
 #include <BeBuild.h>
-#include <Menu.h>		/* For convenience */
+#include <Menu.h>
 #include <View.h>
 
+
 class BMenuBar;
 
+
 class BMenuField : public BView {
- public:
+public:
 							BMenuField(BRect frame, const char* name,
 								const char* label, BMenu* menu,
 								uint32 resize = B_FOLLOW_LEFT|B_FOLLOW_TOP,
-								uint32 flags = B_WILL_DRAW | B_NAVIGABLE); 
+								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
 							BMenuField(BRect frame, const char* name,
 								const char* label, BMenu* menu,
 								bool fixed_size,
 								uint32 resize = B_FOLLOW_LEFT|B_FOLLOW_TOP,
-								uint32 flags = B_WILL_DRAW | B_NAVIGABLE); 
+								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
 							BMenuField(const char* name,
 								const char* label, BMenu* menu,
-								BMessage* message,
-								uint32 flags = B_WILL_DRAW | B_NAVIGABLE); 
+								BMessage* message = NULL,
+								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
 							BMenuField(const char* label,
-								BMenu* menu, BMessage* message = NULL); 
+								BMenu* menu, BMessage* message = NULL);
 							BMenuField(BMessage* data);
 	virtual					~BMenuField();
 
@@ -57,7 +59,7 @@
 
 	virtual	void			SetLabel(const char* label);
 			const char*		Label() const;
-		
+
 	virtual void			SetEnabled(bool on);
 			bool			IsEnabled() const;
 
@@ -86,7 +88,7 @@
 			BLayoutItem*	CreateLabelLayoutItem();
 			BLayoutItem*	CreateMenuBarLayoutItem();
 
-	
+
 	/*----- Private or reserved -----------------------------------------*/
 	virtual status_t		Perform(perform_code d, void* arg);
 
@@ -107,17 +109,16 @@
 	virtual	void			_ReservedMenuField2();
 	virtual	void			_ReservedMenuField3();
 
-			BMenuField		&operator=(const BMenuField&);
+			BMenuField&		operator=(const BMenuField& other);
 
-
 			void			InitObject(const char* label);
 			void			InitObject2();
 			void			DrawLabel(BRect bounds, BRect update);
 	static	void			InitMenu(BMenu* menu);
-	
+
 			int32			_MenuTask();
 	static	int32			_thread_entry(void *arg);
-	
+
 			void			_UpdateFrame();
 			void			_InitMenuBar(BMenu* menu,
 								BRect frame, bool fixedSize);

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/interface/View.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/interface/View.h	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/interface/View.h	2009-08-07 10:11:16 UTC (rev 32178)
@@ -124,6 +124,7 @@
 class BShape;
 class BShelf;
 class BString;
+class BToolTip;
 class BWindow;
 struct _array_data_;
 struct _array_hdr_;
@@ -503,7 +504,6 @@
 
 	virtual	void			DrawAfterChildren(BRect r);
 
-
 			// layout related
 
 	virtual	BSize			MinSize();
@@ -542,6 +542,19 @@
 protected:
 	virtual	void			DoLayout();
 
+public:
+			// tool tip support
+
+			void			SetToolTip(const char* text);
+			void			SetToolTip(BToolTip* tip);
+			BToolTip*		ToolTip() const;
+
+			void			ShowToolTip(BToolTip* tip = NULL);
+			void			HideToolTip();
+
+protected:
+	virtual bool			GetToolTipAt(BPoint point, BToolTip** _tip);
+
 private:
 			void			_Layout(bool force, BLayoutContext* context);
 
@@ -556,7 +569,6 @@
 	friend class BTabView;
 	friend class BWindow;
 
-	virtual	void			_ReservedView11();
 	virtual	void			_ReservedView12();
 	virtual	void			_ReservedView13();
 	virtual	void			_ReservedView14();
@@ -653,8 +665,10 @@
 			uint32			fMouseEventOptions;
 
 			LayoutData*		fLayoutData;
+			BToolTip*		fToolTip;
+			BToolTip*		fVisibleToolTip;
 
-			uint32			_reserved[7];
+			uint32			_reserved[5];
 };
 
 

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/interface/Window.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/interface/Window.h	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/interface/Window.h	2009-08-07 10:11:16 UTC (rev 32178)
@@ -347,7 +347,7 @@
 			BView*			fTopView;
 			BView*			fFocus;
 			BView*			fLastMouseMovedView;
-			uint32			_unused1;
+			BMessageRunner*	fIdleMouseRunner;
 			BMenuBar*		fKeyMenuBar;
 			BButton*		fDefaultButton;
 			BList			fShortcuts;

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/media/BufferGroup.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/media/BufferGroup.h	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/media/BufferGroup.h	2009-08-07 10:11:16 UTC (rev 32178)
@@ -1,82 +1,68 @@
-/*******************************************************************************
-/
-/	File:			BufferGroup.h
-/
-/   Description:   A BBufferGroup organizes sets of BBuffers so that you can request
-/	and reclaim them.
-/
-/	Copyright 1997-98, Be Incorporated, All Rights Reserved
-/
-*******************************************************************************/
-
-#if !defined(_BUFFER_GROUP_H)
+/*
+ * Copyright 2009, Haiku Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _BUFFER_GROUP_H
 #define _BUFFER_GROUP_H
 
+
 #include <MediaDefs.h>
 
+
 class BBuffer;
 struct _shared_buffer_list;
 
-class BBufferGroup
-{
+
+class BBufferGroup {
 public:
+							BBufferGroup(size_t size, int32 count = 3,
+								uint32 placement = B_ANY_ADDRESS,
+								uint32 lock = B_FULL_LOCK);
+	explicit				BBufferGroup();
+							BBufferGroup(int32 count,
+								const media_buffer_id* buffers);
+							~BBufferGroup();
 
-		BBufferGroup(
-				size_t size,
-				int32 count = 3,
-				uint32 placement = B_ANY_ADDRESS,
-				uint32 lock = B_FULL_LOCK);
-explicit	BBufferGroup();
-		BBufferGroup(
-				int32 count,
-				const media_buffer_id * buffers);
-		~BBufferGroup();	/* BBufferGroup is NOT a virtual class!!! */
+			status_t		InitCheck();
 
-		status_t InitCheck();
+			status_t		AddBuffer(const buffer_clone_info& info,
+								BBuffer** _buffer = NULL);
 
-			/* use this function to add buffers you created on your own */
-		status_t AddBuffer(
-				const buffer_clone_info & info,
-				BBuffer ** out_buffer = NULL);
+			BBuffer*		RequestBuffer(size_t size,
+								bigtime_t timeout = B_INFINITE_TIMEOUT);
+			status_t		RequestBuffer(BBuffer* buffer,
+								bigtime_t timeout = B_INFINITE_TIMEOUT);
 
-		BBuffer * RequestBuffer(
-				size_t size,
-				bigtime_t timeout = B_INFINITE_TIMEOUT);
-		status_t RequestBuffer(
-				BBuffer * buffer,
-				bigtime_t timeout = B_INFINITE_TIMEOUT);
-		status_t RequestError();	/* return last RequestBuffer error, useful if NULL is returned */
+			status_t		RequestError();
 
-		status_t CountBuffers(
-				int32 * out_count);
-		status_t GetBufferList(
-				int32 buf_count,
-				BBuffer ** out_buffers);
+			status_t		CountBuffers(int32* _count);
+			status_t		GetBufferList(int32 bufferCount,
+								BBuffer** _buffers);
 
-		status_t WaitForBuffers();
-		status_t ReclaimAllBuffers();
+			status_t		WaitForBuffers();
+			status_t		ReclaimAllBuffers();
 
 private:
-		/* in BeOS R5 this is a deprecated api, from BeOS R4 times */
-		status_t 				AddBuffersTo(BMessage * message, const char * name, bool needLock=true);
-		
-		status_t				InitBufferGroup(); 		/* used internally */
-		BBufferGroup(const BBufferGroup &);				/* not implemented */
-		BBufferGroup& operator=(const BBufferGroup&);	/* not implemented */
+			// deprecated BeOS R4 API
+			status_t 		AddBuffersTo(BMessage* message, const char* name,
+								bool needLock);
 
-		friend struct 			_shared_buffer_list;
+							BBufferGroup(const BBufferGroup& other);
+			BBufferGroup&	operator=(const BBufferGroup& other);
 
-		status_t 				fInitError;
-		status_t 				fRequestError;
-		int32					fBufferCount;
-		_shared_buffer_list *	fBufferList;
-		
-		// this is a BBufferGroup specific semaphore used for reclaiming BBuffers of this group
-		// is also is a system wide unique identifier of this group
-		sem_id					fReclaimSem;
+			status_t		_Init();
 
-		uint32 					_reserved_buffer_group_[9];
+private:
+	friend struct _shared_buffer_list;
+
+			status_t		fInitError;
+			status_t		fRequestError;
+			int32			fBufferCount;
+			_shared_buffer_list* fBufferList;
+			sem_id			fReclaimSem;
+
+			uint32			_reserved[9];
 };
 
-#endif /* _BUFFER_GROUP_H */
 
+#endif	// _BUFFER_GROUP_H

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/media/MediaFile.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/media/MediaFile.h	2009-08-07 08:52:32 UTC (rev 32177)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/media/MediaFile.h	2009-08-07 10:11:16 UTC (rev 32178)
@@ -1,10 +1,11 @@
 /*
  * Copyright 2002-2009, Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
+ * Distributed under the terms of the MIT license.
  */
 #ifndef _MEDIA_FILE_H
 #define	_MEDIA_FILE_H
 
+
 #include <image.h>
 #include <List.h>
 #include <MediaDefs.h>
@@ -15,13 +16,13 @@
 namespace BPrivate {
 	namespace media {
 		class MediaExtractor;
+		class MediaWriter;
 	}
-	class MediaWriter;
 	class _AddonManager;
 }
 
 
-// forward declarations 
+// forward declarations
 class BMediaTrack;
 class BParameterWeb;
 class BView;
@@ -50,7 +51,7 @@
 class BMediaFile {
 public:
 	//	these four constructors are used for read-only access
-								BMediaFile(const entry_ref* ref); 
+								BMediaFile(const entry_ref* ref);
 								BMediaFile(BDataIO* source);
 									// BFile is a BDataIO
 								BMediaFile(const entry_ref* ref, int32 flags);
@@ -71,14 +72,14 @@
 
 			status_t			SetTo(const entry_ref* ref);
 			status_t			SetTo(BDataIO* destination);
-							   
+
 			status_t			InitCheck() const;
 
 	// Get info about the underlying file format.
 			status_t			GetFileFormatInfo(media_file_format* mfi) const;
 
 	//
-	// These functions are for read-only access to a media file.  
+	// These functions are for read-only access to a media file.
 	// The data is read using the BMediaTrack object.
 	//
 			const char*			Copyright() const;
@@ -136,7 +137,7 @@
 	// deprecated, but for R5 compatibility
 			BParameterWeb*		Web();
 
-	// Does nothing, returns B_ERROR, for Zeta compatiblity only	
+	// Does nothing, returns B_ERROR, for Zeta compatiblity only
 			status_t			ControlFile(int32 selector, void* ioData,
 									size_t size);
 
@@ -147,7 +148,7 @@
 
 			BPrivate::_AddonManager* fEncoderMgr;
 			BPrivate::_AddonManager* fWriterMgr;
-			BPrivate::MediaWriter* fWriter;
+			BPrivate::media::MediaWriter* fWriter;
 			int32				fWriterID;
 			media_file_format	fMFI;
 
@@ -159,8 +160,9 @@
 			void				_Init();
 			void				_UnInit();
 			void				_InitReader(BDataIO* source, int32 flags = 0);
-			void				_InitWriter(BDataIO* source,
-									const media_file_format* mfi, int32 flags);
+			void				_InitWriter(BDataIO* target,

[... truncated: 22596 lines follow ...]


From axeld at mail.berlios.de  Fri Aug  7 12:22:22 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 7 Aug 2009 12:22:22 +0200
Subject: [Haiku-commits] r32179 - haiku/trunk/src/preferences/screen
Message-ID: <200908071022.n77AMMgv008501@sheep.berlios.de>

Author: axeld
Date: 2009-08-07 12:22:22 +0200 (Fri, 07 Aug 2009)
New Revision: 32179
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32179&view=rev

Modified:
   haiku/trunk/src/preferences/screen/ScreenMode.cpp
   haiku/trunk/src/preferences/screen/ScreenWindow.cpp
   haiku/trunk/src/preferences/screen/ScreenWindow.h
Log:
* If the user selected color space is not available for the selected resolution,
  _CheckColorMenu() now selects the closest item available - if you switch back
  the resolution to one that supports the original color space, it will be
  restored. This fixes bug #2995.
* I also reverted r24674 as I remembered why I did that in the first place
  (advertizing 24 bit modes as 32 bit), and it was a pretty stupid idea to
  solve it like this, I must admit.
* Instead, the color space menu now only shows spaces that are actually
  supported by the card at all. One could think about hiding 24 bit in case
  both 24 bit, and 32 bit are available, but I didn't do that yet.


Modified: haiku/trunk/src/preferences/screen/ScreenMode.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-08-07 10:11:16 UTC (rev 32178)
+++ haiku/trunk/src/preferences/screen/ScreenMode.cpp	2009-08-07 10:22:22 UTC (rev 32179)
@@ -121,17 +121,8 @@
 bool
 screen_mode::operator!=(const screen_mode &other) const
 {
-	// make no difference between 24 and 32 bit modes
-	color_space thisSpace = space;
-	if (thisSpace == B_RGB24)
-		thisSpace = B_RGB32;
-
-	color_space otherSpace = other.space;
-	if (otherSpace == B_RGB24)
-		otherSpace = B_RGB32;
-
 	return width != other.width || height != other.height
-		|| thisSpace != otherSpace || refresh != other.refresh
+		|| space != other.space || refresh != other.refresh
 		|| combine != other.combine
 		|| swap_displays != other.swap_displays
 		|| use_laptop_panel != other.use_laptop_panel

Modified: haiku/trunk/src/preferences/screen/ScreenWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-07 10:11:16 UTC (rev 32178)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-07 10:22:22 UTC (rev 32179)
@@ -72,6 +72,7 @@
 	{ B_CMAP8, 8, "8 Bits/Pixel, 256 Colors" },
 	{ B_RGB15, 15, "15 Bits/Pixel, 32768 Colors" },
 	{ B_RGB16, 16, "16 Bits/Pixel, 65536 Colors" },
+	{ B_RGB24, 24, "24 Bits/Pixel, 16 Million Colors" },
 	{ B_RGB32, 32, "32 Bits/Pixel, 16 Million Colors" }
 };
 static const int32 kColorSpaceCount
@@ -175,6 +176,7 @@
 		fIsVesa = true;
 
 	_UpdateOriginal();
+	_BuildSupportedColorSpaces();
 	fActive = fSelected = fOriginal;
 
 	fSettings = settings;
@@ -282,11 +284,18 @@
 	fColorsMenu = new BPopUpMenu("colors", true, false);
 
 	for (int32 i = 0; i < kColorSpaceCount; i++) {
+		if ((fSupportedColorSpaces & (1 << i)) == 0)
+			continue;
+
 		BMessage *message = new BMessage(POP_COLORS_MSG);
 		message->AddInt32("bits_per_pixel", kColorSpaces[i].bits_per_pixel);
 		message->AddInt32("space", kColorSpaces[i].space);
 
-		fColorsMenu->AddItem(new BMenuItem(kColorSpaces[i].label, message));
+		BMenuItem* item = new BMenuItem(kColorSpaces[i].label, message);
+		if (kColorSpaces[i].space == screen.ColorSpace())
+			fUserSelectedColorSpace = item;
+
+		fColorsMenu->AddItem(item);
 	}
 
 	rect.OffsetTo(B_ORIGIN);
@@ -511,7 +520,7 @@
 
 
 /*!	Update resolution list according to combine mode
-	(some resolution may not be combinable due to memory restrictions)
+	(some resolutions may not be combinable due to memory restrictions).
 */
 void
 ScreenWindow::_CheckResolutionMenu()
@@ -542,7 +551,13 @@
 void
 ScreenWindow::_CheckColorMenu()
 {
+	int32 supportsAnything = false;
+	int32 index = 0;
+
 	for (int32 i = 0; i < kColorSpaceCount; i++) {
+		if ((fSupportedColorSpaces & (1 << i)) == 0)
+			continue;
+
 		bool supported = false;
 
 		for (int32 j = 0; j < fScreenMode.CountModes(); j++) {
@@ -550,20 +565,72 @@
 
 			if (fSelected.width == mode.width
 				&& fSelected.height == mode.height
-				&& (kColorSpaces[i].space == mode.space
-					// advertize 24 bit mode as 32 bit to avoid confusion
-					|| (kColorSpaces[i].space == B_RGB32
-						&& mode.space == B_RGB24))
+				&& kColorSpaces[i].space == mode.space
 				&& fSelected.combine == mode.combine) {
+				supportsAnything = true;
 				supported = true;
 				break;
 			}
 		}
 
-		BMenuItem* item = fColorsMenu->ItemAt(i);
+		BMenuItem* item = fColorsMenu->ItemAt(index++);
 		if (item)
 			item->SetEnabled(supported);
 	}
+
+	fColorsField->SetEnabled(supportsAnything);
+
+	if (!supportsAnything)
+		return;
+
+	// Make sure a valid item is selected
+
+	BMenuItem* item = fColorsMenu->FindMarked();
+	bool changed = false;
+
+	if (item != fUserSelectedColorSpace) {
+		if (fUserSelectedColorSpace != NULL
+			&& fUserSelectedColorSpace->IsEnabled()) {
+			fUserSelectedColorSpace->SetMarked(true);
+			item = fUserSelectedColorSpace;
+			changed = true;
+		}
+	}
+	if (item != NULL && !item->IsEnabled()) {
+		// find the next best item
+		int32 index = fColorsMenu->IndexOf(item);
+		bool found = false;
+
+		for (int32 i = index + 1; i < fColorsMenu->CountItems(); i++) {
+			item = fColorsMenu->ItemAt(i);
+			if (item->IsEnabled()) {
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			// search backwards as well
+			for (int32 i = index - 1; i >= 0; i--) {
+				item = fColorsMenu->ItemAt(i);
+				if (item->IsEnabled())
+					break;
+			}
+		}
+
+		item->SetMarked(true);
+		changed = true;
+	}
+
+	if (changed) {
+		// Update selected space
+
+		BMessage* message = item->Message();
+		int32 space;
+		if (message->FindInt32("space", &space) == B_OK) {
+			fSelected.space = (color_space)space;
+			_UpdateColorLabel();
+		}
+	}
 }
 
 
@@ -694,28 +761,22 @@
 
 	item = fColorsMenu->ItemAt(0);
 
-	for (int32 i = kColorSpaceCount; i-- > 0;) {
-		if (kColorSpaces[i].space == fSelected.space
-			|| (kColorSpaces[i].space == B_RGB32
-				&& fSelected.space == B_RGB24)) {
-			item = fColorsMenu->ItemAt(i);
+	for (int32 i = 0, index = 0; i <  kColorSpaceCount; i++) {
+		if ((fSupportedColorSpaces & (1 << i)) == 0)
+			continue;
+
+		if (kColorSpaces[i].space == fSelected.space) {
+			item = fColorsMenu->ItemAt(index);
 			break;
 		}
+
+		index++;
 	}
 
 	if (item && !item->IsMarked())
 		item->SetMarked(true);
 
-	string.Truncate(0);
-	uint32 bitsPerPixel = fSelected.BitsPerPixel();
-	// advertize 24 bit mode as 32 bit to avoid confusion
-	if (bitsPerPixel == 24)
-		bitsPerPixel = 32;
-
-	string << bitsPerPixel << " Bits/Pixel";
-	if (string != fColorsMenu->Superitem()->Label())
-		fColorsMenu->Superitem()->SetLabel(string.String());
-
+	_UpdateColorLabel();
 	_UpdateMonitorView();
 	_UpdateRefreshControl();
 
@@ -857,12 +918,18 @@
 
 		case POP_COLORS_MSG:
 		{
-			message->FindInt32("space", (int32 *)&fSelected.space);
+			int32 space;
+			if (message->FindInt32("space", &space) != B_OK)
+				break;
 
-			BString string;
-			string << fSelected.BitsPerPixel() << " Bits/Pixel";
-			fColorsMenu->Superitem()->SetLabel(string.String());
+			int32 index;
+			if (message->FindInt32("index", &index) == B_OK
+				&& fColorsMenu->ItemAt(index) != NULL)
+				fUserSelectedColorSpace = fColorsMenu->ItemAt(index);
 
+			fSelected.space = (color_space)space;
+			_UpdateColorLabel();
+
 			_CheckApplyEnabled();
 			break;
 		}
@@ -871,7 +938,7 @@
 		{
 			message->FindFloat("refresh", &fSelected.refresh);
 			fOtherRefresh->SetLabel("Other" B_UTF8_ELLIPSIS);
-				// revert "Other?" label - it might have had a refresh rate prefix
+				// revert "Other?" label - it might have a refresh rate prefix
 
 			_CheckApplyEnabled();
 			break;
@@ -1064,6 +1131,22 @@
 
 
 void
+ScreenWindow::_BuildSupportedColorSpaces()
+{
+	fSupportedColorSpaces = 0;
+
+	for (int32 i = 0; i < kColorSpaceCount; i++) {
+		for (int32 j = 0; j < fScreenMode.CountModes(); j++) {
+			if (fScreenMode.ModeAt(j).space == kColorSpaces[i].space) {
+				fSupportedColorSpaces |= 1 << i;
+				break;
+			}
+		}
+	}
+}
+
+
+void
 ScreenWindow::_CheckApplyEnabled()
 {
 	fApplyButton->SetEnabled(fSelected != fActive
@@ -1142,6 +1225,15 @@
 
 
 void
+ScreenWindow::_UpdateColorLabel()
+{
+	BString string;
+	string << fSelected.BitsPerPixel() << " Bits/Pixel";
+	fColorsMenu->Superitem()->SetLabel(string.String());
+}
+
+
+void
 ScreenWindow::_Apply()
 {
 	// make checkpoint, so we can undo these changes

Modified: haiku/trunk/src/preferences/screen/ScreenWindow.h
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.h	2009-08-07 10:11:16 UTC (rev 32178)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.h	2009-08-07 10:22:22 UTC (rev 32179)
@@ -29,79 +29,86 @@
 
 
 class ScreenWindow : public BWindow {
-	public:
-		ScreenWindow(ScreenSettings *settings);
-		virtual ~ScreenWindow();
+public:
+							ScreenWindow(ScreenSettings *settings);
+	virtual					~ScreenWindow();
 
-		virtual	bool QuitRequested();
-		virtual void MessageReceived(BMessage *message);
-		virtual void WorkspaceActivated(int32 ws, bool state);
-		virtual void ScreenChanged(BRect frame, color_space mode);
+	virtual	bool			QuitRequested();
+	virtual	void			MessageReceived(BMessage *message);
+	virtual	void			WorkspaceActivated(int32 ws, bool state);
+	virtual	void			ScreenChanged(BRect frame, color_space mode);
 
-	private:
-		BButton* _CreateColumnRowButton(bool columns, bool plus);
-		BButton* _GetColumnRowButton(bool columns, bool plus);
+private:
+			BButton*		_CreateColumnRowButton(bool columns, bool plus);
+			BButton*		_GetColumnRowButton(bool columns, bool plus);
 
-		void _CheckApplyEnabled();
-		void _CheckResolutionMenu();
-		void _CheckColorMenu();
-		void _CheckRefreshMenu();
+			void			_BuildSupportedColorSpaces();
 
-		void _UpdateActiveMode();
-		void _UpdateWorkspaceButtons();
-		void _UpdateRefreshControl();
-		void _UpdateMonitorView();
-		void _UpdateControls();
-		void _UpdateOriginal();
-		void _UpdateMonitor();
+			void			_CheckApplyEnabled();
+			void			_CheckResolutionMenu();
+			void			_CheckColorMenu();
+			void			_CheckRefreshMenu();
 
-		void _Apply();
+			void			_UpdateActiveMode();
+			void			_UpdateWorkspaceButtons();
+			void			_UpdateRefreshControl();
+			void			_UpdateMonitorView();
+			void			_UpdateControls();
+			void			_UpdateOriginal();
+			void			_UpdateMonitor();
+			void			_UpdateColorLabel();
 
-		status_t _WriteVesaModeFile(const screen_mode& mode) const;
-		bool _IsVesa() const { return fIsVesa; }
+			void			_Apply();
 
-		ScreenSettings*	fSettings;
-		bool			fIsVesa;
-		bool			fBootWorkspaceApplied;
+			status_t		_WriteVesaModeFile(const screen_mode& mode) const;
+			bool			_IsVesa() const { return fIsVesa; }
 
-		BStringView*	fMonitorInfo;
-		MonitorView*	fMonitorView;
-		BMenuItem*		fAllWorkspacesItem;
+private:
+			ScreenSettings*	fSettings;
+			bool			fIsVesa;
+			bool			fBootWorkspaceApplied;
 
-		BTextControl*	fColumnsControl;
-		BTextControl*	fRowsControl;
-		BButton*		fWorkspacesButtons[4];
+			BStringView*	fMonitorInfo;
+			MonitorView*	fMonitorView;
+			BMenuItem*		fAllWorkspacesItem;
 
-		BPopUpMenu*		fResolutionMenu;
-		BMenuField*		fResolutionField;
-		BPopUpMenu*		fColorsMenu;
-		BMenuField*		fColorsField;
-		BPopUpMenu*		fRefreshMenu;
-		BMenuField*		fRefreshField;
-		BMenuItem*		fOtherRefresh;
+			BTextControl*	fColumnsControl;
+			BTextControl*	fRowsControl;
+			BButton*		fWorkspacesButtons[4];
 
-		BPopUpMenu*		fCombineMenu;
-		BMenuField*		fCombineField;
-		BPopUpMenu*		fSwapDisplaysMenu;
-		BMenuField*		fSwapDisplaysField;
-		BPopUpMenu*		fUseLaptopPanelMenu;
-		BMenuField*		fUseLaptopPanelField;
-		BPopUpMenu*		fTVStandardMenu;
-		BMenuField*		fTVStandardField;
+			uint32			fSupportedColorSpaces;
+			BMenuItem*		fUserSelectedColorSpace;
 
-		BButton*		fDefaultsButton;
-		BButton*		fApplyButton;
-		BButton*		fRevertButton;
+			BPopUpMenu*		fResolutionMenu;
+			BMenuField*		fResolutionField;
+			BPopUpMenu*		fColorsMenu;
+			BMenuField*		fColorsField;
+			BPopUpMenu*		fRefreshMenu;
+			BMenuField*		fRefreshField;
+			BMenuItem*		fOtherRefresh;
 
-		BButton*		fBackgroundsButton;
+			BPopUpMenu*		fCombineMenu;
+			BMenuField*		fCombineField;
+			BPopUpMenu*		fSwapDisplaysMenu;
+			BMenuField*		fSwapDisplaysField;
+			BPopUpMenu*		fUseLaptopPanelMenu;
+			BMenuField*		fUseLaptopPanelField;
+			BPopUpMenu*		fTVStandardMenu;
+			BMenuField*		fTVStandardField;
 
-		ScreenMode		fScreenMode, fTempScreenMode;
-			// screen modes for all workspaces
-		uint32			fOriginalWorkspacesColumns;
-		uint32			fOriginalWorkspacesRows;
-		screen_mode		fActive, fSelected, fOriginal;
-			// screen modes for the current workspace
-		bool			fModified;
+			BButton*		fDefaultsButton;
+			BButton*		fApplyButton;
+			BButton*		fRevertButton;
+
+			BButton*		fBackgroundsButton;
+
+			ScreenMode		fScreenMode, fTempScreenMode;
+				// screen modes for all workspaces
+			uint32			fOriginalWorkspacesColumns;
+			uint32			fOriginalWorkspacesRows;
+			screen_mode		fActive, fSelected, fOriginal;
+				// screen modes for the current workspace
+			bool			fModified;
 };
 
 #endif	/* SCREEN_WINDOW_H */



From aldeck at mail.berlios.de  Fri Aug  7 12:49:27 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Fri, 7 Aug 2009 12:49:27 +0200
Subject: [Haiku-commits] r32180 - haiku/trunk/build/jam
Message-ID: <200908071049.n77AnRhM029546@sheep.berlios.de>

Author: aldeck
Date: 2009-08-07 12:49:09 +0200 (Fri, 07 Aug 2009)
New Revision: 32180
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32180&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
* Added Haiku3d demo to the image. Removed GLDirectMode demo as discussed.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-08-07 10:22:22 UTC (rev 32179)
+++ haiku/trunk/build/jam/HaikuImage	2009-08-07 10:49:09 UTC (rev 32180)
@@ -75,8 +75,7 @@
 	Screen ScreenSaver Sounds Time Touchpad <preference>Tracker VirtualMemory
 ;
 SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
-	GLDirectMode GLTeapot Mandelbrot Pairs
-	Playground Pulse Sudoku Gradients
+	GLTeapot Haiku3d Mandelbrot Pairs Playground Pulse Sudoku Gradients
 ;
 SYSTEM_LIBS = libbe.so $(HAIKU_SHARED_LIBSTDC++) libmedia.so libtracker.so
 	libtranslation.so libbnetapi.so libnetwork.so libdebug.so libbsd.so



From alex at zappotek.com  Fri Aug  7 12:53:27 2009
From: alex at zappotek.com (Alexandre Deckner)
Date: Fri, 07 Aug 2009 12:53:27 +0200
Subject: [Haiku-commits] r32180 - haiku/trunk/build/jam
In-Reply-To: <200908071049.n77AnRhM029546@sheep.berlios.de>
References: <200908071049.n77AnRhM029546@sheep.berlios.de>
Message-ID: <4A7C07A7.3080606@zappotek.com>

aldeck at mail.berlios.de a ?crit :
> Author: aldeck
> Date: 2009-08-07 12:49:09 +0200 (Fri, 07 Aug 2009)
> New Revision: 32180
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32180&view=rev
>
> Modified:
>    haiku/trunk/build/jam/HaikuImage
> Log:
> * Added Haiku3d demo to the image. Removed GLDirectMode demo as discussed.
BTW, it still needs an icon. If someone's motivated go ahead. I'll give 
it a try otherwise.

Alex


From axeld at mail.berlios.de  Fri Aug  7 13:07:20 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 7 Aug 2009 13:07:20 +0200
Subject: [Haiku-commits] r32181 - in haiku/trunk/src:
	add-ons/kernel/drivers/graphics/vesa system/kernel/debug
Message-ID: <200908071107.n77B7KcD018663@sheep.berlios.de>

Author: axeld
Date: 2009-08-07 13:07:14 +0200 (Fri, 07 Aug 2009)
New Revision: 32181
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32181&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp
   haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp
Log:
* Setting the depth to 1 for VGA mode in frame_buffer_console_init() was not
  a good idea; it didn't have any consequences in there, but actually broke
  the app_server's support for the VGA mode.
* Cleanup.


Modified: haiku/trunk/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp	2009-08-07 10:49:09 UTC (rev 32180)
+++ haiku/trunk/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp	2009-08-07 11:07:14 UTC (rev 32181)
@@ -24,6 +24,8 @@
 get_color_space_for_depth(uint32 depth)
 {
 	switch (depth) {
+		case 1:
+			return B_GRAY1;
 		case 4:
 			return B_GRAY8;
 				// the app_server is smart enough to translate this to VGA mode

Modified: haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp	2009-08-07 10:49:09 UTC (rev 32180)
+++ haiku/trunk/src/system/kernel/debug/frame_buffer_console.cpp	2009-08-07 11:07:14 UTC (rev 32181)
@@ -51,7 +51,8 @@
 };
 
 // Palette is (white and black are exchanged):
-//	0 - white, 1 - blue, 2 - green, 3 - cyan, 4 - red, 5 - magenta, 6 - yellow, 7 - black
+//	0 - white, 1 - blue, 2 - green, 3 - cyan, 4 - red, 5 - magenta, 6 - yellow,
+//  7 - black
 //  8-15 - same but bright (we're ignoring those)
 
 static uint8 sPalette8[] = {
@@ -79,7 +80,7 @@
 
 static struct console_info sConsole;
 static struct frame_buffer_boot_info sBootInfo;
-static struct vesa_mode *sVesaModes;
+static struct vesa_mode* sVesaModes;
 
 
 static inline uint8
@@ -96,18 +97,18 @@
 }
 
 
-static uint8 *
+static uint8*
 get_palette_entry(uint8 index)
 {
 	switch (sConsole.depth) {
 		case 8:
 			return &sPalette8[index];
 		case 15:
-			return (uint8 *)&sPalette15[index];
+			return (uint8*)&sPalette15[index];
 		case 16:
-			return (uint8 *)&sPalette16[index];
+			return (uint8*)&sPalette16[index];
 		default:
-			return (uint8 *)&sPalette32[index];
+			return (uint8*)&sPalette32[index];
 	}
 }
 
@@ -120,10 +121,11 @@
 		glyph = 127;
 
 	if (sConsole.depth >= 8) {
-		uint8 *base = (uint8 *)(sConsole.frame_buffer + sConsole.bytes_per_row * y * CHAR_HEIGHT
+		uint8* base = (uint8*)(sConsole.frame_buffer
+			+ sConsole.bytes_per_row * y * CHAR_HEIGHT
 			+ x * CHAR_WIDTH * sConsole.bytes_per_pixel);
-		uint8 *color = get_palette_entry(foreground_color(attr));
-		uint8 *backgroundColor = get_palette_entry(background_color(attr));
+		uint8* color = get_palette_entry(foreground_color(attr));
+		uint8* backgroundColor = get_palette_entry(background_color(attr));
 
 		for (y = 0; y < CHAR_HEIGHT; y++) {
 			uint8 bits = FONT[CHAR_HEIGHT * glyph + y];
@@ -131,8 +133,10 @@
 				for (int32 i = 0; i < sConsole.bytes_per_pixel; i++) {
 					if (bits & 1)
 						base[x * sConsole.bytes_per_pixel + i] = color[i];
-					else
-						base[x * sConsole.bytes_per_pixel + i] = backgroundColor[i];
+					else {
+						base[x * sConsole.bytes_per_pixel + i]
+							= backgroundColor[i];
+					}
 				}
 				bits >>= 1;
 			}
@@ -140,9 +144,10 @@
 			base += sConsole.bytes_per_row;
 		}
 	} else {
-		// monochrome mode
+		// VGA mode will be treated as monochrome
+		// (ie. only the first plane will be used)
 
-		uint8 *base = (uint8 *)(sConsole.frame_buffer
+		uint8* base = (uint8*)(sConsole.frame_buffer
 			+ sConsole.bytes_per_row * y * CHAR_HEIGHT + x * CHAR_WIDTH / 8);
 		uint8 baseOffset =  (x * CHAR_WIDTH) & 0x7;
 
@@ -182,7 +187,7 @@
 	y *= CHAR_HEIGHT;
 	int32 endX = x + CHAR_WIDTH * sConsole.bytes_per_pixel;
 	int32 endY = y + CHAR_HEIGHT;
-	uint8 *base = (uint8 *)(sConsole.frame_buffer + y * sConsole.bytes_per_row);
+	uint8* base = (uint8*)(sConsole.frame_buffer + y * sConsole.bytes_per_row);
 
 	if (sConsole.depth < 8) {
 		x /= 8;
@@ -199,7 +204,7 @@
 
 
 static status_t
-console_get_size(int32 *_width, int32 *_height)
+console_get_size(int32* _width, int32* _height)
 {
 	*_width = sConsole.columns;
 	*_height = sConsole.rows;
@@ -280,9 +285,9 @@
 	}
 
 	for (int32 y = 0; y < height; y++) {
-		memmove((void *)(sConsole.frame_buffer + (desty + y)
+		memmove((void*)(sConsole.frame_buffer + (desty + y)
 				* sConsole.bytes_per_row + destx),
-			(void *)(sConsole.frame_buffer + (srcy + y) * sConsole.bytes_per_row
+			(void*)(sConsole.frame_buffer + (srcy + y) * sConsole.bytes_per_row
 				+ srcx), width);
 	}
 }
@@ -297,19 +302,19 @@
 	switch (sConsole.bytes_per_pixel) {
 		case 1:
 			if (sConsole.depth >= 8) {
-				memset((void *)sConsole.frame_buffer,
+				memset((void*)sConsole.frame_buffer,
 					sPalette8[background_color(attr)],
 					sConsole.height * sConsole.bytes_per_row);
 			} else {
 				// special case for VGA mode
-				memset((void *)sConsole.frame_buffer, 0xff,
+				memset((void*)sConsole.frame_buffer, 0xff,
 					sConsole.height * sConsole.bytes_per_row);
 			}
 			break;
 		default:
 		{
-			uint8 *base = (uint8 *)sConsole.frame_buffer;
-			uint8 *color = get_palette_entry(background_color(attr));
+			uint8* base = (uint8*)sConsole.frame_buffer;
+			uint8* color = get_palette_entry(background_color(attr));
 
 			for (int32 y = 0; y < sConsole.height; y++) {
 				for (int32 x = 0; x < sConsole.width; x++) {
@@ -359,10 +364,12 @@
 
 
 static status_t
-frame_buffer_update(addr_t baseAddress, int32 width, int32 height, int32 depth, int32 bytesPerRow)
+frame_buffer_update(addr_t baseAddress, int32 width, int32 height, int32 depth,
+	int32 bytesPerRow)
 {
-	TRACE(("frame_buffer_update(buffer = %p, width = %ld, height = %ld, depth = %ld, bytesPerRow = %ld)\n",
-		(void *)baseAddress, width, height, depth, bytesPerRow));
+	TRACE(("frame_buffer_update(buffer = %p, width = %ld, height = %ld, "
+		"depth = %ld, bytesPerRow = %ld)\n", (void*)baseAddress, width, height,
+		depth, bytesPerRow));
 
 	mutex_lock(&sConsole.lock);
 
@@ -380,7 +387,7 @@
 	sConsole.cursor_y = -1;
 
 	TRACE(("framebuffer mapped at %p, %ld columns, %ld rows\n",
-		(void *)sConsole.frame_buffer, sConsole.columns, sConsole.rows));
+		(void*)sConsole.frame_buffer, sConsole.columns, sConsole.rows));
 
 	mutex_unlock(&sConsole.lock);
 	return B_OK;
@@ -398,27 +405,21 @@
 
 
 status_t
-frame_buffer_console_init(kernel_args *args)
+frame_buffer_console_init(kernel_args* args)
 {
 	if (!args->frame_buffer.enabled)
 		return B_OK;
 
 	mutex_init(&sConsole.lock, "console_lock");
 
-	void *frameBuffer;
+	void* frameBuffer;
 	sConsole.area = map_physical_memory("vesa_fb",
-		(void *)args->frame_buffer.physical_buffer.start,
+		(void*)args->frame_buffer.physical_buffer.start,
 		args->frame_buffer.physical_buffer.size, B_ANY_KERNEL_ADDRESS,
 		B_READ_AREA | B_WRITE_AREA | B_USER_CLONEABLE_AREA, &frameBuffer);
 	if (sConsole.area < B_OK)
 		return sConsole.area;
 
-	if (args->frame_buffer.depth == 4) {
-		// VGA mode will be treated as monochrome
-		// (ie. only the first plane will be used)
-		args->frame_buffer.depth = 1;
-	}
-
 	frame_buffer_update((addr_t)frameBuffer, args->frame_buffer.width,
 		args->frame_buffer.height, args->frame_buffer.depth,
 		args->frame_buffer.bytes_per_row);
@@ -432,14 +433,14 @@
 	add_boot_item(FRAME_BUFFER_BOOT_INFO, &sBootInfo,
 		sizeof(frame_buffer_boot_info));
 
-	sVesaModes = (vesa_mode *)malloc(args->vesa_modes_size);
+	sVesaModes = (vesa_mode*)malloc(args->vesa_modes_size);
 	if (sVesaModes != NULL) {
 		memcpy(sVesaModes, args->vesa_modes, args->vesa_modes_size);
 		add_boot_item(VESA_MODES_BOOT_INFO, sVesaModes, args->vesa_modes_size);
 	}
 
 	if (args->edid_info != NULL) {
-		edid1_info *info = (edid1_info *)malloc(sizeof(edid1_info));
+		edid1_info* info = (edid1_info*)malloc(sizeof(edid1_info));
 		if (info != NULL) {
 			memcpy(info, args->edid_info, sizeof(edid1_info));
 			add_boot_item(VESA_EDID_BOOT_INFO, info, sizeof(edid1_info));
@@ -451,7 +452,7 @@
 
 
 status_t
-frame_buffer_console_init_post_modules(kernel_args *args)
+frame_buffer_console_init_post_modules(kernel_args* args)
 {
 	if (sConsole.frame_buffer == 0)
 		return B_OK;



From axeld at mail.berlios.de  Fri Aug  7 13:08:32 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 7 Aug 2009 13:08:32 +0200
Subject: [Haiku-commits] r32182 - haiku/trunk/src/servers/app/drawing
Message-ID: <200908071108.n77B8WEd019866@sheep.berlios.de>

Author: axeld
Date: 2009-08-07 13:08:31 +0200 (Fri, 07 Aug 2009)
New Revision: 32182
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32182&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
Log:
* This lets the app_server respect the boot loader's fail-safe video mode
  setting again. It still allows you to change the mode afterwards, though.
* This fixes bug #3419.


Modified: haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp	2009-08-07 11:07:14 UTC (rev 32181)
+++ haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp	2009-08-07 11:08:31 UTC (rev 32182)
@@ -96,7 +96,8 @@
 
 
 AccelerantHWInterface::AccelerantHWInterface()
-	:  HWInterface(),
+	:
+	HWInterface(),
 	fCardFD(-1),
 	fAccelerantImage(-1),
 	fAccelerantHook(NULL),
@@ -220,15 +221,14 @@
 	int device = -1;
 	int count = 0;
 	if (!use_fail_safe_video_mode()) {
-		// ToDo: the former R5 "stub" driver is called "vesa" under Haiku; however,
-		//	we do not need to avoid this driver this way when is has been ported
-		//	to the new driver architecture - the special case here can then be
-		//	removed.
+		// TODO: We do not need to avoid the "vesa" driver this way once it has
+		// been ported to the new driver architecture - the special case here
+		// can then be removed.
 		struct dirent *entry;
 		char path[PATH_MAX];
 		while (count < deviceNumber && (entry = readdir(directory)) != NULL) {
-			if (!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..") ||
-				!strcmp(entry->d_name, "stub") || !strcmp(entry->d_name, "vesa"))
+			if (!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")
+				|| !strcmp(entry->d_name, "vesa"))
 				continue;
 
 			if (device >= 0) {
@@ -518,7 +518,9 @@
 	}
 #endif
 
-	status_t status = fAccSetDisplayMode(&newMode);
+	status_t status = B_ERROR;
+	if (!use_fail_safe_video_mode() || !fInitialModeSwitch)
+		status = fAccSetDisplayMode(&newMode);
 	if (status != B_OK) {
 		ATRACE(("setting display mode failed\n"));
 		if (!fInitialModeSwitch)
@@ -534,14 +536,15 @@
 
 		if (fModeList == NULL) {
 			status = _UpdateModeList();
-			if (status < B_OK)
+			if (status != B_OK)
 				return status;
 		}
 
 		// If this is the initial mode switch, we try a number of fallback
 		// modes first, before we have to fail
 
-		status = _SetFallbackMode(newMode);
+		status = use_fail_safe_video_mode()
+			? B_ERROR : _SetFallbackMode(newMode);
 		if (status != B_OK) {
 			// The driver doesn't allow us the mode switch - this usually
 			// means we have a driver that doesn't allow mode switches at



From axeld at mail.berlios.de  Fri Aug  7 13:27:30 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 7 Aug 2009 13:27:30 +0200
Subject: [Haiku-commits] r32183 - haiku/trunk/src/servers/app/drawing
Message-ID: <200908071127.n77BRUUs018678@sheep.berlios.de>

Author: axeld
Date: 2009-08-07 13:27:30 +0200 (Fri, 07 Aug 2009)
New Revision: 32183
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32183&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
Log:
* Made the changes in r30278 depending on the USE_ACCELERATION define, ie. you
  can now easily turn it on again (see #2769).
* Also added OFFSCREEN_BACK_BUFFER define to enable the offscreen back buffer
  trick.


Modified: haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp	2009-08-07 11:08:31 UTC (rev 32182)
+++ haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp	2009-08-07 11:27:30 UTC (rev 32183)
@@ -52,7 +52,10 @@
 #	define ATRACE(x) ;
 #endif
 
+#define USE_ACCELERATION		0
+#define OFFSCREEN_BACK_BUFFER	0
 
+
 // This call updates the frame buffer used by the on-screen KDL
 extern "C" status_t _kern_frame_buffer_update(void *baseAddress,
 	int32 width, int32 height, int32 depth, int32 bytesPerRow);
@@ -508,7 +511,7 @@
 
 	bool tryOffscreenBackBuffer = false;
 	fOffscreenBackBuffer = false;
-#if 0
+#if USE_ACCELERATION && OFFSCREEN_BACK_BUFFER
 	if (fVGADevice < 0 && (color_space)newMode.space == B_RGB32) {
 		// we should have an accelerated graphics driver, try
 		// to allocate a frame buffer large enough to contain
@@ -597,7 +600,7 @@
 #endif
 
 	// update acceleration hooks
-#if 0
+#if USE_ACCELERATION
 	fAccFillRect = (fill_rectangle)fAccelerantHook(B_FILL_RECTANGLE,
 		(void *)&fDisplayMode);
 	fAccInvertRect = (invert_rectangle)fAccelerantHook(B_INVERT_RECTANGLE,
@@ -636,7 +639,7 @@
 			&& fFrontBuffer->ColorSpace() != B_RGBA32)
 			|| fVGADevice >= 0 || fOffscreenBackBuffer)
 			doubleBuffered = true;
-#if 1
+#if !USE_ACCELERATION
 		doubleBuffered = true;
 #endif
 



From bga at bug-br.org.br  Fri Aug  7 13:45:17 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Fri, 07 Aug 2009 08:45:17 -0300
Subject: [Haiku-commits] r32183 - haiku/trunk/src/servers/app/drawing
In-Reply-To: <200908071127.n77BRUUs018678@sheep.berlios.de>
References: <200908071127.n77BRUUs018678@sheep.berlios.de>
Message-ID: <4A7C13CD.9070207@bug-br.org.br>

axeld at BerliOS wrote:
> Author: axeld
> Date: 2009-08-07 13:27:30 +0200 (Fri, 07 Aug 2009)
> New Revision: 32183
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32183&view=rev
> 
> Modified:
>    haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
> Log:
> * Made the changes in r30278 depending on the USE_ACCELERATION define, ie. you
>   can now easily turn it on again (see #2769).
> * Also added OFFSCREEN_BACK_BUFFER define to enable the offscreen back buffer
>   trick.

Shouldn't the default be acceleration enabled? Also, maybe being able to 
set it externally (like USE_SSL) would make this even easier to test.

-Bruno



From axeld at pinc-software.de  Fri Aug  7 13:51:26 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Fri, 07 Aug 2009 13:51:26 +0200 CEST
Subject: [Haiku-commits] r32183 - haiku/trunk/src/servers/app/drawing
In-Reply-To: <4A7C13CD.9070207@bug-br.org.br>
Message-ID: <18563125327-BeMail@zon>

Bruno Albuquerque <bga at bug-br.org.br> wrote:
> axeld at BerliOS wrote:
> > Modified:
> >    haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
> > Log:
> > * Made the changes in r30278 depending on the USE_ACCELERATION 
> > define, ie. you
> >   can now easily turn it on again (see #2769).
> > * Also added OFFSCREEN_BACK_BUFFER define to enable the offscreen 
> > back buffer
> >   trick.
> Shouldn't the default be acceleration enabled?

As Stephan pointed out acceleration is actually counter productive on 
newer machines (mostly because how our acceleration stuff works), so 
no.

> Also, maybe being able to 
> set it externally (like USE_SSL) would make this even easier to test.

It's supposed to be a temporary solution only, see #2769.

Bye,
   Axel.



From axeld at mail.berlios.de  Fri Aug  7 14:29:18 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 7 Aug 2009 14:29:18 +0200
Subject: [Haiku-commits] r32184 - haiku/trunk/src/system/kernel/fs
Message-ID: <200908071229.n77CTIQI022641@sheep.berlios.de>

Author: axeld
Date: 2009-08-07 14:29:17 +0200 (Fri, 07 Aug 2009)
New Revision: 32184
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32184&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/fd.cpp
   haiku/trunk/src/system/kernel/fs/vfs.cpp
Log:
* Replaced all "status < B_OK" with != B_OK - this should make the VFS layer
  more robust against broken (userland) file systems.
* 80 character column cleanup.


Modified: haiku/trunk/src/system/kernel/fs/fd.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/fd.cpp	2009-08-07 11:27:30 UTC (rev 32183)
+++ haiku/trunk/src/system/kernel/fs/fd.cpp	2009-08-07 12:29:17 UTC (rev 32184)
@@ -1,10 +1,12 @@
 /*
- * Copyright 2002-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2002-2009, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
+
 //! Operations on file descriptors
 
+
 #include <fd.h>
 
 #include <stdlib.h>
@@ -31,7 +33,7 @@
 
 static struct file_descriptor* get_fd_locked(struct io_context* context,
 	int fd);
-static struct file_descriptor *remove_fd(struct io_context *context, int fd);
+static struct file_descriptor* remove_fd(struct io_context* context, int fd);
 static void deselect_select_infos(file_descriptor* descriptor,
 	select_info* infos);
 
@@ -83,28 +85,30 @@
 };
 
 
-/*** General fd routines ***/
+//	#pragma mark - General fd routines
 
 
 #ifdef DEBUG
-void dump_fd(int fd, struct file_descriptor *descriptor);
+void dump_fd(int fd, struct file_descriptor* descriptor);
 
 void
-dump_fd(int fd,struct file_descriptor *descriptor)
+dump_fd(int fd,struct file_descriptor* descriptor)
 {
-	dprintf("fd[%d] = %p: type = %ld, ref_count = %ld, ops = %p, u.vnode = %p, u.mount = %p, cookie = %p, open_mode = %lx, pos = %Ld\n",
-		fd, descriptor, descriptor->type, descriptor->ref_count, descriptor->ops,
-		descriptor->u.vnode, descriptor->u.mount, descriptor->cookie, descriptor->open_mode, descriptor->pos);
+	dprintf("fd[%d] = %p: type = %ld, ref_count = %ld, ops = %p, u.vnode = %p, "
+		"u.mount = %p, cookie = %p, open_mode = %lx, pos = %Ld\n",
+		fd, descriptor, descriptor->type, descriptor->ref_count,
+		descriptor->ops, descriptor->u.vnode, descriptor->u.mount,
+		descriptor->cookie, descriptor->open_mode, descriptor->pos);
 }
 #endif
 
 
-/** Allocates and initializes a new file_descriptor */
-
-struct file_descriptor *
+/*! Allocates and initializes a new file_descriptor.
+*/
+struct file_descriptor*
 alloc_fd(void)
 {
-	file_descriptor *descriptor
+	file_descriptor* descriptor
 		= (file_descriptor*)malloc(sizeof(struct file_descriptor));
 	if (descriptor == NULL)
 		return NULL;
@@ -121,14 +125,14 @@
 
 
 bool
-fd_close_on_exec(struct io_context *context, int fd)
+fd_close_on_exec(struct io_context* context, int fd)
 {
 	return CHECK_BIT(context->fds_close_on_exec[fd / 8], fd & 7) ? true : false;
 }
 
 
 void
-fd_set_close_on_exec(struct io_context *context, int fd, bool closeFD)
+fd_set_close_on_exec(struct io_context* context, int fd, bool closeFD)
 {
 	if (closeFD)
 		context->fds_close_on_exec[fd / 8] |= (1 << (fd & 7));
@@ -137,12 +141,12 @@
 }
 
 
-/** Searches a free slot in the FD table of the provided I/O context, and inserts
- *	the specified descriptor into it.
- */
-
+/*!	Searches a free slot in the FD table of the provided I/O context, and
+	inserts the specified descriptor into it.
+*/
 int
-new_fd_etc(struct io_context *context, struct file_descriptor *descriptor, int firstIndex)
+new_fd_etc(struct io_context* context, struct file_descriptor* descriptor,
+	int firstIndex)
 {
 	int fd = -1;
 	uint32 i;
@@ -172,18 +176,17 @@
 
 
 int
-new_fd(struct io_context *context, struct file_descriptor *descriptor)
+new_fd(struct io_context* context, struct file_descriptor* descriptor)
 {
 	return new_fd_etc(context, descriptor, 0);
 }
 
 
-/**	Reduces the descriptor's reference counter, and frees all resources
- *	when it's no longer used.
- */
-
+/*!	Reduces the descriptor's reference counter, and frees all resources
+	when it's no longer used.
+*/
 void
-put_fd(struct file_descriptor *descriptor)
+put_fd(struct file_descriptor* descriptor)
 {
 	int32 previous = atomic_add(&descriptor->ref_count, -1);
 
@@ -221,12 +224,11 @@
 }
 
 
-/**	Decrements the open counter of the file descriptor and invokes
- *	its close hook when appropriate.
- */
-
+/*!	Decrements the open counter of the file descriptor and invokes
+	its close hook when appropriate.
+*/
 void
-close_fd(struct file_descriptor *descriptor)
+close_fd(struct file_descriptor* descriptor)
 {
 	if (atomic_add(&descriptor->open_count, -1) == 1) {
 		vfs_unlock_vnode_if_locked(descriptor);
@@ -238,9 +240,9 @@
 
 
 status_t
-close_fd_index(struct io_context *context, int fd)
+close_fd_index(struct io_context* context, int fd)
 {
-	struct file_descriptor *descriptor = remove_fd(context, fd);
+	struct file_descriptor* descriptor = remove_fd(context, fd);
 
 	if (descriptor == NULL)
 		return B_FILE_ERROR;
@@ -253,34 +255,33 @@
 }
 
 
-/**	This descriptor's underlying object will be closed and freed
- *	as soon as possible (in one of the next calls to put_fd() -
- *	get_fd() will no longer succeed on this descriptor).
- *	This is useful if the underlying object is gone, for instance
- *	when a (mounted) volume got removed unexpectedly.
- */
-
+/*!	This descriptor's underlying object will be closed and freed as soon as
+	possible (in one of the next calls to put_fd() - get_fd() will no longer
+	succeed on this descriptor).
+	This is useful if the underlying object is gone, for instance when a
+	(mounted) volume got removed unexpectedly.
+*/
 void
-disconnect_fd(struct file_descriptor *descriptor)
+disconnect_fd(struct file_descriptor* descriptor)
 {
 	descriptor->open_mode |= O_DISCONNECTED;
 }
 
 
 void
-inc_fd_ref_count(struct file_descriptor *descriptor)
+inc_fd_ref_count(struct file_descriptor* descriptor)
 {
 	atomic_add(&descriptor->ref_count, 1);
 }
 
 
-static struct file_descriptor *
-get_fd_locked(struct io_context *context, int fd)
+static struct file_descriptor*
+get_fd_locked(struct io_context* context, int fd)
 {
 	if (fd < 0 || (uint32)fd >= context->table_size)
 		return NULL;
 
-	struct file_descriptor *descriptor = context->fds[fd];
+	struct file_descriptor* descriptor = context->fds[fd];
 
 	if (descriptor != NULL) {
 		// Disconnected descriptors cannot be accessed anymore
@@ -294,8 +295,8 @@
 }
 
 
-struct file_descriptor *
-get_fd(struct io_context *context, int fd)
+struct file_descriptor*
+get_fd(struct io_context* context, int fd)
 {
 	MutexLocker _(context->io_mutex);
 
@@ -303,12 +304,12 @@
 }
 
 
-struct file_descriptor *
-get_open_fd(struct io_context *context, int fd)
+struct file_descriptor*
+get_open_fd(struct io_context* context, int fd)
 {
 	MutexLocker _(context->io_mutex);
 
-	file_descriptor *descriptor = get_fd_locked(context, fd);
+	file_descriptor* descriptor = get_fd_locked(context, fd);
 	if (descriptor == NULL)
 		return NULL;
 
@@ -318,13 +319,12 @@
 }
 
 
-/**	Removes the file descriptor from the specified slot.
- */
-
-static struct file_descriptor *
-remove_fd(struct io_context *context, int fd)
+/*!	Removes the file descriptor from the specified slot.
+*/
+static struct file_descriptor*
+remove_fd(struct io_context* context, int fd)
 {
-	struct file_descriptor *descriptor = NULL;
+	struct file_descriptor* descriptor = NULL;
 
 	if (fd < 0)
 		return NULL;
@@ -361,8 +361,8 @@
 static int
 dup_fd(int fd, bool kernel)
 {
-	struct io_context *context = get_current_io_context(kernel);
-	struct file_descriptor *descriptor;
+	struct io_context* context = get_current_io_context(kernel);
+	struct file_descriptor* descriptor;
 	int status;
 
 	TRACE(("dup_fd: fd = %d\n", fd));
@@ -395,8 +395,8 @@
 static int
 dup2_fd(int oldfd, int newfd, bool kernel)
 {
-	struct file_descriptor *evicted = NULL;
-	struct io_context *context;
+	struct file_descriptor* evicted = NULL;
+	struct io_context* context;
 
 	TRACE(("dup2_fd: ofd = %d, nfd = %d\n", oldfd, newfd));
 
@@ -490,9 +490,9 @@
 
 
 static status_t
-fd_ioctl(bool kernelFD, int fd, ulong op, void *buffer, size_t length)
+fd_ioctl(bool kernelFD, int fd, ulong op, void* buffer, size_t length)
 {
-	struct file_descriptor *descriptor;
+	struct file_descriptor* descriptor;
 	int status;
 
 	descriptor = get_fd(get_current_io_context(kernelFD), fd);
@@ -663,15 +663,15 @@
 }
 
 
-/** This function checks if the specified fd is valid in the current
- *	context. It can be used for a quick check; the fd is not locked
- *	so it could become invalid immediately after this check.
- */
-
+/*!	This function checks if the specified fd is valid in the current
+	context. It can be used for a quick check; the fd is not locked
+	so it could become invalid immediately after this check.
+*/
 bool
 fd_is_valid(int fd, bool kernel)
 {
-	struct file_descriptor *descriptor = get_fd(get_current_io_context(kernel), fd);
+	struct file_descriptor* descriptor
+		= get_fd(get_current_io_context(kernel), fd);
 	if (descriptor == NULL)
 		return false;
 
@@ -680,8 +680,8 @@
 }
 
 
-struct vnode *
-fd_vnode(struct file_descriptor *descriptor)
+struct vnode*
+fd_vnode(struct file_descriptor* descriptor)
 {
 	switch (descriptor->type) {
 		case FDTYPE_FILE:
@@ -703,7 +703,7 @@
 
 
 static ssize_t
-common_user_io(int fd, off_t pos, void *buffer, size_t length, bool write)
+common_user_io(int fd, off_t pos, void* buffer, size_t length, bool write)
 {
 	if (!IS_USER_ADDRESS(buffer))
 		return B_BAD_ADDRESS;
@@ -739,7 +739,7 @@
 	else
 		status = descriptor->ops->fd_read(descriptor, pos, buffer, &length);
 
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	if (movePosition)
@@ -750,7 +750,7 @@
 
 
 static ssize_t
-common_user_vector_io(int fd, off_t pos, const iovec *userVecs, size_t count,
+common_user_vector_io(int fd, off_t pos, const iovec* userVecs, size_t count,
 	bool write)
 {
 	if (!IS_USER_ADDRESS(userVecs))
@@ -759,7 +759,7 @@
 	if (pos < -1)
 		return B_BAD_VALUE;
 
-	/* prevent integer overflow exploit in malloc() */
+	// prevent integer overflow exploit in malloc()
 	if (count > IOV_MAX)
 		return B_BAD_VALUE;
 
@@ -778,7 +778,7 @@
 		return B_NO_MEMORY;
 	MemoryDeleter _(vecs);
 
-	if (user_memcpy(vecs, userVecs, sizeof(iovec) * count) < B_OK)
+	if (user_memcpy(vecs, userVecs, sizeof(iovec) * count) != B_OK)
 		return B_BAD_ADDRESS;
 
 	bool movePosition = false;
@@ -805,7 +805,7 @@
 				&length);
 		}
 
-		if (status < B_OK) {
+		if (status != B_OK) {
 			if (bytesTransferred == 0)
 				return status;
 			status = B_OK;
@@ -831,7 +831,7 @@
 
 
 status_t
-user_fd_kernel_ioctl(int fd, ulong op, void *buffer, size_t length)
+user_fd_kernel_ioctl(int fd, ulong op, void* buffer, size_t length)
 {
 	TRACE(("user_fd_kernel_ioctl: fd %d\n", fd));
 
@@ -843,28 +843,28 @@
 
 
 ssize_t
-_user_read(int fd, off_t pos, void *buffer, size_t length)
+_user_read(int fd, off_t pos, void* buffer, size_t length)
 {
 	return common_user_io(fd, pos, buffer, length, false);
 }
 
 
 ssize_t
-_user_readv(int fd, off_t pos, const iovec *userVecs, size_t count)
+_user_readv(int fd, off_t pos, const iovec* userVecs, size_t count)
 {
 	return common_user_vector_io(fd, pos, userVecs, count, false);
 }
 
 
 ssize_t
-_user_write(int fd, off_t pos, const void *buffer, size_t length)
+_user_write(int fd, off_t pos, const void* buffer, size_t length)
 {
 	return common_user_io(fd, pos, (void*)buffer, length, true);
 }
 
 
 ssize_t
-_user_writev(int fd, off_t pos, const iovec *userVecs, size_t count)
+_user_writev(int fd, off_t pos, const iovec* userVecs, size_t count)
 {
 	return common_user_vector_io(fd, pos, userVecs, count, true);
 }
@@ -875,7 +875,7 @@
 {
 	syscall_64_bit_return_value();
 
-	struct file_descriptor *descriptor;
+	struct file_descriptor* descriptor;
 
 	descriptor = get_fd(get_current_io_context(false), fd);
 	if (!descriptor)
@@ -894,7 +894,7 @@
 
 
 status_t
-_user_ioctl(int fd, ulong op, void *buffer, size_t length)
+_user_ioctl(int fd, ulong op, void* buffer, size_t length)
 {
 	if (!IS_USER_ADDRESS(buffer))
 		return B_BAD_ADDRESS;
@@ -908,15 +908,17 @@
 
 
 ssize_t
-_user_read_dir(int fd, struct dirent *buffer, size_t bufferSize, uint32 maxCount)
+_user_read_dir(int fd, struct dirent* buffer, size_t bufferSize,
+	uint32 maxCount)
 {
-	struct file_descriptor *descriptor;
+	struct file_descriptor* descriptor;
 	ssize_t retval;
 
 	if (!IS_USER_ADDRESS(buffer))
 		return B_BAD_ADDRESS;
 
-	TRACE(("user_read_dir(fd = %d, buffer = %p, bufferSize = %ld, count = %lu)\n", fd, buffer, bufferSize, maxCount));
+	TRACE(("user_read_dir(fd = %d, buffer = %p, bufferSize = %ld, count = "
+		"%lu)\n", fd, buffer, bufferSize, maxCount));
 
 	struct io_context* ioContext = get_current_io_context(false);
 	descriptor = get_fd(ioContext, fd);
@@ -940,7 +942,7 @@
 status_t
 _user_rewind_dir(int fd)
 {
-	struct file_descriptor *descriptor;
+	struct file_descriptor* descriptor;
 	status_t status;
 
 	TRACE(("user_rewind_dir(fd = %d)\n", fd));
@@ -984,13 +986,13 @@
 
 
 ssize_t
-_kern_read(int fd, off_t pos, void *buffer, size_t length)
+_kern_read(int fd, off_t pos, void* buffer, size_t length)
 {
 	if (pos < -1)
 		return B_BAD_VALUE;
 
 	FDGetter fdGetter;
-	struct file_descriptor *descriptor = fdGetter.SetTo(fd, true);
+	struct file_descriptor* descriptor = fdGetter.SetTo(fd, true);
 
 	if (!descriptor)
 		return B_FILE_ERROR;
@@ -1025,7 +1027,7 @@
 
 
 ssize_t
-_kern_readv(int fd, off_t pos, const iovec *vecs, size_t count)
+_kern_readv(int fd, off_t pos, const iovec* vecs, size_t count)
 {
 	bool movePosition = false;
 	status_t status;
@@ -1035,7 +1037,7 @@
 		return B_BAD_VALUE;
 
 	FDGetter fdGetter;
-	struct file_descriptor *descriptor = fdGetter.SetTo(fd, true);
+	struct file_descriptor* descriptor = fdGetter.SetTo(fd, true);
 
 	if (!descriptor)
 		return B_FILE_ERROR;
@@ -1058,7 +1060,7 @@
 		size_t length = vecs[i].iov_len;
 		status = descriptor->ops->fd_read(descriptor, pos, vecs[i].iov_base,
 			&length);
-		if (status < B_OK) {
+		if (status != B_OK) {
 			bytesRead = status;
 			break;
 		}
@@ -1079,13 +1081,13 @@
 
 
 ssize_t
-_kern_write(int fd, off_t pos, const void *buffer, size_t length)
+_kern_write(int fd, off_t pos, const void* buffer, size_t length)
 {
 	if (pos < -1)
 		return B_BAD_VALUE;
 
 	FDGetter fdGetter;
-	struct file_descriptor *descriptor = fdGetter.SetTo(fd, true);
+	struct file_descriptor* descriptor = fdGetter.SetTo(fd, true);
 
 	if (descriptor == NULL)
 		return B_FILE_ERROR;
@@ -1120,7 +1122,7 @@
 
 
 ssize_t
-_kern_writev(int fd, off_t pos, const iovec *vecs, size_t count)
+_kern_writev(int fd, off_t pos, const iovec* vecs, size_t count)
 {
 	bool movePosition = false;
 	status_t status;
@@ -1130,7 +1132,7 @@
 		return B_BAD_VALUE;
 
 	FDGetter fdGetter;
-	struct file_descriptor *descriptor = fdGetter.SetTo(fd, true);
+	struct file_descriptor* descriptor = fdGetter.SetTo(fd, true);
 
 	if (!descriptor)
 		return B_FILE_ERROR;
@@ -1153,7 +1155,7 @@
 		size_t length = vecs[i].iov_len;
 		status = descriptor->ops->fd_write(descriptor, pos,
 			vecs[i].iov_base, &length);
-		if (status < B_OK) {
+		if (status != B_OK) {
 			bytesWritten = status;
 			break;
 		}
@@ -1176,7 +1178,7 @@
 off_t
 _kern_seek(int fd, off_t pos, int seekType)
 {
-	struct file_descriptor *descriptor;
+	struct file_descriptor* descriptor;
 
 	descriptor = get_fd(get_current_io_context(true), fd);
 	if (!descriptor)
@@ -1193,7 +1195,7 @@
 
 
 status_t
-_kern_ioctl(int fd, ulong op, void *buffer, size_t length)
+_kern_ioctl(int fd, ulong op, void* buffer, size_t length)
 {
 	TRACE(("kern_ioctl: fd %d\n", fd));
 
@@ -1204,12 +1206,14 @@
 
 
 ssize_t
-_kern_read_dir(int fd, struct dirent *buffer, size_t bufferSize, uint32 maxCount)
+_kern_read_dir(int fd, struct dirent* buffer, size_t bufferSize,
+	uint32 maxCount)
 {
-	struct file_descriptor *descriptor;
+	struct file_descriptor* descriptor;
 	ssize_t retval;
 
-	TRACE(("sys_read_dir(fd = %d, buffer = %p, bufferSize = %ld, count = %lu)\n",fd, buffer, bufferSize, maxCount));
+	TRACE(("sys_read_dir(fd = %d, buffer = %p, bufferSize = %ld, count = "
+		"%lu)\n",fd, buffer, bufferSize, maxCount));
 
 	struct io_context* ioContext = get_current_io_context(true);
 	descriptor = get_fd(ioContext, fd);
@@ -1233,7 +1237,7 @@
 status_t
 _kern_rewind_dir(int fd)
 {
-	struct file_descriptor *descriptor;
+	struct file_descriptor* descriptor;
 	status_t status;
 
 	TRACE(("sys_rewind_dir(fd = %d)\n",fd));

Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-08-07 11:27:30 UTC (rev 32183)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-08-07 12:29:17 UTC (rev 32184)
@@ -7,6 +7,7 @@
  * Distributed under the terms of the NewOS License.
  */
 
+
 /*! Virtual File System and File System Interface Layer */
 
 
@@ -457,16 +458,16 @@
 static status_t file_deselect(struct file_descriptor* descriptor, uint8 event,
 	struct selectsync* sync);
 static status_t dir_read(struct io_context* context,
-	struct file_descriptor* descriptor, struct dirent* buffer, size_t bufferSize,
-	uint32* _count);
+	struct file_descriptor* descriptor, struct dirent* buffer,
+	size_t bufferSize, uint32* _count);
 static status_t dir_read(struct io_context* ioContext, struct vnode* vnode,
 	void* cookie, struct dirent* buffer, size_t bufferSize, uint32* _count);
 static status_t dir_rewind(struct file_descriptor* descriptor);
 static void dir_free_fd(struct file_descriptor* descriptor);
 static status_t dir_close(struct file_descriptor* descriptor);
 static status_t attr_dir_read(struct io_context* context,
-	struct file_descriptor* descriptor, struct dirent* buffer, size_t bufferSize,
-	uint32* _count);
+	struct file_descriptor* descriptor, struct dirent* buffer,
+	size_t bufferSize, uint32* _count);
 static status_t attr_dir_rewind(struct file_descriptor* descriptor);
 static void attr_dir_free_fd(struct file_descriptor* descriptor);
 static status_t attr_dir_close(struct file_descriptor* descriptor);
@@ -483,14 +484,14 @@
 static status_t attr_write_stat(struct file_descriptor* descriptor,
 	const struct stat* stat, int statMask);
 static status_t index_dir_read(struct io_context* context,
-	struct file_descriptor* descriptor, struct dirent* buffer, size_t bufferSize,
-	uint32* _count);
+	struct file_descriptor* descriptor, struct dirent* buffer,
+	size_t bufferSize, uint32* _count);
 static status_t index_dir_rewind(struct file_descriptor* descriptor);
 static void index_dir_free_fd(struct file_descriptor* descriptor);
 static status_t index_dir_close(struct file_descriptor* descriptor);
 static status_t query_read(struct io_context* context,
-	struct file_descriptor* descriptor, struct dirent* buffer, size_t bufferSize,
-	uint32* _count);
+	struct file_descriptor* descriptor, struct dirent* buffer,
+	size_t bufferSize, uint32* _count);
 static status_t query_rewind(struct file_descriptor* descriptor);
 static void query_free_fd(struct file_descriptor* descriptor);
 static status_t query_close(struct file_descriptor* descriptor);
@@ -995,7 +996,8 @@
 	struct vnode* vnode = (struct vnode*)_vnode;
 	const struct vnode_hash_key* key = (vnode_hash_key*)_key;
 
-#define VHASH(mountid, vnodeid) (((uint32)((vnodeid) >> 32) + (uint32)(vnodeid)) ^ (uint32)(mountid))
+#define VHASH(mountid, vnodeid) \
+	(((uint32)((vnodeid) >> 32) + (uint32)(vnodeid)) ^ (uint32)(mountid))
 
 	if (vnode != NULL)
 		return VHASH(vnode->device, vnode->id) % range;
@@ -1190,7 +1192,8 @@
 inc_vnode_ref_count(struct vnode* vnode)
 {
 	atomic_add(&vnode->ref_count, 1);
-	TRACE(("inc_vnode_ref_count: vnode %p, ref now %ld\n", vnode, vnode->ref_count));
+	TRACE(("inc_vnode_ref_count: vnode %p, ref now %ld\n", vnode,
+		vnode->ref_count));
 }
 
 
@@ -1288,7 +1291,7 @@
 	} else {
 		// we need to create a new vnode and read it in
 		status = create_new_vnode(&vnode, mountID, vnodeID);
-		if (status < B_OK)
+		if (status != B_OK)
 			goto err;
 
 		vnode->busy = true;
@@ -1314,7 +1317,7 @@
 
 		mutex_lock(&sVnodeMutex);
 
-		if (status < B_OK) {
+		if (status != B_OK) {
 			if (gotNode)
 				FS_CALL(vnode, put_vnode, reenter);
 
@@ -1432,9 +1435,9 @@
 
 	mutex_unlock(&sVnodeMutex);
 
-	if (lock >= B_OK)
+	if (lock >= 0)
 		lock = acquire_sem(lock);
-	if (lock < B_OK) {
+	if (lock < 0) {
 		// This means the locking has been deleted in the mean time
 		// or had never existed in the first place - otherwise, we
 		// would get the lock at some point.
@@ -1469,11 +1472,11 @@
 			lockingDeleter.SetTo(locking);
 
 			locking->wait_sem = create_sem(0, "advisory lock");
-			if (locking->wait_sem < B_OK)
+			if (locking->wait_sem < 0)
 				return locking->wait_sem;
 
 			locking->lock = create_sem(0, "advisory locking");
-			if (locking->lock < B_OK)
+			if (locking->lock < 0)
 				return locking->lock;
 		}
 
@@ -1760,7 +1763,7 @@
 				return EOPNOTSUPP;
 
 			status = FS_CALL(vnode, read_stat, &stat);
-			if (status < B_OK)
+			if (status != B_OK)
 				return status;
 
 			flock->l_start += stat.st_size;
@@ -2144,7 +2147,7 @@
 		return get_vnode(dir->device, id, _vnode, true, false);
 
 	status_t status = FS_CALL(dir, lookup, name, &id);
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	mutex_lock(&sVnodeMutex);
@@ -2197,7 +2200,8 @@
 		struct vnode* nextVnode;
 		char* nextPath;
 
-		TRACE(("vnode_path_to_vnode: top of loop. p = %p, p = '%s'\n", path, path));
+		TRACE(("vnode_path_to_vnode: top of loop. p = %p, p = '%s'\n", path,
+			path));
 
 		// done?
 		if (path[0] == '\0')
@@ -2242,12 +2246,12 @@
 		if (status == B_OK && HAS_FS_CALL(vnode, access))
 			status = FS_CALL(vnode, access, X_OK);
 
-		// Tell the filesystem to get the vnode of this path component (if we got the
-		// permission from the call above)
-		if (status >= B_OK)
+		// Tell the filesystem to get the vnode of this path component (if we
+		// got the permission from the call above)
+		if (status == B_OK)
 			status = lookup_dir_entry(vnode, path, &nextVnode);
 
-		if (status < B_OK) {
+		if (status != B_OK) {
 			put_vnode(vnode);
 			return status;
 		}
@@ -2261,7 +2265,8 @@
 
 			TRACE(("traverse link\n"));
 
-			// it's not exactly nice style using goto in this way, but hey, it works :-/
+			// it's not exactly nice style using goto in this way, but hey,
+			// it works :-/
 			if (count + 1 > B_MAX_SYMLINKS) {
 				status = B_LINK_LIMIT;
 				goto resolve_link_error;
@@ -2282,7 +2287,7 @@
 			} else
 				status = B_BAD_VALUE;
 
-			if (status < B_OK) {
+			if (status != B_OK) {
 				free(buffer);
 
 		resolve_link_error:
@@ -2327,7 +2332,7 @@
 
 			free(buffer);
 
-			if (status < B_OK) {
+			if (status != B_OK) {
 				put_vnode(vnode);
 				return status;
 			}
@@ -2418,7 +2423,8 @@
 	The path buffer must be able to store at least one additional character.
 */
 static status_t
-path_to_dir_vnode(char* path, struct vnode** _vnode, char* filename, bool kernel)
+path_to_dir_vnode(char* path, struct vnode** _vnode, char* filename,
+	bool kernel)
 {
 	status_t status = get_dir_path_and_leaf(path, filename);
 	if (status != B_OK)
@@ -2529,7 +2535,8 @@
 	// See if vnode is the root of a mount and move to the covered
 	// vnode so we get the underlying file system
 	VNodePutter vnodePutter;
-	if (vnode->mount->root_vnode == vnode && vnode->mount->covers_vnode != NULL) {
+	if (vnode->mount->root_vnode == vnode
+		&& vnode->mount->covers_vnode != NULL) {
 		vnode = vnode->mount->covers_vnode;
 		inc_vnode_ref_count(vnode);
 		vnodePutter.SetTo(vnode);
@@ -2556,7 +2563,7 @@
 			uint32 num = 1;
 			status = dir_read(ioContext, parent, cookie, buffer, bufferSize,
 				&num);
-			if (status < B_OK)
+			if (status != B_OK)
 				break;
 			if (num == 0) {
 				status = B_ENTRY_NOT_FOUND;
@@ -2662,7 +2669,7 @@
 			inc_vnode_ref_count(vnode);
 		} else {
 			status = lookup_dir_entry(vnode, "..", &parentVnode);
-			if (status < B_OK)
+			if (status != B_OK)
 				goto out;
 		}
 
@@ -2684,7 +2691,7 @@
 		put_vnode(vnode);
 		vnode = parentVnode;
 
-		if (status < B_OK)
+		if (status != B_OK)
 			goto out;
 
 		if (hitRoot) {
@@ -2778,7 +2785,8 @@
 static struct file_descriptor*
 get_fd_and_vnode(int fd, struct vnode** _vnode, bool kernel)
 {
-	struct file_descriptor* descriptor = get_fd(get_current_io_context(kernel), fd);
+	struct file_descriptor* descriptor
+		= get_fd(get_current_io_context(kernel), fd);
 	if (descriptor == NULL)
 		return NULL;
 
@@ -3122,7 +3130,8 @@
 	struct fs_mount* mount;
 
 	hash_open(sMountsTable, &iterator);
-	while ((mount = (struct fs_mount*)hash_next(sMountsTable, &iterator)) != NULL) {
+	while ((mount = (struct fs_mount*)hash_next(sMountsTable, &iterator))
+			!= NULL) {
 		kprintf("%p%4ld %p %p %p %s\n", mount, mount->id, mount->root_vnode,
 			mount->covers_vnode, mount->volume->private_volume,
 			mount->volume->file_system_name);
@@ -3285,9 +3294,10 @@
 		if (fd == NULL)
 			continue;
 
-		kprintf("  %3lu: %ld %p %3ld %4ld %4lx %10Ld %p %s %p\n", i, fd->type, fd->ops,
-			fd->ref_count, fd->open_count, fd->open_mode, fd->pos, fd->cookie,
-			fd->type >= FDTYPE_INDEX && fd->type <= FDTYPE_QUERY ? "mount" : "vnode",
+		kprintf("  %3lu: %ld %p %3ld %4ld %4lx %10Ld %p %s %p\n", i, fd->type,
+			fd->ops, fd->ref_count, fd->open_count, fd->open_mode, fd->pos,
+			fd->cookie, fd->type >= FDTYPE_INDEX && fd->type <= FDTYPE_QUERY
+				? "mount" : "vnode",
 			fd->u.vnode);
 	}
 
@@ -3392,7 +3402,7 @@
 			// sparse read
 			status = zero_pages(&vecs[vecIndex], vecCount - vecIndex, &size);
 		}
-		if (status < B_OK)
+		if (status != B_OK)
 			return status;
 
 		// TODO: this is a work-around for buggy device drivers!
@@ -3401,7 +3411,8 @@
 		//	   overwrite precious data)
 		//	b) panic if the term below is true (at least for writes)
 		if (size > fileVecs[0].length) {
-			//dprintf("warning: device driver %p doesn't respect total length in read_pages() call!\n", ref->device);
+			//dprintf("warning: device driver %p doesn't respect total length "
+			//	"in read_pages() call!\n", ref->device);
 			size = fileVecs[0].length;
 		}
 
@@ -3500,7 +3511,7 @@
 				status = FS_CALL(vnode, read_pages, cookie, fileOffset,
 					tempVecs, tempCount, &bytes);
 			}
-			if (status < B_OK)
+			if (status != B_OK)
 				return status;
 
 			totalSize += bytes;
@@ -3960,7 +3971,7 @@
 
 	struct vnode* vnode;
 	status_t status = path_to_vnode(buffer, true, &vnode, NULL, kernel);
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	*_vnode = vnode;
@@ -3974,7 +3985,7 @@
 	struct vnode* vnode;
 
 	status_t status = get_vnode(mountID, vnodeID, &vnode, canWait, false);
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	*_vnode = vnode;
@@ -4031,7 +4042,7 @@
 
 	fs_mount* mount;
 	status_t status = get_mount(volume->id, &mount);
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	char* buffer = pathBuffer.LockBuffer();
@@ -4050,7 +4061,7 @@
 
 	put_mount(mount);
 
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	if (vnode->device != volume->id) {
@@ -4123,7 +4134,7 @@
 		return B_BUFFER_OVERFLOW;
 
 	status = path_to_vnode(pathBuffer, true, &dir, NULL, true);
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	// the path buffer had been clobbered by the above call
@@ -4153,7 +4164,7 @@
 		moduleName = nextPath;
 
 		status = vnode_path_to_vnode(dir, path, true, 0, true, &file, NULL);
-		if (status < B_OK) {
+		if (status != B_OK) {
 			// vnode_path_to_vnode() has already released the reference to dir
 			return status;
 		}
@@ -4172,8 +4183,8 @@
 
 			return B_OK;
 		} else {
-			TRACE(("vfs_get_module_path(): something is strange here: 0x%08lx...\n",
-				file->type));
+			TRACE(("vfs_get_module_path(): something is strange here: "
+				"0x%08lx...\n", file->type));
 			status = B_ERROR;
 			dir = file;
 			goto err;
@@ -4351,7 +4362,7 @@
 	struct vnode* vnode;
 
 	status_t status = get_vnode(mountID, vnodeID, &vnode, true, true);
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	disconnect_mount_or_vnode_fds(vnode->mount, vnode);
@@ -4483,7 +4494,8 @@
 vfs_get_file_map(struct vnode* vnode, off_t offset, size_t size,
 	file_io_vec* vecs, size_t* _count)
 {
-	FUNCTION(("vfs_get_file_map: vnode %p, vecs %p, offset %Ld, size = %lu\n", vnode, vecs, offset, size));
+	FUNCTION(("vfs_get_file_map: vnode %p, vecs %p, offset %Ld, size = %lu\n",
+		vnode, vecs, offset, size));
 
 	return FS_CALL(vnode, get_file_map, offset, size, vecs, _count);
 }
@@ -4510,7 +4522,7 @@
 {
 	struct vnode* vnode;
 	status_t status = get_vnode(device, inode, &vnode, true, false);
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	status = FS_CALL(vnode, read_stat, stat);
@@ -4553,14 +4565,14 @@
 		leaf = NULL;
 	} else
 		status = get_vnode(device, inode, &vnode, true, false);
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	// get the directory path
 	status = dir_vnode_to_path(vnode, path, pathLength, true);
 	put_vnode(vnode);
 		// we don't need the vnode anymore
-	if (status < B_OK)
+	if (status != B_OK)
 		return status;
 
 	// append the leaf name
@@ -4931,13 +4943,19 @@

[... truncated: 890 lines follow ...]


From axeld at pinc-software.de  Fri Aug  7 14:31:53 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Fri, 07 Aug 2009 14:31:53 +0200 CEST
Subject: [Haiku-commits] r32180 - haiku/trunk/build/jam
In-Reply-To: <4A7C07A7.3080606@zappotek.com>
Message-ID: <20990469902-BeMail@zon>

Alexandre Deckner <alex at zappotek.com> wrote:
> > Log:
> > * Added Haiku3d demo to the image. Removed GLDirectMode demo as 
> > discussed.
> BTW, it still needs an icon. If someone's motivated go ahead. I'll 
> give 
> it a try otherwise.

Don't you want to add mouse control of the viewport, similar to what 
GLTeapot is doing? :-)

Bye,
   Axel.



From anevilyak at gmail.com  Fri Aug  7 14:36:53 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Fri, 7 Aug 2009 07:36:53 -0500
Subject: [Haiku-commits] r32173 - haiku/trunk/src/kits/interface
In-Reply-To: <200908070722.n777MwMc005658@sheep.berlios.de>
References: <200908070722.n777MwMc005658@sheep.berlios.de>
Message-ID: <f019d2f30908070536p707c6897kc0ad3cb75d3cbf38@mail.gmail.com>

On Fri, Aug 7, 2009 at 2:22 AM, axeld at BerliOS<axeld at mail.berlios.de> wrote:
> Author: axeld
> Date: 2009-08-07 09:22:56 +0200 (Fri, 07 Aug 2009)
> New Revision: 32173
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32173&view=rev
>
> Modified:
> ? haiku/trunk/src/kits/interface/BMCPrivate.cpp
> Log:
> * Only take the popup marker into account if fShowPopUpMarker is true.
> * Automatic whitespace cleanup.

Thanks! I didn't realize it was possible for BMenuField to not show that marker.

Regards,

Rene


From alex at zappotek.com  Fri Aug  7 15:06:07 2009
From: alex at zappotek.com (Alexandre Deckner)
Date: Fri, 07 Aug 2009 15:06:07 +0200
Subject: [Haiku-commits] r32180 - haiku/trunk/build/jam
In-Reply-To: <20990469902-BeMail@zon>
References: <20990469902-BeMail@zon>
Message-ID: <4A7C26BF.5030402@zappotek.com>

Axel D?rfler a ?crit :
> Alexandre Deckner <alex at zappotek.com> wrote:
>   
>>> Log:
>>> * Added Haiku3d demo to the image. Removed GLDirectMode demo as 
>>> discussed.
>>>       
>> BTW, it still needs an icon. If someone's motivated go ahead. I'll 
>> give 
>> it a try otherwise.
>>     
>
> Don't you want to add mouse control of the viewport, similar to what 
> GLTeapot is doing? :-)
>
>   
Well, i've done it locally for another demo based on the same code (a 
google earth like demo),
but couldn't find a use for the haiku logo demo really :) Maybe just 
some variations on the animation via a menu, but mouse movement, i'm not 
sure.
I've other ideas though (with some working code already): video texures, 
for dropping videos on an object, and an audio-in media node to do 
animation from audio.

The way i designed the code, it is meant to be reusable from several 
demos, it's a minimalist 3d engine. I haven't decided if several demos 
would be accessible from a menu on the same app, or if separate apps 
should be done, and thus i'd have to make a library of it. Both should 
be doable.

It's always hard to restrain oneself, but i really didn't want to bloat 
the code to early while the core has yet to mature a bit :)
For now, i wanted to let it mature a bit in the image while my head is 
stuck in Tracker's PoseView 8-)

Best regards,
Alex



From stippi at mail.berlios.de  Fri Aug  7 15:18:27 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 7 Aug 2009 15:18:27 +0200
Subject: [Haiku-commits] r32185 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg
Message-ID: <200908071318.n77DIR3Q031719@sheep.berlios.de>

Author: stippi
Date: 2009-08-07 15:18:26 +0200 (Fri, 07 Aug 2009)
New Revision: 32185
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32185&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
Log:
* In the AVCodecDecoder, use the audio format of the original input format,
  but specify it to 16bits/sample if it's still a wildcard. Make sure to
  allocate the scrub buffer with the correct sample size (was hardcoded to 2
  bytes per sample).
* In the AVFormatReader, specify the sample format for B_MEDIA_ENCODED_AUDIO.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp	2009-08-07 12:29:17 UTC (rev 32184)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp	2009-08-07 13:18:26 UTC (rev 32185)
@@ -334,7 +334,11 @@
 		= fInputFormat.u.encoded_audio.output.frame_rate;
 	outputAudioFormat.channel_count
 		= fInputFormat.u.encoded_audio.output.channel_count;
-	outputAudioFormat.format = media_raw_audio_format::B_AUDIO_SHORT;
+	outputAudioFormat.format = fInputFormat.u.encoded_audio.output.format;
+	// Check that format is not still a wild card!
+	if (outputAudioFormat.format == 0)
+		outputAudioFormat.format = media_raw_audio_format::B_AUDIO_SHORT;
+
 	outputAudioFormat.buffer_size
 		= 1024 * fInputFormat.u.encoded_audio.output.channel_count;
 	inOutFormat->type = B_MEDIA_RAW_AUDIO;
@@ -367,7 +371,9 @@
 		result);
 
 	fStartTime = 0;
-	fOutputFrameSize = 2 * outputAudioFormat.channel_count;
+	size_t sampleSize = outputAudioFormat.format
+		& media_raw_audio_format::B_AUDIO_SIZE_MASK;
+	fOutputFrameSize = sampleSize * outputAudioFormat.channel_count;
 	fOutputFrameCount = outputAudioFormat.buffer_size / fOutputFrameSize;
 	fOutputFrameRate = outputAudioFormat.frame_rate;
 	fChunkBuffer = 0;

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp	2009-08-07 12:29:17 UTC (rev 32184)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp	2009-08-07 13:18:26 UTC (rev 32185)
@@ -479,7 +479,7 @@
 			format->u.encoded_audio.frame_size = codecContext->frame_size;
 			// Fill in some info about possible output format
 			format->u.encoded_audio.output
-				= media_multi_audio_format::wildcard;
+				= avformat_to_beos_format(codecContext->sample_fmt);
 			format->u.encoded_audio.output.frame_rate
 				= (float)codecContext->sample_rate;
 			format->u.encoded_audio.output.channel_count



From mattmadia at gmail.com  Fri Aug  7 15:27:11 2009
From: mattmadia at gmail.com (mattmadia at gmail.com)
Date: Fri, 07 Aug 2009 06:27:11 -0700 (PDT)
Subject: [Haiku-commits] BOM: r32185 - ...failed
	C++	/objects/haiku/--arch--/release/add-ons/media/plugins/ffmpeg/AVFormatReader.o	...
Message-ID: <4a7c2baf.1d045a0a.09a2.ffffb98b@mx.google.com>

Host Machine          : FreeBSD 7.2-RELEASE i386
Host Machine 32|64bit : 32bit
use-xattr             : True
use-32bit             : False
Architectures Tested  :
ppc
	x86gcc2
	x86gcc4
	x86gcc2hybrid
	x86gcc4hybrid
Targets Affected      :

	x86gcc4- at alpha-cd
	x86gcc4- at alpha-raw
	x86gcc4- at alpha-vmware
	x86gcc2- at alpha-cd
	x86gcc2- at alpha-raw
	x86gcc2- at alpha-vmware
	x86gcc2hybrid- at alpha-cd
	x86gcc2hybrid- at alpha-raw
	x86gcc2hybrid- at alpha-vmware
	x86gcc4hybrid- at alpha-cd
	x86gcc4hybrid- at alpha-raw
	x86gcc4hybrid- at alpha-vmware
Log Snippet :

AddSymlinkToContainerCopyFilesScript <HaikuImage>system/add-ons/kernel/boot/scsi_disk 
AddSymlinkToContainerCopyFilesScript <HaikuImage>system/add-ons/kernel/boot/usb_disk 
AddSymlinkToContainerCopyFilesScript <HaikuImage>system/add-ons/kernel/boot/intel 
AddSymlinkToContainerCopyFilesScript <HaikuImage>system/add-ons/kernel/boot/bfs 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/accelerants 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/opengl 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/Translators 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/inbound_protocols 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/outbound_protocols 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/inbound_filters 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/outbound_filters 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/system_filters 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media 
C++ /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/AVFormatReader.o 
/storage/Build-o-Matic/haiku/haiku/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp: In member function 'status_t AVFormatReader::StreamCookie::Init(int32)':
/storage/Build-o-Matic/haiku/haiku/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp:482: error: no match for 'operator=' in 'format->media_format::u.media_format::<anonymous union>::encoded_audio.media_encoded_audio_format::output = avformat_to_beos_format(codecContext->AVCodecContext::sample_fmt)'
/storage/Build-o-Matic/haiku/haiku/headers/os/media/MediaDefs.h:242: note: candidates are: media_raw_audio_format& media_raw_audio_format::operator=(const media_raw_audio_format&)

/storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/bin/i586-pc-haiku-gcc -c "/storage/Build-o-Matic/haiku/haiku/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp" -O -Wall -Wno-trigraphs -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wpointer-arith -Wcast-align -Wsign-compare -Wno-multichar -pipe -fno-strict-aliasing -fno-tree-vrp -nostdinc -Wno-deprecated -D_ZETA_USING_DEPRECATED_API_=1 -D_ZETA_TS_FIND_DIR_=1 -D__HAIKU__ -DHAIKU_DISTRO_COMPATIBILITY_DEFAULT -D__INTEL__ -DARCH_x86 -DBOOT_ARCHIVE_IMAGE_OFFSET=300 -DHAIKU_TARGET_PLATFORM_HAIKU -iquote /storage/Build-o-Matic/haiku/haiku/build/user_config_headers -iquote /storage/Build-o-Matic/haiku/haiku/build/config_headers -iquote /storage/Build-o-Matic/haiku/haiku/src/add-ons/media/plugins/ffmpeg -iquote /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/common/add-ons/media/plugins/ffmpeg -iquote /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/freebsd/x86/common/add-ons/media/plugins/ffmpeg -iquote /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/haiku/x86/common/add-ons/media/plugins/ffmpeg -iquote /storage/Build-o-Matic/haiku/haiku/src/add-ons/media/plugins/ffmpeg/libavcodec -iquote /storage/Build-o-Matic/haiku/haiku/src/add-ons/media/plugins/ffmpeg/libavformat -iquote /storage/Build-o-Matic/haiku/haiku/src/add-ons/media/plugins/ffmpeg/libavutil -iquote /storage/Build-o-Matic/haiku/haiku/src/add-ons/media/plugins/ffmpeg/libswscale -I /storage/Build-o-Matic/haiku/haiku/headers/private/media -I /storage/Build-o-Matic/haiku/haiku/headers/private/shared -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3 -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3/i586-pc-haiku -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3/backward -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3/ext -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/include -I /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/include-fixed -I /storage/Build-o-Matic/haiku/haiku/headers -I /storage/Build-o-Matic/haiku/haiku/headers/posix -I /storage/Build-o-Matic/haiku/haiku/headers/gnu -I /storage/Build-o-Matic/haiku/haiku/headers/glibc -I /storage/Build-o-Matic/haiku/haiku/headers/os -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/file_system -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/graphics -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/input_server -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/registrar -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/screen_saver -I /storage/Build-o-Matic/haiku/haiku/headers/os/add-ons/tracker -I /storage/Build-o-Matic/haiku/haiku/headers/os/app -I /storage/Build-o-Matic/haiku/haiku/headers/os/device -I /storage/Build-o-Matic/haiku/haiku/headers/os/drivers -I /storage/Build-o-Matic/haiku/haiku/headers/os/game -I /storage/Build-o-Matic/haiku/haiku/headers/os/interface -I /storage/Build-o-Matic/haiku/haiku/headers/os/kernel -I /storage/Build-o-Matic/haiku/haiku/headers/os/media -I /storage/Build-o-Matic/haiku/haiku/headers/os/mail -I /storage/Build-o-Matic/haiku/haiku/headers/os/midi -I /storage/Build-o-Matic/haiku/haiku/headers/os/midi2 -I /storage/Build-o-Matic/haiku/haiku/headers/os/net -I /storage/Build-o-Matic/haiku/haiku/headers/os/opengl -I /storage/Build-o-Matic/haiku/haiku/headers/os/storage -I /storage/Build-o-Matic/haiku/haiku/headers/os/support -I /storage/Build-o-Matic/haiku/haiku/headers/os/translation -I /storage/Build-o-Matic/haiku/haiku/headers/private/. -o "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/AVFormatReader.o" ;

...failed C++ /storage/Build-o-Matic/haiku/haiku/generated.x86gcc4/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/AVFormatReader.o ...
...skipped ffmpeg for lack of <src!add-ons!media!plugins!ffmpeg>AVFormatReader.o...
...skipped <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media/plugins for lack of ffmpeg...
...skipped haiku-alpha.vmdk for lack of <HaikuImage>haiku.image-copy-files...
...failed updating 1 target(s)...
...skipped 3 target(s)...
...updated 255 target(s)...
command: jam -q -j1 @alpha-vmware


From stippi at mail.berlios.de  Fri Aug  7 15:54:20 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 7 Aug 2009 15:54:20 +0200
Subject: [Haiku-commits] r32186 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg
Message-ID: <200908071354.n77DsKog006418@sheep.berlios.de>

Author: stippi
Date: 2009-08-07 15:54:18 +0200 (Fri, 07 Aug 2009)
New Revision: 32186
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32186&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
Log:
Sorry, reverted r32185, as it was complete bogus and didn't even compile (got
confused about what I already compiled here). The sample format was already
specified.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp	2009-08-07 13:18:26 UTC (rev 32185)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp	2009-08-07 13:54:18 UTC (rev 32186)
@@ -479,7 +479,7 @@
 			format->u.encoded_audio.frame_size = codecContext->frame_size;
 			// Fill in some info about possible output format
 			format->u.encoded_audio.output
-				= avformat_to_beos_format(codecContext->sample_fmt);
+				= media_multi_audio_format::wildcard;
 			format->u.encoded_audio.output.frame_rate
 				= (float)codecContext->sample_rate;
 			format->u.encoded_audio.output.channel_count



From axeld at pinc-software.de  Fri Aug  7 16:19:46 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Fri, 07 Aug 2009 16:19:46 +0200 CEST
Subject: [Haiku-commits] r32180 - haiku/trunk/build/jam
In-Reply-To: <4A7C26BF.5030402@zappotek.com>
Message-ID: <27463526220-BeMail@zon>

Alexandre Deckner <alex at zappotek.com> wrote:
> Axel D?rfler a ?crit :
> > Don't you want to add mouse control of the viewport, similar to 
> > what 
> > GLTeapot is doing? :-)
> Well, i've done it locally for another demo based on the same code (a 
> google earth like demo),
> but couldn't find a use for the haiku logo demo really :) Maybe just 
> some variations on the animation via a menu, but mouse movement, i'm 
> not 
> sure.

Maybe I expressed myself incorrectly: I meant only changing the 
rotation of the logo, not its position; just so that you have something 
to say about what it does, too :-)

[...]
> It's always hard to restrain oneself, but i really didn't want to 
> bloat 
> the code to early while the core has yet to mature a bit :)
> For now, i wanted to let it mature a bit in the image while my head 
> is 
> stuck in Tracker's PoseView 8-)

Hopefully not too long :-)

Bye,
   Axel.



From mmlr at mail.berlios.de  Fri Aug  7 16:39:17 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Fri, 7 Aug 2009 16:39:17 +0200
Subject: [Haiku-commits] r32187 - haiku/trunk/src/kits/app
Message-ID: <200908071439.n77EdHue012855@sheep.berlios.de>

Author: mmlr
Date: 2009-08-07 16:39:15 +0200 (Fri, 07 Aug 2009)
New Revision: 32187
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32187&view=rev

Modified:
   haiku/trunk/src/kits/app/Message.cpp
Log:
Minor cleanup.


Modified: haiku/trunk/src/kits/app/Message.cpp
===================================================================
--- haiku/trunk/src/kits/app/Message.cpp	2009-08-07 13:54:18 UTC (rev 32186)
+++ haiku/trunk/src/kits/app/Message.cpp	2009-08-07 14:39:15 UTC (rev 32187)
@@ -977,21 +977,21 @@
 
 	ssize_t result1 = stream->Write(fHeader, sizeof(message_header));
 	if (result1 != sizeof(message_header))
-		return (result1 >= 0 ? B_ERROR : result1);
+		return result1 < 0 ? result1 : B_ERROR;
 
 	ssize_t result2 = 0;
 	if (fHeader->field_count > 0) {
 		ssize_t fieldsSize = fHeader->field_count * sizeof(field_header);
 		result2 = stream->Write(fFields, fieldsSize);
 		if (result2 != fieldsSize)
-			return (result2 >= 0 ? B_ERROR : result2);
+			return result2 < 0 ? result2 : B_ERROR;
 	}
 
 	ssize_t result3 = 0;
 	if (fHeader->data_size > 0) {
 		result3 = stream->Write(fData, fHeader->data_size);
 		if (result3 != (ssize_t)fHeader->data_size)
-			return (result3 >= 0 ? B_ERROR : result3);
+			return result3 < 0 ? result3 : B_ERROR;
 	}
 
 	if (size)
@@ -1273,12 +1273,10 @@
 	uint8 *header = (uint8 *)fHeader;
 	ssize_t result = stream->Read(header + sizeof(uint32),
 		sizeof(message_header) - sizeof(uint32));
-	result -= sizeof(message_header) - sizeof(uint32);
-
-	if (result != B_OK || fHeader->format != MESSAGE_FORMAT_HAIKU
+	if (result != sizeof(message_header) - sizeof(uint32)
 		|| (fHeader->flags & MESSAGE_FLAG_VALID) == 0) {
 		_InitHeader();
-		return B_BAD_VALUE;
+		return result < 0 ? result : B_BAD_VALUE;
 	}
 
 	what = fHeader->what;



From stippi at mail.berlios.de  Fri Aug  7 16:54:19 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 7 Aug 2009 16:54:19 +0200
Subject: [Haiku-commits] r32188 - in
	haiku/trunk/src/add-ons/media/plugins/ffmpeg: . libavcodec/x86
Message-ID: <200908071454.n77EsJsc014517@sheep.berlios.de>

Author: stippi
Date: 2009-08-07 16:54:17 +0200 (Fri, 07 Aug 2009)
New Revision: 32188
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32188&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
Log:
* Disabled GPL H.264 ASM code
* Enabled WAV muxer.
* Updated configure line in config.h to be closer to what it could have been
  to produce the current config.h, but a lot of encoders and muxers are enabled
  manually at the moment, so this line wouldn't produce the config.h as is.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp	2009-08-07 14:39:15 UTC (rev 32187)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp	2009-08-07 14:54:17 UTC (rev 32188)
@@ -55,6 +55,19 @@
 //		"ogg",
 //		{ 0 }
 //	},
+	{
+		media_file_format::B_WRITABLE
+			| media_file_format::B_KNOWS_ENCODED_AUDIO,
+		{ 0 },
+		B_WAV_FORMAT_FAMILY,
+		100,
+		{ 0 },
+		"audio/x-wav",
+		"WAV Format",
+		"wav",
+		"wav",
+		{ 0 }
+	},
 };
 
 const size_t gMuxerCount = sizeof(gMuxerTable) / sizeof(media_file_format);

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-07 14:39:15 UTC (rev 32187)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-07 14:54:17 UTC (rev 32188)
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--prefix=/boot/common/ --enable-shared --enable-gpl --disable-debug --disable-mmx --disable-demuxer=audio-beos --disable-muxer=audio-beos --disable-encoders --disable-parsers --disable-demuxers --disable-muxers"
+#define FFMPEG_CONFIGURATION "--prefix=/boot/common/ --enable-shared --disable-debug --disable-mmx --disable-demuxer=audio-beos --disable-muxer=audio-beos"
 #define FFMPEG_DATADIR "/boot/common//share/ffmpeg"
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
@@ -717,7 +717,7 @@
 #define CONFIG_TGP_MUXER 0
 #define CONFIG_VC1T_MUXER 0
 #define CONFIG_VOC_MUXER 0
-#define CONFIG_WAV_MUXER 0
+#define CONFIG_WAV_MUXER 1
 #define CONFIG_YUV4MPEGPIPE_MUXER 0
 #define CONFIG_LIBNUT_MUXER 0
 #define CONFIG_CROP_FILTER 1

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile	2009-08-07 14:39:15 UTC (rev 32187)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile	2009-08-07 14:54:17 UTC (rev 32188)
@@ -44,8 +44,8 @@
 		idct_sse2_xvid.c
 		vp3dsp_sse2.c
 		vp6dsp_sse2.c
-		h264_idct_sse2.nasm
-		h264_deblock_sse2.nasm
+#		h264_idct_sse2.nasm # GPL
+#		h264_deblock_sse2.nasm # GPL
 	;
 }
 



From stippi at mail.berlios.de  Fri Aug  7 17:21:38 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 7 Aug 2009 17:21:38 +0200
Subject: [Haiku-commits] r32189 - in
	haiku/trunk/src/add-ons/media/plugins/ffmpeg: . libavcodec
Message-ID: <200908071521.n77FLcBG018959@sheep.berlios.de>

Author: stippi
Date: 2009-08-07 17:21:37 +0200 (Fri, 07 Aug 2009)
New Revision: 32189
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32189&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
Log:
Disabled the rest of the GPL code as per the FFmpeg 0.5 README.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-07 14:54:17 UTC (rev 32188)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-07 15:21:37 UTC (rev 32189)
@@ -284,14 +284,14 @@
 #define CONFIG_ZLIB_DECODER 1
 #define CONFIG_ZMBV_DECODER 1
 #define CONFIG_AAC_DECODER 1
-#define CONFIG_AC3_DECODER 1
+#define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 1
 #define CONFIG_APE_DECODER 1
 #define CONFIG_ATRAC3_DECODER 1
 #define CONFIG_COOK_DECODER 1
 #define CONFIG_DCA_DECODER 1
 #define CONFIG_DSICINAUDIO_DECODER 1
-#define CONFIG_EAC3_DECODER 1
+#define CONFIG_EAC3_DECODER 0
 #define CONFIG_FLAC_DECODER 1
 #define CONFIG_IMC_DECODER 1
 #define CONFIG_MACE3_DECODER 1

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile	2009-08-07 14:54:17 UTC (rev 32188)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile	2009-08-07 15:21:37 UTC (rev 32189)
@@ -27,8 +27,8 @@
 	aasc.c
 	ac3.c
 	ac3_parser.c
-	ac3dec.c
-	ac3dec_data.c
+#	ac3dec.c # GPL
+#	ac3dec_data.c # GPL
 	ac3enc.c
 	ac3tab.c
 	acelp_filters.c
@@ -92,7 +92,7 @@
 	faandct.c
 	faanidct.c
 	faxcompr.c
-#	fdctref.c
+#	fdctref.c # GPL, only used for DCT test program
 	fft.c
 	ffv1.c
 	flacdec.c



From jonas at kirilla.com  Fri Aug  7 19:08:53 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Fri, 07 Aug 2009 19:08:53 +0200 CEST
Subject: [Haiku-commits] r32180 - haiku/trunk/build/jam
In-Reply-To: <4A7C26BF.5030402@zappotek.com>
Message-ID: <8008305023-BeMail@kirilla>

Alexandre Deckner <alex at zappotek.com> wrote:
 ...
> while my head is stuck in Tracker's PoseView 8-)

Could I persuade you to have a look at
http://dev.haiku-os.org/ticket/4191#comment:1

/Jonas.



From stippi at mail.berlios.de  Fri Aug  7 19:14:43 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 7 Aug 2009 19:14:43 +0200
Subject: [Haiku-commits] r32190 - haiku/trunk/build/jam
Message-ID: <200908071714.n77HEhTa018399@sheep.berlios.de>

Author: stippi
Date: 2009-08-07 19:14:33 +0200 (Fri, 07 Aug 2009)
New Revision: 32190
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32190&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Updated the Clockwerk package to a version that has persistent options in the
render settings window.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-08-07 15:21:37 UTC (rev 32189)
+++ haiku/trunk/build/jam/OptionalPackages	2009-08-07 17:14:33 UTC (rev 32190)
@@ -204,15 +204,15 @@
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Clockwerk available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc4-2009-08-04
-			: $(baseURL)/Clockwerk-0.0.1-x86-gcc4-2009-08-04.zip
+		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc4-2009-08-06
+			: $(baseURL)/Clockwerk-0.0.1-x86-gcc4-2009-08-06.zip
 			:
 		;
 		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/Clockwerk/Clockwerk ;
 	} else {
-		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc2-2009-08-04
-			: $(baseURL)/Clockwerk-0.0.1-x86-gcc2-2009-08-04.zip
+		InstallOptionalHaikuImagePackage Clockwerk-0.0.1-x86-gcc2-2009-08-06
+			: $(baseURL)/Clockwerk-0.0.1-x86-gcc2-2009-08-06.zip
 			:
 		;
 		AddSymlinkToHaikuImage home config be Applications



From stippi at mail.berlios.de  Fri Aug  7 19:19:35 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 7 Aug 2009 19:19:35 +0200
Subject: [Haiku-commits] r32191 - in
	haiku/trunk/src/add-ons/media/plugins/ffmpeg: . libavcodec/x86
Message-ID: <200908071719.n77HJZrb025581@sheep.berlios.de>

Author: stippi
Date: 2009-08-07 19:19:32 +0200 (Fri, 07 Aug 2009)
New Revision: 32191
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32191&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/Jamfile
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
Log:
Include GPL code in the FFmpeg plugin during compilation, if the Haiku build
system has been configured to include GPL add-ons. This cannot be switched on
the fly without rebuilding all of the FFmpeg plugin, since the change in the
Jamfile defines will not automatically trigger a rebuild. So if you change your
configuration with regards to --include-gpl-addons, you have to touch config.h
(this commit touches it anyway).


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/Jamfile	2009-08-07 17:14:33 UTC (rev 32190)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/Jamfile	2009-08-07 17:19:32 UTC (rev 32191)
@@ -24,7 +24,7 @@
 	gfx_conv_c_lookup.cpp
 #	gfx_conv_mmx.cpp
  	gfx_util.cpp
-	:  
+	:
 	libavformat.a
 	libavcodec.a
 	libavcodec_$(TARGET_ARCH).a
@@ -72,7 +72,7 @@
 	HAIKU_FFMPEG_DEFINES += ARCH_PPC=1 ;
 	HAIKU_FFMPEG_DEFINES += ARCH_SPARC=0 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
-	HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ; 
+	HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_ALTIVEC=1 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_VIS=0 ;
 } else if $(TARGET_ARCH) = sparc {
@@ -80,11 +80,18 @@
 	HAIKU_FFMPEG_DEFINES += ARCH_PPC=0 ;
 	HAIKU_FFMPEG_DEFINES += ARCH_SPARC=1 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
-	HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ; 
+	HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_ALTIVEC=0 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_VIS=1 ;
 }
 
+if $(INCLUDE_GPL_ADDONS) = 1 {
+	HAIKU_FFMPEG_DEFINES += CONFIG_GPL=1 ;
+} else {
+	HAIKU_FFMPEG_DEFINES += CONFIG_GPL=0 ;
+}
+
+
 HAIKU_FFMPEG_DEFINES = [ FDefines $(HAIKU_FFMPEG_DEFINES) ] ;
 
 SubInclude HAIKU_TOP src add-ons media plugins ffmpeg libavcodec ;

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-07 17:14:33 UTC (rev 32190)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h	2009-08-07 17:19:32 UTC (rev 32191)
@@ -123,7 +123,7 @@
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
-#define CONFIG_GPL 0
+//#define CONFIG_GPL 0 // defined in Jamfile depending on build config
 #define CONFIG_GPROF 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 1

Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile	2009-08-07 17:14:33 UTC (rev 32190)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile	2009-08-07 17:19:32 UTC (rev 32191)
@@ -21,7 +21,6 @@
 		dsputil_mmx.c
 		dsputilenc_mmx.c
 		fdct_mmx.c
-#		idct_mmx.c # GPL
 		idct_mmx_xvid.c
 		motion_est_mmx.c
 		mpegvideo_mmx.c
@@ -34,6 +33,11 @@
 		fft_mmx.nasm
 		dsputil_yasm.nasm
 	;
+	if $(INCLUDE_GPL_ADDONS) = 1 {
+		mmxSources +=
+			idct_mmx.c
+		;
+	}
 }
 
 local sseSources = ;
@@ -44,9 +48,13 @@
 		idct_sse2_xvid.c
 		vp3dsp_sse2.c
 		vp6dsp_sse2.c
-#		h264_idct_sse2.nasm # GPL
-#		h264_deblock_sse2.nasm # GPL
 	;
+	if $(INCLUDE_GPL_ADDONS) = 1 {
+		sseSources +=
+			h264_idct_sse2.nasm
+			h264_deblock_sse2.nasm
+		;
+	}
 }
 
 local amdSources = ;



From alex at zappotek.com  Fri Aug  7 19:34:13 2009
From: alex at zappotek.com (Alexandre Deckner)
Date: Fri, 07 Aug 2009 19:34:13 +0200
Subject: [Haiku-commits] r32180 - haiku/trunk/build/jam
In-Reply-To: <8008305023-BeMail@kirilla>
References: <8008305023-BeMail@kirilla>
Message-ID: <4A7C6595.3030506@zappotek.com>

Jonas Sundstr?m a ?crit :
> Alexandre Deckner <alex at zappotek.com> wrote:
>  ...
>   
>> while my head is stuck in Tracker's PoseView 8-)
>>     
>
> Could I persuade you to have a look at
> http://dev.haiku-os.org/ticket/4191#comment:1

If only i had time for enhancements :D Have you seen the bug list?

Best regards,
Alex





From jonas at kirilla.com  Fri Aug  7 19:59:55 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Fri, 07 Aug 2009 19:59:55 +0200 CEST
Subject: [Haiku-commits] r32180 - haiku/trunk/build/jam
In-Reply-To: <4A7C6595.3030506@zappotek.com>
Message-ID: <11070895063-BeMail@kirilla>

Alexandre Deckner <alex at zappotek.com> wrote:
> Jonas Sundstr?m a ?crit :
> > Alexandre Deckner <alex at zappotek.com> wrote:
> >  ...
> >   
> >> while my head is stuck in Tracker's PoseView 8-)
> >>     
> >
> > Could I persuade you to have a look at
> > http://dev.haiku-os.org/ticket/4191#comment:1
> 
> If only i had time for enhancements :D Have you seen the bug list?

I can imagine. But I actually do consider what I'm describing
in the comment a bug. I would like to be able to pop in a CD,
press Alt-A, Alt-O and have it play in a single MediaPlayer 
(playlist) rather than in 10 concurrent MediaPlayer.

/Jonas.



From mattmadia at gmail.com  Fri Aug  7 21:22:38 2009
From: mattmadia at gmail.com (mattmadia at gmail.com)
Date: Fri, 07 Aug 2009 12:22:38 -0700 (PDT)
Subject: [Haiku-commits] BOM: r32191 - ...failed
	Link	/objects/haiku/--arch--/release/add-ons/media/plugins/ffmpeg/ffmpeg	...
Message-ID: <4a7c7efe.07035a0a.124d.42f3@mx.google.com>

Host Machine          : FreeBSD 7.2-RELEASE i386
Host Machine 32|64bit : 32bit
use-xattr             : True
use-32bit             : False
Architectures Tested  :
	ppc
	x86gcc2
	x86gcc4
	x86gcc2hybrid
	x86gcc4hybrid
Targets Affected      :

	x86gcc2hybrid- at alpha-cd
	x86gcc2hybrid- at alpha-raw
	x86gcc2hybrid- at alpha-vmware
	x86gcc2- at alpha-cd
	x86gcc2- at alpha-raw
	x86gcc2- at alpha-vmware
Log Snippet :

AddSymlinkToContainerCopyFilesScript <HaikuImage>system/add-ons/kernel/boot/bfs 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/accelerants 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/opengl 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/Translators 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/inbound_protocols 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/outbound_protocols 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/inbound_filters 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/outbound_filters 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/system_filters 
AppendToContainerCopyFilesScript <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media 
Link /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/ffmpeg 
/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/libavcodec/x86/libavcodec_x86.a(dsputil_mmx.o): In function `ff_x264_deblock_v_luma_intra_mmxext':
dsputil_mmx.c:(.text+0x1f5a4): undefined reference to `ff_x264_deblock_v8_luma_intra_mmxext'
dsputil_mmx.c:(.text+0x1f5b4): undefined reference to `ff_x264_deblock_v8_luma_intra_mmxext'
collect2: ld returned 1 exit status

/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/bin/i586-pc-haiku-gcc -pipe -nostart -Xlinker -soname="ffmpeg" -nostdlib -Xlinker --no-undefined -o "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/ffmpeg"  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/system/glue/arch/x86/crti.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-090629/crtbegin.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/system/glue/init_term_dyn.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/AVCodecDecoder.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/AVCodecEncoder.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/AVFormatReader.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/AVFormatWriter.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/CodecTable.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/DemuxerTable.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/EncoderTable.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/FFmpegPlugin.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/MuxerTable.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/gfx_conv_c.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/gfx_conv_c_lookup.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/gfx_util.o" \
"/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/libavformat/libavformat.a" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/libavcodec/libavcodec.a" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/libavcodec/x86/libavcodec_x86.a" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/libavutil/libavutil.a" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/libswscale/libswscale.a" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/kits/libbe.so" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/kits/media/libmedia.so" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/libs/zlib/libz.a" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/system/libroot/libroot.so"  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-090629/crtend.o" "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/system/glue/arch/x86/crtn.o" \


...failed Link /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/media/plugins/ffmpeg/ffmpeg ...
...skipped <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media/plugins for lack of ffmpeg...
...skipped haiku-alpha.vmdk for lack of <HaikuImage>haiku.image-copy-files...
...failed updating 1 target(s)...
...skipped 2 target(s)...
...updated 261 target(s)...
command: jam -q -j1 @alpha-vmware


From superstippi at gmx.de  Fri Aug  7 22:21:27 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Fri, 07 Aug 2009 22:21:27 +0200
Subject: [Haiku-commits] BOM: r32191 - ...failed
 Link	/objects/haiku/--arch--/release/add-ons/media/plugins/ffmpeg/ffmpeg	..
 .
In-Reply-To: <4a7c7efe.07035a0a.124d.42f3@mx.google.com>
References: <4a7c7efe.07035a0a.124d.42f3@mx.google.com>
Message-ID: <20090807222127.57948.19@bepc.1249651110.fake>


On 2009-08-07 at 21:22:38 [+0200], mattmadia at gmail.com wrote:
> Host Machine          : FreeBSD 7.2-RELEASE i386
> Host Machine 32|64bit : 32bit
> use-xattr             : True
> use-32bit             : False
> Architectures Tested  :
>     ppc
>     x86gcc2
>     x86gcc4
>     x86gcc2hybrid
>     x86gcc4hybrid
> Targets Affected      :
> 
>     x86gcc2hybrid- at alpha-cd
>     x86gcc2hybrid- at alpha-raw
>     x86gcc2hybrid- at alpha-vmware
>     x86gcc2- at alpha-cd
>     x86gcc2- at alpha-raw
>     x86gcc2- at alpha-vmware
> Log Snippet :
> 
> AddSymlinkToContainerCopyFilesScript 
> <HaikuImage>system/add-ons/kernel/boot/bfs 
> AppendToContainerCopyFilesScript 
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/accelerants 
> AppendToContainerCopyFilesScript 
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/opengl 
> AppendToContainerCopyFilesScript 
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/Translators 
> AppendToContainerCopyFilesScript 
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/inboun
> d_protocols AppendToContainerCopyFilesScript 
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/outbou
> nd_protocols AppendToContainerCopyFilesScript 
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/inboun
> d_filters AppendToContainerCopyFilesScript 
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/outbou
> nd_filters AppendToContainerCopyFilesScript 
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/system
> _filters AppendToContainerCopyFilesScript 
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media Link 
> /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x
> 86/release/add-ons/media/plugins/ffmpeg/ffmpeg 
> /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x
> 86/release/add-ons/media/plugins/ffmpeg/libavcodec/x86/libavcodec_x86.a(ds
> putil_mmx.o): In function `ff_x264_deblock_v_luma_intra_mmxext': 
> dsputil_mmx.c:(.text+0x1f5a4): undefined reference to 
> `ff_x264_deblock_v8_luma_intra_mmxext' dsputil_mmx.c:(.text+0x1f5b4): 
> undefined reference to `ff_x264_deblock_v8_luma_intra_mmxext' collect2: 
> ld returned 1 exit status
> 
> /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/bin/i586-
> pc-haiku-gcc -pipe -nostart -Xlinker -soname="ffmpeg" -nostdlib -Xlinker 
> --no-undefined -o 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/add-ons/media/plugins/ffmpeg/ffmpeg"  
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/system/glue/arch/x86/crti.o" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/lib/gcc-
> lib/i586-pc-haiku/2.95.3-haiku-090629/crtbegin.o" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/system/glue/init_term_dyn.o" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/add-ons/media/plugins/ffmpeg/AVCodecDecoder.o" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/add-ons/media/plugins/ffmpeg/AVCodecEncoder.o" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/rel
>  ease/add-ons/media/plugins/ffmpeg/AVFormatReader.o" 
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
>  /x86/release/add-ons/media/plugins/ffmpeg/AVFormatWriter.o" 
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
>  /x86/release/add-ons/media/plugins/ffmpeg/CodecTable.o" 
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
>  /x86/release/add-ons/media/plugins/ffmpeg/DemuxerTable.o" 
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
>  /x86/release/add-ons/media/plugins/ffmpeg/EncoderTable.o" 
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
>  /x86/release/add-ons/media/plugins/ffmpeg/FFmpegPlugin.o" 
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
>  /x86/release/add-ons/media/plugins/ffmpeg/MuxerTable.o" 
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
>  /x86/release/add-ons/media/plugins/ffmpeg/gfx_conv_c.o" 
>  "/storage/Build-o-Matic/ 
>  haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/med
>  ia/plugins/ffmpeg/gfx_conv_c_lookup.o" 
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
>  /x86/release/add-ons/media/plugins/ffmpeg/gfx_util.o" \
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/add-ons/media/plugins/ffmpeg/libavformat/libavformat.a" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/add-ons/media/plugins/ffmpeg/libavcodec/libavcodec.a" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/add-ons/media/plugins/ffmpeg/libavcodec/x86/libavcodec_x86.a" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/add-ons/media/plugins/ffmpeg/libavutil/libavutil.a" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/add-ons/media/plugins/ffmpeg/libswscale/libswscale.a" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/kits/libbe.so" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> x86/release/kits/media/libmedia.so" 
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
>  ku/x86/release/libs/zlib/libz.a" 
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
>  /x86/release/system/libroot/libroot.so"  
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/lib/gcc
>  -lib/i586-pc-haiku/2.95.3-haiku-090629/crtend.o" 
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
>  /x86/release/system/glue/arch/x86/crtn.o" \
> 
> 
> ...failed Link 
> /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x
> 86/release/add-ons/media/plugins/ffmpeg/ffmpeg ... ...skipped 
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media/plugins for 
> lack of ffmpeg... ...skipped haiku-alpha.vmdk for lack of 
> <HaikuImage>haiku.image-copy-files... ...failed updating 1 target(s)...
> ...skipped 2 target(s)...
> ...updated 261 target(s)...
> command: jam -q -j1 @alpha-vmware

I cannot reproduce this build problem. I cleaned out the ffmpeg object 
folder each time and built with --include-gpl-addons and without.

Best regards,
-Stephan


From stpere at gmail.com  Fri Aug  7 22:22:50 2009
From: stpere at gmail.com (Philippe Saint-Pierre)
Date: Fri, 7 Aug 2009 16:22:50 -0400
Subject: [Haiku-commits] BOM: r32191 - ...failed Link
	/objects/haiku/--arch--/release/add-ons/media/plugins/ffmpeg/ffmpeg
	.. .
In-Reply-To: <20090807222127.57948.19@bepc.1249651110.fake>
References: <4a7c7efe.07035a0a.124d.42f3@mx.google.com>
	<20090807222127.57948.19@bepc.1249651110.fake>
Message-ID: <db396f7a0908071322p7dd1144eo30f78380cdb0d4a5@mail.gmail.com>

Hi,

2009/8/7 Stephan Assmus <superstippi at gmx.de>

>
> On 2009-08-07 at 21:22:38 [+0200], mattmadia at gmail.com wrote:
> > Host Machine          : FreeBSD 7.2-RELEASE i386
> > Host Machine 32|64bit : 32bit
> > use-xattr             : True
> > use-32bit             : False
> > Architectures Tested  :
> >     ppc
> >     x86gcc2
> >     x86gcc4
> >     x86gcc2hybrid
> >     x86gcc4hybrid
> > Targets Affected      :
> >
> >     x86gcc2hybrid- at alpha-cd
> >     x86gcc2hybrid- at alpha-raw
> >     x86gcc2hybrid- at alpha-vmware
> >     x86gcc2- at alpha-cd
> >     x86gcc2- at alpha-raw
> >     x86gcc2- at alpha-vmware
> > Log Snippet :
> >
> > AddSymlinkToContainerCopyFilesScript
> > <HaikuImage>system/add-ons/kernel/boot/bfs
> > AppendToContainerCopyFilesScript
> > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/accelerants
> > AppendToContainerCopyFilesScript
> > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/opengl
> > AppendToContainerCopyFilesScript
> > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/Translators
> > AppendToContainerCopyFilesScript
> >
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/inboun
> > d_protocols AppendToContainerCopyFilesScript
> >
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/outbou
> > nd_protocols AppendToContainerCopyFilesScript
> >
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/inboun
> > d_filters AppendToContainerCopyFilesScript
> >
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/outbou
> > nd_filters AppendToContainerCopyFilesScript
> >
> <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/system
> > _filters AppendToContainerCopyFilesScript
> > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media Link
> >
> /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x
> > 86/release/add-ons/media/plugins/ffmpeg/ffmpeg
> >
> /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x
> >
> 86/release/add-ons/media/plugins/ffmpeg/libavcodec/x86/libavcodec_x86.a(ds
> > putil_mmx.o): In function `ff_x264_deblock_v_luma_intra_mmxext':
> > dsputil_mmx.c:(.text+0x1f5a4): undefined reference to
> > `ff_x264_deblock_v8_luma_intra_mmxext' dsputil_mmx.c:(.text+0x1f5b4):
> > undefined reference to `ff_x264_deblock_v8_luma_intra_mmxext' collect2:
> > ld returned 1 exit status
> >
> >
> /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/bin/i586-
> > pc-haiku-gcc -pipe -nostart -Xlinker -soname="ffmpeg" -nostdlib -Xlinker
> > --no-undefined -o
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/add-ons/media/plugins/ffmpeg/ffmpeg"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/system/glue/arch/x86/crti.o"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/lib/gcc-
> > lib/i586-pc-haiku/2.95.3-haiku-090629/crtbegin.o"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/system/glue/init_term_dyn.o"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/add-ons/media/plugins/ffmpeg/AVCodecDecoder.o"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/add-ons/media/plugins/ffmpeg/AVCodecEncoder.o"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/rel
> >  ease/add-ons/media/plugins/ffmpeg/AVFormatReader.o"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> >  /x86/release/add-ons/media/plugins/ffmpeg/AVFormatWriter.o"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> >  /x86/release/add-ons/media/plugins/ffmpeg/CodecTable.o"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> >  /x86/release/add-ons/media/plugins/ffmpeg/DemuxerTable.o"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> >  /x86/release/add-ons/media/plugins/ffmpeg/EncoderTable.o"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> >  /x86/release/add-ons/media/plugins/ffmpeg/FFmpegPlugin.o"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> >  /x86/release/add-ons/media/plugins/ffmpeg/MuxerTable.o"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> >  /x86/release/add-ons/media/plugins/ffmpeg/gfx_conv_c.o"
> >  "/storage/Build-o-Matic/
> >
>  haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/med
> >  ia/plugins/ffmpeg/gfx_conv_c_lookup.o"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> >  /x86/release/add-ons/media/plugins/ffmpeg/gfx_util.o" \
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/add-ons/media/plugins/ffmpeg/libavformat/libavformat.a"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/add-ons/media/plugins/ffmpeg/libavcodec/libavcodec.a"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/add-ons/media/plugins/ffmpeg/libavcodec/x86/libavcodec_x86.a"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/add-ons/media/plugins/ffmpeg/libavutil/libavutil.a"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/add-ons/media/plugins/ffmpeg/libswscale/libswscale.a"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/kits/libbe.so"
> >
> "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/
> > x86/release/kits/media/libmedia.so"
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku/x86/release/libs/zlib/libz.a"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> >  /x86/release/system/libroot/libroot.so"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/lib/gcc
> >  -lib/i586-pc-haiku/2.95.3-haiku-090629/crtend.o"
> >
>  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> >  /x86/release/system/glue/arch/x86/crtn.o" \
> >
> >
> > ...failed Link
> >
> /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x
> > 86/release/add-ons/media/plugins/ffmpeg/ffmpeg ... ...skipped
> > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media/plugins for
> > lack of ffmpeg... ...skipped haiku-alpha.vmdk for lack of
> > <HaikuImage>haiku.image-copy-files... ...failed updating 1 target(s)...
> > ...skipped 2 target(s)...
> > ...updated 261 target(s)...
> > command: jam -q -j1 @alpha-vmware
>
> I cannot reproduce this build problem. I cleaned out the ffmpeg object
> folder each time and built with --include-gpl-addons and without.
>
> Best regards,
> -Stephan


It affects (only) gcc2 it seems.. would that be why your configuration isn't
affected?

Philippe
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20090807/afc7d41d/attachment.html>

From mattmadia at gmail.com  Fri Aug  7 22:27:04 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Fri, 7 Aug 2009 20:27:04 +0000
Subject: [Haiku-commits] BOM: r32191 - ...failed Link
	/objects/haiku/--arch--/release/add-ons/media/plugins/ffmpeg/ffmpeg
	.. .
In-Reply-To: <20090807222127.57948.19@bepc.1249651110.fake>
References: <4a7c7efe.07035a0a.124d.42f3@mx.google.com>
	<20090807222127.57948.19@bepc.1249651110.fake>
Message-ID: <1e42d8c50908071327k2d875a89h704007e6a00bc5c6@mail.gmail.com>

On Fri, Aug 7, 2009 at 20:21, Stephan Assmus<superstippi at gmx.de> wrote:
> I cannot reproduce this build problem. I cleaned out the ffmpeg object
> folder each time and built with --include-gpl-addons and without.
>

I could try clobbering my generated directory.


Would it be worthwhile to modify BOM to:

report build error
delete the objects/ (and/or cross-tools/) directories for affected targets
rebuild w/o checking out
report whether or not the error persists?


From stippi at mail.berlios.de  Fri Aug  7 22:27:24 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 7 Aug 2009 22:27:24 +0200
Subject: [Haiku-commits] r32192 - haiku/trunk/src/apps/aboutsystem
Message-ID: <200908072027.n77KROSW015323@sheep.berlios.de>

Author: stippi
Date: 2009-08-07 22:27:22 +0200 (Fri, 07 Aug 2009)
New Revision: 32192
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32192&view=rev

Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
Log:
Another update to the credits:
* Moved a couple people up from Contributors to Maintainers, since they gained
  commit acces.
* Shock! Matt Madia and Humdinger were missing!
* Added Koki back to Website team (after consulting him first).
* Added some more well deserved special thanks!

As always, please bring anyone I missed to my attention, I don't leave anyone
out intentionally!


Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2009-08-07 17:19:32 UTC (rev 32191)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2009-08-07 20:27:22 UTC (rev 32192)
@@ -713,6 +713,7 @@
 		"Axel D?rfler\n"
 		"J?r?me Duval\n"
 		"Ren? Gollent\n"
+		"Bryce Groff\n"
 		"Karsten Heimrich\n"
 		"Philippe Houdoin\n"
 		"Maurice Kalinowski\n"
@@ -724,10 +725,14 @@
 		"Marcus Overhagen\n"
 		"Michael Pfeiffer\n"
 		"Fran?ois Revol\n"
+		"Philippe Saint-Pierre\n"
 		"Andrej Spielmann\n"
+		"Jonas Sundstr?m\n"
 		"Oliver Tappe\n"
 		"Gerasim Troeglazov\n"
 		"Ingo Weinhold\n"
+		"Artur Wyszynski\n"
+		"Clemens Zeidler\n"
 		"Siarzhuk Zharski\n"
 		"\n");
 
@@ -751,7 +756,6 @@
 		"David Reid\n"
 		"Hugo Santos\n"
 		"Alexander G. M. Smith\n"
-		"Jonas Sundstr?m\n"
 		"Bryan Varner\n"
 		"Nathan Whitehorn\n"
 		"Michael Wilber\n"
@@ -766,8 +770,11 @@
 	fCreditsView->Insert(
 		"Phil Greenway\n"
 		"Gavin James\n"
+		"Matt Madia\n"
+		"Jorge G. Mare (aka Koki)\n"
 		"Urias McCullough\n"
 		"Niels Sascha Reedijk\n"
+		"Joachim Seemer (Humdinger)\n"
 		"Jonathan Yoder\n"
 		"\n");
 
@@ -788,7 +795,6 @@
 		"Andreas F?rber\n"
 		"Marc Flerackers\n"
 		"Michele Frau (zuMi)\n"
-		"Bryce Groff\n"
 		"Matthijs Hollemans\n"
 		"Mathew Hounsell\n"
 		"Morgan Howe\n"
@@ -809,6 +815,7 @@
 		"Jerome Leveque\n"
 		"Christof Lutteroth\n"
 		"Graham MacDonald\n"
+		"Brecht Machiels\n"
 		"Jan Mat?jek\n"
 		"Brian Matzon\n"
 		"Christopher ML Zumwalt May\n"
@@ -832,7 +839,6 @@
 		"Samuel Rodriguez Perez\n"
 		"Thomas Roell\n"
 		"Rafael Romo\n"
-		"Philippe Saint-Pierre\n"
 		"Ralf Sch?lke\n"
 		"Reznikov Sergei\n"
 		"Zousar Shaker\n"
@@ -845,9 +851,7 @@
 		"Ulrich Wimboeck\n"
 		"Johannes Wischert\n"
 		"James Woodcock\n"
-		"Artur Wyszynski\n"
 		"Gerald Zajac\n"
-		"Clemens Zeidler\n"
 		"?ukasz Zemczak\n"
 		"JiSheng Zhang\n"
 		"Zhao Shuai\n"
@@ -861,6 +865,11 @@
 	fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
 	fCreditsView->Insert("Travis Geiselbrecht (and his NewOS kernel)\n");
 	fCreditsView->Insert("Michael Phipps (project founder)\n\n");
+	fCreditsView->Insert("The Haiku-Ports Team\n");
+	fCreditsView->Insert("The Haikuware Team and their Bounty Program\n");
+	fCreditsView->Insert("The BeGeistert Team\n\n");
+	fCreditsView->Insert("... and the many community members making "
+		"donations!\n\n");
 
 	// copyrights for various projects we use
 



From superstippi at gmx.de  Fri Aug  7 23:33:27 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Fri, 07 Aug 2009 23:33:27 +0200
Subject: [Haiku-commits] BOM: r32191 - ...failed Link
 /objects/haiku/--arch--/release/add-ons/media/plugins/ffmpeg/ffmpeg .. .
In-Reply-To: <db396f7a0908071322p7dd1144eo30f78380cdb0d4a5@mail.gmail.com>
References: <4a7c7efe.07035a0a.124d.42f3@mx.google.com>
	<20090807222127.57948.19@bepc.1249651110.fake>
	<db396f7a0908071322p7dd1144eo30f78380cdb0d4a5@mail.gmail.com>
Message-ID: <20090807233327.58543.21@bepc.1249651110.fake>


On 2009-08-07 at 22:22:50 [+0200], Philippe Saint-Pierre <stpere at gmail.com> 
wrote:
> Hi,
> 
> 2009/8/7 Stephan Assmus <superstippi at gmx.de>
> 
> >
> > On 2009-08-07 at 21:22:38 [+0200], mattmadia at gmail.com wrote:
> > > Host Machine          : FreeBSD 7.2-RELEASE i386
> > > Host Machine 32|64bit : 32bit
> > > use-xattr             : True
> > > use-32bit             : False
> > > Architectures Tested  :
> > >     ppc
> > >     x86gcc2
> > >     x86gcc4
> > >     x86gcc2hybrid
> > >     x86gcc4hybrid
> > > Targets Affected      :
> > >
> > >     x86gcc2hybrid- at alpha-cd
> > >     x86gcc2hybrid- at alpha-raw
> > >     x86gcc2hybrid- at alpha-vmware
> > >     x86gcc2- at alpha-cd
> > >     x86gcc2- at alpha-raw
> > >     x86gcc2- at alpha-vmware
> > > Log Snippet :
> > >
> > > AddSymlinkToContainerCopyFilesScript
> > > <HaikuImage>system/add-ons/kernel/boot/bfs
> > > AppendToContainerCopyFilesScript
> > > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/accelerants 
> > > AppendToContainerCopyFilesScript
> > > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/opengl 
> > > AppendToContainerCopyFilesScript
> > > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/Translators 
> > > AppendToContainerCopyFilesScript
> > >
> > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/inbo
> > un
> > > d_protocols AppendToContainerCopyFilesScript
> > >
> > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/outb
> > ou
> > > nd_protocols AppendToContainerCopyFilesScript
> > >
> > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/inbo
> > un
> > > d_filters AppendToContainerCopyFilesScript
> > >
> > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/outb
> > ou
> > > nd_filters AppendToContainerCopyFilesScript
> > >
> > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/mail_daemon/syst
> > em
> > > _filters AppendToContainerCopyFilesScript
> > > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media Link
> > >
> > /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> > /x
> > > 86/release/add-ons/media/plugins/ffmpeg/ffmpeg
> > >
> > /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> > /x
> > >
> > 86/release/add-ons/media/plugins/ffmpeg/libavcodec/x86/libavcodec_x86.a(
> > ds
> > > putil_mmx.o): In function `ff_x264_deblock_v_luma_intra_mmxext': 
> > > dsputil_mmx.c:(.text+0x1f5a4): undefined reference to 
> > > `ff_x264_deblock_v8_luma_intra_mmxext' dsputil_mmx.c:(.text+0x1f5b4): 
> > > undefined reference to `ff_x264_deblock_v8_luma_intra_mmxext' 
> > > collect2: ld returned 1 exit status
> > >
> > >
> > /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/bin/i58
> > 6-
> > > pc-haiku-gcc -pipe -nostart -Xlinker -soname="ffmpeg" -nostdlib 
> > > -Xlinker
> > > --no-undefined -o
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/add-ons/media/plugins/ffmpeg/ffmpeg"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/system/glue/arch/x86/crti.o"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/lib/gc
> > c-
> > > lib/i586-pc-haiku/2.95.3-haiku-090629/crtbegin.o"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/system/glue/init_term_dyn.o"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/add-ons/media/plugins/ffmpeg/AVCodecDecoder.o"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/add-ons/media/plugins/ffmpeg/AVCodecEncoder.o"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/rel
> > >  ease/add-ons/media/plugins/ffmpeg/AVFormatReader.o"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku
> > >  /x86/release/add-ons/media/plugins/ffmpeg/AVFormatWriter.o"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku
> > >  /x86/release/add-ons/media/plugins/ffmpeg/CodecTable.o"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku
> > >  /x86/release/add-ons/media/plugins/ffmpeg/DemuxerTable.o"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku
> > >  /x86/release/add-ons/media/plugins/ffmpeg/EncoderTable.o"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku
> > >  /x86/release/add-ons/media/plugins/ffmpeg/FFmpegPlugin.o"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku
> > >  /x86/release/add-ons/media/plugins/ffmpeg/MuxerTable.o"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku
> > >  /x86/release/add-ons/media/plugins/ffmpeg/gfx_conv_c.o" 
> > >  "/storage/Build-o-Matic/
> > >
> >  haiku/haiku/generated.x86gcc2hybrid/objects/haiku/x86/release/add-ons/m
> >  ed
> > >  ia/plugins/ffmpeg/gfx_conv_c_lookup.o"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku
> > >  /x86/release/add-ons/media/plugins/ffmpeg/gfx_util.o" \
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/add-ons/media/plugins/ffmpeg/libavformat/libavformat.a"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/add-ons/media/plugins/ffmpeg/libavcodec/libavcodec.a"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/add-ons/media/plugins/ffmpeg/libavcodec/x86/libavcodec_x86
> > > .a"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/add-ons/media/plugins/ffmpeg/libavutil/libavutil.a"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/add-ons/media/plugins/ffmpeg/libswscale/libswscale.a"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/kits/libbe.so"
> > >
> > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haik
> > u/
> > > x86/release/kits/media/libmedia.so"
> > > "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/ha
> > > i
> > >  ku/x86/release/libs/zlib/libz.a"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku
> > >  /x86/release/system/libroot/libroot.so"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2/cross-tools/lib/g
> >  cc
> > >  -lib/i586-pc-haiku/2.95.3-haiku-090629/crtend.o"
> > >
> >  "/storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/hai
> >  ku
> > >  /x86/release/system/glue/arch/x86/crtn.o" \
> > >
> > >
> > > ...failed Link
> > >
> > /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> > /x
> > > 86/release/add-ons/media/plugins/ffmpeg/ffmpeg ... ...skipped
> > > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media/plugins 
> > > for lack of ffmpeg... ...skipped haiku-alpha.vmdk for lack of 
> > > <HaikuImage>haiku.image-copy-files... ...failed updating 1 
> > > target(s)... ...skipped 2 target(s)...
> > > ...updated 261 target(s)...
> > > command: jam -q -j1 @alpha-vmware
> >
> > I cannot reproduce this build problem. I cleaned out the ffmpeg object 
> > folder each time and built with --include-gpl-addons and without.
> >
> > Best regards,
> > -Stephan
> 
> 
> It affects (only) gcc2 it seems.. would that be why your configuration 
> isn't affected?

It could be the reason... let me check. Maybe GCC2 chokes on some ASM that 
is now enabled, if you have --include-gpl-addons configured. If the build 
servers have --include-gpl-addons enabled, is it intentional?

Best regards,
-Stephan


From korli at users.berlios.de  Fri Aug  7 23:32:07 2009
From: korli at users.berlios.de (=?ISO-8859-1?B?Suly9G1lIER1dmFs?=)
Date: Fri, 7 Aug 2009 23:32:07 +0200
Subject: [Haiku-commits] r32169 - haiku/trunk/src/preferences/bluetooth
In-Reply-To: <200908061828.n76ISd7a014916@sheep.berlios.de>
References: <200908061828.n76ISd7a014916@sheep.berlios.de>
Message-ID: <c47b1d430908071432w4d2b4320xbef9a26cf5a0caca@mail.gmail.com>

2009/8/6 oruizdorantes at BerliOS <oruizdorantes at mail.berlios.de>:
> -static const int32 kMsgSetDeviceClassNetbook = 'sDCn';
> +static const int32 kMsgSetDeviceClassHandheld = 'sDCn';

Not very important, but maybe you should consider using sDCh then..

Bye,
Jerome


From stippi at mail.berlios.de  Fri Aug  7 23:55:17 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 7 Aug 2009 23:55:17 +0200
Subject: [Haiku-commits] r32193 -
	haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86
Message-ID: <200908072155.n77LtHFP025782@sheep.berlios.de>

Author: stippi
Date: 2009-08-07 23:55:15 +0200 (Fri, 07 Aug 2009)
New Revision: 32193
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32193&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
Log:
Fixed error in FFmpeg code that defined a function which is only enabled in
GPL mode. Later in the code, the function would only be used in GPL compile mode,
but this fixes the linking in non-GPL mode.


Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c	2009-08-07 20:27:22 UTC (rev 32192)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c	2009-08-07 21:55:15 UTC (rev 32193)
@@ -2372,7 +2372,7 @@
 void ff_x264_deblock_h_luma_sse2(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0);
 void ff_x264_deblock_v8_luma_intra_mmxext(uint8_t *pix, int stride, int alpha, int beta);
 void ff_x264_deblock_h_luma_intra_mmxext(uint8_t *pix, int stride, int alpha, int beta);
-#if ARCH_X86_32
+#if CONFIG_GPL && ARCH_X86_32
 static void ff_x264_deblock_v_luma_intra_mmxext(uint8_t *pix, int stride, int alpha, int beta)
 {
     ff_x264_deblock_v8_luma_intra_mmxext(pix+0, stride, alpha, beta);



From superstippi at gmx.de  Fri Aug  7 23:56:24 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Fri, 07 Aug 2009 23:56:24 +0200
Subject: [Haiku-commits] BOM: r32191 - ...failed Link
 /objects/haiku/--arch--/release/add-ons/media/plugins/ffmpeg/ffmpeg .. .
In-Reply-To: <db396f7a0908071322p7dd1144eo30f78380cdb0d4a5@mail.gmail.com>
References: <4a7c7efe.07035a0a.124d.42f3@mx.google.com>
	<20090807222127.57948.19@bepc.1249651110.fake>
	<db396f7a0908071322p7dd1144eo30f78380cdb0d4a5@mail.gmail.com>
Message-ID: <20090807235624.69763.22@bepc.1249651110.fake>

Hi,

On 2009-08-07 at 22:22:50 [+0200], Philippe Saint-Pierre <stpere at gmail.com> 
wrote:
> 2009/8/7 Stephan Assmus <superstippi at gmx.de>
> > On 2009-08-07 at 21:22:38 [+0200], mattmadia at gmail.com wrote:
> > > ...failed Link
> > >
> > /storage/Build-o-Matic/haiku/haiku/generated.x86gcc2hybrid/objects/haiku
> > /x
> > > 86/release/add-ons/media/plugins/ffmpeg/ffmpeg ... ...skipped
> > > <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media/plugins 
> > > for lack of ffmpeg... ...skipped haiku-alpha.vmdk for lack of 
> > > <HaikuImage>haiku.image-copy-files... ...failed updating 1 
> > > target(s)... ...skipped 2 target(s)...
> > > ...updated 261 target(s)...
> > > command: jam -q -j1 @alpha-vmware
> >
> > I cannot reproduce this build problem. I cleaned out the ffmpeg object 
> > folder each time and built with --include-gpl-addons and without.
> 
> It affects (only) gcc2 it seems.. would that be why your configuration 
> isn't affected?

Should be fixed now.

Best regards,
-Stephan


From kirilla at mail.berlios.de  Sat Aug  8 01:23:52 2009
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Sat, 8 Aug 2009 01:23:52 +0200
Subject: [Haiku-commits] r32194 -
	haiku/trunk/src/add-ons/kernel/file_systems/cdda
Message-ID: <200908072323.n77NNp3j028368@sheep.berlios.de>

Author: kirilla
Date: 2009-08-08 01:23:45 +0200 (Sat, 08 Aug 2009)
New Revision: 32194
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32194&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/cdda/cdda.cpp
Log:
As cdtext extraction preempts a cddb lookup, make sure we got useful data from cdtext. Out of the 30 CDs I've tried all get reported as having cdtext but only one renders any useful data. This should at least give cddb a shot.

Modified: haiku/trunk/src/add-ons/kernel/file_systems/cdda/cdda.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/cdda/cdda.cpp	2009-08-07 21:55:15 UTC (rev 32193)
+++ haiku/trunk/src/add-ons/kernel/file_systems/cdda/cdda.cpp	2009-08-07 23:23:45 UTC (rev 32194)
@@ -562,6 +562,14 @@
 
 	free(buffer);
 
+	if (cdtext.artist == NULL || cdtext.album == NULL)
+		return B_ERROR;
+
+	for (int i = 0; i < cdtext.track_count; i++) {
+		if (cdtext.titles[i] == NULL)
+			return B_ERROR;
+	}
+
 	sanitize_string(cdtext.artist);
 	sanitize_album(cdtext);
 	sanitize_titles(cdtext);



From pulkomandy at mail.berlios.de  Sat Aug  8 01:31:36 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Sat, 8 Aug 2009 01:31:36 +0200
Subject: [Haiku-commits] r32195 -
	haiku/branches/components/gsoc-locale-kit/src/preferences/locale
Message-ID: <200908072331.n77NVadR013869@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-08 01:31:31 +0200 (Sat, 08 Aug 2009)
New Revision: 32195
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32195&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
Log:
More work on the Country custom settings in the preference panel. The popup menus will be used to select defined fields, while there will be textfields between them to add dcustom strings (but most probably some special chars). The short date will still allow only one separator. The popup menus will display real things instead of the placeholder letters but I have to write some more ICU communication layer for that. There will be a description and a sample at each entry.


Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-07 23:23:45 UTC (rev 32194)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-07 23:31:31 UTC (rev 32195)
@@ -6,6 +6,7 @@
 
 #include "TimeFormatSettingsView.h"
 
+#include <Alert.h>
 #include <Box.h>
 #include <Country.h>
 #include <GroupLayout.h>
@@ -26,6 +27,34 @@
 #include <Window.h>
 
 
+void CreateDateMenu(BMenuField** field)
+{
+	BMenu *menu = new BMenu("");
+	*field = new BMenuField("", menu);
+	BMessage* msg = new BMessage('FRMT');
+	msg->AddPointer("dest",*field);
+
+	BMenu* dayMenu = new BMenu("Day");
+	menu->AddItem(dayMenu);
+		dayMenu -> AddItem(new BMenuItem("d", msg));
+		dayMenu -> AddItem(new BMenuItem("D", msg));
+		dayMenu -> AddItem(new BMenuItem("e", msg));
+		dayMenu -> AddItem(new BMenuItem("E", msg));
+		dayMenu -> AddItem(new BMenuItem("F", msg));
+		dayMenu -> AddItem(new BMenuItem("g", msg));
+		dayMenu -> AddItem(new BMenuItem("c", msg));
+	BMenu* monthMenu = new BMenu("Month");
+	menu->AddItem(monthMenu);
+		monthMenu -> AddItem(new BMenuItem("M", msg));
+		monthMenu -> AddItem(new BMenuItem("L", msg));
+	BMenu* yearMenu = new BMenu("Year");
+	menu->AddItem(yearMenu);
+		yearMenu -> AddItem(new BMenuItem("y", msg));
+		yearMenu -> AddItem(new BMenuItem("Y", msg));
+		yearMenu -> AddItem(new BMenuItem("u", msg));
+}
+
+
 TimeFormatSettingsView::TimeFormatSettingsView(BCountry* country)
 	: BView("WindowsSettingsView", B_WILL_DRAW)
 	, fCountry(country)
@@ -35,28 +64,45 @@
 	// Date
 	BSeparatorView* dateHeader = new BSeparatorView("Date");
 
-	BBox *dateFormatBox = new BBox("Date Order");
-	dateFormatBox->SetLabel("Date Order");
-	dateFormatBox->SetLayout(new BGroupLayout(B_HORIZONTAL, 10));
+	//  Long format
+	fLongDateExampleView = new BStringView("", "");
 
-	{
-		fYMDRadioButton = new BRadioButton("", "Year-Month-Day",
-				new BMessage(kSettingsContentsModified));
+	CreateDateMenu(&fLongDateMenu[0]);
+	CreateDateMenu(&fLongDateMenu[1]);
+	CreateDateMenu(&fLongDateMenu[2]);
+	CreateDateMenu(&fLongDateMenu[3]);
 
-		fDMYRadioButton = new BRadioButton("", "Day-Month-Year",
-				new BMessage(kSettingsContentsModified));
+	//  Short format
+	fShortDateExampleView = new BStringView("", "");
 
-		fMDYRadioButton = new BRadioButton("", "Month-Day-Year",
-				new BMessage(kSettingsContentsModified));
+	BMenu* menu = new BPopUpMenu("");
+	menu->AddItem(new BMenuItem("Day",
+		new BMessage(kSettingsContentsModified)));
+	menu->AddItem(new BMenuItem("Month",
+		new BMessage(kSettingsContentsModified)));
+	menu->AddItem(new BMenuItem("Year",
+		new BMessage(kSettingsContentsModified)));
+	fDateMenu[0] = new BMenuField("", menu);
 
-		dateFormatBox->AddChild(BGroupLayoutBuilder(B_VERTICAL,10)
-			.Add(fYMDRadioButton)		
-			.Add(fDMYRadioButton)		
-			.Add(fMDYRadioButton)		
-		);
-	}
+	menu = new BPopUpMenu("");
+	menu->AddItem(new BMenuItem("Day",
+		new BMessage(kSettingsContentsModified)));
+	menu->AddItem(new BMenuItem("Month",
+		new BMessage(kSettingsContentsModified)));
+	menu->AddItem(new BMenuItem("Year",
+		new BMessage(kSettingsContentsModified)));
+	fDateMenu[1] = new BMenuField("", menu);
 
-	BPopUpMenu *menu = new BPopUpMenu("Separator");
+	menu = new BPopUpMenu("");
+	menu->AddItem(new BMenuItem("Day",
+		new BMessage(kSettingsContentsModified)));
+	menu->AddItem(new BMenuItem("Month",
+		new BMessage(kSettingsContentsModified)));
+	menu->AddItem(new BMenuItem("Year",
+		new BMessage(kSettingsContentsModified)));
+	fDateMenu[2] = new BMenuField("", menu);
+
+	menu = new BPopUpMenu("Separator");
 	menu->AddItem(new BMenuItem("None",
 		new BMessage(kSettingsContentsModified)));
 	menu->AddItem(new BMenuItem("Space",
@@ -71,9 +117,6 @@
 		fSeparatorMenuField->StringWidth(fSeparatorMenuField->Label()) + 8.0f);
 	fSeparatorMenuField->SetAlignment(B_ALIGN_LEFT);
 
-	fLongDateExampleView = new BStringView("", "");
-	fShortDateExampleView = new BStringView("", "");
-
 	// Time
 	BSeparatorView* timeHeader = new BSeparatorView("Time");
 
@@ -104,9 +147,27 @@
 
 	AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)
 		.Add(dateHeader)
-		.Add(fLongDateExampleView)
-		.Add(fShortDateExampleView)
-		.Add(dateFormatBox)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
+			.Add(new BStringView("","Long format:"))
+			.Add(fLongDateExampleView)
+			.AddGlue()
+		)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
+			.Add(fLongDateMenu[0])
+			.Add(fLongDateMenu[1])
+			.Add(fLongDateMenu[2])
+			.Add(fLongDateMenu[3])
+		)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
+			.Add(new BStringView("","Short format:"))
+			.Add(fShortDateExampleView)
+			.AddGlue()
+		)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
+			.Add(fDateMenu[0])
+			.Add(fDateMenu[1])
+			.Add(fDateMenu[2])
+		)
 		.Add(fSeparatorMenuField)
 
 		.Add(timeHeader)
@@ -124,10 +185,11 @@
 {
 	f24HrRadioButton->SetTarget(this);
 	f12HrRadioButton->SetTarget(this);
-	fYMDRadioButton->SetTarget(this);
-	fDMYRadioButton->SetTarget(this);
-	fMDYRadioButton->SetTarget(this);
 
+	// TODO do the same for the short date
+	for(int j = 0; j < 4; j++)
+	for(int i = 0; i < fLongDateMenu[3]->Menu()->CountItems(); i++)
+		fLongDateMenu[j]->Menu()->SubmenuAt(i)->SetTargetForItems(this);
 	fSeparatorMenuField->Menu()->SetTargetForItems(this);
 
 	static_cast<BScrollView*>(Parent())->ScrollBar(B_VERTICAL)->SetRange(
@@ -141,6 +203,20 @@
 TimeFormatSettingsView::MessageReceived(BMessage *message)
 {
 	switch (message->what) {
+		case 'FRMT':
+		{
+			// Update one of the dropdown menus
+			void* pointerFromMessage;
+			message->FindPointer("source",&pointerFromMessage);
+			BMenuItem* selectedItem =
+				static_cast<BMenuItem*>(pointerFromMessage);
+			message->FindPointer("dest",&pointerFromMessage);
+			BMenuField* menuField =
+				static_cast<BMenuField*>(pointerFromMessage);
+
+			menuField->MenuItem()->SetLabel(selectedItem->Label());
+		}
+		// pass trough
 		case kSettingsContentsModified:
 			{
 				int32 separator = 0;
@@ -152,17 +228,17 @@
 						;
 				}
 
-				DateOrder format =
-					fYMDRadioButton->Value() ? kYMDFormat :
-					fDMYRadioButton->Value() ? kDMYFormat : kMDYFormat;
+				// TODO add the other fields and generate the ICU string
+				BString dateFormat;
 
+				// TODO send that to our Settings class
 				// settings.SetDateOrderFormat(format);
 				// settings.SetClockTo24Hr(f24HrRadioButton->Value() == 1);
 
 				// Make the notification message and send it to the tracker:
 				BMessage notificationMessage;
 				notificationMessage.AddInt32("TimeFormatSeparator", separator);
-				notificationMessage.AddInt32("DateOrderFormat", format);
+				notificationMessage.AddString("DateOrderFormat", dateFormat);
 				notificationMessage.AddBool("24HrClock",
 					f24HrRadioButton->Value() == 1);
 				// tracker->SendNotices(kDateFormatChanged, &notificationMessage);
@@ -286,6 +362,8 @@
 }
 
 
+// Return true if the Revert button should be enabled (ie some setting was
+// changed)
 bool
 TimeFormatSettingsView::IsRevertable() const
 {
@@ -301,13 +379,14 @@
 	} else
 		return true;
 
-	DateOrder format =
-		fYMDRadioButton->Value() ? kYMDFormat :
-		(fDMYRadioButton->Value() ? kDMYFormat : kMDYFormat);
+	// TODO generate ICU string and compare to the initial one
+	BString dateFormat ;
+		//fYMDRadioButton->Value() ? kYMDFormat :
+		//(fDMYRadioButton->Value() ? kDMYFormat : kMDYFormat);
 
 	return f24HrClock != (f24HrRadioButton->Value() > 0)
 		|| separator != fSeparator
-		|| format != fFormat;
+		|| dateFormat != fDateFormat;
 }
 
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-07 23:23:45 UTC (rev 32194)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-07 23:31:31 UTC (rev 32195)
@@ -8,6 +8,7 @@
 #define __TIMEFORMATSETTINGS_H__
 
 
+#include <String.h>
 #include <View.h>
 
 
@@ -27,13 +28,6 @@
 		kDotSeparator,
 		kSeparatorsEnd
 };
-	
-enum DateOrder {
-		kYMDFormat,
-		kDMYFormat,
-		kMDYFormat,
-		kDateFormatEnd
-};
 
 const uint32 kSettingsContentsModified = 'Scmo';
 
@@ -59,9 +53,8 @@
 		BRadioButton *f24HrRadioButton;
 		BRadioButton *f12HrRadioButton;
 
-		BRadioButton *fYMDRadioButton;
-		BRadioButton *fDMYRadioButton;
-		BRadioButton *fMDYRadioButton;
+		BMenuField *fLongDateMenu[4];
+		BMenuField *fDateMenu[3];
 
 		BMenuField *fSeparatorMenuField;
 
@@ -73,7 +66,7 @@
 		bool f24HrClock;
 
 		FormatSeparator fSeparator;
-		DateOrder fFormat;
+		BString fDateFormat;
 
 		BCountry* fCountry;
 



From mmu_man at mail.berlios.de  Sat Aug  8 02:19:01 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sat, 8 Aug 2009 02:19:01 +0200
Subject: [Haiku-commits] r32196 - haiku/trunk/src/system/libroot/posix/stdlib
Message-ID: <200908080019.n780J1U6025692@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-08 02:18:59 +0200 (Sat, 08 Aug 2009)
New Revision: 32196
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32196&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/stdlib/strtod.c
Log:
Seems r31815 got MIA due to r31919+r31925...

Modified: haiku/trunk/src/system/libroot/posix/stdlib/strtod.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/stdlib/strtod.c	2009-08-07 23:31:31 UTC (rev 32195)
+++ haiku/trunk/src/system/libroot/posix/stdlib/strtod.c	2009-08-08 00:18:59 UTC (rev 32196)
@@ -125,7 +125,7 @@
 
 #if defined(__i386__) || defined(__ia64__) || defined(__alpha__) || \
     defined(__sparc64__) || defined(__powerpc__) || defined(__POWERPC__) || \
-    defined(__m68k__) || defined(__M68K__)
+    defined(__m68k__) || defined(__M68K__) || defined(__arm__) || defined(__ARM__)
 #	include <sys/types.h>
 #	if BYTE_ORDER == BIG_ENDIAN
 #		define IEEE_BIG_ENDIAN



From mmu_man at mail.berlios.de  Sat Aug  8 02:35:51 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sat, 8 Aug 2009 02:35:51 +0200
Subject: [Haiku-commits] r32197 - in haiku/trunk/headers/private:
	kernel/arch/arm kernel/arch/arm/board
	kernel/arch/arm/board/overo kernel/arch/arm/board/verdex
	system/arch/arm
Message-ID: <200908080035.n780ZpU7027704@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-08 02:35:48 +0200 (Sat, 08 Aug 2009)
New Revision: 32197
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32197&view=rev

Added:
   haiku/trunk/headers/private/kernel/arch/arm/board/
   haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h
   haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h
Removed:
   haiku/trunk/headers/private/system/arch/arm/board/
Log:
[ARM]
- moved board/ folder around again, it probably belongs only to kernel stuff,
- added board_config.h templates for gumstix boards.


Copied: haiku/trunk/headers/private/kernel/arch/arm/board (from rev 32191, haiku/trunk/headers/private/system/arch/arm/board)


Property changes on: haiku/trunk/headers/private/kernel/arch/arm/board
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h
===================================================================
--- haiku/trunk/headers/private/system/arch/arm/board/overo/board_config.h	2009-08-07 17:19:32 UTC (rev 32191)
+++ haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h	2009-08-08 00:35:48 UTC (rev 32197)
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2009
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _BOARD_OVERO_BOARD_CONFIG_H
+#define _BOARD_OVERO_BOARD_CONFIG_H
+
+#define BOARD_NAME_PRETTY "Gumstix Overo"
+
+#include <arch/arm/omap3.h>
+
+#endif /* _BOARD_OVERO_BOARD_CONFIG_H */

Added: haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h
===================================================================
--- haiku/trunk/headers/private/system/arch/arm/board/verdex/board_config.h	2009-08-07 17:19:32 UTC (rev 32191)
+++ haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h	2009-08-08 00:35:48 UTC (rev 32197)
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2009
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _BOARD_VERDEX_BOARD_CONFIG_H
+#define _BOARD_VERDEX_BOARD_CONFIG_H
+
+#define BOARD_NAME_PRETTY "Gumstix Verdex"
+
+#include <arch/arm/pxa270.h>
+
+#endif /* _BOARD_VERDEX_BOARD_CONFIG_H */



From mmu_man at mail.berlios.de  Sat Aug  8 03:05:51 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sat, 8 Aug 2009 03:05:51 +0200
Subject: [Haiku-commits] r32198 - in
	haiku/trunk/headers/private/kernel/arch/arm/board: overo verdex
Message-ID: <200908080105.n7815pet031985@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-08 03:05:49 +0200 (Sat, 08 Aug 2009)
New Revision: 32198
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32198&view=rev

Modified:
   haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h
   haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h
Log:
[ARM]
Map UARTs to the cpu specific addresses.


Modified: haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h	2009-08-08 00:35:48 UTC (rev 32197)
+++ haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h	2009-08-08 01:05:49 UTC (rev 32198)
@@ -9,4 +9,10 @@
 
 #include <arch/arm/omap3.h>
 
+#define BOARD_UART1_BASE OMAP_UART1_BASE
+#define BOARD_UART2_BASE OMAP_UART2_BASE
+#define BOARD_UART3_BASE OMAP_UART3_BASE
+
+#define BOARD_DEBUG_UART 2
+
 #endif /* _BOARD_OVERO_BOARD_CONFIG_H */

Modified: haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h	2009-08-08 00:35:48 UTC (rev 32197)
+++ haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h	2009-08-08 01:05:49 UTC (rev 32198)
@@ -9,4 +9,10 @@
 
 #include <arch/arm/pxa270.h>
 
+#define BOARD_UART1_BASE FFUART_BASE
+#define BOARD_UART2_BASE BTUART_BASE
+#define BOARD_UART3_BASE STUART_BASE
+
+#define BOARD_DEBUG_UART 2
+
 #endif /* _BOARD_VERDEX_BOARD_CONFIG_H */



From mmu_man at mail.berlios.de  Sat Aug  8 04:02:05 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sat, 8 Aug 2009 04:02:05 +0200
Subject: [Haiku-commits] r32199 - haiku/trunk/src/system/boot/platform/u-boot
Message-ID: <200908080202.n782259r003258@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-08 04:01:59 +0200 (Sat, 08 Aug 2009)
New Revision: 32199
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32199&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/u-boot/Jamfile
Log:
[ARM]
- add board specific headers to includes,
- some unused flash image targets.


Modified: haiku/trunk/src/system/boot/platform/u-boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-08 01:05:49 UTC (rev 32198)
+++ haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-08 02:01:59 UTC (rev 32199)
@@ -2,6 +2,8 @@
 
 SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ;
 
+#XXX:move to arch/arm
+UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName graphics common ] ;
 UsePrivateHeaders [ FDirName graphics vesa ] ;
@@ -12,7 +14,7 @@
 
 	defines = [ FDefines $(defines) ] ;
 	SubDirCcFlags $(defines) -Wall -Wno-multichar -g3 ;
-	SubDirC++Flags $(defines) -Wall -Wno-multichar -fno-rtti ;
+	SubDirC++Flags $(defines) -Wall -Wno-multichar -fno-rtti -g3 ;
 }
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
@@ -59,11 +61,15 @@
 	dd if=/dev/zero of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) count=$(FLASH_IMAGE_BLOCK_COUNT)
 	# add u-boot
 	dd if=$(>[2]) of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) conv=notrunc
-	# add haiku_loader
+	# add root fs
+	#dd if=$(>[3]) of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) conv=notrunc seek=$(FLASH_IMAGE_ROOTFS_OFFSET)
+	# add haiku_loader (raw, elf or uimage)
 	dd if=$(>[1]) of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) conv=notrunc seek=$(FLASH_IMAGE_LOADER_OFFSET)
 }
 
-BuildUBootFlashImage haiku_flash_image.bin : haiku_loader : $(UBOOT_IMAGE) ;
+BuildUBootFlashImage haiku_flash_image_raw.img : haiku_loader : $(UBOOT_IMAGE) ;
+#BuildUBootFlashImage haiku_flash_image_elf.img : boot_loader_u-boot : $(UBOOT_IMAGE) ;
+#BuildUBootFlashImage haiku_flash_image_uimage.img : boot_loader_u-boot_uimage : $(UBOOT_IMAGE) ;
 
 SEARCH on [ FGristFiles text_menu.cpp ]
 	= [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;



From mmu_man at mail.berlios.de  Sat Aug  8 04:18:30 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sat, 8 Aug 2009 04:18:30 +0200
Subject: [Haiku-commits] r32200 -
	haiku/trunk/headers/private/kernel/arch/arm/board/verdex
Message-ID: <200908080218.n782IUhQ004549@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-08 04:18:29 +0200 (Sat, 08 Aug 2009)
New Revision: 32200
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32200&view=rev

Modified:
   haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h
Log:
[ARM]
debug UART is [0] on Verdex.


Modified: haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h	2009-08-08 02:01:59 UTC (rev 32199)
+++ haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h	2009-08-08 02:18:29 UTC (rev 32200)
@@ -13,6 +13,6 @@
 #define BOARD_UART2_BASE BTUART_BASE
 #define BOARD_UART3_BASE STUART_BASE
 
-#define BOARD_DEBUG_UART 2
+#define BOARD_DEBUG_UART 0
 
 #endif /* _BOARD_VERDEX_BOARD_CONFIG_H */



From mmu_man at mail.berlios.de  Sat Aug  8 04:23:28 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sat, 8 Aug 2009 04:23:28 +0200
Subject: [Haiku-commits] r32201 - haiku/trunk/src/system/boot/platform/u-boot
Message-ID: <200908080223.n782NSUJ004813@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-08 04:23:22 +0200 (Sat, 08 Aug 2009)
New Revision: 32201
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32201&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/u-boot/serial.cpp
   haiku/trunk/src/system/boot/platform/u-boot/uart.c
   haiku/trunk/src/system/boot/platform/u-boot/uart.h
Log:
[ARM]
- cleanup,
- add an uart_debug_port() to avoid using the #define in serial.cpp,
- use board_config defines in uart.c.


Modified: haiku/trunk/src/system/boot/platform/u-boot/serial.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/serial.cpp	2009-08-08 02:18:29 UTC (rev 32200)
+++ haiku/trunk/src/system/boot/platform/u-boot/serial.cpp	2009-08-08 02:23:22 UTC (rev 32201)
@@ -25,7 +25,7 @@
 static void
 serial_putc(char c)
 {
-	uart_putc(0,c);
+	uart_putc(uart_debug_port(),c);
 }
 
 
@@ -68,12 +68,12 @@
 extern "C" void 
 serial_enable(void)
 {
+	/* should already be initialized by U-Boot */
+	/*
 	uart_init_early();
 	uart_init();//todo
-	uart_init_port(0,9600);
-	//uart_init_port(1,9600);
-	//uart_init_port(2,9600);
-
+	uart_init_port(uart_debug_port(),9600);
+	*/
 	sSerialEnabled++;
 }
 

Modified: haiku/trunk/src/system/boot/platform/u-boot/uart.c
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/uart.c	2009-08-08 02:18:29 UTC (rev 32200)
+++ haiku/trunk/src/system/boot/platform/u-boot/uart.c	2009-08-08 02:23:22 UTC (rev 32201)
@@ -23,23 +23,20 @@
 #include <debug.h>
 #include <arch/arm/reg.h>
 #include <arch/arm/uart.h>
-#include <arch/arm/pxa270.h>
+#include <board_config.h>
 //#include <target/debugconfig.h>
 
-//TODO: beaglespecific ?...
-#define DEBUG_UART 2
+#define DEBUG_UART BOARD_DEBUG_UART
 
-
-
 struct uart_stat {
 	addr_t base;
 	uint shift;
 };
 
 static struct uart_stat uart[3] = {
-	{ FFUART_BASE, 2 },
-	{ BTUART_BASE, 2 },
-	{ STUART_BASE, 2 },
+	{ BOARD_UART1_BASE, 2 },
+	{ BOARD_UART2_BASE, 2 },
+	{ BOARD_UART3_BASE, 2 },
 };
 
 static inline void write_uart_reg(int port, uint reg, unsigned char data)
@@ -90,6 +87,11 @@
 
 #define V_NS16550_CLK            (48000000)  /* 48MHz (APLL96/2) */
 
+int uart_debug_port(void)
+{
+	return DEBUG_UART;
+}
+
 void uart_init_port(int port, uint baud)
 {
 	/* clear the tx & rx fifo and disable */

Modified: haiku/trunk/src/system/boot/platform/u-boot/uart.h
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/uart.h	2009-08-08 02:18:29 UTC (rev 32200)
+++ haiku/trunk/src/system/boot/platform/u-boot/uart.h	2009-08-08 02:23:22 UTC (rev 32201)
@@ -31,6 +31,7 @@
 
 void uart_init(void);
 void uart_init_early(void);
+int uart_debug_port(void);
 
 int uart_putc(int port, char c);
 int uart_getc(int port, bool wait);



From mmu_man at mail.berlios.de  Sat Aug  8 04:26:04 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sat, 8 Aug 2009 04:26:04 +0200
Subject: [Haiku-commits] r32202 - in haiku/trunk:
	headers/private/kernel/arch/arm src/system/boot/platform/u-boot
Message-ID: <200908080226.n782Q4fL004947@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-08 04:26:01 +0200 (Sat, 08 Aug 2009)
New Revision: 32202
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32202&view=rev

Removed:
   haiku/trunk/src/system/boot/platform/u-boot/uart.h
Modified:
   haiku/trunk/headers/private/kernel/arch/arm/uart.h
Log:
[ARM]
Remove duplicate header.


Modified: haiku/trunk/headers/private/kernel/arch/arm/uart.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/arm/uart.h	2009-08-08 02:23:22 UTC (rev 32201)
+++ haiku/trunk/headers/private/kernel/arch/arm/uart.h	2009-08-08 02:26:01 UTC (rev 32202)
@@ -31,6 +31,7 @@
 
 void uart_init(void);
 void uart_init_early(void);
+int uart_debug_port(void);
 
 int uart_putc(int port, char c);
 int uart_getc(int port, bool wait);

Deleted: haiku/trunk/src/system/boot/platform/u-boot/uart.h



From mmu_man at mail.berlios.de  Sat Aug  8 04:38:46 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sat, 8 Aug 2009 04:38:46 +0200
Subject: [Haiku-commits] r32203 - in haiku/trunk/src/system/boot: arch/arm
	platform/u-boot
Message-ID: <200908080238.n782ckvm006318@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-08 04:38:44 +0200 (Sat, 08 Aug 2009)
New Revision: 32203
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32203&view=rev

Added:
   haiku/trunk/src/system/boot/arch/arm/uart.c
Removed:
   haiku/trunk/src/system/boot/platform/u-boot/uart.c
Modified:
   haiku/trunk/src/system/boot/arch/arm/Jamfile
   haiku/trunk/src/system/boot/platform/u-boot/Jamfile
Log:
[ARM]
Move uart.c to arch/arm/ where it belongs, it has nothing u-boot specific.


Modified: haiku/trunk/src/system/boot/arch/arm/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/arch/arm/Jamfile	2009-08-08 02:26:01 UTC (rev 32202)
+++ haiku/trunk/src/system/boot/arch/arm/Jamfile	2009-08-08 02:38:44 UTC (rev 32203)
@@ -2,6 +2,8 @@
 
 DEFINES += _BOOT_MODE ;
 
+UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ;
+
 # TODO: Is there any reason to recompile arch_string.S here?
 local librootArchObjects =
 #	<src!system!libroot!posix!string!arch!$(TARGET_ARCH)>arch_string.o
@@ -14,6 +16,7 @@
 ;
 
 KernelMergeObject boot_arch_$(TARGET_ARCH).o :
+	uart.c
 	arch_elf.cpp
 	$(librootArchObjects)
 	: -fno-pic

Copied: haiku/trunk/src/system/boot/arch/arm/uart.c (from rev 32201, haiku/trunk/src/system/boot/platform/u-boot/uart.c)


Property changes on: haiku/trunk/src/system/boot/arch/arm/uart.c
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: haiku/trunk/src/system/boot/platform/u-boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-08 02:26:01 UTC (rev 32202)
+++ haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-08 02:38:44 UTC (rev 32203)
@@ -2,8 +2,6 @@
 
 SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ;
 
-#XXX:move to arch/arm
-UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName graphics common ] ;
 UsePrivateHeaders [ FDirName graphics vesa ] ;
@@ -31,7 +29,6 @@
 	cpu.cpp
 	video.cpp
 	mmu.cpp	
-	uart.c
 	# generic
 	text_menu.cpp
 

Deleted: haiku/trunk/src/system/boot/platform/u-boot/uart.c



From leavengood at gmail.com  Sat Aug  8 07:34:06 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Sat, 8 Aug 2009 01:34:06 -0400
Subject: [Haiku-commits] r32180 - haiku/trunk/build/jam
In-Reply-To: <4A7C07A7.3080606@zappotek.com>
References: <200908071049.n77AnRhM029546@sheep.berlios.de>
	<4A7C07A7.3080606@zappotek.com>
Message-ID: <a4855ac50908072234n74274eddt56462076759d724@mail.gmail.com>

On Fri, Aug 7, 2009 at 6:53 AM, Alexandre Deckner<alex at zappotek.com> wrote:
>
> BTW, it still needs an icon. If someone's motivated go ahead. I'll give
> it a try otherwise.

I'm sort of in icon making mode at the moment so I could work on it.
But at the same time I have plenty of needed icons to occupy me for a
while. So if you want to give it a go we could always use more icon
artists. Just be sure to check the icon guidelines and follow them. In
addition I've learned that all the other great icons from stippi, zuMi
and others are wonderful to learn from.

-- 
Regards,
Ryan


From fekdahl at gmail.com  Sat Aug  8 08:16:04 2009
From: fekdahl at gmail.com (Fredrik Ekdahl)
Date: Sat, 08 Aug 2009 08:16:04 +0200
Subject: [Haiku-commits] r32189 - in
 haiku/trunk/src/add-ons/media/plugins/ffmpeg: . libavcodec
In-Reply-To: <200908071521.n77FLcBG018959@sheep.berlios.de>
References: <200908071521.n77FLcBG018959@sheep.berlios.de>
Message-ID: <4A7D1824.7000500@gmail.com>

stippi at mail.berlios.de skrev:
> Author: stippi
> Date: 2009-08-07 17:21:37 +0200 (Fri, 07 Aug 2009)
> New Revision: 32189
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32189&view=rev
> 
> Modified:
>    haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h
>    haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
> Log:
> Disabled the rest of the GPL code as per the FFmpeg 0.5 README.
> 

Could all this GPL code disabling be made using the configure option 
instead, instead of hardcoding?

Btw, as a sidenote I may add that the AC-3 support in ffmpeg is superior 
to liba52, which we have a decoder for i our repository. Quoting the 
news item about the 0.5 release: "AC-3 that is faster than liba52 in 
5.1, up to 2x faster in stereo and also supports E-AC-3! Hence liba52 is 
now obsolete."

Thanks for doing all this work on the ffmpeg plugin!

-- 
/Fredrik Ekdahl


From humdingerb at mail.berlios.de  Sat Aug  8 08:59:03 2009
From: humdingerb at mail.berlios.de (humdingerb at mail.berlios.de)
Date: Sat, 8 Aug 2009 08:59:03 +0200
Subject: [Haiku-commits] r32204 - haiku/trunk/src/apps/workspaces
Message-ID: <200908080659.n786x3fr009539@sheep.berlios.de>

Author: humdingerb
Date: 2009-08-08 08:59:00 +0200 (Sat, 08 Aug 2009)
New Revision: 32204
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32204&view=rev

Modified:
   haiku/trunk/src/apps/workspaces/Workspaces.cpp
Log:
This doesn't solve #4185 (I'm too dumb, I've tried...). Just changed some strings to mesh with e.g. LaunchBox

Modified: haiku/trunk/src/apps/workspaces/Workspaces.cpp
===================================================================
--- haiku/trunk/src/apps/workspaces/Workspaces.cpp	2009-08-08 02:38:44 UTC (rev 32203)
+++ haiku/trunk/src/apps/workspaces/Workspaces.cpp	2009-08-08 06:59:00 UTC (rev 32204)
@@ -521,11 +521,11 @@
 		BMenuItem* item;
 
 		menu->AddSeparatorItem();
-		menu->AddItem(item = new BMenuItem("No title",
+		menu->AddItem(item = new BMenuItem("No Window Title",
 			new BMessage(kMsgToggleTitle)));
 		if (window->Look() == B_MODAL_WINDOW_LOOK)
 			item->SetMarked(true);
-		menu->AddItem(item = new BMenuItem("No Border",
+		menu->AddItem(item = new BMenuItem("No Window Border",
 			new BMessage(kMsgToggleBorder)));
 		if (window->Look() == B_NO_BORDER_WINDOW_LOOK)
 			item->SetMarked(true);
@@ -535,7 +535,7 @@
 			new BMessage(kMsgToggleAlwaysOnTop)));
 		if (window->Feel() == B_FLOATING_ALL_WINDOW_FEEL)
 			item->SetMarked(true);
-		menu->AddItem(item = new BMenuItem("Auto-Raise",
+		menu->AddItem(item = new BMenuItem("Auto Raise",
 			new BMessage(kMsgToggleAutoRaise)));
 		if (window->IsAutoRaising())
 			item->SetMarked(true);



From humdingerb at mail.berlios.de  Sat Aug  8 09:45:09 2009
From: humdingerb at mail.berlios.de (humdingerb at mail.berlios.de)
Date: Sat, 8 Aug 2009 09:45:09 +0200
Subject: [Haiku-commits] r32205 - haiku/trunk/src/apps/terminal
Message-ID: <200908080745.n787j9pS024354@sheep.berlios.de>

Author: humdingerb
Date: 2009-08-08 09:45:06 +0200 (Sat, 08 Aug 2009)
New Revision: 32205
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32205&view=rev

Modified:
   haiku/trunk/src/apps/terminal/AppearPrefView.cpp
   haiku/trunk/src/apps/terminal/PrefWindow.cpp
   haiku/trunk/src/apps/terminal/TermConst.h
Log:
Applied old patch by Urias (see #3209) improving strings in Terminal's preferences. Added a few more tidbits.

Modified: haiku/trunk/src/apps/terminal/AppearPrefView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/AppearPrefView.cpp	2009-08-08 06:59:00 UTC (rev 32204)
+++ haiku/trunk/src/apps/terminal/AppearPrefView.cpp	2009-08-08 07:45:06 UTC (rev 32205)
@@ -98,7 +98,7 @@
 	AddChild(fFontSize);
 
 	r.OffsetBy(-r.Width() - 10,r.Height() + 25);
-	fColorField = new BMenuField(r, "color", "Change:",
+	fColorField = new BMenuField(r, "color", "Color:",
 		MakeMenu(MSG_COLOR_FIELD_CHANGED, color_tbl, color_tbl[0]));
 	fColorField->SetDivider(StringWidth(fColorField->Label()) + 8.0);
 	AddChild(fColorField);

Modified: haiku/trunk/src/apps/terminal/PrefWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/PrefWindow.cpp	2009-08-08 06:59:00 UTC (rev 32204)
+++ haiku/trunk/src/apps/terminal/PrefWindow.cpp	2009-08-08 07:45:06 UTC (rev 32205)
@@ -23,7 +23,7 @@
 
 
 PrefWindow::PrefWindow(BMessenger messenger)
-	: BWindow(_CenteredRect(BRect(0, 0, 350, 215)), "Terminal Settings",
+	: BWindow(_CenteredRect(BRect(0, 0, 350, 215)), "Terminal Preferences",
 		B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
 		B_NOT_RESIZABLE|B_NOT_ZOOMABLE),
 	fPreviousPref(new PrefHandler(PrefHandler::Default())),

Modified: haiku/trunk/src/apps/terminal/TermConst.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermConst.h	2009-08-08 06:59:00 UTC (rev 32204)
+++ haiku/trunk/src/apps/terminal/TermConst.h	2009-08-08 07:45:06 UTC (rev 32205)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Copyright (c) 2003-4 Kian Duffy <myob at users.sourceforge.net>
  * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
  *
@@ -98,12 +98,12 @@
 const char* const PREF_HALF_FONT_STYLE = "Half Font Style";
 const char* const PREF_HALF_FONT_SIZE = "Half Font Size";
 
-const char* const PREF_TEXT_FORE_COLOR = "Text Foreground Color";
-const char* const PREF_TEXT_BACK_COLOR = "Text Background Color";
-const char* const PREF_SELECT_FORE_COLOR = "Selection Foreground Color";
-const char* const PREF_SELECT_BACK_COLOR = "Selection Background Color";
-const char* const PREF_CURSOR_FORE_COLOR = "Cursor Foreground Color";
-const char* const PREF_CURSOR_BACK_COLOR = "Cursor Background Color";
+const char* const PREF_TEXT_FORE_COLOR = "Text";
+const char* const PREF_TEXT_BACK_COLOR = "Background";
+const char* const PREF_SELECT_FORE_COLOR = "Selected Text";
+const char* const PREF_SELECT_BACK_COLOR = "Selected Background";
+const char* const PREF_CURSOR_FORE_COLOR = "Cursor Text";
+const char* const PREF_CURSOR_BACK_COLOR = "Cursor Background";
 
 const char* const PREF_IM_FORE_COLOR = "IM Foreground Color";
 const char* const PREF_IM_BACK_COLOR = "IM Background Color";
@@ -119,7 +119,7 @@
 const char* const PREF_ANSI_WHITE_COLOR = "ANSI White Color";
 
 const char* const PREF_HISTORY_SIZE = "History Size";
-const char* const PREF_CURSOR_BLINKING = "Cursor Blinking rate";
+const char* const PREF_CURSOR_BLINKING = "Cursor Blinking Rate";
 
 const char* const PREF_IM_AWARE = "Input Method Aware";
 
@@ -127,7 +127,7 @@
 const char* const PREF_ROWS = "Rows";
 const char* const PREF_SHELL = "Shell";
 
-const char* const PREF_TEXT_ENCODING = "Text encoding";
+const char* const PREF_TEXT_ENCODING = "Text Encoding";
 const char* const PREF_GUI_LANGUAGE = "Language";
 
 // Color type



From superstippi at gmx.de  Sat Aug  8 10:30:32 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Sat, 08 Aug 2009 10:30:32 +0200
Subject: [Haiku-commits] r32189 - in
 haiku/trunk/src/add-ons/media/plugins/ffmpeg: . libavcodec
In-Reply-To: <4A7D1824.7000500@gmail.com>
References: <200908071521.n77FLcBG018959@sheep.berlios.de>
	<4A7D1824.7000500@gmail.com>
Message-ID: <20090808103032.338.1@bepc.1249719982.fake>


On 2009-08-08 at 08:16:04 [+0200], Fredrik Ekdahl <fekdahl at gmail.com> wrote:
> stippi at mail.berlios.de skrev:
> > Author: stippi
> > Date: 2009-08-07 17:21:37 +0200 (Fri, 07 Aug 2009) New Revision: 32189
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32189&view=rev
> > 
> > Modified:
> >    haiku/trunk/src/add-ons/media/plugins/ffmpeg/config.h 
> >    haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
> > Log:
> > Disabled the rest of the GPL code as per the FFmpeg 0.5 README.
> > 
> 
> Could all this GPL code disabling be made using the configure option 
> instead, instead of hardcoding?

You missed a commit, I already did just that. It depends on 
--include-gpl-addons now. :-)

> Btw, as a sidenote I may add that the AC-3 support in ffmpeg is superior 
> to liba52, which we have a decoder for i our repository. Quoting the news 
> item about the 0.5 release: "AC-3 that is faster than liba52 in 
> 5.1, up to 2x faster in stereo and also supports E-AC-3! Hence liba52 is 
> now obsolete."

AC-3 in FFmpeg 0.5 does not support everything that our existing Decoder 
supports. We would have to upgrade to a newer revision from the FFmpeg 
repo, but I want to do that carefully only, when I have more time.

I care a lot about the AVC-HD clips from my video camera, and those have 
AC-3 sound that FFmpeg does not support in 0.5.

Best regards,
-Stephan


From stippi at mail.berlios.de  Sat Aug  8 10:53:38 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 8 Aug 2009 10:53:38 +0200
Subject: [Haiku-commits] r32206 - haiku/trunk/src/apps/diskusage
Message-ID: <200908080853.n788rcPq000156@sheep.berlios.de>

Author: stippi
Date: 2009-08-08 10:53:33 +0200 (Sat, 08 Aug 2009)
New Revision: 32206
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32206&view=rev

Modified:
   haiku/trunk/src/apps/diskusage/DiskUsage.rdef
Log:
Replaced duplicated DriveSetup icon with zuMi's DiskUsage icon. According to
a Trac comment, Ryan prefers it. Another argument pro zuMi's version is that
it is a bit more neutral, since DiskUsage can be invoked on folders, not just
entire disks.


Modified: haiku/trunk/src/apps/diskusage/DiskUsage.rdef
===================================================================
--- haiku/trunk/src/apps/diskusage/DiskUsage.rdef	2009-08-08 07:45:06 UTC (rev 32205)
+++ haiku/trunk/src/apps/diskusage/DiskUsage.rdef	2009-08-08 08:53:33 UTC (rev 32206)
@@ -20,30 +20,32 @@
 };
 
 resource vector_icon {
-	$"6E6369660F03010000020016023AF81C3830AFBB29EB3E24FE4903D742949400"
-	$"8EFF47020016023AFDE4B927BB3BBB443D89C84A587E467D6A007DFFB0020016"
-	$"023BFC1538B2EABB58DE3E788D4A21874591FF0096FFB0020006023C96323A4D"
-	$"3FBAFC013D5A974B57A549844D00474747FFA5A0A002001602BC592FBB29A73C"
-	$"0CE4BD0B7C4892C04B7966007DFFD40200060238DBB4399733BC4A333BA54248"
-	$"6E6649EE7B00596756FFEBB2B203A7FF0003FF0000040180020306033E800000"
-	$"00000000003DC00049E00049200000007F7F7EB1EAEAFF4F9DA4020306033E80"
-	$"000000000000003DC00049E00049200000E3B78D86F4F8C9F4888C9802030603"
-	$"3E80000000000000003DC00049E00049200000A9525286F5C0D3F4B05A660203"
-	$"06033E80000000000000003DC00049E00049200000888C9886EBEDF2F4888C98"
-	$"020016033D400000000000000040000048800000000000FF9BD3FFCD0F0A0622"
-	$"3C2249445B5A3E5A3139250A05223C2246B54AC1D7393239250A055A31392539"
-	$"32C7D0BE1E5A3C0A043932B4CBC2564458C921BE980A04444B445B5A3E5A310A"
-	$"04223C2249445B444B08022743B814C1F10802264329440A05445D495D603E5A"
-	$"3B5B3F02043F2EC3882EBB2B2E2C3A2CBAB82CBFFF3F46BB2B46C38846523A52"
-	$"BFFF52BAB80604BF3E2E3E2EBAF2B8B32C3A2CBACC2CBDF9B84CBF1AB7F7BE90"
-	$"B84CBF1A3E3906033E4039C6D5BCA1C6D5BCA1C651BA7FC024B89AC392B8D4C0"
-	$"24B89A0604FE3F3AB915C00AB915C00ABA72C14E3F46BCBE46C33846C6DDBDF1"
-	$"C668C04FC6DDBDF10204423942BCBD42BD2E3F3AC0023ABEB13A3C393CBD2E3C"
-	$"BCBD3F38BEB138C002380A04233C444B59323926110A090108000A0001001001"
-	$"178400040A010101000A020102000A030103000A00030A0B0C1001178402040A"
-	$"0A010A000A0B010B000A0C010C000A00010D1001178400040A0D010D000A0401"
-	$"04000A050105000A0601061001178520040A0801073024B39901178200040A07"
-	$"01073020B2E601178200040A0E010E1815FF0117812204"
+	$"6E6369660B040066050003FF8080038000000300BF00020006023CE000000000"
+	$"00000040000049200000000000FF0606FFCC00000373E573037397E502000602"
+	$"3C000000000000000040000049800040000000FDFF75FFFFAA0002000602BB40"
+	$"000000000000004000004AD00000000000FF8000FF802B0002000602380CC03A"
+	$"07DEBF922B3D9AC24BBB89C509E500FFFFFFFFFFFF800F040AEBBA0C3E5D3E5D"
+	$"545D575953575954585659545250544F5C4F5C4F5C4D5B4C5E58475C48584706"
+	$"041F583A583AC8C8BC6A5034C7C7BB9850344C5806047F553A5438553A583A58"
+	$"3AC8C8BC6A5034C7C7BB9850343606031B553A553A543850363A0A04503A504C"
+	$"584C583A020A4A424A42C274C1053E44434434442C3D2C412C3D2C342C34B589"
+	$"BBD2223D22BD2D223D2250225022C7412757B484C80CB7C7CA433E5DBB485DC1"
+	$"D05D5059C42BCA965059504650465046020427442744B4A9C0A9223D2240223D"
+	$"2250225022C7412757B484C80C2757020650465046C42DC2E43E49C1C349BB48"
+	$"492744B7C7C289274427572757B7C7CA433E5DBB485DC1D05D5059C42BCA9650"
+	$"5902064A424A42C294C0F03E443E44BC8F442F41BA4DC0EA2F4127442744B7C5"
+	$"C28B3E49BB4249C1C3495046C42DC2E4504602042744B4A9C0A927442F412F41"
+	$"B835BFB52C3D2C3F2C3D223D223D224006030F2C342C34B589BBD2223D22BD2D"
+	$"223D2C0607FF3B3E23C2F423BAF4232C2A2CB5822C2A2C3D2C3D2C413E443444"
+	$"43444A42C274C1054A425046502A502A50B5820607FF2F4D2E4D2EC39FB94C3E"
+	$"31C17731BAF4312C2A2CB8742C2A2C3D2C3D2C413E44344443444A4247434A42"
+	$"4D440A053E2A4D2E4D445046502A0606FF0E3E23C2E923BAFE232C2A2CB5712C"
+	$"B8863E31BAFE31C16F314D2EC3A4B9524D2E3E2A502A502A50B571120A000100"
+	$"1001158400040A01010118001501178600040A0101011001178400040A020102"
+	$"000A030103000A030104000A01010518001501178600040A0101051815FF0117"
+	$"8400040A040106000A050107000A060109000A020108000A07010A000A01010B"
+	$"18001501178600040A01010B1815FF01178400040A08010C000A09010D000A0A"
+	$"010E00"
 };
 
 resource(101, "RGB_WIN") rgb_color { 0xDE, 0xDB, 0xDE, 0xFF };



From mattmadia at gmail.com  Sat Aug  8 14:27:56 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Sat, 8 Aug 2009 12:27:56 +0000
Subject: [Haiku-commits] r32205 - haiku/trunk/src/apps/terminal
In-Reply-To: <200908080745.n787j9pS024354@sheep.berlios.de>
References: <200908080745.n787j9pS024354@sheep.berlios.de>
Message-ID: <1e42d8c50908080527g156d06b5uf20049a72efe811f@mail.gmail.com>

On Sat, Aug 8, 2009 at 07:45, <humdingerb at mail.berlios.de> wrote:
> Applied old patch by Urias (see #3209) improving strings in Terminal's preferences. Added a few more tidbits.

this was my patch. urias offered to upload to Trac, as my pc had
trouble creating tickets at that time.

either way, thanks for committing it! :)

--mmadia


From humdingerb at googlemail.com  Sat Aug  8 14:36:16 2009
From: humdingerb at googlemail.com (Humdinger)
Date: Sat, 08 Aug 2009 14:36:16 +0200
Subject: [Haiku-commits] r32205 - haiku/trunk/src/apps/terminal
In-Reply-To: <1e42d8c50908080527g156d06b5uf20049a72efe811f@mail.gmail.com>
References: <200908080745.n787j9pS024354@sheep.berlios.de>
	<1e42d8c50908080527g156d06b5uf20049a72efe811f@mail.gmail.com>
Message-ID: <4A7D7140.5000202@googlemail.com>

Matt Madia wrote:
> either way, thanks for committing it! :)

And it took just a bit longer than half a year... :)
I'm in the process of re-shooting screenshots for the user guide and stumble over these 
things from time to time.

Regards,
Humdinger

-- 
--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-
Deutsche Haiku News @ http://www.haiku-gazette.de


From leavengood at gmail.com  Sat Aug  8 17:09:14 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Sat, 8 Aug 2009 11:09:14 -0400
Subject: [Haiku-commits] r32204 - haiku/trunk/src/apps/workspaces
In-Reply-To: <200908080659.n786x3fr009539@sheep.berlios.de>
References: <200908080659.n786x3fr009539@sheep.berlios.de>
Message-ID: <a4855ac50908080809m43df9e55hb2b93cd6ee640bc7@mail.gmail.com>

On Sat, Aug 8, 2009 at 2:59 AM, <humdingerb at mail.berlios.de> wrote:
>
> This doesn't solve #4185 (I'm too dumb, I've tried...). Just changed some
> strings to mesh with e.g. LaunchBox

I definitely agree with using the positive verb form, and I once had
similar plans for MediaPlayer which also had some options like this (I
don't think it does anymore.) It can be tricky to reverse the logic.
Unless someone beats me to it I'll take a look at this to try to fix
#4185.

-- 
Regards,
Ryan


From leavengood at gmail.com  Sat Aug  8 17:11:37 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Sat, 8 Aug 2009 11:11:37 -0400
Subject: [Haiku-commits] r32206 - haiku/trunk/src/apps/diskusage
In-Reply-To: <200908080853.n788rcPq000156@sheep.berlios.de>
References: <200908080853.n788rcPq000156@sheep.berlios.de>
Message-ID: <a4855ac50908080811m5a7653eaq3d2ab098268cea10@mail.gmail.com>

On Sat, Aug 8, 2009 at 4:53 AM, <stippi at mail.berlios.de> wrote:
> Replaced duplicated DriveSetup icon with zuMi's DiskUsage icon. According to
> a Trac comment, Ryan prefers it. Another argument pro zuMi's version is that
> it is a bit more neutral, since DiskUsage can be invoked on folders, not just
> entire disks.

That is a good point, thanks for committing it.

-- 
Regards,
Ryan


From mmu_man at mail.berlios.de  Sat Aug  8 18:02:36 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sat, 8 Aug 2009 18:02:36 +0200
Subject: [Haiku-commits] r32207 - in haiku/trunk/src/system: boot
	ldscripts/arm ldscripts/arm/board ldscripts/arm/board/overo
	ldscripts/arm/board/verdex
Message-ID: <200908081602.n78G2awj003432@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-08 18:02:34 +0200 (Sat, 08 Aug 2009)
New Revision: 32207
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32207&view=rev

Added:
   haiku/trunk/src/system/ldscripts/arm/board/
   haiku/trunk/src/system/ldscripts/arm/board/overo/
   haiku/trunk/src/system/ldscripts/arm/board/overo/board.ld
   haiku/trunk/src/system/ldscripts/arm/board/verdex/
   haiku/trunk/src/system/ldscripts/arm/board/verdex/board.ld
Modified:
   haiku/trunk/src/system/boot/Jamfile
   haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld
Log:
[ARM]
Include board-specific file from the u-boot ldscript, to allow linking to different load addresses.


Modified: haiku/trunk/src/system/boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/Jamfile	2009-08-08 08:53:33 UTC (rev 32206)
+++ haiku/trunk/src/system/boot/Jamfile	2009-08-08 16:02:34 UTC (rev 32207)
@@ -22,6 +22,11 @@
 	strtol.o
 ;
 
+local extraLinkerArgs = ;
+if $(TARGET_BOOT_BOARD) {
+	extraLinkerArgs += -L$(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/board/$(TARGET_BOOT_BOARD) ;
+}
+
 AddResources haiku_loader : boot_loader.rdef ;
 
 KernelLd boot_loader_$(TARGET_BOOT_PLATFORM) :
@@ -45,7 +50,7 @@
 	$(librootFunctions:G=src!system!kernel!lib)
 
 	: $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/boot_loader_$(TARGET_BOOT_PLATFORM).ld
-	: -Bstatic
+	: -Bstatic $(extraLinkerArgs)
 ;
 
 rule BuildCoffLoader {

Added: haiku/trunk/src/system/ldscripts/arm/board/overo/board.ld
===================================================================
--- haiku/trunk/src/system/ldscripts/arm/board/overo/board.ld	2009-08-08 08:53:33 UTC (rev 32206)
+++ haiku/trunk/src/system/ldscripts/arm/board/overo/board.ld	2009-08-08 16:02:34 UTC (rev 32207)
@@ -0,0 +1,6 @@
+/*
+ * Gumstix Overo ld definitions
+ */
+
+BOARD_LOADER_BASE = 0x80008000 ;
+#error

Added: haiku/trunk/src/system/ldscripts/arm/board/verdex/board.ld
===================================================================
--- haiku/trunk/src/system/ldscripts/arm/board/verdex/board.ld	2009-08-08 08:53:33 UTC (rev 32206)
+++ haiku/trunk/src/system/ldscripts/arm/board/verdex/board.ld	2009-08-08 16:02:34 UTC (rev 32207)
@@ -0,0 +1,6 @@
+/*
+ * Gumstix Verdex ld definitions
+ */
+
+BOARD_LOADER_BASE = 0xa2000000 ;
+

Modified: haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld
===================================================================
--- haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld	2009-08-08 08:53:33 UTC (rev 32206)
+++ haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld	2009-08-08 16:02:34 UTC (rev 32207)
@@ -1,11 +1,13 @@
 OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 
+/* include board-specific definitions */
+INCLUDE board.ld
+
 ENTRY(_start)
 SECTIONS
 {
-/*	. = 0x80008000; */
-	. = 0xa2000000;
+	. = BOARD_LOADER_BASE;
 
 	/* text/read-only data */
 	.text :	{ *(.text .gnu.linkonce.t.*) }



From mmu_man at mail.berlios.de  Sat Aug  8 18:12:03 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sat, 8 Aug 2009 18:12:03 +0200
Subject: [Haiku-commits] r32208 -
	haiku/trunk/src/system/ldscripts/arm/board/overo
Message-ID: <200908081612.n78GC3bo004645@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-08 18:12:02 +0200 (Sat, 08 Aug 2009)
New Revision: 32208
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32208&view=rev

Modified:
   haiku/trunk/src/system/ldscripts/arm/board/overo/board.ld
Log:
[ARM]
Remove debug leftover.


Modified: haiku/trunk/src/system/ldscripts/arm/board/overo/board.ld
===================================================================
--- haiku/trunk/src/system/ldscripts/arm/board/overo/board.ld	2009-08-08 16:02:34 UTC (rev 32207)
+++ haiku/trunk/src/system/ldscripts/arm/board/overo/board.ld	2009-08-08 16:12:02 UTC (rev 32208)
@@ -3,4 +3,4 @@
  */
 
 BOARD_LOADER_BASE = 0x80008000 ;
-#error
+



From anevilyak at mail.berlios.de  Sat Aug  8 20:08:09 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 8 Aug 2009 20:08:09 +0200
Subject: [Haiku-commits] r32209 - haiku/trunk/src/kits/tracker
Message-ID: <200908081808.n78I89QY002885@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-08 20:08:07 +0200 (Sat, 08 Aug 2009)
New Revision: 32209
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32209&view=rev

Modified:
   haiku/trunk/src/kits/tracker/PoseView.cpp
Log:
An Open With window has no target model. PoseView's drop target handling code didn't take this into account, causing a crash. Fixes ticket #4200.



Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-08-08 16:12:02 UTC (rev 32208)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-08-08 18:08:07 UTC (rev 32209)
@@ -8926,6 +8926,10 @@
 	if (targetModel == NULL)
 		targetModel = TargetModel();
 
+	// if this is an OpenWith window, we'll have no target model
+	if (targetModel == NULL)
+		return false;
+
 	entry_ref srcRef;
 	if (targetModel->IsDirectory() && dragMessage->HasRef("refs")
 			&& dragMessage->FindRef("refs", &srcRef) == B_OK) {



From humdingerb at googlemail.com  Sat Aug  8 20:13:33 2009
From: humdingerb at googlemail.com (Humdinger)
Date: Sat, 08 Aug 2009 20:13:33 +0200
Subject: [Haiku-commits] r32209 - haiku/trunk/src/kits/tracker
In-Reply-To: <200908081808.n78I89QY002885@sheep.berlios.de>
References: <200908081808.n78I89QY002885@sheep.berlios.de>
Message-ID: <4A7DC04D.5090809@googlemail.com>

anevilyak at BerliOS wrote:
> Author: anevilyak 
> Modified: haiku/trunk/src/kits/tracker/PoseView.cpp Log:
 > An Open With window has no
> target model. PoseView's drop target handling code didn't take this into account,
> causing a crash. Fixes ticket #4200.

Thanks! You're a quick yak, you are. :)


Regards,
Humdinger

-- 
--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-
Deutsche Haiku News @ http://www.haiku-gazette.de


From anevilyak at mail.berlios.de  Sat Aug  8 21:36:28 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 8 Aug 2009 21:36:28 +0200
Subject: [Haiku-commits] r32210 - haiku/trunk/src/kits/tracker
Message-ID: <200908081936.n78JaSVb012688@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-08 21:36:27 +0200 (Sat, 08 Aug 2009)
New Revision: 32210
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32210&view=rev

Modified:
   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
Log:
When picking file destinations via the slow context popup, also do the copy vs move check based on device. Fixes ticket 4202.


Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-08-08 18:08:07 UTC (rev 32209)
+++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-08-08 19:36:27 UTC (rev 32210)
@@ -1587,9 +1587,20 @@
 							entry.GetRef(&targetref);
 
 							//	if they don't match, move/copy
-							if (targetref != parentref)
+							if (targetref != parentref) {
+								uint32 moveMode = kMoveSelectionTo;
+								node_ref targetNode;
+								node_ref parentNode;
+								if (entry.GetNodeRef(&targetNode) == B_OK
+									&& itemparent.GetNodeRef(&parentNode)
+										== B_OK) {
+									if (targetNode.device == parentNode.device)
+										moveMode = kCopySelectionTo;
+								}
 								//	copy drag contents to target ref in message
-								FSMoveToFolder(list, new BEntry(entry), kMoveSelectionTo);
+								FSMoveToFolder(list, new BEntry(entry),
+									moveMode);
+							}
 
 						} else {
 							// 	current message sent to apps is only B_REFS_RECEIVED



From anevilyak at mail.berlios.de  Sat Aug  8 21:39:34 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 8 Aug 2009 21:39:34 +0200
Subject: [Haiku-commits] r32211 - haiku/trunk/src/kits/tracker
Message-ID: <200908081939.n78JdYwf013111@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-08 21:39:33 +0200 (Sat, 08 Aug 2009)
New Revision: 32211
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32211&view=rev

Modified:
   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
Log:
Oops, check was reversed.



Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-08-08 19:36:27 UTC (rev 32210)
+++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-08-08 19:39:33 UTC (rev 32211)
@@ -1594,7 +1594,7 @@
 								if (entry.GetNodeRef(&targetNode) == B_OK
 									&& itemparent.GetNodeRef(&parentNode)
 										== B_OK) {
-									if (targetNode.device == parentNode.device)
+									if (targetNode.device != parentNode.device)
 										moveMode = kCopySelectionTo;
 								}
 								//	copy drag contents to target ref in message



From rudolfc at mail.berlios.de  Sun Aug  9 17:26:47 2009
From: rudolfc at mail.berlios.de (rudolfc at mail.berlios.de)
Date: Sun, 9 Aug 2009 17:26:47 +0200
Subject: [Haiku-commits] r32212 - haiku/trunk/src/servers/app
Message-ID: <200908091526.n79FQlwP024385@sheep.berlios.de>

Author: rudolfc
Date: 2009-08-09 17:26:19 +0200 (Sun, 09 Aug 2009)
New Revision: 32212
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32212&view=rev

Modified:
   haiku/trunk/src/servers/app/Screen.cpp
   haiku/trunk/src/servers/app/VirtualScreen.cpp
Log:
fixed BScreen mode.flags handling. This is now compatible with BeOS, and fixes for instance the use of Dualhead Setup for the Matrox and nVidia driver which make use of 'free' flags. A modeset command should be relayed to the accelerant even if it differs by just a single bit: the accelerant best knows how to handle this. Remark: Haiku's screen preflet refuses to set modes once a virtual screen is set since it doesn't recognize the currently set mode. I guess that could be fixed.

Modified: haiku/trunk/src/servers/app/Screen.cpp
===================================================================
--- haiku/trunk/src/servers/app/Screen.cpp	2009-08-08 19:39:33 UTC (rev 32211)
+++ haiku/trunk/src/servers/app/Screen.cpp	2009-08-09 15:26:19 UTC (rev 32212)
@@ -93,19 +93,6 @@
 {
 	display_mode current;
 	GetMode(&current);
-	// TODO: decide how best to handle the flags here - things like
-	// the screen preflet will generally always set the flags to 0,
-	// while it seems asking the accelerant to automatically pick the
-	// best mode might not necessarily. For the time being, match the
-	// flags before doing the mode comparison in order to prevent
-	// mode switches for otherwise identical modes (this was relatively
-	// easily observed on at least the radeon accelerant - on first boot
-	// the best mode picked included a flag mask of 0xffffffff ; 
-	// if you switched the resolution of one workspace to something else
-	// and then back to the resolution it started with, you would observe
-	// a mode switch when jumping between that workspace and the others
-	// that were still using the automatically set default mode)
-	current.flags = mode.flags;
 	if (!memcmp(&mode, &current, sizeof(display_mode))) 
 		return B_OK;
 	

Modified: haiku/trunk/src/servers/app/VirtualScreen.cpp
===================================================================
--- haiku/trunk/src/servers/app/VirtualScreen.cpp	2009-08-08 19:39:33 UTC (rev 32211)
+++ haiku/trunk/src/servers/app/VirtualScreen.cpp	2009-08-09 15:26:19 UTC (rev 32212)
@@ -108,11 +108,8 @@
 		display_mode mode;
 		screen->GetMode(&mode);
 
-		screenSettings.AddInt32("width", mode.virtual_width);
-		screenSettings.AddInt32("height", mode.virtual_height);
-		screenSettings.AddInt32("color space", mode.space);
-		screenSettings.AddData("timing", B_RAW_TYPE, &mode.timing,
-			sizeof(display_timing));
+		screenSettings.AddData("mode", B_RAW_TYPE, &mode,
+			sizeof(display_mode));
 
 		settings.AddMessage("screen", &screenSettings);
 	}
@@ -142,16 +139,12 @@
 	BMessage settings;
 	if (_GetConfiguration(screen, settings) == B_OK) {
 		// we found settings for this screen, and try to apply them now
-		int32 width, height, colorSpace;
-		const display_timing* timing;
+		const display_mode* mode;
 		ssize_t size;
-		if (settings.FindInt32("width", &width) == B_OK
-			&& settings.FindInt32("height", &height) == B_OK
-			&& settings.FindInt32("color space", &colorSpace) == B_OK
-			&& settings.FindData("timing", B_RAW_TYPE, (const void**)&timing,
+		if (settings.FindData("mode", B_RAW_TYPE, (const void**)&mode,
 					&size) == B_OK
-			&& size == sizeof(display_timing))
-			status = screen->SetMode(width, height, colorSpace, *timing, true);
+			&& size == sizeof(display_mode))
+			status = screen->SetMode(*mode, true);
 		// TODO: named settings will get lost if setting the mode failed!
 	}
 	if (status < B_OK) {



From mmu_man at mail.berlios.de  Sun Aug  9 17:38:42 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sun, 9 Aug 2009 17:38:42 +0200
Subject: [Haiku-commits] r32213 - haiku/trunk/build/scripts
Message-ID: <200908091538.n79Fcgx9025466@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-09 17:38:41 +0200 (Sun, 09 Aug 2009)
New Revision: 32213
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32213&view=rev

Modified:
   haiku/trunk/build/scripts/build_cross_tools_gcc4
Log:
Don't know why multilib was disabled in r29035, but we'll likely need it for arm, and m68k as well...
Make it depend on haikuMachine.


Modified: haiku/trunk/build/scripts/build_cross_tools_gcc4
===================================================================
--- haiku/trunk/build/scripts/build_cross_tools_gcc4	2009-08-09 15:26:19 UTC (rev 32212)
+++ haiku/trunk/build/scripts/build_cross_tools_gcc4	2009-08-09 15:38:41 UTC (rev 32213)
@@ -22,6 +22,21 @@
 esac
 export MAKE
 
+case $haikuMachine in
+m68k-*)
+	binutilsConfigureArgs="--enable-multilib"
+	gccConfigureArgs="--enable-multilib"
+	;;
+arm-*)
+	binutilsConfigureArgs="--enable-multilib"
+	gccConfigureArgs="--enable-multilib"
+	;;
+*)
+	binutilsConfigureArgs="--disable-multilib"
+	gccConfigureArgs="--disable-multilib"
+	;;
+esac
+
 if [ $# -lt 4 ]; then
 	haikuOutputDir=$haikuSourceDir/generated
 else
@@ -89,7 +104,7 @@
 cd $binutilsObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $binutilsSourceDir/configure \
 	--prefix=$installDir --target=$haikuMachine --disable-nls \
-	--disable-shared --disable-multilib --disable-werror || exit 1
+	--disable-shared --disable-werror $binutilsConfigureArgs || exit 1
 $MAKE || exit 1
 $MAKE install || exit 1
 
@@ -120,8 +135,9 @@
 cd $gccObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $gccSourceDir/configure --prefix=$installDir \
 	--target=$haikuMachine --disable-nls --disable-shared \
-	--disable-multilib --enable-languages=c,c++ \
-	--with-headers=$tmpIncludeDir --with-libs=$tmpLibDir || exit 1
+	--enable-languages=c,c++ \
+	--with-headers=$tmpIncludeDir --with-libs=$tmpLibDir \
+	$gccConfigureArgs || exit 1
 
 # make gcc
 $MAKE || {



From mmu_man at mail.berlios.de  Sun Aug  9 18:40:20 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Sun, 9 Aug 2009 18:40:20 +0200
Subject: [Haiku-commits] r32214 - in
	haiku/trunk/src/system/boot/platform/u-boot: . board
	board/overo board/verdex
Message-ID: <200908091640.n79GeKZ7007112@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-09 18:40:17 +0200 (Sun, 09 Aug 2009)
New Revision: 32214
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32214&view=rev

Added:
   haiku/trunk/src/system/boot/platform/u-boot/board/
   haiku/trunk/src/system/boot/platform/u-boot/board/Jamfile
   haiku/trunk/src/system/boot/platform/u-boot/board/overo/
   haiku/trunk/src/system/boot/platform/u-boot/board/overo/Jamfile
   haiku/trunk/src/system/boot/platform/u-boot/board/verdex/
   haiku/trunk/src/system/boot/platform/u-boot/board/verdex/Jamfile
Modified:
   haiku/trunk/src/system/boot/platform/u-boot/Jamfile
Log:
[ARM]
Add rule to handle uimage, and board-specific stuff to handle load addresses. Need to fix them, u-boot doesn't like loading the file with the header where the header says it should go, must copy to a different address.


Modified: haiku/trunk/src/system/boot/platform/u-boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-09 15:38:41 UTC (rev 32213)
+++ haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-09 16:40:17 UTC (rev 32214)
@@ -36,6 +36,11 @@
 	: -fno-pic
 ;
 
+# include board-specific defs
+SubInclude HAIKU_TOP src system boot platform $(TARGET_BOOT_PLATFORM) board ;
+# reset SubDir
+SubDir HAIKU_TOP src system boot platform u-boot ;
+
 # bootable flash image
 rule BuildUBootFlashImage image : haikuLoader : uboot_image {
 	Depends $(image) : $(haikuLoader) ;
@@ -51,8 +56,6 @@
 
 
 actions BuildUBootFlashImage1 {
-	echo "$(1)"
-	echo "$(2)"
 	$(RM) $(<)
 	# make an empty image
 	dd if=/dev/zero of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) count=$(FLASH_IMAGE_BLOCK_COUNT)
@@ -64,9 +67,23 @@
 	dd if=$(>[1]) of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) conv=notrunc seek=$(FLASH_IMAGE_LOADER_OFFSET)
 }
 
+# uImage
+rule BuildUImage image : data : args {
+	Depends $(image) : $(data) ;
+	LocalClean clean : $(image) ;
+	MKIMAGE_ARGS on $(image) = $(args) ;
+	BuildUImage1 $(image) : $(data) ;
+}
+
+actions BuildUImage1 {
+	mkimage $(MKIMAGE_ARGS) -d $(>) $(<)
+}
+
+BuildUImage haiku_loader.ub : haiku_loader : "-A arm -O netbsd -T kernel -C none -a $(BOARD_UBOOT_LOADER_ADDRESS) -e $(BOARD_UBOOT_LOADER_ADDRESS) -n 'haiku_loader'" ;
+
 BuildUBootFlashImage haiku_flash_image_raw.img : haiku_loader : $(UBOOT_IMAGE) ;
 #BuildUBootFlashImage haiku_flash_image_elf.img : boot_loader_u-boot : $(UBOOT_IMAGE) ;
-#BuildUBootFlashImage haiku_flash_image_uimage.img : boot_loader_u-boot_uimage : $(UBOOT_IMAGE) ;
+BuildUBootFlashImage haiku_flash_image_uimage.img : haiku_loader.ub : $(UBOOT_IMAGE) ;
 
 SEARCH on [ FGristFiles text_menu.cpp ]
 	= [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;

Added: haiku/trunk/src/system/boot/platform/u-boot/board/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/board/Jamfile	2009-08-09 15:38:41 UTC (rev 32213)
+++ haiku/trunk/src/system/boot/platform/u-boot/board/Jamfile	2009-08-09 16:40:17 UTC (rev 32214)
@@ -0,0 +1,6 @@
+SubDir HAIKU_TOP src system boot platform u-boot board ;
+
+if $(TARGET_BOOT_BOARD) {
+        SubInclude HAIKU_TOP src system boot platform $(TARGET_BOOT_PLATFORM) board $(TARGET_BOOT_BOARD) ;
+}
+

Added: haiku/trunk/src/system/boot/platform/u-boot/board/overo/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/board/overo/Jamfile	2009-08-09 15:38:41 UTC (rev 32213)
+++ haiku/trunk/src/system/boot/platform/u-boot/board/overo/Jamfile	2009-08-09 16:40:17 UTC (rev 32214)
@@ -0,0 +1,4 @@
+SubDir HAIKU_TOP src system boot platform u-boot board $(TARGET_BOOT_BOARD) ;
+
+BOARD_UBOOT_LOADER_ADDRESS = 0x80008000 ;
+

Added: haiku/trunk/src/system/boot/platform/u-boot/board/verdex/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/board/verdex/Jamfile	2009-08-09 15:38:41 UTC (rev 32213)
+++ haiku/trunk/src/system/boot/platform/u-boot/board/verdex/Jamfile	2009-08-09 16:40:17 UTC (rev 32214)
@@ -0,0 +1,4 @@
+SubDir HAIKU_TOP src system boot platform u-boot board $(TARGET_BOOT_BOARD) ;
+
+BOARD_UBOOT_LOADER_ADDRESS = 0xa2000000 ;
+



From anevilyak at mail.berlios.de  Sun Aug  9 19:04:27 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sun, 9 Aug 2009 19:04:27 +0200
Subject: [Haiku-commits] r32215 -
	haiku/trunk/src/apps/debugger/gui/team_window
Message-ID: <200908091704.n79H4RpX032144@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-09 19:04:17 +0200 (Sun, 09 Aug 2009)
New Revision: 32215
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32215&view=rev

Modified:
   haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp
   haiku/trunk/src/apps/debugger/gui/team_window/SourceView.h
Log:
Factor out marker management into its own class and share an instance between the MarkerView and TextView. This allows the textview to also track all markers, and in turn make use of this information to highlight lines corresponding to breakpoints and/or the current instruction pointer.



Modified: haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp
===================================================================
--- haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp	2009-08-09 16:40:17 UTC (rev 32214)
+++ haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp	2009-08-09 17:04:17 UTC (rev 32215)
@@ -71,27 +71,18 @@
 };
 
 
-class SourceView::MarkerView : public BaseView {
+class SourceView::MarkerManager {
 public:
-								MarkerView(SourceView* sourceView, Team* team,
-									Listener* listener, FontInfo* fontInfo);
-								~MarkerView();
+								MarkerManager(SourceView* sourceView,
+									Team* team, Listener* listener);
 
-	virtual	void				SetSourceCode(SourceCode* sourceCode);
+			void				SetSourceCode(SourceCode* sourceCode);
 
 			void				SetStackTrace(StackTrace* stackTrace);
 			void				SetStackFrame(StackFrame* stackFrame);
 
 			void				UserBreakpointChanged(target_addr_t address);
 
-	virtual	BSize				MinSize();
-	virtual	BSize				MaxSize();
-
-	virtual	void				Draw(BRect updateRect);
-
-	virtual	void				MouseDown(BPoint where);
-
-private:
 			struct Marker;
 			struct InstructionPointerMarker;
 			struct BreakpointMarker;
@@ -101,14 +92,15 @@
 			typedef BObjectList<Marker>	MarkerList;
 			typedef BObjectList<BreakpointMarker> BreakpointMarkerList;
 
+			void				GetMarkers(uint32 minLine, uint32 maxLine,
+									MarkerList& markers);
+			BreakpointMarker*	BreakpointMarkerAtLine(uint32 line);
+
 private:
 			void				_InvalidateIPMarkers();
 			void				_InvalidateBreakpointMarkers();
 			void				_UpdateIPMarkers();
 			void				_UpdateBreakpointMarkers();
-			void				_GetMarkers(uint32 minLine, uint32 maxLine,
-									MarkerList& markers);
-			BreakpointMarker*	_BreakpointMarkerAtLine(uint32 line);
 
 // TODO: "public" to workaround a GCC2 problem:
 public:
@@ -130,34 +122,67 @@
 private:
 			Team*				fTeam;
 			Listener*			fListener;
+			SourceCode*			fSourceCode;
 			StackTrace*			fStackTrace;
 			StackFrame*			fStackFrame;
 			MarkerList			fIPMarkers;
 			BreakpointMarkerList fBreakpointMarkers;
 			bool				fIPMarkersValid;
 			bool				fBreakpointMarkersValid;
+
+};
+
+
+class SourceView::MarkerView : public BaseView {
+public:
+								MarkerView(SourceView* sourceView, Team* team,
+									Listener* listener, MarkerManager *manager,
+									FontInfo* fontInfo);
+								~MarkerView();
+
+	virtual	void				SetSourceCode(SourceCode* sourceCode);
+
+			void				SetStackTrace(StackTrace* stackTrace);
+			void				SetStackFrame(StackFrame* stackFrame);
+
+			void				UserBreakpointChanged(target_addr_t address);
+
+	virtual	BSize				MinSize();
+	virtual	BSize				MaxSize();
+
+	virtual	void				Draw(BRect updateRect);
+
+	virtual	void				MouseDown(BPoint where);
+
+
+private:
+			Team*				fTeam;
+			Listener*			fListener;
+			MarkerManager*		fMarkerManager;
+			StackTrace*			fStackTrace;
+			StackFrame*			fStackFrame;
 			rgb_color			fBreakpointOptionMarker;
 };
 
 
-struct SourceView::MarkerView::Marker {
+struct SourceView::MarkerManager::Marker {
 								Marker(uint32 line);
 	virtual						~Marker();
 
 	inline	uint32				Line() const;
 
-	virtual	void				Draw(MarkerView* view, BRect rect) = 0;
+	virtual	void				Draw(BView* view, BRect rect) = 0;
 
 private:
 	uint32	fLine;
 };
 
 
-struct SourceView::MarkerView::InstructionPointerMarker : Marker {
+struct SourceView::MarkerManager::InstructionPointerMarker : Marker {
 								InstructionPointerMarker(uint32 line,
 									bool topIP, bool currentIP);
 
-	virtual	void				Draw(MarkerView* view, BRect rect);
+	virtual	void				Draw(BView* view, BRect rect);
 
 private:
 			void				_DrawArrow(BView* view, BPoint tip, BSize size,
@@ -170,14 +195,14 @@
 };
 
 
-struct SourceView::MarkerView::BreakpointMarker : Marker {
+struct SourceView::MarkerManager::BreakpointMarker : Marker {
 								BreakpointMarker(uint32 line,
 									target_addr_t address, bool enabled);
 
 			target_addr_t		Address() const		{ return fAddress; }
 			bool				IsEnabled() const	{ return fEnabled; }
 
-	virtual	void				Draw(MarkerView* view, BRect rect);
+	virtual	void				Draw(BView* view, BRect rect);
 
 private:
 			target_addr_t		fAddress;
@@ -186,7 +211,7 @@
 
 
 template<typename MarkerType>
-struct SourceView::MarkerView::MarkerByLinePredicate
+struct SourceView::MarkerManager::MarkerByLinePredicate
 	: UnaryPredicate<MarkerType> {
 	MarkerByLinePredicate(uint32 line)
 		:
@@ -207,9 +232,11 @@
 class SourceView::TextView : public BaseView {
 public:
 								TextView(SourceView* sourceView,
+									MarkerManager* manager,
 									FontInfo* fontInfo);
 
 	virtual	void				SetSourceCode(SourceCode* sourceCode);
+			void				UserBreakpointChanged(target_addr_t address);
 
 	virtual	BSize				MinSize();
 	virtual	BSize				MaxSize();
@@ -284,6 +311,7 @@
 			bool				fSelectionMode;
 			TrackingState		fTrackState;
 			BMessageRunner*		fScrollRunner;
+			MarkerManager*		fMarkerManager;
 };
 
 
@@ -300,6 +328,7 @@
 {
 }
 
+
 void
 SourceView::BaseView::SetSourceCode(SourceCode* sourceCode)
 {
@@ -367,29 +396,29 @@
 // #pragma mark - MarkerView::Marker
 
 
-SourceView::MarkerView::Marker::Marker(uint32 line)
+SourceView::MarkerManager::Marker::Marker(uint32 line)
 	:
 	fLine(line)
 {
 }
 
 
-SourceView::MarkerView::Marker::~Marker()
+SourceView::MarkerManager::Marker::~Marker()
 {
 }
 
 
 uint32
-SourceView::MarkerView::Marker::Line() const
+SourceView::MarkerManager::Marker::Line() const
 {
 	return fLine;
 }
 
 
-// #pragma mark - MarkerView::InstructionPointerMarker
+// #pragma mark - MarkerManager::InstructionPointerMarker
 
 
-SourceView::MarkerView::InstructionPointerMarker::InstructionPointerMarker(
+SourceView::MarkerManager::InstructionPointerMarker::InstructionPointerMarker(
 	uint32 line, bool topIP, bool currentIP)
 	:
 	Marker(line),
@@ -400,7 +429,7 @@
 
 
 void
-SourceView::MarkerView::InstructionPointerMarker::Draw(MarkerView* view,
+SourceView::MarkerManager::InstructionPointerMarker::Draw(BView* view,
 	BRect rect)
 {
 	// Get the arrow color -- for the top IP, if current, we use blue,
@@ -426,7 +455,7 @@
 
 
 void
-SourceView::MarkerView::InstructionPointerMarker::_DrawArrow(BView* view,
+SourceView::MarkerManager::InstructionPointerMarker::_DrawArrow(BView* view,
 	BPoint tip, BSize size, BSize base, const rgb_color& color, bool fill)
 {
 	view->SetHighColor(color);
@@ -454,10 +483,10 @@
 }
 
 
-// #pragma mark - MarkerView::BreakpointMarker
+// #pragma mark - MarkerManager::BreakpointMarker
 
 
-SourceView::MarkerView::BreakpointMarker::BreakpointMarker(uint32 line,
+SourceView::MarkerManager::BreakpointMarker::BreakpointMarker(uint32 line,
 	target_addr_t address, bool enabled)
 	:
 	Marker(line),
@@ -468,7 +497,7 @@
 
 
 void
-SourceView::MarkerView::BreakpointMarker::Draw(MarkerView* view, BRect rect)
+SourceView::MarkerManager::BreakpointMarker::Draw(BView* view, BRect rect)
 {
 	float y = (rect.top + rect.bottom) / 2;
 	view->SetHighColor((rgb_color){255, 0, 0, 255});
@@ -479,13 +508,12 @@
 }
 
 
-// #pragma mark - MarkerView
+// #pragma mark - MarkerManager
 
 
-SourceView::MarkerView::MarkerView(SourceView* sourceView, Team* team,
-	Listener* listener, FontInfo* fontInfo)
+SourceView::MarkerManager::MarkerManager(SourceView* sourceView, Team* team,
+	Listener* listener)
 	:
-	BaseView("source marker view", sourceView, fontInfo),
 	fTeam(team),
 	fListener(listener),
 	fStackTrace(NULL),
@@ -494,169 +522,50 @@
 	fBreakpointMarkers(20, true),
 	fIPMarkersValid(false),
 	fBreakpointMarkersValid(false)
-
 {
-	rgb_color background = ui_color(B_PANEL_BACKGROUND_COLOR);
-	fBreakpointOptionMarker = tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
-		B_DARKEN_1_TINT);
-	SetViewColor(background);
 }
 
 
-SourceView::MarkerView::~MarkerView()
-{
-}
-
-
 void
-SourceView::MarkerView::SetSourceCode(SourceCode* sourceCode)
+SourceView::MarkerManager::SetSourceCode(SourceCode* sourceCode)
 {
-	_InvalidateIPMarkers();
-	_InvalidateBreakpointMarkers();
-	BaseView::SetSourceCode(sourceCode);
+	fSourceCode = sourceCode;
 }
 
 
 void
-SourceView::MarkerView::SetStackTrace(StackTrace* stackTrace)
+SourceView::MarkerManager::SetStackTrace(StackTrace* stackTrace)
 {
 	fStackTrace = stackTrace;
 	_InvalidateIPMarkers();
-	Invalidate();
 }
 
 
 void
-SourceView::MarkerView::SetStackFrame(StackFrame* stackFrame)
+SourceView::MarkerManager::SetStackFrame(StackFrame* stackFrame)
 {
 	fStackFrame = stackFrame;
 	_InvalidateIPMarkers();
-	Invalidate();
 }
 
 
 void
-SourceView::MarkerView::UserBreakpointChanged(target_addr_t address)
+SourceView::MarkerManager::UserBreakpointChanged(target_addr_t address)
 {
 	_InvalidateBreakpointMarkers();
-	Invalidate();
 }
 
 
-BSize
-SourceView::MarkerView::MinSize()
-{
-	return BSize(40, TotalHeight());
-}
-
-
-BSize
-SourceView::MarkerView::MaxSize()
-{
-	return BSize(MinSize().width, B_SIZE_UNLIMITED);
-}
-
 void
-SourceView::MarkerView::Draw(BRect updateRect)
+SourceView::MarkerManager::_InvalidateIPMarkers()
 {
-	if (fSourceCode == NULL)
-		return;
-
-	// get the lines intersecting with the update rect
-	int32 minLine, maxLine;
-	GetLineRange(updateRect, minLine, maxLine);
-	if (minLine > maxLine)
-		return;
-
-	// get the markers in that range
-	MarkerList markers;
-	_GetMarkers(minLine, maxLine, markers);
-
-	float width = Bounds().Width();
-
-	AutoLocker<SourceCode> sourceLocker(fSourceCode);
-
-	int32 markerIndex = 0;
-	for (int32 line = minLine; line <= maxLine; line++) {
-		bool drawBreakpointOptionMarker = true;
-
-		Marker* marker;
-		while ((marker = markers.ItemAt(markerIndex)) != NULL
-				&& marker->Line() == (uint32)line) {
-			marker->Draw(this, LineRect(line));
-			drawBreakpointOptionMarker = false;
-			markerIndex++;
-		}
-
-		if (!drawBreakpointOptionMarker)
-			continue;
-
-		SourceLocation statementStart, statementEnd;
-		if (!fSourceCode->GetStatementLocationRange(SourceLocation(line),
-				statementStart, statementEnd)
-			|| statementStart.Line() != line) {
-			continue;
-		}
-
-		float y = ((float)line + 0.5f) * fFontInfo->lineHeight;
-		SetHighColor(fBreakpointOptionMarker);
-		FillEllipse(BPoint(width - 8, y), 2, 2);
-	}
-}
-
-
-void
-SourceView::MarkerView::MouseDown(BPoint where)
-{
-	if (fSourceCode == NULL)
-		return;
-
-	int32 line = LineAtOffset(where.y);
-	if (line < 0)
-		return;
-
-	AutoLocker<Team> locker(fTeam);
-	Statement* statement;
-	if (fTeam->GetStatementAtSourceLocation(fSourceCode,
-			SourceLocation(line), statement) != B_OK) {
-		return;
-	}
-	Reference<Statement> statementReference(statement, true);
-	if (statement->StartSourceLocation().Line() != line)
-		return;
-
-	int32 modifiers;
-	if (Looper()->CurrentMessage()->FindInt32("modifiers", &modifiers) != B_OK)
-		modifiers = 0;
-
-	BreakpointMarker* marker = _BreakpointMarkerAtLine(line);
-	target_addr_t address = marker != NULL
-		? marker->Address() : statement->CoveringAddressRange().Start();
-
-	if ((modifiers & B_SHIFT_KEY) != 0) {
-		if (marker != NULL && !marker->IsEnabled())
-			fListener->ClearBreakpointRequested(address);
-		else
-			fListener->SetBreakpointRequested(address, false);
-	} else {
-		if (marker != NULL && marker->IsEnabled())
-			fListener->ClearBreakpointRequested(address);
-		else
-			fListener->SetBreakpointRequested(address, true);
-	}
-}
-
-
-void
-SourceView::MarkerView::_InvalidateIPMarkers()
-{
 	fIPMarkersValid = false;
 	fIPMarkers.MakeEmpty();
 }
 
 
 void
-SourceView::MarkerView::_InvalidateBreakpointMarkers()
+SourceView::MarkerManager::_InvalidateBreakpointMarkers()
 {
 	fBreakpointMarkersValid = false;
 	fBreakpointMarkers.MakeEmpty();
@@ -664,7 +573,7 @@
 
 
 void
-SourceView::MarkerView::_UpdateIPMarkers()
+SourceView::MarkerManager::_UpdateIPMarkers()
 {
 	if (fIPMarkersValid)
 		return;
@@ -688,7 +597,7 @@
 			Reference<Statement> statementReference(statement, true);
 
 			int32 line = statement->StartSourceLocation().Line();
-			if (line < 0 || line >= LineCount())
+			if (line < 0 || line >= fSourceCode->CountLines())
 				continue;
 
 			if (sourceFile != NULL) {
@@ -721,7 +630,7 @@
 
 
 void
-SourceView::MarkerView::_UpdateBreakpointMarkers()
+SourceView::MarkerManager::_UpdateBreakpointMarkers()
 {
 	if (fBreakpointMarkersValid)
 		return;
@@ -751,7 +660,7 @@
 			Reference<Statement> statementReference(statement, true);
 
 			int32 line = statement->StartSourceLocation().Line();
-			if (line < 0 || line >= LineCount())
+			if (line < 0 || line >= fSourceCode->CountLines())
 				continue;
 
 			if (sourceFile != NULL) {
@@ -779,7 +688,7 @@
 
 
 void
-SourceView::MarkerView::_GetMarkers(uint32 minLine, uint32 maxLine,
+SourceView::MarkerManager::GetMarkers(uint32 minLine, uint32 maxLine,
 	MarkerList& markers)
 {
 	_UpdateIPMarkers();
@@ -816,8 +725,8 @@
 }
 
 
-SourceView::MarkerView::BreakpointMarker*
-SourceView::MarkerView::_BreakpointMarkerAtLine(uint32 line)
+SourceView::MarkerManager::BreakpointMarker*
+SourceView::MarkerManager::BreakpointMarkerAtLine(uint32 line)
 {
 	return fBreakpointMarkers.BinarySearchByKey(line,
 		&_CompareLineBreakpointMarker);
@@ -825,7 +734,7 @@
 
 
 /*static*/ int
-SourceView::MarkerView::_CompareMarkers(const Marker* a,
+SourceView::MarkerManager::_CompareMarkers(const Marker* a,
 	const Marker* b)
 {
 	if (a->Line() < b->Line())
@@ -835,7 +744,7 @@
 
 
 /*static*/ int
-SourceView::MarkerView::_CompareBreakpointMarkers(const BreakpointMarker* a,
+SourceView::MarkerManager::_CompareBreakpointMarkers(const BreakpointMarker* a,
 	const BreakpointMarker* b)
 {
 	if (a->Line() < b->Line())
@@ -846,7 +755,7 @@
 
 template<typename MarkerType>
 /*static*/ int
-SourceView::MarkerView::_CompareLineMarkerTemplate(const uint32* line,
+SourceView::MarkerManager::_CompareLineMarkerTemplate(const uint32* line,
 	const MarkerType* marker)
 {
 	if (*line < marker->Line())
@@ -856,7 +765,7 @@
 
 
 /*static*/ int
-SourceView::MarkerView::_CompareLineMarker(const uint32* line,
+SourceView::MarkerManager::_CompareLineMarker(const uint32* line,
 	const Marker* marker)
 {
 	return _CompareLineMarkerTemplate<Marker>(line, marker);
@@ -864,17 +773,176 @@
 
 
 /*static*/ int
-SourceView::MarkerView::_CompareLineBreakpointMarker(const uint32* line,
+SourceView::MarkerManager::_CompareLineBreakpointMarker(const uint32* line,
 	const BreakpointMarker* marker)
 {
 	return _CompareLineMarkerTemplate<BreakpointMarker>(line, marker);
 }
 
 
+// #pragma mark - MarkerView
+
+
+SourceView::MarkerView::MarkerView(SourceView* sourceView, Team* team,
+	Listener* listener, MarkerManager* manager, FontInfo* fontInfo)
+	:
+	BaseView("source marker view", sourceView, fontInfo),
+	fTeam(team),
+	fListener(listener),
+	fMarkerManager(manager),
+	fStackTrace(NULL),
+	fStackFrame(NULL)
+{
+	rgb_color background = ui_color(B_PANEL_BACKGROUND_COLOR);
+	fBreakpointOptionMarker = tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
+		B_DARKEN_1_TINT);
+	SetViewColor(background);
+}
+
+
+SourceView::MarkerView::~MarkerView()
+{
+}
+
+
+void
+SourceView::MarkerView::SetSourceCode(SourceCode* sourceCode)
+{
+	BaseView::SetSourceCode(sourceCode);
+}
+
+
+void
+SourceView::MarkerView::SetStackTrace(StackTrace* stackTrace)
+{
+	Invalidate();
+}
+
+
+void
+SourceView::MarkerView::SetStackFrame(StackFrame* stackFrame)
+{
+	Invalidate();
+}
+
+
+void
+SourceView::MarkerView::UserBreakpointChanged(target_addr_t address)
+{
+	Invalidate();
+}
+
+
+BSize
+SourceView::MarkerView::MinSize()
+{
+	return BSize(40, TotalHeight());
+}
+
+
+BSize
+SourceView::MarkerView::MaxSize()
+{
+	return BSize(MinSize().width, B_SIZE_UNLIMITED);
+}
+
+void
+SourceView::MarkerView::Draw(BRect updateRect)
+{
+	if (fSourceCode == NULL)
+		return;
+
+	// get the lines intersecting with the update rect
+	int32 minLine, maxLine;
+	GetLineRange(updateRect, minLine, maxLine);
+	if (minLine > maxLine)
+		return;
+
+	// get the markers in that range
+	SourceView::MarkerManager::MarkerList markers;
+	fMarkerManager->GetMarkers(minLine, maxLine, markers);
+
+	float width = Bounds().Width();
+
+	AutoLocker<SourceCode> sourceLocker(fSourceCode);
+
+	int32 markerIndex = 0;
+	for (int32 line = minLine; line <= maxLine; line++) {
+		bool drawBreakpointOptionMarker = true;
+
+		SourceView::MarkerManager::Marker* marker;
+		while ((marker = markers.ItemAt(markerIndex)) != NULL
+				&& marker->Line() == (uint32)line) {
+			marker->Draw(this, LineRect(line));
+			drawBreakpointOptionMarker = false;
+			markerIndex++;
+		}
+
+		if (!drawBreakpointOptionMarker)
+			continue;
+
+		SourceLocation statementStart, statementEnd;
+		if (!fSourceCode->GetStatementLocationRange(SourceLocation(line),
+				statementStart, statementEnd)
+			|| statementStart.Line() != line) {
+			continue;
+		}
+
+		float y = ((float)line + 0.5f) * fFontInfo->lineHeight;
+		SetHighColor(fBreakpointOptionMarker);
+		FillEllipse(BPoint(width - 8, y), 2, 2);
+	}
+}
+
+
+void
+SourceView::MarkerView::MouseDown(BPoint where)
+{
+	if (fSourceCode == NULL)
+		return;
+
+	int32 line = LineAtOffset(where.y);
+	if (line < 0)
+		return;
+
+	AutoLocker<Team> locker(fTeam);
+	Statement* statement;
+	if (fTeam->GetStatementAtSourceLocation(fSourceCode,
+			SourceLocation(line), statement) != B_OK) {
+		return;
+	}
+	Reference<Statement> statementReference(statement, true);
+	if (statement->StartSourceLocation().Line() != line)
+		return;
+
+	int32 modifiers;
+	if (Looper()->CurrentMessage()->FindInt32("modifiers", &modifiers) != B_OK)
+		modifiers = 0;
+
+	SourceView::MarkerManager::BreakpointMarker* marker =
+		fMarkerManager->BreakpointMarkerAtLine(line);
+	target_addr_t address = marker != NULL
+		? marker->Address() : statement->CoveringAddressRange().Start();
+
+	if ((modifiers & B_SHIFT_KEY) != 0) {
+		if (marker != NULL && !marker->IsEnabled())
+			fListener->ClearBreakpointRequested(address);
+		else
+			fListener->SetBreakpointRequested(address, false);
+	} else {
+		if (marker != NULL && marker->IsEnabled())
+			fListener->ClearBreakpointRequested(address);
+		else
+			fListener->SetBreakpointRequested(address, true);
+	}
+}
+
+
 // #pragma mark - TextView
 
 
-SourceView::TextView::TextView(SourceView* sourceView, FontInfo* fontInfo)
+SourceView::TextView::TextView(SourceView* sourceView, MarkerManager* manager,
+	FontInfo* fontInfo)
 	:
 	BaseView("source text view", sourceView, fontInfo),
 	fMaxLineWidth(-1),
@@ -887,7 +955,8 @@
 	fClickCount(0),
 	fSelectionMode(false),
 	fTrackState(kNotTracking),
-	fScrollRunner(NULL)
+	fScrollRunner(NULL),
+	fMarkerManager(manager)
 {
 	SetViewColor(ui_color(B_DOCUMENT_BACKGROUND_COLOR));
 	fTextColor = ui_color(B_DOCUMENT_TEXT_COLOR);
@@ -905,6 +974,13 @@
 }
 
 
+void
+SourceView::TextView::UserBreakpointChanged(target_addr_t)
+{
+	Invalidate();
+}
+
+
 BSize
 SourceView::TextView::MinSize()
 {
@@ -928,15 +1004,39 @@
 	// get the lines intersecting with the update rect
 	int32 minLine, maxLine;
 	GetLineRange(updateRect, minLine, maxLine);
+	SourceView::MarkerManager::MarkerList markers;
+	fMarkerManager->GetMarkers(minLine, maxLine, markers);
 
 	// draw the affected lines
 	SetHighColor(fTextColor);
 	SetFont(&fFontInfo->font);
+	SourceView::MarkerManager::Marker* marker;
+	int32 markerIndex = 0;
 	for (int32 i = minLine; i <= maxLine; i++) {
+		SetLowColor(ViewColor());
 		float y = (float)(i + 1) * fFontInfo->lineHeight
 			- fFontInfo->fontHeight.descent;
 		BString lineString;
 		_FormatLine(fSourceCode->LineAt(i), lineString);
+
+		for (int32 j = markerIndex; j < markers.CountItems(); j++) {
+			marker = markers.ItemAt(j);
+			 if (marker->Line() < (uint32)i) {
+				++markerIndex;
+			 	continue;
+			 } else if (marker->Line() == (uint32)i) {
+			 	++markerIndex;
+			 	if (dynamic_cast<SourceView::MarkerManager
+			 		::InstructionPointerMarker*>(marker) != NULL)
+			 		SetLowColor(96, 216, 216, 255);
+			 	else
+					SetLowColor(255, 255, 0, 255);
+				FillRect(BRect(kLeftTextMargin, y - fFontInfo->lineHeight,
+					Bounds().right,	y), B_SOLID_LOW);
+				break;
+			 } else
+			 	break;
+		}
 		DrawString(lineString, BPoint(kLeftTextMargin, y));
 	}
 
@@ -1575,6 +1675,7 @@
 		return;
 
 	if (fStackTrace != NULL) {
+		fMarkerManager->SetStackTrace(NULL);
 		fMarkerView->SetStackTrace(NULL);
 		fStackTrace->RemoveReference();
 	}
@@ -1584,7 +1685,9 @@
 	if (fStackTrace != NULL)
 		fStackTrace->AddReference();
 
+	fMarkerManager->SetStackTrace(fStackTrace);
 	fMarkerView->SetStackTrace(fStackTrace);
+	fTextView->Invalidate();
 }
 
 
@@ -1595,6 +1698,7 @@
 		return;
 
 	if (fStackFrame != NULL) {
+		fMarkerManager->SetStackFrame(NULL);
 		fMarkerView->SetStackFrame(NULL);
 		fStackFrame->RemoveReference();
 	}
@@ -1604,7 +1708,9 @@
 	if (fStackFrame != NULL)
 		fStackFrame->AddReference();
 
+	fMarkerManager->SetStackFrame(fStackFrame);
 	fMarkerView->SetStackFrame(fStackFrame);
+	fTextView->Invalidate();
 
 	if (fStackFrame != NULL)
 		ScrollToAddress(fStackFrame->InstructionPointer());
@@ -1619,6 +1725,7 @@
 		return;
 
 	if (fSourceCode != NULL) {
+		fMarkerManager->SetSourceCode(NULL);
 		fTextView->SetSourceCode(NULL);
 		fMarkerView->SetSourceCode(NULL);
 		fSourceCode->RemoveReference();
@@ -1629,6 +1736,7 @@
 	if (fSourceCode != NULL)
 		fSourceCode->AddReference();
 
+	fMarkerManager->SetSourceCode(fSourceCode);
 	fTextView->SetSourceCode(fSourceCode);
 	fMarkerView->SetSourceCode(fSourceCode);
 	_UpdateScrollBars();
@@ -1641,7 +1749,9 @@
 void
 SourceView::UserBreakpointChanged(target_addr_t address)
 {
+	fMarkerManager->UserBreakpointChanged(address);
 	fMarkerView->UserBreakpointChanged(address);
+	fTextView->UserBreakpointChanged(address);
 }
 
 
@@ -1764,8 +1874,10 @@
 void
 SourceView::_Init()
 {
-	AddChild(fMarkerView = new MarkerView(this, fTeam, fListener, &fFontInfo));
-	AddChild(fTextView = new TextView(this, &fFontInfo));
+	fMarkerManager = new MarkerManager(this, fTeam, fListener);
+	AddChild(fMarkerView = new MarkerView(this, fTeam, fListener,
+		fMarkerManager, &fFontInfo));
+	AddChild(fTextView = new TextView(this, fMarkerManager, &fFontInfo));
 }
 
 

Modified: haiku/trunk/src/apps/debugger/gui/team_window/SourceView.h
===================================================================
--- haiku/trunk/src/apps/debugger/gui/team_window/SourceView.h	2009-08-09 16:40:17 UTC (rev 32214)
+++ haiku/trunk/src/apps/debugger/gui/team_window/SourceView.h	2009-08-09 17:04:17 UTC (rev 32215)
@@ -53,6 +53,7 @@
 
 private:
 			class BaseView;
+			class MarkerManager;
 			class MarkerView;
 			class TextView;
 
@@ -72,6 +73,7 @@
 			StackTrace*			fStackTrace;
 			StackFrame*			fStackFrame;
 			SourceCode*			fSourceCode;
+			MarkerManager*		fMarkerManager;
 			MarkerView*			fMarkerView;
 			TextView*			fTextView;
 			FontInfo			fFontInfo;



From mmlr at mail.berlios.de  Sun Aug  9 19:39:07 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Sun, 9 Aug 2009 19:39:07 +0200
Subject: [Haiku-commits] r32216 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200908091739.n79Hd7hW022776@sheep.berlios.de>

Author: mmlr
Date: 2009-08-09 19:39:05 +0200 (Sun, 09 Aug 2009)
New Revision: 32216
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32216&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_thread.cpp
Log:
The reference of the currently active translation map shouldn't be released
until the data it protects isn't in active use anymore. Previously it would
release the translation map and therefore the page directory reference while
the page dir was still set on the CPU, as only the actual call to
i386_context_switch() will replace the page directory in the control register.
This didn't cause any harm though, as during the context switch interrupts are
disabled and therefore the page directory would only be deferred_delete()ed and
not directly freed/overwritten. Still this is logically more correct.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_thread.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_thread.cpp	2009-08-09 17:04:17 UTC (rev 32215)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_thread.cpp	2009-08-09 17:39:05 UTC (rev 32216)
@@ -384,17 +384,21 @@
 		atomic_or(&toMap->active_on_cpus, (uint32)1 << cpu);
 
 		// assign the new map to the CPU
-		activeMap->RemoveReference();
 		toMap->AddReference();
 		cpuData->arch.active_translation_map = toMap;
 
 		// get the new page directory
 		newPageDirectory = (addr_t)toMap->pgdir_phys;
-	} else
+	} else {
+		activeMap = NULL;
 		newPageDirectory = 0;
+	}
 
 	gX86SwapFPUFunc(from->arch_info.fpu_state, to->arch_info.fpu_state);
 	i386_context_switch(&from->arch_info, &to->arch_info, newPageDirectory);
+
+	if (activeMap != NULL)
+		activeMap->RemoveReference();
 }
 
 



From axeld at pinc-software.de  Sun Aug  9 20:32:04 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 09 Aug 2009 20:32:04 +0200 CEST
Subject: [Haiku-commits] r32212 - haiku/trunk/src/servers/app
In-Reply-To: <200908091526.n79FQlwP024385@sheep.berlios.de>
Message-ID: <1387161399-BeMail@zon>

rudolfc at mail.berlios.de wrote:
> Remark: Haiku's screen preflet refuses to set modes once a virtual 
> screen is set
> since it doesn't recognize the currently set mode. I guess that could 
> be fixed.

How do I play with the virtual screen things? I wanted to have another 
look at the intel_extreme driver with this in mind, so I could then 
also fix any ill-doings in Screen.

BTW, your changes look just fine :-)

Bye,
   Axel.



From axeld at pinc-software.de  Sun Aug  9 20:54:47 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 09 Aug 2009 20:54:47 +0200 CEST
Subject: [Haiku-commits] r32206 - haiku/trunk/src/apps/diskusage
In-Reply-To: <200908080853.n788rcPq000156@sheep.berlios.de>
Message-ID: <2750380945-BeMail@zon>

stippi at mail.berlios.de wrote:
> Log:
> Replaced duplicated DriveSetup icon with zuMi's DiskUsage icon. 
> According to
> a Trac comment, Ryan prefers it. Another argument pro zuMi's version 
> is that
> it is a bit more neutral, since DiskUsage can be invoked on folders, 
> not just
> entire disks.

Maybe a balance ("weighing machine"?) would also server as a good base 
for DiskUsage - I haven't looked at this one, yet, though, just as a 
general idea.

Bye,
   Axel.



From rudolf.cornelissen at gmail.com  Sun Aug  9 21:33:59 2009
From: rudolf.cornelissen at gmail.com (Rudolf Cornelissen)
Date: Sun, 9 Aug 2009 19:33:59 +0000
Subject: [Haiku-commits] r32212 - haiku/trunk/src/servers/app
In-Reply-To: <1387161399-BeMail@zon>
References: <200908091526.n79FQlwP024385@sheep.berlios.de>
	<1387161399-BeMail@zon>
Message-ID: <fe83ece0908091233t69fec33bp81c27bea75b25a7b@mail.gmail.com>

Hi Axel,

Playing with a virtual mode (workspace resolution > screen resolution works
very nice if there's hardware cursor support: if that's used the driver will
automatically pan and scroll around the workspace following the mouse.

Of course that could also be done with a soft cursor but then the app_Server
would need to call the accelerant giving it the new coordinates via some
(new?) hook.

I just tested with a (nvidia/matrox) card and dualhead setup: if you set a
dualhead (not clone) mode the workspace is twice as wide as the screen: the
Haiku preflet then does nolonger work (all modes greyed out).

The cursor doesn't have to be followed by the driver in such a mode since
it's always visible (left or right screen). Unless of course you'd set a
mode that has a virtual resolution above twice the screen: in that case
(with a hardcursor) the driver lets both screens follow the mousecursor.

I always tested this using a small command line tool I 'wrote' called
virtualscreen (wich btw works on haiku now). I could very nicely find out
the hardware granularity and max sizes for setting (virtual) screens with
that. It was kind of cool having a workspace of above 10.000 by 10.000
pixels ;-)

Good to know you're OK with the changes. Thanks!

Rudolf.




On Sun, Aug 9, 2009 at 6:32 PM, Axel D?rfler <axeld at pinc-software.de> wrote:

> rudolfc at mail.berlios.de wrote:
> > Remark: Haiku's screen preflet refuses to set modes once a virtual
> > screen is set
> > since it doesn't recognize the currently set mode. I guess that could
> > be fixed.
>
> How do I play with the virtual screen things? I wanted to have another
> look at the intel_extreme driver with this in mind, so I could then
> also fix any ill-doings in Screen.
>
> BTW, your changes look just fine :-)
>
> Bye,
>    Axel.
>
> _______________________________________________
> Haiku-commits mailing list
> Haiku-commits at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/haiku-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20090809/742db95a/attachment.html>

From mmlr at mail.berlios.de  Sun Aug  9 21:54:47 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Sun, 9 Aug 2009 21:54:47 +0200
Subject: [Haiku-commits] r32217 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200908091954.n79JslQC010913@sheep.berlios.de>

Author: mmlr
Date: 2009-08-09 21:54:41 +0200 (Sun, 09 Aug 2009)
New Revision: 32217
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32217&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
Log:
Adding a disabled debug helper.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp	2009-08-09 17:39:05 UTC (rev 32216)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp	2009-08-09 19:54:41 UTC (rev 32217)
@@ -192,6 +192,15 @@
 	sTMapList.Remove(this);
 	locker.Unlock();
 
+#if 0
+	// this sanity check can be enabled when corruption due to
+	// overwriting an active page directory is suspected
+	addr_t activePageDirectory;
+	read_cr3(activePageDirectory);
+	if (activePageDirectory == (addr_t)pgdir_phys)
+		panic("deleting a still active page directory\n");
+#endif
+
 	if (are_interrupts_enabled())
 		delete this;
 	else



From kirilla at mail.berlios.de  Mon Aug 10 02:31:35 2009
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Mon, 10 Aug 2009 02:31:35 +0200
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
Message-ID: <200908100031.n7A0VZ03004478@sheep.berlios.de>

Author: kirilla
Date: 2009-08-10 02:31:34 +0200 (Mon, 10 Aug 2009)
New Revision: 32218
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32218&view=rev

Modified:
   haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp
   haiku/trunk/src/apps/screenshot/ScreenshotWindow.h
Log:
Working but somewhat dodgy tab space transparency - for humdinger as per request #3813. Enjoy!

Modified: haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp
===================================================================
--- haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp	2009-08-09 19:54:41 UTC (rev 32217)
+++ haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp	2009-08-10 00:31:34 UTC (rev 32218)
@@ -88,6 +88,7 @@
 	fOutputPathPanel(NULL),
 	fLastSelectedPath(NULL),
 	fDelay(delay),
+	fTabHeight(0),
 	fIncludeBorder(includeBorder),
 	fIncludeMouse(includeMouse),
 	fGrabActiveWindow(grabActiveWindow),
@@ -639,8 +640,10 @@
 	BRect frame;
 	delete fScreenshot;
 	if (_GetActiveWindowFrame(&frame) == B_OK) {
-		fScreenshot = new BBitmap(frame.OffsetToCopy(B_ORIGIN), B_RGBA32);
+		fScreenshot = new BBitmap(frame.OffsetToCopy(B_ORIGIN), B_RGBA32, true);
 		BScreen(this).ReadBitmap(fScreenshot, fIncludeMouse, &frame);
+		if (fIncludeBorder)
+			_MakeTabSpaceTransparent();
 	} else {
 		BScreen(this).GetBitmap(&fScreenshot, fIncludeMouse);
 	}
@@ -674,6 +677,7 @@
 				float border = (windowInfo->border_size);
 				frame->InsetBy(-(border), -(border));
 				frame->top -= windowInfo->tab_height;
+				fTabHeight = windowInfo->tab_height;
 			}
 			free(windowInfo);
 
@@ -784,3 +788,102 @@
 		fScreenshot->Bits(), fScreenshot->BitsLength(),
 		fScreenshot->BytesPerRow());
 }
+
+
+void
+ScreenshotWindow::_MakeTabSpaceTransparent()
+{
+	if (fScreenshot->ColorSpace() != B_RGBA32)
+		return;
+		
+	if (fTabHeight == 0)
+		return;
+	
+	// This method is fragile since it relies on the color scheme of the current
+	// window decorator. The code could be simplified a lot if there was a way
+	// to ask for, or to easily compute, the tab width of the target window.
+	
+	uint8* component = static_cast<uint8*>(fScreenshot->Bits());
+	int32 bytesPerRow = fScreenshot->BytesPerRow();
+	int32 pixelsPerRow = bytesPerRow / 4;
+
+	int32 tabHeight = static_cast<int32>(fTabHeight);
+	int32 tabStart = 0;
+	int32 tabEnd = 0;
+	bool foundTabStart = false;
+	bool foundTabEnd = false;
+	
+	// Find the top-left corner of the window tab, by color, and support
+	// this guess by following a one tab high column of pixels downwards.
+	for (int32 x = 0; x < pixelsPerRow; x++) {
+		if (component[0] == 152 && component[1] == 152 && component[2] == 152) {
+			foundTabStart = true;
+	
+			for (int32 y = 0; y < tabHeight; y++) {
+				component += bytesPerRow;
+				
+				if (!(component[0] == 152 && component[1] == 152
+					&& component[2] == 152)) {
+					foundTabStart = false;
+				}			
+			}			
+			component -= bytesPerRow * tabHeight;
+			
+			if (foundTabStart) {
+				tabStart = x;
+				break;
+			}
+		}
+		component += 4;
+	}
+	
+	component = static_cast<uint8*>(fScreenshot->Bits());
+
+	// Find the top-right corner of the window tab.
+	for (int32 x = 0; x < pixelsPerRow; x++) {
+		if (component[0] == 108 && component[1] == 108 && component[2] == 108) {
+			foundTabEnd = true;
+	
+			for (int32 y = 0; y < tabHeight; y++) {
+				component += bytesPerRow;
+			
+				if (!(component[0] == 108 && component[1] == 108
+					&& component[2] == 108)) {
+					foundTabEnd = false;
+				}			
+			}			
+			component -= bytesPerRow * tabHeight;
+			
+			if (foundTabEnd) {
+				tabEnd = x;
+				break;
+			}
+		}
+		component += 4;
+	}
+	
+	if (!foundTabEnd || !foundTabStart)
+		return;
+	
+	if (tabStart > tabEnd)
+		return;
+
+	BView view(fScreenshot->Bounds(), "bitmapView", B_FOLLOW_ALL_SIDES, 0);
+	fScreenshot->AddChild(&view);
+	if(view.Looper() && view.Looper()->Lock()) {
+		view.SetDrawingMode(B_OP_COPY);
+		view.SetHighColor(B_TRANSPARENT_32_BIT);
+
+		if (tabStart > 0)
+			view.FillRect(BRect(0, 0, tabStart - 1, tabHeight - 1));
+
+		if (tabEnd < pixelsPerRow - 1) {
+			view.FillRect(BRect(tabEnd + 1, 0, pixelsPerRow - 1,
+				tabHeight - 1));
+		}
+		view.Sync();
+		view.Looper()->Unlock();
+	}
+	fScreenshot->RemoveChild(&view);
+}
+

Modified: haiku/trunk/src/apps/screenshot/ScreenshotWindow.h
===================================================================
--- haiku/trunk/src/apps/screenshot/ScreenshotWindow.h	2009-08-09 19:54:41 UTC (rev 32217)
+++ haiku/trunk/src/apps/screenshot/ScreenshotWindow.h	2009-08-10 00:31:34 UTC (rev 32218)
@@ -53,6 +53,7 @@
 
 			void			_TakeScreenshot();
 			status_t		_GetActiveWindowFrame(BRect* frame);
+			void			_MakeTabSpaceTransparent();
 
 			status_t		_SaveScreenshot();
 			void			_SaveScreenshotSilent() const;
@@ -74,6 +75,7 @@
 			BMenuItem*		fLastSelectedPath;
 
 			bigtime_t		fDelay;
+			float			fTabHeight;
 
 			bool			fIncludeBorder;
 			bool			fIncludeMouse;



From kirilla at mail.berlios.de  Mon Aug 10 03:26:15 2009
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Mon, 10 Aug 2009 03:26:15 +0200
Subject: [Haiku-commits] r32219 - haiku/trunk/src/servers/cddb_daemon
Message-ID: <200908100126.n7A1QFdZ015564@sheep.berlios.de>

Author: kirilla
Date: 2009-08-10 03:26:14 +0200 (Mon, 10 Aug 2009)
New Revision: 32219
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32219&view=rev

Modified:
   haiku/trunk/src/servers/cddb_daemon/cddb_daemon.cpp
Log:
Strip slash character from cddb data before attempting to rename volume and files. Continue in spite of file errors.

Modified: haiku/trunk/src/servers/cddb_daemon/cddb_daemon.cpp
===================================================================
--- haiku/trunk/src/servers/cddb_daemon/cddb_daemon.cpp	2009-08-10 00:31:34 UTC (rev 32218)
+++ haiku/trunk/src/servers/cddb_daemon/cddb_daemon.cpp	2009-08-10 01:26:14 UTC (rev 32219)
@@ -214,7 +214,11 @@
 	BVolume volume(device);
 	
 	status_t result;
+	status_t error = B_OK;
+	
 	BString name = diskData->artist << " - " << diskData->title;
+	name.ReplaceSet("/", " ");
+	
 	if ((result = volume.SetName(name.String())) != B_OK) {
 		printf("Can't set volume name.\n");
 		return result;
@@ -225,15 +229,20 @@
 	volume.GetRootDirectory(&cddaRoot);
 	
 	BEntry entry;
-	int cnt = 0;
+	int index = 0;
 	while (cddaRoot.GetNextEntry(&entry) == B_OK) {
-		TrackData* data = (TrackData*)((readResponse->tracks).ItemAt(cnt));
+		TrackData* data = (TrackData*)((readResponse->tracks).ItemAt(index));
 		
 		// Update name.
-		if ((result = entry.Rename((data->title).String())) != B_OK) {
-			// Failed renaming one entry. Abort processing.
-			printf("Failed renaming entry at index %d. Aborting.\n", cnt);
-			return result;
+		name = data->title;
+		name.ReplaceSet("/", " ");
+		
+		if ((result = entry.Rename(name.String())) != B_OK) {
+			printf("Failed renaming entry at index %d to \"%s\".\n", index,
+				name.String());
+			error = result;
+				// User can benefit from continuing through all tracks.
+				// Report error later.
 		}
 		
 		// Add relevant attributes. We consider an error here as non-fatal.
@@ -258,10 +267,10 @@
 				(data->artist).String(), (data->artist).Length());			
 		}
 			
-		cnt++;
+		index++;
 	}
 	
-	return B_OK;
+	return error;
 }	
 
 



From leavengood at gmail.com  Mon Aug 10 07:44:22 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 10 Aug 2009 01:44:22 -0400
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <200908100031.n7A0VZ03004478@sheep.berlios.de>
References: <200908100031.n7A0VZ03004478@sheep.berlios.de>
Message-ID: <a4855ac50908092244x6231a779sfe51d48f10f6f56c@mail.gmail.com>

On Sun, Aug 9, 2009 at 8:31 PM, kirilla at
BerliOS<kirilla at mail.berlios.de> wrote:
>
> Working but somewhat dodgy tab space transparency - for humdinger as per request #3813. Enjoy!

:)

This is definitely just asking to be broken, though it is something
I've wanted too.

There is in fact now a GetDecoratorSettings() method in BWindow which
returns a BMessage which contains a BRect called "tab frame" which you
might find useful.

Of course this may all be moot since you cannot really get that
remotely at the moment. But maybe "Tab Frame" could be added as a
specifier to BWindow (only a GET property since only the tab location
in decorator settings is settable.)

-- 
Regards,
Ryan


From humdingerb at googlemail.com  Mon Aug 10 07:49:14 2009
From: humdingerb at googlemail.com (Humdinger)
Date: Mon, 10 Aug 2009 07:49:14 +0200
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <200908100031.n7A0VZ03004478@sheep.berlios.de>
References: <200908100031.n7A0VZ03004478@sheep.berlios.de>
Message-ID: <4A7FB4DA.3020302@googlemail.com>

kirilla at BerliOS wrote:
> Modified:
>    haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp
>    haiku/trunk/src/apps/screenshot/ScreenshotWindow.h
> Log:
> Working but somewhat dodgy tab space transparency - for humdinger as per request #3813. Enjoy!

Wow! Thanks, that's a really nice feature! I only wish I had mentioned that a few days 
earlier, before doing all cut-outs of dozens of screenshots by hand... :)
If I could lure you to BeGeistert, you'd have a beer on me. :)

Regards,
Humdinger

-- 
--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-
Deutsche Haiku News @ http://www.haiku-gazette.de


From humdingerb at mail.berlios.de  Mon Aug 10 10:07:49 2009
From: humdingerb at mail.berlios.de (humdingerb at mail.berlios.de)
Date: Mon, 10 Aug 2009 10:07:49 +0200
Subject: [Haiku-commits] r32220 - haiku/trunk/src/apps/deskbar
Message-ID: <200908100807.n7A87n50005783@sheep.berlios.de>

Author: humdingerb
Date: 2009-08-10 10:07:47 +0200 (Mon, 10 Aug 2009)
New Revision: 32220
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32220&view=rev

Modified:
   haiku/trunk/src/apps/deskbar/BarApp.cpp
   haiku/trunk/src/apps/deskbar/BeMenu.cpp
Log:
Renamed 'Configure Leaf Menu...' to 'Configure Deskbar Menu...'

Modified: haiku/trunk/src/apps/deskbar/BarApp.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BarApp.cpp	2009-08-10 01:26:14 UTC (rev 32219)
+++ haiku/trunk/src/apps/deskbar/BarApp.cpp	2009-08-10 08:07:47 UTC (rev 32220)
@@ -705,7 +705,7 @@
 
 		fConfigWindow = new TFavoritesConfigWindow(BRect(0, 0, 320, 240),
 #ifdef __HAIKU__
-			"Configure Leaf Menu", false, B_ANY_NODE,
+			"Configure Deskbar Menu", false, B_ANY_NODE,
 #else
 			"Configure Be Menu", false, B_ANY_NODE,
 #endif

Modified: haiku/trunk/src/apps/deskbar/BeMenu.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BeMenu.cpp	2009-08-10 01:26:14 UTC (rev 32219)
+++ haiku/trunk/src/apps/deskbar/BeMenu.cpp	2009-08-10 08:07:47 UTC (rev 32220)
@@ -260,7 +260,7 @@
 	subMenu->SetEnabled(!dragging);
 
 #ifdef __HAIKU__
-	item = new BMenuItem("Configure Leaf Menu"B_UTF8_ELLIPSIS, new BMessage(msg_config_db));
+	item = new BMenuItem("Configure Deskbar Menu"B_UTF8_ELLIPSIS, new BMessage(msg_config_db));
 #else
 	item = new BMenuItem("Configure Be Menu"B_UTF8_ELLIPSIS, new BMessage(msg_config_db));
 #endif



From humdingerb at mail.berlios.de  Mon Aug 10 10:20:20 2009
From: humdingerb at mail.berlios.de (humdingerb at mail.berlios.de)
Date: Mon, 10 Aug 2009 10:20:20 +0200
Subject: [Haiku-commits] r32221 - in haiku/trunk/docs: . userguide/en
	userguide/en/applications userguide/en/desktop-applets
	userguide/en/images userguide/en/images/apps-images
	userguide/en/images/attributes-images
	userguide/en/images/deskbar-images
	userguide/en/images/desktop-applets-images
	userguide/en/images/filesystem-layout-images
	userguide/en/images/filetypes-images userguide/en/images/gui-images
	userguide/en/images/installation-images
	userguide/en/images/prefs-images userguide/en/images/queries-images
	userguide/en/images/teammonitor-images
	userguide/en/images/tracker-images
	userguide/en/images/workshop-filetypes+attributes-images
	userguide/en/images/workspaces-images
	userguide/en/preferences userguide/images
	userguide/images/apps-images userguide/images/bootloader-images
	userguide/images/deskbar-images
	userguide/images/desktop-applets-images
	userguide/images/prefs-images
	userguide/images/twitcher-images welcome/images
Message-ID: <200908100820.n7A8KK9K006774@sheep.berlios.de>

Author: humdingerb
Date: 2009-08-10 10:18:39 +0200 (Mon, 10 Aug 2009)
New Revision: 32221
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32221&view=rev

Removed:
   haiku/trunk/docs/userguide/en/images/twitcher-images/
Modified:
   haiku/trunk/docs/Haiku-doc.css
   haiku/trunk/docs/userguide/en/applications/apps-icon-o-matic.html
   haiku/trunk/docs/userguide/en/applications/apps-terminal.html
   haiku/trunk/docs/userguide/en/attributes.html
   haiku/trunk/docs/userguide/en/desktop-applets/desktop-applets-launchbox.html
   haiku/trunk/docs/userguide/en/gui.html
   haiku/trunk/docs/userguide/en/images/apps-images/activitymonitor.png
   haiku/trunk/docs/userguide/en/images/apps-images/cdplayer.png
   haiku/trunk/docs/userguide/en/images/apps-images/charactermap.png
   haiku/trunk/docs/userguide/en/images/apps-images/codycam.png
   haiku/trunk/docs/userguide/en/images/apps-images/diskprobe-about-attr.png
   haiku/trunk/docs/userguide/en/images/apps-images/diskprobe.png
   haiku/trunk/docs/userguide/en/images/apps-images/diskusage.png
   haiku/trunk/docs/userguide/en/images/apps-images/expander-preferences.png
   haiku/trunk/docs/userguide/en/images/apps-images/expander.png
   haiku/trunk/docs/userguide/en/images/apps-images/i-o-m-gradients.png
   haiku/trunk/docs/userguide/en/images/apps-images/i-o-m-overview.png
   haiku/trunk/docs/userguide/en/images/apps-images/people-files.png
   haiku/trunk/docs/userguide/en/images/apps-images/people.png
   haiku/trunk/docs/userguide/en/images/apps-images/poorman.png
   haiku/trunk/docs/userguide/en/images/apps-images/screenshot-options.png
   haiku/trunk/docs/userguide/en/images/apps-images/screenshot.png
   haiku/trunk/docs/userguide/en/images/apps-images/stylededit.png
   haiku/trunk/docs/userguide/en/images/apps-images/terminal.png
   haiku/trunk/docs/userguide/en/images/attributes-images/people.png
   haiku/trunk/docs/userguide/en/images/deskbar-images/calendar.png
   haiku/trunk/docs/userguide/en/images/deskbar-images/configure.png
   haiku/trunk/docs/userguide/en/images/deskbar-images/list-of-apps.png
   haiku/trunk/docs/userguide/en/images/deskbar-images/settings.png
   haiku/trunk/docs/userguide/en/images/desktop-applets-images/launchbox.png
   haiku/trunk/docs/userguide/en/images/filesystem-layout-images/achtung-system.png
   haiku/trunk/docs/userguide/en/images/filesystem-layout-images/achtung-user.png
   haiku/trunk/docs/userguide/en/images/filetypes-images/filetype-addon-stylededit.png
   haiku/trunk/docs/userguide/en/images/filetypes-images/filetype-addon.png
   haiku/trunk/docs/userguide/en/images/gui-images/favorites.png
   haiku/trunk/docs/userguide/en/images/gui-images/gui.png
   haiku/trunk/docs/userguide/en/images/gui-images/open-save.png
   haiku/trunk/docs/userguide/en/images/installation-images/macosx.png
   haiku/trunk/docs/userguide/en/images/prefs-images/appearance-antialiasing.png
   haiku/trunk/docs/userguide/en/images/prefs-images/appearance-colors.png
   haiku/trunk/docs/userguide/en/images/prefs-images/datatranslations.png
   haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-filter-header.png
   haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-filter-spam.png
   haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-in.png
   haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-mailbox.png
   haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-new-account.png
   haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-out.png
   haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-settings.png
   haiku/trunk/docs/userguide/en/images/prefs-images/fonts.png
   haiku/trunk/docs/userguide/en/images/prefs-images/keyboard.png
   haiku/trunk/docs/userguide/en/images/prefs-images/keymap.png
   haiku/trunk/docs/userguide/en/images/prefs-images/menu.png
   haiku/trunk/docs/userguide/en/images/prefs-images/mouse.png
   haiku/trunk/docs/userguide/en/images/prefs-images/network.png
   haiku/trunk/docs/userguide/en/images/prefs-images/screen.png
   haiku/trunk/docs/userguide/en/images/prefs-images/screensaver-fade.png
   haiku/trunk/docs/userguide/en/images/prefs-images/screensaver-modules.png
   haiku/trunk/docs/userguide/en/images/prefs-images/sounds.png
   haiku/trunk/docs/userguide/en/images/prefs-images/time-time.png
   haiku/trunk/docs/userguide/en/images/prefs-images/time-timezone.png
   haiku/trunk/docs/userguide/en/images/prefs-images/virtualmemory.png
   haiku/trunk/docs/userguide/en/images/queries-images/basic-query.png
   haiku/trunk/docs/userguide/en/images/queries-images/formula-query.png
   haiku/trunk/docs/userguide/en/images/queries-images/query-window-filled.png
   haiku/trunk/docs/userguide/en/images/queries-images/query-window.png
   haiku/trunk/docs/userguide/en/images/queries-images/result-window.png
   haiku/trunk/docs/userguide/en/images/teammonitor-images/teammonitor.png
   haiku/trunk/docs/userguide/en/images/tracker-images/drill-down.png
   haiku/trunk/docs/userguide/en/images/tracker-images/get-info.png
   haiku/trunk/docs/userguide/en/images/tracker-images/mount-settings.png
   haiku/trunk/docs/userguide/en/images/tracker-images/new-menu.png
   haiku/trunk/docs/userguide/en/images/tracker-images/open-with-preferred.png
   haiku/trunk/docs/userguide/en/images/tracker-images/open-with.png
   haiku/trunk/docs/userguide/en/images/tracker-images/tracker-preferences-navigator.png
   haiku/trunk/docs/userguide/en/images/tracker-images/transaction-status.png
   haiku/trunk/docs/userguide/en/images/tracker-images/window-drill-down.png
   haiku/trunk/docs/userguide/en/images/tracker-images/window-menu.png
   haiku/trunk/docs/userguide/en/images/tracker-images/window-type-ahead.png
   haiku/trunk/docs/userguide/en/images/workshop-filetypes+attributes-images/filetype-extra-attribute.png
   haiku/trunk/docs/userguide/en/images/workshop-filetypes+attributes-images/filetypes-dvddb-empty.png
   haiku/trunk/docs/userguide/en/images/workshop-filetypes+attributes-images/filetypes-dvddb.png
   haiku/trunk/docs/userguide/en/images/workshop-filetypes+attributes-images/filetypes-new-file-type.png
   haiku/trunk/docs/userguide/en/images/workshop-filetypes+attributes-images/query-dvddb.png
   haiku/trunk/docs/userguide/en/images/workspaces-images/workspaces.png
   haiku/trunk/docs/userguide/en/keyboard-shortcuts.html
   haiku/trunk/docs/userguide/en/preferences/prefs-screen.html
   haiku/trunk/docs/userguide/en/tracker.html
   haiku/trunk/docs/userguide/en/workspaces.html
   haiku/trunk/docs/userguide/images/alert_info_32.png
   haiku/trunk/docs/userguide/images/alert_info_64.png
   haiku/trunk/docs/userguide/images/alert_stop_32.png
   haiku/trunk/docs/userguide/images/alert_stop_64.png
   haiku/trunk/docs/userguide/images/alert_warning_64.png
   haiku/trunk/docs/userguide/images/apps-images/activitymonitor-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/activitymonitor-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/bepdf-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/bepdf-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/bezillabrowser-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/bezillabrowser-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/cdplayer-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/cdplayer-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/charactermap-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/charactermap-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/codycam-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/codycam-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/deskcalc-icon_16.png
   haiku/trunk/docs/userguide/images/apps-images/deskcalc-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/deskcalc-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/deskcalc.png
   haiku/trunk/docs/userguide/images/apps-images/diskprobe-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/diskprobe-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/diskusage-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/diskusage-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/drivesetup-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/drivesetup-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/expander-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/expander-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-bitmap128.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-bitmap16.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-bitmap32.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-bitmap64.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-lod-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-lod-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-path-ab.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-add.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-bezier.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-delete.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-insert.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-move-path.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-move-shape.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-resize.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-rotate.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-select.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-shape.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-terminal-bitmap16.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-terminal-bitmap32.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-vector128.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-vector32.png
   haiku/trunk/docs/userguide/images/apps-images/i-o-m-vector64.png
   haiku/trunk/docs/userguide/images/apps-images/icon-o-matic-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/icon-o-matic-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/installer-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/installer-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/magnify-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/magnify-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/magnify.png
   haiku/trunk/docs/userguide/images/apps-images/mail-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/mail-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/mediaplayer-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/mediaplayer-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/midiplayer-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/midiplayer-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/packageinstaller-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/packageinstaller-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/pe-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/pe-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/people-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/people-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/poorman-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/poorman-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/screenshot-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/screenshot-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/showimage-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/showimage-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/soundrecorder-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/soundrecorder-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/stylededit-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/stylededit-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/terminal-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/terminal-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/textsearch-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/textsearch-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/tv-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/tv-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/vision-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/vision-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/vlc-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/vlc-icon_64.png
   haiku/trunk/docs/userguide/images/apps-images/wonderbrush-icon_32.png
   haiku/trunk/docs/userguide/images/apps-images/wonderbrush-icon_64.png
   haiku/trunk/docs/userguide/images/bootloader-images/boot-screen.png
   haiku/trunk/docs/userguide/images/deskbar-images/positions.png
   haiku/trunk/docs/userguide/images/desktop-applets-images/launchbox-icon_32.png
   haiku/trunk/docs/userguide/images/desktop-applets-images/launchbox-icon_64.png
   haiku/trunk/docs/userguide/images/desktop-applets-images/networkstatus-icon_32.png
   haiku/trunk/docs/userguide/images/desktop-applets-images/networkstatus-icon_64.png
   haiku/trunk/docs/userguide/images/desktop-applets-images/powerstatus-icon_64.png
   haiku/trunk/docs/userguide/images/desktop-applets-images/processcontroller-icon_32.png
   haiku/trunk/docs/userguide/images/desktop-applets-images/processcontroller-icon_64.png
   haiku/trunk/docs/userguide/images/desktop-applets-images/workspaces-icon_32.png
   haiku/trunk/docs/userguide/images/desktop-applets-images/workspaces-icon_64.png
   haiku/trunk/docs/userguide/images/logo.png
   haiku/trunk/docs/userguide/images/prefs-images/appearance-glyph-off.png
   haiku/trunk/docs/userguide/images/prefs-images/appearance-glyph-on-subpixel.png
   haiku/trunk/docs/userguide/images/prefs-images/appearance-glyph-on.png
   haiku/trunk/docs/userguide/images/prefs-images/appearance-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/appearance-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/appearance-subpixel.png
   haiku/trunk/docs/userguide/images/prefs-images/backgrounds-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/backgrounds-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/datatranslations-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/datatranslations-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/e-mail-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/e-mail-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/filetypes-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/filetypes-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/fonts-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/fonts-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/keyboard-icon_16.png
   haiku/trunk/docs/userguide/images/prefs-images/keyboard-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/keyboard-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/keymap-icon_16.png
   haiku/trunk/docs/userguide/images/prefs-images/keymap-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/keymap-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/media-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/media-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/menu-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/menu-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/mouse-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/network-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/network-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/printers-icon_16.png
   haiku/trunk/docs/userguide/images/prefs-images/printers-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/printers-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/screen-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/screen-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/screensaver-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/screensaver-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/sounds-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/sounds-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/time-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/time-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/tracker-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/tracker-icon_64.png
   haiku/trunk/docs/userguide/images/prefs-images/virtualmemory-icon_32.png
   haiku/trunk/docs/userguide/images/prefs-images/virtualmemory-icon_64.png
   haiku/trunk/docs/userguide/images/twitcher-images/twitcher.png
   haiku/trunk/docs/userguide/images/up.png
   haiku/trunk/docs/welcome/images/logo.png
Log:
* Added workspace navigation with CTRL+ALT+Cursor in workspaces.html and
  keyboard-shortcuts.html.
* Added workspace arrangement in Screen preferences.
  Updated screenshot.
* Added newly learned shortcuts: CTRL+ALT+Z to maximize a window and CTRL+ALT+M
  for minimizing and CTRL+ALT+H to hide all windows of an app.
* I-O-M: Removed "Transformation" and "Perspective" from the available
  transformers until those are implemented.
  Same for the Shape property "Rounding".
  Added description of Path|Rotate Vertices Right/Left.
  Thanks Stippi for working on these I-O-M tickets!
* Corrected bottom nav-bar of apps-terminal.html.
* Added black-on-white output for pre.terminal when printing to Haiku-docs.css.
  (Thought I did that already, but apparently not...)
* Added "Ignore Double-click" to launchbox.html.
* Updated all screenshots to show the new decorator design.
* Ran all images thru OptiPNG which losslessly made them on avg. 11% smaller.
* Updated sort order indicator in attributes.html
* Added how to use pop-up navigating for moving files in tracker.html


Modified: haiku/trunk/docs/Haiku-doc.css
===================================================================
--- haiku/trunk/docs/Haiku-doc.css	2009-08-10 08:07:47 UTC (rev 32220)
+++ haiku/trunk/docs/Haiku-doc.css	2009-08-10 08:18:39 UTC (rev 32221)
@@ -248,7 +248,6 @@
     	font-size: 1.0em;
     	font-family: serif;
     	font-style: italic;
-/* 	color: #5e1c1c; */
 	color: #5e1c1c;
 }
 .cli {				/* Shell command or file */
@@ -303,4 +302,8 @@
 	acronym {
 		border: none;
 	}
+	pre.terminal {			/* Terminal output black on white*/
+		background-color: #ffffff;
+		color: #000000;
+	}
 }

Modified: haiku/trunk/docs/userguide/en/applications/apps-icon-o-matic.html
===================================================================
--- haiku/trunk/docs/userguide/en/applications/apps-icon-o-matic.html	2009-08-10 08:07:47 UTC (rev 32220)
+++ haiku/trunk/docs/userguide/en/applications/apps-icon-o-matic.html	2009-08-10 08:18:39 UTC (rev 32221)
@@ -76,7 +76,7 @@
 width="32" height="32" /></td></tr>
         <tr align="center"><td>1,024 byte<br />+&#160;256 byte</td><td> 7,192 byte </td><td> 768 byte </td></tr>
 </table>
-<p>Note that the BeOS used two versions of an icon, one 16x16 and 32x32, to achieve good visuals in List and Icon View mode.</p>
+<p>Note that the BeOS used two versions of an icon, one 16x16 and one 32x32, to achieve good visuals in List and Icon View mode.</p>
 <p>This trick isn't needed with vector icons. Besides only taking up a few hundred bytes in a file, vector icons also scale much better than bitmaps. (Note: BeOS offered only a 16x16 and 32x32 display.)</p>
 <table border="0" cellpadding="10">
         <tr align="center"><td> </td><td><b>16x16</b></td><td><b>32x32</b></td><td><b>64x64</b></td><td><b>128x128</b></td></tr>
@@ -117,7 +117,7 @@
 <p>Here's a quick overview of Icon-O-Matic's window:</p>
 <img src="../images/apps-images/i-o-m-overview.png" alt="i-o-m-overview.png" />
 
-<p>To create any visible object on the canvas, you need a shape with a path and a style. Conveniently, you can create one, two or all three of those together from the <span class="menu">Shape</span> menu. Every kind of object (Paths, Shapes, Transformers, and Styles) has a menu above its list of elements, offering various commands. Every element has certain options that are set in the <span class="menu">Property</span> view.</p>
+<p>To create any visible object on the canvas, you need a shape with a path and a style. Conveniently, you can create one, two or all three of those together from the <span class="menu">Shape</span> menu. Every kind of object (Paths, Shapes, Transformers, and Styles) has a menu above its list of elements, offering various commands. Every element has certain options that are set in the <span class="menu">Properties</span> view.</p>
 
 
 <h2>
@@ -176,11 +176,12 @@
 <table summary="Path menu" border="0" cellspacing="0" cellpadding="2">
 <tr><td><span class="menu">Reverse</span></td><td style="width:15px;"></td><td>If your path isn't "closed" (see Path Properties below), a click into the canvas always creates a new point, connecting it with the last one. "Reverse" will reverse this order and your new point will connect to original start point instead.</td></tr>
 <tr><td><span class="menu">Clean Up</span></td><td></td><td>Most useful with imported SVGs, this function will remove redundant points.</td></tr>
-<tr><td class="onelinetop"><span class="menu">Rotate Indices</span></td><td></td><td>not yet implemented.</td></tr>
+<tr><td class="onelinetop"><span class="menu">Rotate Indices Right</span></td><td><span class="key">ALT</span>&#160;<span class="key">R</span></td><td>Practically, this rotates the opening of a path. It's best seen when using a not-closed path with a style and a shape with a stroke transformer. Now, if your path looks like a &sub; it will rotate like this: &sub; &cap; &sup; &cup;.</td></tr>
+<tr><td class="onelinetop"><span class="menu">Rotate Indices Left</span></td><td><span class="key">ALT</span>&#160;<span class="key">SHIFT</span>&#160;<span class="key">R</span></td><td>Does the same in the other direction.</td></tr>
 </table>
 
 <h3><a id="i-o-m-path-properties" name="i-o-m-path-properties">Path Properties</a></h3>
-<p>The <span class="menu">Property</span> at the bottom left of the window offers all available settings of the currently selected object. A path only has two: a <span class="menu">Name</span> and if it's <span class="menu">Closed</span> or not.</p>
+<p><span class="menu">Properties</span> at the bottom left of the window offers all available settings of the currently selected object. A path only has two: a <span class="menu">Name</span> and if it's <span class="menu">Closed</span> or not.</p>
 
 
 <h2>
@@ -222,10 +223,9 @@
 </table>
 
 <h3><a id="i-o-m-shape-properties" name="i-o-m-shape-properties">Shape Properties</a></h3>
-<p>Besides a <span class="menu">Name</span>, the <span class="menu">Property</span> view for a shape has these options:</p>
+<p>Besides a <span class="menu">Name</span>, the <span class="menu">Properties</span> view for a shape has these options:</p>
 
 <table summary="Shape properties" border="0" cellspacing="0" cellpadding="2">
-<tr><td><span class="menu">Rounding</span></td><td style="width:15px;"></td><td><i>Unfinished feature</i>. Once working correctly, it will do a kind of "hinting" for vector paths, rounding their coordinates to the next full pixel, giving it a crisper look.</td></tr>
 <tr><td><span class="menu">Min LOD</span></td><td></td><td>Minimum Level of Detail</td></tr>
 <tr><td><span class="menu">Max LOD</span></td><td></td><td>Maximum Level of Detail</td></tr>
 </table>
@@ -273,7 +273,7 @@
 <p>The <span class="menu">Style</span> menu offers the usual entries to <span class="menu">Add</span>, <span class="menu">Duplicate</span> or <span class="menu">Remove</span> a style and to <span class="menu">Reset Transformation</span>.</p>
 
 <h3><a id="i-o-m-style-properties" name="i-o-m-style-properties">Style Properties</a></h3>
-<p>The <span class="menu">Name</span> is the only <span class="menu">Property</span> of a style.</p>
+<p>The <span class="menu">Name</span> is the only <span class="menu">Properties</span> of a style.</p>
 
 
 <h2>
@@ -283,8 +283,6 @@
 
 <h3><a id="i-o-m-transformer-menu" name="i-o-m-transformer-menu">Transformer Add Menu</a></h3>
 <table summary=" Transformer Add menu" border="0" cellspacing="0" cellpadding="2">
-<tr><td><span class="menu">Transformation</span></td><td style="width:15px;"></td><td>Offers the same move/resize/rotate options you have by manipulating a shape with your mouse directly.</td></tr>
-<tr><td><span class="menu">Perspective</span></td><td></td><td>not yet implemented</td></tr>
 <tr><td><span class="menu">Contour</span></td><td></td><td>Adds an outline to a shape.</td></tr>
 <tr><td><span class="menu">Stroke</span></td><td></td><td>Strokes the path of a shape instead of filling it with a style.</td></tr>
 </table>
@@ -292,7 +290,7 @@
 <p>Depending on the kind of Transformer, you'll get a different set of properties.</p>
 
 <h3><a id="i-o-m-transformer-properties" name="i-o-m-transformer-properties">Transformer Properties</a></h3>
-<p>Besides a <span class="menu">Name</span> and the actual <span class="menu">Width</span> for the transformer, the <span class="menu">Property</span> view has these (depending on its type slightly differing) options:</p>
+<p>Besides a <span class="menu">Name</span> and the actual <span class="menu">Width</span> for the transformer, the <span class="menu">Properties</span> view has these (depending on its type slightly differing) options:</p>
 <table summary="Transformer properties" border="0" cellspacing="0" cellpadding="2">
 <tr><td><span class="menu">Caps</span></td><td style="width:15px;"></td><td><i>Stroke only</i>. Defines the end caps of a line: <span class="menu">Butt</span>, <span class="menu">Square</span> or <span class="menu">Round</span>.</td></tr>
 <tr><td><span class="menu">Detect Orient.</span></td><td></td><td><i>Contour only</i>. Makes sure the contour always extends outwards when you have self-intersecting paths.</td></tr>

Modified: haiku/trunk/docs/userguide/en/applications/apps-terminal.html
===================================================================
--- haiku/trunk/docs/userguide/en/applications/apps-terminal.html	2009-08-10 08:07:47 UTC (rev 32220)
+++ haiku/trunk/docs/userguide/en/applications/apps-terminal.html	2009-08-10 08:18:39 UTC (rev 32221)
@@ -97,9 +97,9 @@
 	<p>
 		<a href="../applications.html#list-of-apps">Applications</a>
 		&#160;&#160;&#160;
-		Previous: <a href="apps-icon-o-matic.html">Icon-O-Matic</a>
+		Previous: <a href="apps-stylededit.html">StyledEdit</a>
 		&#160;&#160;&#160;
-		Next: <a href="apps-mail.html">Mail</a>
+		Next: <a href="apps-textsearch.html">TextSearch</a>
 	</p>
 </div>
 

Modified: haiku/trunk/docs/userguide/en/attributes.html
===================================================================
--- haiku/trunk/docs/userguide/en/attributes.html	2009-08-10 08:07:47 UTC (rev 32220)
+++ haiku/trunk/docs/userguide/en/attributes.html	2009-08-10 08:18:39 UTC (rev 32221)
@@ -48,7 +48,7 @@
 <p>Attributes are displayed quite similar to a database or spreadsheet. Using Tracker you can choose which attributes to display (columns) and sort file listings (rows) accordingly.</p>
 <p>To do this, open a Tracker window, click on the <span class="menu">Attributes</span> menu, and select the attributes you want to display. Alternatively, simply right-click onto a column heading and mark the items in the context menu. You can rearrange the columns by a simple drag&amp;drop of the column heading. Moving a column out of a window, is a fast way to get rid of columns you don't need.</p>
 <p>Double-click on the line between two attributes in the heading to automatically resize a column to its optimal width.</p>
-<p>Click on a column heading to toggle the sorting order from ascending to descending. You can establish a secondary sort order by pressing the <span class="key">SHIFT</span> key while clicking on a column heading. Doing that you can, for example, sort your People files by company and within that order sort by contact name. See the above screenshot as an example. The secondary sort order is marked by a dotted line under the heading.</p>
+<p>Click on a column heading to toggle the sorting order from ascending to descending. You can establish a secondary sort order by pressing the <span class="key">SHIFT</span> key while clicking on a column heading. Doing that you can, for example, sort your People files by company and within that order sort by contact name. See the above screenshot as an example. The secondary sort order is marked by a lighter colored indicator beside the heading.</p>
 <p>Editing these attributes is as simple as renaming a file: Either click on an entry or press <span class="key">ALT</span>&#160;<span class="key">E</span> and move between the attributes with <span class="key">TAB</span> and <span class="key">SHIFT</span>&#160;<span class="key">TAB</span>. <span class="key">ESC</span> leaves the editing mode without applying the changes.</p>
 
 <h1><a id="attributes-terminal" name="attributes-terminal">Attributes in Terminal</a></h1>

Modified: haiku/trunk/docs/userguide/en/desktop-applets/desktop-applets-launchbox.html
===================================================================
--- haiku/trunk/docs/userguide/en/desktop-applets/desktop-applets-launchbox.html	2009-08-10 08:07:47 UTC (rev 32220)
+++ haiku/trunk/docs/userguide/en/desktop-applets/desktop-applets-launchbox.html	2009-08-10 08:18:39 UTC (rev 32221)
@@ -5,7 +5,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008, Haiku. All rights reserved.
+ * Copyright 2008-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -51,11 +51,13 @@
 <tr><td class="onelinetop"><span class="menu">Settings</span><br />
 <span class="menu">- Horizontal Layout</span><br />
 <span class="menu">- Icon size</span><br />
+<span class="menu">- Ignore Double-click</span><br />
 <span class="menu">- Show Window Border</span><br />
 <span class="menu">- Auto Raise</span><br />
 <span class="menu">- Show On All Workspaces</span></td><td>&#160;</td><td class="onelinetop"><br />
 Aligns the buttons horizontally.<br />
 Sets the icon size between 16 and 64 pixel.<br />
+Launches the object only once, even when you (accidentally) double-click.<br />
 Shows the window border.<br />
 LaunchBox pops up if the mouse is near the screen edge.<br />
 Shows the LaunchBox on every workspace.</td></tr>

Modified: haiku/trunk/docs/userguide/en/gui.html
===================================================================
--- haiku/trunk/docs/userguide/en/gui.html	2009-08-10 08:07:47 UTC (rev 32220)
+++ haiku/trunk/docs/userguide/en/gui.html	2009-08-10 08:18:39 UTC (rev 32221)
@@ -43,11 +43,11 @@
 <ol>
 <li><p>The Deskbar is Haiku's "Start" menu and taskbar, if you will. See topic <a href="deskbar.html">Deskbar</a>.</p></li>
 <li>The yellow tab offers more than just a program's name or a document's filename:
-<ul><li>You can move it by holding the </span>&#160;<span class="key">SHIFT</span> key while dragging it to another position, enabling you to stack a number of windows and conveniently access them by their named tab.</li>
-<li>You minimize a window with a double-click on its tab. A such hidden window can be accessed by its entry in the <a href="deskbar.html">Deskbar</a> or the <a href="twitcher.html">Twitcher</a>.</li>
+<ul><li>You can move it by holding the <span class="key">SHIFT</span> key while dragging it to another position, enabling you to stack a number of windows and conveniently access them by their named tab.</li>
+<li>You minimize a window with a double-click on its tab (or with <span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">M</span>). A such hidden window can be accessed by its entry in the <a href="deskbar.html">Deskbar</a> or the <a href="twitcher.html">Twitcher</a>.</li>
 <li>You can send a window to the back with a right-click on its tab (or its border).</li></ul></li>
 <li><p>The close button.</p></li>
-<li><p>The "alternative size" button (expands window to full screen in most applications).</p></li>
+<li><p>The "alternative size" button (expands window to maximum size in most applications), also done via (or with <span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">Z</span>).</p></li>
 <li><p>The resize button. Dragging anywhere else on a window's border will move the window.</p></li>
 </ol>
 

Modified: haiku/trunk/docs/userguide/en/images/apps-images/activitymonitor.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/cdplayer.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/charactermap.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/codycam.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/diskprobe-about-attr.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/diskprobe.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/diskusage.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/expander-preferences.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/expander.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/i-o-m-gradients.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/i-o-m-overview.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/people-files.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/people.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/poorman.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/screenshot-options.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/screenshot.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/stylededit.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/apps-images/terminal.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/attributes-images/people.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/deskbar-images/calendar.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/deskbar-images/configure.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/deskbar-images/list-of-apps.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/deskbar-images/settings.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/desktop-applets-images/launchbox.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/filesystem-layout-images/achtung-system.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/filesystem-layout-images/achtung-user.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/filetypes-images/filetype-addon-stylededit.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/filetypes-images/filetype-addon.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/gui-images/favorites.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/gui-images/gui.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/gui-images/open-save.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/installation-images/macosx.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/appearance-antialiasing.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/appearance-colors.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/datatranslations.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-filter-header.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-filter-spam.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-in.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-mailbox.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-new-account.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-out.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/e-mail-settings.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/fonts.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/keyboard.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/keymap.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/menu.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/mouse.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/network.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/screen.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/screensaver-fade.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/screensaver-modules.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/sounds.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/time-time.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/time-timezone.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/prefs-images/virtualmemory.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/queries-images/basic-query.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/queries-images/formula-query.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/queries-images/query-window-filled.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/queries-images/query-window.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/queries-images/result-window.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/teammonitor-images/teammonitor.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/drill-down.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/get-info.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/mount-settings.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/new-menu.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/open-with-preferred.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/open-with.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/tracker-preferences-navigator.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/transaction-status.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/window-drill-down.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/window-menu.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/tracker-images/window-type-ahead.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/workshop-filetypes+attributes-images/filetype-extra-attribute.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/workshop-filetypes+attributes-images/filetypes-dvddb-empty.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/workshop-filetypes+attributes-images/filetypes-dvddb.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/workshop-filetypes+attributes-images/filetypes-new-file-type.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/workshop-filetypes+attributes-images/query-dvddb.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/images/workspaces-images/workspaces.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/en/keyboard-shortcuts.html
===================================================================
--- haiku/trunk/docs/userguide/en/keyboard-shortcuts.html	2009-08-10 08:07:47 UTC (rev 32220)
+++ haiku/trunk/docs/userguide/en/keyboard-shortcuts.html	2009-08-10 08:18:39 UTC (rev 32221)
@@ -43,13 +43,16 @@
 <p>Here's a table of many of the most commonly used shortcuts that are always available, even if there isn't a corresponding menu:</p>
 <table summary="shortcuts" border="0" cellspacing="0" cellpadding="4">
 <tr><td><span class="key">ALT</span>&#160;<span class="key">Fx</span></td><td style="width:15px;"></td><td>Switches to <a href="workspaces.html">Workspace</a> X (<span class="key">Fx</span> is the function key corresponding to that workspace).</td></tr>
+<tr><td><span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">&larr;</span>/<span class="key">&rarr;</span>/<span class="key">&uarr;</span>/<span class="key">&darr;</span></td><td></td><td>Navigates spatially the rows/columns of the available workspaces.</td></tr>
 <tr><td><span class="key">CTRL</span>&#160;<span class="key">TAB</span></td><td></td><td>Hold down to bring up the <a href="twitcher.hml">Twitcher</a>.</td></tr>
 <tr><td><span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">DEL</span></td><td></td><td>Opens the <a href="teammonitor.html">Team Monitor</a>.</td></tr>
 <tr><td><span class="key">ALT</span>&#160;<span class="key">ESC</span></td><td></td><td>Enters the menu bar (leave with <span class="key">ESC</span>).</td></tr>
 <tr><td><span class="key">ALT</span>&#160;<span class="key">C</span></td><td></td><td>Copies the selection to the  clipboard.</td></tr>
 <tr><td><span class="key">ALT</span>&#160;<span class="key">X</span></td><td></td><td>Cuts the selection to the clipboard.</td></tr>
 <tr><td><span class="key">ALT</span>&#160;<span class="key">V</span></td><td></td><td>Pastes the clipboard's contents.</td></tr>
-<tr><td><span class="key">ALT</span>&#160;<span class="key">W</span></td><td></td><td>Closes the current window.</td></tr>
+<tr><td><span class="key">ALT</span>&#160;<span class="key">W</span></td><td></td><td>Closes the active window.</td></tr><tr><td><span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">Z</span></td><td></td><td>Expands a window to an alternative size (maximum size for most applications).</td></tr>
+<tr><td><span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">M</span></td><td></td><td>Minimizes the active window.</td></tr>
+<tr><td><span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">H</span></td><td></td><td>Hides (minimizes) all windows of the active application.</td></tr>
 <tr><td><span class="key">ALT</span>&#160;<span class="key">Q</span></td><td></td><td>Quits an application.</td></tr>
 </table>
 

Modified: haiku/trunk/docs/userguide/en/preferences/prefs-screen.html
===================================================================
--- haiku/trunk/docs/userguide/en/preferences/prefs-screen.html	2009-08-10 08:07:47 UTC (rev 32220)
+++ haiku/trunk/docs/userguide/en/preferences/prefs-screen.html	2009-08-10 08:18:39 UTC (rev 32221)
@@ -5,7 +5,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008, Haiku. All rights reserved.
+ * Copyright 2008-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -44,16 +44,16 @@
 <span class="path">~/config/settings/kernel/drivers/vesa</span> - Only when running in VESA mode.<br />
 <span class="path">~/config/settings/Screen_data</span> - Stores the panel's window position.</td></tr>
 </table>
-<p>Each of your workspaces can have its own resolution and color depth.</p>
+<p>Each of your <a href="../workspaces.html">workspaces</a> can have its own resolution and color depth.</p>
 <img src="../images/prefs-images/screen.png" alt="screen.png" />
 <p>The top drop-down menu specifies if your changes are applied only to the current or to all workspaces. Depending on your graphics card, the other two drop-down menus contain all supported resolution and depth settings.</p>
 <p>After clicking on <span class="button">Apply</span>, the graphics mode is changed and an alert appears, asking you to keep or cancel the changes. If you don't answer that alert, the graphics mode reverts after 12 seconds to the previous setting. Maybe you couldn't see the alert because your monitor didn't support the setting.</p>
-<p>To the left, you can set the number of workspaces and open the <a href="prefs-backgrounds.html">Backgrounds</a> preferences.</p>
+<p>To the left, you can set the number of workspaces and arrange them in columns and rows and open the <a href="prefs-backgrounds.html">Backgrounds</a> preferences.</p>
 <p><span class="button">Revert</span> brings back the setting that was active when you started the Screen preferences.</p>
 
 </div>
 
-<!--
+
 <div class="bottomnav">
 	<p>
 		<a href="../preferences.html">Preferences</a>
@@ -63,7 +63,7 @@
 		Next: <a href="prefs-screensaver.html">ScreenSaver</a>
 	</p>
 </div>
--->
 
+
 </body>
 </html>

Modified: haiku/trunk/docs/userguide/en/tracker.html
===================================================================
--- haiku/trunk/docs/userguide/en/tracker.html	2009-08-10 08:07:47 UTC (rev 32220)
+++ haiku/trunk/docs/userguide/en/tracker.html	2009-08-10 08:18:39 UTC (rev 32221)
@@ -73,7 +73,8 @@
 <p>Instead of double-clicking your way down folder after folder, there's a better way to drill down:</p>
 <img src="images/tracker-images/drill-down.png" alt="drill-down.png" />
 <!-- screenshot needs updating to show /boot/system/documentation -->
-<p>Right-click onto a folder, and at the top of the usual context menu you'll find a submenu of the current folder that let's you navigate down a level. Just move down the hierarchy until you find the file or folder you're looking for and click on it to open it. The above shows the contents of the folder <span class="path">/boot/system/documentation/</span>.<br /><br /></p>
+<p>Right-click onto a folder, and at the top of the usual context menu you'll find a submenu of the current folder that let's you navigate down a level. Just move down the hierarchy until you find the file or folder you're looking for and click on it to open it. The above shows the contents of the folder <span class="path">/boot/system/documentation/</span>.<br />
+If you do the above while dragging a file with you, it will be moved to where you eventually drop it.<br /><br /></p>
 <p>A similar method can be used from any Tracker window:</p>
 <img src="images/tracker-images/window-drill-down.png" alt="window-drill-down.png" />
 <p>Click on the area in the lower left, where the number of items is listed, and you'll get submenus for every level above your current location. From there you can drill down through the folders as usual.</p>

Modified: haiku/trunk/docs/userguide/en/workspaces.html
===================================================================
--- haiku/trunk/docs/userguide/en/workspaces.html	2009-08-10 08:07:47 UTC (rev 32220)
+++ haiku/trunk/docs/userguide/en/workspaces.html	2009-08-10 08:18:39 UTC (rev 32221)
@@ -5,7 +5,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008, Haiku. All rights reserved.
+ * Copyright 2008-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -47,10 +47,14 @@
 </table>
 <p><br /></p>
 <img src="images/workspaces-images/workspaces.png" alt="workspaces.png" />
-<p>You find the Workspaces applet with the other <span class="menu">Desktop Applets</span> in the Deskbar. It shows a miniature version of all workspaces. There are several options available from the context menu of the applet's window, which are all pretty self-explaining. Since the applet is a Replicant, you can resize the window as desired and then drag&amp;drop it by its handle onto the desktop (make sure "<span class="menu">Show Replicants</span>" is activated in the Deskbar menu).</p>
+<p>You find the Workspaces applet with the other <span class="menu">Desktop Applets</span> in the Deskbar. It shows a miniature version of all workspaces. There are several options available from the context menu of the applet's window, which are all pretty self-explaining.<br />
+<span class="menu">Change Workspace Count...</span> will open the <a href="preferences/prefs-screen.html">Screen</a> preferences where you set the number of workspaces and their arrangement (how many rows and columns).</p>
+<p>Since the applet is a Replicant, you can resize the window as desired and then drag&amp;drop it by its handle onto the desktop (make sure "<span class="menu">Show Replicants</span>" is activated in the Deskbar menu).</p>
 
 <h2><a id="switching" name="switching">Switching workspaces</a></h2>
-<p>You can switch between workspaces by either clicking into the Workspaces applet or by using the keyboard shortcut <span class="key">ALT</span>&#160;<span class="key">Fx</span>, where "x" is the workspace number. Also, clicking on an application or one of its windows in the Deskbar will send you to the workspace it's in.</p>
+<p>You switch between workspaces by either clicking into the Workspaces applet or by using the keyboard shortcut <span class="key">ALT</span>&#160;<span class="key">Fx</span>, where "x" is the workspace number. It's a good idea to arrange your workspaces in rows of four to mimick the layout of the <span class="key">Fx</span> keys on the keyboard.<br />
+Also, clicking on an application or one of its windows in the Deskbar will send you to the workspace it's in.</p>
+<p>Another very convenient way is to use <span class="key">CTRL</span>&#160;<span class="key">ALT</span>&#160;<span class="key">&larr;</span>/<span class="key">&rarr;</span>/<span class="key">&uarr;</span>/<span class="key">&darr;</span> to navigate spatially the rows/columns of the available workspaces.</p>
 <p>You can switch back and forth between two workspaces with <span class="key">ALT</span>&#160;<span class="key">~</span> (which, depending on the keymap you're using, is the key below <span class="key">ESC</span>, which you have to hit twice to get a <tt>~</tt>).</p>
 
 <h2><a id="moving" name="moving">Moving windows between workspaces</a></h2>

Modified: haiku/trunk/docs/userguide/images/alert_info_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/alert_info_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/alert_stop_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/alert_stop_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/alert_warning_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/activitymonitor-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/activitymonitor-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/bepdf-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/bepdf-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/bezillabrowser-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/bezillabrowser-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/cdplayer-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/cdplayer-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/charactermap-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/charactermap-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/codycam-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/codycam-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/deskcalc-icon_16.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/deskcalc-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/deskcalc-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/deskcalc.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/diskprobe-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/diskprobe-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/diskusage-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/diskusage-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/drivesetup-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/drivesetup-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/expander-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/expander-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-bitmap128.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-bitmap16.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-bitmap32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-bitmap64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-lod-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-lod-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-path-ab.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-add.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-bezier.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-delete.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-insert.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-move-path.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-move-shape.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-resize.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-rotate.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-pointer-select.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-shape.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-terminal-bitmap16.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-terminal-bitmap32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-vector128.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-vector32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/i-o-m-vector64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/icon-o-matic-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/icon-o-matic-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/installer-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/installer-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/magnify-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/magnify-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/magnify.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/mail-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/mail-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/mediaplayer-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/mediaplayer-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/midiplayer-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/midiplayer-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/packageinstaller-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/packageinstaller-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/pe-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/pe-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/people-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/people-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/poorman-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/poorman-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/screenshot-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/screenshot-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/showimage-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/showimage-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/soundrecorder-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/soundrecorder-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/stylededit-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/stylededit-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/terminal-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/terminal-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/textsearch-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/textsearch-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/tv-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/tv-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/vision-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/vision-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/vlc-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/vlc-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/wonderbrush-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/apps-images/wonderbrush-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/bootloader-images/boot-screen.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/deskbar-images/positions.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/desktop-applets-images/launchbox-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/desktop-applets-images/launchbox-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/desktop-applets-images/networkstatus-icon_32.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/desktop-applets-images/networkstatus-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/desktop-applets-images/powerstatus-icon_64.png
===================================================================
(Binary files differ)

Modified: haiku/trunk/docs/userguide/images/desktop-applets-images/processcontroller-icon_32.png
===================================================================

[... truncated: 206 lines follow ...]


From humdingerb at mail.berlios.de  Mon Aug 10 10:39:36 2009
From: humdingerb at mail.berlios.de (humdingerb at mail.berlios.de)
Date: Mon, 10 Aug 2009 10:39:36 +0200
Subject: [Haiku-commits] r32222 -
	haiku/trunk/docs/userguide/en/images/deskbar-images
Message-ID: <200908100839.n7A8dava009899@sheep.berlios.de>

Author: humdingerb
Date: 2009-08-10 10:39:35 +0200 (Mon, 10 Aug 2009)
New Revision: 32222
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32222&view=rev

Modified:
   haiku/trunk/docs/userguide/en/images/deskbar-images/configure.png
Log:
Forgot an updated Configure Deskbar Menu panel screenshot.

Modified: haiku/trunk/docs/userguide/en/images/deskbar-images/configure.png
===================================================================
(Binary files differ)



From axeld at pinc-software.de  Mon Aug 10 11:54:21 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 10 Aug 2009 11:54:21 +0200 CEST
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <a4855ac50908092244x6231a779sfe51d48f10f6f56c@mail.gmail.com>
Message-ID: <3781430068-BeMail@zon>

Ryan Leavengood <leavengood at gmail.com> wrote:
> On Sun, Aug 9, 2009 at 8:31 PM, kirilla at
> BerliOS<kirilla at mail.berlios.de> wrote:
> > Working but somewhat dodgy tab space transparency - for humdinger 
> > as
> > per request #3813. Enjoy!
> :)
> 
> This is definitely just asking to be broken, though it is something
> I've wanted too.
> 
> There is in fact now a GetDecoratorSettings() method in BWindow which
> returns a BMessage which contains a BRect called "tab frame" which 
> you
> might find useful.
> 
> Of course this may all be moot since you cannot really get that
> remotely at the moment. But maybe "Tab Frame" could be added as a
> specifier to BWindow (only a GET property since only the tab location
> in decorator settings is settable.)

That certainly sounds like a good solution to me.

Bye,
   Axel.



From laplace at mail.berlios.de  Mon Aug 10 12:56:02 2009
From: laplace at mail.berlios.de (laplace at mail.berlios.de)
Date: Mon, 10 Aug 2009 12:56:02 +0200
Subject: [Haiku-commits] r32223 - haiku/trunk/src/servers/print
Message-ID: <200908101056.n7AAu2P9011178@sheep.berlios.de>

Author: laplace
Date: 2009-08-10 12:55:59 +0200 (Mon, 10 Aug 2009)
New Revision: 32223
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32223&view=rev

Modified:
   haiku/trunk/src/servers/print/ConfigWindow.cpp
Log:
Changed shortcut for About dialog to 'a'.
Updated about text.

Modified: haiku/trunk/src/servers/print/ConfigWindow.cpp
===================================================================
--- haiku/trunk/src/servers/print/ConfigWindow.cpp	2009-08-10 08:39:35 UTC (rev 32222)
+++ haiku/trunk/src/servers/print/ConfigWindow.cpp	2009-08-10 10:55:59 UTC (rev 32223)
@@ -183,7 +183,7 @@
 	// resize window
 	ResizeTo(fOk->Frame().right + 10, top);
 
-	AddShortcut('i', 0, new BMessage(B_ABOUT_REQUESTED));
+	AddShortcut('a', 0, new BMessage(B_ABOUT_REQUESTED));
 
 	SetDefaultButton(fOk);
 
@@ -248,10 +248,10 @@
 static const char*
 kAbout =
 "Printer Server\n"
-"? 2001-2008 Haiku\n"
+"? 2001-2009 Haiku\n"
 "\n"
-"\tIthamar R. Adema - Initial Implementation\n"
-"\tMichael Pfeiffer - Release 1 and beyond\n"
+"\tIthamar R. Adema\n"
+"\tMichael Pfeiffer\n"
 ;
 
 



From jonas at kirilla.com  Mon Aug 10 13:08:21 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Mon, 10 Aug 2009 13:08:21 +0200 CEST
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <a4855ac50908092244x6231a779sfe51d48f10f6f56c@mail.gmail.com>
Message-ID: <3511381475-BeMail@kirilla>

Ryan Leavengood <leavengood at gmail.com> wrote:
 ...
> But maybe "Tab Frame" could be added as a specifier to
> BWindow (only a GET property since only the tab location
> in decorator settings is settable.)

I can try that. Anyone started on it already?

/Jonas.




From jonas at kirilla.com  Mon Aug 10 14:35:13 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Mon, 10 Aug 2009 14:35:13 +0200 CEST
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <4A7FB4DA.3020302@googlemail.com>
Message-ID: <8723765903-BeMail@kirilla>

Humdinger <humdingerb at googlemail.com> wrote:
 ..
> If I could lure you to BeGeistert, you'd have a beer on me. :)

Thanks! Yes, I'm planning to attend this year. :)

/Jonas.



From humdingerb at googlemail.com  Mon Aug 10 14:49:11 2009
From: humdingerb at googlemail.com (Humdinger)
Date: Mon, 10 Aug 2009 14:49:11 +0200
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <8723765903-BeMail@kirilla>
References: <8723765903-BeMail@kirilla>
Message-ID: <4A801747.5030108@googlemail.com>

Jonas Sundstr?m wrote:
> Humdinger <humdingerb at googlemail.com> wrote:
>  ..
>> If I could lure you to BeGeistert, you'd have a beer on me. :)
> 
> Thanks! Yes, I'm planning to attend this year. :)

Woot! Fantastic! You plan to stay also for the coding sprint?
I'm looking forward to that!

Regards,
Humdinger

-- 
--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-
Deutsche Haiku News @ http://www.haiku-gazette.de


From axeld at mail.berlios.de  Mon Aug 10 15:28:51 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 10 Aug 2009 15:28:51 +0200
Subject: [Haiku-commits] r32224 - haiku/trunk/src/apps/mediaplayer
Message-ID: <200908101328.n7ADSpAZ019393@sheep.berlios.de>

Author: axeld
Date: 2009-08-10 15:28:50 +0200 (Mon, 10 Aug 2009)
New Revision: 32224
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32224&view=rev

Modified:
   haiku/trunk/src/apps/mediaplayer/MainWin.cpp
   haiku/trunk/src/apps/mediaplayer/MainWin.h
Log:
* Ignore shortcuts if command+control are pressed at once, no longer stealing
  system shortcuts. The shortcut mechanism should be reworked to use the
  standard AddShortcut() way of doing, anyway for most things. This fixes bug
  #4208.
* Fixed warnings.
* Minor cleanup.


Modified: haiku/trunk/src/apps/mediaplayer/MainWin.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/MainWin.cpp	2009-08-10 10:55:59 UTC (rev 32223)
+++ haiku/trunk/src/apps/mediaplayer/MainWin.cpp	2009-08-10 13:28:50 UTC (rev 32224)
@@ -18,9 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
  * USA.
- *
  */
 
+
 #include "MainWin.h"
 
 #include <math.h>
@@ -99,29 +99,30 @@
 
 
 MainWin::MainWin()
-	: BWindow(BRect(100,100,400,300), NAME, B_TITLED_WINDOW,
+	:
+	BWindow(BRect(100,100,400,300), NAME, B_TITLED_WINDOW,
  		B_ASYNCHRONOUS_CONTROLS /* | B_WILL_ACCEPT_FIRST_CLICK */),
-	  fInfoWin(NULL),
-	  fPlaylistWindow(NULL),
-	  fHasFile(false),
-	  fHasVideo(false),
-	  fHasAudio(false),
-	  fPlaylist(new Playlist),
-	  fPlaylistObserver(new PlaylistObserver(this)),
-	  fController(new Controller),
-	  fControllerObserver(new ControllerObserver(this,
+	fInfoWin(NULL),
+	fPlaylistWindow(NULL),
+	fHasFile(false),
+	fHasVideo(false),
+	fHasAudio(false),
+	fPlaylist(new Playlist),
+	fPlaylistObserver(new PlaylistObserver(this)),
+	fController(new Controller),
+	fControllerObserver(new ControllerObserver(this,
 		OBSERVE_FILE_CHANGES | OBSERVE_TRACK_CHANGES
 			| OBSERVE_PLAYBACK_STATE_CHANGES | OBSERVE_POSITION_CHANGES
 			| OBSERVE_VOLUME_CHANGES)),
-	  fIsFullscreen(false),
-	  fAlwaysOnTop(false),
-	  fNoInterface(false),
-	  fSourceWidth(-1),
-	  fSourceHeight(-1),
-	  fWidthAspect(0),
-	  fHeightAspect(0),
-	  fMouseDownTracking(false),
-	  fGlobalSettingsListener(this)
+	fIsFullscreen(false),
+	fAlwaysOnTop(false),
+	fNoInterface(false),
+	fSourceWidth(-1),
+	fSourceHeight(-1),
+	fWidthAspect(0),
+	fHeightAspect(0),
+	fMouseDownTracking(false),
+	fGlobalSettingsListener(this)
 {
 	static int pos = 0;
 	MoveBy(pos * 25, pos * 25);
@@ -325,7 +326,7 @@
 		}
 
 		// every other key gets dispatched to our _KeyDown first
-		if (_KeyDown(msg) == B_OK) {
+		if (_KeyDown(msg)) {
 			// it got handled, don't pass it on
 			return;
 		}
@@ -1201,13 +1202,17 @@
 			if (frame.Width() > screenFrame.Width()
 				|| frame.Height() > screenFrame.Height()) {
 				// too large
-				int widthDiff = frame.Width() - screenFrame.Width();
-				int heightDiff = frame.Height() - screenFrame.Height();
+				int widthDiff
+					= frame.IntegerWidth() - screenFrame.IntegerWidth();
+				int heightDiff
+					= frame.IntegerHeight() - screenFrame.IntegerHeight();
+
 				float shrinkScale;
 				if (widthDiff > heightDiff)
 					shrinkScale = (float)(width - widthDiff) / width;
 				else
 					shrinkScale = (float)(height - heightDiff) / height;
+
 				// Resize width/height and center window
 				width = lround(width * shrinkScale);
 				height = lround(height * shrinkScale);
@@ -1218,13 +1223,13 @@
 				int offsetX = 0;
 				int offsetY = 0;
 				if (frame.left < screenFrame.left)
-					offsetX = screenFrame.left - frame.left;
+					offsetX = (int)(screenFrame.left - frame.left);
 				else if (frame.right > screenFrame.right)
-					offsetX = screenFrame.right - frame.right;
+					offsetX = (int)(screenFrame.right - frame.right);
 				if (frame.top < screenFrame.top)
-					offsetX = screenFrame.top - frame.top;
+					offsetX = (int)(screenFrame.top - frame.top);
 				else if (frame.bottom > screenFrame.bottom)
-					offsetX = screenFrame.bottom - frame.bottom;
+					offsetX = (int)(screenFrame.bottom - frame.bottom);
 				MoveBy(offsetX, offsetY);
 			}
 		}
@@ -1431,37 +1436,42 @@
 }
 
 
-/* Trap keys that are about to be send to background or renderer view.
- * Return B_OK if it shouldn't be passed to the view
- */
-status_t
+/*!	Trap keys that are about to be send to background or renderer view.
+	Return true if it shouldn't be passed to the view.
+*/
+bool
 MainWin::_KeyDown(BMessage *msg)
 {
-//	msg->PrintToStream();
+	// TODO: use the shortcut mechanism instead!
 
-	uint32 key		 = msg->FindInt32("key");
-	uint32 raw_char  = msg->FindInt32("raw_char");
+	uint32 key = msg->FindInt32("key");
+	uint32 rawChar = msg->FindInt32("raw_char");
 	uint32 modifier = msg->FindInt32("modifiers");
 
-	printf("key 0x%lx, raw_char 0x%lx, modifiers 0x%lx\n", key, raw_char,
+	printf("key 0x%lx, rawChar 0x%lx, modifiers 0x%lx\n", key, rawChar,
 		modifier);
 
-	switch (raw_char) {
+	// ignore the system modifier namespace
+	if ((modifier & (B_CONTROL_KEY | B_COMMAND_KEY))
+			== (B_CONTROL_KEY | B_COMMAND_KEY))
+		return false;
+
+	switch (rawChar) {
 		case B_SPACE:
 			fController->TogglePlaying();
-			return B_OK;
+			return true;
 
 		case B_ESCAPE:
-			if (fIsFullscreen) {
-				PostMessage(M_TOGGLE_FULLSCREEN);
-				return B_OK;
-			} else
+			if (!fIsFullscreen)
 				break;
 
+			PostMessage(M_TOGGLE_FULLSCREEN);
+			return true;
+
 		case B_ENTER:		// Enter / Return
 			if (modifier & B_COMMAND_KEY) {
 				PostMessage(M_TOGGLE_FULLSCREEN);
-				return B_OK;
+				return true;
 			} else
 				break;
 
@@ -1469,56 +1479,52 @@
 			if ((modifier & (B_COMMAND_KEY | B_CONTROL_KEY | B_OPTION_KEY
 					| B_MENU_KEY)) == 0) {
 				PostMessage(M_TOGGLE_FULLSCREEN);
-				return B_OK;
+				return true;
 			} else
 				break;
 
 		case B_UP_ARROW:
-			if (modifier & B_COMMAND_KEY) {
+			if ((modifier & B_COMMAND_KEY) != 0)
 				PostMessage(M_SKIP_NEXT);
-			} else {
+			else
 				PostMessage(M_VOLUME_UP);
-			}
-			return B_OK;
+			return true;
 
 		case B_DOWN_ARROW:
-			if (modifier & B_COMMAND_KEY) {
+			if ((modifier & B_COMMAND_KEY) != 0)
 				PostMessage(M_SKIP_PREV);
-			} else {
+			else
 				PostMessage(M_VOLUME_DOWN);
-			}
-			return B_OK;
+			return true;
 
 		case B_RIGHT_ARROW:
-			if (modifier & B_COMMAND_KEY) {
+			if ((modifier & B_COMMAND_KEY) != 0)
 				PostMessage(M_VOLUME_UP);
-			} else {
+			else
 				PostMessage(M_SKIP_NEXT);
-			}
-			return B_OK;
+			return true;
 
 		case B_LEFT_ARROW:
-			if (modifier & B_COMMAND_KEY) {
+			if ((modifier & B_COMMAND_KEY) != 0)
 				PostMessage(M_VOLUME_DOWN);
-			} else {
+			else
 				PostMessage(M_SKIP_PREV);
-			}
-			return B_OK;
+			return true;
 
 		case B_PAGE_UP:
 			PostMessage(M_SKIP_NEXT);
-			return B_OK;
+			return true;
 
 		case B_PAGE_DOWN:
 			PostMessage(M_SKIP_PREV);
-			return B_OK;
+			return true;
 	}
 
 	switch (key) {
 		case 0x3a:  		// numeric keypad +
 			if ((modifier & B_COMMAND_KEY) == 0) {
 				PostMessage(M_VOLUME_UP);
-				return B_OK;
+				return true;
 			} else {
 				break;
 			}
@@ -1526,44 +1532,44 @@
 		case 0x25:  		// numeric keypad -
 			if ((modifier & B_COMMAND_KEY) == 0) {
 				PostMessage(M_VOLUME_DOWN);
-				return B_OK;
+				return true;
 			} else {
 				break;
 			}
 
 		case 0x38:			// numeric keypad up arrow
 			PostMessage(M_VOLUME_UP);
-			return B_OK;
+			return true;
 
 		case 0x59:			// numeric keypad down arrow
 			PostMessage(M_VOLUME_DOWN);
-			return B_OK;
+			return true;
 
 		case 0x39:			// numeric keypad page up
 		case 0x4a:			// numeric keypad right arrow
 			PostMessage(M_SKIP_NEXT);
-			return B_OK;
+			return true;
 
 		case 0x5a:			// numeric keypad page down
 		case 0x48:			// numeric keypad left arrow
 			PostMessage(M_SKIP_PREV);
-			return B_OK;
+			return true;
 
-		case 0x34:			//delete button
-		case 0x3e: 			//d for delete
-		case 0x2b:			//t for Trash
-			if (modifiers() & B_COMMAND_KEY) {
+		case 0x34:			// delete button
+		case 0x3e: 			// d for delete
+		case 0x2b:			// t for Trash
+			if ((modifiers() & B_COMMAND_KEY) != 0) {
 				BAutolock _(fPlaylist);
 				BMessage removeMessage(M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH);
 				removeMessage.AddInt32("playlist index",
 					fPlaylist->CurrentItemIndex());
 				fPlaylistWindow->PostMessage(&removeMessage);
-				return B_OK;
+				return true;
 			}
 			break;
 	}
 
-	return B_ERROR;
+	return false;
 }
 
 

Modified: haiku/trunk/src/apps/mediaplayer/MainWin.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/MainWin.h	2009-08-10 10:55:59 UTC (rev 32223)
+++ haiku/trunk/src/apps/mediaplayer/MainWin.h	2009-08-10 13:28:50 UTC (rev 32224)
@@ -21,6 +21,7 @@
 #ifndef __MAIN_WIN_H
 #define __MAIN_WIN_H
 
+
 #include <Window.h>
 #include <Menu.h>
 #include <Button.h>
@@ -34,10 +35,12 @@
 #include "PlaylistItem.h"
 #include "VideoView.h"
 
+
 class ControllerObserver;
 class PlaylistObserver;
 class PlaylistWindow;
 
+
 class MainWin : public BWindow {
 public:
 								MainWin();
@@ -93,7 +96,7 @@
 									BView* originalHandler);
 			void				_MouseUp(BMessage* message);
 			void				_ShowContextMenu(const BPoint& screenPoint);
-			status_t			_KeyDown(BMessage* message);
+			bool				_KeyDown(BMessage* message);
 
 			void				_ToggleFullscreen();
 			void				_ToggleAlwaysOnTop();



From stpere at mail.berlios.de  Mon Aug 10 15:37:07 2009
From: stpere at mail.berlios.de (stpere at BerliOS)
Date: Mon, 10 Aug 2009 15:37:07 +0200
Subject: [Haiku-commits] r32225 - haiku/trunk/src/apps/terminal
Message-ID: <200908101337.n7ADb7Bb020036@sheep.berlios.de>

Author: stpere
Date: 2009-08-10 15:37:06 +0200 (Mon, 10 Aug 2009)
New Revision: 32225
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32225&view=rev

Modified:
   haiku/trunk/src/apps/terminal/AppearPrefView.cpp
   haiku/trunk/src/apps/terminal/PrefWindow.cpp
   haiku/trunk/src/apps/terminal/TermWindow.cpp
   haiku/trunk/src/apps/terminal/TermWindow.h
Log:
Terminal's preferences window :
 * Align the controls
 * Remove a bit of gray space that was superflous
 * Size dropdown menu now includes sizes of 13, 15 or 17, if needed, avoiding the case where is shown the word "size".
   Basically, it doesn't show them unless you got at that value by using the menu entries.

   Also disables the Increase/Decrease text size menu entries if you reach the upper or lower bounds.

Partly fixes ticket #4198.


Modified: haiku/trunk/src/apps/terminal/AppearPrefView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/AppearPrefView.cpp	2009-08-10 13:28:50 UTC (rev 32224)
+++ haiku/trunk/src/apps/terminal/AppearPrefView.cpp	2009-08-10 13:37:06 UTC (rev 32225)
@@ -16,6 +16,7 @@
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <PopUpMenu.h>
+#include <TextControl.h>
 #include <View.h>
 
 #include "MenuUtil.h"
@@ -81,13 +82,25 @@
 
 	float fontDividerSize = StringWidth("Font:") + 8.0;
 	float sizeDividerSize = StringWidth("Size:") + 8.0;
+	float greenDividerSize = StringWidth("Green:") + 8.0;
+	if (greenDividerSize > sizeDividerSize)
+		sizeDividerSize = greenDividerSize;
+	else
+		greenDividerSize = sizeDividerSize;
+	float colorDividerSize = StringWidth("Color:") + 8.0;
 
-	BRect r(5, 5, 225, 25);
+	if (fontDividerSize < colorDividerSize)
+		fontDividerSize = colorDividerSize;
+	else
+		colorDividerSize = fontDividerSize;
 
+	BRect r(5, 5, 261, 25);
+
 	BMenu *menu = _MakeFontMenu(MSG_HALF_FONT_CHANGED,
 		PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY));
 	fFont = new BMenuField(r, "font", "Font:", menu);
 	fFont->SetDivider(fontDividerSize);
+	fFont->SetAlignment(B_ALIGN_RIGHT);
 	AddChild(fFont);
 
 	r.OffsetBy(r.Width() + 10, 0);
@@ -95,17 +108,31 @@
 		PrefHandler::Default()->getInt32(PREF_HALF_FONT_SIZE));
 	fFontSize = new BMenuField(r, "size", "Size:", menu);
 	fFontSize->SetDivider(sizeDividerSize);
+	fFontSize->SetAlignment(B_ALIGN_RIGHT);
 	AddChild(fFontSize);
 
-	r.OffsetBy(-r.Width() - 10,r.Height() + 25);
+	r.OffsetBy(-r.Width() - 10,r.Height() + 10);
 	fColorField = new BMenuField(r, "color", "Color:",
 		MakeMenu(MSG_COLOR_FIELD_CHANGED, color_tbl, color_tbl[0]));
-	fColorField->SetDivider(StringWidth(fColorField->Label()) + 8.0);
+	fColorField->SetDivider(colorDividerSize);
+	fColorField->SetAlignment(B_ALIGN_RIGHT);
 	AddChild(fColorField);
 
   	fColorControl = SetupColorControl(BPoint(r.left, r.bottom + 10),
-  		B_CELLS_32x8, 7.0, MSG_COLOR_CHANGED);
+  		B_CELLS_32x8, 8.0, MSG_COLOR_CHANGED);
   	fColorControl->SetValue(PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR));
+
+	BTextControl* redInput = (BTextControl*)fColorControl->FindView("_red");
+	BTextControl* greenInput = (BTextControl*)fColorControl->FindView("_green");
+	BTextControl* blueInput = (BTextControl*)fColorControl->FindView("_blue");
+	
+	redInput->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
+	greenInput->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
+	blueInput->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
+
+	redInput->SetDivider(greenDividerSize);
+	greenInput->SetDivider(greenDividerSize);
+	blueInput->SetDivider(greenDividerSize);
 }
 
 
@@ -217,6 +244,8 @@
 	BPopUpMenu *menu = new BPopUpMenu("size");
 	int32 sizes[] = {9, 10, 11, 12, 14, 16, 18, 0};
 
+	bool found = false;
+
 	for (uint32 i = 0; sizes[i]; i++) {
 		BString string;
 		string << sizes[i];
@@ -224,8 +253,17 @@
 		BMenuItem* item = new BMenuItem(string.String(), new BMessage(command));
 		menu->AddItem(item);
 
-		if (sizes[i] == defaultSize)
+		if (sizes[i] == defaultSize) {
 			item->SetMarked(true);
+			found = true;
+		} else if (sizes[i] > defaultSize && !found) {
+			BString string;
+			string << defaultSize;
+			BMenuItem* item = new BMenuItem(string.String(), new BMessage(command));
+			item->SetMarked(true);
+			menu->AddItem(item, i);
+			found = true;
+		}
 	}
 
 	return menu;

Modified: haiku/trunk/src/apps/terminal/PrefWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/PrefWindow.cpp	2009-08-10 13:28:50 UTC (rev 32224)
+++ haiku/trunk/src/apps/terminal/PrefWindow.cpp	2009-08-10 13:37:06 UTC (rev 32225)
@@ -23,7 +23,7 @@
 
 
 PrefWindow::PrefWindow(BMessenger messenger)
-	: BWindow(_CenteredRect(BRect(0, 0, 350, 215)), "Terminal Preferences",
+	: BWindow(_CenteredRect(BRect(0, 0, 375, 185)), "Terminal Preferences",
 		B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
 		B_NOT_RESIZABLE|B_NOT_ZOOMABLE),
 	fPreviousPref(new PrefHandler(PrefHandler::Default())),

Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2009-08-10 13:28:50 UTC (rev 32224)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2009-08-10 13:37:06 UTC (rev 32225)
@@ -232,6 +232,17 @@
 	BMenuItem *item = fEncodingmenu->FindItem(EncodingAsString(_ActiveTermView()->Encoding()));
 	if (item != NULL)
 		item->SetMarked(true);
+
+	TermView *view = _ActiveTermView();
+
+	BFont font;
+	view->GetTermFont(&font);
+
+	float size = font.Size();
+
+	fDecreaseFontSizeMenuItem->SetEnabled(size > 9);
+	fIncreaseFontSizeMenuItem->SetEnabled(size < 18);
+
 	BWindow::MenusBeginning();
 }
 
@@ -299,11 +310,16 @@
 	MakeEncodingMenu(fEncodingmenu, false);
 
 	fSizeMenu = new BMenu("Text Size");
-	fSizeMenu->AddItem(new BMenuItem("Increase",
-		new BMessage(kIncreaseFontSize), '+', B_COMMAND_KEY));
-	fSizeMenu->AddItem(new BMenuItem("Decrease",
-		new BMessage(kDecreaseFontSize), '-', B_COMMAND_KEY));
+	
+	fIncreaseFontSizeMenuItem = new BMenuItem("Increase",
+		new BMessage(kIncreaseFontSize), '+', B_COMMAND_KEY);
 
+	fDecreaseFontSizeMenuItem = new BMenuItem("Decrease",
+		new BMessage(kDecreaseFontSize), '-', B_COMMAND_KEY);
+
+	fSizeMenu->AddItem(fIncreaseFontSizeMenuItem);
+	fSizeMenu->AddItem(fDecreaseFontSizeMenuItem);
+
 	fHelpmenu->AddItem(fWindowSizeMenu);
 	fHelpmenu->AddItem(fEncodingmenu);
 	fHelpmenu->AddItem(fSizeMenu);
@@ -609,11 +625,11 @@
 				size -= 1;
 			
 			// limit the font size
-			if (size < 6)
-				size = 6;
-			else if (size > 20)
-				size = 20;
-				
+			if (size < 9)
+				size = 9;
+			if (size > 18)
+				size = 18;
+			
 			font.SetSize(size);	
 			view->SetTermFont(&font);
 			PrefHandler::Default()->setInt32(PREF_HALF_FONT_SIZE, (int32)size);

Modified: haiku/trunk/src/apps/terminal/TermWindow.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.h	2009-08-10 13:28:50 UTC (rev 32224)
+++ haiku/trunk/src/apps/terminal/TermWindow.h	2009-08-10 13:37:06 UTC (rev 32225)
@@ -108,6 +108,9 @@
 	BString			fFindString;
 	BMenuItem		*fFindForwardMenuItem;
 	BMenuItem 		*fFindBackwardMenuItem;
+	BMenuItem		*fIncreaseFontSizeMenuItem;
+	BMenuItem		*fDecreaseFontSizeMenuItem;
+
 	bool			fFindSelection;
 	bool			fForwardSearch;
 	bool			fMatchCase;



From laplace at mail.berlios.de  Mon Aug 10 15:38:38 2009
From: laplace at mail.berlios.de (laplace at mail.berlios.de)
Date: Mon, 10 Aug 2009 15:38:38 +0200
Subject: [Haiku-commits] r32226 - haiku/trunk/src/servers/print
Message-ID: <200908101338.n7ADccVc020125@sheep.berlios.de>

Author: laplace
Date: 2009-08-10 15:38:35 +0200 (Mon, 10 Aug 2009)
New Revision: 32226
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32226&view=rev

Modified:
   haiku/trunk/src/servers/print/ConfigWindow.cpp
   haiku/trunk/src/servers/print/ConfigWindow.h
Log:
Made UI font size sensitive using layout manager.
Please review. 

Modified: haiku/trunk/src/servers/print/ConfigWindow.cpp
===================================================================
--- haiku/trunk/src/servers/print/ConfigWindow.cpp	2009-08-10 13:37:06 UTC (rev 32225)
+++ haiku/trunk/src/servers/print/ConfigWindow.cpp	2009-08-10 13:38:35 UTC (rev 32226)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008, Haiku. All rights reserved.
+ * Copyright 2002-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -24,6 +24,10 @@
 #include <Debug.h>
 #include <Window.h>
 
+// Haiku
+#include <Layout.h>
+#include <GroupLayout.h>
+#include <GroupLayoutBuilder.h>
 
 static const float a0_width = 2380.0;
 static const float a0_height = 3368.0;
@@ -88,10 +92,19 @@
 }
 
 
+static BGroupLayoutBuilder
+LeftAlign(BView* view)
+{
+	return BGroupLayoutBuilder(B_HORIZONTAL)
+		.Add(view)
+		.AddGlue();
+}
+
+
 ConfigWindow::ConfigWindow(config_setup_kind kind, Printer* defaultPrinter,
 	BMessage* settings, AutoReply* sender)
 	: BWindow(ConfigWindow::GetWindowFrame(), "Page Setup",
-		B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
+		B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 	, fKind(kind)
 	, fDefaultPrinter(defaultPrinter)
 	, fSettings(settings)
@@ -106,83 +119,92 @@
 	if (kind == kJobSetup)
 		SetTitle("Print Setup");
 
-	BView* panel = new BBox(Bounds(), "top_panel", B_FOLLOW_ALL,
-					B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP,
-					B_PLAIN_BORDER);
-
+	BView* panel = new BBox(Bounds(), "temporary", B_FOLLOW_ALL,	B_WILL_DRAW);
 	AddChild(panel);
 
-	float left = 10, top = 10;
-	BRect r(left, top, 160, 20);
+	BRect dummyRect(0, 0, 1, 1);
 
-	// print selection popup menu
+	// print selection pop up menu
 	BPopUpMenu* menu = new BPopUpMenu("Select a Printer");
 	SetupPrintersMenu(menu);
 
-	float width = be_plain_font->StringWidth("Printer:") + 10.0;
-	r.right = r.left + width + menu->MaxContentWidth() + 10;
-	fPrinters = new BMenuField(r, "Printer", "Printer:", menu);
-	fPrinters->SetDivider(width);
-	panel->AddChild(fPrinters);
-	top += fPrinters->Bounds().Height() + 10;
+	fPrinters = new BMenuField("Printer:", menu, NULL);
 
 	// page format button
-	r.OffsetTo(left, top);
-	fPageSetup = AddPictureButton(panel, r, "Page Format", "PAGE_SETUP_ON",
+	fPageSetup = AddPictureButton(panel, dummyRect, "Page Format", "PAGE_SETUP_ON",
 		"PAGE_SETUP_OFF", MSG_PAGE_SETUP);
 
 	// add description to button
-	r.OffsetTo(left + fPageSetup->Bounds().Width() + 5, fPageSetup->Frame().top);
-	BStringView *stringView = AddStringView(panel, r, "Paper Setup:");
-	stringView->ResizeToPreferred();
-	r = stringView->Frame();
-	r.OffsetBy(0, r.Height());
-	fPageFormatText = AddStringView(panel, r, "");
-	fPageFormatText->ResizeToPreferred();
-	top = fPageSetup->Frame().bottom + 15;
+	BStringView *pageFormatTitle = new BStringView("pageFormatTitle", "Paper Setup:");
+	fPageFormatText = new BStringView("pageFormatText", "");
 
 	// page selection button
 	fJobSetup = NULL;
+	BStringView* jobSetupTitle = NULL;
 	if (kind == kJobSetup) {
-		r.OffsetTo(left, top);
-		fJobSetup = AddPictureButton(panel, r, "Page Selection", "JOB_SETUP_ON",
+		fJobSetup = AddPictureButton(panel, dummyRect, "Page Selection", "JOB_SETUP_ON",
 			"JOB_SETUP_OFF", MSG_JOB_SETUP);
 		// add description to button
-		r.OffsetTo(left + fJobSetup->Bounds().Width() + 5, top);
-		stringView = AddStringView(panel, r, "Pages to Print:");
-		stringView->ResizeToPreferred();
-		r.OffsetBy(0, stringView->Frame().Height());
-		fJobSetupText = AddStringView(panel, r, "");
-		fJobSetupText->ResizeToPreferred();
-		top = fJobSetup->Frame().bottom + 15;
+		jobSetupTitle = new BStringView("jobSetupTitle", "Pages to Print:");
+		fJobSetupText = new BStringView("jobSetupText", "");
 	}
-	top += 5;
 
 	// separator line
-	BRect line(Bounds());
-	line.OffsetTo(0, top);
-	line.bottom = line.top+1;
-	AddChild(new BBox(line, "line", B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP));
-	top += 10;
+	BBox* separator = new BBox(dummyRect, "line", B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP);
+	separator->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, 1));
 
-	// Cancel button
-	r.OffsetTo(left, top);
-	BButton* cancel = new BButton(r, "Cancel", "Cancel",
+	// Cancel & OK button
+	BButton* cancel = new BButton(dummyRect, "Cancel", "Cancel",
 		new BMessage(B_QUIT_REQUESTED));
-	panel->AddChild(cancel);
-	cancel->ResizeToPreferred();
-	left = cancel->Frame().right + 10;
+	fOk = new BButton(dummyRect, "OK", "OK", new BMessage(MSG_OK));
 
-	// OK button
-	r.OffsetTo(left, top);
-	fOk = new BButton(r, "OK", "OK", new BMessage(MSG_OK));
-	panel->AddChild(fOk);
-	fOk->ResizeToPreferred();
-	top += fOk->Bounds().Height() + 10;
+	RemoveChild(panel);
 
-	// resize window
-	ResizeTo(fOk->Frame().right + 10, top);
+	SetLayout(new BGroupLayout(B_VERTICAL));
+	BGroupLayoutBuilder builder(B_VERTICAL);
 
+	builder
+		.Add(fPrinters)
+		.AddStrut(5)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL)
+				.Add(fPageSetup)
+				.AddStrut(5)
+				.Add(BGroupLayoutBuilder(B_VERTICAL)
+						.Add(LeftAlign(pageFormatTitle))
+						.Add(LeftAlign(fPageFormatText))
+				)
+				.AddGlue()
+		);
+
+	if (fJobSetup != NULL) {
+		builder
+			.AddStrut(5)
+			.Add(BGroupLayoutBuilder(B_HORIZONTAL)
+					.Add(fJobSetup)
+					.AddStrut(5)
+					.Add(BGroupLayoutBuilder(B_VERTICAL)
+							.Add(LeftAlign(jobSetupTitle))
+							.Add(LeftAlign(fJobSetupText))
+					)
+					.AddGlue()
+			);
+	}
+
+	builder
+		.AddStrut(5)
+		.Add(separator)
+		.AddStrut(5)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL)
+				.AddGlue()
+				.Add(cancel)
+				.AddStrut(5)
+				.Add(fOk)
+				.AddGlue()
+		)
+		.SetInsets(5, 5, 5, 5);
+
+	AddChild(builder);
+
 	AddShortcut('a', 0, new BMessage(B_ABOUT_REQUESTED));
 
 	SetDefaultButton(fOk);
@@ -307,6 +329,7 @@
 		onBM->Lock();
 		button->ResizeTo(onBM->Bounds().Width(), onBM->Bounds().Height());
 		onBM->Unlock();
+		panel->RemoveChild(button);
 
 		BPicture* disabled = BitmapToGrayedPicture(panel, offBM);
 		button->SetDisabledOn(disabled);
@@ -324,17 +347,6 @@
 }
 
 
-BStringView* ConfigWindow::AddStringView(BView* panel, BRect frame, const char* text)
-{
-	// frame.bottom = frame.top ;
-	BStringView* string = new BStringView(frame, "", text);
-	string->SetViewColor(panel->ViewColor());
-	string->SetLowColor(panel->ViewColor());
- 	panel->AddChild(string);
- 	return string;
-}
-
-
 void ConfigWindow::PrinterForMimeType()
 {
 	BAutolock lock(gLock);
@@ -426,11 +438,9 @@
 		if (fJobSetup) {
 			fJobSetup->SetEnabled(false);
 			fJobSetupText->SetText("Undefined job settings");
-			fJobSetupText->ResizeToPreferred();
 		}
 		fOk->SetEnabled(false);
 		fPageFormatText->SetText("Undefined paper format");
-		fPageFormatText->ResizeToPreferred();
 	} else {
 		fPageSetup->SetEnabled(true);
 
@@ -456,7 +466,6 @@
 			pageFormat << "Undefined paper format";
 		}
 		fPageFormatText->SetText(pageFormat.String());
-		fPageFormatText->ResizeToPreferred();
 
 			// display information about job
 		if (fKind == kJobSetup) {
@@ -478,17 +487,8 @@
 				job << "Undefined job settings";
 			}
 			fJobSetupText->SetText(job.String());
-			fJobSetupText->ResizeToPreferred();
 		}
 	}
-
-	if (fOk->Frame().right < fPageFormatText->Frame().right)
-		ResizeTo(fPageFormatText->Frame().right + 10, Bounds().bottom);
-
-	if (fJobSetupText) {
-		if (fOk->Frame().right < fJobSetupText->Frame().right)
-			ResizeTo(fJobSetupText->Frame().right + 10, Bounds().bottom);
-	}
 }
 
 

Modified: haiku/trunk/src/servers/print/ConfigWindow.h
===================================================================
--- haiku/trunk/src/servers/print/ConfigWindow.h	2009-08-10 13:37:06 UTC (rev 32225)
+++ haiku/trunk/src/servers/print/ConfigWindow.h	2009-08-10 13:38:35 UTC (rev 32226)
@@ -44,7 +44,6 @@
 private:
 	BPictureButton* AddPictureButton(BView* panel, BRect frame, const char* name,
 		const char* on, const char* off, uint32 what);
-	BStringView* AddStringView(BView* panel, BRect frame, const char* text);
 	void PrinterForMimeType();
 	void SetupPrintersMenu(BMenu* menu);
 	void UpdateAppSettings(const char* mime, const char* printer);



From michael.w.pfeiffer at gmail.com  Mon Aug 10 16:02:13 2009
From: michael.w.pfeiffer at gmail.com (Michael Pfeiffer)
Date: Mon, 10 Aug 2009 16:02:13 +0200
Subject: [Haiku-commits] r32226 - haiku/trunk/src/servers/print
In-Reply-To: <200908101338.n7ADccVc020125@sheep.berlios.de>
References: <200908101338.n7ADccVc020125@sheep.berlios.de>
Message-ID: <7120CB40-43FA-41A4-AFDE-EBAEC75A4F65@gmail.com>


Am 10.08.2009 um 15:38 schrieb laplace at mail.berlios.de:

> Made UI font size sensitive using layout manager.
> Please review.

I need help to fixing the issue mention in:
http://dev.haiku-os.org/ticket/4178#comment:5

TIA,
Michael



From axeld at mail.berlios.de  Mon Aug 10 16:21:01 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 10 Aug 2009 16:21:01 +0200
Subject: [Haiku-commits] r32227 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200908101421.n7AEL1sM024871@sheep.berlios.de>

Author: axeld
Date: 2009-08-10 16:20:59 +0200 (Mon, 10 Aug 2009)
New Revision: 32227
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32227&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp
Log:
* Don't reset fSeparateSubTransactions but restore its previous value. This
  fixes bug #4201.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp	2009-08-10 13:38:35 UTC (rev 32226)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Journal.cpp	2009-08-10 14:20:59 UTC (rev 32227)
@@ -1000,9 +1000,10 @@
 			// Unlocking the inodes might trigger new transactions, but we
 			// cannot reuse the current one anymore, as this one is already
 			// closed.
+			bool separateSubTransactions = fSeparateSubTransactions;
 			fSeparateSubTransactions = true;
 			fOwner->UnlockInodes(success);
-			fSeparateSubTransactions = false;
+			fSeparateSubTransactions = separateSubTransactions;
 		}
 
 		fTimestamp = system_time();



From kirilla at mail.berlios.de  Mon Aug 10 18:12:13 2009
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Mon, 10 Aug 2009 18:12:13 +0200
Subject: [Haiku-commits] r32228 - haiku/trunk/src/kits/interface
Message-ID: <200908101612.n7AGCDra007662@sheep.berlios.de>

Author: kirilla
Date: 2009-08-10 18:12:12 +0200 (Mon, 10 Aug 2009)
New Revision: 32228
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32228&view=rev

Modified:
   haiku/trunk/src/kits/interface/Window.cpp
Log:
Add TabFrame window property.

Modified: haiku/trunk/src/kits/interface/Window.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Window.cpp	2009-08-10 14:20:59 UTC (rev 32227)
+++ haiku/trunk/src/kits/interface/Window.cpp	2009-08-10 16:12:12 UTC (rev 32228)
@@ -172,6 +172,11 @@
 		"Minimize", { B_GET_PROPERTY, B_SET_PROPERTY },
 		{ B_DIRECT_SPECIFIER }, NULL, 0, { B_BOOL_TYPE }
 	},
+	
+	{
+		"TabFrame", { B_GET_PROPERTY },
+		{ B_DIRECT_SPECIFIER }, NULL, 0, { B_RECT_TYPE }
+	},
 
 	{}
 };
@@ -830,6 +835,18 @@
 				}
 			}
 			break;
+		case 12:
+			if (msg->what == B_GET_PROPERTY) {
+				BMessage settings;
+				if (GetDecoratorSettings(&settings) == B_OK) {
+					BRect frame;
+					if(settings.FindRect("tab frame", &frame) == B_OK) {
+						replyMsg.AddRect("result", frame);
+						handled = true;
+					}
+				}
+			}
+			break;
 		default:
 			return BLooper::MessageReceived(msg);
 	}



From leavengood at gmail.com  Mon Aug 10 18:57:03 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 10 Aug 2009 12:57:03 -0400
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <3511381475-BeMail@kirilla>
References: <a4855ac50908092244x6231a779sfe51d48f10f6f56c@mail.gmail.com>
	<3511381475-BeMail@kirilla>
Message-ID: <a4855ac50908100957p49ae0635yf2f7819fe29f151b@mail.gmail.com>

2009/8/10 Jonas Sundstr?m <jonas at kirilla.com>:
>
> I can try that. Anyone started on it already?

No, go for it. My only other concern is I don't know if it is possible
to get a scriptable window reference with the information from the
window_info used in ScreenshotWndow.cpp's _GetActiveWindowFrame()
method. But I'll let you figure that out ;)

-- 
Regards,
Ryan


From axeld at pinc-software.de  Mon Aug 10 19:03:27 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 10 Aug 2009 19:03:27 +0200 CEST
Subject: [Haiku-commits] r32228 - haiku/trunk/src/kits/interface
In-Reply-To: <200908101612.n7AGCDra007662@sheep.berlios.de>
Message-ID: <29527482114-BeMail@zon>

kirilla at BerliOS <kirilla at mail.berlios.de> wrote:
> +					if(settings.FindRect("tab frame", &frame) == B_OK) 
> {

Minor coding style violation: if_space_(...

Bye,
   Axel.



From axeld at pinc-software.de  Mon Aug 10 19:04:34 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 10 Aug 2009 19:04:34 +0200 CEST
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <a4855ac50908100957p49ae0635yf2f7819fe29f151b@mail.gmail.com>
Message-ID: <29594402542-BeMail@zon>

Ryan Leavengood <leavengood at gmail.com> wrote:
> 2009/8/10 Jonas Sundstr?m <jonas at kirilla.com>:
> > I can try that. Anyone started on it already?
> No, go for it. My only other concern is I don't know if it is 
> possible
> to get a scriptable window reference with the information from the
> window_info used in ScreenshotWndow.cpp's _GetActiveWindowFrame()
> method. But I'll let you figure that out ;)

If that wouldn't be possible already (via BMessenger::Private), adding 
the necessary fields to window_info would be no problem. But IIRC it 
should all be there already.

Bye,
   Axel.



From leavengood at gmail.com  Mon Aug 10 19:13:10 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 10 Aug 2009 13:13:10 -0400
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <29594402542-BeMail@zon>
References: <a4855ac50908100957p49ae0635yf2f7819fe29f151b@mail.gmail.com>
	<29594402542-BeMail@zon>
Message-ID: <a4855ac50908101013w617c6802ocfb88cf4fdbc9969@mail.gmail.com>

On Mon, Aug 10, 2009 at 1:04 PM, Axel D?rfler<axeld at pinc-software.de> wrote:
>
> If that wouldn't be possible already (via BMessenger::Private), adding
> the necessary fields to window_info would be no problem. But IIRC it
> should all be there already.

OK cool it looks like BMessenger::Private::SetTo would do the job
using the team, client_port and client_token members of the
window_info structure. You just pass in the BMessenger you want to be
SetTo. Right?

-- 
Regards,
Ryan


From axeld at pinc-software.de  Mon Aug 10 19:43:00 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 10 Aug 2009 19:43:00 +0200 CEST
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <a4855ac50908101013w617c6802ocfb88cf4fdbc9969@mail.gmail.com>
Message-ID: <31900983709-BeMail@zon>

Ryan Leavengood <leavengood at gmail.com> wrote:
> On Mon, Aug 10, 2009 at 1:04 PM, Axel D?rfler<axeld at pinc-software.de> 
> wrote:
> > If that wouldn't be possible already (via BMessenger::Private), 
> > adding
> > the necessary fields to window_info would be no problem. But IIRC 
> > it
> > should all be there already.
> OK cool it looks like BMessenger::Private::SetTo would do the job
> using the team, client_port and client_token members of the
> window_info structure. You just pass in the BMessenger you want to be
> SetTo. Right?

Exactly.

Bye,
   Axel.



From laplace at mail.berlios.de  Mon Aug 10 19:57:45 2009
From: laplace at mail.berlios.de (laplace at mail.berlios.de)
Date: Mon, 10 Aug 2009 19:57:45 +0200
Subject: [Haiku-commits] r32229 - haiku/trunk/src/servers/print
Message-ID: <200908101757.n7AHvjkG021896@sheep.berlios.de>

Author: laplace
Date: 2009-08-10 19:57:43 +0200 (Mon, 10 Aug 2009)
New Revision: 32229
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32229&view=rev

Modified:
   haiku/trunk/src/servers/print/ConfigWindow.cpp
Log:
Fixed the issue from ticket 4178 comment 5.

Modified: haiku/trunk/src/servers/print/ConfigWindow.cpp
===================================================================
--- haiku/trunk/src/servers/print/ConfigWindow.cpp	2009-08-10 16:12:12 UTC (rev 32228)
+++ haiku/trunk/src/servers/print/ConfigWindow.cpp	2009-08-10 17:57:43 UTC (rev 32229)
@@ -327,7 +327,10 @@
 		button->SetViewColor(B_TRANSPARENT_COLOR);
 		panel->AddChild(button);
 		onBM->Lock();
-		button->ResizeTo(onBM->Bounds().Width(), onBM->Bounds().Height());
+		int32 width = onBM->Bounds().Width();
+		int32 height = onBM->Bounds().Height();
+		button->ResizeTo(width, height);
+		button->SetExplicitMaxSize(BSize(width, height));
 		onBM->Unlock();
 		panel->RemoveChild(button);
 



From laplace at mail.berlios.de  Mon Aug 10 20:13:38 2009
From: laplace at mail.berlios.de (laplace at mail.berlios.de)
Date: Mon, 10 Aug 2009 20:13:38 +0200
Subject: [Haiku-commits] r32230 - haiku/trunk/src/servers/print
Message-ID: <200908101813.n7AIDctK023806@sheep.berlios.de>

Author: laplace
Date: 2009-08-10 20:13:36 +0200 (Mon, 10 Aug 2009)
New Revision: 32230
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32230&view=rev

Modified:
   haiku/trunk/src/servers/print/Jamfile
Log:
* Print server is not BeOS compatible since layout manager is used.
* Removed it from haiku-printingkit-cvs package.

Modified: haiku/trunk/src/servers/print/Jamfile
===================================================================
--- haiku/trunk/src/servers/print/Jamfile	2009-08-10 17:57:43 UTC (rev 32229)
+++ haiku/trunk/src/servers/print/Jamfile	2009-08-10 18:13:36 UTC (rev 32230)
@@ -1,7 +1,5 @@
 SubDir HAIKU_TOP src servers print ;
 
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
 UsePrivateHeaders shared print ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers libs print libprint ] ;
 
@@ -30,8 +28,3 @@
 	libprintutils.a
 	$(TARGET_LIBSUPC++)
 ;
-
-Package haiku-printingkit-cvs :
-	print_server :
-#	boot beos system servers ;
-	boot home Desktop haiku-printingkit ;



From leavengood at gmail.com  Mon Aug 10 20:13:52 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 10 Aug 2009 14:13:52 -0400
Subject: [Haiku-commits] r32229 - haiku/trunk/src/servers/print
In-Reply-To: <200908101757.n7AHvjkG021896@sheep.berlios.de>
References: <200908101757.n7AHvjkG021896@sheep.berlios.de>
Message-ID: <a4855ac50908101113q9c6eb7cga84e0d9176758c29@mail.gmail.com>

On Mon, Aug 10, 2009 at 1:57 PM, <laplace at mail.berlios.de> wrote:
>
> + ? ? ? ? ? ? ? button->ResizeTo(width, height);
> + ? ? ? ? ? ? ? button->SetExplicitMaxSize(BSize(width, height));

Are you sure the first line is needed if you have the second? I would think not.

On another note Ingo recently added a new and better BLayoutBuilder
class that you may want to look at. I assume that is what we will want
to use now instead of BGroupLayoutBuilder, etc. I suppose I need to
update my old layout system article or write a new one. There have
been some commits from Axel and Ingo recently that used it. Check out
the About window, Screen, and Debugger source code. The r31118 commit
to add a BWindow parameter is nice since it avoids having to set a
(generally useless) root layout by the API user.

Also see headers/os/interface/LayoutBuilder.h of course.

-- 
Regards,
Ryan


From jackburton at mail.berlios.de  Mon Aug 10 20:46:54 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Mon, 10 Aug 2009 20:46:54 +0200
Subject: [Haiku-commits] r32231 - haiku/trunk/src/tests/kits/game/ParticlesII
Message-ID: <200908101846.n7AIksth027061@sheep.berlios.de>

Author: jackburton
Date: 2009-08-10 20:46:52 +0200 (Mon, 10 Aug 2009)
New Revision: 32231
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32231&view=rev

Modified:
   haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp
Log:
Remove "CanControlFrameBuffer" again, since it wasn't the cause of the crash:
width and height were off by one, and ParticlesII was writing out of the
frame buffer. Some style cleanups.


Modified: haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp
===================================================================
--- haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp	2009-08-10 18:13:36 UTC (rev 32230)
+++ haiku/trunk/src/tests/kits/game/ParticlesII/particlesII.cpp	2009-08-10 18:46:52 UTC (rev 32231)
@@ -95,7 +95,7 @@
 	NWindowScreen *ws = new NWindowScreen(&ret);
 	PRINT(("WindowScreen ctor returned. ret = %s\n", strerror(ret)));
 	// exit if constructing the WindowScreen failed.
-	if((ws == NULL) || (ret < B_OK) || !ws->CanControlFrameBuffer())
+	if((ws == NULL) || (ret < B_OK))
 	{
 		//printf("the window screen was NULL, or there was an error\n");
 		PostMessage(B_QUIT_REQUESTED);
@@ -114,7 +114,7 @@
 }
 
 NWindowScreen::NWindowScreen(status_t *ret)
-	: BWindowScreen("Example", B_8_BIT_640x480, ret), width(640), height(480), COLORS(256)
+	: BWindowScreen("Example", B_8_BIT_640x480, ret), width(639), height(479), COLORS(256)
 {
 	PRINT(("WindowScreen ctor.\n"));
 	thread_is_locked = true;
@@ -148,7 +148,9 @@
 	set_frame_rate(30.);
 }
 
-void NWindowScreen::ScreenConnected(bool connected)
+
+void
+NWindowScreen::ScreenConnected(bool connected)
 {
 	PRINT(("ScreenConnected()\n"));
 	fflush(stdout);
@@ -156,7 +158,7 @@
 	{
 		if(SetSpace(B_8_BIT_640x480) < B_OK)
 		{
-			SetFrameBuffer(640,480);
+			//SetFrameBuffer(640, 480);
 			PRINT(("SetSpace() failed\n"));
 			// properly set the framebuffer. exit if an error occurs.
 			be_app->PostMessage(B_QUIT_REQUESTED);
@@ -268,19 +270,23 @@
 	}
 }
 
-long NWindowScreen::Entry(void* p) {
+
+long
+NWindowScreen::Entry(void* p)
+{
    return ((NWindowScreen*)p)->MyCode();
 }
 
-long NWindowScreen::MyCode()
+
+long
+NWindowScreen::MyCode()
 {
 	bigtime_t trgt = system_time() + frame_pause;
 	srandom(system_time());
 	// beforehand stuff
 	particle_count = 1024*2;
 	particle_list = (particle *)malloc(sizeof(particle)*particle_count);
-	for (uint32 i=0; i<particle_count; i++)
-	{
+	for (uint32 i=0; i<particle_count; i++) {
 		uint32 rand_max = 0xffffffff;		
 		particle_list[i].init_velocity = -((double)((rand_max>>1)+(random()%(rand_max>>1)))/rand_max)*3.333; // magic number
 		particle_list[i].gravity = -(((double)((rand_max>>1)+(random()%(rand_max>>1)))/rand_max))*0.599; // more magic
@@ -297,14 +303,12 @@
 	
 	
 	// the loop o' fun
-	while(!(((NApplication*)be_app)->is_quitting))
-	{
+	while (!(((NApplication*)be_app)->is_quitting)) {
 		// try to sync with the vertical retrace
-		if(BScreen(this).WaitForRetrace() != B_OK)
-		{
+		if (BScreen(this).WaitForRetrace() != B_OK) {
 			// snoze for a bit so that other threads can be happy. 
 			// We are realtime priority you know
-			if(system_time() < trgt)
+			if (system_time() < trgt)
 				snooze(trgt - system_time());
 			trgt = system_time() + frame_pause;
 		}
@@ -319,7 +323,6 @@
 	
 		
 		// eye candy VII - particles! - my own cookin
-		particle *s;
 		int32 x, y, cx,cy;
 		set_frame_rate(60.); // woo. ntsc
 		// calculate the center
@@ -332,9 +335,8 @@
 		//	draw_line(i,0,i,height, i);
 		
 		PRINT(("Starting particle drawing loop\n"));
-		s = particle_list;
-		for (uint32 i=0; i<particle_count; i++)
-		{
+		particle *s = particle_list;
+		for (uint32 i=0; i<particle_count; i++) {
 			PRINT(("drawing particle %d\r", i));
 			
 			// save the old position
@@ -427,7 +429,8 @@
 
 */
 
-void NWindowScreen::draw_line(int x1, int y1, int x2, int y2, int color)
+void
+NWindowScreen::draw_line(int x1, int y1, int x2, int y2, int color)
 {
 	// Simple Bresenham's line drawing algorithm
 	int d,x,y,ax,ay,sx,sy,dx,dy;
@@ -474,7 +477,9 @@
 	}
 }
 
-void NWindowScreen::draw_rect(int x, int y, int w, int h, int color)
+
+void
+NWindowScreen::draw_rect(int x, int y, int w, int h, int color)
 {
 	draw_line(x,y,x+w,y,color);
 	draw_line(x,y,x,y+h,color);
@@ -482,14 +487,20 @@
 	draw_line(x+w,y,x+w,y+h,color);
 }
 
-void NWindowScreen::fill_rect(int x, int y, int w, int h, int color)
+
+void
+NWindowScreen::fill_rect(int x, int y, int w, int h, int color)
 {
-	for(int i=0;i<w;i++)
-		for(int j=0;j<h;j++)
-			set_pixel(i,j,color);
+	for (int i = 0; i < w; i++) {
+		for (int j = 0; j < h; j++) {
+			set_pixel(i, j, color);
+		}
+	}
 }
 
-void NWindowScreen::draw_ellipse(int cx, int cy, int wide, int deep, int color)
+
+void
+NWindowScreen::draw_ellipse(int cx, int cy, int wide, int deep, int color)
 {
 	// if we're asked to draw a really small ellipse, put a single pixel in the buffer
 	// and bail
@@ -540,7 +551,9 @@
 	}
 }
 
-void NWindowScreen::fill_ellipse(int cx, int cy, int wide, int deep, int color)
+
+void
+NWindowScreen::fill_ellipse(int cx, int cy, int wide, int deep, int color)
 {
 	// if we're asked to draw a really small ellipse, put a single pixel in the buffer
 	// and bail
@@ -591,7 +604,9 @@
 	}
 }
 
-void NWindowScreen::ellipse_points(int x, int y, int x_offset, int y_offset, int color)
+
+void
+NWindowScreen::ellipse_points(int x, int y, int x_offset, int y_offset, int color)
 {
 	// fill four pixels for every iteration in draw_ellipse
 	
@@ -617,7 +632,9 @@
 		set_pixel(xCoord,yCoord,color);
 }
 
-void NWindowScreen::ellipse_fill_points(int x, int y, int x_offset, int y_offset, int color)
+
+void
+NWindowScreen::ellipse_fill_points(int x, int y, int x_offset, int y_offset, int color)
 {
 	// put lines between two pixels twice. once for y positive, the other for y negative (symmetry)
 	// for every iteration in fill_ellipse



From kirilla at mail.berlios.de  Mon Aug 10 21:21:39 2009
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Mon, 10 Aug 2009 21:21:39 +0200
Subject: [Haiku-commits] r32232 - haiku/trunk/src/apps/screenshot
Message-ID: <200908101921.n7AJLd9Y031291@sheep.berlios.de>

Author: kirilla
Date: 2009-08-10 21:21:39 +0200 (Mon, 10 Aug 2009)
New Revision: 32232
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32232&view=rev

Modified:
   haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp
   haiku/trunk/src/apps/screenshot/ScreenshotWindow.h
Log:
Use BWindow TabFrame property to find where to apply transparency.

Modified: haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp
===================================================================
--- haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp	2009-08-10 18:46:52 UTC (rev 32231)
+++ haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp	2009-08-10 19:21:39 UTC (rev 32232)
@@ -30,6 +30,8 @@
 #include <NodeInfo.h>
 #include <Path.h>
 #include <RadioButton.h>
+#include <Region.h>
+#include <Roster.h>
 #include <Screen.h>
 #include <String.h>
 #include <StringView.h>
@@ -643,7 +645,7 @@
 		fScreenshot = new BBitmap(frame.OffsetToCopy(B_ORIGIN), B_RGBA32, true);
 		BScreen(this).ReadBitmap(fScreenshot, fIncludeMouse, &frame);
 		if (fIncludeBorder)
-			_MakeTabSpaceTransparent();
+			_MakeTabSpaceTransparent(&frame);
 	} else {
 		BScreen(this).GetBitmap(&fScreenshot, fIncludeMouse);
 	}
@@ -791,96 +793,88 @@
 
 
 void
-ScreenshotWindow::_MakeTabSpaceTransparent()
+ScreenshotWindow::_MakeTabSpaceTransparent(BRect* frame)
 {
+	if (!frame)
+		return;
+
 	if (fScreenshot->ColorSpace() != B_RGBA32)
 		return;
-		
-	if (fTabHeight == 0)
+
+	BRect fullFrame = *frame;
+
+	BMessage message;
+	BMessage reply;
+
+	app_info appInfo;
+	if (be_roster->GetActiveAppInfo(&appInfo) != B_OK)
 		return;
-	
-	// This method is fragile since it relies on the color scheme of the current
-	// window decorator. The code could be simplified a lot if there was a way
-	// to ask for, or to easily compute, the tab width of the target window.
-	
-	uint8* component = static_cast<uint8*>(fScreenshot->Bits());
-	int32 bytesPerRow = fScreenshot->BytesPerRow();
-	int32 pixelsPerRow = bytesPerRow / 4;
 
-	int32 tabHeight = static_cast<int32>(fTabHeight);
-	int32 tabStart = 0;
-	int32 tabEnd = 0;
-	bool foundTabStart = false;
-	bool foundTabEnd = false;
-	
-	// Find the top-left corner of the window tab, by color, and support
-	// this guess by following a one tab high column of pixels downwards.
-	for (int32 x = 0; x < pixelsPerRow; x++) {
-		if (component[0] == 152 && component[1] == 152 && component[2] == 152) {
-			foundTabStart = true;
-	
-			for (int32 y = 0; y < tabHeight; y++) {
-				component += bytesPerRow;
-				
-				if (!(component[0] == 152 && component[1] == 152
-					&& component[2] == 152)) {
-					foundTabStart = false;
-				}			
-			}			
-			component -= bytesPerRow * tabHeight;
-			
-			if (foundTabStart) {
-				tabStart = x;
-				break;
-			}
-		}
-		component += 4;
-	}
-	
-	component = static_cast<uint8*>(fScreenshot->Bits());
+	BMessenger messenger(appInfo.signature, appInfo.team);
+	if (!messenger.IsValid())
+		return;
 
-	// Find the top-right corner of the window tab.
-	for (int32 x = 0; x < pixelsPerRow; x++) {
-		if (component[0] == 108 && component[1] == 108 && component[2] == 108) {
-			foundTabEnd = true;
-	
-			for (int32 y = 0; y < tabHeight; y++) {
-				component += bytesPerRow;
-			
-				if (!(component[0] == 108 && component[1] == 108
-					&& component[2] == 108)) {
-					foundTabEnd = false;
-				}			
-			}			
-			component -= bytesPerRow * tabHeight;
-			
-			if (foundTabEnd) {
-				tabEnd = x;
+	bool foundActiveWindow = false;
+	int32 index = 0;
+
+	while (true) {
+		message.MakeEmpty();
+		message.what = B_GET_PROPERTY;
+		message.AddSpecifier("Active");
+		message.AddSpecifier("Window", index);
+
+		reply.MakeEmpty();
+		messenger.SendMessage(&message, &reply);
+
+		if (reply.what == B_MESSAGE_NOT_UNDERSTOOD)
+			break;
+
+		bool result;
+		if (reply.FindBool("result", &result) == B_OK) {
+			foundActiveWindow = result;
+
+			if (foundActiveWindow)
 				break;
-			}
 		}
-		component += 4;
+		index++;
 	}
-	
-	if (!foundTabEnd || !foundTabStart)
+
+	if (!foundActiveWindow)
 		return;
-	
-	if (tabStart > tabEnd)
+
+	message.MakeEmpty();
+	message.what = B_GET_PROPERTY;
+	message.AddSpecifier("TabFrame");
+	message.AddSpecifier("Window", index);
+	reply.MakeEmpty();
+	messenger.SendMessage(&message, &reply);
+
+	BRect tabFrame;
+	if (reply.FindRect("result", &tabFrame) != B_OK)
 		return;
 
-	BView view(fScreenshot->Bounds(), "bitmapView", B_FOLLOW_ALL_SIDES, 0);
+	if (!fullFrame.Contains(tabFrame))
+		return;
+
+	BRegion tabSpace(fullFrame);
+	fullFrame.OffsetBy(0, fTabHeight);
+	tabSpace.Exclude(fullFrame);
+	tabSpace.Exclude(tabFrame);
+	fullFrame.OffsetBy(0, -fTabHeight);
+	tabSpace.OffsetBy(-fullFrame.left, -fullFrame.top);
+	BScreen screen;
+	BRect screenFrame = screen.Frame();
+	tabSpace.OffsetBy(-screenFrame.left, -screenFrame.top);
+
+	BView view(fScreenshot->Bounds(), "bitmap", B_FOLLOW_ALL_SIDES, 0);
 	fScreenshot->AddChild(&view);
 	if(view.Looper() && view.Looper()->Lock()) {
 		view.SetDrawingMode(B_OP_COPY);
 		view.SetHighColor(B_TRANSPARENT_32_BIT);
 
-		if (tabStart > 0)
-			view.FillRect(BRect(0, 0, tabStart - 1, tabHeight - 1));
+		for (int i = 0; i < tabSpace.CountRects(); i++)
+			view.FillRect(tabSpace.RectAt(i));
 
-		if (tabEnd < pixelsPerRow - 1) {
-			view.FillRect(BRect(tabEnd + 1, 0, pixelsPerRow - 1,
-				tabHeight - 1));
-		}
 		view.Sync();
 		view.Looper()->Unlock();
 	}

Modified: haiku/trunk/src/apps/screenshot/ScreenshotWindow.h
===================================================================
--- haiku/trunk/src/apps/screenshot/ScreenshotWindow.h	2009-08-10 18:46:52 UTC (rev 32231)
+++ haiku/trunk/src/apps/screenshot/ScreenshotWindow.h	2009-08-10 19:21:39 UTC (rev 32232)
@@ -53,7 +53,7 @@
 
 			void			_TakeScreenshot();
 			status_t		_GetActiveWindowFrame(BRect* frame);
-			void			_MakeTabSpaceTransparent();
+			void			_MakeTabSpaceTransparent(BRect* frame);
 
 			status_t		_SaveScreenshot();
 			void			_SaveScreenshotSilent() const;



From jonas at kirilla.com  Mon Aug 10 21:40:15 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Mon, 10 Aug 2009 21:40:15 +0200 CEST
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <a4855ac50908100957p49ae0635yf2f7819fe29f151b@mail.gmail.com>
Message-ID: <34225589179-BeMail@kirilla>

Ryan Leavengood <leavengood at gmail.com> wrote:
> 2009/8/10 Jonas Sundstr?m <jonas at kirilla.com>:
> >
> > I can try that. Anyone started on it already?
> 
> No, go for it. My only other concern is I don't know if it is 
> possible
> to get a scriptable window reference with the information from the
> window_info used in ScreenshotWndow.cpp's _GetActiveWindowFrame()
> method. But I'll let you figure that out ;)

See r32232. I hope you guys don't mind me using the 
public API, with a little help from the frame already
calculated from window_info. Feel free to rewrite! :]

/Jonas.





From kirilla at mail.berlios.de  Mon Aug 10 21:41:02 2009
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Mon, 10 Aug 2009 21:41:02 +0200
Subject: [Haiku-commits] r32233 - haiku/trunk/src/kits/interface
Message-ID: <200908101941.n7AJf2YX000142@sheep.berlios.de>

Author: kirilla
Date: 2009-08-10 21:41:01 +0200 (Mon, 10 Aug 2009)
New Revision: 32233
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32233&view=rev

Modified:
   haiku/trunk/src/kits/interface/Window.cpp
Log:
Cleanup

Modified: haiku/trunk/src/kits/interface/Window.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Window.cpp	2009-08-10 19:21:39 UTC (rev 32232)
+++ haiku/trunk/src/kits/interface/Window.cpp	2009-08-10 19:41:01 UTC (rev 32233)
@@ -840,7 +840,7 @@
 				BMessage settings;
 				if (GetDecoratorSettings(&settings) == B_OK) {
 					BRect frame;
-					if(settings.FindRect("tab frame", &frame) == B_OK) {
+					if (settings.FindRect("tab frame", &frame) == B_OK) {
 						replyMsg.AddRect("result", frame);
 						handled = true;
 					}



From pulkomandy at mail.berlios.de  Mon Aug 10 21:52:38 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Mon, 10 Aug 2009 21:52:38 +0200
Subject: [Haiku-commits] r32234 -
	haiku/branches/components/gsoc-locale-kit/src/preferences/locale
Message-ID: <200908101952.n7AJqceD002136@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-10 21:52:37 +0200 (Mon, 10 Aug 2009)
New Revision: 32234
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32234&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
Log:
Locale preferences : cleanup, added some things, and a method to parse the ICU date format to fill in our preflet. Not really working yet.


Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-10 19:41:01 UTC (rev 32233)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-10 19:52:37 UTC (rev 32234)
@@ -92,6 +92,11 @@
 		bool InitiateDrag(BPoint point, int32 index, bool wasSelected);
 		void MouseMoved(BPoint where, uint32 transit, const BMessage *msg);
 		void MoveItems(BList& items, int32 index);
+		void AttachedToWindow()
+		{
+			BListView::AttachedToWindow();
+			ScrollToSelection();
+		}
 
 		void MessageReceived (BMessage* message)
 		{
@@ -345,7 +350,7 @@
 
 	BView *tab = new BView(TR("Language"), B_WILL_DRAW);
 	tab->SetViewColor(tabView->ViewColor());
-	tab->SetLayout(new BGroupLayout(B_VERTICAL, 10));
+	tab->SetLayout(new BGroupLayout(B_VERTICAL, 0));
 	tabView->AddTab(tab);
 
 	{
@@ -428,7 +433,7 @@
 
 	tab = new BView(TR("Country"), B_WILL_DRAW);
 	tab->SetViewColor(tabView->ViewColor());
-	tab->SetLayout(new BGroupLayout(B_VERTICAL, 10));
+	tab->SetLayout(new BGroupLayout(B_VERTICAL, 0));
 	tabView->AddTab(tab);
 
 	{
@@ -467,7 +472,7 @@
 		fTimeFormatSettings = 
 			new TimeFormatSettingsView(defaultCountry);
 
-		tab->AddChild(BGroupLayoutBuilder(B_HORIZONTAL,10)
+		tab->AddChild(BGroupLayoutBuilder(B_HORIZONTAL,5)
 			.Add(scrollView)
 			.Add(new BScrollView("advanced", fTimeFormatSettings, 0, 
 				false, true, B_NO_BORDER))

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-10 19:41:01 UTC (rev 32233)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-10 19:52:37 UTC (rev 32234)
@@ -8,6 +8,7 @@
 
 #include <Alert.h>
 #include <Box.h>
+#include <CheckBox.h>
 #include <Country.h>
 #include <GroupLayout.h>
 #include <GroupLayoutBuilder.h>
@@ -24,39 +25,71 @@
 #include <SeparatorView.h>
 #include <String.h>
 #include <StringView.h>
+#include <TextControl.h>
 #include <Window.h>
 
 
-void CreateDateMenu(BMenuField** field)
+BMessage*
+MenuMessage(const char* format, BMenuField* field)
 {
+	BMessage* msg = new BMessage('FRMT');
+	msg->AddPointer("dest",field);
+	msg->AddString("format",format);
+
+	return msg;
+}
+
+
+void
+CreateDateMenu(BMenuField** field)
+{
 	BMenu *menu = new BMenu("");
 	*field = new BMenuField("", menu);
-	BMessage* msg = new BMessage('FRMT');
-	msg->AddPointer("dest",*field);
 
 	BMenu* dayMenu = new BMenu("Day");
 	menu->AddItem(dayMenu);
-		dayMenu -> AddItem(new BMenuItem("d", msg));
-		dayMenu -> AddItem(new BMenuItem("D", msg));
-		dayMenu -> AddItem(new BMenuItem("e", msg));
-		dayMenu -> AddItem(new BMenuItem("E", msg));
-		dayMenu -> AddItem(new BMenuItem("F", msg));
-		dayMenu -> AddItem(new BMenuItem("g", msg));
-		dayMenu -> AddItem(new BMenuItem("c", msg));
+		dayMenu -> AddItem(new BMenuItem("day in month",
+			MenuMessage("d",*field)));
+		dayMenu -> AddItem(new BMenuItem("day in month (2 digits)",
+			MenuMessage("dd",*field)));
+		dayMenu -> AddItem(new BMenuItem("day in year",
+			MenuMessage("D",*field)));
+		dayMenu -> AddItem(new BMenuItem("day in year (2 digits)",
+			MenuMessage("DD",*field)));
+		dayMenu -> AddItem(new BMenuItem("day in year (3 digits)",
+			MenuMessage("DDD",*field)));
+		dayMenu -> AddItem(new BMenuItem("day of week",
+			MenuMessage("e",*field)));
+		dayMenu -> AddItem(new BMenuItem("day of week (short text)",
+			MenuMessage("eee",*field)));
+		dayMenu -> AddItem(new BMenuItem("day of week (full text)",
+			MenuMessage("eeee",*field)));
+		dayMenu -> AddItem(new BMenuItem("E",
+			MenuMessage("E",*field)));
+		dayMenu -> AddItem(new BMenuItem("day of week in month",
+			MenuMessage("F",*field)));
+		dayMenu -> AddItem(new BMenuItem("julian day",
+			MenuMessage("g",*field)));
+		//dayMenu -> AddItem(new BMenuItem("c", msg));
 	BMenu* monthMenu = new BMenu("Month");
 	menu->AddItem(monthMenu);
-		monthMenu -> AddItem(new BMenuItem("M", msg));
-		monthMenu -> AddItem(new BMenuItem("L", msg));
+		monthMenu -> AddItem(new BMenuItem("M",
+			MenuMessage("M",*field)));
+		monthMenu -> AddItem(new BMenuItem("L",
+			MenuMessage("L",*field)));
 	BMenu* yearMenu = new BMenu("Year");
 	menu->AddItem(yearMenu);
-		yearMenu -> AddItem(new BMenuItem("y", msg));
-		yearMenu -> AddItem(new BMenuItem("Y", msg));
-		yearMenu -> AddItem(new BMenuItem("u", msg));
+		yearMenu -> AddItem(new BMenuItem("y",
+			MenuMessage("y",*field)));
+		yearMenu -> AddItem(new BMenuItem("Y",
+			MenuMessage("Y",*field)));
+		yearMenu -> AddItem(new BMenuItem("u",
+			MenuMessage("u",*field)));
 }
 
 
 TimeFormatSettingsView::TimeFormatSettingsView(BCountry* country)
-	: BView("WindowsSettingsView", B_WILL_DRAW)
+	: BView("WindowsSettingsView", 0)
 	, fCountry(country)
 {
 	SetLayout(new BGroupLayout(B_HORIZONTAL));
@@ -67,10 +100,11 @@
 	//  Long format
 	fLongDateExampleView = new BStringView("", "");
 
-	CreateDateMenu(&fLongDateMenu[0]);
-	CreateDateMenu(&fLongDateMenu[1]);
-	CreateDateMenu(&fLongDateMenu[2]);
-	CreateDateMenu(&fLongDateMenu[3]);
+	for(int i = 0; i < 4; i++) {
+		CreateDateMenu(&fLongDateMenu[i]);
+		fLongDateSeparator[i] = new BTextControl("","","",
+			new BMessage(kSettingsContentsModified));
+	}
 
 	//  Short format
 	fShortDateExampleView = new BStringView("", "");
@@ -141,29 +175,50 @@
 	fShortTimeExampleView = new BStringView("", "");
 
 	// Numbers
+	BSeparatorView* numberHeader = new BSeparatorView("Numbers");
+
+	BTextControl* numberThousand = new BTextControl("","Thousand separator","",
+		new BMessage(kSettingsContentsModified));
+	BTextControl* numberDecimal = new BTextControl("","Decimal separator","",
+		new BMessage(kSettingsContentsModified));
+	// TODO number of decimal digits (spinbox ?)
+	BCheckBox* numberLeadingZero = new BCheckBox("","Leading 0",
+		new BMessage(kSettingsContentsModified));
+	BTextControl* numberList = new BTextControl("","List separator","",
+		new BMessage(kSettingsContentsModified));
+	// Unit system (US/Metric) (radio)
+
 	// Currency
+	BSeparatorView* currencyHeader = new BSeparatorView("Currency");
 
 	_UpdateExamples();
+	_ParseDateFormat();
 
-	AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)
+	AddChild(BGroupLayoutBuilder(B_VERTICAL, 5)
 		.Add(dateHeader)
-		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 3)
 			.Add(new BStringView("","Long format:"))
 			.Add(fLongDateExampleView)
 			.AddGlue()
 		)
-		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 3)
 			.Add(fLongDateMenu[0])
+			.Add(fLongDateSeparator[0])
 			.Add(fLongDateMenu[1])
+			.Add(fLongDateSeparator[1])
+		)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 3)
 			.Add(fLongDateMenu[2])
+			.Add(fLongDateSeparator[2])
 			.Add(fLongDateMenu[3])
+			.Add(fLongDateSeparator[3])
 		)
-		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 3)
 			.Add(new BStringView("","Short format:"))
 			.Add(fShortDateExampleView)
 			.AddGlue()
 		)
-		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 3)
 			.Add(fDateMenu[0])
 			.Add(fDateMenu[1])
 			.Add(fDateMenu[2])
@@ -174,13 +229,74 @@
 		.Add(fLongTimeExampleView)
 		.Add(fShortTimeExampleView)
 		.Add(clockBox)
+
+		.Add(numberHeader)
+		.Add(numberThousand)
+		.Add(numberDecimal)
+		.Add(numberLeadingZero)
+		.Add(numberList)
+
+		.Add(currencyHeader)
 		.AddGlue()
 		.SetInsets(5,5,5,5)
 	);
 }
 
 
+bool IsSpecialDateChar(char charToTest)
+{
+	static const char* specials = "dDeEFgMLyYu";
+	for(int i = 0; i < 11; i++)
+		if (charToTest == specials[i])
+			return true;
+	return false;
+}
+
+
+// Get the date format from ICU and set the date fields accordingly
 void
+TimeFormatSettingsView::_ParseDateFormat()
+{
+	const char* dateFormat = fCountry->DateFormat(true);
+
+	// Travel trough the string and parse it
+	const char* parsePointer = dateFormat;
+	const char* fieldBegin = dateFormat;
+
+	for(int i = 0; i < 4; i++)
+	{
+		fieldBegin = parsePointer;
+		while( *parsePointer == *(parsePointer+1)) parsePointer++ ;
+		parsePointer++;
+		if(fieldBegin < parsePointer)
+		{
+			BString str;
+			str.Append(fieldBegin, parsePointer - fieldBegin);
+			fLongDateMenu[i]->MenuItem()->SetLabel(str);
+		}
+		if (*parsePointer == '\0') break;
+
+		fieldBegin = parsePointer;
+		while((!IsSpecialDateChar(*parsePointer)) && *parsePointer != '\0') {
+			if (*parsePointer == '\'') {
+				parsePointer++;
+				while (*parsePointer != '\'') parsePointer++;
+			}
+			parsePointer++;
+		}
+		if(fieldBegin < parsePointer)
+		{
+			BString str;
+			str.Append(fieldBegin, parsePointer - fieldBegin);
+			fLongDateSeparator[i]->SetText(str);
+		}
+		if (*parsePointer == '\0') break;
+
+	}
+}
+
+
+void
 TimeFormatSettingsView::AttachedToWindow()
 {
 	f24HrRadioButton->SetTarget(this);
@@ -192,10 +308,12 @@
 		fLongDateMenu[j]->Menu()->SubmenuAt(i)->SetTargetForItems(this);
 	fSeparatorMenuField->Menu()->SetTargetForItems(this);
 
+	/*
 	static_cast<BScrollView*>(Parent())->ScrollBar(B_VERTICAL)->SetRange(
 		0, Bounds().Height());
+	*/
 	static_cast<BScrollView*>(Parent())->ScrollBar(B_VERTICAL)->SetProportion(
-		Bounds().Height() / Parent()->Bounds().Height());
+		Parent()->Bounds().Height() / Bounds().Height());
 }
 
 
@@ -207,14 +325,13 @@
 		{
 			// Update one of the dropdown menus
 			void* pointerFromMessage;
-			message->FindPointer("source",&pointerFromMessage);
-			BMenuItem* selectedItem =
-				static_cast<BMenuItem*>(pointerFromMessage);
 			message->FindPointer("dest",&pointerFromMessage);
 			BMenuField* menuField =
 				static_cast<BMenuField*>(pointerFromMessage);
+			BString format;
+			message->FindString("format",&format);
 
-			menuField->MenuItem()->SetLabel(selectedItem->Label());
+			menuField->MenuItem()->SetLabel(format);
 		}
 		// pass trough
 		case kSettingsContentsModified:
@@ -327,27 +444,13 @@
 	f24HrRadioButton->SetValue(settings.ClockIs24Hr());
 	f12HrRadioButton->SetValue(!settings.ClockIs24Hr());
 
-	switch (settings.DateOrderFormat()) {
-		case kYMDFormat:
-			fYMDRadioButton->SetValue(1);
-			break;
-
-		case kMDYFormat:
-			fMDYRadioButton->SetValue(1);
-			break;
-
-		default:
-		case kDMYFormat:
-			fDMYRadioButton->SetValue(1);
-			break;
-	}
-
 	FormatSeparator separator = settings.TimeFormatSeparator();
 
 	if (separator >= kNoSeparator && separator < kSeparatorsEnd)
 		fSeparatorMenuField->Menu()->ItemAt((int32)separator)->SetMarked(true);
 	*/
 	_UpdateExamples();
+	_ParseDateFormat();
 }
 
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-10 19:41:01 UTC (rev 32233)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-10 19:52:37 UTC (rev 32234)
@@ -17,6 +17,7 @@
 class BMessage;
 class BRadioButton;
 class BStringView;
+class BTextControl;
 
 
 enum FormatSeparator {
@@ -49,11 +50,13 @@
 	private:
 		void _UpdateExamples();
 		void _SendNotices();
+		void _ParseDateFormat();
 
 		BRadioButton *f24HrRadioButton;
 		BRadioButton *f12HrRadioButton;
 
 		BMenuField *fLongDateMenu[4];
+		BTextControl* fLongDateSeparator[5];
 		BMenuField *fDateMenu[3];
 
 		BMenuField *fSeparatorMenuField;



From leavengood at gmail.com  Mon Aug 10 22:04:37 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Mon, 10 Aug 2009 16:04:37 -0400
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <34225589179-BeMail@kirilla>
References: <a4855ac50908100957p49ae0635yf2f7819fe29f151b@mail.gmail.com>
	<34225589179-BeMail@kirilla>
Message-ID: <a4855ac50908101304k72649fb1wd46542975612f26@mail.gmail.com>

2009/8/10 Jonas Sundstr?m <jonas at kirilla.com>:
>
> See r32232. I hope you guys don't mind me using the
> public API, with a little help from the frame already
> calculated from window_info. Feel free to rewrite! :]

No much better, that is great! Even in Haiku apps residing in our repo
I think we should avoid private APIs. Good job.

In fact if possible it might be nice to completely remove the use of
the private APIs in Screenshot, which based on your code should be
possible, right?

You can get the active app with BRoster, then you can query that to
find the active window (as you already do.) Then you can query the
active window for its Frame and TabFrame, right?

-- 
Regards,
Ryan


From bgroff at mail.berlios.de  Tue Aug 11 00:28:49 2009
From: bgroff at mail.berlios.de (bgroff at BerliOS)
Date: Tue, 11 Aug 2009 00:28:49 +0200
Subject: [Haiku-commits] r32235 - in haiku/trunk: headers/os/drivers
	src/add-ons/disk_systems/intel
	src/add-ons/kernel/partitioning_systems/intel
	src/system/kernel/disk_device_manager
Message-ID: <200908102228.n7AMSnB0017812@sheep.berlios.de>

Author: bgroff
Date: 2009-08-11 00:28:47 +0200 (Tue, 11 Aug 2009)
New Revision: 32235
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32235&view=rev

Modified:
   haiku/trunk/headers/os/drivers/disk_device_manager.h
   haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp
   haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.h
   haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
   haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h
   haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
   haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMapWriter.cpp
   haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMapWriter.h
   haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp
   haiku/trunk/src/system/kernel/disk_device_manager/disk_device_manager.cpp
Log:
* Added open_partition to disk_device_manager
* Rewrote PartitionMapWriter
* Updated style to match current style guide for the intel partitioning system.


Modified: haiku/trunk/headers/os/drivers/disk_device_manager.h
===================================================================
--- haiku/trunk/headers/os/drivers/disk_device_manager.h	2009-08-10 19:52:37 UTC (rev 32234)
+++ haiku/trunk/headers/os/drivers/disk_device_manager.h	2009-08-10 22:28:47 UTC (rev 32235)
@@ -101,6 +101,8 @@
 partition_data *get_parent_partition(partition_id partitionID);
 partition_data *get_child_partition(partition_id partitionID, int32 index);
 
+int open_partition(partition_id partitionID, int openMode);
+
 // partition write access
 // (write lock required)
 partition_data *create_child_partition(partition_id partitionID, int32 index,

Modified: haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp	2009-08-10 19:52:37 UTC (rev 32234)
+++ haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp	2009-08-10 22:28:47 UTC (rev 32235)
@@ -36,7 +36,7 @@
 //	| B_DISK_SYSTEM_SUPPORTS_MOVING
 //	| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME
 //	| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS
-	| B_DISK_SYSTEM_SUPPORTS_INITIALIZING
+//	| B_DISK_SYSTEM_SUPPORTS_INITIALIZING
 //	| B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME
 
 //	| B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD
@@ -92,7 +92,7 @@
 ExtendedPartitionAddOn::CanInitialize(const BMutablePartition* partition)
 {
 	// If it's big enough, we can initialize it.
-	return partition->Size() >= 2 * partition->BlockSize();
+	return false;
 }
 
 
@@ -222,7 +222,7 @@
 uint32
 ExtendedPartitionHandle::SupportedOperations(uint32 mask)
 {
-	uint32 flags = B_DISK_SYSTEM_SUPPORTS_INITIALIZING;
+	uint32 flags = 0;//B_DISK_SYSTEM_SUPPORTS_INITIALIZING;
 
 	// creating child
 	if (mask & B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD) {
@@ -254,10 +254,25 @@
 	TRACE("%p->ExtendedPartitionHandle::GetNextSupportedType(child: %p, "
 		"cookie: %ld)\n", this, child, *cookie);
 
-	if (*cookie != 0)
+	int32 index = *cookie;
+	const partition_type* nextType;
+	PartitionMap partitionMap;
+	while (true) {
+		nextType = partitionMap.GetNextSupportedPartitionType(index);
+		if (nextType == NULL)
+			return B_ENTRY_NOT_FOUND;
+		index++;
+		if (nextType->used
+			&& strcmp(nextType->name, kPartitionTypeIntelExtended) != 0)
+			break;
+	}
+
+	if (!nextType)
 		return B_ENTRY_NOT_FOUND;
-	*cookie = *cookie + 1;
-	*type = kPartitionTypeIntelLogical;
+
+	type->SetTo(nextType->name);
+	*cookie = index;
+
 	return B_OK;
 }
 
@@ -266,39 +281,22 @@
 status_t
 ExtendedPartitionHandle::GetPartitioningInfo(BPartitioningInfo* info)
 {
-	// NOTE stippi: At first I tried to use the fPrimaryPartition
-	// here but it does not return any LogicalPartitions. What
-	// happens now is probably what used to happen before, though
-	// I don't understand *where*, since this handle type never
-	// implemented this virtual function.
-
 	// init to the full size (minus the first sector)
 	BMutablePartition* partition = Partition();
-	off_t offset = partition->Offset();// + SECTOR_SIZE;
-	off_t size = partition->Size();//- SECTOR_SIZE;
+	off_t offset = partition->Offset();
+	off_t size = partition->Size();
 	status_t error = info->SetTo(offset, size);
 	if (error != B_OK)
 		return error;
 
 	// exclude the space of the existing logical partitions
 	int32 count = partition->CountChildren();
-printf("%ld logical partitions\n", count);
 	for (int32 i = 0; i < count; i++) {
 		BMutablePartition* child = partition->ChildAt(i);
-		// TODO: Does this correctly account for the partition table
-		// sectors? Preceeding each logical partition should be a
-		// sector for the partition table entry. Those entries form
-		// the linked list of "inner extended partition" + "real partition"
-		// Following the logic above (copied from PartitionMapAddOn),
-		// the outer size includes the first sector and is therefor
-		// what we need here.
 		error = info->ExcludeOccupiedSpace(child->Offset(), child->Size());
-printf("  %ld: offset = %lld (relative: %lld), size = %lld\n", i,
-child->Offset(), child->Offset() - offset, child->Size());
 		if (error != B_OK)
 			return error;
 	}
-info->PrintToStream();
 
 	return B_OK;
 }
@@ -309,7 +307,6 @@
 ExtendedPartitionHandle::GetChildCreationParameterEditor(const char* type,
 	BPartitionParameterEditor** editor)
 {
-	// TODO: We actually need an editor here.
 	*editor = NULL;
 	return B_OK;
 }
@@ -321,102 +318,98 @@
 	const char* typeString, BString* name, const char* parameters)
 {
 	// check type
-	if (!typeString || strcmp(typeString, kPartitionTypeIntelLogical) != 0)
+	if (!typeString)
 		return B_BAD_VALUE;
 
 	// check name
 	if (name)
 		name->Truncate(0);
 
-	// check parameters
-	// TODO:...
+	// check the free space situation
+	BPartitioningInfo info;
+	status_t error = GetPartitioningInfo(&info);
+	if (error != B_OK)
+		return error;
 
-return B_NOT_SUPPORTED;
-//	// check the free space situation
-//	BPartitioningInfo info;
-//	status_t error = GetPartitioningInfo(&info);
-//	if (error != B_OK)
-//		return error;
-//
-//	// any space in the partition at all?
-//	int32 spacesCount = info.CountPartitionableSpaces();
-//	if (spacesCount == 0)
-//		return B_BAD_VALUE;
-//
-//	// check offset and size
-//	off_t offset = sector_align(*_offset);
-//	off_t size = sector_align(*_size);
-//		// TODO: Rather round size up?
-//	off_t end = offset + size;
-//
-//	// get the first partitionable space the requested interval intersects with
-//	int32 spaceIndex = -1;
-//	int32 closestSpaceIndex = -1;
-//	off_t closestSpaceDistance = 0;
-//	for (int32 i = 0; i < spacesCount; i++) {
-//		off_t spaceOffset, spaceSize;
-//		info.GetPartitionableSpaceAt(i, &spaceOffset, &spaceSize);
-//		off_t spaceEnd = spaceOffset + spaceSize;
-//
-//		if (spaceOffset >= offset && spaceOffset < end
-//			|| offset >= spaceOffset && offset < spaceEnd) {
-//			spaceIndex = i;
-//			break;
-//		}
-//
-//		off_t distance;
-//		if (offset < spaceOffset)
-//			distance = spaceOffset - end;
-//		else
-//			distance = spaceEnd - offset;
-//
-//		if (closestSpaceIndex == -1 || distance < closestSpaceDistance) {
-//			closestSpaceIndex = i;
-//			closestSpaceDistance = distance;
-//		}
-//	}
-//
-//	// get the space we found
-//	off_t spaceOffset, spaceSize;
-//	info.GetPartitionableSpaceAt(
-//		spaceIndex >= 0 ? spaceIndex : closestSpaceIndex, &spaceOffset,
-//		&spaceSize);
-//	off_t spaceEnd = spaceOffset + spaceSize;
-//
-//	// If the requested intervald doesn't intersect with any space yet, move
-//	// it, so that it does.
-//	if (spaceIndex < 0) {
-//		spaceIndex = closestSpaceIndex;
-//		if (offset < spaceOffset) {
-//			offset = spaceOffset;
-//			end = offset + size;
-//		} else {
-//			end = spaceEnd;
-//			offset = end - size;
-//		}
-//	}
-//
-//	// move/shrink the interval, so that it fully lies within the space
-//	if (offset < spaceOffset) {
-//		offset = spaceOffset;
-//		end = offset + size;
-//		if (end > spaceEnd) {
-//			end = spaceEnd;
-//			size = end - offset;
-//		}
-//	} else if (end > spaceEnd) {
-//		end = spaceEnd;
-//		offset = end - size;
-//		if (offset < spaceOffset) {
-//			offset = spaceOffset;
-//			size = end - offset;
-//		}
-//	}
-//
-//	*_offset = offset;
-//	*_size = size;
-//
-//	return B_OK;
+	// any space in the partition at all?
+	int32 spacesCount = info.CountPartitionableSpaces();
+	if (spacesCount == 0)
+		return B_BAD_VALUE;
+
+	// check offset and size
+	off_t offset = sector_align(*_offset, Partition()->BlockSize());
+	off_t size = sector_align(*_size, Partition()->BlockSize());
+		// TODO: Rather round size up?
+	off_t end = offset + size;
+
+	// get the first partitionable space the requested interval intersects with
+	int32 spaceIndex = -1;
+	int32 closestSpaceIndex = -1;
+	off_t closestSpaceDistance = 0;
+	for (int32 i = 0; i < spacesCount; i++) {
+		off_t spaceOffset, spaceSize;
+		info.GetPartitionableSpaceAt(i, &spaceOffset, &spaceSize);
+		off_t spaceEnd = spaceOffset + spaceSize;
+
+		if (spaceOffset >= offset && spaceOffset < end
+			|| offset >= spaceOffset && offset < spaceEnd) {
+			spaceIndex = i;
+			break;
+		}
+
+		off_t distance;
+		if (offset < spaceOffset)
+			distance = spaceOffset - end;
+		else
+			distance = spaceEnd - offset;
+
+		if (closestSpaceIndex == -1 || distance < closestSpaceDistance) {
+			closestSpaceIndex = i;
+			closestSpaceDistance = distance;
+		}
+	}
+
+	// get the space we found
+	off_t spaceOffset, spaceSize;
+	info.GetPartitionableSpaceAt(
+		spaceIndex >= 0 ? spaceIndex : closestSpaceIndex, &spaceOffset,
+		&spaceSize);
+	off_t spaceEnd = spaceOffset + spaceSize;
+
+	// If the requested intervald doesn't intersect with any space yet, move
+	// it, so that it does.
+	if (spaceIndex < 0) {
+		spaceIndex = closestSpaceIndex;
+		if (offset < spaceOffset) {
+			offset = spaceOffset;
+			end = offset + size;
+		} else {
+			end = spaceEnd;
+			offset = end - size;
+		}
+	}
+
+	// move/shrink the interval, so that it fully lies within the space
+	if (offset < spaceOffset) {
+		offset = spaceOffset;
+		end = offset + size;
+		if (end > spaceEnd) {
+			end = spaceEnd;
+			size = end - offset;
+		}
+	} else if (end > spaceEnd) {
+		end = spaceEnd;
+		offset = end - size;
+		if (offset < spaceOffset) {
+			offset = spaceOffset;
+			size = end - offset;
+		}
+	}
+
+	*_offset = offset;
+	*_size = size;
+
+	return B_OK;
 }
 
 
@@ -427,73 +420,69 @@
 	BMutablePartition** _child)
 {
 	// check type
-	if (!typeString || strcmp(typeString, kPartitionTypeIntelLogical) != 0)
+	PartitionType type;
+	if (!type.SetType(typeString) || type.IsEmpty())
 		return B_BAD_VALUE;
 
 	// check name
 	if (name && strlen(name) > 0)
 		return B_BAD_VALUE;
 
-	// check parameters
-	// TODO:...
+	// offset properly aligned?
+	if (offset != sector_align(offset, Partition()->BlockSize())
+		|| size != sector_align(size, Partition()->BlockSize()))
+		return B_BAD_VALUE;
 
-return B_NOT_SUPPORTED;
-//	// offset properly aligned?
-//	if (offset != sector_align(offset) || size != sector_align(size))
-//		return B_BAD_VALUE;
-//
-//	// check the free space situation
-//	BPartitioningInfo info;
-//	status_t error = GetPartitioningInfo(&info);
-//	if (error != B_OK)
-//		return error;
-//
-//	bool foundSpace = false;
-//	off_t end = offset + size;
-//	int32 spacesCount = info.CountPartitionableSpaces();
-//	for (int32 i = 0; i < spacesCount; i++) {
-//		off_t spaceOffset, spaceSize;
-//		info.GetPartitionableSpaceAt(i, &spaceOffset, &spaceSize);
-//		off_t spaceEnd = spaceOffset + spaceSize;
-//
-//		if (offset >= spaceOffset && end <= spaceEnd) {
-//			foundSpace = true;
-//			break;
-//		}
-//	}
-//
-//	if (!foundSpace)
-//		return B_BAD_VALUE;
-//
-//	// everything looks good, do it
-//
-//	// create the child
-//	// (Note: the primary partition index is indeed the child index, since
-//	// we picked the first empty primary partition.)
-//	BMutablePartition* partition = Partition();
-//	BMutablePartition* child;
-//	error = partition->CreateChild(primary->Index(), typeString, NULL,
-//		parameters, &child);
-//	if (error != B_OK)
-//		return error;
-//
-//	// init the child
-//	child->SetOffset(offset);
-//	child->SetSize(size);
-//	child->SetBlockSize(SECTOR_SIZE);
-//	//child->SetFlags(0);
-//	child->SetChildCookie(primary);
-//
-//	// init the primary partition
-//	bool active = false;
-//		// TODO: Get from parameters!
-//	primary->SetTo(offset, size, type.Type(), active);
-//
-//// TODO: If the child is an extended partition, we should trigger its
-//// initialization.
-//
-//	*_child = child;
-//	return B_OK;
+	// check the free space situation
+	BPartitioningInfo info;
+	status_t error = GetPartitioningInfo(&info);
+	if (error != B_OK)
+		return error;
+
+	bool foundSpace = false;
+	off_t end = offset + size;
+	int32 spacesCount = info.CountPartitionableSpaces();
+	for (int32 i = 0; i < spacesCount; i++) {
+		off_t spaceOffset, spaceSize;
+		info.GetPartitionableSpaceAt(i, &spaceOffset, &spaceSize);
+		off_t spaceEnd = spaceOffset + spaceSize;
+
+		if (offset >= spaceOffset && end <= spaceEnd) {
+			foundSpace = true;
+			break;
+		}
+	}
+
+	if (!foundSpace)
+		return B_BAD_VALUE;
+
+	// everything looks good, do it
+	// create the child
+	BMutablePartition* child;
+	error = Partition()->CreateChild(-1, typeString,
+		NULL, parameters, &child);
+	if (error != B_OK)
+		return error;
+
+	// init the child
+	child->SetOffset(offset);
+	child->SetSize(size);
+	child->SetBlockSize(Partition()->BlockSize());
+	//child->SetFlags(0);
+	child->SetChildCookie(Partition());
+
+	*_child = child;
+	return B_OK;
 }
 
 
+// DeleteChild
+status_t
+ExtendedPartitionHandle::DeleteChild(BMutablePartition* child)
+{
+	BMutablePartition* parent = child->Parent();
+	status_t error = parent->DeleteChild(child);
+
+	return error;
+}
+

Modified: haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.h
===================================================================
--- haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.h	2009-08-10 19:52:37 UTC (rev 32234)
+++ haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.h	2009-08-10 22:28:47 UTC (rev 32235)
@@ -62,6 +62,8 @@
 									const char* type, const char* name,
 									const char* parameters,
 									BMutablePartition** child);
+	virtual status_t			DeleteChild(BMutablePartition* child);
+
 private:
 			PrimaryPartition*	fPrimaryPartition;
 };

Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp	2009-08-10 19:52:37 UTC (rev 32234)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp	2009-08-10 22:28:47 UTC (rev 32235)
@@ -166,13 +166,13 @@
 		int32 upper = count - 1;
 		while (lower < upper) {
 			int32 mid = (lower + upper) / 2;
-			const Partition *midPartition = partitions[mid];
+			const Partition* midPartition = partitions[mid];
 			if (location >= midPartition->Offset() + midPartition->Size())
 				lower = mid + 1;
 			else
 				upper = mid;
 		}
-		const Partition *partition = partitions[lower];
+		const Partition* partition = partitions[lower];
 		result = (location >= partition->Offset() &&
 				  location < partition->Offset() + partition->Size());
 	}
@@ -207,7 +207,7 @@
 	\param typeName Name of the partition type.
 */
 bool
-PartitionType::SetType(const char *typeName)
+PartitionType::SetType(const char* typeName)
 {
 	for (int32 i = 0; kPartitionTypes[i].name ; i++) {
 		if (!strcmp(typeName, kPartitionTypes[i].name)) {
@@ -237,7 +237,7 @@
 	\param content_type Name of the content type, it is standardized by system.
 */
 bool
-PartitionType::SetContentType(const char *contentType)
+PartitionType::SetContentType(const char* contentType)
 {
 	for (int32 i = 0; kPartitionContentTypes[i].name ; i++) {
 		if (!strcmp(contentType, kPartitionContentTypes[i].name)) {
@@ -319,7 +319,7 @@
 
 
 void
-Partition::SetTo(const partition_descriptor *descriptor, off_t tableOffset,
+Partition::SetTo(const partition_descriptor* descriptor, off_t tableOffset,
 	off_t baseOffset, uint32 blockSize)
 {
 	TRACE(("Partition::SetTo(): active: %x\n", descriptor->active));
@@ -356,19 +356,6 @@
 }
 
 
-void
-Partition::GetPartitionDescriptor(partition_descriptor *descriptor,
-	off_t baseOffset) const
-{
-	descriptor->start = (fOffset - baseOffset) / fBlockSize;
-	descriptor->size = fSize / fBlockSize;
-	descriptor->type = fType;
-	descriptor->active = fActive ? 0x80 : 0x00;
-	descriptor->begin.Unset();
-	descriptor->end.Unset();
-}
-
-
 #ifdef _BOOT_MODE
 void
 Partition::AdjustSize(off_t sessionSize)
@@ -389,7 +376,8 @@
 	// lie within the session
 	if (fPartitionTableOffset % fBlockSize != 0) {
 		TRACE(("Partition::CheckLocation() - bad partition table offset: %lld "
-			"(session: %lld)\n", fPartitionTableOffset, sessionSize));
+			"(session: %lld), (fBlockSize: %ld)\n", fPartitionTableOffset,
+			sessionSize, fBlockSize));
 		return false;
 	}
 	if (fOffset % fBlockSize != 0) {
@@ -426,7 +414,8 @@
 
 
 PrimaryPartition::PrimaryPartition()
-	: Partition(),
+	:
+	Partition(),
 	fHead(NULL),
 	fTail(NULL),
 	fLogicalPartitionCount(0)
@@ -455,7 +444,7 @@
 void
 PrimaryPartition::Unset()
 {
-	while (LogicalPartition *partition = fHead) {
+	while (LogicalPartition* partition = fHead) {
 		fHead = partition->Next();
 		delete partition;
 	}
@@ -470,13 +459,13 @@
 PrimaryPartition::Assign(const PrimaryPartition& other)
 {
 	partition_descriptor descriptor;
-	other.GetPartitionDescriptor(&descriptor, 0);
+	other.GetPartitionDescriptor(&descriptor);
 	SetTo(&descriptor, 0, other.BlockSize());
 
 	const LogicalPartition* otherLogical = other.fHead;
 	while (otherLogical) {
 		off_t tableOffset = otherLogical->PartitionTableOffset();
-		otherLogical->GetPartitionDescriptor(&descriptor, tableOffset);
+		otherLogical->GetPartitionDescriptor(&descriptor);
 
 		LogicalPartition* logical = new(nothrow) LogicalPartition(
 			&descriptor, tableOffset, this);
@@ -492,10 +481,26 @@
 }
 
 
+void
+PrimaryPartition::GetPartitionDescriptor(partition_descriptor* descriptor) const
+{
+	if (IsEmpty()) {
+		memset(descriptor, 0, sizeof(partition_descriptor));
+	} else {
+		descriptor->start = Offset() / BlockSize();
+		descriptor->size = Size() / BlockSize();
+		descriptor->type = Type();
+		descriptor->active = Active() ? 0x80 : 0x00;
+		descriptor->begin.Unset();
+		descriptor->end.Unset();
+	}
+}
+
+
 LogicalPartition*
 PrimaryPartition::LogicalPartitionAt(int32 index) const
 {
-	LogicalPartition *partition = NULL;
+	LogicalPartition* partition = NULL;
 	if (index >= 0 && index < fLogicalPartitionCount) {
 		for (partition = fHead; index > 0; index--)
 			partition = partition->Next();
@@ -530,8 +535,8 @@
 	if (!partition || partition->GetPrimaryPartition() != this)
 		return;
 
-	LogicalPartition *prev = partition->Previous();
-	LogicalPartition *next = partition->Next();
+	LogicalPartition* prev = partition->Previous();
+	LogicalPartition* next = partition->Next();
 
 	if (prev)
 		prev->SetNext(next);
@@ -554,7 +559,8 @@
 
 
 LogicalPartition::LogicalPartition()
-	: Partition(),
+	:
+	Partition(),
 	fPrimary(NULL),
 	fNext(NULL),
 	fPrevious(NULL)
@@ -564,7 +570,8 @@
 
 LogicalPartition::LogicalPartition(const partition_descriptor* descriptor,
 		off_t tableOffset, PrimaryPartition* primary)
-	: Partition(),
+	:
+	Partition(),
 	fPrimary(NULL),
 	fNext(NULL),
 	fPrevious(NULL)
@@ -601,7 +608,7 @@
 
 void
 LogicalPartition::SetTo(off_t offset, off_t size, uint8 type, bool active,
-	off_t tableOffset, PrimaryPartition *primary)
+	off_t tableOffset, PrimaryPartition* primary)
 {
 	Unset();
 	if (primary) {
@@ -622,6 +629,27 @@
 }
 
 
+void
+LogicalPartition::GetPartitionDescriptor(partition_descriptor* descriptor,
+	bool inner) const
+{
+	PrimaryPartition* primary = GetPrimaryPartition();
+	if (inner) {
+		descriptor->start = (PartitionTableOffset() - primary->Offset())
+			/ BlockSize();
+		descriptor->type = primary->Type();
+	} else {
+		descriptor->start = (Offset() - PartitionTableOffset()) / BlockSize();
+		descriptor->type = Type();
+	}
+
+	descriptor->size = Size() / BlockSize();
+	descriptor->active = 0x00;
+	descriptor->begin.Unset();
+	descriptor->end.Unset();
+}
+
+
 //	#pragma mark - PartitionMap
 
 
@@ -661,7 +689,7 @@
 PrimaryPartition*
 PartitionMap::PrimaryPartitionAt(int32 index)
 {
-	PrimaryPartition *partition = NULL;
+	PrimaryPartition* partition = NULL;
 	if (index >= 0 && index < 4)
 		partition = fPrimaries + index;
 	return partition;
@@ -671,7 +699,7 @@
 const PrimaryPartition*
 PartitionMap::PrimaryPartitionAt(int32 index) const
 {
-	const PrimaryPartition *partition = NULL;
+	const PrimaryPartition* partition = NULL;
 	if (index >= 0 && index < 4)
 		partition = fPrimaries + index;
 	return partition;
@@ -729,7 +757,7 @@
 Partition*
 PartitionMap::PartitionAt(int32 index)
 {
-	Partition *partition = NULL;
+	Partition* partition = NULL;
 	int32 count = CountPartitions();
 	if (index >= 0 && index < count) {
 		if (index < 4)
@@ -776,7 +804,7 @@
 		int32 tableOffsetCount = 1;	// primary partition table
 		tableOffsets[0] = 0;			//
 		for (int32 i = 0; i < partitionCount; i++) {
-			const Partition *partition = PartitionAt(i);
+			const Partition* partition = PartitionAt(i);
 			if (!partition->IsExtended())
 				byOffset[byOffsetCount++] = partition;
 
@@ -795,7 +823,7 @@
 		// check for overlappings
 		off_t nextOffset = 0;
 		for (int32 i = 0; i < byOffsetCount; i++) {
-			const Partition *partition = byOffset[i];
+			const Partition* partition = byOffset[i];
 			if (partition->Offset() < nextOffset) {
 				TRACE(("intel: PartitionMap::Check(): overlapping partitions!"
 					"\n"));

Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h	2009-08-10 19:52:37 UTC (rev 32234)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h	2009-08-10 22:28:47 UTC (rev 32235)
@@ -31,7 +31,7 @@
 // partition_type
 struct partition_type {
 	uint8		type;
-	const char	*name;
+	const char*	name;
 	bool		used;
 };
 
@@ -54,13 +54,13 @@
 
 // fill_buffer
 static inline void
-fill_buffer(char *buffer, uint32 length, char ch)
+fill_buffer(char* buffer, uint32 length, char ch)
 {
 	for (uint32 i = 0; i < length; i++)
 		buffer[i] = ch;
 }
 
-void get_partition_type_string(uint8 type, char *buffer);
+void get_partition_type_string(uint8 type, char* buffer);
 
 // chs
 // NOTE: The CHS cannot express locations within larger disks and is therefor
@@ -113,8 +113,8 @@
 	PartitionType();
 
 	bool SetType(uint8 type);
-	bool SetType(const char *typeName);
-	bool SetContentType(const char *contentType);
+	bool SetType(const char* typeName);
+	bool SetContentType(const char* contentType);
 
 	bool IsValid() const	{ return fValid; }
 	bool IsEmpty() const	{ return is_empty_type(fType); }
@@ -122,7 +122,7 @@
 
 	uint8 Type() const		{ return fType; }
 	bool FindNext();
-	void GetTypeString(char *buffer) const
+	void GetTypeString(char* buffer) const
 		{ get_partition_type_string(fType, buffer); }
 private:
 	uint8	fType;
@@ -167,11 +167,8 @@
 			uint8				Type() const		{ return fType; }
 			bool				Active() const		{ return fActive; }
 			uint32				BlockSize() const	{ return fBlockSize; }
-			void				GetTypeString(char *buffer) const
+			void				GetTypeString(char* buffer) const
 									{ get_partition_type_string(fType, buffer); }
-			void				GetPartitionDescriptor(
-									partition_descriptor* descriptor,
-									off_t baseOffset) const;
 
 			void				SetPartitionTableOffset(off_t offset)
 									{ fPartitionTableOffset = offset; }
@@ -183,6 +180,8 @@
 									{ fType = type; }
 			void				SetActive(bool active)
 									{ fActive = active; }
+			void				SetBlockSize(uint32 blockSize)
+									{ fBlockSize = blockSize; }
 
 			bool				CheckLocation(off_t sessionSize) const;
 #ifdef _BOOT_MODE
@@ -215,6 +214,9 @@
 
 			int32				Index() const			{ return fIndex; }
 			void				SetIndex(int32 index)	{ fIndex = index; }
+			void				GetPartitionDescriptor(
+									partition_descriptor* descriptor) const;
+
 				// private
 
 			// only if extended
@@ -240,7 +242,7 @@
 								LogicalPartition(
 									const partition_descriptor* descriptor,
 									off_t tableOffset,
-									PrimaryPartition *primary);
+									PrimaryPartition* primary);
 
 			void				SetTo(const partition_descriptor* descriptor,
 									off_t tableOffset,
@@ -249,7 +251,11 @@
 									bool active, off_t tableOffset,
 									PrimaryPartition* primary);
 			void				Unset();
+			void				GetPartitionDescriptor(
+									partition_descriptor* descriptor,
+									bool inner = false) const;
 
+
 			void				SetPrimaryPartition(PrimaryPartition* primary)
 									{ fPrimary = primary; }
 			PrimaryPartition*	GetPrimaryPartition() const

Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp	2009-08-10 19:52:37 UTC (rev 32234)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp	2009-08-10 22:28:47 UTC (rev 32235)
@@ -130,7 +130,7 @@
 	// parse extended partitions
 	status_t error = B_OK;
 	for (int32 i = 0; error == B_OK && i < 4; i++) {
-		PrimaryPartition *primary = fMap->PrimaryPartitionAt(i);
+		PrimaryPartition* primary = fMap->PrimaryPartitionAt(i);
 		if (primary->IsExtended())
 			error = _ParseExtended(primary, primary->Offset());
 	}
@@ -145,7 +145,7 @@
 
 // _ParseExtended
 status_t
-PartitionMapParser::_ParseExtended(PrimaryPartition *primary, off_t offset)
+PartitionMapParser::_ParseExtended(PrimaryPartition* primary, off_t offset)
 {
 	status_t error = B_OK;
 	int32 partitionCount = 0;
@@ -188,11 +188,11 @@
 		LogicalPartition extended;
 		LogicalPartition nonExtended;
 		for (int32 i = 0; error == B_OK && i < 4; i++) {
-			const partition_descriptor *descriptor = &fPartitionTable->table[i];
+			const partition_descriptor* descriptor = &fPartitionTable->table[i];
 			if (descriptor->is_empty())
 				continue;
 
-			LogicalPartition *partition = NULL;
+			LogicalPartition* partition = NULL;
 			if (descriptor->is_extended()) {
 				if (extended.IsEmpty()) {
 					extended.SetTo(descriptor, offset, primary);
@@ -232,7 +232,7 @@
 
 		// add non-extended partition to list
 		if (error == B_OK && !nonExtended.IsEmpty()) {
-			LogicalPartition *partition
+			LogicalPartition* partition
 				= new(nothrow) LogicalPartition(nonExtended);
 			if (partition)
 				primary->AddLogicalPartition(partition);

Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMapWriter.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMapWriter.cpp	2009-08-10 19:52:37 UTC (rev 32234)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMapWriter.cpp	2009-08-10 22:28:47 UTC (rev 32235)
@@ -3,7 +3,7 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *		Tomas Kucera, kucerat at centrum.cz
+ *		Bryce Groff, brycegroff at gmail.com
  */
 
 #include "PartitionMapWriter.h"
@@ -34,293 +34,225 @@
 #endif
 
 
-// TODO: get rid of this - there is no such thing as a fixed sector size!
-static const uint32 SECTOR_SIZE = 512;
+bool
+check_logical_location(const LogicalPartition* child,
+	const PrimaryPartition* parent)
+{
+	if (child->PartitionTableOffset() % child->BlockSize() != 0) {
+		TRACE(("check_logical_location() - PartitionTableOffset: %lld not a "
+			"multiple of media's block size: %ld\n",
+			child->PartitionTableOffset(), child->BlockSize()));
+		return false;
+	}
+	if (child->Offset() % child->BlockSize() != 0) {
+		TRACE(("check_logical_location() - Parition offset: %lld "
+			"is not a multiple of block size: %ld\n", child->Offset(),
+			child->BlockSize()));
+		return false;
+	}
+	if (child->Size() % child->BlockSize() != 0) {
+		TRACE(("check_logical_location() - Size: (%lld) is not a multiple of"
+			" block size: (%ld)\n", child->Size(), child->BlockSize()));
+		return false;
+	}
+	if (child->PartitionTableOffset() < parent->Offset()
+		|| child->PartitionTableOffset() >= parent->Offset()
+		+ parent->Size()) {
+		TRACE(("check_logical_location() - Partition table: (%lld) not within "
+			"extended partition (start: %lld), (end: %lld)\n",
+			child->PartitionTableOffset(), parent->Offset(), parent->Offset()
+			+ parent->Size()));
+		return false;
+	}
+	if (child->Offset() + child->Size() > parent->Offset() + parent->Size()) {
+		TRACE(("check_logical_location() - logical paritition does not lie "
+			"within extended partition\n"));
+		return false;
+	}
+	return true;
+}
 
 
-// constructor
-/*!	\brief Creates the writer.
-
-	\param deviceFD File descriptor.
-	\param sessionOffset Disk offset of the partition with partitioning system.
-	\param sessionSize Size of the partition with partitioning system.
-*/
-PartitionMapWriter::PartitionMapWriter(int deviceFD, off_t sessionOffset,
-		off_t sessionSize)
+PartitionMapWriter::PartitionMapWriter(int deviceFD, uint32 blockSize)
 	:
 	fDeviceFD(deviceFD),
-	fSessionOffset(sessionOffset),
-	fSessionSize(sessionSize),
-	fMap(NULL)
+	fBlockSize(blockSize)
 {
 }
 
 
-// destructor
 PartitionMapWriter::~PartitionMapWriter()
 {
 }
 
 
-// WriteMBR
-/*!	\brief Writes Master Boot Record to the first sector of the disk.
-
-	If a \a block is not specified, the sector is firstly read from the disk
-	and after changing relevant items it is written back to the disk.
-	This allows to keep code area in MBR intact.
-	\param pts Pointer to \c partition_table.
-	\param map Pointer to the PartitionMap structure describing disk partitions.
-*/
 status_t
-PartitionMapWriter::WriteMBR(const PartitionMap *map, bool clearSectors)
+PartitionMapWriter::WriteMBR(const PartitionMap* map, bool clearCode)
 {
-	if (!map)
+	if (map == NULL)
 		return B_BAD_VALUE;
 
-	fMap = map;
+	partition_table partitionTable;
+	if (clearCode) {
+		partitionTable.clear_code_area();
+	} else {
+		status_t error = _ReadBlock(0, partitionTable);
+		if (error != B_OK)
+			return error;
+	}
 
-	uint8 sector[SECTOR_SIZE];
-	partition_table* pts = (partition_table*)sector;
+	partitionTable.signature = kPartitionTableSectorSignature;
 
-	// If we shall not clear the first two sectors, we need to read the first
-	// sector in, first.
-	status_t error = B_OK;
-	if (clearSectors)
-		memset(sector, 0, SECTOR_SIZE);
-	else
-		error = _ReadSector(0, pts);
+	for (int i = 0; i < 4; i++) {
+		partition_descriptor* descriptor = &partitionTable.table[i];
+		const PrimaryPartition* partition = map->PrimaryPartitionAt(i);
 
-	if (error == B_OK) {
-		error = _WritePrimary(pts);
-		if (error == B_OK)
-			error = _WriteSector(0, pts);
+		partition->GetPartitionDescriptor(descriptor);
 	}
 
-	// Clear the second sector, if desired. We do that to make the partition
-	// unrecognizable by BFS.
-	if (error == B_OK && clearSectors) {
-		memset(sector, 0, SECTOR_SIZE);
-		error = _WriteSector(SECTOR_SIZE, pts);
-	}
-

[... truncated: 1781 lines follow ...]


From kirilla at mail.berlios.de  Tue Aug 11 02:03:29 2009
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Tue, 11 Aug 2009 02:03:29 +0200
Subject: [Haiku-commits] r32236 - haiku/trunk/src/data/beos_mime/application
Message-ID: <200908110003.n7B03TRb028047@sheep.berlios.de>

Author: kirilla
Date: 2009-08-11 02:03:28 +0200 (Tue, 11 Aug 2009)
New Revision: 32236
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32236&view=rev

Added:
   haiku/trunk/src/data/beos_mime/application/x-cd-image
Log:
ISO CD Image mime type. Using the CD device icon for now.

Added: haiku/trunk/src/data/beos_mime/application/x-cd-image
===================================================================
--- haiku/trunk/src/data/beos_mime/application/x-cd-image	2009-08-10 22:28:47 UTC (rev 32235)
+++ haiku/trunk/src/data/beos_mime/application/x-cd-image	2009-08-11 00:03:28 UTC (rev 32236)
@@ -0,0 +1,23 @@
+
+resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
+
+resource(1, "META:TYPE") "application/x-cd-image";
+
+resource(2, "META:S:DESC") #'MSDC' "ISO CD Image";
+
+resource(3, "META:EXTENS") message(234) {
+	"extensions" = "iso",
+	"extensions" = "iso9660",
+	"type" = "application/x-cd-image"
+};
+
+resource(4, "META:ICON") #'VICN' array {
+	$"6E63696605050002030605B812A5BE03E13DE784B8021049F79F4A16EC00F1F1"
+	$"F136D9DDF48A9996B9B4B8BEDBFFF4F4F404EBD0020006023C92C0388F5FB854"
+	$"503C576348D8DF48C95B004137A9FFB9B9B904017E0402043F2E4E2E302E2242"
+	$"2236224E3F5630564E565C425C4E5C3602043F3C433C3B3C3940393E39423F44"
+	$"3B44434445404542453E02044B404B3C4B443F484748374833403344333C3FBC"
+	$"C337BCC347BCC30204402C542C502E5C425C365C4E4058505654586042604E60"
+	$"36050A040103000A000200011001178400040A01020002000A02020201000A03"
+	$"0102100117820004"
+};



From revol at free.fr  Tue Aug 11 02:28:34 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Tue, 11 Aug 2009 02:28:34 +0200 CEST
Subject: [Haiku-commits] r32236 -
 haiku/trunk/src/data/beos_mime/application
In-Reply-To: <200908110003.n7B03TRb028047@sheep.berlios.de>
Message-ID: <1190048817-BeMail@laptop>

> Author: kirilla
> Date: 2009-08-11 02:03:28 +0200 (Tue, 11 Aug 2009)
> New Revision: 32236
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32236&view=rev
> 
> Added:
>    haiku/trunk/src/data/beos_mime/application/x-cd-image
> Log:
> ISO CD Image mime type. Using the CD device icon for now.

We can probably have a sniff rule for this...

So can we for BFS.
Tested in ZETA:
setmime -add application/x-bfs-image -short "BFS Image" -long "Be File 
System Image" -extension bfs -sniffRule '0.60          
([544]"1SFBEGIB")'

for big endian too it should be:
setmime -add application/x-bfs-image -short "BFS Image" -long "Be File 
System Image" -extension bfs -sniffRule '0.60          [544]("1SFBEGIB"
|"1SFBBIGE")'

Fran?ois.


From mmu_man at mail.berlios.de  Tue Aug 11 04:07:19 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Tue, 11 Aug 2009 04:07:19 +0200
Subject: [Haiku-commits] r32237 - in buildtools/trunk/gcc/gcc: . config/arm
Message-ID: <200908110207.n7B27J8Q007063@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-11 04:07:15 +0200 (Tue, 11 Aug 2009)
New Revision: 32237
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32237&view=rev

Added:
   buildtools/trunk/gcc/gcc/config/arm/t-haiku
Modified:
   buildtools/trunk/gcc/gcc/config.gcc
   buildtools/trunk/gcc/gcc/config/arm/haiku.h
Log:
[ARM] [GSoC] Fran?\195?\167ois Revol + Johannes Wischert:
- add missing bits needed to use EABI by default (which should be == AAPCS == BPABI if I understood it right),
	- include t-bpabi and bpabi.h,
	- added an arm/t-haiku and arm/haiku.h to correct back some stuff after them as is done for linux,
- add multilib variants for softfloat (for xscale) and softfp (AAPCS),
- undo the LIBGCC_SPEC override for arm, it might have been the cause of multilib not working, not sure,
- make armv6 default target.
This allows building for both overo and verdex boards with some mods, though it emits calls to exception unwinding stuff that requires some more symbols (like abort), and should probably be fixed some other way.


Modified: buildtools/trunk/gcc/gcc/config/arm/haiku.h
===================================================================
--- buildtools/trunk/gcc/gcc/config/arm/haiku.h	2009-08-11 00:03:28 UTC (rev 32236)
+++ buildtools/trunk/gcc/gcc/config/arm/haiku.h	2009-08-11 02:07:15 UTC (rev 32237)
@@ -29,18 +29,25 @@
 #undef  TARGET_DEFAULT_FLOAT_ABI
 #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT
 
-#undef  TARGET_DEFAULT
-#define TARGET_DEFAULT (0)
+/* bpabi.h sets FPUTYPE_DEFAULT to VFP */
+/* bpabi.h sets ARM_DEFAULT_ABI */
 
 #undef  MULTILIB_DEFAULTS
 #define MULTILIB_DEFAULTS \
   { "marm", "mlittle-endian", "msoft-float", "mno-thumb-interwork" }
 
+/* Default is set by bpabi.h */
+/*
+#undef TARGET_DEFAULT
+*/
+
 #undef SUBTARGET_CPU_DEFAULT
-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm920t
+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
 
 /* Now we define the strings used to build the spec file.  */
+/* interestingly, bpabi defines __GXX_TYPEINFO_EQUALITY_INLINE=0 too as we do. */
 
+#undef TARGET_OS_CPP_BUILTINS
 #define TARGET_OS_CPP_BUILTINS()		\
   do									\
     {									\
@@ -55,11 +62,18 @@
          type_infos are not merged, so that they get compared by name \
          instead of by pointer. */ \
       builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \
-      builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0");\
+      /*builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0"); done in bpabi: */\
+      TARGET_BPABI_CPP_BUILTINS();					\
     }									\
   while (0)
 
+/* Use the default LIBGCC_SPEC, not the empty version in haiku.h, as we
+   do not use multilib (needed ??).  */
+#undef LIBGCC_SPEC
+
 /* If ELF is the default format, we should not use /lib/elf.  */
 
 #undef	LINK_SPEC
-#define LINK_SPEC "%{!o*:-o %b} -m armelf -shared -no-undefined -Bsymbolic %{nostart:-e 0}"
+#define LINK_SPEC "%{!o*:-o %b} -m armelf -shared -no-undefined -Bsymbolic %{nostart:-e 0} \
+  %{mbig-endian:-EB} %{mlittle-endian:-EL} -X" 
+

Added: buildtools/trunk/gcc/gcc/config/arm/t-haiku
===================================================================
--- buildtools/trunk/gcc/gcc/config/arm/t-haiku	2009-08-11 00:03:28 UTC (rev 32236)
+++ buildtools/trunk/gcc/gcc/config/arm/t-haiku	2009-08-11 02:07:15 UTC (rev 32237)
@@ -0,0 +1,21 @@
+# build multilib for soft float and VFP 
+# (unsure about how it should be done...)
+# mix from t-symbian & t-wince-pe
+
+#LIB1ASMSRC = arm/lib1funcs.asm
+#LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _call_via_rX _interwork_call_via_rX
+
+
+#MULTILIB_OPTIONS    += mhard-float
+#MULTILIB_DIRNAMES   += fpu
+
+MULTILIB_OPTIONS    += msoft-float
+MULTILIB_DIRNAMES   += fpu soft
+MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
+
+MULTILIB_OPTIONS    += mfloat-abi=softfp
+MULTILIB_DIRNAMES   += softfp
+
+#LIBGCC = stmp-multilib
+#INSTALL_LIBGCC = install-multilib
+#TARGET_LIBGCC2_CFLAGS = 

Modified: buildtools/trunk/gcc/gcc/config.gcc
===================================================================
--- buildtools/trunk/gcc/gcc/config.gcc	2009-08-11 00:03:28 UTC (rev 32236)
+++ buildtools/trunk/gcc/gcc/config.gcc	2009-08-11 02:07:15 UTC (rev 32237)
@@ -734,8 +734,14 @@
 	use_collect2=yes
 	;;
 arm*-*-haiku*)
-	tmake_file="${tmake_file} t-haiku arm/t-arm arm/t-arm-elf"
-	tm_file="dbxelf.h elfos.h haiku.h arm/elf.h arm/aout.h arm/haiku.h arm/arm.h"
+	tmake_file="${tmake_file} t-haiku arm/t-arm arm/t-arm-elf arm/t-bpabi arm/t-haiku"
+	tm_file="dbxelf.h elfos.h haiku.h arm/elf.h arm/bpabi.h arm/haiku.h"
+	# The BPABI long long divmod functions return a 128-bit value in
+	# registers r0-r3.  Correctly modeling that requires the use of
+	# TImode.
+	need_64bit_hwint=yes
+	default_use_cxa_atexit=yes
+	tm_file="${tm_file} arm/aout.h arm/arm.h"
 	;;
 arm*-*-linux*)			# ARM GNU/Linux with ELF
 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"



From mmu_man at mail.berlios.de  Tue Aug 11 05:02:45 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Tue, 11 Aug 2009 05:02:45 +0200
Subject: [Haiku-commits] r32238 - haiku/trunk/headers/private/system/arch/arm
Message-ID: <200908110302.n7B32jtT010990@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-11 05:02:44 +0200 (Tue, 11 Aug 2009)
New Revision: 32238
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32238&view=rev

Added:
   haiku/trunk/headers/private/system/arch/arm/arch_arm_version.h
Modified:
   haiku/trunk/headers/private/system/arch/arm/asm_defs.h
Log:
[ARM]
Add an __ARM_ARCH__ macro defined to the arch version to simplify checks for >= some version.


Added: haiku/trunk/headers/private/system/arch/arm/arch_arm_version.h
===================================================================
--- haiku/trunk/headers/private/system/arch/arm/arch_arm_version.h	2009-08-11 02:07:15 UTC (rev 32237)
+++ haiku/trunk/headers/private/system/arch/arm/arch_arm_version.h	2009-08-11 03:02:44 UTC (rev 32238)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008, Fran?ois Revol, revol at free.fr.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef SYSTEM_ARCH_ARM_ARCH_ARM_VERSION_H
+#define SYSTEM_ARCH_ARM_ARCH_ARM_VERSION_H
+
+/* map all the various ARM defines to arch version to allow checking for minimal arch */
+
+#if defined(__ARM_ARCH_2__) || defined(__ARM_ARCH_3__)
+#error we do not support this
+#endif
+
+#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
+#define __ARM_ARCH__ 4
+#endif
+
+#if defined(__ARM_ARCH_5__) \
+ || defined(__ARM_ARCH_5E__) \
+ || defined(__ARM_ARCH_5T__) \
+ || defined(__ARM_ARCH_5TE__) \
+ || defined(__ARM_ARCH_5TEJ__)
+#define __ARM_ARCH__ 5
+#endif
+
+#if defined(__ARM_ARCH_6__) \
+ || defined(__ARM_ARCH_6J__) \
+ || defined(__ARM_ARCH_6K__) \
+ || defined(__ARM_ARCH_6ZK__) \
+ || defined(__ARM_ARCH_6T2__)
+#define __ARM_ARCH__ 6
+#endif
+
+#if defined(__ARM_ARCH_7__) \
+ || defined(__ARM_ARCH_7A__) \
+ || defined(__ARM_ARCH_7R__) \
+ || defined(__ARM_ARCH_7M__)
+#define __ARM_ARCH__ 7
+#endif
+
+#ifndef __ARM_ARCH__
+#error cannot determine arm arch version
+#endif
+
+#endif	/* SYSTEM_ARCH_ARM_ARCH_ARM_VERSION_H */
+

Modified: haiku/trunk/headers/private/system/arch/arm/asm_defs.h
===================================================================
--- haiku/trunk/headers/private/system/arch/arm/asm_defs.h	2009-08-11 02:07:15 UTC (rev 32237)
+++ haiku/trunk/headers/private/system/arch/arm/asm_defs.h	2009-08-11 03:02:44 UTC (rev 32238)
@@ -6,12 +6,14 @@
 #define SYSTEM_ARCH_ARM_ASM_DEFS_H
 
 
+/* include arch version helpers */
+#include <arch_arm_version.h>
+
 #define SYMBOL(name)			.global name; name
 #define SYMBOL_END(name)		1: .size name, 1b - name
 #define STATIC_FUNCTION(name)	.type name, %function; name
 #define FUNCTION(name)			.global name; .type name, %function; name
 #define FUNCTION_END(name)		1: .size name, 1b - name
 
-
 #endif	/* SYSTEM_ARCH_ARM_ASM_DEFS_H */
 



From mmu_man at mail.berlios.de  Tue Aug 11 05:21:31 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Tue, 11 Aug 2009 05:21:31 +0200
Subject: [Haiku-commits] r32239 - haiku/trunk/src/system/ldscripts/arm
Message-ID: <200908110321.n7B3LVLe013194@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-11 05:21:29 +0200 (Tue, 11 Aug 2009)
New Revision: 32239
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32239&view=rev

Modified:
   haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld
Log:
[ARM]
Temporary (?) solution to linking the loader: generate symbols needed by the unwinding code, which should actually not be used since we disable exceptions...


Modified: haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld
===================================================================
--- haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld	2009-08-11 03:02:44 UTC (rev 32238)
+++ haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld	2009-08-11 03:21:29 UTC (rev 32239)
@@ -28,6 +28,11 @@
 	__bss_start = .;
 	.bss : { *(.bss) }
 
+	/* exception unwinding - should really not be needed! */
+	__exidx_start = .;
+	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
+	__exidx_end = .;
+
 	. = ALIGN(0x1000);
 	_end = . ;
   /* Stabs debugging sections.  */



From mmu_man at mail.berlios.de  Tue Aug 11 05:24:23 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Tue, 11 Aug 2009 05:24:23 +0200
Subject: [Haiku-commits] r32240 - haiku/trunk/src/system/libroot/os/arch/arm
Message-ID: <200908110324.n7B3ONPh013285@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-11 05:24:22 +0200 (Tue, 11 Aug 2009)
New Revision: 32240
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32240&view=rev

Modified:
   haiku/trunk/src/system/libroot/os/arch/arm/byteorder.S
Log:
[ARM]
Stub out swap funcs for pre armv6 which lack REV/REV16. WRITEME.


Modified: haiku/trunk/src/system/libroot/os/arch/arm/byteorder.S
===================================================================
--- haiku/trunk/src/system/libroot/os/arch/arm/byteorder.S	2009-08-11 03:21:29 UTC (rev 32239)
+++ haiku/trunk/src/system/libroot/os/arch/arm/byteorder.S	2009-08-11 03:24:22 UTC (rev 32240)
@@ -10,23 +10,35 @@
 /* uint16 __swap_int16(uint16 value)
  */
 FUNCTION(__swap_int16):
+#if __ARM_ARCH__ >= 6
 		rev16 r0,r0;
+#else
+#warning IMPLEMENT_ME
+#endif
 FUNCTION_END(__swap_int16)
 
 /* uint32 __swap_int32(uint32 value)
  */
 FUNCTION(__swap_int32):
+#if __ARM_ARCH__ >= 6
 		rev r0,r0;
+#else
+#warning IMPLEMENT_ME
+#endif
 FUNCTION_END(__swap_int32)
 
 /* uint64 __swap_int64(uint64 value)
  */
 FUNCTION(__swap_int64):
+#if __ARM_ARCH__ >= 6
 		rev r0,r0;
 		rev r1,r1;
 		mov r12,r0;
 		mov r0,r1;
 		mov r1,r12;
+#else
+#warning IMPLEMENT_ME
+#endif
 FUNCTION_END(__swap_int64)
 
 /* TODO: The following functions can surely be optimized. A simple optimization



From jackburton at mail.berlios.de  Tue Aug 11 06:47:44 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Tue, 11 Aug 2009 06:47:44 +0200
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
Message-ID: <200908110447.n7B4liNI004463@sheep.berlios.de>

Author: jackburton
Date: 2009-08-11 06:47:39 +0200 (Tue, 11 Aug 2009)
New Revision: 32241
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32241&view=rev

Modified:
   haiku/trunk/src/kits/game/WindowScreen.cpp
Log:
When setting the palette, the passed array is 0 based, even if the first
index is not 0. Bruno, can you check if this fixes SoundPlay's colors?


Modified: haiku/trunk/src/kits/game/WindowScreen.cpp
===================================================================
--- haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-11 03:24:22 UTC (rev 32240)
+++ haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-11 04:47:39 UTC (rev 32241)
@@ -327,7 +327,7 @@
 	if (!fActivateState) {
 		// If we aren't active, we just change our local palette
 		for (int32 x = firstIndex; x <= lastIndex; x++) {
-			fPalette[x] = list[x];
+			fPalette[x] = list[x - firstIndex];
 		}
 	} else {
 		uint8 colors[3 * 256];
@@ -335,12 +335,12 @@
 		int32 j = 0;
 
 		for (int32 x = firstIndex; x <= lastIndex; x++) {
-			fPalette[x] = list[x];
+			fPalette[x] = list[x - firstIndex];
 				// update our local palette as well
 
-			colors[j++] = list[x].red;
-			colors[j++] = list[x].green;
-			colors[j++] = list[x].blue;
+			colors[j++] = fPalette[x].red;
+			colors[j++] = fPalette[x].green;
+			colors[j++] = fPalette[x].blue;
 		}
 
 		if (fAddonImage >= 0) {



From michael.w.pfeiffer at gmail.com  Tue Aug 11 07:33:54 2009
From: michael.w.pfeiffer at gmail.com (Michael Pfeiffer)
Date: Tue, 11 Aug 2009 07:33:54 +0200
Subject: [Haiku-commits] r32229 - haiku/trunk/src/servers/print
In-Reply-To: <a4855ac50908101113q9c6eb7cga84e0d9176758c29@mail.gmail.com>
References: <200908101757.n7AHvjkG021896@sheep.berlios.de>
	<a4855ac50908101113q9c6eb7cga84e0d9176758c29@mail.gmail.com>
Message-ID: <CF8D11DE-2B03-4CE8-A94D-555C33BBA291@gmail.com>


Am 10.08.2009 um 20:13 schrieb Ryan Leavengood:

> On Mon, Aug 10, 2009 at 1:57 PM, <laplace at mail.berlios.de> wrote:
>>
>> +               button->ResizeTo(width, height);
>> +               button->SetExplicitMaxSize(BSize(width, height));
>
> Are you sure the first line is needed if you have the second? I  
> would think not.

Without it the image (in the picture button) gets truncated.

> On another note Ingo recently added a new and better BLayoutBuilder
> class that you may want to look at. I assume that is what we will want
> to use now instead of BGroupLayoutBuilder, etc. I suppose I need to
> update my old layout system article or write a new one. There have
> been some commits from Axel and Ingo recently that used it. Check out
> the About window, Screen, and Debugger source code. The r31118 commit
> to add a BWindow parameter is nice since it avoids having to set a
> (generally useless) root layout by the API user.
>
> Also see headers/os/interface/LayoutBuilder.h of course.

Thanks for the pointers.

- Michael



From axeld at pinc-software.de  Tue Aug 11 08:46:48 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 11 Aug 2009 08:46:48 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32235_-_in_haiku/trunk=3A_headers/os/d?=
 =?utf-8?q?rivers_src/add-ons/disk=5Fsystems/intel_src/add-ons/kernel/part?=
 =?utf-8?q?itioning=5Fsystems/intel_src/system/kernel/disk=5Fdevice=5Fmana?=
 =?utf-8?q?ger?=
In-Reply-To: <200908102228.n7AMSnB0017812@sheep.berlios.de>
Message-ID: <477094839-BeMail@zon>

bgroff at BerliOS <bgroff at mail.berlios.de> wrote:
> -	| B_DISK_SYSTEM_SUPPORTS_INITIALIZING
> +//	| B_DISK_SYSTEM_SUPPORTS_INITIALIZING
>  //	| B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME
>  
>  //	| B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD
> @@ -92,7 +92,7 @@
>  ExtendedPartitionAddOn::CanInitialize(const BMutablePartition* 
> partition)
>  {
>  	// If it's big enough, we can initialize it.
> -	return partition->Size() >= 2 * partition->BlockSize();
> +	return false;
>  }
>  
>  
> @@ -222,7 +222,7 @@
>  uint32
>  ExtendedPartitionHandle::SupportedOperations(uint32 mask)
>  {
> -	uint32 flags = B_DISK_SYSTEM_SUPPORTS_INITIALIZING;
> +	uint32 flags = 0;//B_DISK_SYSTEM_SUPPORTS_INITIALIZING;

Were those changes really intended? They don't seem to make much sense, 
and aren't covered by your commit message.
BTW what is open_partition() for? Is it just a shorthand for open() 
without having to retrieve the device path, if so, why?

Bye,
   Axel.



From axeld at pinc-software.de  Tue Aug 11 08:48:58 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 11 Aug 2009 08:48:58 +0200 CEST
Subject: [Haiku-commits] r32236 -
 haiku/trunk/src/data/beos_mime/application
In-Reply-To: <1190048817-BeMail@laptop>
Message-ID: <607448924-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> > Added:
> >    haiku/trunk/src/data/beos_mime/application/x-cd-image
> > Log:
> > ISO CD Image mime type. Using the CD device icon for now.
> We can probably have a sniff rule for this...

We even should have, since .iso is even quite common for images which 
aren't necessarily ISO, at least I saw those several times already.

> So can we for BFS.
> Tested in ZETA:
> setmime -add application/x-bfs-image -short "BFS Image" -long "Be 
> File 
> System Image" -extension bfs -sniffRule '0.60          
> ([544]"1SFBEGIB")'
> 
> for big endian too it should be:
> setmime -add application/x-bfs-image -short "BFS Image" -long "Be 
> File 
> System Image" -extension bfs -sniffRule '0.60          
> [544]("1SFBEGIB"
> |"1SFBBIGE")'

Yep, BFS is simple to recognize.

Bye,
   Axel.



From axeld at pinc-software.de  Tue Aug 11 08:50:53 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 11 Aug 2009 08:50:53 +0200 CEST
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <a4855ac50908101304k72649fb1wd46542975612f26@mail.gmail.com>
Message-ID: <722749653-BeMail@zon>

Ryan Leavengood <leavengood at gmail.com> wrote:
> 2009/8/10 Jonas Sundstr?m <jonas at kirilla.com>:
> > See r32232. I hope you guys don't mind me using the
> > public API, with a little help from the frame already
> > calculated from window_info. Feel free to rewrite! :]
> No much better, that is great! Even in Haiku apps residing in our 
> repo
> I think we should avoid private APIs. Good job.
> 
> In fact if possible it might be nice to completely remove the use of
> the private APIs in Screenshot, which based on your code should be
> possible, right?
> 
> You can get the active app with BRoster, then you can query that to
> find the active window (as you already do.) Then you can query the
> active window for its Frame and TabFrame, right?

There are windows that don't support scripting (I would find it odd if 
those screenshots would work only for some windows), and IMO it's 
mostly a waste of time to work on this.

Bye,
   Axel.



From axeld at mail.berlios.de  Tue Aug 11 09:47:51 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 11 Aug 2009 09:47:51 +0200
Subject: [Haiku-commits] r32242 - in haiku/trunk: headers/private/interface
	src/kits/interface
Message-ID: <200908110747.n7B7lppv005449@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 09:47:49 +0200 (Tue, 11 Aug 2009)
New Revision: 32242
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32242&view=rev

Modified:
   haiku/trunk/headers/private/interface/ToolTipManager.h
   haiku/trunk/src/kits/interface/ToolTip.cpp
   haiku/trunk/src/kits/interface/ToolTipManager.cpp
Log:
* Made the tool tip manager's lock available, and guarded adding/removing the
  tool tip view with this lock, too.
* BTextToolTip::SetText() can now be called in all circumstances safely.


Modified: haiku/trunk/headers/private/interface/ToolTipManager.h
===================================================================
--- haiku/trunk/headers/private/interface/ToolTipManager.h	2009-08-11 04:47:39 UTC (rev 32241)
+++ haiku/trunk/headers/private/interface/ToolTipManager.h	2009-08-11 07:47:49 UTC (rev 32242)
@@ -6,6 +6,7 @@
 #define _TOOL_TIP_MANAGER_H
 
 
+#include <Locker.h>
 #include <Messenger.h>
 #include <Point.h>
 
@@ -25,6 +26,9 @@
 			void				SetHideDelay(bigtime_t time);
 			bigtime_t			HideDelay() const;
 
+	static	bool				Lock() { return sLock.Lock(); }
+	static	void				Unlock() { sLock.Unlock(); }
+
 private:
 								BToolTipManager();
 	virtual						~BToolTipManager();
@@ -34,6 +38,7 @@
 			bigtime_t			fShowDelay;
 			bigtime_t			fHideDelay;
 
+	static	BLocker				sLock;
 	static	BToolTipManager*	sDefaultInstance;
 };
 

Modified: haiku/trunk/src/kits/interface/ToolTip.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ToolTip.cpp	2009-08-11 04:47:39 UTC (rev 32241)
+++ haiku/trunk/src/kits/interface/ToolTip.cpp	2009-08-11 07:47:49 UTC (rev 32242)
@@ -10,6 +10,7 @@
 
 #include <Message.h>
 #include <TextView.h>
+#include <ToolTipManager.h>
 
 
 BToolTip::BToolTip()
@@ -157,7 +158,26 @@
 void
 BTextToolTip::SetText(const char* text)
 {
+	bool lockedLooper;
+	while (true) {
+		lockedLooper = fTextView->LockLooper();
+		if (!lockedLooper) {
+			BToolTipManager::Lock();
+
+			if (fTextView->Window() != NULL) {
+				BToolTipManager::Unlock();
+				continue;
+			}
+		}
+		break;
+	}
+
 	fTextView->SetText(text);
+
+	if (lockedLooper)
+		fTextView->UnlockLooper();
+	else
+		BToolTipManager::Unlock();
 }
 
 

Modified: haiku/trunk/src/kits/interface/ToolTipManager.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ToolTipManager.cpp	2009-08-11 04:47:39 UTC (rev 32241)
+++ haiku/trunk/src/kits/interface/ToolTipManager.cpp	2009-08-11 07:47:49 UTC (rev 32242)
@@ -14,10 +14,9 @@
 #include <ToolTip.h>
 
 
+BLocker BToolTipManager::sLock("tool tip manager");
 BToolTipManager* BToolTipManager::sDefaultInstance;
 
-static BLocker sLock("tool tip manager");
-
 static const uint32 kMsgHideToolTip = 'hide';
 static const uint32 kMsgShowToolTip = 'show';
 static const uint32 kMsgCurrentToolTip = 'curr';
@@ -56,8 +55,12 @@
 
 	virtual void DetachedFromWindow()
 	{
+		BToolTipManager::Lock();
+
 		RemoveChild(fToolTip->View());
 			// don't delete this one!
+
+		BToolTipManager::Unlock();
 	}
 
 	virtual void MouseMoved(BPoint where, uint32 transit,
@@ -112,7 +115,10 @@
 	// TODO: take alignment into account!
 
 	SetLayout(new BGroupLayout(B_VERTICAL));
+
+	BToolTipManager::Lock();
 	AddChild(new ToolTipView(tip));
+	BToolTipManager::Unlock();
 
 	BSize size = ChildAt(0)->PreferredSize();
 	ResizeTo(size.width, size.height);



From brycegroff at gmail.com  Tue Aug 11 10:38:35 2009
From: brycegroff at gmail.com (Bryce Groff)
Date: Mon, 10 Aug 2009 22:38:35 -1000
Subject: [Haiku-commits] r32235 - in haiku/trunk: headers/os/drivers
	src/add-ons/disk_systems/intel
	src/add-ons/kernel/partitioning_systems/intel
	src/system/kernel/disk_device_manager
In-Reply-To: <477094839-BeMail@zon>
References: <200908102228.n7AMSnB0017812@sheep.berlios.de>
	<477094839-BeMail@zon>
Message-ID: <9efe01ea0908110138v3e38219dv18e108a68c385bfe@mail.gmail.com>

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

> > -     | B_DISK_SYSTEM_SUPPORTS_INITIALIZING
> > +//   | B_DISK_SYSTEM_SUPPORTS_INITIALIZING
> >  //   | B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME
> >
> >  //   | B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD
> > @@ -92,7 +92,7 @@
> >  ExtendedPartitionAddOn::CanInitialize(const BMutablePartition*
> > partition)
> >  {
> >       // If it's big enough, we can initialize it.
> > -     return partition->Size() >= 2 * partition->BlockSize();
> > +     return false;
> >  }
> >
> >
> > @@ -222,7 +222,7 @@
> >  uint32
> >  ExtendedPartitionHandle::SupportedOperations(uint32 mask)
> >  {
> > -     uint32 flags = B_DISK_SYSTEM_SUPPORTS_INITIALIZING;
> > +     uint32 flags = 0;//B_DISK_SYSTEM_SUPPORTS_INITIALIZING;
>
> Were those changes really intended? They don't seem to make much sense,
> and aren't covered by your commit message.
>

We no longer initialize extended partitions, we create them like any other
primary partition. Commenting out support for initialization remove it as an
option for programs (DriveSetup) that use the api. I will try to be more
verbose with my commit messages in the future.


> BTW what is open_partition() for? Is it just a shorthand for open()
> without having to retrieve the device path, if so, why?
>
>
Basically yes, it is a shorthand way to get a file descriptor from a
partition id. It is useful for the Intel add-on in a few places and I
probably useful else where.

Bryce
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20090810/379f79f7/attachment.html>

From axeld at mail.berlios.de  Tue Aug 11 11:25:27 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 11 Aug 2009 11:25:27 +0200
Subject: [Haiku-commits] r32243 - haiku/trunk/src/servers/app
Message-ID: <200908110925.n7B9PRwi031596@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 11:25:26 +0200 (Tue, 11 Aug 2009)
New Revision: 32243
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32243&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/ServerWindow.h
Log:
* Removed superfluous ReplaceDecorator() method.
* Cleanup, no functional change.


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2009-08-11 07:47:49 UTC (rev 32242)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2009-08-11 09:25:26 UTC (rev 32243)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -12,19 +12,44 @@
  *		Philippe Saint-Pierre, stpere at gmail.com
  */
 
-/*!
-	\class ServerWindow
-	\brief Shadow BWindow class
 
-	A ServerWindow handles all the intraserver tasks required of it by its BWindow. There are
-	too many tasks to list as being done by them, but they include handling View transactions,
-	coordinating and linking a window's Window half with its messaging half, dispatching
-	mouse and key events from the server to its window, and other such things.
+/*!	\class ServerWindow
+
+	The ServerWindow class handles all BWindow messaging; it forwards all
+	BWindow requests to the corresponding app_server classes, that is Desktop,
+	Window, and View.
+	Furthermore, it also sends app_server requests/notices to its BWindow. There
+	is one ServerWindow per BWindow.
 */
 
 
 #include "ServerWindow.h"
 
+#include <syslog.h>
+#include <new>
+
+#include <AppDefs.h>
+#include <Autolock.h>
+#include <Debug.h>
+#include <DirectWindow.h>
+#include <TokenSpace.h>
+#include <View.h>
+#include <GradientLinear.h>
+#include <GradientRadial.h>
+#include <GradientRadialFocus.h>
+#include <GradientDiamond.h>
+#include <GradientConic.h>
+
+#include <DirectWindowPrivate.h>
+#include <MessagePrivate.h>
+#include <PortLink.h>
+#include <ServerProtocolStructs.h>
+#include <ViewPrivate.h>
+#include <WindowInfo.h>
+#include <WindowPrivate.h>
+
+#include "clipping.h"
+
 #include "AppServer.h"
 #include "Desktop.h"
 #include "DrawingEngine.h"
@@ -39,32 +64,10 @@
 #include "Window.h"
 #include "WorkspacesView.h"
 
-#include "clipping.h"
 
-#include <DirectWindowPrivate.h>
-#include <MessagePrivate.h>
-#include <PortLink.h>
-#include <ServerProtocolStructs.h>
-#include <ViewPrivate.h>
-#include <WindowInfo.h>
-#include <WindowPrivate.h>
-
-#include <AppDefs.h>
-#include <Autolock.h>
-#include <Debug.h>
-#include <DirectWindow.h>
-#include <TokenSpace.h>
-#include <View.h>
-#include <GradientLinear.h>
-#include <GradientRadial.h>
-#include <GradientRadialFocus.h>
-#include <GradientDiamond.h>
-#include <GradientConic.h>
-
-#include <new>
-
 using std::nothrow;
 
+
 //#define TRACE_SERVER_WINDOW
 #ifdef TRACE_SERVER_WINDOW
 #	include <stdio.h>
@@ -177,8 +180,7 @@
 //	#pragma mark -
 
 
-/*!
-	Sets up the basic BWindow counterpart - you have to call Init() before
+/*!	Sets up the basic BWindow counterpart - you have to call Init() before
 	you can actually use it, though.
 */
 ServerWindow::ServerWindow(const char *title, ServerApp *app,
@@ -236,7 +238,9 @@
 #endif
 
 
-//! Tears down all connections the main app_server objects, and deletes some internals.
+/*! Tears down all connections the main app_server objects, and deletes some
+	internals.
+*/
 ServerWindow::~ServerWindow()
 {
 	STRACE(("ServerWindow(%s@%p):~ServerWindow()\n", fTitle, this));
@@ -282,8 +286,9 @@
 			p->time / p->count);
 	}
 	if (sRedrawProcessingTime.count > 0) {
-		printf("average redraw processing time: %g secs, count: %ld (%lld usecs per call)\n",
-			sRedrawProcessingTime.time / 1000000.0, sRedrawProcessingTime.count,
+		printf("average redraw processing time: %g secs, count: %ld (%lld "
+			"usecs per call)\n", sRedrawProcessingTime.time / 1000000.0,
+			sRedrawProcessingTime.count,
 			sRedrawProcessingTime.time / sRedrawProcessingTime.count);
 	}
 //	if (sNextMessageTime.count > 0) {
@@ -357,18 +362,6 @@
 }
 
 
-//! Forces the window to update its decorator
-void
-ServerWindow::ReplaceDecorator()
-{
-	if (!IsLocked())
-		debugger("you must lock a ServerWindow object before calling ::ReplaceDecorator()\n");
-
-	STRACE(("ServerWindow %s: Replace Decorator\n", fTitle));
-	//fWindow->UpdateDecorator();
-}
-
-
 /*! Shows the window's Window.
 */
 void
@@ -532,8 +525,7 @@
 }
 
 
-/*!
-	Returns the ServerWindow's Window, if it exists and has been
+/*!	Returns the ServerWindow's Window, if it exists and has been
 	added to the Desktop already.
 	In other words, you cannot assume this method will always give you
 	a valid pointer.
@@ -550,7 +542,7 @@
 
 
 View*
-ServerWindow::_CreateView(BPrivate::LinkReceiver &link, View **_parent)
+ServerWindow::_CreateView(BPrivate::LinkReceiver& link, View** _parent)
 {
 	// NOTE: no need to check for a lock. This is a private method.
 
@@ -638,8 +630,7 @@
 }
 
 
-/*!
-	Dispatches all window messages, and those view messages that
+/*!	Dispatches all window messages, and those view messages that
 	don't need a valid fCurrentView (ie. view creation).
 */
 void
@@ -711,6 +702,7 @@
 		}
 		case AS_SEND_BEHIND:
 		{
+			// Has the all-window lock
 			int32 token;
 			team_id teamID;
 			status_t status = B_ERROR;
@@ -724,11 +716,7 @@
 					Title(), behindOf ? behindOf->Title() : "NULL"));
 
 				if (behindOf != NULL) {
-//fDesktop->UnlockSingleWindow();
-// TODO: there is a big race condition when we unlock here
-// (window could be gone by now)!
 					fDesktop->SendWindowBehind(fWindow, behindOf);
-//fDesktop->LockSingleWindow();
 					status = B_OK;
 				} else
 					status = B_NAME_NOT_FOUND;
@@ -779,6 +767,7 @@
 
 		case AS_ADD_TO_SUBSET:
 		{
+			// Has the all-window lock
 			DTRACE(("ServerWindow %s: Message AS_ADD_TO_SUBSET\n", Title()));
 			status_t status = B_ERROR;
 
@@ -789,12 +778,8 @@
 				if (window == NULL || window->Feel() != B_NORMAL_WINDOW_FEEL) {
 					status = B_BAD_VALUE;
 				} else {
-//fDesktop->UnlockSingleWindow();
-// TODO: there is a big race condition when we unlock here
-// (window could be gone by now)!
 					status = fDesktop->AddWindowToSubset(fWindow, window)
 						? B_OK : B_NO_MEMORY;
-//fDesktop->LockSingleWindow();
 				}
 			}
 
@@ -804,6 +789,7 @@
 		}
 		case AS_REMOVE_FROM_SUBSET:
 		{
+			// Has the all-window lock
 			DTRACE(("ServerWindow %s: Message AS_REM_FROM_SUBSET\n", Title()));
 			status_t status = B_ERROR;
 
@@ -812,10 +798,7 @@
 				::Window* window = fDesktop->FindWindowByClientToken(token,
 					App()->ClientTeam());
 				if (window != NULL) {
-//fDesktop->UnlockSingleWindow();
-// TODO: there is a big race condition when we unlock here (window could be gone by now)!
 					fDesktop->RemoveWindowFromSubset(fWindow, window);
-//fDesktop->LockSingleWindow();
 					status = B_OK;
 				} else
 					status = B_BAD_VALUE;
@@ -828,6 +811,7 @@
 
 		case AS_SET_LOOK:
 		{
+			// Has the all-window look
 			DTRACE(("ServerWindow %s: Message AS_SET_LOOK\n", Title()));
 
 			status_t status = B_ERROR;
@@ -838,11 +822,8 @@
 					? B_OK : B_BAD_VALUE;
 			}
 
-			if (status == B_OK && !fWindow->IsOffscreenWindow()) {
-//fDesktop->UnlockSingleWindow();
+			if (status == B_OK && !fWindow->IsOffscreenWindow())
 				fDesktop->SetWindowLook(fWindow, (window_look)look);
-//fDesktop->LockSingleWindow();
-			}
 
 			fLink.StartMessage(status);
 			fLink.Flush();
@@ -850,6 +831,7 @@
 		}
 		case AS_SET_FEEL:
 		{
+			// Has the all-window look
 			DTRACE(("ServerWindow %s: Message AS_SET_FEEL\n", Title()));
 
 			status_t status = B_ERROR;
@@ -860,11 +842,8 @@
 					? B_OK : B_BAD_VALUE;
 			}
 
-			if (status == B_OK && !fWindow->IsOffscreenWindow()) {
-//fDesktop->UnlockSingleWindow();
+			if (status == B_OK && !fWindow->IsOffscreenWindow())
 				fDesktop->SetWindowFeel(fWindow, (window_feel)feel);
-//fDesktop->LockSingleWindow();
-			}
 
 			fLink.StartMessage(status);
 			fLink.Flush();
@@ -872,6 +851,7 @@
 		}
 		case AS_SET_FLAGS:
 		{
+			// Has the all-window look
 			DTRACE(("ServerWindow %s: Message AS_SET_FLAGS\n", Title()));
 
 			status_t status = B_ERROR;
@@ -882,11 +862,8 @@
 					? B_OK : B_BAD_VALUE;
 			}
 
-			if (status == B_OK && !fWindow->IsOffscreenWindow()) {
-//fDesktop->UnlockSingleWindow();
+			if (status == B_OK && !fWindow->IsOffscreenWindow())
 				fDesktop->SetWindowFlags(fWindow, flags);
-//fDesktop->LockSingleWindow();
-			}
 
 			fLink.StartMessage(status);
 			fLink.Flush();
@@ -928,6 +905,8 @@
 		}
 		case AS_SET_WORKSPACES:
 		{
+			// Has the all-window lock (but would actually not need to lock at
+			// all)
 			uint32 newWorkspaces;
 			if (link.Read<uint32>(&newWorkspaces) != B_OK)
 				break;
@@ -935,13 +914,12 @@
 			DTRACE(("ServerWindow %s: Message AS_SET_WORKSPACES %lx\n",
 				Title(), newWorkspaces));
 
-//fDesktop->UnlockSingleWindow();
 			fDesktop->SetWindowWorkspaces(fWindow, newWorkspaces);
-//fDesktop->LockSingleWindow();
 			break;
 		}
 		case AS_WINDOW_RESIZE:
 		{
+			// Has the all-window look
 			float xResizeTo;
 			float yResizeTo;
 			link.Read<float>(&xResizeTo);
@@ -958,11 +936,9 @@
 				// pragmatically set window bounds
 //				fLink.StartMessage(B_BUSY);
 //			} else {
-//fDesktop->UnlockSingleWindow();
 				fDesktop->ResizeWindowBy(fWindow,
 					xResizeTo - fWindow->Frame().Width(),
 					yResizeTo - fWindow->Frame().Height());
-//fDesktop->LockSingleWindow();
 				fLink.StartMessage(B_OK);
 //			}
 			fLink.Flush();
@@ -970,6 +946,7 @@
 		}
 		case AS_WINDOW_MOVE:
 		{
+			// Has the all-window look
 			float xMoveTo;
 			float yMoveTo;
 			link.Read<float>(&xMoveTo);
@@ -984,10 +961,8 @@
 				// pragmatically set window positions
 				fLink.StartMessage(B_BUSY);
 			} else {
-//fDesktop->UnlockSingleWindow();
 				fDesktop->MoveWindowBy(fWindow, xMoveTo - fWindow->Frame().left,
 					yMoveTo - fWindow->Frame().top);
-//fDesktop->LockSingleWindow();
 				fLink.StartMessage(B_OK);
 			}
 			fLink.Flush();
@@ -995,6 +970,8 @@
 		}
 		case AS_SET_SIZE_LIMITS:
 		{
+			// Has the all-window look
+
 			// Attached Data:
 			// 1) float minimum width
 			// 2) float maximum width
@@ -1018,16 +995,8 @@
 				"x: %ld-%ld, y: %ld-%ld\n",
 				Title(), minWidth, maxWidth, minHeight, maxHeight));
 
-//fDesktop->UnlockSingleWindow();
+			fWindow->SetSizeLimits(minWidth, maxWidth, minHeight, maxHeight);
 
-			if (fDesktop->LockAllWindows()) {
-				fWindow->SetSizeLimits(minWidth, maxWidth,
-					minHeight, maxHeight);
-				fDesktop->UnlockAllWindows();
-			}
-
-//fDesktop->LockSingleWindow();
-
 			// and now, sync the client to the limits that we were able to enforce
 			fWindow->GetSizeLimits(&minWidth, &maxWidth,
 				&minHeight, &maxHeight);
@@ -1045,6 +1014,7 @@
 
 		case AS_SET_DECORATOR_SETTINGS:
 		{
+			// Has the all-window look
 			DTRACE(("ServerWindow %s: Message AS_SET_DECORATOR_SETTINGS\n",
 				Title()));
 
@@ -1053,11 +1023,8 @@
 				char buffer[size];
 				if (link.Read(buffer, size) == B_OK) {
 					BMessage settings;
-					if (settings.Unflatten(buffer) == B_OK) {
-//fDesktop->UnlockSingleWindow();
+					if (settings.Unflatten(buffer) == B_OK)
 						fDesktop->SetWindowDecoratorSettings(fWindow, settings);
-//fDesktop->LockSingleWindow();
-					}
 				}
 			}
 			break;
@@ -1091,6 +1058,7 @@
 
 		case AS_SYSTEM_FONT_CHANGED:
 		{
+			// Has the all-window look
 			fDesktop->FontsChanged(fWindow);
 			// TODO: tell client about this, too, and relayout...
 			break;
@@ -1124,9 +1092,9 @@
 
 		case AS_GET_MOUSE:
 		{
+			// Has the all-window look
 			DTRACE(("ServerWindow %s: Message AS_GET_MOUSE\n", fTitle));
 
-//fDesktop->UnlockSingleWindow();
 			// Returns
 			// 1) BPoint mouse location
 			// 2) int32 button state
@@ -1134,7 +1102,6 @@
 			BPoint where;
 			int32 buttons;
 			fDesktop->GetLastMouseState(&where, &buttons);
-//fDesktop->LockSingleWindow();
 
 			fLink.StartMessage(B_OK);
 			fLink.Attach<BPoint>(where);
@@ -1165,15 +1132,14 @@
 		}
 		case AS_DIRECT_WINDOW_SET_FULLSCREEN:
 		{
+			// Has the all-window look
 			bool enable;
 			link.Read<bool>(&enable);
 
 			status_t status = B_OK;
-			if (fDirectWindowData != NULL) {
-//fDesktop->UnlockSingleWindow();
-				_DirectWindowSetFullScreen(enable);	
-//fDesktop->LockSingleWindow();
-			} else
+			if (fDirectWindowData != NULL)
+				_DirectWindowSetFullScreen(enable);
+			else
 				status = B_BAD_TYPE;
 
 			fLink.StartMessage(status);
@@ -1948,7 +1914,8 @@
 
 			// search for a picture with the specified token.
 			ServerPicture *picture = fServerApp->FindPicture(pictureToken);
-			// TODO: Increase that picture's reference count.(~ allocate a picture)
+			// TODO: Increase that picture's reference count.
+			// (~ allocate a picture)
 			if (picture == NULL)
 				break;
 
@@ -1967,7 +1934,7 @@
 			DTRACE(("ServerWindow %s: Message AS_VIEW_GET_CLIP_REGION: "
 				"View: %s\n", Title(), fCurrentView->Name()));
 
-			// if this View is hidden, it is clear that its visible region is void.
+			// if this view is hidden, it has no visible region
 			fLink.StartMessage(B_OK);
 			if (!fWindow->IsVisible() || !fCurrentView->IsVisible()) {
 				BRegion empty;
@@ -2078,7 +2045,8 @@
 				BMessage dragMessage;
 				if (link.Read(buffer, bufferSize) == B_OK
 					&& dragMessage.Unflatten(buffer) == B_OK) {
-						ServerBitmap* bitmap = fServerApp->FindBitmap(bitmapToken);
+						ServerBitmap* bitmap
+							= fServerApp->FindBitmap(bitmapToken);
 						// TODO: possible deadlock
 fDesktop->UnlockSingleWindow();
 						fDesktop->EventDispatcher().SetDragMessage(dragMessage,
@@ -2133,8 +2101,8 @@
 			link.Read<uint32>(&style);
 
 			// TODO: implement rect tracking (used sometimes for selecting
-			// a group of things, also sometimes used to appear to drag something,
-			// but without real drag message)
+			// a group of things, also sometimes used to appear to drag
+			// something, but without real drag message)
 			break;
 		}
 		case AS_VIEW_END_RECT_TRACK:
@@ -2194,8 +2162,7 @@
 }
 
 
-/*!
-	Dispatches all view drawing messages.
+/*!	Dispatches all view drawing messages.
 	The desktop clipping must be read locked when entering this method.
 	Requires a valid fCurrentView.
 */
@@ -2266,8 +2233,9 @@
 			// do not update the pen position actually call StrokeLine
 
 			// TODO: Decide where to put this, for example, it cannot be done
-			// for DrawString(), also there needs to be a decision, if penlocation
-			// is in View coordinates (I think it should be) or in screen coordinates.
+			// for DrawString(), also there needs to be a decision, if the pen
+			// location is in View coordinates (I think it should be) or in
+			// screen coordinates.
 			fCurrentView->CurrentState()->SetPenLocation(penPos);
 			break;
 		}
@@ -2324,8 +2292,8 @@
 			if (link.ReadGradient(&gradient) != B_OK)
 				break;
 
-			GTRACE(("ServerWindow %s: Message AS_FILL_RECT_GRADIENT: View: %s -> "
-				"BRect(%.1f, %.1f, %.1f, %.1f)\n", Title(),
+			GTRACE(("ServerWindow %s: Message AS_FILL_RECT_GRADIENT: View: %s "
+				"-> BRect(%.1f, %.1f, %.1f, %.1f)\n", Title(),
 				fCurrentView->Name(), rect.left, rect.top, rect.right,
 				rect.bottom));
 
@@ -2876,8 +2844,10 @@
 
 			picture->WriteSetDrawingMode((drawing_mode)drawingMode);
 
-			fCurrentView->CurrentState()->SetDrawingMode((drawing_mode)drawingMode);
-			fWindow->GetDrawingEngine()->SetDrawingMode((drawing_mode)drawingMode);
+			fCurrentView->CurrentState()->SetDrawingMode(
+				(drawing_mode)drawingMode);
+			fWindow->GetDrawingEngine()->SetDrawingMode(
+				(drawing_mode)drawingMode);
 			break;
 		}
 
@@ -3001,7 +2971,8 @@
 			BPoint radii((rect.Width() + 1) / 2, (rect.Height() + 1) / 2);
 			BPoint center = rect.LeftTop() + radii;
 
-			picture->WriteDrawArc(center, radii, startTheta, arcTheta, code == AS_FILL_ARC);
+			picture->WriteDrawArc(center, radii, startTheta, arcTheta,
+				code == AS_FILL_ARC);
 			break;
 		}
 
@@ -3172,7 +3143,8 @@
 
 				// This might seem a bit weird, but under R5, the shapes
 				// are always offset by the current pen location
-				BPoint penLocation = fCurrentView->CurrentState()->PenLocation();
+				BPoint penLocation
+					= fCurrentView->CurrentState()->PenLocation();
 				for (int32 i = 0; i < ptCount; i++) {
 					ptList[i] += penLocation;
 				}
@@ -3211,8 +3183,8 @@
 
 				ServerPicture *pictureToDraw = App()->FindPicture(token);
 				if (picture != NULL) {
-					// We need to make a copy of the picture, since it can change
-					// after it has been drawn
+					// We need to make a copy of the picture, since it can
+					// change after it has been drawn
 					ServerPicture *copy = App()->CreatePicture(pictureToDraw);
 					picture->NestPicture(copy);
 					picture->WriteDrawPicture(where, copy->Token());
@@ -3308,8 +3280,7 @@
 }
 
 
-/*!
-	\brief Message-dispatching loop for the ServerWindow
+/*!	\brief Message-dispatching loop for the ServerWindow
 
 	Watches the ServerWindow's message port and dispatches as necessary
 */
@@ -3341,7 +3312,7 @@
 
 		int32 code;
 		status_t status = receiver.GetNextMessage(code);
-		if (status < B_OK) {
+		if (status != B_OK) {
 			// that shouldn't happen, it's our port
 			printf("Someone deleted our message port!\n");
 
@@ -3358,8 +3329,10 @@
 
 #ifdef PROFILE_MESSAGE_LOOP
 		bigtime_t diff = system_time() - start;
-		if (diff > 10000)
-			printf("ServerWindow %s: lock acquisition took %Ld usecs\n", Title(), diff);
+		if (diff > 10000) {
+			printf("ServerWindow %s: lock acquisition took %Ld usecs\n",
+				Title(), diff);
+		}
 #endif
 
 		int32 messagesProcessed = 0;
@@ -3369,8 +3342,8 @@
 		while (true) {
 			if (code == AS_DELETE_WINDOW || code == kMsgQuitLooper) {
 				// this means the client has been killed
-				DTRACE(("ServerWindow %s received 'AS_DELETE_WINDOW' message code\n",
-					Title()));
+				DTRACE(("ServerWindow %s received 'AS_DELETE_WINDOW' message "
+					"code\n", Title()));
 
 				if (code == AS_DELETE_WINDOW) {
 					fLink.StartMessage(B_OK);
@@ -3382,7 +3355,8 @@
 
 				quitLoop = true;
 
-				// ServerWindow's destructor takes care of pulling this object off the desktop.
+				// ServerWindow's destructor takes care of pulling this object
+				// off the desktop.
 				ASSERT(fWindow->IsHidden());
 				break;
 			}
@@ -3435,15 +3409,18 @@
 #else
 				sMessageProfile[code].time += diff;
 #endif
-				if (diff > 10000)
-					printf("ServerWindow %s: message %ld took %Ld usecs\n", Title(), code, diff);
+				if (diff > 10000) {
+					printf("ServerWindow %s: message %ld took %Ld usecs\n",
+						Title(), code, diff);
+				}
 			}
 #endif
 
 			if (needsAllWindowsLocked)
 				fDesktop->UnlockAllWindows();
 
-			// only process up to 70 waiting messages at once (we have the Desktop locked)
+			// Only process up to 70 waiting messages at once (we have the
+			// Desktop locked)
 			if (!receiver.HasMessages() || ++messagesProcessed > 70) {
 				if (lockedDesktop)
 					fDesktop->UnlockSingleWindow();
@@ -3467,7 +3444,8 @@
 		Unlock();
 	}
 
-	// we were asked to quit the message loop - either on request or because of an error
+	// We were asked to quit the message loop - either on request or because of
+	// an error.
 	Quit();
 		// does not return
 }
@@ -3510,7 +3488,7 @@
 		return B_NO_MEMORY;
 
 	status_t status = fDirectWindowData->InitCheck();
-	if (status < B_OK) {
+	if (status != B_OK) {
 		delete fDirectWindowData;
 		fDirectWindowData = NULL;
 
@@ -3535,18 +3513,23 @@
 	// Don't issue a DirectConnected() notification
 	// if the connection is stopped, and we are called
 	// with bufferState == B_DIRECT_MODIFY.
-	if ((fDirectWindowData->buffer_info->buffer_state & B_DIRECT_MODE_MASK) == B_DIRECT_STOP
+	if ((fDirectWindowData->buffer_info->buffer_state & B_DIRECT_MODE_MASK)
+			== B_DIRECT_STOP
 		&& (bufferState & B_DIRECT_MODE_MASK) != B_DIRECT_START) {
 		return;
 	}
 
 	fDirectWindowData->started = true;
 
-	if (bufferState != -1)
-		fDirectWindowData->buffer_info->buffer_state = (direct_buffer_state)bufferState;
+	if (bufferState != -1) {
+		fDirectWindowData->buffer_info->buffer_state
+			= (direct_buffer_state)bufferState;
+	}
 
-	if (driverState != -1)
-		fDirectWindowData->buffer_info->driver_state = (direct_driver_state)driverState;
+	if (driverState != -1) {
+		fDirectWindowData->buffer_info->driver_state
+			= (direct_driver_state)driverState;
+	}
 
 	if ((bufferState & B_DIRECT_MODE_MASK) != B_DIRECT_STOP) {
 		// TODO: Locking ?
@@ -3554,6 +3537,7 @@
 		fDirectWindowData->buffer_info->bits = buffer->Bits();
 		fDirectWindowData->buffer_info->pci_bits = NULL; // TODO
 		fDirectWindowData->buffer_info->bytes_per_row = buffer->BytesPerRow();
+
 		switch (buffer->ColorSpace()) {
 			case B_RGB32:
 			case B_RGBA32:
@@ -3576,44 +3560,53 @@
 				fDirectWindowData->buffer_info->bits_per_pixel = 8;
 				break;
 			default:
-				fprintf(stderr, "unknown colorspace in HandleDirectConnection()!\n");
+				syslog(LOG_ERR,
+					"unknown colorspace in HandleDirectConnection()!\n");
 				fDirectWindowData->buffer_info->bits_per_pixel = 0;
 				break;
 		}
+
 		fDirectWindowData->buffer_info->pixel_format = buffer->ColorSpace();
 		fDirectWindowData->buffer_info->layout = B_BUFFER_NONINTERLEAVED;
-		fDirectWindowData->buffer_info->orientation = B_BUFFER_TOP_TO_BOTTOM; // TODO
-		fDirectWindowData->buffer_info->window_bounds = to_clipping_rect(fWindow->Frame());
+		fDirectWindowData->buffer_info->orientation = B_BUFFER_TOP_TO_BOTTOM;
+			// TODO
+		fDirectWindowData->buffer_info->window_bounds
+			= to_clipping_rect(fWindow->Frame());
 
 		// TODO: Review this
-		const int32 kMaxClipRectsCount = (DIRECT_BUFFER_INFO_AREA_SIZE - sizeof(direct_buffer_info))
-			/ sizeof(clipping_rect);
+		const int32 kMaxClipRectsCount = (DIRECT_BUFFER_INFO_AREA_SIZE
+			- sizeof(direct_buffer_info)) / sizeof(clipping_rect);
 
 		// We just want the region inside the window, border excluded.
 		BRegion clipRegion = fWindow->VisibleContentRegion();
 
-		fDirectWindowData->buffer_info->clip_list_count = min_c(clipRegion.CountRects(),
-			kMaxClipRectsCount);
+		fDirectWindowData->buffer_info->clip_list_count
+			= min_c(clipRegion.CountRects(), kMaxClipRectsCount);
 		fDirectWindowData->buffer_info->clip_bounds = clipRegion.FrameInt();
 
-		for (uint32 i = 0; i < fDirectWindowData->buffer_info->clip_list_count; i++)
-			fDirectWindowData->buffer_info->clip_list[i] = clipRegion.RectAtInt(i);
+		for (uint32 i = 0; i < fDirectWindowData->buffer_info->clip_list_count;
+				i++) {
+			fDirectWindowData->buffer_info->clip_list[i]
+				= clipRegion.RectAtInt(i);
+		}
 	}
 
-	// Releasing this sem causes the client to call BDirectWindow::DirectConnected()
+	// Releasing this semaphore causes the client to call
+	// BDirectWindow::DirectConnected()
 	release_sem(fDirectWindowData->sem);
 
 	// TODO: Waiting half a second in the ServerWindow thread is not a problem,
-	// but since we are called from the Desktop's thread too, very bad things could happen.
-	// Find some way to call this method only within ServerWindow's thread (messaging ?)
+	// but since we are called from the Desktop's thread too, very bad things
+	// could happen.
+	// Find some way to call this method only within ServerWindow's thread
+	// (messaging ?)
 	status_t status;
 	do {
-		// TODO: The timeout is 3000000 usecs (3 seconds) on beos.
-		// Test, but I think half a second is enough.
-		status = acquire_sem_etc(fDirectWindowData->sem_ack, 1, B_TIMEOUT, 500000);
+		status = acquire_sem_etc(fDirectWindowData->sem_ack, 1, B_TIMEOUT,
+			500000);
 	} while (status == B_INTERRUPTED);
 
-	if (status < B_OK) {
+	if (status != B_OK) {
 		// The client application didn't release the semaphore
 		// within the given timeout. Or something else went wrong.
 		// Deleting this member should make it crash.
@@ -3639,8 +3632,8 @@
 		&& fWindow->InUpdate()) {
 		DrawingEngine* drawingEngine = fWindow->GetDrawingEngine();
 		if (drawingEngine->LockParallelAccess()) {
-
-			fWindow->GetEffectiveDrawingRegion(fCurrentView, fCurrentDrawingRegion);
+			fWindow->GetEffectiveDrawingRegion(fCurrentView,
+				fCurrentDrawingRegion);
 			fCurrentDrawingRegionValid = true;
 			BRegion dirty(fCurrentDrawingRegion);
 
@@ -3666,9 +3659,9 @@
 	// "offsets" passed below would need to be updated again
 	DrawingEngine* drawingEngine = fWindow->GetDrawingEngine();
 	if (view && drawingEngine) {
-		BPoint p(0, 0);
-		view->ConvertToScreenForDrawing(&p);
-		drawingEngine->SetDrawState(view->CurrentState(), p.x, p.y);
+		BPoint leftTop(0, 0);
+		view->ConvertToScreenForDrawing(&leftTop);
+		drawingEngine->SetDrawState(view->CurrentState(), leftTop.x, leftTop.y);
 	}
 }
 
@@ -3678,8 +3671,7 @@
 {
 	if (!fCurrentDrawingRegionValid
 		|| fWindow->DrawingRegionChanged(fCurrentView)) {
-		fWindow->GetEffectiveDrawingRegion(fCurrentView,
-			fCurrentDrawingRegion);
+		fWindow->GetEffectiveDrawingRegion(fCurrentView, fCurrentDrawingRegion);
 		fCurrentDrawingRegionValid = true;
 	}
 }
@@ -3720,18 +3712,16 @@
 {
 	if (enable) {
 		fDesktop->HWInterface()->SetCursorVisible(false);
-		
+
 		fDirectWindowData->old_window_frame = fWindow->Frame();
 		BRect screenFrame =
 			fDesktop->ActiveScreen()->Frame();
 		fDirectWindowFeel = fWindow->Feel();
-		fDesktop->MoveWindowBy(fWindow,
-			- fWindow->Frame().left,
-			- fWindow->Frame().top);
+		fDesktop->MoveWindowBy(fWindow, -fWindow->Frame().left,
+			-fWindow->Frame().top);
 		fDesktop->ResizeWindowBy(fWindow,
 			screenFrame.Width() - fWindow->Frame().Width(),
-			screenFrame.Height() 
-				- fWindow->Frame().Height());
+			screenFrame.Height() - fWindow->Frame().Height());
 	} else {
 		const BRect &oldFrame = fDirectWindowData->old_window_frame;
 		fDesktop->MoveWindowBy(fWindow,
@@ -3740,8 +3730,8 @@
 		fDesktop->ResizeWindowBy(fWindow,
 			oldFrame.Width() - fWindow->Frame().Width(),
 			oldFrame.Height() - fWindow->Frame().Height());
-			
-		fDesktop->HWInterface()->SetCursorVisible(true);			
+
+		fDesktop->HWInterface()->SetCursorVisible(true);
 	}
 
 	fDesktop->SetWindowFeel(fWindow,
@@ -3750,7 +3740,7 @@
 
 
 status_t
-ServerWindow::PictureToRegion(ServerPicture *picture, BRegion &region,
+ServerWindow::PictureToRegion(ServerPicture* picture, BRegion& region,
 	bool inverse, BPoint where)
 {
 	fprintf(stderr, "ServerWindow::PictureToRegion() not implemented\n");

Modified: haiku/trunk/src/servers/app/ServerWindow.h
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.h	2009-08-11 07:47:49 UTC (rev 32242)
+++ haiku/trunk/src/servers/app/ServerWindow.h	2009-08-11 09:25:26 UTC (rev 32243)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -61,8 +61,6 @@
 
 			::EventTarget&		EventTarget() { return fEventTarget; }
 
-			void				ReplaceDecorator();
-
 			// methods for sending various messages to client.
 			void				NotifyQuitRequested();
 			void				NotifyMinimize(bool minimize);
@@ -105,7 +103,8 @@
 			void				ResyncDrawState();
 
 						// TODO: Change this
-	inline	void				UpdateCurrentDrawingRegion() { _UpdateCurrentDrawingRegion(); };
+	inline	void				UpdateCurrentDrawingRegion()
+									{ _UpdateCurrentDrawingRegion(); };
 
 private:
 			View*				_CreateView(BPrivate::LinkReceiver &link,
@@ -115,7 +114,8 @@
 			void				_Hide();
 
 			// message handling methods.
-			void				_DispatchMessage(int32 code, BPrivate::LinkReceiver &link);
+			void				_DispatchMessage(int32 code,
+									BPrivate::LinkReceiver &link);
 			void				_DispatchViewMessage(int32 code,
 									BPrivate::LinkReceiver &link);
 			void				_DispatchViewDrawingMessage(int32 code,
@@ -130,12 +130,13 @@
 
 			void				_SetCurrentView(View* view);
 			void				_UpdateDrawState(View* view);
-public:
 			void				_UpdateCurrentDrawingRegion();
-private:
-			bool				_MessageNeedsAllWindowsLocked(uint32 code) const;
 
+			bool				_MessageNeedsAllWindowsLocked(
+									uint32 code) const;
+
 			void				_DirectWindowSetFullScreen(bool set);
+
 			// TODO: Move me elsewhere
 			status_t			PictureToRegion(ServerPicture *picture,
 									BRegion& region, bool inverse,



From axeld at mail.berlios.de  Tue Aug 11 12:01:38 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 11 Aug 2009 12:01:38 +0200
Subject: [Haiku-commits] r32244 - haiku/trunk/src/servers/app
Message-ID: <200908111001.n7BA1c76001605@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 12:01:37 +0200 (Tue, 11 Aug 2009)
New Revision: 32244
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32244&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerApp.cpp
   haiku/trunk/src/servers/app/ServerApp.h
Log:
* Cleanup, no functional change.


Modified: haiku/trunk/src/servers/app/ServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.cpp	2009-08-11 09:25:26 UTC (rev 32243)
+++ haiku/trunk/src/servers/app/ServerApp.cpp	2009-08-11 10:01:37 UTC (rev 32244)
@@ -13,11 +13,33 @@
  *		Philippe Saint-Pierre, stpere at gmail.com
  */
 
-/*!
-	\class ServerApp ServerApp.h
+
+/*!	\class ServerApp ServerApp.h
 	\brief Counterpart to BApplication within the app_server
 */
 
+
+#include "ServerApp.h"
+
+#include <new>
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+
+#include <AppDefs.h>
+#include <Autolock.h>
+#include <Debug.h>
+#include <List.h>
+#include <ScrollBar.h>
+#include <Shape.h>
+#include <String.h>
+
+#include <FontPrivate.h>
+#include <MessengerPrivate.h>
+#include <RosterPrivate.h>
+#include <ServerProtocol.h>
+#include <WindowPrivate.h>
+
 #include "AppServer.h"
 #include "BitmapManager.h"
 #include "CursorManager.h"
@@ -31,7 +53,6 @@
 #include "InputManager.h"
 #include "OffscreenServerWindow.h"
 #include "Screen.h"
-#include "ServerApp.h"
 #include "ServerBitmap.h"
 #include "ServerConfig.h"
 #include "ServerCursor.h"
@@ -41,26 +62,7 @@
 #include "SystemPalette.h"
 #include "Window.h"
 
-#include <FontPrivate.h>
-#include <MessengerPrivate.h>
-#include <RosterPrivate.h>
-#include <ServerProtocol.h>
-#include <WindowPrivate.h>
 
-#include <AppDefs.h>
-#include <Autolock.h>
-#include <Debug.h>
-#include <List.h>
-#include <ScrollBar.h>
-#include <Shape.h>
-#include <String.h>
-
-#include <new>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-
-
 //#define DEBUG_SERVERAPP
 #ifdef DEBUG_SERVERAPP
 #	define STRACE(x) debug_printf x
@@ -84,7 +86,8 @@
 ServerApp::ServerApp(Desktop* desktop, port_id clientReplyPort,
 		port_id clientLooperPort, team_id clientTeam,
 		int32 clientToken, const char* signature)
-	: MessageLooper("application"),
+	:
+	MessageLooper("application"),
 
 	fMessagePort(-1),
 	fClientReplyPort(clientReplyPort),
@@ -160,8 +163,8 @@
 	for (int32 i = fWindowList.CountItems(); i-- > 0;) {
 		ServerWindow* window = fWindowList.ItemAt(i);
 
-		// a window could have been remove in the mean time (if those 20 millisecs
-		// from above weren't enough)
+		// A window could have been removed in the mean time
+		// (if those 20 milli seconds from above weren't enough)
 		if (window == NULL)
 			continue;
 
@@ -183,7 +186,7 @@
 	}
 
 	for (int32 i = fBitmapList.CountItems(); i-- > 0;) {
-		gBitmapManager->DeleteBitmap(static_cast<ServerBitmap *>(fBitmapList.ItemAt(i)));
+		gBitmapManager->DeleteBitmap((ServerBitmap*)fBitmapList.ItemAt(i));
 	}
 
 	for (int32 i = fPictureList.CountItems(); i-- > 0;) {
@@ -196,8 +199,7 @@
 }
 
 
-/*!
-	\brief Checks if the application was initialized correctly
+/*!	\brief Checks if the application was initialized correctly
 */
 status_t
 ServerApp::InitCheck()
@@ -215,8 +217,7 @@
 }
 
 
-/*!
-	\brief This quits the application and deletes it. You're not supposed
+/*!	\brief This quits the application and deletes it. You're not supposed
 		to call its destructor directly.
 
 	At the point you're calling this method, the application should already
@@ -239,16 +240,18 @@
 }
 
 
-/*!
-	\brief Send a message to the ServerApp's BApplication
-	\param msg The message to send
+/*!	\brief Send a message to the ServerApp's BApplication
+	\param message The message to send
 */
 void
-ServerApp::SendMessageToClient(BMessage *msg) const
+ServerApp::SendMessageToClient(BMessage* message) const
 {
-	status_t status = fHandlerMessenger.SendMessage(msg, (BHandler*)NULL, 100000);
-	if (status != B_OK)
-		printf("app %s send to client failed: %s\n", Signature(), strerror(status));
+	status_t status = fHandlerMessenger.SendMessage(message, (BHandler*)NULL,
+		100000);
+	if (status != B_OK) {
+		syslog(LOG_ERR, "app %s send to client failed: %s\n", Signature(),
+			strerror(status));
+	}
 }
 
 
@@ -268,8 +271,7 @@
 }
 
 
-/*!
-	\brief Sets the ServerApp's active status
+/*!	\brief Sets the ServerApp's active status
 	\param value The new status of the ServerApp.
 
 	This changes an internal flag and also sets the current cursor to the one
@@ -332,8 +334,7 @@
 }
 
 
-/*!
-	\brief The thread function ServerApps use to monitor messages
+/*!	\brief The thread function ServerApps use to monitor messages
 */
 void
 ServerApp::_MessageLooper()
@@ -352,9 +353,11 @@
 	status_t err = B_OK;
 
 	while (!fQuitting) {
-		STRACE(("info: ServerApp::_MessageLooper() listening on port %ld.\n", fMessagePort));
+		STRACE(("info: ServerApp::_MessageLooper() listening on port %ld.\n",
+			fMessagePort));
+
 		err = receiver.GetNextMessage(code, B_INFINITE_TIMEOUT);
-		if (err < B_OK || code == B_QUIT_REQUESTED) {
+		if (err != B_OK || code == B_QUIT_REQUESTED) {
 			STRACE(("ServerApp: application seems to be gone...\n"));
 
 			// Tell desktop to quit us
@@ -373,12 +376,15 @@
 
 			case AS_QUIT_APP:
 			{
-				// This message is received only when the app_server is asked to shut down in
-				// test/debug mode. Of course, if we are testing while using AccelerantDriver, we do
-				// NOT want to shut down client applications. The server can be quit o in this fashion
-				// through the driver's interface, such as closing the ViewDriver's window.
+				// This message is received only when the app_server is asked to
+				// shut down in test/debug mode. Of course, if we are testing
+				// while using AccelerantDriver, we do NOT want to shut down
+				// client applications. The server can be quit in this fashion
+				// through the driver's interface, such as closing the
+				// ViewDriver's window.
 
-				STRACE(("ServerApp %s:Server shutdown notification received\n", Signature()));
+				STRACE(("ServerApp %s:Server shutdown notification received\n",
+					Signature()));
 
 				// If we are using the real, accelerated version of the
 				// DrawingEngine, we do NOT want the user to be able shut down
@@ -391,7 +397,8 @@
 			}
 
 			default:
-				STRACE(("ServerApp %s: Got a Message to dispatch\n", Signature()));
+				STRACE(("ServerApp %s: Got a Message to dispatch\n",
+					Signature()));
 				_DispatchMessage(code, receiver);
 				break;
 		}
@@ -409,8 +416,7 @@
 }
 
 
-/*!
-	\brief Handler function for BApplication API messages
+/*!	\brief Handler function for BApplication API messages
 	\param code Identifier code for the message. Equivalent to BMessage::what
 	\param buffer Any attachments
 
@@ -424,15 +430,16 @@
 	switch (code) {
 		case AS_REGISTER_INPUT_SERVER:
 		{
-			EventStream* stream = new (nothrow) InputServerStream(fHandlerMessenger);
+			EventStream* stream
+				= new(std::nothrow) InputServerStream(fHandlerMessenger);
 			if (stream != NULL
 				&& (!stream->IsValid() || !gInputManager->AddStream(stream))) {
 				delete stream;
 				break;
 			}
 
-			// TODO: this should be done using notifications (so that an abandoned
-			//	stream will get noticed directly)
+			// TODO: this should be done using notifications (so that an
+			// abandoned stream will get noticed directly)
 			if (fDesktop->EventDispatcher().InitCheck() != B_OK)
 				fDesktop->EventDispatcher().SetTo(gInputManager->GetStream());
 			break;
@@ -538,9 +545,6 @@
 
 		case AS_SET_DECORATOR:
 		{
-			// Received from an application when the user wants to set the window
-			// decorator to a new one
-
 			// Attached Data:
 			// int32 the index of the decorator to use
 
@@ -581,8 +585,8 @@
 		}
 		case AS_R5_SET_DECORATOR:
 		{
-			// Sort of supports Tracker's nifty Easter Egg. It was easy to do and
-			// it's kind of neat, so why not?
+			// Sort of supports Tracker's nifty Easter Egg. It was easy to do
+			// and it's kind of neat, so why not?
 
 			// Attached Data:
 			// int32 value of the decorator to use
@@ -601,7 +605,9 @@
 		}
 		case AS_CREATE_BITMAP:
 		{
-			STRACE(("ServerApp %s: Received BBitmap creation request\n", Signature()));
+			STRACE(("ServerApp %s: Received BBitmap creation request\n",
+				Signature()));
+
 			// Allocate a bitmap for an application
 
 			// Attached Data:
@@ -617,7 +623,7 @@
 			//	3) int32 area pointer offset used to calculate fBasePtr
 
 			// First, let's attempt to allocate the bitmap
-			ServerBitmap *bitmap = NULL;
+			ServerBitmap* bitmap = NULL;
 			uint8 allocationFlags = kAllocator;
 
 			BRect frame;
@@ -631,10 +637,11 @@
 			link.Read<uint32>(&flags);
 			link.Read<int32>(&bytesPerRow);
 			if (link.Read<screen_id>(&screenID) == B_OK) {
-				// TODO: choose the right HWInterface with regards to the screenID
+				// TODO: choose the right HWInterface with regards to the
+				// screenID
 				bitmap = gBitmapManager->CreateBitmap(&fMemoryAllocator,
-					*fDesktop->HWInterface(), frame, colorSpace, flags, bytesPerRow,
-					screenID, &allocationFlags);
+					*fDesktop->HWInterface(), frame, colorSpace, flags,
+					bytesPerRow, screenID, &allocationFlags);
 			}
 
 			STRACE(("ServerApp %s: Create Bitmap (%.1fx%.1f)\n",
@@ -647,8 +654,10 @@
 				fLink.Attach<int32>(bitmap->Token());
 				fLink.Attach<uint8>(allocationFlags);
 
-				fLink.Attach<area_id>(fMemoryAllocator.Area(bitmap->AllocationCookie()));
-				fLink.Attach<int32>(fMemoryAllocator.AreaOffset(bitmap->AllocationCookie()));
+				fLink.Attach<area_id>(
+					fMemoryAllocator.Area(bitmap->AllocationCookie()));
+				fLink.Attach<int32>(
+					fMemoryAllocator.AreaOffset(bitmap->AllocationCookie()));
 
 				if (allocationFlags & kFramebuffer)
 					fLink.Attach<int32>(bitmap->BytesPerRow());
@@ -664,7 +673,9 @@
 		}
 		case AS_DELETE_BITMAP:
 		{
-			STRACE(("ServerApp %s: received BBitmap delete request\n", Signature()));
+			STRACE(("ServerApp %s: received BBitmap delete request\n",
+				Signature()));
+
 			// Delete a bitmap's allocated memory
 
 			// Attached Data:
@@ -674,7 +685,8 @@
 
 			ServerBitmap *bitmap = FindBitmap(token);
 			if (bitmap && fBitmapList.RemoveItem(bitmap)) {
-				STRACE(("ServerApp %s: Deleting Bitmap %ld\n", Signature(), token));
+				STRACE(("ServerApp %s: Deleting Bitmap %ld\n", Signature(),
+					token));
 
 				gBitmapManager->DeleteBitmap(bitmap);
 			}
@@ -691,8 +703,8 @@
 
 			ServerBitmap *bitmap = FindBitmap(token);
 			if (bitmap != NULL) {
-				STRACE(("ServerApp %s: Get overlay restrictions for bitmap %ld\n",
-					Signature(), token));
+				STRACE(("ServerApp %s: Get overlay restrictions for bitmap "
+					"%ld\n", Signature(), token));
 
 				status = fDesktop->HWInterface()->GetOverlayRestrictions(
 					bitmap->Overlay(), &restrictions);
@@ -881,7 +893,9 @@
 		}
 		case AS_QUERY_CURSOR_HIDDEN:
 		{
-			STRACE(("ServerApp %s: Received IsCursorHidden request\n", Signature()));
+			STRACE(("ServerApp %s: Received IsCursorHidden request\n",
+				Signature()));
+
 			fLink.StartMessage(fCursorHideLevel > 0 ? B_OK : B_ERROR);
 			fLink.Flush();
 			break;
@@ -893,7 +907,8 @@
 			// Attached data:
 			// 1) bool flag to send a reply
 			// 2) int32 token ID of the cursor to set
-			// 3) port_id port to receive a reply. Only exists if the sync flag is true.
+			// 3) port_id port to receive a reply. Only exists if the sync flag
+			//    is true.
 			bool sync;
 			int32 token;
 
@@ -961,10 +976,8 @@
 					// The cursor might need to be updated now.
 					Window* window = view->Window();
 					if (window != NULL && window->IsFocus()) {
-						if (fDesktop->ViewUnderMouse(window)
-							== view->Token()) {
+						if (fDesktop->ViewUnderMouse(window) == view->Token())
 							SetCurrentCursor(cursor);
-						}
 					}
 				}
 
@@ -1017,7 +1030,8 @@
 			}
 
 			if (cursor != NULL) {
-				// Synchronous message - BApplication is waiting on the cursor's ID
+				// Synchronous message - BApplication is waiting on the
+				// cursor's ID
 				fLink.StartMessage(B_OK);
 				fLink.Attach<int32>(cursor->Token());
 			} else
@@ -1139,7 +1153,8 @@
 
 		case AS_SET_MOUSE_MODE:
 		{
-			STRACE(("ServerApp %s: Set Focus Follows Mouse mode\n", Signature()));
+			STRACE(("ServerApp %s: Set Focus Follows Mouse mode\n",
+				Signature()));
 			// Attached Data:
 			// 1) enum mode_mouse FFM mouse mode
 			mode_mouse mouseMode;
@@ -1151,7 +1166,8 @@
 		}
 		case AS_GET_MOUSE_MODE:
 		{
-			STRACE(("ServerApp %s: Get Focus Follows Mouse mode\n", Signature()));
+			STRACE(("ServerApp %s: Get Focus Follows Mouse mode\n",
+				Signature()));
 
 			if (fDesktop->LockSingleWindow()) {
 				DesktopSettings settings(fDesktop);
@@ -1241,7 +1257,8 @@
 				&& link.Read<float>(&size) == B_OK) {
 				gFontManager->Lock();
 
-				FontStyle* style = gFontManager->GetStyle(familyName, styleName);
+				FontStyle* style
+					= gFontManager->GetStyle(familyName, styleName);
 				if (style != NULL) {
 					ServerFont font(*style, size);
 					gFontManager->Unlock();
@@ -1361,7 +1378,8 @@
 			STRACE(("ServerApp %s: AS_GET_FONT_LIST_REVISION\n", Signature()));
 
 			fLink.StartMessage(B_OK);
-			fLink.Attach<int32>(gFontManager->CheckRevision(fDesktop->UserID()));
+			fLink.Attach<int32>(
+				gFontManager->CheckRevision(fDesktop->UserID()));
 			fLink.Flush();
 			break;
 		}
@@ -1438,7 +1456,9 @@
 		}
 		case AS_GET_FAMILY_AND_STYLE_IDS:
 		{
-			FTRACE(("ServerApp %s: AS_GET_FAMILY_AND_STYLE_IDS\n", Signature()));
+			FTRACE(("ServerApp %s: AS_GET_FAMILY_AND_STYLE_IDS\n",
+				Signature()));
+
 			// Attached Data:
 			// 1) font_family - name of font family to use
 			// 2) font_style - name of style in family
@@ -1882,11 +1902,11 @@
 			uint32 numBytes;
 			link.Read<uint32>(&numBytes);
 
-			char *charArray = new (nothrow) char[numBytes];
-			BPoint *escapements = new (nothrow) BPoint[numChars];
-			BPoint *offsets = NULL;
+			char* charArray = new(std::nothrow) char[numBytes];
+			BPoint* escapements = new(std::nothrow) BPoint[numChars];
+			BPoint* offsets = NULL;
 			if (wantsOffsets)
-				offsets = new (nothrow) BPoint[numChars];
+				offsets = new(std::nothrow) BPoint[numChars];
 
 			if (charArray == NULL || escapements == NULL
 				|| (offsets == NULL && wantsOffsets)) {
@@ -2042,23 +2062,23 @@
 			// Returns:
 			// 1) BRect - rects with numChar entries
 
-			uint16 famid, styid;
+			uint16 familyID, styleID;
 			uint32 flags;
-			float ptsize, rotation, shear, falseBoldWidth;
+			float size, rotation, shear, falseBoldWidth;
 			uint8 spacing;
 			font_metric_mode mode;
-			bool string_escapement;
+			bool stringEscapement;
 
-			link.Read<uint16>(&famid);
-			link.Read<uint16>(&styid);
-			link.Read<float>(&ptsize);
+			link.Read<uint16>(&familyID);
+			link.Read<uint16>(&styleID);
+			link.Read<float>(&size);
 			link.Read<float>(&rotation);
 			link.Read<float>(&shear);
 			link.Read<float>(&falseBoldWidth);
 			link.Read<uint8>(&spacing);
 			link.Read<uint32>(&flags);
 			link.Read<font_metric_mode>(&mode);
-			link.Read<bool>(&string_escapement);
+			link.Read<bool>(&stringEscapement);
 
 			escapement_delta delta;
 			link.Read<escapement_delta>(&delta);
@@ -2069,43 +2089,49 @@
 			uint32 numBytes;
 			link.Read<uint32>(&numBytes);
 
-			// TODO: proper error checking
-			char *charArray = new (nothrow) char[numBytes];
-			link.Read(charArray, numBytes);
+			bool success = false;
 
-			BRect rectArray[numChars];
-			// figure out escapements
+			char* charArray = new(std::nothrow) char[numBytes];
+			BRect* rectArray = new(std::nothrow) BRect[numChars];
+			if (charArray != NULL && rectArray != NULL) {
+				link.Read(charArray, numBytes);
 
-			ServerFont font;
-			bool success = false;
-			if (font.SetFamilyAndStyle(famid, styid) == B_OK) {
-				font.SetSize(ptsize);
-				font.SetRotation(rotation);
-				font.SetShear(shear);
-				font.SetFalseBoldWidth(falseBoldWidth);
-				font.SetSpacing(spacing);
-				font.SetFlags(flags);
+				// figure out escapements
 
-				// TODO implement for real
-				if (font.GetBoundingBoxes(charArray, numBytes,
-					rectArray, string_escapement, mode, delta,
-					code == AS_GET_BOUNDINGBOXES_STRING) == B_OK) {
-					fLink.StartMessage(B_OK);
-					fLink.Attach(rectArray, sizeof(rectArray));
-					success = true;
+				ServerFont font;
+				if (font.SetFamilyAndStyle(familyID, styleID) == B_OK) {
+					font.SetSize(size);
+					font.SetRotation(rotation);
+					font.SetShear(shear);
+					font.SetFalseBoldWidth(falseBoldWidth);
+					font.SetSpacing(spacing);
+					font.SetFlags(flags);
+
+					// TODO: implement for real
+					if (font.GetBoundingBoxes(charArray, numBytes,
+							rectArray, stringEscapement, mode, delta,
+							code == AS_GET_BOUNDINGBOXES_STRING) == B_OK) {
+						fLink.StartMessage(B_OK);
+						fLink.Attach(rectArray, sizeof(rectArray));
+						success = true;
+					}
 				}
 			}
 
 			if (!success)
 				fLink.StartMessage(B_ERROR);
 
+			fLink.Flush();
+
 			delete[] charArray;
-			fLink.Flush();
+			delete[] rectArray;
 			break;
 		}
 		case AS_GET_BOUNDINGBOXES_STRINGS:
 		{
-			FTRACE(("ServerApp %s: AS_GET_BOUNDINGBOXES_STRINGS\n", Signature()));
+			FTRACE(("ServerApp %s: AS_GET_BOUNDINGBOXES_STRINGS\n",
+				Signature()));
+
 			// Attached Data:
 			// 1) uint16 - family ID
 			// 2) uint16 - style ID
@@ -2126,14 +2152,14 @@
 			// Returns:
 			// 1) BRect - rects with numStrings entries
 
-			uint16 famid, styid;
+			uint16 familyID, styleID;
 			uint32 flags;
 			float ptsize, rotation, shear, falseBoldWidth;
 			uint8 spacing;
 			font_metric_mode mode;
 
-			link.Read<uint16>(&famid);
-			link.Read<uint16>(&styid);
+			link.Read<uint16>(&familyID);
+			link.Read<uint16>(&styleID);
 			link.Read<float>(&ptsize);
 			link.Read<float>(&rotation);
 			link.Read<float>(&shear);
@@ -2146,19 +2172,22 @@
 			link.Read<int32>(&numStrings);
 
 			escapement_delta deltaArray[numStrings];
-			char *stringArray[numStrings];
+			char* stringArray[numStrings];
 			int32 lengthArray[numStrings];
-			for(int32 i=0; i<numStrings; i++) {
-				// This version of ReadString allocates the strings, we free them below
-				link.ReadString(&stringArray[i], (size_t *)&lengthArray[i]);
+			for(int32 i = 0; i < numStrings; i++) {
+				// This version of ReadString allocates the strings, we free
+				// them below
+				// TODO: this does not work on 64-bit (size_t != int32)
+				link.ReadString(&stringArray[i], (size_t*)&lengthArray[i]);
 				link.Read<escapement_delta>(&deltaArray[i]);
 			}
 
+			// TODO: don't do this on the heap! (at least check the size before)
 			BRect rectArray[numStrings];
 
 			ServerFont font;
 			bool success = false;
-			if (font.SetFamilyAndStyle(famid, styid) == B_OK) {
+			if (font.SetFamilyAndStyle(familyID, styleID) == B_OK) {
 				font.SetSize(ptsize);
 				font.SetRotation(rotation);
 				font.SetShear(shear);
@@ -2184,7 +2213,7 @@
 			break;
 		}
 
-		/* screen commands */
+		// Screen commands
 
 		case AS_VALID_SCREEN_ID:
 		{
@@ -2258,8 +2287,8 @@
 
 			// TODO: the display_mode can be different between
 			// the various screens.
-			// We have the screen_id and the workspace number, with these
-			// we need to find the corresponding "driver", and call getmode on it
+			// We have the screen_id and the workspace number, with these we
+			// need to find the corresponding "driver", and call getmode on it
 			display_mode mode;
 			fDesktop->ScreenAt(0)->GetMode(&mode);
 			// actually this isn't still enough as different workspaces can
@@ -2829,12 +2858,13 @@
 		ServerBitmap* bitmap = FindBitmap(bitmapToken);
 
 		if (bitmap != NULL) {
-			window = new (nothrow) OffscreenServerWindow(title, this, clientReplyPort,
-				looperPort, token, bitmap);
+			window = new (nothrow) OffscreenServerWindow(title, this,
+				clientReplyPort, looperPort, token, bitmap);
 		} else
 			status = B_ERROR;
 	} else {
-		window = new (nothrow) ServerWindow(title, this, clientReplyPort, looperPort, token);
+		window = new (nothrow) ServerWindow(title, this, clientReplyPort,
+			looperPort, token);
 		STRACE(("\nServerApp %s: New Window %s (%g:%g, %g:%g)\n",
 			Signature(), title, frame.left, frame.top,
 			frame.right, frame.bottom));
@@ -2847,7 +2877,8 @@
 		status = window->Init(frame, (window_look)look, (window_feel)feel,
 			flags, workspaces);
 		if (status == B_OK && !window->Run()) {
-			fprintf(stderr, "ServerApp::_CreateWindow() - failed to run the window thread\n");
+			syslog(LOG_ERR, "ServerApp::_CreateWindow() - failed to run the "
+				"window thread\n");
 			status = B_ERROR;
 		}
 
@@ -2896,7 +2927,8 @@
 
 		// only normal and unhidden windows count
 
-		if (window->IsNormal() && !window->IsHidden() && window->InWorkspace(index))
+		if (window->IsNormal() && !window->IsHidden()
+			&& window->InWorkspace(index))
 			return true;
 	}
 
@@ -2939,8 +2971,7 @@
 }
 
 
-/*!
-	\brief Looks up a ServerApp's ServerBitmap in its list
+/*!	\brief Looks up a ServerApp's ServerBitmap in its list
 	\param token ID token of the bitmap to find
 	\return The bitmap having that ID or NULL if not found
 */
@@ -2963,14 +2994,14 @@
 }
 
 
-ServerPicture *
-ServerApp::CreatePicture(const ServerPicture *original)
+ServerPicture*
+ServerApp::CreatePicture(const ServerPicture* original)
 {
-	ServerPicture *picture;
+	ServerPicture* picture;
 	if (original != NULL)
-		picture = new (nothrow) ServerPicture(*original);
+		picture = new(std::nothrow) ServerPicture(*original);
 	else
-		picture = new (nothrow) ServerPicture();
+		picture = new(std::nothrow) ServerPicture();
 
 	if (picture != NULL)
 		fPictureList.AddItem(picture);
@@ -2979,8 +3010,8 @@
 }
 
 
-ServerPicture *
-ServerApp::FindPicture(const int32 &token) const
+ServerPicture*
+ServerApp::FindPicture(int32 token) const
 {
 	// TODO: we need to make sure the picture is ours?!
 	ServerPicture* picture;
@@ -2992,9 +3023,9 @@
 
 
 bool
-ServerApp::DeletePicture(const int32 &token)
+ServerApp::DeletePicture(int32 token)
 {
-	ServerPicture *picture = FindPicture(token);
+	ServerPicture* picture = FindPicture(token);
 	if (picture == NULL)
 		return false;
 
@@ -3012,4 +3043,3 @@
 {
 	return fClientTeam;
 }
-

Modified: haiku/trunk/src/servers/app/ServerApp.h
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.h	2009-08-11 09:25:26 UTC (rev 32243)
+++ haiku/trunk/src/servers/app/ServerApp.h	2009-08-11 10:01:37 UTC (rev 32244)
@@ -39,7 +39,7 @@
 };
 
 class ServerApp : public MessageLooper {
- public:
+public:
 								ServerApp(Desktop* desktop,
 										  port_id clientAppPort,
 										  port_id clientLooperPort,
@@ -57,7 +57,7 @@
 		\brief Determines whether the application is the active one
 		\return true if active, false if not.
 	*/
-			bool				IsActive(void) const { return fIsActive; }
+			bool				IsActive() const { return fIsActive; }
 			void				Activate(bool value);
 
 			void				SendMessageToClient(BMessage* message) const;
@@ -66,22 +66,27 @@
 			ServerCursor*		CurrentCursor() const;
 
 			team_id				ClientTeam() const;
-			const char*			Signature() const { return fSignature.String(); }
-			const char*			SignatureLeaf() const { return fSignature.String() + 12; }
 
+			const char*			Signature() const
+									{ return fSignature.String(); }
+			const char*			SignatureLeaf() const
+									{ return fSignature.String() + 12; }
+
 			bool				AddWindow(ServerWindow* window);
 			void				RemoveWindow(ServerWindow* window);
 			bool				InWorkspace(int32 index) const;
 			uint32				Workspaces() const;
-			int32				InitialWorkspace() const { return fInitialWorkspace; }
+			int32				InitialWorkspace() const
+									{ return fInitialWorkspace; }
 
 			int32				CountBitmaps() const;
 			ServerBitmap*		FindBitmap(int32 token) const;
 
 			int32				CountPictures() const;
-			ServerPicture*		CreatePicture(const ServerPicture* original = NULL);
-			ServerPicture*		FindPicture(const int32& token) const;
-			bool				DeletePicture(const int32& token);
+			ServerPicture*		CreatePicture(
+									const ServerPicture* original = NULL);
+			ServerPicture*		FindPicture(int32 token) const;
+			bool				DeletePicture(int32 token);
 
 			Desktop*			GetDesktop() const { return fDesktop; }
 
@@ -89,14 +94,14 @@
 
 			BPrivate::BTokenSpace& ViewTokens() { return fViewTokens; }
 
- private:
+private:
 	virtual	void				_DispatchMessage(int32 code,
-												 BPrivate::LinkReceiver& link);
+									BPrivate::LinkReceiver& link);
 	virtual	void				_MessageLooper();
 	virtual	void				_GetLooperName(char* name, size_t size);
 			status_t			_CreateWindow(int32 code,
-											  BPrivate::LinkReceiver& link,
-											  port_id& clientReplyPort);
+									BPrivate::LinkReceiver& link,
+									port_id& clientReplyPort);
 
 			bool				_HasWindowUnderMouse();
 
@@ -124,10 +129,9 @@
 
 			int32				fInitialWorkspace;
 
-		// NOTE: Bitmaps and Pictures are stored globally, but ServerApps remember
-		// which ones they own so that they can destroy them when they quit.
-		// TODO:
-		// - As we reference these stuff by token, what about putting them in hash tables ?
+			// NOTE: Bitmaps and Pictures are stored globally, but ServerApps
+			// remember which ones they own so that they can destroy them when
+			// they quit.
 			BList				fBitmapList;
 			BList				fPictureList;
 



From axeld at mail.berlios.de  Tue Aug 11 12:03:47 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 11 Aug 2009 12:03:47 +0200
Subject: [Haiku-commits] r32245 - haiku/trunk/src/servers/app
Message-ID: <200908111003.n7BA3lQH001763@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 12:03:47 +0200 (Tue, 11 Aug 2009)
New Revision: 32245
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32245&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerApp.cpp
Log:
* Made the comment a bit more useful.


Modified: haiku/trunk/src/servers/app/ServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.cpp	2009-08-11 10:01:37 UTC (rev 32244)
+++ haiku/trunk/src/servers/app/ServerApp.cpp	2009-08-11 10:03:47 UTC (rev 32245)
@@ -2322,12 +2322,8 @@
 
 			if (status == B_OK && fDesktop->LockAllWindows()) {
 				display_mode oldMode;
-				// TODO: This is a bit of a mess. The API to set the mode on
-				// a specific workspace was not present in BeOS. It is meant to
-				// be the workspace *index* (not the bitfield). However, the
-				// "~0" is used as kCurrentWorkspace in PrivateScreen.cpp, which
-				// has nothing to do with B_CURRENT_WORKSPACE (== 0, used for the
-				// workspace bit mask of a BWindow).
+				// ~0 is used as the current workspace in PrivateScreen
+				// TODO: add constant for this
 				if (workspace == (uint32)~0
 					|| workspace == (uint32)fDesktop->CurrentWorkspace()) {
 					fDesktop->ScreenAt(0)->GetMode(&oldMode);



From jonas at kirilla.com  Tue Aug 11 13:32:36 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Tue, 11 Aug 2009 13:32:36 +0200 CEST
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <722749653-BeMail@zon>
Message-ID: <9760798680-BeMail@kirilla>

"Axel D?rfler" <axeld at pinc-software.de> wrote:
 ...
> There are windows that don't support scripting 
> (I would find it odd if those screenshots would
> work only for some windows), and IMO it's 
> mostly a waste of time to work on this.

Focus policy comes into play too, when scripting, as a
window may avoid getting focus back from Screenshot when
it hides to take the shot. Workspaces is like that, which
is probably why it doesn't get transparency. A workaround
for this could be to script all windows for their rects
and compare that to the one from window_info.

Or simply extend window_info as suggested. :-]

(Not knowing much about the app_server internals, 
what populates and maintains window_info, I didn't
feel confident to do so yesterday.)

Another [unrelated] case where transparency fails is when
a window tab is partially offscreen.

/Jonas.



From axeld at pinc-software.de  Tue Aug 11 13:41:58 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 11 Aug 2009 13:41:58 +0200 CEST
Subject: [Haiku-commits] r32218 - haiku/trunk/src/apps/screenshot
In-Reply-To: <9760798680-BeMail@kirilla>
Message-ID: <18187887587-BeMail@zon>

"Jonas Sundstr?m" <jonas at kirilla.com> wrote:
> "Axel D?rfler" <axeld at pinc-software.de> wrote:
>  ...
> > There are windows that don't support scripting 
> > (I would find it odd if those screenshots would
> > work only for some windows), and IMO it's 
> > mostly a waste of time to work on this.
> Focus policy comes into play too, when scripting, as a
> window may avoid getting focus back from Screenshot when
> it hides to take the shot. Workspaces is like that, which
> is probably why it doesn't get transparency. A workaround
> for this could be to script all windows for their rects
> and compare that to the one from window_info.
> 
> Or simply extend window_info as suggested. :-]

As Ryan pointed out yesterday, window_info already contains all the 
needed information.

> Another [unrelated] case where transparency fails is when
> a window tab is partially offscreen.

That doesn't sound too hard to fix, though.

Bye,
   Axel.



From bga at bug-br.org.br  Tue Aug 11 13:43:19 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Tue, 11 Aug 2009 08:43:19 -0300
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <200908110447.n7B4liNI004463@sheep.berlios.de>
References: <200908110447.n7B4liNI004463@sheep.berlios.de>
Message-ID: <4A815957.8010907@bug-br.org.br>

jackburton at mail.berlios.de wrote:
> Author: jackburton
> Date: 2009-08-11 06:47:39 +0200 (Tue, 11 Aug 2009)
> New Revision: 32241
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32241&view=rev
> 
> Modified:
>    haiku/trunk/src/kits/game/WindowScreen.cpp
> Log:
> When setting the palette, the passed array is 0 based, even if the first
> index is not 0. Bruno, can you check if this fixes SoundPlay's colors?

Will do this later today when I am back home and will report back. 
Thanks for looking into this.

-Bruno



From stpere at mail.berlios.de  Tue Aug 11 13:53:14 2009
From: stpere at mail.berlios.de (stpere at BerliOS)
Date: Tue, 11 Aug 2009 13:53:14 +0200
Subject: [Haiku-commits] r32246 - haiku/trunk/src/kits/tracker
Message-ID: <200908111153.n7BBrEbP027049@sheep.berlios.de>

Author: stpere
Date: 2009-08-11 13:53:12 +0200 (Tue, 11 Aug 2009)
New Revision: 32246
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32246&view=rev

Modified:
   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
Log:
Now it also considers the MimeType of symlinks targets when proposing add-ons in tracker.

This fixes ticket #2775.


Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-08-11 10:03:47 UTC (rev 32245)
+++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-08-11 11:53:12 UTC (rev 32246)
@@ -2786,6 +2786,15 @@
 		for (int32 index = 0; index < count; index++) {
 			BPose *pose = PoseView()->SelectionList()->ItemAt(index);
 			AddMimeTypeString(mimeTypes, pose->TargetModel());
+			// If it's a symlink, resolves it and add the Target's MimeType
+			if (pose->TargetModel()->IsSymLink()) {
+				Model* resolved = new Model(
+					pose->TargetModel()->EntryRef(), true, true);
+				if (resolved->InitCheck() == B_OK) {
+					AddMimeTypeString(mimeTypes, resolved);
+				}
+				delete resolved;
+			}
 		}
 	}
 



From axeld at mail.berlios.de  Tue Aug 11 13:59:24 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 13:59:24 +0200
Subject: [Haiku-commits] r32247 - haiku/trunk/src/kits/interface
Message-ID: <200908111159.n7BBxOXj027445@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 13:59:21 +0200 (Tue, 11 Aug 2009)
New Revision: 32247
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32247&view=rev

Modified:
   haiku/trunk/src/kits/interface/ToolTipManager.cpp
Log:
* Use kMenuWindowFeel for the tool tips, or else they won't work on
  B_AVOID_FRONT windows (like the Deskbar).


Modified: haiku/trunk/src/kits/interface/ToolTipManager.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ToolTipManager.cpp	2009-08-11 11:53:12 UTC (rev 32246)
+++ haiku/trunk/src/kits/interface/ToolTipManager.cpp	2009-08-11 11:59:21 UTC (rev 32247)
@@ -11,6 +11,7 @@
 #include <LayoutBuilder.h>
 #include <MessageRunner.h>
 
+#include <WindowPrivate.h>
 #include <ToolTip.h>
 
 
@@ -107,7 +108,7 @@
 ToolTipWindow::ToolTipWindow(BToolTip* tip, BPoint where)
 	:
 	BWindow(BRect(0, 0, 250, 10), "tool tip", B_BORDERED_WINDOW_LOOK,
-		B_FLOATING_APP_WINDOW_FEEL, B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE
+		kMenuWindowFeel, B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE
 			| B_AUTO_UPDATE_SIZE_LIMITS | B_AVOID_FRONT | B_AVOID_FOCUS)
 {
 	MoveTo(where + tip->MouseRelativeLocation());



From pulkomandy at mail.berlios.de  Tue Aug 11 14:01:59 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Tue, 11 Aug 2009 14:01:59 +0200
Subject: [Haiku-commits] r32248 -
	haiku/branches/components/gsoc-locale-kit/src/preferences/locale
Message-ID: <200908111201.n7BC1xtL027737@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-11 14:01:58 +0200 (Tue, 11 Aug 2009)
New Revision: 32248
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32248&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
Log:
Match ICU date format chars to our menu entries. Some language are still not parsed correctly, but I can't find why.


Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-11 11:59:21 UTC (rev 32247)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-11 12:01:58 UTC (rev 32248)
@@ -1,6 +1,6 @@
 /*
-** Copyright 2009, Adrien Destugues, pulkomandy at gmail.com. All rights reserved.
-** Distributed under the terms of the MIT License.
+* Copyright 2009, Adrien Destugues, pulkomandy at gmail.com. All rights reserved.
+* Distributed under the terms of the MIT License.
 */
 
 
@@ -40,6 +40,19 @@
 }
 
 
+class dateMenuItem: public BMenuItem
+{
+	public:
+		dateMenuItem(const char* label, const char* code, BMenuField* field) 
+			: BMenuItem(label, MenuMessage(code, field))
+		{ 
+			icuCode = code;
+		}
+
+		BString icuCode;
+};
+
+
 void
 CreateDateMenu(BMenuField** field)
 {
@@ -47,44 +60,42 @@
 	*field = new BMenuField("", menu);
 
 	BMenu* dayMenu = new BMenu("Day");
+	// Not all available ICU settings are listed here. It's possible to add some
+	// other things if you ever need.
 	menu->AddItem(dayMenu);
-		dayMenu -> AddItem(new BMenuItem("day in month",
-			MenuMessage("d",*field)));
-		dayMenu -> AddItem(new BMenuItem("day in month (2 digits)",
-			MenuMessage("dd",*field)));
-		dayMenu -> AddItem(new BMenuItem("day in year",
-			MenuMessage("D",*field)));
-		dayMenu -> AddItem(new BMenuItem("day in year (2 digits)",
-			MenuMessage("DD",*field)));
-		dayMenu -> AddItem(new BMenuItem("day in year (3 digits)",
-			MenuMessage("DDD",*field)));
-		dayMenu -> AddItem(new BMenuItem("day of week",
-			MenuMessage("e",*field)));
-		dayMenu -> AddItem(new BMenuItem("day of week (short text)",
-			MenuMessage("eee",*field)));
-		dayMenu -> AddItem(new BMenuItem("day of week (full text)",
-			MenuMessage("eeee",*field)));
-		dayMenu -> AddItem(new BMenuItem("E",
-			MenuMessage("E",*field)));
-		dayMenu -> AddItem(new BMenuItem("day of week in month",
-			MenuMessage("F",*field)));
-		dayMenu -> AddItem(new BMenuItem("julian day",
-			MenuMessage("g",*field)));
+		dayMenu -> AddItem(new dateMenuItem("day in month", "d", *field));
+		dayMenu -> AddItem(new dateMenuItem("day in month (2 digits)", "dd", 
+			*field));
+		dayMenu -> AddItem(new dateMenuItem("day in year", "D", *field));
+		dayMenu -> AddItem(new dateMenuItem("day in year (2 digits)", "DD",
+			*field));
+		dayMenu -> AddItem(new dateMenuItem("day in year (3 digits)", "DDD",
+			*field));
+		dayMenu -> AddItem(new dateMenuItem("day of week", "e",
+			*field));
+		//dayMenu -> AddItem(new dateMenuItem("day of week (short text)", "eee",
+		//	*field));
+		//dayMenu -> AddItem(new dateMenuItem("day of week (full text)", "eeee",
+		//	*field));
+		dayMenu -> AddItem(new dateMenuItem("day of week (short name)", "E", 
+			*field));
+		dayMenu -> AddItem(new dateMenuItem("day of week (name)", "EEEE",
+			*field));
+		dayMenu -> AddItem(new dateMenuItem("day of week in month", "F",
+			*field));
+		dayMenu -> AddItem(new dateMenuItem("julian day", "g", *field));
 		//dayMenu -> AddItem(new BMenuItem("c", msg));
 	BMenu* monthMenu = new BMenu("Month");
 	menu->AddItem(monthMenu);
-		monthMenu -> AddItem(new BMenuItem("M",
-			MenuMessage("M",*field)));
-		monthMenu -> AddItem(new BMenuItem("L",
-			MenuMessage("L",*field)));
+		monthMenu -> AddItem(new dateMenuItem("month number", "M", *field));
+		monthMenu -> AddItem(new dateMenuItem("month name", "MMMM", *field));
+		//monthMenu -> AddItem(new dateMenuItem("L", "L", *field));
 	BMenu* yearMenu = new BMenu("Year");
 	menu->AddItem(yearMenu);
-		yearMenu -> AddItem(new BMenuItem("y",
-			MenuMessage("y",*field)));
-		yearMenu -> AddItem(new BMenuItem("Y",
-			MenuMessage("Y",*field)));
-		yearMenu -> AddItem(new BMenuItem("u",
-			MenuMessage("u",*field)));
+		yearMenu -> AddItem(new dateMenuItem("Year", "y", *field));
+		yearMenu -> AddItem(new dateMenuItem("Year (2 digits)", "yy", *field));
+		//yearMenu -> AddItem(new dateMenuItem("Y", "Y", *field));
+		//yearMenu -> AddItem(new dateMenuItem("u", "u", *field));
 }
 
 
@@ -268,31 +279,43 @@
 		fieldBegin = parsePointer;
 		while( *parsePointer == *(parsePointer+1)) parsePointer++ ;
 		parsePointer++;
-		if(fieldBegin < parsePointer)
-		{
-			BString str;
-			str.Append(fieldBegin, parsePointer - fieldBegin);
-			fLongDateMenu[i]->MenuItem()->SetLabel(str);
+		BString str;
+		str.Append(fieldBegin, parsePointer - fieldBegin);
+
+		BMenu* subMenu;
+		bool isFound = false;
+		for(int subMenuIndex = 0; subMenuIndex < 3; subMenuIndex++) {
+			subMenu = fLongDateMenu[i]->Menu()->SubmenuAt(subMenuIndex);
+			BMenuItem* item;
+			for(int itemIndex = 0; (item = subMenu->ItemAt(itemIndex)) != NULL; 
+					itemIndex++) {
+				if(static_cast<dateMenuItem*>(item)->icuCode == str) {
+					item->SetMarked(true);
+					fLongDateMenu[i]->MenuItem()->SetLabel(item->Label());
+					isFound = true;
+				} else
+					item->SetMarked(false);
+			}
 		}
-		if (*parsePointer == '\0') break;
 
+		if(!isFound)
+			fLongDateMenu[i]->MenuItem()->SetLabel(str.Append("*"));
+
 		fieldBegin = parsePointer;
-		while((!IsSpecialDateChar(*parsePointer)) && *parsePointer != '\0') {
+		while((!IsSpecialDateChar(*parsePointer)) && *parsePointer != '\0' 
+				&& *(parsePointer-1) >= 0) {
 			if (*parsePointer == '\'') {
 				parsePointer++;
 				while (*parsePointer != '\'') parsePointer++;
 			}
 			parsePointer++;
 		}
-		if(fieldBegin < parsePointer)
-		{
-			BString str;
-			str.Append(fieldBegin, parsePointer - fieldBegin);
-			fLongDateSeparator[i]->SetText(str);
-		}
-		if (*parsePointer == '\0') break;
+		str.Truncate(0);
+		str.Append(fieldBegin, parsePointer - fieldBegin);
+		fLongDateSeparator[i]->SetText(str);
+	}
 
-	}
+	free((void*)dateFormat);
 }
 
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-11 11:59:21 UTC (rev 32247)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-11 12:01:58 UTC (rev 32248)
@@ -56,7 +56,7 @@
 		BRadioButton *f12HrRadioButton;
 
 		BMenuField *fLongDateMenu[4];
-		BTextControl* fLongDateSeparator[5];
+		BTextControl* fLongDateSeparator[4];
 		BMenuField *fDateMenu[3];
 
 		BMenuField *fSeparatorMenuField;



From axeld at pinc-software.de  Tue Aug 11 14:21:26 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 11 Aug 2009 14:21:26 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32248_-_haiku/branches/components/gsoc?=
 =?utf-8?q?-locale-kit/src/preferences/locale?=
In-Reply-To: <200908111201.n7BC1xtL027737@sheep.berlios.de>
Message-ID: <20555189718-BeMail@zon>

pulkomandy at BerliOS <pulkomandy at mail.berlios.de> wrote:
> +* Distributed under the terms of the MIT License.
>  */

The '*/' is supposed to be indented by one space as well.

Bye,
   Axel.



From axeld at mail.berlios.de  Tue Aug 11 14:32:15 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 14:32:15 +0200
Subject: [Haiku-commits] r32249 - in haiku/trunk: headers/private/interface
	src/kits/interface
Message-ID: <200908111232.n7BCWFNP031120@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 14:32:12 +0200 (Tue, 11 Aug 2009)
New Revision: 32249
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32249&view=rev

Modified:
   haiku/trunk/headers/private/interface/ToolTip.h
   haiku/trunk/src/kits/interface/ToolTip.cpp
   haiku/trunk/src/kits/interface/ToolTipManager.cpp
Log:
* Made the BToolTip interface a bit more convenient to use when subclassing it.


Modified: haiku/trunk/headers/private/interface/ToolTip.h
===================================================================
--- haiku/trunk/headers/private/interface/ToolTip.h	2009-08-11 12:01:58 UTC (rev 32248)
+++ haiku/trunk/headers/private/interface/ToolTip.h	2009-08-11 12:32:12 UTC (rev 32249)
@@ -34,6 +34,13 @@
 	virtual void				SetAlignment(BAlignment alignment);
 			BAlignment			Alignment() const;
 
+	virtual	void				AttachedToWindow();
+	virtual void				DetachedFromWindow();
+
+protected:
+			bool				Lock();
+			void				Unlock();
+
 private:
 								BToolTip(const BToolTip& other);
 			BToolTip&			operator=(const BToolTip &other);
@@ -41,6 +48,7 @@
 			void				_InitData();
 
 private:
+			bool				fLockedLooper;
 			bool				fIsSticky;
 			BPoint				fRelativeLocation;
 			BAlignment			fAlignment;

Modified: haiku/trunk/src/kits/interface/ToolTip.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ToolTip.cpp	2009-08-11 12:01:58 UTC (rev 32248)
+++ haiku/trunk/src/kits/interface/ToolTip.cpp	2009-08-11 12:32:12 UTC (rev 32249)
@@ -92,6 +92,50 @@
 
 
 void
+BToolTip::AttachedToWindow()
+{
+}
+
+
+void
+BToolTip::DetachedFromWindow()
+{
+}
+
+
+bool
+BToolTip::Lock()
+{
+	bool lockedLooper;
+	while (true) {
+		lockedLooper = View()->LockLooper();
+		if (!lockedLooper) {
+			BToolTipManager::Lock();
+
+			if (View()->Window() != NULL) {
+				BToolTipManager::Unlock();
+				continue;
+			}
+		}
+		break;
+	}
+
+	fLockedLooper = lockedLooper;
+	return true;
+}
+
+
+void
+BToolTip::Unlock()
+{
+	if (fLockedLooper)
+		View()->UnlockLooper();
+	else
+		BToolTipManager::Unlock();
+}
+
+
+void
 BToolTip::_InitData()
 {
 	fIsSticky = false;
@@ -158,26 +202,12 @@
 void
 BTextToolTip::SetText(const char* text)
 {
-	bool lockedLooper;
-	while (true) {
-		lockedLooper = fTextView->LockLooper();
-		if (!lockedLooper) {
-			BToolTipManager::Lock();
+	if (!Lock())
+		return;
 
-			if (fTextView->Window() != NULL) {
-				BToolTipManager::Unlock();
-				continue;
-			}
-		}
-		break;
-	}
-
 	fTextView->SetText(text);
 
-	if (lockedLooper)
-		fTextView->UnlockLooper();
-	else
-		BToolTipManager::Unlock();
+	Unlock();
 }
 
 

Modified: haiku/trunk/src/kits/interface/ToolTipManager.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ToolTipManager.cpp	2009-08-11 12:01:58 UTC (rev 32248)
+++ haiku/trunk/src/kits/interface/ToolTipManager.cpp	2009-08-11 12:32:12 UTC (rev 32249)
@@ -52,6 +52,7 @@
 	virtual void AttachedToWindow()
 	{
 		SetEventMask(B_POINTER_EVENTS, 0);
+		fToolTip->AttachedToWindow();
 	}
 
 	virtual void DetachedFromWindow()
@@ -60,6 +61,7 @@
 
 		RemoveChild(fToolTip->View());
 			// don't delete this one!
+		fToolTip->DetachedFromWindow();
 
 		BToolTipManager::Unlock();
 	}



From axeld at mail.berlios.de  Tue Aug 11 14:36:01 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 14:36:01 +0200
Subject: [Haiku-commits] r32250 - haiku/trunk/src/bin/desklink
Message-ID: <200908111236.n7BCa17B031632@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 14:35:57 +0200 (Tue, 11 Aug 2009)
New Revision: 32250
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32250&view=rev

Modified:
   haiku/trunk/src/bin/desklink/Jamfile
   haiku/trunk/src/bin/desklink/MediaReplicant.cpp
Log:
* Added a volume tool tip to Deskbar's volume replicant, thus closing ticket
  #3118.


Modified: haiku/trunk/src/bin/desklink/Jamfile
===================================================================
--- haiku/trunk/src/bin/desklink/Jamfile	2009-08-11 12:32:12 UTC (rev 32249)
+++ haiku/trunk/src/bin/desklink/Jamfile	2009-08-11 12:35:57 UTC (rev 32250)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UsePrivateHeaders app ;
+UsePrivateHeaders app interface shared ;
 
 BinCommand desklink :
 	desklink.cpp

Modified: haiku/trunk/src/bin/desklink/MediaReplicant.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/MediaReplicant.cpp	2009-08-11 12:32:12 UTC (rev 32249)
+++ haiku/trunk/src/bin/desklink/MediaReplicant.cpp	2009-08-11 12:35:57 UTC (rev 32250)
@@ -10,8 +10,10 @@
  *		Axel D?rfler, axeld at pinc-software.de.
  */
 
+
 //! Volume control, and media shortcuts in Deskbar
 
+
 #include <new>
 #include <stdio.h>
 
@@ -25,7 +27,11 @@
 #include <PopUpMenu.h>
 #include <Roster.h>
 #include <String.h>
+#include <StringView.h>
 
+#include <ToolTip.h>
+#include <ToolTipManager.h>
+
 #include "desklink.h"
 #include "iconfile.h"
 #include "MixerControl.h"
@@ -44,6 +50,56 @@
 static const char* kSettingsFile = "x-vnd.Haiku-desklink";
 
 
+class VolumeToolTip : public BToolTip {
+public:
+	VolumeToolTip(int32 which = VOLUME_USE_MIXER)
+		:
+		fWhich(which)
+	{
+		fView = new BStringView("", "");
+	}
+
+	virtual ~VolumeToolTip()
+	{
+		delete fView;
+	}
+
+	virtual BView* View() const
+	{
+		return fView;
+	}
+
+	virtual void AttachedToWindow()
+	{
+		Update();
+	}
+
+	void SetWhich(int32 which)
+	{
+		fWhich = which;
+	}
+
+	void Update()
+	{
+		if (!Lock())
+			return;
+
+		MixerControl control;
+		control.Connect(fWhich);
+
+		char text[256];
+		snprintf(text, sizeof(text), "%g dB", control.Volume());
+		fView->SetText(text);
+
+		Unlock();
+	}
+
+private:
+	BStringView*	fView;
+	int32			fWhich;
+};
+
+
 class MediaReplicant : public BView {
 public:
 							MediaReplicant(BRect frame, const char* name,
@@ -263,6 +319,12 @@
 				MixerControl mixerControl;
 				mixerControl.Connect(fVolumeWhich);
 				mixerControl.ChangeVolumeBy(deltaY < 0 ? 6 : -6);
+
+				VolumeToolTip* tip = dynamic_cast<VolumeToolTip*>(ToolTip());
+				if (tip != NULL) {
+					tip->Update();
+					ShowToolTip(tip);
+				}
 			}
 			break;
 		}
@@ -387,8 +449,10 @@
 {
 	fIcon = new BBitmap(BRect(0, 0, kSpeakerWidth - 1, kSpeakerHeight - 1),
 		B_CMAP8);
-	fIcon->SetBits(kSpeakerBits, kSpeakerWidth*kSpeakerHeight, 0, B_CMAP8);
+	fIcon->SetBits(kSpeakerBits, kSpeakerWidth * kSpeakerHeight, 0, B_CMAP8);
 
+	SetToolTip(new VolumeToolTip());
+
 	_LoadSettings();
 }
 



From axeld at mail.berlios.de  Tue Aug 11 14:57:51 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 14:57:51 +0200
Subject: [Haiku-commits] r32251 - haiku/trunk/src/bin/desklink
Message-ID: <200908111257.n7BCvpZ5001578@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 14:57:49 +0200 (Tue, 11 Aug 2009)
New Revision: 32251
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32251&view=rev

Modified:
   haiku/trunk/src/bin/desklink/MediaReplicant.cpp
Log:
* Forgot to set which volume should be shown.


Modified: haiku/trunk/src/bin/desklink/MediaReplicant.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/MediaReplicant.cpp	2009-08-11 12:35:57 UTC (rev 32250)
+++ haiku/trunk/src/bin/desklink/MediaReplicant.cpp	2009-08-11 12:57:49 UTC (rev 32251)
@@ -308,6 +308,9 @@
 			item->SetMarked(!item->IsMarked());
 			fVolumeWhich = item->IsMarked()
 				? VOLUME_USE_PHYS_OUTPUT : VOLUME_USE_MIXER;
+
+			if (VolumeToolTip* tip = dynamic_cast<VolumeToolTip*>(ToolTip()))
+				tip->SetWhich(fVolumeWhich);
 			break;
 		}
 
@@ -451,9 +454,9 @@
 		B_CMAP8);
 	fIcon->SetBits(kSpeakerBits, kSpeakerWidth * kSpeakerHeight, 0, B_CMAP8);
 
-	SetToolTip(new VolumeToolTip());
+	_LoadSettings();
 
-	_LoadSettings();
+	SetToolTip(new VolumeToolTip(fVolumeWhich));
 }
 
 



From host.haiku at gmx.de  Tue Aug 11 15:36:23 2009
From: host.haiku at gmx.de (host)
Date: Tue, 11 Aug 2009 15:36:23 +0200
Subject: [Haiku-commits] r32248 -
	haiku/branches/components/gsoc-locale-kit/src/preferences/locale
In-Reply-To: <20555189718-BeMail@zon>
References: <20555189718-BeMail@zon>
Message-ID: <4A8173D7.2060609@gmx.de>

Axel D?rfler schrieb:
> pulkomandy at BerliOS <pulkomandy at mail.berlios.de> wrote:
>> +* Distributed under the terms of the MIT License.
>> +* Distributed under the terms of the MIT License.
>>  */
>>  
>>  
>> @@ -40,6 +40,19 @@
>>  }
>>  
>>  
>> +class dateMenuItem: public BMenuItem

> 
> The '*/' is supposed to be indented by one space as well.
> 

And i guess the class name should start uppercase too.

Regards,
Karsten


From anevilyak at mail.berlios.de  Tue Aug 11 15:48:42 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 11 Aug 2009 15:48:42 +0200
Subject: [Haiku-commits] r32252 - haiku/trunk/build/jam
Message-ID: <200908111348.n7BDmg4v006377@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-11 15:48:42 +0200 (Tue, 11 Aug 2009)
New Revision: 32252
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32252&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Patch by Ankur Sethi: Updated CLucene package with wchar support enabled.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-08-11 12:57:49 UTC (rev 32251)
+++ haiku/trunk/build/jam/OptionalPackages	2009-08-11 13:48:42 UTC (rev 32252)
@@ -229,8 +229,8 @@
 		Echo "No optional package CLucene available for GCC2" ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11
-			: $(baseURL)/clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11.zip
+			clucene-0.9.21svn-x86-gcc4-haiku-2009-08-11
+			: $(baseURL)/clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip
 			:
 		;
 	}



From axeld at pinc-software.de  Tue Aug 11 16:16:26 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 11 Aug 2009 16:16:26 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32248_-_haiku/branches/components/gsoc?=
 =?utf-8?q?-locale-kit/src/preferences/locale?=
In-Reply-To: <4A8173D7.2060609@gmx.de>
Message-ID: <27455076126-BeMail@zon>

host <host.haiku at gmx.de> wrote:
> Axel D?rfler schrieb:
> > pulkomandy at BerliOS <pulkomandy at mail.berlios.de> wrote:
> >> +* Distributed under the terms of the MIT License.
> >> +* Distributed under the terms of the MIT License.
> >>  */
> >>  
> >> @@ -40,6 +40,19 @@
> >>  }
> >>  
> >>  
> >> +class dateMenuItem: public BMenuItem
> > The '*/' is supposed to be indented by one space as well.
> And i guess the class name should start uppercase too.

And I didn't even notice that one... :-)

Bye,
   Axel.



From axeld at pinc-software.de  Tue Aug 11 16:21:55 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 11 Aug 2009 16:21:55 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32235_-_in_haiku/trunk=3A_headers/os/d?=
 =?utf-8?q?rivers_src/add-ons/disk=5Fsystems/intel_src/add-ons/kernel/part?=
 =?utf-8?q?itioning=5Fsystems/intel_src/system/kernel/disk=5Fdevice=5Fmana?=
 =?utf-8?q?ger?=
In-Reply-To: <9efe01ea0908110138v3e38219dv18e108a68c385bfe@mail.gmail.com>
Message-ID: <27784068740-BeMail@zon>

Bryce Groff <brycegroff at gmail.com> wrote:
> > > -     uint32 flags = B_DISK_SYSTEM_SUPPORTS_INITIALIZING;
> > > +     uint32 flags = 0;//B_DISK_SYSTEM_SUPPORTS_INITIALIZING;
> > Were those changes really intended? They don't seem to make much 
> > sense,
> > and aren't covered by your commit message.
> We no longer initialize extended partitions, we create them like any 
> other
> primary partition. Commenting out support for initialization remove 
> it as an
> option for programs (DriveSetup) that use the api. I will try to be 
> more
> verbose with my commit messages in the future.

Ah, okay, thanks for the explanation.

> > BTW what is open_partition() for? Is it just a shorthand for open()
> > without having to retrieve the device path, if so, why?
> Basically yes, it is a shorthand way to get a file descriptor from a
> partition id. It is useful for the Intel add-on in a few places and I
> probably useful else where.

I'm not sure how you intend to use it, but I guess I'll see :-)
(btw, after open_partition() and the following function, there is a 
missing blank line)

Bye,
   Axel.



From axeld at mail.berlios.de  Tue Aug 11 16:30:22 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 16:30:22 +0200
Subject: [Haiku-commits] r32253 - haiku/trunk/src/kits/app
Message-ID: <200908111430.n7BEUMBw009787@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 16:30:20 +0200 (Tue, 11 Aug 2009)
New Revision: 32253
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32253&view=rev

Modified:
   haiku/trunk/src/kits/app/Message.cpp
Log:
* Added missing space.


Modified: haiku/trunk/src/kits/app/Message.cpp
===================================================================
--- haiku/trunk/src/kits/app/Message.cpp	2009-08-11 13:48:42 UTC (rev 32252)
+++ haiku/trunk/src/kits/app/Message.cpp	2009-08-11 14:30:20 UTC (rev 32253)
@@ -6,6 +6,7 @@
  *		Michael Lotz <mmlr at mlotz.ch>
  */
 
+
 #include <Message.h>
 #include <MessageAdapter.h>
 #include <MessagePrivate.h>
@@ -645,7 +646,7 @@
 					entry_ref ref;
 					BPrivate::entry_ref_unflatten(&ref, (char *)pointer, size);
 
-					printf("entry_ref(device=%ld, directory=%lld,"
+					printf("entry_ref(device=%ld, directory=%lld, "
 						"name=\"%s\", ", ref.device, ref.directory, ref.name);
 
 					BPath path(&ref);



From axeld at mail.berlios.de  Tue Aug 11 17:46:19 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 17:46:19 +0200
Subject: [Haiku-commits] r32254 - in haiku/trunk/src:
	add-ons/kernel/file_systems/cdda system/kernel/fs
Message-ID: <200908111546.n7BFkJLB016254@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 17:46:07 +0200 (Tue, 11 Aug 2009)
New Revision: 32254
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32254&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
   haiku/trunk/src/system/kernel/fs/vfs.cpp
Log:
* cdda_read_dir() could copy too many bytes into the provided buffer (worst
  case was an unterminated string, though).
* fix_dirent() did not copy the trailing null-byte.
* Not yet entirely sure why, but this caused #4214.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp	2009-08-11 14:30:20 UTC (rev 32253)
+++ haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp	2009-08-11 15:46:07 UTC (rev 32254)
@@ -152,7 +152,7 @@
 			size_t			Size() const { return fSize; }
 			type_code		Type() const { return fType; }
 			uint8*			Data() const { return fData; }
-		
+
 			bool			IsProtectedNamespace();
 	static	bool			IsProtectedNamespace(const char* name);
 
@@ -682,11 +682,11 @@
 		if (read_cdtext(fDevice, text) != B_OK)
 			dprintf("CDDA: no CD-Text found.\n");
 		else
-			doLookup = false;	 
+			doLookup = false;
 	} else {
 		doLookup = false;
 	}
-		
+
 	int32 trackCount = toc->last_track + 1 - toc->first_track;
 	off_t totalFrames = 0;
 	char title[256];
@@ -755,10 +755,10 @@
 	// Add CD:do_lookup attribute.
 	fRootNode->AddAttribute(kDoLookupAttribute, B_BOOL_TYPE, true,
 		(const uint8*)&doLookup, sizeof(bool));
-		
+
 	// Add CD:toc attribute.
 	fRootNode->AddAttribute(kTocAttribute, B_RAW_TYPE, true,
-		(const uint8*)toc, B_BENDIAN_TO_HOST_INT16(toc->data_length) + 2); 
+		(const uint8*)toc, B_BENDIAN_TO_HOST_INT16(toc->data_length) + 2);
 
 	_RestoreSharedAttributes();
 	if (fd >= 0)
@@ -883,9 +883,9 @@
 	int fd = _OpenAttributes(O_RDONLY);
 	if (fd < 0)
 		return;
-		
+
 	_RestoreAttributes(fd);
-	
+
 	close(fd);
 }
 
@@ -1123,7 +1123,7 @@
 {
 	// Check if the attribute is in the restricted namespace. Attributes in
 	// this namespace should not be edited by the user as they are handled
-	// internally by the add-on. Calls the static version. 
+	// internally by the add-on. Calls the static version.
 	return IsProtectedNamespace(fName);
 }
 
@@ -1134,7 +1134,7 @@
 	// Convenience static version of the above method. Usually called when we
 	// don't have a constructed Attribute object handy.
 	return strncmp(kProtectedAttrNamespace, name,
-		strlen(kProtectedAttrNamespace)) == 0;	
+		strlen(kProtectedAttrNamespace)) == 0;
 }
 
 
@@ -1865,7 +1865,8 @@
 		}
 
 		if (user_memcpy(buffer, &entry, sizeof(struct dirent) - 1) != B_OK
-			|| user_strlcpy(buffer->d_name, name, bufferSize) < B_OK)
+			|| user_strlcpy(buffer->d_name, name,
+					bufferSize + 1 - sizeof(struct dirent)) < B_OK)
 			return B_BAD_ADDRESS;
 
 		buffer = (struct dirent*)((uint8*)buffer + entry.d_reclen);

Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-08-11 14:30:20 UTC (rev 32253)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-08-11 15:46:07 UTC (rev 32254)
@@ -5564,7 +5564,7 @@
 		ASSERT(entry->d_reclen >= sizeof(struct dirent));
 
 		if (user_memcpy(entry->d_name, userEntry->d_name,
-				entry->d_reclen - sizeof(struct dirent)) != B_OK)
+				entry->d_reclen + 1 - sizeof(struct dirent)) != B_OK)
 			return B_BAD_ADDRESS;
 	} else
 		entry = userEntry;



From axeld at mail.berlios.de  Tue Aug 11 19:00:37 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 19:00:37 +0200
Subject: [Haiku-commits] r32255 - haiku/trunk/src/apps/powerstatus
Message-ID: <200908111700.n7BH0bJr017406@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 19:00:31 +0200 (Tue, 11 Aug 2009)
New Revision: 32255
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32255&view=rev

Modified:
   haiku/trunk/src/apps/powerstatus/ExtendedInfoWindow.cpp
   haiku/trunk/src/apps/powerstatus/ExtendedInfoWindow.h
   haiku/trunk/src/apps/powerstatus/PowerStatus.cpp
   haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
   haiku/trunk/src/apps/powerstatus/PowerStatusView.h
Log:
* Worked over the battery look a bit, looks much better now IMO.
* Made the replicant transparent (for background images).
* Fixed many of Clemen's coding style violations.


Modified: haiku/trunk/src/apps/powerstatus/ExtendedInfoWindow.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/ExtendedInfoWindow.cpp	2009-08-11 15:46:07 UTC (rev 32254)
+++ haiku/trunk/src/apps/powerstatus/ExtendedInfoWindow.cpp	2009-08-11 17:00:31 UTC (rev 32255)
@@ -1,11 +1,12 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Clemens Zeidler, haiku at Clemens-Zeidler.de
  */
 
+
 #include "ExtendedInfoWindow.h"
 
 #include <Box.h>
@@ -16,18 +17,21 @@
 #include <String.h>
 
 
+const int kLineSpacing = 5;
+
+
 FontString::FontString()
 {
 	font = be_plain_font;
 }
 
 
-const int kLineSpacing = 5;
+//	#pragma mark -
 
+
 BatteryInfoView::BatteryInfoView()
 	:
-	BView("battery info view", B_WILL_DRAW |
-		B_FULL_UPDATE_ON_RESIZE),
+	BView("battery info view", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE),
 	fPreferredSize(200, 200),
 	fMaxStringSize(0, 0)
 {
@@ -46,7 +50,7 @@
 {
 	fBatteryInfo = info;
 	fBatteryExtendedInfo = extInfo;
-	
+
 	_FillStringList();
 }
 
@@ -55,23 +59,22 @@
 BatteryInfoView::Draw(BRect updateRect)
 {
 	SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-	
+
 	BPoint point(10, 10);
-	
+
 	float space = _MeasureString("").height + kLineSpacing;
 
-	for (int i = 0; i < fStringList.CountItems(); i ++)
-	{
+	for (int i = 0; i < fStringList.CountItems(); i++) {
 		FontString* fontString = fStringList.ItemAt(i);
 		SetFont(fontString->font);
 		DrawString(fontString->string.String(), point);
 		point.y += space;
-	}	
-}		
+	}
+}
 
 
 void
-BatteryInfoView::GetPreferredSize(float *width, float *height)
+BatteryInfoView::GetPreferredSize(float* width, float* height)
 {
 	*width = fPreferredSize.width;
 	*height = fPreferredSize.height;
@@ -97,7 +100,7 @@
 	BFont font;
 	GetFont(&font);
 	BSize size;
-	
+
 	size.width = font.StringWidth(string);
 
 	font_height height;
@@ -120,7 +123,7 @@
 			powerUnit = " mWh";
 			rateUnit = " mW";
 			break;
-		
+
 		case 1:
 			powerUnit = " mAh";
 			rateUnit = " mA";
@@ -132,7 +135,7 @@
 	fontString = new FontString;
 	fStringList.AddItem(fontString);
 	fontString->font = be_bold_font;
-	
+
 	if (fBatteryInfo.state & BATTERY_CHARGING)
 		fontString->string = "Battery charging";
 	else if (fBatteryInfo.state & BATTERY_DISCHARGING)
@@ -141,35 +144,35 @@
 		fontString->string = "Empty Battery Slot";
 	else
 		fontString->string = "Battery unused";
-		
+
 	fontString = new FontString;
 	fontString->string = "Capacity: ";
 	fontString->string << fBatteryInfo.capacity;
 	fontString->string << powerUnit;
 	_AddToStringList(fontString);
-		
+
 	fontString = new FontString;
 	fontString->string = "Last full Charge: ";
 	fontString->string << fBatteryInfo.full_capacity;
 	fontString->string << powerUnit;
 	_AddToStringList(fontString);
-	
+
 	fontString = new FontString;
 	fontString->string = "Current Rate: ";
 	fontString->string << fBatteryInfo.current_rate;
 	fontString->string << rateUnit;
 	_AddToStringList(fontString);
-	
+
 	// empty line
 	fontString = new FontString;
 	_AddToStringList(fontString);
-	
+
 	fontString = new FontString;
 	fontString->string = "Design Capacity: ";
 	fontString->string << fBatteryExtendedInfo.design_capacity;
 	fontString->string << powerUnit;
 	_AddToStringList(fontString);
-		
+
 	fontString = new FontString;
 	fontString->string = "Technology: ";
 	if (fBatteryExtendedInfo.technology == 0)
@@ -179,57 +182,57 @@
 	else
 		fontString->string << "?";
 	_AddToStringList(fontString);
-	
+
 	fontString = new FontString;
 	fontString->string = "Design Voltage: ";
 	fontString->string << fBatteryExtendedInfo.design_voltage;
 	fontString->string << " mV";
 	_AddToStringList(fontString);
-		
+
 	fontString = new FontString;
 	fontString->string = "Design Capacity Warning: ";
 	fontString->string << fBatteryExtendedInfo.design_capacity_warning;
 	fontString->string << powerUnit;
 	_AddToStringList(fontString);
-		
+
 	fontString = new FontString;
 	fontString->string = "Design Capacity low Warning: ";
 	fontString->string << fBatteryExtendedInfo.design_capacity_low;
 	fontString->string << powerUnit;
 	_AddToStringList(fontString);
-		
+
 	fontString = new FontString;
 	fontString->string = "Capacity Granularity 1: ";
 	fontString->string << fBatteryExtendedInfo.capacity_granularity_1;
 	fontString->string << powerUnit;
 	_AddToStringList(fontString);
-		
+
 	fontString = new FontString;
 	fontString->string = "Capacity Granularity 2: ";
 	fontString->string << fBatteryExtendedInfo.capacity_granularity_2;
 	fontString->string << powerUnit;
 	_AddToStringList(fontString);
-		
+
 	fontString = new FontString;
 	fontString->string = "Model Number: ";
 	fontString->string << fBatteryExtendedInfo.model_number;
 	_AddToStringList(fontString);
-		
+
 	fontString = new FontString;
 	fontString->string = "Serial number: ";
 	fontString->string << fBatteryExtendedInfo.serial_number;
 	_AddToStringList(fontString);
-		
+
 	fontString = new FontString;
 	fontString->string = "Type: ";
 	fontString->string += fBatteryExtendedInfo.type;
 	_AddToStringList(fontString);
-		
+
 	fontString = new FontString;
 	fontString->string = "OEM Info: ";
 	fontString->string += fBatteryExtendedInfo.oem_info;
 	_AddToStringList(fontString);
-	
+
 	fPreferredSize.width = fMaxStringSize.width + 10;
 	fPreferredSize.height = (fMaxStringSize.height + kLineSpacing) *
 		fStringList.CountItems();
@@ -256,32 +259,28 @@
 }
 
 
+//	#pragma mark -
+
+
 ExtPowerStatusView::ExtPowerStatusView(PowerStatusDriverInterface* interface,
-			BRect frame, int32 resizingMode, int batteryId,
-			ExtendedInfoWindow* window)
+		BRect frame, int32 resizingMode, int batteryID,
+		ExtendedInfoWindow* window)
 	:
-	PowerStatusView(interface, frame, resizingMode, batteryId),
+	PowerStatusView(interface, frame, resizingMode, batteryID),
 	fExtendedInfoWindow(window),
 	fBatteryInfoView(window->GetExtendedBatteryInfoView()),
 	fSelected(false)
 {
-			
 }
 
 
 void
 ExtPowerStatusView::Draw(BRect updateRect)
 {
-	if (fSelected) {
+	if (fSelected)
 		SetLowColor(102, 152, 203);
-		SetHighColor(102, 152, 203);
-		FillRect(updateRect);	
-	}
-	else {
+	else
 		SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-		SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-		FillRect(updateRect);
-	}
 
 	PowerStatusView::Draw(updateRect);
 }
@@ -292,44 +291,47 @@
 {
 	if (!fSelected) {
 		fSelected = true;
-		_Update(true);
-		fExtendedInfoWindow->BatterySelected(this);
+		Update(true);
+		if (ExtendedInfoWindow* window
+				= dynamic_cast<ExtendedInfoWindow*>(Window()))
+			window->BatterySelected(this);
 	}
-}		
+}
 
 
 void
 ExtPowerStatusView::Select(bool select)
 {
 	fSelected = select;
-	_Update(true);
+	Update(true);
 }
 
 
 bool
-ExtPowerStatusView::IsValid()
+ExtPowerStatusView::IsCritical()
 {
-	if (fBatteryInfo.state & BATTERY_CRITICAL_STATE)
-		return false;
-	return true;
+	return (fBatteryInfo.state & BATTERY_CRITICAL_STATE) != 0;
 }
 
 
 void
-ExtPowerStatusView::_Update(bool force)
+ExtPowerStatusView::Update(bool force)
 {
-	PowerStatusView::_Update(force);
+	PowerStatusView::Update(force);
 	if (!fSelected)
 		return;
-		
+
 	acpi_extended_battery_info extInfo;
-	fDriverInterface->GetExtendedBatteryInfo(&extInfo, fBatteryId);
+	fDriverInterface->GetExtendedBatteryInfo(&extInfo, fBatteryID);
 
 	fBatteryInfoView->Update(fBatteryInfo, extInfo);
 	fBatteryInfoView->Invalidate();
 }
 
 
+//	#pragma mark -
+
+
 ExtendedInfoWindow::ExtendedInfoWindow(PowerStatusDriverInterface* interface)
 	:
 	BWindow(BRect(100, 150, 500, 500), "Extended Battery Info", B_TITLED_WINDOW,
@@ -348,7 +350,7 @@
 	mainLayout->SetSpacing(10);
 	mainLayout->SetInsets(10, 10, 10, 10);
 	view->SetLayout(mainLayout);
-	
+
 	BRect rect = Bounds();
 	rect.InsetBy(5, 5);
 	BBox *infoBox = new BBox(rect, "Power Status Box");
@@ -358,14 +360,14 @@
 	infoLayout->SetSpacing(10);
 	infoBox->SetLayout(infoLayout);
 	mainLayout->AddView(infoBox);
-	
+
 	BGroupView* batteryView = new BGroupView(B_VERTICAL);
 	batteryView->GroupLayout()->SetSpacing(10);
 	infoLayout->AddView(batteryView);
 
 	// create before the battery views
 	fBatteryInfoView = new BatteryInfoView();
-	
+
 	BGroupLayout* batteryLayout = batteryView->GroupLayout();
 	BRect batteryRect(0, 0, 50, 30);
 	for (int i = 0; i < interface->GetBatteryCount(); i++) {
@@ -377,18 +379,18 @@
 		batteryLayout->AddView(view);
 		fBatteryViewList.AddItem(view);
 		fDriverInterface->StartWatching(view);
-		if (view->IsValid())
+		if (!view->IsCritical())
 			fSelectedView = view;
 	}
 
-	batteryLayout->AddItem(BSpaceLayoutItem::CreateGlue());	
-	
+	batteryLayout->AddItem(BSpaceLayoutItem::CreateGlue());
+
 	infoLayout->AddView(fBatteryInfoView);
-	
+
 	if (!fSelectedView && fBatteryViewList.CountItems() > 0)
-		fSelectedView = fBatteryViewList.ItemAt(0);	
+		fSelectedView = fBatteryViewList.ItemAt(0);
 	fSelectedView->Select();
-	
+
 	BSize size = mainLayout->PreferredSize();
 	ResizeTo(size.width, size.height);
 }
@@ -398,7 +400,7 @@
 {
 	for (int i = 0; i < fBatteryViewList.CountItems(); i++)
 		fDriverInterface->StopWatching(fBatteryViewList.ItemAt(i));
-		
+
 	fDriverInterface->ReleaseReference();
 }
 

Modified: haiku/trunk/src/apps/powerstatus/ExtendedInfoWindow.h
===================================================================
--- haiku/trunk/src/apps/powerstatus/ExtendedInfoWindow.h	2009-08-11 15:46:07 UTC (rev 32254)
+++ haiku/trunk/src/apps/powerstatus/ExtendedInfoWindow.h	2009-08-11 17:00:31 UTC (rev 32255)
@@ -1,14 +1,15 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Clemens Zeidler, haiku at Clemens-Zeidler.de
  */
- 
+
 #ifndef EXTENDED_INFO_WINDOW_H
 #define EXTENDED_INFO_WINDOW_H
 
+
 #include <ObjectList.h>
 #include <String.h>
 #include <View.h>
@@ -18,69 +19,67 @@
 #include "PowerStatusView.h"
 
 
-class FontString
-{
+class FontString {
 public:
 					FontString();
 
 	const BFont*	font;
-	BString			string;	
+	BString			string;
 };
 
 
-class BatteryInfoView : public BView
-{
-	public:
-						BatteryInfoView();
-						~BatteryInfoView();
+class BatteryInfoView : public BView {
+public:
+							BatteryInfoView();
+							~BatteryInfoView();
 
-		virtual void	Update(battery_info& info,
-							acpi_extended_battery_info& extInfo);
-		virtual	void	Draw(BRect updateRect);
-		virtual void	GetPreferredSize(float *width, float *height);
-		virtual void	AttachedToWindow();
+	virtual void			Update(battery_info& info,
+								acpi_extended_battery_info& extInfo);
+	virtual	void			Draw(BRect updateRect);
+	virtual void			GetPreferredSize(float* width, float* height);
+	virtual void			AttachedToWindow();
 
-	private:
-		BSize			_MeasureString(const BString& string);
-		void			_FillStringList();
-		void			_AddToStringList(FontString* fontString);
-		void			_ClearStringList();
+private:
+			BSize			_MeasureString(const BString& string);
+			void			_FillStringList();
+			void			_AddToStringList(FontString* fontString);
+			void			_ClearStringList();
 
-		battery_info				fBatteryInfo;
-		acpi_extended_battery_info	fBatteryExtendedInfo;
-		
-		BSize						fPreferredSize;
-		
-		BObjectList<FontString>		fStringList;
-		BSize						fMaxStringSize;
+			battery_info				fBatteryInfo;
+			acpi_extended_battery_info	fBatteryExtendedInfo;
+
+			BSize						fPreferredSize;
+
+			BObjectList<FontString>		fStringList;
+			BSize						fMaxStringSize;
 };
 
 
 class ExtendedInfoWindow;
 
-class ExtPowerStatusView : public PowerStatusView
-{
-	public:
-		ExtPowerStatusView(PowerStatusDriverInterface* interface,
-			BRect frame, int32 resizingMode, int batteryId,
-			ExtendedInfoWindow* window);
-			
-		virtual	void	Draw(BRect updateRect);
-		virtual	void	MouseDown(BPoint where);
+class ExtPowerStatusView : public PowerStatusView {
+public:
+								ExtPowerStatusView(
+									PowerStatusDriverInterface* interface,
+									BRect frame, int32 resizingMode,
+									int batteryID, ExtendedInfoWindow* window);
 
-		virtual void	Select(bool select = true);
-		
-		// return true if it battery is in a none critical state
-		virtual bool	IsValid();
+	virtual	void				Draw(BRect updateRect);
+	virtual	void				MouseDown(BPoint where);
 
-	protected:
-		virtual void	_Update(bool force = false);
+	virtual void				Select(bool select = true);
 
-	private:
-		ExtendedInfoWindow*	fExtendedInfoWindow;
-		BatteryInfoView*	fBatteryInfoView;
-		
-		bool				fSelected;	
+	// return true if it battery is in a critical state
+	virtual	bool				IsCritical();
+
+protected:
+	virtual void				Update(bool force = false);
+
+private:
+			ExtendedInfoWindow*	fExtendedInfoWindow;
+			BatteryInfoView*	fBatteryInfoView;
+
+			bool				fSelected;
 };
 
 
@@ -89,7 +88,7 @@
 public:
 		ExtendedInfoWindow(PowerStatusDriverInterface* interface);
 		~ExtendedInfoWindow();
-	
+
 	BatteryInfoView*			GetExtendedBatteryInfoView();
 
 	void						BatterySelected(ExtPowerStatusView* view);
@@ -97,9 +96,9 @@
 private:
 	PowerStatusDriverInterface* 		fDriverInterface;
 	BObjectList<ExtPowerStatusView>		fBatteryViewList;
-	
+
 	BatteryInfoView*					fBatteryInfoView;
-	
+
 	ExtPowerStatusView*					fSelectedView;
 };
 

Modified: haiku/trunk/src/apps/powerstatus/PowerStatus.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatus.cpp	2009-08-11 15:46:07 UTC (rev 32254)
+++ haiku/trunk/src/apps/powerstatus/PowerStatus.cpp	2009-08-11 17:00:31 UTC (rev 32255)
@@ -79,6 +79,7 @@
 		isInstalled = deskbar.HasItem(kDeskbarItemName);
 	}
 
+isInstalled = true;
 	if (isDeskbarRunning && !isInstalled) {
 		BAlert* alert = new BAlert("", "Do you want PowerStatus to live in the Deskbar?",
 			"Don't", "Install", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
@@ -87,7 +88,7 @@
 		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;

Modified: haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-11 15:46:07 UTC (rev 32254)
+++ haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-11 17:00:31 UTC (rev 32255)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -13,6 +13,7 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <ControlLook.h>
 #include <Deskbar.h>
 #include <Dragger.h>
 #include <Drivers.h>
@@ -43,12 +44,12 @@
 
 
 PowerStatusView::PowerStatusView(PowerStatusDriverInterface* interface,
-	BRect frame, int32 resizingMode,  int batteryId, bool inDeskbar)
+		BRect frame, int32 resizingMode,  int batteryID, bool inDeskbar)
 	:
 	BView(frame, kDeskbarItemName, resizingMode,
 		B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE),
 	fDriverInterface(interface),
-	fBatteryId(batteryId),
+	fBatteryID(batteryID),
 	fInDeskbar(inDeskbar)
 {
 	fPreferredSize.width = frame.Width();
@@ -71,14 +72,12 @@
 		fShowTime = value;
 	int32 intValue;
 	if (archive->FindInt32("battery id", &intValue) == B_OK)
-		fBatteryId = intValue;
-	
+		fBatteryID = intValue;
 }
 
 
 PowerStatusView::~PowerStatusView()
 {
-
 }
 
 
@@ -93,7 +92,7 @@
 	if (status == B_OK)
 		status = archive->AddBool("show time", fShowTime);
 	if (status == B_OK)
-		status = archive->AddInt32("battery id", fBatteryId);
+		status = archive->AddInt32("battery id", fBatteryID);
 
 	return status;
 }
@@ -102,6 +101,8 @@
 void
 PowerStatusView::_Init()
 {
+	SetViewColor(B_TRANSPARENT_COLOR);
+
 	fShowLabel = true;
 	fShowTime = false;
 	fShowStatusIcon = true;
@@ -109,7 +110,6 @@
 	fPercent = -1;
 	fOnline = true;
 	fTimeLeft = 0;
-
 }
 
 
@@ -118,13 +118,11 @@
 {
 	BView::AttachedToWindow();
 	if (Parent())
-		SetViewColor(Parent()->ViewColor());
+		SetLowColor(Parent()->ViewColor());
 	else
-		SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+		SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
-	SetLowColor(ViewColor());
-
-	_Update();
+	Update();
 }
 
 
@@ -140,7 +138,7 @@
 {
 	switch (message->what) {
 		case kMsgUpdate:
-			_Update();
+			Update();
 			break;
 
 		default:
@@ -169,39 +167,55 @@
 	float left = rect.left;
 	rect.left += rect.Width() / 11;
 
+	SetHighColor(84, 84, 84);
+
 	float gap = 1;
 	if (rect.Height() > 8) {
-		rect.InsetBy(1, 1);
-		SetPenSize(2);
-		gap = 2;
-	}
+		gap = ceilf((rect.left - left) / 2);
 
-	SetHighColor(92, 92, 92);
+		// left
+		FillRect(BRect(rect.left, rect.top, rect.left + gap - 1, rect.bottom));
+		// right
+		FillRect(BRect(rect.right - gap + 1, rect.top, rect.right,
+			rect.bottom));
+		// top
+		FillRect(BRect(rect.left + gap, rect.top, rect.right - gap,
+			rect.top + gap - 1));
+		// bottom
+		FillRect(BRect(rect.left + gap, rect.bottom + 1 - gap,
+			rect.right - gap, rect.bottom));
+	} else
+		StrokeRect(rect);
 
-	StrokeRect(rect);
-
-	SetPenSize(1);
 	FillRect(BRect(left, floorf(rect.top + rect.Height() / 4) + 1,
-		rect.left, floorf(rect.bottom - rect.Height() / 4)));
+		rect.left - 1, floorf(rect.bottom - rect.Height() / 4)));
 
 	int32 percent = fPercent;
 	if (percent > 100 || percent < 0)
 		percent = 100;
 
 	if (percent > 0) {
-		if (percent < 16)
-			SetHighColor(180, 0, 0);
-		else
-			SetHighColor(20, 180, 0);
-
-		rect.InsetBy(gap + 1, gap + 1);
-		if (gap > 1) {
-			rect.right++;
-			rect.bottom++;
+		rgb_color base;
+		if (fOnline) {
+			if (percent <= 15)
+				base.set_to(180, 0, 0);
+			else
+				base.set_to(20, 180, 0);
+		} else {
+			base = HighColor();
+			percent = 100;
 		}
 
-		rect.right = rect.left + rect.Width() * min_c(percent, 100) / 100.0;
-		FillRect(rect);
+		rect.InsetBy(gap, gap);
+		rect.right = rect.left + rect.Width() * percent / 100.0;
+
+		if (be_control_look != NULL)
+			be_control_look->DrawButtonBackground(this, rect, rect, base,
+				fOnline ? 0 : BControlLook::B_DISABLED);
+			//if (!)
+
+		else
+			FillRect(rect);
 	}
 
 	SetHighColor(0, 0, 0);
@@ -211,6 +225,11 @@
 void
 PowerStatusView::Draw(BRect updateRect)
 {
+	bool drawBackground = Parent() == NULL
+		|| (Parent()->Flags() & B_DRAW_ON_CHILDREN) == 0;
+	if (drawBackground)
+		FillRect(updateRect, B_SOLID_LOW);
+
 	float aspect = Bounds().Width() / Bounds().Height();
 	bool below = aspect <= 1.0f;
 
@@ -269,6 +288,17 @@
 			point.y += (Bounds().Height() - textHeight) / 2;
 		}
 
+		if (drawBackground)
+			SetHighColor(ui_color(B_CONTROL_TEXT_COLOR));
+		else {
+			SetDrawingMode(B_OP_OVER);
+			rgb_color c = Parent()->LowColor();
+			if (c.red + c.green + c.blue > 128 * 3)
+				SetHighColor(0, 0, 0);
+			else
+				SetHighColor(255, 255, 255);
+		}
+
 		DrawString(text, point);
 	}
 }
@@ -303,13 +333,13 @@
 
 
 void
-PowerStatusView::_Update(bool force)
+PowerStatusView::Update(bool force)
 {
 	int32 previousPercent = fPercent;
 	bool previousTimeLeft = fTimeLeft;
 	bool wasOnline = fOnline;
 
-	_GetBatteryInfo(&fBatteryInfo, fBatteryId);
+	_GetBatteryInfo(&fBatteryInfo, fBatteryID);
 
 	fPercent = (100 * fBatteryInfo.capacity) / fBatteryInfo.full_capacity;
 	fTimeLeft = fBatteryInfo.time_left;
@@ -317,7 +347,7 @@
 		fOnline = true;
 	else
 		fOnline = false;
-	
+
 	if (fInDeskbar) {
 		// make sure the tray icon is large enough
 		float width = fShowStatusIcon ? kMinIconWidth + 2 : 0;
@@ -346,24 +376,25 @@
 
 
 void
-PowerStatusView::_GetBatteryInfo(battery_info* batteryInfo, int batteryId)
+PowerStatusView::_GetBatteryInfo(battery_info* batteryInfo, int batteryID)
 {
-	if (batteryId >= 0) {
-		fDriverInterface->GetBatteryInfo(batteryInfo, batteryId);
+	if (batteryID >= 0) {
+		fDriverInterface->GetBatteryInfo(batteryInfo, batteryID);
+	} else {
+		for (int i = 0; i < fDriverInterface->GetBatteryCount(); i++) {
+			battery_info info;
+			fDriverInterface->GetBatteryInfo(&info, i);
+
+			if (i == 0)
+				*batteryInfo = info;
+			else {
+				batteryInfo->state &= info.state;
+				batteryInfo->capacity += info.capacity;
+				batteryInfo->full_capacity += info.full_capacity;
+				batteryInfo->time_left += info.time_left;
+			}
+		}
 	}
-	else for (int i = 0; i < fDriverInterface->GetBatteryCount(); i++) {
-		battery_info tmpInfo;
-		fDriverInterface->GetBatteryInfo(&tmpInfo, i);
-		
-		if (i == 0)
-			*batteryInfo = tmpInfo;
-		else {
-			batteryInfo->state &= tmpInfo.state;
-			batteryInfo->capacity += tmpInfo.capacity;
-			batteryInfo->full_capacity += tmpInfo.full_capacity;
-			batteryInfo->time_left += tmpInfo.time_left;			
-		}	
-	}
 }
 
 
@@ -371,7 +402,7 @@
 
 
 PowerStatusReplicant::PowerStatusReplicant(BRect frame, int32 resizingMode,
-	bool inDeskbar)
+		bool inDeskbar)
 	:
 	PowerStatusView(NULL, frame, resizingMode, -1, inDeskbar)
 {
@@ -386,7 +417,7 @@
 			B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
 		AddChild(dragger);
 	} else
-		_Update();
+		Update();
 }
 
 
@@ -439,17 +470,17 @@
 	switch (message->what) {
 		case kMsgToggleLabel:
 			fShowLabel = !fShowLabel;
-			_Update(true);
+			Update(true);
 			break;
 
 		case kMsgToggleTime:
 			fShowTime = !fShowTime;
-			_Update(true);
+			Update(true);
 			break;
 
 		case kMsgToggleStatusIcon:
 			fShowStatusIcon = !fShowStatusIcon;
-			_Update(true);
+			Update(true);
 			break;
 
 		case kMsgToggleExtInfo:
@@ -488,9 +519,10 @@
 	menu->AddItem(new BMenuItem(!fShowTime ? "Show Time" : "Show Percent",
 		new BMessage(kMsgToggleTime)));
 
-	menu->AddItem(new BMenuItem("Battery Info",
+	menu->AddSeparatorItem();
+	menu->AddItem(new BMenuItem("Battery Info" B_UTF8_ELLIPSIS,
 		new BMessage(kMsgToggleExtInfo)));
-	
+
 	menu->AddSeparatorItem();
 	menu->AddItem(new BMenuItem("About" B_UTF8_ELLIPSIS,
 		new BMessage(B_ABOUT_REQUESTED)));
@@ -535,7 +567,7 @@
 			_Quit();
 		}
 	}
-	
+
 	fExtendedWindow = NULL;
 	fMessengerExist = false;
 	fExtWindowMessenger = NULL;

Modified: haiku/trunk/src/apps/powerstatus/PowerStatusView.h
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatusView.h	2009-08-11 15:46:07 UTC (rev 32254)
+++ haiku/trunk/src/apps/powerstatus/PowerStatusView.h	2009-08-11 17:00:31 UTC (rev 32255)
@@ -1,12 +1,11 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Axel D?rfler, axeld at pinc-software.de
  *		Clemens Zeidler, haiku at Clemens-Zeidler.de
  */
-
 #ifndef POWER_STATUS_VIEW_H
 #define POWER_STATUS_VIEW_H
 
@@ -17,77 +16,79 @@
 
 
 class PowerStatusView : public BView {
-	public:
-		PowerStatusView(PowerStatusDriverInterface* interface,
-			BRect frame, int32 resizingMode, int batteryId = -1,
-			bool inDeskbar = false);
-		
-		virtual	~PowerStatusView();
+public:
+							PowerStatusView(
+								PowerStatusDriverInterface* interface,
+								BRect frame, int32 resizingMode,
+								int batteryID = -1, bool inDeskbar = false);
 
-		virtual	status_t Archive(BMessage* archive, bool deep = true) const;
+	virtual					~PowerStatusView();
 
-		virtual	void	AttachedToWindow();
-		virtual	void	DetachedFromWindow();
+	virtual	status_t		Archive(BMessage* archive, bool deep = true) const;
 
-		virtual	void	MessageReceived(BMessage* message);
-		virtual	void	Draw(BRect updateRect);
-		virtual void	GetPreferredSize(float *width, float *height);
-		
-	protected:
-						PowerStatusView(BMessage* archive);
-		
-		virtual void	_Update(bool force = false);
-		virtual void	_GetBatteryInfo(battery_info* info, int batteryId);
+	virtual	void			AttachedToWindow();
+	virtual	void			DetachedFromWindow();
 
-		PowerStatusDriverInterface*	fDriverInterface;
+	virtual	void			MessageReceived(BMessage* message);
+	virtual	void			Draw(BRect updateRect);
+	virtual	void			GetPreferredSize(float *width, float *height);
 
-		bool			fShowLabel;
-		bool			fShowTime;
-		bool			fShowStatusIcon;
-		
-		int				fBatteryId;
-		bool			fInDeskbar;
 
-		battery_info	fBatteryInfo;
+protected:
+							PowerStatusView(BMessage* archive);
 
-	private:
-		void			_Init();
-		void			_SetLabel(char* buffer, size_t bufferLength);
-		void			_DrawBattery(BRect rect);
+	virtual void			Update(bool force = false);
 
-		int32			fPercent;
-		time_t			fTimeLeft;
-		bool			fOnline;
+private:
+			void			_GetBatteryInfo(battery_info* info, int batteryID);
+			void			_Init();
+			void			_SetLabel(char* buffer, size_t bufferLength);
+			void			_DrawBattery(BRect rect);
 
-		BSize			fPreferredSize;
+protected:
+			PowerStatusDriverInterface*	fDriverInterface;
+
+			bool			fShowLabel;
+			bool			fShowTime;
+			bool			fShowStatusIcon;
+
+			int				fBatteryID;
+			bool			fInDeskbar;
+
+			battery_info	fBatteryInfo;
+
+			int32			fPercent;
+			time_t			fTimeLeft;
+			bool			fOnline;
+
+			BSize			fPreferredSize;
 };

[... truncated: 50 lines follow ...]


From axeld at mail.berlios.de  Tue Aug 11 19:49:30 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 19:49:30 +0200
Subject: [Haiku-commits] r32256 - haiku/trunk/src/apps/powerstatus
Message-ID: <200908111749.n7BHnUSm011635@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 19:49:27 +0200 (Tue, 11 Aug 2009)
New Revision: 32256
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32256&view=rev

Modified:
   haiku/trunk/src/apps/powerstatus/ACPIDriverInterface.h
   haiku/trunk/src/apps/powerstatus/APMDriverInterface.h
   haiku/trunk/src/apps/powerstatus/DriverInterface.cpp
   haiku/trunk/src/apps/powerstatus/DriverInterface.h
   haiku/trunk/src/apps/powerstatus/PowerStatus.cpp
   haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
   haiku/trunk/src/apps/powerstatus/PowerStatusView.h
Log:
* Improved the disabled look (in case there is no battery -- apparently, the
  ACPI interface needs some more work, as it currently uses
  BATTERY_CRITICAL_STATE to report that there is no battery...).
* Cleanup of many more of Clemens' coding style violations...


Modified: haiku/trunk/src/apps/powerstatus/ACPIDriverInterface.h
===================================================================
--- haiku/trunk/src/apps/powerstatus/ACPIDriverInterface.h	2009-08-11 17:00:31 UTC (rev 32255)
+++ haiku/trunk/src/apps/powerstatus/ACPIDriverInterface.h	2009-08-11 17:49:27 UTC (rev 32256)
@@ -5,10 +5,10 @@
  * Authors:
  *		Clemens Zeidler, haiku at clemens-zeidler.de
  */
-
 #ifndef ACPI_DRIVER_INTERFACE_H
 #define ACPI_DRIVER_INTERFACE_H
 
+
 #include "DriverInterface.h"
 
 #include <Locker.h>
@@ -17,13 +17,12 @@
 
 const int8 kRateBufferSize = 10;
 
-class RateBuffer
-{
+class RateBuffer {
 public:
 							RateBuffer();
 	void					AddRate(int32 rate);
 	int32					GetMeanRate();
-	
+
 private:
 	int32					fRateBuffer[kRateBufferSize];
 	int8					fPosition;
@@ -32,11 +31,10 @@
 };
 
 
-class Battery
-{
+class Battery {
 public:
 								Battery(int driverHandler);
-								~Battery();	
+								~Battery();
 
 	status_t					InitCheck();
 
@@ -49,19 +47,18 @@
 private:
 	void						_Init();
 
-	
+
 	int							fDriverHandler;
 	status_t					fInitStatus;
 
 	acpi_extended_battery_info	fExtendedBatteryInfo;
-	
+
 	RateBuffer					fRateBuffer;
 	acpi_battery_info			fCachedAcpiInfo;
 };
 
 
-class ACPIDriverInterface : public PowerStatusDriverInterface
-{
+class ACPIDriverInterface : public PowerStatusDriverInterface {
 public:
 	virtual					~ACPIDriverInterface();
 
@@ -75,13 +72,13 @@
 protected:
 	// Read the battery info from the hardware.
 	virtual status_t 		_ReadBatteryInfo();
-	
+
 	virtual void			_WatchPowerStatus();
 	virtual status_t		_FindDrivers(const char* path);
 
 	BObjectList<Battery>	fDriverList;
-	
+
 	BLocker					fInterfaceLocker;
 };
 
-#endif
+#endif	// ACPI_DRIVER_INTERFACE_H

Modified: haiku/trunk/src/apps/powerstatus/APMDriverInterface.h
===================================================================
--- haiku/trunk/src/apps/powerstatus/APMDriverInterface.h	2009-08-11 17:00:31 UTC (rev 32255)
+++ haiku/trunk/src/apps/powerstatus/APMDriverInterface.h	2009-08-11 17:49:27 UTC (rev 32256)
@@ -5,31 +5,30 @@
  * Authors:
  *		Clemens Zeidler, haiku at clemens-zeidler.de
  */
-
 #ifndef APM_DRIVER_INTERFACE_H
 #define APM_DRIVER_INTERFACE_H
 
+
 #include "DriverInterface.h"
 
 
-class APMDriverInterface : public PowerStatusDriverInterface
-{
+class APMDriverInterface : public PowerStatusDriverInterface {
 public:
 	virtual				~APMDriverInterface();
 
 	virtual status_t	Connect();
 	virtual status_t 	GetBatteryInfo(battery_info* info, int32 index);
 	virtual status_t	GetExtendedBatteryInfo(acpi_extended_battery_info* info,
-								int32 index);
+							int32 index);
 	virtual int32		GetBatteryCount();
 
 protected:
 	virtual void		_WatchPowerStatus();
-	
-private:		
+
+private:
 #ifndef HAIKU_TARGET_PLATFORM_HAIKU
 	int					fDevice;
 #endif
 };
 
-#endif
+#endif	// APM_DRIVER_INTERFACE_H

Modified: haiku/trunk/src/apps/powerstatus/DriverInterface.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/DriverInterface.cpp	2009-08-11 17:00:31 UTC (rev 32255)
+++ haiku/trunk/src/apps/powerstatus/DriverInterface.cpp	2009-08-11 17:49:27 UTC (rev 32256)
@@ -1,11 +1,12 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Clemens Zeidler, haiku at Clemens-Zeidler.de
  */
- 
+
+
 #include "DriverInterface.h"
 
 #include <Autolock.h>
@@ -14,7 +15,6 @@
 
 Monitor::~Monitor()
 {
-	
 }
 
 
@@ -39,8 +39,7 @@
 void
 Monitor::Broadcast(uint32 message)
 {
-	for (int i = 0; i < fWatcherList.CountItems(); i++)
-	{
+	for (int i = 0; i < fWatcherList.CountItems(); i++) {
 		BMessenger messenger(fWatcherList.ItemAt(i));
 		messenger.SendMessage(message);
 	}
@@ -50,9 +49,9 @@
 PowerStatusDriverInterface::PowerStatusDriverInterface()
 	:
 	fIsWatching(0),
-	fThreadId(-1)
+	fThread(-1)
 {
-	
+
 }
 
 
@@ -67,27 +66,25 @@
 {
 	BAutolock autolock(fListLocker);
 	status_t status = Monitor::StartWatching(target);
-	
+
 	if (status != B_OK)
 		return status;
 
-	if (fThreadId > 0)
+	if (fThread > 0)
 		return B_OK;
-	
-	fThreadId = spawn_thread(&_ThreadWatchPowerFunction, "PowerStatusThread",
-								B_LOW_PRIORITY, this);
-	if (fThreadId >= 0) {
+
+	fThread = spawn_thread(&_ThreadWatchPowerFunction, "PowerStatusThread",
+		B_LOW_PRIORITY, this);
+	if (fThread >= 0) {
 		atomic_set(&fIsWatching, 1);
-		status = resume_thread(fThreadId);
-	}
-	else
-		return fThreadId;
+		status = resume_thread(fThread);
+	} else
+		return fThread;
 
-	if (status != B_OK && fWatcherList.CountItems() == 0) {
+	if (status != B_OK && fWatcherList.CountItems() == 0)
 		atomic_set(&fIsWatching, 0);
-	}
+
 	return status;
-	
 }
 
 
@@ -95,17 +92,15 @@
 PowerStatusDriverInterface::StopWatching(BHandler* target)
 {
 	BAutolock autolock(fListLocker);
-	if (fThreadId < 0)
+	if (fThread < 0)
 		return B_BAD_VALUE;
 
-	status_t status;
 	if (fWatcherList.CountItems() == 1) {
 		atomic_set(&fIsWatching, 0);
-	
-		status = wait_for_thread(fThreadId, &status);
-		fThreadId = -1;
+		wait_for_thread(fThread, NULL);
+		fThread = -1;
 	}
-	
+
 	return Monitor::StopWatching(target);
 }
 
@@ -122,9 +117,8 @@
 PowerStatusDriverInterface::Disconnect()
 {
 	atomic_set(&fIsWatching, 0);
-	status_t status;
-	wait_for_thread(fThreadId, &status);
-	fThreadId = -1;
+	wait_for_thread(fThread, NULL);
+	fThread = -1;
 }
 
 

Modified: haiku/trunk/src/apps/powerstatus/DriverInterface.h
===================================================================
--- haiku/trunk/src/apps/powerstatus/DriverInterface.h	2009-08-11 17:00:31 UTC (rev 32255)
+++ haiku/trunk/src/apps/powerstatus/DriverInterface.h	2009-08-11 17:49:27 UTC (rev 32256)
@@ -1,14 +1,14 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Clemens Zeidler, haiku at Clemens-Zeidler.de
  */
- 
 #ifndef DRIVER_INTERFACE_H
 #define DRIVER_INTERFACE_H
 
+
 #include <Handler.h>
 #include <Locker.h>
 #include <ObjectList.h>
@@ -16,13 +16,13 @@
 
 #include "device/power_managment.h"
 
+
 typedef BObjectList<BHandler> WatcherList;
 
 const uint32 kMsgUpdate = 'updt';
 
 
-struct battery_info
-{
+struct battery_info {
 	int8		state;
 	int32		capacity;
 	int32		full_capacity;
@@ -32,11 +32,10 @@
 
 
 /*! Handle a list of watcher and broadcast a messages to them. */
-class Monitor
-{
+class Monitor {
 public:
 	virtual				~Monitor();
-	
+
 	virtual status_t	StartWatching(BHandler* target);
 	virtual status_t	StopWatching(BHandler* target);
 
@@ -44,12 +43,10 @@
 
 protected:
 	WatcherList			fWatcherList;
-	
 };
 
 
-class PowerStatusDriverInterface : public Monitor, public Referenceable
-{
+class PowerStatusDriverInterface : public Monitor, public Referenceable {
 public:
 						PowerStatusDriverInterface();
 						~PowerStatusDriverInterface();
@@ -57,26 +54,27 @@
 	virtual status_t	StartWatching(BHandler* target);
 	virtual status_t	StopWatching(BHandler* target);
 	virtual void		Broadcast(uint32 message);
-	
+
 	virtual status_t	Connect() = 0;
 	virtual void		Disconnect();
-	
+
 	virtual status_t 	GetBatteryInfo(battery_info* status, int32 index) = 0;
 	virtual status_t 	GetExtendedBatteryInfo(acpi_extended_battery_info* info,
 							int32 index) = 0;
-	
+
 	virtual int32		GetBatteryCount() = 0;
 
 protected:
 	virtual void		_WatchPowerStatus() = 0;
 
 	vint32				fIsWatching;
+
 private:
 	static int32		_ThreadWatchPowerFunction(void* data);
 
-	thread_id			fThreadId;
+	thread_id			fThread;
 	BLocker				fListLocker;
 };
 
 
-#endif
+#endif	// DRIVER_INTERFACE_H

Modified: haiku/trunk/src/apps/powerstatus/PowerStatus.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatus.cpp	2009-08-11 17:00:31 UTC (rev 32255)
+++ haiku/trunk/src/apps/powerstatus/PowerStatus.cpp	2009-08-11 17:49:27 UTC (rev 32256)
@@ -79,7 +79,6 @@
 		isInstalled = deskbar.HasItem(kDeskbarItemName);
 	}
 
-isInstalled = true;
 	if (isDeskbarRunning && !isInstalled) {
 		BAlert* alert = new BAlert("", "Do you want PowerStatus to live in the Deskbar?",
 			"Don't", "Install", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);

Modified: haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-11 17:00:31 UTC (rev 32255)
+++ haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-11 17:49:27 UTC (rev 32256)
@@ -191,30 +191,27 @@
 		rect.left - 1, floorf(rect.bottom - rect.Height() / 4)));
 
 	int32 percent = fPercent;
-	if (percent > 100 || percent < 0)
+	if (percent > 100 || percent < 0 || !fHasBattery)
 		percent = 100;
 
 	if (percent > 0) {
 		rgb_color base;
-		if (fOnline) {
+		if (fHasBattery) {
 			if (percent <= 15)
 				base.set_to(180, 0, 0);
 			else
 				base.set_to(20, 180, 0);
 		} else {
 			base = HighColor();
-			percent = 100;
 		}
 
 		rect.InsetBy(gap, gap);
 		rect.right = rect.left + rect.Width() * percent / 100.0;
 
-		if (be_control_look != NULL)
+		if (be_control_look != NULL) {
 			be_control_look->DrawButtonBackground(this, rect, rect, base,
-				fOnline ? 0 : BControlLook::B_DISABLED);
-			//if (!)
-
-		else
+				fHasBattery ? 0 : BControlLook::B_DISABLED);
+		} else
 			FillRect(rect);
 	}
 
@@ -343,11 +340,15 @@
 
 	fPercent = (100 * fBatteryInfo.capacity) / fBatteryInfo.full_capacity;
 	fTimeLeft = fBatteryInfo.time_left;
-	if (fBatteryInfo.state & BATTERY_CHARGING)
+	if ((fBatteryInfo.state & BATTERY_CHARGING) != 0)
 		fOnline = true;
 	else
 		fOnline = false;
 
+	// TODO: if critical really means that, its name should be changed...
+	fHasBattery = (fBatteryInfo.state & BATTERY_CRITICAL_STATE) == 0
+		&& fPercent >= 0;
+
 	if (fInDeskbar) {
 		// make sure the tray icon is large enough
 		float width = fShowStatusIcon ? kMinIconWidth + 2 : 0;
@@ -358,6 +359,15 @@
 
 			if (text[0])
 				width += ceilf(StringWidth(text)) + 4;
+		} else {
+			char text[256];
+			if (fHasBattery) {
+				snprintf(text, sizeof(text), "%ld%%\n%ld:%02ld\n%s",
+					fPercent, fTimeLeft / 3600, (fTimeLeft / 60) % 60,
+					fOnline ? "charging" : "discharging");
+			} else
+				strcpy(text, "no battery");
+			SetToolTip(text);
 		}
 		if (width == 0) {
 			// make sure we're not going away completely

Modified: haiku/trunk/src/apps/powerstatus/PowerStatusView.h
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatusView.h	2009-08-11 17:00:31 UTC (rev 32255)
+++ haiku/trunk/src/apps/powerstatus/PowerStatusView.h	2009-08-11 17:49:27 UTC (rev 32256)
@@ -60,6 +60,7 @@
 			int32			fPercent;
 			time_t			fTimeLeft;
 			bool			fOnline;
+			bool			fHasBattery;
 
 			BSize			fPreferredSize;
 };



From axeld at mail.berlios.de  Tue Aug 11 20:34:35 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 20:34:35 +0200
Subject: [Haiku-commits] r32257 - haiku/trunk/src/apps/powerstatus
Message-ID: <200908111834.n7BIYZZ7016069@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 20:34:33 +0200 (Tue, 11 Aug 2009)
New Revision: 32257
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32257&view=rev

Modified:
   haiku/trunk/src/apps/powerstatus/ACPIDriverInterface.cpp
   haiku/trunk/src/apps/powerstatus/APMDriverInterface.cpp
   haiku/trunk/src/apps/powerstatus/DriverInterface.cpp
   haiku/trunk/src/apps/powerstatus/DriverInterface.h
Log:
* The device watcher now waits on a semaphore, and doesn't use snooze() anymore.
* This has the advantage that we can quit PowerStatus instantly, instead of
  having to wait for two seconds in the worst case.
* Automatic whitespace cleanup.


Modified: haiku/trunk/src/apps/powerstatus/ACPIDriverInterface.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/ACPIDriverInterface.cpp	2009-08-11 17:49:27 UTC (rev 32256)
+++ haiku/trunk/src/apps/powerstatus/ACPIDriverInterface.cpp	2009-08-11 18:34:33 UTC (rev 32257)
@@ -6,6 +6,7 @@
  *		Clemens Zeidler, haiku at clemens-zeidler.de
  */
 
+
 #include "ACPIDriverInterface.h"
 
 #include <stdio.h>
@@ -22,7 +23,7 @@
 	fSize(kRateBufferSize),
 	fCurrentSize(0)
 {
-		
+
 }
 
 
@@ -33,7 +34,7 @@
 	fPosition ++;
 	if (fPosition >= fSize)
 		fPosition = 0;
-	
+
 	if (fCurrentSize < fSize)
 		fCurrentSize ++;
 }
@@ -46,7 +47,7 @@
 	for (int i = 0; i < fCurrentSize; i++) {
 		mean += fRateBuffer[i];
 	}
-	
+
 	if (fCurrentSize == 0)
 		return -1;
 
@@ -81,10 +82,10 @@
 	status_t status;
 	status = ioctl(fDriverHandler, GET_BATTERY_INFO, &fCachedAcpiInfo,
 		sizeof(acpi_battery_info));
-	
+
 	if (status != B_OK)
 		return status;
-		
+
 	return B_OK;
 }
 
@@ -113,7 +114,7 @@
 	status_t status;
 	status = ioctl(fDriverHandler, GET_EXTENDED_BATTERY_INFO, info,
 		sizeof(acpi_extended_battery_info));
-	
+
 	return status;
 }
 
@@ -126,17 +127,17 @@
 		sizeof(uint32));
 	if (fInitStatus != B_OK)
 		return;
-	
+
 	fInitStatus = ioctl(fDriverHandler, GET_EXTENDED_BATTERY_INFO,
 		&fExtendedBatteryInfo, sizeof(acpi_extended_battery_info));
 	if (fInitStatus != B_OK)
 		return;
-	
+
 	fInitStatus = ioctl(fDriverHandler, GET_BATTERY_INFO, &fCachedAcpiInfo,
 		sizeof(acpi_battery_info));
 	if (fInitStatus != B_OK)
 		return;
-	
+
 	printf("ACPI driver found\n");
 
 }
@@ -167,7 +168,7 @@
 	BAutolock autolock(fInterfaceLocker);
 	if (index < 0 || index >= fDriverList.CountItems())
 		return B_ERROR;
-		
+
 	status_t status;
 	status = fDriverList.ItemAt(index)->GetBatteryInfoCached(info);
 	return status;
@@ -181,7 +182,7 @@
 	BAutolock autolock(fInterfaceLocker);
 	if (index < 0 || index >= fDriverList.CountItems())
 		return B_ERROR;
-		
+
 	status_t status;
 	status = fDriverList.ItemAt(index)->GetExtendedBatteryInfo(info);
 
@@ -201,7 +202,7 @@
 {
 	for (int i = 0; i < fDriverList.CountItems(); i++)
 		fDriverList.ItemAt(i)->ReadBatteryInfo();
-	
+
 	return B_OK;
 }
 
@@ -215,7 +216,7 @@
 	while (atomic_get(&fIsWatching) > 0) {
 		_ReadBatteryInfo();
 		Broadcast(kMsgUpdate);
-		snooze(kUpdateInterval);
+		acquire_sem_etc(fWaitSem, 1, B_RELATIVE_TIMEOUT, kUpdateInterval);
 	}
 }
 
@@ -225,13 +226,13 @@
 {
 	BDirectory dir(path);
 	BEntry entry;
-	
+
 	status_t status = B_ERROR;
-	
+
 	while (dir.GetNextEntry(&entry) == B_OK) {
 		BPath path;
 		entry.GetPath(&path);
-		
+
 		if (entry.IsDirectory()) {
 			if (_FindDrivers(path.Path()) == B_OK)
 				return B_OK;
@@ -249,9 +250,9 @@
 					delete battery;
 			}
 		}
-		
+
 	}
-	return status;	
+	return status;
 }
 
-	
+

Modified: haiku/trunk/src/apps/powerstatus/APMDriverInterface.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/APMDriverInterface.cpp	2009-08-11 17:49:27 UTC (rev 32256)
+++ haiku/trunk/src/apps/powerstatus/APMDriverInterface.cpp	2009-08-11 18:34:33 UTC (rev 32257)
@@ -6,6 +6,7 @@
  *		Clemens Zeidler, haiku at clemens-zeidler.de
  */
 
+
 #include "APMDriverInterface.h"
 
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
@@ -61,7 +62,7 @@
 	if (fDevice < 0) {
 		return B_ERROR;
 	}
-	
+
 	return B_OK;
 #endif
 }
@@ -72,7 +73,7 @@
 {
 	if (index != 0)
 		return B_BAD_VALUE;
-	
+
 	info->current_rate = -1;
 
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
@@ -86,7 +87,7 @@
 		info->full_capacity = 100;
 		info->time_left = apmInfo.time_left;
 	}
-	
+
 	return status;
 #else
 	if (fDevice < 0)
@@ -108,7 +109,7 @@
 		else if (info->time_left & 0x8000)
 			info->time_left = (info->time_left & 0x7fff) * 60;
 	}
-	
+
 	return B_OK;
 #endif
 }
@@ -134,7 +135,7 @@
 {
 	while (atomic_get(&fIsWatching) > 0) {
 		Broadcast(kMsgUpdate);
-		snooze(kUpdateInterval);
+		acquire_sem_etc(fWaitSem, 1, B_RELATIVE_TIMEOUT, kUpdateInterval);
 	}
 }
 

Modified: haiku/trunk/src/apps/powerstatus/DriverInterface.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/DriverInterface.cpp	2009-08-11 17:49:27 UTC (rev 32256)
+++ haiku/trunk/src/apps/powerstatus/DriverInterface.cpp	2009-08-11 18:34:33 UTC (rev 32257)
@@ -46,18 +46,20 @@
 }
 
 
+//	#pragma mark -
+
+
 PowerStatusDriverInterface::PowerStatusDriverInterface()
 	:
 	fIsWatching(0),
+	fWaitSem(-1),
 	fThread(-1)
 {
-
 }
 
 
 PowerStatusDriverInterface::~PowerStatusDriverInterface()
 {
-
 }
 
 
@@ -65,8 +67,8 @@
 PowerStatusDriverInterface::StartWatching(BHandler* target)
 {
 	BAutolock autolock(fListLocker);
+
 	status_t status = Monitor::StartWatching(target);
-
 	if (status != B_OK)
 		return status;
 
@@ -76,14 +78,21 @@
 	fThread = spawn_thread(&_ThreadWatchPowerFunction, "PowerStatusThread",
 		B_LOW_PRIORITY, this);
 	if (fThread >= 0) {
+		fWaitSem = create_sem(0, "power status wait");
+
 		atomic_set(&fIsWatching, 1);
 		status = resume_thread(fThread);
 	} else
 		return fThread;
 
-	if (status != B_OK && fWatcherList.CountItems() == 0)
+	if (status != B_OK && fWatcherList.CountItems() == 0) {
 		atomic_set(&fIsWatching, 0);
+		delete_sem(fWaitSem);
 
+		fThread = -1;
+		fWaitSem = -1;
+	}
+
 	return status;
 }
 
@@ -95,11 +104,8 @@
 	if (fThread < 0)
 		return B_BAD_VALUE;
 
-	if (fWatcherList.CountItems() == 1) {
-		atomic_set(&fIsWatching, 0);
-		wait_for_thread(fThread, NULL);
-		fThread = -1;
-	}
+	if (fWatcherList.CountItems() == 1)
+		Disconnect();
 
 	return Monitor::StopWatching(target);
 }
@@ -116,9 +122,15 @@
 void
 PowerStatusDriverInterface::Disconnect()
 {
+	if (fThread < 0)
+		return;
+
 	atomic_set(&fIsWatching, 0);
+	delete_sem(fWaitSem);
+
 	wait_for_thread(fThread, NULL);
 	fThread = -1;
+	fWaitSem = -1;
 }
 
 

Modified: haiku/trunk/src/apps/powerstatus/DriverInterface.h
===================================================================
--- haiku/trunk/src/apps/powerstatus/DriverInterface.h	2009-08-11 17:49:27 UTC (rev 32256)
+++ haiku/trunk/src/apps/powerstatus/DriverInterface.h	2009-08-11 18:34:33 UTC (rev 32257)
@@ -68,6 +68,7 @@
 	virtual void		_WatchPowerStatus() = 0;
 
 	vint32				fIsWatching;
+	sem_id				fWaitSem;
 
 private:
 	static int32		_ThreadWatchPowerFunction(void* data);



From axeld at mail.berlios.de  Tue Aug 11 20:41:17 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 20:41:17 +0200
Subject: [Haiku-commits] r32258 - haiku/trunk/src/apps/powerstatus
Message-ID: <200908111841.n7BIfHo8016698@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 20:41:15 +0200 (Tue, 11 Aug 2009)
New Revision: 32258
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32258&view=rev

Modified:
   haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
   haiku/trunk/src/apps/powerstatus/PowerStatusWindow.cpp
Log:
* Made the window much larger by default.
* Cleaned up the about requester a bit.


Modified: haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-11 18:34:33 UTC (rev 32257)
+++ haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-11 18:41:15 UTC (rev 32258)
@@ -547,10 +547,9 @@
 void
 PowerStatusReplicant::_AboutRequested()
 {
-	BAlert *alert = new BAlert("about", "PowerStatus\n"
-		"written by Axel D?rfler,\n"
-		"\tClemens Zeidler\n"
-		"\tCopyright 2006, Haiku, Inc.\n", "Ok");
+	BAlert* alert = new BAlert("about", "PowerStatus\n"
+		"written by Axel D?rfler, Clemens Zeidler\n"
+		"Copyright 2006, Haiku, Inc.\n", "Ok");
 	BTextView *view = alert->TextView();
 	BFont font;
 

Modified: haiku/trunk/src/apps/powerstatus/PowerStatusWindow.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatusWindow.cpp	2009-08-11 18:34:33 UTC (rev 32257)
+++ haiku/trunk/src/apps/powerstatus/PowerStatusWindow.cpp	2009-08-11 18:41:15 UTC (rev 32258)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -14,7 +14,7 @@
 
 
 PowerStatusWindow::PowerStatusWindow()
-	: BWindow(BRect(100, 150, 147, 197), "PowerStatus", B_TITLED_WINDOW,
+	: BWindow(BRect(100, 150, 281, 299), "PowerStatus", B_TITLED_WINDOW,
 		B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS)
 {
 	BView* topView = new BView(Bounds(), NULL, B_FOLLOW_ALL, B_WILL_DRAW);



From clemens.zeidler at rwth-aachen.de  Tue Aug 11 20:43:27 2009
From: clemens.zeidler at rwth-aachen.de (Clemens zeidler)
Date: Tue, 11 Aug 2009 20:43:27 +0200
Subject: [Haiku-commits] r32257 - haiku/trunk/src/apps/powerstatus
In-Reply-To: <200908111834.n7BIYZZ7016069@sheep.berlios.de>
References: <200908111834.n7BIYZZ7016069@sheep.berlios.de>
Message-ID: <op.uyigyow1sfi1ex@lec-modul>

On Tue, 11 Aug 2009 20:34:35 +0200, <axeld at mail.berlios.de> wrote:

> * The device watcher now waits on a semaphore, and doesn't use snooze()  
> anymore.

Hey cool thanks that was on my todo list :-)




From axeld at mail.berlios.de  Tue Aug 11 20:48:08 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 20:48:08 +0200
Subject: [Haiku-commits] r32259 - haiku/trunk/src/apps/powerstatus
Message-ID: <200908111848.n7BIm829017900@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 20:48:06 +0200 (Tue, 11 Aug 2009)
New Revision: 32259
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32259&view=rev

Modified:
   haiku/trunk/src/apps/powerstatus/DriverInterface.cpp
Log:
* Fixed a deadlock that often happened when installing PowerStatus to the
  Deskbar.


Modified: haiku/trunk/src/apps/powerstatus/DriverInterface.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/DriverInterface.cpp	2009-08-11 18:41:15 UTC (rev 32258)
+++ haiku/trunk/src/apps/powerstatus/DriverInterface.cpp	2009-08-11 18:48:06 UTC (rev 32259)
@@ -100,12 +100,16 @@
 status_t
 PowerStatusDriverInterface::StopWatching(BHandler* target)
 {
-	BAutolock autolock(fListLocker);
 	if (fThread < 0)
 		return B_BAD_VALUE;
 
-	if (fWatcherList.CountItems() == 1)
+	fListLocker.Lock();
+
+	if (fWatcherList.CountItems() == 1) {
+		fListLocker.Unlock();
 		Disconnect();
+	} else
+		fListLocker.Unlock();
 
 	return Monitor::StopWatching(target);
 }



From axeld at mail.berlios.de  Tue Aug 11 20:53:50 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 20:53:50 +0200
Subject: [Haiku-commits] r32260 - haiku/trunk/src/apps/powerstatus
Message-ID: <200908111853.n7BIro30018574@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 20:53:48 +0200 (Tue, 11 Aug 2009)
New Revision: 32260
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32260&view=rev

Modified:
   haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
Log:
* Made the battery frame black, this looks better on the desktop.


Modified: haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-11 18:48:06 UTC (rev 32259)
+++ haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-11 18:53:48 UTC (rev 32260)
@@ -167,7 +167,7 @@
 	float left = rect.left;
 	rect.left += rect.Width() / 11;
 
-	SetHighColor(84, 84, 84);
+	SetHighColor(0, 0, 0);
 
 	float gap = 1;
 	if (rect.Height() > 8) {
@@ -201,9 +201,8 @@
 				base.set_to(180, 0, 0);
 			else
 				base.set_to(20, 180, 0);
-		} else {
-			base = HighColor();
-		}
+		} else
+			base.set_to(84, 84, 84);
 
 		rect.InsetBy(gap, gap);
 		rect.right = rect.left + rect.Width() * percent / 100.0;



From jackburton at mail.berlios.de  Tue Aug 11 21:00:05 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Tue, 11 Aug 2009 21:00:05 +0200
Subject: [Haiku-commits] r32261 - haiku/trunk/src/kits/game
Message-ID: <200908111900.n7BJ05r3020655@sheep.berlios.de>

Author: jackburton
Date: 2009-08-11 21:00:00 +0200 (Tue, 11 Aug 2009)
New Revision: 32261
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32261&view=rev

Modified:
   haiku/trunk/src/kits/game/WindowScreen.cpp
Log:
Handle workspace changes gracefully, without crashing.


Modified: haiku/trunk/src/kits/game/WindowScreen.cpp
===================================================================
--- haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-11 18:53:48 UTC (rev 32260)
+++ haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-11 19:00:00 UTC (rev 32261)
@@ -337,18 +337,21 @@
 		for (int32 x = firstIndex; x <= lastIndex; x++) {
 			fPalette[x] = list[x - firstIndex];
 				// update our local palette as well
+		}
 
-			colors[j++] = fPalette[x].red;
-			colors[j++] = fPalette[x].green;
-			colors[j++] = fPalette[x].blue;
+		j = 0;
+		for (int32 i = 0; i < 256; i++) {
+			colors[j++] = fPalette[i].red;
+			colors[j++] = fPalette[i].green;
+			colors[j++] = fPalette[i].blue;
 		}
-
+		
 		if (fAddonImage >= 0) {
 			set_indexed_colors setIndexedColors =
 				(set_indexed_colors)fGetAccelerantHook(B_SET_INDEXED_COLORS,
 					NULL);
 			if (setIndexedColors != NULL) {
-				setIndexedColors(lastIndex - firstIndex + 1, firstIndex,
+				setIndexedColors(255, 0,
 					colors, 0);
 			}
 		}
@@ -719,14 +722,15 @@
 BWindowScreen::_Deactivate()
 {
 	CALLED();
-	_AssertDisplayMode(fOriginalDisplayMode);
-
+	
 	if (fDebugState && !fDebugFirst) {
 		_Suspend();
 		SuspensionHook(false);
 	} else
 		ScreenConnected(false);
 
+	_AssertDisplayMode(fOriginalDisplayMode);
+
 	_ResetAccelerantHooks();
 	
 	be_app->ShowCursor();
@@ -747,12 +751,8 @@
 	status_t status = B_OK;
 	if (fAddonImage < 0)
 		status = _InitClone();
-	else {
-		if (fWaitEngineIdle)
-			fWaitEngineIdle();
-		
+	else	
 		_ResetAccelerantHooks();
-	}
 			
 	if (status == B_OK) {
 		sWaitIdleHook = fWaitEngineIdle = (wait_engine_idle)fGetAccelerantHook(B_WAIT_ENGINE_IDLE, NULL);
@@ -777,7 +777,9 @@
 BWindowScreen::_ResetAccelerantHooks()
 {
 	CALLED();
-	
+	if (fWaitEngineIdle)
+		fWaitEngineIdle();
+			
 	sFillRectHook = NULL;
 	sBlitRectHook = NULL;
 	sTransparentBlitHook = NULL;



From jackburton at mail.berlios.de  Tue Aug 11 21:02:33 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Tue, 11 Aug 2009 21:02:33 +0200
Subject: [Haiku-commits] r32262 - haiku/trunk/src/kits/game
Message-ID: <200908111902.n7BJ2XY2021682@sheep.berlios.de>

Author: jackburton
Date: 2009-08-11 21:02:30 +0200 (Tue, 11 Aug 2009)
New Revision: 32262
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32262&view=rev

Modified:
   haiku/trunk/src/kits/game/WindowScreen.cpp
Log:
This part wasn't meant to be committed


Modified: haiku/trunk/src/kits/game/WindowScreen.cpp
===================================================================
--- haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-11 19:00:00 UTC (rev 32261)
+++ haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-11 19:02:30 UTC (rev 32262)
@@ -337,14 +337,11 @@
 		for (int32 x = firstIndex; x <= lastIndex; x++) {
 			fPalette[x] = list[x - firstIndex];
 				// update our local palette as well
+		
+			colors[j++] = fPalette[x].red;
+			colors[j++] = fPalette[x].green;
+			colors[j++] = fPalette[x].blue;
 		}
-
-		j = 0;
-		for (int32 i = 0; i < 256; i++) {
-			colors[j++] = fPalette[i].red;
-			colors[j++] = fPalette[i].green;
-			colors[j++] = fPalette[i].blue;
-		}
 		
 		if (fAddonImage >= 0) {
 			set_indexed_colors setIndexedColors =



From pulkomandy at mail.berlios.de  Tue Aug 11 21:10:03 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Tue, 11 Aug 2009 21:10:03 +0200
Subject: [Haiku-commits] r32263 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale src/preferences/locale
Message-ID: <200908111910.n7BJA3D5024278@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-11 21:10:02 +0200 (Tue, 11 Aug 2009)
New Revision: 32263
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32263&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
Log:
Update our BCountry instance when using the long date dropdown. We need to send the BCountry back to ICU and save its settings somewhere, however.


Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-11 19:02:30 UTC (rev 32262)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-11 19:10:02 UTC (rev 32263)
@@ -8,7 +8,11 @@
 
 #include <unicode/locid.h>
 
+namespace icu_4_2 {
+	class DateFormat;
+}
 
+
 enum {
 	B_METRIC = 0,
 	B_US
@@ -36,7 +40,9 @@
 			bool longFormat);
 		virtual void	FormatTime(BString *string,time_t time,bool longFormat);
 
-		const char		*DateFormat(bool longFormat) const;
+		const char		*GetDateFormat(bool longFormat) const;
+		void			SetDateFormat(const char* formatString, 
+							bool longFormat = true);
 		const char		*TimeFormat(bool longFormat) const;
 		const char		*DateSeparator() const;
 		const char		*TimeSeparator() const;
@@ -73,6 +79,8 @@
 		virtual int32	MonFracDigits() const;
 
 	private:
+		icu_4_2::DateFormat *fICULongDateFormatter;
+		icu_4_2::DateFormat *fICUShortDateFormatter;
 		const char	**fStrings;
 		Locale fICULocale;
 };

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-11 19:02:30 UTC (rev 32262)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-11 19:10:02 UTC (rev 32263)
@@ -52,6 +52,10 @@
 	: fStrings(gStrings)
 	, fICULocale(languageAndCountryCode)
 {
+   	fICULongDateFormatter = DateFormat::createDateInstance(
+		DateFormat::FULL, fICULocale);
+   	fICUShortDateFormatter = DateFormat::createDateInstance(
+		DateFormat::SHORT, fICULocale);
 }
 
 
@@ -104,10 +108,8 @@
 {
 	// TODO: ICU allows for 4 different levels of expansion :
 	// short, medium, long, and full. Our bool parameter is not enough...
-	icu_4_2::DateFormat* dateFormatter;
-   	dateFormatter = DateFormat::createDateInstance(
-		longFormat ? DateFormat::FULL : DateFormat::SHORT,
-		fICULocale);
+	icu_4_2::DateFormat* dateFormatter = 
+		longFormat ? fICULongDateFormatter : fICUShortDateFormatter;
 	UnicodeString ICUString;
 	ICUString = dateFormatter->format((UDate)time * 1000, ICUString);
 
@@ -147,12 +149,10 @@
 
 
 const char *
-BCountry::DateFormat(bool longFormat) const
+BCountry::GetDateFormat(bool longFormat) const
 {
-	icu_4_2::DateFormat* dateFormatter;
-   	dateFormatter = DateFormat::createDateInstance(
-		longFormat ? DateFormat::FULL : DateFormat::SHORT,
-		fICULocale);
+	icu_4_2::DateFormat* dateFormatter = 
+		longFormat ? fICULongDateFormatter : fICUShortDateFormatter;
 	SimpleDateFormat* dateFormatterImpl =
 		static_cast<SimpleDateFormat*>(dateFormatter);
 
@@ -168,7 +168,20 @@
 }
 
 
-const char *
+void
+BCountry::SetDateFormat(const char* formatString, bool longFormat)
+{
+	icu_4_2::DateFormat* dateFormatter = 
+		longFormat ? fICULongDateFormatter : fICUShortDateFormatter;
+	SimpleDateFormat* dateFormatterImpl =
+		static_cast<SimpleDateFormat*>(dateFormatter);
+
+	UnicodeString pattern(formatString);
+	dateFormatterImpl->applyPattern(pattern);
+}
+
+
+const char*
 BCountry::TimeFormat(bool longFormat) const
 {
 	icu_4_2::DateFormat* dateFormatter;

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-11 19:02:30 UTC (rev 32262)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-11 19:10:02 UTC (rev 32263)
@@ -1,7 +1,7 @@
 /*
-* Copyright 2009, Adrien Destugues, pulkomandy at gmail.com. All rights reserved.
-* Distributed under the terms of the MIT License.
-*/
+ * Copyright 2009, Adrien Destugues, pulkomandy at gmail.com. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
 
 
 #include "TimeFormatSettingsView.h"
@@ -40,10 +40,10 @@
 }
 
 
-class dateMenuItem: public BMenuItem
+class DateMenuItem: public BMenuItem
 {
 	public:
-		dateMenuItem(const char* label, const char* code, BMenuField* field) 
+		DateMenuItem(const char* label, const char* code, BMenuField* field) 
 			: BMenuItem(label, MenuMessage(code, field))
 		{ 
 			icuCode = code;
@@ -59,43 +59,43 @@
 	BMenu *menu = new BMenu("");
 	*field = new BMenuField("", menu);
 
-	BMenu* dayMenu = new BMenu("Day");
+	BPopUpMenu* dayMenu = new BPopUpMenu("Day");
 	// Not all available ICU settings are listed here. It's possible to add some
 	// other things if you ever need.
 	menu->AddItem(dayMenu);
-		dayMenu -> AddItem(new dateMenuItem("day in month", "d", *field));
-		dayMenu -> AddItem(new dateMenuItem("day in month (2 digits)", "dd", 
+		dayMenu -> AddItem(new DateMenuItem("day in month", "d", *field));
+		dayMenu -> AddItem(new DateMenuItem("day in month (2 digits)", "dd", 
 			*field));
-		dayMenu -> AddItem(new dateMenuItem("day in year", "D", *field));
-		dayMenu -> AddItem(new dateMenuItem("day in year (2 digits)", "DD",
+		dayMenu -> AddItem(new DateMenuItem("day in year", "D", *field));
+		dayMenu -> AddItem(new DateMenuItem("day in year (2 digits)", "DD",
 			*field));
-		dayMenu -> AddItem(new dateMenuItem("day in year (3 digits)", "DDD",
+		dayMenu -> AddItem(new DateMenuItem("day in year (3 digits)", "DDD",
 			*field));
-		dayMenu -> AddItem(new dateMenuItem("day of week", "e",
+		dayMenu -> AddItem(new DateMenuItem("day of week", "e",
 			*field));
-		//dayMenu -> AddItem(new dateMenuItem("day of week (short text)", "eee",
+		//dayMenu -> AddItem(new DateMenuItem("day of week (short text)", "eee",
 		//	*field));
-		//dayMenu -> AddItem(new dateMenuItem("day of week (full text)", "eeee",
+		//dayMenu -> AddItem(new DateMenuItem("day of week (full text)", "eeee",
 		//	*field));
-		dayMenu -> AddItem(new dateMenuItem("day of week (short name)", "E", 
+		dayMenu -> AddItem(new DateMenuItem("day of week (short name)", "E", 
 			*field));
-		dayMenu -> AddItem(new dateMenuItem("day of week (name)", "EEEE",
+		dayMenu -> AddItem(new DateMenuItem("day of week (name)", "EEEE",
 			*field));
-		dayMenu -> AddItem(new dateMenuItem("day of week in month", "F",
+		dayMenu -> AddItem(new DateMenuItem("day of week in month", "F",
 			*field));
-		dayMenu -> AddItem(new dateMenuItem("julian day", "g", *field));
+		dayMenu -> AddItem(new DateMenuItem("julian day", "g", *field));
 		//dayMenu -> AddItem(new BMenuItem("c", msg));
-	BMenu* monthMenu = new BMenu("Month");
+	BPopUpMenu* monthMenu = new BPopUpMenu("Month");
 	menu->AddItem(monthMenu);
-		monthMenu -> AddItem(new dateMenuItem("month number", "M", *field));
-		monthMenu -> AddItem(new dateMenuItem("month name", "MMMM", *field));
-		//monthMenu -> AddItem(new dateMenuItem("L", "L", *field));
-	BMenu* yearMenu = new BMenu("Year");
+		monthMenu -> AddItem(new DateMenuItem("month number", "M", *field));
+		monthMenu -> AddItem(new DateMenuItem("month name", "MMMM", *field));
+		//monthMenu -> AddItem(new DateMenuItem("L", "L", *field));
+	BPopUpMenu* yearMenu = new BPopUpMenu("Year");
 	menu->AddItem(yearMenu);
-		yearMenu -> AddItem(new dateMenuItem("Year", "y", *field));
-		yearMenu -> AddItem(new dateMenuItem("Year (2 digits)", "yy", *field));
-		//yearMenu -> AddItem(new dateMenuItem("Y", "Y", *field));
-		//yearMenu -> AddItem(new dateMenuItem("u", "u", *field));
+		yearMenu -> AddItem(new DateMenuItem("Year", "y", *field));
+		yearMenu -> AddItem(new DateMenuItem("Year (2 digits)", "yy", *field));
+		//yearMenu -> AddItem(new DateMenuItem("Y", "Y", *field));
+		//yearMenu -> AddItem(new DateMenuItem("u", "u", *field));
 }
 
 
@@ -268,7 +268,7 @@
 void
 TimeFormatSettingsView::_ParseDateFormat()
 {
-	const char* dateFormat = fCountry->DateFormat(true);
+	const char* dateFormat = fCountry->GetDateFormat(true);
 
 	// Travel trough the string and parse it
 	const char* parsePointer = dateFormat;
@@ -282,6 +282,8 @@
 		BString str;
 		str.Append(fieldBegin, parsePointer - fieldBegin);
 
+		fLongDateString[i] = str;
+
 		BMenu* subMenu;
 		bool isFound = false;
 		for(int subMenuIndex = 0; subMenuIndex < 3; subMenuIndex++) {
@@ -289,7 +291,7 @@
 			BMenuItem* item;
 			for(int itemIndex = 0; (item = subMenu->ItemAt(itemIndex)) != NULL; 
 					itemIndex++) {
-				if(static_cast<dateMenuItem*>(item)->icuCode == str) {
+				if(static_cast<DateMenuItem*>(item)->icuCode == str) {
 					item->SetMarked(true);
 					fLongDateMenu[i]->MenuItem()->SetLabel(item->Label());
 					isFound = true;
@@ -314,8 +316,6 @@
 		str.Append(fieldBegin, parsePointer - fieldBegin);
 		fLongDateSeparator[i]->SetText(str);
 	}
-
-	free((void*)dateFormat);
 }
 
 
@@ -330,13 +330,21 @@
 	for(int i = 0; i < fLongDateMenu[3]->Menu()->CountItems(); i++)
 		fLongDateMenu[j]->Menu()->SubmenuAt(i)->SetTargetForItems(this);
 	fSeparatorMenuField->Menu()->SetTargetForItems(this);
+}
 
-	/*
-	static_cast<BScrollView*>(Parent())->ScrollBar(B_VERTICAL)->SetRange(
-		0, Bounds().Height());
-	*/
-	static_cast<BScrollView*>(Parent())->ScrollBar(B_VERTICAL)->SetProportion(
-		Parent()->Bounds().Height() / Bounds().Height());
+
+void
+TimeFormatSettingsView::_UpdateLongDateFormatString()
+{
+	BString newDateFormat;
+
+	for(int i=0; i<4; i++) {
+		newDateFormat.Append(fLongDateString[i]);
+		newDateFormat.Append(fLongDateSeparator[i]->Text());
+	}
+
+	// TODO create a "custom" country and save it ...
+	fCountry->SetDateFormat(newDateFormat.String());
 }
 
 
@@ -354,7 +362,19 @@
 			BString format;
 			message->FindString("format",&format);
 
-			menuField->MenuItem()->SetLabel(format);
+			for (int i=0; i < 4; i++) {
+				if (fLongDateMenu[i]==menuField) {
+					fLongDateString[i] = format;
+					break;
+				}
+			}
+
+			message->FindPointer("source",&pointerFromMessage);
+			BMenuItem* menuItem = static_cast<BMenuItem*>(pointerFromMessage);
+
+			menuField->MenuItem()->SetLabel(menuItem->Label());
+
+			_UpdateLongDateFormatString();
 		}
 		// pass trough
 		case kSettingsContentsModified:

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-11 19:02:30 UTC (rev 32262)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.h	2009-08-11 19:10:02 UTC (rev 32263)
@@ -51,11 +51,13 @@
 		void _UpdateExamples();
 		void _SendNotices();
 		void _ParseDateFormat();
+		void _UpdateLongDateFormatString();
 
 		BRadioButton *f24HrRadioButton;
 		BRadioButton *f12HrRadioButton;
 
 		BMenuField *fLongDateMenu[4];
+		BString fLongDateString[4];
 		BTextControl* fLongDateSeparator[4];
 		BMenuField *fDateMenu[3];
 



From kirilla at mail.berlios.de  Tue Aug 11 21:16:35 2009
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Tue, 11 Aug 2009 21:16:35 +0200
Subject: [Haiku-commits] r32264 - haiku/trunk/src/data/beos_mime/application
Message-ID: <200908111916.n7BJGZtU026846@sheep.berlios.de>

Author: kirilla
Date: 2009-08-11 21:16:34 +0200 (Tue, 11 Aug 2009)
New Revision: 32264
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32264&view=rev

Added:
   haiku/trunk/src/data/beos_mime/application/x-bfs-image
Log:
BFS image mime type

Added: haiku/trunk/src/data/beos_mime/application/x-bfs-image
===================================================================
--- haiku/trunk/src/data/beos_mime/application/x-bfs-image	2009-08-11 19:10:02 UTC (rev 32263)
+++ haiku/trunk/src/data/beos_mime/application/x-bfs-image	2009-08-11 19:16:34 UTC (rev 32264)
@@ -0,0 +1,31 @@
+
+resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
+
+resource(1, "META:TYPE") "application/x-bfs-image";
+
+resource(2, "META:S:DESC") #'MSDC' "BFS Image";
+
+resource(3, "META:L:DESC") #'MLDC' "Be File System Image";
+
+resource(4, "META:SNIFF_RULE") "0.60 [544](\"1SFBEGIB\"|\"1SFBBIGE\")";
+
+resource(5, "META:EXTENS") message(234) {
+	"extensions" = "bfs",
+	"type" = "application/x-bfs-image"
+};
+
+resource(6, "META:ICON") #'VICN' array {
+	$"6E636966080500040054020006023B019B3AA235BC243E3C71D248D17C498491"
+	$"00E7BB8FFFC99867020006023BA71138D0C8BBF4B83E90E64AED7C485BD7008A"
+	$"561DFFB57A3A02000602BB6FCBB8D4C839AA71BC3992492FF148D96A00FFC790"
+	$"FFFFF4EA0366330003FFDFC003AD7238110A0626543A464C455C4B4C603E600A"
+	$"063822262E264F3C5A4E484E2A0A04262E264F3C5A3C370A043C373C5A4E484E"
+	$"2A0A043822262E3C374E2A0A042832284E3A573A390A042A4D2B4638492A430A"
+	$"042A4D365238492B460A042A4D3854384936520A042E4CBB2BC5D3BB2BC5072E"
+	$"4A0A042C49344D344B2C470A042A352A402B38383B0A0436442A403846383B0A"
+	$"042B382A403644383B0A042EBE672EBF33BB2DC03FBB2DBF730A042CBD292CBD"
+	$"F5343F343D08022A4E2A540E0A010100000A0001101001178420040A00011030"
+	$"302901178420040A00011030401B01178420040A0001011001178400040A0201"
+	$"02000A030103000A040104000A050105000A06020B06000A0202070D000A0702"
+	$"0C08000A0302090E0815FF0A00020A0F0815FF"
+};



From axeld at mail.berlios.de  Tue Aug 11 21:27:12 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 11 Aug 2009 21:27:12 +0200
Subject: [Haiku-commits] r32265 - haiku/trunk/src/apps/powerstatus
Message-ID: <200908111927.n7BJRCbc030591@sheep.berlios.de>

Author: axeld
Date: 2009-08-11 21:27:10 +0200 (Tue, 11 Aug 2009)
New Revision: 32265
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32265&view=rev

Modified:
   haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
   haiku/trunk/src/apps/powerstatus/PowerStatusView.h
Log:
* The deskbar replicant now memorizes its settings.


Modified: haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-11 19:16:34 UTC (rev 32264)
+++ haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-11 19:27:10 UTC (rev 32265)
@@ -9,27 +9,30 @@
 
 
 #include "PowerStatusView.h"
-#include "PowerStatus.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <Alert.h>
 #include <Application.h>
 #include <ControlLook.h>
 #include <Deskbar.h>
 #include <Dragger.h>
 #include <Drivers.h>
+#include <File.h>
+#include <FindDirectory.h>
 #include <MenuItem.h>
 #include <MessageRunner.h>
+#include <Path.h>
 #include <PopUpMenu.h>
 #include <TextView.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "ACPIDriverInterface.h"
 #include "APMDriverInterface.h"
 #include "ExtendedInfoWindow.h"
+#include "PowerStatus.h"
 
 
 extern "C" _EXPORT BView *instantiate_deskbar_item(void);
@@ -62,17 +65,7 @@
 	: BView(archive)
 {
 	_Init();
-
-	bool value;
-	if (archive->FindBool("show label", &value) == B_OK)
-		fShowLabel = value;
-	if (archive->FindBool("show icon", &value) == B_OK)
-		fShowStatusIcon = value;
-	if (archive->FindBool("show time", &value) == B_OK)
-		fShowTime = value;
-	int32 intValue;
-	if (archive->FindInt32("battery id", &intValue) == B_OK)
-		fBatteryID = intValue;
+	FromMessage(archive);
 }
 
 
@@ -86,13 +79,7 @@
 {
 	status_t status = BView::Archive(archive, deep);
 	if (status == B_OK)
-		status = archive->AddBool("show label", fShowLabel);
-	if (status == B_OK)
-		status = archive->AddBool("show icon", fShowStatusIcon);
-	if (status == B_OK)
-		status = archive->AddBool("show time", fShowTime);
-	if (status == B_OK)
-		status = archive->AddInt32("battery id", fBatteryID);
+		status = ToMessage(archive);
 
 	return status;
 }
@@ -129,7 +116,6 @@
 void
 PowerStatusView::DetachedFromWindow()
 {
-
 }
 
 
@@ -385,6 +371,38 @@
 
 
 void
+PowerStatusView::FromMessage(const BMessage* archive)
+{
+	bool value;
+	if (archive->FindBool("show label", &value) == B_OK)
+		fShowLabel = value;
+	if (archive->FindBool("show icon", &value) == B_OK)
+		fShowStatusIcon = value;
+	if (archive->FindBool("show time", &value) == B_OK)
+		fShowTime = value;
+
+	int32 intValue;
+	if (archive->FindInt32("battery id", &intValue) == B_OK)
+		fBatteryID = intValue;
+}
+
+
+status_t
+PowerStatusView::ToMessage(BMessage* archive) const
+{
+	status_t status = archive->AddBool("show label", fShowLabel);
+	if (status == B_OK)
+		status = archive->AddBool("show icon", fShowStatusIcon);
+	if (status == B_OK)
+		status = archive->AddBool("show time", fShowTime);
+	if (status == B_OK)
+		status = archive->AddInt32("battery id", fBatteryID);
+
+	return status;
+}
+
+
+void
 PowerStatusView::_GetBatteryInfo(battery_info* batteryInfo, int batteryID)
 {
 	if (batteryID >= 0) {
@@ -416,6 +434,7 @@
 	PowerStatusView(NULL, frame, resizingMode, -1, inDeskbar)
 {
 	_Init();
+	_LoadSettings();
 
 	if (!inDeskbar) {
 		// we were obviously added to a standard window - let's add a dragger
@@ -435,6 +454,7 @@
 	PowerStatusView(archive)
 {
 	_Init();
+	_LoadSettings();
 }
 
 
@@ -447,6 +467,8 @@
 	fDriverInterface->StopWatching(this);
 	fDriverInterface->Disconnect();
 	fDriverInterface->ReleaseReference();
+
+	_SaveSettings();
 }
 
 
@@ -595,7 +617,52 @@
 }
 
 
+status_t
+PowerStatusReplicant::_GetSettings(BFile& file, int mode)
+{
+	BPath path;
+	status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path,
+		(mode & O_ACCMODE) != O_RDONLY);
+	if (status != B_OK)
+		return status;
+
+	path.Append("PowerStatus settings");
+
+	return file.SetTo(path.Path(), mode);
+}
+
+
 void
+PowerStatusReplicant::_LoadSettings()
+{
+	BFile file;
+	if (_GetSettings(file, B_READ_ONLY) != B_OK)
+		return;
+
+	BMessage settings;
+	if (settings.Unflatten(&file) < B_OK)
+		return;
+
+	FromMessage(&settings);
+}
+
+
+void
+PowerStatusReplicant::_SaveSettings()
+{
+	BFile file;
+	if (_GetSettings(file, B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE) != B_OK)
+		return;
+
+	BMessage settings('pwst');
+	ToMessage(&settings);
+
+	ssize_t size = 0;
+	settings.Flatten(&file, &size);
+}
+
+
+void
 PowerStatusReplicant::_OpenExtendedWindow()
 {
 	if (!fExtendedWindow) {
@@ -604,6 +671,7 @@
 		fExtendedWindow->Show();
 		return;
 	}
+
 	BMessage msg(B_SET_PROPERTY);
 	msg.AddSpecifier("Hidden", int32(0));
 	if (fExtWindowMessenger->SendMessage(&msg) == B_BAD_PORT_ID) {
@@ -613,8 +681,7 @@
 		fExtWindowMessenger = new BMessenger(NULL, fExtendedWindow);
 		fMessengerExist = true;
 		fExtendedWindow->Show();
-	}
-	else
+	} else
 		fExtendedWindow->Activate();
 
 }
@@ -623,7 +690,7 @@
 //	#pragma mark -
 
 
-extern "C" _EXPORT BView *
+extern "C" _EXPORT BView*
 instantiate_deskbar_item(void)
 {
 	return new PowerStatusReplicant(BRect(0, 0, 15, 15), B_FOLLOW_NONE, true);

Modified: haiku/trunk/src/apps/powerstatus/PowerStatusView.h
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatusView.h	2009-08-11 19:16:34 UTC (rev 32264)
+++ haiku/trunk/src/apps/powerstatus/PowerStatusView.h	2009-08-11 19:27:10 UTC (rev 32265)
@@ -15,6 +15,9 @@
 #include "DriverInterface.h"
 
 
+class BFile;
+
+
 class PowerStatusView : public BView {
 public:
 							PowerStatusView(
@@ -39,6 +42,9 @@
 
 	virtual void			Update(bool force = false);
 
+			void			FromMessage(const BMessage* message);
+			status_t		ToMessage(BMessage* message) const;
+
 private:
 			void			_GetBatteryInfo(battery_info* info, int batteryID);
 			void			_Init();
@@ -84,6 +90,10 @@
 			void			_Init();
 			void			_Quit();
 
+			status_t		_GetSettings(BFile& file, int mode);
+			void			_LoadSettings();
+			void			_SaveSettings();
+
 			void			_OpenExtendedWindow();
 
 private:



From bga at bug-br.org.br  Tue Aug 11 22:50:28 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Tue, 11 Aug 2009 22:50:28
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <200908110447.n7B4liNI004463@sheep.berlios.de>
Message-ID: <368825780-BeMail@Gaspode>

On Tue, 11 Aug 2009 06:47:44 +0200, jackburton at mail.berlios.de said:

> Author: jackburton
> Date: 2009-08-11 06:47:39 +0200 (Tue, 11 Aug 2009)
> New Revision: 32241
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32241&view=rev
> 
> Modified:
>    haiku/trunk/src/kits/game/WindowScreen.cpp
> Log:
> When setting the palette, the passed array is 0 based, even if the 
> first
> index is not 0. Bruno, can you check if this fixes SoundPlay's colors?

Unfortunatelly, this did not seem to help. Dunno if it is relevant but 
when exiting from BWindowScreen mode, the colors of the entire Desktop 
are messed up.

Also, anotherthing that may be relevant is that I am pretty sure at 
some point in time QING did work without messing up the colors under 
Haiku.

Let me know if I can help in any other way.

-Bruno



From bga at bug-br.org.br  Tue Aug 11 22:57:44 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Tue, 11 Aug 2009 22:57:44
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <368825780-BeMail@Gaspode>
Message-ID: <237414312-BeMail@Gaspode>

On Tue, 11 Aug 2009 22:50:28, Bruno Albuquerque said:

> > Author: jackburton
> > Date: 2009-08-11 06:47:39 +0200 (Tue, 11 Aug 2009)
> > New Revision: 32241
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32241&view=rev
> > 
> > Modified:
> >    haiku/trunk/src/kits/game/WindowScreen.cpp
> > Log:
> > When setting the palette, the passed array is 0 based, even if the 
> > first
> > index is not 0. Bruno, can you check if this fixes SoundPlay's 
> > colors?
> 
> Unfortunatelly, this did not seem to help. Dunno if it is relevant 
> but 
> when exiting from BWindowScreen mode, the colors of the entire Desktop 
> are messed up.
> 
> Also, anotherthing that may be relevant is that I am pretty sure at 
> some point in time QING did work without messing up the colors under 
> Haiku.
> 
> Let me know if I can help in any other way.

And the plot thickens. I took a screenshot of the garbled screen after 
returning from BWindowScreen mode and, in the screenshot, the colors 
are correct. could this be related to double buffering in any way?

-Bruno



From stpere at mail.berlios.de  Wed Aug 12 01:52:10 2009
From: stpere at mail.berlios.de (stpere at BerliOS)
Date: Wed, 12 Aug 2009 01:52:10 +0200
Subject: [Haiku-commits] r32266 - haiku/trunk/src/apps/cortex/RouteApp
Message-ID: <200908112352.n7BNqALr011868@sheep.berlios.de>

Author: stpere
Date: 2009-08-12 01:52:10 +0200 (Wed, 12 Aug 2009)
New Revision: 32266
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32266&view=rev

Modified:
   haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp
Log:
Vertically align the text label in the StatusView of Cortex;
Fixes ticket #3032.


Modified: haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp	2009-08-11 19:27:10 UTC (rev 32265)
+++ haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp	2009-08-11 23:52:10 UTC (rev 32266)
@@ -302,7 +302,8 @@
 	r.left += 10.0;
 	font_height fh;
 	be_plain_font->GetHeight(&fh);
-	r.bottom = Bounds().bottom - fh.descent - 1.0;
+	r.bottom = Bounds().bottom - fh.descent
+		- (Bounds().Height() - fh.ascent - fh.descent) / 2;
 	v->MovePenTo(r.LeftBottom());
 	v->DrawString(Text());
 



From phoudoin at mail.berlios.de  Wed Aug 12 05:01:54 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Wed, 12 Aug 2009 05:01:54 +0200
Subject: [Haiku-commits] r32267 - in haiku/trunk: headers/os/opengl
	src/kits/opengl src/tests/kits/opengl/glinfo
Message-ID: <200908120301.n7C31sWE002585@sheep.berlios.de>

Author: phoudoin
Date: 2009-08-12 05:01:48 +0200 (Wed, 12 Aug 2009)
New Revision: 32267
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32267&view=rev

Modified:
   haiku/trunk/headers/os/opengl/GLView.h
   haiku/trunk/src/kits/opengl/GLView.cpp
   haiku/trunk/src/tests/kits/opengl/glinfo/GLInfo.cpp
Log:
Fixed BGLView constructor: name string argument wasn't qualified constant!
Fixed GCC4 warnings in GLInfo.



Modified: haiku/trunk/headers/os/opengl/GLView.h
===================================================================
--- haiku/trunk/headers/os/opengl/GLView.h	2009-08-11 23:52:10 UTC (rev 32266)
+++ haiku/trunk/headers/os/opengl/GLView.h	2009-08-12 03:01:48 UTC (rev 32267)
@@ -34,7 +34,7 @@
 
 class BGLView : public BView {
 public:
-					BGLView(BRect rect, char *name,
+					BGLView(BRect rect, const char *name,
 						ulong resizingMode, ulong mode,
 						ulong options);
 	virtual			~BGLView();
@@ -119,7 +119,7 @@
 
 class BGLScreen : public BWindowScreen {
 public:
-				BGLScreen(char *name,
+				BGLScreen(const char *name,
 					ulong screenMode, ulong options,
 					status_t *error, bool debug=false);
 				~BGLScreen();

Modified: haiku/trunk/src/kits/opengl/GLView.cpp
===================================================================
--- haiku/trunk/src/kits/opengl/GLView.cpp	2009-08-11 23:52:10 UTC (rev 32266)
+++ haiku/trunk/src/kits/opengl/GLView.cpp	2009-08-12 03:01:48 UTC (rev 32267)
@@ -55,7 +55,7 @@
 };
 
 
-BGLView::BGLView(BRect rect, char *name, ulong resizingMode, ulong mode,
+BGLView::BGLView(BRect rect, const char *name, ulong resizingMode, ulong mode,
 		ulong options)
    : BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), //  | B_FULL_UPDATE_ON_RESIZE)
 	fGc(NULL),
@@ -462,7 +462,7 @@
 
 // TODO: implement BGLScreen class...
 
-BGLScreen::BGLScreen(char *name, ulong screenMode, ulong options,
+BGLScreen::BGLScreen(const char *name, ulong screenMode, ulong options,
 			status_t *error, bool debug)
   : BWindowScreen(name, screenMode, error, debug)
 {

Modified: haiku/trunk/src/tests/kits/opengl/glinfo/GLInfo.cpp
===================================================================
--- haiku/trunk/src/tests/kits/opengl/glinfo/GLInfo.cpp	2009-08-11 23:52:10 UTC (rev 32266)
+++ haiku/trunk/src/tests/kits/opengl/glinfo/GLInfo.cpp	2009-08-12 03:01:48 UTC (rev 32267)
@@ -43,7 +43,7 @@
 };
 
 
-void AddItem(BListView *list, int level, char *text, ...)
+void AddItem(BListView *list, int level, const char *text, ...)
 {
 	char buffer[512];
 	va_list arg;



From stefano.ceccherini at gmail.com  Wed Aug 12 06:12:11 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Wed, 12 Aug 2009 06:12:11 +0200
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <237414312-BeMail@Gaspode>
References: <368825780-BeMail@Gaspode> <237414312-BeMail@Gaspode>
Message-ID: <894b9700908112112p4a0d617r7e02abdeef5509e7@mail.gmail.com>

2009/8/12 Bruno Albuquerque <bga at bug-br.org.br>:

> And the plot thickens. I took a screenshot of the garbled screen after
> returning from BWindowScreen mode and, in the screenshot, the colors
> are correct. could this be related to double buffering in any way?
>
> -Bruno

Could be the case. What's weird is: ParticlesII now looks fine, and
the screen isn't messed up on quit.


From axeld at pinc-software.de  Wed Aug 12 10:29:06 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 10:29:06 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32267_-_in_haiku/trunk=3A_headers/os/o?=
 =?utf-8?q?pengl_src/kits/opengl_src/tests/kits/opengl/glinfo?=
In-Reply-To: <200908120301.n7C31sWE002585@sheep.berlios.de>
Message-ID: <876052885-BeMail@zon>

phoudoin at mail.berlios.de wrote:
> Log:
> Fixed BGLView constructor: name string argument wasn't qualified 
> constant!
[...]
> -					BGLView(BRect rect, char *name,
> +					BGLView(BRect rect, const char *name,
[...]
> -				BGLScreen(char *name,
> +				BGLScreen(const char *name,

This breaks binary compatibility, please revert, or add the non-const 
versions for GCC2 compatibility.

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug 12 10:39:38 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 10:39:38 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32263_-_in_haiku/branches/components/g?=
 =?utf-8?q?soc-locale-kit=3A_headers/os/locale_src/kits/locale_src/prefere?=
 =?utf-8?q?nces/locale?=
In-Reply-To: <200908111910.n7BJA3D5024278@sheep.berlios.de>
Message-ID: <1508515375-BeMail@zon>

pulkomandy at BerliOS <pulkomandy at mail.berlios.de> wrote:
> Log:
> Update our BCountry instance when using the long date dropdown.
> We need to send the BCountry back to ICU and save its settings 
> somewhere, however.

Just pointing out coding style violations:

> -		const char		*DateFormat(bool longFormat) const;
> +		const char		*GetDateFormat(bool longFormat) const;
> +		void			SetDateFormat(const char* formatString, 

While the "* " form is preferred, always try to be consistent.
Also, we don't use the Get* prefix for the direct form, only when you 
get the result indirectly (for example, in case the action could fail).
Also, you only changed DateFormat(), and left TimeFormat() as is - 
always have consistent APIs (but in this case, please revert to 
DateFormat()).

> +++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/
> Country.cpp	2009-08-11 19:10:02 UTC (rev 32263)
> @@ -52,6 +52,10 @@
>  	: fStrings(gStrings)
>  	, fICULocale(languageAndCountryCode)

Don't use this style, instead use:

	:
	fStrings(gStrings),
	fICULocale(...)

>  {
> +   	fICULongDateFormatter = DateFormat::createDateInstance(
> +		DateFormat::FULL, fICULocale);
> +   	fICUShortDateFormatter = DateFormat::createDateInstance(
> +		DateFormat::SHORT, fICULocale);

Don't indent with spaces!

> +	icu_4_2::DateFormat* dateFormatter = 
> +		longFormat ? fICULongDateFormatter : fICUShortDateFormatter;

The '=' goes to the next line - the only operator that stays on the 
line is ','.

> -class dateMenuItem: public BMenuItem
> +class DateMenuItem: public BMenuItem
>  {

The opening bracket goes to the same line as the class.

>  	public:

Again, no spaces!!!

> -		dateMenuItem(const char* label, const char* code, BMenuField* 
> field) 
> +		DateMenuItem(const char* label, const char* code, BMenuField* 
> field) 
>  			: BMenuItem(label, MenuMessage(code, field))

Use instead:
	:
	BMenuItem(...)

> -		dayMenu -> AddItem(new dateMenuItem("day in month", "d", *
> field));
> -		dayMenu -> AddItem(new dateMenuItem("day in month (2 digits)", 
> "dd", 

Don't use spaces around "->'!

>  		for(int subMenuIndex = 0; subMenuIndex < 3; subMenuIndex++) {

Space after 'for'...

> -				if(static_cast<dateMenuItem*>(item)->icuCode == str) {
> +				if(static_cast<DateMenuItem*>(item)->icuCode == str) {

Space after 'if'...

> +void
> +TimeFormatSettingsView::_UpdateLongDateFormatString()
> +{
> +	BString newDateFormat;
> +
> +	for(int i=0; i<4; i++) {

Space after 'for', and between the operators:
	for (int i = 0; i < 4; i++) {

Please take more care about our coding style in the future!

Bye,
   Axel.



From pulkomandy at gmail.com  Wed Aug 12 10:53:47 2009
From: pulkomandy at gmail.com (PulkoMandy)
Date: Wed, 12 Aug 2009 10:53:47 +0200
Subject: [Haiku-commits] r32263 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale src/preferences/locale
In-Reply-To: <1508515375-BeMail@zon>
References: <200908111910.n7BJA3D5024278@sheep.berlios.de>
	<1508515375-BeMail@zon>
Message-ID: <36ed0c950908120153v4349d2a3se2f8f5d8f4e6d8e7@mail.gmail.com>

2009/8/12 Axel D?rfler <axeld at pinc-software.de>:
> pulkomandy at BerliOS <pulkomandy at mail.berlios.de> wrote:
>> Log:
>> Update our BCountry instance when using the long date dropdown.
>> We need to send the BCountry back to ICU and save its settings
>> somewhere, however.
>
> Just pointing out coding style violations:
>
>> - ? ? ? ? ? ? const char ? ? ? ? ? ? ?*DateFormat(bool longFormat) const;
>> + ? ? ? ? ? ? const char ? ? ? ? ? ? ?*GetDateFormat(bool longFormat) const;
>> + ? ? ? ? ? ? void ? ? ? ? ? ? ? ? ? ?SetDateFormat(const char* formatString,
>
> While the "* " form is preferred, always try to be consistent.

I tend to use the "* " form usually, these were part of the old
localekit code. I'll change them

> Also, we don't use the Get* prefix for the direct form, only when you
> get the result indirectly (for example, in case the action could fail).
> Also, you only changed DateFormat(), and left TimeFormat() as is -
> always have consistent APIs (but in this case, please revert to
> DateFormat()).

This was to avoid a conflict with ICU's DateFormat class. If I name
this method DateFormat, the code will not compile anymore. Any other
solution for that ?

>
>> +++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/
>> Country.cpp ? 2009-08-11 19:10:02 UTC (rev 32263)
>> @@ -52,6 +52,10 @@
>> ? ? ? : fStrings(gStrings)
>> ? ? ? , fICULocale(languageAndCountryCode)
>
> Don't use this style, instead use:
>
> ? ? ? ?:
> ? ? ? ?fStrings(gStrings),
> ? ? ? ?fICULocale(...)
>
>> ?{
>> + ? ? fICULongDateFormatter = DateFormat::createDateInstance(
>> + ? ? ? ? ? ? DateFormat::FULL, fICULocale);
>> + ? ? fICUShortDateFormatter = DateFormat::createDateInstance(
>> + ? ? ? ? ? ? DateFormat::SHORT, fICULocale);
>
> Don't indent with spaces!
>
>> + ? ? icu_4_2::DateFormat* dateFormatter =
>> + ? ? ? ? ? ? longFormat ? fICULongDateFormatter : fICUShortDateFormatter;
>
> The '=' goes to the next line - the only operator that stays on the
> line is ','.
>
>> -class dateMenuItem: public BMenuItem
>> +class DateMenuItem: public BMenuItem
>> ?{
>
> The opening bracket goes to the same line as the class.
>
>> ? ? ? public:
>
> Again, no spaces!!!
>
>> - ? ? ? ? ? ? dateMenuItem(const char* label, const char* code, BMenuField*
>> field)
>> + ? ? ? ? ? ? DateMenuItem(const char* label, const char* code, BMenuField*
>> field)
>> ? ? ? ? ? ? ? ? ? ? ? : BMenuItem(label, MenuMessage(code, field))
>
> Use instead:
> ? ? ? ?:
> ? ? ? ?BMenuItem(...)
>
>> - ? ? ? ? ? ? dayMenu -> AddItem(new dateMenuItem("day in month", "d", *
>> field));
>> - ? ? ? ? ? ? dayMenu -> AddItem(new dateMenuItem("day in month (2 digits)",
>> "dd",
>
> Don't use spaces around "->'!
>
>> ? ? ? ? ? ? ? for(int subMenuIndex = 0; subMenuIndex < 3; subMenuIndex++) {
>
> Space after 'for'...
>
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? if(static_cast<dateMenuItem*>(item)->icuCode == str) {
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? if(static_cast<DateMenuItem*>(item)->icuCode == str) {
>
> Space after 'if'...
>
>> +void
>> +TimeFormatSettingsView::_UpdateLongDateFormatString()
>> +{
>> + ? ? BString newDateFormat;
>> +
>> + ? ? for(int i=0; i<4; i++) {
>
> Space after 'for', and between the operators:
> ? ? ? ?for (int i = 0; i < 4; i++) {
>
> Please take more care about our coding style in the future!

I will try. Looks like autoindenting in my editor failed. Sorry !

-- 
Adrien Destugues / PulkoMandy
El?ve ing?nieur ENSSAT EII1- www.enssat.fr
GSoC student for Haiku - http://haiku-os.org
GrafX2 project team - http://code.google.com/p/grafx2


From brycegroff at gmail.com  Wed Aug 12 11:53:09 2009
From: brycegroff at gmail.com (Bryce Groff)
Date: Tue, 11 Aug 2009 23:53:09 -1000
Subject: [Haiku-commits] r32235 - in haiku/trunk: headers/os/drivers
	src/add-ons/disk_systems/intel
	src/add-ons/kernel/partitioning_systems/intel
	src/system/kernel/disk_device_manager
In-Reply-To: <27784068740-BeMail@zon>
References: <9efe01ea0908110138v3e38219dv18e108a68c385bfe@mail.gmail.com>
	<27784068740-BeMail@zon>
Message-ID: <9efe01ea0908120253o399a0668u6eb70d921800e1e7@mail.gmail.com>

> I'm not sure how you intend to use it, but I guess I'll see :-)
> (btw, after open_partition() and the following function, there is a
> missing blank line)
>
>
Thanks,
Bryce
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20090811/f9cb1252/attachment.html>

From pulkomandy at mail.berlios.de  Wed Aug 12 11:55:00 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Wed, 12 Aug 2009 11:55:00 +0200
Subject: [Haiku-commits] r32268 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale src/preferences/locale
Message-ID: <200908120955.n7C9t0iC028930@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-12 11:54:58 +0200 (Wed, 12 Aug 2009)
New Revision: 32268
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32268&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
Log:
Coding style fixes.


Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-12 03:01:48 UTC (rev 32267)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-12 09:54:58 UTC (rev 32268)
@@ -33,33 +33,33 @@
 
 		// date & time
 
-		virtual void	FormatDate(char *string,size_t maxSize,time_t time,
+		virtual void	FormatDate(char* string,size_t maxSize,time_t time,
 			bool longFormat);
-		virtual void	FormatDate(BString *string,time_t time,bool longFormat);
-		virtual void	FormatTime(char *string,size_t maxSize,time_t time,
+		virtual void	FormatDate(BString* string,time_t time,bool longFormat);
+		virtual void	FormatTime(char* string,size_t maxSize,time_t time,
 			bool longFormat);
-		virtual void	FormatTime(BString *string,time_t time,bool longFormat);
+		virtual void	FormatTime(BString* string,time_t time,bool longFormat);
 
-		const char		*GetDateFormat(bool longFormat) const;
+		const char*		GetDateFormat(bool longFormat) const;
 		void			SetDateFormat(const char* formatString, 
 							bool longFormat = true);
-		const char		*TimeFormat(bool longFormat) const;
-		const char		*DateSeparator() const;
-		const char		*TimeSeparator() const;
+		const char*		TimeFormat(bool longFormat) const;
+		const char*		DateSeparator() const;
+		const char*		TimeSeparator() const;
 
 		// numbers
 
-		virtual void	FormatNumber(char *string,size_t maxSize,double value);
-		virtual void	FormatNumber(BString *string,double value);
-		virtual void	FormatNumber(char *string,size_t maxSize,int32 value);
-		virtual void	FormatNumber(BString *string,int32 value);
+		virtual void	FormatNumber(char* string,size_t maxSize,double value);
+		virtual void	FormatNumber(BString* string,double value);
+		virtual void	FormatNumber(char* string,size_t maxSize,int32 value);
+		virtual void	FormatNumber(BString* string,int32 value);
 
-		const char		*DecimalPoint() const;
-		const char		*ThousandsSeparator() const;
-		const char		*Grouping() const;
+		const char*		DecimalPoint() const;
+		const char*		ThousandsSeparator() const;
+		const char*		Grouping() const;
 
-		const char		*PositiveSign() const;
-		const char		*NegativeSign() const;
+		const char*		PositiveSign() const;
+		const char*		NegativeSign() const;
 
 		// measurements
 
@@ -67,21 +67,21 @@
 
 		// monetary
 
-		virtual ssize_t	FormatMonetary(char *string, size_t maxSize,
+		virtual ssize_t	FormatMonetary(char* string, size_t maxSize,
 			double value);
-		virtual ssize_t	FormatMonetary(BString *string, double value);
+		virtual ssize_t	FormatMonetary(BString* string, double value);
 
-		const char		*CurrencySymbol() const;
-		const char		*InternationalCurrencySymbol() const;
-		const char		*MonDecimalPoint() const;
-		const char		*MonThousandsSeparator() const;
-		const char		*MonGrouping() const;
+		const char*		CurrencySymbol() const;
+		const char*		InternationalCurrencySymbol() const;
+		const char*		MonDecimalPoint() const;
+		const char*		MonThousandsSeparator() const;
+		const char*		MonGrouping() const;
 		virtual int32	MonFracDigits() const;
 
 	private:
-		icu_4_2::DateFormat *fICULongDateFormatter;
-		icu_4_2::DateFormat *fICUShortDateFormatter;
-		const char	**fStrings;
+		icu_4_2::DateFormat* fICULongDateFormatter;
+		icu_4_2::DateFormat* fICUShortDateFormatter;
+		const char**	fStrings;
 		Locale fICULocale;
 };
 

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-12 03:01:48 UTC (rev 32267)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-12 09:54:58 UTC (rev 32268)
@@ -21,7 +21,7 @@
 #include <stdarg.h>
 
 
-const char *gStrings[] = {
+const char* gStrings[] = {
 	// date/time format
 	"",
 	"",
@@ -42,19 +42,21 @@
 
 
 BCountry::BCountry(const char* languageCode, const char* countryCode)
-	: fStrings(gStrings)
-	, fICULocale(languageCode, countryCode)
+	: 
+	fStrings(gStrings),
+	fICULocale(languageCode, countryCode)
 {
 }
 
 
 BCountry::BCountry(const char* languageAndCountryCode)
-	: fStrings(gStrings)
-	, fICULocale(languageAndCountryCode)
+	:
+	fStrings(gStrings),
+	fICULocale(languageAndCountryCode)
 {
-   	fICULongDateFormatter = DateFormat::createDateInstance(
+	fICULongDateFormatter = DateFormat::createDateInstance(
 		DateFormat::FULL, fICULocale);
-   	fICUShortDateFormatter = DateFormat::createDateInstance(
+ 	fICUShortDateFormatter = DateFormat::createDateInstance(
 		DateFormat::SHORT, fICULocale);
 }
 
@@ -64,7 +66,7 @@
 }
 
 
-const char *
+const char*
 BCountry::Name() const
 {
 	UnicodeString uString;
@@ -76,7 +78,7 @@
 }
 
 
-const char *
+const char*
 BCountry::Code() const
 {
 	return fICULocale.getName();
@@ -84,7 +86,7 @@
 
 
 // TODO use ICU backend keywords instead
-const char *
+const char*
 BCountry::GetString(uint32 id) const
 {
 	if (id < B_COUNTRY_STRINGS_BASE || id >= B_NUM_COUNTRY_STRINGS)
@@ -95,7 +97,7 @@
 
 
 void 
-BCountry::FormatDate(char *string, size_t maxSize, time_t time, bool longFormat)
+BCountry::FormatDate(char* string, size_t maxSize, time_t time, bool longFormat)
 {
 	BString fullString;
 	FormatDate(&fullString, time, longFormat);
@@ -108,8 +110,8 @@
 {
 	// TODO: ICU allows for 4 different levels of expansion :
 	// short, medium, long, and full. Our bool parameter is not enough...
-	icu_4_2::DateFormat* dateFormatter = 
-		longFormat ? fICULongDateFormatter : fICUShortDateFormatter;
+	icu_4_2::DateFormat* dateFormatter
+		= longFormat ? fICULongDateFormatter : fICUShortDateFormatter;
 	UnicodeString ICUString;
 	ICUString = dateFormatter->format((UDate)time * 1000, ICUString);
 
@@ -121,7 +123,7 @@
 
 
 void 
-BCountry::FormatTime(char *string, size_t maxSize, time_t time, bool longFormat)
+BCountry::FormatTime(char* string, size_t maxSize, time_t time, bool longFormat)
 {
 	BString fullString;
 	FormatTime(&fullString, time, longFormat);
@@ -130,12 +132,12 @@
 
 
 void 
-BCountry::FormatTime(BString *string, time_t time, bool longFormat)
+BCountry::FormatTime(BString* string, time_t time, bool longFormat)
 {
 	// TODO: ICU allows for 4 different levels of expansion :
 	// short, medium, long, and full. Our bool parameter is not enough...
 	icu_4_2::DateFormat* timeFormatter;
-   	timeFormatter = DateFormat::createTimeInstance(
+ 	timeFormatter = DateFormat::createTimeInstance(
 		longFormat ? DateFormat::FULL : DateFormat::SHORT,
 		fICULocale);
 	UnicodeString ICUString;
@@ -148,7 +150,7 @@
 }
 
 
-const char *
+const char*
 BCountry::GetDateFormat(bool longFormat) const
 {
 	icu_4_2::DateFormat* dateFormatter = 
@@ -185,7 +187,7 @@
 BCountry::TimeFormat(bool longFormat) const
 {
 	icu_4_2::DateFormat* dateFormatter;
-   	dateFormatter = DateFormat::createTimeInstance(
+ 	dateFormatter = DateFormat::createTimeInstance(
 		longFormat ? DateFormat::FULL : DateFormat::SHORT,
 		fICULocale);
 	SimpleDateFormat* dateFormatterImpl =
@@ -206,14 +208,14 @@
 // TODO find how to get it from ICU (setting it is ok, we use the pattern-string
 // for that)
 // Or remove this function ?
-const char *
+const char*
 BCountry::DateSeparator() const
 {
 	return fStrings[B_DATE_SEPARATOR];
 }
 
 
-const char *
+const char*
 BCountry::TimeSeparator() const
 {
 	return fStrings[B_TIME_SEPARATOR];
@@ -221,7 +223,7 @@
 
 
 void 
-BCountry::FormatNumber(char *string, size_t maxSize, double value)
+BCountry::FormatNumber(char* string, size_t maxSize, double value)
 {
 	BString fullString;
 	FormatNumber(&fullString, value);
@@ -230,7 +232,7 @@
 
 
 void 
-BCountry::FormatNumber(BString *string, double value)
+BCountry::FormatNumber(BString* string, double value)
 {
 	UErrorCode err;
 	NumberFormat* numberFormatter =
@@ -249,7 +251,7 @@
 
 
 void 
-BCountry::FormatNumber(char *string, size_t maxSize, int32 value)
+BCountry::FormatNumber(char* string, size_t maxSize, int32 value)
 {
 	BString fullString;
 	FormatNumber(&fullString, value);
@@ -258,7 +260,7 @@
 
 
 void 
-BCountry::FormatNumber(BString *string, int32 value)
+BCountry::FormatNumber(BString* string, int32 value)
 {
 	UErrorCode err;
 	NumberFormat* numberFormatter =
@@ -277,7 +279,7 @@
 
 
 // This will only work for locales using the decimal system...
-const char *
+const char*
 BCountry::DecimalPoint() const
 {
 	UErrorCode err;
@@ -306,7 +308,7 @@
 }
 
 
-const char *
+const char*
 BCountry::ThousandsSeparator() const
 {
 	UErrorCode err;
@@ -333,7 +335,7 @@
 }
 
 
-const char *
+const char*
 BCountry::Grouping() const
 {
 	UErrorCode err;
@@ -360,7 +362,7 @@
 }
 
 
-const char *
+const char*
 BCountry::PositiveSign() const
 {
 	UErrorCode err;
@@ -387,7 +389,7 @@
 }
 
 
-const char *
+const char*
 BCountry::NegativeSign() const
 {
 	UErrorCode err;
@@ -423,7 +425,7 @@
 
 
 ssize_t
-BCountry::FormatMonetary(char *string, size_t maxSize, double value)
+BCountry::FormatMonetary(char* string, size_t maxSize, double value)
 {
 	BString fullString;
 	FormatMonetary(&fullString, value);
@@ -432,7 +434,7 @@
 
 
 ssize_t 
-BCountry::FormatMonetary(BString *string, double value)
+BCountry::FormatMonetary(BString* string, double value)
 {
 	UErrorCode err;
 	NumberFormat* numberFormatter =
@@ -452,7 +454,7 @@
 }
 
 
-const char *
+const char*
 BCountry::CurrencySymbol() const
 {
 	UErrorCode err;
@@ -479,7 +481,7 @@
 }
 
 
-const char *
+const char*
 BCountry::InternationalCurrencySymbol() const
 {
 	UErrorCode err;
@@ -506,7 +508,7 @@
 }
 
 
-const char *
+const char*
 BCountry::MonDecimalPoint() const
 {
 	UErrorCode err;
@@ -533,7 +535,7 @@
 }
 
 
-const char *
+const char*
 BCountry::MonThousandsSeparator() const
 {
 	UErrorCode err;
@@ -560,7 +562,7 @@
 }
 
 
-const char *
+const char*
 BCountry::MonGrouping() const
 {
 	UErrorCode err;

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-12 03:01:48 UTC (rev 32267)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-12 09:54:58 UTC (rev 32268)
@@ -40,11 +40,11 @@
 }
 
 
-class DateMenuItem: public BMenuItem
-{
+class DateMenuItem: public BMenuItem {
 	public:
 		DateMenuItem(const char* label, const char* code, BMenuField* field) 
-			: BMenuItem(label, MenuMessage(code, field))
+			:
+			BMenuItem(label, MenuMessage(code, field))
 		{ 
 			icuCode = code;
 		}
@@ -63,39 +63,39 @@
 	// Not all available ICU settings are listed here. It's possible to add some
 	// other things if you ever need.
 	menu->AddItem(dayMenu);
-		dayMenu -> AddItem(new DateMenuItem("day in month", "d", *field));
-		dayMenu -> AddItem(new DateMenuItem("day in month (2 digits)", "dd", 
+		dayMenu->AddItem(new DateMenuItem("day in month", "d", *field));
+		dayMenu->AddItem(new DateMenuItem("day in month (2 digits)", "dd", 
 			*field));
-		dayMenu -> AddItem(new DateMenuItem("day in year", "D", *field));
-		dayMenu -> AddItem(new DateMenuItem("day in year (2 digits)", "DD",
+		dayMenu->AddItem(new DateMenuItem("day in year", "D", *field));
+		dayMenu->AddItem(new DateMenuItem("day in year (2 digits)", "DD",
 			*field));
-		dayMenu -> AddItem(new DateMenuItem("day in year (3 digits)", "DDD",
+		dayMenu->AddItem(new DateMenuItem("day in year (3 digits)", "DDD",
 			*field));
-		dayMenu -> AddItem(new DateMenuItem("day of week", "e",
+		dayMenu->AddItem(new DateMenuItem("day of week", "e",
 			*field));
-		//dayMenu -> AddItem(new DateMenuItem("day of week (short text)", "eee",
+		//dayMenu->AddItem(new DateMenuItem("day of week (short text)", "eee",
 		//	*field));
-		//dayMenu -> AddItem(new DateMenuItem("day of week (full text)", "eeee",
+		//dayMenu->AddItem(new DateMenuItem("day of week (full text)", "eeee",
 		//	*field));
-		dayMenu -> AddItem(new DateMenuItem("day of week (short name)", "E", 
+		dayMenu->AddItem(new DateMenuItem("day of week (short name)", "E", 
 			*field));
-		dayMenu -> AddItem(new DateMenuItem("day of week (name)", "EEEE",
+		dayMenu->AddItem(new DateMenuItem("day of week (name)", "EEEE",
 			*field));
-		dayMenu -> AddItem(new DateMenuItem("day of week in month", "F",
+		dayMenu->AddItem(new DateMenuItem("day of week in month", "F",
 			*field));
-		dayMenu -> AddItem(new DateMenuItem("julian day", "g", *field));
-		//dayMenu -> AddItem(new BMenuItem("c", msg));
+		dayMenu->AddItem(new DateMenuItem("julian day", "g", *field));
+		//dayMenu->AddItem(new BMenuItem("c", msg));
 	BPopUpMenu* monthMenu = new BPopUpMenu("Month");
 	menu->AddItem(monthMenu);
-		monthMenu -> AddItem(new DateMenuItem("month number", "M", *field));
-		monthMenu -> AddItem(new DateMenuItem("month name", "MMMM", *field));
-		//monthMenu -> AddItem(new DateMenuItem("L", "L", *field));
+		monthMenu->AddItem(new DateMenuItem("month number", "M", *field));
+		monthMenu->AddItem(new DateMenuItem("month name", "MMMM", *field));
+		//monthMenu->AddItem(new DateMenuItem("L", "L", *field));
 	BPopUpMenu* yearMenu = new BPopUpMenu("Year");
 	menu->AddItem(yearMenu);
-		yearMenu -> AddItem(new DateMenuItem("Year", "y", *field));
-		yearMenu -> AddItem(new DateMenuItem("Year (2 digits)", "yy", *field));
-		//yearMenu -> AddItem(new DateMenuItem("Y", "Y", *field));
-		//yearMenu -> AddItem(new DateMenuItem("u", "u", *field));
+		yearMenu->AddItem(new DateMenuItem("Year", "y", *field));
+		yearMenu->AddItem(new DateMenuItem("Year (2 digits)", "yy", *field));
+		//yearMenu->AddItem(new DateMenuItem("Y", "Y", *field));
+		//yearMenu->AddItem(new DateMenuItem("u", "u", *field));
 }
 
 
@@ -108,16 +108,16 @@
 	// Date
 	BSeparatorView* dateHeader = new BSeparatorView("Date");
 
-	//  Long format
+	// Long format
 	fLongDateExampleView = new BStringView("", "");
 
-	for(int i = 0; i < 4; i++) {
+	for (int i = 0; i < 4; i++) {
 		CreateDateMenu(&fLongDateMenu[i]);
 		fLongDateSeparator[i] = new BTextControl("","","",
 			new BMessage(kSettingsContentsModified));
 	}
 
-	//  Short format
+	// Short format
 	fShortDateExampleView = new BStringView("", "");
 
 	BMenu* menu = new BPopUpMenu("");
@@ -257,7 +257,7 @@
 bool IsSpecialDateChar(char charToTest)
 {
 	static const char* specials = "dDeEFgMLyYu";
-	for(int i = 0; i < 11; i++)
+	for (int i = 0; i < 11; i++)
 		if (charToTest == specials[i])
 			return true;
 	return false;
@@ -274,10 +274,10 @@
 	const char* parsePointer = dateFormat;
 	const char* fieldBegin = dateFormat;
 
-	for(int i = 0; i < 4; i++)
+	for (int i = 0; i < 4; i++)
 	{
 		fieldBegin = parsePointer;
-		while( *parsePointer == *(parsePointer+1)) parsePointer++ ;
+		while (*parsePointer == *(parsePointer+1)) parsePointer++ ;
 		parsePointer++;
 		BString str;
 		str.Append(fieldBegin, parsePointer - fieldBegin);
@@ -286,12 +286,12 @@
 
 		BMenu* subMenu;
 		bool isFound = false;
-		for(int subMenuIndex = 0; subMenuIndex < 3; subMenuIndex++) {
+		for (int subMenuIndex = 0; subMenuIndex < 3; subMenuIndex++) {
 			subMenu = fLongDateMenu[i]->Menu()->SubmenuAt(subMenuIndex);
 			BMenuItem* item;
-			for(int itemIndex = 0; (item = subMenu->ItemAt(itemIndex)) != NULL; 
+			for (int itemIndex = 0; (item = subMenu->ItemAt(itemIndex)) != NULL;
 					itemIndex++) {
-				if(static_cast<DateMenuItem*>(item)->icuCode == str) {
+				if (static_cast<DateMenuItem*>(item)->icuCode == str) {
 					item->SetMarked(true);
 					fLongDateMenu[i]->MenuItem()->SetLabel(item->Label());
 					isFound = true;
@@ -300,11 +300,11 @@
 			}
 		}
 
-		if(!isFound)
+		if (!isFound)
 			fLongDateMenu[i]->MenuItem()->SetLabel(str.Append("*"));
 
 		fieldBegin = parsePointer;
-		while((!IsSpecialDateChar(*parsePointer)) && *parsePointer != '\0' 
+		while ((!IsSpecialDateChar(*parsePointer)) && *parsePointer != '\0' 
 				&& *(parsePointer-1) >= 0) {
 			if (*parsePointer == '\'') {
 				parsePointer++;
@@ -326,8 +326,8 @@
 	f12HrRadioButton->SetTarget(this);
 
 	// TODO do the same for the short date
-	for(int j = 0; j < 4; j++)
-	for(int i = 0; i < fLongDateMenu[3]->Menu()->CountItems(); i++)
+	for (int j = 0; j < 4; j++)
+	for (int i = 0; i < fLongDateMenu[3]->Menu()->CountItems(); i++)
 		fLongDateMenu[j]->Menu()->SubmenuAt(i)->SetTargetForItems(this);
 	fSeparatorMenuField->Menu()->SetTargetForItems(this);
 }
@@ -338,7 +338,7 @@
 {
 	BString newDateFormat;
 
-	for(int i=0; i<4; i++) {
+	for (int i = 0; i < 4; i++) {
 		newDateFormat.Append(fLongDateString[i]);
 		newDateFormat.Append(fLongDateSeparator[i]->Text());
 	}



From axeld at pinc-software.de  Wed Aug 12 12:02:34 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 12:02:34 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32263_-_in_haiku/branches/components/g?=
 =?utf-8?q?soc-locale-kit=3A_headers/os/locale_src/kits/locale_src/prefere?=
 =?utf-8?q?nces/locale?=
In-Reply-To: <36ed0c950908120153v4349d2a3se2f8f5d8f4e6d8e7@mail.gmail.com>
Message-ID: <6484936030-BeMail@zon>

PulkoMandy <pulkomandy at gmail.com> wrote:
> > Also, we don't use the Get* prefix for the direct form, only when 
> > you
> > get the result indirectly (for example, in case the action could 
> > fail).
> > Also, you only changed DateFormat(), and left TimeFormat() as is -
> > always have consistent APIs (but in this case, please revert to
> > DateFormat()).
> This was to avoid a conflict with ICU's DateFormat class. If I name
> this method DateFormat, the code will not compile anymore. Any other
> solution for that ?

That explains this at least :-)
If ICU is using names like that, I would suggest putting it in a 
namespace, as it doesn't sound like a good idea to pollute the global 
one with this.
I don't know if that would be much work, but since this is originally 
from IBM, I would think it may boil down to changing a configure 
option.

> > Please take more care about our coding style in the future!
> I will try. Looks like autoindenting in my editor failed. Sorry !

Okay, good luck then ;-)

Bye,
   Axel.



From pulkomandy at gmail.com  Wed Aug 12 12:13:28 2009
From: pulkomandy at gmail.com (PulkoMandy)
Date: Wed, 12 Aug 2009 12:13:28 +0200
Subject: [Haiku-commits] r32263 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale src/preferences/locale
In-Reply-To: <6484936030-BeMail@zon>
References: <36ed0c950908120153v4349d2a3se2f8f5d8f4e6d8e7@mail.gmail.com>
	<6484936030-BeMail@zon>
Message-ID: <36ed0c950908120313p5330307djeaa41055b31d7f7d@mail.gmail.com>

> That explains this at least :-)
> If ICU is using names like that, I would suggest putting it in a
> namespace, as it doesn't sound like a good idea to pollute the global
> one with this.
> I don't know if that would be much work, but since this is originally
> from IBM, I would think it may boil down to changing a configure
> option.

Actually there is a namespace (icu_4_2) but all the headers have
"using namespace icu_4_2" in them. Maybe I can still explicitly locale
my DateFormat objects in this namespace. will try that to see if it
works.

-- 
Adrien Destugues / PulkoMandy
El?ve ing?nieur ENSSAT EII1- www.enssat.fr
GSoC student for Haiku - http://haiku-os.org
GrafX2 project team - http://code.google.com/p/grafx2


From aldeck at mail.berlios.de  Wed Aug 12 12:47:38 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Wed, 12 Aug 2009 12:47:38 +0200
Subject: [Haiku-commits] r32269 - haiku/trunk/src/servers/mail
Message-ID: <200908121047.n7CAlcPM015904@sheep.berlios.de>

Author: aldeck
Date: 2009-08-12 12:47:18 +0200 (Wed, 12 Aug 2009)
New Revision: 32269
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32269&view=rev

Added:
   haiku/trunk/src/servers/mail/DeskbarViewIcons.h
   haiku/trunk/src/servers/mail/DeskbarViewIcons.rdef
Modified:
   haiku/trunk/src/servers/mail/Jamfile
   haiku/trunk/src/servers/mail/deskbarview.cpp
   haiku/trunk/src/servers/mail/deskbarview.h
Log:
* Rewrote icon drawing for the deskbar replicant, now use our shiny vector
 icons. Haven't looked into R5 backward compat.
* Minor style fixes, more in the next commit.


Added: haiku/trunk/src/servers/mail/DeskbarViewIcons.h
===================================================================
--- haiku/trunk/src/servers/mail/DeskbarViewIcons.h	2009-08-12 09:54:58 UTC (rev 32268)
+++ haiku/trunk/src/servers/mail/DeskbarViewIcons.h	2009-08-12 10:47:18 UTC (rev 32269)
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2009, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef DESKBAR_VIEW_ICONS_H
+#define DESKBAR_VIEW_ICONS_H
+
+enum {
+	kIconNoMail		= 1000,
+	kIconNewMail	= 1001
+};
+
+#endif // DESKBAR_VIEW_ICONS_H

Added: haiku/trunk/src/servers/mail/DeskbarViewIcons.rdef
===================================================================
--- haiku/trunk/src/servers/mail/DeskbarViewIcons.rdef	2009-08-12 09:54:58 UTC (rev 32268)
+++ haiku/trunk/src/servers/mail/DeskbarViewIcons.rdef	2009-08-12 10:47:18 UTC (rev 32269)
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2009, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Alexandre Deckner <alex at zappotek.com>
+ */
+
+#include "DeskbarViewIcons.h"
+
+resource(kIconNoMail) #'VICN' array {
+	$"6E63696610050004006A020006063C55F93D5C9ABF48EE3E484E4B6A43C35976"
+	$"495F849385EAF7FFA2A5B7C2C2A0BCCCDC748994FF829AB2020006033B9EE13B"
+	$"9EE1BB9EE13B9EE14A10E147F9EB00ACD3DB9FFFFFFFFF6492A8020006023A2A"
+	$"16B8F45D3AE2F43C1D5446BCF5477C2100F7FBFDFF31596B02000603BA68BD3A"
+	$"CB11BCBEBBBC5E184A35D549E60100343D412F364145FF566F7A020006023B4E"
+	$"07BA96743B15213BEFCE499B3D4A176700435563FF2D404802000602352DDDBA"
+	$"68303C7773374206477FF64AE5FA00BED1DBFF8DADBA020006023A11DA3A5196"
+	$"BACC2E3A7F4848C35C4A23C100FFEEC0FFE7D6A80200060238DDE0B865633B86"
+	$"F63C1C2A48AFCD493E7A00B4A06BFFA28B4E03826A31037795A303F206060200"
+	$"0602BAD0C03A15D1BAF9D2BC024D4BB1114A539100FFC7BAFFC31A1A02000602"
+	$"BAD0C03A15D1BAF9D2BC024D4BB1114A539101E3E3E3FF59697A0200060237FB"
+	$"FC391283BC18FD3AB8644BB9C148DD1D00D6D9DCFF78899912060BE28B3F3960"
+	$"3C46564C564A564E5653535155C788C71BC9764E5B5F48CB8147CB8147CC4D44"
+	$"60406043603D5C3B5E3C5C3B02044647453BC291BE263C2DC189B9DE382B2F2D"
+	$"342B342D392F362DBFCBBADC060CFEAFAA5A405A345A345A2B4E23572649213F"
+	$"2545223F252E2D2E2DB7AFB8FEB6FDBC282ABA75B6FDBC282A492C4A2251395E"
+	$"4354C1BCC81F0607FE1A5A405A345A345A2B4E23572649213F2545223F252E2D"
+	$"4445560404FE44564446444F443D382FC066BAE5BAE0B8222D2F302D2D2F0606"
+	$"EF03382F382FB89AB6FEB6FDBD5A2A30B6FDBD5A2A492B3A2B3A2B30382F2E2A"
+	$"382FBC910605EF03382F382FB89AB6FEB763BD5A2B30B763BD5A2B49C0BBBDBD"
+	$"C0BBBDBDC000BB9BBC912FBE9DBA00BC912F0605FE022C4A444D3B49444D4445"
+	$"4445C156C041C0BBBDBDC122BEEAC0BBBDBD2A490606A70A444D3B49444DC7EB"
+	$"4354395E22512C4A0A042F4C28513358424C0605AA03B7BABEF223433254BFB1"
+	$"C3BA38443D4733410606EA0A44423A36B7BABEF2384433413D47BFB1C3BA4447"
+	$"060AEEEF0E234331C24EB746C1EB31C24E3253BA6EC264BA6EC264BB8FC285BC"
+	$"CAC21CBC7AC27CBCFAC1E3BD30C05DBD1AC134BD30C05D4444BD3DBFCABD3DBF"
+	$"CABD60BDF73A363744394235460A05563C5E365E41584756460A04543B5C355E"
+	$"36563C0A044C44563C563E4C460A064A454A43543B563C4C444C460A095C354A"
+	$"434A454C46563E564658475E415E360E0A010100000A0001021001178402040A"
+	$"020103000A030101000A0001041001178400040A040105000A050106000A0601"
+	$"07000A070108000A0001111001178400040A0C010D000A0D010E000A0E010F00"
+	$"0A0F011000"
+};
+
+resource(kIconNewMail) #'VICN' array {
+	$"6E63696611050004006A020006063C55F93D5C9ABF48EE3E484E4B6A43C35976"
+	$"495F849385EAF7FFA2A5B7C2C2A0BCCCDC748994FF829AB2020006033B9EE13B"
+	$"9EE1BB9EE13B9EE14A10E147F9EB00ACD3DB9FFFFFFFFF6492A8020006023A2A"
+	$"16B8F45D3AE2F43C1D5446BCF5477C2100F7FBFDFF31596B02000603BA68BD3A"
+	$"CB11BCBEBBBC5E184A35D549E60100343D412F364145FF566F7A020006023B4E"
+	$"07BA96743B15213BEFCE499B3D4A176700435563FF2D404802000602352DDDBA"
+	$"68303C7773374206477FF64AE5FA00BED1DBFF8DADBA020006023A11DA3A5196"
+	$"BACC2E3A7F4848C35C4A23C100FFEEC0FFE7D6A80200060238DDE0B865633B86"
+	$"F63C1C2A48AFCD493E7A00B4A06BFFA28B4E03826A31037795A303F206060200"
+	$"06022F146D3B80D3BC7FF03032974B85E5482BA200FFC7BAFFC31A1A02000602"
+	$"2F146D3B80D3BC7FF03032974B85E5482BA201E3E3E3FF59697A020006022F14"
+	$"6D3B80D3BC7FF03032974B75E5484BA200D6D9DCFF78899903FAA28E13060BE2"
+	$"8B3F39603C46564C564A564E5653535155C788C71BC9764E5B5F48CB8147CB81"
+	$"47CC4D4460406043603D5C3B5E3C5C3B02044647453BC291BE263C2DC189B9DE"
+	$"382B2F2D342B342D392F362DBFCBBADC060CFEAFAA5A405A345A345A2B4E2357"
+	$"2649213F2545223F252E2D2E2DB7AFB8FEB6FDBC282ABA75B6FDBC282A492C4A"
+	$"2251395E4354C1BCC81F0607FE1A5A405A345A345A2B4E23572649213F254522"
+	$"3F252E2D4445560404FE44564446444F443D382FC066BAE5BAE0B8222D2F302D"
+	$"2D2F0606EF03382F382FB89AB6FEB6FDBD5A2A30B6FDBD5A2A492B3A2B3A2B30"
+	$"382F2E2A382FBC910605EF03382F382FB89AB6FEB763BD5A2B30B763BD5A2B49"
+	$"C0BBBDBDC0BBBDBDC000BB9BBC912FBE9DBA00BC912F0605FE022C4A444D3B49"
+	$"444D44454445C156C041C0BBBDBDC122BEEAC0BBBDBD2A490606A70A444D3B49"
+	$"444DC7EB4354395E22512C4A0A042F4C28513358424C0605AA03B7BABEF22343"
+	$"3254BFB1C3BA38443D4733410606EA0A44423A36B7BABEF2384433413D47BFB1"
+	$"C3BA4447060AEEEF0E234331C24EB746C1EB31C24E3253BA6EC264BA6EC264BB"
+	$"8FC285BCCAC21CBC7AC27CBCFAC1E3BD30C05DBD1AC134BD30C05D4444BD3DBF"
+	$"CABD3DBFCABD60BDF73A363744394235460A054EBA2B4E285623562C50310A04"
+	$"4CB9BA4C274E284EBA200A044C274E28562354220A044E404EBA2B4F324F3F0A"
+	$"044E404C3F4CB9C54EBA390A084C274C3F4E404F3F4F32562C56235422140A01"
+	$"0100000A0001021001178402040A020103000A030101000A0001041001178400"
+	$"040A040105000A050106000A060107000A070108000A0B0109000A00020A0B10"
+	$"01178400040A08010A000A09010B000A0A010C000A0001121001178400040A0C"
+	$"010D000A0D010E000A10010F000A0E0110000A0F011100"
+};

Modified: haiku/trunk/src/servers/mail/Jamfile
===================================================================
--- haiku/trunk/src/servers/mail/Jamfile	2009-08-12 09:54:58 UTC (rev 32268)
+++ haiku/trunk/src/servers/mail/Jamfile	2009-08-12 10:47:18 UTC (rev 32269)
@@ -8,10 +8,11 @@
 
 UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
 UsePrivateHeaders mail ;
+UseLibraryHeaders icon ;
 
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
-AddResources mail_daemon : mail_daemon.rdef ;
+AddResources mail_daemon : mail_daemon.rdef DeskbarViewIcons.rdef ;
 
 Server mail_daemon :
 	deskbarview.cpp

Modified: haiku/trunk/src/servers/mail/deskbarview.cpp
===================================================================
--- haiku/trunk/src/servers/mail/deskbarview.cpp	2009-08-12 09:54:58 UTC (rev 32268)
+++ haiku/trunk/src/servers/mail/deskbarview.cpp	2009-08-12 10:47:18 UTC (rev 32269)
@@ -18,6 +18,7 @@
 #include <VolumeRoster.h>
 #include <Directory.h>
 #include <FindDirectory.h>
+#include <IconUtils.h>
 #include <Query.h>
 #include <SymLink.h>
 #include <NodeInfo.h>
@@ -36,6 +37,7 @@
 #include <MDRLanguage.h>
 
 #include "deskbarview.h"
+#include "DeskbarViewIcons.h"
 
 const char *kTrackerSignature = "application/x-vnd.Be-TRAK";
 
@@ -62,7 +64,7 @@
 			(char*)our_image <= (char*)image->text_part + image->text_part_size)
 			break;
 	}
-	
+
 	return ret;
 }
 
@@ -76,36 +78,44 @@
 //	#pragma mark -
 
 
-DeskbarView::DeskbarView(BRect frame) 
-	: BView(frame, "mail_daemon", B_FOLLOW_NONE, B_WILL_DRAW | B_PULSE_NEEDED)
-	, fIcon(NULL)
-	, fCurrentIconState(NEW_MAIL)
+DeskbarView::DeskbarView(BRect frame)
+	:
+	BView(frame, "mail_daemon", B_FOLLOW_NONE, B_WILL_DRAW | B_PULSE_NEEDED),
+	fStatus(kStatusNoMail)
 {
+	_InitBitmaps();
 }
 
 DeskbarView::DeskbarView(BMessage *message)
-	: BView(message)
-	, fIcon(NULL)
-	, fCurrentIconState(NEW_MAIL)
+	:
+	BView(message),
+	fStatus(kStatusNoMail)
 {
-	ChangeIcon(NO_MAIL);
+	_InitBitmaps();
 }
 
 DeskbarView::~DeskbarView()
 {
-	delete fIcon;
+	for (int i = 0; i < kStatusCount; i++)
+		delete fBitmaps[i];
+
 	for (int32 i = 0; i < fNewMailQueries.CountItems(); i++)
 		delete ((BQuery *)(fNewMailQueries.ItemAt(i)));
 }
 
 void DeskbarView::AttachedToWindow()
 {
-	if (be_roster->IsRunning("application/x-vnd.Be-POST"))
-	{
+	BView::AttachedToWindow();
+	if (Parent())
+		SetViewColor(Parent()->ViewColor());
+	else
+		SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+
+	SetLowColor(ViewColor());
+
+	if (be_roster->IsRunning("application/x-vnd.Be-POST")) {
 		RefreshMailQuery();
-	}
-	else
-	{
+	} else {
 		BDeskbar deskbar;
 		deskbar.RemoveItem("mail_daemon");
 	}
@@ -120,10 +130,10 @@
 	BVolumeRoster volumes;
 	BVolume volume;
 	fNewMessages = 0;
-	
+
 	while (volumes.GetNextVolume(&volume) == B_OK) {
 		BQuery *newMailQuery = new BQuery;
-	
+
 		newMailQuery->SetTarget(this);
 		newMailQuery->SetVolume(&volume);
 		newMailQuery->PushAttr(B_MAIL_ATTR_STATUS);
@@ -138,16 +148,17 @@
 		newMailQuery->PushOp(B_OR);
 		newMailQuery->PushOp(B_AND);
 		newMailQuery->Fetch();
-		
+
 		BEntry entry;
 		while (newMailQuery->GetNextEntry(&entry) == B_OK)
 			if (entry.InitCheck() == B_OK)
 				fNewMessages++;
-		
+
 		fNewMailQueries.AddItem(newMailQuery);
 	}
 
-	ChangeIcon((fNewMessages > 0) ? NEW_MAIL : NO_MAIL);
+	fStatus = (fNewMessages > 0) ? kStatusNewMail : kStatusNoMail;
+	Invalidate();
 }
 
 DeskbarView* DeskbarView::Instantiate(BMessage *data)
@@ -168,18 +179,12 @@
 
 void DeskbarView::Draw(BRect /*updateRect*/)
 {
-	PushState();
+	if (fBitmaps[fStatus] == NULL)
+		return;
 
-	SetHighColor(Parent()->ViewColor());
-	FillRect(BRect(0.0,0.0,15.0,15.0));
-	if(fIcon)
-	{
-		SetDrawingMode(B_OP_OVER);
-		DrawBitmap(fIcon,BRect(0.0,0.0,15.0,15.0));
-	}
-
-	PopState();
-	Sync();
+	SetDrawingMode(B_OP_ALPHA);
+	DrawBitmap(fBitmaps[fStatus]);
+	SetDrawingMode(B_OP_COPY);
 }
 
 status_t OpenFolder(const char* end)
@@ -187,15 +192,15 @@
 	BPath path;
 	find_directory(B_USER_DIRECTORY, &path);
 	path.Append(end);
-	
+
 	entry_ref ref;
 	if (get_ref_for_path(path.Path(),&ref) != B_OK) return B_NAME_NOT_FOUND;
 	if (!BEntry(&ref).Exists()) return B_NAME_NOT_FOUND;
-	
-	
+
+
 	BMessage open_mbox(B_REFS_RECEIVED);
 	open_mbox.AddRef("refs",&ref);
-	
+
 	BMessenger tracker("application/x-vnd.Be-TRAK");
 	tracker.SendMessage(&open_mbox);
 	return B_OK;
@@ -244,8 +249,9 @@
 				case B_ENTRY_REMOVED:
 					fNewMessages--;
 					break;
-			}	
-			ChangeIcon((fNewMessages > 0) ? NEW_MAIL : NO_MAIL);
+			}
+			fStatus = (fNewMessages > 0) ? kStatusNewMail : kStatusNoMail;
+			Invalidate();
 			break;
 		}
 		case B_QUIT_REQUESTED:
@@ -256,17 +262,17 @@
 		{
 			BMessage argv(B_ARGV_RECEIVED);
 			argv.AddString("argv", "E-mail");
-			
+
 			entry_ref ref;
 			BPath path;
 			int i = 0;
-			
+
 			while (message->FindRef("refs",i++,&ref) == B_OK && path.SetTo(&ref) == B_OK)
 			{
 				//fprintf(stderr,"got %s\n", path.Path());
 				argv.AddString("argv", path.Path());
 			}
-			
+
 			if (i > 1)
 			{
 				argv.AddInt32("argc", i);
@@ -281,40 +287,38 @@
 
 
 void
-DeskbarView::ChangeIcon(int32 icon)
+DeskbarView::_InitBitmaps()
 {
-	if (fCurrentIconState == icon)
-		return;
+	for (int i = 0; i < kStatusCount; i++)
+		fBitmaps[i] = NULL;
 
-	BBitmap *newIcon(NULL);
-
 	image_info info;
-	if (our_image(&info) == B_OK) {
-		BFile file(info.name, B_READ_ONLY);
-		if (file.InitCheck() < B_OK)
-			goto err;
+	if (our_image(&info) != B_OK)
+		return;
 
-		BResources rsrc(&file);
-		size_t len;
-		const void *data = rsrc.LoadResource('BBMP', icon == NEW_MAIL
-			? "New" : "Read",&len);
-		if (len == 0)
-			goto err;
+	BFile file(info.name, B_READ_ONLY);
+	if (file.InitCheck() != B_OK)
+		return;
 
-		BMemoryIO stream(data, len);
-		stream.Seek(0, SEEK_SET);
-		BMessage archive;
-		if (archive.Unflatten(&stream) != B_OK)
-			goto err;
-		newIcon = new BBitmap(&archive);
-	} else
-		fputs("no image!", stderr);
+	BResources resources(&file);
+	if (resources.InitCheck() != B_OK)
+		return;
 
-err:
-	fCurrentIconState = icon;
-	delete fIcon;
-	fIcon = newIcon;
-	Invalidate();
+	for (int i = 0; i < kStatusCount; i++) {
+		const void* data = NULL;
+		size_t size;
+		data = resources.LoadResource(B_VECTOR_ICON_TYPE,
+			kIconNoMail + i, &size);
+		if (data != NULL) {
+			BBitmap* icon = new BBitmap(Bounds(), B_RGBA32);
+			if (icon->InitCheck() == B_OK
+				&& BIconUtils::GetVectorIcon((const uint8 *)data,
+					size, icon) == B_OK) {
+				fBitmaps[i] = icon;
+			} else
+				delete icon;
+		}
+	}
 }
 
 
@@ -465,7 +469,7 @@
 						&& strcmp(mimeString, "application/x-vnd.Be-query") == 0)
 						useNavMenu = true;
 				}
-				// clobber the existing ref only if the symlink derefernces completely, 
+				// clobber the existing ref only if the symlink derefernces completely,
 				// otherwise we'll stick with what we have
 				entry.GetRef(&ref);
 			}

Modified: haiku/trunk/src/servers/mail/deskbarview.h
===================================================================
--- haiku/trunk/src/servers/mail/deskbarview.h	2009-08-12 09:54:58 UTC (rev 32268)
+++ haiku/trunk/src/servers/mail/deskbarview.h	2009-08-12 10:47:18 UTC (rev 32269)
@@ -10,9 +10,10 @@
 #include "NavMenu.h"
 
 
-enum MDDeskbarIcon {
-	NO_MAIL = 0,
-	NEW_MAIL,
+enum {
+	kStatusNoMail = 0,
+	kStatusNewMail,
+	kStatusCount
 };
 
 enum MDDeskbarMessages {
@@ -33,7 +34,7 @@
 class _EXPORT DeskbarView : public BView {
 	public:
 		DeskbarView (BRect frame);
-		DeskbarView (BMessage *data);	
+		DeskbarView (BMessage *data);
 
 		virtual ~DeskbarView();
 
@@ -46,17 +47,16 @@
 		virtual void		MessageReceived(BMessage *message);
 		virtual void		Pulse();
 
-		void				ChangeIcon(int32 icon);
-
 	private:
 		void		RefreshMailQuery();
 		bool		CreateMenuLinks(BDirectory &,BPath &);
 		void		CreateNewMailQuery(BEntry &);
 		BPopUpMenu	*BuildMenu();
-	
-		BBitmap		*fIcon;
-		int32		fCurrentIconState;
-		
+		void		_InitBitmaps();
+
+		BBitmap*	fBitmaps[kStatusCount];
+		int32		fStatus;
+
 		BList		fNewMailQueries;
 		int32		fNewMessages;
 



From pulkomandy at mail.berlios.de  Wed Aug 12 12:48:19 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Wed, 12 Aug 2009 12:48:19 +0200
Subject: [Haiku-commits] r32270 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale src/preferences/locale
Message-ID: <200908121048.n7CAmJkK016057@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-12 12:48:18 +0200 (Wed, 12 Aug 2009)
New Revision: 32270
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32270&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
Log:
It is now possible to change the separators in the long date. Also renamed GetDateFormat to DateFormat as it actually works when using proper namespace names.


Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-12 10:47:18 UTC (rev 32269)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-12 10:48:18 UTC (rev 32270)
@@ -40,7 +40,7 @@
 			bool longFormat);
 		virtual void	FormatTime(BString* string,time_t time,bool longFormat);
 
-		const char*		GetDateFormat(bool longFormat) const;
+		const char*		DateFormat(bool longFormat) const;
 		void			SetDateFormat(const char* formatString, 
 							bool longFormat = true);
 		const char*		TimeFormat(bool longFormat) const;

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-12 10:47:18 UTC (rev 32269)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-12 10:48:18 UTC (rev 32270)
@@ -151,7 +151,7 @@
 
 
 const char*
-BCountry::GetDateFormat(bool longFormat) const
+BCountry::DateFormat(bool longFormat) const
 {
 	icu_4_2::DateFormat* dateFormatter = 
 		longFormat ? fICULongDateFormatter : fICUShortDateFormatter;

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-12 10:47:18 UTC (rev 32269)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-12 10:48:18 UTC (rev 32270)
@@ -115,6 +115,8 @@
 		CreateDateMenu(&fLongDateMenu[i]);
 		fLongDateSeparator[i] = new BTextControl("","","",
 			new BMessage(kSettingsContentsModified));
+		fLongDateSeparator[i]->SetModificationMessage(
+			new BMessage(kSettingsContentsModified));
 	}
 
 	// Short format
@@ -268,7 +270,7 @@
 void
 TimeFormatSettingsView::_ParseDateFormat()
 {
-	const char* dateFormat = fCountry->GetDateFormat(true);
+	const char* dateFormat = fCountry->DateFormat(true);
 
 	// Travel trough the string and parse it
 	const char* parsePointer = dateFormat;
@@ -326,9 +328,11 @@
 	f12HrRadioButton->SetTarget(this);
 
 	// TODO do the same for the short date
-	for (int j = 0; j < 4; j++)
-	for (int i = 0; i < fLongDateMenu[3]->Menu()->CountItems(); i++)
-		fLongDateMenu[j]->Menu()->SubmenuAt(i)->SetTargetForItems(this);
+	for (int j = 0; j < 4; j++) {
+		for (int i = 0; i < fLongDateMenu[j]->Menu()->CountItems(); i++)
+			fLongDateMenu[j]->Menu()->SubmenuAt(i)->SetTargetForItems(this);
+		fLongDateSeparator[j]->SetTarget(this);
+	}
 	fSeparatorMenuField->Menu()->SetTargetForItems(this);
 }
 
@@ -373,8 +377,6 @@
 			BMenuItem* menuItem = static_cast<BMenuItem*>(pointerFromMessage);
 
 			menuField->MenuItem()->SetLabel(menuItem->Label());
-
-			_UpdateLongDateFormatString();
 		}
 		// pass trough
 		case kSettingsContentsModified:
@@ -388,8 +390,7 @@
 						;
 				}
 
-				// TODO add the other fields and generate the ICU string
-				BString dateFormat;
+				_UpdateLongDateFormatString();
 
 				// TODO send that to our Settings class
 				// settings.SetDateOrderFormat(format);
@@ -398,7 +399,6 @@
 				// Make the notification message and send it to the tracker:
 				BMessage notificationMessage;
 				notificationMessage.AddInt32("TimeFormatSeparator", separator);
-				notificationMessage.AddString("DateOrderFormat", dateFormat);
 				notificationMessage.AddBool("24HrClock",
 					f24HrRadioButton->Value() == 1);
 				// tracker->SendNotices(kDateFormatChanged, &notificationMessage);



From aldeck at mail.berlios.de  Wed Aug 12 12:53:10 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Wed, 12 Aug 2009 12:53:10 +0200
Subject: [Haiku-commits] r32271 - haiku/trunk/src/servers/mail
Message-ID: <200908121053.n7CArACW021038@sheep.berlios.de>

Author: aldeck
Date: 2009-08-12 12:53:00 +0200 (Wed, 12 Aug 2009)
New Revision: 32271
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32271&view=rev

Added:
   haiku/trunk/src/servers/mail/DeskbarView.cpp
   haiku/trunk/src/servers/mail/DeskbarView.h
Removed:
   haiku/trunk/src/servers/mail/deskbarview.cpp
   haiku/trunk/src/servers/mail/deskbarview.h
Modified:
   haiku/trunk/src/servers/mail/Jamfile
Log:
* Rename deskbarview.cpp/h to DeskbarView.cpp/h


Copied: haiku/trunk/src/servers/mail/DeskbarView.cpp (from rev 32269, haiku/trunk/src/servers/mail/deskbarview.cpp)
===================================================================
--- haiku/trunk/src/servers/mail/deskbarview.cpp	2009-08-12 10:47:18 UTC (rev 32269)
+++ haiku/trunk/src/servers/mail/DeskbarView.cpp	2009-08-12 10:53:00 UTC (rev 32271)
@@ -0,0 +1,598 @@
+/* DeskbarView - main_daemon's deskbar menu and view
+ *
+ * Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved.
+ */
+
+
+#include <PopUpMenu.h>
+#include <Bitmap.h>
+#include <Rect.h>
+#include <MenuItem.h>
+#include <Window.h>
+#include <Messenger.h>
+#include <Roster.h>
+#include <Resources.h>
+#include <Entry.h>
+#include <Path.h>
+#include <NodeMonitor.h>
+#include <VolumeRoster.h>
+#include <Directory.h>
+#include <FindDirectory.h>
+#include <IconUtils.h>
+#include <Query.h>
+#include <SymLink.h>
+#include <NodeInfo.h>
+#include <kernel/fs_info.h>
+#include <kernel/fs_index.h>
+#include <Deskbar.h>
+#include <String.h>
+
+#include <stdio.h>
+#include <malloc.h>
+
+#include <E-mail.h>
+#include <MailSettings.h>
+#include <MailDaemon.h>
+
+#include <MDRLanguage.h>
+
+#include "DeskbarView.h"
+#include "DeskbarViewIcons.h"
+
+const char *kTrackerSignature = "application/x-vnd.Be-TRAK";
+
+
+//-----The following #defines get around a bug in get_image_info on ppc---
+#if __INTEL__
+#define text_part text
+#define text_part_size text_size
+#else
+#define text_part data
+#define text_part_size data_size
+#endif
+
+extern "C" _EXPORT BView* instantiate_deskbar_item();
+
+
+status_t our_image(image_info* image)
+{
+	int32 cookie = 0;
+	status_t ret;
+	while ((ret = get_next_image_info(0,&cookie,image)) == B_OK)
+	{
+		if ((char*)our_image >= (char*)image->text_part &&
+			(char*)our_image <= (char*)image->text_part + image->text_part_size)
+			break;
+	}
+
+	return ret;
+}
+
+BView* instantiate_deskbar_item(void)
+{
+	return new DeskbarView(BRect(0, 0, 15, 15));
+}
+
+
+//-------------------------------------------------------------------------------
+//	#pragma mark -
+
+
+DeskbarView::DeskbarView(BRect frame)
+	:
+	BView(frame, "mail_daemon", B_FOLLOW_NONE, B_WILL_DRAW | B_PULSE_NEEDED),
+	fStatus(kStatusNoMail)
+{
+	_InitBitmaps();
+}
+
+DeskbarView::DeskbarView(BMessage *message)
+	:
+	BView(message),
+	fStatus(kStatusNoMail)
+{
+	_InitBitmaps();
+}
+
+DeskbarView::~DeskbarView()
+{
+	for (int i = 0; i < kStatusCount; i++)
+		delete fBitmaps[i];
+
+	for (int32 i = 0; i < fNewMailQueries.CountItems(); i++)
+		delete ((BQuery *)(fNewMailQueries.ItemAt(i)));
+}
+
+void DeskbarView::AttachedToWindow()
+{
+	BView::AttachedToWindow();
+	if (Parent())
+		SetViewColor(Parent()->ViewColor());
+	else
+		SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+
+	SetLowColor(ViewColor());
+
+	if (be_roster->IsRunning("application/x-vnd.Be-POST")) {
+		RefreshMailQuery();
+	} else {
+		BDeskbar deskbar;
+		deskbar.RemoveItem("mail_daemon");
+	}
+}
+
+void DeskbarView::RefreshMailQuery()
+{
+	for (int32 i = 0; i < fNewMailQueries.CountItems(); i++)
+		delete ((BQuery *)(fNewMailQueries.ItemAt(i)));
+	fNewMailQueries.MakeEmpty();
+
+	BVolumeRoster volumes;
+	BVolume volume;
+	fNewMessages = 0;
+
+	while (volumes.GetNextVolume(&volume) == B_OK) {
+		BQuery *newMailQuery = new BQuery;
+
+		newMailQuery->SetTarget(this);
+		newMailQuery->SetVolume(&volume);
+		newMailQuery->PushAttr(B_MAIL_ATTR_STATUS);
+		newMailQuery->PushString("New");
+		newMailQuery->PushOp(B_EQ);
+		newMailQuery->PushAttr("BEOS:TYPE");
+		newMailQuery->PushString("text/x-email");
+		newMailQuery->PushOp(B_EQ);
+		newMailQuery->PushAttr("BEOS:TYPE");
+		newMailQuery->PushString("text/x-partial-email");
+		newMailQuery->PushOp(B_EQ);
+		newMailQuery->PushOp(B_OR);
+		newMailQuery->PushOp(B_AND);
+		newMailQuery->Fetch();
+
+		BEntry entry;
+		while (newMailQuery->GetNextEntry(&entry) == B_OK)
+			if (entry.InitCheck() == B_OK)
+				fNewMessages++;
+
+		fNewMailQueries.AddItem(newMailQuery);
+	}
+
+	fStatus = (fNewMessages > 0) ? kStatusNewMail : kStatusNoMail;
+	Invalidate();
+}
+
+DeskbarView* DeskbarView::Instantiate(BMessage *data)
+{
+	if (!validate_instantiation(data, "DeskbarView"))
+		return NULL;
+
+	return new DeskbarView(data);
+}
+
+status_t DeskbarView::Archive(BMessage *data,bool deep) const
+{
+	BView::Archive(data, deep);
+
+	data->AddString("add_on", "application/x-vnd.Be-POST");
+	return B_NO_ERROR;
+}
+
+void DeskbarView::Draw(BRect /*updateRect*/)
+{
+	if (fBitmaps[fStatus] == NULL)
+		return;
+
+	SetDrawingMode(B_OP_ALPHA);
+	DrawBitmap(fBitmaps[fStatus]);
+	SetDrawingMode(B_OP_COPY);
+}
+
+status_t OpenFolder(const char* end)
+{
+	BPath path;
+	find_directory(B_USER_DIRECTORY, &path);
+	path.Append(end);
+
+	entry_ref ref;
+	if (get_ref_for_path(path.Path(),&ref) != B_OK) return B_NAME_NOT_FOUND;
+	if (!BEntry(&ref).Exists()) return B_NAME_NOT_FOUND;
+
+
+	BMessage open_mbox(B_REFS_RECEIVED);
+	open_mbox.AddRef("refs",&ref);
+
+	BMessenger tracker("application/x-vnd.Be-TRAK");
+	tracker.SendMessage(&open_mbox);
+	return B_OK;
+}
+
+
+void
+DeskbarView::MessageReceived(BMessage *message)
+{
+	switch(message->what)
+	{
+		case MD_CHECK_SEND_NOW:
+			// also happens in DeskbarView::MouseUp() with
+			// B_TERTIARY_MOUSE_BUTTON pressed
+			BMailDaemon::CheckMail(true);
+			break;
+		case MD_CHECK_FOR_MAILS:
+			BMailDaemon::CheckMail(false,message->FindString("account"));
+			break;
+		case MD_SEND_MAILS:
+			BMailDaemon::SendQueuedMail();
+			break;
+
+		case MD_OPEN_NEW:
+		{
+			char *argv[] = {"New Message", "mailto:"};
+			be_roster->Launch("text/x-email",2,argv);
+			break;
+		}
+		case MD_OPEN_PREFS:
+			be_roster->Launch("application/x-vnd.Haiku-Mail");
+			break;
+
+		case MD_REFRESH_QUERY:
+			RefreshMailQuery();
+			break;
+
+		case B_QUERY_UPDATE:
+		{
+			int32 what;
+			message->FindInt32("opcode",&what);
+			switch (what) {
+				case B_ENTRY_CREATED:
+					fNewMessages++;
+					break;
+				case B_ENTRY_REMOVED:
+					fNewMessages--;
+					break;
+			}
+			fStatus = (fNewMessages > 0) ? kStatusNewMail : kStatusNoMail;
+			Invalidate();
+			break;
+		}
+		case B_QUIT_REQUESTED:
+			BMailDaemon::Quit();
+			break;
+
+		case B_REFS_RECEIVED:	// open received files in the standard mail application
+		{
+			BMessage argv(B_ARGV_RECEIVED);
+			argv.AddString("argv", "E-mail");
+
+			entry_ref ref;
+			BPath path;
+			int i = 0;
+
+			while (message->FindRef("refs",i++,&ref) == B_OK && path.SetTo(&ref) == B_OK)
+			{
+				//fprintf(stderr,"got %s\n", path.Path());
+				argv.AddString("argv", path.Path());
+			}
+
+			if (i > 1)
+			{
+				argv.AddInt32("argc", i);
+				be_roster->Launch("text/x-email", &argv);
+			}
+			break;
+		}
+		default:
+			BView::MessageReceived(message);
+	}
+}
+
+
+void
+DeskbarView::_InitBitmaps()
+{
+	for (int i = 0; i < kStatusCount; i++)
+		fBitmaps[i] = NULL;
+
+	image_info info;
+	if (our_image(&info) != B_OK)
+		return;
+
+	BFile file(info.name, B_READ_ONLY);
+	if (file.InitCheck() != B_OK)
+		return;
+
+	BResources resources(&file);
+	if (resources.InitCheck() != B_OK)
+		return;
+
+	for (int i = 0; i < kStatusCount; i++) {
+		const void* data = NULL;
+		size_t size;
+		data = resources.LoadResource(B_VECTOR_ICON_TYPE,
+			kIconNoMail + i, &size);
+		if (data != NULL) {
+			BBitmap* icon = new BBitmap(Bounds(), B_RGBA32);
+			if (icon->InitCheck() == B_OK
+				&& BIconUtils::GetVectorIcon((const uint8 *)data,
+					size, icon) == B_OK) {
+				fBitmaps[i] = icon;
+			} else
+				delete icon;
+		}
+	}
+}
+
+
+void
+DeskbarView::Pulse()
+{
+	// TODO: Check if mail_daemon is still running
+}
+
+
+void
+DeskbarView::MouseUp(BPoint pos)
+{
+	if (fLastButtons & B_PRIMARY_MOUSE_BUTTON) {
+		if (OpenFolder("mail/mailbox") != B_OK)
+		if (OpenFolder("mail/in") != B_OK)
+		if (OpenFolder("mail/INBOX") != B_OK)
+			OpenFolder("mail");
+	}
+
+	if (fLastButtons & B_TERTIARY_MOUSE_BUTTON)
+		BMailDaemon::CheckMail(true);
+}
+
+
+void
+DeskbarView::MouseDown(BPoint pos)
+{
+	Looper()->CurrentMessage()->FindInt32("buttons",&fLastButtons);
+	Looper()->CurrentMessage()->PrintToStream();
+
+	if (fLastButtons & B_SECONDARY_MOUSE_BUTTON) {
+		ConvertToScreen(&pos);
+
+		BPopUpMenu *menu = BuildMenu();
+		if (menu) {
+			menu->Go(pos, true, true, BRect(pos.x - 2, pos.y - 2,
+				pos.x + 2, pos.y + 2), true);
+		}
+	}
+}
+
+
+bool
+DeskbarView::CreateMenuLinks(BDirectory &directory,BPath &path)
+{
+	status_t status = directory.SetTo(path.Path());
+	if (status == B_OK)
+		return true;
+
+	// Check if the directory has to be created (and do it in this case,
+	// filling it with some standard links).  Normally the installer will
+	// create the directory and fill it with links, so normally this doesn't
+	// get used.
+
+	BEntry entry(path.Path());
+	if (status != B_ENTRY_NOT_FOUND
+		|| entry.GetParent(&directory) < B_OK
+		|| directory.CreateDirectory(path.Leaf(), NULL) < B_OK
+		|| directory.SetTo(path.Path()) < B_OK)
+		return false;
+
+	BPath targetPath;
+	find_directory(B_USER_DIRECTORY, &targetPath);
+	targetPath.Append("mail/in");
+
+	directory.CreateSymLink("Open Inbox Folder", targetPath.Path(), NULL);
+	targetPath.GetParent(&targetPath);
+	directory.CreateSymLink("Open Mail Folder", targetPath.Path(), NULL);
+
+	// create the draft query
+
+	BFile file;
+	if (directory.CreateFile("Open Draft", &file) < B_OK)
+		return true;
+
+	BString string("MAIL:draft==1");
+	file.WriteAttrString("_trk/qrystr", &string);
+	string = "E-mail";
+	file.WriteAttrString("_trk/qryinitmime", &string);
+	BNodeInfo(&file).SetType("application/x-vnd.Be-query");
+
+	return true;
+}
+
+
+void
+DeskbarView::CreateNewMailQuery(BEntry &query)
+{
+	BFile file(&query, B_READ_WRITE | B_CREATE_FILE);
+	if (file.InitCheck() != B_OK)
+		return;
+
+	BString string("((" B_MAIL_ATTR_STATUS "==\"[nN][eE][wW]\")&&((BEOS:TYPE=="
+		"\"text/x-email\")||(BEOS:TYPE==\"text/x-partial-email\")))");
+	file.WriteAttrString("_trk/qrystr", &string);
+	string = "E-mail";
+	file.WriteAttrString("_trk/qryinitmime", &string);
+	BNodeInfo(&file).SetType("application/x-vnd.Be-query");
+}
+
+
+BPopUpMenu *
+DeskbarView::BuildMenu()
+{
+	BPopUpMenu *menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
+	menu->SetFont(be_plain_font);
+
+	menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE (
+		"Create New Message","N) ?????????")B_UTF8_ELLIPSIS,
+		new BMessage(MD_OPEN_NEW)));
+	menu->AddSeparatorItem();
+
+	BMessenger tracker(kTrackerSignature);
+	BNavMenu *navMenu;
+	BMenuItem *item;
+	BMessage *msg;
+	entry_ref ref;
+
+	BPath path;
+	find_directory(B_USER_SETTINGS_DIRECTORY, &path);
+	path.Append("Mail/Menu Links");
+
+	BDirectory directory;
+	if (CreateMenuLinks(directory, path)) {
+		int32 count = 0;
+
+		while (directory.GetNextRef(&ref) == B_OK) {
+			count++;
+
+			path.SetTo(&ref);
+			// the true here dereferences the symlinks all the way :)
+			BEntry entry(&ref, true);
+
+			// do we want to use the NavMenu, or just an ordinary BMenuItem?
+			// we are using the NavMenu only for directories and queries
+			bool useNavMenu = false;
+
+			if (entry.InitCheck() == B_OK) {
+				if (entry.IsDirectory())
+					useNavMenu = true;
+				else if (entry.IsFile()) {
+					// Files should use the BMenuItem unless they are queries
+					char mimeString[B_MIME_TYPE_LENGTH];
+					BNode node(&entry);
+					BNodeInfo info(&node);
+					if (info.GetType(mimeString) == B_OK
+						&& strcmp(mimeString, "application/x-vnd.Be-query") == 0)
+						useNavMenu = true;
+				}
+				// clobber the existing ref only if the symlink derefernces completely,
+				// otherwise we'll stick with what we have
+				entry.GetRef(&ref);
+			}
+
+			msg = new BMessage(B_REFS_RECEIVED);
+			msg->AddRef("refs", &ref);
+
+			if (useNavMenu) {
+				item = new BMenuItem(navMenu = new BNavMenu(path.Leaf(),
+					B_REFS_RECEIVED, tracker), msg);
+				navMenu->SetNavDir(&ref);
+			} else
+				item = new BMenuItem(path.Leaf(), msg);
+
+			menu->AddItem(item);
+			if(entry.InitCheck() != B_OK)
+				item->SetEnabled(false);
+		}
+		if (count > 0)
+			menu->AddSeparatorItem();
+	}
+
+	// Hack for R5's buggy Query Notification
+	#ifdef HAIKU_TARGET_PLATFORM_BEOS
+		menu->AddItem(new BMenuItem(
+			MDR_DIALECT_CHOICE("Refresh New Mail Count",
+				"????????????"),
+			new BMessage(MD_REFRESH_QUERY)));
+	#endif
+
+	// The New E-mail query
+
+	if (fNewMessages > 0) {
+		BString string;
+		MDR_DIALECT_CHOICE(
+			string << fNewMessages << " new message"
+				<< (fNewMessages != 1 ? "s" : B_EMPTY_STRING),
+			string << fNewMessages << " ?????????");
+
+		find_directory(B_USER_SETTINGS_DIRECTORY, &path);
+		path.Append("Mail/New E-mail");
+
+		BEntry query(path.Path());
+		if (!query.Exists())
+			CreateNewMailQuery(query);
+		query.GetRef(&ref);
+
+		item = new BMenuItem(navMenu = new BNavMenu(string.String(),
+			B_REFS_RECEIVED, BMessenger(kTrackerSignature)),
+			msg = new BMessage(B_REFS_RECEIVED));
+		msg->AddRef("refs", &ref);
+		navMenu->SetNavDir(&ref);
+
+		menu->AddItem(item);
+	} else {
+		menu->AddItem(item = new BMenuItem(
+			MDR_DIALECT_CHOICE ("No new messages","?????????"), NULL));
+		item->SetEnabled(false);
+	}
+
+	BList list;
+	GetInboundMailChains(&list);
+
+	if (modifiers() & B_SHIFT_KEY) {
+		BMenu *chainMenu = new BMenu(
+			MDR_DIALECT_CHOICE ("Check For Mails Only","R) ???????"));
+		BFont font;
+		menu->GetFont(&font);
+		chainMenu->SetFont(&font);
+
+		for (int32 i = 0; i < list.CountItems(); i++) {
+			BMailChain *chain = (BMailChain *)list.ItemAt(i);
+
+			BMessage *message = new BMessage(MD_CHECK_FOR_MAILS);
+			message->AddString("account", chain->Name());
+
+			chainMenu->AddItem(new BMenuItem(chain->Name(), message));
+			delete chain;
+		}
+		if (list.IsEmpty()) {
+			item = new BMenuItem("<no accounts>", NULL);
+			item->SetEnabled(false);
+			chainMenu->AddItem(item);
+		}
+		chainMenu->SetTargetForItems(this);
+		menu->AddItem(new BMenuItem(chainMenu, new BMessage(MD_CHECK_FOR_MAILS)));
+
+		// Not used:
+		// menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE (
+		// "Check For Mails Only","???????"), new BMessage(MD_CHECK_FOR_MAILS)));
+		menu->AddItem(new BMenuItem(
+			MDR_DIALECT_CHOICE ("Send Pending Mails", "M) ????????"),
+		new BMessage(MD_SEND_MAILS)));
+	} else {
+		menu->AddItem(item = new BMenuItem(
+			MDR_DIALECT_CHOICE ("Check For Mail Now", "C) ???????"),
+			new BMessage(MD_CHECK_SEND_NOW)));
+		if (list.IsEmpty())
+			item->SetEnabled(false);
+	}
+
+	menu->AddSeparatorItem();
+	menu->AddItem(new BMenuItem(
+		MDR_DIALECT_CHOICE ("Edit Preferences","P) ???????") B_UTF8_ELLIPSIS,
+		new BMessage(MD_OPEN_PREFS)));
+
+	if (modifiers() & B_SHIFT_KEY) {
+		menu->AddItem(new BMenuItem(
+			MDR_DIALECT_CHOICE ("Shutdown Mail Services","Q) ??"),
+			new BMessage(B_QUIT_REQUESTED)));
+	}
+
+	// Reset Item Targets (only those which aren't already set)
+
+	for (int32 i = menu->CountItems(); i-- > 0;) {
+		item = menu->ItemAt(i);
+		if (item && (msg = item->Message()) != NULL) {
+			if (msg->what == B_REFS_RECEIVED)
+				item->SetTarget(tracker);
+			else
+				item->SetTarget(this);
+		}
+	}
+	return menu;
+}
+

Copied: haiku/trunk/src/servers/mail/DeskbarView.h (from rev 32269, haiku/trunk/src/servers/mail/deskbarview.h)

Modified: haiku/trunk/src/servers/mail/Jamfile
===================================================================
--- haiku/trunk/src/servers/mail/Jamfile	2009-08-12 10:48:18 UTC (rev 32270)
+++ haiku/trunk/src/servers/mail/Jamfile	2009-08-12 10:53:00 UTC (rev 32271)
@@ -15,7 +15,7 @@
 AddResources mail_daemon : mail_daemon.rdef DeskbarViewIcons.rdef ;
 
 Server mail_daemon :
-	deskbarview.cpp
+	DeskbarView.cpp
 	LEDAnimation.cpp
 	main.cpp
 ;

Deleted: haiku/trunk/src/servers/mail/deskbarview.cpp

Deleted: haiku/trunk/src/servers/mail/deskbarview.h



From philippe.houdoin at gmail.com  Wed Aug 12 13:24:56 2009
From: philippe.houdoin at gmail.com (Philippe Houdoin)
Date: Wed, 12 Aug 2009 13:24:56 +0200
Subject: [Haiku-commits] Haiku-commits] r32267 - in haiku/trunk:
	headers/os/opengl src/kits/opengl src/tests/kits/opengl/glinfo
Message-ID: <ce99af780908120424r39b63738sdaebbe468a5745fa@mail.gmail.com>

Hi Axel,

> This breaks binary compatibility, please revert, or add the non-const
> versions for GCC2 compatibility.

I'm *so* stupid.
As I switch to gcc4 build, I was suprised to see those deprecated warnings.
But I've checked in BeBook, not BeOS R5 GLView.h, the original
constructor definition.
Sorry about that.

I'll revert it ASAP, but feel free to do it as well.

I should have stay focused on porting Threading Building Blocks
instead (reason for switching to gcc4 :-\)...

Bye,
  Philippe.


From aldeck at mail.berlios.de  Wed Aug 12 13:25:52 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Wed, 12 Aug 2009 13:25:52 +0200
Subject: [Haiku-commits] r32272 - haiku/trunk/src/servers/mail
Message-ID: <200908121125.n7CBPqB2031409@sheep.berlios.de>

Author: aldeck
Date: 2009-08-12 13:25:44 +0200 (Wed, 12 Aug 2009)
New Revision: 32272
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32272&view=rev

Modified:
   haiku/trunk/src/servers/mail/DeskbarView.cpp
   haiku/trunk/src/servers/mail/DeskbarView.h
Log:
* Style update. Don't know what to do about the licence headers though


Modified: haiku/trunk/src/servers/mail/DeskbarView.cpp
===================================================================
--- haiku/trunk/src/servers/mail/DeskbarView.cpp	2009-08-12 10:53:00 UTC (rev 32271)
+++ haiku/trunk/src/servers/mail/DeskbarView.cpp	2009-08-12 11:25:44 UTC (rev 32272)
@@ -4,36 +4,35 @@
  */
 
 
-#include <PopUpMenu.h>
 #include <Bitmap.h>
-#include <Rect.h>
-#include <MenuItem.h>
-#include <Window.h>
-#include <Messenger.h>
-#include <Roster.h>
-#include <Resources.h>
+#include <Deskbar.h>
+#include <Directory.h>
 #include <Entry.h>
-#include <Path.h>
-#include <NodeMonitor.h>
-#include <VolumeRoster.h>
-#include <Directory.h>
 #include <FindDirectory.h>
 #include <IconUtils.h>
-#include <Query.h>
-#include <SymLink.h>
-#include <NodeInfo.h>
 #include <kernel/fs_info.h>
 #include <kernel/fs_index.h>
-#include <Deskbar.h>
+#include <MenuItem.h>
+#include <Messenger.h>
+#include <NodeInfo.h>
+#include <NodeMonitor.h>
+#include <Path.h>
+#include <PopUpMenu.h>
+#include <Query.h>
+#include <Rect.h>
+#include <Resources.h>
+#include <Roster.h>
 #include <String.h>
+#include <SymLink.h>
+#include <VolumeRoster.h>
+#include <Window.h>
 
 #include <stdio.h>
 #include <malloc.h>
 
 #include <E-mail.h>
+#include <MailDaemon.h>
 #include <MailSettings.h>
-#include <MailDaemon.h>
-
 #include <MDRLanguage.h>
 
 #include "DeskbarView.h"
@@ -86,6 +85,7 @@
 	_InitBitmaps();
 }
 
+
 DeskbarView::DeskbarView(BMessage *message)
 	:
 	BView(message),
@@ -94,6 +94,7 @@
 	_InitBitmaps();
 }
 
+
 DeskbarView::~DeskbarView()
 {
 	for (int i = 0; i < kStatusCount; i++)
@@ -103,6 +104,7 @@
 		delete ((BQuery *)(fNewMailQueries.ItemAt(i)));
 }
 
+
 void DeskbarView::AttachedToWindow()
 {
 	BView::AttachedToWindow();
@@ -114,14 +116,15 @@
 	SetLowColor(ViewColor());
 
 	if (be_roster->IsRunning("application/x-vnd.Be-POST")) {
-		RefreshMailQuery();
+		_RefreshMailQuery();
 	} else {
 		BDeskbar deskbar;
 		deskbar.RemoveItem("mail_daemon");
 	}
 }
 
-void DeskbarView::RefreshMailQuery()
+
+void DeskbarView::_RefreshMailQuery()
 {
 	for (int32 i = 0; i < fNewMailQueries.CountItems(); i++)
 		delete ((BQuery *)(fNewMailQueries.ItemAt(i)));
@@ -150,9 +153,10 @@
 		newMailQuery->Fetch();
 
 		BEntry entry;
-		while (newMailQuery->GetNextEntry(&entry) == B_OK)
+		while (newMailQuery->GetNextEntry(&entry) == B_OK) {
 			if (entry.InitCheck() == B_OK)
 				fNewMessages++;
+		}
 
 		fNewMailQueries.AddItem(newMailQuery);
 	}
@@ -161,6 +165,7 @@
 	Invalidate();
 }
 
+
 DeskbarView* DeskbarView::Instantiate(BMessage *data)
 {
 	if (!validate_instantiation(data, "DeskbarView"))
@@ -169,6 +174,7 @@
 	return new DeskbarView(data);
 }
 
+
 status_t DeskbarView::Archive(BMessage *data,bool deep) const
 {
 	BView::Archive(data, deep);
@@ -177,6 +183,7 @@
 	return B_NO_ERROR;
 }
 
+
 void DeskbarView::Draw(BRect /*updateRect*/)
 {
 	if (fBitmaps[fStatus] == NULL)
@@ -187,6 +194,7 @@
 	SetDrawingMode(B_OP_COPY);
 }
 
+
 status_t OpenFolder(const char* end)
 {
 	BPath path;
@@ -194,9 +202,11 @@
 	path.Append(end);
 
 	entry_ref ref;
-	if (get_ref_for_path(path.Path(),&ref) != B_OK) return B_NAME_NOT_FOUND;
-	if (!BEntry(&ref).Exists()) return B_NAME_NOT_FOUND;
+	if (get_ref_for_path(path.Path(),&ref) != B_OK)
+		return B_NAME_NOT_FOUND;
 
+	if (!BEntry(&ref).Exists())
+		return B_NAME_NOT_FOUND;
 
 	BMessage open_mbox(B_REFS_RECEIVED);
 	open_mbox.AddRef("refs",&ref);
@@ -208,7 +218,7 @@
 
 
 void
-DeskbarView::MessageReceived(BMessage *message)
+DeskbarView::MessageReceived(BMessage* message)
 {
 	switch(message->what)
 	{
@@ -226,7 +236,7 @@
 
 		case MD_OPEN_NEW:
 		{
-			char *argv[] = {"New Message", "mailto:"};
+			char* argv[] = {"New Message", "mailto:"};
 			be_roster->Launch("text/x-email",2,argv);
 			break;
 		}
@@ -235,7 +245,7 @@
 			break;
 
 		case MD_REFRESH_QUERY:
-			RefreshMailQuery();
+			_RefreshMailQuery();
 			break;
 
 		case B_QUERY_UPDATE:
@@ -258,7 +268,8 @@
 			BMailDaemon::Quit();
 			break;
 
-		case B_REFS_RECEIVED:	// open received files in the standard mail application
+		// open received files in the standard mail application
+		case B_REFS_RECEIVED:
 		{
 			BMessage argv(B_ARGV_RECEIVED);
 			argv.AddString("argv", "E-mail");
@@ -267,14 +278,13 @@
 			BPath path;
 			int i = 0;
 
-			while (message->FindRef("refs",i++,&ref) == B_OK && path.SetTo(&ref) == B_OK)
-			{
+			while (message->FindRef("refs", i++, &ref) == B_OK
+				&& path.SetTo(&ref) == B_OK) {
 				//fprintf(stderr,"got %s\n", path.Path());
 				argv.AddString("argv", path.Path());
 			}
 
-			if (i > 1)
-			{
+			if (i > 1) {
 				argv.AddInt32("argc", i);
 				be_roster->Launch("text/x-email", &argv);
 			}
@@ -333,9 +343,9 @@
 DeskbarView::MouseUp(BPoint pos)
 {
 	if (fLastButtons & B_PRIMARY_MOUSE_BUTTON) {
-		if (OpenFolder("mail/mailbox") != B_OK)
-		if (OpenFolder("mail/in") != B_OK)
-		if (OpenFolder("mail/INBOX") != B_OK)
+		if (OpenFolder("mail/mailbox") != B_OK
+			&& OpenFolder("mail/in") != B_OK
+			&& OpenFolder("mail/INBOX") != B_OK)
 			OpenFolder("mail");
 	}
 
@@ -353,7 +363,7 @@
 	if (fLastButtons & B_SECONDARY_MOUSE_BUTTON) {
 		ConvertToScreen(&pos);
 
-		BPopUpMenu *menu = BuildMenu();
+		BPopUpMenu* menu = _BuildMenu();
 		if (menu) {
 			menu->Go(pos, true, true, BRect(pos.x - 2, pos.y - 2,
 				pos.x + 2, pos.y + 2), true);
@@ -363,7 +373,7 @@
 
 
 bool
-DeskbarView::CreateMenuLinks(BDirectory &directory,BPath &path)
+DeskbarView::_CreateMenuLinks(BDirectory& directory, BPath& path)
 {
 	status_t status = directory.SetTo(path.Path());
 	if (status == B_OK)
@@ -406,7 +416,7 @@
 
 
 void
-DeskbarView::CreateNewMailQuery(BEntry &query)
+DeskbarView::_CreateNewMailQuery(BEntry& query)
 {
 	BFile file(&query, B_READ_WRITE | B_CREATE_FILE);
 	if (file.InitCheck() != B_OK)
@@ -421,21 +431,21 @@
 }
 
 
-BPopUpMenu *
-DeskbarView::BuildMenu()
+BPopUpMenu*
+DeskbarView::_BuildMenu()
 {
-	BPopUpMenu *menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
+	BPopUpMenu* menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
 	menu->SetFont(be_plain_font);
 
 	menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE (
-		"Create New Message","N) ?????????")B_UTF8_ELLIPSIS,
+		"Create New Message", "N) ?????????")B_UTF8_ELLIPSIS,
 		new BMessage(MD_OPEN_NEW)));
 	menu->AddSeparatorItem();
 
 	BMessenger tracker(kTrackerSignature);
-	BNavMenu *navMenu;
-	BMenuItem *item;
-	BMessage *msg;
+	BNavMenu* navMenu;
+	BMenuItem* item;
+	BMessage* msg;
 	entry_ref ref;
 
 	BPath path;
@@ -443,7 +453,7 @@
 	path.Append("Mail/Menu Links");
 
 	BDirectory directory;
-	if (CreateMenuLinks(directory, path)) {
+	if (_CreateMenuLinks(directory, path)) {
 		int32 count = 0;
 
 		while (directory.GetNextRef(&ref) == B_OK) {
@@ -466,11 +476,12 @@
 					BNode node(&entry);
 					BNodeInfo info(&node);
 					if (info.GetType(mimeString) == B_OK
-						&& strcmp(mimeString, "application/x-vnd.Be-query") == 0)
+						&& strcmp(mimeString, "application/x-vnd.Be-query")
+							== 0)
 						useNavMenu = true;
 				}
-				// clobber the existing ref only if the symlink derefernces completely,
-				// otherwise we'll stick with what we have
+				// clobber the existing ref only if the symlink derefernces
+				// completely, otherwise we'll stick with what we have
 				entry.GetRef(&ref);
 			}
 
@@ -514,7 +525,7 @@
 
 		BEntry query(path.Path());
 		if (!query.Exists())
-			CreateNewMailQuery(query);
+			_CreateNewMailQuery(query);
 		query.GetRef(&ref);
 
 		item = new BMenuItem(navMenu = new BNavMenu(string.String(),
@@ -541,9 +552,9 @@
 		chainMenu->SetFont(&font);
 
 		for (int32 i = 0; i < list.CountItems(); i++) {
-			BMailChain *chain = (BMailChain *)list.ItemAt(i);
+			BMailChain* chain = (BMailChain*)list.ItemAt(i);
 
-			BMessage *message = new BMessage(MD_CHECK_FOR_MAILS);
+			BMessage* message = new BMessage(MD_CHECK_FOR_MAILS);
 			message->AddString("account", chain->Name());
 
 			chainMenu->AddItem(new BMenuItem(chain->Name(), message));
@@ -573,12 +584,12 @@
 
 	menu->AddSeparatorItem();
 	menu->AddItem(new BMenuItem(
-		MDR_DIALECT_CHOICE ("Edit Preferences","P) ???????") B_UTF8_ELLIPSIS,
+		MDR_DIALECT_CHOICE ("Edit Preferences", "P) ???????") B_UTF8_ELLIPSIS,
 		new BMessage(MD_OPEN_PREFS)));
 
 	if (modifiers() & B_SHIFT_KEY) {
 		menu->AddItem(new BMenuItem(
-			MDR_DIALECT_CHOICE ("Shutdown Mail Services","Q) ??"),
+			MDR_DIALECT_CHOICE ("Shutdown Mail Services", "Q) ??"),
 			new BMessage(B_QUIT_REQUESTED)));
 	}
 
@@ -595,4 +606,3 @@
 	}
 	return menu;
 }
-

Modified: haiku/trunk/src/servers/mail/DeskbarView.h
===================================================================
--- haiku/trunk/src/servers/mail/DeskbarView.h	2009-08-12 10:53:00 UTC (rev 32271)
+++ haiku/trunk/src/servers/mail/DeskbarView.h	2009-08-12 11:25:44 UTC (rev 32272)
@@ -34,24 +34,24 @@
 class _EXPORT DeskbarView : public BView {
 	public:
 		DeskbarView (BRect frame);
-		DeskbarView (BMessage *data);
+		DeskbarView (BMessage* data);
 
 		virtual ~DeskbarView();
 
 		virtual void		Draw(BRect updateRect);
 		virtual void		AttachedToWindow();
-		static DeskbarView *Instantiate(BMessage *data);
-		virtual	status_t	Archive(BMessage *data, bool deep = true) const;
+		static DeskbarView*	Instantiate(BMessage* data);
+		virtual	status_t	Archive(BMessage* data, bool deep = true) const;
 		virtual void	 	MouseDown(BPoint);
 		virtual void	 	MouseUp(BPoint);
 		virtual void		MessageReceived(BMessage *message);
 		virtual void		Pulse();
 
 	private:
-		void		RefreshMailQuery();
-		bool		CreateMenuLinks(BDirectory &,BPath &);
-		void		CreateNewMailQuery(BEntry &);
-		BPopUpMenu	*BuildMenu();
+		void		_RefreshMailQuery();
+		bool		_CreateMenuLinks(BDirectory&, BPath&);
+		void		_CreateNewMailQuery(BEntry&);
+		BPopUpMenu*	_BuildMenu();
 		void		_InitBitmaps();
 
 		BBitmap*	fBitmaps[kStatusCount];



From aldeck at mail.berlios.de  Wed Aug 12 13:40:47 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Wed, 12 Aug 2009 13:40:47 +0200
Subject: [Haiku-commits] r32273 - haiku/trunk/src/servers/mail
Message-ID: <200908121140.n7CBelBh023432@sheep.berlios.de>

Author: aldeck
Date: 2009-08-12 13:40:42 +0200 (Wed, 12 Aug 2009)
New Revision: 32273
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32273&view=rev

Modified:
   haiku/trunk/src/servers/mail/DeskbarView.cpp
   haiku/trunk/src/servers/mail/DeskbarView.h
Log:
* More style fixes


Modified: haiku/trunk/src/servers/mail/DeskbarView.cpp
===================================================================
--- haiku/trunk/src/servers/mail/DeskbarView.cpp	2009-08-12 11:25:44 UTC (rev 32272)
+++ haiku/trunk/src/servers/mail/DeskbarView.cpp	2009-08-12 11:40:42 UTC (rev 32273)
@@ -1,9 +1,14 @@
-/* DeskbarView - main_daemon's deskbar menu and view
+/* DeskbarView - mail_daemon's deskbar menu and view
  *
  * Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved.
  */
 
 
+#include "DeskbarView.h"
+
+#include <stdio.h>
+#include <malloc.h>
+
 #include <Bitmap.h>
 #include <Deskbar.h>
 #include <Directory.h>
@@ -27,18 +32,14 @@
 #include <VolumeRoster.h>
 #include <Window.h>
 
-#include <stdio.h>
-#include <malloc.h>
-
 #include <E-mail.h>
 #include <MailDaemon.h>
 #include <MailSettings.h>
 #include <MDRLanguage.h>
 
-#include "DeskbarView.h"
 #include "DeskbarViewIcons.h"
 
-const char *kTrackerSignature = "application/x-vnd.Be-TRAK";
+const char* kTrackerSignature = "application/x-vnd.Be-TRAK";
 
 
 //-----The following #defines get around a bug in get_image_info on ppc---

Modified: haiku/trunk/src/servers/mail/DeskbarView.h
===================================================================
--- haiku/trunk/src/servers/mail/DeskbarView.h	2009-08-12 11:25:44 UTC (rev 32272)
+++ haiku/trunk/src/servers/mail/DeskbarView.h	2009-08-12 11:40:42 UTC (rev 32273)
@@ -1,10 +1,11 @@
+/* DeskbarView - mail_daemon's deskbar menu and view
+ *
+ * Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved.
+ */
 #ifndef DESKBAR_VIEW_H
 #define DESKBAR_VIEW_H
-/* DeskbarView - main_daemon's deskbar menu and view
-**
-** Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved.
-*/
 
+
 #include <View.h>
 
 #include "NavMenu.h"
@@ -32,35 +33,34 @@
 class BPath;
 
 class _EXPORT DeskbarView : public BView {
-	public:
-		DeskbarView (BRect frame);
-		DeskbarView (BMessage* data);
+public:
+						DeskbarView(BRect frame);
+						DeskbarView(BMessage* data);
+	virtual				~DeskbarView();
 
-		virtual ~DeskbarView();
+	virtual void		Draw(BRect updateRect);
+	virtual void		AttachedToWindow();
+	static DeskbarView*	Instantiate(BMessage* data);
+	virtual	status_t	Archive(BMessage* data, bool deep = true) const;
+	virtual void	 	MouseDown(BPoint);
+	virtual void	 	MouseUp(BPoint);
+	virtual void		MessageReceived(BMessage* message);
+	virtual void		Pulse();
 
-		virtual void		Draw(BRect updateRect);
-		virtual void		AttachedToWindow();
-		static DeskbarView*	Instantiate(BMessage* data);
-		virtual	status_t	Archive(BMessage* data, bool deep = true) const;
-		virtual void	 	MouseDown(BPoint);
-		virtual void	 	MouseUp(BPoint);
-		virtual void		MessageReceived(BMessage *message);
-		virtual void		Pulse();
+private:
+	void				_RefreshMailQuery();
+	bool				_CreateMenuLinks(BDirectory&, BPath&);
+	void				_CreateNewMailQuery(BEntry&);
+	BPopUpMenu*			_BuildMenu();
+	void				_InitBitmaps();
 
-	private:
-		void		_RefreshMailQuery();
-		bool		_CreateMenuLinks(BDirectory&, BPath&);
-		void		_CreateNewMailQuery(BEntry&);
-		BPopUpMenu*	_BuildMenu();
-		void		_InitBitmaps();
+	BBitmap*			fBitmaps[kStatusCount];
+	int32				fStatus;
 
-		BBitmap*	fBitmaps[kStatusCount];
-		int32		fStatus;
+	BList				fNewMailQueries;
+	int32				fNewMessages;
 
-		BList		fNewMailQueries;
-		int32		fNewMessages;
-
-		int32		fLastButtons;
+	int32				fLastButtons;
 };
 
 #endif	/* DESKBAR_VIEW_H */



From aldeck at mail.berlios.de  Wed Aug 12 14:21:23 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Wed, 12 Aug 2009 14:21:23 +0200
Subject: [Haiku-commits] r32274 - haiku/trunk/src/servers/mail
Message-ID: <200908121221.n7CCLNBa026514@sheep.berlios.de>

Author: aldeck
Date: 2009-08-12 14:21:13 +0200 (Wed, 12 Aug 2009)
New Revision: 32274
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32274&view=rev

Modified:
   haiku/trunk/src/servers/mail/DeskbarView.cpp
   haiku/trunk/src/servers/mail/main.cpp
Log:
* Build fix
* More style fixes
* Automatic whitespace cleanup


Modified: haiku/trunk/src/servers/mail/DeskbarView.cpp
===================================================================
--- haiku/trunk/src/servers/mail/DeskbarView.cpp	2009-08-12 11:40:42 UTC (rev 32273)
+++ haiku/trunk/src/servers/mail/DeskbarView.cpp	2009-08-12 12:21:13 UTC (rev 32274)
@@ -203,7 +203,7 @@
 	path.Append(end);
 
 	entry_ref ref;
-	if (get_ref_for_path(path.Path(),&ref) != B_OK)
+	if (get_ref_for_path(path.Path(), &ref) != B_OK)
 		return B_NAME_NOT_FOUND;
 
 	if (!BEntry(&ref).Exists())
@@ -238,7 +238,7 @@
 		case MD_OPEN_NEW:
 		{
 			char* argv[] = {"New Message", "mailto:"};
-			be_roster->Launch("text/x-email",2,argv);
+			be_roster->Launch("text/x-email", 2, argv);
 			break;
 		}
 		case MD_OPEN_PREFS:
@@ -252,7 +252,7 @@
 		case B_QUERY_UPDATE:
 		{
 			int32 what;
-			message->FindInt32("opcode",&what);
+			message->FindInt32("opcode", &what);
 			switch (what) {
 				case B_ENTRY_CREATED:
 					fNewMessages++;

Modified: haiku/trunk/src/servers/mail/main.cpp
===================================================================
--- haiku/trunk/src/servers/mail/main.cpp	2009-08-12 11:40:42 UTC (rev 32273)
+++ haiku/trunk/src/servers/mail/main.cpp	2009-08-12 12:21:13 UTC (rev 32274)
@@ -35,7 +35,7 @@
 #include <status.h>
 #include <StringList.h>
 
-#include "deskbarview.h"
+#include "DeskbarView.h"
 #include "LEDAnimation.h"
 
 #include <MDRLanguage.h>
@@ -53,7 +53,7 @@
 #endif
 
 using std::map;
-	
+
 typedef struct glorbal {
 	size_t bytes;
 	BStringList msgs;
@@ -68,14 +68,14 @@
 
 		virtual void MessageReceived(BMessage *msg);
 		virtual	void RefsReceived(BMessage *a_message);
-		
+
 		virtual void Pulse();
 		virtual bool QuitRequested();
 		virtual void ReadyToRun();
 
 		void InstallDeskbarIcon();
 		void RemoveDeskbarIcon();
-		
+
 		void RunChains(BList &list,BMessage *msg);
 		void SendPendingMessages(BMessage *msg);
 		void GetNewMessages(BMessage *msg);
@@ -85,7 +85,7 @@
 
 		BMessageRunner *auto_check;
 		BMailSettings settings_file;
-		
+
 		int32 new_messages;
 		bool central_beep;
 			// TRUE to do a beep when the status window closes.  This happens
@@ -94,17 +94,17 @@
 			// Set to TRUE by the 'mcbp' message that the mail Notification
 			// filter sends us, cleared when the beep is done.
 		BList fetch_done_respondents;
-		
+
 		BList queries;
 		LEDAnimation *led;
-		
+
 		BString alert_string;
 };
 
 
 MailDaemonApp::MailDaemonApp(void)
 	: BApplication("application/x-vnd.Be-POST")
-{	
+{
 	status = new BMailStatusWindow(BRect(40, 400, 360, 400), "Mail Status",
 					settings_file.ShowStatusWindow());
 	auto_check = NULL;
@@ -174,12 +174,12 @@
 			string << new_messages << " ?????????????? ";
 		else
 			string << "?????????????";
-	);	
+	);
 	central_beep = false;
 	status->SetDefaultMessage(string);
 
 	led = new LEDAnimation;
-	SetPulseRate(1000000);	
+	SetPulseRate(1000000);
 }
 
 
@@ -238,7 +238,7 @@
 #ifndef HAIKU_TARGET_PLATFORM_BEOS
 				int s = socket(AF_INET, SOCK_DGRAM, 0);
 				bsppp_status_t status;
-			
+
 				strcpy(status.if_name, "ppp0");
 				if (ioctl(s, BONE_SERIAL_PPP_GET_STATUS, &status, sizeof(status)) != 0) {
 					close(s);
@@ -287,7 +287,7 @@
 			{
 			BMessage *msg, reply('mnuc');
 			reply.AddInt32("num_new_messages",new_messages);
-			
+
 			while((msg = (BMessage *)fetch_done_respondents.RemoveItem(0L))) {
 				msg->SendReply(&reply);
 				delete msg;
@@ -317,7 +317,7 @@
 				fetch_done_respondents.AddItem(DetachCurrentMessage());
 				break;
 			}
-			
+
 			reply.AddInt32("num_new_messages",new_messages);
 			msg->SendReply(&reply);
 			}
@@ -337,13 +337,13 @@
 				alert_string << num_messages << " new message";
 				if (num_messages > 1)
 					alert_string << 's';
-	
+
 				alert_string << " for " << msg->FindString("chain_name") << '\n';,
 
 				alert_string << msg->FindString("chain_name") << "??\n" << num_messages
 					<< " ???????????????";
 			);
-			
+
 			}
 			break;
 		case B_QUERY_UPDATE:
@@ -358,9 +358,9 @@
 					new_messages--;
 					break;
 			}
-			
+
 			BString string;
-			
+
 			MDR_DIALECT_CHOICE (
 				if (new_messages > 0)
 					string << new_messages;
@@ -375,9 +375,9 @@
 				else
 					string << "?????????????";
 			);
-			
+
 			status->SetDefaultMessage(string.String());
-			
+
 			}
 			break;
 	}
@@ -422,7 +422,7 @@
 MailDaemonApp::QuitRequested()
 {
 	RemoveDeskbarIcon();
-	
+
 	return true;
 }
 
@@ -466,7 +466,7 @@
 	BList list;
 	GetInboundMailChains(&list);
 
-	RunChains(list,msg);	
+	RunChains(list,msg);
 }
 
 
@@ -559,7 +559,7 @@
 				BMailChainRunner *runner = GetMailChainRunner(chain_id,status);
 				runner->GetMessages(&ids,bytes);
 				runner->Stop();
-			}	
+			}
 		} else {
 			const char *path;
 			msg->FindString("message_path",&path);
@@ -612,7 +612,7 @@
 		if (fs_stat_index(device, B_MAIL_ATTR_FLAGS, &indexInfo) == 0
 			&& indexInfo.type == B_STRING_TYPE)
 			fs_remove_index(device, B_MAIL_ATTR_FLAGS);
-			
+
 		for (int32 i = 0;stringIndices[i];i++)
 			fs_create_index(device,stringIndices[i],B_STRING_TYPE,0);
 
@@ -648,7 +648,7 @@
 	const char *types[2] = {"text/x-email","text/x-partial-email"};
 	BMimeType mime;
 	BMessage info;
-	
+
 	for (int i = 0; i < 2; i++) {
 		info.MakeEmpty();
 		mime.SetTo(types[i]);
@@ -699,7 +699,7 @@
 				if (!strcmp(result,"MAIL:fullsize"))
 					hasSize = true;
 			}
-		
+
 			if (!hasAccount)
 				addAttribute(info,B_MAIL_ATTR_ACCOUNT,"Account",B_STRING_TYPE,true,false,100);
 			if (!hasThread)



From bga at bug-br.org.br  Wed Aug 12 14:31:27 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Wed, 12 Aug 2009 09:31:27 -0300
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <894b9700908112112p4a0d617r7e02abdeef5509e7@mail.gmail.com>
References: <368825780-BeMail@Gaspode> <237414312-BeMail@Gaspode>
	<894b9700908112112p4a0d617r7e02abdeef5509e7@mail.gmail.com>
Message-ID: <4A82B61F.6030602@bug-br.org.br>

Stefano Ceccherini wrote:

>> And the plot thickens. I took a screenshot of the garbled screen after
>> returning from BWindowScreen mode and, in the screenshot, the colors
>> are correct. could this be related to double buffering in any way?
> 
> Could be the case. What's weird is: ParticlesII now looks fine, and
> the screen isn't messed up on quit.

I actually tried ParticlesII and still saw the same problems. I did an 
update-install build so wait a bit and later today I will do a full 
build and try again just in case.

-Bruno



From kirilla at mail.berlios.de  Wed Aug 12 15:54:29 2009
From: kirilla at mail.berlios.de (kirilla at BerliOS)
Date: Wed, 12 Aug 2009 15:54:29 +0200
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
	data/beos_mime/application
Message-ID: <200908121354.n7CDsTCd004729@sheep.berlios.de>

Author: kirilla
Date: 2009-08-12 15:54:28 +0200 (Wed, 12 Aug 2009)
New Revision: 32275
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32275&view=rev

Added:
   haiku/trunk/src/bin/mountvolume.rdef
Modified:
   haiku/trunk/src/bin/Jamfile
   haiku/trunk/src/bin/mountvolume.cpp
   haiku/trunk/src/data/beos_mime/application/x-bfs-image
   haiku/trunk/src/data/beos_mime/application/x-cd-image
Log:
Make mountvolume a BApplication and set it as the preferred one for opening BFS and (for now) ISO images.

Modified: haiku/trunk/src/bin/Jamfile
===================================================================
--- haiku/trunk/src/bin/Jamfile	2009-08-12 12:21:13 UTC (rev 32274)
+++ haiku/trunk/src/bin/Jamfile	2009-08-12 13:54:28 UTC (rev 32275)
@@ -14,6 +14,7 @@
 AddResources fortune : fortune.rdef ;
 AddResources hey : hey.rdef ;
 AddResources mimeset : mimeset.rdef ;
+AddResources mountvolume : mountvolume.rdef ;
 AddResources urlwrapper : urlwrapper.rdef ;
 
 # standard commands that don't need any additional library

Modified: haiku/trunk/src/bin/mountvolume.cpp
===================================================================
--- haiku/trunk/src/bin/mountvolume.cpp	2009-08-12 12:21:13 UTC (rev 32274)
+++ haiku/trunk/src/bin/mountvolume.cpp	2009-08-12 13:54:28 UTC (rev 32275)
@@ -1,8 +1,9 @@
 /*
- * Copyright 2005-2007, Ingo Weinhold, bonefish at users.sf.net. All rights reserved.
- * Copyright 2005-2009, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2005-2007 Ingo Weinhold, bonefish at users.sf.net
+ * Copyright 2005-2009 Axel D?rfler, axeld at pinc-software.de
+ * Copyright 2009 Jonas Sundstr?m, jonas at kirilla.se
  *
- * Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT License.
  */
 
 
@@ -14,6 +15,7 @@
 #include <string.h>
 #include <termios.h>
 
+#include <Application.h>
 #include <Path.h>
 #include <String.h>
 #include <fs_volume.h>
@@ -288,9 +290,68 @@
 //	#pragma mark -
 
 
-int
-main(int argc, char** argv)
+class MountVolume : public BApplication {
+public:
+						MountVolume();
+	virtual				~MountVolume();
+
+	virtual	void		RefsReceived(BMessage* message);
+	virtual	void		ArgvReceived(int32 argc, char** argv);
+	virtual	void		ReadyToRun();
+};
+
+
+MountVolume::MountVolume()
+	:
+	BApplication("application/x-vnd.haiku-mountvolume")
 {
+}
+
+
+MountVolume::~MountVolume()
+{
+}
+
+
+void
+MountVolume::RefsReceived(BMessage* message)
+{
+	status_t status;
+	int32 refCount;
+	type_code typeFound;
+
+	status = message->GetInfo("refs", &typeFound, &refCount);
+	if (status != B_OK || refCount < 1) {
+		fprintf(stderr, "Failed to get info from entry_refs BMessage: %s\n",
+			strerror(status));
+		exit(1);
+	}
+
+	entry_ref ref;
+	BPath path;
+
+	int32 argc = refCount + 1;
+	char** argv = new char*[argc + 1];
+	argv[0] = strdup(kAppName);
+
+	for (int32 i = 0; i < refCount; i++) {
+		message->FindRef("refs", i, &ref);
+		status = path.SetTo(&ref);
+		if (status != B_OK) {
+			fprintf(stderr, "Failed to get a path (%s) from entry (%s): %s\n",
+				path.Path(), ref.name, strerror(status));
+		}
+		argv[1 + i] = strdup(path.Path());
+	}
+	argv[argc] = NULL;
+
+	ArgvReceived(argc, argv);
+}
+
+
+void
+MountVolume::ArgvReceived(int32 argc, char** argv)
+{
 	MountVisitor mountVisitor;
 	PrintPartitionsVisitor printPartitionsVisitor;
 	bool listAllDevices = false;
@@ -460,5 +521,25 @@
 			deviceList.VisitEachMountablePartition(&printPartitionsVisitor);
 	}
 
+	exit(0);
+}
+
+
+void
+MountVolume::ReadyToRun()
+{
+	Quit();
+}
+
+
+//	#pragma mark -
+
+
+int
+main()
+{
+	MountVolume mountVolume;
+	mountVolume.Run();
 	return 0;
 }
+

Added: haiku/trunk/src/bin/mountvolume.rdef
===================================================================
--- haiku/trunk/src/bin/mountvolume.rdef	2009-08-12 12:21:13 UTC (rev 32274)
+++ haiku/trunk/src/bin/mountvolume.rdef	2009-08-12 13:54:28 UTC (rev 32275)
@@ -0,0 +1,10 @@
+resource app_signature "application/x-vnd.haiku-mountvolume";
+
+resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
+
+resource(1, "BEOS:FILE_TYPES") message
+{
+	"types" = "application/x-bfs-image",
+	"types" = "application/x-cd-image"
+};
+

Modified: haiku/trunk/src/data/beos_mime/application/x-bfs-image
===================================================================
--- haiku/trunk/src/data/beos_mime/application/x-bfs-image	2009-08-12 12:21:13 UTC (rev 32274)
+++ haiku/trunk/src/data/beos_mime/application/x-bfs-image	2009-08-12 13:54:28 UTC (rev 32275)
@@ -14,7 +14,9 @@
 	"type" = "application/x-bfs-image"
 };
 
-resource(6, "META:ICON") #'VICN' array {
+resource(6, "META:PREF_APP") #'MSIG' "application/x-vnd.haiku-mountvolume";
+
+resource(7, "META:ICON") #'VICN' array {
 	$"6E636966080500040054020006023B019B3AA235BC243E3C71D248D17C498491"
 	$"00E7BB8FFFC99867020006023BA71138D0C8BBF4B83E90E64AED7C485BD7008A"
 	$"561DFFB57A3A02000602BB6FCBB8D4C839AA71BC3992492FF148D96A00FFC790"

Modified: haiku/trunk/src/data/beos_mime/application/x-cd-image
===================================================================
--- haiku/trunk/src/data/beos_mime/application/x-cd-image	2009-08-12 12:21:13 UTC (rev 32274)
+++ haiku/trunk/src/data/beos_mime/application/x-cd-image	2009-08-12 13:54:28 UTC (rev 32275)
@@ -11,7 +11,9 @@
 	"type" = "application/x-cd-image"
 };
 
-resource(4, "META:ICON") #'VICN' array {
+resource(4, "META:PREF_APP") #'MSIG' "application/x-vnd.haiku-mountvolume";
+
+resource(5, "META:ICON") #'VICN' array {
 	$"6E63696605050002030605B812A5BE03E13DE784B8021049F79F4A16EC00F1F1"
 	$"F136D9DDF48A9996B9B4B8BEDBFFF4F4F404EBD0020006023C92C0388F5FB854"
 	$"503C576348D8DF48C95B004137A9FFB9B9B904017E0402043F2E4E2E302E2242"



From ingo_weinhold at gmx.de  Wed Aug 12 15:44:52 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Wed, 12 Aug 2009 15:44:52 +0200
Subject: [Haiku-commits] r32214 - in
 haiku/trunk/src/system/boot/platform/u-boot: . board board/overo
 board/verdex
In-Reply-To: <200908091640.n79GeKZ7007112@sheep.berlios.de>
References: <200908091640.n79GeKZ7007112@sheep.berlios.de>
Message-ID: <20090812154452.577.1@knochen-vm.localdomain>


On 2009-08-09 at 18:40:20 [+0200], mmu_man at mail.berlios.de wrote:
> Author: mmu_man
> Date: 2009-08-09 18:40:17 +0200 (Sun, 09 Aug 2009)
> New Revision: 32214
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32214&view=rev
> 
> Added:
>    haiku/trunk/src/system/boot/platform/u-boot/board/
>    haiku/trunk/src/system/boot/platform/u-boot/board/Jamfile
>    haiku/trunk/src/system/boot/platform/u-boot/board/overo/
>    haiku/trunk/src/system/boot/platform/u-boot/board/overo/Jamfile
>    haiku/trunk/src/system/boot/platform/u-boot/board/verdex/
>    haiku/trunk/src/system/boot/platform/u-boot/board/verdex/Jamfile
> Modified:
>    haiku/trunk/src/system/boot/platform/u-boot/Jamfile
> Log:
> [ARM]
> Add rule to handle uimage, and board-specific stuff to handle load 
> addresses. Need to fix them, u-boot doesn't like loading the file with the 
> header where the header says it should go, must copy to a different address.
> 
> 
> Modified: haiku/trunk/src/system/boot/platform/u-boot/Jamfile
> ===================================================================
> --- haiku/trunk/src/system/boot/platform/u-boot/Jamfile    2009-08-09 
> 15:38:41 UTC (rev 32213)
> +++ haiku/trunk/src/system/boot/platform/u-boot/Jamfile    2009-08-09 
> 16:40:17 UTC (rev 32214)
> @@ -36,6 +36,11 @@
>      : -fno-pic
>  ;
>  
> +# include board-specific defs
> +SubInclude HAIKU_TOP src system boot platform $(TARGET_BOOT_PLATFORM) 
> board ;
> +# reset SubDir
> +SubDir HAIKU_TOP src system boot platform u-boot ;
> +
>  # bootable flash image
>  rule BuildUBootFlashImage image : haikuLoader : uboot_image {

Where applicable our coding style applies analogously to jam files, too. The 
opening brace of rules and actions belongs on the next line.

>      Depends $(image) : $(haikuLoader) ;
> @@ -51,8 +56,6 @@
>  
>  
>  actions BuildUBootFlashImage1 {

Ditto.

> -    echo "$(1)"
> -    echo "$(2)"
>      $(RM) $(<)
>      # make an empty image
>      dd if=/dev/zero of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) 
>      count=$(FLASH_IMAGE_BLOCK_COUNT)
> @@ -64,9 +67,23 @@
>      dd if=$(>[1]) of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) conv=notrunc 
>      seek=$(FLASH_IMAGE_LOADER_OFFSET)
>  }
>  
> +# uImage
> +rule BuildUImage image : data : args {

Ditto.

> +    Depends $(image) : $(data) ;
> +    LocalClean clean : $(image) ;
> +    MKIMAGE_ARGS on $(image) = $(args) ;
> +    BuildUImage1 $(image) : $(data) ;
> +}
> +
> +actions BuildUImage1 {

Ditto.

Generally please stick to the 80 columns limit. In actions the backslash is 
your friend.

CU, Ingo


From axeld at mail.berlios.de  Wed Aug 12 16:12:13 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 12 Aug 2009 16:12:13 +0200
Subject: [Haiku-commits] r32276 - in haiku/trunk/src/system/boot/loader: .
	file_systems/fat
Message-ID: <200908121412.n7CECD1f006220@sheep.berlios.de>

Author: axeld
Date: 2009-08-12 16:12:09 +0200 (Wed, 12 Aug 2009)
New Revision: 32276
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32276&view=rev

Modified:
   haiku/trunk/src/system/boot/loader/Jamfile
   haiku/trunk/src/system/boot/loader/file_systems/fat/Stream.cpp
Log:
* Fixed warnings.
* Removed FAT support from the boot loader for now.


Modified: haiku/trunk/src/system/boot/loader/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/loader/Jamfile	2009-08-12 13:54:28 UTC (rev 32275)
+++ haiku/trunk/src/system/boot/loader/Jamfile	2009-08-12 14:12:09 UTC (rev 32276)
@@ -39,7 +39,7 @@
 			defines +=
 				BOOT_SUPPORT_PARTITION_EFI
 
-				BOOT_SUPPORT_FILE_SYSTEM_FAT
+				#BOOT_SUPPORT_FILE_SYSTEM_FAT
 			;
 		}
 	}

Modified: haiku/trunk/src/system/boot/loader/file_systems/fat/Stream.cpp
===================================================================
--- haiku/trunk/src/system/boot/loader/file_systems/fat/Stream.cpp	2009-08-12 13:54:28 UTC (rev 32275)
+++ haiku/trunk/src/system/boot/loader/file_systems/fat/Stream.cpp	2009-08-12 14:12:09 UTC (rev 32276)
@@ -108,14 +108,12 @@
 {
 	//TRACE(("FATFS::Stream::%s(%Ld,,)\n", __FUNCTION__, pos));
 	uint32 index = (uint32)(pos / fVolume.ClusterSize());
-	uint32 cluster;
-	if (pos >= fSize)
+	if (pos >= fSize || index >= fClusterCount)
 		return B_BAD_VALUE;
-	if (index >= fClusterCount)
-		return B_BAD_VALUE;
 
+	uint32 cluster = 0;
 	bool found = false;
-	int i;
+	uint32 i;
 	for (i = 0; i < CLUSTER_MAP_CACHE_SIZE; i++) {
 		if (fClusterMapCache[i].block == index) {
 			cluster = fClusterMapCache[i].cluster;
@@ -142,7 +140,8 @@
 #endif
 	}
 	if (!fVolume.IsValidCluster(cluster))
-		return ENOENT;
+		return B_ENTRY_NOT_FOUND;
+
 	fClusterMapCache[fClusterMapCacheLast].block = index;
 	fClusterMapCache[fClusterMapCacheLast].cluster = cluster;
 	fClusterMapCacheLast++;
@@ -164,22 +163,21 @@
 Stream::ReadAt(off_t pos, uint8 *buffer, size_t *_length)
 {
 	TRACE(("FATFS::Stream::%s(%Ld, )\n", __FUNCTION__, pos));
-	status_t err;
-	// set/check boundaries for pos/length
 
+	// set/check boundaries for pos/length
 	if (pos < 0)
 		return B_BAD_VALUE;
 	if (pos >= fSize) {
 		*_length = 0;
-		return B_NO_ERROR;
+		return B_OK;
 	}
 
 #if 0
 	// lazily build the cluster list
 	if (!fClusters) {
-		err = BuildClusterList();
-		if (err < B_OK)
-			return err;
+		status_t status = BuildClusterList();
+		if (status != B_OK)
+			return status;
 	}
 #endif
 
@@ -197,7 +195,6 @@
 
 	uint32 bytesRead = 0;
 	uint32 blockSize = fVolume.BlockSize();
-	uint32 blockShift = fVolume.BlockShift();
 	uint8 *block;
 
 	// the first block_run we read could not be aligned to the block_size boundary
@@ -251,7 +248,7 @@
 			break;
 		}
 
-		if (read_pos(fVolume.Device(), fVolume.ToOffset(num), 
+		if (read_pos(fVolume.Device(), fVolume.ToOffset(num),
 			buffer + bytesRead, fVolume.BlockSize()) < B_OK) {
 			*_length = bytesRead;
 			return B_BAD_VALUE;
@@ -272,9 +269,10 @@
 	}
 
 	*_length = bytesRead;
-	return B_NO_ERROR;
+	return B_OK;
 }
 
+
 status_t
 Stream::BuildClusterList()
 {



From mmu_man at mail.berlios.de  Wed Aug 12 16:17:06 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Wed, 12 Aug 2009 16:17:06 +0200
Subject: [Haiku-commits] r32277 - haiku/trunk/src/system/libroot/os/arch/arm
Message-ID: <200908121417.n7CEH6RD006784@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-12 16:17:05 +0200 (Wed, 12 Aug 2009)
New Revision: 32277
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32277&view=rev

Modified:
   haiku/trunk/src/system/libroot/os/arch/arm/atomic.S
Log:
[ARM]
Condition the exclusive ops to >= armv6 instead of specific version.


Modified: haiku/trunk/src/system/libroot/os/arch/arm/atomic.S
===================================================================
--- haiku/trunk/src/system/libroot/os/arch/arm/atomic.S	2009-08-12 14:12:09 UTC (rev 32276)
+++ haiku/trunk/src/system/libroot/os/arch/arm/atomic.S	2009-08-12 14:17:05 UTC (rev 32277)
@@ -11,7 +11,7 @@
 /* int atomic_add(int *value, int increment)
  */
 FUNCTION(atomic_add):
-#if ARM_ISA_ARMV6 || ARM_ISA_ARMV7
+#if __ARM_ARCH__ >= 6
 miss1:	       	ldrex       r12, [r0]
         	add         r2,  r12, r1
         	strex       r3,  r2,  [r0]
@@ -46,7 +46,7 @@
 /* int atomic_and(int *value, int andValue)
  */
 FUNCTION(atomic_and):
-#if ARM_ISA_ARMV6 || ARM_ISA_ARMV7
+#if __ARM_ARCH__ >= 6
 miss2:	       	ldrex       r12, [r0]
         	and         r2,  r12, r1
         	strex       r3,  r2,  [r0]
@@ -79,7 +79,7 @@
 /* int atomic_or(int *value, int orValue)
  */
 FUNCTION(atomic_or):
-#if ARM_ISA_ARMV6 || ARM_ISA_ARMV7
+#if __ARM_ARCH__ >= 6
 
 miss3:	       	ldrex       r12, [r0]
         	eor         r2,  r12, r1
@@ -113,16 +113,19 @@
 /* int atomic_set(int *value, int setTo)
  */
 FUNCTION(atomic_set):
+#if __ARM_ARCH__ >= 6
 miss4:		ldrex   r12, [r0]
        		strex   r3, r1, [r0]
        		teq     r3, #0
        		bne     miss4
 	        mov         pc,  lr
+#endif
 FUNCTION_END(atomic_set)
 
 /* int atomic_test_and_set(int *value, int setTo, int testValue) 
  */
 FUNCTION(atomic_test_and_set):
+#if __ARM_ARCH__ >= 6
 /*miss5:  ldrex       r12, [r0]                       @ load from the address and mark it exclusive
         cmp         r12, r2                         @ compare the value with the comperand(r2)
         strexeq     r3,  r1,  [r0]                  @ if they were equal, attempt to store the new value (r1)
@@ -132,6 +135,7 @@
         bne         same                            @ if it succeeded, jump to (same) and return. there is no need to clrex if strex succeeded
 differ: clrex                           	    @ clrex
 same:   mov         r0,  r12*/
+#endif
 #warning TODO TODO TODO
         mov         pc,  lr
 FUNCTION_END(atomic_test_and_set)



From pulkomandy at mail.berlios.de  Wed Aug 12 16:19:18 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Wed, 12 Aug 2009 16:19:18 +0200
Subject: [Haiku-commits] r32278 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale src/preferences/locale
Message-ID: <200908121419.n7CEJI8e006914@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-12 16:19:17 +0200 (Wed, 12 Aug 2009)
New Revision: 32278
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32278&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleRoster.h
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
Log:
Cleanup and style fixing.


Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-12 14:17:05 UTC (rev 32277)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-12 14:19:17 UTC (rev 32278)
@@ -33,33 +33,34 @@
 
 		// date & time
 
-		virtual void	FormatDate(char* string,size_t maxSize,time_t time,
+		virtual void FormatDate(char* string, size_t maxSize, time_t time,
 			bool longFormat);
-		virtual void	FormatDate(BString* string,time_t time,bool longFormat);
-		virtual void	FormatTime(char* string,size_t maxSize,time_t time,
+		virtual void FormatDate(BString* string, time_t time, bool longFormat);
+		virtual void FormatTime(char* string, size_t maxSize, time_t time,
 			bool longFormat);
-		virtual void	FormatTime(BString* string,time_t time,bool longFormat);
+		virtual void FormatTime(BString* string, time_t time,
+			bool longFormat);
 
-		const char*		DateFormat(bool longFormat) const;
-		void			SetDateFormat(const char* formatString, 
-							bool longFormat = true);
-		const char*		TimeFormat(bool longFormat) const;
-		const char*		DateSeparator() const;
-		const char*		TimeSeparator() const;
+		const char*	DateFormat(bool longFormat) const;
+		void		SetDateFormat(const char* formatString,
+						bool longFormat = true);
+		const char*	TimeFormat(bool longFormat) const;
+		const char*	DateSeparator() const;
+		const char*	TimeSeparator() const;
 
 		// numbers
 
-		virtual void	FormatNumber(char* string,size_t maxSize,double value);
-		virtual void	FormatNumber(BString* string,double value);
-		virtual void	FormatNumber(char* string,size_t maxSize,int32 value);
-		virtual void	FormatNumber(BString* string,int32 value);
+		virtual void FormatNumber(char* string, size_t maxSize, double value);
+		virtual void FormatNumber(BString* string, double value);
+		virtual void FormatNumber(char* string, size_t maxSize, int32 value);
+		virtual void FormatNumber(BString* string, int32 value);
 
-		const char*		DecimalPoint() const;
-		const char*		ThousandsSeparator() const;
-		const char*		Grouping() const;
+		const char*	DecimalPoint() const;
+		const char*	ThousandsSeparator() const;
+		const char*	Grouping() const;
 
-		const char*		PositiveSign() const;
-		const char*		NegativeSign() const;
+		const char*	PositiveSign() const;
+		const char*	NegativeSign() const;
 
 		// measurements
 
@@ -71,11 +72,11 @@
 			double value);
 		virtual ssize_t	FormatMonetary(BString* string, double value);
 
-		const char*		CurrencySymbol() const;
-		const char*		InternationalCurrencySymbol() const;
-		const char*		MonDecimalPoint() const;
-		const char*		MonThousandsSeparator() const;
-		const char*		MonGrouping() const;
+		const char*	CurrencySymbol() const;
+		const char*	InternationalCurrencySymbol() const;
+		const char*	MonDecimalPoint() const;
+		const char*	MonThousandsSeparator() const;
+		const char*	MonGrouping() const;
 		virtual int32	MonFracDigits() const;
 
 	private:

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleRoster.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleRoster.h	2009-08-12 14:17:05 UTC (rev 32277)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/LocaleRoster.h	2009-08-12 14:19:17 UTC (rev 32278)
@@ -33,11 +33,12 @@
 //		status_t GetCatalog(const char *mimeType, BCatalog *catalog);
 //		status_t SetCatalog(BLocale *,const char *mimeType, BCatalog *catalog);
 
-//		status_t GetLocaleFor(const char *langCode,const char *countryCode);
+//		status_t GetLocaleFor(const char *langCode, const char *countryCode);
 
 		status_t GetDefaultCollator(BCollator **) const;
 		status_t GetDefaultLanguage(BLanguage **) const;
 		status_t GetDefaultCountry(BCountry **) const;
+		void SetDefaultCountry(BCountry *) const;
 
 		status_t GetPreferredLanguages(BMessage *) const;
 		status_t SetPreferredLanguages(BMessage *);

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-08-12 14:17:05 UTC (rev 32277)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-08-12 14:19:17 UTC (rev 32278)
@@ -150,6 +150,7 @@
 	BList fCatalogAddOnInfos;
 	BMessage fPreferredLanguages;
 	BString fCountryCodeName;
+	BString fCountryDateFormat;
 
 	RosterData();
 	~RosterData();
@@ -441,11 +442,22 @@
 	BAutolock lock(gRosterData.fLock);
 	assert(lock.IsLocked());
 
-	*country = new(std::nothrow) BCountry(gRosterData.fCountryCodeName.String());
+	*country = new(std::nothrow) BCountry(
+		gRosterData.fCountryCodeName.String());
+	if (gRosterData.fCountryDateFormat.Length() > 0)
+		(*country)->SetDateFormat(gRosterData.fCountryDateFormat.String());
 	return B_OK;
 }
 
 
+void
+BLocaleRoster::SetDefaultCountry(BCountry * newDefault) const
+{
+	gRosterData.fCountryCodeName = newDefault->Code();
+	gRosterData.fCountryDateFormat = newDefault->DateFormat(true);
+}
+
+
 status_t
 BLocaleRoster::GetPreferredLanguages(BMessage *languages) const
 {
@@ -481,7 +493,6 @@
 	if (!languages)
 		return B_BAD_VALUE;
 
-	int32_t localeCount;
 	int32 i;
 	UnicodeString icuLanguageName;
 	BString languageName;
@@ -496,8 +507,9 @@
 		languageSet.insert(BString(icuLocaleList[i]));
 	}
 #else
-	static const Locale* icuLocaleList =
-		Locale::getAvailableLocales(localeCount);
+	int32_t localeCount;
+	static const Locale* icuLocaleList
+		= Locale::getAvailableLocales(localeCount);
 
 	// Loop over the strings and add them to an std::set to remove duplicates
 	for (i = 0; i < localeCount; i++) {

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-12 14:17:05 UTC (rev 32277)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/LocaleWindow.cpp	2009-08-12 14:19:17 UTC (rev 32278)
@@ -69,14 +69,13 @@
 	const char* text = Text();
 	BString truncatedString(text);
 	owner->TruncateString(&truncatedString, B_TRUNCATE_MIDDLE,
-						  frame.Width() - TEXT_OFFSET - 4.0);
+		frame.Width() - TEXT_OFFSET - 4.0);
 	float height = frame.Height();
 	float textHeight = fh.ascent + fh.descent;
 	BPoint textPoint;
 	textPoint.x = frame.left + TEXT_OFFSET;
 	textPoint.y = frame.top
-				  + ceilf(height / 2.0 - textHeight / 2.0
-				  		  + fh.ascent);
+		+ ceilf(height / 2.0 - textHeight / 2.0 + fh.ascent);
 	owner->DrawString(truncatedString.String(), textPoint);
 }
 
@@ -112,7 +111,7 @@
 						BList items;
 						int32 index;
 						for (int32 i = 0; message->FindInt32("index", i, &index)
-							   	== B_OK; i++)
+							 	== B_OK; i++)
 							if (BListItem* item = ItemAt(index))
 								items.AddItem((void*)item);
 
@@ -131,7 +130,7 @@
 						for (int32 i = 0; message->FindInt32("index", i, &index)
 								== B_OK; i++)
 							if (BListItem* item = list->RemoveItem(index)) {
-								AddItem(item,fDropIndex);
+								AddItem(item, fDropIndex);
 								fDropIndex++;
 							}
 
@@ -347,7 +346,6 @@
 	BTabView *tabView = new BTabView("tabview");
 
 	// Language tab
-
 	BView *tab = new BView(TR("Language"), B_WILL_DRAW);
 	tab->SetViewColor(tabView->ViewColor());
 	tab->SetLayout(new BGroupLayout(B_VERTICAL, 0));
@@ -357,7 +355,7 @@
 		// first list: available languages
 		LanguageListView *listView = new LanguageListView("available",
 			B_MULTIPLE_SELECTION_LIST);
-		BScrollView *scrollView = new BScrollView("scroller", listView, 
+		BScrollView *scrollView = new BScrollView("scroller", listView,
 			0, false, true, B_FANCY_BORDER);
 
 		// Fill the language list from the LocaleRoster data
@@ -378,13 +376,13 @@
 				BStringByteSink bbs(&str);
 				currentLocale.getDisplayName(languageFullName);
 				languageFullName.toUTF8(bbs);
-				LanguageListItem* si = 
-					new LanguageListItem(str, currentLanguage.String());
+				LanguageListItem* si
+					= new LanguageListItem(str, currentLanguage.String());
 				listView->AddItem(si);
 			}
 
 		} else {
-			BAlert* myAlert = new BAlert("Error", 
+			BAlert* myAlert = new BAlert("Error",
 				TR("Unable to find the available languages! You can't use this"
 					"preflet!"),
 				TR("Ok"), NULL, NULL,
@@ -403,13 +401,13 @@
 		BMessage msg;
 		be_locale_roster->GetPreferredLanguages(&msg);
 		BString langCode;
-		for (int index = 0; msg.FindString("language", index, &langCode) 
+		for (int index = 0; msg.FindString("language", index, &langCode)
 					== B_OK;
 				index++) {
 			for (int listPos = 0; LanguageListItem* lli
 					= static_cast<LanguageListItem*>(listView->ItemAt(listPos));
 					listPos++) {
-				if(langCode == lli->getLanguageCode()) {
+				if (langCode == lli->getLanguageCode()) {
 					fPreferredListView->AddItem(lli);
 					listView->RemoveItem(lli);
 				}
@@ -417,11 +415,11 @@
 		}
 
 		tab->AddChild(BGroupLayoutBuilder(B_HORIZONTAL, 10)
-			.Add(BGroupLayoutBuilder(B_VERTICAL,10)
+			.Add(BGroupLayoutBuilder(B_VERTICAL, 10)
 				.Add(new BStringView("", TR("Available languages")))
 				.Add(scrollView)
 			)
-			.Add(BGroupLayoutBuilder(B_VERTICAL,10)
+			.Add(BGroupLayoutBuilder(B_VERTICAL, 10)
 				.Add(new BStringView("", TR("Preferred languages")))
 				.Add(scrollViewEnabled)
 			)
@@ -430,7 +428,6 @@
 	}
 
 	// Country tab
-
 	tab = new BView(TR("Country"), B_WILL_DRAW);
 	tab->SetViewColor(tabView->ViewColor());
 	tab->SetLayout(new BGroupLayout(B_VERTICAL, 0));
@@ -454,27 +451,27 @@
 		BCountry* defaultCountry;
 		be_locale_roster->GetDefaultCountry(&defaultCountry);
 
-		for(int index = 0; index < localeCount; index++)
+		for (int index = 0; index < localeCount; index++)
 		{
 			UnicodeString countryFullName;
 			BString str;
 			BStringByteSink bbs(&str);
 			currentLocale[index].getDisplayName(countryFullName);
 			countryFullName.toUTF8(bbs);
-			LanguageListItem* si = 
-				new LanguageListItem(str, currentLocale[index].getName());
+			LanguageListItem* si
+				= new LanguageListItem(str, currentLocale[index].getName());
 			listView->AddItem(si);
-			if (strcmp(currentLocale[index].getName(), 
+			if (strcmp(currentLocale[index].getName(),
 					defaultCountry->Code()) == 0)
 				listView->Select(listView->CountItems() - 1);
 		}
 
-		fTimeFormatSettings = 
-			new TimeFormatSettingsView(defaultCountry);
+		fTimeFormatSettings
+			= new TimeFormatSettingsView(defaultCountry);
 
-		tab->AddChild(BGroupLayoutBuilder(B_HORIZONTAL,5)
+		tab->AddChild(BGroupLayoutBuilder(B_HORIZONTAL, 5)
 			.Add(scrollView)
-			.Add(new BScrollView("advanced", fTimeFormatSettings, 0, 
+			.Add(new BScrollView("advanced", fTimeFormatSettings, 0,
 				false, true, B_NO_BORDER))
 		);
 
@@ -482,7 +479,6 @@
 	}
 
 	// check if the window is on screen
-
 	rect = BScreen().Frame();
 	rect.right -= 20;
 	rect.bottom -= 20;
@@ -519,6 +515,7 @@
 			(fPreferredListView->ItemAt(index))->getLanguageCode());
 		index++;
 	}
+	// TODO also save Country tab settings
 	be_app_messenger.SendMessage(&update);
 
 	be_app_messenger.SendMessage(B_QUIT_REQUESTED);

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-12 14:17:05 UTC (rev 32277)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-12 14:19:17 UTC (rev 32278)
@@ -42,10 +42,10 @@
 
 class DateMenuItem: public BMenuItem {
 	public:
-		DateMenuItem(const char* label, const char* code, BMenuField* field) 
+		DateMenuItem(const char* label, const char* code, BMenuField* field)
 			:
 			BMenuItem(label, MenuMessage(code, field))
-		{ 
+		{
 			icuCode = code;
 		}
 
@@ -64,7 +64,7 @@
 	// other things if you ever need.
 	menu->AddItem(dayMenu);
 		dayMenu->AddItem(new DateMenuItem("day in month", "d", *field));
-		dayMenu->AddItem(new DateMenuItem("day in month (2 digits)", "dd", 
+		dayMenu->AddItem(new DateMenuItem("day in month (2 digits)", "dd",
 			*field));
 		dayMenu->AddItem(new DateMenuItem("day in year", "D", *field));
 		dayMenu->AddItem(new DateMenuItem("day in year (2 digits)", "DD",
@@ -77,7 +77,7 @@
 		//	*field));
 		//dayMenu->AddItem(new DateMenuItem("day of week (full text)", "eeee",
 		//	*field));
-		dayMenu->AddItem(new DateMenuItem("day of week (short name)", "E", 
+		dayMenu->AddItem(new DateMenuItem("day of week (short name)", "E",
 			*field));
 		dayMenu->AddItem(new DateMenuItem("day of week (name)", "EEEE",
 			*field));
@@ -178,7 +178,7 @@
 		f12HrRadioButton = new BRadioButton("", "12 Hour",
 				new BMessage(kSettingsContentsModified));
 
-		clockBox->AddChild(BGroupLayoutBuilder(B_VERTICAL,10)
+		clockBox->AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)
 				.Add(f24HrRadioButton)
 				.Add(f12HrRadioButton)
 		);
@@ -251,7 +251,7 @@
 
 		.Add(currencyHeader)
 		.AddGlue()
-		.SetInsets(5,5,5,5)
+		.SetInsets(5, 5, 5, 5)
 	);
 }
 
@@ -279,7 +279,7 @@
 	for (int i = 0; i < 4; i++)
 	{
 		fieldBegin = parsePointer;
-		while (*parsePointer == *(parsePointer+1)) parsePointer++ ;
+		while (*parsePointer == *(parsePointer + 1)) parsePointer++ ;
 		parsePointer++;
 		BString str;
 		str.Append(fieldBegin, parsePointer - fieldBegin);
@@ -306,8 +306,8 @@
 			fLongDateMenu[i]->MenuItem()->SetLabel(str.Append("*"));
 
 		fieldBegin = parsePointer;
-		while ((!IsSpecialDateChar(*parsePointer)) && *parsePointer != '\0' 
-				&& *(parsePointer-1) >= 0) {
+		while ((!IsSpecialDateChar(*parsePointer)) && *parsePointer != '\0'
+				&& *(parsePointer - 1) >= 0) {
 			if (*parsePointer == '\'') {
 				parsePointer++;
 				while (*parsePointer != '\'') parsePointer++;
@@ -347,7 +347,7 @@
 		newDateFormat.Append(fLongDateSeparator[i]->Text());
 	}
 
-	// TODO create a "custom" country and save it ...
+	// TODO save this in the settings preflet and make the roster load it back
 	fCountry->SetDateFormat(newDateFormat.String());
 }
 
@@ -361,12 +361,12 @@
 			// Update one of the dropdown menus
 			void* pointerFromMessage;
 			message->FindPointer("dest",&pointerFromMessage);
-			BMenuField* menuField =
-				static_cast<BMenuField*>(pointerFromMessage);
+			BMenuField* menuField
+			= static_cast<BMenuField*>(pointerFromMessage);
 			BString format;
 			message->FindString("format",&format);
 
-			for (int i=0; i < 4; i++) {
+			for (int i = 0; i < 4; i++) {
 				if (fLongDateMenu[i]==menuField) {
 					fLongDateString[i] = format;
 					break;



From axeld at mail.berlios.de  Wed Aug 12 16:29:02 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 12 Aug 2009 16:29:02 +0200
Subject: [Haiku-commits] r32279 - haiku/trunk/src/bin/rc
Message-ID: <200908121429.n7CET26m007607@sheep.berlios.de>

Author: axeld
Date: 2009-08-12 16:29:02 +0200 (Wed, 12 Aug 2009)
New Revision: 32279
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32279&view=rev

Modified:
   haiku/trunk/src/bin/rc/compile.h
   haiku/trunk/src/bin/rc/parser.y
Log:
* Fixed warnings.
* Minor cleanup.


Modified: haiku/trunk/src/bin/rc/compile.h
===================================================================
--- haiku/trunk/src/bin/rc/compile.h	2009-08-12 14:19:17 UTC (rev 32278)
+++ haiku/trunk/src/bin/rc/compile.h	2009-08-12 14:29:02 UTC (rev 32279)
@@ -1,22 +1,22 @@
 /*
  * Copyright (c) 2003 Matthijs Hollemans
- * 
- * 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 
+ *
+ * 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 
+ *
+ * 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 
+ *
+ * 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.
  */
 
@@ -38,58 +38,52 @@
 struct field_t;
 
 // Describes a data type.
-struct type_t
-{
-	type_code code;   // type code
-	char* name;       // name of this type
-	int32 count;      // how many fields
-	field_t* fields;  // field definitions
-	int32 def_id;     // default resource ID
-	char* def_name;   // default resource name
+struct type_t {
+	type_code		code;			// type code
+	const char*		name;			// name of this type
+	int32			count;			// how many fields
+	field_t*		fields;			// field definitions
+	int32			def_id;			// default resource ID
+	const char*		def_name;		// default resource name
 };
 
 // Used by the lexer and parser to pass around resource data. The rdef
 // format allows string literals to contain embedded '\0' chars, so we
 // can't use strlen() to find their length; instead we look at the size
 // field for that (size includes the final '\0' too).
-struct data_t
-{
-	type_t type;  // data type
-	char* name;   // name (only if this is a field)
-	size_t size;  // byte size of data
-	void* ptr;    // the actual data
+struct data_t {
+	type_t			type;			// data type
+	char*			name;			// name (only if this is a field)
+	size_t			size;			// byte size of data
+	void*			ptr;			// the actual data
 };
 
 // Describes a data field in a user-defined type.
-struct field_t
-{
-	type_t type;    // data type
-	char* name;     // name of this field
-	size_t resize;  // if not 0, data will be resized
-	data_t data;    // default value
+struct field_t {
+	type_t			type;			// data type
+	const char*		name;			// name of this field
+	size_t			resize;			// if not 0, data will be resized
+	data_t			data;			// default value
 };
 
 // Describes an array of data_t or field_t objects.
-struct list_t
-{
-	int32 count;
-	void* items;  // cast to data_t* or field_t*
+struct list_t {
+	int32			count;
+	void*			items;			// cast to data_t* or field_t*
 };
 
 // Used by the parser to pass around resource IDs.
-struct res_id_t
-{
-	bool has_id;
-	bool has_name;
-	int32 id;
-	char* name;
+struct res_id_t {
+	bool			has_id;
+	bool			has_name;
+	int32			id;
+	char*			name;
 };
 
 // Describes a symbolic constant.
-struct define_t
-{
-	char* name;
-	int32 value;
+struct define_t {
+	const char*		name;
+	int32			value;
 };
 
 // The output file we add resources to.
@@ -109,7 +103,7 @@
 void free_mem(void* ptr);
 
 // Returns the data type with the specified name.
-type_t get_type(char* name);
+type_t get_type(const char* name);
 
 void abort_compile(status_t err, const char* format, ...);
 void abort_compile();

Modified: haiku/trunk/src/bin/rc/parser.y
===================================================================
--- haiku/trunk/src/bin/rc/parser.y	2009-08-12 14:19:17 UTC (rev 32278)
+++ haiku/trunk/src/bin/rc/parser.y	2009-08-12 14:29:02 UTC (rev 32279)
@@ -1,22 +1,22 @@
 /*
  * Copyright (c) 2003 Matthijs Hollemans
- * 
- * 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 
+ *
+ * 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 
+ *
+ * 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 
+ *
+ * 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.
  */
 
@@ -37,40 +37,39 @@
 
 #define YYERROR_VERBOSE
 
-static void yyerror(char*);
+static void yyerror(const char*);
 
 struct ident_compare_t {  // allows the maps to compare identifier names
 	bool
-	operator()(char* s1, char* s2) const
+	operator()(const char* s1, const char* s2) const
 	{
 		return strcmp(s1, s2) < 0;
 	}
 };
 
-typedef std::map<char*, int32, ident_compare_t> sym_tab_t;
+typedef std::map<const char*, int32, ident_compare_t> sym_tab_t;
 typedef sym_tab_t::iterator sym_iter_t;
 
-static sym_tab_t symbol_table;  // symbol table for enums
-static int32 enum_cnt;          // counter for enum symbols without id
+typedef std::map<const char*, type_t, ident_compare_t> type_tab_t;
+typedef type_tab_t::iterator type_iter_t;
 
-static void add_symbol(char*, int32);
-static int32 get_symbol(char*);
+typedef std::map<const char*, define_t, ident_compare_t> define_tab_t;
+typedef define_tab_t::iterator define_iter_t;
 
-typedef std::map<char*, type_t, ident_compare_t> type_tab_t;
-typedef type_tab_t::iterator type_iter_t;
 
+static sym_tab_t symbol_table;  // symbol table for enums
+static int32 enum_cnt;          // counter for enum symbols without id
 static type_tab_t type_table;  // symbol table for data types
+static define_tab_t define_table;  // symbol table for defines
 
-static void add_user_type(res_id_t, type_code, char*, list_t);
 
-typedef std::map<char*, define_t, ident_compare_t> define_tab_t;
-typedef define_tab_t::iterator define_iter_t;
+static void add_user_type(res_id_t, type_code, const char*, list_t);
+static void add_symbol(const char*, int32);
+static int32 get_symbol(const char*);
 
-static define_tab_t define_table;  // symbol table for defines
+static bool is_type(const char* name);
+static define_t get_define(const char* name);
 
-static bool is_type(char* name);
-static define_t get_define(char* name);
-
 static data_t make_data(size_t, type_t);
 static data_t make_bool(bool);
 static data_t make_int(uint64);
@@ -83,7 +82,7 @@
 static data_t flatten_msg(BMessage*);
 
 static data_t make_default(type_t);
-static data_t make_type(char*, list_t);
+static data_t make_type(char* name, list_t);
 
 static list_t make_field_list(field_t);
 static list_t concat_field_list(list_t, field_t);
@@ -98,6 +97,7 @@
 
 static void add_resource(res_id_t, type_code, data_t);
 
+
 //------------------------------------------------------------------------------
 %}
 
@@ -130,7 +130,7 @@
 %type <id> id
 %type <d> archive array arrayfields data expr message msgfield
 %type <d> type typefield type_or_define
-%type <l> msgfields typefields typedeffields 
+%type <l> msgfields typefields typedeffields
 %type <F> typedeffield
 %type <T> datatype typecast
 
@@ -143,11 +143,11 @@
 
 %%
 
-script 
+script
 	: /* empty */
-	| script enum 
-	| script typedef 
-	| script resource 
+	| script enum
+	| script typedef
+	| script resource
 	;
 
 enum
@@ -204,7 +204,7 @@
 			$$.data   = make_default($1);
 		}
 	| datatype IDENT '=' expr
-		{ 
+		{
 			$$.type   = $1;
 			$$.name   = $2;
 			$$.resize = 0;
@@ -227,17 +227,17 @@
 	;
 
 resource
-	: RESOURCE id expr ';' 
-		{ 
-			add_resource($2, $3.type.code, $3); 
+	: RESOURCE id expr ';'
+		{
+			add_resource($2, $3.type.code, $3);
 		}
-	| RESOURCE id TYPECODE expr ';' 
-		{ 
-			add_resource($2, $3, $4); 
+	| RESOURCE id TYPECODE expr ';'
+		{
+			add_resource($2, $3, $4);
 		}
-	| RESOURCE id '(' TYPECODE ')' expr ';' 
-		{ 
-			add_resource($2, $4, $6); 
+	| RESOURCE id '(' TYPECODE ')' expr ';'
+		{
+			add_resource($2, $4, $6);
 		}
 	;
 
@@ -245,28 +245,28 @@
 	: /* empty */
 		{
 			$$.has_id = false; $$.has_name = false; $$.name = NULL;
-		} 
+		}
 	| '(' ')'
 		{
 			$$.has_id = false; $$.has_name = false; $$.name = NULL;
-		} 
+		}
 	| '(' integer ')'
-		{ 
-			$$.has_id = true; $$.id = (int32) $2; 
-			$$.has_name = false; $$.name = NULL; 
+		{
+			$$.has_id = true; $$.id = (int32) $2;
+			$$.has_name = false; $$.name = NULL;
 		}
 	| '(' integer ',' STRING ')'
-		{ 
-			$$.has_id = true; $$.id = (int32) $2; 
-			$$.has_name = true; $$.name = (char*) $4.ptr; 
+		{
+			$$.has_id = true; $$.id = (int32) $2;
+			$$.has_name = true; $$.name = (char*) $4.ptr;
 		}
 	| '(' IDENT ')'
-		{ 
+		{
 			$$.has_id = true; $$.id = get_symbol($2);
 
 			if (flags & RDEF_AUTO_NAMES)
 			{
-				$$.has_name = true; $$.name = $2; 
+				$$.has_name = true; $$.name = $2;
 			}
 			else
 			{
@@ -275,13 +275,13 @@
 			}
 		}
 	| '(' IDENT ',' STRING ')'
-		{ 
+		{
 			$$.has_id = true; $$.id = get_symbol($2);
 			$$.has_name = true; $$.name = (char*) $4.ptr;
-			free_mem($2); 
+			free_mem($2);
 		}
 	| '(' STRING ')'
-		{ 
+		{
 			$$.has_id = false;
 			$$.has_name = true; $$.name = (char*) $2.ptr;
 		}
@@ -401,7 +401,7 @@
 	| IDENT expr
 		{
 			$$ = make_type($1, make_data_list($2));
-		} 
+		}
 	| type_or_define { $$ = $1; }
 	;
 
@@ -432,7 +432,7 @@
 	| expr           { $$ = $1; }
 	;
 
-expr 
+expr
 	: expr '+' expr         { $$ = binary_expr($1, $3, '+'); }
 	| expr '-' expr         { $$ = binary_expr($1, $3, '-'); }
 	| expr '*' expr         { $$ = binary_expr($1, $3, '*'); }
@@ -473,7 +473,7 @@
 	| '(' MESSAGE ')'       { $$ = get_type("message"); }
 	| '(' ARCHIVE IDENT ')' { $$ = get_type("message"); free_mem($3); }
 	| '(' IDENT ')'         { $$ = get_type($2); free_mem($2); }
-	; 
+	;
 
 datatype
 	: ARRAY         { $$ = get_type("raw"); }
@@ -497,10 +497,10 @@
 
 
 void
-yyerror(char* msg)
+yyerror(const char* msg)
 {
 	// This function is called by the parser when it encounters
-	// an error, after which it aborts parsing and returns from 
+	// an error, after which it aborts parsing and returns from
 	// yyparse(). We never call yyerror() directly.
 
 	rdef_err = RDEF_COMPILE_ERR;
@@ -511,7 +511,7 @@
 
 
 void
-add_symbol(char* name, int32 id)
+add_symbol(const char* name, int32 id)
 {
 	if (symbol_table.find(name) != symbol_table.end())
 		abort_compile(RDEF_COMPILE_ERR, "duplicate symbol %s", name);
@@ -521,7 +521,7 @@
 
 
 int32
-get_symbol(char* name)
+get_symbol(const char* name)
 {
 	sym_iter_t i = symbol_table.find(name);
 
@@ -533,7 +533,7 @@
 
 
 static void
-add_builtin_type(type_code code, char* name)
+add_builtin_type(type_code code, const char* name)
 {
 	type_t type;
 	type.code     = code;
@@ -548,7 +548,7 @@
 
 
 void
-add_user_type(res_id_t id, type_code code, char* name, list_t list)
+add_user_type(res_id_t id, type_code code, const char* name, list_t list)
 {
 	if (type_table.find(name) != type_table.end())
 		abort_compile(RDEF_COMPILE_ERR, "duplicate type %s", name);
@@ -586,7 +586,7 @@
 
 
 type_t
-get_type(char* name)
+get_type(const char* name)
 {
 	type_iter_t i = type_table.find(name);
 
@@ -598,14 +598,14 @@
 
 
 bool
-is_type(char* name)
+is_type(const char* name)
 {
 	return type_table.find(name) != type_table.end();
 }
 
 
 define_t
-get_define(char* name)
+get_define(const char* name)
 {
 	define_iter_t i = define_table.find(name);
 
@@ -742,7 +742,7 @@
 
 data_t
 make_default(type_t type)
-{ 
+{
 	data_t out;
 
 	if (is_builtin_type(type)) {
@@ -1371,7 +1371,7 @@
 		id.id = data.type.def_id;
 
 	if (!id.has_name)
-		id.name = data.type.def_name;
+		id.name = (char*)data.type.def_name;
 
 	if (!(flags & RDEF_MERGE_RESOURCES) && rsrc.HasResource(code, id.id))
 		abort_compile(RDEF_COMPILE_ERR, "duplicate resource");
@@ -1681,7 +1681,7 @@
 
 
 static void
-add_define(char* name, int32 value)
+add_define(const char* name, int32 value)
 {
 	define_t define;
 	define.name  = name;
@@ -1749,7 +1749,7 @@
 	// so we don't need to free them here; compile.cpp already does that
 	// when it cleans up. However, we do need to remove the entries from
 	// the tables, otherwise they will still be around the next time we are
-	// asked to compile something. 
+	// asked to compile something.
 
 #ifdef DEBUG
 	// Note that in DEBUG mode, we _do_ free these items, so they don't show



From revol at free.fr  Wed Aug 12 16:31:00 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Wed, 12 Aug 2009 16:31:00 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32275_-_in_haiku/trunk/src=3A_bin_data?=
 =?utf-8?q?/beos=5Fmime/application?=
In-Reply-To: <200908121354.n7CDsTCd004729@sheep.berlios.de>
Message-ID: <2657965346-BeMail@laptop>

> Log:
> Make mountvolume a BApplication and set it as the preferred one for
> opening BFS and (for now) ISO images.

While this is nice, it prevents using it in Bootscript if we ever need 
to...

I recall having this issue in ZETA when trying to make a live CD that 
would mount a usb key to read backed up settings before starting 
everything...

Fran?ois.


From anevilyak at mail.berlios.de  Wed Aug 12 16:39:26 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Wed, 12 Aug 2009 16:39:26 +0200
Subject: [Haiku-commits] r32280 - in haiku/trunk: headers/os/opengl
	src/kits/opengl
Message-ID: <200908121439.n7CEdQXG008476@sheep.berlios.de>

Author: anevilyak
Date: 2009-08-12 16:39:26 +0200 (Wed, 12 Aug 2009)
New Revision: 32280
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32280&view=rev

Modified:
   haiku/trunk/headers/os/opengl/GLView.h
   haiku/trunk/src/kits/opengl/GLView.cpp
Log:
Revert bin compat break from r32267.



Modified: haiku/trunk/headers/os/opengl/GLView.h
===================================================================
--- haiku/trunk/headers/os/opengl/GLView.h	2009-08-12 14:29:02 UTC (rev 32279)
+++ haiku/trunk/headers/os/opengl/GLView.h	2009-08-12 14:39:26 UTC (rev 32280)
@@ -34,7 +34,7 @@
 
 class BGLView : public BView {
 public:
-					BGLView(BRect rect, const char *name,
+					BGLView(BRect rect, char* name,
 						ulong resizingMode, ulong mode,
 						ulong options);
 	virtual			~BGLView();
@@ -119,7 +119,7 @@
 
 class BGLScreen : public BWindowScreen {
 public:
-				BGLScreen(const char *name,
+				BGLScreen(char* name,
 					ulong screenMode, ulong options,
 					status_t *error, bool debug=false);
 				~BGLScreen();

Modified: haiku/trunk/src/kits/opengl/GLView.cpp
===================================================================
--- haiku/trunk/src/kits/opengl/GLView.cpp	2009-08-12 14:29:02 UTC (rev 32279)
+++ haiku/trunk/src/kits/opengl/GLView.cpp	2009-08-12 14:39:26 UTC (rev 32280)
@@ -55,7 +55,7 @@
 };
 
 
-BGLView::BGLView(BRect rect, const char *name, ulong resizingMode, ulong mode,
+BGLView::BGLView(BRect rect, char* name, ulong resizingMode, ulong mode,
 		ulong options)
    : BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), //  | B_FULL_UPDATE_ON_RESIZE)
 	fGc(NULL),
@@ -462,7 +462,7 @@
 
 // TODO: implement BGLScreen class...
 
-BGLScreen::BGLScreen(const char *name, ulong screenMode, ulong options,
+BGLScreen::BGLScreen(char* name, ulong screenMode, ulong options,
 			status_t *error, bool debug)
   : BWindowScreen(name, screenMode, error, debug)
 {



From axeld at mail.berlios.de  Wed Aug 12 16:39:38 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 12 Aug 2009 16:39:38 +0200
Subject: [Haiku-commits] r32281 -
	haiku/trunk/src/system/boot/loader/file_systems/tarfs
Message-ID: <200908121439.n7CEdcxp008513@sheep.berlios.de>

Author: axeld
Date: 2009-08-12 16:39:37 +0200 (Wed, 12 Aug 2009)
New Revision: 32281
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32281&view=rev

Modified:
   haiku/trunk/src/system/boot/loader/file_systems/tarfs/tarfs.cpp
Log:
* Cleanup.


Modified: haiku/trunk/src/system/boot/loader/file_systems/tarfs/tarfs.cpp
===================================================================
--- haiku/trunk/src/system/boot/loader/file_systems/tarfs/tarfs.cpp	2009-08-12 14:39:26 UTC (rev 32280)
+++ haiku/trunk/src/system/boot/loader/file_systems/tarfs/tarfs.cpp	2009-08-12 14:39:37 UTC (rev 32281)
@@ -1,6 +1,6 @@
 /*
  * Copyright 2005-2007, Ingo Weinhold, bonefish at cs.tu-berlin.de.
- * Copyright 2005, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2005-2009, Axel D?rfler, axeld at pinc-software.de.
  *
  * Distributed under the terms of the MIT License.
  */
@@ -33,13 +33,14 @@
 #endif
 
 
-static const uint32 kFloppyArchiveOffset = BOOT_ARCHIVE_IMAGE_OFFSET * 1024;	// initially at 192 kB, now defined at build time
+static const uint32 kFloppyArchiveOffset = BOOT_ARCHIVE_IMAGE_OFFSET * 1024;
+	// defined at build time, see build/jam/BuildSetup
 static const size_t kTarRegionSize = 16 * 1024 * 1024;	// 16 MB
 
 namespace TarFS {
 
 struct RegionDelete {
-	inline void operator()(void *memory)
+	inline void operator()(void* memory)
 	{
 		if (memory != NULL)
 			platform_free_region(memory, kTarRegionSize);
@@ -47,24 +48,33 @@
 };
 
 struct RegionDeleter : BPrivate::AutoDeleter<void, RegionDelete> {
-	RegionDeleter() : BPrivate::AutoDeleter<void, RegionDelete>() {}
-	RegionDeleter(void *memory) : BPrivate::AutoDeleter<void, RegionDelete>(memory) {}
+	RegionDeleter()
+		:
+		BPrivate::AutoDeleter<void, RegionDelete>()
+	{
+	}
+
+	RegionDeleter(void* memory)
+		:
+		BPrivate::AutoDeleter<void, RegionDelete>(memory)
+	{
+	}
 };
 
 class Directory;
 
 class Entry : public DoublyLinkedListLinkImpl<Entry> {
-	public:
-		Entry(const char *name);
-		virtual ~Entry() {}
+public:
+								Entry(const char* name);
+	virtual						~Entry() {}
 
-		const char *Name() const { return fName; }
-		virtual ::Node *ToNode() = 0;
-		virtual TarFS::Directory *ToTarDirectory() { return NULL; }
+			const char*			Name() const { return fName; }
+	virtual	::Node*				ToNode() = 0;
+	virtual TarFS::Directory*	ToTarDirectory() { return NULL; }
 
-	protected:
-		const char	*fName;
-		int32		fID;
+protected:
+			const char*			fName;
+			int32				fID;
 };
 
 
@@ -73,52 +83,58 @@
 
 
 class File : public ::Node, public Entry {
-	public:
-		File(tar_header *header, const char *name);
-		virtual ~File();
+public:
+								File(tar_header* header, const char* name);
+	virtual						~File();
 
-		virtual ssize_t ReadAt(void *cookie, off_t pos, void *buffer, size_t bufferSize);
-		virtual ssize_t WriteAt(void *cookie, off_t pos, const void *buffer, size_t bufferSize);
+	virtual	ssize_t				ReadAt(void* cookie, off_t pos, void* buffer,
+									size_t bufferSize);
+	virtual	ssize_t				WriteAt(void* cookie, off_t pos,
+									const void* buffer, size_t bufferSize);
 
-		virtual status_t GetName(char *nameBuffer, size_t bufferSize) const;
+	virtual	status_t			GetName(char* nameBuffer,
+									size_t bufferSize) const;
 
-		virtual int32 Type() const;
-		virtual off_t Size() const;
-		virtual ino_t Inode() const;
+	virtual	int32				Type() const;
+	virtual	off_t				Size() const;
+	virtual	ino_t				Inode() const;
 
-		virtual ::Node *ToNode() { return this; }
+	virtual	::Node*				ToNode() { return this; }
 
-	private:
-		tar_header	*fHeader;
-		off_t		fSize;
+private:
+			tar_header*			fHeader;
+			off_t				fSize;
 };
 
 
 class Directory : public ::Directory, public Entry {
-	public:
-		Directory(const char *name);
-		virtual ~Directory();
+public:
+								Directory(const char* name);
+	virtual						~Directory();
 
-		virtual status_t Open(void **_cookie, int mode);
-		virtual status_t Close(void *cookie);
+	virtual	status_t			Open(void** _cookie, int mode);
+	virtual	status_t			Close(void* cookie);
 
-		virtual status_t GetName(char *nameBuffer, size_t bufferSize) const;
+	virtual	status_t			GetName(char* nameBuffer,
+									size_t bufferSize) const;
 
-		virtual TarFS::Entry *LookupEntry(const char *name);
-		virtual ::Node *Lookup(const char *name, bool traverseLinks);
+	virtual	TarFS::Entry*		LookupEntry(const char* name);
+	virtual	::Node*				Lookup(const char* name, bool traverseLinks);
 
-		virtual status_t GetNextEntry(void *cookie, char *nameBuffer, size_t bufferSize);
-		virtual status_t GetNextNode(void *cookie, Node **_node);
-		virtual status_t Rewind(void *cookie);
-		virtual bool IsEmpty();
+	virtual	status_t			GetNextEntry(void* cookie, char* nameBuffer,
+									size_t bufferSize);
+	virtual	status_t			GetNextNode(void* cookie, Node** _node);
+	virtual	status_t			Rewind(void* cookie);
+	virtual	bool				IsEmpty();
 
-		virtual ino_t Inode() const;
+	virtual	ino_t				Inode() const;
 
-		virtual ::Node *ToNode() { return this; };
-		virtual TarFS::Directory *ToTarDirectory()	{ return this; }
+	virtual ::Node*				ToNode() { return this; };
+	virtual TarFS::Directory*	ToTarDirectory() { return this; }
 
-		status_t AddDirectory(char *dirName, TarFS::Directory **_dir = NULL);
-		status_t AddFile(tar_header *header);
+			status_t			AddDirectory(char* dirName,
+									TarFS::Directory** _dir = NULL);
+			status_t			AddFile(tar_header* header);
 
 	private:
 		typedef ::Directory _inherited;
@@ -128,44 +144,46 @@
 
 
 class Symlink : public ::Node, public Entry {
-	public:
-		Symlink(tar_header *header, const char *name);
-		virtual ~Symlink();
+public:
+								Symlink(tar_header* header, const char* name);
+	virtual						~Symlink();
 
-		virtual ssize_t ReadAt(void *cookie, off_t pos, void *buffer,
-			size_t bufferSize);
-		virtual ssize_t WriteAt(void *cookie, off_t pos, const void *buffer,
-			size_t bufferSize);
+	virtual	ssize_t				ReadAt(void* cookie, off_t pos, void* buffer,
+									size_t bufferSize);
+	virtual	ssize_t				WriteAt(void* cookie, off_t pos,
+									const void* buffer, size_t bufferSize);
 
-		virtual status_t GetName(char *nameBuffer, size_t bufferSize) const;
+	virtual	status_t			GetName(char* nameBuffer,
+									size_t bufferSize) const;
 
-		virtual int32 Type() const;
-		virtual off_t Size() const;
-		virtual ino_t Inode() const;
+	virtual	int32				Type() const;
+	virtual	off_t				Size() const;
+	virtual	ino_t				Inode() const;
 
-		const char* LinkPath() const	{ return fHeader->linkname; }
+			const char*			LinkPath() const { return fHeader->linkname; }
 
-		virtual ::Node *ToNode() { return this; }
+	virtual ::Node*				ToNode() { return this; }
 
-	private:
-		tar_header	*fHeader;
-		size_t		fSize;
+private:
+			tar_header*			fHeader;
+			size_t				fSize;
 };
 
 
 class Volume : public TarFS::Directory {
-	public:
-		Volume();
-		~Volume();
+public:
+								Volume();
+								~Volume();
 
-		status_t			Init(boot::Partition *partition);
+			status_t			Init(boot::Partition* partition);
 
-		TarFS::Directory	*Root() { return this; }
+			TarFS::Directory*	Root() { return this; }
 
-	private:
-		status_t			_Inflate(boot::Partition *partition, void* cookie,
-								off_t offset, RegionDeleter& regionDeleter,
-								size_t* inflatedBytes);
+private:
+			status_t			_Inflate(boot::Partition* partition,
+									void* cookie, off_t offset,
+									RegionDeleter& regionDeleter,
+									size_t* inflatedBytes);
 };
 
 }	// namespace TarFS
@@ -178,10 +196,10 @@
 
 
 bool
-skip_gzip_header(z_stream *stream)
+skip_gzip_header(z_stream* stream)
 {
-	uint8 *buffer = (uint8 *)stream->next_in;
-	
+	uint8* buffer = (uint8*)stream->next_in;
+
 	// check magic and skip method
 	if (buffer[0] != 0x1f || buffer[1] != 0x8b)
 		return false;
@@ -224,7 +242,7 @@
 // #pragma mark -
 
 
-TarFS::Entry::Entry(const char *name)
+TarFS::Entry::Entry(const char* name)
 	:
 	fName(name),
 	fID(sNextID++)
@@ -235,7 +253,7 @@
 // #pragma mark -
 
 
-TarFS::File::File(tar_header *header, const char *name)
+TarFS::File::File(tar_header* header, const char* name)
 	: TarFS::Entry(name),
 	fHeader(header)
 {
@@ -249,9 +267,10 @@
 
 
 ssize_t
-TarFS::File::ReadAt(void *cookie, off_t pos, void *buffer, size_t bufferSize)
+TarFS::File::ReadAt(void* cookie, off_t pos, void* buffer, size_t bufferSize)
 {
-	TRACE(("tarfs: read at %Ld, %lu bytes, fSize = %Ld\n", pos, bufferSize, fSize));
+	TRACE(("tarfs: read at %Ld, %lu bytes, fSize = %Ld\n", pos, bufferSize,
+		fSize));
 
 	if (pos < 0 || !buffer)
 		return B_BAD_VALUE;
@@ -270,16 +289,18 @@
 
 
 ssize_t
-TarFS::File::WriteAt(void *cookie, off_t pos, const void *buffer, size_t bufferSize)
+TarFS::File::WriteAt(void* cookie, off_t pos, const void* buffer,
+	size_t bufferSize)
 {
 	return B_NOT_ALLOWED;
 }
 
 
 status_t
-TarFS::File::GetName(char *nameBuffer, size_t bufferSize) const
+TarFS::File::GetName(char* nameBuffer, size_t bufferSize) const
 {
-	return strlcpy(nameBuffer, Name(), bufferSize) >= bufferSize ? B_BUFFER_OVERFLOW : B_OK;
+	return strlcpy(nameBuffer, Name(), bufferSize) >= bufferSize
+		? B_BUFFER_OVERFLOW : B_OK;
 }
 
 
@@ -306,7 +327,7 @@
 
 // #pragma mark -
 
-TarFS::Directory::Directory(const char *name)
+TarFS::Directory::Directory(const char* name)
 	: TarFS::Entry(name)
 {
 }
@@ -314,19 +335,20 @@
 
 TarFS::Directory::~Directory()
 {
-	while (TarFS::Entry *entry = fEntries.Head()) {
+	while (TarFS::Entry* entry = fEntries.Head()) {
 		fEntries.Remove(entry);
 		delete entry;
 	}
 }
 
 
-status_t 
-TarFS::Directory::Open(void **_cookie, int mode)
+status_t
+TarFS::Directory::Open(void** _cookie, int mode)
 {
 	_inherited::Open(_cookie, mode);
 
-	EntryIterator *iterator = new(nothrow) EntryIterator(fEntries.GetIterator());
+	EntryIterator* iterator
+		= new(std::nothrow) EntryIterator(fEntries.GetIterator());
 	if (iterator == NULL)
 		return B_NO_MEMORY;
 
@@ -336,30 +358,31 @@
 }
 
 
-status_t 
-TarFS::Directory::Close(void *cookie)
+status_t
+TarFS::Directory::Close(void* cookie)
 {
 	_inherited::Close(cookie);
 
-	delete (EntryIterator *)cookie;
+	delete (EntryIterator*)cookie;
 	return B_OK;
 }
 
 
 status_t
-TarFS::Directory::GetName(char *nameBuffer, size_t bufferSize) const
+TarFS::Directory::GetName(char* nameBuffer, size_t bufferSize) const
 {
-	return strlcpy(nameBuffer, Name(), bufferSize) >= bufferSize ? B_BUFFER_OVERFLOW : B_OK;
+	return strlcpy(nameBuffer, Name(), bufferSize) >= bufferSize
+		? B_BUFFER_OVERFLOW : B_OK;
 }
 
 
-TarFS::Entry *
-TarFS::Directory::LookupEntry(const char *name)
+TarFS::Entry*
+TarFS::Directory::LookupEntry(const char* name)
 {
 	EntryIterator iterator(fEntries.GetIterator());
 
 	while (iterator.HasNext()) {
-		TarFS::Entry *entry = iterator.Next();
+		TarFS::Entry* entry = iterator.Next();
 		if (strcmp(name, entry->Name()) == 0)
 			return entry;
 	}
@@ -368,10 +391,10 @@
 }
 
 
-::Node *
-TarFS::Directory::Lookup(const char *name, bool traverseLinks)
+::Node*
+TarFS::Directory::Lookup(const char* name, bool traverseLinks)
 {
-	TarFS::Entry *entry = LookupEntry(name);
+	TarFS::Entry* entry = LookupEntry(name);
 	if (!entry)
 		return NULL;
 
@@ -395,11 +418,11 @@
 }
 
 
-status_t 
-TarFS::Directory::GetNextEntry(void *_cookie, char *name, size_t size)
+status_t
+TarFS::Directory::GetNextEntry(void* _cookie, char* name, size_t size)
 {
-	EntryIterator *iterator = (EntryIterator *)_cookie;
-	TarFS::Entry *entry = iterator->Next();
+	EntryIterator* iterator = (EntryIterator*)_cookie;
+	TarFS::Entry* entry = iterator->Next();
 
 	if (entry != NULL) {
 		strlcpy(name, entry->Name(), size);
@@ -410,11 +433,11 @@
 }
 
 
-status_t 
-TarFS::Directory::GetNextNode(void *_cookie, Node **_node)
+status_t
+TarFS::Directory::GetNextNode(void* _cookie, Node** _node)
 {
-	EntryIterator *iterator = (EntryIterator *)_cookie;
-	TarFS::Entry *entry = iterator->Next();
+	EntryIterator* iterator = (EntryIterator*)_cookie;
+	TarFS::Entry* entry = iterator->Next();
 
 	if (entry != NULL) {
 		*_node = entry->ToNode();
@@ -424,19 +447,19 @@
 }
 
 
-status_t 
-TarFS::Directory::Rewind(void *_cookie)
+status_t
+TarFS::Directory::Rewind(void* _cookie)
 {
-	EntryIterator *iterator = (EntryIterator *)_cookie;
+	EntryIterator* iterator = (EntryIterator*)_cookie;
 	*iterator = fEntries.GetIterator();
-	return B_OK;	
+	return B_OK;
 }
 
 
 status_t
-TarFS::Directory::AddDirectory(char *dirName, TarFS::Directory **_dir)
+TarFS::Directory::AddDirectory(char* dirName, TarFS::Directory** _dir)
 {
-	char *subDir = strchr(dirName, '/');
+	char* subDir = strchr(dirName, '/');
 	if (subDir) {
 		// skip slashes
 		while (*subDir == '/') {
@@ -451,8 +474,8 @@
 	}
 
 	// check, whether the directory does already exist
-	Entry *entry = LookupEntry(dirName);
-	TarFS::Directory *dir = (entry ? entry->ToTarDirectory() : NULL);
+	Entry* entry = LookupEntry(dirName);
+	TarFS::Directory* dir = (entry ? entry->ToTarDirectory() : NULL);
 	if (entry) {
 		if (!dir)
 			return B_ERROR;
@@ -480,10 +503,10 @@
 
 
 status_t
-TarFS::Directory::AddFile(tar_header *header)
+TarFS::Directory::AddFile(tar_header* header)
 {
-	char *leaf = strrchr(header->name, '/');
-	char *dirName = NULL;
+	char* leaf = strrchr(header->name, '/');
+	char* dirName = NULL;
 	if (leaf) {
 		dirName = header->name;
 		*leaf = '\0';
@@ -492,7 +515,7 @@
 		leaf = header->name;
 
 	// create the parent directory
-	TarFS::Directory *dir = this;
+	TarFS::Directory* dir = this;
 	if (dirName) {
 		status_t error = AddDirectory(dirName, &dir);
 		if (error != B_OK)
@@ -500,7 +523,7 @@
 	}
 
 	// create the entry
-	TarFS::Entry *entry;
+	TarFS::Entry* entry;
 	if (header->type == TAR_FILE || header->type == TAR_FILE2)
 		entry = new(nothrow) TarFS::File(header, leaf);
 	else if (header->type == TAR_SYMLINK)
@@ -517,7 +540,7 @@
 }
 
 
-bool 
+bool
 TarFS::Directory::IsEmpty()
 {
 	return fEntries.IsEmpty();
@@ -534,7 +557,7 @@
 // #pragma mark -
 
 
-TarFS::Symlink::Symlink(tar_header *header, const char *name)
+TarFS::Symlink::Symlink(tar_header* header, const char* name)
 	: TarFS::Entry(name),
 	fHeader(header)
 {
@@ -550,14 +573,14 @@
 
 
 ssize_t
-TarFS::Symlink::ReadAt(void *cookie, off_t pos, void *buffer, size_t bufferSize)
+TarFS::Symlink::ReadAt(void* cookie, off_t pos, void* buffer, size_t bufferSize)
 {
 	return B_NOT_ALLOWED;
 }
 
 
 ssize_t
-TarFS::Symlink::WriteAt(void *cookie, off_t pos, const void *buffer,
+TarFS::Symlink::WriteAt(void* cookie, off_t pos, const void* buffer,
 	size_t bufferSize)
 {
 	return B_NOT_ALLOWED;
@@ -565,7 +588,7 @@
 
 
 status_t
-TarFS::Symlink::GetName(char *nameBuffer, size_t bufferSize) const
+TarFS::Symlink::GetName(char* nameBuffer, size_t bufferSize) const
 {
 	return strlcpy(nameBuffer, Name(), bufferSize) >= bufferSize
 		? B_BUFFER_OVERFLOW : B_OK;
@@ -608,9 +631,9 @@
 
 
 status_t
-TarFS::Volume::Init(boot::Partition *partition)
+TarFS::Volume::Init(boot::Partition* partition)
 {
-	void *cookie;
+	void* cookie;
 	status_t error = partition->Open(&cookie, O_RDONLY);
 	if (error != B_OK)
 		return error;
@@ -619,7 +642,7 @@
 		boot::Partition	*partition;
 		void			*cookie;
 
-		PartitionCloser(boot::Partition *partition, void *cookie)
+		PartitionCloser(boot::Partition* partition, void* cookie)
 			: partition(partition),
 			  cookie(cookie)
 		{
@@ -645,13 +668,13 @@
 		return status;
 
 	// parse the tar file
-	char *block = (char*)regionDeleter.Get();
+	char* block = (char*)regionDeleter.Get();
 	int blockCount = inflatedBytes / BLOCK_SIZE;
 	int blockIndex = 0;
 
 	while (blockIndex < blockCount) {
 		// check header
-		tar_header *header = (tar_header*)(block + blockIndex * BLOCK_SIZE);
+		tar_header* header = (tar_header*)(block + blockIndex * BLOCK_SIZE);
 		//dump_header(*header);
 
 		if (header->magic[0] == '\0')
@@ -669,7 +692,8 @@
 
 		TRACE(("tarfs: \"%s\", %Ld bytes\n", header->name, size));
 
-		// TODO: this is old-style GNU tar which probably won't work with newer ones...
+		// TODO: this is old-style GNU tar which probably won't work with newer
+		// ones...
 		switch (header->type) {
 			case TAR_FILE:
 			case TAR_FILE2:
@@ -685,7 +709,8 @@
 				// this is a long file name
 				// TODO: read long name
 			default:
-				dprintf("tarfs: unsupported file type: %d ('%c')\n", header->type, header->type);
+				dprintf("tarfs: unsupported file type: %d ('%c')\n",
+					header->type, header->type);
 				// unsupported type
 				status = B_ERROR;
 				break;
@@ -707,7 +732,7 @@
 
 
 status_t
-TarFS::Volume::_Inflate(boot::Partition *partition, void* cookie, off_t offset,
+TarFS::Volume::_Inflate(boot::Partition* partition, void* cookie, off_t offset,
 	RegionDeleter& regionDeleter, size_t* inflatedBytes)
 {
 	char in[2048];
@@ -742,7 +767,7 @@
 		}
 
 		zStream.avail_in = bytesRead;
-		zStream.next_in = (Bytef *)in;
+		zStream.next_in = (Bytef*)in;
 
 		if (!headerRead) {
 			// check and skip gzip header
@@ -752,7 +777,7 @@
 
 			if (!out) {
 				// allocate memory for the uncompressed data
-				if (platform_allocate_region((void **)&out, kTarRegionSize,
+				if (platform_allocate_region((void**)&out, kTarRegionSize,
 						B_READ_AREA | B_WRITE_AREA, false) != B_OK) {
 					TRACE(("tarfs: allocating region failed!\n"));
 					return B_NO_MEMORY;
@@ -761,7 +786,7 @@
 			}
 
 			zStream.avail_out = kTarRegionSize;
-			zStream.next_out = (Bytef *)out;
+			zStream.next_out = (Bytef*)out;
 
 			status = inflateInit2(&zStream, -15);
 			if (status != Z_OK)
@@ -793,9 +818,9 @@
 
 
 static status_t
-tarfs_get_file_system(boot::Partition *partition, ::Directory **_root)
+tarfs_get_file_system(boot::Partition* partition, ::Directory** _root)
 {
-	TarFS::Volume *volume = new(nothrow) TarFS::Volume;
+	TarFS::Volume* volume = new(nothrow) TarFS::Volume;
 	if (volume == NULL)
 		return B_NO_MEMORY;
 



From jonas at kirilla.com  Wed Aug 12 16:39:58 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Wed, 12 Aug 2009 16:39:58 +0200 CEST
Subject: [Haiku-commits]
 =?iso-8859-1?q?r32275_-_in_haiku/trunk/src=3A_bin?=
 =?iso-8859-1?q?_data/beos=5Fmime/application?=
In-Reply-To: <200908121354.n7CDsTCd004729@sheep.berlios.de>
Message-ID: <15508385042-BeMail@kirilla>

kirilla at BerliOS <kirilla at mail.berlios.de> wrote:
 ...
> Make mountvolume a BApplication and set it as the 
> preferred one for opening BFS and (for now) ISO images.

It's fun to play around with. The volumes show up in
Tracker's mount menu. Moving a mounted volume's image
to Trash appears to unmount it.

Mounting a set of images serially works nicely, as
happens when doing Open With > mountvolume on a 
selection of images.

Mounting images concurrently does show problems.
This happens when you Command-O a set of image files
in Tracker and multiple mountvolume get launched.

I don't know if the issue is in mountvolume or in the
kernel, but I don't think my changes have much to do
with it, except making it easier to see happen.

/Jonas.



From anevilyak at gmail.com  Wed Aug 12 16:41:38 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Wed, 12 Aug 2009 09:41:38 -0500
Subject: [Haiku-commits] Haiku-commits] r32267 - in haiku/trunk:
	headers/os/opengl src/kits/opengl src/tests/kits/opengl/glinfo
In-Reply-To: <ce99af780908120424r39b63738sdaebbe468a5745fa@mail.gmail.com>
References: <ce99af780908120424r39b63738sdaebbe468a5745fa@mail.gmail.com>
Message-ID: <f019d2f30908120741l7533e6e6gbceda8f7eb17b49f@mail.gmail.com>

On Wed, Aug 12, 2009 at 6:24 AM, Philippe
Houdoin<philippe.houdoin at gmail.com> wrote:
> I'll revert it ASAP, but feel free to do it as well.

Done in r32280.

Regards,

Rene


From axeld at mail.berlios.de  Wed Aug 12 16:47:47 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 12 Aug 2009 16:47:47 +0200
Subject: [Haiku-commits] r32282 - haiku/trunk/build/jam
Message-ID: <200908121447.n7CEllHN009298@sheep.berlios.de>

Author: axeld
Date: 2009-08-12 16:47:46 +0200 (Wed, 12 Aug 2009)
New Revision: 32282
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32282&view=rev

Modified:
   haiku/trunk/build/jam/BuildSetup
   haiku/trunk/build/jam/FloppyBootImage
Log:
* Removed the (intel) gart stuff from the floppy image. Not sure why this was
  on it. With the other changes already made, we can now use a 1440k boot image
  for x86 as well, again.
* If you build a CD, you'll have to take extra care to see whether it still fits
  on the floppy or not - space is really tight already.
* Made USB support optional for the CD-ROM. It's turned on, though, since we do
  want to support USB-CD-ROMs by default; this is just something you can use
  once in case we need to enlarge the boot floppy to 2880k again.


Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2009-08-12 14:39:37 UTC (rev 32281)
+++ haiku/trunk/build/jam/BuildSetup	2009-08-12 14:47:46 UTC (rev 32282)
@@ -199,18 +199,20 @@
 		HAIKU_DEFINES += __ARM__ ;
 		HAIKU_BOOT_PLATFORM = u-boot ;
 		HAIKU_BOOT_BOARD ?= verdex ;
-		HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB (there is not realy a floppy on the gumstix ;) )
+		HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ;
+			# in kB (there is not really a floppy on the gumstix ;) )
 		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
-		HAIKU_NO_WERROR = 1 ; # we use #warning as placeholders for things to write...
+		HAIKU_NO_WERROR = 1 ;
+			# we use #warning as placeholders for things to write...
 	}
 	case x86 :
 	{
 		HAIKU_DEFINES += __INTEL__ ;
 		HAIKU_BOOT_PLATFORM = bios_ia32 ;
-		HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
+		HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB
 		# offset in floppy image (>= sizeof(haiku_loader))
-		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
+		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 270 ; # in kB
 
 		# yasm is required for target arch x86
 		if ! $(HAIKU_YASM) {
@@ -224,7 +226,8 @@
 		HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB
 		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 150 ; # in kB
-		HAIKU_NO_WERROR = 1 ; # we use #warning as placeholders for things to write...
+		HAIKU_NO_WERROR = 1 ;
+			# we use #warning as placeholders for things to write...
 	}
 	case mipsel :
 	{

Modified: haiku/trunk/build/jam/FloppyBootImage
===================================================================
--- haiku/trunk/build/jam/FloppyBootImage	2009-08-12 14:39:37 UTC (rev 32281)
+++ haiku/trunk/build/jam/FloppyBootImage	2009-08-12 14:47:46 UTC (rev 32282)
@@ -26,33 +26,35 @@
 }
 
 local NET_BOOT = 0 ;
+local USB_BOOT = 1 ;
 
+local USB_ONLY = ;
+if $(USB_BOOT) = 1 {
+	USB_ONLY = "" ;
+}
+
 local BOOT_ADD_ONS_NET ;
 if $(NET_BOOT) = 1 {
-BOOT_ADD_ONS_NET =
-#	nbd
-#	remote_disk
-#	$(SYSTEM_ADD_ONS_DRIVERS_NET)
-#	stack socket
-#	$(SYSTEM_NETWORK_DEVICES)
-#	$(SYSTEM_NETWORK_DATALINK_PROTOCOLS)
-#	$(SYSTEM_NETWORK_PPP)
-#	$(SYSTEM_NETWORK_PROTOCOLS)
-;
+	BOOT_ADD_ONS_NET =
+		remote_disk
+		$(SYSTEM_ADD_ONS_DRIVERS_NET)
+		stack socket
+		$(SYSTEM_NETWORK_DEVICES)
+		$(SYSTEM_NETWORK_DATALINK_PROTOCOLS)
+		$(SYSTEM_NETWORK_PPP)
+		$(SYSTEM_NETWORK_PROTOCOLS)
+	;
 }
 
-SYSTEM_ADD_ONS_BUS_MANAGERS = agp_gart $(ATA_ONLY)ata config_manager pci
-	$(IDE_ONLY)ide $(X86_ONLY)isa scsi usb
+SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata config_manager pci
+	$(IDE_ONLY)ide $(X86_ONLY)isa scsi $(USB_ONLY)usb
 ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ;
-#cdda fat googlefs nfs ;
 
 
 # modules
 AddFilesToFloppyBootArchive system add-ons kernel bus_managers
 	: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToFloppyBootArchive system add-ons kernel busses agp_gart
-	: $(X86_ONLY)<agp_gart>intel ;
 AddFilesToFloppyBootArchive system add-ons kernel busses ide
 	: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ;
 AddFilesToFloppyBootArchive system add-ons kernel busses scsi
@@ -66,20 +68,24 @@
 	: intel session ;
 AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
 	: $(PPC_ONLY)openpic ;
-AddFilesToFloppyBootArchive system add-ons kernel busses usb
-	: <usb>uhci <usb>ohci <usb>ehci ;
 
+if $(USB_BOOT) = 1 {
+	AddFilesToFloppyBootArchive system add-ons kernel busses usb
+		: <usb>uhci <usb>ohci <usb>ehci ;
+}
+
 if $(TARGET_ARCH) = x86 {
 	AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
 }
 
 # drivers
-AddNewDriversToFloppyBootArchive disk scsi	: scsi_cd scsi_disk ;
-AddDriversToFloppyBootArchive disk usb	: usb_disk ;
+AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ;
+if $(USB_BOOT) = 1 {
+	AddDriversToFloppyBootArchive disk usb : usb_disk ;
+}
 if $(NET_BOOT) = 1 {
-#AddDriversToFloppyBootArchive disk virtual	: nbd ;
-AddDriversToFloppyBootArchive disk virtual	: remote_disk ;
-AddDriversToFloppyBootArchive net			: $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
+	AddDriversToFloppyBootArchive disk virtual : remote_disk ;
+	AddDriversToFloppyBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
 }
 
 # kernel
@@ -94,17 +100,17 @@
 	: $(driverSettingsFiles) ;
 
 if $(NET_BOOT) = 1 {
-# add-ons
-AddFilesToFloppyBootArchive system add-ons kernel network
-	: stack socket ;
-AddFilesToFloppyBootArchive system add-ons kernel network devices
-	: $(SYSTEM_NETWORK_DEVICES) ;
-AddFilesToFloppyBootArchive system add-ons kernel network datalink_protocols
-	: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToFloppyBootArchive system add-ons kernel network ppp
-	: $(SYSTEM_NETWORK_PPP) ;
-AddFilesToFloppyBootArchive system add-ons kernel network protocols
-	: $(SYSTEM_NETWORK_PROTOCOLS) ;
+	# add-ons
+	AddFilesToFloppyBootArchive system add-ons kernel network
+		: stack socket ;
+	AddFilesToFloppyBootArchive system add-ons kernel network devices
+		: $(SYSTEM_NETWORK_DEVICES) ;
+	AddFilesToFloppyBootArchive system add-ons kernel network datalink_protocols
+		: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
+	AddFilesToFloppyBootArchive system add-ons kernel network ppp
+		: $(SYSTEM_NETWORK_PPP) ;
+	AddFilesToFloppyBootArchive system add-ons kernel network protocols
+		: $(SYSTEM_NETWORK_PROTOCOLS) ;
 }
 
 # boot module links
@@ -115,8 +121,8 @@
 	$(X86_ONLY)generic_x86
 	ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata
 	it8211
-	<usb>uhci <usb>ohci <usb>ehci
-	scsi_cd scsi_disk usb_disk
+	$(USB_ONLY)<usb>uhci $(USB_ONLY)<usb>ohci $(USB_ONLY)<usb>ehci
+	scsi_cd scsi_disk $(USB_ONLY)usb_disk
 	intel session
 	$(SYSTEM_ADD_ONS_FILE_SYSTEMS)
 	$(BOOT_ADD_ONS_NET)



From axeld at pinc-software.de  Wed Aug 12 16:52:42 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 16:52:42 +0200 CEST
Subject: [Haiku-commits] r32282 - haiku/trunk/build/jam
In-Reply-To: <200908121447.n7CEllHN009298@sheep.berlios.de>
Message-ID: <23892371843-BeMail@zon>

axeld at BerliOS <axeld at mail.berlios.de> wrote:
> * If you build a CD, you'll have to take extra care to see whether it 
> still fits
>   on the floppy or not - space is really tight already.

That reminds me, can someone please check if the GCC4 CD works as well?
You need to rebuild haiku_loader after this change, btw.

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug 12 16:55:36 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 16:55:36 +0200 CEST
Subject: [Haiku-commits] r32282 - haiku/trunk/build/jam
In-Reply-To: <200908121447.n7CEllHN009298@sheep.berlios.de>
Message-ID: <24066323545-BeMail@zon>

axeld at BerliOS <axeld at mail.berlios.de> wrote:
> * Removed the (intel) gart stuff from the floppy image. Not sure why 
> this was
>   on it. With the other changes already made, we can now use a 1440k 
> boot image
>   for x86 as well, again.

Damn, the machine I hoped would work now, still reboots instead of 
loading Haiku.
So unless someone elses problems are fixed now, we could revert to the 
more convenient 2880k boot floppy.

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug 12 16:58:01 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 16:58:01 +0200 CEST
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
 data/beos_mime/application
In-Reply-To: <2657965346-BeMail@laptop>
Message-ID: <24211870221-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> > Log:
> > Make mountvolume a BApplication and set it as the preferred one for
> > opening BFS and (for now) ISO images.
> While this is nice, it prevents using it in Bootscript if we ever 
> need 
> to...
> 
> I recall having this issue in ZETA when trying to make a live CD that 
> would mount a usb key to read backed up settings before starting 
> everything...

If that is needed (I guess it isn't yet), one could set the argv flag 
on mountvolume, and remove the BApplication class again. This should 
work in the same way.
But I would leave it as it is for now.

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug 12 16:59:03 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 16:59:03 +0200 CEST
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
 data/beos_mime/application
In-Reply-To: <15508385042-BeMail@kirilla>
Message-ID: <24273888373-BeMail@zon>

"Jonas Sundstr?m" <jonas at kirilla.com> wrote:
> kirilla at BerliOS <kirilla at mail.berlios.de> wrote:
>  ...
> > Make mountvolume a BApplication and set it as the 
> > preferred one for opening BFS and (for now) ISO images.
> It's fun to play around with. The volumes show up in
> Tracker's mount menu. Moving a mounted volume's image
> to Trash appears to unmount it.
> 
> Mounting a set of images serially works nicely, as
> happens when doing Open With > mountvolume on a 
> selection of images.
> 
> Mounting images concurrently does show problems.
> This happens when you Command-O a set of image files
> in Tracker and multiple mountvolume get launched.

What do you mean by problems?

Bye,
   Axel.



From jonas at kirilla.com  Wed Aug 12 17:20:37 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Wed, 12 Aug 2009 17:20:37 +0200 CEST
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
 data/beos_mime/application
In-Reply-To: <24273888373-BeMail@zon>
Message-ID: <17948010773-BeMail@kirilla>

"Axel D?rfler" <axeld at pinc-software.de> wrote:
> "Jonas Sundstr?m" <jonas at kirilla.com> wrote:
 ...
> > Mounting images concurrently does show problems.
> > This happens when you Command-O a set of image files
> > in Tracker and multiple mountvolume get launched.
> 
> What do you mean by problems?

E.g. trying with 10 images concurrently,
6 images get mounted, 4 don't get mounted.

(made up figures)

/Jonas.





From laplace at mail.berlios.de  Wed Aug 12 18:00:48 2009
From: laplace at mail.berlios.de (laplace at mail.berlios.de)
Date: Wed, 12 Aug 2009 18:00:48 +0200
Subject: [Haiku-commits] r32283 - haiku/trunk/src/preferences/print
Message-ID: <200908121600.n7CG0muG015848@sheep.berlios.de>

Author: laplace
Date: 2009-08-12 18:00:46 +0200 (Wed, 12 Aug 2009)
New Revision: 32283
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32283&view=rev

Modified:
   haiku/trunk/src/preferences/print/PrintersWindow.cpp
Log:
Some code style clean up.

Modified: haiku/trunk/src/preferences/print/PrintersWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/print/PrintersWindow.cpp	2009-08-12 14:47:46 UTC (rev 32282)
+++ haiku/trunk/src/preferences/print/PrintersWindow.cpp	2009-08-12 16:00:46 UTC (rev 32283)
@@ -44,15 +44,20 @@
 #include <Application.h>
 #include <FindDirectory.h>
 
+
 PrintersWindow::PrintersWindow(BRect frame)
-	: Inherited(BRect(78.0, 71.0, 561.0, 409.0), "Printers", B_TITLED_WINDOW, B_NOT_H_RESIZABLE)
-	, fSelectedPrinter(NULL)
-	, fAddingPrinter(false)
+	:
+	Inherited(BRect(78.0, 71.0, 561.0, 409.0), "Printers", B_TITLED_WINDOW,
+			B_NOT_H_RESIZABLE),
+	fSelectedPrinter(NULL),
+	fAddingPrinter(false)
 {
 	BuildGUI();
 }
 
-bool PrintersWindow::QuitRequested()
+
+bool
+PrintersWindow::QuitRequested()
 {
 	bool result = Inherited::QuitRequested();
 	if (result) {
@@ -62,7 +67,9 @@
 	return result;
 }
 
-void PrintersWindow::MessageReceived(BMessage* msg)
+
+void
+PrintersWindow::MessageReceived(BMessage* msg)
 {
 	switch(msg->what)
 	{
@@ -155,7 +162,9 @@
 	}
 }
 
-void PrintersWindow::BuildGUI()
+
+void
+PrintersWindow::BuildGUI()
 {
 	const float boxInset = 10.0;
 	BRect r(Bounds());
@@ -280,11 +289,15 @@
 	SetSizeLimits(Bounds().Width(), Bounds().Width(), Bounds().Height(), 20000);	
 }
 
-bool PrintersWindow::IsSelected(PrinterItem* printer) {
+
+bool
+PrintersWindow::IsSelected(PrinterItem* printer) {
 	return fSelectedPrinter && fSelectedPrinter == printer;
 }
 
-void PrintersWindow::AddJob(SpoolFolder* folder, Job* job) {
+
+void
+PrintersWindow::AddJob(SpoolFolder* folder, Job* job) {
 	if (IsSelected(folder->Item())) {
 		fJobListView->AddJob(job);
 	}
@@ -292,7 +305,9 @@
 	UpdatePrinterButtons();
 }
 
-void PrintersWindow::RemoveJob(SpoolFolder* folder, Job* job) {
+
+void
+PrintersWindow::RemoveJob(SpoolFolder* folder, Job* job) {
 	if (IsSelected(folder->Item())) {
 		fJobListView->RemoveJob(job);
 	}
@@ -300,7 +315,9 @@
 	UpdatePrinterButtons();
 }
 
-void PrintersWindow::UpdateJob(SpoolFolder* folder, Job* job) {
+
+void
+PrintersWindow::UpdateJob(SpoolFolder* folder, Job* job) {
 	if (IsSelected(folder->Item())) {
 		fJobListView->UpdateJob(job);
 		UpdateJobButtons();
@@ -309,13 +326,17 @@
 	UpdatePrinterButtons();
 }
 
-void PrintersWindow::UpdatePrinterButtons() {
+
+void
+PrintersWindow::UpdatePrinterButtons() {
 	PrinterItem* item = fPrinterListView->SelectedItem();
 	fRemove->SetEnabled(item && !item->HasPendingJobs());
 	fMakeDefault->SetEnabled(item && !item->IsActivePrinter());
 }
-	
-void PrintersWindow::UpdateJobButtons() {
+
+
+void
+PrintersWindow::UpdateJobButtons() {
 	JobItem* item = fJobListView->SelectedItem();
 	if (item != NULL) {
 		Job* job = item->GetJob();



From mmu_man at mail.berlios.de  Wed Aug 12 18:12:37 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Wed, 12 Aug 2009 18:12:37 +0200
Subject: [Haiku-commits] r32284 - in haiku/trunk: . build/jam
	build/jam/board build/jam/board/overo build/jam/board/verdex
	src/system/boot src/system/boot/platform/u-boot
	src/system/ldscripts/arm
Message-ID: <200908121612.n7CGCb7f017266@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-12 18:12:35 +0200 (Wed, 12 Aug 2009)
New Revision: 32284
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32284&view=rev

Added:
   haiku/trunk/build/jam/board/
   haiku/trunk/build/jam/board/overo/
   haiku/trunk/build/jam/board/overo/BoardSetup
   haiku/trunk/build/jam/board/verdex/
   haiku/trunk/build/jam/board/verdex/BoardSetup
Removed:
   haiku/trunk/src/system/ldscripts/arm/board/
Modified:
   haiku/trunk/Jamrules
   haiku/trunk/build/jam/BuildSetup
   haiku/trunk/src/system/boot/Jamfile
   haiku/trunk/src/system/boot/platform/u-boot/Jamfile
Log:
[ARM]
- consolidate board specific definitions into build/jam/board/*/BoardSetup to avoid duplicating address values everywhere,
	- add various addresses, boot script, custom C/C++ flags and SD card definition,
	- not sure BoardSetup is included at the best place though,
	- replaced board-specific ldscript with passing the loader address directly to LD from BoardSetup,
- added haiku.mmc target which generates an mmc/SD card image with a FAT partition with the files needed to boot for the board, should later be integrated with haiku.image with the BFS partition offset passed to bfs_shell, requires apt:sfdisk,mtools on GNU/Linux,
- added some more rules, one to build a script for the SD image,
- fake a NetBSD loader for now, U-Boot doesn't know haiku, and we'll need a way to pass the tgz image and RAM size, we'll either use standlone way (usual C argv[]) or the NetBSD args,
- style fixes,
- 80 cols, /me pets Ingo.


Modified: haiku/trunk/Jamrules
===================================================================
--- haiku/trunk/Jamrules	2009-08-12 16:00:46 UTC (rev 32283)
+++ haiku/trunk/Jamrules	2009-08-12 16:12:35 UTC (rev 32284)
@@ -83,4 +83,10 @@
 	}
 }
 
+# Include embedded board-specific file.
+# UserBuildConfig can override HAIKU_BOOT_BOARD.
+if $(HAIKU_BOOT_BOARD) {
+	include [ FDirName $(HAIKU_BUILD_RULES_DIR) board $(HAIKU_BOOT_BOARD) BoardSetup ] ;
+}
+
 PrepareConfigVariables ;

Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2009-08-12 16:00:46 UTC (rev 32283)
+++ haiku/trunk/build/jam/BuildSetup	2009-08-12 16:12:35 UTC (rev 32284)
@@ -870,6 +870,7 @@
 	TARGET_GCC_LIBGCC_OBJECTS	= ;
 
 	TARGET_BOOT_PLATFORM		= ;
+	TARGET_BOOT_BOARD		= ;
 
 	TARGET_LIBRARY_NAME_MAP		= HOST_LIBRARY_NAME_MAP ;
 }

Added: haiku/trunk/build/jam/board/overo/BoardSetup
===================================================================
--- haiku/trunk/build/jam/board/overo/BoardSetup	2009-08-12 16:00:46 UTC (rev 32283)
+++ haiku/trunk/build/jam/board/overo/BoardSetup	2009-08-12 16:12:35 UTC (rev 32284)
@@ -0,0 +1,60 @@
+# Gumstix Overo board-specific definitions
+
+HAIKU_BOARD_DESCRIPTION = "Gumstix Overo" ;
+
+
+#
+# Various hardcoded addresses
+#
+
+# load address for haiku_loader
+HAIKU_BOARD_LOADER_BASE = 0x80008000 ;
+# entry points (raw binary, and netbsd loader emulation)
+HAIKU_BOARD_LOADER_ENTRY_RAW = 0x80008000 ;
+HAIKU_BOARD_LOADER_ENTRY_NBSD = 0x80008004 ;
+
+# load address for haiku_loader uimage
+# (must be different than real load address)
+HAIKU_BOARD_LOADER_UIBASE = 0x84000000 ;
+
+HAIKU_BOARD_LOADER_STACK_BASE = 0x84000000 ;
+
+
+#
+# mmc/SD image
+#
+
+# in MB
+HAIKU_BOARD_SDIMAGE_SIZE = 256 ;
+
+# in MB
+HAIKU_BOARD_SDIMAGE_FAT_SIZE = 32 ;
+
+# offset in blocks XXX: FIXME
+# (autodetect from sfdisk or use cylinder count for fat size)
+HAIKU_BOARD_SDIMAGE_BFS_OFFSET = ;
+
+# autoboot script
+HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME = gumstix-factory.script ;
+HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT = "if mmcinit; then \
+	fatload mmc 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader.ub; \
+	bootm $(HAIKU_BOARD_LOADER_UIBASE); \
+fi" ;
+
+HAIKU_BOARD_SDIMAGE_FILES =
+	haiku_loader
+	haiku_loader.ub
+	$(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME)
+;
+
+
+#
+# gcc flags for the specific cpu
+#
+
+TARGET_KERNEL_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
+TARGET_KERNEL_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
+TARGET_CCFLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
+TARGET_C++FLAGS += -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=soft ;
+
+

Added: haiku/trunk/build/jam/board/verdex/BoardSetup
===================================================================
--- haiku/trunk/build/jam/board/verdex/BoardSetup	2009-08-12 16:00:46 UTC (rev 32283)
+++ haiku/trunk/build/jam/board/verdex/BoardSetup	2009-08-12 16:12:35 UTC (rev 32284)
@@ -0,0 +1,70 @@
+# Gumstix Verdex board-specific definitions
+
+HAIKU_BOARD_DESCRIPTION = "Gumstix Verdex" ;
+
+#
+# Various hardcoded addresses
+#
+
+# load address for haiku_loader
+HAIKU_BOARD_LOADER_BASE = 0xa2000000 ;
+# entry points (raw binary, and netbsd loader emulation)
+HAIKU_BOARD_LOADER_ENTRY_RAW = 0xa2000000 ;
+HAIKU_BOARD_LOADER_ENTRY_NBSD = 0xa2000004 ;
+
+# load address for haiku_loader uimage
+# (must be different than real load address)
+HAIKU_BOARD_LOADER_UIBASE = 0xa4000000 ;
+
+HAIKU_BOARD_LOADER_STACK_BASE = 0xa4000000 ;
+
+#
+# Flash image
+#
+
+# u-boot binary image filename, to build the flash image
+# XXX: Locate it somehow (for now just put it in generated/)
+HAIKU_BOARD_UBOOT_IMAGE ?= u-boot-verdex-400-r1604.bin ;
+HAIKU_BOARD_UBOOT_IMAGE_URL = 
+	http://www.gumstix.net/feeds/u-boot/u-boot-verdex-400-r1604.bin ;
+
+
+#
+# mmc/SD image
+#
+
+# in MB
+HAIKU_BOARD_SDIMAGE_SIZE = 256 ;
+
+# in MB
+HAIKU_BOARD_SDIMAGE_FAT_SIZE = 32 ;
+
+# offset in blocks XXX: FIXME
+# (autodetect from sfdisk or use cylinder count for fat size)
+#HAIKU_BOARD_SDIMAGE_BFS_OFFSET = ;
+
+# autoboot script
+HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME = gumstix-factory.script ;
+
+HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT = "if mmcinit; then \
+	fatload mmc 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader.ub; \
+	bootm $(HAIKU_BOARD_LOADER_UIBASE); \
+fi" ;
+
+HAIKU_BOARD_SDIMAGE_FILES = 
+	haiku_loader
+	haiku_loader.ub 
+	$(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME)
+;
+
+
+#
+# gcc flags for the specific cpu
+#
+
+TARGET_KERNEL_CCFLAGS += -mcpu=xscale -mfloat-abi=soft ;
+TARGET_KERNEL_C++FLAGS += -mcpu=xscale -mfloat-abi=soft ;
+TARGET_CCFLAGS += -mcpu=xscale -mfloat-abi=soft ;
+TARGET_C++FLAGS += -mcpu=xscale -mfloat-abi=soft ;
+
+

Modified: haiku/trunk/src/system/boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/Jamfile	2009-08-12 16:00:46 UTC (rev 32283)
+++ haiku/trunk/src/system/boot/Jamfile	2009-08-12 16:12:35 UTC (rev 32284)
@@ -23,8 +23,9 @@
 ;
 
 local extraLinkerArgs = ;
-if $(TARGET_BOOT_BOARD) {
-	extraLinkerArgs += -L$(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/board/$(TARGET_BOOT_BOARD) ;
+if $(HAIKU_BOARD_LOADER_BASE) {
+	#extraLinkerArgs += -L$(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/board/$(TARGET_BOOT_BOARD) ;
+	extraLinkerArgs += --defsym BOARD_LOADER_BASE=$(HAIKU_BOARD_LOADER_BASE) ;
 }
 
 AddResources haiku_loader : boot_loader.rdef ;

Modified: haiku/trunk/src/system/boot/platform/u-boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-12 16:00:46 UTC (rev 32283)
+++ haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-12 16:12:35 UTC (rev 32284)
@@ -15,6 +15,10 @@
 	SubDirC++Flags $(defines) -Wall -Wno-multichar -fno-rtti -g3 ;
 }
 
+# we fake NetBSD since we don't have an OS ID yet for uimage,
+# and we also fake a netbsd loader anyway.
+local uImageFakeOS = "netbsd" ;
+
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
 
 KernelMergeObject boot_platform_u-boot.o :
@@ -42,7 +46,8 @@
 SubDir HAIKU_TOP src system boot platform u-boot ;
 
 # bootable flash image
-rule BuildUBootFlashImage image : haikuLoader : uboot_image {
+rule BuildUBootFlashImage image : haikuLoader : uboot_image
+{
 	Depends $(image) : $(haikuLoader) ;
 	#Depends $(image) : $(archive) ;
 	Depends $(image) : $(uboot_image) ;
@@ -55,36 +60,133 @@
 }
 
 
-actions BuildUBootFlashImage1 {
+actions BuildUBootFlashImage1
+{
 	$(RM) $(<)
+
 	# make an empty image
-	dd if=/dev/zero of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) count=$(FLASH_IMAGE_BLOCK_COUNT)
+	dd of=$(<) \
+		if=/dev/zero \
+		bs=$(FLASH_IMAGE_BLOCK_SIZE) \
+		count=$(FLASH_IMAGE_BLOCK_COUNT)
+
 	# add u-boot
-	dd if=$(>[2]) of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) conv=notrunc
+	dd of=$(<) \
+		if=$(>[2]) \
+		bs=$(FLASH_IMAGE_BLOCK_SIZE) \
+		conv=notrunc
+
 	# add root fs
-	#dd if=$(>[3]) of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) conv=notrunc seek=$(FLASH_IMAGE_ROOTFS_OFFSET)
+#	dd of=$(<) \
+#		if=$(>[3]) \
+#		bs=$(FLASH_IMAGE_BLOCK_SIZE) \
+#		conv=notrunc \
+#		seek=$(FLASH_IMAGE_ROOTFS_OFFSET)
+
 	# add haiku_loader (raw, elf or uimage)
-	dd if=$(>[1]) of=$(<) bs=$(FLASH_IMAGE_BLOCK_SIZE) conv=notrunc seek=$(FLASH_IMAGE_LOADER_OFFSET)
+	dd of=$(<) \
+		if=$(>[1]) \
+		bs=$(FLASH_IMAGE_BLOCK_SIZE) \
+		conv=notrunc seek=$(FLASH_IMAGE_LOADER_OFFSET)
 }
 
 # uImage
-rule BuildUImage image : data : args {
+rule BuildUImage image : data : args
+{
 	Depends $(image) : $(data) ;
 	LocalClean clean : $(image) ;
 	MKIMAGE_ARGS on $(image) = $(args) ;
 	BuildUImage1 $(image) : $(data) ;
 }
 
-actions BuildUImage1 {
+actions BuildUImage1
+{
 	mkimage $(MKIMAGE_ARGS) -d $(>) $(<)
 }
 
-BuildUImage haiku_loader.ub : haiku_loader : "-A arm -O netbsd -T kernel -C none -a $(BOARD_UBOOT_LOADER_ADDRESS) -e $(BOARD_UBOOT_LOADER_ADDRESS) -n 'haiku_loader'" ;
+rule BuildUImageScript script : content
+{
+	LocalClean clean : $(script) ;
+	SCRIPTCONTENT on $(script) = $(content) ;
+	SCRIPTNAME on $(script) = $(script) ;
+	FAKEOS on $(script) = $(uImageFakeOS) ;
+	BuildUImageScript1 $(script) : $(content) ;
+}
 
-BuildUBootFlashImage haiku_flash_image_raw.img : haiku_loader : $(UBOOT_IMAGE) ;
-#BuildUBootFlashImage haiku_flash_image_elf.img : boot_loader_u-boot : $(UBOOT_IMAGE) ;
-BuildUBootFlashImage haiku_flash_image_uimage.img : haiku_loader.ub : $(UBOOT_IMAGE) ;
+actions BuildUImageScript1
+{
+	rm -f $(<) $(<).txt
+	echo '$(SCRIPTCONTENT)' > $(<).txt
+	mkimage -A arm -O $(FAKEOS) -T script -C none -n $(SCRIPTNAME) \
+		-d $(<).txt $(<)
+	rm -f $(<).txt
+}
 
+# SD/mmc image rule
+# requires sfdisk and mtools packages on linux
+rule BuildUBootSDImage image : files 
+{
+	Depends $(image) : $(files) ;
+	SDIMAGE_BLOCK_SIZE on $(image) = 1MB ;
+	SDIMAGE_SIZE on $(image) = $(HAIKU_BOARD_SDIMAGE_SIZE) ;
+	SDIMAGE_FDISK on $(image) = /sbin/sfdisk ;
+	SDIMAGE_FDISK_SCRIPT on $(image) = 
+		"0,$(HAIKU_BOARD_SDIMAGE_FAT_SIZE),0c,-\\\n,,eb\\\n\\\n" ;
+	SDIMAGE_FDISK_H on $(image) = 255 ;
+	SDIMAGE_FDISK_S on $(image) = 63 ;
+	SDIMAGE_FDISK_UNIT on $(image) = M ;
+	BuildUBootSDImage1 $(image) : $(files) ;
+}
+
+actions BuildUBootSDImage1
+{
+	$(RM) $(<)
+	$(RM) $(<).mtools
+
+	# make an empty image
+	dd of=$(<) \
+		if=/dev/zero \
+		bs=$(SDIMAGE_BLOCK_SIZE) \
+		count=$(SDIMAGE_SIZE)
+	# partition it
+	echo -e '$(SDIMAGE_FDISK_SCRIPT)' | $(SDIMAGE_FDISK) -f -D \
+		-H $(SDIMAGE_FDISK_H) -S $(SDIMAGE_FDISK_S) \
+		-u$(SDIMAGE_FDISK_UNIT) $(<)
+	# generate mtools config
+	echo 'drive i: file="$(<)" partition=1' > $(<).mtools
+	# format the image
+	MTOOLSRC=$(<).mtools mformat i:
+	# populate
+	MTOOLSRC=$(<).mtools mcopy $(>) i:
+	# list content
+	MTOOLSRC=$(<).mtools mdir i:
+	# cleanup
+	$(RM) $(<).mtools
+}
+
+# uimage targets
+BuildUImage haiku_loader.ub : haiku_loader : 
+	-A arm -O $(uImageFakeOS) -T kernel -C none
+	-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_RAW)
+		-n 'haiku_loader' ;
+
+if $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) {
+	
+	BuildUImageScript $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) : 
+		$(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT) ;
+}
+
+# flash image targets
+BuildUBootFlashImage haiku_flash_image_raw.img : haiku_loader : 
+	$(HAIKU_BOARD_UBOOT_IMAGE) ;
+#BuildUBootFlashImage haiku_flash_image_elf.img : boot_loader_u-boot : 
+#	$(HAIKU_BOARD_UBOOT_IMAGE) ;
+BuildUBootFlashImage haiku_flash_image_uimage.img : haiku_loader.ub : 
+	$(HAIKU_BOARD_UBOOT_IMAGE) ;
+
+# SD/mmc image targets
+BuildUBootSDImage haiku.mmc : $(HAIKU_BOARD_SDIMAGE_FILES) ;
+
 SEARCH on [ FGristFiles text_menu.cpp ]
 	= [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;
 



From mmu_man at mail.berlios.de  Wed Aug 12 18:25:03 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Wed, 12 Aug 2009 18:25:03 +0200
Subject: [Haiku-commits] r32285 - haiku/trunk/src/system/ldscripts/arm
Message-ID: <200908121625.n7CGP3wb018862@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-12 18:25:02 +0200 (Wed, 12 Aug 2009)
New Revision: 32285
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32285&view=rev

Modified:
   haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld
Log:
[ARM]
Missed this one in previous commit: remove board.ld include as we now give LD the address directly.


Modified: haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld
===================================================================
--- haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld	2009-08-12 16:12:35 UTC (rev 32284)
+++ haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld	2009-08-12 16:25:02 UTC (rev 32285)
@@ -1,9 +1,6 @@
 OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 
-/* include board-specific definitions */
-INCLUDE board.ld
-
 ENTRY(_start)
 SECTIONS
 {



From revol at free.fr  Wed Aug 12 18:31:48 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Wed, 12 Aug 2009 18:31:48 +0200 CEST
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
 data/beos_mime/application
In-Reply-To: <17948010773-BeMail@kirilla>
Message-ID: <451728177-BeMail@laptop>

> "Axel D?rfler" <axeld at pinc-software.de> wrote:
> > "Jonas Sundstr?m" <jonas at kirilla.com> wrote:
>  ...
> > > Mounting images concurrently does show problems.
> > > This happens when you Command-O a set of image files
> > > in Tracker and multiple mountvolume get launched.
> > 
> > What do you mean by problems?
> 
> E.g. trying with 10 images concurrently,
> 6 images get mounted, 4 don't get mounted.
> 
> (made up figures)

Are you sure the app flags on mountvolume are set correctly ?
Could be it sends itself some of the args to 
BApplication::ArgsReceived() and it's unimplemented ?

Fran?ois.


From stefano.ceccherini at gmail.com  Wed Aug 12 18:32:19 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Wed, 12 Aug 2009 18:32:19 +0200
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <4A82B61F.6030602@bug-br.org.br>
References: <368825780-BeMail@Gaspode> <237414312-BeMail@Gaspode>
	<894b9700908112112p4a0d617r7e02abdeef5509e7@mail.gmail.com>
	<4A82B61F.6030602@bug-br.org.br>
Message-ID: <894b9700908120932m72c6299el8f1e30cc23356813@mail.gmail.com>

2009/8/12 Bruno Albuquerque <bga at bug-br.org.br>:

> I actually tried ParticlesII and still saw the same problems. I did an
> update-install build so wait a bit and later today I will do a full
> build and try again just in case.
>
> -Bruno

Also, I only tested on qemu so far.
Also, I think some accelerants don't behave correctly wrt
WindowScreen. I think Rudolf knows best about this.


From jonas at kirilla.com  Wed Aug 12 19:03:21 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Wed, 12 Aug 2009 19:03:21 +0200 CEST
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
 data/beos_mime/application
In-Reply-To: <451728177-BeMail@laptop>
Message-ID: <1498746080-BeMail@kirilla>

"Fran?ois Revol" <revol at free.fr> wrote:
> "Jonas Sundstr?m" <jonas at kirilla.com> wrote:
 ...
> > E.g. trying with 10 images concurrently,
> > 6 images get mounted, 4 don't get mounted.
 ...
> Are you sure the app flags on mountvolume are set
> correctly ?

I think so. Multiple Launch, Background App.
I've double-checked the binary.

> Could be it sends itself some of the args to 
> BApplication::ArgsReceived() and it's unimplemented ?

RefsReceived() takes the paths of the refs and feeds 
that as argv to ArgvReceived(). Both are implemented.
main() does nothing but start the application, so it
can't steal any arguments.

/Jonas.


From bga at bug-br.org.br  Wed Aug 12 19:05:29 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Wed, 12 Aug 2009 14:05:29 -0300
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <894b9700908120932m72c6299el8f1e30cc23356813@mail.gmail.com>
References: <368825780-BeMail@Gaspode>
	<237414312-BeMail@Gaspode>	<894b9700908112112p4a0d617r7e02abdeef5509e7@mail.gmail.com>	<4A82B61F.6030602@bug-br.org.br>
	<894b9700908120932m72c6299el8f1e30cc23356813@mail.gmail.com>
Message-ID: <4A82F659.7090608@bug-br.org.br>

Stefano Ceccherini wrote:

>> I actually tried ParticlesII and still saw the same problems. I did an
>> update-install build so wait a bit and later today I will do a full
>> build and try again just in case.
> 
> Also, I only tested on qemu so far.
 >
> Also, I think some accelerants don't behave correctly wrt
> WindowScreen. I think Rudolf knows best about this.

Do you know if this includes the VESA accelerant? That's what I am 
using. And in real hardware.

-Bruno



From axeld at pinc-software.de  Wed Aug 12 19:12:37 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 19:12:37 +0200 CEST
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
 data/beos_mime/application
In-Reply-To: <17948010773-BeMail@kirilla>
Message-ID: <32287887853-BeMail@zon>

"Jonas Sundstr?m" <jonas at kirilla.com> wrote:
> "Axel D?rfler" <axeld at pinc-software.de> wrote:
> > "Jonas Sundstr?m" <jonas at kirilla.com> wrote:
>  ...
> > > Mounting images concurrently does show problems.
> > > This happens when you Command-O a set of image files
> > > in Tracker and multiple mountvolume get launched.
> > What do you mean by problems?
> E.g. trying with 10 images concurrently,
> 6 images get mounted, 4 don't get mounted.
> 
> (made up figures)

That deserves a bug ticket, I'd say, even if it's probably not common 
usage for this :-)

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug 12 19:20:52 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 19:20:52 +0200 CEST
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <894b9700908120932m72c6299el8f1e30cc23356813@mail.gmail.com>
Message-ID: <32782561236-BeMail@zon>

Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
> 2009/8/12 Bruno Albuquerque <bga at bug-br.org.br>:
> > I actually tried ParticlesII and still saw the same problems. I did 
> > an
> > update-install build so wait a bit and later today I will do a full
> > build and try again just in case.
> Also, I only tested on qemu so far.
> Also, I think some accelerants don't behave correctly wrt
> WindowScreen. I think Rudolf knows best about this.

I could imagine that the intel_extreme driver has problems with this, 
as I probably never really tested this (AFAIC remember) :-)

Bye,
   Axel.



From axeld at mail.berlios.de  Wed Aug 12 19:48:18 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 12 Aug 2009 19:48:18 +0200
Subject: [Haiku-commits] r32286 -
	haiku/trunk/src/system/boot/platform/bios_ia32
Message-ID: <200908121748.n7CHmIK4013999@sheep.berlios.de>

Author: axeld
Date: 2009-08-12 19:48:18 +0200 (Wed, 12 Aug 2009)
New Revision: 32286
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32286&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/bios_ia32/start.c
Log:
* Disabled multiboot for now, as it breaks the PXE build.


Modified: haiku/trunk/src/system/boot/platform/bios_ia32/start.c
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/start.c	2009-08-12 16:25:02 UTC (rev 32285)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/start.c	2009-08-12 17:48:18 UTC (rev 32286)
@@ -127,7 +127,7 @@
 	console_init();
 	cpu_init();
 	mmu_init();
-	parse_multiboot_commandline(&args);
+	//parse_multiboot_commandline(&args);
 
 	// wait a bit to give the user the opportunity to press a key
 	spin(750000);
@@ -142,7 +142,7 @@
 	acpi_init();
 	smp_init();
 	//hpet_init(); // TODO: Not yet
-	dump_multiboot_info();
+	//dump_multiboot_info();
 	main(&args);
 }
 



From bonefish at mail.berlios.de  Wed Aug 12 19:52:45 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 12 Aug 2009 19:52:45 +0200
Subject: [Haiku-commits] r32287 -
	haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server
Message-ID: <200908121752.n7CHqj0T014457@sheep.berlios.de>

Author: bonefish
Date: 2009-08-12 19:52:44 +0200 (Wed, 12 Aug 2009)
New Revision: 32287
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32287&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp
Log:
Spotted by "Blub": After unmounting we didn't delete the Volume object.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp	2009-08-12 17:48:18 UTC (rev 32286)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp	2009-08-12 17:52:44 UTC (rev 32287)
@@ -284,13 +284,11 @@
 UserlandRequestHandler::_HandleRequest(UnmountVolumeRequest* request)
 {
 	// check and execute the request
-	status_t result = B_OK;
-	Volume* volume = (Volume*)request->volume;
-	if (!volume)
-		result = B_BAD_VALUE;
-	if (result == B_OK) {
+	status_t result = B_BAD_VALUE;
+	if (Volume* volume = (Volume*)request->volume) {
 		RequestThreadContext context(volume, request);
 		result = volume->Unmount();
+		fFileSystem->DeleteVolume(volume);
 	}
 
 	// prepare the reply



From pulkomandy at mail.berlios.de  Wed Aug 12 20:53:50 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Wed, 12 Aug 2009 20:53:50 +0200
Subject: [Haiku-commits] r32288 - in
	haiku/branches/components/gsoc-locale-kit: headers/os/locale
	src/kits/locale src/preferences/locale
Message-ID: <200908121853.n7CIroAZ025678@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-12 20:53:49 +0200 (Wed, 12 Aug 2009)
New Revision: 32288
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32288&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
Log:
-Added the currency par of the preflet
-Finally found the problem with the BBox not showing (you mustn't call SetLayout on them !)
-Modified most functions in BCountry to fill in a BString instead of returning a pointer to a freed area
-Cleanup and style fixes.


Modified: haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-12 17:52:44 UTC (rev 32287)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/locale/Country.h	2009-08-12 18:53:49 UTC (rev 32288)
@@ -25,7 +25,7 @@
 		BCountry(const char* languageAndCountryCode = "en_US");
 		virtual ~BCountry();
 
-		virtual const char *Name() const;
+		virtual bool Name(BString&) const;
 		const char* Code() const;
 
 		// see definitions below
@@ -41,10 +41,10 @@
 		virtual void FormatTime(BString* string, time_t time,
 			bool longFormat);
 
-		const char*	DateFormat(bool longFormat) const;
+		bool		DateFormat(BString&, bool longFormat) const;
 		void		SetDateFormat(const char* formatString,
 						bool longFormat = true);
-		const char*	TimeFormat(bool longFormat) const;
+		bool		TimeFormat(BString&, bool longFormat) const;
 		const char*	DateSeparator() const;
 		const char*	TimeSeparator() const;
 
@@ -55,12 +55,12 @@
 		virtual void FormatNumber(char* string, size_t maxSize, int32 value);
 		virtual void FormatNumber(BString* string, int32 value);
 
-		const char*	DecimalPoint() const;
-		const char*	ThousandsSeparator() const;
-		const char*	Grouping() const;
+		bool		DecimalPoint(BString&) const;
+		bool		ThousandsSeparator(BString&) const;
+		bool		Grouping(BString&) const;
 
-		const char*	PositiveSign() const;
-		const char*	NegativeSign() const;
+		bool		PositiveSign(BString&) const;
+		bool		NegativeSign(BString&) const;
 
 		// measurements
 
@@ -72,11 +72,11 @@
 			double value);
 		virtual ssize_t	FormatMonetary(BString* string, double value);
 
-		const char*	CurrencySymbol() const;
-		const char*	InternationalCurrencySymbol() const;
-		const char*	MonDecimalPoint() const;
-		const char*	MonThousandsSeparator() const;
-		const char*	MonGrouping() const;
+		bool		CurrencySymbol(BString&) const;
+		bool		InternationalCurrencySymbol(BString&) const;
+		bool		MonDecimalPoint(BString&) const;
+		bool		MonThousandsSeparator(BString&) const;
+		bool		MonGrouping(BString&) const;
 		virtual int32	MonFracDigits() const;
 
 	private:

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-12 17:52:44 UTC (rev 32287)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/Country.cpp	2009-08-12 18:53:49 UTC (rev 32288)
@@ -42,7 +42,7 @@
 
 
 BCountry::BCountry(const char* languageCode, const char* countryCode)
-	: 
+	:
 	fStrings(gStrings),
 	fICULocale(languageCode, countryCode)
 {
@@ -66,15 +66,14 @@
 }
 
 
-const char*
-BCountry::Name() const
+bool
+BCountry::Name(BString& name) const
 {
 	UnicodeString uString;
 	fICULocale.getDisplayName(uString);
-	BString str;
-	BStringByteSink stringConverter(&str);
+	BStringByteSink stringConverter(&name);
 	uString.toUTF8(stringConverter);
-	return str.String();
+	return true;
 }
 
 
@@ -96,7 +95,7 @@
 }
 
 
-void 
+void
 BCountry::FormatDate(char* string, size_t maxSize, time_t time, bool longFormat)
 {
 	BString fullString;
@@ -105,7 +104,7 @@
 }
 
 
-void 
+void
 BCountry::FormatDate(BString *string, time_t time, bool longFormat)
 {
 	// TODO: ICU allows for 4 different levels of expansion :
@@ -122,7 +121,7 @@
 }
 
 
-void 
+void
 BCountry::FormatTime(char* string, size_t maxSize, time_t time, bool longFormat)
 {
 	BString fullString;
@@ -131,7 +130,7 @@
 }
 
 
-void 
+void
 BCountry::FormatTime(BString* string, time_t time, bool longFormat)
 {
 	// TODO: ICU allows for 4 different levels of expansion :
@@ -150,58 +149,56 @@
 }
 
 
-const char*
-BCountry::DateFormat(bool longFormat) const
+bool
+BCountry::DateFormat(BString& format, bool longFormat) const
 {
-	icu_4_2::DateFormat* dateFormatter = 
-		longFormat ? fICULongDateFormatter : fICUShortDateFormatter;
-	SimpleDateFormat* dateFormatterImpl =
-		static_cast<SimpleDateFormat*>(dateFormatter);
+	icu_4_2::DateFormat* dateFormatter
+		= longFormat ? fICULongDateFormatter : fICUShortDateFormatter;
+	SimpleDateFormat* dateFormatterImpl
+		= static_cast<SimpleDateFormat*>(dateFormatter);
 
 	UnicodeString ICUString;
 	ICUString = dateFormatterImpl->toPattern(ICUString);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&format);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
 void
 BCountry::SetDateFormat(const char* formatString, bool longFormat)
 {
-	icu_4_2::DateFormat* dateFormatter = 
-		longFormat ? fICULongDateFormatter : fICUShortDateFormatter;
-	SimpleDateFormat* dateFormatterImpl =
-		static_cast<SimpleDateFormat*>(dateFormatter);
+	icu_4_2::DateFormat* dateFormatter
+		= longFormat ? fICULongDateFormatter : fICUShortDateFormatter;
+	SimpleDateFormat* dateFormatterImpl
+		= static_cast<SimpleDateFormat*>(dateFormatter);
 
 	UnicodeString pattern(formatString);
 	dateFormatterImpl->applyPattern(pattern);
 }
 
 
-const char*
-BCountry::TimeFormat(bool longFormat) const
+bool
+BCountry::TimeFormat(BString& format, bool longFormat) const
 {
 	icu_4_2::DateFormat* dateFormatter;
  	dateFormatter = DateFormat::createTimeInstance(
 		longFormat ? DateFormat::FULL : DateFormat::SHORT,
 		fICULocale);
-	SimpleDateFormat* dateFormatterImpl =
-		static_cast<SimpleDateFormat*>(dateFormatter);
+	SimpleDateFormat* dateFormatterImpl
+		= static_cast<SimpleDateFormat*>(dateFormatter);
 
 	UnicodeString ICUString;
 	ICUString = dateFormatterImpl->toPattern(ICUString);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&format);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
@@ -222,7 +219,7 @@
 }
 
 
-void 
+void
 BCountry::FormatNumber(char* string, size_t maxSize, double value)
 {
 	BString fullString;
@@ -231,12 +228,12 @@
 }
 
 
-void 
+void
 BCountry::FormatNumber(BString* string, double value)
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter =
-		NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter
+		= NumberFormat::createInstance(fICULocale, err);
 
 	assert(err == U_ZERO_ERROR);
 
@@ -250,7 +247,7 @@
 }
 
 
-void 
+void
 BCountry::FormatNumber(char* string, size_t maxSize, int32 value)
 {
 	BString fullString;
@@ -259,12 +256,12 @@
 }
 
 
-void 
+void
 BCountry::FormatNumber(BString* string, int32 value)
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter =
-		NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter
+		= NumberFormat::createInstance(fICULocale, err);
 
 	assert(err == U_ZERO_ERROR);
 
@@ -279,12 +276,12 @@
 
 
 // This will only work for locales using the decimal system...
-const char*
-BCountry::DecimalPoint() const
+bool
+BCountry::DecimalPoint(BString& format) const
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter = 
-		NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter
+		= NumberFormat::createInstance(fICULocale, err);
 
 	assert(err == U_ZERO_ERROR);
 
@@ -293,26 +290,25 @@
 
 	assert(decimalFormatter != NULL);
 
-	const DecimalFormatSymbols* syms =
-		decimalFormatter->getDecimalFormatSymbols();
+	const DecimalFormatSymbols* syms
+		= decimalFormatter->getDecimalFormatSymbols();
 
 	UnicodeString ICUString;
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kDecimalSeparatorSymbol);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&format);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
-const char*
-BCountry::ThousandsSeparator() const
+bool
+BCountry::ThousandsSeparator(BString& separator) const
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter 
+	NumberFormat* numberFormatter
 		= NumberFormat::createInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
 	DecimalFormat* decimalFormatter
@@ -326,21 +322,20 @@
 	UnicodeString ICUString;
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&separator);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
-const char*
-BCountry::Grouping() const
+bool
+BCountry::Grouping(BString& grouping) const
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter =
-		NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter
+		= NumberFormat::createInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
 	DecimalFormat* decimalFormatter
 		= dynamic_cast<DecimalFormat*>(numberFormatter);
@@ -353,20 +348,19 @@
 	UnicodeString ICUString;
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kGroupingSeparatorSymbol);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&grouping);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
-const char*
-BCountry::PositiveSign() const
+bool
+BCountry::PositiveSign(BString& sign) const
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter 
+	NumberFormat* numberFormatter
 		= NumberFormat::createInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
 	DecimalFormat* decimalFormatter
@@ -380,21 +374,20 @@
 	UnicodeString ICUString;
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kPlusSignSymbol);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&sign);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
-const char*
-BCountry::NegativeSign() const
+bool
+BCountry::NegativeSign(BString& sign) const
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter =
-		NumberFormat::createInstance(fICULocale, err);
+	NumberFormat* numberFormatter
+		= NumberFormat::createInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
 	DecimalFormat* decimalFormatter
 		= dynamic_cast<DecimalFormat*>(numberFormatter);
@@ -407,17 +400,16 @@
 	UnicodeString ICUString;
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kMinusSignSymbol);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&sign);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
 // TODO does ICU even support this ? Is it in the keywords ?
-int8 
+int8
 BCountry::Measurement() const
 {
 	return B_US;
@@ -433,12 +425,12 @@
 }
 
 
-ssize_t 
+ssize_t
 BCountry::FormatMonetary(BString* string, double value)
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter =
-		NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter
+		= NumberFormat::createCurrencyInstance(fICULocale, err);
 
 	assert(err == U_ZERO_ERROR);
 
@@ -454,12 +446,12 @@
 }
 
 
-const char*
-BCountry::CurrencySymbol() const
+bool
+BCountry::CurrencySymbol(BString& symbol) const
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter =
-		NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter
+		= NumberFormat::createCurrencyInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
 	DecimalFormat* decimalFormatter
 		= dynamic_cast<DecimalFormat*>(numberFormatter);
@@ -472,21 +464,20 @@
 	UnicodeString ICUString;
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kCurrencySymbol);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&symbol);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
-const char*
-BCountry::InternationalCurrencySymbol() const
+bool
+BCountry::InternationalCurrencySymbol(BString& symbol) const
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter =
-		NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter
+		= NumberFormat::createCurrencyInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
 	DecimalFormat* decimalFormatter
 		= dynamic_cast<DecimalFormat*>(numberFormatter);
@@ -499,21 +490,20 @@
 	UnicodeString ICUString;
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kIntlCurrencySymbol);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&symbol);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
-const char*
-BCountry::MonDecimalPoint() const
+bool
+BCountry::MonDecimalPoint(BString& decimal) const
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter =
-		NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter
+		= NumberFormat::createCurrencyInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
 	DecimalFormat* decimalFormatter
 		= dynamic_cast<DecimalFormat*>(numberFormatter);
@@ -526,20 +516,19 @@
 	UnicodeString ICUString;
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kMonetarySeparatorSymbol);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&decimal);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
-const char*
-BCountry::MonThousandsSeparator() const
+bool
+BCountry::MonThousandsSeparator(BString& separator) const
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter 
+	NumberFormat* numberFormatter
 		= NumberFormat::createCurrencyInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
 	DecimalFormat* decimalFormatter
@@ -553,21 +542,20 @@
 	UnicodeString ICUString;
 	ICUString = syms->getSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&separator);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
-const char*
-BCountry::MonGrouping() const
+bool
+BCountry::MonGrouping(BString& grouping) const
 {
 	UErrorCode err;
-	NumberFormat* numberFormatter =
-		NumberFormat::createCurrencyInstance(fICULocale, err);
+	NumberFormat* numberFormatter
+		= NumberFormat::createCurrencyInstance(fICULocale, err);
 	assert(err == U_ZERO_ERROR);
 	DecimalFormat* decimalFormatter
 		= dynamic_cast<DecimalFormat*>(numberFormatter);
@@ -581,17 +569,16 @@
 	ICUString = syms->getSymbol(
 		DecimalFormatSymbols::kMonetaryGroupingSeparatorSymbol);
 
-	BString string;
-	BStringByteSink stringConverter(&string);
+	BStringByteSink stringConverter(&grouping);
 
 	ICUString.toUTF8(stringConverter);
 
-	return string.String();
+	return true;
 }
 
 
 // TODO: is this possible to get from ICU ?
-int32 
+int32
 BCountry::MonFracDigits() const
 {
 	return 2;

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-08-12 17:52:44 UTC (rev 32287)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-08-12 18:53:49 UTC (rev 32288)
@@ -454,7 +454,7 @@
 BLocaleRoster::SetDefaultCountry(BCountry * newDefault) const
 {
 	gRosterData.fCountryCodeName = newDefault->Code();
-	gRosterData.fCountryDateFormat = newDefault->DateFormat(true);
+	newDefault->DateFormat(gRosterData.fCountryDateFormat, true);
 }
 
 

Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-12 17:52:44 UTC (rev 32287)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-12 18:53:49 UTC (rev 32288)
@@ -160,16 +160,12 @@
 	menu->AddItem(new BMenuItem(".", new BMessage(kSettingsContentsModified)));
 
 	fSeparatorMenuField = new BMenuField("Separator:", menu);
-	fSeparatorMenuField->SetDivider(
-		fSeparatorMenuField->StringWidth(fSeparatorMenuField->Label()) + 8.0f);
-	fSeparatorMenuField->SetAlignment(B_ALIGN_LEFT);
 
 	// Time
 	BSeparatorView* timeHeader = new BSeparatorView("Time");
 
 	BBox *clockBox = new BBox("Clock");
 	clockBox->SetLabel("Clock");
-	clockBox->SetLayout(new BGroupLayout(B_VERTICAL, 10));
 
 	{
 		f24HrRadioButton = new BRadioButton("", "24 Hour",
@@ -178,9 +174,10 @@
 		f12HrRadioButton = new BRadioButton("", "12 Hour",
 				new BMessage(kSettingsContentsModified));
 
-		clockBox->AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)
+		clockBox->AddChild(BGroupLayoutBuilder(B_VERTICAL, 3)
 				.Add(f24HrRadioButton)
 				.Add(f12HrRadioButton)
+				.SetInsets(3, 3, 3, 3)
 		);
 	}
 
@@ -203,7 +200,36 @@
 
 	// Currency
 	BSeparatorView* currencyHeader = new BSeparatorView("Currency");
+	BTextControl* currencySymbol = new BTextControl("","Currency symbol:","",
+		new BMessage(kSettingsContentsModified));
+	menu = new BPopUpMenu("Negative marker:");
+	menu->AddItem(new BMenuItem("-", new BMessage(kSettingsContentsModified)));
+	menu->AddItem(new BMenuItem("()", new BMessage(kSettingsContentsModified)));
 
+	BMenuField* currencyNegative = new BMenuField("Separator:", menu);
+
+	BTextControl* currencyDecimal = new BTextControl("","Decimal separator","",
+		new BMessage(kSettingsContentsModified));
+	BCheckBox* currencyLeadingZero = new BCheckBox("","Leading 0",
+		new BMessage(kSettingsContentsModified));
+
+	BBox *formatBox = new BBox("Symbol position");
+	formatBox->SetLabel("Symbol position");
+
+	{
+		BRadioButton* beforeRadioButton = new BRadioButton("", "Before",
+				new BMessage(kSettingsContentsModified));
+
+		BRadioButton* afterRadioButton = new BRadioButton("", "After",
+				new BMessage(kSettingsContentsModified));
+
+		formatBox->AddChild(BGroupLayoutBuilder(B_VERTICAL, 3)
+				.Add(beforeRadioButton)
+				.Add(afterRadioButton)
+				.SetInsets(3, 3, 3, 3)
+		);
+	}
+
 	_UpdateExamples();
 	_ParseDateFormat();
 
@@ -241,7 +267,10 @@
 		.Add(timeHeader)
 		.Add(fLongTimeExampleView)
 		.Add(fShortTimeExampleView)
-		.Add(clockBox)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 3)
+			.Add(clockBox)
+			.AddGlue()
+		)
 
 		.Add(numberHeader)
 		.Add(numberThousand)
@@ -250,7 +279,14 @@
 		.Add(numberList)
 
 		.Add(currencyHeader)
-		.AddGlue()
+		.Add(currencySymbol)
+		.Add(currencyNegative)
+		.Add(currencyDecimal)
+		.Add(currencyLeadingZero)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 3)
+			.Add(formatBox)
+			.AddGlue()
+		)
 		.SetInsets(5, 5, 5, 5)
 	);
 }
@@ -270,7 +306,9 @@
 void
 TimeFormatSettingsView::_ParseDateFormat()
 {
-	const char* dateFormat = fCountry->DateFormat(true);
+	BString dateFormatString;
+	fCountry->DateFormat(dateFormatString, true);
+	const char* dateFormat = dateFormatString.String();
 
 	// Travel trough the string and parse it
 	const char* parsePointer = dateFormat;



From leavengood at gmail.com  Wed Aug 12 21:07:04 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Wed, 12 Aug 2009 15:07:04 -0400
Subject: [Haiku-commits] r32272 - haiku/trunk/src/servers/mail
In-Reply-To: <200908121125.n7CBPqB2031409@sheep.berlios.de>
References: <200908121125.n7CBPqB2031409@sheep.berlios.de>
Message-ID: <a4855ac50908121207g4ddf1323u582949ef69833874@mail.gmail.com>

On Wed, Aug 12, 2009 at 7:25 AM, <aldeck at mail.berlios.de> wrote:
>
> * Style update. Don't know what to do about the licence headers though

I think this should work for DeskbarView.cpp (based on svn log):

/*
 * Copyright 2004-2009 Haiku Inc.
 * Copyright 2001-2004 Dr. Zoidberg Enterprises.
 * All rights reserved. Distributed under the terms of the MIT License.
 *
 * Authors:
 *		Nathan Whitehorn
 *		Axel D?rfler, axeld at pinc-software.de
 *		Ryan Leavengood, leavengood at gmail.com
 *		DarkWyrm, darkwyrm at gmail.com
 *		Alexandre Deckner, alex at zappotek.com
 */

I checked and MDR is indeed distributed under MIT/BSD:

http://bebits.com/app/2289

For DeskbarView.h it can be the same minus DarkWyrm and Axel.

Similar logic can be used on any other files...

-- 
Regards,
Ryan


From leavengood at gmail.com  Wed Aug 12 21:09:49 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Wed, 12 Aug 2009 15:09:49 -0400
Subject: [Haiku-commits] Haiku-commits] r32267 - in haiku/trunk:
	headers/os/opengl src/kits/opengl src/tests/kits/opengl/glinfo
In-Reply-To: <ce99af780908120424r39b63738sdaebbe468a5745fa@mail.gmail.com>
References: <ce99af780908120424r39b63738sdaebbe468a5745fa@mail.gmail.com>
Message-ID: <a4855ac50908121209xd0cdafcla35d6a76da4a1e4a@mail.gmail.com>

On Wed, Aug 12, 2009 at 7:24 AM, Philippe
Houdoin<philippe.houdoin at gmail.com> wrote:
>
> I should have stay focused on porting Threading Building Blocks
> instead (reason for switching to gcc4 :-\)...

Oh cool, yes indeed get back to that ;)

-- 
Regards,
Ryan


From leavengood at gmail.com  Wed Aug 12 21:15:30 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Wed, 12 Aug 2009 15:15:30 -0400
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
	data/beos_mime/application
In-Reply-To: <2657965346-BeMail@laptop>
References: <200908121354.n7CDsTCd004729@sheep.berlios.de>
	<2657965346-BeMail@laptop>
Message-ID: <a4855ac50908121215q554e5985s69add8f6880ce291@mail.gmail.com>

On Wed, Aug 12, 2009 at 10:31 AM, Fran?ois Revol<revol at free.fr> wrote:
>
> While this is nice, it prevents using it in Bootscript if we ever need
> to...

Doesn't this only apply if you tried to run mountvolume before the
app_server in the Bootscript?

-- 
Regards,
Ryan


From mmu_man at mail.berlios.de  Wed Aug 12 22:30:05 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Wed, 12 Aug 2009 22:30:05 +0200
Subject: [Haiku-commits] r32289 - in haiku/trunk/src/system/boot/platform:
	bios_ia32 pxe_ia32
Message-ID: <200908122030.n7CKU5N7017738@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-12 22:30:03 +0200 (Wed, 12 Aug 2009)
New Revision: 32289
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32289&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/bios_ia32/start.c
   haiku/trunk/src/system/boot/platform/pxe_ia32/Jamfile
   haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage2.S
Log:
fix PXE build with multiboot. GRUB supports netboot btw, could be interesting to explore... but the pxe shell doesn't check for the info yet.


Modified: haiku/trunk/src/system/boot/platform/bios_ia32/start.c
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/start.c	2009-08-12 18:53:49 UTC (rev 32288)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/start.c	2009-08-12 20:30:03 UTC (rev 32289)
@@ -127,7 +127,7 @@
 	console_init();
 	cpu_init();
 	mmu_init();
-	//parse_multiboot_commandline(&args);
+	parse_multiboot_commandline(&args);
 
 	// wait a bit to give the user the opportunity to press a key
 	spin(750000);
@@ -142,7 +142,7 @@
 	acpi_init();
 	smp_init();
 	//hpet_init(); // TODO: Not yet
-	//dump_multiboot_info();
+	dump_multiboot_info();
 	main(&args);
 }
 

Modified: haiku/trunk/src/system/boot/platform/pxe_ia32/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/pxe_ia32/Jamfile	2009-08-12 18:53:49 UTC (rev 32288)
+++ haiku/trunk/src/system/boot/platform/pxe_ia32/Jamfile	2009-08-12 20:30:03 UTC (rev 32289)
@@ -26,6 +26,7 @@
 	keyboard.cpp
 	menu.cpp
 	mmu.cpp
+	multiboot.cpp
 	cpu.cpp
 	acpi.cpp
 	smp.cpp

Modified: haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage2.S
===================================================================
--- haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage2.S	2009-08-12 18:53:49 UTC (rev 32288)
+++ haiku/trunk/src/system/boot/platform/pxe_ia32/pxe_stage2.S	2009-08-12 20:30:03 UTC (rev 32289)
@@ -200,6 +200,9 @@
 /* global data table */
 .balign 8
 
+GLOBAL(gMultiBootInfo):
+	.long	0
+
 GLOBAL(gBootPartitionOffset):
 	.long	0xffffffff
 



From bga at bug-br.org.br  Wed Aug 12 22:51:08 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Wed, 12 Aug 2009 17:51:08 -0300
Subject: [Haiku-commits] r32272 - haiku/trunk/src/servers/mail
In-Reply-To: <a4855ac50908121207g4ddf1323u582949ef69833874@mail.gmail.com>
References: <200908121125.n7CBPqB2031409@sheep.berlios.de>
	<a4855ac50908121207g4ddf1323u582949ef69833874@mail.gmail.com>
Message-ID: <4A832B3C.1000004@bug-br.org.br>

Ryan Leavengood wrote:

> I think this should work for DeskbarView.cpp (based on svn log):
> 
> /*
>  * Copyright 2004-2009 Haiku Inc.
>  * Copyright 2001-2004 Dr. Zoidberg Enterprises.
>  * All rights reserved. Distributed under the terms of the MIT License.
>  *
>  * Authors:
>  *		Nathan Whitehorn
>  *		Axel D?rfler, axeld at pinc-software.de
>  *		Ryan Leavengood, leavengood at gmail.com
>  *		DarkWyrm, darkwyrm at gmail.com
>  *		Alexandre Deckner, alex at zappotek.com
>  */
> 
> I checked and MDR is indeed distributed under MIT/BSD:
> 
> http://bebits.com/app/2289
> 
> For DeskbarView.h it can be the same minus DarkWyrm and Axel.
> 
> Similar logic can be used on any other files...

Not that I really mind, but in this case and if this change is to be 
done than every file in MDR should also list Nathan Whitehorn and myself 
as Authors as we are the original Dr. Zoidberg Enterprises. :)

-Bruno



From leavengood at gmail.com  Wed Aug 12 22:59:22 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Wed, 12 Aug 2009 16:59:22 -0400
Subject: [Haiku-commits] r32272 - haiku/trunk/src/servers/mail
In-Reply-To: <4A832B3C.1000004@bug-br.org.br>
References: <200908121125.n7CBPqB2031409@sheep.berlios.de>
	<a4855ac50908121207g4ddf1323u582949ef69833874@mail.gmail.com>
	<4A832B3C.1000004@bug-br.org.br>
Message-ID: <a4855ac50908121359i72178f2bqbfc7d9a603fd1993@mail.gmail.com>

On Wed, Aug 12, 2009 at 4:51 PM, Bruno Albuquerque<bga at bug-br.org.br> wrote:
>
> Not that I really mind, but in this case and if this change is to be
> done than every file in MDR should also list Nathan Whitehorn and myself
> as Authors as we are the original Dr. Zoidberg Enterprises. :)

Of course. The main reason I only included him was he was in the svn
log. But you belong there as well if we are going to list everyone.

Also it is good to have your input as the original author so we can be
sure this copyright notice change won't cause problems :)

-- 
Regards,
Ryan


From axeld at pinc-software.de  Wed Aug 12 23:30:59 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 23:30:59 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32288_-_in_haiku/branches/components/g?=
 =?utf-8?q?soc-locale-kit=3A_headers/os/locale_src/kits/locale_src/prefere?=
 =?utf-8?q?nces/locale?=
In-Reply-To: <200908121853.n7CIroAZ025678@sheep.berlios.de>
Message-ID: <47789428966-BeMail@zon>

pulkomandy at BerliOS <pulkomandy at mail.berlios.de> wrote:
> +		virtual bool Name(BString&) const;

Why not:
BString Name() const;
?

(BString is smart enough to make it a cheap copy)
Otherwise, this would be the exact case where we'd use GetName().

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug 12 23:32:41 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 23:32:41 +0200 CEST
Subject: [Haiku-commits] r32272 - haiku/trunk/src/servers/mail
In-Reply-To: <a4855ac50908121207g4ddf1323u582949ef69833874@mail.gmail.com>
Message-ID: <47891629760-BeMail@zon>

Ryan Leavengood <leavengood at gmail.com> wrote:
> For DeskbarView.h it can be the same minus DarkWyrm and Axel.

And I guess I have probably also touched most of the files during MDR 
times.

Bye,
   Axel.



From axeld at pinc-software.de  Wed Aug 12 23:34:41 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 12 Aug 2009 23:34:41 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32275_-_in_haiku/trunk/src=3A_bin_data?=
 =?utf-8?q?/beos=5Fmime/application?=
In-Reply-To: <a4855ac50908121215q554e5985s69add8f6880ce291@mail.gmail.com>
Message-ID: <48011658430-BeMail@zon>

Ryan Leavengood <leavengood at gmail.com> wrote:
> On Wed, Aug 12, 2009 at 10:31 AM, Fran?ois Revol<revol at free.fr> 
> wrote:
> > While this is nice, it prevents using it in Bootscript if we ever 
> > need
> > to...
> Doesn't this only apply if you tried to run mountvolume before the
> app_server in the Bootscript?

Exactly.

Bye,
   Axel.



From bga at bug-br.org.br  Wed Aug 12 22:00:58 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Wed, 12 Aug 2009 22:00:58
Subject: [Haiku-commits] r32272 - haiku/trunk/src/servers/mail
In-Reply-To: <a4855ac50908121359i72178f2bqbfc7d9a603fd1993@mail.gmail.com>
Message-ID: <293214818-BeMail@Gaspode>

On Wed, 12 Aug 2009 16:59:22 -0400, Ryan Leavengood said:

> > Not that I really mind, but in this case and if this change is to 
> > be
> > done than every file in MDR should also list Nathan Whitehorn and 
> > myself
> > as Authors as we are the original Dr. Zoidberg Enterprises. :)
> 
> Of course. The main reason I only included him was he was in the svn
> log. But you belong there as well if we are going to list everyone.
> 
> Also it is good to have your input as the original author so we can 
> be
> sure this copyright notice change won't cause problems :)

I am fine with the changes, but as Nathan is MIA, I am not sure doing 
this without his consent is ok. I am pretty sure he would not mind (I 
am certain, in fact), but we should at least try to contact him.

-Bruno



From bga at bug-br.org.br  Thu Aug 13 00:02:28 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Wed, 12 Aug 2009 19:02:28 -0300
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
 data/beos_mime/application
In-Reply-To: <48011658430-BeMail@zon>
Message-ID: <383432980-BeMail@Gaspode>

On Wed, 12 Aug 2009 23:34:41 +0200 CEST, Axel D?rfler said:

> > > While this is nice, it prevents using it in Bootscript if we ever 
> > > need
> > > to...
> >
> > Doesn't this only apply if you tried to run mountvolume before the
> > app_server in the Bootscript?
> 
> Exactly.

Funny enough, I actually do that. The reason is that I mount my home 
dir from a different partition and this has to be done as earlier as 
possible in the boot process.

-Bruno



From bga at bug-br.org.br  Wed Aug 12 22:04:54 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Wed, 12 Aug 2009 22:04:54
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
 data/beos_mime/application
In-Reply-To: <383432980-BeMail@Gaspode>
Message-ID: <529204761-BeMail@Gaspode>

On Wed, 12 Aug 2009 19:02:28 -0300, Bruno Albuquerque said:

> > > > While this is nice, it prevents using it in Bootscript if we 
> > > > ever 
> > > > need
> > > > to...
> > >
> > > Doesn't this only apply if you tried to run mountvolume before 
> > > the
> > > app_server in the Bootscript?
> > 
> > Exactly.
> 
> Funny enough, I actually do that. The reason is that I mount my home 
> dir from a different partition and this has to be done as earlier as 
> possible in the boot process.

I forgot to mention that even with this, I do not mind this change. I 
can simply replace mountvolume by an explicit mount call. It is just 
that "mountvolume Data" is easier than "mount -t bfs ...".

-Bruno
 


From mmu_man at mail.berlios.de  Thu Aug 13 00:06:19 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 00:06:19 +0200
Subject: [Haiku-commits] r32290 - haiku/trunk/src/system/boot/platform/u-boot
Message-ID: <200908122206.n7CM6J5e029131@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 00:06:14 +0200 (Thu, 13 Aug 2009)
New Revision: 32290
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32290&view=rev

Modified:
   haiku/trunk/src/system/boot/platform/u-boot/Jamfile
Log:
[ARM]
Name the FAT; no need to list the contents.


Modified: haiku/trunk/src/system/boot/platform/u-boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-12 20:30:03 UTC (rev 32289)
+++ haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-12 22:06:14 UTC (rev 32290)
@@ -155,11 +155,11 @@
 	# generate mtools config
 	echo 'drive i: file="$(<)" partition=1' > $(<).mtools
 	# format the image
-	MTOOLSRC=$(<).mtools mformat i:
+	MTOOLSRC=$(<).mtools mformat -v "Haiku" i:
 	# populate
 	MTOOLSRC=$(<).mtools mcopy $(>) i:
 	# list content
-	MTOOLSRC=$(<).mtools mdir i:
+	#MTOOLSRC=$(<).mtools mdir i:
 	# cleanup
 	$(RM) $(<).mtools
 }



From leavengood at gmail.com  Thu Aug 13 00:16:49 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Wed, 12 Aug 2009 18:16:49 -0400
Subject: [Haiku-commits] r32272 - haiku/trunk/src/servers/mail
In-Reply-To: <293214818-BeMail@Gaspode>
References: <a4855ac50908121359i72178f2bqbfc7d9a603fd1993@mail.gmail.com>
	<293214818-BeMail@Gaspode>
Message-ID: <a4855ac50908121516u1ff060fbl461540d89016c189@mail.gmail.com>

On Wed, Aug 12, 2009 at 6:00 PM, Bruno Albuquerque<bga at bug-br.org.br> wrote:
>
> I am fine with the changes, but as Nathan is MIA, I am not sure doing
> this without his consent is ok. I am pretty sure he would not mind (I
> am certain, in fact), but we should at least try to contact him.

Well given the code was released under the MIT license and put in the
Haiku repo by Nathan and the Dr Zoidberg copyright is still preserved
I think we have all the bases covered.

-- 
Regards,
Ryan


From bga at bug-br.org.br  Wed Aug 12 22:39:14 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Wed, 12 Aug 2009 22:39:14
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <894b9700908120932m72c6299el8f1e30cc23356813@mail.gmail.com>
Message-ID: <171980761-BeMail@Gaspode>

On Wed, 12 Aug 2009 18:32:19 +0200, Stefano Ceccherini said:

> 2009/8/12 Bruno Albuquerque <bga at bug-br.org.br>:
> 
> > I actually tried ParticlesII and still saw the same problems. I did 
> > an
> > update-install build so wait a bit and later today I will do a full
> > build and try again just in case.
> >
> > -Bruno
> 
> Also, I only tested on qemu so far.
> Also, I think some accelerants don't behave correctly wrt
> WindowScreen. I think Rudolf knows best about this.

So I tried it on a clean installation. When i start particles, the 
background is gray instead of black. It becomes black where particles 
travel through. Also, when exiting (ALT+Q), all colors in the Desktop 
are messed up.

Is it possible that you forgot to commit something?

-Bruno



From jonas at kirilla.com  Thu Aug 13 00:43:50 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Thu, 13 Aug 2009 00:43:50 +0200 CEST
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
 data/beos_mime/application
In-Reply-To: <383432980-BeMail@Gaspode>
Message-ID: <3795970906-BeMail@kirilla>

"Bruno Albuquerque" <bga at bug-br.org.br> wrote:
 ...
> Funny enough, I actually do that. The reason is
> that I mount my home dir from a different partition
> and this has to be done as earlier as possible in
> the boot process.

I'm sorry for the inconvenience.

Interesting how I've thought all these years that the
"Argv Only" app flag was dysfunctional or deprecated,
and that the only way to have files opened in Tracker
actually get to a non-BApplication was to either make
it a BApplication or have another BApplication mediate.
(like ZooKeeper does)

Does Pete Goodeve's xicon support setting a script as
a mime type's preferred app, or does it only make it
a target for direct file drops? With "Argv Only" set
and working the way that has been implied it would seem
possible to have scripts on equal terms with applications.

/Jonas.



From mattmadia at gmail.com  Thu Aug 13 01:48:09 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Wed, 12 Aug 2009 23:48:09 +0000
Subject: [Haiku-commits] r32286 -
	haiku/trunk/src/system/boot/platform/bios_ia32
In-Reply-To: <200908121748.n7CHmIK4013999@sheep.berlios.de>
References: <200908121748.n7CHmIK4013999@sheep.berlios.de>
Message-ID: <1e42d8c50908121648w57ce8c61h25165fbcf54e8f8a@mail.gmail.com>

On Wed, Aug 12, 2009 at 17:48, axeld at BerliOS<axeld at mail.berlios.de> wrote:
>
> * Disabled multiboot for now, as it breaks the PXE build.

How would one configure/jam for the PXE build?
Currently Build-O-Matic isn't tracking it.
Also, fwiw, most of the boot floppies aren't being tracked either.

--mmadia


From mmu_man at mail.berlios.de  Thu Aug 13 03:15:26 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 03:15:26 +0200
Subject: [Haiku-commits] r32291 - in haiku/trunk/src/system/boot: .
	platform/u-boot platform/u-boot/arch platform/u-boot/arch/arm
Message-ID: <200908130115.n7D1FQ3n000013@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 03:15:21 +0200 (Thu, 13 Aug 2009)
New Revision: 32291
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32291&view=rev

Added:
   haiku/trunk/src/system/boot/platform/u-boot/arch/
   haiku/trunk/src/system/boot/platform/u-boot/arch/arm/
   haiku/trunk/src/system/boot/platform/u-boot/arch/arm/shell.S
Removed:
   haiku/trunk/src/system/boot/platform/u-boot/start.S
Modified:
   haiku/trunk/src/system/boot/Jamfile
   haiku/trunk/src/system/boot/platform/u-boot/start2.c
Log:
[ARM]
- cleanup,
- moved the startup asm code to u-boot/arch/arm/shell.S
- added netbsd loader entry point,
- store the invocation type (0: standalone, 1: netbsd),
- store the global data in a variable,
- added some debug code to see what U-Boot gives us.


Modified: haiku/trunk/src/system/boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/Jamfile	2009-08-12 22:06:14 UTC (rev 32290)
+++ haiku/trunk/src/system/boot/Jamfile	2009-08-13 01:15:21 UTC (rev 32291)
@@ -24,7 +24,6 @@
 
 local extraLinkerArgs = ;
 if $(HAIKU_BOARD_LOADER_BASE) {
-	#extraLinkerArgs += -L$(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/board/$(TARGET_BOOT_BOARD) ;
 	extraLinkerArgs += --defsym BOARD_LOADER_BASE=$(HAIKU_BOARD_LOADER_BASE) ;
 }
 

Copied: haiku/trunk/src/system/boot/platform/u-boot/arch/arm/shell.S (from rev 32289, haiku/trunk/src/system/boot/platform/u-boot/start.S)
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/start.S	2009-08-12 20:30:03 UTC (rev 32289)
+++ haiku/trunk/src/system/boot/platform/u-boot/arch/arm/shell.S	2009-08-13 01:15:21 UTC (rev 32291)
@@ -0,0 +1,57 @@
+#include <arch/arm/arch_cpu.h>
+
+#include <asm_defs.h>
+
+
+	.text
+
+/*
+ * Entry points to the loader that U-Boot passes control to.
+ */
+
+/*
+ * called as standalone (raw binary)
+ * *MUST* be first symbol
+ */
+SYMBOL(_start_raw):
+/*
+ * ELF entry
+ */
+SYMBOL(_start):
+	mov	r0,#0
+	b	_start_common
+SYMBOL_END(_start_raw)
+SYMBOL_END(_start)
+
+/*
+ * called from bootm with netbsd loader compatible args
+ */
+SYMBOL(_start_netbsd):
+	mov	r0,#1
+	b	_start_common
+SYMBOL_END(_start_netbsd)
+
+
+
+SYMBOL(_start_common):
+	strb	r0,gUBootOS
+	str	r8,gUBootGlobalData
+	/* ... */
+	ldrb	r0,gUBootOS
+	cmp	r0,#0
+	beq	start_raw
+	cmp	r0,#1
+	beq	start_netbsd
+	mov	pc,lr
+SYMBOL_END(_start_common)
+
+
+
+
+SYMBOL(gUBootGlobalData):
+	.long   0
+SYMBOL_END(gUBootGlobalData)
+SYMBOL(gUBootOS):
+	.byte   0
+SYMBOL_END(gUBootOS)
+


Property changes on: haiku/trunk/src/system/boot/platform/u-boot/arch/arm/shell.S
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: haiku/trunk/src/system/boot/platform/u-boot/start.S

Modified: haiku/trunk/src/system/boot/platform/u-boot/start2.c
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/start2.c	2009-08-12 22:06:14 UTC (rev 32290)
+++ haiku/trunk/src/system/boot/platform/u-boot/start2.c	2009-08-13 01:15:21 UTC (rev 32291)
@@ -29,7 +29,8 @@
 extern uint8 _end;
 
 extern int main(stage2_args *args);
-void _start(void);
+extern void _start(void);
+extern int start_raw(int argc, char **argv);
 
 
 uint32 sBootOptions;
@@ -53,6 +54,12 @@
 }
 
 
+/* needed for libgcc unwind XXX */
+void
+abort(void)
+{
+	panic("abort");
+}
 
 
 void
@@ -93,9 +100,41 @@
 }
 
 
-void
-start2(void)
+typedef struct uboot_arm_gd {
+	struct board_data *bd;
+	uint32 flags;
+	uint32 baudrate;
+	uint32 have_console;
+	uint32 reloc_off;
+	uint32 env_addr;
+	uint32 env_valid;
+	uint32 fb_base;
+} uboot_arm_gd;
+
+register volatile uboot_arm_gd *gGD asm ("r8");
+extern uboot_arm_gd *gUBootGlobalData;
+extern uint8 gUBootOS;
+
+int
+start_netbsd(struct board_info *bd, struct uimage *image, const char *consdev,
+	const char *cmdline)
 {
+	const char *argv[] = { "haiku", cmdline };
+	int argc = 1;
+	if (cmdline)
+		argc++;
+	start_raw(argc, argv);
+}
+
+int
+start_linux(int argc, int archnum, void *atags)
+{
+}
+
+
+int
+start_raw(int argc, char **argv)
+{
 	stage2_args args;
 
 	clear_bss();
@@ -108,6 +147,17 @@
 	serial_init();
 	console_init();
 	cpu_init();
+
+	{ //DEBUG:
+		int i;
+		dprintf("argc = %d\n", argc);
+		for (i = 0; i < argc; i++)
+			dprintf("argv[%d] @%lx = '%s'\n", i, (uint32)argv[i], argv[i]);
+		dprintf("os: %d\n", gUBootOS);
+		dprintf("gd @ %p\n", gGD);
+		dprintf("gd->bd @ %p\n", gGD->bd);
+	}
+	
 //	mmu_init();
 
 	// wait a bit to give the user the opportunity to press a key



From mmu_man at mail.berlios.de  Thu Aug 13 03:24:46 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 03:24:46 +0200
Subject: [Haiku-commits] r32292 -
	haiku/trunk/headers/private/kernel/boot/platform/u-boot
Message-ID: <200908130124.n7D1OkwK000454@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 03:24:44 +0200 (Thu, 13 Aug 2009)
New Revision: 32292
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32292&view=rev

Modified:
   haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_kernel_args.h
   haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_stage2_args.h
Log:
- cleanup,
- assign (c) to Haiku Inc as it's just empty anyway.


Modified: haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_kernel_args.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_kernel_args.h	2009-08-13 01:15:21 UTC (rev 32291)
+++ haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_kernel_args.h	2009-08-13 01:24:44 UTC (rev 32292)
@@ -1,7 +1,7 @@
 /*
-** Copyright 2003, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
-*/
+ * Copyright 2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef KERNEL_BOOT_PLATFORM_UBOOT_KERNEL_ARGS_H
 #define KERNEL_BOOT_PLATFORM_UBOOT_KERNEL_ARGS_H
 
@@ -20,4 +20,4 @@
 	char dummy;
 } platform_kernel_args;
 
-#endif	/* KERNEL_BOOT_PLATFORM_OPENFIRMWARE_KERNEL_ARGS_H */
+#endif	/* KERNEL_BOOT_PLATFORM_UBOOT_KERNEL_ARGS_H */

Modified: haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_stage2_args.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_stage2_args.h	2009-08-13 01:15:21 UTC (rev 32291)
+++ haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_stage2_args.h	2009-08-13 01:24:44 UTC (rev 32292)
@@ -1,9 +1,9 @@
 /*
-** Copyright 2003, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
-*/
-#ifndef KERNEL_BOOT_PLATFORM_BIOS_IA32_STAGE2_H
-#define KERNEL_BOOT_PLATFORM_BIOS_IA32_STAGE2_H
+ * Copyright 2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef KERNEL_BOOT_PLATFORM_UBOOT_STAGE2_H
+#define KERNEL_BOOT_PLATFORM_UBOOT_STAGE2_H
 
 #ifndef KERNEL_BOOT_STAGE2_ARGS_H
 #	error This file is included from <boot/stage2_args.h> only
@@ -12,4 +12,4 @@
 struct platform_stage2_args {
 };
 
-#endif	/* KERNEL_BOOT_PLATFORM_BIOS_IA32_STAGE2_H */
+#endif	/* KERNEL_BOOT_PLATFORM_UBOOT_STAGE2_H */



From mmlr at mail.berlios.de  Thu Aug 13 04:00:50 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Thu, 13 Aug 2009 04:00:50 +0200
Subject: [Haiku-commits] r32293 - haiku/trunk/src/system/kernel/slab
Message-ID: <200908130200.n7D20oSN002832@sheep.berlios.de>

Author: mmlr
Date: 2009-08-13 04:00:49 +0200 (Thu, 13 Aug 2009)
New Revision: 32293
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32293&view=rev

Modified:
   haiku/trunk/src/system/kernel/slab/Slab.cpp
Log:
We already panic to indicate that something's wrong, no real need to crash
afterwards instead of returning gracefully.


Modified: haiku/trunk/src/system/kernel/slab/Slab.cpp
===================================================================
--- haiku/trunk/src/system/kernel/slab/Slab.cpp	2009-08-13 01:24:44 UTC (rev 32292)
+++ haiku/trunk/src/system/kernel/slab/Slab.cpp	2009-08-13 02:00:49 UTC (rev 32293)
@@ -417,8 +417,10 @@
 internal_alloc(size_t size, uint32 flags)
 {
 	if (flags & CACHE_DURING_BOOT) {
-		if ((sInitialPointer + size) > sInitialLimit)
+		if ((sInitialPointer + size) > sInitialLimit) {
 			panic("internal_alloc: ran out of initial space");
+			return NULL;
+		}
 
 		uint8 *buffer = sInitialPointer;
 		sInitialPointer += size;
@@ -489,8 +491,10 @@
 
 	TRACE_CACHE(cache, "delete pages %p (%ld)", pages, id);
 
-	if (id < B_OK)
+	if (id < 0) {
 		panic("object cache: freeing unknown area");
+		return;
+	}
 
 	delete_area(id);
 
@@ -688,7 +692,7 @@
 {
 	void *pages = (void *)ROUNDDOWN((addr_t)slab->pages, B_PAGE_SIZE);
 	if (create_area(cache->name, &pages, B_EXACT_ADDRESS, cache->slab_size,
-		B_ALREADY_WIRED, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA) < B_OK)
+		B_ALREADY_WIRED, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA) < 0)
 		panic("failed to create_area()");
 }
 
@@ -994,8 +998,10 @@
 static void
 object_cache_return_to_slab(object_cache *cache, slab *source, void *object)
 {
-	if (source == NULL)
+	if (source == NULL) {
 		panic("object_cache: free'd object has no slab");
+		return;
+	}
 
 	ParanoiaChecker _(source);
 
@@ -1309,6 +1315,7 @@
 	if (link == NULL) {
 		panic("object cache: requested object %p missing from hash table",
 			object);
+		return NULL;
 	}
 	return link->parent;
 }
@@ -1333,10 +1340,15 @@
 HashedObjectCache::UnprepareObject(slab *source, void *object)
 {
 	Link *link = hash_table.Lookup(object);
-	if (link == NULL)
+	if (link == NULL) {
 		panic("object cache: requested object missing from hash table");
-	if (link->parent != source)
+		return;
+	}
+
+	if (link->parent != source) {
 		panic("object cache: slab mismatch");
+		return;
+	}
 
 	hash_table.Remove(link);
 	free_link(link);



From mmu_man at mail.berlios.de  Thu Aug 13 06:32:08 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 06:32:08 +0200
Subject: [Haiku-commits] r32294 - haiku/trunk/src/system/libroot/os/arch/arm
Message-ID: <200908130432.n7D4W83E019075@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 06:32:05 +0200 (Thu, 13 Aug 2009)
New Revision: 32294
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32294&view=rev

Modified:
   haiku/trunk/src/system/libroot/os/arch/arm/byteorder.S
Log:
[ARM]
- fixed copyright,
- added a naive armv5 implementation for __swap_int{16,32}.


Modified: haiku/trunk/src/system/libroot/os/arch/arm/byteorder.S
===================================================================
--- haiku/trunk/src/system/libroot/os/arch/arm/byteorder.S	2009-08-13 02:00:49 UTC (rev 32293)
+++ haiku/trunk/src/system/libroot/os/arch/arm/byteorder.S	2009-08-13 04:32:05 UTC (rev 32294)
@@ -1,7 +1,7 @@
 /*
-** Copyright 2003, Axel D?fler, axeld at pinc-software.de. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
-*/
+ * Copyright 2009, Johannes Wischert. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
 
 #include <asm_defs.h>
 
@@ -14,7 +14,13 @@
 		rev16 r0,r0;
 #else
 #warning IMPLEMENT_ME
+		and r1,r0,#0x000000ff
+		and r2,r0,#0x0000ff00
+		mov r1,r1,LSL #8
+		mov r2,r2,ROR #8
+		orr r0,r1,r2
 #endif
+		mov pc,lr
 FUNCTION_END(__swap_int16)
 
 /* uint32 __swap_int32(uint32 value)
@@ -24,7 +30,16 @@
 		rev r0,r0;
 #else
 #warning IMPLEMENT_ME
+		mov r3,#0xff000000
+		orr r3,#0x0000ff00
+		and r1,r0,r3
+		mov r1,r1,ROR #24
+		mov r3,r3,ROR #8
+		and r2,r0,r3
+		mov r2,r2,ROR #8
+		orr r0,r1,r2
 #endif
+		mov pc,lr
 FUNCTION_END(__swap_int32)
 
 /* uint64 __swap_int64(uint64 value)
@@ -39,6 +54,7 @@
 #else
 #warning IMPLEMENT_ME
 #endif
+		mov pc,lr
 FUNCTION_END(__swap_int64)
 
 /* TODO: The following functions can surely be optimized. A simple optimization



From revol at free.fr  Thu Aug 13 06:39:09 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Thu, 13 Aug 2009 06:39:09 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32286_-_haiku/trunk/src/system/boot/pl?=
 =?utf-8?q?atform/bios=5Fia32?=
In-Reply-To: <1e42d8c50908121648w57ce8c61h25165fbcf54e8f8a@mail.gmail.com>
Message-ID: <269813364-BeMail@laptop>

> On Wed, Aug 12, 2009 at 17:48, axeld at BerliOS<axeld at mail.berlios.de
> > wrote:
> >
> > * Disabled multiboot for now, as it breaks the PXE build.
> 
> How would one configure/jam for the PXE build?
> Currently Build-O-Matic isn't tracking it.
> Also, fwiw, most of the boot floppies aren't being tracked either.

Something like
HAIKU_BOOT_PLATFORM=pxe_ia32 jam -q haiku_loader

(just the loader is different).

Fran?ois.


From mmu_man at mail.berlios.de  Thu Aug 13 07:28:37 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 07:28:37 +0200
Subject: [Haiku-commits] r32295 - in haiku/trunk: build/jam/board/overo
	build/jam/board/verdex headers/private/kernel/boot/platform/u-boot
	src/system/boot/platform/u-boot
	src/system/boot/platform/u-boot/arch/arm
Message-ID: <200908130528.n7D5SbVL017122@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 07:28:30 +0200 (Thu, 13 Aug 2009)
New Revision: 32295
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32295&view=rev

Added:
   haiku/trunk/headers/private/kernel/boot/platform/u-boot/uimage.h
   haiku/trunk/src/system/boot/platform/u-boot/uimage.cpp
Modified:
   haiku/trunk/build/jam/board/overo/BoardSetup
   haiku/trunk/build/jam/board/verdex/BoardSetup
   haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_stage2_args.h
   haiku/trunk/src/system/boot/platform/u-boot/Jamfile
   haiku/trunk/src/system/boot/platform/u-boot/arch/arm/shell.S
   haiku/trunk/src/system/boot/platform/u-boot/devices.cpp
   haiku/trunk/src/system/boot/platform/u-boot/start2.c
Log:
[ARM]
- don't clobber the parameter regs in the entry point,
- fix entry point address for netbsd loader emulation,
- added a gUImage global to point to the uimage blob with the tgz,
- added tgz info to platform stage2 args,
- add simple uimage support, just dumps the header and gets the nth blob in the image, (seems we have a bug in the math code, some infos don't print),
- made devices.cpp use them to publish the MemoryDisk,
- add an haiku_loader_nbsd.ub target which puts both the loader and kernel_arm for now (need to replace with the tgz).


Modified: haiku/trunk/build/jam/board/overo/BoardSetup
===================================================================
--- haiku/trunk/build/jam/board/overo/BoardSetup	2009-08-13 04:32:05 UTC (rev 32294)
+++ haiku/trunk/build/jam/board/overo/BoardSetup	2009-08-13 05:28:30 UTC (rev 32295)
@@ -11,7 +11,7 @@
 HAIKU_BOARD_LOADER_BASE = 0x80008000 ;
 # entry points (raw binary, and netbsd loader emulation)
 HAIKU_BOARD_LOADER_ENTRY_RAW = 0x80008000 ;
-HAIKU_BOARD_LOADER_ENTRY_NBSD = 0x80008004 ;
+HAIKU_BOARD_LOADER_ENTRY_NBSD = 0x80008008 ;
 
 # load address for haiku_loader uimage
 # (must be different than real load address)
@@ -36,7 +36,9 @@
 
 # autoboot script
 HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME = gumstix-factory.script ;
-HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT = "if mmcinit; then \
+HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT = "\
+setenv bootargs debug_screen true; \
+if mmcinit; then \
 	fatload mmc 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader.ub; \
 	bootm $(HAIKU_BOARD_LOADER_UIBASE); \
 fi" ;
@@ -44,6 +46,7 @@
 HAIKU_BOARD_SDIMAGE_FILES =
 	haiku_loader
 	haiku_loader.ub
+	haiku_loader_nbsd.ub
 	$(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME)
 ;
 

Modified: haiku/trunk/build/jam/board/verdex/BoardSetup
===================================================================
--- haiku/trunk/build/jam/board/verdex/BoardSetup	2009-08-13 04:32:05 UTC (rev 32294)
+++ haiku/trunk/build/jam/board/verdex/BoardSetup	2009-08-13 05:28:30 UTC (rev 32295)
@@ -10,7 +10,7 @@
 HAIKU_BOARD_LOADER_BASE = 0xa2000000 ;
 # entry points (raw binary, and netbsd loader emulation)
 HAIKU_BOARD_LOADER_ENTRY_RAW = 0xa2000000 ;
-HAIKU_BOARD_LOADER_ENTRY_NBSD = 0xa2000004 ;
+HAIKU_BOARD_LOADER_ENTRY_NBSD = 0xa2000008 ;
 
 # load address for haiku_loader uimage
 # (must be different than real load address)
@@ -46,14 +46,17 @@
 # autoboot script
 HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME = gumstix-factory.script ;
 
-HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT = "if mmcinit; then \
-	fatload mmc 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader.ub; \
+HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT = "\
+setenv bootargs debug_screen true; \
+if mmcinit; then \
+	fatload mmc 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader_nbsd.ub; \
 	bootm $(HAIKU_BOARD_LOADER_UIBASE); \
 fi" ;
 
 HAIKU_BOARD_SDIMAGE_FILES = 
 	haiku_loader
-	haiku_loader.ub 
+	haiku_loader.ub
+	haiku_loader_nbsd.ub
 	$(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME)
 ;
 

Modified: haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_stage2_args.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_stage2_args.h	2009-08-13 04:32:05 UTC (rev 32294)
+++ haiku/trunk/headers/private/kernel/boot/platform/u-boot/platform_stage2_args.h	2009-08-13 05:28:30 UTC (rev 32295)
@@ -10,6 +10,8 @@
 #endif
 
 struct platform_stage2_args {
+	void *boot_tgz_data;
+	uint32 boot_tgz_size;
 };
 
 #endif	/* KERNEL_BOOT_PLATFORM_UBOOT_STAGE2_H */

Added: haiku/trunk/headers/private/kernel/boot/platform/u-boot/uimage.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/platform/u-boot/uimage.h	2009-08-13 04:32:05 UTC (rev 32294)
+++ haiku/trunk/headers/private/kernel/boot/platform/u-boot/uimage.h	2009-08-13 05:28:30 UTC (rev 32295)
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Fran?ois Revol, revol at free.fr
+ */
+#ifndef KERNEL_BOOT_PLATFORM_UBOOT_UIMAGE_H
+#define KERNEL_BOOT_PLATFORM_UBOOT_UIMAGE_H
+
+#include <SupportDefs.h>
+
+/* same type and constant names as U-Boot */
+
+#define IH_TYPE_STANDALONE 1
+#define IH_TYPE_KERNEL 2
+#define IH_TYPE_RAMDISK 3
+#define IH_TYPE_MULTI 4
+
+#define IH_COMP_NONE 0
+
+#define IH_MAGIC 0x27051956
+#define IH_NMLEN 32
+
+typedef struct image_header {
+	uint32 ih_magic;
+	uint32 ih_hcrc;
+	uint32 ih_time;
+	uint32 ih_size;
+	uint32 ih_load;
+	uint32 ih_ep;
+	uint32 ih_dcrc;
+	uint8 ih_os;
+	uint8 ih_arch;
+	uint8 ih_type;
+	uint8 ih_comp;
+	char ih_name[IH_NMLEN];
+} image_header_t;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void dump_uimage(struct image_header *image);
+bool image_multi_getimg(struct image_header *image, uint32 idx, 
+	uint32 *data, uint32 *size);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/* KERNEL_BOOT_PLATFORM_UBOOT_UIMAGE_H */

Modified: haiku/trunk/src/system/boot/platform/u-boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-13 04:32:05 UTC (rev 32294)
+++ haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-13 05:28:30 UTC (rev 32295)
@@ -22,7 +22,7 @@
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
 
 KernelMergeObject boot_platform_u-boot.o :
-	start.S
+	shell.S
 	start2.c
 	debug.c
 	console.cpp
@@ -31,6 +31,7 @@
 	keyboard.cpp
 	menu.cpp
 	cpu.cpp
+	uimage.cpp
 	video.cpp
 	mmu.cpp	
 	# generic
@@ -96,12 +97,14 @@
 	Depends $(image) : $(data) ;
 	LocalClean clean : $(image) ;
 	MKIMAGE_ARGS on $(image) = $(args) ;
+	colon on $(image) = ":" ;
+	local files = $(data:G=) ;
 	BuildUImage1 $(image) : $(data) ;
 }
 
 actions BuildUImage1
 {
-	mkimage $(MKIMAGE_ARGS) -d $(>) $(<)
+	mkimage $(MKIMAGE_ARGS) -d $(>:J=$(colon)) $(<)
 }
 
 rule BuildUImageScript script : content
@@ -170,8 +173,12 @@
 	-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_RAW)
 		-n 'haiku_loader' ;
 
+BuildUImage haiku_loader_nbsd.ub : haiku_loader kernel_arm : 
+	-A arm -O $(uImageFakeOS) -T multi -C none
+	-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_NBSD)
+		-n 'haiku_loader' ;
+
 if $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) {
-	
 	BuildUImageScript $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) : 
 		$(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT) ;
 }
@@ -187,6 +194,8 @@
 # SD/mmc image targets
 BuildUBootSDImage haiku.mmc : $(HAIKU_BOARD_SDIMAGE_FILES) ;
 
+SEARCH on [ FGristFiles shell.S ]
+	= [ FDirName $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) arch $(TARGET_ARCH) ] ;
 SEARCH on [ FGristFiles text_menu.cpp ]
 	= [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;
 

Modified: haiku/trunk/src/system/boot/platform/u-boot/arch/arm/shell.S
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/arch/arm/shell.S	2009-08-13 04:32:05 UTC (rev 32294)
+++ haiku/trunk/src/system/boot/platform/u-boot/arch/arm/shell.S	2009-08-13 05:28:30 UTC (rev 32295)
@@ -18,7 +18,7 @@
  * ELF entry
  */
 SYMBOL(_start):
-	mov	r0,#0
+	mov	r4,#0
 	b	_start_common
 SYMBOL_END(_start_raw)
 SYMBOL_END(_start)
@@ -27,20 +27,20 @@
  * called from bootm with netbsd loader compatible args
  */
 SYMBOL(_start_netbsd):
-	mov	r0,#1
+	mov	r4,#1
 	b	_start_common
 SYMBOL_END(_start_netbsd)
 
 
 
 SYMBOL(_start_common):
-	strb	r0,gUBootOS
+	strb	r4,gUBootOS
 	str	r8,gUBootGlobalData
 	/* ... */
-	ldrb	r0,gUBootOS
-	cmp	r0,#0
+	ldrb	r4,gUBootOS
+	cmp	r4,#0
 	beq	start_raw
-	cmp	r0,#1
+	cmp	r4,#1
 	beq	start_netbsd
 	mov	pc,lr
 SYMBOL_END(_start_common)
@@ -51,6 +51,9 @@
 SYMBOL(gUBootGlobalData):
 	.long   0
 SYMBOL_END(gUBootGlobalData)
+SYMBOL(gUImage):
+	.long   0
+SYMBOL_END(gUImage)
 SYMBOL(gUBootOS):
 	.byte   0
 SYMBOL_END(gUBootOS)

Modified: haiku/trunk/src/system/boot/platform/u-boot/devices.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/devices.cpp	2009-08-13 04:32:05 UTC (rev 32294)
+++ haiku/trunk/src/system/boot/platform/u-boot/devices.cpp	2009-08-13 05:28:30 UTC (rev 32295)
@@ -23,13 +23,14 @@
 status_t 
 platform_add_boot_device(struct stage2_args *args, NodeList *devicesList)
 {
-#warning ARM: correct/configurable "initrd" location	
-	uint8* data = (uint8*)0xa5000000;
-	size_t size = 0;
-
 	TRACE("platform_add_boot_device\n");
 
-	MemoryDisk* disk = new(nothrow) MemoryDisk(data, size, "boot.tgz");
+	if (!args->platform.boot_tgz_data || !args->platform.boot_tgz_size)
+		return B_DEVICE_NOT_FOUND;
+
+	MemoryDisk* disk = new(nothrow) MemoryDisk(
+		(const uint8 *)args->platform.boot_tgz_data, 
+		args->platform.boot_tgz_size, "boot.tgz");
 	if (!disk) {
 		dprintf("platform_add_boot_device(): Could not create MemoryDisk !\n");
 		return B_NO_MEMORY;

Modified: haiku/trunk/src/system/boot/platform/u-boot/start2.c
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/start2.c	2009-08-13 04:32:05 UTC (rev 32294)
+++ haiku/trunk/src/system/boot/platform/u-boot/start2.c	2009-08-13 05:28:30 UTC (rev 32295)
@@ -8,6 +8,7 @@
 #include "console.h"
 #include "cpu.h"
 #include "smp.h"
+#include "uimage.h"
 #include "keyboard.h"
 
 #include <KernelExport.h>
@@ -31,6 +32,8 @@
 extern int main(stage2_args *args);
 extern void _start(void);
 extern int start_raw(int argc, char **argv);
+extern void dump_uimage(struct image_header *image);
+extern struct image_header *gUImage;
 
 
 uint32 sBootOptions;
@@ -116,13 +119,14 @@
 extern uint8 gUBootOS;
 
 int
-start_netbsd(struct board_info *bd, struct uimage *image, const char *consdev,
+start_netbsd(struct board_info *bd, struct image_header *image, const char *consdev,
 	const char *cmdline)
 {
 	const char *argv[] = { "haiku", cmdline };
 	int argc = 1;
 	if (cmdline)
 		argc++;
+	gUImage = image;
 	start_raw(argc, argv);
 }
 
@@ -142,6 +146,13 @@
 	call_ctors();
 	args.heap_size = HEAP_SIZE;
 	args.arguments = NULL;
+	args.platform.boot_tgz_data = NULL;
+	args.platform.boot_tgz_size = 0;
+	
+	// if we get passed a uimage, try to find the second blob
+	if (gUImage)
+		image_multi_getimg(gUImage, 1, &args.platform.boot_tgz_data,
+			&args.platform.boot_tgz_size);
 
 
 	serial_init();
@@ -156,6 +167,9 @@
 		dprintf("os: %d\n", gUBootOS);
 		dprintf("gd @ %p\n", gGD);
 		dprintf("gd->bd @ %p\n", gGD->bd);
+		dprintf("uimage @ %p\n", gUImage);
+		if (gUImage)
+			dump_uimage(gUImage);
 	}
 	
 //	mmu_init();

Added: haiku/trunk/src/system/boot/platform/u-boot/uimage.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/uimage.cpp	2009-08-13 04:32:05 UTC (rev 32294)
+++ haiku/trunk/src/system/boot/platform/u-boot/uimage.cpp	2009-08-13 05:28:30 UTC (rev 32295)
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2009, Fran?ois Revol, revol at free.fr.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <uimage.h>
+
+#include <KernelExport.h>
+#include <ByteOrder.h>
+
+
+void dump_uimage(struct image_header *image)
+{
+	uint32 *sizes;
+	int i;
+	
+	dprintf("uimage @ %p:\n", image);
+	
+	if (!image)
+		return;
+	dprintf("magic: %x\n", ntohl(image->ih_magic));
+	dprintf("size: %x\n", ntohl(image->ih_size));
+	dprintf("load: %p\n", (void *)ntohl(image->ih_load));
+	dprintf("ep: %d\n", (void *)ntohl(image->ih_ep));
+	dprintf("os: %d\n", image->ih_os);
+	dprintf("arch: %d\n", image->ih_arch);
+	dprintf("type: %d\n", image->ih_type);
+	dprintf("comp: %d\n", image->ih_comp);
+	dprintf("name: '%32.32s'\n", image->ih_name);
+	if (image->ih_type != IH_TYPE_MULTI)
+		return;
+	sizes = (uint32 *)(&image[1]);
+	for (i = 0; sizes[i]; i++) {
+		dprintf("contents[%d] :", i);
+		dprintf("%x bytes\n", (int)ntohl(sizes[i]));
+	}
+}
+
+
+bool
+image_multi_getimg(struct image_header *image, uint32 idx, uint32 *data, uint32 *size)
+{
+	uint32 *sizes;
+	uint32 base;
+	int i, count = 0;
+
+	sizes = (uint32 *)(&image[1]);
+	base = (uint32)sizes;
+	for (i = 0; sizes[i]; i++)
+		count++;
+	base += (count + 1) * sizeof(uint32);
+	for (i = 0; sizes[i] && idx < i; i++) {
+		if (idx == i) {
+			*data = base;
+			*size = ntohl(sizes[i]);
+			return true;
+		}
+	}
+	return false;
+}
+



From axeld at pinc-software.de  Thu Aug 13 09:08:55 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 13 Aug 2009 09:08:55 +0200 CEST
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
 data/beos_mime/application
In-Reply-To: <529204761-BeMail@Gaspode>
Message-ID: <1894310839-BeMail@zon>

"Bruno Albuquerque" <bga at bug-br.org.br> wrote:
> I forgot to mention that even with this, I do not mind this change. I 
> can simply replace mountvolume by an explicit mount call. It is just 
> that "mountvolume Data" is easier than "mount -t bfs ...".

You can just leave out the "-t" option - mount will always recognize 
the file system if possible (in the same way as mountvolume does).

Bye,
   Axel.



From leavengood at mail.berlios.de  Thu Aug 13 09:28:12 2009
From: leavengood at mail.berlios.de (leavengood at BerliOS)
Date: Thu, 13 Aug 2009 09:28:12 +0200
Subject: [Haiku-commits] r32296 - haiku/trunk/src/apps/showimage
Message-ID: <200908130728.n7D7SCEr020072@sheep.berlios.de>

Author: leavengood
Date: 2009-08-13 09:28:11 +0200 (Thu, 13 Aug 2009)
New Revision: 32296
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32296&view=rev

Modified:
   haiku/trunk/src/apps/showimage/EntryMenuItem.cpp
   haiku/trunk/src/apps/showimage/EntryMenuItem.h
   haiku/trunk/src/apps/showimage/PrintOptionsWindow.cpp
   haiku/trunk/src/apps/showimage/PrintOptionsWindow.h
   haiku/trunk/src/apps/showimage/ProgressWindow.cpp
   haiku/trunk/src/apps/showimage/ProgressWindow.h
   haiku/trunk/src/apps/showimage/ResizerWindow.cpp
   haiku/trunk/src/apps/showimage/ResizerWindow.h
   haiku/trunk/src/apps/showimage/ShowImage.rdef
   haiku/trunk/src/apps/showimage/ShowImageApp.cpp
   haiku/trunk/src/apps/showimage/ShowImageApp.h
   haiku/trunk/src/apps/showimage/ShowImageSettings.cpp
   haiku/trunk/src/apps/showimage/ShowImageSettings.h
   haiku/trunk/src/apps/showimage/ShowImageStatusView.cpp
   haiku/trunk/src/apps/showimage/ShowImageStatusView.h
   haiku/trunk/src/apps/showimage/ShowImageUndo.cpp
   haiku/trunk/src/apps/showimage/ShowImageUndo.h
Log:
- Cleanup to match coding guidelines. The header cleanup might have been
  overkill.
- Updating some copyright years.
- ResizerWindow.h was not self-contained.

Some of the other files were skipped due to complexity and planned code changes.



Modified: haiku/trunk/src/apps/showimage/EntryMenuItem.cpp
===================================================================
--- haiku/trunk/src/apps/showimage/EntryMenuItem.cpp	2009-08-13 05:28:30 UTC (rev 32295)
+++ haiku/trunk/src/apps/showimage/EntryMenuItem.cpp	2009-08-13 07:28:11 UTC (rev 32296)
@@ -1,48 +1,33 @@
-/*****************************************************************************/
-// EntryMenuItem
-// Written by Michael Pfeiffer
-//
-// EntryMenuItem.cpp
-//
-//
-// Copyright (c) 2003 OpenBeOS Project
-//
-// 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.
-/*****************************************************************************/
+/*
+ * Copyright 2003-2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer, laplace at haiku-os.org
+ */
 
+#include "EntryMenuItem.h"
+
 #include <Node.h>
 #include <NodeInfo.h>
 
-#include "EntryMenuItem.h"
 
-EntryMenuItem::EntryMenuItem(entry_ref* ref, const char* label, BMessage* message, char shortcut, uint32 modifiers)
-	: BMenuItem(label, message, shortcut, modifiers)
-	, fEntry(*ref)
-	, fSmallIcon(NULL)
+EntryMenuItem::EntryMenuItem(entry_ref* ref, const char* label,
+	BMessage* message, char shortcut, uint32 modifiers)
+	:
+	BMenuItem(label, message, shortcut, modifiers),
+	fEntry(*ref),
+	fSmallIcon(NULL)
 {
 }
 
+
 EntryMenuItem::~EntryMenuItem()
 {
 	delete fSmallIcon;
 }
 
+
 void 
 EntryMenuItem::GetContentSize(float* width, float* height)
 {
@@ -53,6 +38,7 @@
 	}
 }
 
+
 void
 EntryMenuItem::DrawContent()
 {
@@ -60,7 +46,7 @@
 	BPoint pos(view->PenLocation());
 
 	if (fSmallIcon == NULL) {
-		fSmallIcon = LoadIcon(); // load on demand
+		fSmallIcon = LoadIcon(); // Load on demand
 	}
 
 	view->MovePenBy(kTextIndent, 0);
@@ -72,17 +58,20 @@
 	}
 }
 
+
 BBitmap*
 EntryMenuItem::GetIcon(BMimeType* mimeType)
 {
 	BBitmap* icon;
-	icon = new BBitmap(BRect(0, 0, kIconSize-1, kIconSize-1), B_CMAP8);
+	icon = new BBitmap(BRect(0, 0, kIconSize - 1, kIconSize - 1), B_CMAP8);
 	if (mimeType->GetIcon(icon, B_MINI_ICON) != B_OK) {
-		delete icon; icon = NULL;
+		delete icon;
+		icon = NULL;
 	}
 	return icon;
 }
 
+
 BBitmap*
 EntryMenuItem::LoadIcon()
 {
@@ -93,20 +82,21 @@
 
 	// Note: BNodeInfo::GetTrackerIcon does not work as expected!
 
-	// try to get the icon stored in file attribute
+	// Try to get the icon stored in file attribute
 	icon = new BBitmap(BRect(0, 0, kIconSize-1, kIconSize-1), B_CMAP8);
 	if (info.GetIcon(icon, B_MINI_ICON) == B_OK) {
 		return icon;
 	} 
-	delete icon; icon = NULL;
+	delete icon;
+	icon = NULL;
 
-	// get the icon from type
+	// Get the icon from type
 	if (info.GetType(type) == B_OK) {
 		BMimeType mimeType(type);
 		BMimeType superType;
 		if (mimeType.InitCheck() == B_OK) {
 			icon = GetIcon(&mimeType);
-			// or super type
+			// Or super type
 			if (icon == NULL && mimeType.GetSupertype(&superType) == B_OK) {
 				icon = GetIcon(&superType);
 			}
@@ -115,3 +105,4 @@
 
 	return icon;
 }
+

Modified: haiku/trunk/src/apps/showimage/EntryMenuItem.h
===================================================================
--- haiku/trunk/src/apps/showimage/EntryMenuItem.h	2009-08-13 05:28:30 UTC (rev 32295)
+++ haiku/trunk/src/apps/showimage/EntryMenuItem.h	2009-08-13 07:28:11 UTC (rev 32296)
@@ -1,59 +1,42 @@
-/*****************************************************************************/
-// EntryMenuItem
-// Written by Michael Pfeiffer
-//
-// EntryMenuItem.h
-//
-//
-// Copyright (c) 2003 OpenBeOS Project
-//
-// 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.
-/*****************************************************************************/
+/*
+ * Copyright 2003-2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer, laplace at haiku-os.org
+ */
+#ifndef ENTRY_MENU_ITEM_H
+#define ENTRY_MENU_ITEM_H
 
-#ifndef _EntryMenuItem_h
-#define _EntryMenuItem_h
 
 #include <Bitmap.h>
 #include <Entry.h>
 #include <MenuItem.h>
 #include <Mime.h>
 
-class EntryMenuItem : public BMenuItem
-{
+
+class EntryMenuItem : public BMenuItem {
 public:
-	EntryMenuItem(entry_ref* entry, const char* label, BMessage* message, char shortcut = 0, uint32 modifiers = 0);
-	~EntryMenuItem();
+				EntryMenuItem(entry_ref* entry, const char* label,
+					BMessage* message, char shortcut = 0, uint32 modifiers = 0);
+				~EntryMenuItem();
 	
-	void GetContentSize(float* width, float* height);
-	void DrawContent();
+	void 		GetContentSize(float* width, float* height);
+	void 		DrawContent();
 	
 private:
+	BBitmap* 	GetIcon(BMimeType* mimeType);
+	BBitmap* 	LoadIcon();
+
+	entry_ref 	fEntry;
+	BBitmap* 	fSmallIcon;
+
 	enum {
 		kIconSize = 16,
 		kTextIndent = kIconSize + 4,
 	};
-	
-	BBitmap* GetIcon(BMimeType* mimeType);
-	BBitmap* LoadIcon();
-
-	entry_ref fEntry;
-	BBitmap* fSmallIcon;
 };
 
-#endif
+
+#endif	// ENTRY_MENU_ITEM_H
+

Modified: haiku/trunk/src/apps/showimage/PrintOptionsWindow.cpp
===================================================================
--- haiku/trunk/src/apps/showimage/PrintOptionsWindow.cpp	2009-08-13 05:28:30 UTC (rev 32295)
+++ haiku/trunk/src/apps/showimage/PrintOptionsWindow.cpp	2009-08-13 07:28:11 UTC (rev 32296)
@@ -1,55 +1,41 @@
-/*****************************************************************************/
-// PrintOptionsWindow
-// Written by Michael Pfeiffer
-//
-// PrintOptionsWindow.cpp
-//
-//
-// Copyright (c) 2003 OpenBeOS Project
-//
-// 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.
-/*****************************************************************************/
+/*
+ * Copyright 2003-2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer, laplace at haiku-os.org
+ */
 
+#include "PrintOptionsWindow.h"
+
+#include <stdio.h> // for sprintf
+#include <stdlib.h> // for atof
+
 #include <Box.h>
 #include <Button.h>
 #include <String.h>
-#include <stdio.h> // for sprintf
-#include <stdlib.h> // for atof
 
-#include "PrintOptionsWindow.h"
 #include "ShowImageConstants.h"
 
+
 PrintOptions::PrintOptions()
-	: fOption(kFitToPage)
-	, fZoomFactor(1.0)
-	, fDPI(72.0)
-	, fWidth(1024 / 72.0)
-	, fHeight(768 / 72.0)
+	:
+	fOption(kFitToPage),
+	fZoomFactor(1.0),
+	fDPI(72.0),
+	fWidth(1024/72.0),
+	fHeight(768/72.0)
 {
 }
 
+
 void
 PrintOptions::SetBounds(BRect rect)
 {
 	fBounds = rect;
 }
 
+
 void
 PrintOptions::SetZoomFactor(float f)
 {
@@ -57,6 +43,7 @@
 	fDPI = 72.0 / fZoomFactor;
 }
 
+
 void
 PrintOptions::SetDPI(float dpi)
 {
@@ -64,13 +51,15 @@
 	fZoomFactor = 72.0 / dpi;
 }
 
+
 void
 PrintOptions::SetWidth(float w)
 {
 	fWidth = w;
-	fHeight = (fBounds.Height()+1) * w / (fBounds.Width()+1);
+	fHeight = (fBounds.Height() + 1) * w / (fBounds.Width() + 1);
 }
 
+
 void
 PrintOptions::SetHeight(float h)
 {
@@ -78,20 +67,24 @@
 	fHeight = h;
 }
 
-PrintOptionsWindow::PrintOptionsWindow(BPoint at, PrintOptions *options, BWindow* listener)
-	: BWindow(BRect(at.x, at.y, at.x+300, at.y+200), "Print Options", 
-	B_TITLED_WINDOW_LOOK, B_MODAL_SUBSET_WINDOW_FEEL, 
-	B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
-	, fPrintOptions(options)
-	, fCurrentOptions(*options)
-	, fListener(listener)
-	, fStatus(B_ERROR)
+
+PrintOptionsWindow::PrintOptionsWindow(BPoint at, PrintOptions *options,
+	BWindow* listener)
+	: 
+	BWindow(BRect(at.x, at.y, at.x + 300, at.y + 200), "Print Options", 
+		B_TITLED_WINDOW_LOOK, B_MODAL_SUBSET_WINDOW_FEEL, 
+		B_NOT_ZOOMABLE | B_NOT_RESIZABLE),
+	fPrintOptions(options),
+	fCurrentOptions(*options),
+	fListener(listener),
+	fStatus(B_ERROR)
 {
 	AddToSubset(listener);
 	Setup();
 	Show();
 }
 
+
 PrintOptionsWindow::~PrintOptionsWindow()
 {
 	BMessage msg(MSG_PRINT);
@@ -99,8 +92,10 @@
 	fListener.SendMessage(&msg);
 }
 
+
 BRadioButton*
-PrintOptionsWindow::AddRadioButton(BView* view, BPoint& at, const char* name, const char* label, uint32 what, bool selected)
+PrintOptionsWindow::AddRadioButton(BView* view, BPoint& at, const char* name,
+	const char* label, uint32 what, bool selected)
 {
 	BRect rect(0, 0, 100, 20);
 	BRadioButton* button;
@@ -113,8 +108,10 @@
 	return button;
 }
 
+
 BTextControl*
-PrintOptionsWindow::AddTextControl(BView* view, BPoint& at, const char* name, const char* label, float value, float divider, uint32 what)
+PrintOptionsWindow::AddTextControl(BView* view, BPoint& at, const char* name,
+	const char* label, float value, float divider, uint32 what)
 {
 	BRect rect(0, 0, divider + 45, 20);
 	BTextControl* text;
@@ -129,6 +126,7 @@
 	return text;	
 }
 
+
 void
 PrintOptionsWindow::Setup()
 {
@@ -145,24 +143,33 @@
 		B_PLAIN_BORDER);
 	AddChild(panel);
 	
-	AddRadioButton(panel, at, "fit_to_page", "Fit Image to Page", kMsgFitToPageSelected, op == PrintOptions::kFitToPage);
+	AddRadioButton(panel, at, "fit_to_page", "Fit Image to Page",
+		kMsgFitToPageSelected, op == PrintOptions::kFitToPage);
 	textAt = at;
-	rb = AddRadioButton(panel, at, "zoom_factor", "Zoom Factor in %: ", kMsgZoomFactorSelected, op == PrintOptions::kZoomFactor);
+	rb = AddRadioButton(panel, at, "zoom_factor", "Zoom Factor in %: ",
+		kMsgZoomFactorSelected, op == PrintOptions::kZoomFactor);
 	textAt.x = rb->Bounds().right + 5;
-	fZoomFactor = AddTextControl(panel, textAt, "zoom_factor_text", "", fCurrentOptions.ZoomFactor()*100, 0, kMsgZoomFactorChanged);
+	fZoomFactor = AddTextControl(panel, textAt, "zoom_factor_text", "",
+		fCurrentOptions.ZoomFactor()*100, 0, kMsgZoomFactorChanged);
 
 	textAt = at;
-	rb = AddRadioButton(panel, at, "dpi", "DPI: ", kMsgDPISelected, op == PrintOptions::kDPI);
+	rb = AddRadioButton(panel, at, "dpi", "DPI: ", kMsgDPISelected,
+		op == PrintOptions::kDPI);
 	textAt.x = rb->Bounds().right + 5;
-	fDPI = AddTextControl(panel, textAt, "dpi_text", "", fCurrentOptions.DPI(), 0, kMsgDPIChanged);
+	fDPI = AddTextControl(panel, textAt, "dpi_text", "", fCurrentOptions.DPI(),
+		0, kMsgDPIChanged);
 
-	rb = AddRadioButton(panel, at, "width_and_height", "Resize To (in 1/72 Inches):", kMsgWidthAndHeightSelected, op == PrintOptions::kWidth || op == PrintOptions::kHeight); 
+	rb = AddRadioButton(panel, at, "width_and_height",
+		"Resize To (in 1/72 Inches):", kMsgWidthAndHeightSelected,
+		op == PrintOptions::kWidth || op == PrintOptions::kHeight); 
 	at.x += 15;
 	textAt = at;	
-	fWidth = AddTextControl(panel, textAt, "width", "Width: ", fCurrentOptions.Width(), 40, kMsgWidthChanged);
+	fWidth = AddTextControl(panel, textAt, "width", "Width: ",
+		fCurrentOptions.Width(), 40, kMsgWidthChanged);
 	textAt = at;
 	textAt.x += fWidth->Bounds().Width() + 5;
-	fHeight = AddTextControl(panel, textAt, "height", "Height: ", fCurrentOptions.Height(), 40, kMsgHeightChanged);
+	fHeight = AddTextControl(panel, textAt, "height", "Height: ",
+		fCurrentOptions.Height(), 40, kMsgHeightChanged);
 
 	at.x = 0;
 	at.y = textAt.y;
@@ -172,7 +179,8 @@
 	
 	at.y += 10;
 	rect.OffsetBy(at);
-	button = new BButton(rect, "job setup", "Job Setup", new BMessage(kMsgJobSetup));
+	button = new BButton(rect, "job setup", "Job Setup",
+		new BMessage(kMsgJobSetup));
 	panel->AddChild(button);
 	button->ResizeToPreferred();
 
@@ -182,11 +190,14 @@
 	ResizeTo(fHeight->Frame().right + kIndent, button->Frame().bottom + kIndent);
 
 	// center button 
-	button->MoveTo((Bounds().Width()-button->Bounds().Width())/2, button->Frame().top);
+	button->MoveTo((Bounds().Width()-button->Bounds().Width())/2,
+		button->Frame().top);
 }
 
+
 enum PrintOptions::Option
-PrintOptionsWindow::MsgToOption(uint32 what) {
+PrintOptionsWindow::MsgToOption(uint32 what)
+{
 	switch (what) {
 		case kMsgFitToPageSelected: return PrintOptions::kFitToPage;
 		case kMsgZoomFactorSelected: return PrintOptions::kZoomFactor;
@@ -196,6 +207,7 @@
 	return PrintOptions::kFitToPage;
 }
 
+
 bool
 PrintOptionsWindow::GetValue(BTextControl* text, float* value)
 {
@@ -203,6 +215,7 @@
 	return true;
 }
 
+
 void
 PrintOptionsWindow::SetValue(BTextControl* text, float value)
 {
@@ -216,6 +229,7 @@
 	text->SetModificationMessage(msg);
 }
 
+
 void
 PrintOptionsWindow::MessageReceived(BMessage* msg)
 {
@@ -229,7 +243,8 @@
 			break;
 		
 		case kMsgZoomFactorChanged:
-			if (GetValue(fZoomFactor, &value) && fCurrentOptions.ZoomFactor() != value) {
+			if (GetValue(fZoomFactor, &value)
+				&& fCurrentOptions.ZoomFactor() != value) {
 				fCurrentOptions.SetZoomFactor(value/100);
 				SetValue(fDPI, fCurrentOptions.DPI());
 			}
@@ -263,3 +278,4 @@
 			BWindow::MessageReceived(msg);
 	}
 }
+

Modified: haiku/trunk/src/apps/showimage/PrintOptionsWindow.h
===================================================================
--- haiku/trunk/src/apps/showimage/PrintOptionsWindow.h	2009-08-13 05:28:30 UTC (rev 32295)
+++ haiku/trunk/src/apps/showimage/PrintOptionsWindow.h	2009-08-13 07:28:11 UTC (rev 32296)
@@ -1,42 +1,29 @@
-/*****************************************************************************/
-// PrintOptionsWindow
-// Written by Michael Pfeiffer
-//
-// PrintOptionsWindow.h
-//
-//
-// Copyright (c) 2003 OpenBeOS Project
-//
-// 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.
-/*****************************************************************************/
+/*
+ * Copyright 2003-2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer, laplace at haiku-os.org
+ */
+#ifndef PRINT_OPTIONS_WINDOW_H
+#define PRINT_OPTIONS_WINDOW_H
 
-#ifndef _PrintOptionsWindow_h
-#define _PrintOptionsWindow_h
 
-#include <Window.h>
-#include <RadioButton.h>
-#include <TextControl.h>
 #include <Messenger.h>
+#include <RadioButton.h>
 #include <Rect.h>
+#include <TextControl.h>
+#include <Window.h>
 
+
 class PrintOptions {
 public:
+					PrintOptions();
+	
+	// bounds of the image
+	BRect 			Bounds() const { return fBounds; }
+	void 			SetBounds(BRect bounds);
+
 	enum Option {
 		kFitToPage,
 		kZoomFactor,
@@ -45,50 +32,60 @@
 		kHeight,
 		kNumberOfOptions
 	};
-
-	PrintOptions();
+	enum Option		Option() const { return fOption; }
+	void 			SetOption(enum Option op) { fOption = op; }
 	
-	// bounds of the image
-	BRect Bounds() const { return fBounds; }
-	void SetBounds(BRect bounds);
-
-	enum Option Option() const { return fOption; }
-	void SetOption(enum Option op) { fOption = op; }
-	// zoomFactor = 72.0 / dpi
-	float ZoomFactor() const { return fZoomFactor; }
-	void SetZoomFactor(float z);
-	float DPI() const { return fDPI; }
-	void SetDPI(float dpi);
-	// setting width/height updates height/width to keep aspect ratio
-	float Width() const { return fWidth; }
-	float Height() const { return fHeight; }
-	void SetWidth(float width);
-	void SetHeight(float height);
+	// ZoomFactor = 72.0 / dpi
+	float 			ZoomFactor() const { return fZoomFactor; }
+	void 			SetZoomFactor(float z);
+	float 			DPI() const { return fDPI; }
+	void 			SetDPI(float dpi);
 	
+	// Setting width/height updates height/width to keep aspect ratio
+	float 			Width() const { return fWidth; }
+	float 			Height() const { return fHeight; }
+	void 			SetWidth(float width);
+	void 			SetHeight(float height);
+	
 private:
-	BRect fBounds;
-	enum Option fOption;
-	float fZoomFactor;
-	float fDPI;
-	float fWidth, fHeight; // 1/72 Inches
+	BRect 			fBounds;
+	enum Option		fOption;
+	float 			fZoomFactor;
+	float 			fDPI;
+	float 			fWidth, fHeight; // 1/72 Inches
 };
 
-class PrintOptionsWindow : public BWindow
-{
+class PrintOptionsWindow : public BWindow {
 public:
-	PrintOptionsWindow(BPoint at, PrintOptions* options, BWindow* listener);
-	~PrintOptionsWindow();
+								PrintOptionsWindow(BPoint at,
+									PrintOptions* options, BWindow* listener);
+								~PrintOptionsWindow();
 
-	void MessageReceived(BMessage* msg);
+	void 			MessageReceived(BMessage* msg);
 
 private:
-	BRadioButton* AddRadioButton(BView* view, BPoint& at, const char* name, const char* label, uint32 what, bool selected);
-	BTextControl* AddTextControl(BView* view, BPoint& at, const char* name, const char* label, float value, float divider, uint32 what);
-	void Setup();
-	enum PrintOptions::Option MsgToOption(uint32 what);
-	bool GetValue(BTextControl* text, float* value);
-	void SetValue(BTextControl* text, float value);
+	BRadioButton* 				AddRadioButton(BView* view, BPoint& at,
+									const char* name, const char* label,
+									uint32 what, bool selected);
+
+	BTextControl* 				AddTextControl(BView* view, BPoint& at, 
+									const char* name, const char* label,
+									float value, float divider, uint32 what);
+
+	void						Setup();
+	enum PrintOptions::Option	MsgToOption(uint32 what);
+	bool						GetValue(BTextControl* text, float* value);
+	void						SetValue(BTextControl* text, float value);
 	
+	PrintOptions* 				fPrintOptions;
+	PrintOptions 				fCurrentOptions;
+	BMessenger 					fListener;
+	status_t 					fStatus;
+	BTextControl* 				fZoomFactor;
+	BTextControl* 				fDPI;
+	BTextControl* 				fWidth;
+	BTextControl* 				fHeight;
+
 	enum {
 		kMsgOK = 'mPOW',
 		kMsgFitToPageSelected,
@@ -106,15 +103,8 @@
 		kIndent = 5,
 		kLineSkip = 5,
 	};
-	
-	PrintOptions* fPrintOptions;
-	PrintOptions fCurrentOptions;
-	BMessenger fListener;
-	status_t fStatus;
-	BTextControl* fZoomFactor;
-	BTextControl* fDPI;
-	BTextControl* fWidth;
-	BTextControl* fHeight;
 };
 
+
 #endif
+

Modified: haiku/trunk/src/apps/showimage/ProgressWindow.cpp
===================================================================
--- haiku/trunk/src/apps/showimage/ProgressWindow.cpp	2009-08-13 05:28:30 UTC (rev 32295)
+++ haiku/trunk/src/apps/showimage/ProgressWindow.cpp	2009-08-13 07:28:11 UTC (rev 32296)
@@ -3,23 +3,24 @@
  * Distributed under the terms of the MIT License.
  */
 
-
 #include "ProgressWindow.h"
-#include "ShowImageConstants.h"
 
+#include <stdio.h>
+
 #include <Autolock.h>
 #include <MessageRunner.h>
 #include <Screen.h>
 #include <StatusBar.h>
 
-#include <stdio.h>
+#include "ShowImageConstants.h"
 
 
 static const uint32 kMsgShow = 'show';
 
 
 ProgressWindow::ProgressWindow(BWindow* referenceWindow)
-	: BWindow(BRect(0, 0, 250, 100), "Progress Monitor",
+	:
+	BWindow(BRect(0, 0, 250, 100), "Progress Monitor",
 		B_MODAL_WINDOW_LOOK, B_FLOATING_APP_WINDOW_FEEL,
 		B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS),
 	fRunner(NULL)

Modified: haiku/trunk/src/apps/showimage/ProgressWindow.h
===================================================================
--- haiku/trunk/src/apps/showimage/ProgressWindow.h	2009-08-13 05:28:30 UTC (rev 32295)
+++ haiku/trunk/src/apps/showimage/ProgressWindow.h	2009-08-13 07:28:11 UTC (rev 32296)
@@ -13,20 +13,21 @@
 
 
 class ProgressWindow : public BWindow {
-	public:
-		ProgressWindow(BWindow* referenceWindow);
-		virtual ~ProgressWindow();
+public:
+					ProgressWindow(BWindow* referenceWindow);
+	virtual			~ProgressWindow();
 
-		virtual void MessageReceived(BMessage *message);
+	virtual void 	MessageReceived(BMessage *message);
 
-		void Start();
-		void Stop();
+			void	Start();
+			void	Stop();
 
-	private:
-		BStatusBar*		fStatusBar;
-		BMessageRunner*	fRunner;
-		bool			fRetrievedUpdate;
-		bool			fRetrievedShow;
+private:
+	BStatusBar*		fStatusBar;
+	BMessageRunner*	fRunner;
+	bool			fRetrievedUpdate;
+	bool			fRetrievedShow;
 };
 
+
 #endif	// PROGRESS_WINDOW_H

Modified: haiku/trunk/src/apps/showimage/ResizerWindow.cpp
===================================================================
--- haiku/trunk/src/apps/showimage/ResizerWindow.cpp	2009-08-13 05:28:30 UTC (rev 32295)
+++ haiku/trunk/src/apps/showimage/ResizerWindow.cpp	2009-08-13 07:28:11 UTC (rev 32296)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Copyright 2004-2005 yellowTAB GmbH. All Rights Reserverd.
  * Copyright 2006 Bernd Korz. All Rights Reserved
  * Distributed under the terms of the MIT License.
@@ -7,11 +7,14 @@
  * Authors:
  *		yellowTAB GmbH
  *		Bernd Korz
- *      Michael Pfeiffer
- *      Ryan Leavengood
+ *		Michael Pfeiffer
+ *		Ryan Leavengood
  */
 
+#include "ResizerWindow.h"
 
+#include <stdlib.h>
+
 #include <Box.h>
 #include <Button.h>
 #include <CheckBox.h>
@@ -20,9 +23,6 @@
 #include <String.h>
 #include <TextControl.h>
 
-#include <stdlib.h>
-
-#include "ResizerWindow.h"
 #include "ShowImageConstants.h"
 
 
@@ -37,10 +37,12 @@
 
 
 ResizerWindow::ResizerWindow(BMessenger target, int32 width, int32 height)
-	: BWindow(BRect(100, 100, 300, 300), "Resize", B_FLOATING_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
-	, fOriginalWidth(width)
-	, fOriginalHeight(height)
-	, fTarget(target)
+	:
+	BWindow(BRect(100, 100, 300, 300), "Resize", B_FLOATING_WINDOW,
+		B_NOT_ZOOMABLE | B_NOT_RESIZABLE),
+	fOriginalWidth(width),
+	fOriginalHeight(height),
+	fTarget(target)
 {
 	BView* back_view = new BView(Bounds(), "", B_FOLLOW_ALL, B_WILL_DRAW);
 	back_view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -51,8 +53,10 @@
 	const float column2 = max_c(widthLabelWidth, heightLabelWidth);
 
 	const float textControlWidth = column2 + back_view->StringWidth("999999");
-	const float keepAspectRatioLabelWidth = 20 + back_view->StringWidth(kKeepAspectRatioLabel);
-	const float width2 = 2 * kHorizontalIndent + max_c(textControlWidth, keepAspectRatioLabelWidth);
+	const float keepAspectRatioLabelWidth = 20
+		+ back_view->StringWidth(kKeepAspectRatioLabel);
+	const float width2 = 2 * kHorizontalIndent
+		+ max_c(textControlWidth, keepAspectRatioLabelWidth);
 	
 	ResizeTo(width2+1, Bounds().Height()+1);
 	
@@ -62,17 +66,20 @@
 	
 	BString widthValue;
 	widthValue << width;
-	fWidth = new BTextControl(rect, "width", kWidthLabel, widthValue.String(), NULL);
+	fWidth = new BTextControl(rect, "width", kWidthLabel, widthValue.String(),
+		NULL);
 	fWidth->SetModificationMessage(new BMessage(kWidthModifiedMsg));
 	AddControl(back_view, fWidth, column2, rect);
 					
 	BString heightValue;
 	heightValue << height;	
-	fHeight = new BTextControl(rect, "height", kHeightLabel, heightValue.String(), NULL);
+	fHeight = new BTextControl(rect, "height", kHeightLabel,
+		heightValue.String(), NULL);
 	fHeight->SetModificationMessage(new BMessage(kHeightModifiedMsg));
 	AddControl(back_view, fHeight, column2, rect);
 	
-	fAspectRatio = new BCheckBox(rect, "Ratio", kKeepAspectRatioLabel, new BMessage(kWidthModifiedMsg));
+	fAspectRatio = new BCheckBox(rect, "Ratio", kKeepAspectRatioLabel,
+		new BMessage(kWidthModifiedMsg));
 	fAspectRatio->SetValue(B_CONTROL_ON);
 	AddControl(back_view, fAspectRatio, column2, rect);
 	
@@ -87,8 +94,14 @@
 }
 
 
+ResizerWindow::~ResizerWindow()
+{
+}
+
+
 void
-ResizerWindow::AddControl(BView* view, BControl* control, float column2, BRect& rect)
+ResizerWindow::AddControl(BView* view, BControl* control, float column2,
+	BRect& rect)
 {
 	float width, height;
 	view->AddChild(control);
@@ -116,7 +129,8 @@
 	line.right -= 3;
 	line.top = rect.top;
 	line.bottom = line.top + lineWidth - 1;
-	BBox* separatorLine = new BBox(line, "", B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW | B_FRAME_EVENTS, B_PLAIN_BORDER);
+	BBox* separatorLine = new BBox(line, "", B_FOLLOW_LEFT_RIGHT,
+		B_WILL_DRAW | B_FRAME_EVENTS, B_PLAIN_BORDER);
 	view->AddChild(separatorLine);
 	rect.OffsetBy(0, kLineDistance + lineWidth);
 }
@@ -177,7 +191,8 @@
 		case kWidthModifiedMsg:
 			if (fAspectRatio->Value() == B_CONTROL_ON) {
 				int w = atoi(fWidth->Text());
-				int h = (int)((int64)w * (int64) fOriginalHeight / (int64) fOriginalWidth);
+				int h = (int)((int64)w * (int64) fOriginalHeight
+					/ (int64) fOriginalWidth);
 				BString height;
 				height << h;
 				BMessage* msg = new BMessage(*fHeight->ModificationMessage());
@@ -189,7 +204,8 @@
 		case kHeightModifiedMsg:
 			if (fAspectRatio->Value() == B_CONTROL_ON) {
 				int h = atoi(fHeight->Text());
-				int w = (int)((int64)h * (int64) fOriginalWidth / (int64) fOriginalHeight);
+				int w = (int)((int64)h * (int64) fOriginalWidth
+					/ (int64) fOriginalHeight);
 				BString width;
 				width << w;
 				BMessage* msg = new BMessage(*fWidth->ModificationMessage());
@@ -213,11 +229,6 @@
 }
 
 
-ResizerWindow::~ResizerWindow()
-{
-}
-
-
 bool
 ResizerWindow::QuitRequested()
 {

Modified: haiku/trunk/src/apps/showimage/ResizerWindow.h
===================================================================
--- haiku/trunk/src/apps/showimage/ResizerWindow.h	2009-08-13 05:28:30 UTC (rev 32295)
+++ haiku/trunk/src/apps/showimage/ResizerWindow.h	2009-08-13 07:28:11 UTC (rev 32296)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Copyright 2004-2005 yellowTAB GmbH. All Rights Reserverd.
  * Copyright 2006 Bernd Korz. All Rights Reserved
  * Distributed under the terms of the MIT License.
@@ -7,15 +7,16 @@
  * Authors:
  *		yellowTAB GmbH
  *		Bernd Korz
- *      Michael Pfeiffer
- *      Ryan Leavengood
+ *		Michael Pfeiffer
+ *		Ryan Leavengood
  */
-#ifndef _RESIZER_WINDOW_H
-#define _RESIZER_WINDOW_H
+#ifndef RESIZER_WINDOW_H
+#define RESIZER_WINDOW_H
 
 
+#include <Messenger.h>
+#include <View.h>
 #include <Window.h>
-#include <View.h>
 
 class BCheckBox;
 class BControl;
@@ -24,7 +25,8 @@
 
 class ResizerWindow : public BWindow {
 	public:			
-						ResizerWindow(BMessenger target, int32 width, int32 height );
+						ResizerWindow(BMessenger target, int32 width,
+							int32 height );
 
 		virtual void	MessageReceived(BMessage* msg);
 		virtual	bool	QuitRequested();
@@ -36,7 +38,8 @@
 			kActivateMsg = 'RSRa',
 				// activates the window
 			kUpdateMsg,
-				// provides the new size of the image in two "int32" fields "width" and "height"
+				// provides the new size of the image in two "int32" fields
+				// "width" and "height"
 		};
 
 	private:
@@ -47,10 +50,10 @@
 			kApplyMsg,
 		};
 
-		void AddControl(BView* parent, BControl* control, float column2,
-			BRect& rect);
-		void AddSeparatorLine(BView* parent, BRect& rect);
-		void LeftAlign(BControl* control);
+		void			AddControl(BView* parent, BControl* control,
+							float column2, BRect& rect);
+		void			AddSeparatorLine(BView* parent, BRect& rect);
+		void			LeftAlign(BControl* control);
 
 		BTextControl*	fWidth;
 		BTextControl*	fHeight;
@@ -58,9 +61,10 @@
 		BButton*		fApply;
 		// the original size of the image use for aspect ratio calculation
 		// to avoid rounding errors
-		int32           fOriginalWidth;
-		int32           fOriginalHeight;
+		int32			fOriginalWidth;
+		int32			fOriginalHeight;
 		BMessenger		fTarget;
 };
 
-#endif	// _RESIZER_WINDOW_H
+
+#endif	// RESIZER_WINDOW_H

Modified: haiku/trunk/src/apps/showimage/ShowImage.rdef
===================================================================

[... truncated: 808 lines follow ...]


From leavengood at mail.berlios.de  Thu Aug 13 09:30:48 2009
From: leavengood at mail.berlios.de (leavengood at BerliOS)
Date: Thu, 13 Aug 2009 09:30:48 +0200
Subject: [Haiku-commits] r32297 - in haiku/trunk: headers/private/shared
	src/kits/shared
Message-ID: <200908130730.n7D7UmNo020446@sheep.berlios.de>

Author: leavengood
Date: 2009-08-13 09:30:48 +0200 (Thu, 13 Aug 2009)
New Revision: 32297
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32297&view=rev

Modified:
   haiku/trunk/headers/private/shared/AboutWindow.h
   haiku/trunk/src/kits/shared/AboutWindow.cpp
Log:
Made some char* params const to fix a GCC4 warning in ShowImage (the only
current client of this AFAIK.) They should have been const to begin with...


Modified: haiku/trunk/headers/private/shared/AboutWindow.h
===================================================================
--- haiku/trunk/headers/private/shared/AboutWindow.h	2009-08-13 07:28:11 UTC (rev 32296)
+++ haiku/trunk/headers/private/shared/AboutWindow.h	2009-08-13 07:30:48 UTC (rev 32297)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 Haiku, Inc.
+ * Copyright 2007-2009 Haiku, Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -14,8 +14,8 @@
 
 class BAboutWindow {
 	public:
-		BAboutWindow(char *appName, int32 firstCopyrightYear,
-			const char **authors, char *extraInfo = NULL);
+		BAboutWindow(const char *appName, int32 firstCopyrightYear,
+			const char **authors, const char *extraInfo = NULL);
 		virtual ~BAboutWindow();
 
 		void Show();

Modified: haiku/trunk/src/kits/shared/AboutWindow.cpp
===================================================================
--- haiku/trunk/src/kits/shared/AboutWindow.cpp	2009-08-13 07:28:11 UTC (rev 32296)
+++ haiku/trunk/src/kits/shared/AboutWindow.cpp	2009-08-13 07:30:48 UTC (rev 32297)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 Haiku, Inc.
+ * Copyright 2007-2009 Haiku, Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -16,8 +16,8 @@
 #include <time.h>
 
 
-BAboutWindow::BAboutWindow(char *appName, int32 firstCopyrightYear,
-	const char **authors, char *extraInfo)
+BAboutWindow::BAboutWindow(const char *appName, int32 firstCopyrightYear,
+	const char **authors, const char *extraInfo)
 {
 	fAppName = new BString(appName);
 



From bgroff at mail.berlios.de  Thu Aug 13 10:38:59 2009
From: bgroff at mail.berlios.de (bgroff at BerliOS)
Date: Thu, 13 Aug 2009 10:38:59 +0200
Subject: [Haiku-commits] r32298 -
	haiku/trunk/src/system/kernel/disk_device_manager
Message-ID: <200908130838.n7D8cxPO026652@sheep.berlios.de>

Author: bgroff
Date: 2009-08-13 10:38:58 +0200 (Thu, 13 Aug 2009)
New Revision: 32298
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32298&view=rev

Modified:
   haiku/trunk/src/system/kernel/disk_device_manager/disk_device_manager.cpp
Log:
* Cleaned up pointer style
* Added new line that was missing from previous commit.


Modified: haiku/trunk/src/system/kernel/disk_device_manager/disk_device_manager.cpp
===================================================================
--- haiku/trunk/src/system/kernel/disk_device_manager/disk_device_manager.cpp	2009-08-13 07:30:48 UTC (rev 32297)
+++ haiku/trunk/src/system/kernel/disk_device_manager/disk_device_manager.cpp	2009-08-13 08:38:58 UTC (rev 32298)
@@ -18,11 +18,11 @@
 
 
 // write_lock_disk_device
-disk_device_data *
+disk_device_data*
 write_lock_disk_device(partition_id partitionID)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) {
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	if (KDiskDevice* device = manager->RegisterDevice(partitionID, false)) {
 		if (device->WriteLock())
 			return device->DeviceData();
 		// Only unregister, when the locking fails. The guarantees, that the
@@ -37,8 +37,8 @@
 void
 write_unlock_disk_device(partition_id partitionID)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) {
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	if (KDiskDevice* device = manager->RegisterDevice(partitionID, false)) {
 		bool isLocked = device->IsWriteLocked();
 		if (isLocked) {
 			device->WriteUnlock();
@@ -50,11 +50,11 @@
 
 
 // read_lock_disk_device
-disk_device_data *
+disk_device_data*
 read_lock_disk_device(partition_id partitionID)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) {
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	if (KDiskDevice* device = manager->RegisterDevice(partitionID, false)) {
 		if (device->ReadLock())
 			return device->DeviceData();
 		// Only unregister, when the locking fails. The guarantees, that the
@@ -69,8 +69,8 @@
 void
 read_unlock_disk_device(partition_id partitionID)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) {
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	if (KDiskDevice* device = manager->RegisterDevice(partitionID, false)) {
 		bool isLocked = device->IsReadLocked(false);
 		if (isLocked) {
 			device->ReadUnlock();
@@ -83,11 +83,11 @@
 
 // find_disk_device
 int32
-find_disk_device(const char *path)
+find_disk_device(const char* path)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
 	partition_id id = -1;
-	if (KDiskDevice *device = manager->RegisterDevice(path)) {
+	if (KDiskDevice* device = manager->RegisterDevice(path)) {
 		id = device->ID();
 		device->Unregister();
 	}
@@ -97,11 +97,11 @@
 
 // find_partition
 int32
-find_partition(const char *path)
+find_partition(const char* path)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
 	partition_id id = -1;
-	if (KPartition *partition = manager->RegisterPartition(path)) {
+	if (KPartition* partition = manager->RegisterPartition(path)) {
 		id = partition->ID();
 		partition->Unregister();
 	}
@@ -110,31 +110,31 @@
 
 
 // get_disk_device
-disk_device_data *
+disk_device_data*
 get_disk_device(partition_id partitionID)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	KDiskDevice *device = manager->FindDevice(partitionID, false);
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	KDiskDevice* device = manager->FindDevice(partitionID, false);
 	return (device ? device->DeviceData() : NULL);
 }
 
 
 // get_partition
-partition_data *
+partition_data*
 get_partition(partition_id partitionID)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	KPartition *partition = manager->FindPartition(partitionID);
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	KPartition* partition = manager->FindPartition(partitionID);
 	return (partition ? partition->PartitionData() : NULL);
 }
 
 
 // get_parent_partition
-partition_data *
+partition_data*
 get_parent_partition(partition_id partitionID)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	KPartition *partition = manager->FindPartition(partitionID);
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	KPartition* partition = manager->FindPartition(partitionID);
 	if (partition && partition->Parent())
 		return partition->Parent()->PartitionData();
 	return NULL;
@@ -142,12 +142,12 @@
 
 
 // get_child_partition
-partition_data *
+partition_data*
 get_child_partition(partition_id partitionID, int32 index)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KPartition *partition = manager->FindPartition(partitionID)) {
-		if (KPartition *child = partition->ChildAt(index))
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	if (KPartition* partition = manager->FindPartition(partitionID)) {
+		if (KPartition* child = partition->ChildAt(index))
 			return child->PartitionData();
 	}
 	return NULL;
@@ -157,8 +157,8 @@
 int
 open_partition(partition_id partitionID, int openMode)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	KPartition *partition = manager->FindPartition(partitionID);
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	KPartition* partition = manager->FindPartition(partitionID);
 	if (partition == NULL)
 		return B_BAD_VALUE;
 
@@ -170,14 +170,15 @@
 	return fd;
 }
 
+
 // create_child_partition
-partition_data *
+partition_data*
 create_child_partition(partition_id partitionID, int32 index, off_t offset,
 	off_t size, partition_id childID)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KPartition *partition = manager->FindPartition(partitionID)) {
-		KPartition *child = NULL;
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	if (KPartition* partition = manager->FindPartition(partitionID)) {
+		KPartition* child = NULL;
 		if (partition->CreateChild(childID, index, offset, size, &child)
 				== B_OK) {
 			return child->PartitionData();
@@ -196,9 +197,9 @@
 bool
 delete_partition(partition_id partitionID)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	if (KPartition *partition = manager->FindPartition(partitionID)) {
-		if (KPartition *parent = partition->Parent())
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	if (KPartition* partition = manager->FindPartition(partitionID)) {
+		if (KPartition* parent = partition->Parent())
 			return parent->RemoveChild(partition);
 	}
 	return false;
@@ -234,8 +235,8 @@
 get_default_partition_content_name(partition_id partitionID,
 	const char* fileSystemName, char* buffer, size_t bufferSize)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
-	KPartition *partition = manager->RegisterPartition(partitionID);
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
+	KPartition* partition = manager->RegisterPartition(partitionID);
 	if (partition == NULL)
 		return B_ENTRY_NOT_FOUND;
 
@@ -265,11 +266,11 @@
 
 // find_disk_system
 disk_system_id
-find_disk_system(const char *name)
+find_disk_system(const char* name)
 {
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
 	if (ManagerLocker locker = manager) {
-		if (KDiskSystem *diskSystem = manager->FindDiskSystem(name))
+		if (KDiskSystem* diskSystem = manager->FindDiskSystem(name))
 			return diskSystem->ID();
 	}
 	return -1;
@@ -281,9 +282,9 @@
 update_disk_device_job_progress(disk_job_id jobID, float progress)
 {
 #if 0
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
 	if (ManagerLocker locker = manager) {
-		if (KDiskDeviceJob *job = manager->FindJob(jobID)) {
+		if (KDiskDeviceJob* job = manager->FindJob(jobID)) {
 			job->UpdateProgress(progress);
 			return true;
 		}
@@ -295,12 +296,12 @@
 
 // update_disk_device_job_extra_progress
 bool
-update_disk_device_job_extra_progress(disk_job_id jobID, const char *info)
+update_disk_device_job_extra_progress(disk_job_id jobID, const char* info)
 {
 #if 0
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
 	if (ManagerLocker locker = manager) {
-		if (KDiskDeviceJob *job = manager->FindJob(jobID)) {
+		if (KDiskDeviceJob* job = manager->FindJob(jobID)) {
 			job->UpdateExtraProgress(info);
 			return true;
 		}
@@ -312,12 +313,12 @@
 
 // set_disk_device_job_error_message
 bool
-set_disk_device_job_error_message(disk_job_id jobID, const char *message)
+set_disk_device_job_error_message(disk_job_id jobID, const char* message)
 {
 #if 0
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
 	if (ManagerLocker locker = manager) {
-		if (KDiskDeviceJob *job = manager->FindJob(jobID)) {
+		if (KDiskDeviceJob* job = manager->FindJob(jobID)) {
 			job->SetErrorMessage(message);
 			return true;
 		}
@@ -334,13 +335,13 @@
 {
 #if 0
 	bool paused = false;
-	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
+	KDiskDeviceManager* manager = KDiskDeviceManager::Default();
 	do {
 		sem_id pauseSemaphore = -1;
 		if (ManagerLocker locker = manager) {
 			// get the job and the respective job queue
-			if (KDiskDeviceJob *job = manager->FindJob(jobID)) {
-				if (KDiskDeviceJobQueue *jobQueue = job->JobQueue()) {
+			if (KDiskDeviceJob* job = manager->FindJob(jobID)) {
+				if (KDiskDeviceJobQueue* jobQueue = job->JobQueue()) {
 					// terminate if canceled.
 					if (jobQueue->IsCanceled()) {
 						if (jobQueue->ShallReverse())



From stefano.ceccherini at gmail.com  Thu Aug 13 12:05:18 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 13 Aug 2009 12:05:18 +0200
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <171980761-BeMail@Gaspode>
References: <894b9700908120932m72c6299el8f1e30cc23356813@mail.gmail.com>
	<171980761-BeMail@Gaspode>
Message-ID: <894b9700908130305p435342a9k194e33f349a5fdd9@mail.gmail.com>

2009/8/13 Bruno Albuquerque <bga at bug-br.org.br>:

> So I tried it on a clean installation. When i start particles, the
> background is gray instead of black. It becomes black where particles
> travel through.

That happens here too, but I'm not sure if this isn't a problem of the
demo itself.
There's a (commented out) part in ParticlesII where the palette is
tested by drawing some rectangles on screen in different colors, and
that works correctly.

> Also, when exiting (ALT+Q), all colors in the Desktop
> are messed up.

That doesn't happen here, though. Neither on qemu nor on VirtualBox,
where I just tried a clean installation and a fresh checkout.

> Is it possible that you forgot to commit something?
>
> -Bruno

Nope, as I said, I also tried on a fresh checkout.

Anyway, I'm still working on this.


From stefano.ceccherini at gmail.com  Thu Aug 13 12:07:24 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 13 Aug 2009 12:07:24 +0200
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <32782561236-BeMail@zon>
References: <894b9700908120932m72c6299el8f1e30cc23356813@mail.gmail.com>
	<32782561236-BeMail@zon>
Message-ID: <894b9700908130307i2c9cf295t1fbd4be1d6c6c8c0@mail.gmail.com>

2009/8/12 Axel D?rfler <axeld at pinc-software.de>:

>> Also, I think some accelerants don't behave correctly wrt
>> WindowScreen. I think Rudolf knows best about this.
>
> I could imagine that the intel_extreme driver has problems with this,
> as I probably never really tested this (AFAIC remember) :-)
>
> Bye,
> ? Axel.

Yeah, in fact :-) That's what I'm using on the only real computer I have.
The biggest problem is that BWindowScreen can't setup a virtualscreen
having a double height (The PageFlipper demo uses that trick).


From axeld at mail.berlios.de  Thu Aug 13 12:23:10 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 12:23:10 +0200
Subject: [Haiku-commits] r32299 - haiku/trunk/src/apps/powerstatus
Message-ID: <200908131023.n7DANAXl007508@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 12:23:06 +0200 (Thu, 13 Aug 2009)
New Revision: 32299
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32299&view=rev

Modified:
   haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
Log:
* Further improved look.


Modified: haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp
===================================================================
--- haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-13 08:38:58 UTC (rev 32298)
+++ haiku/trunk/src/apps/powerstatus/PowerStatusView.cpp	2009-08-13 10:23:06 UTC (rev 32299)
@@ -181,23 +181,36 @@
 		percent = 100;
 
 	if (percent > 0) {
-		rgb_color base;
+		rect.InsetBy(gap, gap);
+		rgb_color base = {84, 84, 84, 255};
+		if (be_control_look != NULL) {
+			BRect empty = rect;
+			if (fHasBattery && percent > 0)
+				empty.left += empty.Width() * percent / 100.0;
+
+			be_control_look->DrawButtonBackground(this, empty, empty, base,
+				fHasBattery
+					? BControlLook::B_ACTIVATED : BControlLook::B_DISABLED,
+				fHasBattery && percent > 0
+					? (BControlLook::B_ALL_BORDERS
+						& ~BControlLook::B_LEFT_BORDER)
+					: BControlLook::B_ALL_BORDERS);
+		}
+
 		if (fHasBattery) {
 			if (percent <= 15)
 				base.set_to(180, 0, 0);
 			else
 				base.set_to(20, 180, 0);
-		} else
-			base.set_to(84, 84, 84);
 
-		rect.InsetBy(gap, gap);
-		rect.right = rect.left + rect.Width() * percent / 100.0;
+			rect.right = rect.left + rect.Width() * percent / 100.0;
 
-		if (be_control_look != NULL) {
-			be_control_look->DrawButtonBackground(this, rect, rect, base,
-				fHasBattery ? 0 : BControlLook::B_DISABLED);
-		} else
-			FillRect(rect);
+			if (be_control_look != NULL) {
+				be_control_look->DrawButtonBackground(this, rect, rect, base,
+					fHasBattery ? 0 : BControlLook::B_DISABLED);
+			} else
+				FillRect(rect);
+		}
 	}
 
 	SetHighColor(0, 0, 0);
@@ -243,11 +256,7 @@
 
 		if (iconRect.Width() + 1 >= kMinIconWidth
 			&& iconRect.Height() + 1 >= kMinIconHeight) {
-			// TODO: have real icons
-			//if (!fOnline)
-				_DrawBattery(iconRect);
-			//else
-			//	FillRect(iconRect);
+			_DrawBattery(iconRect);
 		} else {
 			// there is not enough space for the icon
 			iconRect.Set(0, 0, -1, -1);
@@ -346,9 +355,20 @@
 				width += ceilf(StringWidth(text)) + 4;
 		} else {
 			char text[256];
+			const char* open = "";
+			const char* close = "";
+			if (!fOnline) {
+				open = "(";
+				close = ")";
+			}
 			if (fHasBattery) {
-				snprintf(text, sizeof(text), "%ld%%\n%ld:%02ld\n%s",
-					fPercent, fTimeLeft / 3600, (fTimeLeft / 60) % 60,
+				size_t length = snprintf(text, sizeof(text), "%s%ld%%%s\n",
+					open, fPercent, close);
+				if (fTimeLeft) {
+					length += snprintf(text + length, sizeof(text) - length,
+						"%ld:%02ld\n", fTimeLeft / 3600, (fTimeLeft / 60) % 60);
+				}
+				length += snprintf(text + length, sizeof(text) - length, "%s",
 					fOnline ? "charging" : "discharging");
 			} else
 				strcpy(text, "no battery");
@@ -635,6 +655,8 @@
 void
 PowerStatusReplicant::_LoadSettings()
 {
+	fShowLabel = false;
+
 	BFile file;
 	if (_GetSettings(file, B_READ_ONLY) != B_OK)
 		return;



From jackburton at mail.berlios.de  Thu Aug 13 12:29:34 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Thu, 13 Aug 2009 12:29:34 +0200
Subject: [Haiku-commits] r32300 - haiku/trunk/src/kits/game
Message-ID: <200908131029.n7DATYKA008226@sheep.berlios.de>

Author: jackburton
Date: 2009-08-13 12:29:11 +0200 (Thu, 13 Aug 2009)
New Revision: 32300
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32300&view=rev

Modified:
   haiku/trunk/src/kits/game/WindowScreen.cpp
Log:
Move HideCursor() fom Show() to _Activate(), so it gets called also on workspace change.

Modified: haiku/trunk/src/kits/game/WindowScreen.cpp
===================================================================
--- haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-13 10:23:06 UTC (rev 32299)
+++ haiku/trunk/src/kits/game/WindowScreen.cpp	2009-08-13 10:29:11 UTC (rev 32300)
@@ -309,7 +309,6 @@
 	if (!fActivateState) {
 		release_sem(fActivateSem);
 		fActivateState = true;
-		be_app->HideCursor();
 	}
 }
 
@@ -702,6 +701,8 @@
 			return status;
 	}
 
+	be_app->HideCursor();
+
 	SetColorList(fPalette);
 	if (fDebugState && !fDebugFirst) {
 		SuspensionHook(true);



From stefano.ceccherini at gmail.com  Thu Aug 13 12:32:04 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 13 Aug 2009 12:32:04 +0200
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <894b9700908130305p435342a9k194e33f349a5fdd9@mail.gmail.com>
References: <894b9700908120932m72c6299el8f1e30cc23356813@mail.gmail.com>
	<171980761-BeMail@Gaspode>
	<894b9700908130305p435342a9k194e33f349a5fdd9@mail.gmail.com>
Message-ID: <894b9700908130332w1e1dc330yfc73b5bbcb788cf6@mail.gmail.com>

2009/8/13 Stefano Ceccherini <stefano.ceccherini at gmail.com>:

>> Also, when exiting (ALT+Q), all colors in the Desktop
>> are messed up.
>
> That doesn't happen here, though. Neither on qemu nor on VirtualBox,
> where I just tried a clean installation and a fresh checkout.

BTW, I just managed to reproduce this once in 20 runs. To do that, I
had to launch ParticlesII and then quit it immediately before it
showed the screen.
Moreover, this caused (once) the problem described in ticket #2658.
I suspect some race condition in app_server.


From bga at bug-br.org.br  Thu Aug 13 10:49:20 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Thu, 13 Aug 2009 10:49:20
Subject: [Haiku-commits] r32241 - haiku/trunk/src/kits/game
In-Reply-To: <894b9700908130332w1e1dc330yfc73b5bbcb788cf6@mail.gmail.com>
Message-ID: <1894660032-BeMail@Gaspode>

On Thu, 13 Aug 2009 12:32:04 +0200, Stefano Ceccherini said:

> >> Also, when exiting (ALT+Q), all colors in the Desktop
> >> are messed up.
> >
> > That doesn't happen here, though. Neither on qemu nor on 
> > VirtualBox,
> > where I just tried a clean installation and a fresh checkout.
> 
> BTW, I just managed to reproduce this once in 20 runs. To do that, I
> had to launch ParticlesII and then quit it immediately before it
> showed the screen.
> Moreover, this caused (once) the problem described in ticket #2658.
> I suspect some race condition in app_server.

And that could be triggered more easily in my machine as I have 4 
processors. I guess you are in the correct track. Also, I am pretty 
sure the reason the problem in #2658 is because, somehow, the app_server 
still thinks the resolution is the old one. In my case, I see this not 
by the fact that the Deskbar is in the wrong place (as it is not) but 
by the fact that the only region that is invalidated just after I leave 
full screen mode is the the one with the same size the scrren was in 
full screen, starting in the top-left corner.

in fact, I am pretty sure you can also see this invalidation problem 
with BDirectWindow. Start that Stars demo. Move the window so it is 
more to the top-left corner of the screen. Switch if to full screen 
mode (ALT+F) and then back to windowed mode (ALT+F again). You will 
notice that a region of the screen to the right and bellow the center 
shows some black dots where some stars were. That region of the screen 
was not invalidated when fullscreen mode was exited.

-Bruno



From pulkomandy at mail.berlios.de  Thu Aug 13 12:51:16 2009
From: pulkomandy at mail.berlios.de (pulkomandy at BerliOS)
Date: Thu, 13 Aug 2009 12:51:16 +0200
Subject: [Haiku-commits] r32301 -
	haiku/branches/components/gsoc-locale-kit/src/preferences/locale
Message-ID: <200908131051.n7DApGPM028211@sheep.berlios.de>

Author: pulkomandy
Date: 2009-08-13 12:51:15 +0200 (Thu, 13 Aug 2009)
New Revision: 32301
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32301&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
Log:
Added the full options menu to the short date drop down boxes.


Modified: haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-13 10:29:11 UTC (rev 32300)
+++ haiku/branches/components/gsoc-locale-kit/src/preferences/locale/TimeFormatSettingsView.cpp	2009-08-13 10:51:15 UTC (rev 32301)
@@ -122,34 +122,11 @@
 	// Short format
 	fShortDateExampleView = new BStringView("", "");
 
-	BMenu* menu = new BPopUpMenu("");
-	menu->AddItem(new BMenuItem("Day",
-		new BMessage(kSettingsContentsModified)));
-	menu->AddItem(new BMenuItem("Month",
-		new BMessage(kSettingsContentsModified)));
-	menu->AddItem(new BMenuItem("Year",
-		new BMessage(kSettingsContentsModified)));
-	fDateMenu[0] = new BMenuField("", menu);
+	for (int i = 0; i < 4; i++) {
+		CreateDateMenu(&fDateMenu[i]);
+	}
 
-	menu = new BPopUpMenu("");
-	menu->AddItem(new BMenuItem("Day",
-		new BMessage(kSettingsContentsModified)));
-	menu->AddItem(new BMenuItem("Month",
-		new BMessage(kSettingsContentsModified)));
-	menu->AddItem(new BMenuItem("Year",
-		new BMessage(kSettingsContentsModified)));
-	fDateMenu[1] = new BMenuField("", menu);
-
-	menu = new BPopUpMenu("");
-	menu->AddItem(new BMenuItem("Day",
-		new BMessage(kSettingsContentsModified)));
-	menu->AddItem(new BMenuItem("Month",
-		new BMessage(kSettingsContentsModified)));
-	menu->AddItem(new BMenuItem("Year",
-		new BMessage(kSettingsContentsModified)));
-	fDateMenu[2] = new BMenuField("", menu);
-
-	menu = new BPopUpMenu("Separator");
+	BPopUpMenu* menu = new BPopUpMenu("Separator");
 	menu->AddItem(new BMenuItem("None",
 		new BMessage(kSettingsContentsModified)));
 	menu->AddItem(new BMenuItem("Space",
@@ -365,12 +342,17 @@
 	f24HrRadioButton->SetTarget(this);
 	f12HrRadioButton->SetTarget(this);
 
-	// TODO do the same for the short date
 	for (int j = 0; j < 4; j++) {
 		for (int i = 0; i < fLongDateMenu[j]->Menu()->CountItems(); i++)
 			fLongDateMenu[j]->Menu()->SubmenuAt(i)->SetTargetForItems(this);
 		fLongDateSeparator[j]->SetTarget(this);
 	}
+
+	for (int j = 0; j < 3; j++) {
+		for (int i = 0; i < fDateMenu[j]->Menu()->CountItems(); i++)
+			fDateMenu[j]->Menu()->SubmenuAt(i)->SetTargetForItems(this);
+	}
+
 	fSeparatorMenuField->Menu()->SetTargetForItems(this);
 }
 



From axeld at mail.berlios.de  Thu Aug 13 13:06:30 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 13:06:30 +0200
Subject: [Haiku-commits] r32302 - haiku/trunk/src/preferences/screen
Message-ID: <200908131106.n7DB6UGT013233@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 13:06:14 +0200 (Thu, 13 Aug 2009)
New Revision: 32302
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32302&view=rev

Modified:
   haiku/trunk/src/preferences/screen/MonitorView.cpp
   haiku/trunk/src/preferences/screen/MonitorView.h
   haiku/trunk/src/preferences/screen/ScreenWindow.cpp
Log:
* Even though it might be a bit too crowded, the monitor preview now also
  shows the DPI of the chosen resolution. Better ideas welcome.
* Cleanup.


Modified: haiku/trunk/src/preferences/screen/MonitorView.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/MonitorView.cpp	2009-08-13 10:51:15 UTC (rev 32301)
+++ haiku/trunk/src/preferences/screen/MonitorView.cpp	2009-08-13 11:06:14 UTC (rev 32302)
@@ -11,27 +11,22 @@
 
 
 #include "MonitorView.h"
-#include "Constants.h"
 
+#include <stdio.h>
+
 #include <Roster.h>
 #include <Screen.h>
 
+#include "Constants.h"
 
-#ifndef __HAIKU__
-inline bool
-operator!=(const rgb_color& x, const rgb_color& y)
-{
-	return x.red != y.red || x.blue != y.blue || x.green != y.green;
-}
-#endif
 
-
 MonitorView::MonitorView(BRect rect, char *name, int32 width, int32 height)
 	: BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE),
 	fMaxWidth(1920),
 	fMaxHeight(1200),
 	fWidth(width),
-	fHeight(height)
+	fHeight(height),
+	fDPI(0)
 {
 	BScreen screen(B_MAIN_SCREEN_ID);
 	fDesktopColor = screen.DesktopColor(current_workspace());
@@ -51,6 +46,8 @@
 		fBackgroundColor = Parent()->ViewColor();
 	else
 		fBackgroundColor = ui_color(B_PANEL_BACKGROUND_COLOR);
+
+	_UpdateDPI();
 }
 
 
@@ -61,43 +58,14 @@
 }
 
 
-BRect
-MonitorView::MonitorBounds()
-{
-	float maxWidth = Bounds().Width();
-	float maxHeight = Bounds().Height();
-	if (maxWidth / maxHeight > (float)fMaxWidth / fMaxHeight)
-		maxWidth = maxHeight / fMaxHeight * fMaxWidth;
-	else
-		maxHeight = maxWidth / fMaxWidth * fMaxHeight;
-
-	float factorX = (float)fWidth / fMaxWidth;
-	float factorY = (float)fHeight / fMaxHeight;
-
-	if (factorX > factorY && factorX > 1) {
-		factorY /= factorX;
-		factorX = 1;
-	} else if (factorY > factorX && factorY > 1) {
-		factorX /= factorY;
-		factorY = 1;
-	}
-
-	float width = maxWidth * factorX;
-	float height = maxHeight * factorY;
-
-	BSize size = Bounds().Size();
-	return BRect((size.width - width) / 2, (size.height - height) / 2,
-		(size.width + width) / 2, (size.height + height) / 2);
-}
-
-
 void
 MonitorView::Draw(BRect updateRect)
 {
 	rgb_color darkColor = {160, 160, 160, 255};
 	rgb_color blackColor = {0, 0, 0, 255};
 	rgb_color redColor = {228, 0, 0, 255};
-	BRect outerRect = MonitorBounds();
+	rgb_color whiteColor = {255, 255, 255, 255};
+	BRect outerRect = _MonitorBounds();
 
 	SetHighColor(fBackgroundColor);
 	FillRect(updateRect);
@@ -127,6 +95,28 @@
 	SetHighColor(redColor);
 	BPoint powerPos(outerRect.left + 5, outerRect.bottom - 2);
 	StrokeLine(powerPos, BPoint(powerPos.x + 2, powerPos.y));
+
+	// DPI
+
+	if (fDPI == 0)
+		return;
+
+	font_height fontHeight;
+	GetFontHeight(&fontHeight);
+	float height = ceilf(fontHeight.ascent + fontHeight.descent);
+
+	char text[64];
+	snprintf(text, sizeof(text), "%ld dpi", fDPI);
+
+	float width = StringWidth(text);
+	if (width > innerRect.Width() || height > innerRect.Height())
+		return;
+
+	SetLowColor(fDesktopColor);
+	SetHighColor(whiteColor);
+
+	DrawString(text, BPoint(innerRect.left + (innerRect.Width() - width) / 2,
+		innerRect.top + fontHeight.ascent + (innerRect.Height() - height) / 2));
 }
 
 
@@ -139,6 +129,7 @@
 	fWidth = width;
 	fHeight = height;
 
+	_UpdateDPI();
 	Invalidate();
 }
 
@@ -184,3 +175,50 @@
 			break;
 	}
 }
+
+
+BRect
+MonitorView::_MonitorBounds()
+{
+	float maxWidth = Bounds().Width();
+	float maxHeight = Bounds().Height();
+	if (maxWidth / maxHeight > (float)fMaxWidth / fMaxHeight)
+		maxWidth = maxHeight / fMaxHeight * fMaxWidth;
+	else
+		maxHeight = maxWidth / fMaxWidth * fMaxHeight;
+
+	float factorX = (float)fWidth / fMaxWidth;
+	float factorY = (float)fHeight / fMaxHeight;
+
+	if (factorX > factorY && factorX > 1) {
+		factorY /= factorX;
+		factorX = 1;
+	} else if (factorY > factorX && factorY > 1) {
+		factorX /= factorY;
+		factorY = 1;
+	}
+
+	float width = maxWidth * factorX;
+	float height = maxHeight * factorY;
+
+	BSize size = Bounds().Size();
+	return BRect((size.width - width) / 2, (size.height - height) / 2,
+		(size.width + width) / 2, (size.height + height) / 2);
+}
+
+
+void
+MonitorView::_UpdateDPI()
+{
+	fDPI = 0;
+
+	BScreen screen(Window());
+	monitor_info info;
+	if (screen.GetMonitorInfo(&info) != B_OK)
+		return;
+
+	double x = info.width / 2.54;
+	double y = info.height / 2.54;
+
+	fDPI = (int32)round((fWidth / x + fHeight / y) / 2);
+}

Modified: haiku/trunk/src/preferences/screen/MonitorView.h
===================================================================
--- haiku/trunk/src/preferences/screen/MonitorView.h	2009-08-13 10:51:15 UTC (rev 32301)
+++ haiku/trunk/src/preferences/screen/MonitorView.h	2009-08-13 11:06:14 UTC (rev 32302)
@@ -16,28 +16,30 @@
 
 
 class MonitorView : public BView {
-	public:
-		MonitorView(BRect frame, char *name, int32 screenWidth,
-			int32 screenHeight);
-		~MonitorView();
+public:
+							MonitorView(BRect frame, char* name,
+								int32 screenWidth, int32 screenHeight);
+	virtual					~MonitorView();
 
-		virtual void AttachedToWindow();
-		virtual void Draw(BRect updateRect);
-		virtual void MessageReceived(BMessage *message);
-		virtual void MouseDown(BPoint point);
+	virtual	void			AttachedToWindow();
+	virtual	void			Draw(BRect updateRect);
+	virtual	void			MessageReceived(BMessage *message);
+	virtual	void			MouseDown(BPoint point);
 
-		void SetResolution(int32 width, int32 height);
-		void SetMaxResolution(int32 width, int32 height);
+			void			SetResolution(int32 width, int32 height);
+			void			SetMaxResolution(int32 width, int32 height);
 
-	private:
-		BRect MonitorBounds();
+private:
+			BRect			_MonitorBounds();
+			void			_UpdateDPI();
 
-		rgb_color	fBackgroundColor;
-		rgb_color	fDesktopColor;
-		int32		fMaxWidth;
-		int32		fMaxHeight;
-		int32		fWidth;
-		int32		fHeight;
+			rgb_color		fBackgroundColor;
+			rgb_color		fDesktopColor;
+			int32			fMaxWidth;
+			int32			fMaxHeight;
+			int32			fWidth;
+			int32			fHeight;
+			int32			fDPI;
 };
 
 #endif	/* MONITOR_VIEW_H */

Modified: haiku/trunk/src/preferences/screen/ScreenWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-13 10:51:15 UTC (rev 32301)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.cpp	2009-08-13 11:06:14 UTC (rev 32302)
@@ -262,7 +262,7 @@
 		if (maxHeight < mode.height)
 			maxHeight = mode.height;
 
-		BMessage *message = new BMessage(POP_RESOLUTION_MSG);
+		BMessage* message = new BMessage(POP_RESOLUTION_MSG);
 		message->AddInt32("width", mode.width);
 		message->AddInt32("height", mode.height);
 
@@ -287,7 +287,7 @@
 		if ((fSupportedColorSpaces & (1 << i)) == 0)
 			continue;
 
-		BMessage *message = new BMessage(POP_COLORS_MSG);
+		BMessage* message = new BMessage(POP_COLORS_MSG);
 		message->AddInt32("bits_per_pixel", kColorSpaces[i].bits_per_pixel);
 		message->AddInt32("space", kColorSpaces[i].space);
 



From axeld at mail.berlios.de  Thu Aug 13 13:08:09 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 13 Aug 2009 13:08:09 +0200
Subject: [Haiku-commits] r32303 - haiku/trunk/headers/private/kernel/boot
Message-ID: <200908131108.n7DB89Z6015668@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 13:07:57 +0200 (Thu, 13 Aug 2009)
New Revision: 32303
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32303&view=rev

Modified:
   haiku/trunk/headers/private/kernel/boot/kernel_args.h
Log:
* Enlarged kernel_args array even more, as network boot needs this with all the
  extra kernel drivers.


Modified: haiku/trunk/headers/private/kernel/boot/kernel_args.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/kernel_args.h	2009-08-13 11:06:14 UTC (rev 32302)
+++ haiku/trunk/headers/private/kernel/boot/kernel_args.h	2009-08-13 11:07:57 UTC (rev 32303)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2002-2009, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -21,7 +21,7 @@
 #include <util/KMessage.h>
 
 #define CURRENT_KERNEL_ARGS_VERSION	1
-#define MAX_KERNEL_ARGS_RANGE		16
+#define MAX_KERNEL_ARGS_RANGE		20
 
 // names of common boot_volume fields
 #define BOOT_METHOD						"boot method"



From axeld at mail.berlios.de  Thu Aug 13 13:09:12 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 13 Aug 2009 13:09:12 +0200
Subject: [Haiku-commits] r32304 - haiku/trunk/build/jam
Message-ID: <200908131109.n7DB9CDO016769@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 13:09:10 +0200 (Thu, 13 Aug 2009)
New Revision: 32304
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32304&view=rev

Modified:
   haiku/trunk/build/jam/NetBootArchive
Log:
* Added missing drivers/protocols/... to the network boot archive.
* Also added the automatic ATA/IDE switch logic from HaikuImage.


Modified: haiku/trunk/build/jam/NetBootArchive
===================================================================
--- haiku/trunk/build/jam/NetBootArchive	2009-08-13 11:07:57 UTC (rev 32303)
+++ haiku/trunk/build/jam/NetBootArchive	2009-08-13 11:09:10 UTC (rev 32304)
@@ -14,21 +14,32 @@
 	GPL_ONLY = "" ;
 }
 
+#HACK: remove when old ide code is removed!
+local ATA_ONLY = ;
+local IDE_ONLY = ;
+if $(HAIKU_ATA_STACK) = 1 {
+	ATA_ONLY = "" ;
+} else {
+	IDE_ONLY = "" ;
+}
+
 SYSTEM_NETWORK_DEVICES = ethernet loopback ;
 SYSTEM_NETWORK_DATALINK_PROTOCOLS = ethernet_frame <module>arp loopback_frame
 	ipv4_datagram ;
-SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp ;
+SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix ;
 
-SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com etherpci $(X86_ONLY)ipro1000
-	$(X86_ONLY)ipro100 $(X86_ONLY)rtl8139 rtl8169 sis900
-	$(X86_ONLY)marvell_yukon $(X86_ONLY)via_rhine wb840 vlance
-	$(GPL_ONLY)bcm440x $(GPL_ONLY)bcm570x
+SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
+	$(X86_ONLY)broadcom570x etherpci $(X86_ONLY)ipro1000
+	pegasus $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900
+	$(X86_ONLY)via_rhine wb840 $(X86_ONLY)ipro100 $(X86_ONLY)nforce
+	#vlance
+	$(X86_ONLY)marvell_yukon $(X86_ONLY)syskonnect
+	$(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx usb_ecm
 ;
-SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi
-	config_manager agp_gart
+SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa $(IDE_ONLY)ide $(ATA_ONLY)ata
+	scsi config_manager agp_gart
 ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs fat iso9660 ;
-#cdda googlefs nfs $(GPL_ONLY)ntfs ;
 
 
 # modules
@@ -44,7 +55,7 @@
 AddFilesToNetBootArchive system add-ons kernel file_systems
 	: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
 AddFilesToNetBootArchive system add-ons kernel generic
-	: ide_adapter locked_pool scsi_periph ;
+	: $(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool scsi_periph ;
 AddFilesToNetBootArchive system add-ons kernel partitioning_systems
 	: intel session ;
 AddFilesToNetBootArchive system add-ons kernel interrupt_controllers
@@ -58,7 +69,7 @@
 AddNewDriversToNetBootArchive disk scsi	: scsi_cd scsi_disk ;
 #AddDriversToNetBootArchive disk virtual : nbd ;
 AddDriversToNetBootArchive disk virtual	: remote_disk ;
-AddDriversToNetBootArchive net			: $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
+AddDriversToNetBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
 
 # kernel
 AddFilesToNetBootArchive system : <revisioned>kernel_$(TARGET_ARCH) ;
@@ -73,7 +84,7 @@
 
 # add-ons
 AddFilesToNetBootArchive system add-ons kernel network
-	: stack ;
+	: <net>notifications stack ;
 AddFilesToNetBootArchive system add-ons kernel network devices
 	: $(SYSTEM_NETWORK_DEVICES) ;
 AddFilesToNetBootArchive system add-ons kernel network datalink_protocols
@@ -88,7 +99,7 @@
 	$(SYSTEM_ADD_ONS_BUS_MANAGERS)
 	ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112
 	$(SYSTEM_ADD_ONS_FILE_SYSTEMS)
-	ide_adapter locked_pool scsi_periph
+	$(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool scsi_periph
 	intel session
 	$(PPC_ONLY)openpic
 	$(X86_ONLY)generic_x86



From axeld at mail.berlios.de  Thu Aug 13 13:33:53 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 13 Aug 2009 13:33:53 +0200
Subject: [Haiku-commits] r32305 - haiku/trunk/src/servers/app
Message-ID: <200908131133.n7DBXrqM000603@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 13:33:51 +0200 (Thu, 13 Aug 2009)
New Revision: 32305
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32305&view=rev

Modified:
   haiku/trunk/src/servers/app/Window.cpp
Log:
* Don't let the app_server trigger a content draw if the kWindowScreenFlag is
  set. This fixes the white background when starting ParticlesII.
* Minor cleanup.


Modified: haiku/trunk/src/servers/app/Window.cpp
===================================================================
--- haiku/trunk/src/servers/app/Window.cpp	2009-08-13 11:09:10 UTC (rev 32304)
+++ haiku/trunk/src/servers/app/Window.cpp	2009-08-13 11:33:51 UTC (rev 32305)
@@ -231,7 +231,7 @@
 	region->Include(fFrame);
 }
 
-// GetBorderRegion
+
 void
 Window::GetBorderRegion(BRegion* region)
 {
@@ -577,12 +577,15 @@
 	if (!fEffectiveDrawingRegionValid) {
 		fEffectiveDrawingRegion = VisibleContentRegion();
 		if (fUpdateRequested && !fInUpdate) {
-			// we requested an update, but the client has not started it yet,
-			// so it is only allowed to draw outside the pending update sessions region
-			fEffectiveDrawingRegion.Exclude(&(fPendingUpdateSession->DirtyRegion()));
+			// We requested an update, but the client has not started it yet,
+			// so it is only allowed to draw outside the pending update sessions
+			// region
+			fEffectiveDrawingRegion.Exclude(
+				&fPendingUpdateSession->DirtyRegion());
 		} else if (fInUpdate) {
 			// enforce the dirty region of the update session
-			fEffectiveDrawingRegion.IntersectWith(&fCurrentUpdateSession->DirtyRegion());
+			fEffectiveDrawingRegion.IntersectWith(
+				&fCurrentUpdateSession->DirtyRegion());
 		} else {
 			// not in update, the view can draw everywhere
 //printf("Window(%s)::GetEffectiveDrawingRegion(for %s) - outside update\n", Title(), view->Name());
@@ -1503,6 +1506,18 @@
 		fDecorator->GetSizeLimits(&fMinWidth, &fMinHeight, &fMaxWidth, &fMaxHeight);
 		_ObeySizeLimits();
 	}
+
+// TODO: not sure if we want to do this
+#if 0
+	if ((fOriginalFlags & kWindowScreenFlag) != (flags & kWindowScreenFlag)) {
+		// TODO: disabling needs to be nestable (or we might lose the previous
+		// update state)
+		if ((flags & kWindowScreenFlag) != 0)
+			DisableUpdateRequests();
+		else
+			EnableUpdateRequests();
+	}
+#endif
 }
 
 
@@ -1824,8 +1839,7 @@
 }
 
 
-/*static*/
-uint32
+/*static*/ uint32
 Window::ValidWindowFlags()
 {
 	return B_NOT_MOVABLE | B_NOT_CLOSABLE | B_NOT_ZOOMABLE
@@ -1842,8 +1856,7 @@
 }
 
 
-/*static*/
-uint32
+/*static*/ uint32
 Window::ValidWindowFlags(window_feel feel)
 {
 	uint32 flags = ValidWindowFlags();
@@ -1857,7 +1870,6 @@
 // #pragma mark - private
 
 
-// _ShiftPartOfRegion
 void
 Window::_ShiftPartOfRegion(BRegion* region, BRegion* regionToShift,
 	int32 xOffset, int32 yOffset)
@@ -1881,31 +1893,33 @@
 void
 Window::_TriggerContentRedraw(BRegion& dirtyContentRegion)
 {
-	if (IsVisible() && dirtyContentRegion.CountRects() > 0) {
-		// put this into the pending dirty region
-		// to eventually trigger a client redraw
-		bool wasExpose = fPendingUpdateSession->IsExpose();
-		BRegion* backgroundClearingRegion = &dirtyContentRegion;
+	if (!IsVisible() || dirtyContentRegion.CountRects() == 0
+		|| (fFlags & kWindowScreenFlag) != 0)
+		return;
 
-		_TransferToUpdateSession(&dirtyContentRegion);
+	// put this into the pending dirty region
+	// to eventually trigger a client redraw
+	bool wasExpose = fPendingUpdateSession->IsExpose();
+	BRegion* backgroundClearingRegion = &dirtyContentRegion;
 
-		if (fPendingUpdateSession->IsExpose()) {
-			if (!fContentRegionValid)
-				_UpdateContentRegion();
+	_TransferToUpdateSession(&dirtyContentRegion);
 
-			if (!wasExpose) {
-				// there was suddenly added a dirty region
-				// caused by exposing content, we need to clear
-				// the entire background
-				backgroundClearingRegion
-					= &(fPendingUpdateSession->DirtyRegion());
-			}
+	if (fPendingUpdateSession->IsExpose()) {
+		if (!fContentRegionValid)
+			_UpdateContentRegion();
 
-			if (fDrawingEngine->LockParallelAccess()) {
-				bool copyToFrontEnabled = fDrawingEngine->CopyToFrontEnabled();
-				fDrawingEngine->SetCopyToFrontEnabled(true);
-				fDrawingEngine->SuspendAutoSync();
+		if (!wasExpose) {
+			// there was suddenly added a dirty region
+			// caused by exposing content, we need to clear
+			// the entire background
+			backgroundClearingRegion = &fPendingUpdateSession->DirtyRegion();
+		}
 
+		if (fDrawingEngine->LockParallelAccess()) {
+			bool copyToFrontEnabled = fDrawingEngine->CopyToFrontEnabled();
+			fDrawingEngine->SetCopyToFrontEnabled(true);
+			fDrawingEngine->SuspendAutoSync();
+
 //sCurrentColor.red = rand() % 255;
 //sCurrentColor.green = rand() % 255;
 //sCurrentColor.blue = rand() % 255;
@@ -1915,13 +1929,12 @@
 //fDrawingEngine->FillRegion(*backgroundClearingRegion, sCurrentColor);
 //snooze(10000);
 
-				fTopView->Draw(fDrawingEngine, backgroundClearingRegion,
-					&fContentRegion, true);
+			fTopView->Draw(fDrawingEngine, backgroundClearingRegion,
+				&fContentRegion, true);
 
-				fDrawingEngine->Sync();
-				fDrawingEngine->SetCopyToFrontEnabled(copyToFrontEnabled);
-				fDrawingEngine->UnlockParallelAccess();
-			}
+			fDrawingEngine->Sync();
+			fDrawingEngine->SetCopyToFrontEnabled(copyToFrontEnabled);
+			fDrawingEngine->UnlockParallelAccess();
 		}
 	}
 }
@@ -1971,8 +1984,7 @@
 }
 
 
-/*!
-	pre: the clipping is readlocked (this function is
+/*!	pre: the clipping is readlocked (this function is
 	only called from _TriggerContentRedraw()), which
 	in turn is only called from MessageReceived() with
 	the clipping lock held
@@ -2001,7 +2013,7 @@
 	}
 }
 
-// _SendUpdateMessage
+
 void
 Window::_SendUpdateMessage()
 {
@@ -2253,9 +2265,10 @@
 
 
 Window::UpdateSession::UpdateSession()
-	: fDirtyRegion(),
-	  fInUse(false),
-	  fCause(0)
+	:
+	fDirtyRegion(),
+	fInUse(false),
+	fCause(0)
 {
 }
 



From stefano.ceccherini at gmail.com  Thu Aug 13 13:35:25 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 13 Aug 2009 13:35:25 +0200
Subject: [Haiku-commits] r32305 - haiku/trunk/src/servers/app
In-Reply-To: <200908131133.n7DBXrqM000603@sheep.berlios.de>
References: <200908131133.n7DBXrqM000603@sheep.berlios.de>
Message-ID: <894b9700908130435g6bb8aea6j822184127c72585f@mail.gmail.com>

2009/8/13 axeld at BerliOS <axeld at mail.berlios.de>:
> Author: axeld
> Date: 2009-08-13 13:33:51 +0200 (Thu, 13 Aug 2009)
> New Revision: 32305
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32305&view=rev
>
> Modified:
> ? haiku/trunk/src/servers/app/Window.cpp
> Log:
> * Don't let the app_server trigger a content draw if the kWindowScreenFlag is
> ?set. This fixes the white background when starting ParticlesII.
> * Minor cleanup.

I was going to ask stippi how to do that. Thanks :-)


From stefano.ceccherini at gmail.com  Thu Aug 13 13:44:46 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 13 Aug 2009 13:44:46 +0200
Subject: [Haiku-commits] r32305 - haiku/trunk/src/servers/app
In-Reply-To: <894b9700908130435g6bb8aea6j822184127c72585f@mail.gmail.com>
References: <200908131133.n7DBXrqM000603@sheep.berlios.de>
	<894b9700908130435g6bb8aea6j822184127c72585f@mail.gmail.com>
Message-ID: <894b9700908130444s465f0b55yf2d47c8a4cd3d0a6@mail.gmail.com>

2009/8/13 Stefano Ceccherini <stefano.ceccherini at gmail.com>:
> 2009/8/13 axeld at BerliOS <axeld at mail.berlios.de>:
>> Author: axeld
>> Date: 2009-08-13 13:33:51 +0200 (Thu, 13 Aug 2009)
>> New Revision: 32305
>> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32305&view=rev
>>
>> Modified:
>> ? haiku/trunk/src/servers/app/Window.cpp
>> Log:
>> * Don't let the app_server trigger a content draw if the kWindowScreenFlag is
>> ?set. This fixes the white background when starting ParticlesII.
>> * Minor cleanup.
>
> I was going to ask stippi how to do that. Thanks :-)
>

BTW, we should also prevent other windows to get in front of the
BWindowScreen, just like we do for BDirectWindow.


From axeld at pinc-software.de  Thu Aug 13 13:52:29 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 13 Aug 2009 13:52:29 +0200 CEST
Subject: [Haiku-commits] r32305 - haiku/trunk/src/servers/app
In-Reply-To: <894b9700908130444s465f0b55yf2d47c8a4cd3d0a6@mail.gmail.com>
Message-ID: <18908791475-BeMail@zon>

Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
> BTW, we should also prevent other windows to get in front of the
> BWindowScreen, just like we do for BDirectWindow.

The only window that is allowed to get in front of a kWindowScreenFeel 
window is one with the special password feel.
So AFAICT we're just doing that already.

Bye,
   Axel.



From stefano.ceccherini at gmail.com  Thu Aug 13 14:04:10 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 13 Aug 2009 14:04:10 +0200
Subject: [Haiku-commits] r32305 - haiku/trunk/src/servers/app
In-Reply-To: <18908791475-BeMail@zon>
References: <894b9700908130444s465f0b55yf2d47c8a4cd3d0a6@mail.gmail.com>
	<18908791475-BeMail@zon>
Message-ID: <894b9700908130504p6fc1000cr80265f7220df30de@mail.gmail.com>

2009/8/13 Axel D?rfler <axeld at pinc-software.de>:
> Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
>> BTW, we should also prevent other windows to get in front of the
>> BWindowScreen, just like we do for BDirectWindow.
>
> The only window that is allowed to get in front of a kWindowScreenFeel
> window is one with the special password feel.
> So AFAICT we're just doing that already.
>
> Bye,
> ? Axel.

Ok. This, then, tell me that there is some other problem, because (but
only sometimes, I have to say), I can make deskbar appear over the
ParticlesII window.


From axeld at mail.berlios.de  Thu Aug 13 14:05:25 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 13 Aug 2009 14:05:25 +0200
Subject: [Haiku-commits] r32306 - haiku/trunk/src/system/kernel/fs
Message-ID: <200908131205.n7DC5POx006657@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 14:05:20 +0200 (Thu, 13 Aug 2009)
New Revision: 32306
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32306&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/vfs.cpp
Log:
* Let fix_dirent() handle invalid reclen's gracefully.


Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-08-13 11:33:51 UTC (rev 32305)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-08-13 12:05:20 UTC (rev 32306)
@@ -5563,6 +5563,10 @@
 
 		ASSERT(entry->d_reclen >= sizeof(struct dirent));
 
+		// This hints to a problem in the file system implementation
+		if (entry->d_reclen < sizeof(struct dirent))
+			return B_BAD_DATA;
+
 		if (user_memcpy(entry->d_name, userEntry->d_name,
 				entry->d_reclen + 1 - sizeof(struct dirent)) != B_OK)
 			return B_BAD_ADDRESS;



From bgroff at mail.berlios.de  Thu Aug 13 14:23:35 2009
From: bgroff at mail.berlios.de (bgroff at BerliOS)
Date: Thu, 13 Aug 2009 14:23:35 +0200
Subject: [Haiku-commits] r32307 - haiku/trunk/src/apps/drivesetup
Message-ID: <200908131223.n7DCNZiC008829@sheep.berlios.de>

Author: bgroff
Date: 2009-08-13 14:23:35 +0200 (Thu, 13 Aug 2009)
New Revision: 32307
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32307&view=rev

Modified:
   haiku/trunk/src/apps/drivesetup/MainWindow.cpp
Log:
Updated menu changes.
* Disable Init menu for partitions that are read only, or have no media (ie. empty cdrom)
* Disable Delete menu for partitions that are devices.
* Disable Mount menu for partitions that are devices.


Modified: haiku/trunk/src/apps/drivesetup/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-08-13 12:05:20 UTC (rev 32306)
+++ haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-08-13 12:23:35 UTC (rev 32307)
@@ -503,7 +503,6 @@
 		fInitMenu->SetEnabled(prepared);
 		fDeleteMI->SetEnabled(prepared);
 
-
 		BDiskSystem diskSystem;
 		fDDRoster.RewindDiskSystems();
 		while (fDDRoster.GetNextDiskSystem(&diskSystem) == B_OK) {
@@ -535,10 +534,16 @@
 
 		// Mount items
 		if (partition) {
-			fInitMenu->SetEnabled(!partition->IsMounted());
-			fDeleteMI->SetEnabled(!partition->IsMounted());
-			fMountMI->SetEnabled(!partition->IsMounted());
+			fInitMenu->SetEnabled(!partition->IsMounted()
+				&& !partition->IsReadOnly()
+				&& partition->Device()->HasMedia());
 
+			fDeleteMI->SetEnabled(!partition->IsMounted()
+				&& !partition->IsDevice());
+
+			fMountMI->SetEnabled(!partition->IsMounted()
+				&& !partition->IsDevice());
+
 			bool unMountable = false;
 			if (partition->IsMounted()) {
 				// see if this partition is the boot volume



From bga at bug-br.org.br  Thu Aug 13 14:31:48 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Thu, 13 Aug 2009 09:31:48 -0300
Subject: [Haiku-commits] r32307 - haiku/trunk/src/apps/drivesetup
In-Reply-To: <200908131223.n7DCNZiC008829@sheep.berlios.de>
References: <200908131223.n7DCNZiC008829@sheep.berlios.de>
Message-ID: <4A8407B4.8060005@bug-br.org.br>

bgroff at BerliOS wrote:

> * Disable Mount menu for partitions that are devices.

It is not uncommon for devices like memory sticks and SD cards to not 
have a partition at all and, instead, have the filesystem directly over 
the raw device.

-Bruno



From brycegroff at gmail.com  Thu Aug 13 14:39:05 2009
From: brycegroff at gmail.com (Bryce Groff)
Date: Thu, 13 Aug 2009 02:39:05 -1000
Subject: [Haiku-commits] r32307 - haiku/trunk/src/apps/drivesetup
In-Reply-To: <4A8407B4.8060005@bug-br.org.br>
References: <200908131223.n7DCNZiC008829@sheep.berlios.de>
	<4A8407B4.8060005@bug-br.org.br>
Message-ID: <9efe01ea0908130539y6f0400d7m8fd8e1652768653@mail.gmail.com>

> > * Disable Mount menu for partitions that are devices.
>
> It is not uncommon for devices like memory sticks and SD cards to not
> have a partition at all and, instead, have the filesystem directly over
> the raw device.
>

I thought about this before I made the change. I came to the conclusion that
if a device was a raw filesystem the only thing you would be able to do to
it would be to initialize a new partitioning system which is still available
as an option. I am not sure what action would be taken if you wanted to
delete a raw filesystem on a device.

If there is a case that I am missing or seems unintuitive about this please
let me know.
Bryce
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20090813/1c59e6c6/attachment.html>

From mmu_man at mail.berlios.de  Thu Aug 13 14:48:34 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 14:48:34 +0200
Subject: [Haiku-commits] r32308 - haiku/trunk/src/system/ldscripts/arm
Message-ID: <200908131248.n7DCmYTU011762@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 14:48:33 +0200 (Thu, 13 Aug 2009)
New Revision: 32308
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32308&view=rev

Modified:
   haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld
Log:
[ARM]
Move the unwind data out of the bss section, it broke bss init which ended up erasing real data and making dprintf do weird things...


Modified: haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld
===================================================================
--- haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld	2009-08-13 12:23:35 UTC (rev 32307)
+++ haiku/trunk/src/system/ldscripts/arm/boot_loader_u-boot.ld	2009-08-13 12:48:33 UTC (rev 32308)
@@ -21,15 +21,15 @@
 	__data_start = .;
 	.data : { *(.data .gnu.linkonce.d.*) }
 
-	/* unintialized data (in same segment as writable data) */
-	__bss_start = .;
-	.bss : { *(.bss) }
-
 	/* exception unwinding - should really not be needed! */
 	__exidx_start = .;
 	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
 	__exidx_end = .;
 
+	/* unintialized data (in same segment as writable data) */
+	__bss_start = .;
+	.bss : { *(.bss) }
+
 	. = ALIGN(0x1000);
 	_end = . ;
   /* Stabs debugging sections.  */



From bga at bug-br.org.br  Thu Aug 13 15:12:14 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Thu, 13 Aug 2009 10:12:14 -0300
Subject: [Haiku-commits] r32307 - haiku/trunk/src/apps/drivesetup
In-Reply-To: <9efe01ea0908130539y6f0400d7m8fd8e1652768653@mail.gmail.com>
References: <200908131223.n7DCNZiC008829@sheep.berlios.de>	<4A8407B4.8060005@bug-br.org.br>
	<9efe01ea0908130539y6f0400d7m8fd8e1652768653@mail.gmail.com>
Message-ID: <4A84112E.4020902@bug-br.org.br>

Bryce Groff wrote:

>     It is not uncommon for devices like memory sticks and SD cards to not
>     have a partition at all and, instead, have the filesystem directly over
>     the raw device.
> 
> 
> I thought about this before I made the change. I came to the conclusion 
> that if a device was a raw filesystem the only thing you would be able 
> to do to it would be to initialize a new partitioning system which is 
> still available as an option. I am not sure what action would be taken 
> if you wanted to delete a raw filesystem on a device.

You can also mount it, of course. :)

Just as a reference, mounting a partition under linux would be something 
like:

mount /dev/sda1 /blah

In a device without partition and with the filesystem over the raw 
device, it would be:

mount /dev/sda /blah

Notice that the partition number indicator is omitted in this case.

You can not, of course, delete a partition in a device like this (it has 
no partition, after all) and creating a partition would most likely 
invalidate the filesystem even if the partition takes up the entire 
device. But you can mount it nevertheless.

-Bruno



From axeld at pinc-software.de  Thu Aug 13 15:20:43 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 13 Aug 2009 15:20:43 +0200 CEST
Subject: [Haiku-commits] r32307 - haiku/trunk/src/apps/drivesetup
In-Reply-To: <9efe01ea0908130539y6f0400d7m8fd8e1652768653@mail.gmail.com>
Message-ID: <24202316235-BeMail@zon>

Bryce Groff <brycegroff at gmail.com> wrote:
> > > * Disable Mount menu for partitions that are devices.
> >
> > It is not uncommon for devices like memory sticks and SD cards to 
> > not
> > have a partition at all and, instead, have the filesystem directly 
> > over
> > the raw device.
> I thought about this before I made the change. I came to the 
> conclusion that
> if a device was a raw filesystem the only thing you would be able to 
> do to
> it would be to initialize a new partitioning system which is still 
> available
> as an option. I am not sure what action would be taken if you wanted 
> to
> delete a raw filesystem on a device.
> 
> If there is a case that I am missing or seems unintuitive about this 
> please
> let me know.

*Mounting* should still be possible, though.

Bye,
   Axel.



From axeld at pinc-software.de  Thu Aug 13 15:21:07 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 13 Aug 2009 15:21:07 +0200 CEST
Subject: [Haiku-commits] r32305 - haiku/trunk/src/servers/app
In-Reply-To: <894b9700908130504p6fc1000cr80265f7220df30de@mail.gmail.com>
Message-ID: <24226506373-BeMail@zon>

Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
> 2009/8/13 Axel D?rfler <axeld at pinc-software.de>:
> > Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
> >> BTW, we should also prevent other windows to get in front of the
> >> BWindowScreen, just like we do for BDirectWindow.
> > The only window that is allowed to get in front of a 
> > kWindowScreenFeel
> > window is one with the special password feel.
> > So AFAICT we're just doing that already.
> Ok. This, then, tell me that there is some other problem, because 
> (but
> only sometimes, I have to say), I can make deskbar appear over the
> ParticlesII window.

Well, that deserves another bug report, I'd guess :-)

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Aug 13 15:32:51 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 15:32:51 +0200
Subject: [Haiku-commits] r32309 - haiku/trunk/src/bin
Message-ID: <200908131332.n7DDWpR8017918@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 15:32:49 +0200 (Thu, 13 Aug 2009)
New Revision: 32309
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32309&view=rev

Modified:
   haiku/trunk/src/bin/xres.cpp
Log:
* Fixed warning.
* Minor cleanup.


Modified: haiku/trunk/src/bin/xres.cpp
===================================================================
--- haiku/trunk/src/bin/xres.cpp	2009-08-13 12:48:33 UTC (rev 32308)
+++ haiku/trunk/src/bin/xres.cpp	2009-08-13 13:32:49 UTC (rev 32309)
@@ -3,6 +3,7 @@
  * Distributed under the terms of the MIT License.
  */
 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,8 +15,10 @@
 #include <StorageDefs.h>
 #include <TypeConstants.h>
 
+
 using namespace std;
 
+
 static const char *kCommandName = "xres";
 static const char *kDefaultResourceName = NULL;
 static const char *kDefaultOutputFile = "xres.output.rsrc";
@@ -80,6 +83,7 @@
 "  <id>   - A positive or negative integer.\n"
 ;
 
+
 // resource_type
 static const char *
 resource_type(type_code type)
@@ -95,6 +99,7 @@
 	return typeString;
 }
 
+
 // ResourceID
 struct ResourceID {
 	type_code	type;
@@ -103,9 +108,10 @@
 
 	ResourceID(type_code type = B_ANY_TYPE, int32 id = 0,
 			bool wildcardID = true)
-		: type(type),
-		  id(id),
-		  wildcardID(wildcardID)
+		:
+		type(type),
+		id(id),
+		wildcardID(wildcardID)
 	{
 	}
 
@@ -129,6 +135,7 @@
 	}
 };
 
+
 // ResourceDataSource
 struct ResourceDataSource {
 	ResourceDataSource()
@@ -146,6 +153,7 @@
 	}
 };
 
+
 // MemoryResourceDataSource
 struct MemoryResourceDataSource : ResourceDataSource {
 	MemoryResourceDataSource(const void *data, size_t size, bool clone)
@@ -191,12 +199,14 @@
 	bool	fOwner;
 };
 
+
 // FileResourceDataSource
 struct FileResourceDataSource : ResourceDataSource {
 	FileResourceDataSource(const char *path)
-		: fPath(path),
-		  fData(NULL),
-		  fSize(0)
+		:
+		fPath(path),
+		fData(NULL),
+		fSize(0)
 	{
 	}
 
@@ -266,6 +276,7 @@
 	size_t	fSize;
 };
 
+
 // State
 struct State {
 	State()
@@ -305,6 +316,7 @@
 	}
 };
 
+
 // ListState
 struct ListState : State {
 	ListState()
@@ -351,22 +363,22 @@
 		const char *name;
 		size_t size;
 		for (int32 i = 0;
-			 resources.GetResourceInfo(i, &type, &id, &name, &size);
-			 i++) {
-
-			printf("'%s' %11ld %11u  %s\n", resource_type(type), id, size,
+				resources.GetResourceInfo(i, &type, &id, &name, &size); i++) {
+			printf("'%s' %11ld %11lu  %s\n", resource_type(type), id, size,
 				(name && strlen(name) > 0 ? name : "(no name)"));
 		}
 	}
 };
 
+
 // WriteFileState
 struct WriteFileState : State {
 	WriteFileState()
-		: fOutputFilePath(kDefaultOutputFile),
-		  fResources(NULL),
-		  fInclusionPattern(NULL),
-		  fExclusionPattern(NULL)
+		:
+		fOutputFilePath(kDefaultOutputFile),
+		fResources(NULL),
+		fInclusionPattern(NULL),
+		fExclusionPattern(NULL)
 	{
 	}
 
@@ -422,7 +434,7 @@
 			if (!data) {
 				fprintf(stderr, "Error: Failed to read resources from input "
 					"file \"%s\".\n", path);
-	
+
 				exit(1);
 			}
 
@@ -457,7 +469,7 @@
 			// not included or explicitly excluded
 			return;
 		}
-		
+
 		// get resource data
 		const void *data;
 		size_t size;
@@ -525,6 +537,7 @@
 	ResourceID	*fExclusionPattern;
 };
 
+
 // Command
 struct Command {
 	Command()
@@ -538,11 +551,13 @@
 	virtual void Do(State *state) = 0;
 };
 
+
 // SetOutputCommand
 struct SetOutputCommand : Command {
 	SetOutputCommand(const char *path)
-		: Command(),
-		  fPath(path)
+		:
+		Command(),
+		fPath(path)
 	{
 	}
 
@@ -555,11 +570,13 @@
 	string	fPath;
 };
 
+
 // ProcessInputCommand
 struct ProcessInputCommand : Command {
 	ProcessInputCommand(const char *path)
-		: Command(),
-		  fPath(path)
+		:
+		Command(),
+		fPath(path)
 	{
 	}
 
@@ -572,12 +589,14 @@
 	string	fPath;
 };
 
+
 // SetResourcePatternCommand
 struct SetResourcePatternCommand : Command {
 	SetResourcePatternCommand(const ResourceID &pattern, bool inclusion)
-		: Command(),
-		  fPattern(pattern),
-		  fInclusion(inclusion)
+		:
+		Command(),
+		fPattern(pattern),
+		fInclusion(inclusion)
 	{
 	}
 
@@ -594,14 +613,16 @@
 	bool		fInclusion;
 };
 
+
 // AddResourceCommand
 struct AddResourceCommand : Command {
 	AddResourceCommand(const ResourceID &id, const char *name,
 			ResourceDataSource *dataSource)
-		: Command(),
-		  fID(id),
-		  fHasName(name),
-		  fDataSource(dataSource)
+		:
+		Command(),
+		fID(id),
+		fHasName(name),
+		fDataSource(dataSource)
 	{
 		if (fHasName)
 			fName = name;
@@ -648,6 +669,7 @@
 		commandName);
 }
 
+
 // print_usage_and_exit
 static void
 print_usage_and_exit(bool error)
@@ -656,6 +678,7 @@
 	exit(error ? 1 : 0);
 }
 
+
 // next_arg
 static const char *
 next_arg(int &argi, bool optional = false)
@@ -669,6 +692,7 @@
 	return kArgv[argi++];
 }
 
+
 // parse_resource_id
 static void
 parse_resource_id(const char *toParse, ResourceID &resourceID,
@@ -733,6 +757,7 @@
 	*name = toParse + 1;
 }
 
+
 // main
 int
 main(int argc, const char *const *argv)



From axeld at mail.berlios.de  Thu Aug 13 15:33:10 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 15:33:10 +0200
Subject: [Haiku-commits] r32310 -
	haiku/trunk/src/add-ons/kernel/partitioning_systems/session
Message-ID: <200908131333.n7DDXA0U018007@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 15:33:08 +0200 (Thu, 13 Aug 2009)
New Revision: 32310
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32310&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/partitioning_systems/session/Disc.cpp
   haiku/trunk/src/add-ons/kernel/partitioning_systems/session/Disc.h
Log:
* Cleanup.


Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/session/Disc.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/session/Disc.cpp	2009-08-13 13:32:49 UTC (rev 32309)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/session/Disc.cpp	2009-08-13 13:33:08 UTC (rev 32310)
@@ -1,12 +1,14 @@
-//----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered
-//  by the OpenBeOS license.
-//
-//  Copyright (c) 2003 Tyler Dauwalder, tyler at dauwalder.net
-//---------------------------------------------------------------------
-/*!
-	\file Disc.cpp
+/*
+ * Copyright 2003-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT license.
+ *
+ * Authors:
+ *		Tyler Akidau, haiku at akidau.net
+ */
 
+
+/*!	\file Disc.cpp
+
 	Disc class implementation, used to enumerate the CD/DVD sessions.
 
 	The protocols followed in this module are based on information
@@ -19,6 +21,7 @@
 	number \c 0x2.
 */
 
+
 #include "Disc.h"
 
 #include <DiskDeviceDefs.h>
@@ -26,36 +29,26 @@
 
 #include "Debug.h"
 
-DBG(static const char *kModuleDebugName = "session");
 
-//------------------------------------------------------------------------------
-// Helper function declarations
-//------------------------------------------------------------------------------
+DBG(static const char* kModuleDebugName = "session");
 
-static
-status_t
-read_table_of_contents(int deviceFD, uint32 first_session, uchar *buffer,
-                       uint16 buffer_length, bool msf);
 
-
-//------------------------------------------------------------------------------
-// Helper class declarations
-//------------------------------------------------------------------------------
-
 /*! \brief An item that can be stored in a List object.
 */
 struct list_item {
 public:
-	list_item(uint32 index, list_item *next = NULL)
-		: index(index)
-		, next(next)
+	list_item(uint32 index, list_item* next = NULL)
+		:
+		index(index),
+		next(next)
 	{
-	};
+	}
 
-	int32 index;
-	list_item *next;
+	int32		index;
+	list_item*	next;
 };
 
+
 /*! \brief A simple, singly linked list.
 */
 class List {
@@ -64,7 +57,7 @@
 	~List();
 
 	list_item* Find(int32 index) const;
-	void Add(list_item *item);
+	void Add(list_item* item);
 	void Clear();
 	void SortAndRemoveDuplicates();
 
@@ -72,36 +65,38 @@
 	list_item* Last() const;
 
 private:
-	list_item *fFirst;
-	list_item *fLast;
+	list_item*	fFirst;
+	list_item*	fLast;
 };
 
-/*! \brief Keeps track of track information.
 
-	Can be stored in a List object.
+/*! \brief Keeps track of track information.
 */
 struct track : public list_item {
 public:
-	track(uint32 index, off_t startLBA, uint8 control, uint8 adr, track *next = NULL)
-		: list_item(index, next)
-		, start_lba(startLBA)
-		, control(control)
-		, adr(adr)
+	track(uint32 index, off_t startLBA, uint8 control, uint8 adr,
+			track* next = NULL)
+		:
+		list_item(index, next),
+		start_lba(startLBA),
+		control(control),
+		adr(adr)
 	{
 	}
 
-	off_t start_lba;
-	uint8 control;		//!< only used to give what are probably useless warnings
-	uint8 adr;			//!< only used to give what are probably useless warnings
+	off_t	start_lba;
+	uint8	control;
+		//!< only used to give what are probably useless warnings
+	uint8	adr;
+		//!< only used to give what are probably useless warnings
 };
 
-/*! \brief Keeps track of session information.
 
-	Can be stored in a List object.
+/*! \brief Keeps track of session information.
 */
 struct session : public list_item {
 public:
-	session(uint32 index, session *next = NULL);
+	session(uint32 index, session* next = NULL);
 
 	bool first_track_hint_is_set();
 	bool last_track_hint_is_set();
@@ -109,51 +104,237 @@
 
 	bool is_audio();
 
-	int8 first_track_hint;
-	int8 last_track_hint;
-	int8 control;
-	int8 adr;
-	off_t end_lba;
+	int8	first_track_hint;
+	int8	last_track_hint;
+	int8	control;
+	int8	adr;
+	off_t	end_lba;
 
-	List track_list;
+	List	track_list;
 };
 
-//------------------------------------------------------------------------------
-// List
-//------------------------------------------------------------------------------
 
+//	#pragma mark - Helper functions
+
+
+#ifdef DEBUG
+/*
+static void
+dump_scsi_command(raw_device_command* cmd)
+{
+	int i;
+	uint j;
+	scsi_table_of_contents_command* scsi_command
+		= (scsi_table_of_contents_command*)(&(cmd->command));
+
+	for (i = 0; i < cmd->command_length; i++)
+		TRACE(("%.2x,", cmd->command[i]));
+	TRACE(("\n"));
+
+	TRACE(("raw_device_command:\n"));
+	TRACE(("  command:\n"));
+	TRACE(("    command = %d (0x%.2x)\n", scsi_command->command,
+		scsi_command->command));
+	TRACE(("    msf     = %d\n", scsi_command->msf));
+	TRACE(("    format  = %d (0x%.2x)\n", scsi_command->format,
+		scsi_command->format));
+	TRACE(("    number  = %d\n", scsi_command->number));
+	TRACE(("    length  = %d\n",
+		B_BENDIAN_TO_HOST_INT16(scsi_command->length)));
+	TRACE(("    control = %d\n", scsi_command->control));
+	TRACE(("  command_length    = %d\n", cmd->command_length));
+	TRACE(("  flags             = %d\n", cmd->flags));
+	TRACE(("  scsi_status       = 0x%x\n", cmd->scsi_status));
+	TRACE(("  cam_status        = 0x%x\n", cmd->cam_status));
+	TRACE(("  data              = %p\n", cmd->data));
+	TRACE(("  data_length       = %ld\n", cmd->data_length));
+	TRACE(("  sense_data        = %p\n", cmd->sense_data));
+	TRACE(("  sense_data_length = %ld\n", cmd->sense_data_length));
+	TRACE(("  timeout           = %lld\n", cmd->timeout));
+	TRACE(("data dump:\n"));
+	for (j = 0; j < 2048; j++) {//cmd->data_length; j++) {
+		uchar c = ((uchar*)cmd->data)[j];
+
+		if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')
+			|| ('0' <= c && c <= '9'))
+			TRACE(("\\%c,", c));
+		else
+			TRACE(("%.2x,", c));
+	}
+	TRACE(("\n"));
+	TRACE(("sense_data dump:\n"));
+	for (j = 0; j < cmd->sense_data_length; j++) {
+		uchar c = ((uchar*)cmd->sense_data)[j];
+		if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')
+			|| ('0' <= c && c <= '9'))
+			TRACE(("%c", c));
+		else if (c == 0)
+			TRACE(("_"));
+		else
+			TRACE(("-"));
+	}
+	TRACE(("\n"));
+}
+*/
+
+
+static void
+dump_full_table_of_contents(uchar* data, uint16 dataLength)
+{
+	cdrom_table_of_contents_header* header
+		= (cdrom_table_of_contents_header*)data;
+	cdrom_full_table_of_contents_entry* entries
+		= (cdrom_full_table_of_contents_entry*)(data + 4);
+	int headerLength = B_BENDIAN_TO_HOST_INT16(header->length);
+
+	if (dataLength < headerLength) {
+		TRACE(("dump_full_table_of_contents: warning, data buffer not large "
+			"enough (%d < %d)\n", dataLength, headerLength));
+		headerLength = dataLength;
+	}
+
+	TRACE(("%s: table of contents dump:\n", kModuleDebugName));
+	TRACE(("--------------------------------------------------\n"));
+	TRACE(("header:\n"));
+	TRACE(("  length = %d\n", header_length));
+	TRACE(("  first  = %d\n", header->first));
+	TRACE(("  last   = %d\n", header->last));
+
+	int count = (headerLength - 2) / sizeof(cdrom_full_table_of_contents_entry);
+	TRACE(("\n"));
+	TRACE(("entry count = %d\n", count));
+
+	for (int i = 0; i < count; i++) {
+		TRACE(("\n"));
+		TRACE(("entry #%d:\n", i));
+		TRACE(("  session  = %d\n", entries[i].session));
+		TRACE(("  adr      = %d\n", entries[i].adr));
+		TRACE(("  control  = %d (%s track, copy %s)\n", entries[i].control,
+			(entries[i].control & kControlDataTrack ? "data" : "audio"),
+			(entries[i].control & kControlCopyPermitted
+				? "permitted" : "prohibited")));
+		TRACE(("  tno      = %d\n", entries[i].tno));
+		TRACE(("  point    = %d (0x%.2x)\n", entries[i].point,
+			entries[i].point));
+		TRACE(("  minutes  = %d\n", entries[i].minutes));
+		TRACE(("  frames   = %d\n", entries[i].seconds));
+		TRACE(("  seconds  = %d\n", entries[i].frames));
+		TRACE(("  zero     = %d\n", entries[i].zero));
+		TRACE(("  pminutes = %d\n", entries[i].pminutes));
+		TRACE(("  pseconds = %d\n", entries[i].pseconds));
+		TRACE(("  pframes  = %d\n", entries[i].pframes));
+		TRACE(("  lba      = %ld\n",
+			msf_to_lba(make_msf_address(entries[i].pminutes,
+			entries[i].pseconds, entries[i].pframes))));
+	}
+	TRACE(("--------------------------------------------------\n"));
+}
+#endif	// DEBUG
+
+
+static status_t
+read_table_of_contents(int deviceFD, uint32 first_session, uchar* buffer,
+	uint16 buffer_length, bool msf)
+{
+	scsi_table_of_contents_command scsi_command;
+	raw_device_command raw_command;
+	const uint32 sense_data_length = 1024;
+	uchar sense_data[sense_data_length];
+	status_t error = buffer ? B_OK : B_BAD_VALUE;
+
+	DEBUG_INIT_ETC(NULL, ("fd: %d, buffer: %p, buffer_length: %d",
+		deviceFD, buffer, buffer_length));
+
+	if (error)
+		return error;
+
+	// Init the scsi command and copy it into the "raw scsi command"
+	// ioctl struct
+	memset(raw_command.command, 0, 16);
+	scsi_command.command = 0x43;
+	scsi_command.msf = 1;
+	scsi_command.format = kFullTableOfContentsFormat;
+	scsi_command.number = first_session;
+	scsi_command.length = B_HOST_TO_BENDIAN_INT16(buffer_length);
+	scsi_command.control = 0;
+	scsi_command.reserved0 = scsi_command.reserved1 = scsi_command.reserved2
+		= scsi_command.reserved3 = scsi_command.reserved4
+		= scsi_command.reserved5 = scsi_command.reserved6 = 0;
+	memcpy(raw_command.command, &scsi_command, sizeof(scsi_command));
+
+	// Init the rest of the raw command
+	raw_command.command_length = 10;
+	raw_command.flags = kScsiFlags;
+	raw_command.scsi_status = 0;
+	raw_command.cam_status = 0;
+	raw_command.data = buffer;
+	raw_command.data_length = buffer_length;
+	memset(raw_command.data, 0, raw_command.data_length);
+	raw_command.sense_data = sense_data;
+	raw_command.sense_data_length = sense_data_length;
+	memset(raw_command.sense_data, 0, raw_command.sense_data_length);
+	raw_command.timeout = kScsiTimeout;
+
+	if (ioctl(deviceFD, B_RAW_DEVICE_COMMAND, &raw_command) == 0) {
+		if (raw_command.scsi_status == 0 && raw_command.cam_status == 1) {
+			// SUCCESS!!!
+			DBG(dump_full_table_of_contents(buffer, buffer_length));
+		} else {
+			error = B_FILE_ERROR;
+			TRACE(("%s: scsi ioctl succeeded, but scsi command failed\n",
+				kModuleDebugName));
+		}
+	} else {
+		error = errno;
+		TRACE(("%s: scsi command failed with error 0x%lx\n", kModuleDebugName,
+			error));
+	}
+
+	return error;
+
+}
+
+
+//	#pragma mark - List
+// TODO: get rid of this, and use the standard DoublyLinkedList
+
+
 /*! \brief Creates an empty list.
 */
 List::List()
-	: fFirst(NULL)
-	, fLast(NULL)
+	:
+	fFirst(NULL),
+	fLast(NULL)
 {
 }
 
+
 List::~List()
 {
 	Clear();
 }
 
+
 /*! \brief Returns the ListItem with the given index, or NULL if not found.
 */
 list_item*
 List::Find(int32 index) const
 {
 //	TRACE(("%s: List::Find(%ld)\n", kModuleDebugName, index));
-	list_item *item = fFirst;
+	list_item* item = fFirst;
 	while (item && item->index != index) {
 		item = item->next;
 	}
 	return item;
 }
 
+
 /*! \brief Adds the given item to the end of the list.
 
 	\param item The item to add (may not be NULL)
 */
 void
-List::Add(list_item *item)
+List::Add(list_item* item)
 {
 //	TRACE(("%s: List::Add(%p)\n", kModuleDebugName, item));
 	if (item) {
@@ -169,24 +350,27 @@
 	}
 }
 
+
 /*! \brief Clears the list.
 */
 void
 List::Clear()
 {
-	list_item *item = fFirst;
+	list_item* item = fFirst;
 	while (item) {
-		list_item *next = item->next;
+		list_item* next = item->next;
 		delete item;
 		item = next;
 	}
 	fFirst = fLast = NULL;
 }
 
+
 /*! \brief Bubble sorts the list by index, removing any duplicates
 	(the first instance is kept).
 
-	\todo I believe duplicate removal is actually unnecessary, but I need to verify that.
+	\todo I believe duplicate removal is actually unnecessary, but
+		I need to verify that.
 */
 void
 List::SortAndRemoveDuplicates()
@@ -195,9 +379,9 @@
 	while (!sorted) {
 		sorted = true;
 
-		list_item *prev = NULL;
-		list_item *item = fFirst;
-		list_item *next = NULL;
+		list_item* prev = NULL;
+		list_item* item = fFirst;
+		list_item* next = NULL;
 		while (item && item->next) {
 			next = item->next;
 //			dprintf("List::Sort: %ld -> %ld\n", item->index, next->index);
@@ -222,8 +406,9 @@
 				}
 			} else if (item->index == next->index) {
 				// Duplicate indicies
-				TRACE(("%s: List::SortAndRemoveDuplicates: duplicate indicies found (#%ld); "
-				       "keeping first instance\n", kModuleDebugName, item->index));
+				TRACE(("%s: List::SortAndRemoveDuplicates: duplicate indicies "
+					"found (#%ld); keeping first instance\n", kModuleDebugName,
+					item->index));
 				item->next = next->next;
 				delete next;
 				next = item->next;
@@ -235,36 +420,42 @@
 	}
 }
 
+
 /*! \brief Returns the first item in the list, or NULL if empty
 */
 list_item*
-List::First() const {
+List::First() const
+{
 	return fFirst;
 }
 
+
 /*! \brief Returns the last item in the list, or NULL if empty
 */
 list_item*
-List::Last() const {
+List::Last() const
+{
 	return fLast;
 }
 
-//------------------------------------------------------------------------------
-// session
-//------------------------------------------------------------------------------
 
+//	#pragma mark - session
+
+
 /*! \brief Creates an unitialized session object
 */
-session::session(uint32 index, session *next)
-	: list_item(index, next)
-	, first_track_hint(-1)
-	, last_track_hint(-1)
-	, control(-1)
-	, adr(-1)
-	, end_lba(0)
+session::session(uint32 index, session* next)
+	:
+	list_item(index, next),
+	first_track_hint(-1),
+	last_track_hint(-1),
+	control(-1),
+	adr(-1),
+	end_lba(0)
 {
 }
 
+
 /*! \brief Returns true if the \a first_track_hint member has not been
 	set to a legal value yet.
 */
@@ -274,6 +465,7 @@
 	return 1 <= first_track_hint && first_track_hint <= 99;
 }
 
+
 /*! \brief Returns true if the \a last_track_hint member has not been
 	set to a legal value yet.
 */
@@ -283,6 +475,7 @@
 	return 1 <= last_track_hint && last_track_hint <= 99;
 }
 
+
 /*! \brief Returns true if the \a end_lba member has not been
 	set to a legal value yet.
 
@@ -296,6 +489,7 @@
 	return end_lba > 0;
 }
 
+
 /*! \brief Returns true if the session is flagged as being audio.
 
 	If the \c control value for the session has not been set, returns
@@ -307,10 +501,10 @@
 	return end_lba_is_set() && !(control & kControlDataTrack);
 }
 
-//------------------------------------------------------------------------------
-// Disc
-//------------------------------------------------------------------------------
 
+//	#pragma mark - Disc
+
+
 /*! \brief Creates a new Disc object by parsing the given table of contents
 	entries and checking the resultant data structure for errors and
 	warnings.
@@ -319,8 +513,9 @@
 	elsewise they will return an error code.
 */
 Disc::Disc(int fd)
-	: fInitStatus(B_NO_INIT)
-	, fSessionList(new List)
+	:
+	fInitStatus(B_NO_INIT),
+	fSessionList(new List)
 {
 	DEBUG_INIT_ETC("Disc", ("fd: %d", fd));
 
@@ -336,26 +531,28 @@
 
 	status_t error = fSessionList ? B_OK : B_NO_MEMORY;
 
-	// Attempt to read the table of contents, first in lba mode, then in msf mode
-	if (!error) {
+	// Attempt to read the table of contents, first in lba mode, then in msf
+	// mode
+	if (!error)
 		error = read_table_of_contents(fd, 1, data, kBlockSize, false);
-	}
 	if (error) {
-		TRACE(("%s: lba read_toc failed, trying msf instead\n", kModuleDebugName));
+		TRACE(("%s: lba read_toc failed, trying msf instead\n",
+			kModuleDebugName));
 		error = read_table_of_contents(fd, 1, data, kBlockSize, true);
 	}
 
 	// Interpret the data returned, if successful
 	if (!error) {
-		cdrom_table_of_contents_header *header;
-		cdrom_full_table_of_contents_entry *entries;
+		cdrom_table_of_contents_header* header;
+		cdrom_full_table_of_contents_entry* entries;
 		int count;
 
 		header = (cdrom_table_of_contents_header*)data;
 		entries = (cdrom_full_table_of_contents_entry*)(data+4);
 		header->length = B_BENDIAN_TO_HOST_INT16(header->length);
 
-		count = (header->length-2) / sizeof(cdrom_full_table_of_contents_entry);
+		count = (header->length - 2)
+			/ sizeof(cdrom_full_table_of_contents_entry);
 
 		error = _ParseTableOfContents(entries, count);
 //		Dump();
@@ -369,12 +566,15 @@
 	fInitStatus = error;
 }
 
+
 /*! \brief Destroys the Disc's internal list.
 */
-Disc::~Disc() {
+Disc::~Disc()
+{
 	delete fSessionList;
 }
 
+
 /*! \brief Returns \c B_OK if the object was successfully initialized, or
 	an error code if not.
 */
@@ -384,6 +584,7 @@
 	return fInitStatus;
 }
 
+
 /*! \brief Stores the info for the given session (using 0 based indicies) in the
 	struct pointed to by \a sessionInfo.
 
@@ -394,59 +595,60 @@
 {
 	DEBUG_INIT_ETC("Disc", ("index: %ld", index));
 	int32 counter = -1;
-	for (session *session = (struct session*)fSessionList->First();
-	       session;
-	         session = (struct session*)session->next)
-	{
+	for (session* session = (struct session*)fSessionList->First(); session;
+			session = (struct session*)session->next) {
 		if (session->is_audio()) {
-			counter++; // only one session per audio session
+			counter++;
+				// only one session per audio session
 			if (counter == index) {
 				// Found an audio session. Take the start of the first
 				// track with the end of session.
-				track *track = (struct track*)session->track_list.First();
-				if (track) {
+				track* track = (struct track*)session->track_list.First();
+				if (track != NULL) {
 					PRINT(("found session #%ld info (audio session)\n", index));
 
-					off_t start_lba = track->start_lba;
-					off_t end_lba = session->end_lba;
+					off_t startLBA = track->start_lba;
+					off_t endLBA = session->end_lba;
 
-					off_t offset = start_lba * kBlockSize;
-					off_t size = (end_lba - start_lba) * kBlockSize;
+					off_t offset = startLBA * kBlockSize;
+					off_t size = (endLBA - startLBA) * kBlockSize;
 
-					Session *result = new Session(offset, size, kBlockSize,
-					                              index, B_PARTITION_READ_ONLY,
-					                              kPartitionTypeAudioSession);
-					if (!result)
-						PRINT(("Error allocating new Session object; out of memory!\n"));
+					Session* result = new Session(offset, size, kBlockSize,
+						index, B_PARTITION_READ_ONLY,
+						kPartitionTypeAudioSession);
+					if (result == NULL) {
+						PRINT(("Error allocating new Session object; out of "
+							"memory!\n"));
+					}
 					return result;
 				} else {
-					PRINT(("Error: session #%ld is an audio "
-					       "session with no tracks!\n", index));
+					PRINT(("Error: session #%ld is an audio session with no "
+						"tracks!\n", index));
 					return NULL;
 				}
 			}
 		} else {
-			for (track *track = (struct track*)session->track_list.First();
-			       track;
-			         track = (struct track*)track->next)
-			{
+			for (track* track = (struct track*)session->track_list.First();
+					track; track = (struct track*)track->next) {
 				counter++;
 				if (counter == index) {
 					PRINT(("found session #%ld info (data session)\n", index));
 
-					off_t start_lba = track->start_lba;
-					off_t end_lba = track->next
-					                  ? ((struct track*)track->next)->start_lba
-					                    : session->end_lba;
+					off_t startLBA = track->start_lba;
+					off_t endLBA = track->next
+						? ((struct track*)track->next)->start_lba
+						: session->end_lba;
 
-					off_t offset = start_lba * kBlockSize;
-					off_t size = (end_lba - start_lba) * kBlockSize;
+					off_t offset = startLBA * kBlockSize;
+					off_t size = (endLBA - startLBA) * kBlockSize;
 
-					Session *result = new Session(offset, size, kBlockSize,
-					                              index, B_PARTITION_READ_ONLY,
-					                              kPartitionTypeDataSession);
-					if (!result)
-						PRINT(("Error allocating new Session object; out of memory!\n"));
+					Session* result = new Session(offset, size, kBlockSize,
+						index, B_PARTITION_READ_ONLY,
+						kPartitionTypeDataSession);
+					if (result == NULL) {
+						PRINT(("Error allocating new Session object; out of "
+							"memory!\n"));
+					}
 					return result;
 				}
 			}
@@ -457,24 +659,27 @@
 	return NULL;
 }
 
+
 /*! \brief Dumps a printout of the disc using TRACE.
 */
 void
 Disc::Dump()
 {
 	TRACE(("%s: Disc dump:\n", kModuleDebugName));
-	session *session = (struct session*)fSessionList->First();
-	while (session) {
+	session* session = (struct session*)fSessionList->First();
+	while (session != NULL) {
 		TRACE(("session %ld:\n", session->index));
 		TRACE(("  first track hint: %d\n", session->first_track_hint));
 		TRACE(("  last track hint:  %d\n", session->last_track_hint));
 		TRACE(("  end_lba:          %lld\n", session->end_lba));
-		TRACE(("  control:          %d (%s session, copy %s)\n", session->control,
-		       (session->control & kControlDataTrack ? "data" : "audio"),
-		       (session->control & kControlCopyPermitted ? "permitted" : "prohibited")));
+		TRACE(("  control:          %d (%s session, copy %s)\n",
+			session->control, (session->control & kControlDataTrack
+				? "data" : "audio"),
+			(session->control & kControlCopyPermitted
+				? "permitted" : "prohibited")));
 		TRACE(("  adr:              %d\n", session->adr));
-		track *track = (struct track*)session->track_list.First();
-		while (track) {
+		track* track = (struct track*)session->track_list.First();
+		while (track != NULL) {
 			TRACE(("  track %ld:\n", track->index));
 			TRACE(("    start_lba: %lld\n", track->start_lba));
 			track = (struct track*)track->next;
@@ -483,124 +688,125 @@
 	}
 }
 
-/*! \brief Reads through the given table of contents data and creates an unsorted,
-	unverified (i.e. non-error-checked) list of sessions and tracks.
+
+/*! \brief Reads through the given table of contents data and creates an
+	unsorted, unverified (i.e. non-error-checked) list of sessions and tracks.
 */
 status_t
-Disc::_ParseTableOfContents(cdrom_full_table_of_contents_entry entries[], uint32 count)
+Disc::_ParseTableOfContents(cdrom_full_table_of_contents_entry entries[],
+	uint32 count)
 {
 	DEBUG_INIT_ETC("Disc", ("entries: %p, count: %ld", entries, count));
+
 	for (uint32 i = 0; i < count; i++) {
 		// Find or create the appropriate session
-		uint8 session_index = entries[i].session;
-		session *session = (struct session*)fSessionList->Find(session_index);
-		if (!session) {
-			session = new struct session(session_index);
-			if (!session) {
+		uint8 sessionIndex = entries[i].session;
+		session* session = (struct session*)fSessionList->Find(sessionIndex);
+		if (session == NULL) {
+			session = new struct session(sessionIndex);
+			if (session == NULL)
 				return B_NO_MEMORY;
-			} else {
-				fSessionList->Add(session);
-			}
+
+			fSessionList->Add(session);
 		}
 
 		uint8 point = entries[i].point;
 
 		switch (point) {
-
 			// first track hint
 			case 0xA0:
 				if (!session->first_track_hint_is_set()) {
-					int8 first_track_hint = entries[i].pminutes;
-					if (1 <= first_track_hint && first_track_hint <= 99) {
-						session->first_track_hint = first_track_hint;
+					int8 firstTrackHint = entries[i].pminutes;
+					if (1 <= firstTrackHint && firstTrackHint <= 99) {
+						session->first_track_hint = firstTrackHint;
 					} else {
 						WARN(("%s: warning: illegal first track hint %d found "
-						      "for session %d\n", kModuleDebugName, first_track_hint,
-						      session_index));
+							"for session %d\n", kModuleDebugName,
+							firstTrackHint, sessionIndex));
 					}
 				} else {
-					WARN(("%s: warning: duplicated first track hint values found for"
-					      "session %d; using first value encountered: %d", kModuleDebugName,
-					      session_index, session->first_track_hint));
+					WARN(("%s: warning: duplicated first track hint values "
+						"found for session %d; using first value "
+						"encountered: %d", kModuleDebugName, sessionIndex,
+						session->first_track_hint));
 				}
 				break;
 
 			// last track hint
 			case 0xA1:
 				if (!session->last_track_hint_is_set()) {
-					int8 last_track_hint = entries[i].pminutes;
-					if (1 <= last_track_hint && last_track_hint <= 99) {
-						session->last_track_hint = last_track_hint;
+					int8 lastTrackHint = entries[i].pminutes;
+					if (1 <= lastTrackHint && lastTrackHint <= 99) {
+						session->last_track_hint = lastTrackHint;
 					} else {
 						WARN(("%s: warning: illegal last track hint %d found "
-						      "for session %d\n", kModuleDebugName, last_track_hint,
-						      session_index));
+							"for session %d\n", kModuleDebugName,
+							lastTrackHint, sessionIndex));
 					}
 				} else {
-					WARN(("%s: warning: duplicate last track hint values found for"
-					      "session %d; using first value encountered: %d", kModuleDebugName,
-					      session_index, session->last_track_hint));
+					WARN(("%s: warning: duplicate last track hint values found "
+						"for session %d; using first value encountered: %d",
+						kModuleDebugName, sessionIndex,
+						session->last_track_hint));
 				}
 				break;
 
 			// end of session address
 			case 0xA2:
 				if (!session->end_lba_is_set()) {
-					off_t end_lba = msf_to_lba(make_msf_address(
-								                          entries[i].pminutes,
-								                          entries[i].pseconds,
-								                          entries[i].pframes));
-					if (end_lba > 0) {
-						session->end_lba = end_lba;
+					off_t endLBA = msf_to_lba(make_msf_address(
+						entries[i].pminutes, entries[i].pseconds,
+						entries[i].pframes));
+					if (endLBA > 0) {
+						session->end_lba = endLBA;
 						// We also grab the session's control and adr values
 						// from this entry
 						session->control = entries[i].control;
 						session->adr = entries[i].adr;
 					} else {
-						WARN(("%s: warning: illegal end lba %lld found "
-						      "for session %d\n", kModuleDebugName, end_lba,
-						      session_index));
+						WARN(("%s: warning: illegal end lba %lld found for "
+							"session %d\n", kModuleDebugName, endLBA,
+							sessionIndex));
 					}
 				} else {
-					WARN(("%s: warning: duplicate end lba values found for"
-					      "session %d; using first value encountered: %lld",
-					      kModuleDebugName, session_index, session->end_lba));
+					WARN(("%s: warning: duplicate end lba values found for "
+						"session %d; using first value encountered: %lld",
+						kModuleDebugName, sessionIndex, session->end_lba));
 				}
 				break;
 
-				// Valid, but uninteresting, points
-				case 0xB0:
-				case 0xB1:
-				case 0xB2:
-				case 0xB3:
-				case 0xB4:
-				case 0xC0:
-				case 0xC1:
-					break;
+			// Valid, but uninteresting, points
+			case 0xB0:
+			case 0xB1:
+			case 0xB2:
+			case 0xB3:
+			case 0xB4:
+			case 0xC0:
+			case 0xC1:
+				break;
 
 			default:
 				// Anything else had better be a valid track number,
 				// or it's an invalid point
 				if (1 <= point && point <= 99) {
-					// Create and add the track. We'll weed out any duplicates later.
-					uint8 track_index = point;
-					off_t start_lba = msf_to_lba(make_msf_address(
-								                          entries[i].pminutes,
-								                          entries[i].pseconds,
-								                          entries[i].pframes));
-					// The control and adr values grabbed here are only used later on
-					// to signal a warning if they don't match the corresponding values
-					// of the parent session.
-					track *track = new(nothrow) struct track(track_index, start_lba,
-					               entries[i].control, entries[i].adr);
-					if (!track) {
+					// Create and add the track. We'll weed out any duplicates
+					// later.
+					uint8 trackIndex = point;
+					off_t startLBA = msf_to_lba(make_msf_address(
+						entries[i].pminutes, entries[i].pseconds,
+						entries[i].pframes));
+					// The control and adr values grabbed here are only used
+					// later on to signal a warning if they don't match the
+					// corresponding values of the parent session.
+					track* track = new(std::nothrow) struct track(trackIndex,
+						startLBA, entries[i].control, entries[i].adr);
+					if (track == NULL)
 						return B_NO_MEMORY;
-					} else {
-						session->track_list.Add(track);
-					}
+
+					session->track_list.Add(track);
 				} else {
-					WARN(("%s: warning: illegal point 0x%2x found in table of contents\n",
-					      kModuleDebugName, entries[i].point));
+					WARN(("%s: warning: illegal point 0x%2x found in table of "
+						"contents\n", kModuleDebugName, entries[i].point));
 				}
 				break;
 		}
@@ -608,6 +814,7 @@
 	return B_OK;
 }
 
+
 /*! \brief Bubble sorts the session list and each session's track lists,
 	removing all but the first of any duplicates (by index) found along
 	the way.
@@ -616,13 +823,14 @@
 Disc::_SortAndRemoveDuplicates()
 {
 	fSessionList->SortAndRemoveDuplicates();
-	session *session = (struct session*)fSessionList->First();
-	while (session) {
+	session* session = (struct session*)fSessionList->First();
+	while (session != NULL) {
 		session->track_list.SortAndRemoveDuplicates();
 		session = (struct session*)session->next;
 	}
 }
 
+
 /*	\brief Checks the sessions and tracks for any anomalies.
 
 	Errors will return an error code, warnings will return B_OK.
@@ -653,84 +861,85 @@
 	int32 lastSessionIndex = 0;
 	int32 lastTrackIndex = 0;
 
-	for (session *session = (struct session*)fSessionList->First();
-	       session;
-	         session = (struct session*)session->next)
-	{
+	for (session* session = (struct session*)fSessionList->First(); session;
+			session = (struct session*)session->next) {
 		// Check for errors
-		//-----------------
 
 		// missing end lba
 		if (!session->end_lba_is_set()) {
-			TRACE(("%s: Disc::_CheckForErrorsAndWarnings: error: no end of session "
-			       "address for session #%ld\n", kModuleDebugName, session->index));
+			TRACE(("%s: Disc::_CheckForErrorsAndWarnings: error: no end of "
+				"session address for session #%ld\n", kModuleDebugName,
+				session->index));
 			return B_ERROR;
 		}
 
 		// empty track list
-		track *track = (struct track*)session->track_list.First();
-		if (!track) {
-			TRACE(("%s: Disc::_CheckForErrorsAndWarnings: error: session #%ld has no"
-			       "tracks\n", kModuleDebugName, session->index));
+		track* track = (struct track*)session->track_list.First();
+		if (track == NULL) {
+			TRACE(("%s: Disc::_CheckForErrorsAndWarnings: error: session #%ld "
+				"has no tracks\n", kModuleDebugName, session->index));
 			return B_ERROR;
 		}
 
 		// Check for warnings
-		//-------------------

[... truncated: 490 lines follow ...]


From revol at free.fr  Thu Aug 13 15:36:06 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Thu, 13 Aug 2009 15:36:06 +0200 CEST
Subject: [Haiku-commits] r32307 - haiku/trunk/src/apps/drivesetup
In-Reply-To: <24202316235-BeMail@zon>
Message-ID: <480202991-BeMail@laptop>

> Bryce Groff <brycegroff at gmail.com> wrote:
> > > > * Disable Mount menu for partitions that are devices.
> > >
> > > It is not uncommon for devices like memory sticks and SD cards to 
> > > not
> > > have a partition at all and, instead, have the filesystem 
> > > directly 
> > > over
> > > the raw device.
> > I thought about this before I made the change. I came to the 
> > conclusion that
> > if a device was a raw filesystem the only thing you would be able 
> > to 
> > do to
> > it would be to initialize a new partitioning system which is still 
> > available
> > as an option. I am not sure what action would be taken if you 
> > wanted 
> > to
> > delete a raw filesystem on a device.
> > 
> > If there is a case that I am missing or seems unintuitive about 
> > this 
> > please
> > let me know.
> 
> *Mounting* should still be possible, though.

The obvious case being our own USB key installs which dump the BFS 
image at offset 0 of the device, ie no partition at all.

So this means you wouldn't even be able to mount another Haiku bootable 
key to copy files to it...

Fran?ois.


From brycegroff at gmail.com  Thu Aug 13 15:47:04 2009
From: brycegroff at gmail.com (Bryce Groff)
Date: Thu, 13 Aug 2009 03:47:04 -1000
Subject: [Haiku-commits] r32307 - haiku/trunk/src/apps/drivesetup
In-Reply-To: <24202316235-BeMail@zon>
References: <9efe01ea0908130539y6f0400d7m8fd8e1652768653@mail.gmail.com>
	<24202316235-BeMail@zon>
Message-ID: <9efe01ea0908130647u46bee824qbec37609d43f8399@mail.gmail.com>

> *Mounting* should still be possible, though.
>
>
Duh, Im an idiot :-)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20090813/f185de57/attachment.html>

From bgroff at mail.berlios.de  Thu Aug 13 15:55:04 2009
From: bgroff at mail.berlios.de (bgroff at BerliOS)
Date: Thu, 13 Aug 2009 15:55:04 +0200
Subject: [Haiku-commits] r32311 - haiku/trunk/src/apps/drivesetup
Message-ID: <200908131355.n7DDt3vk020456@sheep.berlios.de>

Author: bgroff
Date: 2009-08-13 15:55:01 +0200 (Thu, 13 Aug 2009)
New Revision: 32311
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32311&view=rev

Modified:
   haiku/trunk/src/apps/drivesetup/MainWindow.cpp
Log:
Revert back Mount menu item. One should be able to mount disk devices that contain raw filesystems.


Modified: haiku/trunk/src/apps/drivesetup/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-08-13 13:33:08 UTC (rev 32310)
+++ haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-08-13 13:55:01 UTC (rev 32311)
@@ -541,8 +541,7 @@
 			fDeleteMI->SetEnabled(!partition->IsMounted()
 				&& !partition->IsDevice());
 
-			fMountMI->SetEnabled(!partition->IsMounted()
-				&& !partition->IsDevice());
+			fMountMI->SetEnabled(!partition->IsMounted());
 
 			bool unMountable = false;
 			if (partition->IsMounted()) {



From jackburton at mail.berlios.de  Thu Aug 13 16:01:29 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Thu, 13 Aug 2009 16:01:29 +0200
Subject: [Haiku-commits] r32312 - haiku/trunk/src/servers/app
Message-ID: <200908131401.n7DE1Tef021174@sheep.berlios.de>

Author: jackburton
Date: 2009-08-13 16:01:25 +0200 (Thu, 13 Aug 2009)
New Revision: 32312
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32312&view=rev

Modified:
   haiku/trunk/src/servers/app/Desktop.cpp
   haiku/trunk/src/servers/app/Window.cpp
Log:
Moved HandleDirectConnection From Window to Desktop. This should fix the
spurious off-window drawing of BDirectWindow. At least, it does here.


Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2009-08-13 13:55:01 UTC (rev 32311)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2009-08-13 14:01:25 UTC (rev 32312)
@@ -1912,6 +1912,8 @@
 void
 Desktop::_HideWindow(Window* window)
 {
+	window->ServerWindow()->HandleDirectConnection(B_DIRECT_STOP);
+
 	// after rebuilding the clipping,
 	// this window will not have a visible
 	// region anymore, so we need to remember
@@ -1927,8 +1929,6 @@
 	_WindowChanged(window);
 
 	MarkDirty(dirty);
-
-	window->ServerWindow()->HandleDirectConnection(B_DIRECT_STOP);
 }
 
 
@@ -1981,10 +1981,6 @@
 
 	GetDrawingEngine()->CopyRegion(&copyRegion, (int32)x, (int32)y);
 
-	// allow DirectWindows to draw again after the visual
-	// content is at the new location
-	window->ServerWindow()->HandleDirectConnection(B_DIRECT_START | B_BUFFER_MOVED);
-
 	// in the dirty region, exclude the parts that we
 	// could move by blitting
 	copyRegion.OffsetBy((int32)x, (int32)y);
@@ -1994,6 +1990,10 @@
 	_SetBackground(background);
 	_WindowChanged(window);
 
+	// allow DirectWindows to draw again after the visual
+	// content is at the new location
+	window->ServerWindow()->HandleDirectConnection(B_DIRECT_START | B_BUFFER_MOVED);
+
 	UnlockAllWindows();
 }
 
@@ -2017,6 +2017,8 @@
 	// it is shrunk in "previouslyOccupiedRegion"
 	BRegion previouslyOccupiedRegion(window->VisibleRegion());
 
+	window->ServerWindow()->HandleDirectConnection(B_DIRECT_STOP);
+
 	window->ResizeBy((int32)x, (int32)y, &newDirtyRegion);
 
 	BRegion background;
@@ -2035,6 +2037,8 @@
 	_SetBackground(background);
 	_WindowChanged(window);
 
+	window->ServerWindow()->HandleDirectConnection(B_DIRECT_START | B_BUFFER_RESIZED);
+
 	UnlockAllWindows();
 }
 

Modified: haiku/trunk/src/servers/app/Window.cpp
===================================================================
--- haiku/trunk/src/servers/app/Window.cpp	2009-08-13 13:55:01 UTC (rev 32311)
+++ haiku/trunk/src/servers/app/Window.cpp	2009-08-13 14:01:25 UTC (rev 32312)
@@ -365,13 +365,9 @@
 	if (x == 0 && y == 0)
 		return;
 
-	fWindow->HandleDirectConnection(B_DIRECT_STOP);
-
 	fFrame.right += x;
 	fFrame.bottom += y;
 
-	fWindow->HandleDirectConnection(B_DIRECT_START | B_BUFFER_RESIZED);
-
 	fBorderRegionValid = false;
 	fContentRegionValid = false;
 	fEffectiveDrawingRegionValid = false;



From mmu_man at mail.berlios.de  Thu Aug 13 16:03:44 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 16:03:44 +0200
Subject: [Haiku-commits] r32313 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200908131403.n7DE3iQZ021453@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 16:03:43 +0200 (Thu, 13 Aug 2009)
New Revision: 32313
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32313&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_elf.c
Log:
Use a more logical and native error here.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_elf.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_elf.c	2009-08-13 14:01:25 UTC (rev 32312)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_elf.c	2009-08-13 14:03:43 UTC (rev 32313)
@@ -145,7 +145,7 @@
 			default:
 				dprintf("arch_elf_relocate_rel: unhandled relocation type %d\n",
 					ELF32_R_TYPE(rel[i].r_info));
-				return EPERM;
+				return B_BAD_DATA;
 		}
 
 		resolveAddress = (addr_t *)(image->text_region.delta + rel[i].r_offset);



From axeld at mail.berlios.de  Thu Aug 13 16:21:20 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 16:21:20 +0200
Subject: [Haiku-commits] r32314 - haiku/trunk/src/system/kernel/fs
Message-ID: <200908131421.n7DELKUn023688@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 16:21:18 +0200 (Thu, 13 Aug 2009)
New Revision: 32314
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32314&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/vfs.cpp
Log:
* We also shouldn't try to copy if the dirent is too large, obviously.


Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-08-13 14:03:43 UTC (rev 32313)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-08-13 14:21:18 UTC (rev 32314)
@@ -5564,7 +5564,8 @@
 		ASSERT(entry->d_reclen >= sizeof(struct dirent));
 
 		// This hints to a problem in the file system implementation
-		if (entry->d_reclen < sizeof(struct dirent))
+		if (entry->d_reclen < sizeof(struct dirent)
+			|| entry->d_reclen > sizeof(buffer))
 			return B_BAD_DATA;
 
 		if (user_memcpy(entry->d_name, userEntry->d_name,



From ingo_weinhold at gmx.de  Thu Aug 13 16:14:39 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Thu, 13 Aug 2009 16:14:39 +0200
Subject: [Haiku-commits] r32306 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <200908131205.n7DC5POx006657@sheep.berlios.de>
References: <200908131205.n7DC5POx006657@sheep.berlios.de>
Message-ID: <20090813161439.573.1@knochen-vm.localdomain>


On 2009-08-13 at 14:05:25 [+0200], axeld at BerliOS <axeld at mail.berlios.de> 
wrote:
> Author: axeld
> Date: 2009-08-13 14:05:20 +0200 (Thu, 13 Aug 2009)
> New Revision: 32306
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32306&view=rev
> 
> Modified:
>    haiku/trunk/src/system/kernel/fs/vfs.cpp
> Log:
> * Let fix_dirent() handle invalid reclen's gracefully.

Since that constitutes a file system bug, how about panicking gracefully 
instead?

CU, Ingo


From mattmadia at gmail.com  Thu Aug 13 16:35:54 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Thu, 13 Aug 2009 14:35:54 +0000
Subject: [Haiku-commits] r32272 - haiku/trunk/src/servers/mail
In-Reply-To: <293214818-BeMail@Gaspode>
References: <a4855ac50908121359i72178f2bqbfc7d9a603fd1993@mail.gmail.com>
	<293214818-BeMail@Gaspode>
Message-ID: <1e42d8c50908130735r719b1974x216b7900a8162629@mail.gmail.com>

On Wed, Aug 12, 2009 at 22:00, Bruno Albuquerque<bga at bug-br.org.br> wrote:
> as Nathan is MIA, I am not sure doing
> this without his consent is ok. I am pretty sure he would not mind (I
> am certain, in fact), but we should at least try to contact him.

This might be him... http://freebsd.monkey.org/freebsd-ppc/200903/msg00016.html

on this page, he's also listed as the
FreeBSD/powerpc G5 Support
   Contact: Nathan Whitehorn <nwhiteh... at freebsd.org>
( http://www.mail-archive.com/freebsd-announce at freebsd.org/msg00267.html )

Back in the day, i do recall him having a quad daystar  (PPC)

Bruno, care to test the waters?  :)

--mmadia


From mmu_man at mail.berlios.de  Thu Aug 13 16:45:08 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 16:45:08 +0200
Subject: [Haiku-commits] r32315 - in
	haiku/trunk/headers/private/kernel/arch/arm/board: overo verdex
Message-ID: <200908131445.n7DEj89N026467@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 16:45:06 +0200 (Thu, 13 Aug 2009)
New Revision: 32315
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32315&view=rev

Modified:
   haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h
   haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h
Log:
[ARM]
Identify cpus more precisely.


Modified: haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h	2009-08-13 14:21:18 UTC (rev 32314)
+++ haiku/trunk/headers/private/kernel/arch/arm/board/overo/board_config.h	2009-08-13 14:45:06 UTC (rev 32315)
@@ -7,6 +7,9 @@
 
 #define BOARD_NAME_PRETTY "Gumstix Overo"
 
+#define BOARD_CPU_TYPE_OMAP 1
+#define BOARD_CPU_OMAP3 1
+
 #include <arch/arm/omap3.h>
 
 #define BOARD_UART1_BASE OMAP_UART1_BASE

Modified: haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h	2009-08-13 14:21:18 UTC (rev 32314)
+++ haiku/trunk/headers/private/kernel/arch/arm/board/verdex/board_config.h	2009-08-13 14:45:06 UTC (rev 32315)
@@ -7,6 +7,9 @@
 
 #define BOARD_NAME_PRETTY "Gumstix Verdex"
 
+#define BOARD_CPU_TYPE_PXA 1
+#define BOARD_CPU_PXA270 1
+
 #include <arch/arm/pxa270.h>
 
 #define BOARD_UART1_BASE FFUART_BASE



From mattmadia at gmail.com  Thu Aug 13 16:53:49 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Thu, 13 Aug 2009 14:53:49 +0000
Subject: [Haiku-commits] r32275 - in haiku/trunk/src: bin
	data/beos_mime/application
In-Reply-To: <383432980-BeMail@Gaspode>
References: <48011658430-BeMail@zon> <383432980-BeMail@Gaspode>
Message-ID: <1e42d8c50908130753m3b11a468t48191dbbed941845@mail.gmail.com>

On Wed, Aug 12, 2009 at 22:02, Bruno Albuquerque<bga at bug-br.org.br> wrote:
> Funny enough, I actually do that. The reason is that I mount my home
> dir from a different partition and this has to be done as earlier as
> possible in the boot process.

Would you explain how you do this?
Might be worthwhile to document,  eg for advanced usage with virtualizing Haiku.

--mmadia


From jackburton at mail.berlios.de  Thu Aug 13 16:55:00 2009
From: jackburton at mail.berlios.de (jackburton at mail.berlios.de)
Date: Thu, 13 Aug 2009 16:55:00 +0200
Subject: [Haiku-commits] r32316 -
	haiku/trunk/src/tests/kits/game/direct_window_test
Message-ID: <200908131455.n7DEt06W028544@sheep.berlios.de>

Author: jackburton
Date: 2009-08-13 16:54:54 +0200 (Thu, 13 Aug 2009)
New Revision: 32316
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32316&view=rev

Modified:
   haiku/trunk/src/tests/kits/game/direct_window_test/StarWindow.cpp
Log:
This one took me ages to find out, since I was looking for a bug in
BDirectWindow, either in the kit or app_server part. Basically that
calculation overflowed, and the application drawn outside the frame
buffer. Freaky. I'm sure Chart suffers from a similar problem (ticket
#1939)


Modified: haiku/trunk/src/tests/kits/game/direct_window_test/StarWindow.cpp
===================================================================
--- haiku/trunk/src/tests/kits/game/direct_window_test/StarWindow.cpp	2009-08-13 14:45:06 UTC (rev 32315)
+++ haiku/trunk/src/tests/kits/game/direct_window_test/StarWindow.cpp	2009-08-13 14:54:54 UTC (rev 32316)
@@ -356,7 +356,7 @@
 	row_bytes = info->bytes_per_row / (info->bits_per_pixel / 8);
 	
 	// update the screen bases (only one of the 3 will be really used).
-	draw_ptr8 = (uint8*)info->bits + info->bytes_per_row * info->window_bounds.top + (info->window_bounds.left * info->bits_per_pixel / 8);
+	draw_ptr8 = (uint8*)info->bits + (info->bytes_per_row * info->window_bounds.top) + (info->window_bounds.left * (info->bits_per_pixel / 8));
 	draw_ptr16 = (uint16*)draw_ptr8;
 	draw_ptr32 = (uint32*)draw_ptr8;
 



From mmu_man at mail.berlios.de  Thu Aug 13 16:56:41 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 16:56:41 +0200
Subject: [Haiku-commits] r32317 - haiku/trunk/src/system/boot/arch/arm
Message-ID: <200908131456.n7DEuf23028769@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 16:56:40 +0200 (Thu, 13 Aug 2009)
New Revision: 32317
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32317&view=rev

Modified:
   haiku/trunk/src/system/boot/arch/arm/uart.c
Log:
[GSoC] [ARM] Patch by Johannes Wischert.
Add UART initialization for OMAP. uncomment polling wait loops.


Modified: haiku/trunk/src/system/boot/arch/arm/uart.c
===================================================================
--- haiku/trunk/src/system/boot/arch/arm/uart.c	2009-08-13 14:54:54 UTC (rev 32316)
+++ haiku/trunk/src/system/boot/arch/arm/uart.c	2009-08-13 14:56:40 UTC (rev 32317)
@@ -113,19 +113,23 @@
 
 void uart_init_early(void)
 {
-#warning INTITIALIZE UART!!!!!
+#if BOARD_CPU_OMAP3
 	/* UART1 */
-//	RMWREG32(CKEN1, 13, 1, 1),
-//	RMWREG32(CM_ICLKEN1_CORE, 13, 1, 1),
+	RMWREG32(CM_FCLKEN1_CORE, 13, 1, 1);
+	RMWREG32(CM_ICLKEN1_CORE, 13, 1, 1);
 
 	/* UART2 */
-//	RMWREG32(CM_FCLKEN1_CORE, 14, 1, 1),
-//	RMWREG32(CM_ICLKEN1_CORE, 14, 1, 1),
+	RMWREG32(CM_FCLKEN1_CORE, 14, 1, 1);
+	RMWREG32(CM_ICLKEN1_CORE, 14, 1, 1);
 
 	/* UART3 */
-//	RMWREG32(CM_FCLKEN_PER, 11, 1, 1),
-//	RMWREG32(CM_ICLKEN_PER, 11, 1, 1),
+	RMWREG32(CM_FCLKEN_PER, 11, 1, 1);
+	RMWREG32(CM_ICLKEN_PER, 11, 1, 1);
+#else
+#warning INTITIALIZE UART!!!!!
+#endif
 
+
 	uart_init_port(DEBUG_UART, 115200);
 }
 
@@ -136,21 +140,21 @@
 int uart_putc(int port, char c )
 {
 
-//	while (!(read_uart_reg(port, UART_LSR) & (1<<6))) // wait for the last char to get out
-//		;
+	while (!(read_uart_reg(port, UART_LSR) & (1<<6))) // wait for the last char to get out
+		;
   	write_uart_reg(port, UART_THR, c);
 	return 0;
 }
 
 int uart_getc(int port, bool wait)  /* returns -1 if no data available */
 {
-//	if (wait) {
-//		while (!(read_uart_reg(port, UART_LSR) & (1<<0))) // wait for data to show up in the rx fifo
-//			;
-//	} else {
-//		if (!(read_uart_reg(port, UART_LSR) & (1<<0)))
-//			return -1;
-//	}
+	if (wait) {
+		while (!(read_uart_reg(port, UART_LSR) & (1<<0))) // wait for data to show up in the rx fifo
+			;
+	} else {
+		if (!(read_uart_reg(port, UART_LSR) & (1<<0)))
+			return -1;
+	}
 	return read_uart_reg(port, UART_RHR);
 }
 



From axeld at mail.berlios.de  Thu Aug 13 17:14:35 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 17:14:35 +0200
Subject: [Haiku-commits] r32318 - haiku/trunk/src/bin/network/netstat
Message-ID: <200908131514.n7DFEZc0030767@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 17:14:34 +0200 (Thu, 13 Aug 2009)
New Revision: 32318
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32318&view=rev

Modified:
   haiku/trunk/src/bin/network/netstat/netstat.cpp
Log:
* getservbyport() expects the port in network byte order. Resolving port names
  is now working as expected.


Modified: haiku/trunk/src/bin/network/netstat/netstat.cpp
===================================================================
--- haiku/trunk/src/bin/network/netstat/netstat.cpp	2009-08-13 14:56:40 UTC (rev 32317)
+++ haiku/trunk/src/bin/network/netstat/netstat.cpp	2009-08-13 15:14:34 UTC (rev 32318)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -54,7 +54,7 @@
 inet_print_address(sockaddr* _address)
 {
 	sockaddr_in& address = *(sockaddr_in *)_address;
-	
+
 	if (address.sin_family != AF_INET || address.sin_len == 0) {
 		printf("%-22s", "-");
 		return;
@@ -65,7 +65,7 @@
 	if (sResolveNames) {
 		host = gethostbyaddr((const char*)&address.sin_addr, sizeof(in_addr),
 			AF_INET);
-		service = getservbyport(ntohs(address.sin_port), NULL);
+		service = getservbyport(address.sin_port, NULL);
 	}
 
 	const char *hostName;



From bga at bug-br.org.br  Thu Aug 13 17:52:07 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Thu, 13 Aug 2009 12:52:07 -0300
Subject: [Haiku-commits] r32275 - in haiku/trunk/src:
	bin	data/beos_mime/application
In-Reply-To: <1e42d8c50908130753m3b11a468t48191dbbed941845@mail.gmail.com>
References: <48011658430-BeMail@zon> <383432980-BeMail@Gaspode>
	<1e42d8c50908130753m3b11a468t48191dbbed941845@mail.gmail.com>
Message-ID: <4A8436A7.80401@bug-br.org.br>

Matt Madia wrote:
> On Wed, Aug 12, 2009 at 22:02, Bruno Albuquerque<bga at bug-br.org.br> wrote:
>> Funny enough, I actually do that. The reason is that I mount my home
>> dir from a different partition and this has to be done as earlier as
>> possible in the boot process.
> 
> Would you explain how you do this?
> Might be worthwhile to document,  eg for advanced usage with virtualizing Haiku.

Add "mountvolume Data" as the first line of Bootscript :) Nothing fancy, 
really. But it does not work anymore dur to the changes in mountvolume. 
The alternative is adding, alkso as the forst lines, this:

mkdir /MountPointName
mount /path/to/partition /MountPointName

Note it is the system Bootscript. Not UserBootscript.

Then my /boot/home is a symlink to /MountPointName/home. QED. :)

-Bruno



From axeld at mail.berlios.de  Thu Aug 13 18:22:12 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 18:22:12 +0200
Subject: [Haiku-commits] r32319 - haiku/trunk/src/servers/net
Message-ID: <200908131622.n7DGMCqU005864@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 18:22:09 +0200 (Thu, 13 Aug 2009)
New Revision: 32319
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32319&view=rev

Modified:
   haiku/trunk/src/servers/net/NetServer.cpp
   haiku/trunk/src/servers/net/NetServer.h
   haiku/trunk/src/servers/net/Services.cpp
   haiku/trunk/src/servers/net/Settings.cpp
Log:
* Added "stand_alone" setting to the services - this way you can use the
  net_server to launch services that work like a daemon theirselves (like sshd).
  A service like this is also killed (via SIGTERM) when the netserver stops the
  service (with sshd, you have to pass the '-D' option to make this work).
* If a boolean is given without value, it now defaults to true.
* The "launch" argument now gets its arguments properly parsed, and added, too.
* Services::_Update() did accidently set fUpdate on the wrong service, causing
  services that were not changed to be stopped.
* More helpful output.


Modified: haiku/trunk/src/servers/net/NetServer.cpp
===================================================================
--- haiku/trunk/src/servers/net/NetServer.cpp	2009-08-13 15:14:34 UTC (rev 32318)
+++ haiku/trunk/src/servers/net/NetServer.cpp	2009-08-13 16:22:09 UTC (rev 32319)
@@ -80,6 +80,10 @@
 	void		(*set_port)(sockaddr* address, int32 port);
 };
 
+
+const char* kNetServerSignature = "application/x-vnd.haiku-net_server";
+
+
 // AF_INET family
 static bool inet_parse_address(const char* string, sockaddr* address);
 static void inet_set_any_address(sockaddr* address);

Modified: haiku/trunk/src/servers/net/NetServer.h
===================================================================
--- haiku/trunk/src/servers/net/NetServer.h	2009-08-13 15:14:34 UTC (rev 32318)
+++ haiku/trunk/src/servers/net/NetServer.h	2009-08-13 16:22:09 UTC (rev 32319)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -14,7 +14,7 @@
 #include <net/if.h>
 
 
-static const char* kNetServerSignature = "application/x-vnd.haiku-net_server";
+extern const char* kNetServerSignature;
 
 static const uint32 kMsgConfigureInterface = 'COif';
 

Modified: haiku/trunk/src/servers/net/Services.cpp
===================================================================
--- haiku/trunk/src/servers/net/Services.cpp	2009-08-13 15:14:34 UTC (rev 32318)
+++ haiku/trunk/src/servers/net/Services.cpp	2009-08-13 16:22:09 UTC (rev 32319)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -26,7 +26,7 @@
 using namespace std;
 
 struct service_address {
-	struct service *owner;
+	struct service* owner;
 	int		socket;
 	int		family;
 	int		type;
@@ -36,15 +36,18 @@
 	bool operator==(const struct service_address& other) const;
 };
 
-typedef vector<service_address> AddressList;
+typedef std::vector<service_address> AddressList;
+typedef std::vector<std::string> StringList;
 
 struct service {
 	std::string	name;
-	std::string	launch;
+	StringList	arguments;
 	uid_t		user;
 	gid_t		group;
 	AddressList	addresses;
 	uint32		update;
+	bool		stand_alone;
+	pid_t		process;
 
 	~service();
 	bool operator!=(const struct service& other) const;
@@ -128,10 +131,18 @@
 service::operator==(const struct service& other) const
 {
 	if (name != other.name
-		|| launch != other.launch
-		|| addresses.size() != other.addresses.size())
+		|| arguments.size() != other.arguments.size()
+		|| addresses.size() != other.addresses.size()
+		|| stand_alone != other.stand_alone)
 		return false;
 
+	// compare arguments
+
+	for(int i = 0; i < arguments.size(); i++) {
+		if (arguments[i] != other.arguments[i])
+			return false;
+	}
+
 	// compare addresses
 
 	AddressList::const_iterator iterator = addresses.begin();
@@ -244,6 +255,16 @@
 status_t
 Services::_StartService(struct service& service)
 {
+	if (service.stand_alone && service.process == -1) {
+		status_t status = _LaunchService(service, -1);
+		if (status == B_OK) {
+			// add service
+			fNameMap[service.name] = &service;
+			service.update = fUpdate;
+		}
+		return status;
+	}
+
 	// create socket
 
 	bool failed = false;
@@ -293,13 +314,16 @@
 status_t
 Services::_StopService(struct service& service)
 {
+	printf("Stop service '%s'\n", service.name.c_str());
+
 	// remove service from maps
 	{
 		ServiceNameMap::iterator iterator = fNameMap.find(service.name);
 		if (iterator != fNameMap.end())
 			fNameMap.erase(iterator);
 	}
-	{
+
+	if (!service.stand_alone) {
 		AddressList::const_iterator iterator = service.addresses.begin();
 		for (; iterator != service.addresses.end(); iterator++) {
 			const service_address& address = *iterator;
@@ -314,6 +338,12 @@
 		}
 	}
 
+	// Shutdown the running server, if any
+	if (service.process != -1) {
+		printf("  Sending SIGTERM to process %ld\n", service.process);
+		kill(-service.process, SIGTERM);
+	}
+
 	delete &service;
 	return B_OK;
 }
@@ -324,9 +354,8 @@
 {
 	// get mandatory fields
 	const char* name;
-	const char* launch;
 	if (message.FindString("name", &name) != B_OK
-		|| message.FindString("launch", &launch) != B_OK)
+		|| !message.HasString("launch"))
 		return B_BAD_VALUE;
 
 	service = new (std::nothrow) ::service;
@@ -334,8 +363,15 @@
 		return B_NO_MEMORY;
 
 	service->name = name;
-	service->launch = launch;
 
+	const char* argument;
+	for (int i = 0; message.FindString("launch", i, &argument) == B_OK; i++) {
+		service->arguments.push_back(argument);
+	}
+
+	service->stand_alone = false;
+	service->process = -1;
+
 	// TODO: user/group is currently ignored!
 
 	// Default family/port/protocol/type for all addresses
@@ -355,7 +391,8 @@
 		serviceProtocol = parse_protocol(string);
 	else {
 		string = "tcp";
-			// we set 'string' here for an eventual call to getservbyname() below
+			// we set 'string' here for an eventual call to getservbyname()
+			// below
 		serviceProtocol = IPPROTO_TCP;
 	}
 
@@ -375,6 +412,10 @@
 		serviceType = type_for_protocol(serviceProtocol);
 	}
 
+	bool standAlone = false;
+	if (message.FindBool("stand_alone", &standAlone) == B_OK)
+		service->stand_alone = standAlone;
+
 	BMessage address;
 	int32 i = 0;
 	for (; message.FindMessage("address", i, &address) == B_OK; i++) {
@@ -464,15 +505,17 @@
 		ServiceNameMap::iterator iterator = fNameMap.find(name);
 		if (iterator == fNameMap.end()) {
 			// this service does not exist yet, start it
+			printf("New service %s\n", service->name.c_str());
 			_StartService(*service);
 		} else {
 			// this service does already exist - check for any changes
 
 			if (*service != *iterator->second) {
+				printf("Restart service %s\n", service->name.c_str());
 				_StopService(*iterator->second);
 				_StartService(*service);
 			} else
-				service->update = fUpdate;
+				iterator->second->update = fUpdate;
 		}
 	}
 
@@ -494,9 +537,9 @@
 status_t
 Services::_LaunchService(struct service& service, int socket)
 {
-	printf("LAUNCH: %s\n", service.launch.c_str());
+	printf("Launch service: %s\n", service.arguments[0].c_str());
 
-	if (fcntl(socket, F_SETFD, 0) < 0) {
+	if (socket != -1 && fcntl(socket, F_SETFD, 0) < 0) {
 		// could not clear FD_CLOEXEC on socket
 		return errno;
 	}
@@ -507,27 +550,37 @@
 			// make sure we're in our own session, and don't accidently quit
 			// the net_server
 
-		// We're the child, replace standard input/output
-		dup2(socket, STDIN_FILENO);
-		dup2(socket, STDOUT_FILENO);
-		dup2(socket, STDERR_FILENO);
-		close(socket);
+		if (socket != -1) {
+			// We're the child, replace standard input/output
+			dup2(socket, STDIN_FILENO);
+			dup2(socket, STDOUT_FILENO);
+			dup2(socket, STDERR_FILENO);
+			close(socket);
+		}
 
 		// build argument array
 
-		const char** args = (const char**)malloc(2 * sizeof(void *));
+		const char** args = (const char**)malloc(
+			(service.arguments.size() + 1) * sizeof(char*));
 		if (args == NULL)
 			exit(1);
 
-		args[0] = service.launch.c_str();
-		args[1] = NULL;
-		if (execv(service.launch.c_str(), (char* const*)args) < 0)
+		for (int i = 0; i < service.arguments.size(); i++) {
+			args[i] = service.arguments[i].c_str();
+		}
+		args[service.arguments.size()] = NULL;
+
+		if (execv(service.arguments[0].c_str(), (char* const*)args) < 0)
 			exit(1);
 
 		// we'll never trespass here
 	} else {
 		// the server does not need the socket anymore
-		close(socket);
+		if (socket != -1)
+			close(socket);
+
+		if (service.stand_alone)
+			service.process = child;
 	}
 
 	// TODO: make sure child started successfully...

Modified: haiku/trunk/src/servers/net/Settings.cpp
===================================================================
--- haiku/trunk/src/servers/net/Settings.cpp	2009-08-13 15:14:34 UTC (rev 32318)
+++ haiku/trunk/src/servers/net/Settings.cpp	2009-08-13 16:22:09 UTC (rev 32319)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -75,6 +75,7 @@
 	{B_STRING_TYPE, "type", NULL},
 	{B_STRING_TYPE, "protocol", NULL},
 	{B_INT32_TYPE, "port", NULL},
+	{B_BOOL_TYPE, "stand_alone", NULL},
 	{0, NULL, NULL}
 };
 
@@ -177,6 +178,10 @@
 				break;
 		}
 	}
+	if (type == B_BOOL_TYPE && parameter.value_count == 0) {
+		// boolean parameters are always true
+		message.AddBool(name, true);
+	}
 
 	return B_OK;
 }



From axeld at mail.berlios.de  Thu Aug 13 18:28:29 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 18:28:29 +0200
Subject: [Haiku-commits] r32320 - haiku/trunk/src/servers/net
Message-ID: <200908131628.n7DGSTwn006557@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 18:28:28 +0200 (Thu, 13 Aug 2009)
New Revision: 32320
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32320&view=rev

Modified:
   haiku/trunk/src/servers/net/Services.cpp
Log:
* Fixed warnings.


Modified: haiku/trunk/src/servers/net/Services.cpp
===================================================================
--- haiku/trunk/src/servers/net/Services.cpp	2009-08-13 16:22:09 UTC (rev 32319)
+++ haiku/trunk/src/servers/net/Services.cpp	2009-08-13 16:28:28 UTC (rev 32320)
@@ -138,7 +138,7 @@
 
 	// compare arguments
 
-	for(int i = 0; i < arguments.size(); i++) {
+	for(size_t i = 0; i < arguments.size(); i++) {
 		if (arguments[i] != other.arguments[i])
 			return false;
 	}
@@ -565,7 +565,7 @@
 		if (args == NULL)
 			exit(1);
 
-		for (int i = 0; i < service.arguments.size(); i++) {
+		for (size_t i = 0; i < service.arguments.size(); i++) {
 			args[i] = service.arguments[i].c_str();
 		}
 		args[service.arguments.size()] = NULL;



From axeld at mail.berlios.de  Thu Aug 13 18:30:25 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 18:30:25 +0200
Subject: [Haiku-commits] r32321 - in haiku/trunk/src: bin/network/ifconfig
	preferences/network servers/net
Message-ID: <200908131630.n7DGUPCW007126@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 18:30:21 +0200 (Thu, 13 Aug 2009)
New Revision: 32321
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32321&view=rev

Modified:
   haiku/trunk/src/bin/network/ifconfig/ifconfig.cpp
   haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
   haiku/trunk/src/servers/net/NetServer.cpp
   haiku/trunk/src/servers/net/NetServer.h
   haiku/trunk/src/servers/net/Settings.cpp
Log:
* Made defines out of the kNetServerSignature and kMsgConfigureInterface
  constants - they are used in other apps as well, and defining them as
  "static const" causes undefined warnings in other source files. This also
  fixes the build.
* Changed "interfaces::auto config" to auto_config, as that's more convenient
  to use in the settings files.


Modified: haiku/trunk/src/bin/network/ifconfig/ifconfig.cpp
===================================================================
--- haiku/trunk/src/bin/network/ifconfig/ifconfig.cpp	2009-08-13 16:28:28 UTC (rev 32320)
+++ haiku/trunk/src/bin/network/ifconfig/ifconfig.cpp	2009-08-13 16:30:21 UTC (rev 32321)
@@ -762,7 +762,7 @@
 		message.AddString("device", name);
 		BMessage address;
 		address.AddString("family", "inet");
-		address.AddBool("auto config", true);
+		address.AddBool("auto_config", true);
 		message.AddMessage("address", &address);
 
 		BMessenger networkServer(kNetServerSignature);

Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2009-08-13 16:28:28 UTC (rev 32320)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2009-08-13 16:30:21 UTC (rev 32321)
@@ -449,7 +449,7 @@
 	message.AddString("device", device);
 	BMessage address;
 	address.AddString("family", "inet");
-	address.AddBool("auto config", true);
+	address.AddBool("auto_config", true);
 	message.AddMessage("address", &address);
 
 	BMessage reply;

Modified: haiku/trunk/src/servers/net/NetServer.cpp
===================================================================
--- haiku/trunk/src/servers/net/NetServer.cpp	2009-08-13 16:28:28 UTC (rev 32320)
+++ haiku/trunk/src/servers/net/NetServer.cpp	2009-08-13 16:30:21 UTC (rev 32321)
@@ -81,9 +81,6 @@
 };
 
 
-const char* kNetServerSignature = "application/x-vnd.haiku-net_server";
-
-
 // AF_INET family
 static bool inet_parse_address(const char* string, sockaddr* address);
 static void inet_set_any_address(sockaddr* address);
@@ -559,7 +556,7 @@
 		// retrieve addresses
 
 		bool autoConfig;
-		if (addressMessage.FindBool("auto config", &autoConfig) != B_OK)
+		if (addressMessage.FindBool("auto_config", &autoConfig) != B_OK)
 			autoConfig = false;
 #if 0
 		if (autoConfig && fromMessage) {
@@ -731,7 +728,7 @@
 	interface.AddString("device", path);
 	BMessage address;
 	address.AddString("family", "inet");
-	address.AddBool("auto config", true);
+	address.AddBool("auto_config", true);
 	interface.AddMessage("address", &address);
 
 	return _ConfigureInterface(socket, interface);

Modified: haiku/trunk/src/servers/net/NetServer.h
===================================================================
--- haiku/trunk/src/servers/net/NetServer.h	2009-08-13 16:28:28 UTC (rev 32320)
+++ haiku/trunk/src/servers/net/NetServer.h	2009-08-13 16:30:21 UTC (rev 32321)
@@ -14,11 +14,12 @@
 #include <net/if.h>
 
 
-extern const char* kNetServerSignature;
+// NOTE: this header is used by other applications (such as ifconfig,
+// and Network) because of these two defines
+#define kNetServerSignature		"application/x-vnd.haiku-net_server"
+#define kMsgConfigureInterface	'COif'
 
-static const uint32 kMsgConfigureInterface = 'COif';
 
-
 extern bool get_family_index(const char* name, int32& familyIndex);
 extern int family_at_index(int32 index);
 extern bool parse_address(int32 familyIndex, const char* argument,

Modified: haiku/trunk/src/servers/net/Settings.cpp
===================================================================
--- haiku/trunk/src/servers/net/Settings.cpp	2009-08-13 16:28:28 UTC (rev 32320)
+++ haiku/trunk/src/servers/net/Settings.cpp	2009-08-13 16:30:21 UTC (rev 32321)
@@ -36,7 +36,7 @@
 	{B_STRING_TYPE, "peer", NULL},
 	{B_STRING_TYPE, "broadcast", NULL},
 	{B_STRING_TYPE, "gateway", NULL},
-	{B_BOOL_TYPE, "auto config", NULL},
+	{B_BOOL_TYPE, "auto_config", NULL},
 	{0, NULL, NULL}
 };
 



From axeld at pinc-software.de  Thu Aug 13 18:36:05 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 13 Aug 2009 18:36:05 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r32316_-_haiku/trunk/src/tests/kits/gam?=
 =?utf-8?q?e/direct=5Fwindow=5Ftest?=
In-Reply-To: <200908131455.n7DEt06W028544@sheep.berlios.de>
Message-ID: <35924166316-BeMail@zon>

jackburton at mail.berlios.de wrote:
> -	draw_ptr8 = (uint8*)info->bits + info->bytes_per_row * info->
> window_bounds.top + (info->> window_bounds.left * info->bits_per_pixel 
/ 8);
> +	draw_ptr8 = (uint8*)info->bits + (info->bytes_per_row * info->
> window_bounds.top) + (info->> window_bounds.left * (info->
bits_per_pixel / 8));

Nice one, although two pairs of parenthesis are actually useless, and 
should be discarded, also, a comment wouldn't be too bad explaining 
that.

Bye,
   Axel.



From axeld at pinc-software.de  Thu Aug 13 18:38:23 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 13 Aug 2009 18:38:23 +0200 CEST
Subject: [Haiku-commits] r32306 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <20090813161439.573.1@knochen-vm.localdomain>
Message-ID: <36062327982-BeMail@zon>

Ingo Weinhold <ingo_weinhold at gmx.de> wrote:
> On 2009-08-13 at 14:05:25 [+0200], axeld at BerliOS <
> axeld at mail.berlios.de> 
> wrote:
> > Author: axeld
> > Date: 2009-08-13 14:05:20 +0200 (Thu, 13 Aug 2009)
> > New Revision: 32306
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32306&view=rev
> > 
> > Modified:
> >    haiku/trunk/src/system/kernel/fs/vfs.cpp
> > Log:
> > * Let fix_dirent() handle invalid reclen's gracefully.
> Since that constitutes a file system bug, how about panicking 
> gracefully 
> instead?

That's what the ASSERT is there for - I should probably extend it, 
though.
But basically, since this is a user buffer we're working on, the 
userland app could overwrite the dirent in between, too, so that this 
doesn't have to be a file system bug for real.

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Aug 13 18:44:14 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 18:44:14 +0200
Subject: [Haiku-commits] r32322 - haiku/trunk/data/settings/network
Message-ID: <200908131644.n7DGiEbS021292@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 18:44:12 +0200 (Thu, 13 Aug 2009)
New Revision: 32322
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32322&view=rev

Modified:
   haiku/trunk/data/settings/network/services
Log:
* Disable ftp/telnet - only sshd is started now by default!!
* Note that you need to have the OpenSSH package installed correctly for this
  to work. Otherwise your Haiku machine is no longer accessible through the
  net anymore!


Modified: haiku/trunk/data/settings/network/services
===================================================================
--- haiku/trunk/data/settings/network/services	2009-08-13 16:30:21 UTC (rev 32321)
+++ haiku/trunk/data/settings/network/services	2009-08-13 16:44:12 UTC (rev 32322)
@@ -1,7 +1,12 @@
-service telnet {
-	launch	telnetd
-}
+#service telnet {
+#	launch	telnetd
+#}
 
-service ftp {
-	launch	ftpd
+#service ftp {
+#	launch	ftpd
+#}
+
+service ssh {
+	launch	/boot/common/bin/sshd -D
+	stand_alone
 }



From axeld at mail.berlios.de  Thu Aug 13 18:49:56 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 13 Aug 2009 18:49:56 +0200
Subject: [Haiku-commits] r32323 - haiku/trunk/src/system/kernel/fs
Message-ID: <200908131649.n7DGnuKW025318@sheep.berlios.de>

Author: axeld
Date: 2009-08-13 18:49:53 +0200 (Thu, 13 Aug 2009)
New Revision: 32323
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32323&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/vfs.cpp
Log:
* Also have the uppper limit check in the assert.


Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-08-13 16:44:12 UTC (rev 32322)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-08-13 16:49:53 UTC (rev 32323)
@@ -5561,9 +5561,11 @@
 		if (user_memcpy(entry, userEntry, sizeof(struct dirent) - 1) != B_OK)
 			return B_BAD_ADDRESS;
 
-		ASSERT(entry->d_reclen >= sizeof(struct dirent));
+		ASSERT(entry->d_reclen >= sizeof(struct dirent)
+			&& entry->d_reclen <= sizeof(buffer));
 
-		// This hints to a problem in the file system implementation
+		// This hints to a problem in the file system implementation, but
+		// could also be caused by a malicious user application
 		if (entry->d_reclen < sizeof(struct dirent)
 			|| entry->d_reclen > sizeof(buffer))
 			return B_BAD_DATA;



From mmu_man at mail.berlios.de  Thu Aug 13 19:29:49 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 19:29:49 +0200
Subject: [Haiku-commits] r32324 - in haiku/trunk/src:
	add-ons/kernel/bus_managers/config_manager/arch
	add-ons/kernel/bus_managers/config_manager/arch/arm
	add-ons/kernel/bus_managers/pci/arch
	add-ons/kernel/bus_managers/pci/arch/arm system/boot/platform/u-boot
Message-ID: <200908131729.n7DHTnCK019852@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 19:29:46 +0200 (Thu, 13 Aug 2009)
New Revision: 32324
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32324&view=rev

Added:
   haiku/trunk/src/add-ons/kernel/bus_managers/config_manager/arch/arm/
   haiku/trunk/src/add-ons/kernel/bus_managers/config_manager/arch/arm/Jamfile
   haiku/trunk/src/add-ons/kernel/bus_managers/config_manager/arch/arm/config_manager_arch.c
   haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/
   haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/Jamfile
   haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_controller.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_io.c
   haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_io.h
Modified:
   haiku/trunk/src/system/boot/platform/u-boot/Jamfile
Log:
[ARM]
Stubbed out config_manager and pci bus_manager arch code.
Now really use the boot floppy tgz for the netbsd uimage as it all builds, but with other kernel arch code not yet commited.


Added: haiku/trunk/src/add-ons/kernel/bus_managers/config_manager/arch/arm/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/config_manager/arch/arm/Jamfile	2009-08-13 16:49:53 UTC (rev 32323)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/config_manager/arch/arm/Jamfile	2009-08-13 17:29:46 UTC (rev 32324)
@@ -0,0 +1,10 @@
+SubDir HAIKU_TOP src add-ons kernel bus_managers config_manager arch $(TARGET_ARCH) ;
+
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ;
+
+UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] ;
+
+KernelStaticLibrary config_manager_arch : 
+	config_manager_arch.c
+	;
+

Added: haiku/trunk/src/add-ons/kernel/bus_managers/config_manager/arch/arm/config_manager_arch.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/config_manager/arch/arm/config_manager_arch.c	2009-08-13 16:49:53 UTC (rev 32323)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/config_manager/arch/arm/config_manager_arch.c	2009-08-13 17:29:46 UTC (rev 32324)
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2009 Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * arch-specific config manager
+ *
+ * Authors (in chronological order):
+ *              Fran?ois Revol (revol at free.fr)
+ */
+
+#include <OS.h>
+#include <config_manager.h>
+
+int config_manager_scan_hardcoded(struct device_info **info, int32 *count)
+{
+	return B_OK;
+}
+

Added: haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/Jamfile	2009-08-13 16:49:53 UTC (rev 32323)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/Jamfile	2009-08-13 17:29:46 UTC (rev 32324)
@@ -0,0 +1,10 @@
+SubDir HAIKU_TOP src add-ons kernel bus_managers pci arch $(TARGET_ARCH) ;
+
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ;
+UsePrivateHeaders kernel [ FDirName kernel arch $(TARGET_ARCH) ] 
+	[ FDirName kernel boot platform $(HAIKU_BOOT_PLATFORM) ] ;
+
+KernelStaticLibrary pci_arch_bus_manager :
+	pci_controller.cpp
+	pci_io.c
+;

Added: haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_controller.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_controller.cpp	2009-08-13 16:49:53 UTC (rev 32323)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_controller.cpp	2009-08-13 17:29:46 UTC (rev 32324)
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2009, Haiku Inc.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include "pci_controller.h"
+
+//#include <arch_platform.h>
+
+#include "pci_private.h"
+
+
+status_t
+pci_controller_init(void)
+{
+	/* no support yet */
+#warning ARM:WRITEME
+	return B_OK;
+}
+
+
+void *
+pci_ram_address(const void *physical_address_in_system_memory)
+{
+	return (void *)physical_address_in_system_memory;
+}

Added: haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_io.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_io.c	2009-08-13 16:49:53 UTC (rev 32323)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_io.c	2009-08-13 17:29:46 UTC (rev 32324)
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2009, Haiku Inc.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include "pci_io.h"
+#include "pci_private.h"
+#warning ARM:WRITEME
+
+
+status_t
+pci_io_init()
+{
+	return B_OK;
+}
+
+
+uint8
+pci_read_io_8(int mapped_io_addr)
+{
+	/* NOT IMPLEMENTED */
+	return 0;
+}
+
+
+void
+pci_write_io_8(int mapped_io_addr, uint8 value)
+{
+	/* NOT IMPLEMENTED */
+}
+
+
+uint16
+pci_read_io_16(int mapped_io_addr)
+{
+	/* NOT IMPLEMENTED */
+	return 0;
+}
+
+
+void
+pci_write_io_16(int mapped_io_addr, uint16 value)
+{
+	/* NOT IMPLEMENTED */
+}
+
+
+uint32
+pci_read_io_32(int mapped_io_addr)
+{
+	/* NOT IMPLEMENTED */
+	return 0;
+}
+
+
+void
+pci_write_io_32(int mapped_io_addr, uint32 value)
+{
+	/* NOT IMPLEMENTED */
+}

Added: haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_io.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_io.h	2009-08-13 16:49:53 UTC (rev 32323)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/pci/arch/arm/pci_io.h	2009-08-13 17:29:46 UTC (rev 32324)
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2009, Haiku Inc.
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+
+#ifndef PCI_BUS_MANAGER_ARM_IO_H
+#define PCI_BUS_MANAGER_ARM_IO_H
+
+#include <SupportDefs.h>
+
+#endif	// PCI_BUS_MANAGER_ARM_IO_H

Modified: haiku/trunk/src/system/boot/platform/u-boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-13 16:49:53 UTC (rev 32323)
+++ haiku/trunk/src/system/boot/platform/u-boot/Jamfile	2009-08-13 17:29:46 UTC (rev 32324)
@@ -173,7 +173,8 @@
 	-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_RAW)
 		-n 'haiku_loader' ;
 
-BuildUImage haiku_loader_nbsd.ub : haiku_loader kernel_arm : 
+local tgzArchive = haiku-floppyboot.tgz ;
+BuildUImage haiku_loader_nbsd.ub : haiku_loader $(tgzArchive) : 
 	-A arm -O $(uImageFakeOS) -T multi -C none
 	-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_NBSD)
 		-n 'haiku_loader' ;



From mmu_man at mail.berlios.de  Thu Aug 13 19:36:43 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 19:36:43 +0200
Subject: [Haiku-commits] r32325 - haiku/trunk/src/system/ldscripts/arm
Message-ID: <200908131736.n7DHah65031335@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 19:36:42 +0200 (Thu, 13 Aug 2009)
New Revision: 32325
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32325&view=rev

Modified:
   haiku/trunk/src/system/ldscripts/arm/kernel.ld
Log:
[ARM]
Add unwind symbols to the kernel too... not sure it goes here though.


Modified: haiku/trunk/src/system/ldscripts/arm/kernel.ld
===================================================================
--- haiku/trunk/src/system/ldscripts/arm/kernel.ld	2009-08-13 17:29:46 UTC (rev 32324)
+++ haiku/trunk/src/system/ldscripts/arm/kernel.ld	2009-08-13 17:36:42 UTC (rev 32325)
@@ -51,6 +51,12 @@
 		__rodata_end = . ;		
 	}
 
+	/* exception unwinding - should really not be needed! XXX: find the correct place. */
+	__exidx_start = .;
+	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
+	__exidx_end = .;
+
+
 	/* writable data  */
 	__data_start_rom = .;	/* in one segment binaries, the rom data address is on top of the ram data address */
 	__data_start = .;



From stefano.ceccherini at gmail.com  Thu Aug 13 19:39:54 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 13 Aug 2009 19:39:54 +0200
Subject: [Haiku-commits] r32316 -
	haiku/trunk/src/tests/kits/game/direct_window_test
In-Reply-To: <35924166316-BeMail@zon>
References: <200908131455.n7DEt06W028544@sheep.berlios.de>
	<35924166316-BeMail@zon>
Message-ID: <894b9700908131039y63cba7b9vab12c3a53ced123b@mail.gmail.com>

2009/8/13 Axel D?rfler <axeld at pinc-software.de>:
> jackburton at mail.berlios.de wrote:
>> - ? ? draw_ptr8 = (uint8*)info->bits + info->bytes_per_row * info->
>> window_bounds.top + (info->> window_bounds.left * info->bits_per_pixel
> / 8);
>> + ? ? draw_ptr8 = (uint8*)info->bits + (info->bytes_per_row * info->
>> window_bounds.top) + (info->> window_bounds.left * (info->
> bits_per_pixel / 8));
>
> Nice one, although two pairs of parenthesis are actually useless, and
> should be discarded, also, a comment wouldn't be too bad explaining
> that.
>
> Bye,
> ? Axel.

I was thinking the same while I was driving home. Will do that later.


From jonas at kirilla.com  Thu Aug 13 19:40:11 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Thu, 13 Aug 2009 19:40:11 +0200 CEST
Subject: [Haiku-commits] r32322 - haiku/trunk/data/settings/network
In-Reply-To: <200908131644.n7DGiEbS021292@sheep.berlios.de>
Message-ID: <11750884163-BeMail@kirilla>

axeld at mail.berlios.de wrote:
> Author: axeld
> Date: 2009-08-13 18:44:12 +0200 (Thu, 13 Aug 2009)
> New Revision: 32322
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32322&view=rev
> 
> Modified:
>    haiku/trunk/data/settings/network/services
> Log:
> * Disable ftp/telnet - only sshd is started now by default!!

Phew, that was timely! I'm meeting some OpenBSD guys the
day after tomorrow! ;)

/Jonas.


From aljen at mail.berlios.de  Thu Aug 13 19:46:54 2009
From: aljen at mail.berlios.de (aljen at mail.berlios.de)
Date: Thu, 13 Aug 2009 19:46:54 +0200
Subject: [Haiku-commits] r32326 - haiku/trunk/src/system/kernel/cache
Message-ID: <200908131746.n7DHksR5000444@sheep.berlios.de>

Author: aljen
Date: 2009-08-13 19:46:39 +0200 (Thu, 13 Aug 2009)
New Revision: 32326
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32326&view=rev

Modified:
   haiku/trunk/src/system/kernel/cache/block_cache.cpp
Log:
Fixed wrong check


Modified: haiku/trunk/src/system/kernel/cache/block_cache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/cache/block_cache.cpp	2009-08-13 17:36:42 UTC (rev 32325)
+++ haiku/trunk/src/system/kernel/cache/block_cache.cpp	2009-08-13 17:46:39 UTC (rev 32326)
@@ -2373,7 +2373,7 @@
 
 	// create a new transaction for the sub transaction
 	cache_transaction* newTransaction = new(std::nothrow) cache_transaction;
-	if (transaction == NULL)
+	if (newTransaction == NULL)
 		return B_NO_MEMORY;
 
 	newTransaction->id = atomic_add(&cache->next_transaction_id, 1);



From mmu_man at mail.berlios.de  Thu Aug 13 20:34:19 2009
From: mmu_man at mail.berlios.de (mmu_man at mail.berlios.de)
Date: Thu, 13 Aug 2009 20:34:19 +0200
Subject: [Haiku-commits] r32327 - in haiku/trunk/src: system/boot/arch/arm
	system/kernel/arch system/kernel/arch/arm
	tools/gensyscalls/arch tools/gensyscalls/arch/arm
Message-ID: <200908131834.n7DIYJLn005850@sheep.berlios.de>

Author: mmu_man
Date: 2009-08-13 20:34:15 +0200 (Thu, 13 Aug 2009)
New Revision: 32327
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=32327&view=rev

Added:
   haiku/trunk/src/system/kernel/arch/arm/
   haiku/trunk/src/system/kernel/arch/arm/Jamfile
   haiku/trunk/src/system/kernel/arch/arm/arch_asm.S
   haiku/trunk/src/system/kernel/arch/arm/arch_commpage.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_cpu.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_debug.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_debug_console.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_elf.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_int.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_platform.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_real_time_clock.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_smp.c
   haiku/trunk/src/system/kernel/arch/arm/arch_system_info.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_thread.c
   haiku/trunk/src/system/kernel/arch/arm/arch_timer.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_user_debugger.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_vm.cpp
   haiku/trunk/src/system/kernel/arch/arm/arch_vm_translation_map.cpp
   haiku/trunk/src/system/kernel/arch/arm/uart.c
   haiku/trunk/src/tools/gensyscalls/arch/arm/
   haiku/trunk/src/tools/gensyscalls/arch/arm/arch_gensyscalls.h
Removed:
   haiku/trunk/src/system/boot/arch/arm/uart.c
Modified:
   haiku/trunk/src/system/boot/arch/arm/Jamfile
Log:
[GSoC] [ARM] Patch by Johannes Wischert.
- stubbed out many arch kernel functions (borrowed from other archs),
- partially implement ELF relocations code, enough to load the kernel,
- move uart.c to kernel sources and use the same one for the loader,
- default implementation for gensyscalls,
- assembler code functions for interrupt masking (enable/disable/restore/query).


Modified: haiku/trunk/src/system/boot/arch/arm/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/arch/arm/Jamfile	2009-08-13 17:46:39 UTC (rev 32326)
+++ haiku/trunk/src/system/boot/arch/arm/Jamfile	2009-08-13 18:34:15 UTC (rev 32327)
@@ -24,7 +24,7 @@
 	$(kernelLibArchObjects)
 ;
 
-SEARCH on [ FGristFiles arch_elf.cpp ]
+SEARCH on [ FGristFiles arch_elf.cpp uart.c ]
     = [ FDirName $(HAIKU_TOP) src system kernel arch $(TARGET_ARCH) ] ;
 
 SEARCH on [ FGristFiles $(librootArchObjects) ]

Deleted: haiku/trunk/src/system/boot/arch/arm/uart.c

Added: haiku/trunk/src/system/kernel/arch/arm/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/arch/arm/Jamfile	2009-08-13 17:46:39 UTC (rev 32326)
+++ haiku/trunk/src/system/kernel/arch/arm/Jamfile	2009-08-13 18:34:15 UTC (rev 32327)
@@ -0,0 +1,42 @@
+SubDir HAIKU_TOP src system kernel arch arm ;
+
+SubDirHdrs $(SUBDIR) $(DOTDOT) generic ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board $(TARGET_BOOT_BOARD) ] ;
+
+
+SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
+
+
+KernelMergeObject kernel_arch_arm.o :
+#	arch_atomic.c
+	arch_commpage.cpp
+	arch_cpu.cpp
+#	arch_cpu_asm.S
+	arch_debug_console.cpp
+	arch_debug.cpp
+	arch_elf.cpp
+#	arch_exceptions.S
+	arch_int.cpp
+	arch_platform.cpp
+	arch_real_time_clock.cpp
+	arch_smp.c
+	arch_system_info.cpp
+	arch_thread.c
+	arch_timer.cpp
+	arch_user_debugger.cpp
+	arch_vm.cpp
+	arch_vm_translation_map.cpp
+	arch_asm.S
+	uart.c
+	generic_vm_physical_page_mapper.cpp
+	generic_vm_physical_page_ops.cpp
+#
+	:
+	$(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused
+	:
+
+;
+
+CreateAsmStructOffsetsHeader asm_offsets.h : asm_offsets.cpp ;
+

Added: haiku/trunk/src/system/kernel/arch/arm/arch_asm.S
===================================================================
--- haiku/trunk/src/system/kernel/arch/arm/arch_asm.S	2009-08-13 17:46:39 UTC (rev 32326)
+++ haiku/trunk/src/system/kernel/arch/arm/arch_asm.S	2009-08-13 18:34:15 UTC (rev 32327)
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2009, Wischert, johanneswi at gmail.com.
+ * All rights reserved. Distributed under the terms of the MIT License.
+ *
+ * Copyright 2003, Travis Geiselbrecht. All rights reserved.
+ * Distributed under the terms of the NewOS License.
+ */
+
+#include <arch/arm/arch_cpu.h>
+
+#include <asm_defs.h>
+
+.text
+
+
+
+/* void arch_int_enable_interrupts(void) */
+FUNCTION(arch_int_enable_interrupts):
+        mrs     r0, cpsr
+        bic     r0, r0, #(1<<7)         /* clear the I bit */
+        msr     cpsr_c, r0
+        bx      lr
+FUNCTION_END(arch_int_enable_interrupts)
+
+
+/* int arch_int_disable_interrupts(void) 
+ */
+FUNCTION(arch_int_disable_interrupts):
+        mrs     r0, cpsr
+        orr     r0, r0, #(1<<7)
+        msr     cpsr_c, r0
+        bx      lr
+FUNCTION_END(arch_int_disable_interrupts)
+
+
+/* void arch_int_restore_interrupts(int oldState) 
+ */
+FUNCTION(arch_int_restore_interrupts):
+	mrs     r1, cpsr
+	orr	r0,r0, #(1<<7)
+	bic     r1, r1,#(1<<7) 
+        orr     r1, r1, r0
+        msr     cpsr_c, r1
+	bx 	lr
+FUNCTION_END(arch_int_restore_interrupts)
+
+
+/* bool arch_int_are_interrupts_enabled(void) */
+FUNCTION(arch_int_are_interrupts_enabled):
+        mrs     r0, cpsr
+        and     r0, r0, #(1<<7)		/*read the I bit*/
+	mvn	r0, r0			/*negate it since 1 means disabled interrupts*/
+	bx 	lr
+FUNCTION_END(arch_int_are_interrupts_enabled)
+
+

Added: haiku/trunk/src/system/kernel/arch/arm/arch_commpage.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/arm/arch_commpage.cpp	2009-08-13 17:46:39 UTC (rev 32326)
+++ haiku/trunk/src/system/kernel/arch/arm/arch_commpage.cpp	2009-08-13 18:34:15 UTC (rev 32327)
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2009, Johannes Wischert, johanneswi at gmail.com.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <commpage.h>
+
+#include <string.h>
+
+#include <KernelExport.h>
+
+#include <cpu.h>
+#include <elf.h>
+#include <smp.h>
+
+
+status_t
+arch_commpage_init(void)
+{
+	/* no optimized memcpy or anything yet */
+	/* we don't use it for syscall yet either */
+	// add syscall to the commpage image
+//	image_id image = get_commpage_image();
+#warning ARM:IMPLEMENTME
+	return B_OK;
+}
+
+
+status_t
+arch_commpage_init_post_cpus(void)
+{
+#warning ARM:IMPLEMENTME
+        return B_OK;
+}
+

Added: haiku/trunk/src/system/kernel/arch/arm/arch_cpu.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/arm/arch_cpu.cpp	2009-08-13 17:46:39 UTC (rev 32326)
+++ haiku/trunk/src/system/kernel/arch/arm/arch_cpu.cpp	2009-08-13 18:34:15 UTC (rev 32327)
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2007, Fran?ois Revol, revol at free.fr.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 2003-2005, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 2001, Travis Geiselbrecht. All rights reserved.
+ * Distributed under the terms of the NewOS License.
+ */
+
+
+#include <KernelExport.h>
+
+//#include <arch_platform.h>
+#include <arch_thread.h>
+#include <arch/cpu.h>
+#include <boot/kernel_args.h>
+#include <commpage.h>
+#include <elf.h>
+
+
+int arch_cpu_type;
+int arch_fpu_type;
+int arch_mmu_type;
+int arch_platform;
+
+status_t 
+arch_cpu_preboot_init_percpu(kernel_args *args, int curr_cpu)
+{
+	// enable FPU
+	//ppc:set_msr(get_msr() | MSR_FP_AVAILABLE);
+
+	// The current thread must be NULL for all CPUs till we have threads.
+	// Some boot code relies on this.
+	arch_thread_set_current_thread(NULL);
+
+	return B_OK;
+}
+
+
+status_t 
+arch_cpu_init_percpu(kernel_args *args, int curr_cpu)
+{
+	//detect_cpu(curr_cpu);
+
+	// we only support one anyway...
+	return 0;
+}
+
+
+status_t
+arch_cpu_init(kernel_args *args)
+{
+	arch_cpu_type = args->arch_args.cpu_type;
+	arch_fpu_type = args->arch_args.fpu_type;
+	arch_mmu_type = args->arch_args.mmu_type;
+	arch_platform = args->arch_args.platform;
+	arch_platform = args->arch_args.machine;
+#warning TODO arch_cpu_init
+	return B_OK;
+}
+
+
+status_t
+arch_cpu_init_post_vm(kernel_args *args)
+{
+	return B_OK;
+}
+
+status_t
+arch_cpu_init_post_modules(kernel_args *args)
+{
+	// add the functions to the commpage image
+	image_id image = get_commpage_image();
+
+	return B_OK;
+}
+
+
+void 
+arch_cpu_sync_icache(void *address, size_t len)
+{
+#warning ARM arch_cpu_sync_icache 
+
+//	cpu_ops.flush_icache((addr_t)address, len);
+}
+
+
+void
+arch_cpu_memory_read_barrier(void)
+{
+	asm volatile ("nop;" : : : "memory");
+#warning M68k: check arch_cpu_memory_read_barrier (FNOP ?)
+}
+
+
+void
+arch_cpu_memory_write_barrier(void)
+{
+	asm volatile ("nop;" : : : "memory");
+#warning M68k: check arch_cpu_memory_write_barrier (FNOP ?)
+}
+
+
+void 
+arch_cpu_invalidate_TLB_range(addr_t start, addr_t end)
+{
+/*	int32 num_pages = end / B_PAGE_SIZE - start / B_PAGE_SIZE;
+	cpu_ops.flush_insn_pipeline();
+	while (num_pages-- >= 0) {
+		cpu_ops.flush_atc_addr(start);
+		cpu_ops.flush_insn_pipeline();
+		start += B_PAGE_SIZE;
+	}
+	cpu_ops.flush_insn_pipeline();
+*/
+#warning WRITEME arch_cpu_invalidate_TLB_range
+}
+
+
+void 
+arch_cpu_invalidate_TLB_list(addr_t pages[], int num_pages)
+{
+/*
+	int i;
+	
+	cpu_ops.flush_insn_pipeline();
+	for (i = 0; i < num_pages; i++) {
+		cpu_ops.flush_atc_addr(pages[i]);
+		cpu_ops.flush_insn_pipeline();
+	}
+	cpu_ops.flush_insn_pipeline();
+*/
+#warning WRITEME arch_cpu_invalidate_TLB_lis
+}
+
+
+void 
+arch_cpu_global_TLB_invalidate(void)
+{
+/*	cpu_ops.flush_insn_pipeline();
+	cpu_ops.flush_atc_all();
+	cpu_ops.flush_insn_pipeline();
+*/
+#warning WRITEME arch_cpu_global_TLB_invalidate
+}
+
+
+void 
+arch_cpu_user_TLB_invalidate(void)
+{/*
+	cpu_ops.flush_insn_pipeline();
+	cpu_ops.flush_atc_user();
+	cpu_ops.flush_insn_pipeline();
+*/
+#warning WRITEME 
+
+}
+
+
+status_t
+arch_cpu_user_memcpy(void *to, const void *from, size_t size,
+	addr_t *faultHandler)
+{
+#warning WRITEME 
+/*
+	char *tmp = (char *)to;
+	char *s = (char *)from;
+	addr_t oldFaultHandler = *faultHandler;
+
+	if (m68k_set_fault_handler(faultHandler, (addr_t)&&error))
+		goto error;
+
+	while (size--)
+		*tmp++ = *s++;
+
+	*faultHandler = oldFaultHandler;
+	return 0;
+
+error:
+	*faultHandler = oldFaultHandler;*/
+	return B_BAD_ADDRESS;
+}
+
+
+/**	\brief Copies at most (\a size - 1) characters from the string in \a from to
+ *	the string in \a to, NULL-terminating the result.
+ *
+ *	\param to Pointer to the destination C-string.
+ *	\param from Pointer to the source C-string.
+ *	\param size Size in bytes of the string buffer pointed to by \a to.
+ *	
+ *	\return strlen(\a from).
+ */
+
+ssize_t
+arch_cpu_user_strlcpy(char *to, const char *from, size_t size, addr_t *faultHandler)
+{
+#warning WRITEME 
+/*
+	int from_length = 0;
+	addr_t oldFaultHandler = *faultHandler;
+
+	if (m68k_set_fault_handler(faultHandler, (addr_t)&&error))
+		goto error;
+
+	if (size > 0) {
+		to[--size] = '\0';
+		// copy 
+		for ( ; size; size--, from_length++, to++, from++) {
+			if ((*to = *from) == '\0')
+				break;
+		}
+	}
+	// count any leftover from chars
+	while (*from++ != '\0')
+		from_length++;
+
+	*faultHandler = oldFaultHandler;
+	return from_length;
+
+error:
+	*faultHandler = oldFaultHandler;*/
+	return B_BAD_ADDRESS;
+}
+
+
+status_t
+arch_cpu_user_memset(void *s, char c, size_t count, addr_t *faultHandler)
+{
+#warning WRITEME 
+
+/*
+	char *xs = (char *)s;
+	addr_t oldFaultHandler = *faultHandler;
+
+	if (m68k_set_fault_handler(faultHandler, (addr_t)&&error))
+		goto error;
+
+	while (count--)
+		*xs++ = c;
+
+	*faultHandler = oldFaultHandler;
+	return 0;
+
+error:
+	*faultHandler = oldFaultHandler;*/
+
+	return B_BAD_ADDRESS;
+}
+
+
+status_t
+arch_cpu_shutdown(bool reboot)
+{
+#warning WRITEME 
+//	M68KPlatform::Default()->ShutDown(reboot);
+	return B_ERROR;
+}
+
+
+void
+arch_cpu_idle(void)
+{
+#warning WRITEME 
+
+//	if (cpu_ops.idle)
+//		cpu_ops.idle();
+//#warning M68K: use LPSTOP ?
+	//asm volatile ("lpstop");
+}
+
+
+// The purpose of this function is to trick the compiler. When setting the
+// page_handler to a label that is obviously (to the compiler) never used,
+// it may reorganize the control flow, so that the labeled part is optimized
+// away.
+// By invoking the function like this
+//
+//	if (m68k_set_fault_handler(faultHandler, (addr_t)&&error))
+//		goto error;
+//
+// the compiler has to keep the labeled code, since it can't guess the return
+// value of this (non-inlinable) function. At least in my tests it worked that
+// way, and I hope it will continue to work like this in the future.
+//
+/*bool
+m68k_set_fault_handler(addr_t *handlerLocation, addr_t handler)
+{
+	*handlerLocation = handler;
+	return false;
+}*/

Added: haiku/trunk/src/system/kernel/arch/arm/arch_debug.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/arm/arch_debug.cpp	2009-08-13 17:46:39 UTC (rev 32326)
+++ haiku/trunk/src/system/kernel/arch/arm/arch_debug.cpp	2009-08-13 18:34:15 UTC (rev 32327)
@@ -0,0 +1,394 @@
+/*
+ * Copyright 2003-2008, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Axel D?rfler <axeld at pinc-software.de>
+ * 		Ingo Weinhold <bonefish at cs.tu-berlin.de>
+ * 		Fran?ois Revol <revol at free.fr>
+ */
+
+
+#include <arch/debug.h>
+
+#include <arch_cpu.h>
+#include <debug.h>
+#include <elf.h>
+#include <kernel.h>
+#include <kimage.h>
+#include <thread.h>
+
+
+struct stack_frame {
+	struct stack_frame	*previous;
+	addr_t				return_address;
+};
+
+#define NUM_PREVIOUS_LOCATIONS 32
+
+extern struct iframe_stack gBootFrameStack;
+/*
+
+static bool
+already_visited(uint32 *visited, int32 *_last, int32 *_num, uint32 framePointer)
+{
+	int32 last = *_last;
+	int32 num = *_num;
+	int32 i;
+
+	for (i = 0; i < num; i++) {
+		if (visited[(NUM_PREVIOUS_LOCATIONS + last - i)
+				% NUM_PREVIOUS_LOCATIONS] == framePointer) {
+			return true;
+		}
+	}
+
+	*_last = last = (last + 1) % NUM_PREVIOUS_LOCATIONS;
+	visited[last] = framePointer;
+
+	if (num < NUM_PREVIOUS_LOCATIONS)
+		*_num = num + 1;
+
+	return false;
+}
+
+
+static inline stack_frame *
+get_current_stack_frame()
+{
+	stack_frame *frame;
+	asm volatile("move.l %%fp,%0" : "=r"(frame));
+	return frame;
+}
+
+
+static status_t
+get_next_frame(addr_t framePointer, addr_t *next, addr_t *ip)
+{
+	struct thread *thread = thread_get_current_thread();
+	addr_t oldFaultHandler = thread->fault_handler;
+
+	// set fault handler, so that we can safely access user stacks
+	if (thread) {
+		if (m68k_set_fault_handler(&thread->fault_handler, (addr_t)&&error))
+			goto error;
+	}
+
+	*ip = ((struct stack_frame *)framePointer)->return_address;
+	*next = (addr_t)((struct stack_frame *)framePointer)->previous;
+
+	if (thread)
+		thread->fault_handler = oldFaultHandler;
+	return B_OK;
+
+error:
+	thread->fault_handler = oldFaultHandler;
+	return B_BAD_ADDRESS;
+}
+
+
+static void
+print_stack_frame(struct thread *thread, addr_t ip, addr_t framePointer,
+	addr_t nextFramePointer)
+{
+	addr_t diff = nextFramePointer - framePointer;
+
+	// kernel space/user space switch
+	if (diff & 0x80000000)
+		diff = 0;
+
+	// lookup symbol
+	const char *symbol, *image;
+	addr_t baseAddress;
+	bool exactMatch;
+	status_t status = elf_debug_lookup_symbol_address(ip, &baseAddress, &symbol,
+		&image, &exactMatch);
+	if (status != B_OK && !IS_KERNEL_ADDRESS(ip) && thread) {
+		// try to locate the image in the images loaded into user space
+		status = image_debug_lookup_user_symbol_address(thread->team, ip,
+			&baseAddress, &symbol, &image, &exactMatch);
+	}
+	if (status == B_OK) {
+		if (symbol != NULL) {
+			kprintf("%08lx (+%4ld) %08lx   <%s>:%s + 0x%04lx%s\n", framePointer,
+				diff, ip, image, symbol, ip - baseAddress,
+				(exactMatch ? "" : " (nearest)"));
+		} else {
+			kprintf("%08lx (+%4ld) %08lx   <%s@%p>:unknown + 0x%04lx\n",
+				framePointer, diff, ip, image, (void *)baseAddress,
+				ip - baseAddress);
+		}
+	} else
+		kprintf("%08lx (+%4ld) %08lx\n", framePointer, diff, ip);
+}
+
+
+static int
+stack_trace(int argc, char **argv)
+{
+	uint32 previousLocations[NUM_PREVIOUS_LOCATIONS];
+	struct iframe_stack *frameStack;
+	struct thread *thread;
+	addr_t framePointer;
+	int32 i, num = 0, last = 0;
+
+	if (argc < 2) {
+		thread = thread_get_current_thread();
+		framePointer = (addr_t)get_current_stack_frame();
+	} else {
+kprintf("Stack traces of other threads not supported yet!\n");
+return 0;
+	}
+
+	// We don't have a thread pointer early in the boot process
+	if (thread != NULL)
+		frameStack = &thread->arch_info.iframes;
+	else
+		frameStack = &gBootFrameStack;
+
+	for (i = 0; i < frameStack->index; i++) {
+		kprintf("iframe %p (end = %p)\n",
+			frameStack->frames[i], frameStack->frames[i] + 1);
+	}
+
+	if (thread != NULL) {
+		kprintf("stack trace for thread 0x%lx \"%s\"\n", thread->id,
+			thread->name);
+
+		kprintf("    kernel stack: %p to %p\n",
+			(void *)thread->kernel_stack_base,
+			(void *)(thread->kernel_stack_top));
+		if (thread->user_stack_base != 0) {
+			kprintf("      user stack: %p to %p\n",
+				(void *)thread->user_stack_base,
+				(void *)(thread->user_stack_base + thread->user_stack_size));
+		}
+	}
+
+	kprintf("frame            caller     <image>:function + offset\n");
+
+	for (;;) {
+		// see if the frame pointer matches the iframe
+		struct iframe *frame = NULL;
+		for (i = 0; i < frameStack->index; i++) {
+			if (framePointer == (addr_t)frameStack->frames[i]) {
+				// it's an iframe
+				frame = frameStack->frames[i];
+				break;
+			}
+		}
+
+		if (frame) {
+			kprintf("iframe at %p\n", frame);
+			kprintf("   d0 0x%08lx    d1 0x%08lx    d2 0x%08lx    d3 0x%08lx\n",
+				frame->d[0], frame->d[1], frame->d[2], frame->d[3]);
+			kprintf("   d4 0x%08lx    d5 0x%08lx    d6 0x%08lx    d7 0x%08lx\n",
+				frame->d[4], frame->d[5], frame->d[6], frame->d[7]);
+			kprintf("   a0 0x%08lx    a1 0x%08lx    a2 0x%08lx    a3 0x%08lx\n",
+				frame->a[0], frame->a[1], frame->a[2], frame->a[3]);
+			kprintf("   a4 0x%08lx    a5 0x%08lx    a6 0x%08lx    a7 0x%08lx (sp)\n",
+#warning M68K: a7 in iframe ??
+				frame->a[4], frame->a[5], frame->a[6], -1L);
+			kprintf("   pc 0x%08lx        sr 0x%04x\n",
+				frame->cpu.pc, frame->cpu.sr);
+#warning M68K: missing regs
+
+			print_stack_frame(thread, frame->cpu.pc, framePointer, frame->a[6]);
+ 			framePointer = frame->a[6];
+		} else {
+			addr_t ip, nextFramePointer;
+
+			if (get_next_frame(framePointer, &nextFramePointer, &ip) != B_OK) {
+				kprintf("%08lx -- read fault\n", framePointer);
+				break;
+			}
+
+			if (ip == 0 || framePointer == 0)
+				break;
+
+			print_stack_frame(thread, ip, framePointer, nextFramePointer);
+			framePointer = nextFramePointer;
+		}
+
+		if (already_visited(previousLocations, &last, &num, framePointer)) {
+			kprintf("circular stack frame: %p!\n", (void *)framePointer);
+			break;
+		}
+		if (framePointer == 0)
+			break;
+	}
+
+
+	return 0;
+}
+
+*/
+
+// #pragma mark -
+
+
+void
+arch_debug_save_registers(int *regs)
+{
+}
+
+
+bool
+arch_debug_contains_call(struct thread *thread, const char *symbol,
+	addr_t start, addr_t end)
+{
+	return false;
+}
+
+
+void *
+arch_debug_get_caller(void)
+{
+#warning ARM:IMPLEMENT
+	// TODO: implement me
+	//return __builtin_frame_address(1);
+//	struct stack_frame *frame;
+	//frame = __builtin_frame_address(0);
+//	frame = get_current_stack_frame();
+//	return (void *)frame->previous->return_address;
+	return NULL;
+}
+
+
+/*!	Captures a stack trace (the return addresses) of the current thread.
+	\param returnAddresses The array the return address shall be written to.
+	\param maxCount The maximum number of return addresses to be captured.
+	\param skipIframes The number of interrupt frames that shall be skipped. If
+		greater than 0, \a skipFrames is ignored.
+	\param skipFrames The number of stack frames that shall be skipped.
+	\param userOnly If \c true, only userland return addresses are captured.
+	\return The number of return addresses written to the given array.
+*/
+int32
+arch_debug_get_stack_trace(addr_t* returnAddresses, int32 maxCount,
+	int32 skipIframes, int32 skipFrames, bool userOnly)
+{
+/*	struct iframe_stack *frameStack;
+	addr_t framePointer;
+	int32 count = 0;
+	int32 i, num = 0, last = 0;
+
+	// Keep skipping normal stack frames until we've skipped the iframes we're
+	// supposed to skip.
+	if (skipIframes > 0) {
+		skipFrames = INT_MAX;
+	} else {
+		// always skip our own frame
+		skipFrames++;
+	}
+
+	struct thread* thread = thread_get_current_thread();
+	framePointer = (addr_t)get_current_stack_frame();
+
+	// We don't have a thread pointer early in the boot process
+	if (thread != NULL)
+		frameStack = &thread->arch_info.iframes;
+	else
+		frameStack = &gBootFrameStack;
+
+	while (framePointer != 0 && count < maxCount) {
+		// see if the frame pointer matches the iframe
+		struct iframe *frame = NULL;
+		for (i = 0; i < frameStack->index; i++) {
+			if (framePointer == (addr_t)frameStack->frames[i]) {
+				// it's an iframe
+				frame = frameStack->frames[i];
+				break;
+			}
+		}
+
+		addr_t ip;
+		addr_t nextFrame;
+
+		if (frame) {
+			ip = frame->cpu.pc;
+ 			nextFrame = frame->a[6];
+
+			if (skipIframes > 0) {
+				if (--skipIframes == 0)
+					skipFrames = 0;
+			}
+		} else {
+			if (get_next_frame(framePointer, &nextFrame, &ip) != B_OK)
+				break;
+		}
+
+		if (skipFrames <= 0 && (!userOnly || IS_USER_ADDRESS(framePointer)))
+			returnAddresses[count++] = ip;
+		else
+			skipFrames--;
+
+		framePointer = nextFrame;
+	}
+
+	return count;*/
+#warning ARM:IMPLEMENT
+
+	return 0;
+}
+
+
+void*
+arch_debug_get_interrupt_pc(bool* _isSyscall)
+{
+	// TODO: Implement!
+	return NULL;
+}
+
+
+bool
+arch_is_debug_variable_defined(const char* variableName)
+{
+	// TODO: Implement!
+	return false;
+}
+
+
+status_t
+arch_set_debug_variable(const char* variableName, uint64 value)
+{
+	// TODO: Implement!
+	return B_ENTRY_NOT_FOUND;
+}
+
+
+status_t
+arch_get_debug_variable(const char* variableName, uint64* value)
+{
+	// TODO: Implement!
+	return B_ENTRY_NOT_FOUND;
+}
+
+
+status_t
+arch_debug_init(kernel_args *args)
+{
+//	add_debugger_command("where", &stack_trace, "Same as \"sc\"");
+//	add_debugger_command("bt", &stack_trace, "Same as \"sc\" (as in gdb)");
+//	add_debugger_command("sc", &stack_trace, "Stack crawl for current thread");
+#warning ARM:IMPLEMENT
+
+	return B_NO_ERROR;
+}
+
+void
+arch_debug_call_with_fault_handler(cpu_ent* cpu, jmp_buf jumpBuffer,
+        void (*function)(void*), void* parameter)
+{
+        // TODO: Implement! Most likely in assembly.
+        longjmp(jumpBuffer, 1);
+}
+
+
+void
+arch_debug_unset_current_thread(void)
+{
+        // TODO: Implement!
+}
+
+

Added: haiku/trunk/src/system/kernel/arch/arm/arch_debug_console.cpp
====